Version19.61.3

This commit is contained in:
Antonio Cañas Vargas 2019-11-10 13:38:17 +01:00
parent 9b6ba73686
commit 3fec5e8ebc
16 changed files with 26 additions and 19 deletions

View File

@ -1410,7 +1410,7 @@ void HTM_OPTION (HTM_Type_t Type,const void *ValuePtr,bool Selected,bool Disable
HTM_Unsigned (*((unsigned *) ValuePtr)); HTM_Unsigned (*((unsigned *) ValuePtr));
break; break;
case HTM_Type_LONG: case HTM_Type_LONG:
fprintf (Gbl.F.Out,"%ld",*((long *) ValuePtr)); HTM_Long (*((long *) ValuePtr));
break; break;
case HTM_Type_STRING: case HTM_Type_STRING:
HTM_Txt ((char *) ValuePtr); HTM_Txt ((char *) ValuePtr);
@ -1524,3 +1524,8 @@ void HTM_Unsigned (unsigned Num)
{ {
fprintf (Gbl.F.Out,"%u",Num); fprintf (Gbl.F.Out,"%u",Num);
} }
void HTM_Long (long Num)
{
fprintf (Gbl.F.Out,"%ld",Num);
}

View File

@ -152,5 +152,6 @@ void HTM_BR (void);
void HTM_Txt (const char *Txt); void HTM_Txt (const char *Txt);
void HTM_TxtColon (const char *Txt); void HTM_TxtColon (const char *Txt);
void HTM_Unsigned (unsigned Num); void HTM_Unsigned (unsigned Num);
void HTM_Long (long Num);
#endif #endif

View File

@ -437,7 +437,7 @@ static void Ban_ListBannersForEdition (void)
Ban->Hidden ? "DAT_LIGHT" : Ban->Hidden ? "DAT_LIGHT" :
"DAT"); "DAT");
HTM_ARTICLE_Begin (Anchor); HTM_ARTICLE_Begin (Anchor);
fprintf (Gbl.F.Out,"%ld",Ban->BanCod); HTM_Long (Ban->BanCod);
HTM_ARTICLE_End (); HTM_ARTICLE_End ();
HTM_TD_End (); HTM_TD_End ();

View File

@ -1495,7 +1495,7 @@ static void Ctr_ListCentresForEdition (void)
/* Centre code */ /* Centre code */
HTM_TD_Begin ("class=\"DAT CODE\""); HTM_TD_Begin ("class=\"DAT CODE\"");
fprintf (Gbl.F.Out,"%ld",Ctr->CtrCod); HTM_Long (Ctr->CtrCod);
HTM_TD_End (); HTM_TD_End ();
/* Centre logo */ /* Centre logo */

View File

@ -487,7 +487,7 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - *
En OpenSWAD: En OpenSWAD:
ps2pdf source.ps destination.pdf ps2pdf source.ps destination.pdf
*/ */
#define Log_PLATFORM_VERSION "SWAD 19.61.2 (2019-11-10)" #define Log_PLATFORM_VERSION "SWAD 19.61.3 (2019-11-10)"
#define CSS_FILE "swad19.47.css" #define CSS_FILE "swad19.47.css"
#define JS_FILE "swad19.39.js" #define JS_FILE "swad19.39.js"
/* /*
@ -495,7 +495,8 @@ ps2pdf source.ps destination.pdf
// TODO: Impedir la creación y edición de proyectos si no son editables. // 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) // TODO: Importante: filtrar proyectos por usuarios (igual que en trabajos o en asistencia)
Version 19.61.2: Nov 10, 2019 Code refactoring in HTML text printing. (? lines) Version 19.61.3: Nov 10, 2019 Code refactoring in HTML long printing. (246297 lines)
Version 19.61.2: Nov 10, 2019 Code refactoring in HTML unsigned printing. (246291 lines)
Version 19.61.1: Nov 10, 2019 Code refactoring in HTML text printing. (246291 lines) Version 19.61.1: Nov 10, 2019 Code refactoring in HTML text printing. (246291 lines)
Version 19.61: Nov 10, 2019 Code refactoring in HTML text printing. (246298 lines) Version 19.61: Nov 10, 2019 Code refactoring in HTML text printing. (246298 lines)
Version 19.60.3: Nov 09, 2019 Code refactoring in HTML select options. (246311 lines) Version 19.60.3: Nov 09, 2019 Code refactoring in HTML select options. (246311 lines)

View File

@ -494,7 +494,7 @@ static void Cla_ListClassroomsForEdition (void)
/* Classroom code */ /* Classroom code */
HTM_TD_Begin ("class=\"DAT RM\""); HTM_TD_Begin ("class=\"DAT RM\"");
fprintf (Gbl.F.Out,"%ld",Cla->ClaCod); HTM_Long (Cla->ClaCod);
HTM_TD_End (); HTM_TD_End ();
/* Classroom short name */ /* Classroom short name */

