Version 15.251.2

This commit is contained in:
Antonio Cañas Vargas 2016-09-11 22:45:53 +02:00
parent 1e69d5ab81
commit 46822c7d15
3 changed files with 72 additions and 5 deletions

View File

@ -135,13 +135,14 @@
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.251.1 (2016-09-11)" #define Log_PLATFORM_VERSION "SWAD 15.251.2 (2016-09-11)"
#define CSS_FILE "swad15.229.css" #define CSS_FILE "swad15.229.css"
#define JS_FILE "swad15.238.1.js" #define JS_FILE "swad15.238.1.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 15.251.2: Sep 11, 2016 Changes in layout of user's usage report. (204465 lines)
Version 15.251.1: Sep 11, 2016 Changes in user's usage report. (204406 lines) Version 15.251.1: Sep 11, 2016 Changes in user's usage report. (204406 lines)
Version 15.251: Sep 11, 2016 List of courses in user's usage report. (204416 lines) Version 15.251: Sep 11, 2016 List of courses in user's usage report. (204416 lines)
Version 15.250.10:Sep 11, 2016 Details of user's profile removed from user's usage report. (? lines) Version 15.250.10:Sep 11, 2016 Details of user's profile removed from user's usage report. (? lines)

View File

@ -89,11 +89,13 @@ void Rep_PrintMyUsageReport (void)
static void Rep_ShowOrPrintMyUsageReport (Rep_SeeOrPrint_t SeeOrPrint) static void Rep_ShowOrPrintMyUsageReport (Rep_SeeOrPrint_t SeeOrPrint)
{ {
extern const char *Txt_Report_of_use_of_the_platform; extern const char *Txt_Report_of_use_of_the_platform;
extern const char *Txt_Personal_information;
extern const char *Txt_User[Usr_NUM_SEXS]; extern const char *Txt_User[Usr_NUM_SEXS];
extern const char *Txt_ID; extern const char *Txt_ID;
extern const char *Txt_Email; extern const char *Txt_Email;
extern const char *Txt_Country; extern const char *Txt_Country;
extern const char *Txt_Institution; extern const char *Txt_Institution;
extern const char *Txt_Figures;
extern const char *Txt_From_TIME; extern const char *Txt_From_TIME;
extern const char *Txt_day; extern const char *Txt_day;
extern const char *Txt_days; extern const char *Txt_days;
@ -111,6 +113,7 @@ static void Rep_ShowOrPrintMyUsageReport (Rep_SeeOrPrint_t SeeOrPrint)
extern const char *Txt_Messages_sent; extern const char *Txt_Messages_sent;
extern const char *Txt_message; extern const char *Txt_message;
extern const char *Txt_messages; extern const char *Txt_messages;
extern const char *Txt_Courses;
extern const char *Txt_USER_in_COURSE; extern const char *Txt_USER_in_COURSE;
extern const char *Txt_ROLES_SINGUL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS]; extern const char *Txt_ROLES_SINGUL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
extern const char *Txt_course; extern const char *Txt_course;
@ -127,11 +130,16 @@ static void Rep_ShowOrPrintMyUsageReport (Rep_SeeOrPrint_t SeeOrPrint)
Rol_Role_t Role; Rol_Role_t Role;
unsigned NumCrss; unsigned NumCrss;
/***** Start frame and list *****/ /***** Start frame *****/
if (SeeOrPrint == Rep_SEE) if (SeeOrPrint == Rep_SEE)
Lay_StartRoundFrame ("100%",Txt_Report_of_use_of_the_platform, Lay_StartRoundFrame (NULL,Txt_Report_of_use_of_the_platform,
Rep_PutIconToPrintMyUsageReport); Rep_PutIconToPrintMyUsageReport);
fprintf (Gbl.F.Out,"<ul class=\"LEFT_MIDDLE\">"); fprintf (Gbl.F.Out,"<div class=\"LEFT_TOP\" style=\"margin:10px;\">");
/***** Personal information *****/
fprintf (Gbl.F.Out,"<h2>%s</h2>"
"<ul>",
Txt_Personal_information);
/***** User's name *****/ /***** User's name *****/
fprintf (Gbl.F.Out,"<li>%s: <strong>%s</strong></li>", fprintf (Gbl.F.Out,"<li>%s: <strong>%s</strong></li>",
@ -172,6 +180,13 @@ static void Rep_ShowOrPrintMyUsageReport (Rep_SeeOrPrint_t SeeOrPrint)
Txt_Institution, Txt_Institution,
Ins.FullName); Ins.FullName);
fprintf (Gbl.F.Out,"</ul>");
/***** Figures *****/
fprintf (Gbl.F.Out,"<h2>%s</h2>"
"<ul>",
Txt_Figures);
/***** Get figures *****/ /***** Get figures *****/
Prf_GetUsrFigures (Gbl.Usrs.Me.UsrDat.UsrCod,&UsrFigures); Prf_GetUsrFigures (Gbl.Usrs.Me.UsrDat.UsrCod,&UsrFigures);
@ -290,6 +305,13 @@ static void Rep_ShowOrPrintMyUsageReport (Rep_SeeOrPrint_t SeeOrPrint)
fprintf (Gbl.F.Out,"?"); fprintf (Gbl.F.Out,"?");
fprintf (Gbl.F.Out,"</li>"); fprintf (Gbl.F.Out,"</li>");
fprintf (Gbl.F.Out,"</ul>");
/***** Courses *****/
fprintf (Gbl.F.Out,"<h2>%s</h2>"
"<ul>",
Txt_Courses);
/***** Number of courses in which the user is student/teacher *****/ /***** Number of courses in which the user is student/teacher *****/
for (Role = Rol_STUDENT; for (Role = Rol_STUDENT;
Role <= Rol_TEACHER; Role <= Rol_TEACHER;
@ -316,8 +338,10 @@ static void Rep_ShowOrPrintMyUsageReport (Rep_SeeOrPrint_t SeeOrPrint)
fprintf (Gbl.F.Out,"</li>"); fprintf (Gbl.F.Out,"</li>");
} }
/***** End list and frame *****/
fprintf (Gbl.F.Out,"</ul>"); fprintf (Gbl.F.Out,"</ul>");
/***** End frame *****/
fprintf (Gbl.F.Out,"</div>");
if (SeeOrPrint == Rep_SEE) if (SeeOrPrint == Rep_SEE)
Lay_EndRoundFrame (); Lay_EndRoundFrame ();
} }

View File

@ -11415,6 +11415,27 @@ const char *Txt_Field_BR_name =
"Nome<br />do campo"; "Nome<br />do campo";
#endif #endif
const char *Txt_Figures =
#if L==1
"Xifres";
#elif L==2
"Zahlen";
#elif L==3
"Figures";
#elif L==4
"Cifras";
#elif L==5
"Chiffres";
#elif L==6
"Cifras"; // Okoteve traducción
#elif L==7
"Cifre";
#elif L==8
"Cyfry";
#elif L==9
"N&uacute;meros";
#endif
const char *Txt_File = const char *Txt_File =
#if L==1 #if L==1
"Fitxer"; "Fitxer";
@ -27556,6 +27577,27 @@ const char *Txt_PERCENT_of_users =
"% de utilizadores"; "% de utilizadores";
#endif #endif
const char *Txt_Personal_information =
#if L==1
"Dades personals";
#elif L==2
"Pers&ouml;nliche Angaben";
#elif L==3
"Personal information";
#elif L==4
"Datos personales";
#elif L==5
"Informations personnelles";
#elif L==6
"Datos personales"; // Okoteve traducción
#elif L==7
"Informazione personale";
#elif L==8
"Informacje osobiste";
#elif L==9
"Informa&ccedil;&atilde;o pessoal";
#endif
const char *Txt_Phone = const char *Txt_Phone =
#if L==1 #if L==1
"Tel&egrave;fon"; "Tel&egrave;fon";