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

This commit is contained in:
Antonio Cañas Vargas 2016-10-04 23:57:32 +02:00
parent d38cf52c33
commit 46d81be880
2 changed files with 45 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -143,13 +143,14 @@
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.13 (2016-10-04)" #define Log_PLATFORM_VERSION "SWAD 16.13.1 (2016-10-04)"
#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 16.13.1: Oct 04, 2016 Changes in user's usage report. (205906 lines)
Version 16.13: Oct 04, 2016 New filename for user's usage report. (205883 lines) Version 16.13: Oct 04, 2016 New filename for user's usage report. (205883 lines)
Version 16.12: Oct 04, 2016 Code refactoring in user's usage report. (205882 lines) Version 16.12: Oct 04, 2016 Code refactoring in user's usage report. (205882 lines)
Copy icon/report64x64.png to icon directory Copy icon/report64x64.png to icon directory

60
swad_report.c
View File

@ -235,8 +235,9 @@ static void Rep_CreateMyUsageReport (struct CurrentTimeUTC *CurrentTimeUTC,
/***** Start file *****/ /***** Start file *****/
Lay_StartHTMLFile (Gbl.F.Rep,FilenameReport); Lay_StartHTMLFile (Gbl.F.Rep,FilenameReport);
fprintf (Gbl.F.Rep,"<body style=\"margin:1em;text-align:left;" fprintf (Gbl.F.Rep,"<body style=\"margin:1em;"
"font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;\">\n"); " text-align:left;"
" font-family:Helvetica,Arial,sans-serif;\">\n");
/***** Header *****/ /***** Header *****/
Rep_WriteHeader (CurrentTimeUTC,Permalink); Rep_WriteHeader (CurrentTimeUTC,Permalink);
@ -319,10 +320,24 @@ static void Rep_PutLinkToMyUsageReport (struct CurrentTimeUTC *CurrentTimeUTC,
static void Req_TitleReport (struct CurrentTimeUTC *CurrentTimeUTC) static void Req_TitleReport (struct CurrentTimeUTC *CurrentTimeUTC)
{ {
fprintf (Gbl.F.Out,"<div class=\"DAT_N\" style=\"margin-bottom:10px;\">" extern const char *Txt_User[Usr_NUM_SEXS];
"%s",Gbl.Usrs.Me.UsrDat.FullName); extern const char *Txt_Date;
if (CurrentTimeUTC->StrDate[0])
fprintf (Gbl.F.Out,"<br />%s",CurrentTimeUTC->StrDate); fprintf (Gbl.F.Out,"<div class=\"DAT\" style=\"margin-bottom:10px;\">");
/***** User *****/
fprintf (Gbl.F.Out,"%s: <span class=\"DAT_N_BOLD\">%s</span>",
Txt_User[Gbl.Usrs.Me.UsrDat.Sex],
Gbl.Usrs.Me.UsrDat.FullName);
fprintf (Gbl.F.Out,"<br />");
/***** Report date *****/
fprintf (Gbl.F.Out,"%s: <span class=\"DAT_N\">%s %s UTC</span>",
Txt_Date,
CurrentTimeUTC->StrDate,
CurrentTimeUTC->StrTime);
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>");
} }
@ -396,12 +411,18 @@ static void Rep_WriteHeader (struct CurrentTimeUTC *CurrentTimeUTC,
CurrentTimeUTC->StrTime); CurrentTimeUTC->StrTime);
/***** Permalink *****/ /***** Permalink *****/
fprintf (Gbl.F.Rep,"<li>%s: <a href=\"%s\" target=\"_blank\">%s</a></li>", fprintf (Gbl.F.Rep,"<li>%s: "
"<a href=\"%s\" target=\"_blank\""
" style=\"text-decoration:none;\">"
"%s"
"</a>"
"</li>",
Txt_Permalink, Txt_Permalink,
Permalink,Permalink); Permalink,Permalink);
/***** End of header *****/ /***** End of header *****/
fprintf (Gbl.F.Rep,"</header>\n"); fprintf (Gbl.F.Rep,"</ul>"
"</header>\n");
} }
/*****************************************************************************/ /*****************************************************************************/
@ -417,7 +438,7 @@ static void Rep_WriteSectionPlatform (void)
/***** Start of section *****/ /***** Start of section *****/
fprintf (Gbl.F.Rep,"<section>" fprintf (Gbl.F.Rep,"<section>"
"<h2>%s</h2>" "<h3>%s</h3>"
"<ul>", "<ul>",
Txt_Teaching_platform); Txt_Teaching_platform);
@ -427,7 +448,12 @@ static void Rep_WriteSectionPlatform (void)
Cfg_PLATFORM_FULL_NAME,Txt_TAGLINE); Cfg_PLATFORM_FULL_NAME,Txt_TAGLINE);
/***** Server URL *****/ /***** Server URL *****/
fprintf (Gbl.F.Rep,"<li>%s: <a href=\"%s\">%s</a></li>", fprintf (Gbl.F.Rep,"<li>%s: "
"<a href=\"%s\" target=\"_blank\""
" style=\"text-decoration:none;\">"
"%s"
"</a>"
"</li>",
Txt_URL,Cfg_URL_SWAD_SERVER,Cfg_URL_SWAD_SERVER); Txt_URL,Cfg_URL_SWAD_SERVER,Cfg_URL_SWAD_SERVER);
/***** End of section *****/ /***** End of section *****/
@ -451,7 +477,7 @@ static void Rep_WriteSectionUsrInfo (void)
/***** Start of section *****/ /***** Start of section *****/
fprintf (Gbl.F.Rep,"<section>" fprintf (Gbl.F.Rep,"<section>"
"<h2>%s</h2>" "<h3>%s</h3>"
"<ul>", "<ul>",
Txt_Personal_information); Txt_Personal_information);
@ -515,7 +541,7 @@ static void Rep_WriteSectionUsrFigures (struct UsrFigures *UsrFigures,
/***** Start of section *****/ /***** Start of section *****/
fprintf (Gbl.F.Rep,"<section>" fprintf (Gbl.F.Rep,"<section>"
"<h2>%s</h2>" "<h3>%s</h3>"
"<ul>", "<ul>",
Txt_Figures); Txt_Figures);
@ -665,7 +691,7 @@ static void Rep_WriteSectionGlobalHits (struct UsrFigures *UsrFigures,
/***** Start of section *****/ /***** Start of section *****/
fprintf (Gbl.F.Rep,"<section>" fprintf (Gbl.F.Rep,"<section>"
"<h2>%s</h2>", "<h3>%s</h3>",
Txt_Hits); Txt_Hits);
/***** Global (in any course) hits per year *****/ /***** Global (in any course) hits per year *****/
@ -693,11 +719,11 @@ static void Rep_WriteSectionCurrentCourses (struct UsrFigures *UsrFigures,
/***** Start of section *****/ /***** Start of section *****/
fprintf (Gbl.F.Rep,"<section>" fprintf (Gbl.F.Rep,"<section>"
"<h2>%s", "<h3>%s",
Txt_Courses); Txt_Courses);
if (CurrentTimeUTC->StrDate[0]) if (CurrentTimeUTC->StrDate[0])
fprintf (Gbl.F.Rep," (%s)",CurrentTimeUTC->StrDate); fprintf (Gbl.F.Rep," (%s)",CurrentTimeUTC->StrDate);
fprintf (Gbl.F.Rep,"</h2>" fprintf (Gbl.F.Rep,"</h3>"
"<ul>"); "<ul>");
/***** Number of courses in which the user is student/teacher *****/ /***** Number of courses in which the user is student/teacher *****/
@ -729,7 +755,7 @@ static void Rep_WriteSectionHistoricCourses (struct UsrFigures *UsrFigures,
/***** Start of section *****/ /***** Start of section *****/
fprintf (Gbl.F.Rep,"<section>" fprintf (Gbl.F.Rep,"<section>"
"<h2>%s (%s)</h2>", "<h3>%s (%s)</h3>",
Txt_Courses,Txt_historical_log); Txt_Courses,Txt_historical_log);
fprintf (Gbl.F.Rep,Txt_Only_courses_with_more_than_X_clicks_are_shown, fprintf (Gbl.F.Rep,Txt_Only_courses_with_more_than_X_clicks_are_shown,
Rep_MIN_CLICKS_CRS); Rep_MIN_CLICKS_CRS);
@ -817,7 +843,7 @@ static void Rep_GetAndWriteCurrentCrssOfAUsr (const struct UsrData *UsrDat,Rol_R
Txt_courses); Txt_courses);
if (NumCrss) if (NumCrss)
{ {
fprintf (Gbl.F.Rep," (%u %s / %u %s)", fprintf (Gbl.F.Rep," (%u %s / %u %s):",
Usr_GetNumUsrsInCrssOfAUsr (Gbl.Usrs.Me.UsrDat.UsrCod,Role,Rol_TEACHER), Usr_GetNumUsrsInCrssOfAUsr (Gbl.Usrs.Me.UsrDat.UsrCod,Role,Rol_TEACHER),
Txt_teachers_ABBREVIATION, Txt_teachers_ABBREVIATION,
Usr_GetNumUsrsInCrssOfAUsr (Gbl.Usrs.Me.UsrDat.UsrCod,Role,Rol_STUDENT), Usr_GetNumUsrsInCrssOfAUsr (Gbl.Usrs.Me.UsrDat.UsrCod,Role,Rol_STUDENT),