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 15.245.3

This commit is contained in:
Antonio Cañas Vargas 2016-07-25 21:08:53 +02:00
parent df895b04fd
commit 7074316c9b
2 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -136,13 +136,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.245.2 (2016-07-24)"
#define Log_PLATFORM_VERSION "SWAD 15.245.3 (2016-07-24)"
#define CSS_FILE "swad15.229.css"
#define JS_FILE "swad15.238.1.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 15.245.3: Jul 25, 2016 Listing of guests uses the list filled instead of querying database a second time to get all user's data. (204088 lines)
Version 15.245.2: Jul 25, 2016 Listing of students/teachers uses the list filled instead of querying database a second time to get all user's data. (204088 lines)
Version 15.245.1: Jul 25, 2016 Code refactoring in building of queries to get/search users. (204081 lines)
Version 15.245: Jul 25, 2016 List of users is filled with user's name and user's institution.

40
swad_user.c
View File

@ -4501,7 +4501,9 @@ static void Usr_GetListUsrsFromQuery (const char *Query,Rol_Role_t Role,Sco_Scop
break;
}
break;
case Rol__GUEST_:
case Rol__GUEST_: // Guests have no courses,...
// ...so they have not accepted...
// ...inscription in any course
case Rol_DEG_ADM: // Any admin (degree, centre, institution or system)
UsrInList->Accepted = false;
break;
@ -5387,20 +5389,18 @@ static void Usr_ListMainDataGsts (bool PutCheckBoxToSelectUsr)
/***** Initialize structure with user's data *****/
Usr_UsrDataConstructor (&UsrDat);
/***** List students' data *****/
/***** List guests' data *****/
for (NumUsr = 0, Gbl.RowEvenOdd = 0;
NumUsr < Gbl.Usrs.LstUsrs[Rol__GUEST_].NumUsrs; )
NumUsr < Gbl.Usrs.LstUsrs[Rol__GUEST_].NumUsrs;
NumUsr++, Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd)
{
UsrDat.UsrCod = Gbl.Usrs.LstUsrs[Rol__GUEST_].Lst[NumUsr].UsrCod;
if (Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat)) // If user's data exist...
{
UsrDat.Accepted = false; // Guests have no courses,...
// ...so they have not accepted...
// ...inscription in any course
Usr_WriteRowUsrMainData (++NumUsr,&UsrDat,true);
/* Copy user's basic data from list */
Usr_CopyBasicUsrDataFromList (&UsrDat,&Gbl.Usrs.LstUsrs[Rol__GUEST_].Lst[NumUsr]);
Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd;
}
/* Get list of user's IDs */
ID_GetListIDsFromUsrCod (&UsrDat);
Usr_WriteRowUsrMainData (NumUsr + 1,&UsrDat,true);
}
/***** Free memory used for user's data *****/
@ -5453,7 +5453,8 @@ static void Usr_ListMainDataStds (bool PutCheckBoxToSelectUsr)
/***** List students' data *****/
for (NumUsr = 0, Gbl.RowEvenOdd = 0;
NumUsr < Gbl.Usrs.LstUsrs[Rol_STUDENT].NumUsrs; )
NumUsr < Gbl.Usrs.LstUsrs[Rol_STUDENT].NumUsrs;
NumUsr++, Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd)
{
/* Copy user's basic data from list */
Usr_CopyBasicUsrDataFromList (&UsrDat,&Gbl.Usrs.LstUsrs[Rol_STUDENT].Lst[NumUsr]);
@ -5461,9 +5462,7 @@ static void Usr_ListMainDataStds (bool PutCheckBoxToSelectUsr)
/* Get list of user's IDs */
ID_GetListIDsFromUsrCod (&UsrDat);
Usr_WriteRowUsrMainData (++NumUsr,&UsrDat,PutCheckBoxToSelectUsr);
Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd;
Usr_WriteRowUsrMainData (NumUsr + 1,&UsrDat,PutCheckBoxToSelectUsr);
}
/***** Free memory used for user's data *****/
@ -5525,9 +5524,10 @@ static void Usr_ListMainDataTchs (bool PutCheckBoxToSelectUsr)
/***** Initialize structure with user's data *****/
Usr_UsrDataConstructor (&UsrDat);
/***** List data of teachers *****/
/***** List teachers' data *****/
for (NumUsr = 0, Gbl.RowEvenOdd = 0;
NumUsr < Gbl.Usrs.LstUsrs[Rol_TEACHER].NumUsrs; )
NumUsr < Gbl.Usrs.LstUsrs[Rol_TEACHER].NumUsrs;
NumUsr++, Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd)
{
/* Copy user's basic data from list */
Usr_CopyBasicUsrDataFromList (&UsrDat,&Gbl.Usrs.LstUsrs[Rol_TEACHER].Lst[NumUsr]);
@ -5535,9 +5535,7 @@ static void Usr_ListMainDataTchs (bool PutCheckBoxToSelectUsr)
/* Get list of user's IDs */
ID_GetListIDsFromUsrCod (&UsrDat);
Usr_WriteRowUsrMainData (++NumUsr,&UsrDat,PutCheckBoxToSelectUsr);
Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd;
Usr_WriteRowUsrMainData (NumUsr + 1,&UsrDat,PutCheckBoxToSelectUsr);
}
/***** Free memory used for user's data *****/