mirror of https://github.com/acanas/swad-core.git
Version19.78
This commit is contained in:
parent
463b9fba4c
commit
d4f5a80061
|
@ -211,7 +211,7 @@ void Acc_CheckIfEmptyAccountExists (void)
|
|||
if (NumUsrs)
|
||||
{
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,
|
||||
Box_BoxTableBegin (NULL,
|
||||
(NumUsrs == 1) ? Txt_Do_you_think_you_are_this_user :
|
||||
Txt_Do_you_think_you_are_one_of_these_users,
|
||||
NULL,
|
||||
|
@ -242,7 +242,7 @@ void Acc_CheckIfEmptyAccountExists (void)
|
|||
Usr_UsrDataDestructor (&UsrDat);
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
else
|
||||
Ale_ShowAlert (Ale_INFO,Txt_There_is_no_empty_account_associated_with_your_ID_X,
|
||||
|
@ -359,7 +359,7 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith
|
|||
Frm_StartForm (ActCreUsrAcc);
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_Create_account,NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_Create_account,NULL,
|
||||
Hlp_PROFILE_SignUp,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Nickname *****/
|
||||
|
@ -407,7 +407,7 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith
|
|||
Pwd_PutFormToGetNewPasswordOnce ();
|
||||
|
||||
/***** End table, send button and end box *****/
|
||||
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_account);
|
||||
Box_BoxTableWithButtonEnd (Btn_CREATE_BUTTON,Txt_Create_account);
|
||||
|
||||
/***** End form *****/
|
||||
Frm_EndForm ();
|
||||
|
|
|
@ -629,7 +629,6 @@ Assessment:
|
|||
478. ActAnsMchQstStd Answer a match question (as student)
|
||||
479. ActRefMchStd Refresh current question when playing a game (as student)
|
||||
|
||||
480. ActReqSeeMyMchRes Select range of dates to see my matches results
|
||||
481. ActSeeMyMchRes Show my matches results
|
||||
482. ActReqSeeUsrMchRes Select users and range of dates to see matches results
|
||||
|
||||
|
@ -2141,7 +2140,7 @@ const struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
|
|||
[ActSeeMyTstRes ] = {1084,-1,TabUnk,ActReqTst ,0x208,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Tst_ShowMyTstResults ,NULL},
|
||||
[ActSeeOneTstResMe ] = {1085,-1,TabUnk,ActReqTst ,0x208,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Tst_ShowOneTstResult ,NULL},
|
||||
[ActReqSeeUsrTstRes ] = {1080,-1,TabUnk,ActReqTst ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Dat_SetIniEndDates ,Tst_SelUsrsToViewUsrsTstResults,NULL},
|
||||
[ActSeeUsrTstRes ] = {1081,-1,TabUnk,ActReqTst ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Tst_GetUsrsAndShowTstResults ,NULL},
|
||||
[ActSeeUsrTstRes ] = {1081,-1,TabUnk,ActReqTst ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Tst_GetUsrsAndShowTstResults ,NULL},
|
||||
[ActSeeOneTstResOth ] = {1082,-1,TabUnk,ActReqTst ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Tst_ShowOneTstResult ,NULL},
|
||||
|
||||
[ActSeeGam ] = {1650,-1,TabUnk,ActSeeAllGam ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Gam_SeeOneGame ,NULL},
|
||||
|
@ -2162,12 +2161,11 @@ const struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
|
|||
[ActAnsMchQstStd ] = {1651,-1,TabUnk,ActSeeAllGam ,0x008, 0, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_2ND_TAB,Mch_GetMatchBeingPlayed ,Mch_ReceiveQuestionAnswer ,NULL},
|
||||
[ActRefMchStd ] = {1782,-1,TabUnk,ActSeeAllGam ,0x008, 0, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_AJAX_RFRESH,Mch_GetMatchBeingPlayed ,Mch_RefreshMatchStd ,NULL},
|
||||
|
||||
[ActReqSeeMyMchRes ] = {1795,-1,TabUnk,ActSeeAllGam ,0x208,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Dat_SetIniEndDates ,McR_SelDatesToSeeMyMchResults ,NULL},
|
||||
[ActSeeMyMchRes ] = {1796,-1,TabUnk,ActSeeAllGam ,0x208,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,McR_ShowMyMchResults ,NULL},
|
||||
[ActSeeOneMchResMe ] = {1797,-1,TabUnk,ActSeeAllGam ,0x208,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,McR_ShowOneMchResult ,NULL},
|
||||
|
||||
[ActReqSeeUsrMchRes ] = {1798,-1,TabUnk,ActSeeAllGam ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Dat_SetIniEndDates ,McR_SelUsrsToViewUsrsMchResults,NULL},
|
||||
[ActSeeUsrMchRes ] = {1799,-1,TabUnk,ActSeeAllGam ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,McR_GetUsrsAndShowMchResults ,NULL},
|
||||
[ActSeeUsrMchRes ] = {1799,-1,TabUnk,ActSeeAllGam ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,McR_GetUsrsAndShowMchResults ,NULL},
|
||||
[ActSeeOneMchResOth ] = {1800,-1,TabUnk,ActSeeAllGam ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,McR_ShowOneMchResult ,NULL},
|
||||
[ActChgVisResMchUsr ] = {1801,-1,TabUnk,ActSeeAllGam ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Mch_ToggleVisibilResultsMchUsr ,NULL},
|
||||
|
||||
|
@ -5014,7 +5012,7 @@ Act_Action_t Act_FromActCodToAction[1 + Act_MAX_ACTION_COD] = // Do not reuse un
|
|||
-1, // #1792 (obsolete action)
|
||||
-1, // #1793 (obsolete action)
|
||||
ActChgVisResMchQst, // #1794
|
||||
ActReqSeeMyMchRes, // #1795
|
||||
-1, // #1795
|
||||
ActSeeMyMchRes, // #1796
|
||||
ActSeeOneMchResMe, // #1797
|
||||
ActReqSeeUsrMchRes, // #1798
|
||||
|
|
|
@ -64,7 +64,7 @@ typedef enum
|
|||
|
||||
typedef signed int Act_Action_t; // Must be a signed type, because -1 is used to indicate obsolete action
|
||||
|
||||
#define Act_NUM_ACTIONS (1 + 4 + 66 + 38 + 12 + 42 + 36 + 19 + 110 + 180 + 437 + 176 + 169 + 16 + 68)
|
||||
#define Act_NUM_ACTIONS (1 + 4 + 66 + 38 + 12 + 42 + 36 + 19 + 110 + 179 + 437 + 176 + 169 + 16 + 68)
|
||||
|
||||
#define Act_MAX_ACTION_COD 1807
|
||||
|
||||
|
@ -628,57 +628,56 @@ typedef signed int Act_Action_t; // Must be a signed type, because -1 is used to
|
|||
#define ActAnsMchQstStd (ActChgCrsTT1stDay + 132)
|
||||
#define ActRefMchStd (ActChgCrsTT1stDay + 133)
|
||||
|
||||
#define ActReqSeeMyMchRes (ActChgCrsTT1stDay + 134)
|
||||
#define ActSeeMyMchRes (ActChgCrsTT1stDay + 135)
|
||||
#define ActSeeOneMchResMe (ActChgCrsTT1stDay + 136)
|
||||
#define ActSeeMyMchRes (ActChgCrsTT1stDay + 134)
|
||||
#define ActSeeOneMchResMe (ActChgCrsTT1stDay + 135)
|
||||
|
||||
#define ActReqSeeUsrMchRes (ActChgCrsTT1stDay + 137)
|
||||
#define ActSeeUsrMchRes (ActChgCrsTT1stDay + 138)
|
||||
#define ActSeeOneMchResOth (ActChgCrsTT1stDay + 139)
|
||||
#define ActChgVisResMchUsr (ActChgCrsTT1stDay + 140)
|
||||
#define ActReqSeeUsrMchRes (ActChgCrsTT1stDay + 136)
|
||||
#define ActSeeUsrMchRes (ActChgCrsTT1stDay + 137)
|
||||
#define ActSeeOneMchResOth (ActChgCrsTT1stDay + 138)
|
||||
#define ActChgVisResMchUsr (ActChgCrsTT1stDay + 139)
|
||||
|
||||
#define ActFrmNewGam (ActChgCrsTT1stDay + 141)
|
||||
#define ActEdiOneGam (ActChgCrsTT1stDay + 142)
|
||||
#define ActNewGam (ActChgCrsTT1stDay + 143)
|
||||
#define ActChgGam (ActChgCrsTT1stDay + 144)
|
||||
#define ActReqRemGam (ActChgCrsTT1stDay + 145)
|
||||
#define ActRemGam (ActChgCrsTT1stDay + 146)
|
||||
#define ActHidGam (ActChgCrsTT1stDay + 147)
|
||||
#define ActShoGam (ActChgCrsTT1stDay + 148)
|
||||
#define ActAddOneGamQst (ActChgCrsTT1stDay + 149)
|
||||
#define ActGamLstTstQst (ActChgCrsTT1stDay + 150)
|
||||
#define ActAddTstQstToGam (ActChgCrsTT1stDay + 151)
|
||||
#define ActReqRemGamQst (ActChgCrsTT1stDay + 152)
|
||||
#define ActRemGamQst (ActChgCrsTT1stDay + 153)
|
||||
#define ActUp_GamQst (ActChgCrsTT1stDay + 154)
|
||||
#define ActDwnGamQst (ActChgCrsTT1stDay + 155)
|
||||
#define ActFrmNewGam (ActChgCrsTT1stDay + 140)
|
||||
#define ActEdiOneGam (ActChgCrsTT1stDay + 141)
|
||||
#define ActNewGam (ActChgCrsTT1stDay + 142)
|
||||
#define ActChgGam (ActChgCrsTT1stDay + 143)
|
||||
#define ActReqRemGam (ActChgCrsTT1stDay + 144)
|
||||
#define ActRemGam (ActChgCrsTT1stDay + 145)
|
||||
#define ActHidGam (ActChgCrsTT1stDay + 146)
|
||||
#define ActShoGam (ActChgCrsTT1stDay + 147)
|
||||
#define ActAddOneGamQst (ActChgCrsTT1stDay + 148)
|
||||
#define ActGamLstTstQst (ActChgCrsTT1stDay + 149)
|
||||
#define ActAddTstQstToGam (ActChgCrsTT1stDay + 150)
|
||||
#define ActReqRemGamQst (ActChgCrsTT1stDay + 151)
|
||||
#define ActRemGamQst (ActChgCrsTT1stDay + 152)
|
||||
#define ActUp_GamQst (ActChgCrsTT1stDay + 153)
|
||||
#define ActDwnGamQst (ActChgCrsTT1stDay + 154)
|
||||
|
||||
#define ActSeeSvy (ActChgCrsTT1stDay + 156)
|
||||
#define ActAnsSvy (ActChgCrsTT1stDay + 157)
|
||||
#define ActFrmNewSvy (ActChgCrsTT1stDay + 158)
|
||||
#define ActEdiOneSvy (ActChgCrsTT1stDay + 159)
|
||||
#define ActNewSvy (ActChgCrsTT1stDay + 160)
|
||||
#define ActChgSvy (ActChgCrsTT1stDay + 161)
|
||||
#define ActReqRemSvy (ActChgCrsTT1stDay + 162)
|
||||
#define ActRemSvy (ActChgCrsTT1stDay + 163)
|
||||
#define ActReqRstSvy (ActChgCrsTT1stDay + 164)
|
||||
#define ActRstSvy (ActChgCrsTT1stDay + 165)
|
||||
#define ActHidSvy (ActChgCrsTT1stDay + 166)
|
||||
#define ActShoSvy (ActChgCrsTT1stDay + 167)
|
||||
#define ActEdiOneSvyQst (ActChgCrsTT1stDay + 168)
|
||||
#define ActRcvSvyQst (ActChgCrsTT1stDay + 169)
|
||||
#define ActReqRemSvyQst (ActChgCrsTT1stDay + 170)
|
||||
#define ActRemSvyQst (ActChgCrsTT1stDay + 171)
|
||||
#define ActSeeSvy (ActChgCrsTT1stDay + 155)
|
||||
#define ActAnsSvy (ActChgCrsTT1stDay + 156)
|
||||
#define ActFrmNewSvy (ActChgCrsTT1stDay + 157)
|
||||
#define ActEdiOneSvy (ActChgCrsTT1stDay + 158)
|
||||
#define ActNewSvy (ActChgCrsTT1stDay + 159)
|
||||
#define ActChgSvy (ActChgCrsTT1stDay + 160)
|
||||
#define ActReqRemSvy (ActChgCrsTT1stDay + 161)
|
||||
#define ActRemSvy (ActChgCrsTT1stDay + 162)
|
||||
#define ActReqRstSvy (ActChgCrsTT1stDay + 163)
|
||||
#define ActRstSvy (ActChgCrsTT1stDay + 164)
|
||||
#define ActHidSvy (ActChgCrsTT1stDay + 165)
|
||||
#define ActShoSvy (ActChgCrsTT1stDay + 166)
|
||||
#define ActEdiOneSvyQst (ActChgCrsTT1stDay + 167)
|
||||
#define ActRcvSvyQst (ActChgCrsTT1stDay + 168)
|
||||
#define ActReqRemSvyQst (ActChgCrsTT1stDay + 169)
|
||||
#define ActRemSvyQst (ActChgCrsTT1stDay + 170)
|
||||
|
||||
#define ActSeeOneExaAnn (ActChgCrsTT1stDay + 172)
|
||||
#define ActSeeDatExaAnn (ActChgCrsTT1stDay + 173)
|
||||
#define ActEdiExaAnn (ActChgCrsTT1stDay + 174)
|
||||
#define ActRcvExaAnn (ActChgCrsTT1stDay + 175)
|
||||
#define ActPrnExaAnn (ActChgCrsTT1stDay + 176)
|
||||
#define ActReqRemExaAnn (ActChgCrsTT1stDay + 177)
|
||||
#define ActRemExaAnn (ActChgCrsTT1stDay + 178)
|
||||
#define ActHidExaAnn (ActChgCrsTT1stDay + 179)
|
||||
#define ActShoExaAnn (ActChgCrsTT1stDay + 180)
|
||||
#define ActSeeOneExaAnn (ActChgCrsTT1stDay + 171)
|
||||
#define ActSeeDatExaAnn (ActChgCrsTT1stDay + 172)
|
||||
#define ActEdiExaAnn (ActChgCrsTT1stDay + 173)
|
||||
#define ActRcvExaAnn (ActChgCrsTT1stDay + 174)
|
||||
#define ActPrnExaAnn (ActChgCrsTT1stDay + 175)
|
||||
#define ActReqRemExaAnn (ActChgCrsTT1stDay + 176)
|
||||
#define ActRemExaAnn (ActChgCrsTT1stDay + 177)
|
||||
#define ActHidExaAnn (ActChgCrsTT1stDay + 178)
|
||||
#define ActShoExaAnn (ActChgCrsTT1stDay + 179)
|
||||
|
||||
/*****************************************************************************/
|
||||
/******************************** Files tab **********************************/
|
||||
|
|
|
@ -526,12 +526,12 @@ static void Agd_ShowEventsToday (Agd_AgendaType_t AgendaType)
|
|||
switch (AgendaType)
|
||||
{
|
||||
case Agd_MY_AGENDA_TODAY:
|
||||
Box_StartBoxTableShadow (NULL,Txt_Today,NULL,
|
||||
Box_BoxTableShadowBegin (NULL,Txt_Today,NULL,
|
||||
Hlp_PROFILE_Agenda,
|
||||
2);
|
||||
break;
|
||||
case Agd_ANOTHER_AGENDA_TODAY:
|
||||
Box_StartBoxTableShadow (NULL,Txt_Today,NULL,
|
||||
Box_BoxTableShadowBegin (NULL,Txt_Today,NULL,
|
||||
Hlp_PROFILE_Agenda_public_agenda,
|
||||
2);
|
||||
break;
|
||||
|
@ -549,7 +549,7 @@ static void Agd_ShowEventsToday (Agd_AgendaType_t AgendaType)
|
|||
Agd_ShowOneEvent (AgendaType,Gbl.Agenda.LstAgdCods[NumEvent]);
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
|
||||
/***** Free list of events *****/
|
||||
|
@ -1501,10 +1501,10 @@ void Agd_RequestCreatOrEditEvent (void)
|
|||
|
||||
/***** Begin box and table *****/
|
||||
if (ItsANewEvent)
|
||||
Box_StartBoxTable (NULL,Txt_New_event,NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_New_event,NULL,
|
||||
Hlp_PROFILE_Agenda_new_event,Box_NOT_CLOSABLE,2);
|
||||
else
|
||||
Box_StartBoxTable (NULL,Txt_Edit_event,NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_Edit_event,NULL,
|
||||
Hlp_PROFILE_Agenda_edit_event,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Event *****/
|
||||
|
@ -1563,9 +1563,9 @@ void Agd_RequestCreatOrEditEvent (void)
|
|||
|
||||
/***** End table, send button and end box *****/
|
||||
if (ItsANewEvent)
|
||||
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_event);
|
||||
Box_BoxTableWithButtonEnd (Btn_CREATE_BUTTON,Txt_Create_event);
|
||||
else
|
||||
Box_EndBoxTableWithButton (Btn_CONFIRM_BUTTON,Txt_Save_changes);
|
||||
Box_BoxTableWithButtonEnd (Btn_CONFIRM_BUTTON,Txt_Save_changes);
|
||||
|
||||
/***** End form *****/
|
||||
Frm_EndForm ();
|
||||
|
|
|
@ -404,7 +404,7 @@ void Ann_ShowFormAnnouncement (void)
|
|||
Frm_StartForm (ActRcvAnn);
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_New_announcement,NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_New_announcement,NULL,
|
||||
Hlp_MESSAGES_Announcements,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Announcement subject and body *****/
|
||||
|
@ -435,7 +435,7 @@ void Ann_ShowFormAnnouncement (void)
|
|||
HTM_TR_End ();
|
||||
|
||||
/***** End table, send button and end box *****/
|
||||
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_announcement);
|
||||
Box_BoxTableWithButtonEnd (Btn_CREATE_BUTTON,Txt_Create_announcement);
|
||||
|
||||
/***** End form *****/
|
||||
Frm_EndForm ();
|
||||
|
|
|
@ -1155,10 +1155,10 @@ void Asg_RequestCreatOrEditAsg (void)
|
|||
|
||||
/***** Begin box and table *****/
|
||||
if (ItsANewAssignment)
|
||||
Box_StartBoxTable (NULL,Txt_New_assignment,NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_New_assignment,NULL,
|
||||
Hlp_ASSESSMENT_Assignments_new_assignment,Box_NOT_CLOSABLE,2);
|
||||
else
|
||||
Box_StartBoxTable (NULL,
|
||||
Box_BoxTableBegin (NULL,
|
||||
Asg.Title[0] ? Asg.Title :
|
||||
Txt_Edit_assignment,
|
||||
NULL,
|
||||
|
@ -1224,9 +1224,9 @@ void Asg_RequestCreatOrEditAsg (void)
|
|||
|
||||
/***** End table, send button and end box *****/
|
||||
if (ItsANewAssignment)
|
||||
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_assignment);
|
||||
Box_BoxTableWithButtonEnd (Btn_CREATE_BUTTON,Txt_Create_assignment);
|
||||
else
|
||||
Box_EndBoxTableWithButton (Btn_CONFIRM_BUTTON,Txt_Save_changes);
|
||||
Box_BoxTableWithButtonEnd (Btn_CONFIRM_BUTTON,Txt_Save_changes);
|
||||
|
||||
/***** End form *****/
|
||||
Frm_EndForm ();
|
||||
|
@ -1260,7 +1260,7 @@ static void Asg_ShowLstGrpsToEditAssignment (long AsgCod)
|
|||
HTM_TD_End ();
|
||||
|
||||
HTM_TD_Begin ("class=\"LT\"");
|
||||
Box_StartBoxTable ("100%",NULL,NULL,
|
||||
Box_BoxTableBegin ("100%",NULL,NULL,
|
||||
Hlp_USERS_Groups,Box_NOT_CLOSABLE,0);
|
||||
|
||||
/***** First row: checkbox to select the whole course *****/
|
||||
|
@ -1287,7 +1287,7 @@ static void Asg_ShowLstGrpsToEditAssignment (long AsgCod)
|
|||
AsgCod,Grp_ASSIGNMENT);
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
HTM_TD_End ();
|
||||
|
||||
HTM_TR_End ();
|
||||
|
|
|
@ -1092,10 +1092,10 @@ void Att_RequestCreatOrEditAttEvent (void)
|
|||
|
||||
/***** Begin box and table *****/
|
||||
if (ItsANewAttEvent)
|
||||
Box_StartBoxTable (NULL,Txt_New_event,NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_New_event,NULL,
|
||||
Hlp_USERS_Attendance_new_event,Box_NOT_CLOSABLE,2);
|
||||
else
|
||||
Box_StartBoxTable (NULL,
|
||||
Box_BoxTableBegin (NULL,
|
||||
Att.Title[0] ? Att.Title :
|
||||
Txt_Edit_event,
|
||||
NULL,
|
||||
|
@ -1163,9 +1163,9 @@ void Att_RequestCreatOrEditAttEvent (void)
|
|||
|
||||
/***** End table, send button and end box *****/
|
||||
if (ItsANewAttEvent)
|
||||
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_event);
|
||||
Box_BoxTableWithButtonEnd (Btn_CREATE_BUTTON,Txt_Create_event);
|
||||
else
|
||||
Box_EndBoxTableWithButton (Btn_CONFIRM_BUTTON,Txt_Save_changes);
|
||||
Box_BoxTableWithButtonEnd (Btn_CONFIRM_BUTTON,Txt_Save_changes);
|
||||
|
||||
/***** End form *****/
|
||||
Frm_EndForm ();
|
||||
|
@ -1199,7 +1199,7 @@ static void Att_ShowLstGrpsToEditAttEvent (long AttCod)
|
|||
HTM_TD_End ();
|
||||
|
||||
HTM_TD_Begin ("class=\"LT\"");
|
||||
Box_StartBoxTable ("100%",NULL,NULL,
|
||||
Box_BoxTableBegin ("100%",NULL,NULL,
|
||||
NULL,Box_NOT_CLOSABLE,0);
|
||||
|
||||
/***** First row: checkbox to select the whole course *****/
|
||||
|
@ -1226,7 +1226,7 @@ static void Att_ShowLstGrpsToEditAttEvent (long AttCod)
|
|||
AttCod,Grp_ATT_EVENT);
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
HTM_TD_End ();
|
||||
HTM_TR_End ();
|
||||
}
|
||||
|
@ -1828,14 +1828,14 @@ void Att_SeeOneAttEvent (void)
|
|||
Gbl.AttEvents.CurrentPage = Pag_GetParamPagNum (Pag_ATT_EVENTS);
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_Event,NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_Event,NULL,
|
||||
Hlp_USERS_Attendance,Box_NOT_CLOSABLE,2);
|
||||
|
||||
Att.AttCod = Gbl.AttEvents.AttCod;
|
||||
Att_ShowOneAttEvent (&Att,true);
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
|
||||
switch (Gbl.Usrs.Me.Role.Logged)
|
||||
{
|
||||
|
@ -2889,7 +2889,10 @@ static void Att_GetListSelectedAttCods (char **StrAttCodsSelected)
|
|||
NumAttEvent < Gbl.AttEvents.Num;
|
||||
NumAttEvent++)
|
||||
if (Gbl.AttEvents.Lst[NumAttEvent].AttCod == AttCod)
|
||||
{
|
||||
Gbl.AttEvents.Lst[NumAttEvent].Selected = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
else // No events selected
|
||||
|
@ -3404,7 +3407,7 @@ static void Att_ListStdsWithAttEventsDetails (unsigned NumUsrsInList,
|
|||
HTM_SECTION_Begin (Att_ATTENDANCE_DETAILS_ID);
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_Details,NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_Details,NULL,
|
||||
NULL,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** List students with attendance details *****/
|
||||
|
@ -3422,7 +3425,7 @@ static void Att_ListStdsWithAttEventsDetails (unsigned NumUsrsInList,
|
|||
}
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
|
||||
/***** End section with attendance details *****/
|
||||
HTM_SECTION_End ();
|
||||
|
|
|
@ -845,7 +845,7 @@ static void Ban_PutFormToCreateBanner (void)
|
|||
Frm_StartForm (ActNewBan);
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_New_banner,NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_New_banner,NULL,
|
||||
Hlp_SYSTEM_Banners_edit,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Write heading *****/
|
||||
|
@ -889,7 +889,7 @@ static void Ban_PutFormToCreateBanner (void)
|
|||
HTM_TR_End ();
|
||||
|
||||
/***** End table, send button and end box *****/
|
||||
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_banner);
|
||||
Box_BoxTableWithButtonEnd (Btn_CREATE_BUTTON,Txt_Create_banner);
|
||||
|
||||
/***** End form *****/
|
||||
Frm_EndForm ();
|
||||
|
|
26
swad_box.c
26
swad_box.c
|
@ -62,17 +62,17 @@ extern struct Globals Gbl;
|
|||
/***************************** Private prototypes ****************************/
|
||||
/*****************************************************************************/
|
||||
|
||||
static void Box_StartBoxInternal (const char *Width,const char *Title,
|
||||
static void Box_BoxInternalBegin (const char *Width,const char *Title,
|
||||
void (*FunctionToDrawContextualIcons) (void),
|
||||
const char *HelpLink,Box_Closable_t Closable,
|
||||
const char *ClassFrame);
|
||||
|
||||
/*****************************************************************************/
|
||||
/******************* Start and end a table with rounded box ******************/
|
||||
/******************* Begin and end a table with rounded box ******************/
|
||||
/*****************************************************************************/
|
||||
// CellPadding must be 0, 1, 2, 4 or 8
|
||||
|
||||
void Box_StartBoxTable (const char *Width,const char *Title,
|
||||
void Box_BoxTableBegin (const char *Width,const char *Title,
|
||||
void (*FunctionToDrawContextualIcons) (void),
|
||||
const char *HelpLink,Box_Closable_t Closable,
|
||||
unsigned CellPadding) // CellPadding must be 0, 1, 2, 5 or 10
|
||||
|
@ -82,12 +82,12 @@ void Box_StartBoxTable (const char *Width,const char *Title,
|
|||
HTM_TABLE_BeginWidePadding (CellPadding);
|
||||
}
|
||||
|
||||
void Box_StartBoxTableShadow (const char *Width,const char *Title,
|
||||
void Box_BoxTableShadowBegin (const char *Width,const char *Title,
|
||||
void (*FunctionToDrawContextualIcons) (void),
|
||||
const char *HelpLink,
|
||||
unsigned CellPadding) // CellPadding must be 0, 1, 2, 5 or 10
|
||||
{
|
||||
Box_StartBoxShadow (Width,Title,
|
||||
Box_BoxShadowBegin (Width,Title,
|
||||
FunctionToDrawContextualIcons,
|
||||
HelpLink);
|
||||
HTM_TABLE_BeginWidePadding (CellPadding);
|
||||
|
@ -97,24 +97,24 @@ void Box_BoxBegin (const char *Width,const char *Title,
|
|||
void (*FunctionToDrawContextualIcons) (void),
|
||||
const char *HelpLink,Box_Closable_t Closable)
|
||||
{
|
||||
Box_StartBoxInternal (Width,Title,
|
||||
Box_BoxInternalBegin (Width,Title,
|
||||
FunctionToDrawContextualIcons,
|
||||
HelpLink,Closable,
|
||||
"FRAME");
|
||||
}
|
||||
|
||||
void Box_StartBoxShadow (const char *Width,const char *Title,
|
||||
void Box_BoxShadowBegin (const char *Width,const char *Title,
|
||||
void (*FunctionToDrawContextualIcons) (void),
|
||||
const char *HelpLink)
|
||||
{
|
||||
Box_StartBoxInternal (Width,Title,
|
||||
Box_BoxInternalBegin (Width,Title,
|
||||
FunctionToDrawContextualIcons,
|
||||
HelpLink,Box_NOT_CLOSABLE,
|
||||
"FRAME_SHADOW");
|
||||
}
|
||||
|
||||
// Return pointer to box id string
|
||||
static void Box_StartBoxInternal (const char *Width,const char *Title,
|
||||
static void Box_BoxInternalBegin (const char *Width,const char *Title,
|
||||
void (*FunctionToDrawContextualIcons) (void),
|
||||
const char *HelpLink,Box_Closable_t Closable,
|
||||
const char *ClassFrame)
|
||||
|
@ -202,19 +202,19 @@ static void Box_StartBoxInternal (const char *Width,const char *Title,
|
|||
}
|
||||
}
|
||||
|
||||
void Box_EndBoxTable (void)
|
||||
void Box_BoxTableEnd (void)
|
||||
{
|
||||
HTM_TABLE_End ();
|
||||
Box_BoxEnd ();
|
||||
}
|
||||
|
||||
void Box_EndBoxTableWithButton (Btn_Button_t Button,const char *TxtButton)
|
||||
void Box_BoxTableWithButtonEnd (Btn_Button_t Button,const char *TxtButton)
|
||||
{
|
||||
HTM_TABLE_End ();
|
||||
Box_EndBoxWithButton (Button,TxtButton);
|
||||
Box_BoxWithButtonEnd (Button,TxtButton);
|
||||
}
|
||||
|
||||
void Box_EndBoxWithButton (Btn_Button_t Button,const char *TxtButton)
|
||||
void Box_BoxWithButtonEnd (Btn_Button_t Button,const char *TxtButton)
|
||||
{
|
||||
Btn_PutButton (Button,TxtButton);
|
||||
Box_BoxEnd ();
|
||||
|
|
12
swad_box.h
12
swad_box.h
|
@ -51,23 +51,23 @@ typedef enum
|
|||
/****************************** Public prototypes ****************************/
|
||||
/*****************************************************************************/
|
||||
|
||||
void Box_StartBoxTable (const char *Width,const char *Title,
|
||||
void Box_BoxTableBegin (const char *Width,const char *Title,
|
||||
void (*FunctionToDrawContextualIcons) (void),
|
||||
const char *HelpLink,Box_Closable_t Closable,
|
||||
unsigned CellPadding);
|
||||
void Box_BoxBegin (const char *Width,const char *Title,
|
||||
void (*FunctionToDrawContextualIcons) (void),
|
||||
const char *HelpLink,Box_Closable_t Closable);
|
||||
void Box_StartBoxShadow (const char *Width,const char *Title,
|
||||
void Box_BoxShadowBegin (const char *Width,const char *Title,
|
||||
void (*FunctionToDrawContextualIcons) (void),
|
||||
const char *HelpLink);
|
||||
void Box_StartBoxTableShadow (const char *Width,const char *Title,
|
||||
void Box_BoxTableShadowBegin (const char *Width,const char *Title,
|
||||
void (*FunctionToDrawContextualIcons) (void),
|
||||
const char *HelpLink,
|
||||
unsigned CellPadding);
|
||||
void Box_EndBoxTable (void);
|
||||
void Box_EndBoxTableWithButton (Btn_Button_t Button,const char *TxtButton);
|
||||
void Box_EndBoxWithButton (Btn_Button_t Button,const char *TxtButton);
|
||||
void Box_BoxTableEnd (void);
|
||||
void Box_BoxTableWithButtonEnd (Btn_Button_t Button,const char *TxtButton);
|
||||
void Box_BoxWithButtonEnd (Btn_Button_t Button,const char *TxtButton);
|
||||
void Box_BoxEnd (void);
|
||||
|
||||
#endif
|
||||
|
|
|
@ -178,7 +178,7 @@ void Ctr_SeeCtrWithPendingDegs (void)
|
|||
if (NumCtrs)
|
||||
{
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_Centres_with_pending_degrees,NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_Centres_with_pending_degrees,NULL,
|
||||
Hlp_SYSTEM_Hierarchy_pending,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Wrtie heading *****/
|
||||
|
@ -223,7 +223,7 @@ void Ctr_SeeCtrWithPendingDegs (void)
|
|||
}
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
else
|
||||
Ale_ShowAlert (Ale_INFO,Txt_There_are_no_centres_with_requests_for_degrees_to_be_confirmed);
|
||||
|
@ -2470,7 +2470,7 @@ static void Ctr_PutFormToCreateCentre (void)
|
|||
Lay_NoPermissionExit ();
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_New_centre,NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_New_centre,NULL,
|
||||
NULL,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Write heading *****/
|
||||
|
@ -2552,7 +2552,7 @@ static void Ctr_PutFormToCreateCentre (void)
|
|||
HTM_TR_End ();
|
||||
|
||||
/***** End table, send button and end box *****/
|
||||
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_centre);
|
||||
Box_BoxTableWithButtonEnd (Btn_CREATE_BUTTON,Txt_Create_centre);
|
||||
|
||||
/***** End form *****/
|
||||
Frm_EndForm ();
|
||||
|
@ -2887,7 +2887,7 @@ void Ctr_ListCtrsFound (MYSQL_RES **mysql_res,unsigned NumCtrs)
|
|||
"%u %s",
|
||||
NumCtrs,(NumCtrs == 1) ? Txt_centre :
|
||||
Txt_centres);
|
||||
Box_StartBoxTable (NULL,Gbl.Title,NULL,
|
||||
Box_BoxTableBegin (NULL,Gbl.Title,NULL,
|
||||
NULL,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Write heading *****/
|
||||
|
@ -2912,7 +2912,7 @@ void Ctr_ListCtrsFound (MYSQL_RES **mysql_res,unsigned NumCtrs)
|
|||
}
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
|
||||
/***** Free structure that stores the query result *****/
|
||||
|
|
|
@ -490,7 +490,7 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - *
|
|||
En OpenSWAD:
|
||||
ps2pdf source.ps destination.pdf
|
||||
*/
|
||||
#define Log_PLATFORM_VERSION "SWAD 19.77 (2019-11-25)"
|
||||
#define Log_PLATFORM_VERSION "SWAD 19.78 (2019-11-25)"
|
||||
#define CSS_FILE "swad19.74.3.css"
|
||||
#define JS_FILE "swad19.70.js"
|
||||
/*
|
||||
|
@ -498,6 +498,10 @@ ps2pdf source.ps destination.pdf
|
|||
// TODO: Impedir la creación y edición de proyectos si no son editables.
|
||||
// TODO: En cada juego, poder listar los resultados en una tabla como la de resultados globales
|
||||
|
||||
Version 19.78: Nov 25, 2019 Filtering of match results by games. (247104 lines)
|
||||
1 change necessary in database:
|
||||
UPDATE actions SET Obsolete='Y' WHERE ActCod=1795;
|
||||
|
||||
Version 19.77: Nov 25, 2019 Changes in database related to timeline. (246877 lines)
|
||||
7 changes necessary in database:
|
||||
RENAME TABLE social_comments TO tl_comments;
|
||||
|
|
|
@ -257,7 +257,7 @@ void Cht_ShowListOfChatRoomsWithUsrs (void)
|
|||
if (NumRows > 0) // If not empty chat rooms found
|
||||
{
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_Rooms_with_users,NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_Rooms_with_users,NULL,
|
||||
NULL,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Write heading *****/
|
||||
|
@ -290,7 +290,7 @@ void Cht_ShowListOfChatRoomsWithUsrs (void)
|
|||
}
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
|
||||
/***** Free structure that stores the query result *****/
|
||||
|
|
|
@ -887,7 +887,7 @@ static void Cla_PutFormToCreateClassroom (void)
|
|||
Frm_StartForm (ActNewCla);
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_New_classroom,NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_New_classroom,NULL,
|
||||
NULL,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Write heading *****/
|
||||
|
@ -931,7 +931,7 @@ static void Cla_PutFormToCreateClassroom (void)
|
|||
HTM_TR_End ();
|
||||
|
||||
/***** End table, send button and end box *****/
|
||||
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_classroom);
|
||||
Box_BoxTableWithButtonEnd (Btn_CREATE_BUTTON,Txt_Create_classroom);
|
||||
|
||||
/***** End form *****/
|
||||
Frm_EndForm ();
|
||||
|
|
|
@ -68,7 +68,7 @@ void Coo_EditMyPrefsOnCookies (void)
|
|||
HTM_SECTION_Begin (Coo_COOKIES_ID);
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_Cookies,Coo_PutIconsCookies,
|
||||
Box_BoxTableBegin (NULL,Txt_Cookies,Coo_PutIconsCookies,
|
||||
Hlp_PROFILE_Settings_cookies,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Edit my preference about cookies *****/
|
||||
|
@ -91,7 +91,7 @@ void Coo_EditMyPrefsOnCookies (void)
|
|||
HTM_DIV_End ();
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
|
||||
/***** End section with preferences about cookies *****/
|
||||
HTM_SECTION_End ();
|
||||
|
|
|
@ -151,7 +151,7 @@ void Cty_SeeCtyWithPendingInss (void)
|
|||
if (NumCtys)
|
||||
{
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_Countries_with_pending_institutions,NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_Countries_with_pending_institutions,NULL,
|
||||
Hlp_SYSTEM_Hierarchy_pending,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Write heading *****/
|
||||
|
@ -198,7 +198,7 @@ void Cty_SeeCtyWithPendingInss (void)
|
|||
}
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
else
|
||||
Ale_ShowAlert (Ale_INFO,Txt_There_are_no_countries_with_requests_for_institutions_to_be_confirmed);
|
||||
|
@ -531,7 +531,7 @@ void Cty_ListCountries2 (void)
|
|||
Hie_WriteMenuHierarchy ();
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_Countries,Cty_PutIconsListingCountries,
|
||||
Box_BoxTableBegin (NULL,Txt_Countries,Cty_PutIconsListingCountries,
|
||||
Hlp_SYSTEM_Countries,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Write heading *****/
|
||||
|
@ -623,7 +623,7 @@ void Cty_ListCountries2 (void)
|
|||
HTM_TR_End ();
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
|
||||
/***** Div for Google Geochart *****/
|
||||
if (Gbl.Action.Act == ActSeeCty)
|
||||
|
@ -2030,7 +2030,7 @@ static void Cty_PutFormToCreateCountry (void)
|
|||
Frm_StartForm (ActNewCty);
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_New_country,NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_New_country,NULL,
|
||||
NULL,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Write heading *****/
|
||||
|
@ -2108,7 +2108,7 @@ static void Cty_PutFormToCreateCountry (void)
|
|||
}
|
||||
|
||||
/***** End table, send button and end box *****/
|
||||
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_country);
|
||||
Box_BoxTableWithButtonEnd (Btn_CREATE_BUTTON,Txt_Create_country);
|
||||
|
||||
/***** End form *****/
|
||||
Frm_EndForm ();
|
||||
|
@ -2432,7 +2432,7 @@ void Cty_ListCtysFound (MYSQL_RES **mysql_res,unsigned NumCtys)
|
|||
"%u %s",
|
||||
NumCtys,NumCtys == 1 ? Txt_country :
|
||||
Txt_countries);
|
||||
Box_StartBoxTable (NULL,Gbl.Title,NULL,
|
||||
Box_BoxTableBegin (NULL,Gbl.Title,NULL,
|
||||
NULL,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Write heading *****/
|
||||
|
@ -2457,7 +2457,7 @@ void Cty_ListCtysFound (MYSQL_RES **mysql_res,unsigned NumCtys)
|
|||
}
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
|
||||
/***** Free structure that stores the query result *****/
|
||||
|
|
|
@ -1636,7 +1636,7 @@ static void Crs_PutFormToCreateCourse (void)
|
|||
Lay_NoPermissionExit ();
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_New_course,NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_New_course,NULL,
|
||||
NULL,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Write heading *****/
|
||||
|
@ -1706,7 +1706,7 @@ static void Crs_PutFormToCreateCourse (void)
|
|||
HTM_TR_End ();
|
||||
|
||||
/***** End table, send button and end box *****/
|
||||
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_course);
|
||||
Box_BoxTableWithButtonEnd (Btn_CREATE_BUTTON,Txt_Create_course);
|
||||
|
||||
/***** End form *****/
|
||||
Frm_EndForm ();
|
||||
|
@ -2987,7 +2987,7 @@ void Crs_GetAndWriteCrssOfAUsr (const struct UsrData *UsrDat,Rol_Role_t Role)
|
|||
if (NumCrss)
|
||||
{
|
||||
/* Begin box and table */
|
||||
Box_StartBoxTable ("100%",NULL,NULL,
|
||||
Box_BoxTableBegin ("100%",NULL,NULL,
|
||||
NULL,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/* Heading row */
|
||||
|
@ -3029,7 +3029,7 @@ void Crs_GetAndWriteCrssOfAUsr (const struct UsrData *UsrDat,Rol_Role_t Role)
|
|||
}
|
||||
|
||||
/* End table and box */
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
|
||||
/***** Free structure that stores the query result *****/
|
||||
|
@ -3060,7 +3060,7 @@ void Crs_ListCrssFound (MYSQL_RES **mysql_res,unsigned NumCrss)
|
|||
"%u %s",
|
||||
NumCrss,(NumCrss == 1) ? Txt_course :
|
||||
Txt_courses);
|
||||
Box_StartBoxTable (NULL,Gbl.Title,NULL,
|
||||
Box_BoxTableBegin (NULL,Gbl.Title,NULL,
|
||||
NULL,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Heading row *****/
|
||||
|
@ -3088,7 +3088,7 @@ void Crs_ListCrssFound (MYSQL_RES **mysql_res,unsigned NumCrss)
|
|||
}
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
|
||||
/***** Free structure that stores the query result *****/
|
||||
|
@ -3291,7 +3291,7 @@ void Crs_AskRemoveOldCrss (void)
|
|||
HTM_LABEL_End ();
|
||||
|
||||
/***** Send button and end box *****/
|
||||
Box_EndBoxWithButton (Btn_REMOVE_BUTTON,Txt_Eliminate);
|
||||
Box_BoxWithButtonEnd (Btn_REMOVE_BUTTON,Txt_Eliminate);
|
||||
|
||||
/***** End form *****/
|
||||
Frm_EndForm ();
|
||||
|
|
|
@ -181,7 +181,7 @@ void Deg_SeeDegWithPendingCrss (void)
|
|||
if (NumDegs)
|
||||
{
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_Degrees_with_pending_courses,NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_Degrees_with_pending_courses,NULL,
|
||||
Hlp_SYSTEM_Hierarchy_pending,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Write heading *****/
|
||||
|
@ -227,7 +227,7 @@ void Deg_SeeDegWithPendingCrss (void)
|
|||
}
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
else
|
||||
Ale_ShowAlert (Ale_INFO,Txt_There_are_no_degrees_with_requests_for_courses_to_be_confirmed);
|
||||
|
@ -925,7 +925,7 @@ static void Deg_PutFormToCreateDegree (void)
|
|||
Lay_NoPermissionExit ();
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_New_degree,NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_New_degree,NULL,
|
||||
NULL,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Write heading *****/
|
||||
|
@ -997,7 +997,7 @@ static void Deg_PutFormToCreateDegree (void)
|
|||
HTM_TR_End ();
|
||||
|
||||
/***** End table, send button and end box *****/
|
||||
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_degree);
|
||||
Box_BoxTableWithButtonEnd (Btn_CREATE_BUTTON,Txt_Create_degree);
|
||||
|
||||
/***** End form *****/
|
||||
Frm_EndForm ();
|
||||
|
@ -2544,7 +2544,7 @@ void Deg_ListDegsFound (MYSQL_RES **mysql_res,unsigned NumDegs)
|
|||
"%u %s",
|
||||
NumDegs,(NumDegs == 1) ? Txt_degree :
|
||||
Txt_degrees);
|
||||
Box_StartBoxTable (NULL,Gbl.Title,NULL,
|
||||
Box_BoxTableBegin (NULL,Gbl.Title,NULL,
|
||||
NULL,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Write heading *****/
|
||||
|
@ -2569,7 +2569,7 @@ void Deg_ListDegsFound (MYSQL_RES **mysql_res,unsigned NumDegs)
|
|||
}
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
|
||||
/***** Free structure that stores the query result *****/
|
||||
|
|
|
@ -454,7 +454,7 @@ static void DT_PutFormToCreateDegreeType (void)
|
|||
Frm_StartForm (ActNewDegTyp);
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_New_type_of_degree,NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_New_type_of_degree,NULL,
|
||||
NULL,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Write heading *****/
|
||||
|
@ -484,7 +484,7 @@ static void DT_PutFormToCreateDegreeType (void)
|
|||
HTM_TR_End ();
|
||||
|
||||
/***** End table, send button and end box *****/
|
||||
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_type_of_degree);
|
||||
Box_BoxTableWithButtonEnd (Btn_CREATE_BUTTON,Txt_Create_type_of_degree);
|
||||
|
||||
/***** End form *****/
|
||||
Frm_EndForm ();
|
||||
|
|
|
@ -114,7 +114,7 @@ void Dpt_SeeDepts (void)
|
|||
snprintf (Gbl.Title,sizeof (Gbl.Title),
|
||||
Txt_Departments_of_INSTITUTION_X,
|
||||
Gbl.Hierarchy.Ins.FullName);
|
||||
Box_StartBoxTable (NULL,Gbl.Title,
|
||||
Box_BoxTableBegin (NULL,Gbl.Title,
|
||||
Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM ? Dpt_PutIconToEditDpts :
|
||||
NULL,
|
||||
Hlp_INSTITUTION_Departments,Box_NOT_CLOSABLE,2);
|
||||
|
@ -207,7 +207,7 @@ void Dpt_SeeDepts (void)
|
|||
HTM_TR_End ();
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
|
||||
/***** Free list of departments *****/
|
||||
Dpt_FreeListDepartments ();
|
||||
|
@ -895,7 +895,7 @@ static void Dpt_PutFormToCreateDepartment (void)
|
|||
Frm_StartForm (ActNewDpt);
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_New_department,NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_New_department,NULL,
|
||||
NULL,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Write heading *****/
|
||||
|
@ -946,7 +946,7 @@ static void Dpt_PutFormToCreateDepartment (void)
|
|||
HTM_TR_End ();
|
||||
|
||||
/***** End table, send button and end box *****/
|
||||
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_department);
|
||||
Box_BoxTableWithButtonEnd (Btn_CREATE_BUTTON,Txt_Create_department);
|
||||
|
||||
/***** End form *****/
|
||||
Frm_EndForm ();
|
||||
|
|
|
@ -761,7 +761,7 @@ static void Enr_ShowFormRegRemSeveralUsrs (Rol_Role_t Role)
|
|||
Pwd_AskForConfirmationOnDangerousAction ();
|
||||
|
||||
/***** Send button and end box *****/
|
||||
Box_EndBoxWithButton (Btn_CONFIRM_BUTTON,Txt_Confirm);
|
||||
Box_BoxWithButtonEnd (Btn_CONFIRM_BUTTON,Txt_Confirm);
|
||||
|
||||
/***** End form *****/
|
||||
Frm_EndForm ();
|
||||
|
@ -819,7 +819,7 @@ void Enr_AskRemoveOldUsrs (void)
|
|||
HTM_LABEL_End ();
|
||||
|
||||
/***** Send button and end box *****/
|
||||
Box_EndBoxWithButton (Btn_REMOVE_BUTTON,Txt_Eliminate);
|
||||
Box_BoxWithButtonEnd (Btn_REMOVE_BUTTON,Txt_Eliminate);
|
||||
|
||||
/***** End form *****/
|
||||
Frm_EndForm ();
|
||||
|
|
|
@ -1020,7 +1020,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod,
|
|||
Ale_ShowAlerts (Anchor);
|
||||
|
||||
/* Start highlighted box */
|
||||
Box_StartBoxShadow (Width,NULL,FunctionToDrawContextualIcons,HelpLink);
|
||||
Box_BoxShadowBegin (Width,NULL,FunctionToDrawContextualIcons,HelpLink);
|
||||
}
|
||||
else // Don't highlight
|
||||
/* Start normal box */
|
||||
|
@ -1469,11 +1469,11 @@ static void Exa_ShowExamAnnouncement (long ExaCod,
|
|||
|
||||
/***** End table, send button and end box *****/
|
||||
if (TypeViewExamAnnouncement == Exa_FORM_VIEW)
|
||||
Box_EndBoxTableWithButton ((ExaCod > 0) ? Btn_CONFIRM_BUTTON :
|
||||
Box_BoxTableWithButtonEnd ((ExaCod > 0) ? Btn_CONFIRM_BUTTON :
|
||||
Btn_CREATE_BUTTON,
|
||||
Txt_Publish_announcement_OF_EXAM);
|
||||
else
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
|
||||
/***** Show QR code *****/
|
||||
if (TypeViewExamAnnouncement == Exa_PRINT_VIEW)
|
||||
|
|
118
swad_figure.c
118
swad_figure.c
|
@ -238,7 +238,7 @@ void Fig_ReqShowFigures (void)
|
|||
HTM_LABEL_End ();
|
||||
|
||||
/***** Send button and end box *****/
|
||||
Box_EndBoxWithButton (Btn_CONFIRM_BUTTON,Txt_Show_statistic);
|
||||
Box_BoxWithButtonEnd (Btn_CONFIRM_BUTTON,Txt_Show_statistic);
|
||||
|
||||
/***** End form *****/
|
||||
Frm_EndForm ();
|
||||
|
@ -366,7 +366,7 @@ static void Fig_GetAndShowUsersStats (void)
|
|||
extern const char *Txt_Average_number_of_users_belonging_to_a_course;
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_FIGURE_TYPES[Fig_USERS],NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_FIGURE_TYPES[Fig_USERS],NULL,
|
||||
Hlp_ANALYTICS_Figures_users,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Write heading *****/
|
||||
|
@ -391,7 +391,7 @@ static void Fig_GetAndShowUsersStats (void)
|
|||
Fig_GetAndShowNumUsrsNotBelongingToAnyCrs (); // Users not beloging to any course
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -494,7 +494,7 @@ static void Fig_GetAndShowUsersRanking (void)
|
|||
extern const char *Txt_Followers;
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_FIGURE_TYPES[Fig_USERS_RANKING],NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_FIGURE_TYPES[Fig_USERS_RANKING],NULL,
|
||||
Hlp_ANALYTICS_Figures_ranking,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Write heading *****/
|
||||
|
@ -544,7 +544,7 @@ static void Fig_GetAndShowUsersRanking (void)
|
|||
HTM_TR_End ();
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -559,7 +559,7 @@ static void Fig_GetAndShowHierarchyStats (void)
|
|||
Rol_Role_t Role;
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_FIGURE_TYPES[Fig_HIERARCHY],NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_FIGURE_TYPES[Fig_HIERARCHY],NULL,
|
||||
Hlp_ANALYTICS_Figures_hierarchy,Box_NOT_CLOSABLE,2);
|
||||
|
||||
Fig_WriteHeadHierarchy ();
|
||||
|
@ -574,7 +574,7 @@ static void Fig_GetAndShowHierarchyStats (void)
|
|||
Fig_GetAndShowHierarchyTotal ();
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -1051,7 +1051,7 @@ static void Fig_GetAndShowInssOrderedByNumCtrs (void)
|
|||
unsigned NumInss = 0;
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable ("100%",Txt_Institutions_by_number_of_centres,NULL,
|
||||
Box_BoxTableBegin ("100%",Txt_Institutions_by_number_of_centres,NULL,
|
||||
NULL,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Get institutions ordered by number of centres *****/
|
||||
|
@ -1101,7 +1101,7 @@ static void Fig_GetAndShowInssOrderedByNumCtrs (void)
|
|||
DB_FreeMySQLResult (&mysql_res);
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -1116,7 +1116,7 @@ static void Fig_GetAndShowInssOrderedByNumDegs (void)
|
|||
unsigned NumInss = 0;
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable ("100%",Txt_Institutions_by_number_of_degrees,NULL,
|
||||
Box_BoxTableBegin ("100%",Txt_Institutions_by_number_of_degrees,NULL,
|
||||
NULL,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Get institutions ordered by number of degrees *****/
|
||||
|
@ -1169,7 +1169,7 @@ static void Fig_GetAndShowInssOrderedByNumDegs (void)
|
|||
DB_FreeMySQLResult (&mysql_res);
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -1184,7 +1184,7 @@ static void Fig_GetAndShowInssOrderedByNumCrss (void)
|
|||
unsigned NumInss = 0;
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable ("100%",Txt_Institutions_by_number_of_courses,NULL,
|
||||
Box_BoxTableBegin ("100%",Txt_Institutions_by_number_of_courses,NULL,
|
||||
NULL,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Get institutions ordered by number of courses *****/
|
||||
|
@ -1240,7 +1240,7 @@ static void Fig_GetAndShowInssOrderedByNumCrss (void)
|
|||
DB_FreeMySQLResult (&mysql_res);
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -1255,7 +1255,7 @@ static void Fig_GetAndShowInssOrderedByNumUsrsInCrss (void)
|
|||
unsigned NumInss = 0;
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable ("100%",Txt_Institutions_by_number_of_users_in_courses,NULL,
|
||||
Box_BoxTableBegin ("100%",Txt_Institutions_by_number_of_users_in_courses,NULL,
|
||||
NULL,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Get institutions ordered by number of users in courses *****/
|
||||
|
@ -1314,7 +1314,7 @@ static void Fig_GetAndShowInssOrderedByNumUsrsInCrss (void)
|
|||
DB_FreeMySQLResult (&mysql_res);
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -1330,7 +1330,7 @@ static void Fig_GetAndShowInssOrderedByNumUsrsWhoClaimToBelongToThem (void)
|
|||
unsigned NumInss;
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable ("100%",Txt_Institutions_by_number_of_users_who_claim_to_belong_to_them,
|
||||
Box_BoxTableBegin ("100%",Txt_Institutions_by_number_of_users_who_claim_to_belong_to_them,
|
||||
NULL,
|
||||
NULL,Box_NOT_CLOSABLE,2);
|
||||
|
||||
|
@ -1383,7 +1383,7 @@ static void Fig_GetAndShowInssOrderedByNumUsrsWhoClaimToBelongToThem (void)
|
|||
DB_FreeMySQLResult (&mysql_res);
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -2759,7 +2759,7 @@ static void Fig_GetAndShowOERsStats (void)
|
|||
unsigned long NumFiles[2];
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_FIGURE_TYPES[Fig_OER],NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_FIGURE_TYPES[Fig_OER],NULL,
|
||||
Hlp_ANALYTICS_Figures_open_educational_resources_oer,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Write table heading *****/
|
||||
|
@ -2795,7 +2795,7 @@ static void Fig_GetAndShowOERsStats (void)
|
|||
}
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -2954,7 +2954,7 @@ static void Fig_GetAndShowAssignmentsStats (void)
|
|||
(double) NumCoursesWithAssignments;
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_FIGURE_TYPES[Fig_ASSIGNMENTS],NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_FIGURE_TYPES[Fig_ASSIGNMENTS],NULL,
|
||||
Hlp_ANALYTICS_Figures_assignments,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Write table heading *****/
|
||||
|
@ -2989,7 +2989,7 @@ static void Fig_GetAndShowAssignmentsStats (void)
|
|||
HTM_TR_End ();
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -3014,7 +3014,7 @@ static void Fig_GetAndShowProjectsStats (void)
|
|||
(double) NumCoursesWithProjects;
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_FIGURE_TYPES[Fig_PROJECTS],NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_FIGURE_TYPES[Fig_PROJECTS],NULL,
|
||||
Hlp_ANALYTICS_Figures_projects,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Write table heading *****/
|
||||
|
@ -3044,7 +3044,7 @@ static void Fig_GetAndShowProjectsStats (void)
|
|||
HTM_TR_End ();
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -3070,7 +3070,7 @@ static void Fig_GetAndShowTestsStats (void)
|
|||
struct Tst_Stats Stats;
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_FIGURE_TYPES[Fig_TESTS],NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_FIGURE_TYPES[Fig_TESTS],NULL,
|
||||
Hlp_ANALYTICS_Figures_tests,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Write table heading *****/
|
||||
|
@ -3190,7 +3190,7 @@ static void Fig_GetAndShowTestsStats (void)
|
|||
HTM_TR_End ();
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -3214,7 +3214,7 @@ static void Fig_GetAndShowGamesStats (void)
|
|||
NumGamesPerCourse = (double) NumGames / (double) NumCoursesWithGames;
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_FIGURE_TYPES[Fig_GAMES],NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_FIGURE_TYPES[Fig_GAMES],NULL,
|
||||
Hlp_ANALYTICS_Figures_games,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Write table heading *****/
|
||||
|
@ -3244,7 +3244,7 @@ static void Fig_GetAndShowGamesStats (void)
|
|||
HTM_TR_End ();
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -3271,7 +3271,7 @@ static void Fig_GetAndShowTimelineActivityStats (void)
|
|||
unsigned NumUsrsTotal;
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_FIGURE_TYPES[Fig_TIMELINE],NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_FIGURE_TYPES[Fig_TIMELINE],NULL,
|
||||
Hlp_ANALYTICS_Figures_timeline,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Heading row *****/
|
||||
|
@ -3547,7 +3547,7 @@ static void Fig_GetAndShowTimelineActivityStats (void)
|
|||
HTM_TR_End ();
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -3577,7 +3577,7 @@ static void Fig_GetAndShowFollowStats (void)
|
|||
double Average;
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_FIGURE_TYPES[Fig_FOLLOW],NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_FIGURE_TYPES[Fig_FOLLOW],NULL,
|
||||
Hlp_ANALYTICS_Figures_followed_followers,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Heading row *****/
|
||||
|
@ -3833,7 +3833,7 @@ static void Fig_GetAndShowFollowStats (void)
|
|||
}
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -3862,7 +3862,7 @@ static void Fig_GetAndShowForumStats (void)
|
|||
FiguresForum.NumUsrsToBeNotifiedByEMail = 0;
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_FIGURE_TYPES[Fig_FORUMS],NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_FIGURE_TYPES[Fig_FORUMS],NULL,
|
||||
Hlp_ANALYTICS_Figures_forums,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Write table heading *****/
|
||||
|
@ -3945,7 +3945,7 @@ static void Fig_GetAndShowForumStats (void)
|
|||
Fig_WriteForumTotalStats (&FiguresForum);
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -4205,7 +4205,7 @@ static void Fig_GetAndShowNumUsrsPerNotifyEvent (void)
|
|||
unsigned NumMails[Ntf_NUM_NOTIFY_EVENTS];
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_FIGURE_TYPES[Fig_NOTIFY_EVENTS],NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_FIGURE_TYPES[Fig_NOTIFY_EVENTS],NULL,
|
||||
Hlp_ANALYTICS_Figures_notifications,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Heading row *****/
|
||||
|
@ -4398,7 +4398,7 @@ static void Fig_GetAndShowNumUsrsPerNotifyEvent (void)
|
|||
HTM_TR_End ();
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -4435,7 +4435,7 @@ static void Fig_GetAndShowNoticesStats (void)
|
|||
NumTotalNotifications += NumNotif;
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_FIGURE_TYPES[Fig_NOTICES],NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_FIGURE_TYPES[Fig_NOTICES],NULL,
|
||||
Hlp_ANALYTICS_Figures_notices,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Write table heading *****/
|
||||
|
@ -4475,7 +4475,7 @@ static void Fig_GetAndShowNoticesStats (void)
|
|||
HTM_TR_End ();
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -4506,7 +4506,7 @@ static void Fig_GetAndShowMsgsStats (void)
|
|||
NumMsgsReceivedAndNotified = Msg_GetNumMsgsReceived (Gbl.Scope.Current,Msg_STATUS_NOTIFIED);
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_FIGURE_TYPES[Fig_MESSAGES],NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_FIGURE_TYPES[Fig_MESSAGES],NULL,
|
||||
Hlp_ANALYTICS_Figures_messages,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Write table heading *****/
|
||||
|
@ -4570,7 +4570,7 @@ static void Fig_GetAndShowMsgsStats (void)
|
|||
HTM_TR_End ();
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -4602,7 +4602,7 @@ static void Fig_GetAndShowSurveysStats (void)
|
|||
}
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_FIGURE_TYPES[Fig_SURVEYS],NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_FIGURE_TYPES[Fig_SURVEYS],NULL,
|
||||
Hlp_ANALYTICS_Figures_surveys,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Write table heading *****/
|
||||
|
@ -4642,7 +4642,7 @@ static void Fig_GetAndShowSurveysStats (void)
|
|||
HTM_TR_End ();
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -4658,7 +4658,7 @@ static void Fig_GetAndShowNumUsrsPerPrivacy (void)
|
|||
extern const char *Txt_FIGURE_TYPES[Fig_NUM_FIGURES];
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_FIGURE_TYPES[Fig_PRIVACY],NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_FIGURE_TYPES[Fig_PRIVACY],NULL,
|
||||
Hlp_ANALYTICS_Figures_privacy,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Privacy for photo *****/
|
||||
|
@ -4675,7 +4675,7 @@ static void Fig_GetAndShowNumUsrsPerPrivacy (void)
|
|||
Pri_EXTENDED_PROFILE_ALLOWED_VIS);
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -4780,7 +4780,7 @@ static void Fig_GetAndShowNumUsrsPerCookies (void)
|
|||
unsigned NumUsrsTotal = 0;
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_FIGURE_TYPES[Fig_COOKIES],NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_FIGURE_TYPES[Fig_COOKIES],NULL,
|
||||
Hlp_ANALYTICS_Figures_cookies,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Heading row *****/
|
||||
|
@ -4833,7 +4833,7 @@ static void Fig_GetAndShowNumUsrsPerCookies (void)
|
|||
}
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -4855,7 +4855,7 @@ static void Fig_GetAndShowNumUsrsPerLanguage (void)
|
|||
unsigned NumUsrsTotal = 0;
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_FIGURE_TYPES[Fig_LANGUAGES],NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_FIGURE_TYPES[Fig_LANGUAGES],NULL,
|
||||
Hlp_ANALYTICS_Figures_language,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Heading row *****/
|
||||
|
@ -4908,7 +4908,7 @@ static void Fig_GetAndShowNumUsrsPerLanguage (void)
|
|||
}
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -4933,7 +4933,7 @@ static void Fig_GetAndShowNumUsrsPerFirstDayOfWeek (void)
|
|||
unsigned NumUsrsTotal = 0;
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_FIGURE_TYPES[Fig_FIRST_DAY_OF_WEEK],NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_FIGURE_TYPES[Fig_FIRST_DAY_OF_WEEK],NULL,
|
||||
Hlp_ANALYTICS_Figures_calendar,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Heading row *****/
|
||||
|
@ -4996,7 +4996,7 @@ static void Fig_GetAndShowNumUsrsPerFirstDayOfWeek (void)
|
|||
}
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -5016,7 +5016,7 @@ static void Fig_GetAndShowNumUsrsPerDateFormat (void)
|
|||
unsigned NumUsrsTotal = 0;
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_FIGURE_TYPES[Fig_DATE_FORMAT],NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_FIGURE_TYPES[Fig_DATE_FORMAT],NULL,
|
||||
Hlp_ANALYTICS_Figures_dates,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Heading row *****/
|
||||
|
@ -5070,7 +5070,7 @@ static void Fig_GetAndShowNumUsrsPerDateFormat (void)
|
|||
}
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -5093,7 +5093,7 @@ static void Fig_GetAndShowNumUsrsPerIconSet (void)
|
|||
unsigned NumUsrsTotal = 0;
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_FIGURE_TYPES[Fig_ICON_SETS],NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_FIGURE_TYPES[Fig_ICON_SETS],NULL,
|
||||
Hlp_ANALYTICS_Figures_icons,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Heading row *****/
|
||||
|
@ -5151,7 +5151,7 @@ static void Fig_GetAndShowNumUsrsPerIconSet (void)
|
|||
}
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -5173,7 +5173,7 @@ static void Fig_GetAndShowNumUsrsPerMenu (void)
|
|||
unsigned NumUsrsTotal = 0;
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_FIGURE_TYPES[Fig_MENUS],NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_FIGURE_TYPES[Fig_MENUS],NULL,
|
||||
Hlp_ANALYTICS_Figures_menu,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Heading row *****/
|
||||
|
@ -5226,7 +5226,7 @@ static void Fig_GetAndShowNumUsrsPerMenu (void)
|
|||
}
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -5249,7 +5249,7 @@ static void Fig_GetAndShowNumUsrsPerTheme (void)
|
|||
unsigned NumUsrsTotal = 0;
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_FIGURE_TYPES[Fig_THEMES],NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_FIGURE_TYPES[Fig_THEMES],NULL,
|
||||
Hlp_ANALYTICS_Figures_theme,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Heading row *****/
|
||||
|
@ -5307,7 +5307,7 @@ static void Fig_GetAndShowNumUsrsPerTheme (void)
|
|||
}
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -5329,7 +5329,7 @@ static void Fig_GetAndShowNumUsrsPerSideColumns (void)
|
|||
extern const char *Txt_LAYOUT_SIDE_COLUMNS[4];
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_FIGURE_TYPES[Fig_SIDE_COLUMNS],NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_FIGURE_TYPES[Fig_SIDE_COLUMNS],NULL,
|
||||
Hlp_ANALYTICS_Figures_columns,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Heading row *****/
|
||||
|
@ -5387,7 +5387,7 @@ static void Fig_GetAndShowNumUsrsPerSideColumns (void)
|
|||
}
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
|
@ -3200,7 +3200,7 @@ static void Brw_ShowFileBrowsersAsgWrkCrs (void)
|
|||
Brw_WriteTopBeforeShowingFileBrowser ();
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable ("100%",Txt_Assignments_and_other_works,
|
||||
Box_BoxTableBegin ("100%",Txt_Assignments_and_other_works,
|
||||
Brw_PutIconShowFigure,
|
||||
Hlp_FILES_Homework_for_teachers,Box_NOT_CLOSABLE,0);
|
||||
|
||||
|
@ -3211,7 +3211,7 @@ static void Brw_ShowFileBrowsersAsgWrkCrs (void)
|
|||
Par_GetNextStrUntilSeparParamMult (&Ptr,Gbl.Usrs.Other.UsrDat.EncryptedUsrCod,
|
||||
Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64);
|
||||
Usr_GetUsrCodFromEncryptedUsrCod (&Gbl.Usrs.Other.UsrDat);
|
||||
if (Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&Gbl.Usrs.Other.UsrDat,Usr_DONT_GET_PREFS)) // Get of the database the data of the user
|
||||
if (Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&Gbl.Usrs.Other.UsrDat,Usr_DONT_GET_PREFS))
|
||||
if (Usr_CheckIfICanViewAsgWrk (&Gbl.Usrs.Other.UsrDat))
|
||||
{
|
||||
Gbl.Usrs.Other.UsrDat.Accepted =
|
||||
|
@ -3239,7 +3239,7 @@ static void Brw_ShowFileBrowsersAsgWrkCrs (void)
|
|||
}
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -8380,7 +8380,7 @@ static void Brw_PutFormToCreateAFolder (const char FileNameToShow[NAME_MAX + 1])
|
|||
HTM_LABEL_End ();
|
||||
|
||||
/***** Send button and end box *****/
|
||||
Box_EndBoxWithButton (Btn_CREATE_BUTTON,Txt_Create_folder);
|
||||
Box_BoxWithButtonEnd (Btn_CREATE_BUTTON,Txt_Create_folder);
|
||||
|
||||
/***** End form *****/
|
||||
Frm_EndForm ();
|
||||
|
@ -8503,7 +8503,7 @@ static void Brw_PutFormToPasteAFileOrFolder (const char *FileNameToShow)
|
|||
FileNameToShow);
|
||||
|
||||
/***** Send button and end box *****/
|
||||
Box_EndBoxWithButton (Btn_CREATE_BUTTON,Txt_Paste);
|
||||
Box_BoxWithButtonEnd (Btn_CREATE_BUTTON,Txt_Paste);
|
||||
|
||||
/***** End form *****/
|
||||
Frm_EndForm ();
|
||||
|
@ -8569,7 +8569,7 @@ static void Brw_PutFormToCreateALink (const char *FileNameToShow)
|
|||
HTM_TABLE_End ();
|
||||
|
||||
/***** Send button and end box *****/
|
||||
Box_EndBoxWithButton (Btn_CREATE_BUTTON,Txt_Create_link);
|
||||
Box_BoxWithButtonEnd (Btn_CREATE_BUTTON,Txt_Create_link);
|
||||
|
||||
/***** End form *****/
|
||||
Frm_EndForm ();
|
||||
|
@ -9519,7 +9519,7 @@ void Brw_ShowFileMetadata (void)
|
|||
}
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTableShadow (NULL,NULL,NULL,NULL,2);
|
||||
Box_BoxTableShadowBegin (NULL,NULL,NULL,NULL,2);
|
||||
|
||||
/***** Link to download the file *****/
|
||||
HTM_TR_Begin (NULL);
|
||||
|
@ -9715,14 +9715,14 @@ void Brw_ShowFileMetadata (void)
|
|||
if (ICanEdit) // I can edit file properties
|
||||
{
|
||||
/* End table, send button and end box */
|
||||
Box_EndBoxTableWithButton (Btn_CONFIRM_BUTTON,Txt_Save_file_properties);
|
||||
Box_BoxTableWithButtonEnd (Btn_CONFIRM_BUTTON,Txt_Save_file_properties);
|
||||
|
||||
/* End form */
|
||||
Frm_EndForm ();
|
||||
}
|
||||
else
|
||||
/* End table and box */
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
|
||||
/***** Mark possible notifications as seen *****/
|
||||
switch (Gbl.FileBrowser.Type)
|
||||
|
@ -11817,7 +11817,7 @@ void Brw_ListDocsFound (MYSQL_RES **mysql_res,unsigned long NumDocs,
|
|||
"%lu %s",
|
||||
NumDocs,(NumDocs == 1) ? TitleSingular :
|
||||
TitlePlural);
|
||||
Box_StartBoxTable (NULL,Gbl.Title,NULL,
|
||||
Box_BoxTableBegin (NULL,Gbl.Title,NULL,
|
||||
NULL,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Write heading *****/
|
||||
|
@ -11860,7 +11860,7 @@ void Brw_ListDocsFound (MYSQL_RES **mysql_res,unsigned long NumDocs,
|
|||
HTM_TR_End ();
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
|
||||
/***** Free structure that stores the query result *****/
|
||||
|
@ -12187,7 +12187,7 @@ void Brw_AskRemoveOldFiles (void)
|
|||
HTM_LABEL_End ();
|
||||
|
||||
/***** Send button and end box *****/
|
||||
Box_EndBoxWithButton (Btn_REMOVE_BUTTON,Txt_Remove);
|
||||
Box_BoxWithButtonEnd (Btn_REMOVE_BUTTON,Txt_Remove);
|
||||
|
||||
/***** End form *****/
|
||||
Frm_EndForm ();
|
||||
|
|
|
@ -147,7 +147,7 @@ void Fol_SuggestUsrsToFollowMainZone (void)
|
|||
&mysql_res)))
|
||||
{
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable ("560px",Txt_Who_to_follow,Fol_PutIconsWhoToFollow,
|
||||
Box_BoxTableBegin ("560px",Txt_Who_to_follow,Fol_PutIconsWhoToFollow,
|
||||
Hlp_START_Profiles_who_to_follow,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Initialize structure with user's data *****/
|
||||
|
@ -178,7 +178,7 @@ void Fol_SuggestUsrsToFollowMainZone (void)
|
|||
Usr_UsrDataDestructor (&UsrDat);
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
else
|
||||
Ale_ShowAlert (Ale_INFO,Txt_No_user_to_whom_you_can_follow_Try_again_later);
|
||||
|
@ -684,7 +684,7 @@ static void Fol_ListFollowingUsr (struct UsrData *UsrDat)
|
|||
Usr_UsrDataConstructor (&FollowingUsrDat);
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable ("560px",Txt_Following,NULL,
|
||||
Box_BoxTableBegin ("560px",Txt_Following,NULL,
|
||||
NULL,Box_NOT_CLOSABLE,2);
|
||||
|
||||
for (NumUsr = 0;
|
||||
|
@ -708,7 +708,7 @@ static void Fol_ListFollowingUsr (struct UsrData *UsrDat)
|
|||
}
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
|
||||
/***** Free memory used for user's data *****/
|
||||
Usr_UsrDataDestructor (&FollowingUsrDat);
|
||||
|
@ -767,7 +767,7 @@ static void Fol_ListFollowersUsr (struct UsrData *UsrDat)
|
|||
Usr_UsrDataConstructor (&FollowerUsrDat);
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable ("560px",Txt_Followers,NULL,
|
||||
Box_BoxTableBegin ("560px",Txt_Followers,NULL,
|
||||
NULL,Box_NOT_CLOSABLE,2);
|
||||
|
||||
for (NumUsr = 0;
|
||||
|
@ -791,7 +791,7 @@ static void Fol_ListFollowersUsr (struct UsrData *UsrDat)
|
|||
}
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
|
||||
/***** Free memory used for user's data *****/
|
||||
Usr_UsrDataDestructor (&FollowerUsrDat);
|
||||
|
|
96
swad_game.c
96
swad_game.c
|
@ -159,7 +159,7 @@ static void Gam_ListAllGames (void)
|
|||
switch (Gbl.Usrs.Me.Role.Logged)
|
||||
{
|
||||
case Rol_STD:
|
||||
McR_PutFormToViewMchResults (ActReqSeeMyMchRes);
|
||||
McR_PutFormToViewMchResults (ActSeeMyMchRes);
|
||||
break;
|
||||
case Rol_NET:
|
||||
case Rol_TCH:
|
||||
|
@ -180,7 +180,7 @@ static void Gam_ListAllGames (void)
|
|||
Gbl.Crs.Grps.WhichGrps = Grp_ALL_GROUPS;
|
||||
|
||||
/***** Get list of games *****/
|
||||
Gam_GetListGames ();
|
||||
Gam_GetListGames (Gbl.Games.SelectedOrder);
|
||||
|
||||
/***** Compute variables related to pagination *****/
|
||||
Pagination.NumItems = Gbl.Games.Num;
|
||||
|
@ -236,7 +236,7 @@ static void Gam_ListAllGames (void)
|
|||
for (NumGame = Pagination.FirstItemVisible;
|
||||
NumGame <= Pagination.LastItemVisible;
|
||||
NumGame++)
|
||||
Gam_ShowOneGame (Gbl.Games.LstGamCods[NumGame - 1],
|
||||
Gam_ShowOneGame (Gbl.Games.Lst[NumGame - 1].GamCod,
|
||||
false,
|
||||
false, // Do not list game questions
|
||||
false); // Do not put form to start new match
|
||||
|
@ -631,13 +631,13 @@ static void Gam_GetParamOrder (void)
|
|||
/*********************** Get list of all the games *************************/
|
||||
/*****************************************************************************/
|
||||
|
||||
void Gam_GetListGames (void)
|
||||
void Gam_GetListGames (Gam_Order_t SelectedOrder)
|
||||
{
|
||||
static const char *OrderBySubQuery[Gam_NUM_ORDERS] =
|
||||
{
|
||||
[Gam_ORDER_BY_START_DATE] = "StartTime DESC,EndTime DESC,gam_games.Title DESC",
|
||||
[Gam_ORDER_BY_END_DATE ] = "EndTime DESC,StartTime DESC,gam_games.Title DESC",
|
||||
[Gam_ORDER_BY_TITLE ] = "gam_games.Title DESC",
|
||||
[Gam_ORDER_BY_TITLE ] = "gam_games.Title",
|
||||
};
|
||||
MYSQL_RES *mysql_res;
|
||||
MYSQL_ROW row;
|
||||
|
@ -684,7 +684,7 @@ void Gam_GetListGames (void)
|
|||
" ORDER BY %s",
|
||||
Gbl.Hierarchy.Crs.CrsCod,
|
||||
HiddenSubQuery,
|
||||
OrderBySubQuery[Gbl.Games.SelectedOrder]);
|
||||
OrderBySubQuery[SelectedOrder]);
|
||||
|
||||
/***** Free allocated memory for subquery *****/
|
||||
free (HiddenSubQuery);
|
||||
|
@ -694,7 +694,7 @@ void Gam_GetListGames (void)
|
|||
Gbl.Games.Num = (unsigned) NumRows;
|
||||
|
||||
/***** Create list of games *****/
|
||||
if ((Gbl.Games.LstGamCods = (long *) calloc (NumRows,sizeof (long))) == NULL)
|
||||
if ((Gbl.Games.Lst = (struct GameSelected *) malloc (NumRows * sizeof (struct GameSelected))) == NULL)
|
||||
Lay_NotEnoughMemoryExit ();
|
||||
|
||||
/***** Get the games codes *****/
|
||||
|
@ -704,7 +704,7 @@ void Gam_GetListGames (void)
|
|||
{
|
||||
/* Get next game code (row[0]) */
|
||||
row = mysql_fetch_row (mysql_res);
|
||||
if ((Gbl.Games.LstGamCods[NumGame] = Str_ConvertStrCodToLongCod (row[0])) <= 0)
|
||||
if ((Gbl.Games.Lst[NumGame].GamCod = Str_ConvertStrCodToLongCod (row[0])) <= 0)
|
||||
Lay_ShowErrorAndExit ("Error: wrong game code.");
|
||||
}
|
||||
}
|
||||
|
@ -717,6 +717,72 @@ void Gam_GetListGames (void)
|
|||
Gbl.Games.LstIsRead = true;
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
/********************* Get list of game events selected **********************/
|
||||
/*****************************************************************************/
|
||||
// Return number of games selected
|
||||
|
||||
unsigned Gam_GetListSelectedGamCods (char **StrGamCodsSelected)
|
||||
{
|
||||
unsigned MaxSizeListGamCodsSelected;
|
||||
unsigned NumGame;
|
||||
const char *Ptr;
|
||||
long GamCod;
|
||||
char LongStr[Cns_MAX_DECIMAL_DIGITS_LONG + 1];
|
||||
unsigned NumGamesSelected;
|
||||
|
||||
/***** Allocate memory for list of games selected *****/
|
||||
MaxSizeListGamCodsSelected = Gbl.Games.Num * (Cns_MAX_DECIMAL_DIGITS_LONG + 1);
|
||||
if ((*StrGamCodsSelected = (char *) malloc (MaxSizeListGamCodsSelected + 1)) == NULL)
|
||||
Lay_NotEnoughMemoryExit ();
|
||||
|
||||
/***** Get parameter multiple with list of games selected *****/
|
||||
Par_GetParMultiToText ("GamCods",*StrGamCodsSelected,MaxSizeListGamCodsSelected);
|
||||
|
||||
/***** Set which games will be shown as selected (checkboxes on) *****/
|
||||
if ((*StrGamCodsSelected)[0]) // There are games selected
|
||||
{
|
||||
/* Reset selection */
|
||||
for (NumGame = 0;
|
||||
NumGame < Gbl.Games.Num;
|
||||
NumGame++)
|
||||
Gbl.Games.Lst[NumGame].Selected = false;
|
||||
NumGamesSelected = 0;
|
||||
|
||||
/* Set some games as selected */
|
||||
for (Ptr = *StrGamCodsSelected;
|
||||
*Ptr;
|
||||
)
|
||||
{
|
||||
/* Get next game selected */
|
||||
Par_GetNextStrUntilSeparParamMult (&Ptr,LongStr,Cns_MAX_DECIMAL_DIGITS_LONG);
|
||||
GamCod = Str_ConvertStrCodToLongCod (LongStr);
|
||||
|
||||
/* Set each game in *StrGamCodsSelected as selected */
|
||||
for (NumGame = 0;
|
||||
NumGame < Gbl.Games.Num;
|
||||
NumGame++)
|
||||
if (Gbl.Games.Lst[NumGame].GamCod == GamCod)
|
||||
{
|
||||
Gbl.Games.Lst[NumGame].Selected = true;
|
||||
NumGamesSelected++;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
else // No games selected
|
||||
{
|
||||
/***** Set all games as selected *****/
|
||||
for (NumGame = 0;
|
||||
NumGame < Gbl.Games.Num;
|
||||
NumGame++)
|
||||
Gbl.Games.Lst[NumGame].Selected = true;
|
||||
NumGamesSelected = Gbl.Games.Num;
|
||||
}
|
||||
|
||||
return NumGamesSelected;
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
/********************** Get game data using its code *************************/
|
||||
/*****************************************************************************/
|
||||
|
@ -828,11 +894,11 @@ static void Gam_ResetGame (struct Game *Game)
|
|||
|
||||
void Gam_FreeListGames (void)
|
||||
{
|
||||
if (Gbl.Games.LstIsRead && Gbl.Games.LstGamCods)
|
||||
if (Gbl.Games.LstIsRead && Gbl.Games.Lst)
|
||||
{
|
||||
/***** Free memory used by the list of games *****/
|
||||
free (Gbl.Games.LstGamCods);
|
||||
Gbl.Games.LstGamCods = NULL;
|
||||
free (Gbl.Games.Lst);
|
||||
Gbl.Games.Lst = NULL;
|
||||
Gbl.Games.Num = 0;
|
||||
Gbl.Games.LstIsRead = false;
|
||||
}
|
||||
|
@ -1120,10 +1186,10 @@ static void Gam_PutFormsEditionGame (struct Game *Game,bool ItsANewGame)
|
|||
|
||||
/***** Begin box and table *****/
|
||||
if (ItsANewGame)
|
||||
Box_StartBoxTable (NULL,Txt_New_game,NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_New_game,NULL,
|
||||
Hlp_ASSESSMENT_Games_new_game,Box_NOT_CLOSABLE,2);
|
||||
else
|
||||
Box_StartBoxTable (NULL,
|
||||
Box_BoxTableBegin (NULL,
|
||||
Game->Title[0] ? Game->Title :
|
||||
Txt_Edit_game,
|
||||
NULL,
|
||||
|
@ -1165,9 +1231,9 @@ static void Gam_PutFormsEditionGame (struct Game *Game,bool ItsANewGame)
|
|||
|
||||
/***** End table, send button and end box *****/
|
||||
if (ItsANewGame)
|
||||
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_game);
|
||||
Box_BoxTableWithButtonEnd (Btn_CREATE_BUTTON,Txt_Create_game);
|
||||
else
|
||||
Box_EndBoxTableWithButton (Btn_CONFIRM_BUTTON,Txt_Save_changes);
|
||||
Box_BoxTableWithButtonEnd (Btn_CONFIRM_BUTTON,Txt_Save_changes);
|
||||
|
||||
/***** End form *****/
|
||||
Frm_EndForm ();
|
||||
|
|
|
@ -37,6 +37,12 @@
|
|||
#define Gam_MAX_CHARS_TITLE (128 - 1) // 127
|
||||
#define Gam_MAX_BYTES_TITLE ((Gam_MAX_CHARS_TITLE + 1) * Str_MAX_BYTES_PER_CHAR - 1) // 2047
|
||||
|
||||
struct GameSelected
|
||||
{
|
||||
long GamCod; // Game code
|
||||
bool Selected; // Is this game selected when viewing match results?
|
||||
};
|
||||
|
||||
struct Game
|
||||
{
|
||||
long GamCod; // Game code
|
||||
|
@ -82,7 +88,8 @@ void Gam_RequestCreatOrEditGame (void);
|
|||
void Gam_PutParams (void);
|
||||
long Gam_GetParams (void);
|
||||
|
||||
void Gam_GetListGames (void);
|
||||
void Gam_GetListGames (Gam_Order_t SelectedOrder);
|
||||
unsigned Gam_GetListSelectedGamCods (char **StrGamCodsSelected);
|
||||
void Gam_GetDataOfGameByCod (struct Game *Gam);
|
||||
void Gam_GetDataOfGameByFolder (struct Game *Gam);
|
||||
void Gam_FreeListGames (void);
|
||||
|
|
|
@ -704,12 +704,13 @@ struct Globals
|
|||
struct
|
||||
{
|
||||
bool LstIsRead; // Is the list already read from database, or it needs to be read?
|
||||
unsigned Num; // Number of surveys
|
||||
long *LstGamCods; // List of game codes
|
||||
unsigned Num; // Number of games
|
||||
struct GameSelected *Lst; // List of games
|
||||
Gam_Order_t SelectedOrder;
|
||||
unsigned CurrentPage;
|
||||
char *ListQuestions;
|
||||
long MchCodBeingPlayed; // Used to refresh game via AJAX
|
||||
char *StrGamCodsSelected;
|
||||
} Games;
|
||||
struct
|
||||
{
|
||||
|
|
12
swad_group.c
12
swad_group.c
|
@ -2067,7 +2067,7 @@ void Grp_ShowLstGrpsToChgOtherUsrsGrps (long UsrCod)
|
|||
Grp_GetListGrpTypesAndGrpsInThisCrs (Grp_ONLY_GROUP_TYPES_WITH_GROUPS);
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_Groups,NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_Groups,NULL,
|
||||
Hlp_USERS_Groups,Box_NOT_CLOSABLE,0);
|
||||
|
||||
/***** List to select the groups the user belongs to *****/
|
||||
|
@ -2078,7 +2078,7 @@ void Grp_ShowLstGrpsToChgOtherUsrsGrps (long UsrCod)
|
|||
Grp_ListGrpsToAddOrRemUsrs (&Gbl.Crs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp],UsrCod);
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
|
||||
/***** Free list of groups types and groups in current course *****/
|
||||
Grp_FreeListGrpTypesAndGrps ();
|
||||
|
@ -2464,7 +2464,7 @@ static void Grp_PutFormToCreateGroupType (void)
|
|||
Frm_StartFormAnchor (ActNewGrpTyp,Grp_GROUP_TYPES_SECTION_ID);
|
||||
|
||||
/***** Begin box *****/
|
||||
Box_StartBoxTable (NULL,Txt_New_type_of_group,NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_New_type_of_group,NULL,
|
||||
NULL,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Write heading *****/
|
||||
|
@ -2545,7 +2545,7 @@ static void Grp_PutFormToCreateGroupType (void)
|
|||
HTM_TR_End ();
|
||||
|
||||
/***** End table, send button and end box *****/
|
||||
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_type_of_group);
|
||||
Box_BoxTableWithButtonEnd (Btn_CREATE_BUTTON,Txt_Create_type_of_group);
|
||||
|
||||
/***** End form *****/
|
||||
Frm_EndForm ();
|
||||
|
@ -2574,7 +2574,7 @@ static void Grp_PutFormToCreateGroup (void)
|
|||
Frm_StartFormAnchor (ActNewGrp,Grp_GROUPS_SECTION_ID);
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_New_group,NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_New_group,NULL,
|
||||
NULL,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Write heading *****/
|
||||
|
@ -2667,7 +2667,7 @@ static void Grp_PutFormToCreateGroup (void)
|
|||
HTM_TR_End ();
|
||||
|
||||
/***** End table, send button and end box *****/
|
||||
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_group);
|
||||
Box_BoxTableWithButtonEnd (Btn_CREATE_BUTTON,Txt_Create_group);
|
||||
|
||||
/***** End form *****/
|
||||
Frm_EndForm ();
|
||||
|
|
|
@ -126,7 +126,7 @@ void Hlp_ShowHelpWhatWouldYouLikeToDo (void)
|
|||
Txt_If_you_can_not_find_your_institution_your_centre_your_degree_or_your_courses_you_can_create_them);
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_What_would_you_like_to_do,NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_What_would_you_like_to_do,NULL,
|
||||
NULL,Box_CLOSABLE,2);
|
||||
|
||||
if (Gbl.Usrs.Me.Logged) // I am logged
|
||||
|
@ -256,7 +256,7 @@ void Hlp_ShowHelpWhatWouldYouLikeToDo (void)
|
|||
}
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
|
@ -553,7 +553,7 @@ static void Hld_ListHolidaysForEdition (void)
|
|||
unsigned HolidayTypeUnsigned;
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_Holidays,Cal_PutIconToSeeCalendar,
|
||||
Box_BoxTableBegin (NULL,Txt_Holidays,Cal_PutIconToSeeCalendar,
|
||||
Hlp_INSTITUTION_Holidays_edit,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Write heading *****/
|
||||
|
@ -654,7 +654,7 @@ static void Hld_ListHolidaysForEdition (void)
|
|||
}
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -964,7 +964,7 @@ static void Hld_PutFormToCreateHoliday (void)
|
|||
Frm_StartForm (ActNewHld);
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_New_holiday,NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_New_holiday,NULL,
|
||||
Hlp_INSTITUTION_Holidays_edit,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Write heading *****/
|
||||
|
@ -1040,7 +1040,7 @@ static void Hld_PutFormToCreateHoliday (void)
|
|||
HTM_TR_End ();
|
||||
|
||||
/***** End table, send button and end box *****/
|
||||
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_holiday);
|
||||
Box_BoxTableWithButtonEnd (Btn_CREATE_BUTTON,Txt_Create_holiday);
|
||||
|
||||
/***** End form *****/
|
||||
Frm_EndForm ();
|
||||
|
|
|
@ -1095,7 +1095,7 @@ void Inf_FormsToSelSendInfo (void)
|
|||
|
||||
/***** Form to choice between alternatives *****/
|
||||
/* Begin box and table */
|
||||
Box_StartBoxTable (NULL,Txt_Source_of_information,Inf_PutIconToViewInfo,
|
||||
Box_BoxTableBegin (NULL,Txt_Source_of_information,Inf_PutIconToViewInfo,
|
||||
HelpEdit[Gbl.Crs.Info.Type],Box_NOT_CLOSABLE,4);
|
||||
|
||||
/* Options */
|
||||
|
@ -1148,7 +1148,7 @@ void Inf_FormsToSelSendInfo (void)
|
|||
}
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -2051,7 +2051,7 @@ void Inf_EditPlainTxtInfo (void)
|
|||
HTM_DIV_End ();
|
||||
|
||||
/***** Send button and end box *****/
|
||||
Box_EndBoxWithButton (Btn_CONFIRM_BUTTON,Txt_Save_changes);
|
||||
Box_BoxWithButtonEnd (Btn_CONFIRM_BUTTON,Txt_Save_changes);
|
||||
Frm_EndForm ();
|
||||
}
|
||||
|
||||
|
@ -2101,7 +2101,7 @@ void Inf_EditRichTxtInfo (void)
|
|||
HTM_DIV_End ();
|
||||
|
||||
/***** Send button and end box *****/
|
||||
Box_EndBoxWithButton (Btn_CONFIRM_BUTTON,Txt_Save_changes);
|
||||
Box_BoxWithButtonEnd (Btn_CONFIRM_BUTTON,Txt_Save_changes);
|
||||
Frm_EndForm ();
|
||||
}
|
||||
|
||||
|
|
|
@ -169,7 +169,7 @@ void Ins_SeeInsWithPendingCtrs (void)
|
|||
if (NumInss)
|
||||
{
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_Institutions_with_pending_centres,NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_Institutions_with_pending_centres,NULL,
|
||||
Hlp_SYSTEM_Hierarchy_pending,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Write heading *****/
|
||||
|
@ -214,7 +214,7 @@ void Ins_SeeInsWithPendingCtrs (void)
|
|||
}
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
else
|
||||
Ale_ShowAlert (Ale_INFO,Txt_There_are_no_institutions_with_requests_for_centres_to_be_confirmed);
|
||||
|
@ -2180,7 +2180,7 @@ static void Ins_PutFormToCreateInstitution (void)
|
|||
Lay_NoPermissionExit ();
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_New_institution,NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_New_institution,NULL,
|
||||
NULL,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Write heading *****/
|
||||
|
@ -2246,7 +2246,7 @@ static void Ins_PutFormToCreateInstitution (void)
|
|||
HTM_TR_End ();
|
||||
|
||||
/***** End table, send button and end box *****/
|
||||
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_institution);
|
||||
Box_BoxTableWithButtonEnd (Btn_CREATE_BUTTON,Txt_Create_institution);
|
||||
|
||||
/***** End form *****/
|
||||
Frm_EndForm ();
|
||||
|
@ -2505,7 +2505,7 @@ void Ins_ListInssFound (MYSQL_RES **mysql_res,unsigned NumInss)
|
|||
"%u %s",
|
||||
NumInss,NumInss == 1 ? Txt_institution :
|
||||
Txt_institutions);
|
||||
Box_StartBoxTable (NULL,Gbl.Title,NULL,
|
||||
Box_BoxTableBegin (NULL,Gbl.Title,NULL,
|
||||
NULL,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Write heading *****/
|
||||
|
@ -2530,7 +2530,7 @@ void Ins_ListInssFound (MYSQL_RES **mysql_res,unsigned NumInss)
|
|||
}
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
|
||||
/***** Free structure that stores the query result *****/
|
||||
|
|
|
@ -1642,7 +1642,7 @@ void Lay_AdvertisementMobile (void)
|
|||
HTM_DIV_Begin ("style=\"margin-top:25px;\"");
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,NULL,NULL,
|
||||
Box_BoxTableBegin (NULL,NULL,NULL,
|
||||
NULL,Box_NOT_CLOSABLE,8);
|
||||
|
||||
/***** Show advertisement *****/
|
||||
|
@ -1660,7 +1660,7 @@ void Lay_AdvertisementMobile (void)
|
|||
HTM_TR_End ();
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
|
||||
HTM_DIV_End ();
|
||||
}
|
||||
|
|
|
@ -727,7 +727,7 @@ static void Lnk_PutFormToCreateLink (void)
|
|||
Frm_StartForm (ActNewLnk);
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_New_link,NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_New_link,NULL,
|
||||
Hlp_SYSTEM_Links_edit,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Write heading *****/
|
||||
|
@ -762,7 +762,7 @@ static void Lnk_PutFormToCreateLink (void)
|
|||
HTM_TR_End ();
|
||||
|
||||
/***** End table, send button and end box *****/
|
||||
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_link);
|
||||
Box_BoxTableWithButtonEnd (Btn_CREATE_BUTTON,Txt_Create_link);
|
||||
|
||||
/***** End form *****/
|
||||
Frm_EndForm ();
|
||||
|
|
12
swad_mail.c
12
swad_mail.c
|
@ -122,7 +122,7 @@ void Mai_SeeMailDomains (void)
|
|||
Mai_GetListMailDomainsAllowedForNotif ();
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_Email_domains_allowed_for_notifications,
|
||||
Box_BoxTableBegin (NULL,Txt_Email_domains_allowed_for_notifications,
|
||||
Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM ? Mai_PutIconToEditMailDomains :
|
||||
NULL,
|
||||
Hlp_START_Domains,Box_NOT_CLOSABLE,2);
|
||||
|
@ -174,7 +174,7 @@ void Mai_SeeMailDomains (void)
|
|||
}
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
|
||||
/***** Free list of mail domains *****/
|
||||
Mai_FreeListMailDomains ();
|
||||
|
@ -474,7 +474,7 @@ static void Mai_ListMailDomainsForEdition (void)
|
|||
struct Mail *Mai;
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_Email_domains_allowed_for_notifications,NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_Email_domains_allowed_for_notifications,NULL,
|
||||
Hlp_START_Domains_edit,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Write heading *****/
|
||||
|
@ -529,7 +529,7 @@ static void Mai_ListMailDomainsForEdition (void)
|
|||
}
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -744,7 +744,7 @@ static void Mai_PutFormToCreateMailDomain (void)
|
|||
Frm_StartForm (ActNewMai);
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_New_email_domain,NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_New_email_domain,NULL,
|
||||
Hlp_START_Domains_edit,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Write heading *****/
|
||||
|
@ -774,7 +774,7 @@ static void Mai_PutFormToCreateMailDomain (void)
|
|||
HTM_TR_End ();
|
||||
|
||||
/***** End table, send button and end box *****/
|
||||
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_email_domain);
|
||||
Box_BoxTableWithButtonEnd (Btn_CREATE_BUTTON,Txt_Create_email_domain);
|
||||
|
||||
/***** End form *****/
|
||||
Frm_EndForm ();
|
||||
|
|
|
@ -1193,7 +1193,7 @@ static void Mch_PutFormNewMatch (struct Game *Game)
|
|||
Gam_PutParamQstInd (0); // Start by first question in game
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_New_match,NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_New_match,NULL,
|
||||
Hlp_ASSESSMENT_Games_matches,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Match title *****/
|
||||
|
@ -1256,7 +1256,7 @@ static void Mch_ShowLstGrpsToCreateMatch (void)
|
|||
HTM_TD_End ();
|
||||
|
||||
HTM_TD_Begin ("class=\"LT\"");
|
||||
Box_StartBoxTable ("95%",NULL,NULL,
|
||||
Box_BoxTableBegin ("95%",NULL,NULL,
|
||||
NULL,Box_NOT_CLOSABLE,0);
|
||||
|
||||
/***** First row: checkbox to select the whole course *****/
|
||||
|
@ -1282,7 +1282,7 @@ static void Mch_ShowLstGrpsToCreateMatch (void)
|
|||
Grp_MATCH);
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
HTM_TD_End ();
|
||||
HTM_TR_End ();
|
||||
}
|
||||
|
|
|
@ -53,6 +53,8 @@ extern struct Globals Gbl;
|
|||
/***************************** Private constants *****************************/
|
||||
/*****************************************************************************/
|
||||
|
||||
#define McR_RESULTS_TABLE_ID "mcr_table"
|
||||
|
||||
/*****************************************************************************/
|
||||
/******************************* Private types *******************************/
|
||||
/*****************************************************************************/
|
||||
|
@ -70,8 +72,10 @@ extern struct Globals Gbl;
|
|||
/*****************************************************************************/
|
||||
|
||||
static void McR_ShowUsrsMchResults (void);
|
||||
static void McR_ListGamesToSelect (void);
|
||||
static void McR_ShowHeaderMchResults (Usr_MeOrOther_t MeOrOther);
|
||||
static void McR_ShowMchResults (Usr_MeOrOther_t MeOrOther);
|
||||
static void McR_ShowMchResults (Usr_MeOrOther_t MeOrOther,
|
||||
unsigned NumGamesSelected);
|
||||
static void McR_ShowMchResultsSummaryRow (bool ShowSummaryResults,
|
||||
unsigned NumResults,
|
||||
unsigned NumTotalQsts,
|
||||
|
@ -102,56 +106,62 @@ void McR_PutFormToViewMchResults (Act_Action_t Action)
|
|||
Mnu_ContextMenuEnd ();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
/****************** Select dates to show my matches results ******************/
|
||||
/*****************************************************************************/
|
||||
|
||||
void McR_SelDatesToSeeMyMchResults (void)
|
||||
{
|
||||
extern const char *Hlp_ASSESSMENT_Games_results;
|
||||
extern const char *Txt_Results;
|
||||
extern const char *Txt_View_matches_results;
|
||||
|
||||
/***** Begin form *****/
|
||||
Frm_StartForm (ActSeeMyMchRes);
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_Results,NULL,
|
||||
Hlp_ASSESSMENT_Games_results,Box_NOT_CLOSABLE,2);
|
||||
Dat_PutFormStartEndClientLocalDateTimesWithYesterdayToday (false);
|
||||
|
||||
/***** End table, send button and end box *****/
|
||||
Box_EndBoxTableWithButton (Btn_CONFIRM_BUTTON,Txt_View_matches_results);
|
||||
|
||||
/***** End form *****/
|
||||
Frm_EndForm ();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
/*************************** Show my matches results *************************/
|
||||
/*****************************************************************************/
|
||||
|
||||
void McR_ShowMyMchResults (void)
|
||||
{
|
||||
extern const char *Hlp_ASSESSMENT_Games_results;
|
||||
extern const char *Hlp_ASSESSMENT_Games_results;
|
||||
extern const char *Txt_Results;
|
||||
unsigned NumGamesSelected;
|
||||
|
||||
/***** Get starting and ending dates *****/
|
||||
Dat_GetIniEndDatesFromForm ();
|
||||
/***** Get list of games *****/
|
||||
Gam_GetListGames (Gam_ORDER_BY_TITLE);
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_Results,NULL,
|
||||
Hlp_ASSESSMENT_Games_results,Box_NOT_CLOSABLE,2);
|
||||
/***** Get list of game codes selected *****/
|
||||
NumGamesSelected = Gam_GetListSelectedGamCods (&Gbl.Games.StrGamCodsSelected);
|
||||
|
||||
/***** Header of the table with the list of users *****/
|
||||
McR_ShowHeaderMchResults (Usr_ME);
|
||||
if (NumGamesSelected)
|
||||
{
|
||||
/***** Begin box *****/
|
||||
Box_BoxBegin (NULL,Txt_Results,NULL,
|
||||
Hlp_ASSESSMENT_Games_results,Box_NOT_CLOSABLE);
|
||||
|
||||
/***** List my matches results *****/
|
||||
Tst_GetConfigTstFromDB (); // To get feedback type
|
||||
McR_ShowMchResults (Usr_ME);
|
||||
/***** List games to select *****/
|
||||
McR_ListGamesToSelect ();
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
/***** Start section with match results table *****/
|
||||
HTM_SECTION_Begin (McR_RESULTS_TABLE_ID);
|
||||
|
||||
/***** Begin table *****/
|
||||
HTM_TABLE_BeginWidePadding (2);
|
||||
|
||||
/***** Header of the table with the list of users *****/
|
||||
McR_ShowHeaderMchResults (Usr_ME);
|
||||
|
||||
/***** List my matches results *****/
|
||||
Tst_GetConfigTstFromDB (); // To get feedback type
|
||||
McR_ShowMchResults (Usr_ME,NumGamesSelected);
|
||||
|
||||
/***** End table *****/
|
||||
HTM_TABLE_End ();
|
||||
|
||||
/***** End section with match results table *****/
|
||||
HTM_SECTION_End ();
|
||||
|
||||
/***** End box *****/
|
||||
Box_BoxEnd ();
|
||||
}
|
||||
else
|
||||
Ale_ShowAlert (Ale_WARNING,"No games selected."); // TODO: Need translation!!!!
|
||||
|
||||
/***** Free memory for list of game events selected *****/
|
||||
free (Gbl.Games.StrGamCodsSelected);
|
||||
|
||||
/***** Free list of games *****/
|
||||
Gam_FreeListGames ();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -223,9 +233,6 @@ void McR_SelUsrsToViewUsrsMchResults (void)
|
|||
|
||||
HTM_TR_End ();
|
||||
|
||||
/***** Starting and ending dates in the search *****/
|
||||
Dat_PutFormStartEndClientLocalDateTimesWithYesterdayToday (false);
|
||||
|
||||
HTM_TABLE_End ();
|
||||
|
||||
/***** Send button *****/
|
||||
|
@ -276,33 +283,152 @@ static void McR_ShowUsrsMchResults (void)
|
|||
{
|
||||
extern const char *Hlp_ASSESSMENT_Games_results;
|
||||
extern const char *Txt_Results;
|
||||
unsigned NumGamesSelected;
|
||||
const char *Ptr;
|
||||
|
||||
/***** Get starting and ending dates *****/
|
||||
Dat_GetIniEndDatesFromForm ();
|
||||
/***** Get list of games *****/
|
||||
Gam_GetListGames (Gam_ORDER_BY_TITLE);
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_Results,NULL,
|
||||
Hlp_ASSESSMENT_Games_results,Box_NOT_CLOSABLE,2);
|
||||
/***** Get list of game codes selected *****/
|
||||
NumGamesSelected = Gam_GetListSelectedGamCods (&Gbl.Games.StrGamCodsSelected);
|
||||
|
||||
/***** Header of the table with the list of users *****/
|
||||
McR_ShowHeaderMchResults (Usr_OTHER);
|
||||
|
||||
/***** List the matches results of the selected users *****/
|
||||
Ptr = Gbl.Usrs.Selected.List[Rol_UNK];
|
||||
while (*Ptr)
|
||||
if (NumGamesSelected)
|
||||
{
|
||||
Par_GetNextStrUntilSeparParamMult (&Ptr,Gbl.Usrs.Other.UsrDat.EncryptedUsrCod,
|
||||
Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64);
|
||||
Usr_GetUsrCodFromEncryptedUsrCod (&Gbl.Usrs.Other.UsrDat);
|
||||
if (Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&Gbl.Usrs.Other.UsrDat,Usr_DONT_GET_PREFS)) // Get of the database the data of the user
|
||||
if (Usr_CheckIfICanViewMch (&Gbl.Usrs.Other.UsrDat))
|
||||
/***** Show matches results *****/
|
||||
McR_ShowMchResults (Usr_OTHER);
|
||||
/***** Begin box *****/
|
||||
Box_BoxBegin (NULL,Txt_Results,NULL,
|
||||
Hlp_ASSESSMENT_Games_results,Box_NOT_CLOSABLE);
|
||||
|
||||
/***** List games to select *****/
|
||||
McR_ListGamesToSelect ();
|
||||
|
||||
/***** Start section with match results table *****/
|
||||
HTM_SECTION_Begin (McR_RESULTS_TABLE_ID);
|
||||
|
||||
/***** Begin table *****/
|
||||
HTM_TABLE_BeginWidePadding (2);
|
||||
|
||||
/***** Header of the table with the list of users *****/
|
||||
McR_ShowHeaderMchResults (Usr_OTHER);
|
||||
|
||||
/***** List the matches results of the selected users *****/
|
||||
Ptr = Gbl.Usrs.Selected.List[Rol_UNK];
|
||||
while (*Ptr)
|
||||
{
|
||||
Par_GetNextStrUntilSeparParamMult (&Ptr,Gbl.Usrs.Other.UsrDat.EncryptedUsrCod,
|
||||
Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64);
|
||||
Usr_GetUsrCodFromEncryptedUsrCod (&Gbl.Usrs.Other.UsrDat);
|
||||
if (Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&Gbl.Usrs.Other.UsrDat,Usr_DONT_GET_PREFS))
|
||||
if (Usr_CheckIfICanViewMch (&Gbl.Usrs.Other.UsrDat))
|
||||
/***** Show matches results *****/
|
||||
McR_ShowMchResults (Usr_OTHER,NumGamesSelected);
|
||||
}
|
||||
|
||||
/***** End table *****/
|
||||
HTM_TABLE_End ();
|
||||
|
||||
/***** End section with match results table *****/
|
||||
HTM_SECTION_End ();
|
||||
|
||||
/***** End box *****/
|
||||
Box_BoxEnd ();
|
||||
}
|
||||
else
|
||||
Ale_ShowAlert (Ale_WARNING,"No games selected."); // TODO: Need translation!!!!
|
||||
|
||||
/***** Free memory for list of game events selected *****/
|
||||
free (Gbl.Games.StrGamCodsSelected);
|
||||
|
||||
/***** Free list of games *****/
|
||||
Gam_FreeListGames ();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
/********** Write list of those attendance events that have students *********/
|
||||
/*****************************************************************************/
|
||||
|
||||
static void McR_ListGamesToSelect (void)
|
||||
{
|
||||
extern const char *The_ClassFormLinkInBoxBold[The_NUM_THEMES];
|
||||
extern const char *Txt_Games;
|
||||
extern const char *Txt_Game;
|
||||
extern const char *Txt_Update_results;
|
||||
unsigned UniqueId;
|
||||
unsigned NumGame;
|
||||
struct Game Game;
|
||||
|
||||
/***** Begin box *****/
|
||||
Box_BoxBegin (NULL,Txt_Games,NULL,NULL,Box_NOT_CLOSABLE);
|
||||
|
||||
/***** Begin form to update the results
|
||||
depending on the games selected *****/
|
||||
Frm_StartFormAnchor (Gbl.Action.Act,McR_RESULTS_TABLE_ID);
|
||||
Grp_PutParamsCodGrps ();
|
||||
Usr_PutHiddenParSelectedUsrsCods (&Gbl.Usrs.Selected);
|
||||
|
||||
/***** Begin table *****/
|
||||
HTM_TABLE_BeginWidePadding (2);
|
||||
|
||||
/***** Heading row *****/
|
||||
HTM_TR_Begin (NULL);
|
||||
|
||||
HTM_TH (1,2,NULL,NULL);
|
||||
HTM_TH (1,1,"LM",Txt_Game);
|
||||
|
||||
HTM_TR_End ();
|
||||
|
||||
/***** List the events *****/
|
||||
for (NumGame = 0, UniqueId = 1, Gbl.RowEvenOdd = 0;
|
||||
NumGame < Gbl.Games.Num;
|
||||
NumGame++, UniqueId++, Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd)
|
||||
{
|
||||
/* Get data of this game */
|
||||
Game.GamCod = Gbl.Games.Lst[NumGame].GamCod;
|
||||
Gam_GetDataOfGameByCod (&Game);
|
||||
|
||||
/* Write a row for this event */
|
||||
HTM_TR_Begin (NULL);
|
||||
|
||||
HTM_TD_Begin ("class=\"DAT CT COLOR%u\"",Gbl.RowEvenOdd);
|
||||
HTM_INPUT_CHECKBOX ("GamCods",false,
|
||||
"id=\"Gam%u\" value=\"%ld\"%s",
|
||||
NumGame,Gbl.Games.Lst[NumGame].GamCod,
|
||||
Gbl.Games.Lst[NumGame].Selected ? " checked=\"checked\"" : "");
|
||||
HTM_TD_End ();
|
||||
|
||||
HTM_TD_Begin ("class=\"DAT RT COLOR%u\"",Gbl.RowEvenOdd);
|
||||
HTM_LABEL_Begin ("for=\"Gam%u\"",NumGame);
|
||||
HTM_TxtF ("%u:",NumGame + 1);
|
||||
HTM_LABEL_End ();
|
||||
HTM_TD_End ();
|
||||
|
||||
HTM_TD_Begin ("class=\"DAT LT COLOR%u\"",Gbl.RowEvenOdd);
|
||||
HTM_Txt (Game.Title);
|
||||
HTM_TD_End ();
|
||||
|
||||
HTM_TR_End ();
|
||||
}
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
/***** Put button to refresh *****/
|
||||
HTM_TR_Begin (NULL);
|
||||
|
||||
HTM_TD_Begin ("colspan=\"3\" class=\"CM\"");
|
||||
HTM_BUTTON_Animated_Begin (Txt_Update_results,
|
||||
The_ClassFormLinkInBoxBold[Gbl.Prefs.Theme],
|
||||
NULL);
|
||||
Ico_PutCalculateIconWithText (Txt_Update_results);
|
||||
HTM_BUTTON_End ();
|
||||
HTM_TD_End ();
|
||||
|
||||
HTM_TR_End ();
|
||||
|
||||
/***** End table *****/
|
||||
HTM_TABLE_End ();
|
||||
|
||||
/***** End form *****/
|
||||
Frm_EndForm ();
|
||||
|
||||
/***** End box *****/
|
||||
Box_BoxEnd ();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -348,12 +474,17 @@ static void McR_ShowHeaderMchResults (Usr_MeOrOther_t MeOrOther)
|
|||
/********* Show the matches results of a user in the current course **********/
|
||||
/*****************************************************************************/
|
||||
|
||||
static void McR_ShowMchResults (Usr_MeOrOther_t MeOrOther)
|
||||
static void McR_ShowMchResults (Usr_MeOrOther_t MeOrOther,
|
||||
unsigned NumGamesSelected)
|
||||
{
|
||||
extern const char *Txt_Match_result;
|
||||
extern const char *Txt_Hidden_result;
|
||||
MYSQL_RES *mysql_res;
|
||||
MYSQL_ROW row;
|
||||
size_t MaxSizeGamesSubQuery;
|
||||
char *GamesSubQuery;
|
||||
unsigned NumGame;
|
||||
char LongStr[Cns_MAX_DECIMAL_DIGITS_LONG + 1];
|
||||
struct UsrData *UsrDat;
|
||||
bool ShowResultThisMatch;
|
||||
bool ShowSummaryResults = true;
|
||||
|
@ -371,31 +502,52 @@ static void McR_ShowMchResults (Usr_MeOrOther_t MeOrOther)
|
|||
double TotalScoreOfAllResults = 0.0;
|
||||
time_t TimeUTC[Dat_NUM_START_END_TIME];
|
||||
|
||||
/***** Trivial check: there should be games selected *****/
|
||||
if (!NumGamesSelected)
|
||||
return;
|
||||
|
||||
/***** Set user *****/
|
||||
UsrDat = (MeOrOther == Usr_ME) ? &Gbl.Usrs.Me.UsrDat :
|
||||
&Gbl.Usrs.Other.UsrDat;
|
||||
&Gbl.Usrs.Other.UsrDat;
|
||||
|
||||
/***** Allocate memory for subquery of games selected *****/
|
||||
MaxSizeGamesSubQuery = (size_t) NumGamesSelected * (Cns_MAX_DECIMAL_DIGITS_LONG + 1);
|
||||
if ((GamesSubQuery = (char *) malloc (MaxSizeGamesSubQuery + 1)) == NULL)
|
||||
Lay_NotEnoughMemoryExit ();
|
||||
|
||||
/***** Build subquery with list of selected games *****/
|
||||
GamesSubQuery[0] = '\0';
|
||||
for (NumGame = 0;
|
||||
NumGame < Gbl.Games.Num;
|
||||
NumGame++)
|
||||
if (Gbl.Games.Lst[NumGame].Selected)
|
||||
{
|
||||
sprintf (LongStr,"%ld",Gbl.Games.Lst[NumGame].GamCod);
|
||||
if (GamesSubQuery[0])
|
||||
Str_Concat (GamesSubQuery,",",MaxSizeGamesSubQuery);
|
||||
Str_Concat (GamesSubQuery,LongStr,MaxSizeGamesSubQuery);
|
||||
}
|
||||
|
||||
/***** Make database query *****/
|
||||
NumResults =
|
||||
(unsigned) DB_QuerySELECT (&mysql_res,"can not get matches results of a user",
|
||||
"SELECT mch_results.MchCod," // row[0]
|
||||
"UNIX_TIMESTAMP(mch_results.StartTime)," // row[1]
|
||||
"UNIX_TIMESTAMP(mch_results.EndTime)," // row[2]
|
||||
"mch_results.NumQsts," // row[3]
|
||||
"mch_results.NumQstsNotBlank," // row[4]
|
||||
"mch_results.Score" // row[5]
|
||||
"UNIX_TIMESTAMP(mch_results.StartTime)," // row[1]
|
||||
"UNIX_TIMESTAMP(mch_results.EndTime)," // row[2]
|
||||
"mch_results.NumQsts," // row[3]
|
||||
"mch_results.NumQstsNotBlank," // row[4]
|
||||
"mch_results.Score" // row[5]
|
||||
" FROM mch_results,mch_matches,gam_games"
|
||||
" WHERE mch_results.UsrCod=%ld"
|
||||
" AND mch_results.MchCod=mch_matches.MchCod"
|
||||
" AND mch_matches.GamCod=gam_games.GamCod"
|
||||
" AND gam_games.CrsCod=%ld" // Extra check
|
||||
" AND mch_matches.EndTime>=FROM_UNIXTIME(%ld)"
|
||||
" AND mch_matches.StartTime<=FROM_UNIXTIME(%ld)"
|
||||
" ORDER BY MchCod",
|
||||
" AND gam_games.GamCod IN (%s)"
|
||||
" ORDER BY gam_games.Title",
|
||||
UsrDat->UsrCod,
|
||||
Gbl.Hierarchy.Crs.CrsCod,
|
||||
(long) Gbl.DateRange.TimeUTC[Dat_START_TIME],
|
||||
(long) Gbl.DateRange.TimeUTC[Dat_END_TIME]);
|
||||
GamesSubQuery);
|
||||
free (GamesSubQuery);
|
||||
|
||||
/***** Show user's data *****/
|
||||
HTM_TR_Begin (NULL);
|
||||
|
@ -405,28 +557,28 @@ static void McR_ShowMchResults (Usr_MeOrOther_t MeOrOther)
|
|||
if (NumResults)
|
||||
{
|
||||
for (NumResult = 0;
|
||||
NumResult < NumResults;
|
||||
NumResult++)
|
||||
{
|
||||
row = mysql_fetch_row (mysql_res);
|
||||
NumResult < NumResults;
|
||||
NumResult++)
|
||||
{
|
||||
row = mysql_fetch_row (mysql_res);
|
||||
|
||||
/* Get match code (row[0]) */
|
||||
/* Get match code (row[0]) */
|
||||
if ((Match.MchCod = Str_ConvertStrCodToLongCod (row[0])) < 0)
|
||||
Lay_ShowErrorAndExit ("Wrong code of match.");
|
||||
Mch_GetDataOfMatchByCod (&Match);
|
||||
Mch_GetDataOfMatchByCod (&Match);
|
||||
|
||||
/* Show match result? */
|
||||
ShowResultThisMatch = McR_CheckIfICanSeeMatchResult (Match.MchCod,UsrDat->UsrCod);
|
||||
ShowSummaryResults = ShowSummaryResults && ShowResultThisMatch;
|
||||
|
||||
if (NumResult)
|
||||
HTM_TR_Begin (NULL);
|
||||
if (NumResult)
|
||||
HTM_TR_Begin (NULL);
|
||||
|
||||
/* Write start/end times (row[1], row[2] hold UTC start/end times) */
|
||||
for (StartEndTime = (Dat_StartEndTime_t) 0;
|
||||
/* Write start/end times (row[1], row[2] hold UTC start/end times) */
|
||||
for (StartEndTime = (Dat_StartEndTime_t) 0;
|
||||
StartEndTime <= (Dat_StartEndTime_t) (Dat_NUM_START_END_TIME - 1);
|
||||
StartEndTime++)
|
||||
{
|
||||
{
|
||||
TimeUTC[StartEndTime] = Dat_GetUNIXTimeFromStr (row[1 + StartEndTime]);
|
||||
UniqueId++;
|
||||
if (asprintf (&Id,"mch_time_%u_%u",(unsigned) StartEndTime,UniqueId) < 0)
|
||||
|
@ -437,22 +589,22 @@ static void McR_ShowMchResults (Usr_MeOrOther_t MeOrOther)
|
|||
Gbl.Prefs.DateFormat,Dat_SEPARATOR_BREAK,
|
||||
true,true,false,0x7);
|
||||
HTM_TD_End ();
|
||||
free (Id);
|
||||
}
|
||||
free (Id);
|
||||
}
|
||||
|
||||
/* Write match title */
|
||||
/* Write match title */
|
||||
HTM_TD_Begin ("class=\"DAT LT COLOR%u\"",Gbl.RowEvenOdd);
|
||||
HTM_Txt (Match.Title);
|
||||
HTM_TD_End ();
|
||||
|
||||
/* Get number of questions (row[3]) */
|
||||
if (sscanf (row[3],"%u",&NumQstsInThisResult) != 1)
|
||||
NumQstsInThisResult = 0;
|
||||
/* Get number of questions (row[3]) */
|
||||
if (sscanf (row[3],"%u",&NumQstsInThisResult) != 1)
|
||||
NumQstsInThisResult = 0;
|
||||
NumTotalQsts += NumQstsInThisResult;
|
||||
|
||||
/* Get number of questions not blank (row[4]) */
|
||||
if (sscanf (row[4],"%u",&NumQstsNotBlankInThisResult) != 1)
|
||||
NumQstsNotBlankInThisResult = 0;
|
||||
/* Get number of questions not blank (row[4]) */
|
||||
if (sscanf (row[4],"%u",&NumQstsNotBlankInThisResult) != 1)
|
||||
NumQstsNotBlankInThisResult = 0;
|
||||
NumTotalQstsNotBlank += NumQstsNotBlankInThisResult;
|
||||
|
||||
if (ShowResultThisMatch)
|
||||
|
@ -465,12 +617,12 @@ static void McR_ShowMchResults (Usr_MeOrOther_t MeOrOther)
|
|||
TotalScoreOfAllResults += ScoreInThisResult;
|
||||
}
|
||||
|
||||
/* Write number of questions */
|
||||
/* Write number of questions */
|
||||
HTM_TD_Begin ("class=\"DAT RT COLOR%u\"",Gbl.RowEvenOdd);
|
||||
HTM_Unsigned (NumQstsInThisResult);
|
||||
HTM_TD_End ();
|
||||
|
||||
/* Write number of questions not blank */
|
||||
/* Write number of questions not blank */
|
||||
HTM_TD_Begin ("class=\"DAT RT COLOR%u\"",Gbl.RowEvenOdd);
|
||||
HTM_Unsigned (NumQstsNotBlankInThisResult);
|
||||
HTM_TD_End ();
|
||||
|
@ -481,20 +633,20 @@ static void McR_ShowMchResults (Usr_MeOrOther_t MeOrOther)
|
|||
HTM_Double (ScoreInThisResult);
|
||||
HTM_TD_End ();
|
||||
|
||||
/* Write average score per question */
|
||||
/* Write average score per question */
|
||||
HTM_TD_Begin ("class=\"DAT RT COLOR%u\"",Gbl.RowEvenOdd);
|
||||
if (ShowResultThisMatch)
|
||||
HTM_Double (NumQstsInThisResult ? ScoreInThisResult /
|
||||
(double) NumQstsInThisResult :
|
||||
0.0);
|
||||
(double) NumQstsInThisResult :
|
||||
0.0);
|
||||
HTM_TD_End ();
|
||||
|
||||
/* Write score over Tst_SCORE_MAX */
|
||||
/* Write score over Tst_SCORE_MAX */
|
||||
HTM_TD_Begin ("class=\"DAT RT COLOR%u\"",Gbl.RowEvenOdd);
|
||||
if (ShowResultThisMatch)
|
||||
HTM_Double (NumQstsInThisResult ? ScoreInThisResult * Tst_SCORE_MAX /
|
||||
(double) NumQstsInThisResult :
|
||||
0.0);
|
||||
(double) NumQstsInThisResult :
|
||||
0.0);
|
||||
HTM_TD_End ();
|
||||
|
||||
/* Link to show this result */
|
||||
|
@ -522,18 +674,18 @@ static void McR_ShowMchResults (Usr_MeOrOther_t MeOrOther)
|
|||
Ico_PutIconOff ("eye-slash.svg",Txt_Hidden_result);
|
||||
HTM_TD_End ();
|
||||
|
||||
HTM_TR_End ();
|
||||
}
|
||||
HTM_TR_End ();
|
||||
}
|
||||
|
||||
/***** Write totals for this user *****/
|
||||
McR_ShowMchResultsSummaryRow (ShowSummaryResults,
|
||||
NumResults,
|
||||
NumTotalQsts,NumTotalQstsNotBlank,
|
||||
TotalScoreOfAllResults);
|
||||
NumTotalQsts,NumTotalQstsNotBlank,
|
||||
TotalScoreOfAllResults);
|
||||
}
|
||||
else
|
||||
{
|
||||
HTM_TD_ColouredEmpty (8);
|
||||
HTM_TD_ColouredEmpty (9);
|
||||
HTM_TR_End ();
|
||||
}
|
||||
|
||||
|
|
|
@ -36,7 +36,6 @@
|
|||
/*****************************************************************************/
|
||||
|
||||
void McR_PutFormToViewMchResults (Act_Action_t Action);
|
||||
void McR_SelDatesToSeeMyMchResults (void);
|
||||
void McR_ShowMyMchResults (void);
|
||||
void McR_SelUsrsToViewUsrsMchResults (void);
|
||||
void McR_GetUsrsAndShowMchResults (void);
|
||||
|
|
|
@ -3833,7 +3833,7 @@ void Msg_ListBannedUsrs (void)
|
|||
Usr_UsrDataConstructor (&UsrDat);
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_Banned_users,NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_Banned_users,NULL,
|
||||
NULL,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** List users *****/
|
||||
|
@ -3877,7 +3877,7 @@ void Msg_ListBannedUsrs (void)
|
|||
}
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
|
||||
/***** Free memory used for user's data *****/
|
||||
Usr_UsrDataDestructor (&UsrDat);
|
||||
|
|
|
@ -540,7 +540,7 @@ void Net_ShowWebAndSocialNetworksStats (void)
|
|||
}
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_FIGURE_TYPES[Fig_SOCIAL_NETWORKS],NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_FIGURE_TYPES[Fig_SOCIAL_NETWORKS],NULL,
|
||||
Hlp_ANALYTICS_Figures_webs_social_networks,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Write heading *****/
|
||||
|
@ -597,7 +597,7 @@ void Net_ShowWebAndSocialNetworksStats (void)
|
|||
}
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
|
||||
/***** Free structure that stores the query result *****/
|
||||
DB_FreeMySQLResult (&mysql_res);
|
||||
|
|
|
@ -412,7 +412,7 @@ static void Nck_ShowFormChangeUsrNickname (const struct UsrData *UsrDat,bool Its
|
|||
HTM_TR_End ();
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
|
||||
/***** End section *****/
|
||||
HTM_SECTION_End ();
|
||||
|
|
|
@ -118,7 +118,7 @@ void Not_ShowFormNotice (void)
|
|||
HTM_TEXTAREA_End ();
|
||||
|
||||
/***** Send button and end box *****/
|
||||
Box_EndBoxWithButton (Btn_CREATE_BUTTON,Txt_Create_notice);
|
||||
Box_BoxWithButtonEnd (Btn_CREATE_BUTTON,Txt_Create_notice);
|
||||
|
||||
/***** End form *****/
|
||||
Frm_EndForm ();
|
||||
|
|
|
@ -289,7 +289,7 @@ void Pwd_ShowFormSendNewPwd (void)
|
|||
HTM_LABEL_End ();
|
||||
|
||||
/***** Send button and end box *****/
|
||||
Box_EndBoxWithButton (Btn_CONFIRM_BUTTON,Txt_Get_a_new_password);
|
||||
Box_BoxWithButtonEnd (Btn_CONFIRM_BUTTON,Txt_Get_a_new_password);
|
||||
|
||||
/***** End form *****/
|
||||
Frm_EndForm ();
|
||||
|
@ -710,7 +710,7 @@ void Pwd_ShowFormChgMyPwd (void)
|
|||
Pwd_PutFormToGetNewPasswordTwice ();
|
||||
|
||||
/***** End table, send button and end box *****/
|
||||
Box_EndBoxTableWithButton (Btn_CONFIRM_BUTTON,
|
||||
Box_BoxTableWithButtonEnd (Btn_CONFIRM_BUTTON,
|
||||
IHaveAPasswordInDB ? Txt_Change_password :
|
||||
Txt_Set_password);
|
||||
|
||||
|
|
|
@ -798,7 +798,7 @@ static void Plc_PutFormToCreatePlace (void)
|
|||
Frm_StartForm (ActNewPlc);
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_New_place,NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_New_place,NULL,
|
||||
NULL,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Write heading *****/
|
||||
|
@ -834,7 +834,7 @@ static void Plc_PutFormToCreatePlace (void)
|
|||
HTM_TR_End ();
|
||||
|
||||
/***** End table, send button and end box *****/
|
||||
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_place);
|
||||
Box_BoxTableWithButtonEnd (Btn_CREATE_BUTTON,Txt_Create_place);
|
||||
|
||||
/***** End form *****/
|
||||
Frm_EndForm ();
|
||||
|
|
|
@ -110,7 +110,7 @@ void Plg_ListPlugins (void)
|
|||
Plg_GetListPlugins ();
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_Plugins,
|
||||
Box_BoxTableBegin (NULL,Txt_Plugins,
|
||||
Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM ? Plg_PutIconToEditPlugins :
|
||||
NULL,
|
||||
NULL,Box_NOT_CLOSABLE,2);
|
||||
|
@ -161,7 +161,7 @@ void Plg_ListPlugins (void)
|
|||
}
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
|
||||
/***** Free list of plugins *****/
|
||||
Plg_FreeListPlugins ();
|
||||
|
@ -875,7 +875,7 @@ static void Plg_PutFormToCreatePlugin (void)
|
|||
Frm_StartForm (ActNewPlg);
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_New_plugin,NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_New_plugin,NULL,
|
||||
NULL,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Write heading *****/
|
||||
|
@ -930,7 +930,7 @@ static void Plg_PutFormToCreatePlugin (void)
|
|||
HTM_TR_End ();
|
||||
|
||||
/***** End table, send button and end box *****/
|
||||
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_plugin);
|
||||
Box_BoxTableWithButtonEnd (Btn_CREATE_BUTTON,Txt_Create_plugin);
|
||||
|
||||
/***** End form *****/
|
||||
Frm_EndForm ();
|
||||
|
|
|
@ -97,7 +97,7 @@ void Pri_EditMyPrivacy (void)
|
|||
Ale_ShowAlert (Ale_WARNING,Txt_Please_check_your_privacy_settings);
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_Privacy,Pri_PutIconsPrivacy,
|
||||
Box_BoxTableBegin (NULL,Txt_Privacy,Pri_PutIconsPrivacy,
|
||||
Hlp_PROFILE_Settings_privacy,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Edit photo visibility *****/
|
||||
|
@ -125,7 +125,7 @@ void Pri_EditMyPrivacy (void)
|
|||
Pri_TIMELINE_ALLOWED_VIS);
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
|
||||
/***** End section with settings on privacy *****/
|
||||
HTM_SECTION_End ();
|
||||
|
|
|
@ -216,7 +216,7 @@ void Prf_RequestUserProfile (void)
|
|||
HTM_LABEL_End ();
|
||||
|
||||
/***** Send button and end box *****/
|
||||
Box_EndBoxWithButton (Btn_CONFIRM_BUTTON,Txt_Continue);
|
||||
Box_BoxWithButtonEnd (Btn_CONFIRM_BUTTON,Txt_Continue);
|
||||
|
||||
/***** End form *****/
|
||||
Frm_EndForm ();
|
||||
|
|
|
@ -2364,7 +2364,7 @@ static void Prj_AddUsrsToProject (Prj_RoleInProject_t RoleInProject)
|
|||
Usr_GetUsrCodFromEncryptedUsrCod (&Gbl.Usrs.Other.UsrDat);
|
||||
|
||||
/* Get user's data */
|
||||
if (Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&Gbl.Usrs.Other.UsrDat,Usr_DONT_GET_PREFS)) // Get of the database the data of the user
|
||||
if (Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&Gbl.Usrs.Other.UsrDat,Usr_DONT_GET_PREFS))
|
||||
{
|
||||
/* Add user to project */
|
||||
DB_QueryREPLACE ("can not add user to project",
|
||||
|
@ -3448,14 +3448,14 @@ static void Prj_PutFormProject (struct Project *Prj,bool ItsANewProject)
|
|||
/***** 1. Project members *****/
|
||||
if (!ItsANewProject) // Existing project
|
||||
{
|
||||
Box_StartBoxTable (NULL,Txt_Members,NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_Members,NULL,
|
||||
NULL,Box_NOT_CLOSABLE,2);
|
||||
for (NumRoleToShow = 0;
|
||||
NumRoleToShow < Brw_NUM_ROLES_TO_SHOW;
|
||||
NumRoleToShow++)
|
||||
Prj_ShowOneProjectMembersWithARole (Prj,Prj_EDIT_ONE_PROJECT,
|
||||
Prj_RolesToShow[NumRoleToShow]);
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
|
||||
/***** 2. Project data *****/
|
||||
|
@ -3465,7 +3465,7 @@ static void Prj_PutFormProject (struct Project *Prj,bool ItsANewProject)
|
|||
Prj_PutCurrentParams ();
|
||||
|
||||
/* Begin box and table */
|
||||
Box_StartBoxTable (NULL,Txt_Data,NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_Data,NULL,
|
||||
NULL,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/* Project title */
|
||||
|
@ -3596,9 +3596,9 @@ static void Prj_PutFormProject (struct Project *Prj,bool ItsANewProject)
|
|||
|
||||
/* End table, send button and end box */
|
||||
if (ItsANewProject)
|
||||
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_project);
|
||||
Box_BoxTableWithButtonEnd (Btn_CREATE_BUTTON,Txt_Create_project);
|
||||
else
|
||||
Box_EndBoxTableWithButton (Btn_CONFIRM_BUTTON,Txt_Save_changes);
|
||||
Box_BoxTableWithButtonEnd (Btn_CONFIRM_BUTTON,Txt_Save_changes);
|
||||
|
||||
/* End data form */
|
||||
Frm_EndForm ();
|
||||
|
|
|
@ -195,13 +195,13 @@ void Rec_ReqEditRecordFields (void)
|
|||
if (Gbl.Crs.Records.LstFields.Num) // Fields found...
|
||||
{
|
||||
/* Begin box and table */
|
||||
Box_StartBoxTable (NULL,Txt_Record_fields,NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_Record_fields,NULL,
|
||||
Hlp_USERS_Students_course_record_card,Box_NOT_CLOSABLE,2);
|
||||
|
||||
Rec_ListFieldsRecordsForEdition ();
|
||||
|
||||
/* End table and box */
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
else // No fields of records found for current course in the database
|
||||
Ale_ShowAlert (Ale_INFO,Txt_There_are_no_record_fields_in_the_course_X,
|
||||
|
@ -369,7 +369,7 @@ void Rec_ShowFormCreateRecordField (void)
|
|||
Frm_StartForm (ActNewFie);
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_New_record_field,NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_New_record_field,NULL,
|
||||
Hlp_USERS_Students_course_record_card,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Write heading *****/
|
||||
|
@ -415,7 +415,7 @@ void Rec_ShowFormCreateRecordField (void)
|
|||
HTM_TR_End ();
|
||||
|
||||
/***** End table, send button and end box *****/
|
||||
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_record_field);
|
||||
Box_BoxTableWithButtonEnd (Btn_CREATE_BUTTON,Txt_Create_record_field);
|
||||
|
||||
/***** End form *****/
|
||||
Frm_EndForm ();
|
||||
|
@ -1739,7 +1739,7 @@ static void Rec_ShowCrsRecord (Rec_CourseRecordViewType_t TypeOfView,
|
|||
snprintf (StrRecordWidth,sizeof (StrRecordWidth),
|
||||
"%upx",
|
||||
Rec_RECORD_WIDTH);
|
||||
Box_StartBoxTable (StrRecordWidth,NULL,NULL,
|
||||
Box_BoxTableBegin (StrRecordWidth,NULL,NULL,
|
||||
Rec_RecordHelp[TypeOfView],Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Write heading *****/
|
||||
|
@ -1860,14 +1860,14 @@ static void Rec_ShowCrsRecord (Rec_CourseRecordViewType_t TypeOfView,
|
|||
if (ICanEdit)
|
||||
{
|
||||
/* End table, send button and end box */
|
||||
Box_EndBoxTableWithButton (Btn_CONFIRM_BUTTON,Txt_Save_changes);
|
||||
Box_BoxTableWithButtonEnd (Btn_CONFIRM_BUTTON,Txt_Save_changes);
|
||||
|
||||
/* End form */
|
||||
Frm_EndForm ();
|
||||
}
|
||||
else
|
||||
/* End table and box */
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -2258,7 +2258,7 @@ void Rec_ShowSharedUsrRecord (Rec_SharedRecordViewType_t TypeOfView,
|
|||
sprintf (StrRecordWidth,"%upx",Rec_RECORD_WIDTH);
|
||||
Gbl.Record.UsrDat = UsrDat;
|
||||
Gbl.Record.TypeOfView = TypeOfView;
|
||||
Box_StartBoxTable (StrRecordWidth,NULL,
|
||||
Box_BoxTableBegin (StrRecordWidth,NULL,
|
||||
TypeOfView == Rec_SHA_OTHER_NEW_USR_FORM ? NULL : // New user ==> don't put icons
|
||||
Rec_PutIconsCommands,
|
||||
Rec_RecordHelp[TypeOfView],Box_NOT_CLOSABLE,2);
|
||||
|
@ -2452,7 +2452,7 @@ void Rec_ShowSharedUsrRecord (Rec_SharedRecordViewType_t TypeOfView,
|
|||
}
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -4003,7 +4003,7 @@ static void Rec_ShowFormMyInsCtrDpt (bool IAmATeacher)
|
|||
|
||||
/***** Begin box and table *****/
|
||||
sprintf (StrRecordWidth,"%upx",Rec_RECORD_WIDTH);
|
||||
Box_StartBoxTable (StrRecordWidth,
|
||||
Box_BoxTableBegin (StrRecordWidth,
|
||||
IAmATeacher ? Txt_Institution_centre_and_department :
|
||||
Txt_Institution,
|
||||
NULL,
|
||||
|
@ -4187,7 +4187,7 @@ static void Rec_ShowFormMyInsCtrDpt (bool IAmATeacher)
|
|||
}
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
|
||||
/***** End section *****/
|
||||
HTM_SECTION_End ();
|
||||
|
|
|
@ -167,7 +167,7 @@ void Rep_ReqMyUsageReport (void)
|
|||
Rep_TitleReport (NULL); // NULL means do not write date
|
||||
|
||||
/***** Send button and end box *****/
|
||||
Box_EndBoxWithButton (Btn_CONFIRM_BUTTON,Txt_Generate_report);
|
||||
Box_BoxWithButtonEnd (Btn_CONFIRM_BUTTON,Txt_Generate_report);
|
||||
|
||||
/***** End form *****/
|
||||
Frm_EndForm ();
|
||||
|
|
|
@ -530,7 +530,7 @@ void Sta_AskShowGblHits (void)
|
|||
Frm_StartFormAnchor (ActSeeAccGbl,Sta_STAT_RESULTS_SECTION_ID);
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_Statistics_of_all_visits,NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_Statistics_of_all_visits,NULL,
|
||||
Hlp_ANALYTICS_Visits_global_visits,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Start and end dates for the search *****/
|
||||
|
@ -632,7 +632,7 @@ void Sta_AskShowGblHits (void)
|
|||
Dat_PutHiddenParBrowserTZDiff ();
|
||||
|
||||
/***** Send button and end box *****/
|
||||
Box_EndBoxWithButton (Btn_CONFIRM_BUTTON,Txt_Show_hits);
|
||||
Box_BoxWithButtonEnd (Btn_CONFIRM_BUTTON,Txt_Show_hits);
|
||||
|
||||
/***** End form *****/
|
||||
Frm_EndForm ();
|
||||
|
|
|
@ -1883,10 +1883,10 @@ void Svy_RequestCreatOrEditSvy (void)
|
|||
|
||||
/***** Begin box and table *****/
|
||||
if (ItsANewSurvey)
|
||||
Box_StartBoxTable (NULL,Txt_New_survey,NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_New_survey,NULL,
|
||||
Hlp_ASSESSMENT_Surveys_new_survey,Box_NOT_CLOSABLE,2);
|
||||
else
|
||||
Box_StartBoxTable (NULL,
|
||||
Box_BoxTableBegin (NULL,
|
||||
Svy.Title[0] ? Svy.Title :
|
||||
Txt_Edit_survey,
|
||||
NULL,
|
||||
|
@ -1968,9 +1968,9 @@ void Svy_RequestCreatOrEditSvy (void)
|
|||
|
||||
/***** End table, send button and end box *****/
|
||||
if (ItsANewSurvey)
|
||||
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_survey);
|
||||
Box_BoxTableWithButtonEnd (Btn_CREATE_BUTTON,Txt_Create_survey);
|
||||
else
|
||||
Box_EndBoxTableWithButton (Btn_CONFIRM_BUTTON,Txt_Save_changes);
|
||||
Box_BoxTableWithButtonEnd (Btn_CONFIRM_BUTTON,Txt_Save_changes);
|
||||
|
||||
/***** End form *****/
|
||||
Frm_EndForm ();
|
||||
|
@ -2086,7 +2086,7 @@ static void Svy_ShowLstGrpsToEditSurvey (long SvyCod)
|
|||
HTM_TD_End ();
|
||||
|
||||
HTM_TD_Begin ("class=\"LT\"");
|
||||
Box_StartBoxTable ("95%",NULL,NULL,
|
||||
Box_BoxTableBegin ("95%",NULL,NULL,
|
||||
NULL,Box_NOT_CLOSABLE,0);
|
||||
|
||||
/***** First row: checkbox to select the whole course *****/
|
||||
|
@ -2112,7 +2112,7 @@ static void Svy_ShowLstGrpsToEditSurvey (long SvyCod)
|
|||
SvyCod,Grp_SURVEY);
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
HTM_TD_End ();
|
||||
HTM_TR_End ();
|
||||
}
|
||||
|
|
|
@ -517,7 +517,7 @@ static void Syl_ShowSyllabus (bool PutIconToEdit)
|
|||
Gbl.Action.Act == ActLftIteSylLec || Gbl.Action.Act == ActLftIteSylPra);
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_INFO_TITLE[Gbl.Crs.Info.Type],
|
||||
Box_BoxTableBegin (NULL,Txt_INFO_TITLE[Gbl.Crs.Info.Type],
|
||||
PutIconToEdit ? Inf_PutIconToEditInfo :
|
||||
NULL,
|
||||
Gbl.Syllabus.EditionIsActive ? Hlp_COURSE_Syllabus_edit :
|
||||
|
|
18
swad_test.c
18
swad_test.c
|
@ -1781,7 +1781,7 @@ static void Tst_ShowFormEditTags (void)
|
|||
if ((NumRows = Tst_GetAllTagsFromCurrentCrs (&mysql_res)))
|
||||
{
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_Tags,NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_Tags,NULL,
|
||||
Hlp_ASSESSMENT_Tests_writing_a_question,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Show tags *****/
|
||||
|
@ -1819,7 +1819,7 @@ static void Tst_ShowFormEditTags (void)
|
|||
}
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
else
|
||||
Ale_ShowAlert (Ale_INFO,Txt_No_test_questions);
|
||||
|
@ -7553,12 +7553,12 @@ void Tst_SelDatesToSeeMyTstResults (void)
|
|||
Frm_StartForm (ActSeeMyTstRes);
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_Results,NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_Results,NULL,
|
||||
Hlp_ASSESSMENT_Tests_results,Box_NOT_CLOSABLE,2);
|
||||
Dat_PutFormStartEndClientLocalDateTimesWithYesterdayToday (false);
|
||||
|
||||
/***** End table, send button and end box *****/
|
||||
Box_EndBoxTableWithButton (Btn_CONFIRM_BUTTON,Txt_View_test_results);
|
||||
Box_BoxTableWithButtonEnd (Btn_CONFIRM_BUTTON,Txt_View_test_results);
|
||||
|
||||
/***** End form *****/
|
||||
Frm_EndForm ();
|
||||
|
@ -7577,7 +7577,7 @@ void Tst_ShowMyTstResults (void)
|
|||
Dat_GetIniEndDatesFromForm ();
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_Results,NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_Results,NULL,
|
||||
Hlp_ASSESSMENT_Tests_results,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Header of the table with the list of users *****/
|
||||
|
@ -7588,7 +7588,7 @@ void Tst_ShowMyTstResults (void)
|
|||
Tst_ShowTstResults (&Gbl.Usrs.Me.UsrDat);
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -7654,7 +7654,7 @@ static void Tst_ShowUsrsTstResults (void)
|
|||
Dat_GetIniEndDatesFromForm ();
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_Results,NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_Results,NULL,
|
||||
Hlp_ASSESSMENT_Tests_results,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Header of the table with the list of users *****/
|
||||
|
@ -7667,14 +7667,14 @@ static void Tst_ShowUsrsTstResults (void)
|
|||
Par_GetNextStrUntilSeparParamMult (&Ptr,Gbl.Usrs.Other.UsrDat.EncryptedUsrCod,
|
||||
Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64);
|
||||
Usr_GetUsrCodFromEncryptedUsrCod (&Gbl.Usrs.Other.UsrDat);
|
||||
if (Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&Gbl.Usrs.Other.UsrDat,Usr_DONT_GET_PREFS)) // Get of the database the data of the user
|
||||
if (Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&Gbl.Usrs.Other.UsrDat,Usr_DONT_GET_PREFS))
|
||||
if (Usr_CheckIfICanViewTst (&Gbl.Usrs.Other.UsrDat))
|
||||
/***** Show test results *****/
|
||||
Tst_ShowTstResults (&Gbl.Usrs.Other.UsrDat);
|
||||
}
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
21
swad_text.c
21
swad_text.c
|
@ -51483,6 +51483,27 @@ const char *Txt_Update_messages =
|
|||
"Atualizar mensagens";
|
||||
#endif
|
||||
|
||||
const char *Txt_Update_results =
|
||||
#if L==1 // ca
|
||||
"Actualitzar resultats";
|
||||
#elif L==2 // de
|
||||
"Update Ergebnisse";
|
||||
#elif L==3 // en
|
||||
"Update results";
|
||||
#elif L==4 // es
|
||||
"Actualizar resultados";
|
||||
#elif L==5 // fr
|
||||
"Mise à jour des résultats";
|
||||
#elif L==6 // gn
|
||||
"Actualizar resultados"; // Okoteve traducción
|
||||
#elif L==7 // it
|
||||
"Aggiornamento risultati";
|
||||
#elif L==8 // pl
|
||||
"Zaktualizuj wyniki mecze";
|
||||
#elif L==9 // pt
|
||||
"Atualizar os resultados";
|
||||
#endif
|
||||
|
||||
const char *Txt_Update_users =
|
||||
#if L==1 // ca
|
||||
"Actualitzar usuaris";
|
||||
|
|
|
@ -111,6 +111,29 @@ struct PostContent
|
|||
· an original note
|
||||
· a shared note
|
||||
· a comment to a note
|
||||
|
||||
_____tl_pubs_____ _tl_comments_
|
||||
| | | |
|
||||
| Publication n |------------------------------------>| Comment p |
|
||||
| (comment) | +----| (to note m) |
|
||||
|_________________| ____tl_notes_____ | |_____________|
|
||||
| | | | | | |
|
||||
| Publication n-1 |-------->| Note m |<---+ | |
|
||||
| (original note) | | (tl. post) | | ... |
|
||||
|_________________| |_________________| |_____________|
|
||||
| | | | | |
|
||||
| | | Note m-1 | | Comment 1 |
|
||||
| ... | | (public file) | +----| (to note 2) |
|
||||
|_________________| |_________________| | |_____________|
|
||||
| | | | |
|
||||
| Publication 2 | | Note 2 |<---+
|
||||
| (shared note) |----+ | (exam announc.) |
|
||||
|_________________| | |_________________|
|
||||
| | | | |
|
||||
| Publication 1 | +--->| Note 1 |
|
||||
| (original note) |-------->| (tl. post) |
|
||||
|_________________| |_________________|
|
||||
|
||||
A note can be:
|
||||
· a timeline post
|
||||
· a public file
|
||||
|
|
10
swad_user.c
10
swad_user.c
|
@ -2615,7 +2615,7 @@ void Usr_WriteFormLogin (Act_Action_t NextAction,void (*FuncParams) (void))
|
|||
FuncParams ();
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTable (NULL,Txt_Log_in,NULL,
|
||||
Box_BoxTableBegin (NULL,Txt_Log_in,NULL,
|
||||
Hlp_PROFILE_LogIn,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** User's ID/nickname *****/
|
||||
|
@ -2639,7 +2639,7 @@ void Usr_WriteFormLogin (Act_Action_t NextAction,void (*FuncParams) (void))
|
|||
HTM_DIV_End ();
|
||||
|
||||
/***** End table, send button and end box *****/
|
||||
Box_EndBoxTableWithButton (Btn_CONFIRM_BUTTON,Txt_Log_in);
|
||||
Box_BoxTableWithButtonEnd (Btn_CONFIRM_BUTTON,Txt_Log_in);
|
||||
|
||||
/***** End form *****/
|
||||
Frm_EndForm ();
|
||||
|
@ -7364,7 +7364,7 @@ unsigned Usr_ListUsrsFound (Rol_Role_t Role,
|
|||
Txt_users[Sex]) :
|
||||
((NumUsrs == 1) ? Txt_ROLES_SINGUL_abc[Role][Sex] :
|
||||
Txt_ROLES_PLURAL_abc[Role][Sex]));
|
||||
Box_StartBoxTable (NULL,Gbl.Title,NULL,
|
||||
Box_BoxTableBegin (NULL,Gbl.Title,NULL,
|
||||
NULL,Box_NOT_CLOSABLE,2);
|
||||
|
||||
/***** Heading row with column names *****/
|
||||
|
@ -7423,7 +7423,7 @@ unsigned Usr_ListUsrsFound (Rol_Role_t Role,
|
|||
Usr_UsrDataDestructor (&UsrDat);
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
|
||||
/***** Free memory for teachers list *****/
|
||||
|
@ -9904,7 +9904,7 @@ void Usr_ShowTableCellWithUsrData (struct UsrData *UsrDat,unsigned NumRows)
|
|||
}
|
||||
Frm_StartForm (NextAction);
|
||||
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
|
||||
HTM_BUTTON_SUBMIT_Begin (UsrDat->FullName,"BT_LINK AUTHOR_TXT",NULL);
|
||||
HTM_BUTTON_SUBMIT_Begin (UsrDat->FullName,"BT_LINK LT AUTHOR_TXT",NULL);
|
||||
|
||||
/***** Show user's ID *****/
|
||||
ID_WriteUsrIDs (UsrDat,NULL);
|
||||
|
|
|
@ -564,7 +564,7 @@ static void ZIP_ShowLinkToDownloadZIP (const char *FileName,const char *URL,
|
|||
char FileSizeStr[Fil_MAX_BYTES_FILE_SIZE_STRING + 1];
|
||||
|
||||
/***** Begin box and table *****/
|
||||
Box_StartBoxTableShadow (NULL,NULL,NULL,NULL,2);
|
||||
Box_BoxTableShadowBegin (NULL,NULL,NULL,NULL,2);
|
||||
|
||||
/***** Link to download the file *****/
|
||||
HTM_TR_Begin (NULL);
|
||||
|
@ -615,5 +615,5 @@ static void ZIP_ShowLinkToDownloadZIP (const char *FileName,const char *URL,
|
|||
HTM_TR_End ();
|
||||
|
||||
/***** End table and box *****/
|
||||
Box_EndBoxTable ();
|
||||
Box_BoxTableEnd ();
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue