diff --git a/swad_changelog.h b/swad_changelog.h index d733a7b22..644d2cb6b 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -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) diff --git a/swad_duplicate.c b/swad_duplicate.c index eb6ff0590..b151ef64d 100644 --- a/swad_duplicate.c +++ b/swad_duplicate.c @@ -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,"" - "" - "%s: %u" + "" + "" + "%s: %u" + "" "", + 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,"" + "" + "", + 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,"" + ""); + /* Write all the courses this user belongs to */ Crs_GetAndWriteCrssOfAUsr (&UsrDat,Rol_TEACHER); Crs_GetAndWriteCrssOfAUsr (&UsrDat,Rol_STUDENT); diff --git a/swad_text.c b/swad_text.c index 9805eab79..0c2631c57 100644 --- a/swad_text.c +++ b/swad_text.c @@ -36694,6 +36694,27 @@ const char *Txt_Sign_up = "Solicitar inscrição"; #endif +const char *Txt_Similar_users = +#if L==1 + "Usuaris similars"; +#elif L==2 + "Ä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żytkowników"; +#elif L==9 + "Usuários similares"; +#endif + const char *Txt_Size = // ...of a file zone #if L==1 "Mida";