From 0c2180ee04c8b1c891fcb5cb9e8ef1062d1b9987 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Wed, 10 May 2017 09:39:38 +0200 Subject: [PATCH] Version 16.209.4 --- css/{swad16.208.7.css => swad16.209.3.css} | 8 +-- swad_changelog.h | 6 ++- swad_record.c | 59 +++++++++++++--------- 3 files changed, 39 insertions(+), 34 deletions(-) rename css/{swad16.208.7.css => swad16.209.3.css} (99%) diff --git a/css/swad16.208.7.css b/css/swad16.209.3.css similarity index 99% rename from css/swad16.208.7.css rename to css/swad16.209.3.css index db99afcb5..2587f6a7d 100644 --- a/css/swad16.208.7.css +++ b/css/swad16.209.3.css @@ -2091,13 +2091,7 @@ a:hover img.CENTRE_PHOTO_SHOW text-align:center; vertical-align:top; } -.REC_SHA - { - display:inline-block; - margin:0 6px; - vertical-align:top; - } -.REC_CRS +.REC_SHA, .REC_CRS, .REC_TT { display:inline-block; margin:0 6px; diff --git a/swad_changelog.h b/swad_changelog.h index 41ddb859e..dfeec379b 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -234,13 +234,15 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.209.2 (2017-05-08)" -#define CSS_FILE "swad16.208.7.css" +#define Log_PLATFORM_VERSION "SWAD 16.209.4 (2017-05-10)" +#define CSS_FILE "swad16.209.3.css" #define JS_FILE "swad16.206.3.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 16.209.4: May 09, 2017 Changes in layout of list of guests' records. (218838 lines) + Version 16.209.3: May 09, 2017 Changes in layout of list of teachers' records. (218830 lines) Version 16.209.2: May 09, 2017 Fixed bug in hidden parameters. (218831 lines) 1 change necessary in database: ALTER TABLE hidden_params CHANGE COLUMN ParamValue ParamValue LONGTEXT NOT NULL; diff --git a/swad_record.c b/swad_record.c index 84948db12..27ab61f07 100644 --- a/swad_record.c +++ b/swad_record.c @@ -996,7 +996,7 @@ void Rec_ListRecordsGstsPrint (void) static void Rec_ListRecordsGsts (Rec_SharedRecordViewType_t TypeOfView) { extern const char *Txt_You_must_select_one_ore_more_users; - unsigned NumUsrs = 0; + unsigned NumUsr = 0; const char *Ptr; struct UsrData UsrDat; @@ -1045,20 +1045,23 @@ static void Rec_ListRecordsGsts (Rec_SharedRecordViewType_t TypeOfView) Usr_GetUsrCodFromEncryptedUsrCod (&UsrDat); if (Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat)) // Get from the database the data of the student { - fprintf (Gbl.F.Out,"
"); + NumUsr != 0 && + (NumUsr % Gbl.Usrs.Listing.RecsPerPag) == 0) + fprintf (Gbl.F.Out," style=\"page-break-before:always;\""); + fprintf (Gbl.F.Out,">"); /* Shared record */ + fprintf (Gbl.F.Out,"
"); Rec_ShowSharedUsrRecord (TypeOfView,&UsrDat,NULL); + fprintf (Gbl.F.Out,"
"); - fprintf (Gbl.F.Out,"
"); + /* End container for this user */ + fprintf (Gbl.F.Out,""); - NumUsrs++; + NumUsr++; } } /***** Free memory used for user's data *****/ @@ -1213,13 +1216,13 @@ static void Rec_ListRecordsStds (Rec_SharedRecordViewType_t ShaTypeOfView, Gbl.CurrentCrs.Crs.CrsCod, false)) { - /* Check if this student has accepted + /* Check if this user has accepted his/her inscription in the current course */ UsrDat.Accepted = Usr_CheckIfUsrBelongsToCrs (UsrDat.UsrCod, Gbl.CurrentCrs.Crs.CrsCod, true); - /* Start records of this user */ + /* Start container for this user */ sprintf (Anchor,"record_%u",NumUsr); fprintf (Gbl.F.Out,"
"); - - /* Show course record */ Rec_ShowCrsRecord (CrsTypeOfView,&UsrDat,Anchor); - - /* End course record */ fprintf (Gbl.F.Out,"
"); } + /* End container for this user */ fprintf (Gbl.F.Out,""); NumUsr++; @@ -1366,8 +1365,9 @@ static void Rec_ListRecordsTchs (Rec_SharedRecordViewType_t TypeOfView) extern const char *Hlp_USERS_Teachers_timetable; extern const char *Txt_You_must_select_one_ore_more_teachers; extern const char *Txt_TIMETABLE_TYPES[TT_NUM_TIMETABLE_TYPES]; - unsigned NumUsrs = 0; + unsigned NumUsr = 0; const char *Ptr; + char Anchor[32]; struct UsrData UsrDat; bool ShowOfficeHours; char Width[10 + 2 + 1]; @@ -1432,34 +1432,43 @@ static void Rec_ListRecordsTchs (Rec_SharedRecordViewType_t TypeOfView) Gbl.CurrentCrs.Crs.CrsCod, false)) { + /* Check if this user has accepted + his/her inscription in the current course */ UsrDat.Accepted = Usr_CheckIfUsrBelongsToCrs (UsrDat.UsrCod, Gbl.CurrentCrs.Crs.CrsCod, true); - fprintf (Gbl.F.Out,"
"); + NumUsr != 0 && + (NumUsr % Gbl.Usrs.Listing.RecsPerPag) == 0) + fprintf (Gbl.F.Out," style=\"page-break-before:always;\""); + fprintf (Gbl.F.Out,">"); /* Shared record */ + fprintf (Gbl.F.Out,"
"); Rec_ShowSharedUsrRecord (TypeOfView,&UsrDat,NULL); + fprintf (Gbl.F.Out,"
"); /* Office hours */ if (ShowOfficeHours) { + fprintf (Gbl.F.Out,"
"); Gbl.TimeTable.Type = TT_TUTORING_TIMETABLE; Lay_StartRoundFrame (Width,Txt_TIMETABLE_TYPES[Gbl.TimeTable.Type], NULL,Hlp_USERS_Teachers_timetable); TT_ShowTimeTable (UsrDat.UsrCod); Lay_EndRoundFrame (); + fprintf (Gbl.F.Out,"
"); } - fprintf (Gbl.F.Out,"
"); + /* End container for this user */ + fprintf (Gbl.F.Out,""); - NumUsrs++; + NumUsr++; } } /***** Free memory used for user's data *****/