Version 16.225.4

This commit is contained in:
Antonio Cañas Vargas 2017-05-26 18:08:37 +02:00
parent c9debaf69f
commit 723ba145ac
2 changed files with 14 additions and 36 deletions

View File

@ -238,13 +238,14 @@
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.225.3 (2017-05-26)" #define Log_PLATFORM_VERSION "SWAD 16.225.4 (2017-05-26)"
#define CSS_FILE "swad16.222.css" #define CSS_FILE "swad16.222.css"
#define JS_FILE "swad16.206.3.js" #define JS_FILE "swad16.206.3.js"
// Number of lines (includes comments but not blank lines) has been got with the following command: // Number of lines (includes comments but not blank lines) has been got with the following command:
// nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*?.h sql/swad*.sql | tail -1 // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*?.h sql/swad*.sql | tail -1
/* /*
Version 16.225.4: May 26, 2017 Removed link to show all data of teachers. (220562 lines)
Version 16.225.3: May 26, 2017 Removed link to show all data of guests. (220582 lines) Version 16.225.3: May 26, 2017 Removed link to show all data of guests. (220582 lines)
Version 16.225.2: May 26, 2017 Fixed bug in lists of teachers. (220601 lines) Version 16.225.2: May 26, 2017 Fixed bug in lists of teachers. (220601 lines)
Version 16.225.1: May 26, 2017 Fixed bug related with new role. (220580 lines) Version 16.225.1: May 26, 2017 Fixed bug related with new role. (220580 lines)

View File

@ -202,7 +202,6 @@ static void Usr_PutIconToShowGstsAllData (void);
static void Usr_PutIconToShowStdsAllData (void); static void Usr_PutIconToShowStdsAllData (void);
static void Usr_PutLinkToShowStdsAllData (void); static void Usr_PutLinkToShowStdsAllData (void);
static void Usr_PutIconToShowTchsAllData (void); static void Usr_PutIconToShowTchsAllData (void);
static void Usr_PutLinkToShowTchsAllData (void);
static void Usr_ShowGstsAllDataParams (void); static void Usr_ShowGstsAllDataParams (void);
static void Usr_ShowStdsAllDataParams (void); static void Usr_ShowStdsAllDataParams (void);
static void Usr_ShowTchsAllDataParams (void); static void Usr_ShowTchsAllDataParams (void);
@ -7628,28 +7627,18 @@ void Usr_SeeTeachers (void)
Usr_ShowFormsToSelectUsrListType (ActLstTch); Usr_ShowFormsToSelectUsrListType (ActLstTch);
/***** Draw a class photo with teachers of the course *****/ /***** Draw a class photo with teachers of the course *****/
switch (Gbl.Usrs.Me.ListType) if (Gbl.Usrs.Me.ListType == Usr_LIST_AS_CLASS_PHOTO)
{ Lay_WriteHeaderClassPhoto (false,true,
case Usr_LIST_AS_CLASS_PHOTO: (Gbl.Scope.Current == Sco_SCOPE_CRS ||
Lay_WriteHeaderClassPhoto (false,true, Gbl.Scope.Current == Sco_SCOPE_DEG ||
(Gbl.Scope.Current == Sco_SCOPE_CRS || Gbl.Scope.Current == Sco_SCOPE_CTR ||
Gbl.Scope.Current == Sco_SCOPE_DEG || Gbl.Scope.Current == Sco_SCOPE_INS) ? Gbl.CurrentIns.Ins.InsCod :
Gbl.Scope.Current == Sco_SCOPE_CTR || -1L,
Gbl.Scope.Current == Sco_SCOPE_INS) ? Gbl.CurrentIns.Ins.InsCod : (Gbl.Scope.Current == Sco_SCOPE_CRS ||
-1L, Gbl.Scope.Current == Sco_SCOPE_DEG) ? Gbl.CurrentDeg.Deg.DegCod :
(Gbl.Scope.Current == Sco_SCOPE_CRS || -1L,
Gbl.Scope.Current == Sco_SCOPE_DEG) ? Gbl.CurrentDeg.Deg.DegCod : Gbl.Scope.Current == Sco_SCOPE_CRS ? Gbl.CurrentCrs.Crs.CrsCod :
-1L, -1L);
Gbl.Scope.Current == Sco_SCOPE_CRS ? Gbl.CurrentCrs.Crs.CrsCod :
-1L);
break;
case Usr_LIST_AS_LISTING:
if (Gbl.Usrs.Me.LoggedRole >= Rol_DEG_ADM)
Usr_PutLinkToShowTchsAllData ();
break;
default:
break;
}
/* Start form */ /* Start form */
if (ICanViewRecords) if (ICanViewRecords)
@ -7858,18 +7847,6 @@ static void Usr_PutIconToShowTchsAllData (void)
NULL); NULL);
} }
static void Usr_PutLinkToShowTchsAllData (void)
{
extern const char *Txt_Show_all_data;
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Lay_PutContextualLink (ActLstTchAll,NULL,Usr_ShowTchsAllDataParams,
"table64x64.gif",
Txt_Show_all_data,Txt_Show_all_data,
NULL);
fprintf (Gbl.F.Out,"</div>");
}
static void Usr_ShowGstsAllDataParams (void) static void Usr_ShowGstsAllDataParams (void)
{ {
Usr_PutParamListWithPhotos (); Usr_PutParamListWithPhotos ();