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

This commit is contained in:
Antonio Cañas Vargas 2016-06-16 19:16:09 +02:00
parent 83f5e8d658
commit a15143387c
3 changed files with 46 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
swad_changelog.h
View File

@ -128,14 +128,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.225.14 (2016-06-16)"
#define Log_PLATFORM_VERSION "SWAD 15.225.15 (2016-06-16)"
#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.15:Jun 16, 2016 Button in possible duplicate user to show similar users. (? lines)
Version 15.225.15:Jun 16, 2016 Button in possible duplicate user to show similar users. (202781 lines)
Version 15.225.14:Jun 16, 2016 Code refactoring in listing of users. (202741 lines)
Version 15.225.13:Jun 16, 2016 Check if a user in listing of possible duplicate users has accepted all his/her courses. (202790 lines)
Version 15.225.12:Jun 16, 2016 New module swad_duplicate for possible duplicate users. (202758 lines)

25
swad_duplicate.c
View File

@ -122,6 +122,7 @@ void Dup_ListDuplicateUsrs (void)
{
extern const char *Txt_Possibly_duplicate_users;
extern const char *Txt_Informants;
extern const char *Txt_Similar_users;
extern const char *Txt_No_users_found[Rol_NUM_ROLES];
char Query[1024];
MYSQL_RES *mysql_res;
@ -181,13 +182,33 @@ void Dup_ListDuplicateUsrs (void)
Lay_ShowErrorAndExit ("Wrong number of informers.");
if (NumInformants > 1)
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\"></td>"
"<td colspan=\"%u\" class=\"DAT\">%s: %u</td>"
"<td colspan=\"2\" class=\"COLOR%u\"></td>"
"<td colspan=\"%u\""
" class=\"DAT LEFT_MIDDLE COLOR%u\">"
"%s: %u"
"</td>"
"</tr>",
Gbl.RowEvenOdd,
Usr_NUM_MAIN_FIELDS_DATA_USR-2,
Gbl.RowEvenOdd,
Txt_Informants,
NumInformants);
/* Write link to view users similar to this */
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\" class=\"COLOR%u\"></td>"
"<td colspan=\"%u\""
" class=\"DAT LEFT_MIDDLE COLOR%u\">",
Gbl.RowEvenOdd,
Usr_NUM_MAIN_FIELDS_DATA_USR-2,
Gbl.RowEvenOdd);
Act_FormStart (ActLstDupUsr); // TODO: Change to new action
Usr_PutParamUsrCodEncrypted (UsrDat.EncryptedUsrCod);
Lay_PutConfirmButtonInline (Txt_Similar_users);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/* Write all the courses this user belongs to */
Crs_GetAndWriteCrssOfAUsr (&UsrDat,Rol_TEACHER);
Crs_GetAndWriteCrssOfAUsr (&UsrDat,Rol_STUDENT);

21
swad_text.c
View File

@ -36694,6 +36694,27 @@ const char *Txt_Sign_up =
"Solicitar inscri&ccedil;&atilde;o";
#endif
const char *Txt_Similar_users =
#if L==1
"Usuaris similars";
#elif L==2
"&Auml;hnliche Benutzer";
#elif L==3
"Similar users";
#elif L==4
"Usuarios similares";
#elif L==5
"Utilisateurs similaires";
#elif L==6
"Usuarios similares"; // Okoteve traducción
#elif L==7
"Utenti simili";
#elif L==8
"Podobne u&zdot;ytkownik&oacute;w";
#elif L==9
"Usu&aacute;rios similares";
#endif
const char *Txt_Size = // ...of a file zone
#if L==1
"Mida";