mirror of https://github.com/acanas/swad-core.git
Version19.31.36
This commit is contained in:
parent
7fe0920f74
commit
2194047dbf
|
@ -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.31.35 (2019-10-10)"
|
#define Log_PLATFORM_VERSION "SWAD 19.31.36 (2019-10-10)"
|
||||||
#define CSS_FILE "swad19.29.css"
|
#define CSS_FILE "swad19.29.css"
|
||||||
#define JS_FILE "swad19.30.js"
|
#define JS_FILE "swad19.30.js"
|
||||||
/*
|
/*
|
||||||
|
@ -495,6 +495,7 @@ ps2pdf source.ps destination.pdf
|
||||||
// TODO: Un TFG preasignado sin estudiante tiene que salir un triángulo amarillo
|
// TODO: Un TFG preasignado sin estudiante tiene que salir un triángulo amarillo
|
||||||
// TODO: Hacer un nuevo rol en los TFG: tutor externo (profesor de áreas no vinculadas con el centro, profesionales de empresas, etc.)
|
// TODO: Hacer un nuevo rol en los TFG: tutor externo (profesor de áreas no vinculadas con el centro, profesionales de empresas, etc.)
|
||||||
|
|
||||||
|
Version 19.31.36: Oct 10, 2019 Code refactoring in HTML tables. (246620 lines)
|
||||||
Version 19.31.35: Oct 10, 2019 Code refactoring in HTML tables. (246629 lines)
|
Version 19.31.35: Oct 10, 2019 Code refactoring in HTML tables. (246629 lines)
|
||||||
Version 19.31.34: Oct 10, 2019 Code refactoring in HTML tables. (246628 lines)
|
Version 19.31.34: Oct 10, 2019 Code refactoring in HTML tables. (246628 lines)
|
||||||
Version 19.31.33: Oct 09, 2019 Code refactoring in HTML tables. (246688 lines)
|
Version 19.31.33: Oct 09, 2019 Code refactoring in HTML tables. (246688 lines)
|
||||||
|
|
321
swad_test.c
321
swad_test.c
File diff suppressed because it is too large
Load Diff
|
@ -1016,9 +1016,10 @@ static void TsI_WriteRowImportedQst (struct XMLElement *StemElem,
|
||||||
Gbl.RowEvenOdd = NumQst % 2;
|
Gbl.RowEvenOdd = NumQst % 2;
|
||||||
NumQst++;
|
NumQst++;
|
||||||
|
|
||||||
/***** Put icon to indicate that a question does not exist in database *****/
|
|
||||||
Tbl_StartRow ();
|
Tbl_StartRow ();
|
||||||
fprintf (Gbl.F.Out,"<td class=\"BT%u CENTER_TOP\">",Gbl.RowEvenOdd);
|
|
||||||
|
/***** Put icon to indicate that a question does not exist in database *****/
|
||||||
|
Tbl_StartCellAttr ("class=\"BT%u CENTER_TOP\"",Gbl.RowEvenOdd);
|
||||||
fprintf (Gbl.F.Out,"<img src=\"%s/%s\""
|
fprintf (Gbl.F.Out,"<img src=\"%s/%s\""
|
||||||
" alt=\"%s\" title=\"%s\""
|
" alt=\"%s\" title=\"%s\""
|
||||||
" class=\"CONTEXT_ICO_16x16\" />",
|
" class=\"CONTEXT_ICO_16x16\" />",
|
||||||
|
@ -1032,14 +1033,13 @@ static void TsI_WriteRowImportedQst (struct XMLElement *StemElem,
|
||||||
Tbl_EndCell ();
|
Tbl_EndCell ();
|
||||||
|
|
||||||
/***** Write number of question *****/
|
/***** Write number of question *****/
|
||||||
fprintf (Gbl.F.Out,"<td class=\"%s CENTER_TOP COLOR%u\">",
|
Tbl_StartCellAttr ("class=\"%s CENTER_TOP COLOR%u\"",ClassData,Gbl.RowEvenOdd);
|
||||||
ClassData,Gbl.RowEvenOdd);
|
|
||||||
if (!QuestionExists)
|
if (!QuestionExists)
|
||||||
fprintf (Gbl.F.Out,"%u ",++NumNonExistingQst);
|
fprintf (Gbl.F.Out,"%u ",++NumNonExistingQst);
|
||||||
Tbl_EndCell ();
|
Tbl_EndCell ();
|
||||||
|
|
||||||
/***** Write the question tags *****/
|
/***** Write the question tags *****/
|
||||||
fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP COLOR%u\">",Gbl.RowEvenOdd);
|
Tbl_StartCellAttr ("class=\"LEFT_TOP COLOR%u\"",Gbl.RowEvenOdd);
|
||||||
if (Gbl.Test.Tags.Num)
|
if (Gbl.Test.Tags.Num)
|
||||||
{
|
{
|
||||||
/***** Write the tags *****/
|
/***** Write the tags *****/
|
||||||
|
@ -1050,11 +1050,11 @@ static void TsI_WriteRowImportedQst (struct XMLElement *StemElem,
|
||||||
{
|
{
|
||||||
Tbl_StartRow ();
|
Tbl_StartRow ();
|
||||||
|
|
||||||
fprintf (Gbl.F.Out,"<td class=\"%s LEFT_TOP\">",ClassData);
|
Tbl_StartCellAttr ("class=\"%s LEFT_TOP\"",ClassData);
|
||||||
fprintf (Gbl.F.Out," • ");
|
fprintf (Gbl.F.Out," • ");
|
||||||
Tbl_EndCell ();
|
Tbl_EndCell ();
|
||||||
|
|
||||||
fprintf (Gbl.F.Out,"<td class=\"%s LEFT_TOP\">",ClassData);
|
Tbl_StartCellAttr ("class=\"%s LEFT_TOP\"",ClassData);
|
||||||
fprintf (Gbl.F.Out,"%s",Gbl.Test.Tags.Txt[NumTag]);
|
fprintf (Gbl.F.Out,"%s",Gbl.Test.Tags.Txt[NumTag]);
|
||||||
Tbl_EndCell ();
|
Tbl_EndCell ();
|
||||||
|
|
||||||
|
@ -1069,12 +1069,12 @@ static void TsI_WriteRowImportedQst (struct XMLElement *StemElem,
|
||||||
Tbl_EndCell ();
|
Tbl_EndCell ();
|
||||||
|
|
||||||
/***** Write the question type *****/
|
/***** Write the question type *****/
|
||||||
fprintf (Gbl.F.Out,"<td class=\"%s CENTER_TOP COLOR%u\">",ClassData,Gbl.RowEvenOdd);
|
Tbl_StartCellAttr ("class=\"%s CENTER_TOP COLOR%u\"",ClassData,Gbl.RowEvenOdd);
|
||||||
fprintf (Gbl.F.Out,"%s ",Txt_TST_STR_ANSWER_TYPES[Gbl.Test.AnswerType]);
|
fprintf (Gbl.F.Out,"%s ",Txt_TST_STR_ANSWER_TYPES[Gbl.Test.AnswerType]);
|
||||||
Tbl_EndCell ();
|
Tbl_EndCell ();
|
||||||
|
|
||||||
/***** Write if shuffle is enabled *****/
|
/***** Write if shuffle is enabled *****/
|
||||||
fprintf (Gbl.F.Out,"<td class=\"CENTER_TOP COLOR%u\">",Gbl.RowEvenOdd);
|
Tbl_StartCellAttr ("class=\"CENTER_TOP COLOR%u\"",Gbl.RowEvenOdd);
|
||||||
if (Gbl.Test.AnswerType == Tst_ANS_UNIQUE_CHOICE ||
|
if (Gbl.Test.AnswerType == Tst_ANS_UNIQUE_CHOICE ||
|
||||||
Gbl.Test.AnswerType == Tst_ANS_MULTIPLE_CHOICE)
|
Gbl.Test.AnswerType == Tst_ANS_MULTIPLE_CHOICE)
|
||||||
/* Put an icon that indicates whether shuffle is enabled or not */
|
/* Put an icon that indicates whether shuffle is enabled or not */
|
||||||
|
@ -1090,7 +1090,7 @@ static void TsI_WriteRowImportedQst (struct XMLElement *StemElem,
|
||||||
Tbl_EndCell ();
|
Tbl_EndCell ();
|
||||||
|
|
||||||
/***** Write the stem and the answers *****/
|
/***** Write the stem and the answers *****/
|
||||||
fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP COLOR%u\">",Gbl.RowEvenOdd);
|
Tbl_StartCellAttr ("class=\"LEFT_TOP COLOR%u\"",Gbl.RowEvenOdd);
|
||||||
Tst_WriteQstStem (Stem,ClassStem);
|
Tst_WriteQstStem (Stem,ClassStem);
|
||||||
Tst_WriteQstFeedback (Feedback,"TEST_EDI_LIGHT");
|
Tst_WriteQstFeedback (Feedback,"TEST_EDI_LIGHT");
|
||||||
switch (Gbl.Test.AnswerType)
|
switch (Gbl.Test.AnswerType)
|
||||||
|
@ -1143,9 +1143,10 @@ static void TsI_WriteRowImportedQst (struct XMLElement *StemElem,
|
||||||
AnswerFeedback,AnswerFeedbackLength,false);
|
AnswerFeedback,AnswerFeedbackLength,false);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Put an icon that indicates whether the answer is correct or wrong */
|
|
||||||
Tbl_StartRow ();
|
Tbl_StartRow ();
|
||||||
fprintf (Gbl.F.Out,"<td class=\"BT%u\">",Gbl.RowEvenOdd);
|
|
||||||
|
/* Put an icon that indicates whether the answer is correct or wrong */
|
||||||
|
Tbl_StartCellAttr ("class=\"BT%u\"",Gbl.RowEvenOdd);
|
||||||
if (Gbl.Test.Answer.Options[NumOpt].Correct)
|
if (Gbl.Test.Answer.Options[NumOpt].Correct)
|
||||||
fprintf (Gbl.F.Out,"<img src=\"%s/check.svg\""
|
fprintf (Gbl.F.Out,"<img src=\"%s/check.svg\""
|
||||||
" alt=\"%s\" title=\"%s\""
|
" alt=\"%s\" title=\"%s\""
|
||||||
|
@ -1158,12 +1159,12 @@ static void TsI_WriteRowImportedQst (struct XMLElement *StemElem,
|
||||||
Tbl_EndCell ();
|
Tbl_EndCell ();
|
||||||
|
|
||||||
/* Write the number of option */
|
/* Write the number of option */
|
||||||
fprintf (Gbl.F.Out,"<td class=\"%s LEFT_TOP\">",ClassData);
|
Tbl_StartCellAttr ("class=\"%s LEFT_TOP\"",ClassData);
|
||||||
fprintf (Gbl.F.Out,"%c) ",'a' + (char) NumOpt);
|
fprintf (Gbl.F.Out,"%c) ",'a' + (char) NumOpt);
|
||||||
Tbl_EndCell ();
|
Tbl_EndCell ();
|
||||||
|
|
||||||
/* Write the text and the feedback of the answer */
|
/* Write the text and the feedback of the answer */
|
||||||
fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP\">");
|
Tbl_StartCellAttr ("class=\"LEFT_TOP\"");
|
||||||
fprintf (Gbl.F.Out,"<div class=\"%s\">"
|
fprintf (Gbl.F.Out,"<div class=\"%s\">"
|
||||||
"%s"
|
"%s"
|
||||||
"</div>",
|
"</div>",
|
||||||
|
@ -1174,6 +1175,7 @@ static void TsI_WriteRowImportedQst (struct XMLElement *StemElem,
|
||||||
"</div>",
|
"</div>",
|
||||||
AnswerFeedback);
|
AnswerFeedback);
|
||||||
Tbl_EndCell ();
|
Tbl_EndCell ();
|
||||||
|
|
||||||
Tbl_EndRow ();
|
Tbl_EndRow ();
|
||||||
|
|
||||||
/* Free memory allocated for the answer and the feedback */
|
/* Free memory allocated for the answer and the feedback */
|
||||||
|
|
|
@ -1134,9 +1134,9 @@ static void TT_DrawTimeTable (void)
|
||||||
/***** Row with day names *****/
|
/***** Row with day names *****/
|
||||||
Tbl_StartRow ();
|
Tbl_StartRow ();
|
||||||
|
|
||||||
fprintf (Gbl.F.Out,"<td rowspan=\"2\" class=\"TT_HOUR_BIG RIGHT_MIDDLE\""
|
Tbl_StartCellAttr ("rowspan=\"2\" class=\"TT_HOUR_BIG RIGHT_MIDDLE\""
|
||||||
" style=\"width:%u%%;\">",
|
" style=\"width:%u%%;\">",
|
||||||
TT_PERCENT_WIDTH_OF_AN_HOUR_COLUMN);
|
TT_PERCENT_WIDTH_OF_AN_HOUR_COLUMN);
|
||||||
fprintf (Gbl.F.Out,"%02u:00",Gbl.TimeTable.Config.Range.Hours.Start);
|
fprintf (Gbl.F.Out,"%02u:00",Gbl.TimeTable.Config.Range.Hours.Start);
|
||||||
Tbl_EndCell ();
|
Tbl_EndCell ();
|
||||||
|
|
||||||
|
@ -1144,9 +1144,9 @@ static void TT_DrawTimeTable (void)
|
||||||
TT_TimeTableDrawDaysCells ();
|
TT_TimeTableDrawDaysCells ();
|
||||||
TT_DrawCellAlignTimeTable ();
|
TT_DrawCellAlignTimeTable ();
|
||||||
|
|
||||||
fprintf (Gbl.F.Out,"<td rowspan=\"2\" class=\"TT_HOUR_BIG LEFT_MIDDLE\""
|
Tbl_StartCellAttr ("rowspan=\"2\" class=\"TT_HOUR_BIG LEFT_MIDDLE\""
|
||||||
" style=\"width:%u%%;\">",
|
" style=\"width:%u%%;\">",
|
||||||
TT_PERCENT_WIDTH_OF_AN_HOUR_COLUMN);
|
TT_PERCENT_WIDTH_OF_AN_HOUR_COLUMN);
|
||||||
fprintf (Gbl.F.Out,"%02u:00",Gbl.TimeTable.Config.Range.Hours.Start);
|
fprintf (Gbl.F.Out,"%02u:00",Gbl.TimeTable.Config.Range.Hours.Start);
|
||||||
Tbl_EndCell ();
|
Tbl_EndCell ();
|
||||||
|
|
||||||
|
@ -1276,7 +1276,7 @@ static void TT_TimeTableDrawAdjustRow (void)
|
||||||
|
|
||||||
Tbl_StartRow ();
|
Tbl_StartRow ();
|
||||||
|
|
||||||
fprintf (Gbl.F.Out,"<td class=\"TT_HOURCOL\">");
|
Tbl_StartCellAttr ("class=\"TT_HOURCOL\"");
|
||||||
Tbl_EndCell ();
|
Tbl_EndCell ();
|
||||||
|
|
||||||
TT_DrawCellAlignTimeTable ();
|
TT_DrawCellAlignTimeTable ();
|
||||||
|
@ -1287,12 +1287,12 @@ static void TT_TimeTableDrawAdjustRow (void)
|
||||||
Minicolumn < TT_NUM_MINICOLUMNS_PER_DAY;
|
Minicolumn < TT_NUM_MINICOLUMNS_PER_DAY;
|
||||||
Minicolumn++)
|
Minicolumn++)
|
||||||
{
|
{
|
||||||
fprintf (Gbl.F.Out,"<td class=\"TT_MINICOL\">");
|
Tbl_StartCellAttr ("class=\"TT_MINICOL\"");
|
||||||
Tbl_EndCell ();
|
Tbl_EndCell ();
|
||||||
}
|
}
|
||||||
TT_DrawCellAlignTimeTable ();
|
TT_DrawCellAlignTimeTable ();
|
||||||
|
|
||||||
fprintf (Gbl.F.Out,"<td class=\"TT_HOURCOL\">");
|
Tbl_StartCellAttr ("class=\"TT_HOURCOL\"");
|
||||||
Tbl_EndCell ();
|
Tbl_EndCell ();
|
||||||
|
|
||||||
Tbl_EndRow ();
|
Tbl_EndRow ();
|
||||||
|
@ -1313,12 +1313,12 @@ static void TT_TimeTableDrawDaysCells (void)
|
||||||
DayColumn++)
|
DayColumn++)
|
||||||
{
|
{
|
||||||
Weekday = (DayColumn + Gbl.Prefs.FirstDayOfWeek) % 7;
|
Weekday = (DayColumn + Gbl.Prefs.FirstDayOfWeek) % 7;
|
||||||
fprintf (Gbl.F.Out,"<td colspan=\"%u\" class=\"%s CENTER_MIDDLE\""
|
Tbl_StartCellAttr ("colspan=\"%u\" class=\"%s CENTER_MIDDLE\""
|
||||||
" style=\"width:%u%%;\">",
|
" style=\"width:%u%%;\"",
|
||||||
TT_NUM_MINICOLUMNS_PER_DAY,
|
TT_NUM_MINICOLUMNS_PER_DAY,
|
||||||
Weekday == 6 ? "TT_SUNDAY" : // Sunday drawn in red
|
Weekday == 6 ? "TT_SUNDAY" : // Sunday drawn in red
|
||||||
"TT_DAY", // Monday to Saturday
|
"TT_DAY", // Monday to Saturday
|
||||||
TT_PERCENT_WIDTH_OF_A_DAY);
|
TT_PERCENT_WIDTH_OF_A_DAY);
|
||||||
fprintf (Gbl.F.Out,"%s",Txt_DAYS_CAPS[Weekday]);
|
fprintf (Gbl.F.Out,"%s",Txt_DAYS_CAPS[Weekday]);
|
||||||
Tbl_EndCell ();
|
Tbl_EndCell ();
|
||||||
}
|
}
|
||||||
|
@ -1330,10 +1330,10 @@ static void TT_TimeTableDrawDaysCells (void)
|
||||||
|
|
||||||
static void TT_TimeTableDrawHourCell (unsigned Hour,unsigned Min,const char *Align)
|
static void TT_TimeTableDrawHourCell (unsigned Hour,unsigned Min,const char *Align)
|
||||||
{
|
{
|
||||||
fprintf (Gbl.F.Out,"<td rowspan=\"2\" class=\"TT_HOUR %s %s\">",
|
Tbl_StartCellAttr ("rowspan=\"2\" class=\"TT_HOUR %s %s\"",
|
||||||
Min ? "TT_HOUR_SMALL" :
|
Min ? "TT_HOUR_SMALL" :
|
||||||
"TT_HOUR_BIG",
|
"TT_HOUR_BIG",
|
||||||
Align);
|
Align);
|
||||||
fprintf (Gbl.F.Out,"%02u:%02u",Hour,Min);
|
fprintf (Gbl.F.Out,"%02u:%02u",Hour,Min);
|
||||||
Tbl_EndCell ();
|
Tbl_EndCell ();
|
||||||
}
|
}
|
||||||
|
@ -1420,7 +1420,7 @@ static unsigned TT_CalculateColsToDrawInCell (bool TopCall,
|
||||||
|
|
||||||
static void TT_DrawCellAlignTimeTable (void)
|
static void TT_DrawCellAlignTimeTable (void)
|
||||||
{
|
{
|
||||||
fprintf (Gbl.F.Out,"<td class=\"TT_ALIGN\">");
|
Tbl_StartCellAttr ("class=\"TT_ALIGN\"");
|
||||||
Tbl_EndCell ();
|
Tbl_EndCell ();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
99
swad_user.c
99
swad_user.c
|
@ -3645,7 +3645,7 @@ void Usr_WriteRowUsrMainData (unsigned NumUsr,struct UsrData *UsrDat,
|
||||||
|
|
||||||
if (PutCheckBoxToSelectUsr)
|
if (PutCheckBoxToSelectUsr)
|
||||||
{
|
{
|
||||||
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE %s\">",BgColor);
|
Tbl_StartCellAttr ("class=\"CENTER_MIDDLE %s\"",BgColor);
|
||||||
Usr_PutCheckboxToSelectUser (Role,UsrDat->EncryptedUsrCod,UsrIsTheMsgSender);
|
Usr_PutCheckboxToSelectUser (Role,UsrDat->EncryptedUsrCod,UsrIsTheMsgSender);
|
||||||
Tbl_EndCell ();
|
Tbl_EndCell ();
|
||||||
}
|
}
|
||||||
|
@ -3667,7 +3667,7 @@ void Usr_WriteRowUsrMainData (unsigned NumUsr,struct UsrData *UsrDat,
|
||||||
Tbl_EndCell ();
|
Tbl_EndCell ();
|
||||||
|
|
||||||
/***** Write number of user in the list *****/
|
/***** Write number of user in the list *****/
|
||||||
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_MIDDLE %s\">",
|
Tbl_StartCellAttr ("class=\"%s RIGHT_MIDDLE %s\"",
|
||||||
UsrDat->Accepted ? "USR_LIST_NUM_N" :
|
UsrDat->Accepted ? "USR_LIST_NUM_N" :
|
||||||
"USR_LIST_NUM",
|
"USR_LIST_NUM",
|
||||||
BgColor);
|
BgColor);
|
||||||
|
@ -3677,7 +3677,7 @@ void Usr_WriteRowUsrMainData (unsigned NumUsr,struct UsrData *UsrDat,
|
||||||
if (Gbl.Usrs.Listing.WithPhotos)
|
if (Gbl.Usrs.Listing.WithPhotos)
|
||||||
{
|
{
|
||||||
/***** Show user's photo *****/
|
/***** Show user's photo *****/
|
||||||
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE %s\">",BgColor);
|
Tbl_StartCellAttr ("class=\"CENTER_MIDDLE %s\"",BgColor);
|
||||||
ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (UsrDat,PhotoURL);
|
ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (UsrDat,PhotoURL);
|
||||||
Pho_ShowUsrPhoto (UsrDat,ShowPhoto ? PhotoURL :
|
Pho_ShowUsrPhoto (UsrDat,ShowPhoto ? PhotoURL :
|
||||||
NULL,
|
NULL,
|
||||||
|
@ -3686,10 +3686,10 @@ void Usr_WriteRowUsrMainData (unsigned NumUsr,struct UsrData *UsrDat,
|
||||||
}
|
}
|
||||||
|
|
||||||
/****** Write user's IDs ******/
|
/****** Write user's IDs ******/
|
||||||
fprintf (Gbl.F.Out,"<td class=\"%s LEFT_MIDDLE %s\">",
|
Tbl_StartCellAttr ("class=\"%s LEFT_MIDDLE %s\"",
|
||||||
UsrDat->Accepted ? "DAT_SMALL_N" :
|
UsrDat->Accepted ? "DAT_SMALL_N" :
|
||||||
"DAT_SMALL",
|
"DAT_SMALL",
|
||||||
BgColor);
|
BgColor);
|
||||||
ID_WriteUsrIDs (UsrDat,NULL);
|
ID_WriteUsrIDs (UsrDat,NULL);
|
||||||
Tbl_EndCell ();
|
Tbl_EndCell ();
|
||||||
|
|
||||||
|
@ -3697,7 +3697,7 @@ void Usr_WriteRowUsrMainData (unsigned NumUsr,struct UsrData *UsrDat,
|
||||||
Ins.InsCod = UsrDat->InsCod;
|
Ins.InsCod = UsrDat->InsCod;
|
||||||
Ins_GetDataOfInstitutionByCod (&Ins,Ins_GET_BASIC_DATA);
|
Ins_GetDataOfInstitutionByCod (&Ins,Ins_GET_BASIC_DATA);
|
||||||
Usr_WriteMainUsrDataExceptUsrID (UsrDat,BgColor);
|
Usr_WriteMainUsrDataExceptUsrID (UsrDat,BgColor);
|
||||||
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE %s\">",BgColor);
|
Tbl_StartCellAttr ("class=\"LEFT_MIDDLE %s\"",BgColor);
|
||||||
Ins_DrawInstitutionLogoWithLink (&Ins,25);
|
Ins_DrawInstitutionLogoWithLink (&Ins,25);
|
||||||
Tbl_EndCell ();
|
Tbl_EndCell ();
|
||||||
|
|
||||||
|
@ -3723,8 +3723,7 @@ static void Usr_WriteRowGstAllData (struct UsrData *UsrDat)
|
||||||
if (Gbl.Usrs.Listing.WithPhotos)
|
if (Gbl.Usrs.Listing.WithPhotos)
|
||||||
{
|
{
|
||||||
/***** Show guest's photo *****/
|
/***** Show guest's photo *****/
|
||||||
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE COLOR%u\">",
|
Tbl_StartCellAttr ("class=\"LEFT_MIDDLE COLOR%u\"",Gbl.RowEvenOdd);
|
||||||
Gbl.RowEvenOdd);
|
|
||||||
ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (UsrDat,PhotoURL);
|
ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (UsrDat,PhotoURL);
|
||||||
Pho_ShowUsrPhoto (UsrDat,ShowPhoto ? PhotoURL :
|
Pho_ShowUsrPhoto (UsrDat,ShowPhoto ? PhotoURL :
|
||||||
NULL,
|
NULL,
|
||||||
|
@ -3733,8 +3732,7 @@ static void Usr_WriteRowGstAllData (struct UsrData *UsrDat)
|
||||||
}
|
}
|
||||||
|
|
||||||
/****** Write user's ID ******/
|
/****** Write user's ID ******/
|
||||||
fprintf (Gbl.F.Out,"<td class=\"DAT_SMALL LEFT_MIDDLE COLOR%u\">",
|
Tbl_StartCellAttr ("class=\"DAT_SMALL LEFT_MIDDLE COLOR%u\"",Gbl.RowEvenOdd);
|
||||||
Gbl.RowEvenOdd);
|
|
||||||
ID_WriteUsrIDs (UsrDat,NULL);
|
ID_WriteUsrIDs (UsrDat,NULL);
|
||||||
fprintf (Gbl.F.Out," ");
|
fprintf (Gbl.F.Out," ");
|
||||||
Tbl_EndCell ();
|
Tbl_EndCell ();
|
||||||
|
@ -3826,8 +3824,7 @@ static void Usr_WriteRowStdAllData (struct UsrData *UsrDat,char *GroupNames)
|
||||||
if (Gbl.Usrs.Listing.WithPhotos)
|
if (Gbl.Usrs.Listing.WithPhotos)
|
||||||
{
|
{
|
||||||
/***** Show student's photo *****/
|
/***** Show student's photo *****/
|
||||||
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE COLOR%u\">",
|
Tbl_StartCellAttr ("class=\"LEFT_MIDDLE COLOR%u\"",Gbl.RowEvenOdd);
|
||||||
Gbl.RowEvenOdd);
|
|
||||||
ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (UsrDat,PhotoURL);
|
ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (UsrDat,PhotoURL);
|
||||||
Pho_ShowUsrPhoto (UsrDat,ShowPhoto ? PhotoURL :
|
Pho_ShowUsrPhoto (UsrDat,ShowPhoto ? PhotoURL :
|
||||||
NULL,
|
NULL,
|
||||||
|
@ -3836,10 +3833,10 @@ static void Usr_WriteRowStdAllData (struct UsrData *UsrDat,char *GroupNames)
|
||||||
}
|
}
|
||||||
|
|
||||||
/****** Write user's ID ******/
|
/****** Write user's ID ******/
|
||||||
fprintf (Gbl.F.Out,"<td class=\"%s LEFT_MIDDLE COLOR%u\">",
|
Tbl_StartCellAttr ("class=\"%s LEFT_MIDDLE COLOR%u\"",
|
||||||
UsrDat->Accepted ? "DAT_SMALL_N" :
|
UsrDat->Accepted ? "DAT_SMALL_N" :
|
||||||
"DAT_SMALL",
|
"DAT_SMALL",
|
||||||
Gbl.RowEvenOdd);
|
Gbl.RowEvenOdd);
|
||||||
ID_WriteUsrIDs (UsrDat,NULL);
|
ID_WriteUsrIDs (UsrDat,NULL);
|
||||||
fprintf (Gbl.F.Out," ");
|
fprintf (Gbl.F.Out," ");
|
||||||
Tbl_EndCell ();
|
Tbl_EndCell ();
|
||||||
|
@ -3946,8 +3943,7 @@ static void Usr_WriteRowTchAllData (struct UsrData *UsrDat)
|
||||||
if (Gbl.Usrs.Listing.WithPhotos)
|
if (Gbl.Usrs.Listing.WithPhotos)
|
||||||
{
|
{
|
||||||
/***** Show teacher's photo *****/
|
/***** Show teacher's photo *****/
|
||||||
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE COLOR%u\">",
|
Tbl_StartCellAttr ("class=\"LEFT_MIDDLE COLOR%u\"",Gbl.RowEvenOdd);
|
||||||
Gbl.RowEvenOdd);
|
|
||||||
ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (UsrDat,PhotoURL);
|
ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (UsrDat,PhotoURL);
|
||||||
Pho_ShowUsrPhoto (UsrDat,ShowPhoto ? PhotoURL :
|
Pho_ShowUsrPhoto (UsrDat,ShowPhoto ? PhotoURL :
|
||||||
NULL,
|
NULL,
|
||||||
|
@ -3956,10 +3952,10 @@ static void Usr_WriteRowTchAllData (struct UsrData *UsrDat)
|
||||||
}
|
}
|
||||||
|
|
||||||
/****** Write the user's ID ******/
|
/****** Write the user's ID ******/
|
||||||
fprintf (Gbl.F.Out,"<td class=\"%s LEFT_MIDDLE COLOR%u\">",
|
Tbl_StartCellAttr ("class=\"%s LEFT_MIDDLE COLOR%u\"",
|
||||||
UsrDat->Accepted ? "DAT_SMALL_N" :
|
UsrDat->Accepted ? "DAT_SMALL_N" :
|
||||||
"DAT_SMALL",
|
"DAT_SMALL",
|
||||||
Gbl.RowEvenOdd);
|
Gbl.RowEvenOdd);
|
||||||
ID_WriteUsrIDs (UsrDat,NULL);
|
ID_WriteUsrIDs (UsrDat,NULL);
|
||||||
fprintf (Gbl.F.Out," ");
|
fprintf (Gbl.F.Out," ");
|
||||||
Tbl_EndCell ();
|
Tbl_EndCell ();
|
||||||
|
@ -4018,14 +4014,14 @@ static void Usr_WriteRowAdmData (unsigned NumUsr,struct UsrData *UsrDat)
|
||||||
Tbl_StartRow ();
|
Tbl_StartRow ();
|
||||||
|
|
||||||
/***** Write number of user *****/
|
/***** Write number of user *****/
|
||||||
fprintf (Gbl.F.Out,"<td class=\"USR_LIST_NUM_N CENTER_MIDDLE COLOR%u\">",Gbl.RowEvenOdd);
|
Tbl_StartCellAttr ("class=\"USR_LIST_NUM_N CENTER_MIDDLE COLOR%u\"",Gbl.RowEvenOdd);
|
||||||
fprintf (Gbl.F.Out,"%u",NumUsr);
|
fprintf (Gbl.F.Out,"%u",NumUsr);
|
||||||
Tbl_EndCell ();
|
Tbl_EndCell ();
|
||||||
|
|
||||||
if (Gbl.Usrs.Listing.WithPhotos)
|
if (Gbl.Usrs.Listing.WithPhotos)
|
||||||
{
|
{
|
||||||
/***** Show administrator's photo *****/
|
/***** Show administrator's photo *****/
|
||||||
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE COLOR%u\">",Gbl.RowEvenOdd);
|
Tbl_StartCellAttr ("class=\"LEFT_MIDDLE COLOR%u\"",Gbl.RowEvenOdd);
|
||||||
ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (UsrDat,PhotoURL);
|
ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (UsrDat,PhotoURL);
|
||||||
Pho_ShowUsrPhoto (UsrDat,ShowPhoto ? PhotoURL :
|
Pho_ShowUsrPhoto (UsrDat,ShowPhoto ? PhotoURL :
|
||||||
NULL,
|
NULL,
|
||||||
|
@ -4034,10 +4030,10 @@ static void Usr_WriteRowAdmData (unsigned NumUsr,struct UsrData *UsrDat)
|
||||||
}
|
}
|
||||||
|
|
||||||
/****** Write the user's ID ******/
|
/****** Write the user's ID ******/
|
||||||
fprintf (Gbl.F.Out,"<td class=\"%s LEFT_MIDDLE COLOR%u\">",
|
Tbl_StartCellAttr ("class=\"%s LEFT_MIDDLE COLOR%u\"",
|
||||||
UsrDat->Accepted ? "DAT_SMALL_N" :
|
UsrDat->Accepted ? "DAT_SMALL_N" :
|
||||||
"DAT_SMALL",
|
"DAT_SMALL",
|
||||||
Gbl.RowEvenOdd);
|
Gbl.RowEvenOdd);
|
||||||
ID_WriteUsrIDs (UsrDat,NULL);
|
ID_WriteUsrIDs (UsrDat,NULL);
|
||||||
fprintf (Gbl.F.Out," ");
|
fprintf (Gbl.F.Out," ");
|
||||||
Tbl_EndCell ();
|
Tbl_EndCell ();
|
||||||
|
@ -4046,7 +4042,8 @@ static void Usr_WriteRowAdmData (unsigned NumUsr,struct UsrData *UsrDat)
|
||||||
Ins.InsCod = UsrDat->InsCod;
|
Ins.InsCod = UsrDat->InsCod;
|
||||||
Ins_GetDataOfInstitutionByCod (&Ins,Ins_GET_BASIC_DATA);
|
Ins_GetDataOfInstitutionByCod (&Ins,Ins_GET_BASIC_DATA);
|
||||||
Usr_WriteMainUsrDataExceptUsrID (UsrDat,Gbl.ColorRows[Gbl.RowEvenOdd]);
|
Usr_WriteMainUsrDataExceptUsrID (UsrDat,Gbl.ColorRows[Gbl.RowEvenOdd]);
|
||||||
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE %s\">",Gbl.ColorRows[Gbl.RowEvenOdd]);
|
|
||||||
|
Tbl_StartCellAttr ("class=\"LEFT_MIDDLE %s\"",Gbl.ColorRows[Gbl.RowEvenOdd]);
|
||||||
Ins_DrawInstitutionLogoWithLink (&Ins,25);
|
Ins_DrawInstitutionLogoWithLink (&Ins,25);
|
||||||
Tbl_EndCell ();
|
Tbl_EndCell ();
|
||||||
Tbl_EndRow ();
|
Tbl_EndRow ();
|
||||||
|
@ -4115,12 +4112,12 @@ static void Usr_WriteUsrData (const char *BgColor,
|
||||||
bool NonBreak,bool Accepted)
|
bool NonBreak,bool Accepted)
|
||||||
{
|
{
|
||||||
/***** Start table cell *****/
|
/***** Start table cell *****/
|
||||||
fprintf (Gbl.F.Out,"<td class=\"%s LEFT_MIDDLE %s\">",
|
Tbl_StartCellAttr ("class=\"%s LEFT_MIDDLE %s\"",
|
||||||
Accepted ? (NonBreak ? "DAT_SMALL_NOBR_N" :
|
Accepted ? (NonBreak ? "DAT_SMALL_NOBR_N" :
|
||||||
"DAT_SMALL_N") :
|
"DAT_SMALL_N") :
|
||||||
(NonBreak ? "DAT_SMALL_NOBR" :
|
(NonBreak ? "DAT_SMALL_NOBR" :
|
||||||
"DAT_SMALL"),
|
"DAT_SMALL"),
|
||||||
BgColor);
|
BgColor);
|
||||||
|
|
||||||
/***** Container to limit length *****/
|
/***** Container to limit length *****/
|
||||||
fprintf (Gbl.F.Out,"<div class=\"USR_DAT\">");
|
fprintf (Gbl.F.Out,"<div class=\"USR_DAT\">");
|
||||||
|
@ -6556,8 +6553,8 @@ static void Usr_ListMainDataStds (bool PutCheckBoxToSelectUsr)
|
||||||
if (!Gbl.Usrs.ClassPhoto.AllGroups)
|
if (!Gbl.Usrs.ClassPhoto.AllGroups)
|
||||||
{
|
{
|
||||||
Tbl_StartRow ();
|
Tbl_StartRow ();
|
||||||
fprintf (Gbl.F.Out,"<td colspan=\"%u\" class=\"TIT CENTER_MIDDLE\">",
|
Tbl_StartCellAttr ("colspan=\"%u\" class=\"TIT CENTER_MIDDLE\"",
|
||||||
1 + Usr_NUM_MAIN_FIELDS_DATA_USR);
|
1 + Usr_NUM_MAIN_FIELDS_DATA_USR);
|
||||||
Grp_WriteNamesOfSelectedGrps ();
|
Grp_WriteNamesOfSelectedGrps ();
|
||||||
Tbl_EndCell ();
|
Tbl_EndCell ();
|
||||||
Tbl_EndRow ();
|
Tbl_EndRow ();
|
||||||
|
@ -6885,8 +6882,8 @@ void Usr_ListAllDataStds (void)
|
||||||
if (!Gbl.Usrs.ClassPhoto.AllGroups)
|
if (!Gbl.Usrs.ClassPhoto.AllGroups)
|
||||||
{
|
{
|
||||||
Tbl_StartRow ();
|
Tbl_StartRow ();
|
||||||
fprintf (Gbl.F.Out,"<td colspan=\"%u\" class=\"TIT CENTER_MIDDLE\">",
|
Tbl_StartCellAttr ("colspan=\"%u\" class=\"TIT CENTER_MIDDLE\"",
|
||||||
NumColumnsTotal);
|
NumColumnsTotal);
|
||||||
Grp_WriteNamesOfSelectedGrps ();
|
Grp_WriteNamesOfSelectedGrps ();
|
||||||
Tbl_EndCell ();
|
Tbl_EndCell ();
|
||||||
Tbl_EndRow ();
|
Tbl_EndRow ();
|
||||||
|
@ -6939,7 +6936,7 @@ void Usr_ListAllDataStds (void)
|
||||||
NumCol++)
|
NumCol++)
|
||||||
if (NumCol != 1 || Gbl.Usrs.Listing.WithPhotos) // Skip photo column if I don't want it in listing
|
if (NumCol != 1 || Gbl.Usrs.Listing.WithPhotos) // Skip photo column if I don't want it in listing
|
||||||
{
|
{
|
||||||
fprintf (Gbl.F.Out,"<td class=\"VERY_LIGHT_BLUE\">");
|
Tbl_StartCellAttr ("class=\"VERY_LIGHT_BLUE\"");
|
||||||
Tbl_EndCell ();
|
Tbl_EndCell ();
|
||||||
}
|
}
|
||||||
for (NumField = 0;
|
for (NumField = 0;
|
||||||
|
@ -7242,12 +7239,12 @@ unsigned Usr_ListUsrsFound (Rol_Role_t Role,
|
||||||
{
|
{
|
||||||
Tbl_StartRow ();
|
Tbl_StartRow ();
|
||||||
|
|
||||||
fprintf (Gbl.F.Out,"<td colspan=\"2\" class=\"COLOR%u\">",Gbl.RowEvenOdd);
|
Tbl_StartCellAttr ("colspan=\"2\" class=\"COLOR%u\"",Gbl.RowEvenOdd);
|
||||||
Tbl_EndCell ();
|
Tbl_EndCell ();
|
||||||
|
|
||||||
fprintf (Gbl.F.Out,"<td colspan=\"%u\" class=\"COLOR%u\">",
|
Tbl_StartCellAttr ("colspan=\"%u\" class=\"COLOR%u\"",
|
||||||
Usr_NUM_MAIN_FIELDS_DATA_USR-2,
|
Usr_NUM_MAIN_FIELDS_DATA_USR-2,
|
||||||
Gbl.RowEvenOdd);
|
Gbl.RowEvenOdd);
|
||||||
if (Role == Rol_UNK)
|
if (Role == Rol_UNK)
|
||||||
{
|
{
|
||||||
Crs_GetAndWriteCrssOfAUsr (&UsrDat,Rol_TCH);
|
Crs_GetAndWriteCrssOfAUsr (&UsrDat,Rol_TCH);
|
||||||
|
@ -9747,10 +9744,10 @@ void Usr_ShowTableCellWithUsrData (struct UsrData *UsrDat,unsigned NumRows)
|
||||||
|
|
||||||
/***** Show user's photo and name *****/
|
/***** Show user's photo and name *****/
|
||||||
if (NumRows)
|
if (NumRows)
|
||||||
fprintf (Gbl.F.Out,"<td rowspan=\"%u\" class=\"LEFT_TOP COLOR%u\">",
|
Tbl_StartCellAttr ("rowspan=\"%u\" class=\"LEFT_TOP COLOR%u\"",
|
||||||
NumRows + 1,Gbl.RowEvenOdd);
|
NumRows + 1,Gbl.RowEvenOdd);
|
||||||
else
|
else
|
||||||
fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP COLOR%u\">",Gbl.RowEvenOdd);
|
Tbl_StartCellAttr ("class=\"LEFT_TOP COLOR%u\"",Gbl.RowEvenOdd);
|
||||||
ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (UsrDat,PhotoURL);
|
ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (UsrDat,PhotoURL);
|
||||||
Pho_ShowUsrPhoto (UsrDat,ShowPhoto ? PhotoURL :
|
Pho_ShowUsrPhoto (UsrDat,ShowPhoto ? PhotoURL :
|
||||||
NULL,
|
NULL,
|
||||||
|
@ -9759,10 +9756,10 @@ void Usr_ShowTableCellWithUsrData (struct UsrData *UsrDat,unsigned NumRows)
|
||||||
|
|
||||||
/***** Start form to go to user's record card *****/
|
/***** Start form to go to user's record card *****/
|
||||||
if (NumRows)
|
if (NumRows)
|
||||||
fprintf (Gbl.F.Out,"<td rowspan=\"%u\" class=\"LEFT_TOP COLOR%u\">",
|
Tbl_StartCellAttr ("rowspan=\"%u\" class=\"LEFT_TOP COLOR%u\"",
|
||||||
NumRows + 1,Gbl.RowEvenOdd);
|
NumRows + 1,Gbl.RowEvenOdd);
|
||||||
else
|
else
|
||||||
fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP COLOR%u\">",Gbl.RowEvenOdd);
|
Tbl_StartCellAttr ("class=\"LEFT_TOP COLOR%u\"",Gbl.RowEvenOdd);
|
||||||
switch (UsrDat->Roles.InCurrentCrs.Role)
|
switch (UsrDat->Roles.InCurrentCrs.Role)
|
||||||
{
|
{
|
||||||
case Rol_STD:
|
case Rol_STD:
|
||||||
|
|
10
swad_zip.c
10
swad_zip.c
|
@ -568,7 +568,7 @@ static void ZIP_ShowLinkToDownloadZIP (const char *FileName,const char *URL,
|
||||||
|
|
||||||
/***** Link to download the file *****/
|
/***** Link to download the file *****/
|
||||||
Tbl_StartRow ();
|
Tbl_StartRow ();
|
||||||
fprintf (Gbl.F.Out,"<td colspan=\"2\" class=\"FILENAME_TXT CENTER_MIDDLE\">");
|
Tbl_StartCellAttr ("colspan=\"2\" class=\"FILENAME_TXT CENTER_MIDDLE\"");
|
||||||
fprintf (Gbl.F.Out,"<a href=\"%s\" class=\"FILENAME_TXT\" title=\"%s\" target=\"_blank\">"
|
fprintf (Gbl.F.Out,"<a href=\"%s\" class=\"FILENAME_TXT\" title=\"%s\" target=\"_blank\">"
|
||||||
"<img src=\"%s32x32/zip32x32.gif\""
|
"<img src=\"%s32x32/zip32x32.gif\""
|
||||||
" alt=\"%s\" title=\"%s\""
|
" alt=\"%s\" title=\"%s\""
|
||||||
|
@ -592,11 +592,11 @@ static void ZIP_ShowLinkToDownloadZIP (const char *FileName,const char *URL,
|
||||||
/***** Filename *****/
|
/***** Filename *****/
|
||||||
Tbl_StartRow ();
|
Tbl_StartRow ();
|
||||||
|
|
||||||
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_MIDDLE\">",The_ClassFormInBox[Gbl.Prefs.Theme]);
|
Tbl_StartCellAttr ("class=\"%s RIGHT_MIDDLE\"",The_ClassFormInBox[Gbl.Prefs.Theme]);
|
||||||
fprintf (Gbl.F.Out,"%s:",Txt_Filename);
|
fprintf (Gbl.F.Out,"%s:",Txt_Filename);
|
||||||
Tbl_EndCell ();
|
Tbl_EndCell ();
|
||||||
|
|
||||||
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_MIDDLE\">");
|
Tbl_StartCellAttr ("class=\"DAT LEFT_MIDDLE\"");
|
||||||
fprintf (Gbl.F.Out,"<a href=\"%s\" class=\"DAT\" title=\"%s\" target=\"_blank\">"
|
fprintf (Gbl.F.Out,"<a href=\"%s\" class=\"DAT\" title=\"%s\" target=\"_blank\">"
|
||||||
"%s"
|
"%s"
|
||||||
"</a>",
|
"</a>",
|
||||||
|
@ -609,11 +609,11 @@ static void ZIP_ShowLinkToDownloadZIP (const char *FileName,const char *URL,
|
||||||
Fil_WriteFileSizeFull ((double) FileSize,FileSizeStr);
|
Fil_WriteFileSizeFull ((double) FileSize,FileSizeStr);
|
||||||
Tbl_StartRow ();
|
Tbl_StartRow ();
|
||||||
|
|
||||||
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_MIDDLE\">",The_ClassFormInBox[Gbl.Prefs.Theme]);
|
Tbl_StartCellAttr ("class=\"%s RIGHT_MIDDLE\"",The_ClassFormInBox[Gbl.Prefs.Theme]);
|
||||||
fprintf (Gbl.F.Out,"%s:",Txt_File_size);
|
fprintf (Gbl.F.Out,"%s:",Txt_File_size);
|
||||||
Tbl_EndCell ();
|
Tbl_EndCell ();
|
||||||
|
|
||||||
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_MIDDLE\">");
|
Tbl_StartCellAttr ("class=\"DAT LEFT_MIDDLE\"");
|
||||||
fprintf (Gbl.F.Out,"%s",FileSizeStr);
|
fprintf (Gbl.F.Out,"%s",FileSizeStr);
|
||||||
if (UncompressedSize)
|
if (UncompressedSize)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue