Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version19.31.19

This commit is contained in:
Antonio Cañas Vargas 2019-10-07 23:02:50 +02:00
parent 0d2202bb72
commit 11a1a2f04b
4 changed files with 200 additions and 208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

247
swad_attendance.c
View File

@ -410,15 +410,21 @@ static void Att_ShowOneAttEvent (struct AttendanceEvent *Att,bool ShowOnlyThisAt
StartEndTime <= (Dat_StartEndTime_t) (Dat_NUM_START_END_TIME - 1); StartEndTime <= (Dat_StartEndTime_t) (Dat_NUM_START_END_TIME - 1);
StartEndTime++) StartEndTime++)
{ {
fprintf (Gbl.F.Out,"<td id=\"att_date_%u_%u\" class=\"%s LEFT_BOTTOM", if (ShowOnlyThisAttEventComplete)
(unsigned) StartEndTime,UniqueId, Tbl_StartCellAttr ("id=\"att_date_%u_%u\" class=\"%s LEFT_BOTTOM\"",
Att->Hidden ? (Att->Open ? "DATE_GREEN_LIGHT" : (unsigned) StartEndTime,UniqueId,
"DATE_RED_LIGHT") : Att->Hidden ? (Att->Open ? "DATE_GREEN_LIGHT" :
(Att->Open ? "DATE_GREEN" : "DATE_RED_LIGHT") :
"DATE_RED")); (Att->Open ? "DATE_GREEN" :
if (!ShowOnlyThisAttEventComplete) "DATE_RED"));
fprintf (Gbl.F.Out," COLOR%u",Gbl.RowEvenOdd); else
fprintf (Gbl.F.Out,"\">"); Tbl_StartCellAttr ("id=\"att_date_%u_%u\" class=\"%s LEFT_BOTTOM COLOR%u\"",
(unsigned) StartEndTime,UniqueId,
Att->Hidden ? (Att->Open ? "DATE_GREEN_LIGHT" :
"DATE_RED_LIGHT") :
(Att->Open ? "DATE_GREEN" :
"DATE_RED"),
Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"<script type=\"text/javascript\">" fprintf (Gbl.F.Out,"<script type=\"text/javascript\">"
"writeLocalDateHMSFromUTC('att_date_%u_%u',%ld," "writeLocalDateHMSFromUTC('att_date_%u_%u',%ld,"
"%u,'<br />','%s',true,true,0x7);" "%u,'<br />','%s',true,true,0x7);"
@ -429,10 +435,10 @@ static void Att_ShowOneAttEvent (struct AttendanceEvent *Att,bool ShowOnlyThisAt
} }
/* Attendance event title */ /* Attendance event title */
fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP"); if (ShowOnlyThisAttEventComplete)
if (!ShowOnlyThisAttEventComplete) Tbl_StartCellAttr ("class=\"LEFT_TOP\"");
fprintf (Gbl.F.Out," COLOR%u",Gbl.RowEvenOdd); else
fprintf (Gbl.F.Out,"\">"); Tbl_StartCellAttr ("class=\"LEFT_TOP COLOR%u\"",Gbl.RowEvenOdd);
Lay_StartArticle (Anchor); Lay_StartArticle (Anchor);
Att_PutLinkAttEvent (Att,Txt_View_event,Att->Title, Att_PutLinkAttEvent (Att,Txt_View_event,Att->Title,
Att->Hidden ? "ASG_TITLE_LIGHT" : Att->Hidden ? "ASG_TITLE_LIGHT" :
@ -441,14 +447,16 @@ static void Att_ShowOneAttEvent (struct AttendanceEvent *Att,bool ShowOnlyThisAt
Tbl_EndCell (); Tbl_EndCell ();
/* Number of students in this event */ /* Number of students in this event */
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_TOP", if (ShowOnlyThisAttEventComplete)
Att->Hidden ? "ASG_TITLE_LIGHT" : Tbl_StartCellAttr ("class=\"%s RIGHT_TOP\"",
"ASG_TITLE"); Att->Hidden ? "ASG_TITLE_LIGHT" :
if (!ShowOnlyThisAttEventComplete) "ASG_TITLE");
fprintf (Gbl.F.Out," COLOR%u",Gbl.RowEvenOdd); else
fprintf (Gbl.F.Out,"\">" Tbl_StartCellAttr ("class=\"%s RIGHT_TOP COLOR%u\"",
"%u", Att->Hidden ? "ASG_TITLE_LIGHT" :
Att->NumStdsTotal); "ASG_TITLE",
Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"%u",Att->NumStdsTotal);
Tbl_EndCell (); Tbl_EndCell ();
Tbl_EndRow (); Tbl_EndRow ();
@ -456,14 +464,12 @@ static void Att_ShowOneAttEvent (struct AttendanceEvent *Att,bool ShowOnlyThisAt
/***** Write second row of data of this attendance event *****/ /***** Write second row of data of this attendance event *****/
Tbl_StartRow (); Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td colspan=\"2\" class=\"LEFT_TOP");
if (!ShowOnlyThisAttEventComplete)
fprintf (Gbl.F.Out," COLOR%u",Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"\">");
/* Author of the attendance event */ /* Author of the attendance event */
if (ShowOnlyThisAttEventComplete)
Tbl_StartCellAttr ("colspan=\"2\" class=\"LEFT_TOP\"");
else
Tbl_StartCellAttr ("colspan=\"2\" class=\"LEFT_TOP COLOR%u\"",Gbl.RowEvenOdd);
Att_WriteAttEventAuthor (Att); Att_WriteAttEventAuthor (Att);
Tbl_EndCell (); Tbl_EndCell ();
/* Text of the attendance event */ /* Text of the attendance event */
@ -471,20 +477,16 @@ static void Att_ShowOneAttEvent (struct AttendanceEvent *Att,bool ShowOnlyThisAt
Str_ChangeFormat (Str_FROM_HTML,Str_TO_RIGOROUS_HTML, Str_ChangeFormat (Str_FROM_HTML,Str_TO_RIGOROUS_HTML,
Description,Cns_MAX_BYTES_TEXT,false); // Convert from HTML to recpectful HTML Description,Cns_MAX_BYTES_TEXT,false); // Convert from HTML to recpectful HTML
Str_InsertLinks (Description,Cns_MAX_BYTES_TEXT,60); // Insert links Str_InsertLinks (Description,Cns_MAX_BYTES_TEXT,60); // Insert links
if (ShowOnlyThisAttEventComplete)
fprintf (Gbl.F.Out,"<td colspan=\"2\" class=\"LEFT_TOP"); Tbl_StartCellAttr ("colspan=\"2\" class=\"LEFT_TOP\"");
if (!ShowOnlyThisAttEventComplete) else
fprintf (Gbl.F.Out," COLOR%u",Gbl.RowEvenOdd); Tbl_StartCellAttr ("colspan=\"2\" class=\"LEFT_TOP COLOR%u\"",Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"\">");
if (Gbl.Crs.Grps.NumGrps) if (Gbl.Crs.Grps.NumGrps)
Att_GetAndWriteNamesOfGrpsAssociatedToAttEvent (Att); Att_GetAndWriteNamesOfGrpsAssociatedToAttEvent (Att);
fprintf (Gbl.F.Out,"<div class=\"%s\">%s</div>", fprintf (Gbl.F.Out,"<div class=\"%s\">%s</div>",
Att->Hidden ? "DAT_LIGHT" : Att->Hidden ? "DAT_LIGHT" :
"DAT", "DAT",
Description); Description);
Tbl_EndCell (); Tbl_EndCell ();
Tbl_EndRow (); Tbl_EndRow ();
@ -1101,12 +1103,12 @@ void Att_RequestCreatOrEditAttEvent (void)
/***** Attendance event title *****/ /***** Attendance event title *****/
Tbl_StartRow (); Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"RIGHT_TOP\">"); Tbl_StartCellAttr ("class=\"RIGHT_TOP\"");
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],Txt_Title); The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Title);
Tbl_EndCell (); Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP\">"); Tbl_StartCellAttr ("class=\"LEFT_TOP\"");
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\" />",
@ -1121,12 +1123,12 @@ void Att_RequestCreatOrEditAttEvent (void)
/***** Visibility of comments *****/ /***** Visibility of comments *****/
Tbl_StartRow (); Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"RIGHT_TOP\">"); Tbl_StartCellAttr ("class=\"RIGHT_TOP\"");
fprintf (Gbl.F.Out,"<label for=\"ComTchVisible\" class=\"%s\">%s:</label>", fprintf (Gbl.F.Out,"<label for=\"ComTchVisible\" class=\"%s\">%s:</label>",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Teachers_comment); The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Teachers_comment);
Tbl_EndCell (); Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP\">"); Tbl_StartCellAttr ("class=\"LEFT_TOP\"");
fprintf (Gbl.F.Out,"<select id=\"ComTchVisible\" name=\"ComTchVisible\">"); fprintf (Gbl.F.Out,"<select id=\"ComTchVisible\" name=\"ComTchVisible\">");
fprintf (Gbl.F.Out,"<option value=\"N\""); fprintf (Gbl.F.Out,"<option value=\"N\"");
@ -1148,12 +1150,12 @@ void Att_RequestCreatOrEditAttEvent (void)
/***** Attendance event description *****/ /***** Attendance event description *****/
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_Description); The_ClassFormInBox[Gbl.Prefs.Theme],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=\"5\">"); " cols=\"60\" rows=\"5\">");
if (!ItsANewAttEvent) if (!ItsANewAttEvent)
@ -1199,19 +1201,18 @@ static void Att_ShowLstGrpsToEditAttEvent (long AttCod)
/***** Start box and table *****/ /***** Start box and table *****/
Tbl_StartRow (); Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_TOP\">", Tbl_StartCellAttr ("class=\"%s RIGHT_TOP\"",The_ClassFormInBox[Gbl.Prefs.Theme]);
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 ("100%",NULL,NULL, Box_StartBoxTable ("100%",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\" id=\"WholeCrs\" name=\"WholeCrs\" value=\"Y\""); "<input type=\"checkbox\" id=\"WholeCrs\" name=\"WholeCrs\" value=\"Y\"");
if (!Att_CheckIfAttEventIsAssociatedToGrps (AttCod)) if (!Att_CheckIfAttEventIsAssociatedToGrps (AttCod))
@ -2098,21 +2099,17 @@ static void Att_WriteRowUsrToCallTheRoll (unsigned NumUsr,
/***** Icon to show if the user is already present *****/ /***** Icon to show if the user is already present *****/
Tbl_StartRow (); Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"BT%u\">", Tbl_StartCellAttr ("class=\"BT%u\"",Gbl.RowEvenOdd);
Gbl.RowEvenOdd); fprintf (Gbl.F.Out,"<label for=\"Std%u\">",NumUsr);
fprintf (Gbl.F.Out,"<label for=\"Std%u\">",
NumUsr);
Att_PutCheckOrCross (Present); Att_PutCheckOrCross (Present);
fprintf (Gbl.F.Out,"</label>"); fprintf (Gbl.F.Out,"</label>");
Tbl_EndCell (); Tbl_EndCell ();
/***** Checkbox to select user *****/ /***** Checkbox to select user *****/
fprintf (Gbl.F.Out,"<td class=\"CENTER_TOP COLOR%u\">", Tbl_StartCellAttr ("class=\"CENTER_TOP COLOR%u\"",Gbl.RowEvenOdd);
Gbl.RowEvenOdd); fprintf (Gbl.F.Out,"<input type=\"checkbox\""
fprintf (Gbl.F.Out,"<input type=\"checkbox\" id=\"Std%u\" name=\"UsrCodStd\"" " id=\"Std%u\" name=\"UsrCodStd\" value=\"%s\"",
" value=\"%s\"", NumUsr,UsrDat->EncryptedUsrCod);
NumUsr,
UsrDat->EncryptedUsrCod);
if (Present) // This student has attended to the event? if (Present) // This student has attended to the event?
fprintf (Gbl.F.Out," checked=\"checked\""); fprintf (Gbl.F.Out," checked=\"checked\"");
if (!ICanChangeStdAttendance) if (!ICanChangeStdAttendance)
@ -2121,18 +2118,17 @@ static void Att_WriteRowUsrToCallTheRoll (unsigned NumUsr,
Tbl_EndCell (); Tbl_EndCell ();
/***** Write number of student in the list *****/ /***** Write number of student in the list *****/
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_TOP COLOR%u\">", Tbl_StartCellAttr ("class=\"%s RIGHT_TOP COLOR%u\">",
UsrDat->Accepted ? "DAT_N" : UsrDat->Accepted ? "DAT_N" :
"DAT", "DAT",
Gbl.RowEvenOdd); Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"%u",NumUsr); fprintf (Gbl.F.Out,"%u",NumUsr);
Tbl_EndCell (); Tbl_EndCell ();
/***** Show student's photo *****/ /***** Show student's photo *****/
if (Gbl.Usrs.Listing.WithPhotos) if (Gbl.Usrs.Listing.WithPhotos)
{ {
fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP COLOR%u\">", Tbl_StartCellAttr ("class=\"LEFT_TOP 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,
@ -2141,18 +2137,18 @@ static void Att_WriteRowUsrToCallTheRoll (unsigned NumUsr,
} }
/***** Write user's ID ******/ /***** Write user's ID ******/
fprintf (Gbl.F.Out,"<td class=\"%s LEFT_TOP COLOR%u\">", Tbl_StartCellAttr ("class=\"%s LEFT_TOP 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);
Tbl_EndCell (); Tbl_EndCell ();
/***** Write student's name *****/ /***** Write student's name *****/
fprintf (Gbl.F.Out,"<td class=\"%s LEFT_TOP COLOR%u\">", Tbl_StartCellAttr ("class=\"%s LEFT_TOP COLOR%u\"",
UsrDat->Accepted ? "DAT_SMALL_N" : UsrDat->Accepted ? "DAT_SMALL_N" :
"DAT_SMALL", "DAT_SMALL",
Gbl.RowEvenOdd); Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"%s",UsrDat->Surname1); fprintf (Gbl.F.Out,"%s",UsrDat->Surname1);
if (UsrDat->Surname2[0]) if (UsrDat->Surname2[0])
fprintf (Gbl.F.Out," %s",UsrDat->Surname2); fprintf (Gbl.F.Out," %s",UsrDat->Surname2);
@ -2160,8 +2156,7 @@ static void Att_WriteRowUsrToCallTheRoll (unsigned NumUsr,
Tbl_EndCell (); Tbl_EndCell ();
/***** Student's comment: write form or text */ /***** Student's comment: write form or text */
fprintf (Gbl.F.Out,"<td class=\"DAT_SMALL LEFT_TOP COLOR%u\">", Tbl_StartCellAttr ("class=\"DAT_SMALL LEFT_TOP COLOR%u\"",Gbl.RowEvenOdd);
Gbl.RowEvenOdd);
if (ICanEditStdComment) // Show with form if (ICanEditStdComment) // Show with form
fprintf (Gbl.F.Out,"<textarea name=\"CommentStd%ld\"" fprintf (Gbl.F.Out,"<textarea name=\"CommentStd%ld\""
" cols=\"40\" rows=\"3\">" " cols=\"40\" rows=\"3\">"
@ -2177,8 +2172,7 @@ static void Att_WriteRowUsrToCallTheRoll (unsigned NumUsr,
Tbl_EndCell (); Tbl_EndCell ();
/***** Teacher's comment: write form, text or nothing */ /***** Teacher's comment: write form, text or nothing */
fprintf (Gbl.F.Out,"<td class=\"DAT_SMALL LEFT_TOP COLOR%u\">", Tbl_StartCellAttr ("class=\"DAT_SMALL LEFT_TOP COLOR%u\"",Gbl.RowEvenOdd);
Gbl.RowEvenOdd);
if (ICanEditTchComment) // Show with form if (ICanEditTchComment) // Show with form
fprintf (Gbl.F.Out,"<textarea name=\"CommentTch%ld\"" fprintf (Gbl.F.Out,"<textarea name=\"CommentTch%ld\""
" cols=\"40\" rows=\"3\">" " cols=\"40\" rows=\"3\">"
@ -3146,8 +3140,7 @@ static void Att_ListEventsToSelect (Att_TypeOfView_t TypeOfView)
/* Write a row for this event */ /* Write a row for this event */
Tbl_StartRow (); Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"DAT CENTER_TOP COLOR%u\">", Tbl_StartCellAttr ("class=\"DAT CENTER_TOP COLOR%u\"",Gbl.RowEvenOdd);
Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"<input type=\"checkbox\"" fprintf (Gbl.F.Out,"<input type=\"checkbox\""
" id=\"Att%u\" name=\"AttCods\" value=\"%ld\"", " id=\"Att%u\" name=\"AttCods\" value=\"%ld\"",
NumAttEvent, NumAttEvent,
@ -3157,14 +3150,12 @@ static void Att_ListEventsToSelect (Att_TypeOfView_t TypeOfView)
fprintf (Gbl.F.Out," />"); fprintf (Gbl.F.Out," />");
Tbl_EndCell (); Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"DAT RIGHT_TOP COLOR%u\">", Tbl_StartCellAttr ("class=\"DAT RIGHT_TOP COLOR%u\"",Gbl.RowEvenOdd);
Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"<label for=\"Att%u\">%u:</label>", fprintf (Gbl.F.Out,"<label for=\"Att%u\">%u:</label>",
NumAttEvent,NumAttEvent + 1); NumAttEvent,NumAttEvent + 1);
Tbl_EndCell (); Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_TOP COLOR%u\">", Tbl_StartCellAttr ("class=\"DAT LEFT_TOP COLOR%u\"",Gbl.RowEvenOdd);
Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"<label for=\"Att%u\">" fprintf (Gbl.F.Out,"<label for=\"Att%u\">"
"<span id=\"att_date_start_%u\"></span>" "<span id=\"att_date_start_%u\"></span>"
"</label>" "</label>"
@ -3177,13 +3168,11 @@ static void Att_ListEventsToSelect (Att_TypeOfView_t TypeOfView)
(unsigned) Gbl.Prefs.DateFormat,Txt_Today); (unsigned) Gbl.Prefs.DateFormat,Txt_Today);
Tbl_EndCell (); Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_TOP COLOR%u\">", Tbl_StartCellAttr ("class=\"DAT LEFT_TOP COLOR%u\"",Gbl.RowEvenOdd);
Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"%s",Gbl.AttEvents.Lst[NumAttEvent].Title); fprintf (Gbl.F.Out,"%s",Gbl.AttEvents.Lst[NumAttEvent].Title);
Tbl_EndCell (); Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"DAT RIGHT_TOP COLOR%u\">", Tbl_StartCellAttr ("class=\"DAT RIGHT_TOP COLOR%u\"",Gbl.RowEvenOdd);
Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"%u",Gbl.AttEvents.Lst[NumAttEvent].NumStdsTotal); fprintf (Gbl.F.Out,"%u",Gbl.AttEvents.Lst[NumAttEvent].NumStdsTotal);
Tbl_EndCell (); Tbl_EndCell ();
@ -3195,7 +3184,7 @@ static void Att_ListEventsToSelect (Att_TypeOfView_t TypeOfView)
{ {
Tbl_StartRow (); Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td colspan=\"5\" class=\"CENTER_MIDDLE\">"); Tbl_StartCellAttr ("colspan=\"5\" class=\"CENTER_MIDDLE\"");
Frm_LinkFormSubmitAnimated (Txt_Update_attendance, Frm_LinkFormSubmitAnimated (Txt_Update_attendance,
The_ClassFormInBoxBold[Gbl.Prefs.Theme], The_ClassFormInBoxBold[Gbl.Prefs.Theme],
NULL); NULL);
@ -3281,9 +3270,9 @@ static void Att_ListUsrsAttendanceTable (Att_TypeOfView_t TypeOfView,
{ {
Tbl_StartRow (); Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td colspan=\"%u\" class=\"DAT_N_LINE_TOP RIGHT_MIDDLE\">", Tbl_StartCellAttr ("colspan=\"%u\" class=\"DAT_N_LINE_TOP RIGHT_MIDDLE\"",
Gbl.Usrs.Listing.WithPhotos ? 4 : Gbl.Usrs.Listing.WithPhotos ? 4 :
3); 3);
fprintf (Gbl.F.Out,"%s:",Txt_Number_of_users); fprintf (Gbl.F.Out,"%s:",Txt_Number_of_users);
Tbl_EndCell (); Tbl_EndCell ();
@ -3292,7 +3281,7 @@ static void Att_ListUsrsAttendanceTable (Att_TypeOfView_t TypeOfView,
NumAttEvent++) NumAttEvent++)
if (Gbl.AttEvents.Lst[NumAttEvent].Selected) if (Gbl.AttEvents.Lst[NumAttEvent].Selected)
{ {
fprintf (Gbl.F.Out,"<td class=\"DAT_N_LINE_TOP RIGHT_MIDDLE\">"); Tbl_StartCellAttr ("class=\"DAT_N_LINE_TOP RIGHT_MIDDLE\"");
fprintf (Gbl.F.Out,"%u", fprintf (Gbl.F.Out,"%u",
Gbl.AttEvents.Lst[NumAttEvent].NumStdsFromList); Gbl.AttEvents.Lst[NumAttEvent].NumStdsFromList);
Tbl_EndCell (); Tbl_EndCell ();
@ -3300,7 +3289,7 @@ static void Att_ListUsrsAttendanceTable (Att_TypeOfView_t TypeOfView,
Total += Gbl.AttEvents.Lst[NumAttEvent].NumStdsFromList; Total += Gbl.AttEvents.Lst[NumAttEvent].NumStdsFromList;
} }
fprintf (Gbl.F.Out,"<td class=\"DAT_N_LINE_TOP RIGHT_MIDDLE\">"); Tbl_StartCellAttr ("class=\"DAT_N_LINE_TOP RIGHT_MIDDLE\"");
fprintf (Gbl.F.Out,"%u",Total); fprintf (Gbl.F.Out,"%u",Total);
Tbl_EndCell (); Tbl_EndCell ();
@ -3383,19 +3372,18 @@ static void Att_WriteRowUsrSeveralAttEvents (unsigned NumUsr,struct UsrData *Usr
/***** Write number of user in the list *****/ /***** Write number of user in the list *****/
Tbl_StartRow (); Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_MIDDLE COLOR%u\">", Tbl_StartCellAttr ("class=\"%s RIGHT_MIDDLE COLOR%u\"",
UsrDat->Accepted ? "DAT_N" : UsrDat->Accepted ? "DAT_N" :
"DAT", "DAT",
Gbl.RowEvenOdd); Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"%u",NumUsr + 1); fprintf (Gbl.F.Out,"%u",NumUsr + 1);
Tbl_EndCell (); Tbl_EndCell ();
/***** Show user's photo *****/ /***** Show user's photo *****/
if (Gbl.Usrs.Listing.WithPhotos) if (Gbl.Usrs.Listing.WithPhotos)
{ {
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE COLOR%u\"" Tbl_StartCellAttr ("class=\"LEFT_MIDDLE COLOR%u\" style=\"width:22px;\"",
" style=\"width:22px;\">", 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,
@ -3404,18 +3392,18 @@ static void Att_WriteRowUsrSeveralAttEvents (unsigned NumUsr,struct UsrData *Usr
} }
/***** 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);
Tbl_EndCell (); Tbl_EndCell ();
/***** Write user's name *****/ /***** Write user's name *****/
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);
fprintf (Gbl.F.Out,"%s",UsrDat->Surname1); fprintf (Gbl.F.Out,"%s",UsrDat->Surname1);
if (UsrDat->Surname2[0]) if (UsrDat->Surname2[0])
fprintf (Gbl.F.Out," %s",UsrDat->Surname2); fprintf (Gbl.F.Out," %s",UsrDat->Surname2);
@ -3435,7 +3423,7 @@ static void Att_WriteRowUsrSeveralAttEvents (unsigned NumUsr,struct UsrData *Usr
UsrDat->UsrCod); UsrDat->UsrCod);
/* Write check or cross */ /* Write check or cross */
fprintf (Gbl.F.Out,"<td class=\"BM%u\">",Gbl.RowEvenOdd); Tbl_StartCellAttr ("class=\"BM%u\"",Gbl.RowEvenOdd);
Att_PutCheckOrCross (Present); Att_PutCheckOrCross (Present);
Tbl_EndCell (); Tbl_EndCell ();
@ -3444,8 +3432,7 @@ static void Att_WriteRowUsrSeveralAttEvents (unsigned NumUsr,struct UsrData *Usr
} }
/***** Last column with the number of times this user is present *****/ /***** Last column with the number of times this user is present *****/
fprintf (Gbl.F.Out,"<td class=\"DAT_N RIGHT_MIDDLE COLOR%u\">", Tbl_StartCellAttr ("class=\"DAT_N RIGHT_MIDDLE COLOR%u\"",Gbl.RowEvenOdd);
Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"%u",NumTimesPresent); fprintf (Gbl.F.Out,"%u",NumTimesPresent);
Tbl_EndCell (); Tbl_EndCell ();
@ -3545,16 +3532,15 @@ static void Att_ListAttEventsForAStd (unsigned NumUsr,struct UsrData *UsrDat)
NumUsr++; NumUsr++;
Tbl_StartRow (); Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_MIDDLE COLOR%u\">", Tbl_StartCellAttr ("class=\"%s RIGHT_MIDDLE COLOR%u\"",
UsrDat->Accepted ? "DAT_N" : UsrDat->Accepted ? "DAT_N" :
"DAT", "DAT",
Gbl.RowEvenOdd); Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"%u:",NumUsr); fprintf (Gbl.F.Out,"%u:",NumUsr);
Tbl_EndCell (); Tbl_EndCell ();
/***** Show student's photo *****/ /***** Show student's photo *****/
fprintf (Gbl.F.Out,"<td colspan=\"2\" class=\"RIGHT_MIDDLE COLOR%u\">", Tbl_StartCellAttr ("colspan=\"2\" class=\"RIGHT_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,
@ -3562,21 +3548,20 @@ static void Att_ListAttEventsForAStd (unsigned NumUsr,struct UsrData *UsrDat)
Tbl_EndCell (); Tbl_EndCell ();
/***** Write user's ID ******/ /***** Write user's ID ******/
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE COLOR%u\">", Tbl_StartCellAttr ("class=\"LEFT_MIDDLE COLOR%u\"",Gbl.RowEvenOdd);
Gbl.RowEvenOdd);
Tbl_StartTable (); Tbl_StartTable ();
Tbl_StartRow (); Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"%s LEFT_MIDDLE\">", Tbl_StartCellAttr ("class=\"%s LEFT_MIDDLE\"",
UsrDat->Accepted ? "DAT_N" : UsrDat->Accepted ? "DAT_N" :
"DAT"); "DAT");
ID_WriteUsrIDs (UsrDat,NULL); ID_WriteUsrIDs (UsrDat,NULL);
Tbl_EndCell (); Tbl_EndCell ();
/***** Write student's name *****/ /***** Write student's name *****/
fprintf (Gbl.F.Out,"<td class=\"%s LEFT_MIDDLE\">", Tbl_StartCellAttr ("class=\"%s LEFT_MIDDLE\"",
UsrDat->Accepted ? "DAT_SMALL_N" : UsrDat->Accepted ? "DAT_SMALL_N" :
"DAT_SMALL"); "DAT_SMALL");
fprintf (Gbl.F.Out,"%s",UsrDat->Surname1); fprintf (Gbl.F.Out,"%s",UsrDat->Surname1);
if (UsrDat->Surname2[0]) if (UsrDat->Surname2[0])
fprintf (Gbl.F.Out," %s",UsrDat->Surname2); fprintf (Gbl.F.Out," %s",UsrDat->Surname2);
@ -3610,20 +3595,18 @@ static void Att_ListAttEventsForAStd (unsigned NumUsr,struct UsrData *UsrDat)
Tbl_PutEmptyColouredCells (1); Tbl_PutEmptyColouredCells (1);
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_TOP COLOR%u\">", Tbl_StartCellAttr ("class=\"%s RIGHT_TOP COLOR%u\"",
Present ? "DAT_GREEN" : Present ? "DAT_GREEN" :
"DAT_RED", "DAT_RED",
Gbl.RowEvenOdd); Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"%u:",NumAttEvent + 1); fprintf (Gbl.F.Out,"%u:",NumAttEvent + 1);
Tbl_EndCell (); Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"BT%u\">", Tbl_StartCellAttr ("class=\"BT%u\"",Gbl.RowEvenOdd);
Gbl.RowEvenOdd);
Att_PutCheckOrCross (Present); Att_PutCheckOrCross (Present);
Tbl_EndCell (); Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_TOP COLOR%u\">", Tbl_StartCellAttr ("class=\"DAT LEFT_TOP COLOR%u\"",Gbl.RowEvenOdd);
Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"<span id=\"att_date_start_%u_%u\"></span>" fprintf (Gbl.F.Out,"<span id=\"att_date_start_%u_%u\"></span>"
"<br />%s" "<br />%s"
"<script type=\"text/javascript\">" "<script type=\"text/javascript\">"
@ -3646,12 +3629,10 @@ static void Att_ListAttEventsForAStd (unsigned NumUsr,struct UsrData *UsrDat)
Tbl_PutEmptyColouredCells (2); Tbl_PutEmptyColouredCells (2);
fprintf (Gbl.F.Out,"<td class=\"BT%u\">", Tbl_StartCellAttr ("class=\"BT%u\"",Gbl.RowEvenOdd);
Gbl.RowEvenOdd);
Tbl_EndCell (); Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_MIDDLE COLOR%u\">", Tbl_StartCellAttr ("class=\"DAT LEFT_MIDDLE COLOR%u\"",Gbl.RowEvenOdd);
Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"<dl>"); fprintf (Gbl.F.Out,"<dl>");
if (ShowCommentStd) if (ShowCommentStd)
{ {

44
swad_banner.c
View File

@ -422,12 +422,13 @@ static void Ban_ListBannersForEdition (void)
/* Put icon to remove banner */ /* Put icon to remove banner */
Tbl_StartRow (); Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"BM\">");
Tbl_StartCellAttr ("class=\"BM\"");
Ico_PutContextualIconToRemove (ActRemBan,Ban_PutParamBanCodToEdit); Ico_PutContextualIconToRemove (ActRemBan,Ban_PutParamBanCodToEdit);
Tbl_EndCell (); Tbl_EndCell ();
/* Put icon to hide/show banner */ /* Put icon to hide/show banner */
fprintf (Gbl.F.Out,"<td class=\"BM\">"); Tbl_StartCellAttr ("class=\"BM\"");
if (Ban->Hidden) if (Ban->Hidden)
Ico_PutContextualIconToUnhide (ActShoBan,Anchor,Ban_PutParamBanCodToEdit); Ico_PutContextualIconToUnhide (ActShoBan,Anchor,Ban_PutParamBanCodToEdit);
else else
@ -435,16 +436,16 @@ static void Ban_ListBannersForEdition (void)
Tbl_EndCell (); Tbl_EndCell ();
/* Banner code */ /* Banner code */
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_MIDDLE\">", Tbl_StartCellAttr ("class=\"%s RIGHT_MIDDLE\"",
Ban->Hidden ? "DAT_LIGHT" : Ban->Hidden ? "DAT_LIGHT" :
"DAT"); "DAT");
Lay_StartArticle (Anchor); Lay_StartArticle (Anchor);
fprintf (Gbl.F.Out,"%ld",Ban->BanCod); fprintf (Gbl.F.Out,"%ld",Ban->BanCod);
Lay_EndArticle (); Lay_EndArticle ();
Tbl_EndCell (); Tbl_EndCell ();
/* Banner short name */ /* Banner short name */
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">"); Tbl_StartCellAttr ("class=\"CENTER_MIDDLE\"");
Frm_StartForm (ActRenBanSho); Frm_StartForm (ActRenBanSho);
Ban_PutParamBanCodToEdit (); Ban_PutParamBanCodToEdit ();
fprintf (Gbl.F.Out,"<input type=\"text\" name=\"ShortName\"" fprintf (Gbl.F.Out,"<input type=\"text\" name=\"ShortName\""
@ -456,7 +457,7 @@ static void Ban_ListBannersForEdition (void)
Tbl_EndCell (); Tbl_EndCell ();
/* Banner full name */ /* Banner full name */
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">"); Tbl_StartCellAttr ("class=\"CENTER_MIDDLE\"");
Frm_StartForm (ActRenBanFul); Frm_StartForm (ActRenBanFul);
Ban_PutParamBanCodToEdit (); Ban_PutParamBanCodToEdit ();
fprintf (Gbl.F.Out,"<input type=\"text\" name=\"FullName\"" fprintf (Gbl.F.Out,"<input type=\"text\" name=\"FullName\""
@ -468,7 +469,7 @@ static void Ban_ListBannersForEdition (void)
Tbl_EndCell (); Tbl_EndCell ();
/* Banner image */ /* Banner image */
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">"); Tbl_StartCellAttr ("class=\"CENTER_MIDDLE\"");
Frm_StartForm (ActChgBanImg); Frm_StartForm (ActChgBanImg);
Ban_PutParamBanCodToEdit (); Ban_PutParamBanCodToEdit ();
fprintf (Gbl.F.Out,"<input type=\"text\" name=\"Img\"" fprintf (Gbl.F.Out,"<input type=\"text\" name=\"Img\""
@ -479,7 +480,7 @@ static void Ban_ListBannersForEdition (void)
Tbl_EndCell (); Tbl_EndCell ();
/* Banner WWW */ /* Banner WWW */
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">"); Tbl_StartCellAttr ("class=\"CENTER_MIDDLE\"");
Frm_StartForm (ActChgBanWWW); Frm_StartForm (ActChgBanWWW);
Ban_PutParamBanCodToEdit (); Ban_PutParamBanCodToEdit ();
fprintf (Gbl.F.Out,"<input type=\"url\" name=\"WWW\"" fprintf (Gbl.F.Out,"<input type=\"url\" name=\"WWW\""
@ -489,6 +490,7 @@ static void Ban_ListBannersForEdition (void)
Cns_MAX_CHARS_WWW,Ban->WWW,Gbl.Form.Id); Cns_MAX_CHARS_WWW,Ban->WWW,Gbl.Form.Id);
Frm_EndForm (); Frm_EndForm ();
Tbl_EndCell (); Tbl_EndCell ();
Tbl_EndRow (); Tbl_EndRow ();
/* Free anchor string */ /* Free anchor string */
@ -865,15 +867,18 @@ static void Ban_PutFormToCreateBanner (void)
/***** Banner code *****/ /***** Banner code *****/
Tbl_StartRow (); Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"BM\">");
Tbl_StartCellAttr ("class=\"BM\"");
Tbl_EndCell (); Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"BM\">");
Tbl_StartCellAttr ("class=\"BM\"");
Tbl_EndCell (); Tbl_EndCell ();
Tbl_PutEmptyCells (1); Tbl_PutEmptyCells (1);
/***** Banner short name *****/ /***** Banner short name *****/
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">" Tbl_StartCellAttr ("class=\"CENTER_MIDDLE\"");
"<input type=\"text\" name=\"ShortName\"" fprintf (Gbl.F.Out,"<input type=\"text\" name=\"ShortName\""
" maxlength=\"%u\" value=\"%s\"" " maxlength=\"%u\" value=\"%s\""
" class=\"INPUT_SHORT_NAME\"" " class=\"INPUT_SHORT_NAME\""
" required=\"required\" />", " required=\"required\" />",
@ -881,8 +886,8 @@ static void Ban_PutFormToCreateBanner (void)
Tbl_EndCell (); Tbl_EndCell ();
/***** Banner full name *****/ /***** Banner full name *****/
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">" Tbl_StartCellAttr ("class=\"CENTER_MIDDLE\"");
"<input type=\"text\" name=\"FullName\"" fprintf (Gbl.F.Out,"<input type=\"text\" name=\"FullName\""
" maxlength=\"%u\" value=\"%s\"" " maxlength=\"%u\" value=\"%s\""
" class=\"INPUT_FULL_NAME\"" " class=\"INPUT_FULL_NAME\""
" required=\"required\" />", " required=\"required\" />",
@ -890,21 +895,22 @@ static void Ban_PutFormToCreateBanner (void)
Tbl_EndCell (); Tbl_EndCell ();
/***** Banner image *****/ /***** Banner image *****/
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">" Tbl_StartCellAttr ("class=\"CENTER_MIDDLE\"");
"<input type=\"text\" name=\"Img\"" fprintf (Gbl.F.Out,"<input type=\"text\" name=\"Img\""
" size=\"12\" maxlength=\"%u\" value=\"%s\"" " size=\"12\" maxlength=\"%u\" value=\"%s\""
" required=\"required\" />", " required=\"required\" />",
Ban_MAX_CHARS_IMAGE,Ban_EditingBan->Img); Ban_MAX_CHARS_IMAGE,Ban_EditingBan->Img);
Tbl_EndCell (); Tbl_EndCell ();
/***** Banner WWW *****/ /***** Banner WWW *****/
fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\">" Tbl_StartCellAttr ("class=\"CENTER_MIDDLE\"");
"<input type=\"url\" name=\"WWW\"" fprintf (Gbl.F.Out,"<input type=\"url\" name=\"WWW\""
" maxlength=\"%u\" value=\"%s\"" " maxlength=\"%u\" value=\"%s\""
" class=\"INPUT_WWW\"" " class=\"INPUT_WWW\""
" required=\"required\" />", " required=\"required\" />",
Cns_MAX_CHARS_WWW,Ban_EditingBan->WWW); Cns_MAX_CHARS_WWW,Ban_EditingBan->WWW);
Tbl_EndCell (); Tbl_EndCell ();
Tbl_EndRow (); Tbl_EndRow ();
/***** End table, send button and end box *****/ /***** End table, send button and end box *****/

114
swad_centre.c
View File

@ -209,16 +209,15 @@ void Ctr_SeeCtrWithPendingDegs (void)
/* Centre logo and full name */ /* Centre logo and full name */
Tbl_StartRow (); Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE %s\">",
BgColor); Tbl_StartCellAttr ("class=\"LEFT_MIDDLE %s\"",BgColor);
Ctr_DrawCentreLogoAndNameWithLink (&Ctr,ActSeeDeg, Ctr_DrawCentreLogoAndNameWithLink (&Ctr,ActSeeDeg,
"DAT_NOBR","CENTER_MIDDLE"); "DAT_NOBR","CENTER_MIDDLE");
Tbl_EndCell (); Tbl_EndCell ();
/* Number of pending degrees (row[1]) */ /* Number of pending degrees (row[1]) */
fprintf (Gbl.F.Out,"<td class=\"DAT RIGHT_MIDDLE %s\">" Tbl_StartCellAttr ("class=\"DAT RIGHT_MIDDLE %s\"",BgColor);
"%s", fprintf (Gbl.F.Out,"%s",row[1]);
BgColor,row[1]);
Tbl_EndCell (); Tbl_EndCell ();
Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd; Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd;
@ -409,13 +408,14 @@ static void Ctr_Configuration (bool PrintView)
/***** Institution *****/ /***** Institution *****/
Tbl_StartRow (); Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"RIGHT_MIDDLE\">"
"<label for=\"OthInsCod\" class=\"%s\">%s:</label>", Tbl_StartCellAttr ("class=\"RIGHT_MIDDLE\"");
fprintf (Gbl.F.Out,"<label for=\"OthInsCod\" class=\"%s\">%s:</label>",
The_ClassFormInBox[Gbl.Prefs.Theme], The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Institution); Txt_Institution);
Tbl_EndCell (); Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"DAT_N LEFT_MIDDLE\">");
Tbl_StartCellAttr ("class=\"DAT_N LEFT_MIDDLE\"");
if (!PrintView && if (!PrintView &&
Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM) Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM)
// Only system admins can move a centre to another institution // Only system admins can move a centre to another institution
@ -445,19 +445,20 @@ static void Ctr_Configuration (bool PrintView)
} }
else // I can not move centre to another institution else // I can not move centre to another institution
fprintf (Gbl.F.Out,"%s",Gbl.Hierarchy.Ins.FullName); fprintf (Gbl.F.Out,"%s",Gbl.Hierarchy.Ins.FullName);
Tbl_EndCell (); Tbl_EndCell ();
Tbl_EndRow (); Tbl_EndRow ();
/***** Centre full name *****/ /***** Centre full name *****/
Tbl_StartRow (); Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"RIGHT_MIDDLE\">"
"<label for=\"FullName\" class=\"%s\">%s:</label>", Tbl_StartCellAttr ("class=\"RIGHT_MIDDLE\"");
fprintf (Gbl.F.Out,"<label for=\"FullName\" class=\"%s\">%s:</label>",
The_ClassFormInBox[Gbl.Prefs.Theme], The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Centre); Txt_Centre);
Tbl_EndCell (); Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"DAT_N LEFT_MIDDLE\">");
Tbl_StartCellAttr ("class=\"DAT_N LEFT_MIDDLE\"");
if (!PrintView && if (!PrintView &&
Gbl.Usrs.Me.Role.Logged >= Rol_INS_ADM) Gbl.Usrs.Me.Role.Logged >= Rol_INS_ADM)
// Only institution admins and system admins can edit centre full name // Only institution admins and system admins can edit centre full name
@ -477,17 +478,19 @@ static void Ctr_Configuration (bool PrintView)
else // I can not edit centre full name else // I can not edit centre full name
fprintf (Gbl.F.Out,"%s",Gbl.Hierarchy.Ctr.FullName); fprintf (Gbl.F.Out,"%s",Gbl.Hierarchy.Ctr.FullName);
Tbl_EndCell (); Tbl_EndCell ();
Tbl_EndRow (); Tbl_EndRow ();
/***** Centre short name *****/ /***** Centre short name *****/
Tbl_StartRow (); Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"RIGHT_MIDDLE\">"
"<label for=\"ShortName\" class=\"%s\">%s:</label>", Tbl_StartCellAttr ("class=\"RIGHT_MIDDLE\"");
fprintf (Gbl.F.Out,"<label for=\"ShortName\" class=\"%s\">%s:</label>",
The_ClassFormInBox[Gbl.Prefs.Theme], The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Short_name); Txt_Short_name);
Tbl_EndCell (); Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"DAT_N LEFT_MIDDLE\">");
Tbl_StartCellAttr ("class=\"DAT_N LEFT_MIDDLE\"");
if (!PrintView && if (!PrintView &&
Gbl.Usrs.Me.Role.Logged >= Rol_INS_ADM) Gbl.Usrs.Me.Role.Logged >= Rol_INS_ADM)
// Only institution admins and system admins can edit centre short name // Only institution admins and system admins can edit centre short name
@ -507,19 +510,19 @@ static void Ctr_Configuration (bool PrintView)
else // I can not edit centre short name else // I can not edit centre short name
fprintf (Gbl.F.Out,"%s",Gbl.Hierarchy.Ctr.ShrtName); fprintf (Gbl.F.Out,"%s",Gbl.Hierarchy.Ctr.ShrtName);
Tbl_EndCell (); Tbl_EndCell ();
Tbl_EndRow (); Tbl_EndRow ();
/***** Place *****/ /***** Place *****/
Plc.PlcCod = Gbl.Hierarchy.Ctr.PlcCod; Plc.PlcCod = Gbl.Hierarchy.Ctr.PlcCod;
Plc_GetDataOfPlaceByCod (&Plc); Plc_GetDataOfPlaceByCod (&Plc);
Tbl_StartRow (); Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_MIDDLE\">"
"%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Place);
Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_MIDDLE\">");
Tbl_StartCellAttr ("class=\"%s RIGHT_MIDDLE\"",The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Place);
Tbl_EndCell ();
Tbl_StartCellAttr ("class=\"DAT LEFT_MIDDLE\"");
if (!PrintView && if (!PrintView &&
Gbl.Usrs.Me.Role.Logged >= Rol_CTR_ADM) Gbl.Usrs.Me.Role.Logged >= Rol_CTR_ADM)
// Only centre admins, institution admins and system admins // Only centre admins, institution admins and system admins
@ -555,17 +558,19 @@ static void Ctr_Configuration (bool PrintView)
else // I can not change centre place else // I can not change centre place
fprintf (Gbl.F.Out,"%s",Plc.FullName); fprintf (Gbl.F.Out,"%s",Plc.FullName);
Tbl_EndCell (); Tbl_EndCell ();
Tbl_EndRow (); Tbl_EndRow ();
/***** Centre WWW *****/ /***** Centre WWW *****/
Tbl_StartRow (); Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"RIGHT_MIDDLE\">"
"<label for=\"WWW\" class=\"%s\">%s:</label>", Tbl_StartCellAttr ("class=\"RIGHT_MIDDLE\"");
fprintf (Gbl.F.Out,"<label for=\"WWW\" class=\"%s\">%s:</label>",
The_ClassFormInBox[Gbl.Prefs.Theme], The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Web); Txt_Web);
Tbl_EndCell (); Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">");
Tbl_StartCellAttr ("class=\"LEFT_MIDDLE\"");
if (!PrintView && if (!PrintView &&
Gbl.Usrs.Me.Role.Logged >= Rol_CTR_ADM) Gbl.Usrs.Me.Role.Logged >= Rol_CTR_ADM)
// Only centre admins, institution admins and system admins // Only centre admins, institution admins and system admins
@ -591,17 +596,18 @@ static void Ctr_Configuration (bool PrintView)
Gbl.Hierarchy.Ctr.WWW, Gbl.Hierarchy.Ctr.WWW,
Gbl.Hierarchy.Ctr.WWW); Gbl.Hierarchy.Ctr.WWW);
Tbl_EndCell (); Tbl_EndCell ();
Tbl_EndRow (); Tbl_EndRow ();
/***** Shortcut to the centre *****/ /***** Shortcut to the centre *****/
Tbl_StartRow (); Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_MIDDLE\">"
"%s:", Tbl_StartCellAttr ("class=\"%s RIGHT_MIDDLE\"",The_ClassFormInBox[Gbl.Prefs.Theme]);
The_ClassFormInBox[Gbl.Prefs.Theme], fprintf (Gbl.F.Out,"%s:",Txt_Shortcut);
Txt_Shortcut);
Tbl_EndCell (); Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_MIDDLE\">"
"<a href=\"%s/%s?ctr=%ld\" class=\"DAT\" target=\"_blank\">" Tbl_StartCellAttr ("class=\"DAT LEFT_MIDDLE\"");
fprintf (Gbl.F.Out,"<a href=\"%s/%s?ctr=%ld\" class=\"DAT\" target=\"_blank\">"
"%s/%s?ctr=%ld" "%s/%s?ctr=%ld"
"</a>", "</a>",
Cfg_URL_SWAD_CGI, Cfg_URL_SWAD_CGI,
@ -611,6 +617,7 @@ static void Ctr_Configuration (bool PrintView)
Lan_STR_LANG_ID[Gbl.Prefs.Language], Lan_STR_LANG_ID[Gbl.Prefs.Language],
Gbl.Hierarchy.Ctr.CtrCod); Gbl.Hierarchy.Ctr.CtrCod);
Tbl_EndCell (); Tbl_EndCell ();
Tbl_EndRow (); Tbl_EndRow ();
if (PrintView) if (PrintView)
@ -618,13 +625,11 @@ static void Ctr_Configuration (bool PrintView)
/***** QR code with link to the centre *****/ /***** QR code with link to the centre *****/
Tbl_StartRow (); Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_MIDDLE\">" Tbl_StartCellAttr ("class=\"%s RIGHT_MIDDLE\"",The_ClassFormInBox[Gbl.Prefs.Theme]);
"%s:", fprintf (Gbl.F.Out,"%s:",Txt_QR_code);
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_QR_code);
Tbl_EndCell (); Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_MIDDLE\">"); Tbl_StartCellAttr ("class=\"DAT LEFT_MIDDLE\"");
QR_LinkTo (250,"ctr",Gbl.Hierarchy.Ctr.CtrCod); QR_LinkTo (250,"ctr",Gbl.Hierarchy.Ctr.CtrCod);
Tbl_EndCell (); Tbl_EndCell ();
@ -634,27 +639,26 @@ static void Ctr_Configuration (bool PrintView)
{ {
/***** Number of users who claim to belong to this centre *****/ /***** Number of users who claim to belong to this centre *****/
Tbl_StartRow (); Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_MIDDLE\">"
"%s:", Tbl_StartCellAttr ("class=\"%s RIGHT_MIDDLE\"",The_ClassFormInBox[Gbl.Prefs.Theme]);
The_ClassFormInBox[Gbl.Prefs.Theme], fprintf (Gbl.F.Out,"%s:",Txt_Users_of_the_centre);
Txt_Users_of_the_centre);
Tbl_EndCell (); Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_MIDDLE\">"
"%u", Tbl_StartCellAttr ("class=\"DAT LEFT_MIDDLE\"");
Usr_GetNumUsrsWhoClaimToBelongToCtr (Gbl.Hierarchy.Ctr.CtrCod)); fprintf (Gbl.F.Out,"%u",Usr_GetNumUsrsWhoClaimToBelongToCtr (Gbl.Hierarchy.Ctr.CtrCod));
Tbl_EndCell (); Tbl_EndCell ();
Tbl_EndRow (); Tbl_EndRow ();
/***** Number of degrees *****/ /***** Number of degrees *****/
Tbl_StartRow (); Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_MIDDLE\">"
"%s:", Tbl_StartCellAttr ("class=\"%s RIGHT_MIDDLE\"",The_ClassFormInBox[Gbl.Prefs.Theme]);
The_ClassFormInBox[Gbl.Prefs.Theme], fprintf (Gbl.F.Out,"%s:",Txt_Degrees);
Txt_Degrees);
Tbl_EndCell (); Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">");
/* Form to go to see degrees of this centre */ /* Form to go to see degrees of this centre */
Tbl_StartCellAttr ("class=\"LEFT_MIDDLE\"");
Frm_StartFormGoTo (ActSeeDeg); Frm_StartFormGoTo (ActSeeDeg);
Ctr_PutParamCtrCod (Gbl.Hierarchy.Ctr.CtrCod); Ctr_PutParamCtrCod (Gbl.Hierarchy.Ctr.CtrCod);
snprintf (Gbl.Title,sizeof (Gbl.Title), snprintf (Gbl.Title,sizeof (Gbl.Title),
@ -664,21 +668,21 @@ static void Ctr_Configuration (bool PrintView)
fprintf (Gbl.F.Out,"%u</a>", fprintf (Gbl.F.Out,"%u</a>",
Deg_GetNumDegsInCtr (Gbl.Hierarchy.Ctr.CtrCod)); Deg_GetNumDegsInCtr (Gbl.Hierarchy.Ctr.CtrCod));
Frm_EndForm (); Frm_EndForm ();
Tbl_EndCell (); Tbl_EndCell ();
Tbl_EndRow (); Tbl_EndRow ();
/***** Number of courses *****/ /***** Number of courses *****/
Tbl_StartRow (); Tbl_StartRow ();
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_MIDDLE\">"
"%s:", Tbl_StartCellAttr ("class=\"%s RIGHT_MIDDLE\"",The_ClassFormInBox[Gbl.Prefs.Theme]);
The_ClassFormInBox[Gbl.Prefs.Theme], fprintf (Gbl.F.Out,"%s:",Txt_Courses);
Txt_Courses);
Tbl_EndCell (); Tbl_EndCell ();
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_MIDDLE\">"
"%u", Tbl_StartCellAttr ("class=\"DAT LEFT_MIDDLE\"");
Crs_GetNumCrssInCtr (Gbl.Hierarchy.Ctr.CtrCod)); fprintf (Gbl.F.Out,"%u",Crs_GetNumCrssInCtr (Gbl.Hierarchy.Ctr.CtrCod));
Tbl_EndCell (); Tbl_EndCell ();
Tbl_EndRow (); Tbl_EndRow ();
/***** Number of users in courses of this centre *****/ /***** Number of users in courses of this centre *****/

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.18 (2019-10-07)" #define Log_PLATFORM_VERSION "SWAD 19.31.19 (2019-10-07)"
#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.19: Oct 07, 2019 Code refactoring in HTML tables. (247211 lines)
Version 19.31.18: Oct 07, 2019 Code refactoring in HTML tables. (247239 lines) Version 19.31.18: Oct 07, 2019 Code refactoring in HTML tables. (247239 lines)
Version 19.31.17: Oct 07, 2019 Code refactoring in HTML tables. (247221 lines) Version 19.31.17: Oct 07, 2019 Code refactoring in HTML tables. (247221 lines)
Version 19.31.16: Oct 07, 2019 Code refactoring in HTML tables. (247185 lines) Version 19.31.16: Oct 07, 2019 Code refactoring in HTML tables. (247185 lines)