Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version 16.225.6

This commit is contained in:
Antonio Cañas Vargas 2017-05-26 19:25:41 +02:00
parent 289cc39a6c
commit ed6f02788e
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
swad_changelog.h
View File

@ -232,19 +232,19 @@
// TODO: Statistics of hits in course accessible by non-editing teachers.
// TODO: Fix order of teachers when listing record cards of teachers
// TODO: Include non-editing teachers in Usr_SeeTchClassPhotoPrn ()
/*****************************************************************************/
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.225.5 (2017-05-26)"
#define Log_PLATFORM_VERSION "SWAD 16.225.6 (2017-05-26)"
#define CSS_FILE "swad16.222.css"
#define JS_FILE "swad16.206.3.js"
// 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
/*
Version 16.225.6: May 26, 2017 Fixed bug printing classphoto of teachers. (220553 lines)
Version 16.225.5: May 26, 2017 Removed link to show all data of students. (220543 lines)
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)

27
swad_user.c
View File

@ -6578,8 +6578,9 @@ void Usr_ListAllDataTchs (void)
/***** Show warning indicating no teachers found *****/
Usr_ShowWarningNoUsersFound (Rol_TCH);
/***** Free memory for teachers list *****/
Usr_FreeUsrsList (Rol_TCH);
/***** Free memory for teachers lists *****/
Usr_FreeUsrsList (Rol_TCH); // Teachers
Usr_FreeUsrsList (Rol_NET); // Non-editing teachers
}
/*****************************************************************************/
@ -7939,6 +7940,8 @@ void Usr_SeeStdClassPhotoPrn (void)
void Usr_SeeTchClassPhotoPrn (void)
{
unsigned NumUsrs;
/***** Get and update type of list,
number of columns in class photo
and preference about view photos *****/
@ -7955,9 +7958,13 @@ void Usr_SeeTchClassPhotoPrn (void)
Sco_GetScope ("ScopeUsr");
/***** Get list of teachers *****/
Usr_GetListUsrs (Gbl.Scope.Current,Rol_TCH);
Usr_GetListUsrs (Gbl.Scope.Current,Rol_NET); // Non-editing teachers
Usr_GetListUsrs (Gbl.Scope.Current,Rol_TCH); // Teachers
NumUsrs = Usr_GetTotalNumberOfUsersInCourses (Gbl.Scope.Current,
1 << Rol_NET |
1 << Rol_TCH);
if (Gbl.Usrs.LstUsrs[Rol_TCH].NumUsrs)
if (NumUsrs)
{
/***** Draw the teachers' class photo *****/
Lay_WriteHeaderClassPhoto (true,true,
@ -7972,16 +7979,22 @@ void Usr_SeeTchClassPhotoPrn (void)
Gbl.Scope.Current == Sco_SCOPE_CRS ? Gbl.CurrentCrs.Crs.CrsCod :
-1L);
Lay_StartTableWide (0);
/* List teachers and non-editing teachers */
Usr_DrawClassPhoto (Usr_CLASS_PHOTO_PRN,
Rol_TCH,false);
Rol_TCH,false);
Usr_DrawClassPhoto (Usr_CLASS_PHOTO_PRN,
Rol_NET,false);
Lay_EndTable ();
}
else
/***** Show warning indicating no teachers found *****/
Usr_ShowWarningNoUsersFound (Rol_TCH);
/***** Free memory for teachers list *****/
Usr_FreeUsrsList (Rol_TCH);
/***** Free memory for teachers lists *****/
Usr_FreeUsrsList (Rol_TCH); // Teachers
Usr_FreeUsrsList (Rol_NET); // Non-editing teachers
}
/*****************************************************************************/