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.228.2

This commit is contained in:
Antonio Cañas Vargas 2017-05-30 17:34:49 +02:00
parent c0a595ea76
commit 3d325bf2b7
4 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -231,13 +231,14 @@
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.228.1 (2017-05-30)" #define Log_PLATFORM_VERSION "SWAD 16.228.2 (2017-05-30)"
#define CSS_FILE "swad16.226.css" #define CSS_FILE "swad16.226.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.228.2: May 30, 2017 Fixed bug in selection of users. (220726 lines)
Version 16.228.1: May 30, 2017 By default, photos are displayed in listing of users. (220722 lines) Version 16.228.1: May 30, 2017 By default, photos are displayed in listing of users. (220722 lines)
Version 16.228: May 30, 2017 Non-editing teachers can not change their selection of groups. Version 16.228: May 30, 2017 Non-editing teachers can not change their selection of groups.
Removed alert with origin of copy when pasting. (220722 lines) Removed alert with origin of copy when pasting. (220722 lines)

4
swad_duplicate.c
View File

@ -183,7 +183,7 @@ void Dup_ListDuplicateUsrs (void)
UsrDat.Accepted = false; UsrDat.Accepted = false;
/* Write data of this user */ /* Write data of this user */
Usr_WriteRowUsrMainData (NumUsrs - NumUsr,&UsrDat,false); Usr_WriteRowUsrMainData (NumUsrs - NumUsr,&UsrDat,false,Rol_UNK);
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\" class=\"COLOR%u\"></td>" "<td colspan=\"2\" class=\"COLOR%u\"></td>"
@ -315,7 +315,7 @@ static void Dup_ListSimilarUsrs (void)
UsrDat.Accepted = false; UsrDat.Accepted = false;
/* Write data of this user */ /* Write data of this user */
Usr_WriteRowUsrMainData (NumUsrs - NumUsr,&UsrDat,false); Usr_WriteRowUsrMainData (NumUsrs - NumUsr,&UsrDat,false,Rol_UNK);
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\" class=\"COLOR%u\"></td>" "<td colspan=\"2\" class=\"COLOR%u\"></td>"

46
swad_user.c
View File

