From 916bdc67f2efc4a4bdee4a978a2b2af09a311c8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Mon, 14 Nov 2016 10:30:33 +0100 Subject: [PATCH] Version 16.59.2 --- swad_changelog.h | 5 +++-- swad_notice.c | 8 +++++--- swad_report.c | 4 ++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index 546e8a627..ad3bdbd36 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -145,7 +145,6 @@ // TODO: Writing a message to several recipients: include message to indicate that list of nicknames must be comma separated // TODO: When requesting inscription, I can not click in the photo of my record. Change the form? -// TODO: Cuando se crea una cuenta nueva, debería ponerse a 0 las estadísticas del perfil del usuario // TODO: Import ID, e-mail, Surname1, Surname2, Name from CSV, suggested by Javier Melero // TODO: Remove columns DegCod,CrsCod from database table surveys @@ -156,13 +155,15 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.59 (2016-11-14)" +#define Log_PLATFORM_VERSION "SWAD 16.59.2 (2016-11-14)" #define CSS_FILE "swad16.59.css" #define JS_FILE "swad16.46.1.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.59.2: Nov 14, 2016 Fix bug in user's usage report. (207077 lines) + Version 16.59.1: Nov 14, 2016 Fix bug in deletion of a notice, reported by Javier Fernández Baldomero and others. (207076 lines) Version 16.59: Nov 14, 2016 Changes in layout of contextual help icon. Changes in CSS. (207075 lines) Version 16.58: Nov 14, 2016 Code refactoring related to layout of frames and tables. (207062 lines) diff --git a/swad_notice.c b/swad_notice.c index 7a8eeecf7..4e4bfd85f 100644 --- a/swad_notice.c +++ b/swad_notice.c @@ -280,11 +280,13 @@ void Not_RequestRemNotice (void) /***** Get the code of the notice to remove *****/ NotCod = Not_GetParamNotCod (); - /***** Form to ask for confirmation to remove this notice *****/ - Act_FormStart (ActRemNot); - Not_PutHiddenParamNotCod (NotCod); + /***** Ask for confirmation to remove this notice *****/ Lay_ShowAlert (Lay_WARNING,Txt_Do_you_really_want_to_remove_the_following_notice); Not_GetDataAndShowNotice (NotCod); + + /***** Form to remove this notice *****/ + Act_FormStart (ActRemNot); + Not_PutHiddenParamNotCod (NotCod); Lay_PutRemoveButton (Txt_Remove); Act_FormEnd (); diff --git a/swad_report.c b/swad_report.c index 13945a367..5f1970591 100644 --- a/swad_report.c +++ b/swad_report.c @@ -1192,7 +1192,7 @@ static void Rep_WriteRowCrsData (long CrsCod,Rol_Role_t Role, static void Rep_ShowMyHitsPerYear (bool AnyCourse,long CrsCod,Rol_Role_t Role, struct Rep_Report *Report) { - char Query[512]; + char Query[1024]; char SubQueryCrs[128]; char SubQueryRol[128]; MYSQL_RES *mysql_res; @@ -1266,7 +1266,7 @@ static void Rep_ShowMyHitsPerYear (bool AnyCourse,long CrsCod,Rol_Role_t Role, fprintf (Gbl.F.Rep,"%04u ",Year); /* Draw bar proportional to number of hits */ - Rep_DrawBarNumHits (Year == LastYear ? Report->Hits.Num : + Rep_DrawBarNumHits (Year == ReadYear ? Report->Hits.Num : 0, Report->Hits.Max,Rep_MAX_BAR_WIDTH); fprintf (Gbl.F.Rep,"
");