Marown/swad-core
Marown/swad-core
1
0
Fork 0
mirror of https://github.com/acanas/swad-core.git synced 2024-05-31 13:55:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version 15.225.19

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2016-06-17 10:45:02 +02:00
parent 86581914c5
commit b024fa84cb
4 changed files with 44 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
swad_changelog.h
View File

@ -128,13 +128,15 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.225.18 (2016-06-17)"
#define Log_PLATFORM_VERSION "SWAD 15.225.19 (2016-06-17)"
#define CSS_FILE "swad15.225.11.css"
#define JS_FILE "swad15.216.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.225.20:Jun 17, 2016 Show number of messages of a user in similar users. (? lines)
Version 15.225.19:Jun 17, 2016 Changed layout of listing of similar users. (202927 lines)
Version 15.225.18:Jun 17, 2016 Show number of files of a user in similar users. (202904 lines)
Version 15.225.17:Jun 17, 2016 Show similar users. Not finished. (202878 lines)
Version 15.225.16:Jun 16, 2016 New action to show similar users. Not finished. (202887 lines)

8
swad_course.c
View File

@ -2977,12 +2977,6 @@ void Crs_GetAndWriteCrssOfAUsr (const struct UsrData *UsrDat,Rol_Role_t Role)
if ((NumCrss = (unsigned) DB_QuerySELECT (Query,&mysql_res,"can not get courses of a user")))
{
/* Start frame and table */
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\" class=\"COLOR%u\"></td>"
"<td colspan=\"%u\" class=\"COLOR%u\">",
Gbl.RowEvenOdd,
Usr_NUM_MAIN_FIELDS_DATA_USR-2,
Gbl.RowEvenOdd);
Lay_StartRoundFrameTable ("100%",2,NULL);
/* Heading row */
@ -3030,8 +3024,6 @@ void Crs_GetAndWriteCrssOfAUsr (const struct UsrData *UsrDat,Rol_Role_t Role)
/* End table and frame */
Lay_EndRoundFrameTable ();
fprintf (Gbl.F.Out,"</td>"
"</tr>");
}
/***** Free structure that stores the query result *****/

41
swad_duplicate.c
View File

@ -300,11 +300,37 @@ void Dup_ListSimilarUsrs (void)
Usr_NUM_MAIN_FIELDS_DATA_USR-2,
Gbl.RowEvenOdd);
/* Write user figures */
Dup_WriteUsrFigures (UsrDat.UsrCod);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/* Write all the courses this user belongs to */
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\" class=\"COLOR%u\"></td>"
"<td colspan=\"%u\" class=\"COLOR%u\">",
Gbl.RowEvenOdd,
Usr_NUM_MAIN_FIELDS_DATA_USR-2,
Gbl.RowEvenOdd);
Crs_GetAndWriteCrssOfAUsr (&UsrDat,Rol_TEACHER);
Crs_GetAndWriteCrssOfAUsr (&UsrDat,Rol_STUDENT);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/* Button to remove this user from list of duplicates */
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\" class=\"COLOR%u\"></td>"
"<td colspan=\"%u\" class=\"LEFT_TOP COLOR%u\""
" style=\"padding-bottom:20px;\">",
Gbl.RowEvenOdd,
Usr_NUM_MAIN_FIELDS_DATA_USR-2,
Gbl.RowEvenOdd);
// TODO: Show the following button only if this user is in list of duplicates
Act_FormStart (ActLstSimUsr); // TODO: Change to a new action
Usr_PutParamUsrCodEncrypted (UsrDat.EncryptedUsrCod);
Lay_PutConfirmButtonInline ("Quitar de duplicados"); // TODO: Need translation!!!
Lay_PutConfirmButtonInline ("No es duplicado"); // TODO: Need translation!!!
Act_FormEnd ();
/* Button to remove this user */
@ -313,16 +339,9 @@ void Dup_ListSimilarUsrs (void)
Lay_PutRemoveButtonInline ("Eliminar usuario"); // TODO: Need translation!!!
Act_FormEnd ();
/* Write user figures */
Dup_WriteUsrFigures (UsrDat.UsrCod);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/* Write all the courses this user belongs to */
Crs_GetAndWriteCrssOfAUsr (&UsrDat,Rol_TEACHER);
Crs_GetAndWriteCrssOfAUsr (&UsrDat,Rol_STUDENT);
Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd;
}
}
@ -352,7 +371,8 @@ static void Dup_WriteUsrFigures (long UsrCod)
unsigned NumFiles;
/***** Star list ****/
fprintf (Gbl.F.Out,"<ul class=\"PRF_FIG_UL DAT_NOBR_N\">");
fprintf (Gbl.F.Out,"<div>"
"<ul class=\"PRF_FIG_UL DAT_NOBR_N\">");
/***** Write number of files *****/
NumFiles = Brw_GetNumFilesUsr (UsrCod);
@ -370,7 +390,8 @@ static void Dup_WriteUsrFigures (long UsrCod)
// TODO: ...
/***** End list *****/
fprintf (Gbl.F.Out,"</ul>");
fprintf (Gbl.F.Out,"</ul>"
"</div>");
}
/*****************************************************************************/

10
swad_user.c
View File

@ -5871,7 +5871,17 @@ unsigned Usr_ListUsrsFound (Rol_Role_t Role,const char *UsrQuery)
/* Write all the courses this user belongs to */
if (Role != Rol__GUEST_)
{
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\" class=\"COLOR%u\"></td>"
"<td colspan=\"%u\" class=\"COLOR%u\">",
Gbl.RowEvenOdd,
Usr_NUM_MAIN_FIELDS_DATA_USR-2,
Gbl.RowEvenOdd);
Crs_GetAndWriteCrssOfAUsr (&UsrDat,Role);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
}
Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd;
}