@ -110,7 +110,7 @@ static const char *Usr_ParamUsrCod[Rol_NUM_ROLES] =
{ {
"UsrCodAll", // Rol_UNK (here means all users) "UsrCodAll", // Rol_UNK (here means all users)
"UsrCodGst", // Rol_GST "UsrCodGst", // Rol_GST
NULL, // Rol_USR NULL, // Rol_USR
"UsrCodStd", // Rol_STD "UsrCodStd", // Rol_STD
"UsrCodNET", // Rol_NET "UsrCodNET", // Rol_NET
"UsrCodTch", // Rol_TCH "UsrCodTch", // Rol_TCH
@ -195,12 +195,15 @@ static void Usr_FormToSelectUsrListType (Act_Action_t NextAction,Usr_ShowUsrsTyp
static Usr_Sex_t Usr_GetSexOfUsrsLst (Rol_Role_t Role); static Usr_Sex_t Usr_GetSexOfUsrsLst (Rol_Role_t Role);
static void Usr_PutCheckboxToSelectUser (struct UsrData *UsrDat,bool UsrIsTheMsgSender); static void Usr_PutCheckboxToSelectUser (Rol_Role_t Role,
const char *EncryptedUsrCod,
bool UsrIsTheMsgSender);
static void Usr_PutCheckboxListWithPhotos (void); static void Usr_PutCheckboxListWithPhotos (void);
static void Usr_ListMainDataGsts (bool PutCheckBoxToSelectUsr); static void Usr_ListMainDataGsts (bool PutCheckBoxToSelectUsr);
static void Usr_ListMainDataStds (bool PutCheckBoxToSelectUsr); static void Usr_ListMainDataStds (bool PutCheckBoxToSelectUsr);
static void Usr_ListMainDataTchs (Rol_Role_t Role,bool PutCheckBoxToSelectUsr); static void Usr_ListMainDataTchs (Rol_Role_t Role,bool PutCheckBoxToSelectUsr);
static void Usr_ListUsrsForSelection (Rol_Role_t Role);
static void Usr_ListRowsAllDataTchs (Rol_Role_t Role, static void Usr_ListRowsAllDataTchs (Rol_Role_t Role,
const char *FieldNames[Usr_NUM_ALL_FIELDS_DATA_TCH], const char *FieldNames[Usr_NUM_ALL_FIELDS_DATA_TCH],
unsigned NumColumns); unsigned NumColumns);
@ -3202,7 +3205,7 @@ static void Usr_InsertMyLastData (void)
#define Usr_MAX_BYTES_BG_COLOR (16 - 1) #define Usr_MAX_BYTES_BG_COLOR (16 - 1)
void Usr_WriteRowUsrMainData (unsigned NumUsr,struct UsrData *UsrDat, void Usr_WriteRowUsrMainData (unsigned NumUsr,struct UsrData *UsrDat,
bool PutCheckBoxToSelectUsr) bool PutCheckBoxToSelectUsr,Rol_Role_t Role)
{ {
extern const char *Txt_Enrolment_confirmed; extern const char *Txt_Enrolment_confirmed;
extern const char *Txt_Enrolment_not_confirmed; extern const char *Txt_Enrolment_not_confirmed;
@ -3227,7 +3230,7 @@ void Usr_WriteRowUsrMainData (unsigned NumUsr,struct UsrData *UsrDat,
if (PutCheckBoxToSelectUsr) if (PutCheckBoxToSelectUsr)
{ {
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE %s\">",BgColor); fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE %s\">",BgColor);
Usr_PutCheckboxToSelectUser (UsrDat,UsrIsTheMsgSender); Usr_PutCheckboxToSelectUser (Role,UsrDat->EncryptedUsrCod,UsrIsTheMsgSender);
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");
} }
@ -5732,8 +5735,7 @@ void Usr_PutCheckboxToSelectAllUsers (Rol_Role_t Role)
"<th colspan=\"%u\" class=\"LEFT_MIDDLE LIGHT_BLUE\">" "<th colspan=\"%u\" class=\"LEFT_MIDDLE LIGHT_BLUE\">"
"<label>", "<label>",
Usr_GetColumnsForSelectUsrs ()); Usr_GetColumnsForSelectUsrs ());
if (Usr_NameSelUnsel[Role] && if (Usr_NameSelUnsel[Role] && Usr_ParamUsrCod[Role])
Usr_ParamUsrCod[Role])
fprintf (Gbl.F.Out,"<input type=\"checkbox\"" fprintf (Gbl.F.Out,"<input type=\"checkbox\""
" name=\"%s\" value=\"\"" " name=\"%s\" value=\"\""
" onclick=\"togglecheckChildren(this,'%s')\" />", " onclick=\"togglecheckChildren(this,'%s')\" />",
@ -5791,27 +5793,27 @@ unsigned Usr_GetColumnsForSelectUsrs (void)
/******* Put a checkbox, in a classphoto or a list, to select a user *********/ /******* Put a checkbox, in a classphoto or a list, to select a user *********/
/*****************************************************************************/ /*****************************************************************************/
static void Usr_PutCheckboxToSelectUser (struct UsrData *UsrDat,bool UsrIsTheMsgSender) static void Usr_PutCheckboxToSelectUser (Rol_Role_t Role,
const char *EncryptedUsrCod,
bool UsrIsTheMsgSender)
{ {
bool CheckboxChecked; bool CheckboxChecked;
if (Usr_NameSelUnsel[UsrDat->RoleInCurrentCrsDB] && if (Usr_NameSelUnsel[Role] && Usr_ParamUsrCod[Role])
Usr_ParamUsrCod[UsrDat->RoleInCurrentCrsDB])
{ {
/***** Check box must be checked? *****/ /***** Check box must be checked? *****/
CheckboxChecked = false;
if (UsrIsTheMsgSender) if (UsrIsTheMsgSender)
CheckboxChecked = true; CheckboxChecked = true;
else else
/* Check if user is in lists of selected users */ /* Check if user is in lists of selected users */
CheckboxChecked = Usr_FindUsrCodInListOfSelectedUsrs (UsrDat->EncryptedUsrCod); CheckboxChecked = Usr_FindUsrCodInListOfSelectedUsrs (EncryptedUsrCod);
/***** Check box *****/ /***** Check box *****/
fprintf (Gbl.F.Out,"<input type=\"checkbox\" name=\"%s\" value=\"%s\"" fprintf (Gbl.F.Out,"<input type=\"checkbox\" name=\"%s\" value=\"%s\""
" onclick=\"checkParent(this,'%s')\"", " onclick=\"checkParent(this,'%s')\"",
Usr_ParamUsrCod[UsrDat->RoleInCurrentCrsDB], Usr_ParamUsrCod[Role],
UsrDat->EncryptedUsrCod, EncryptedUsrCod,
Usr_NameSelUnsel[UsrDat->RoleInCurrentCrsDB]); Usr_NameSelUnsel[Role]);
if (CheckboxChecked) if (CheckboxChecked)
fprintf (Gbl.F.Out," checked=\"checked\""); fprintf (Gbl.F.Out," checked=\"checked\"");
fprintf (Gbl.F.Out," />"); fprintf (Gbl.F.Out," />");
@ -5933,7 +5935,7 @@ static void Usr_ListMainDataGsts (bool PutCheckBoxToSelectUsr)
ID_GetListIDsFromUsrCod (&UsrDat); ID_GetListIDsFromUsrCod (&UsrDat);
/* Show row for this guest */ /* Show row for this guest */
Usr_WriteRowUsrMainData (NumUsr + 1,&UsrDat,true); Usr_WriteRowUsrMainData (NumUsr + 1,&UsrDat,true,Rol_GST);
} }
/***** Free memory used for user's data *****/ /***** Free memory used for user's data *****/
@ -6002,7 +6004,8 @@ static void Usr_ListMainDataStds (bool PutCheckBoxToSelectUsr)
ID_GetListIDsFromUsrCod (&UsrDat); ID_GetListIDsFromUsrCod (&UsrDat);
/* Show row for this student */ /* Show row for this student */
Usr_WriteRowUsrMainData (NumUsr + 1,&UsrDat,PutCheckBoxToSelectUsr); Usr_WriteRowUsrMainData (NumUsr + 1,&UsrDat,
PutCheckBoxToSelectUsr,Rol_STD);
} }
/***** Free memory used for user's data *****/ /***** Free memory used for user's data *****/
@ -6076,7 +6079,8 @@ static void Usr_ListMainDataTchs (Rol_Role_t Role,bool PutCheckBoxToSelectUsr)
ID_GetListIDsFromUsrCod (&UsrDat); ID_GetListIDsFromUsrCod (&UsrDat);
/* Show row for this teacher */ /* Show row for this teacher */
Usr_WriteRowUsrMainData (NumUsr + 1,&UsrDat,PutCheckBoxToSelectUsr); Usr_WriteRowUsrMainData (NumUsr + 1,&UsrDat,
PutCheckBoxToSelectUsr,Role);
} }
/***** Free memory used for user's data *****/ /***** Free memory used for user's data *****/
@ -6414,7 +6418,7 @@ void Usr_ListAllDataStds (void)
/*************** List users (of current course) for selection ****************/ /*************** List users (of current course) for selection ****************/
/*****************************************************************************/ /*****************************************************************************/
void Usr_ListUsrsForSelection (Rol_Role_t Role) static void Usr_ListUsrsForSelection (Rol_Role_t Role)
{ {
unsigned NumUsr; unsigned NumUsr;
struct UsrData UsrDat; struct UsrData UsrDat;
@ -6441,7 +6445,7 @@ void Usr_ListUsrsForSelection (Rol_Role_t Role)
if (Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat)) // If user's data exist... if (Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat)) // If user's data exist...
{ {
UsrDat.Accepted = Gbl.Usrs.LstUsrs[Role].Lst[NumUsr].Accepted; UsrDat.Accepted = Gbl.Usrs.LstUsrs[Role].Lst[NumUsr].Accepted;
Usr_WriteRowUsrMainData (++NumUsr,&UsrDat,true); Usr_WriteRowUsrMainData (++NumUsr,&UsrDat,true,Role);
Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd; Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd;
} }
@ -6641,7 +6645,7 @@ unsigned Usr_ListUsrsFound (Rol_Role_t Role,
ID_GetListIDsFromUsrCod (&UsrDat); ID_GetListIDsFromUsrCod (&UsrDat);
/* Write data of this user */ /* Write data of this user */
Usr_WriteRowUsrMainData (NumUsr + 1,&UsrDat,false); Usr_WriteRowUsrMainData (NumUsr + 1,&UsrDat,false,Role);
/* Write all the courses this user belongs to */ /* Write all the courses this user belongs to */
if (Role != Rol_GST && // Guests do not belong to any course if (Role != Rol_GST && // Guests do not belong to any course
@ -8034,7 +8038,7 @@ static void Usr_DrawClassPhoto (Usr_ClassPhotoType_t ClassPhotoType,
/***** Checkbox to select this user *****/ /***** Checkbox to select this user *****/
if (PutCheckBoxToSelectUsr) if (PutCheckBoxToSelectUsr)
Usr_PutCheckboxToSelectUser (&UsrDat,UsrIsTheMsgSender); Usr_PutCheckboxToSelectUser (Role,UsrDat.EncryptedUsrCod,UsrIsTheMsgSender);
/***** Show photo *****/ /***** Show photo *****/
ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (&UsrDat,PhotoURL); ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (&UsrDat,PhotoURL);

3
swad_user.h
View File

@ -319,7 +319,7 @@ void Usr_UpdateMyLastData (void);
void Usr_InsertMyLastCrsTabAndTime (void); void Usr_InsertMyLastCrsTabAndTime (void);
void Usr_WriteRowUsrMainData (unsigned NumUsr,struct UsrData *UsrDat, void Usr_WriteRowUsrMainData (unsigned NumUsr,struct UsrData *UsrDat,
bool PutCheckboxToSelectUsr); bool PutCheckBoxToSelectUsr,Rol_Role_t Role);
unsigned Usr_GetNumUsrsInCrs (Rol_Role_t Role,long CrsCod); unsigned Usr_GetNumUsrsInCrs (Rol_Role_t Role,long CrsCod);
unsigned Usr_GetNumUsrsInCrssOfDeg (Rol_Role_t Role,long DegCod); unsigned Usr_GetNumUsrsInCrssOfDeg (Rol_Role_t Role,long DegCod);
@ -368,7 +368,6 @@ void Usr_ListUsersToSelect (Rol_Role_t Role);
void Usr_ListAllDataGsts (void); void Usr_ListAllDataGsts (void);
void Usr_ListAllDataStds (void); void Usr_ListAllDataStds (void);
void Usr_ListUsrsForSelection (Rol_Role_t Role);
void Usr_ListAllDataTchs (void); void Usr_ListAllDataTchs (void);
unsigned Usr_ListUsrsFound (Rol_Role_t Role, unsigned Usr_ListUsrsFound (Rol_Role_t Role,
const char SearchQuery[Sch_MAX_BYTES_SEARCH_QUERY]); const char SearchQuery[Sch_MAX_BYTES_SEARCH_QUERY]);