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

This commit is contained in:
Antonio Cañas Vargas 2016-10-04 00:30:46 +02:00
parent 9ba122055f
commit 9cf699ff3d
2 changed files with 18 additions and 11 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.11.1 (2016-10-04)" #define Log_PLATFORM_VERSION "SWAD 16.11.2 (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.11.2: Oct 04, 2016 Code refactoring in user's usage report. (205829 lines)
Version 16.11.1: Oct 04, 2016 Code refactoring in user's usage report. (205824 lines) Version 16.11.1: Oct 04, 2016 Code refactoring in user's usage report. (205824 lines)
Version 16.11: Oct 03, 2016 Created permalinks to report files. (205793 lines) Version 16.11: Oct 03, 2016 Created permalinks to report files. (205793 lines)
1 change necessary in database: 1 change necessary in database:

26
swad_report.c
View File

@ -83,6 +83,7 @@ static void Rep_CreateMyUsageReport (struct CurrentTimeUTC *CurrentTimeUTC,
char *Permalink); char *Permalink);
static void Rep_PutLinkToMyUsageReport (struct CurrentTimeUTC *CurrentTimeUTC, static void Rep_PutLinkToMyUsageReport (struct CurrentTimeUTC *CurrentTimeUTC,
const char *Permalink); const char *Permalink);
static void Req_TitleReport (struct CurrentTimeUTC *CurrentTimeUTC);
static void Rep_WriteHeader (struct CurrentTimeUTC *CurrentTimeUTC, static void Rep_WriteHeader (struct CurrentTimeUTC *CurrentTimeUTC,
const char *Permalink); const char *Permalink);
@ -144,11 +145,7 @@ void Rep_ReqMyUsageReport (void)
Lay_StartRoundFrame (NULL,Gbl.Title,NULL); Lay_StartRoundFrame (NULL,Gbl.Title,NULL);
/***** Header *****/ /***** Header *****/
fprintf (Gbl.F.Out,"<div class=\"DAT_N\">" Req_TitleReport (&CurrentTimeUTC);
"%s",Gbl.Usrs.Me.UsrDat.FullName);
if (CurrentTimeUTC.StrDate[0])
fprintf (Gbl.F.Out,"<br />%s",CurrentTimeUTC.StrDate);
fprintf (Gbl.F.Out,"</div>");
/***** Send button and end frame *****/ /***** Send button and end frame *****/
Lay_EndRoundFrameWithButton (Lay_CONFIRM_BUTTON,Txt_Generate_report); Lay_EndRoundFrameWithButton (Lay_CONFIRM_BUTTON,Txt_Generate_report);
@ -267,11 +264,7 @@ static void Rep_PutLinkToMyUsageReport (struct CurrentTimeUTC *CurrentTimeUTC,
Lay_StartRoundFrame (NULL,Gbl.Title,NULL); Lay_StartRoundFrame (NULL,Gbl.Title,NULL);
/***** Header *****/ /***** Header *****/
fprintf (Gbl.F.Out,"<div class=\"DAT_N\">" Req_TitleReport (CurrentTimeUTC);
"%s",Gbl.Usrs.Me.UsrDat.FullName);
if (CurrentTimeUTC->StrDate[0])
fprintf (Gbl.F.Out,"<br />%s",CurrentTimeUTC->StrDate);
fprintf (Gbl.F.Out,"</div>");
/***** Put anchor and report filename *****/ /***** Put anchor and report filename *****/
fprintf (Gbl.F.Out,"<div class=\"FILENAME CENTER_MIDDLE\">"); fprintf (Gbl.F.Out,"<div class=\"FILENAME CENTER_MIDDLE\">");
@ -294,6 +287,19 @@ static void Rep_PutLinkToMyUsageReport (struct CurrentTimeUTC *CurrentTimeUTC,
Lay_EndRoundFrame (); Lay_EndRoundFrame ();
} }
/*****************************************************************************/
/********************* Write title of user's usage report ********************/
/*****************************************************************************/
static void Req_TitleReport (struct CurrentTimeUTC *CurrentTimeUTC)
{
fprintf (Gbl.F.Out,"<div class=\"DAT_N\">"
"%s",Gbl.Usrs.Me.UsrDat.FullName);
if (CurrentTimeUTC->StrDate[0])
fprintf (Gbl.F.Out,"<br />%s",CurrentTimeUTC->StrDate);
fprintf (Gbl.F.Out,"</div>");
}
/*****************************************************************************/ /*****************************************************************************/
/******************** Write header of user's usage report ********************/ /******************** Write header of user's usage report ********************/
/*****************************************************************************/ /*****************************************************************************/