mirror of https://github.com/acanas/swad-core.git
Version 15.151
This commit is contained in:
parent
1d7ff7b9e7
commit
80d5291114
|
@ -247,19 +247,15 @@ void Cal_DrawCalendar (void)
|
|||
/***** Create list of calls for examination *****/
|
||||
Exa_CreateListOfExamAnnouncements ();
|
||||
|
||||
/***** Start of table and title *****/
|
||||
/***** Start frame *****/
|
||||
Lay_StartRoundFrame (NULL,NULL,PrintView ? NULL :
|
||||
Cal_PutIconToPrintCalendar);
|
||||
fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE\">");
|
||||
Lay_WriteHeaderClassPhoto (1,PrintView,false,
|
||||
Lay_WriteHeaderClassPhoto (PrintView,false,
|
||||
Gbl.CurrentIns.Ins.InsCod,
|
||||
Gbl.CurrentDeg.Deg.DegCod,
|
||||
Gbl.CurrentCrs.Crs.CrsCod);
|
||||
|
||||
/***** Draw several months *****/
|
||||
fprintf (Gbl.F.Out,"<tr>"
|
||||
"<td class=\"CENTER_TOP\">");
|
||||
|
||||
/* Show form to change first day of week */
|
||||
if (!PrintView)
|
||||
Cal_ShowIntegratedFormToSelFirstDayOfWeek (ActChgCal1stDay);
|
||||
|
@ -287,10 +283,6 @@ void Cal_DrawCalendar (void)
|
|||
"</script>",
|
||||
Params);
|
||||
|
||||
fprintf (Gbl.F.Out,"</td>"
|
||||
"</tr>"
|
||||
"</table>");
|
||||
|
||||
/***** Free list of dates of exam announcements *****/
|
||||
Exa_FreeListExamAnnouncements ();
|
||||
|
||||
|
|
|
@ -141,6 +141,7 @@
|
|||
// Number of lines (includes comments but not blank lines) has been got with the following command:
|
||||
// nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1
|
||||
/*
|
||||
Version 15.151: Mar 18, 2016 Changes in layout of header class photo. (195930 lines)
|
||||
Version 15.150.10:Mar 18, 2016 Icon to print calendar integrated in frame. (195961 lines)
|
||||
Version 15.150.9: Mar 18, 2016 Icons to print/show-all students/teachers integrated in frame. (195957 lines)
|
||||
Version 15.150.8: Mar 18, 2016 Icons to print/show-all guests integrated in frame. (195967 lines)
|
||||
|
|
66
swad_info.c
66
swad_info.c
|
@ -1590,18 +1590,16 @@ static void Inf_ShowPlainTxtInfo (void)
|
|||
|
||||
if (TxtHTML[0])
|
||||
{
|
||||
/***** Start table *****/
|
||||
/***** Start frame *****/
|
||||
Lay_StartRoundFrame (NULL,Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type],
|
||||
ICanEdit ? Inf_PutIconToEditInfo :
|
||||
NULL);
|
||||
fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE\">");
|
||||
|
||||
if (Gbl.CurrentCrs.Info.Type == Inf_INTRODUCTION ||
|
||||
Gbl.CurrentCrs.Info.Type == Inf_TEACHING_GUIDE)
|
||||
Lay_WriteHeaderClassPhoto (3,false,false,Gbl.CurrentIns.Ins.InsCod,Gbl.CurrentDeg.Deg.DegCod,Gbl.CurrentCrs.Crs.CrsCod);
|
||||
Lay_WriteHeaderClassPhoto (false,false,Gbl.CurrentIns.Ins.InsCod,Gbl.CurrentDeg.Deg.DegCod,Gbl.CurrentCrs.Crs.CrsCod);
|
||||
|
||||
fprintf (Gbl.F.Out,"<tr>"
|
||||
"<td class=\"DAT LEFT_MIDDLE\">");
|
||||
fprintf (Gbl.F.Out,"<div class=\"DAT LEFT_MIDDLE\">");
|
||||
|
||||
/***** Convert to respectful HTML and insert links *****/
|
||||
Str_ChangeFormat (Str_FROM_HTML,Str_TO_RIGOROUS_HTML,
|
||||
|
@ -1611,10 +1609,8 @@ static void Inf_ShowPlainTxtInfo (void)
|
|||
/***** Write text *****/
|
||||
fprintf (Gbl.F.Out,"%s",TxtHTML);
|
||||
|
||||
/***** End table *****/
|
||||
fprintf (Gbl.F.Out,"</td>"
|
||||
"</tr>"
|
||||
"</table>");
|
||||
/***** End frame *****/
|
||||
fprintf (Gbl.F.Out,"</div>");
|
||||
Lay_EndRoundFrame ();
|
||||
}
|
||||
else
|
||||
|
@ -1646,19 +1642,16 @@ static void Inf_ShowRichTxtInfo (void)
|
|||
|
||||
if (TxtMD[0])
|
||||
{
|
||||
/***** Start table *****/
|
||||
/***** Start frame *****/
|
||||
Lay_StartRoundFrame (NULL,Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type],
|
||||
ICanEdit ? Inf_PutIconToEditInfo :
|
||||
NULL);
|
||||
fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE\">");
|
||||
|
||||
if (Gbl.CurrentCrs.Info.Type == Inf_INTRODUCTION ||
|
||||
Gbl.CurrentCrs.Info.Type == Inf_TEACHING_GUIDE)
|
||||
Lay_WriteHeaderClassPhoto (3,false,false,Gbl.CurrentIns.Ins.InsCod,Gbl.CurrentDeg.Deg.DegCod,Gbl.CurrentCrs.Crs.CrsCod);
|
||||
Lay_WriteHeaderClassPhoto (false,false,Gbl.CurrentIns.Ins.InsCod,Gbl.CurrentDeg.Deg.DegCod,Gbl.CurrentCrs.Crs.CrsCod);
|
||||
|
||||
fprintf (Gbl.F.Out,"<tr>"
|
||||
"<td class=\"LEFT_MIDDLE\">"
|
||||
"<div id=\"crs_info\">");
|
||||
fprintf (Gbl.F.Out,"<div id=\"crs_info\" class=\"LEFT_MIDDLE\">");
|
||||
|
||||
/***** Store text into a temporary .md file in HTML output directory *****/
|
||||
// TODO: change to another directory?
|
||||
|
@ -1717,11 +1710,8 @@ static void Inf_ShowRichTxtInfo (void)
|
|||
fclose (FileHTML);
|
||||
unlink (PathFileHTML);
|
||||
|
||||
/***** Finish table *****/
|
||||
fprintf (Gbl.F.Out,"</div>"
|
||||
"</td>"
|
||||
"</tr>"
|
||||
"</table>");
|
||||
/***** End frame *****/
|
||||
fprintf (Gbl.F.Out,"</div>");
|
||||
Lay_EndRoundFrame ();
|
||||
}
|
||||
else
|
||||
|
@ -1834,30 +1824,28 @@ void Inf_EditPlainTxtInfo (void)
|
|||
/***** Set info type *****/
|
||||
Gbl.CurrentCrs.Info.Type = Inf_AsignInfoType ();
|
||||
|
||||
/***** Start table *****/
|
||||
/***** Start form and frame *****/
|
||||
Act_FormStart (Inf_ActionsRcvPlaTxtInfo[Gbl.CurrentCrs.Info.Type]);
|
||||
Lay_StartRoundFrameTable (NULL,0,Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type]);
|
||||
Lay_StartRoundFrame (NULL,Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type],NULL);
|
||||
|
||||
if (Gbl.CurrentCrs.Info.Type == Inf_INTRODUCTION ||
|
||||
Gbl.CurrentCrs.Info.Type == Inf_TEACHING_GUIDE)
|
||||
Lay_WriteHeaderClassPhoto (1,false,false,Gbl.CurrentIns.Ins.InsCod,Gbl.CurrentDeg.Deg.DegCod,Gbl.CurrentCrs.Crs.CrsCod);
|
||||
Lay_WriteHeaderClassPhoto (false,false,Gbl.CurrentIns.Ins.InsCod,Gbl.CurrentDeg.Deg.DegCod,Gbl.CurrentCrs.Crs.CrsCod);
|
||||
|
||||
/***** Get info text from database *****/
|
||||
Inf_GetInfoTxtFromDB (TxtHTML,NULL,Cns_MAX_BYTES_LONG_TEXT);
|
||||
|
||||
/***** Edition area *****/
|
||||
fprintf (Gbl.F.Out,"<tr>"
|
||||
"<td class=\"CENTER_MIDDLE\">");
|
||||
fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\">");
|
||||
Lay_HelpPlainEditor ();
|
||||
fprintf (Gbl.F.Out,"<textarea name=\"Txt\" cols=\"80\" rows=\"20\">"
|
||||
"%s"
|
||||
"</textarea>",
|
||||
"</textarea>"
|
||||
"</div>",
|
||||
TxtHTML);
|
||||
fprintf (Gbl.F.Out,"</td>"
|
||||
"</tr>");
|
||||
|
||||
/***** End form *****/
|
||||
Lay_EndRoundFrameTableWithButton (Lay_CONFIRM_BUTTON,Txt_Save);
|
||||
/***** End frame and form *****/
|
||||
Lay_EndRoundFrameWithButton (Lay_CONFIRM_BUTTON,Txt_Save);
|
||||
Act_FormEnd ();
|
||||
}
|
||||
|
||||
|
@ -1874,30 +1862,28 @@ void Inf_EditRichTxtInfo (void)
|
|||
/***** Set info type *****/
|
||||
Gbl.CurrentCrs.Info.Type = Inf_AsignInfoType ();
|
||||
|
||||
/***** Start form *****/
|
||||
/***** Start form and frame *****/
|
||||
Act_FormStart (Inf_ActionsRcvRchTxtInfo[Gbl.CurrentCrs.Info.Type]);
|
||||
Lay_StartRoundFrameTable (NULL,0,Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type]);
|
||||
Lay_StartRoundFrame (NULL,Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type],NULL);
|
||||
|
||||
if (Gbl.CurrentCrs.Info.Type == Inf_INTRODUCTION ||
|
||||
Gbl.CurrentCrs.Info.Type == Inf_TEACHING_GUIDE)
|
||||
Lay_WriteHeaderClassPhoto (1,false,false,Gbl.CurrentIns.Ins.InsCod,Gbl.CurrentDeg.Deg.DegCod,Gbl.CurrentCrs.Crs.CrsCod);
|
||||
Lay_WriteHeaderClassPhoto (false,false,Gbl.CurrentIns.Ins.InsCod,Gbl.CurrentDeg.Deg.DegCod,Gbl.CurrentCrs.Crs.CrsCod);
|
||||
|
||||
/***** Get info text from database *****/
|
||||
Inf_GetInfoTxtFromDB (TxtHTML,NULL,Cns_MAX_BYTES_LONG_TEXT);
|
||||
|
||||
/***** Edition area *****/
|
||||
fprintf (Gbl.F.Out,"<tr>"
|
||||
"<td class=\"CENTER_MIDDLE\">");
|
||||
fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\">");
|
||||
Lay_HelpRichEditor ();
|
||||
fprintf (Gbl.F.Out,"<textarea name=\"Txt\" cols=\"80\" rows=\"20\">"
|
||||
"%s"
|
||||
"</textarea>",
|
||||
"</textarea>"
|
||||
"</div>",
|
||||
TxtHTML);
|
||||
fprintf (Gbl.F.Out,"</td>"
|
||||
"</tr>");
|
||||
|
||||
/***** End form *****/
|
||||
Lay_EndRoundFrameTableWithButton (Lay_CONFIRM_BUTTON,Txt_Save);
|
||||
/***** End frame and form *****/
|
||||
Lay_EndRoundFrameWithButton (Lay_CONFIRM_BUTTON,Txt_Save);
|
||||
Act_FormEnd ();
|
||||
}
|
||||
|
||||
|
|
|
@ -1539,7 +1539,7 @@ static void Lay_WriteFootFromHTMLFile (void)
|
|||
/****** Write header and footer of the class photo or academic calendar ******/
|
||||
/*****************************************************************************/
|
||||
|
||||
void Lay_WriteHeaderClassPhoto (unsigned NumColumns,bool PrintView,bool DrawingClassPhoto,
|
||||
void Lay_WriteHeaderClassPhoto (bool PrintView,bool DrawingClassPhoto,
|
||||
long InsCod,long DegCod,long CrsCod)
|
||||
{
|
||||
struct Institution Ins;
|
||||
|
@ -1559,11 +1559,8 @@ void Lay_WriteHeaderClassPhoto (unsigned NumColumns,bool PrintView,bool DrawingC
|
|||
Crs_GetDataOfCourseByCod (&Crs);
|
||||
|
||||
/***** Table start *****/
|
||||
fprintf (Gbl.F.Out,"<tr>"
|
||||
"<td colspan=\"%u\" class=\"CENTER_MIDDLE\">"
|
||||
"<table style=\"width:100%%; padding:12px;\">"
|
||||
"<tr>",
|
||||
NumColumns);
|
||||
fprintf (Gbl.F.Out,"<table style=\"width:100%%; padding:12px;\">"
|
||||
"<tr>");
|
||||
|
||||
/***** First column: institution logo *****/
|
||||
fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP\" style=\"width:80px;\">");
|
||||
|
@ -1627,9 +1624,7 @@ void Lay_WriteHeaderClassPhoto (unsigned NumColumns,bool PrintView,bool DrawingC
|
|||
|
||||
/***** Table end *****/
|
||||
fprintf (Gbl.F.Out,"</tr>"
|
||||
"</table>"
|
||||
"</td>"
|
||||
"</tr>");
|
||||
"</table>");
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
|
@ -110,7 +110,7 @@ void Lay_ShowAlert (Lay_AlertType_t MsgType,const char *Message);
|
|||
void Lay_RefreshNotifsAndConnected (void);
|
||||
void Lay_RefreshLastClicks (void);
|
||||
|
||||
void Lay_WriteHeaderClassPhoto (unsigned NumColumns,bool PrintView,bool DrawingClassPhoto,
|
||||
void Lay_WriteHeaderClassPhoto (bool PrintView,bool DrawingClassPhoto,
|
||||
long InsCod,long DegCod,long CrsCod);
|
||||
|
||||
void Lay_AdvertisementMobile (void);
|
||||
|
|
34
swad_test.c
34
swad_test.c
|
@ -604,15 +604,14 @@ static bool Tst_CheckIfNextTstAllowed (void)
|
|||
if (NumSecondsFromNowToNextAccTst > 0)
|
||||
{
|
||||
/***** Start frame *****/
|
||||
Lay_StartRoundFrameTable (NULL,2,Txt_Test);
|
||||
Lay_WriteHeaderClassPhoto (1,false,false,
|
||||
Lay_StartRoundFrame (NULL,Txt_Test,NULL);
|
||||
Lay_WriteHeaderClassPhoto (false,false,
|
||||
Gbl.CurrentIns.Ins.InsCod,
|
||||
Gbl.CurrentDeg.Deg.DegCod,
|
||||
Gbl.CurrentCrs.Crs.CrsCod);
|
||||
|
||||
/***** Write warning *****/
|
||||
fprintf (Gbl.F.Out,"<tr>"
|
||||
"<td class=\"DAT CENTER_MIDDLE\">");
|
||||
fprintf (Gbl.F.Out,"<div class=\"DAT CENTER_MIDDLE\">");
|
||||
fprintf (Gbl.F.Out,Txt_You_can_not_make_a_new_test_in_the_course_X_until,
|
||||
Gbl.CurrentCrs.Crs.FullName);
|
||||
fprintf (Gbl.F.Out,": "
|
||||
|
@ -621,12 +620,11 @@ static bool Tst_CheckIfNextTstAllowed (void)
|
|||
"<script type=\"text/javascript\">"
|
||||
"writeLocalDateHMSFromUTC('date_next_test',%ld,' ','%s');"
|
||||
"</script>"
|
||||
"</td>"
|
||||
"</tr>",
|
||||
"</div>",
|
||||
(long) TimeNextTestUTC,Txt_Today);
|
||||
|
||||
/***** End frame *****/
|
||||
Lay_EndRoundFrameTable ();
|
||||
Lay_EndRoundFrame ();
|
||||
|
||||
return false;
|
||||
}
|
||||
|
@ -738,24 +736,25 @@ static void Tst_WriteTestHead (unsigned NumTst)
|
|||
extern const char *Txt_Test_result;
|
||||
extern const char *Txt_Test_No_X_that_you_make_in_this_course;
|
||||
|
||||
/***** Start table *****/
|
||||
Lay_StartRoundFrameTable (NULL,2,Gbl.Action.Act == ActSeeTst ? Txt_Test :
|
||||
Txt_Test_result);
|
||||
Lay_WriteHeaderClassPhoto (3,false,false,
|
||||
/***** Start frame *****/
|
||||
Lay_StartRoundFrame (NULL,Gbl.Action.Act == ActSeeTst ? Txt_Test :
|
||||
Txt_Test_result,NULL);
|
||||
Lay_WriteHeaderClassPhoto (false,false,
|
||||
Gbl.CurrentIns.Ins.InsCod,
|
||||
Gbl.CurrentDeg.Deg.DegCod,
|
||||
Gbl.CurrentCrs.Crs.CrsCod);
|
||||
|
||||
/***** Header row *****/
|
||||
/***** Header *****/
|
||||
if (Gbl.Action.Act == ActAssTst &&
|
||||
Gbl.Usrs.Me.IBelongToCurrentCrs)
|
||||
{
|
||||
fprintf (Gbl.F.Out,"<tr>"
|
||||
"<td colspan=\"3\" class=\"DAT CENTER_MIDDLE\">");
|
||||
fprintf (Gbl.F.Out,"<div class=\"DAT CENTER_MIDDLE\">");
|
||||
fprintf (Gbl.F.Out,Txt_Test_No_X_that_you_make_in_this_course,NumTst);
|
||||
fprintf (Gbl.F.Out,"</td>"
|
||||
"</tr>");
|
||||
fprintf (Gbl.F.Out,"</div>");
|
||||
}
|
||||
|
||||
/***** Start table *****/
|
||||
fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -764,7 +763,8 @@ static void Tst_WriteTestHead (unsigned NumTst)
|
|||
|
||||
static void Tst_WriteTestFoot (void)
|
||||
{
|
||||
Lay_EndRoundFrameTable ();
|
||||
fprintf (Gbl.F.Out,"</table>");
|
||||
Lay_EndRoundFrame ();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
|
@ -142,8 +142,7 @@ static void TT_ShowTimeTableGrpsSelected (void)
|
|||
extern const char *Txt_Groups_OF_A_USER;
|
||||
extern const char *Txt_All_groups;
|
||||
|
||||
fprintf (Gbl.F.Out,"<tr>"
|
||||
"<td class=\"TIT_CLASSPHOTO CENTER_MIDDLE\">");
|
||||
fprintf (Gbl.F.Out,"<div class=\"TIT_CLASSPHOTO CENTER_MIDDLE\">");
|
||||
switch (Gbl.CurrentCrs.Grps.WhichGrps)
|
||||
{
|
||||
case Grp_ONLY_MY_GROUPS:
|
||||
|
@ -154,8 +153,7 @@ static void TT_ShowTimeTableGrpsSelected (void)
|
|||
fprintf (Gbl.F.Out,"%s",Txt_All_groups);
|
||||
break;
|
||||
}
|
||||
fprintf (Gbl.F.Out,"</td>"
|
||||
"</tr>");
|
||||
fprintf (Gbl.F.Out,"</div>");
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -261,11 +259,10 @@ void TT_ShowClassTimeTable (void)
|
|||
Gbl.TimeTable.ContextualIcons.PutIconEditOfficeHours ||
|
||||
Gbl.TimeTable.ContextualIcons.PutIconPrint) ? TT_PutContextualIcons :
|
||||
NULL);
|
||||
fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE\">");
|
||||
|
||||
/***** Start time table drawing *****/
|
||||
if (Gbl.TimeTable.Type == TT_COURSE_TIMETABLE)
|
||||
Lay_WriteHeaderClassPhoto (1,PrintView,false,
|
||||
Lay_WriteHeaderClassPhoto (PrintView,false,
|
||||
Gbl.CurrentIns.Ins.InsCod,Gbl.CurrentDeg.Deg.DegCod,Gbl.CurrentCrs.Crs.CrsCod);
|
||||
|
||||
if (PrintView)
|
||||
|
@ -273,28 +270,17 @@ void TT_ShowClassTimeTable (void)
|
|||
TT_ShowTimeTableGrpsSelected ();
|
||||
else
|
||||
{
|
||||
fprintf (Gbl.F.Out,"<tr>"
|
||||
"<td>");
|
||||
|
||||
/***** Select whether show only my groups or all groups *****/
|
||||
TT_ShowSelectorWhichGrps (Gbl.TimeTable.Type == TT_COURSE_TIMETABLE ? ActSeeCrsTT :
|
||||
ActSeeMyTT);
|
||||
ActSeeMyTT);
|
||||
|
||||
/***** Show form to change first day of week *****/
|
||||
Cal_ShowIntegratedFormToSelFirstDayOfWeek (Gbl.TimeTable.Type == TT_COURSE_TIMETABLE ? ActChgCrsTT1stDay :
|
||||
ActChgMyTT1stDay);
|
||||
|
||||
fprintf (Gbl.F.Out,"</td>"
|
||||
"</tr>");
|
||||
ActChgMyTT1stDay);
|
||||
}
|
||||
|
||||
/***** Show the time table *****/
|
||||
fprintf (Gbl.F.Out,"<tr>"
|
||||
"<td class=\"CENTER_MIDDLE\">");
|
||||
TT_ShowTimeTable (Gbl.Usrs.Me.UsrDat.UsrCod);
|
||||
fprintf (Gbl.F.Out,"</td>"
|
||||
"</tr>"
|
||||
"</table>");
|
||||
|
||||
/***** End frame *****/
|
||||
Lay_EndRoundFrame ();
|
||||
|
|
48
swad_user.c
48
swad_user.c
|
@ -6677,17 +6677,17 @@ void Usr_SeeGuests (void)
|
|||
Act_FormStart (ActSeeRecSevGst);
|
||||
Grp_PutParamsCodGrps ();
|
||||
|
||||
/* Start table */
|
||||
fprintf (Gbl.F.Out,"<table style=\"margin:0 auto;\">");
|
||||
|
||||
if (Gbl.Usrs.Me.ListType == Usr_CLASS_PHOTO)
|
||||
Lay_WriteHeaderClassPhoto (Gbl.Usrs.ClassPhoto.Cols,false,true,
|
||||
Lay_WriteHeaderClassPhoto (false,true,
|
||||
(Gbl.Scope.Current == Sco_SCOPE_CTR ||
|
||||
Gbl.Scope.Current == Sco_SCOPE_INS) ? Gbl.CurrentIns.Ins.InsCod :
|
||||
-1L,
|
||||
-1L,
|
||||
-1L);
|
||||
|
||||
/* Start table */
|
||||
fprintf (Gbl.F.Out,"<table style=\"margin:0 auto;\">");
|
||||
|
||||
/* Put a row to select all users */
|
||||
Usr_PutCheckboxToSelectAllTheUsers (Rol__GUEST_);
|
||||
|
||||
|
@ -6830,11 +6830,8 @@ void Usr_SeeStudents (void)
|
|||
Grp_PutParamsCodGrps ();
|
||||
}
|
||||
|
||||
/* Start table */
|
||||
fprintf (Gbl.F.Out,"<table style=\"margin:0 auto;\">");
|
||||
|
||||
if (Gbl.Usrs.Me.ListType == Usr_CLASS_PHOTO)
|
||||
Lay_WriteHeaderClassPhoto (Gbl.Usrs.ClassPhoto.Cols,false,true,
|
||||
Lay_WriteHeaderClassPhoto (false,true,
|
||||
(Gbl.Scope.Current == Sco_SCOPE_CRS ||
|
||||
Gbl.Scope.Current == Sco_SCOPE_DEG ||
|
||||
Gbl.Scope.Current == Sco_SCOPE_CTR ||
|
||||
|
@ -6846,6 +6843,9 @@ void Usr_SeeStudents (void)
|
|||
Gbl.Scope.Current == Sco_SCOPE_CRS ? Gbl.CurrentCrs.Crs.CrsCod :
|
||||
-1L);
|
||||
|
||||
/* Start table */
|
||||
fprintf (Gbl.F.Out,"<table style=\"margin:0 auto;\">");
|
||||
|
||||
/* Put a row to select all users */
|
||||
if (ICanViewRecords)
|
||||
Usr_PutCheckboxToSelectAllTheUsers (Rol_STUDENT);
|
||||
|
@ -6973,11 +6973,8 @@ void Usr_SeeTeachers (void)
|
|||
if (ICanViewRecords)
|
||||
Act_FormStart (ActSeeRecSevTch);
|
||||
|
||||
/* Start table */
|
||||
fprintf (Gbl.F.Out,"<table style=\"margin:0 auto;\">");
|
||||
|
||||
if (Gbl.Usrs.Me.ListType == Usr_CLASS_PHOTO)
|
||||
Lay_WriteHeaderClassPhoto (Gbl.Usrs.ClassPhoto.Cols,false,true,
|
||||
Lay_WriteHeaderClassPhoto (false,true,
|
||||
(Gbl.Scope.Current == Sco_SCOPE_CRS ||
|
||||
Gbl.Scope.Current == Sco_SCOPE_DEG ||
|
||||
Gbl.Scope.Current == Sco_SCOPE_CTR ||
|
||||
|
@ -6989,6 +6986,9 @@ void Usr_SeeTeachers (void)
|
|||
Gbl.Scope.Current == Sco_SCOPE_CRS ? Gbl.CurrentCrs.Crs.CrsCod :
|
||||
-1L);
|
||||
|
||||
/* Start table */
|
||||
fprintf (Gbl.F.Out,"<table style=\"margin:0 auto;\">");
|
||||
|
||||
/* Put a row to select all users */
|
||||
if (ICanViewRecords)
|
||||
Usr_PutCheckboxToSelectAllTheUsers (Rol_TEACHER);
|
||||
|
@ -7140,14 +7140,16 @@ void Usr_SeeGstClassPhotoPrn (void)
|
|||
if (Gbl.Usrs.LstGsts.NumUsrs)
|
||||
{
|
||||
/***** Draw the guests' class photo *****/
|
||||
Lay_StartRoundFrameTable (NULL,0,NULL);
|
||||
Lay_WriteHeaderClassPhoto (Gbl.Usrs.ClassPhoto.Cols,true,true,
|
||||
Lay_StartRoundFrame (NULL,NULL,NULL);
|
||||
Lay_WriteHeaderClassPhoto (true,true,
|
||||
(Gbl.Scope.Current == Sco_SCOPE_CTR ||
|
||||
Gbl.Scope.Current == Sco_SCOPE_INS) ? Gbl.CurrentIns.Ins.InsCod :
|
||||
-1L,
|
||||
-1L,-1L);
|
||||
fprintf (Gbl.F.Out,"<table style=\"margin:0 auto;\">");
|
||||
Usr_DrawClassPhoto (Usr_CLASS_PHOTO_PRN,Rol__GUEST_);
|
||||
Lay_EndRoundFrameTable ();
|
||||
fprintf (Gbl.F.Out,"</table>");
|
||||
Lay_EndRoundFrame ();
|
||||
}
|
||||
else
|
||||
Usr_ShowWarningNoUsersFound (Rol__GUEST_);
|
||||
|
@ -7180,8 +7182,8 @@ void Usr_SeeStdClassPhotoPrn (void)
|
|||
if (Gbl.Usrs.LstStds.NumUsrs)
|
||||
{
|
||||
/***** Draw the students' class photo *****/
|
||||
Lay_StartRoundFrameTable (NULL,0,NULL);
|
||||
Lay_WriteHeaderClassPhoto (Gbl.Usrs.ClassPhoto.Cols,true,true,
|
||||
Lay_StartRoundFrame (NULL,NULL,NULL);
|
||||
Lay_WriteHeaderClassPhoto (true,true,
|
||||
(Gbl.Scope.Current == Sco_SCOPE_CRS ||
|
||||
Gbl.Scope.Current == Sco_SCOPE_DEG ||
|
||||
Gbl.Scope.Current == Sco_SCOPE_CTR ||
|
||||
|
@ -7192,8 +7194,10 @@ void Usr_SeeStdClassPhotoPrn (void)
|
|||
-1L,
|
||||
Gbl.Scope.Current == Sco_SCOPE_CRS ? Gbl.CurrentCrs.Crs.CrsCod :
|
||||
-1L);
|
||||
fprintf (Gbl.F.Out,"<table style=\"margin:0 auto;\">");
|
||||
Usr_DrawClassPhoto (Usr_CLASS_PHOTO_PRN,Rol_STUDENT);
|
||||
Lay_EndRoundFrameTable ();
|
||||
fprintf (Gbl.F.Out,"</table>");
|
||||
Lay_EndRoundFrame ();
|
||||
}
|
||||
else
|
||||
Usr_ShowWarningNoUsersFound (Rol_STUDENT);
|
||||
|
@ -7234,8 +7238,8 @@ void Usr_SeeTchClassPhotoPrn (void)
|
|||
if (Gbl.Usrs.LstTchs.NumUsrs)
|
||||
{
|
||||
/***** Draw the teachers' class photo *****/
|
||||
Lay_StartRoundFrameTable (NULL,0,NULL);
|
||||
Lay_WriteHeaderClassPhoto (Gbl.Usrs.ClassPhoto.Cols,true,true,
|
||||
Lay_StartRoundFrame (NULL,NULL,NULL);
|
||||
Lay_WriteHeaderClassPhoto (true,true,
|
||||
(Gbl.Scope.Current == Sco_SCOPE_CRS ||
|
||||
Gbl.Scope.Current == Sco_SCOPE_DEG ||
|
||||
Gbl.Scope.Current == Sco_SCOPE_CTR ||
|
||||
|
@ -7246,8 +7250,10 @@ void Usr_SeeTchClassPhotoPrn (void)
|
|||
-1L,
|
||||
Gbl.Scope.Current == Sco_SCOPE_CRS ? Gbl.CurrentCrs.Crs.CrsCod :
|
||||
-1L);
|
||||
fprintf (Gbl.F.Out,"<table style=\"margin:0 auto;\">");
|
||||
Usr_DrawClassPhoto (Usr_CLASS_PHOTO_PRN,Rol_TEACHER);
|
||||
Lay_EndRoundFrameTable ();
|
||||
fprintf (Gbl.F.Out,"</table>");
|
||||
Lay_EndRoundFrame ();
|
||||
}
|
||||
else
|
||||
Lay_ShowAlert (Lay_INFO,Txt_No_users_found[Rol_TEACHER]);
|
||||
|
|
Loading…
Reference in New Issue