Marown/swad-core
Marown/swad-core
1
0
Fork 0
mirror of https://github.com/acanas/swad-core.git synced 2024-06-08 17:55:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version19.31.35

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2019-10-10 01:01:16 +02:00
parent 1447812e01
commit 7fe0920f74
3 changed files with 67 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
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.31.34 (2019-10-10)" #define Log_PLATFORM_VERSION "SWAD 19.31.35 (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.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)
Version 19.31.32: Oct 09, 2019 Code refactoring in HTML tables. (246718 lines) Version 19.31.32: Oct 09, 2019 Code refactoring in HTML tables. (246718 lines)

84
swad_survey.c
View File

@ -463,9 +463,9 @@ static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst,
/* Forms to remove/edit this assignment */ /* Forms to remove/edit this assignment */
if (ShowOnlyThisSvyComplete) if (ShowOnlyThisSvyComplete)
fprintf (Gbl.F.Out,"<td rowspan=\"2\" class=\"CONTEXT_COL\">"); Tbl_StartCellAttr ("rowspan=\"2\" class=\"CONTEXT_COL\"");
else else
fprintf (Gbl.F.Out,"<td rowspan=\"2\" class=\"CONTEXT_COL COLOR%u\">",Gbl.RowEvenOdd); Tbl_StartCellAttr ("rowspan=\"2\" class=\"CONTEXT_COL COLOR%u\"",Gbl.RowEvenOdd);
if (Svy.Status.ICanEdit) if (Svy.Status.ICanEdit)
Svy_PutFormsToRemEditOneSvy (&Svy,Anchor); Svy_PutFormsToRemEditOneSvy (&Svy,Anchor);
Tbl_EndCell (); Tbl_EndCell ();
@ -473,14 +473,14 @@ static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst,
/* Start date/time */ /* Start date/time */
UniqueId++; UniqueId++;
if (ShowOnlyThisSvyComplete) if (ShowOnlyThisSvyComplete)
fprintf (Gbl.F.Out,"<td id=\"svy_date_start_%u\" class=\"%s LEFT_TOP\">", Tbl_StartCellAttr ("id=\"svy_date_start_%u\" class=\"%s LEFT_TOP\"",
UniqueId, UniqueId,
Svy.Status.Visible ? (Svy.Status.Open ? "DATE_GREEN" : Svy.Status.Visible ? (Svy.Status.Open ? "DATE_GREEN" :
"DATE_RED") : "DATE_RED") :
(Svy.Status.Open ? "DATE_GREEN_LIGHT" : (Svy.Status.Open ? "DATE_GREEN_LIGHT" :
"DATE_RED_LIGHT")); "DATE_RED_LIGHT"));
else else
fprintf (Gbl.F.Out,"<td id=\"svy_date_start_%u\" class=\"%s LEFT_TOP COLOR%u\">", Tbl_StartCellAttr ("id=\"svy_date_start_%u\" class=\"%s LEFT_TOP COLOR%u\"",
UniqueId, UniqueId,
Svy.Status.Visible ? (Svy.Status.Open ? "DATE_GREEN" : Svy.Status.Visible ? (Svy.Status.Open ? "DATE_GREEN" :
"DATE_RED") : "DATE_RED") :
@ -497,14 +497,14 @@ static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst,
/* End date/time */ /* End date/time */
if (ShowOnlyThisSvyComplete) if (ShowOnlyThisSvyComplete)
fprintf (Gbl.F.Out,"<td id=\"svy_date_end_%u\" class=\"%s LEFT_TOP\">", Tbl_StartCellAttr ("id=\"svy_date_end_%u\" class=\"%s LEFT_TOP\"",
UniqueId, UniqueId,
Svy.Status.Visible ? (Svy.Status.Open ? "DATE_GREEN" : Svy.Status.Visible ? (Svy.Status.Open ? "DATE_GREEN" :
"DATE_RED") : "DATE_RED") :
(Svy.Status.Open ? "DATE_GREEN_LIGHT" : (Svy.Status.Open ? "DATE_GREEN_LIGHT" :
"DATE_RED_LIGHT")); "DATE_RED_LIGHT"));
else else
fprintf (Gbl.F.Out,"<td id=\"svy_date_end_%u\" class=\"%s LEFT_TOP COLOR%u\">", Tbl_StartCellAttr ("id=\"svy_date_end_%u\" class=\"%s LEFT_TOP COLOR%u\"",
UniqueId, UniqueId,
Svy.Status.Visible ? (Svy.Status.Open ? "DATE_GREEN" : Svy.Status.Visible ? (Svy.Status.Open ? "DATE_GREEN" :
"DATE_RED") : "DATE_RED") :
@ -521,9 +521,9 @@ static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst,
/* Survey title */ /* Survey title */
if (ShowOnlyThisSvyComplete) if (ShowOnlyThisSvyComplete)
fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP\">"); Tbl_StartCellAttr ("class=\"LEFT_TOP\"");
else else
fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP COLOR%u\">",Gbl.RowEvenOdd); Tbl_StartCellAttr ("class=\"LEFT_TOP COLOR%u\"",Gbl.RowEvenOdd);
Lay_StartArticle (Anchor); Lay_StartArticle (Anchor);
Frm_StartForm (ActSeeSvy); Frm_StartForm (ActSeeSvy);
Svy_PutParamSvyCod (SvyCod); Svy_PutParamSvyCod (SvyCod);
@ -550,9 +550,9 @@ static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst,
/* Status of the survey */ /* Status of the survey */
if (ShowOnlyThisSvyComplete) if (ShowOnlyThisSvyComplete)
fprintf (Gbl.F.Out,"<td rowspan=\"2\" class=\"LEFT_TOP\">"); Tbl_StartCellAttr ("rowspan=\"2\" class=\"LEFT_TOP\"");
else else
fprintf (Gbl.F.Out,"<td rowspan=\"2\" class=\"LEFT_TOP COLOR%u\">",Gbl.RowEvenOdd); Tbl_StartCellAttr ("rowspan=\"2\" class=\"LEFT_TOP COLOR%u\"",Gbl.RowEvenOdd);
Svy_WriteStatus (&Svy); Svy_WriteStatus (&Svy);
if (!ShowOnlyThisSvyComplete) if (!ShowOnlyThisSvyComplete)
@ -597,16 +597,16 @@ static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst,
/* Author of the survey */ /* Author of the survey */
if (ShowOnlyThisSvyComplete) if (ShowOnlyThisSvyComplete)
fprintf (Gbl.F.Out,"<td colspan=\"2\" class=\"LEFT_TOP\">"); Tbl_StartCellAttr ("colspan=\"2\" class=\"LEFT_TOP\"");
else else
fprintf (Gbl.F.Out,"<td colspan=\"2\" class=\"LEFT_TOP COLOR%u\">",Gbl.RowEvenOdd); Tbl_StartCellAttr ("colspan=\"2\" class=\"LEFT_TOP COLOR%u\"",Gbl.RowEvenOdd);
Svy_WriteAuthor (&Svy); Svy_WriteAuthor (&Svy);
Tbl_EndCell (); Tbl_EndCell ();
if (ShowOnlyThisSvyComplete) if (ShowOnlyThisSvyComplete)
fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP\">"); Tbl_StartCellAttr ("class=\"LEFT_TOP\"");
else else
fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP COLOR%u\">",Gbl.RowEvenOdd); Tbl_StartCellAttr ("class=\"LEFT_TOP COLOR%u\"",Gbl.RowEvenOdd);
Tbl_EndCell (); Tbl_EndCell ();
/* Scope of the survey */ /* Scope of the survey */
@ -680,7 +680,7 @@ static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst,
if (ShowOnlyThisSvyComplete) if (ShowOnlyThisSvyComplete)
{ {
Tbl_StartRow (); Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td colspan=\"5\">"); Tbl_StartCellAttr ("colspan=\"5\"");
Svy_ListSvyQuestions (&Svy,SvyQst); Svy_ListSvyQuestions (&Svy,SvyQst);
Tbl_EndCell (); Tbl_EndCell ();
Tbl_EndRow (); Tbl_EndRow ();
@ -1874,13 +1874,13 @@ void Svy_RequestCreatOrEditSvy (void)
/***** Scope of the survey *****/ /***** Scope of the survey *****/
Tbl_StartRow (); Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"RIGHT_MIDDLE\">"); Tbl_StartCellAttr ("class=\"RIGHT_MIDDLE\"");
fprintf (Gbl.F.Out,"<label for=\"ScopeSvy\" class=\"%s\">%s:</label>", fprintf (Gbl.F.Out,"<label for=\"ScopeSvy\" class=\"%s\">%s:</label>",
The_ClassFormInBox[Gbl.Prefs.Theme], The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Scope); Txt_Scope);
Tbl_EndCell (); Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">"); Tbl_StartCellAttr ("class=\"LEFT_MIDDLE\"");
Svy_SetDefaultAndAllowedScope (&Svy); Svy_SetDefaultAndAllowedScope (&Svy);
Sco_GetScope ("ScopeSvy"); Sco_GetScope ("ScopeSvy");
Sco_PutSelectorScope ("ScopeSvy",false); Sco_PutSelectorScope ("ScopeSvy",false);
@ -1891,13 +1891,13 @@ void Svy_RequestCreatOrEditSvy (void)
/***** Survey title *****/ /***** Survey title *****/
Tbl_StartRow (); Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"RIGHT_MIDDLE\">"); Tbl_StartCellAttr ("class=\"RIGHT_MIDDLE\"");
fprintf (Gbl.F.Out,"<label for=\"Title\" class=\"%s\">%s:</label>", fprintf (Gbl.F.Out,"<label for=\"Title\" class=\"%s\">%s:</label>",
The_ClassFormInBox[Gbl.Prefs.Theme], The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Title); Txt_Title);
Tbl_EndCell (); Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">"); Tbl_StartCellAttr ("class=\"LEFT_MIDDLE\"");
fprintf (Gbl.F.Out,"<input type=\"text\" id=\"Title\" name=\"Title\"" fprintf (Gbl.F.Out,"<input type=\"text\" id=\"Title\" name=\"Title\""
" size=\"45\" maxlength=\"%u\" value=\"%s\"" " size=\"45\" maxlength=\"%u\" value=\"%s\""
" required=\"required\" />", " required=\"required\" />",
@ -1912,13 +1912,13 @@ void Svy_RequestCreatOrEditSvy (void)
/***** Survey text *****/ /***** Survey text *****/
Tbl_StartRow (); Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"RIGHT_TOP\">"); Tbl_StartCellAttr ("class=\"RIGHT_TOP\"");
fprintf (Gbl.F.Out,"<label for=\"Txt\" class=\"%s\">%s:</label>", fprintf (Gbl.F.Out,"<label for=\"Txt\" class=\"%s\">%s:</label>",
The_ClassFormInBox[Gbl.Prefs.Theme], The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Description); Txt_Description);
Tbl_EndCell (); Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP\">"); Tbl_StartCellAttr ("class=\"LEFT_TOP\"");
fprintf (Gbl.F.Out,"<textarea id=\"Txt\" name=\"Txt\"" fprintf (Gbl.F.Out,"<textarea id=\"Txt\" name=\"Txt\""
" cols=\"60\" rows=\"10\">"); " cols=\"60\" rows=\"10\">");
if (!ItsANewSurvey) if (!ItsANewSurvey)
@ -1931,11 +1931,11 @@ void Svy_RequestCreatOrEditSvy (void)
/***** Users' roles who can answer the survey *****/ /***** Users' roles who can answer the survey *****/
Tbl_StartRow (); Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"RIGHT_TOP %s\">",The_ClassFormInBox[Gbl.Prefs.Theme]); Tbl_StartCellAttr ("class=\"RIGHT_TOP %s\"",The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Users); fprintf (Gbl.F.Out,"%s:",Txt_Users);
Tbl_EndCell (); Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_MIDDLE\">"); Tbl_StartCellAttr ("class=\"DAT LEFT_MIDDLE\"");
Rol_WriteSelectorRoles (1 << Rol_STD | Rol_WriteSelectorRoles (1 << Rol_STD |
1 << Rol_NET | 1 << Rol_NET |
1 << Rol_TCH, 1 << Rol_TCH,
@ -2063,18 +2063,18 @@ static void Svy_ShowLstGrpsToEditSurvey (long SvyCod)
/***** Start box and table *****/ /***** Start box and table *****/
Tbl_StartRow (); Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_TOP\">",The_ClassFormInBox[Gbl.Prefs.Theme]); Tbl_StartCellAttr ("class=\"%s RIGHT_TOP\"",The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Groups); fprintf (Gbl.F.Out,"%s:",Txt_Groups);
Tbl_EndCell (); Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP\">"); Tbl_StartCellAttr ("class=\"LEFT_TOP\"");
Box_StartBoxTable ("95%",NULL,NULL, Box_StartBoxTable ("95%",NULL,NULL,
NULL,Box_NOT_CLOSABLE,0); NULL,Box_NOT_CLOSABLE,0);
/***** First row: checkbox to select the whole course *****/ /***** First row: checkbox to select the whole course *****/
Tbl_StartRow (); Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td colspan=\"7\" class=\"DAT LEFT_MIDDLE\">"); Tbl_StartCellAttr ("colspan=\"7\" class=\"DAT LEFT_MIDDLE\"");
fprintf (Gbl.F.Out,"<label>" fprintf (Gbl.F.Out,"<label>"
"<input type=\"checkbox\"" "<input type=\"checkbox\""
" id=\"WholeCrs\" name=\"WholeCrs\" value=\"Y\""); " id=\"WholeCrs\" name=\"WholeCrs\" value=\"Y\"");
@ -2708,12 +2708,12 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst,
/***** Stem *****/ /***** Stem *****/
Tbl_StartRow (); Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"RIGHT_TOP\">"); Tbl_StartCellAttr ("class=\"RIGHT_TOP\"");
fprintf (Gbl.F.Out,"<label for=\"Txt\" class=\"%s\">%s:</label>", fprintf (Gbl.F.Out,"<label for=\"Txt\" class=\"%s\">%s:</label>",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Wording); The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Wording);
Tbl_EndCell (); Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP\">"); Tbl_StartCellAttr ("class=\"LEFT_TOP\"");
fprintf (Gbl.F.Out,"<textarea id=\"Txt\" name=\"Txt\" cols=\"60\" rows=\"4\">" fprintf (Gbl.F.Out,"<textarea id=\"Txt\" name=\"Txt\" cols=\"60\" rows=\"4\">"
"%s" "%s"
"</textarea>", "</textarea>",
@ -2725,11 +2725,11 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst,
/***** Type of answer *****/ /***** Type of answer *****/
Tbl_StartRow (); Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_TOP\">",The_ClassFormInBox[Gbl.Prefs.Theme]); Tbl_StartCellAttr ("class=\"%s RIGHT_TOP\"",The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Type); fprintf (Gbl.F.Out,"%s:",Txt_Type);
Tbl_EndCell (); Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"%s LEFT_TOP\">",The_ClassFormInBox[Gbl.Prefs.Theme]); Tbl_StartCellAttr ("class=\"%s LEFT_TOP\"",The_ClassFormInBox[Gbl.Prefs.Theme]);
for (AnsType = (Svy_AnswerType_t) 0; for (AnsType = (Svy_AnswerType_t) 0;
AnsType < Svy_NUM_ANS_TYPES; AnsType < Svy_NUM_ANS_TYPES;
AnsType++) AnsType++)
@ -2755,7 +2755,7 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst,
Tbl_PutEmptyCells (1); Tbl_PutEmptyCells (1);
/* Unique or multiple choice answers */ /* Unique or multiple choice answers */
fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP\">"); Tbl_StartCellAttr ("class=\"LEFT_TOP\"");
Tbl_StartTablePadding (2); Tbl_StartTablePadding (2);
for (NumAns = 0; for (NumAns = 0;
NumAns < Svy_MAX_ANSWERS_PER_QUESTION; NumAns < Svy_MAX_ANSWERS_PER_QUESTION;
@ -2764,13 +2764,13 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst,
Tbl_StartRow (); Tbl_StartRow ();
/* Label with the number of the answer */ /* Label with the number of the answer */
fprintf (Gbl.F.Out,"<td class=\"RIGHT_TOP\">"); Tbl_StartCellAttr ("class=\"RIGHT_TOP\"");
fprintf (Gbl.F.Out,"<label for=\"AnsStr%u\" class=\"%s\">%u)</label>", fprintf (Gbl.F.Out,"<label for=\"AnsStr%u\" class=\"%s\">%u)</label>",
NumAns,The_ClassFormInBox[Gbl.Prefs.Theme],NumAns + 1); NumAns,The_ClassFormInBox[Gbl.Prefs.Theme],NumAns + 1);
Tbl_EndCell (); Tbl_EndCell ();
/* Answer text */ /* Answer text */
fprintf (Gbl.F.Out,"<td class=\"RIGHT_TOP\">"); Tbl_StartCellAttr ("class=\"RIGHT_TOP\"");
fprintf (Gbl.F.Out,"<textarea id=\"AnsStr%u\" name=\"AnsStr%u\"" fprintf (Gbl.F.Out,"<textarea id=\"AnsStr%u\" name=\"AnsStr%u\""
" cols=\"50\" rows=\"1\">", " cols=\"50\" rows=\"1\">",
NumAns,NumAns); NumAns,NumAns);
@ -3258,7 +3258,7 @@ static void Svy_ListSvyQuestions (struct Survey *Svy,
if (Svy->Status.ICanEdit) if (Svy->Status.ICanEdit)
{ {
fprintf (Gbl.F.Out,"<td class=\"BT%u\">",Gbl.RowEvenOdd); Tbl_StartCellAttr ("class=\"BT%u\"",Gbl.RowEvenOdd);
/* Write icon to remove the question */ /* Write icon to remove the question */
Frm_StartForm (ActReqRemSvyQst); Frm_StartForm (ActReqRemSvyQst);
@ -3278,18 +3278,18 @@ static void Svy_ListSvyQuestions (struct Survey *Svy,
/* Write index of question inside survey (row[1]) */ /* Write index of question inside survey (row[1]) */
if (sscanf (row[1],"%u",&(SvyQst->QstInd)) != 1) if (sscanf (row[1],"%u",&(SvyQst->QstInd)) != 1)
Lay_ShowErrorAndExit ("Error: wrong question index."); Lay_ShowErrorAndExit ("Error: wrong question index.");
fprintf (Gbl.F.Out,"<td class=\"DAT_SMALL CENTER_TOP COLOR%u\">",Gbl.RowEvenOdd); Tbl_StartCellAttr ("class=\"DAT_SMALL CENTER_TOP COLOR%u\"",Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"%u",SvyQst->QstInd + 1); fprintf (Gbl.F.Out,"%u",SvyQst->QstInd + 1);
Tbl_EndCell (); Tbl_EndCell ();
/* Write the question type (row[2]) */ /* Write the question type (row[2]) */
SvyQst->AnswerType = Svy_ConvertFromStrAnsTypDBToAnsTyp (row[2]); SvyQst->AnswerType = Svy_ConvertFromStrAnsTypDBToAnsTyp (row[2]);
fprintf (Gbl.F.Out,"<td class=\"DAT_SMALL CENTER_TOP COLOR%u\">",Gbl.RowEvenOdd); Tbl_StartCellAttr ("class=\"DAT_SMALL CENTER_TOP COLOR%u\"",Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"%s",Txt_SURVEY_STR_ANSWER_TYPES[SvyQst->AnswerType]); fprintf (Gbl.F.Out,"%s",Txt_SURVEY_STR_ANSWER_TYPES[SvyQst->AnswerType]);
Tbl_EndCell (); Tbl_EndCell ();
/* Write the stem (row[3]) and the answers of this question */ /* Write the stem (row[3]) and the answers of this question */
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_TOP COLOR%u\">",Gbl.RowEvenOdd); Tbl_StartCellAttr ("class=\"DAT LEFT_TOP COLOR%u\"",Gbl.RowEvenOdd);
Svy_WriteQstStem (row[3]); Svy_WriteQstStem (row[3]);
Svy_WriteAnswersOfAQst (Svy,SvyQst,PutFormAnswerSurvey); Svy_WriteAnswersOfAQst (Svy,SvyQst,PutFormAnswerSurvey);
Tbl_EndCell (); Tbl_EndCell ();
@ -3437,7 +3437,7 @@ static void Svy_WriteAnswersOfAQst (struct Survey *Svy,
if (PutFormAnswerSurvey) if (PutFormAnswerSurvey)
{ {
/* Write selector to choice this answer */ /* Write selector to choice this answer */
fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP\">"); Tbl_StartCellAttr ("class=\"LEFT_TOP\"");
fprintf (Gbl.F.Out,"<input type=\""); fprintf (Gbl.F.Out,"<input type=\"");
if (SvyQst->AnswerType == Svy_ANS_UNIQUE_CHOICE) if (SvyQst->AnswerType == Svy_ANS_UNIQUE_CHOICE)
fprintf (Gbl.F.Out,"radio\"" fprintf (Gbl.F.Out,"radio\""
@ -3453,7 +3453,7 @@ static void Svy_WriteAnswersOfAQst (struct Survey *Svy,
} }
/* Write the number of option */ /* Write the number of option */
fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP\" style=\"width:50px;\">"); Tbl_StartCellAttr ("class=\"LEFT_TOP\" style=\"width:50px;\"");
fprintf (Gbl.F.Out,"<label for=\"Ans%010u_%010u\" class=\"DAT\">" fprintf (Gbl.F.Out,"<label for=\"Ans%010u_%010u\" class=\"DAT\">"
"%u)" "%u)"
"</label>", "</label>",
@ -3461,7 +3461,7 @@ static void Svy_WriteAnswersOfAQst (struct Survey *Svy,
Tbl_EndCell (); Tbl_EndCell ();
/* Write the text of the answer */ /* Write the text of the answer */
fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP\">"); Tbl_StartCellAttr ("class=\"LEFT_TOP\"");
fprintf (Gbl.F.Out,"<label for=\"Ans%010u_%010u\" class=\"DAT\">%s</label>", fprintf (Gbl.F.Out,"<label for=\"Ans%010u_%010u\" class=\"DAT\">%s</label>",
(unsigned) SvyQst->QstCod,NumAns, (unsigned) SvyQst->QstCod,NumAns,
SvyQst->AnsChoice[NumAns].Text); SvyQst->AnsChoice[NumAns].Text);
@ -3507,8 +3507,8 @@ static void Svy_DrawBarNumUsrs (unsigned NumUsrs,unsigned MaxUsrs)
Txt_of_PART_OF_A_TOTAL,MaxUsrs); Txt_of_PART_OF_A_TOTAL,MaxUsrs);
/***** Draw bar with a with proportional to the number of clicks *****/ /***** Draw bar with a with proportional to the number of clicks *****/
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_TOP\" style=\"width:%upx;\">", Tbl_StartCellAttr ("class=\"DAT LEFT_TOP\" style=\"width:%upx;\"",
Svy_MAX_BAR_WIDTH + 125); Svy_MAX_BAR_WIDTH + 125);
if (NumUsrs && MaxUsrs) if (NumUsrs && MaxUsrs)
BarWidth = (unsigned) ((((float) NumUsrs * (float) Svy_MAX_BAR_WIDTH) / BarWidth = (unsigned) ((((float) NumUsrs * (float) Svy_MAX_BAR_WIDTH) /
(float) MaxUsrs) + 0.5); (float) MaxUsrs) + 0.5);

46
swad_syllabus.c
View File

@ -601,13 +601,13 @@ static void Syl_ShowRowSyllabus (unsigned NumItem,
{ {
if (NewItem) if (NewItem)
{ {
fprintf (Gbl.F.Out,"<td colspan=\"5\" class=\"COLOR%u\">",Gbl.RowEvenOdd); Tbl_StartCellAttr ("colspan=\"5\" class=\"COLOR%u\"",Gbl.RowEvenOdd);
Tbl_EndCell (); Tbl_EndCell ();
} }
else else
{ {
/***** Icon to remove the row *****/ /***** Icon to remove the row *****/
fprintf (Gbl.F.Out,"<td class=\"BM%u\">",Gbl.RowEvenOdd); Tbl_StartCellAttr ("class=\"BM%u\"",Gbl.RowEvenOdd);
if (LstItemsSyllabus.Lst[NumItem].HasChildren) if (LstItemsSyllabus.Lst[NumItem].HasChildren)
Ico_PutIconRemovalNotAllowed (); Ico_PutIconRemovalNotAllowed ();
else else
@ -622,7 +622,7 @@ static void Syl_ShowRowSyllabus (unsigned NumItem,
/***** Icon to get up an item *****/ /***** Icon to get up an item *****/
Syl_CalculateUpSubtreeSyllabus (&Subtree,NumItem); Syl_CalculateUpSubtreeSyllabus (&Subtree,NumItem);
fprintf (Gbl.F.Out,"<td class=\"BM%u\">",Gbl.RowEvenOdd); Tbl_StartCellAttr ("class=\"BM%u\"",Gbl.RowEvenOdd);
if (Subtree.MovAllowed) if (Subtree.MovAllowed)
{ {
snprintf (Gbl.Title,sizeof (Gbl.Title), snprintf (Gbl.Title,sizeof (Gbl.Title),
@ -641,7 +641,7 @@ static void Syl_ShowRowSyllabus (unsigned NumItem,
/***** Icon to get down item *****/ /***** Icon to get down item *****/
Syl_CalculateDownSubtreeSyllabus (&Subtree,NumItem); Syl_CalculateDownSubtreeSyllabus (&Subtree,NumItem);
fprintf (Gbl.F.Out,"<td class=\"BM%u\">",Gbl.RowEvenOdd); Tbl_StartCellAttr ("class=\"BM%u\"",Gbl.RowEvenOdd);
if (Subtree.MovAllowed) if (Subtree.MovAllowed)
{ {
snprintf (Gbl.Title,sizeof (Gbl.Title), snprintf (Gbl.Title,sizeof (Gbl.Title),
@ -659,7 +659,7 @@ static void Syl_ShowRowSyllabus (unsigned NumItem,
Tbl_EndCell (); Tbl_EndCell ();
/***** Icon to increase the level of an item *****/ /***** Icon to increase the level of an item *****/
fprintf (Gbl.F.Out,"<td class=\"BM%u\">",Gbl.RowEvenOdd); Tbl_StartCellAttr ("class=\"BM%u\"",Gbl.RowEvenOdd);
if (Level > 1) if (Level > 1)
{ {
snprintf (Gbl.Title,sizeof (Gbl.Title), snprintf (Gbl.Title,sizeof (Gbl.Title),
@ -676,7 +676,7 @@ static void Syl_ShowRowSyllabus (unsigned NumItem,
Tbl_EndCell (); Tbl_EndCell ();
/***** Icon to decrease level item *****/ /***** Icon to decrease level item *****/
fprintf (Gbl.F.Out,"<td class=\"BM%u\">",Gbl.RowEvenOdd); Tbl_StartCellAttr ("class=\"BM%u\"",Gbl.RowEvenOdd);
if (Level < LastLevel + 1 && if (Level < LastLevel + 1 &&
Level < Syl_MAX_LEVELS_SYLLABUS) Level < Syl_MAX_LEVELS_SYLLABUS)
{ {
@ -704,25 +704,25 @@ static void Syl_ShowRowSyllabus (unsigned NumItem,
/***** Indent depending on the level *****/ /***** Indent depending on the level *****/
if (Level > 1) if (Level > 1)
{ {
fprintf (Gbl.F.Out,"<td colspan=\"%d\" class=\"COLOR%u\">", Tbl_StartCellAttr ("colspan=\"%d\" class=\"COLOR%u\"",
Level - 1,Gbl.RowEvenOdd); Level - 1,Gbl.RowEvenOdd);
Tbl_EndCell (); Tbl_EndCell ();
} }
/***** Code of the item *****/ /***** Code of the item *****/
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_TOP COLOR%u\" style=\"width:%dpx;\">", Tbl_StartCellAttr ("class=\"%s RIGHT_TOP COLOR%u\" style=\"width:%dpx;\"",
StyleSyllabus[Level],Gbl.RowEvenOdd, StyleSyllabus[Level],Gbl.RowEvenOdd,
Level * Syl_WIDTH_NUM_SYLLABUS); Level * Syl_WIDTH_NUM_SYLLABUS);
if (Level == 1) if (Level == 1)
fprintf (Gbl.F.Out,"&nbsp;"); fprintf (Gbl.F.Out,"&nbsp;");
fprintf (Gbl.F.Out,"%s&nbsp;",StrItemCod); fprintf (Gbl.F.Out,"%s&nbsp;",StrItemCod);
Tbl_EndCell (); Tbl_EndCell ();
/***** Text of the item *****/ /***** Text of the item *****/
fprintf (Gbl.F.Out,"<td colspan=\"%d\" class=\"%s LEFT_TOP COLOR%u\">", Tbl_StartCellAttr ("colspan=\"%d\" class=\"%s LEFT_TOP COLOR%u\"",
LstItemsSyllabus.NumLevels - Level + 1, LstItemsSyllabus.NumLevels - Level + 1,
StyleSyllabus[Level], StyleSyllabus[Level],
Gbl.RowEvenOdd); Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"%s",Text); fprintf (Gbl.F.Out,"%s",Text);
Tbl_EndCell (); Tbl_EndCell ();
} }
@ -888,23 +888,23 @@ static void Syl_PutFormItemSyllabus (bool NewItem,unsigned NumItem,int Level,int
/***** Indent depending on the level *****/ /***** Indent depending on the level *****/
if (Level > 1) if (Level > 1)
{ {
fprintf (Gbl.F.Out,"<td colspan=\"%d\" class=\"COLOR%u\">", Tbl_StartCellAttr ("colspan=\"%d\" class=\"COLOR%u\"",
Level - 1,Gbl.RowEvenOdd); Level - 1,Gbl.RowEvenOdd);
Tbl_EndCell (); Tbl_EndCell ();
} }
/***** Write the code of the item *****/ /***** Write the code of the item *****/
if (NewItem) // If the item is new (not stored in the file) ==> it has not a number if (NewItem) // If the item is new (not stored in the file) ==> it has not a number
{ {
fprintf (Gbl.F.Out,"<td class=\"COLOR%u\" style=\"width:%dpx;\">", Tbl_StartCellAttr ("class=\"COLOR%u\" style=\"width:%dpx;\"",
Gbl.RowEvenOdd,Level * Syl_WIDTH_NUM_SYLLABUS); Gbl.RowEvenOdd,Level * Syl_WIDTH_NUM_SYLLABUS);
Tbl_EndCell (); Tbl_EndCell ();
} }
else else
{ {
fprintf (Gbl.F.Out,"<td class=\"%s LEFT_MIDDLE COLOR%u\" style=\"width:%dpx;\">", Tbl_StartCellAttr ("class=\"%s LEFT_MIDDLE COLOR%u\" style=\"width:%dpx;\"",
StyleSyllabus[Level],Gbl.RowEvenOdd, StyleSyllabus[Level],Gbl.RowEvenOdd,
Level * Syl_WIDTH_NUM_SYLLABUS); Level * Syl_WIDTH_NUM_SYLLABUS);
if (Level == 1) if (Level == 1)
fprintf (Gbl.F.Out,"&nbsp;"); fprintf (Gbl.F.Out,"&nbsp;");
Syl_WriteNumItem (NULL,Gbl.F.Out,Level,CodItem); Syl_WriteNumItem (NULL,Gbl.F.Out,Level,CodItem);
@ -913,8 +913,8 @@ static void Syl_PutFormItemSyllabus (bool NewItem,unsigned NumItem,int Level,int
} }
/***** Text of the item *****/ /***** Text of the item *****/
fprintf (Gbl.F.Out,"<td colspan=\"%d\" class=\"LEFT_MIDDLE COLOR%u\">", Tbl_StartCellAttr ("colspan=\"%d\" class=\"LEFT_MIDDLE COLOR%u\">",
LstItemsSyllabus.NumLevels - Level + 1,Gbl.RowEvenOdd); LstItemsSyllabus.NumLevels - Level + 1,Gbl.RowEvenOdd);
Frm_StartForm (NewItem ? (Gbl.Crs.Info.Type == Inf_LECTURES ? ActInsIteSylLec : Frm_StartForm (NewItem ? (Gbl.Crs.Info.Type == Inf_LECTURES ? ActInsIteSylLec :
ActInsIteSylPra) : ActInsIteSylPra) :
(Gbl.Crs.Info.Type == Inf_LECTURES ? ActModIteSylLec : (Gbl.Crs.Info.Type == Inf_LECTURES ? ActModIteSylLec :