View File

@ -395,7 +395,7 @@ static void Crs_Configuration (bool PrintView)
HTM_TD_End (); HTM_TD_End ();
HTM_TD_Begin ("class=\"DAT LM\""); HTM_TD_Begin ("class=\"DAT LM\"");
fprintf (Gbl.F.Out,"%ld",Gbl.Hierarchy.Crs.CrsCod); HTM_Long (Gbl.Hierarchy.Crs.CrsCod);
HTM_TD_End (); HTM_TD_End ();
HTM_TR_End (); HTM_TR_End ();
@ -1438,7 +1438,7 @@ static void Crs_ListCoursesOfAYearForEdition (unsigned Year)
/* Course code */ /* Course code */
HTM_TD_Begin ("class=\"DAT CODE\""); HTM_TD_Begin ("class=\"DAT CODE\"");
fprintf (Gbl.F.Out,"%ld",Crs->CrsCod); HTM_Long (Crs->CrsCod);
HTM_TD_End (); HTM_TD_End ();
/* Institutional code of the course */ /* Institutional code of the course */

View File

@ -720,7 +720,7 @@ static void Deg_ListDegreesForEdition (void)
/* Degree code */ /* Degree code */
HTM_TD_Begin ("class=\"DAT CODE\""); HTM_TD_Begin ("class=\"DAT CODE\"");
fprintf (Gbl.F.Out,"%ld",Deg->DegCod); HTM_Long (Deg->DegCod);
HTM_TD_End (); HTM_TD_End ();
/* Degree logo */ /* Degree logo */

View File

@ -407,7 +407,7 @@ static void DT_ListDegreeTypesForEdition (void)
/* Degree type code */ /* Degree type code */
HTM_TD_Begin ("class=\"DAT CODE\""); HTM_TD_Begin ("class=\"DAT CODE\"");
fprintf (Gbl.F.Out,"%ld",Gbl.DegTypes.Lst[NumDegTyp].DegTypCod); HTM_Long (Gbl.DegTypes.Lst[NumDegTyp].DegTypCod);
HTM_TD_End (); HTM_TD_End ();
/* Name of degree type */ /* Name of degree type */

View File

@ -1470,7 +1470,7 @@ static void Ins_ListInstitutionsForEdition (void)
/* Institution code */ /* Institution code */
HTM_TD_Begin ("class=\"DAT CODE\""); HTM_TD_Begin ("class=\"DAT CODE\"");
fprintf (Gbl.F.Out,"%ld",Ins->InsCod); HTM_Long (Ins->InsCod);
HTM_TD_End (); HTM_TD_End ();
/* Institution logo */ /* Institution logo */

View File

@ -433,7 +433,7 @@ static void Lnk_ListLinksForEdition (void)
/* Link code */ /* Link code */
HTM_TD_Begin ("class=\"DAT RM\""); HTM_TD_Begin ("class=\"DAT RM\"");
fprintf (Gbl.F.Out,"%ld",Lnk->LnkCod); HTM_Long (Lnk->LnkCod);
HTM_TD_End (); HTM_TD_End ();
/* Link short name */ /* Link short name */

View File

@ -499,7 +499,7 @@ static void Mai_ListMailDomainsForEdition (void)
/* Mail code */ /* Mail code */
HTM_TD_Begin ("class=\"DAT RM\""); HTM_TD_Begin ("class=\"DAT RM\"");
fprintf (Gbl.F.Out,"%ld",Mai->MaiCod); HTM_Long (Mai->MaiCod);
HTM_TD_End (); HTM_TD_End ();
/* Mail domain */ /* Mail domain */

View File

@ -545,7 +545,7 @@ static void Plc_ListPlacesForEdition (void)
/* Place code */ /* Place code */
HTM_TD_Begin ("class=\"DAT RM\""); HTM_TD_Begin ("class=\"DAT RM\"");
fprintf (Gbl.F.Out,"%ld",Plc->PlcCod); HTM_Long (Plc->PlcCod);
HTM_TD_End (); HTM_TD_End ();
/* Place short name */ /* Place short name */

View File

@ -408,7 +408,7 @@ static void Plg_ListPluginsForEdition (void)
/* Plugin code */ /* Plugin code */
HTM_TD_Begin ("class=\"DAT RM\""); HTM_TD_Begin ("class=\"DAT RM\"");
fprintf (Gbl.F.Out,"%ld",Plg->PlgCod); HTM_Long (Plg->PlgCod);
HTM_TD_End (); HTM_TD_End ();
/* Plugin logo */ /* Plugin logo */

View File

@ -1561,7 +1561,7 @@ void Prf_ShowRankingFigure (MYSQL_RES **mysql_res,unsigned NumUsrs)
Prf_ShowUsrInRanking (&UsrDat,Rank); Prf_ShowUsrInRanking (&UsrDat,Rank);
HTM_TD_Begin ("class=\"RM COLOR%u\"",Gbl.RowEvenOdd); HTM_TD_Begin ("class=\"RM COLOR%u\"",Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"%ld",Figure); HTM_Long (Figure);
HTM_TD_End (); HTM_TD_End ();
HTM_TR_End (); HTM_TR_End ();

View File

@ -4497,7 +4497,7 @@ static void Tst_WriteIntAnsAssessTest (struct UsrData *UsrDat,
(IntAnswerUsr == IntAnswerCorr ? "ANS_OK" : (IntAnswerUsr == IntAnswerCorr ? "ANS_OK" :
"ANS_BAD") : "ANS_BAD") :
"ANS_0"); "ANS_0");
fprintf (Gbl.F.Out,"%ld",IntAnswerUsr); HTM_Long (IntAnswerUsr);
HTM_TD_End (); HTM_TD_End ();
} }
else else
@ -4515,9 +4515,9 @@ static void Tst_WriteIntAnsAssessTest (struct UsrData *UsrDat,
HTM_TD_Begin ("class=\"ANS_0 CM\""); HTM_TD_Begin ("class=\"ANS_0 CM\"");
if (Gbl.Test.Config.Feedback == Tst_FEEDBACK_EACH_GOOD_BAD || if (Gbl.Test.Config.Feedback == Tst_FEEDBACK_EACH_GOOD_BAD ||
Gbl.Test.Config.Feedback == Tst_FEEDBACK_FULL_FEEDBACK) Gbl.Test.Config.Feedback == Tst_FEEDBACK_FULL_FEEDBACK)
fprintf (Gbl.F.Out,"%ld",IntAnswerCorr); HTM_Long (IntAnswerCorr);
else else
fprintf (Gbl.F.Out,"?"); HTM_Txt ("?");
HTM_TD_End (); HTM_TD_End ();
HTM_TR_End (); HTM_TR_End ();