diff --git a/swad_HTML.c b/swad_HTML.c index 54a41599..bb1383e9 100644 --- a/swad_HTML.c +++ b/swad_HTML.c @@ -1558,6 +1558,11 @@ void HTM_Unsigned (unsigned Num) fprintf (Gbl.F.Out,"%u",Num); } +void HTM_UnsignedLong (unsigned long Num) + { + fprintf (Gbl.F.Out,"%lu",Num); + } + void HTM_Long (long Num) { fprintf (Gbl.F.Out,"%ld",Num); diff --git a/swad_HTML.h b/swad_HTML.h index 98fb5d73..17aacda0 100644 --- a/swad_HTML.h +++ b/swad_HTML.h @@ -157,6 +157,7 @@ void HTM_TxtColon (const char *Txt); void HTM_NBSPTxt (const char *Txt); void HTM_NBSP (void); void HTM_Unsigned (unsigned Num); +void HTM_UnsignedLong (unsigned long Num); void HTM_Long (long Num); #endif diff --git a/swad_changelog.h b/swad_changelog.h index e40d2460..d6a73759 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -487,7 +487,7 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - * En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 19.61.6 (2019-11-10)" +#define Log_PLATFORM_VERSION "SWAD 19.61.7 (2019-11-10)" #define CSS_FILE "swad19.47.css" #define JS_FILE "swad19.39.js" /* @@ -495,6 +495,7 @@ ps2pdf source.ps destination.pdf // TODO: Impedir la creación y edición de proyectos si no son editables. // TODO: Importante: filtrar proyectos por usuarios (igual que en trabajos o en asistencia) + Version 19.61.7: Nov 10, 2019 Code refactoring in HTML unsigned long printing. (? lines) Version 19.61.6: Nov 10, 2019 Code refactoring in HTML underlines. (246327 lines) Version 19.61.5: Nov 10, 2019 Code refactoring in HTML text printing. (246308 lines) Version 19.61.4: Nov 10, 2019 Code refactoring in HTML text printing. (246303 lines) diff --git a/swad_enrolment.c b/swad_enrolment.c index fd1ea62e..75d0280f 100644 --- a/swad_enrolment.c +++ b/swad_enrolment.c @@ -2834,7 +2834,7 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected) /***** Number *****/ HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"DAT RT\""); - fprintf (Gbl.F.Out,"%lu",NumReqs - NumReq); + HTM_UnsignedLong (NumReqs - NumReq); HTM_TD_End (); /***** Link to course *****/ diff --git a/swad_figure.c b/swad_figure.c index e4e04f29..87520881 100644 --- a/swad_figure.c +++ b/swad_figure.c @@ -2614,11 +2614,11 @@ static void Fig_WriteRowStatsFileBrowsers1 (const char *NameOfFileZones, HTM_TD_End (); HTM_TD_Begin ("class=\"%s RM\"",Class); - fprintf (Gbl.F.Out,"%lu",SizeOfFileZones->NumFolders); + HTM_UnsignedLong (SizeOfFileZones->NumFolders); HTM_TD_End (); HTM_TD_Begin ("class=\"%s RM\"",Class); - fprintf (Gbl.F.Out,"%lu",SizeOfFileZones->NumFiles); + HTM_UnsignedLong (SizeOfFileZones->NumFiles); HTM_TD_End (); HTM_TD_Begin ("class=\"%s RM\"",Class); @@ -2785,11 +2785,11 @@ static void Fig_GetAndShowOERsStats (void) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%lu",NumFiles[0]); + HTM_UnsignedLong (NumFiles[0]); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%lu",NumFiles[1]); + HTM_UnsignedLong (NumFiles[1]); HTM_TD_End (); HTM_TR_End (); @@ -3122,7 +3122,7 @@ static void Fig_GetAndShowTestsStats (void) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%lu",Stats.NumHits); + HTM_UnsignedLong (Stats.NumHits); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); @@ -3171,7 +3171,7 @@ static void Fig_GetAndShowTestsStats (void) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT_N_LINE_TOP RM\""); - fprintf (Gbl.F.Out,"%lu",Stats.NumHits); + HTM_UnsignedLong (Stats.NumHits); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT_N_LINE_TOP RM\""); @@ -3405,7 +3405,7 @@ static void Fig_GetAndShowSocialActivityStats (void) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%lu",NumSocialNotes); + HTM_UnsignedLong (NumSocialNotes); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); @@ -3526,7 +3526,7 @@ static void Fig_GetAndShowSocialActivityStats (void) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT_N_LINE_TOP RM\""); - fprintf (Gbl.F.Out,"%lu",NumSocialNotes); + HTM_UnsignedLong (NumSocialNotes); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT_N_LINE_TOP RM\""); diff --git a/swad_file_browser.c b/swad_file_browser.c index 4ad36418..7e8d0eaf 100644 --- a/swad_file_browser.c +++ b/swad_file_browser.c @@ -11906,7 +11906,7 @@ static void Brw_WriteRowDocData (unsigned long *NumDocsNotHidden,MYSQL_ROW row) /***** Write number of document in this search *****/ HTM_TD_Begin ("class=\"DAT RT %s\"",BgColor); - fprintf (Gbl.F.Out,"%lu",++(*NumDocsNotHidden)); + HTM_UnsignedLong (++(*NumDocsNotHidden)); HTM_TD_End (); /***** Write institution logo, institution short name *****/ diff --git a/swad_group.c b/swad_group.c index f99e63f5..d050ad6c 100644 --- a/swad_group.c +++ b/swad_group.c @@ -2302,7 +2302,7 @@ static void Grp_ListGrpsForMultipleSelection (struct GroupType *GrpTyp, Role--) { HTM_TD_Begin ("class=\"DAT CM\""); - fprintf (Gbl.F.Out,"%lu",Grp_CountNumUsrsInNoGrpsOfType (Role,GrpTyp->GrpTypCod)); + HTM_UnsignedLong (Grp_CountNumUsrsInNoGrpsOfType (Role,GrpTyp->GrpTypCod)); HTM_TD_End (); } diff --git a/swad_indicator.c b/swad_indicator.c index 9c75f9e5..a3bc8d29 100644 --- a/swad_indicator.c +++ b/swad_indicator.c @@ -1125,14 +1125,14 @@ static void Ind_ShowTableOfCoursesWithIndicators (Ind_IndicatorsLayout_t Indicat (Indicators.NumFilesAssignments != 0) ? "DAT_SMALL_GREEN" : "DAT_SMALL_RED", Gbl.RowEvenOdd); - fprintf (Gbl.F.Out,"%lu",Indicators.NumFilesAssignments); + HTM_UnsignedLong (Indicators.NumFilesAssignments); HTM_TD_End (); HTM_TD_Begin ("class=\"%s RM COLOR%u\"", (Indicators.NumFilesWorks != 0) ? "DAT_SMALL_GREEN" : "DAT_SMALL_RED", Gbl.RowEvenOdd); - fprintf (Gbl.F.Out,"%lu",Indicators.NumFilesWorks); + HTM_UnsignedLong (Indicators.NumFilesWorks); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT_SMALL_GREEN CM COLOR%u\"", @@ -1184,14 +1184,14 @@ static void Ind_ShowTableOfCoursesWithIndicators (Ind_IndicatorsLayout_t Indicat (Indicators.NumFilesInDocumentZones != 0) ? "DAT_SMALL_GREEN" : "DAT_SMALL_RED", Gbl.RowEvenOdd); - fprintf (Gbl.F.Out,"%lu",Indicators.NumFilesInDocumentZones); + HTM_UnsignedLong (Indicators.NumFilesInDocumentZones); HTM_TD_End (); HTM_TD_Begin ("class=\"%s RM COLOR%u\"", (Indicators.NumFilesInSharedZones != 0) ? "DAT_SMALL_GREEN" : "DAT_SMALL_RED", Gbl.RowEvenOdd); - fprintf (Gbl.F.Out,"%lu",Indicators.NumFilesInSharedZones); + HTM_UnsignedLong (Indicators.NumFilesInSharedZones); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT_SMALL_GREEN CM COLOR%u\"", diff --git a/swad_statistic.c b/swad_statistic.c index 6d876a6d..8b8378b0 100644 --- a/swad_statistic.c +++ b/swad_statistic.c @@ -3374,7 +3374,7 @@ static void Sta_ShowNumHitsPerCountry (unsigned long NumRows, /* Write ranking of this country */ HTM_TD_Begin ("class=\"LOG RM\""); if (CtyCod > 0) - fprintf (Gbl.F.Out,"%lu",++Ranking); + HTM_UnsignedLong (++Ranking); HTM_NBSP (); HTM_TD_End (); @@ -3464,7 +3464,7 @@ static void Sta_ShowNumHitsPerInstitution (unsigned long NumRows, /* Write ranking of this institution */ HTM_TD_Begin ("class=\"LOG RT\""); if (InsCod > 0) - fprintf (Gbl.F.Out,"%lu",++Ranking); + HTM_UnsignedLong (++Ranking); HTM_NBSP (); HTM_TD_End (); @@ -3556,7 +3556,7 @@ static void Sta_ShowNumHitsPerCentre (unsigned long NumRows, /* Write ranking of this centre */ HTM_TD_Begin ("class=\"LOG RT\""); if (CtrCod > 0) - fprintf (Gbl.F.Out,"%lu",++Ranking); + HTM_UnsignedLong (++Ranking); HTM_NBSP (); HTM_TD_End (); @@ -3648,7 +3648,7 @@ static void Sta_ShowNumHitsPerDegree (unsigned long NumRows, /* Write ranking of this degree */ HTM_TD_Begin ("class=\"LOG RT\""); if (DegCod > 0) - fprintf (Gbl.F.Out,"%lu",++Ranking); + HTM_UnsignedLong (++Ranking); HTM_NBSP (); HTM_TD_End (); @@ -3752,7 +3752,7 @@ static void Sta_ShowNumHitsPerCourse (unsigned long NumRows, /* Write ranking of this course */ HTM_TD_Begin ("class=\"LOG RT\""); if (CrsOK) - fprintf (Gbl.F.Out,"%lu",++Ranking); + HTM_UnsignedLong (++Ranking); HTM_NBSP (); HTM_TD_End (); diff --git a/swad_test.c b/swad_test.c index 2f7e3df2..75b4c4ab 100644 --- a/swad_test.c +++ b/swad_test.c @@ -2899,7 +2899,7 @@ static void Tst_ListOneOrMoreQuestionsForEdition (unsigned long NumRows, /* Write number of question */ HTM_DIV_Begin ("class=\"BIG_INDEX\""); - fprintf (Gbl.F.Out,"%lu",NumRow + 1); + HTM_UnsignedLong (NumRow + 1); HTM_DIV_End (); /* Write answer type (row[2]) */ @@ -2987,7 +2987,7 @@ static void Tst_ListOneOrMoreQuestionsForEdition (unsigned long NumRows, /* Write number of times this question has been answered */ HTM_TD_Begin ("class=\"DAT_SMALL CT COLOR%u\"",Gbl.RowEvenOdd); - fprintf (Gbl.F.Out,"%lu",NumHitsThisQst); + HTM_UnsignedLong (NumHitsThisQst); HTM_TD_End (); /* Write average score */ @@ -3001,7 +3001,7 @@ static void Tst_ListOneOrMoreQuestionsForEdition (unsigned long NumRows, /* Write number of times this question has been answered (not blank) */ HTM_TD_Begin ("class=\"DAT_SMALL CT COLOR%u\"",Gbl.RowEvenOdd); - fprintf (Gbl.F.Out,"%lu",NumHitsNotBlankThisQst); + HTM_UnsignedLong (NumHitsNotBlankThisQst); HTM_TD_End (); /* Write average score (not blank) */