From 4a9bc596eb1b69bcdafd7eb0ec597d622a5255d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Fri, 25 Oct 2019 22:48:34 +0200 Subject: [PATCH] Version19.44 --- sql/swad.sql | 9 +- swad_ID.c | 8 +- swad_MFU.c | 4 +- swad_account.c | 8 +- swad_action.c | 22 +- swad_action.h | 303 +++++++-------- swad_agenda.c | 16 +- swad_announcement.c | 4 +- swad_assignment.c | 4 +- swad_attendance.c | 24 +- swad_banner.c | 8 +- swad_box.c | 10 +- swad_box.h | 4 +- swad_calendar.c | 8 +- swad_centre.c | 18 +- swad_changelog.h | 14 +- swad_chat.c | 4 +- swad_classroom.c | 8 +- swad_connected.c | 4 +- swad_country.c | 10 +- swad_course.c | 20 +- swad_database.c | 22 +- swad_date.c | 4 +- swad_degree.c | 14 +- swad_degree_type.c | 10 +- swad_department.c | 4 +- swad_duplicate.c | 8 +- swad_enrolment.c | 20 +- swad_exam.c | 6 +- swad_figure.c | 10 +- swad_file_browser.c | 24 +- swad_forum.c | 18 +- swad_game.c | 12 +- swad_global.c | 1 + swad_global.h | 4 + swad_group.c | 16 +- swad_holiday.c | 4 +- swad_icon.c | 4 +- swad_indicator.c | 4 +- swad_info.c | 24 +- swad_institution.c | 14 +- swad_language.c | 4 +- swad_link.c | 8 +- swad_logo.c | 4 +- swad_mail.c | 12 +- swad_match.c | 6 +- swad_match_result.c | 8 +- swad_media.c | 4 +- swad_menu.c | 4 +- swad_message.c | 12 +- swad_network.c | 4 +- swad_nickname.c | 2 +- swad_notice.c | 6 +- swad_notification.c | 8 +- swad_password.c | 8 +- swad_photo.c | 10 +- swad_place.c | 8 +- swad_plugin.c | 4 +- swad_profile.c | 2 +- swad_project.c | 916 +++++++++++++++++++++++++------------------- swad_project.h | 13 +- swad_record.c | 8 +- swad_report.c | 6 +- swad_search.c | 4 +- swad_setting.c | 12 +- swad_statistic.c | 14 +- swad_survey.c | 18 +- swad_syllabus.c | 2 +- swad_test.c | 48 +-- swad_test_import.c | 8 +- swad_text.c | 139 +++++-- swad_theme.c | 4 +- swad_timeline.c | 12 +- swad_timetable.c | 12 +- swad_user.c | 32 +- 75 files changed, 1173 insertions(+), 922 deletions(-) diff --git a/sql/swad.sql b/sql/swad.sql index 13669253..a5a19c3f 100644 --- a/sql/swad.sql +++ b/sql/swad.sql @@ -1020,6 +1020,13 @@ CREATE TABLE IF NOT EXISTS plugins ( IP CHAR(15) NOT NULL, UNIQUE INDEX(PlgCod)); -- +-- Table prj_config: stores the configuration of projects for each course +-- +CREATE TABLE IF NOT EXISTS prj_config ( + CrsCod INT NOT NULL DEFAULT -1, + Editable ENUM('N','Y') NOT NULL DEFAULT 'Y', + UNIQUE INDEX(CrsCod)); +-- -- Table prj_usr: stores the users inside projects -- CREATE TABLE IF NOT EXISTS prj_usr ( @@ -1036,7 +1043,7 @@ CREATE TABLE IF NOT EXISTS projects ( DptCod INT NOT NULL DEFAULT -1, Locked ENUM('N','Y') NOT NULL DEFAULT 'N', Hidden ENUM('N','Y') NOT NULL DEFAULT 'N', - Preassigned ENUM('N','Y') NOT NULL DEFAULT 'N', + Assigned ENUM('N','Y') NOT NULL DEFAULT 'N', NumStds INT NOT NULL DEFAULT 1, Proposal ENUM('new','modified','unmodified') NOT NULL DEFAULT 'new', CreatTime DATETIME NOT NULL, diff --git a/swad_ID.c b/swad_ID.c index 54fc49cf..8931ecbb 100644 --- a/swad_ID.c +++ b/swad_ID.c @@ -520,7 +520,7 @@ void ID_ShowFormChangeMyID (bool IShouldFillInID) snprintf (StrRecordWidth,sizeof (StrRecordWidth), "%upx", Rec_RECORD_WIDTH); - Box_StartBox (StrRecordWidth,Txt_ID,Acc_PutLinkToRemoveMyAccount, + Box_BoxBegin (StrRecordWidth,Txt_ID,Acc_PutLinkToRemoveMyAccount, Hlp_PROFILE_Account,Box_NOT_CLOSABLE); /***** Show form to change ID *****/ @@ -529,7 +529,7 @@ void ID_ShowFormChangeMyID (bool IShouldFillInID) IShouldFillInID); /***** End box *****/ - Box_EndBox (); + Box_BoxEnd (); /***** End section *****/ Lay_EndSection (); @@ -552,7 +552,7 @@ void ID_ShowFormChangeOtherUsrID (void) snprintf (StrRecordWidth,sizeof (StrRecordWidth), "%upx", Rec_RECORD_WIDTH); - Box_StartBox (StrRecordWidth,Txt_ID,NULL, + Box_BoxBegin (StrRecordWidth,Txt_ID,NULL, Hlp_PROFILE_Account,Box_NOT_CLOSABLE); /***** Show form to change ID *****/ @@ -561,7 +561,7 @@ void ID_ShowFormChangeOtherUsrID (void) false); // IShouldFillInID /***** End box *****/ - Box_EndBox (); + Box_BoxEnd (); /***** End section *****/ Lay_EndSection (); diff --git a/swad_MFU.c b/swad_MFU.c index dc843fb2..6f92ef61 100644 --- a/swad_MFU.c +++ b/swad_MFU.c @@ -218,7 +218,7 @@ void MFU_WriteBigMFUActions (struct MFU_ListMFUActions *ListMFUActions) char TabMenuStr[MFU_MAX_BYTES_TAB + 6 + MFU_MAX_BYTES_MENU + 1]; /***** Start box *****/ - Box_StartBox (NULL,Txt_My_frequent_actions,NULL, + Box_BoxBegin (NULL,Txt_My_frequent_actions,NULL, Hlp_ANALYTICS_Frequent,Box_NOT_CLOSABLE); HTM_DIV_Begin ("id=\"MFU_actions_big\""); @@ -257,7 +257,7 @@ void MFU_WriteBigMFUActions (struct MFU_ListMFUActions *ListMFUActions) /***** End box *****/ HTM_DIV_End (); - Box_EndBox (); + Box_BoxEnd (); } /*****************************************************************************/ diff --git a/swad_account.c b/swad_account.c index d6da00af..741f6d49 100644 --- a/swad_account.c +++ b/swad_account.c @@ -141,7 +141,7 @@ static void Acc_ShowFormCheckIfIHaveAccount (const char *Title) extern const char *Txt_Skip_this_step; /***** Start box *****/ - Box_StartBox (NULL,Title,NULL, + Box_BoxBegin (NULL,Title,NULL, Hlp_PROFILE_SignUp,Box_NOT_CLOSABLE); /***** Help alert *****/ @@ -166,7 +166,7 @@ static void Acc_ShowFormCheckIfIHaveAccount (const char *Title) Frm_EndForm (); /***** End box *****/ - Box_EndBox (); + Box_BoxEnd (); } /*****************************************************************************/ @@ -430,7 +430,7 @@ void Acc_ShowFormGoToRequestNewAccount (void) snprintf (Gbl.Title,sizeof (Gbl.Title), Txt_New_on_PLATFORM_Sign_up, Cfg_PLATFORM_SHORT_NAME); - Box_StartBox (NULL,Gbl.Title,NULL, + Box_BoxBegin (NULL,Gbl.Title,NULL, Hlp_PROFILE_SignUp,Box_NOT_CLOSABLE); /***** Button to go to request the creation of a new account *****/ @@ -439,7 +439,7 @@ void Acc_ShowFormGoToRequestNewAccount (void) Frm_EndForm (); /***** End box *****/ - Box_EndBox (); + Box_BoxEnd (); } /*****************************************************************************/ diff --git a/swad_action.c b/swad_action.c index 19043f3c..c05d02d4 100644 --- a/swad_action.c +++ b/swad_action.c @@ -499,6 +499,12 @@ Assessment: 356. ActSeeTblAllPrj Show all projects in a table NEW. ActCfgPrj Configure all projects + NEW. ActRcvCfgPrj Receive configuration of all projects + 368. ActReqLckAllPrj Request locking of all projects + 369. ActReqUnlAllPrj Request unlocking of all projects + 370. ActLckAllPrj Lock all projects + 371. ActUnlAllPrj Unlock all projects + 357. ActFrmNewPrj Form to create a new project 358. ActEdiOnePrj Edit one project 359. ActPrnOnePrj Print one project @@ -510,10 +516,6 @@ Assessment: 365. ActShoPrj Show project 366. ActLckPrj Lock project edition 367. ActUnlPrj Unlock project edition - 368. ActReqLckAllPrj Request locking of all projects - 369. ActReqUnlAllPrj Request unlocking of all projects - 370. ActLckAllPrj Lock all projects - 371. ActUnlAllPrj Unlock all projects 372. ActReqAddStdPrj Request adding a student to a project 373. ActReqAddTutPrj Request adding a tutor to a project 374. ActReqAddEvlPrj Request adding an evaluator to a project @@ -2062,7 +2064,12 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActShoAsg */{ 965,-1,TabUnk,ActSeeAsg ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Asg_ShowAssignment ,NULL}, /* ActSeeTblAllPrj */{1696,-1,TabUnk,ActSeePrj ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_NEW_TAB,NULL ,Prj_ShowTableAllProjects ,NULL}, - /* ActCfgPrj */{1803,-1,TabUnk,ActSeePrj ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_NEW_TAB,NULL ,Prj_ShowTableAllProjects ,NULL}, + /* ActCfgPrj */{1803,-1,TabUnk,ActSeePrj ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prj_ShowFormConfig ,NULL}, + /* ActRcvCfgPrj */{1804,-1,TabUnk,ActSeePrj ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prj_ReceiveConfigPrj ,NULL}, + /* ActReqLckAllPrj */{1775,-1,TabUnk,ActSeePrj ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prj_ReqLockAllProjectsEdition ,NULL}, + /* ActReqUnlAllPrj */{1776,-1,TabUnk,ActSeePrj ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prj_ReqUnlockAllProjectsEdition,NULL}, + /* ActLckAllPrj */{1777,-1,TabUnk,ActSeePrj ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prj_LockAllProjectsEdition ,NULL}, + /* ActUnlAllPrj */{1778,-1,TabUnk,ActSeePrj ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prj_UnlockAllProjectsEdition ,NULL}, /* ActFrmNewPrj */{1675,-1,TabUnk,ActSeePrj ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prj_RequestCreatePrj ,NULL}, /* ActEdiOnePrj */{1676,-1,TabUnk,ActSeePrj ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prj_RequestEditPrj ,NULL}, /* ActPrnOnePrj */{1677,-1,TabUnk,ActSeePrj ,0x3F8,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_NEW_TAB,NULL ,Prj_PrintOneProject ,NULL}, @@ -2074,10 +2081,6 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActShoPrj */{1683,-1,TabUnk,ActSeePrj ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prj_ShowProject ,NULL}, /* ActLckPrj */{1773,-1,TabUnk,ActSeePrj ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_AJAX_NORMAL,NULL ,Prj_LockProjectEdition ,NULL}, /* ActUnlPrj */{1774,-1,TabUnk,ActSeePrj ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_AJAX_NORMAL,NULL ,Prj_UnlockProjectEdition ,NULL}, - /* ActReqLckAllPrj */{1775,-1,TabUnk,ActSeePrj ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prj_ReqLockAllProjectsEdition ,NULL}, - /* ActReqUnlAllPrj */{1776,-1,TabUnk,ActSeePrj ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prj_ReqUnlockAllProjectsEdition,NULL}, - /* ActLckAllPrj */{1777,-1,TabUnk,ActSeePrj ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prj_LockAllProjectsEdition ,NULL}, - /* ActUnlAllPrj */{1778,-1,TabUnk,ActSeePrj ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prj_UnlockAllProjectsEdition ,NULL}, /* ActReqAddStdPrj */{1684,-1,TabUnk,ActSeePrj ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prj_ReqAddStds ,NULL}, /* ActReqAddTutPrj */{1685,-1,TabUnk,ActSeePrj ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prj_ReqAddTuts ,NULL}, /* ActReqAddEvlPrj */{1686,-1,TabUnk,ActSeePrj ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prj_ReqAddEvls ,NULL}, @@ -5036,6 +5039,7 @@ Act_Action_t Act_FromActCodToAction[1 + Act_MAX_ACTION_COD] = // Do not reuse un ActChgVisResMchUsr, // #1801 ActChgNumColMch, // #1802 ActCfgPrj, // #1803 + ActRcvCfgPrj, // #1804 }; /*****************************************************************************/ diff --git a/swad_action.h b/swad_action.h index 1839eb64..10efa95d 100644 --- a/swad_action.h +++ b/swad_action.h @@ -64,9 +64,9 @@ 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 + 64 + 38 + 12 + 42 + 36 + 19 + 110 + 178 + 437 + 176 + 169 + 16 + 68) +#define Act_NUM_ACTIONS (1 + 4 + 64 + 38 + 12 + 42 + 36 + 19 + 110 + 179 + 437 + 176 + 169 + 16 + 68) -#define Act_MAX_ACTION_COD 1803 +#define Act_MAX_ACTION_COD 1804 #define Act_MAX_OPTIONS_IN_MENU_PER_TAB 13 @@ -515,166 +515,167 @@ typedef signed int Act_Action_t; // Must be a signed type, because -1 is used to #define ActSeeTblAllPrj (ActChgCrsTT1stDay + 28) #define ActCfgPrj (ActChgCrsTT1stDay + 29) -#define ActFrmNewPrj (ActChgCrsTT1stDay + 30) -#define ActEdiOnePrj (ActChgCrsTT1stDay + 31) -#define ActPrnOnePrj (ActChgCrsTT1stDay + 32) -#define ActNewPrj (ActChgCrsTT1stDay + 33) -#define ActChgPrj (ActChgCrsTT1stDay + 34) -#define ActReqRemPrj (ActChgCrsTT1stDay + 35) -#define ActRemPrj (ActChgCrsTT1stDay + 36) -#define ActHidPrj (ActChgCrsTT1stDay + 37) -#define ActShoPrj (ActChgCrsTT1stDay + 38) -#define ActLckPrj (ActChgCrsTT1stDay + 39) -#define ActUnlPrj (ActChgCrsTT1stDay + 40) -#define ActReqLckAllPrj (ActChgCrsTT1stDay + 41) -#define ActReqUnlAllPrj (ActChgCrsTT1stDay + 42) -#define ActLckAllPrj (ActChgCrsTT1stDay + 43) -#define ActUnlAllPrj (ActChgCrsTT1stDay + 44) -#define ActReqAddStdPrj (ActChgCrsTT1stDay + 45) -#define ActReqAddTutPrj (ActChgCrsTT1stDay + 46) -#define ActReqAddEvlPrj (ActChgCrsTT1stDay + 47) -#define ActAddStdPrj (ActChgCrsTT1stDay + 48) -#define ActAddTutPrj (ActChgCrsTT1stDay + 49) -#define ActAddEvlPrj (ActChgCrsTT1stDay + 50) -#define ActReqRemStdPrj (ActChgCrsTT1stDay + 51) -#define ActReqRemTutPrj (ActChgCrsTT1stDay + 52) -#define ActReqRemEvlPrj (ActChgCrsTT1stDay + 53) -#define ActRemStdPrj (ActChgCrsTT1stDay + 54) -#define ActRemTutPrj (ActChgCrsTT1stDay + 55) -#define ActRemEvlPrj (ActChgCrsTT1stDay + 56) +#define ActRcvCfgPrj (ActChgCrsTT1stDay + 30) +#define ActReqLckAllPrj (ActChgCrsTT1stDay + 31) +#define ActReqUnlAllPrj (ActChgCrsTT1stDay + 32) +#define ActLckAllPrj (ActChgCrsTT1stDay + 33) +#define ActUnlAllPrj (ActChgCrsTT1stDay + 34) +#define ActFrmNewPrj (ActChgCrsTT1stDay + 35) +#define ActEdiOnePrj (ActChgCrsTT1stDay + 36) +#define ActPrnOnePrj (ActChgCrsTT1stDay + 37) +#define ActNewPrj (ActChgCrsTT1stDay + 38) +#define ActChgPrj (ActChgCrsTT1stDay + 39) +#define ActReqRemPrj (ActChgCrsTT1stDay + 40) +#define ActRemPrj (ActChgCrsTT1stDay + 41) +#define ActHidPrj (ActChgCrsTT1stDay + 42) +#define ActShoPrj (ActChgCrsTT1stDay + 43) +#define ActLckPrj (ActChgCrsTT1stDay + 44) +#define ActUnlPrj (ActChgCrsTT1stDay + 45) +#define ActReqAddStdPrj (ActChgCrsTT1stDay + 46) +#define ActReqAddTutPrj (ActChgCrsTT1stDay + 47) +#define ActReqAddEvlPrj (ActChgCrsTT1stDay + 48) +#define ActAddStdPrj (ActChgCrsTT1stDay + 49) +#define ActAddTutPrj (ActChgCrsTT1stDay + 50) +#define ActAddEvlPrj (ActChgCrsTT1stDay + 51) +#define ActReqRemStdPrj (ActChgCrsTT1stDay + 52) +#define ActReqRemTutPrj (ActChgCrsTT1stDay + 53) +#define ActReqRemEvlPrj (ActChgCrsTT1stDay + 54) +#define ActRemStdPrj (ActChgCrsTT1stDay + 55) +#define ActRemTutPrj (ActChgCrsTT1stDay + 56) +#define ActRemEvlPrj (ActChgCrsTT1stDay + 57) -#define ActAdmDocPrj (ActChgCrsTT1stDay + 57) -#define ActReqRemFilDocPrj (ActChgCrsTT1stDay + 58) -#define ActRemFilDocPrj (ActChgCrsTT1stDay + 59) -#define ActRemFolDocPrj (ActChgCrsTT1stDay + 60) -#define ActCopDocPrj (ActChgCrsTT1stDay + 61) -#define ActPasDocPrj (ActChgCrsTT1stDay + 62) -#define ActRemTreDocPrj (ActChgCrsTT1stDay + 63) -#define ActFrmCreDocPrj (ActChgCrsTT1stDay + 64) -#define ActCreFolDocPrj (ActChgCrsTT1stDay + 65) -#define ActCreLnkDocPrj (ActChgCrsTT1stDay + 66) -#define ActRenFolDocPrj (ActChgCrsTT1stDay + 67) -#define ActRcvFilDocPrjDZ (ActChgCrsTT1stDay + 68) -#define ActRcvFilDocPrjCla (ActChgCrsTT1stDay + 69) -#define ActExpDocPrj (ActChgCrsTT1stDay + 70) -#define ActConDocPrj (ActChgCrsTT1stDay + 71) -#define ActZIPDocPrj (ActChgCrsTT1stDay + 72) -#define ActReqDatDocPrj (ActChgCrsTT1stDay + 73) -#define ActChgDatDocPrj (ActChgCrsTT1stDay + 74) -#define ActDowDocPrj (ActChgCrsTT1stDay + 75) +#define ActAdmDocPrj (ActChgCrsTT1stDay + 58) +#define ActReqRemFilDocPrj (ActChgCrsTT1stDay + 59) +#define ActRemFilDocPrj (ActChgCrsTT1stDay + 60) +#define ActRemFolDocPrj (ActChgCrsTT1stDay + 61) +#define ActCopDocPrj (ActChgCrsTT1stDay + 62) +#define ActPasDocPrj (ActChgCrsTT1stDay + 63) +#define ActRemTreDocPrj (ActChgCrsTT1stDay + 64) +#define ActFrmCreDocPrj (ActChgCrsTT1stDay + 65) +#define ActCreFolDocPrj (ActChgCrsTT1stDay + 66) +#define ActCreLnkDocPrj (ActChgCrsTT1stDay + 67) +#define ActRenFolDocPrj (ActChgCrsTT1stDay + 68) +#define ActRcvFilDocPrjDZ (ActChgCrsTT1stDay + 69) +#define ActRcvFilDocPrjCla (ActChgCrsTT1stDay + 70) +#define ActExpDocPrj (ActChgCrsTT1stDay + 71) +#define ActConDocPrj (ActChgCrsTT1stDay + 72) +#define ActZIPDocPrj (ActChgCrsTT1stDay + 73) +#define ActReqDatDocPrj (ActChgCrsTT1stDay + 74) +#define ActChgDatDocPrj (ActChgCrsTT1stDay + 75) +#define ActDowDocPrj (ActChgCrsTT1stDay + 76) -#define ActAdmAssPrj (ActChgCrsTT1stDay + 76) -#define ActReqRemFilAssPrj (ActChgCrsTT1stDay + 77) -#define ActRemFilAssPrj (ActChgCrsTT1stDay + 78) -#define ActRemFolAssPrj (ActChgCrsTT1stDay + 79) -#define ActCopAssPrj (ActChgCrsTT1stDay + 80) -#define ActPasAssPrj (ActChgCrsTT1stDay + 81) -#define ActRemTreAssPrj (ActChgCrsTT1stDay + 82) -#define ActFrmCreAssPrj (ActChgCrsTT1stDay + 83) -#define ActCreFolAssPrj (ActChgCrsTT1stDay + 84) -#define ActCreLnkAssPrj (ActChgCrsTT1stDay + 85) -#define ActRenFolAssPrj (ActChgCrsTT1stDay + 86) -#define ActRcvFilAssPrjDZ (ActChgCrsTT1stDay + 87) -#define ActRcvFilAssPrjCla (ActChgCrsTT1stDay + 88) -#define ActExpAssPrj (ActChgCrsTT1stDay + 89) -#define ActConAssPrj (ActChgCrsTT1stDay + 90) -#define ActZIPAssPrj (ActChgCrsTT1stDay + 91) -#define ActReqDatAssPrj (ActChgCrsTT1stDay + 92) -#define ActChgDatAssPrj (ActChgCrsTT1stDay + 93) -#define ActDowAssPrj (ActChgCrsTT1stDay + 94) +#define ActAdmAssPrj (ActChgCrsTT1stDay + 77) +#define ActReqRemFilAssPrj (ActChgCrsTT1stDay + 78) +#define ActRemFilAssPrj (ActChgCrsTT1stDay + 79) +#define ActRemFolAssPrj (ActChgCrsTT1stDay + 80) +#define ActCopAssPrj (ActChgCrsTT1stDay + 81) +#define ActPasAssPrj (ActChgCrsTT1stDay + 82) +#define ActRemTreAssPrj (ActChgCrsTT1stDay + 83) +#define ActFrmCreAssPrj (ActChgCrsTT1stDay + 84) +#define ActCreFolAssPrj (ActChgCrsTT1stDay + 85) +#define ActCreLnkAssPrj (ActChgCrsTT1stDay + 86) +#define ActRenFolAssPrj (ActChgCrsTT1stDay + 87) +#define ActRcvFilAssPrjDZ (ActChgCrsTT1stDay + 88) +#define ActRcvFilAssPrjCla (ActChgCrsTT1stDay + 89) +#define ActExpAssPrj (ActChgCrsTT1stDay + 90) +#define ActConAssPrj (ActChgCrsTT1stDay + 91) +#define ActZIPAssPrj (ActChgCrsTT1stDay + 92) +#define ActReqDatAssPrj (ActChgCrsTT1stDay + 93) +#define ActChgDatAssPrj (ActChgCrsTT1stDay + 94) +#define ActDowAssPrj (ActChgCrsTT1stDay + 95) -#define ActSeeTst (ActChgCrsTT1stDay + 95) -#define ActAssTst (ActChgCrsTT1stDay + 96) -#define ActEdiTstQst (ActChgCrsTT1stDay + 97) -#define ActEdiOneTstQst (ActChgCrsTT1stDay + 98) -#define ActReqImpTstQst (ActChgCrsTT1stDay + 99) -#define ActImpTstQst (ActChgCrsTT1stDay + 100) -#define ActLstTstQst (ActChgCrsTT1stDay + 101) -#define ActRcvTstQst (ActChgCrsTT1stDay + 102) -#define ActReqRemTstQst (ActChgCrsTT1stDay + 103) -#define ActRemTstQst (ActChgCrsTT1stDay + 104) -#define ActShfTstQst (ActChgCrsTT1stDay + 105) -#define ActCfgTst (ActChgCrsTT1stDay + 106) -#define ActEnableTag (ActChgCrsTT1stDay + 107) -#define ActDisableTag (ActChgCrsTT1stDay + 108) -#define ActRenTag (ActChgCrsTT1stDay + 109) -#define ActRcvCfgTst (ActChgCrsTT1stDay + 110) +#define ActSeeTst (ActChgCrsTT1stDay + 96) +#define ActAssTst (ActChgCrsTT1stDay + 97) +#define ActEdiTstQst (ActChgCrsTT1stDay + 98) +#define ActEdiOneTstQst (ActChgCrsTT1stDay + 99) +#define ActReqImpTstQst (ActChgCrsTT1stDay + 100) +#define ActImpTstQst (ActChgCrsTT1stDay + 101) +#define ActLstTstQst (ActChgCrsTT1stDay + 102) +#define ActRcvTstQst (ActChgCrsTT1stDay + 103) +#define ActReqRemTstQst (ActChgCrsTT1stDay + 104) +#define ActRemTstQst (ActChgCrsTT1stDay + 105) +#define ActShfTstQst (ActChgCrsTT1stDay + 106) +#define ActCfgTst (ActChgCrsTT1stDay + 107) +#define ActEnableTag (ActChgCrsTT1stDay + 108) +#define ActDisableTag (ActChgCrsTT1stDay + 109) +#define ActRenTag (ActChgCrsTT1stDay + 110) +#define ActRcvCfgTst (ActChgCrsTT1stDay + 111) -#define ActReqSeeMyTstRes (ActChgCrsTT1stDay + 111) -#define ActSeeMyTstRes (ActChgCrsTT1stDay + 112) -#define ActSeeOneTstResMe (ActChgCrsTT1stDay + 113) -#define ActReqSeeUsrTstRes (ActChgCrsTT1stDay + 114) -#define ActSeeUsrTstRes (ActChgCrsTT1stDay + 115) -#define ActSeeOneTstResOth (ActChgCrsTT1stDay + 116) +#define ActReqSeeMyTstRes (ActChgCrsTT1stDay + 112) +#define ActSeeMyTstRes (ActChgCrsTT1stDay + 113) +#define ActSeeOneTstResMe (ActChgCrsTT1stDay + 114) +#define ActReqSeeUsrTstRes (ActChgCrsTT1stDay + 115) +#define ActSeeUsrTstRes (ActChgCrsTT1stDay + 116) +#define ActSeeOneTstResOth (ActChgCrsTT1stDay + 117) -#define ActSeeGam (ActChgCrsTT1stDay + 117) -#define ActReqRemMch (ActChgCrsTT1stDay + 118) -#define ActRemMch (ActChgCrsTT1stDay + 119) -#define ActReqNewMch (ActChgCrsTT1stDay + 120) -#define ActNewMch (ActChgCrsTT1stDay + 121) -#define ActResMch (ActChgCrsTT1stDay + 122) -#define ActBckMch (ActChgCrsTT1stDay + 123) -#define ActPlyPauMch (ActChgCrsTT1stDay + 124) -#define ActFwdMch (ActChgCrsTT1stDay + 125) -#define ActChgNumColMch (ActChgCrsTT1stDay + 126) -#define ActChgVisResMchQst (ActChgCrsTT1stDay + 127) -#define ActRefMchTch (ActChgCrsTT1stDay + 128) +#define ActSeeGam (ActChgCrsTT1stDay + 118) +#define ActReqRemMch (ActChgCrsTT1stDay + 119) +#define ActRemMch (ActChgCrsTT1stDay + 120) +#define ActReqNewMch (ActChgCrsTT1stDay + 121) +#define ActNewMch (ActChgCrsTT1stDay + 122) +#define ActResMch (ActChgCrsTT1stDay + 123) +#define ActBckMch (ActChgCrsTT1stDay + 124) +#define ActPlyPauMch (ActChgCrsTT1stDay + 125) +#define ActFwdMch (ActChgCrsTT1stDay + 126) +#define ActChgNumColMch (ActChgCrsTT1stDay + 127) +#define ActChgVisResMchQst (ActChgCrsTT1stDay + 128) +#define ActRefMchTch (ActChgCrsTT1stDay + 129) -#define ActJoiMch (ActChgCrsTT1stDay + 129) -#define ActAnsMchQstStd (ActChgCrsTT1stDay + 130) -#define ActRefMchStd (ActChgCrsTT1stDay + 131) +#define ActJoiMch (ActChgCrsTT1stDay + 130) +#define ActAnsMchQstStd (ActChgCrsTT1stDay + 131) +#define ActRefMchStd (ActChgCrsTT1stDay + 132) -#define ActReqSeeMyMchRes (ActChgCrsTT1stDay + 132) -#define ActSeeMyMchRes (ActChgCrsTT1stDay + 133) -#define ActSeeOneMchResMe (ActChgCrsTT1stDay + 134) +#define ActReqSeeMyMchRes (ActChgCrsTT1stDay + 133) +#define ActSeeMyMchRes (ActChgCrsTT1stDay + 134) +#define ActSeeOneMchResMe (ActChgCrsTT1stDay + 135) -#define ActReqSeeUsrMchRes (ActChgCrsTT1stDay + 135) -#define ActSeeUsrMchRes (ActChgCrsTT1stDay + 136) -#define ActSeeOneMchResOth (ActChgCrsTT1stDay + 137) -#define ActChgVisResMchUsr (ActChgCrsTT1stDay + 138) +#define ActReqSeeUsrMchRes (ActChgCrsTT1stDay + 136) +#define ActSeeUsrMchRes (ActChgCrsTT1stDay + 137) +#define ActSeeOneMchResOth (ActChgCrsTT1stDay + 138) +#define ActChgVisResMchUsr (ActChgCrsTT1stDay + 139) -#define ActFrmNewGam (ActChgCrsTT1stDay + 139) -#define ActEdiOneGam (ActChgCrsTT1stDay + 140) -#define ActNewGam (ActChgCrsTT1stDay + 141) -#define ActChgGam (ActChgCrsTT1stDay + 142) -#define ActReqRemGam (ActChgCrsTT1stDay + 143) -#define ActRemGam (ActChgCrsTT1stDay + 144) -#define ActHidGam (ActChgCrsTT1stDay + 145) -#define ActShoGam (ActChgCrsTT1stDay + 146) -#define ActAddOneGamQst (ActChgCrsTT1stDay + 147) -#define ActGamLstTstQst (ActChgCrsTT1stDay + 148) -#define ActAddTstQstToGam (ActChgCrsTT1stDay + 149) -#define ActReqRemGamQst (ActChgCrsTT1stDay + 150) -#define ActRemGamQst (ActChgCrsTT1stDay + 151) -#define ActUp_GamQst (ActChgCrsTT1stDay + 152) -#define ActDwnGamQst (ActChgCrsTT1stDay + 153) +#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 + 154) -#define ActAnsSvy (ActChgCrsTT1stDay + 155) -#define ActFrmNewSvy (ActChgCrsTT1stDay + 156) -#define ActEdiOneSvy (ActChgCrsTT1stDay + 157) -#define ActNewSvy (ActChgCrsTT1stDay + 158) -#define ActChgSvy (ActChgCrsTT1stDay + 159) -#define ActReqRemSvy (ActChgCrsTT1stDay + 160) -#define ActRemSvy (ActChgCrsTT1stDay + 161) -#define ActReqRstSvy (ActChgCrsTT1stDay + 162) -#define ActRstSvy (ActChgCrsTT1stDay + 163) -#define ActHidSvy (ActChgCrsTT1stDay + 164) -#define ActShoSvy (ActChgCrsTT1stDay + 165) -#define ActEdiOneSvyQst (ActChgCrsTT1stDay + 166) -#define ActRcvSvyQst (ActChgCrsTT1stDay + 167) -#define ActReqRemSvyQst (ActChgCrsTT1stDay + 168) -#define ActRemSvyQst (ActChgCrsTT1stDay + 169) +#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 + 170) -#define ActSeeDatExaAnn (ActChgCrsTT1stDay + 171) -#define ActEdiExaAnn (ActChgCrsTT1stDay + 172) -#define ActRcvExaAnn (ActChgCrsTT1stDay + 173) -#define ActPrnExaAnn (ActChgCrsTT1stDay + 174) -#define ActReqRemExaAnn (ActChgCrsTT1stDay + 175) -#define ActRemExaAnn (ActChgCrsTT1stDay + 176) -#define ActHidExaAnn (ActChgCrsTT1stDay + 177) -#define ActShoExaAnn (ActChgCrsTT1stDay + 178) +#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 **********************************/ diff --git a/swad_agenda.c b/swad_agenda.c index 5d3d8be2..0c2b7dd8 100644 --- a/swad_agenda.c +++ b/swad_agenda.c @@ -154,7 +154,7 @@ void Agd_ShowMyAgenda (void) Agd_GetParams (Agd_MY_AGENDA); /***** Start box *****/ - Box_StartBox ("100%",Txt_My_agenda,Agd_PutIconsMyFullAgenda, + Box_BoxBegin ("100%",Txt_My_agenda,Agd_PutIconsMyFullAgenda, Hlp_PROFILE_Agenda,Box_NOT_CLOSABLE); /***** Put forms to choice which events to show *****/ @@ -171,7 +171,7 @@ void Agd_ShowMyAgenda (void) Agd_ShowEvents (Agd_MY_AGENDA); /***** End box *****/ - Box_EndBox (); + Box_BoxEnd (); } /*****************************************************************************/ @@ -357,7 +357,7 @@ void Agd_ShowUsrAgenda (void) Txt_Public_agenda_USER, Gbl.Usrs.Other.UsrDat.FullName); ItsMe = Usr_ItsMe (Gbl.Usrs.Other.UsrDat.UsrCod); - Box_StartBox ("100%",Gbl.Title, + Box_BoxBegin ("100%",Gbl.Title, ItsMe ? Agd_PutIconsMyPublicAgenda : Agd_PutIconsOtherPublicAgenda, Hlp_PROFILE_Agenda_public_agenda,Box_NOT_CLOSABLE); @@ -369,7 +369,7 @@ void Agd_ShowUsrAgenda (void) Agd_ShowEvents (Agd_ANOTHER_AGENDA); /***** End box *****/ - Box_EndBox (); + Box_BoxEnd (); } if (Error) @@ -401,7 +401,7 @@ void Agd_ShowOtherAgendaAfterLogIn (void) Txt_Public_agenda_USER, Gbl.Usrs.Other.UsrDat.FullName); ItsMe = Usr_ItsMe (Gbl.Usrs.Other.UsrDat.UsrCod); - Box_StartBox ("100%",Gbl.Title, + Box_BoxBegin ("100%",Gbl.Title, ItsMe ? Agd_PutIconToViewEditMyFullAgenda : Agd_PutIconsOtherPublicAgenda, Hlp_PROFILE_Agenda_public_agenda,Box_NOT_CLOSABLE); @@ -413,7 +413,7 @@ void Agd_ShowOtherAgendaAfterLogIn (void) Agd_ShowEvents (Agd_ANOTHER_AGENDA); /***** End box *****/ - Box_EndBox (); + Box_BoxEnd (); } else Ale_ShowAlertUserNotFoundOrYouDoNotHavePermission (); @@ -1904,12 +1904,12 @@ void Agd_PrintAgdQRCode (void) snprintf (Gbl.Title,sizeof (Gbl.Title), Txt_Where_s_USER, Gbl.Usrs.Me.UsrDat.FullName); - Box_StartBox (NULL,Gbl.Title,NULL, + Box_BoxBegin (NULL,Gbl.Title,NULL, NULL,Box_NOT_CLOSABLE); /***** Print QR code ****/ QR_PrintQRCode (); /***** End box *****/ - Box_EndBox (); + Box_BoxEnd (); } diff --git a/swad_announcement.c b/swad_announcement.c index 9e3d6be1..4f3bc4b5 100644 --- a/swad_announcement.c +++ b/swad_announcement.c @@ -127,7 +127,7 @@ void Ann_ShowAllAnnouncements (void) } /***** Start box *****/ - Box_StartBox ("550px",Txt_Announcements, + Box_BoxBegin ("550px",Txt_Announcements, ICanEdit ? Ann_PutIconToAddNewAnnouncement : NULL, Hlp_MESSAGES_Announcements,Box_NOT_CLOSABLE); @@ -174,7 +174,7 @@ void Ann_ShowAllAnnouncements (void) Ann_PutButtonToAddNewAnnouncement (); /***** End box *****/ - Box_EndBox (); + Box_BoxEnd (); /***** Free structure that stores the query result *****/ DB_FreeMySQLResult (&mysql_res); diff --git a/swad_assignment.c b/swad_assignment.c index e94236a6..900ca5b3 100644 --- a/swad_assignment.c +++ b/swad_assignment.c @@ -143,7 +143,7 @@ static void Asg_ShowAllAssignments (void) &Pagination); /***** Start box *****/ - Box_StartBox ("100%",Txt_Assignments,Asg_PutIconsListAssignments, + Box_BoxBegin ("100%",Txt_Assignments,Asg_PutIconsListAssignments, Hlp_ASSESSMENT_Assignments,Box_NOT_CLOSABLE); /***** Select whether show only my groups or all groups *****/ @@ -178,7 +178,7 @@ static void Asg_ShowAllAssignments (void) Asg_PutButtonToCreateNewAsg (); /***** End box *****/ - Box_EndBox (); + Box_BoxEnd (); /***** Write again links to pages *****/ if (Pagination.MoreThanOnePage) diff --git a/swad_attendance.c b/swad_attendance.c index a4d9784c..9a651527 100644 --- a/swad_attendance.c +++ b/swad_attendance.c @@ -223,7 +223,7 @@ static void Att_ShowAllAttEvents (void) &Pagination); /***** Start box *****/ - Box_StartBox ("100%",Txt_Events,Att_PutIconsInListOfAttEvents, + Box_BoxBegin ("100%",Txt_Events,Att_PutIconsInListOfAttEvents, Hlp_USERS_Attendance,Box_NOT_CLOSABLE); /***** Select whether show only my groups or all groups *****/ @@ -284,7 +284,7 @@ static void Att_ShowAllAttEvents (void) Att_PutButtonToCreateNewAttEvent (); /***** End box *****/ - Box_EndBox (); + Box_BoxEnd (); /***** Write again links to pages *****/ if (Pagination.MoreThanOnePage) @@ -1887,7 +1887,7 @@ static void Att_ListAttOnlyMeAsStudent (struct AttendanceEvent *Att) /***** List students (only me) *****/ /* Start box */ - Box_StartBox (NULL,Txt_Attendance,NULL, + Box_BoxBegin (NULL,Txt_Attendance,NULL, Hlp_USERS_Attendance,Box_NOT_CLOSABLE); /* Begin table */ @@ -1919,7 +1919,7 @@ static void Att_ListAttOnlyMeAsStudent (struct AttendanceEvent *Att) } /* End box */ - Box_EndBox (); + Box_BoxEnd (); } /*****************************************************************************/ @@ -1945,7 +1945,7 @@ static void Att_ListAttStudents (struct AttendanceEvent *Att) Usr_GetListUsrs (Hie_CRS,Rol_STD); /***** Start box *****/ - Box_StartBox (NULL,Txt_Attendance,NULL, + Box_BoxBegin (NULL,Txt_Attendance,NULL, Hlp_USERS_Attendance,Box_NOT_CLOSABLE); /***** Form to select groups *****/ @@ -2017,7 +2017,7 @@ static void Att_ListAttStudents (struct AttendanceEvent *Att) Lay_EndSection (); /***** End box *****/ - Box_EndBox (); + Box_BoxEnd (); /***** Free memory for students list *****/ Usr_FreeUsrsList (Rol_STD); @@ -2721,7 +2721,7 @@ static void Usr_ListOrPrintMyAttendanceCrs (Att_TypeOfView_t TypeOfView) Att_GetListSelectedAttCods (&Gbl.AttEvents.StrAttCodsSelected); /***** Start box *****/ - Box_StartBox (NULL,Txt_Attendance, + Box_BoxBegin (NULL,Txt_Attendance, TypeOfView == Att_NORMAL_VIEW_ONLY_ME ? Att_PutIconsMyAttList : NULL, TypeOfView == Att_NORMAL_VIEW_ONLY_ME ? Hlp_USERS_Attendance_attendance_list : @@ -2742,7 +2742,7 @@ static void Usr_ListOrPrintMyAttendanceCrs (Att_TypeOfView_t TypeOfView) Att_ListStdsWithAttEventsDetails (1,&Gbl.Usrs.Me.UsrDat.UsrCod); /***** End box *****/ - Box_EndBox (); + Box_BoxEnd (); /***** Free memory for list of attendance events selected *****/ free ((void *) Gbl.AttEvents.StrAttCodsSelected); @@ -2807,7 +2807,7 @@ static void Usr_ListOrPrintUsrsAttendanceCrs (Att_TypeOfView_t TypeOfView) Att_GetListSelectedAttCods (&Gbl.AttEvents.StrAttCodsSelected); /***** Start box *****/ - Box_StartBox (NULL,Txt_Attendance_list, + Box_BoxBegin (NULL,Txt_Attendance_list, TypeOfView == Att_NORMAL_VIEW_STUDENTS ? Att_PutIconsStdsAttList : NULL, TypeOfView == Att_NORMAL_VIEW_STUDENTS ? Hlp_USERS_Attendance_attendance_list : @@ -2828,7 +2828,7 @@ static void Usr_ListOrPrintUsrsAttendanceCrs (Att_TypeOfView_t TypeOfView) Att_ListStdsWithAttEventsDetails (NumUsrsInList,LstSelectedUsrCods); /***** End box *****/ - Box_EndBox (); + Box_BoxEnd (); /***** Free memory for list of attendance events selected *****/ free ((void *) Gbl.AttEvents.StrAttCodsSelected); @@ -3077,7 +3077,7 @@ static void Att_ListEventsToSelect (Att_TypeOfView_t TypeOfView) TypeOfView == Att_NORMAL_VIEW_STUDENTS); /***** Start box *****/ - Box_StartBox (NULL,Txt_Events, + Box_BoxBegin (NULL,Txt_Events, TypeOfView == Att_NORMAL_VIEW_ONLY_ME ? Att_PutIconToViewAttEvents : (TypeOfView == Att_NORMAL_VIEW_STUDENTS ? Att_PutIconToEditAttEvents : NULL), @@ -3178,7 +3178,7 @@ static void Att_ListEventsToSelect (Att_TypeOfView_t TypeOfView) Frm_EndForm (); /***** End box *****/ - Box_EndBox (); + Box_BoxEnd (); } /*****************************************************************************/ diff --git a/swad_banner.c b/swad_banner.c index ac85445c..706064d3 100644 --- a/swad_banner.c +++ b/swad_banner.c @@ -111,7 +111,7 @@ void Ban_SeeBanners (void) Ban_GetListBanners (&mysql_res,NumRows); /***** Start box *****/ - Box_StartBox (NULL,Txt_Banners,Ban_PutIconsListingBanners, + Box_BoxBegin (NULL,Txt_Banners,Ban_PutIconsListingBanners, Hlp_SYSTEM_Banners,Box_NOT_CLOSABLE); /***** Write all banners *****/ @@ -129,7 +129,7 @@ void Ban_SeeBanners (void) } /***** End box *****/ - Box_EndBox (); + Box_BoxEnd (); /***** Free list of banners *****/ Ban_FreeListBanners (); @@ -222,7 +222,7 @@ static void Ban_EditBannersInternal (void) Ban_GetListBanners (&mysql_res,NumRows); /***** Start box *****/ - Box_StartBox (NULL,Txt_Banners,Ban_PutIconsEditingBanners, + Box_BoxBegin (NULL,Txt_Banners,Ban_PutIconsEditingBanners, Hlp_SYSTEM_Banners_edit,Box_NOT_CLOSABLE); /***** Put a form to create a new banner *****/ @@ -233,7 +233,7 @@ static void Ban_EditBannersInternal (void) Ban_ListBannersForEdition (); /***** End box *****/ - Box_EndBox (); + Box_BoxEnd (); /***** Free list of banners *****/ Ban_FreeListBanners (); diff --git a/swad_box.c b/swad_box.c index 0306f7c7..a06d3bc9 100644 --- a/swad_box.c +++ b/swad_box.c @@ -77,7 +77,7 @@ void Box_StartBoxTable (const char *Width,const char *Title, const char *HelpLink,Box_Closable_t Closable, unsigned CellPadding) // CellPadding must be 0, 1, 2, 5 or 10 { - Box_StartBox (Width,Title,FunctionToDrawContextualIcons, + Box_BoxBegin (Width,Title,FunctionToDrawContextualIcons, HelpLink,Closable); HTM_TABLE_BeginWidePadding (CellPadding); } @@ -93,7 +93,7 @@ void Box_StartBoxTableShadow (const char *Width,const char *Title, HTM_TABLE_BeginWidePadding (CellPadding); } -void Box_StartBox (const char *Width,const char *Title, +void Box_BoxBegin (const char *Width,const char *Title, void (*FunctionToDrawContextualIcons) (void), const char *HelpLink,Box_Closable_t Closable) { @@ -207,7 +207,7 @@ static void Box_StartBoxInternal (const char *Width,const char *Title, void Box_EndBoxTable (void) { HTM_TABLE_End (); - Box_EndBox (); + Box_BoxEnd (); } void Box_EndBoxTableWithButton (Btn_Button_t Button,const char *TxtButton) @@ -219,10 +219,10 @@ void Box_EndBoxTableWithButton (Btn_Button_t Button,const char *TxtButton) void Box_EndBoxWithButton (Btn_Button_t Button,const char *TxtButton) { Btn_PutButton (Button,TxtButton); - Box_EndBox (); + Box_BoxEnd (); } -void Box_EndBox (void) +void Box_BoxEnd (void) { /***** Check level of nesting *****/ if (Gbl.Box.Nested < 0) diff --git a/swad_box.h b/swad_box.h index 147ef8ad..60059e97 100644 --- a/swad_box.h +++ b/swad_box.h @@ -55,7 +55,7 @@ void Box_StartBoxTable (const char *Width,const char *Title, void (*FunctionToDrawContextualIcons) (void), const char *HelpLink,Box_Closable_t Closable, unsigned CellPadding); -void Box_StartBox (const char *Width,const char *Title, +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, @@ -68,6 +68,6 @@ void Box_StartBoxTableShadow (const char *Width,const char *Title, 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_EndBox (void); +void Box_BoxEnd (void); #endif diff --git a/swad_calendar.c b/swad_calendar.c index 8755ccb4..84ef0ef5 100644 --- a/swad_calendar.c +++ b/swad_calendar.c @@ -81,12 +81,12 @@ void Cal_PutIconsToSelectFirstDayOfWeek (void) extern const char *Hlp_PROFILE_Settings_calendar; extern const char *Txt_Calendar; - Box_StartBox (NULL,Txt_Calendar,Cal_PutIconsFirstDayOfWeek, + Box_BoxBegin (NULL,Txt_Calendar,Cal_PutIconsFirstDayOfWeek, Hlp_PROFILE_Settings_calendar,Box_NOT_CLOSABLE); Set_StartSettingsHead (); Cal_ShowFormToSelFirstDayOfWeek (ActChg1stDay,NULL); Set_EndSettingsHead (); - Box_EndBox (); + Box_BoxEnd (); } /*****************************************************************************/ @@ -260,7 +260,7 @@ static void Cal_DrawCalendar (Act_Action_t ActionSeeCalendar, } /***** Start box *****/ - Box_StartBox (NULL,NULL,FunctionToDrawContextualIcons, + Box_BoxBegin (NULL,NULL,FunctionToDrawContextualIcons, PrintView ? NULL : Hlp_START_Calendar,Box_NOT_CLOSABLE); Lay_WriteHeaderClassPhoto (PrintView,false, @@ -301,7 +301,7 @@ static void Cal_DrawCalendar (Act_Action_t ActionSeeCalendar, ParamsStr); /***** End box *****/ - Box_EndBox (); + Box_BoxEnd (); } /*****************************************************************************/ diff --git a/swad_centre.c b/swad_centre.c index fa85bfad..5af21d45 100644 --- a/swad_centre.c +++ b/swad_centre.c @@ -324,10 +324,10 @@ static void Ctr_Configuration (bool PrintView) /***** Start box *****/ if (PrintView) - Box_StartBox (NULL,NULL,NULL, + Box_BoxBegin (NULL,NULL,NULL, NULL,Box_NOT_CLOSABLE); else - Box_StartBox (NULL,NULL,Ctr_PutIconsCtrConfig, + Box_BoxBegin (NULL,NULL,Ctr_PutIconsCtrConfig, Hlp_CENTRE_Information,Box_NOT_CLOSABLE); /***** Title *****/ @@ -695,7 +695,7 @@ static void Ctr_Configuration (bool PrintView) HTM_TABLE_End (); /***** End box *****/ - Box_EndBox (); + Box_BoxEnd (); } /*****************************************************************************/ @@ -815,7 +815,7 @@ static void Ctr_ListCentres (void) snprintf (Gbl.Title,sizeof (Gbl.Title), Txt_Centres_of_INSTITUTION_X, Gbl.Hierarchy.Ins.FullName); - Box_StartBox (NULL,Gbl.Title,Ctr_PutIconsListingCentres, + Box_BoxBegin (NULL,Gbl.Title,Ctr_PutIconsListingCentres, Hlp_INSTITUTION_Centres,Box_NOT_CLOSABLE); if (Gbl.Hierarchy.Ins.Ctrs.Num) // There are centres in the current institution @@ -846,7 +846,7 @@ static void Ctr_ListCentres (void) } /***** End box *****/ - Box_EndBox (); + Box_BoxEnd (); } /*****************************************************************************/ @@ -1014,7 +1014,7 @@ static void Ctr_EditCentresInternal (void) snprintf (Gbl.Title,sizeof (Gbl.Title), Txt_Centres_of_INSTITUTION_X, Gbl.Hierarchy.Ins.FullName); - Box_StartBox (NULL,Gbl.Title,Ctr_PutIconsEditingCentres, + Box_BoxBegin (NULL,Gbl.Title,Ctr_PutIconsEditingCentres, Hlp_INSTITUTION_Centres,Box_NOT_CLOSABLE); /***** Put a form to create a new centre *****/ @@ -1025,7 +1025,7 @@ static void Ctr_EditCentresInternal (void) Ctr_ListCentresForEdition (); /***** End box *****/ - Box_EndBox (); + Box_BoxEnd (); /***** Free list of centres *****/ Ctr_FreeListCentres (); @@ -2313,7 +2313,7 @@ void Ctr_RequestPhoto (void) Frm_StartForm (ActRecCtrPho); /***** Start box *****/ - Box_StartBox (NULL,Txt_Photo,NULL, + Box_BoxBegin (NULL,Txt_Photo,NULL, NULL,Box_NOT_CLOSABLE); /***** Write help message *****/ @@ -2338,7 +2338,7 @@ void Ctr_RequestPhoto (void) Gbl.Form.Id); /***** End box *****/ - Box_EndBox (); + Box_BoxEnd (); /***** End form *****/ Frm_EndForm (); diff --git a/swad_changelog.h b/swad_changelog.h index c7609f80..a4287595 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -487,12 +487,22 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - * En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 19.43 (2019-10-25)" +#define Log_PLATFORM_VERSION "SWAD 19.44 (2019-10-25)" #define CSS_FILE "swad19.42.6.css" #define JS_FILE "swad19.39.js" /* -// TODO: Perico: poner un candado de bloqueo de creación/edición de proyectos (por ejemplo en asignaturas obsoletas) // TODO: Hacer un nuevo rol en los TFG: tutor externo (profesor de áreas no vinculadas con el centro, profesionales de empresas, etc.) +// TODO: Impedir la creación y edición de proyectos si no son editables. +// TODO: Eliminar asignatura de prj_config al eliminar una asignatura. + + Version 19.44: Oct 25, 2019 Configuration of all projects. + Changed preassigned (projects) to assigned in database and messages. (246280 lines) + 3/4 changes necessary in database: +ALTER TABLE projects CHANGE COLUMN Preassigned Assigned ENUM('N','Y') NOT NULL DEFAULT 'N'; +INSERT INTO actions (ActCod,Language,Obsolete,Txt) VALUES ('1804','es','N','Recibir configuración proyectos'); +CREATE TABLE IF NOT EXISTS prj_config (CrsCod INT NOT NULL DEFAULT -1,Editable ENUM('N','Y') NOT NULL DEFAULT 'Y',UNIQUE INDEX(CrsCod)); +Only if you use MyISAM: +ALTER TABLE prj_config ENGINE=MyISAM; Version 19.43: Oct 25, 2019 New action to configure all projects. (246064 lines) 1 change necessary in database: diff --git a/swad_chat.c b/swad_chat.c index 120cea7c..684aaefa 100644 --- a/swad_chat.c +++ b/swad_chat.c @@ -124,7 +124,7 @@ void Cht_ShowListOfAvailableChatRooms (void) Usr_GetMyDegrees (); /***** Start box *****/ - Box_StartBox (NULL,Txt_Chat_rooms,NULL, + Box_BoxBegin (NULL,Txt_Chat_rooms,NULL, NULL,Box_NOT_CLOSABLE); fprintf (Gbl.F.Out,""); - Box_EndBox (); + Box_BoxEnd (); } /*****************************************************************************/ diff --git a/swad_classroom.c b/swad_classroom.c index d2fdbecd..dd066261 100644 --- a/swad_classroom.c +++ b/swad_classroom.c @@ -112,7 +112,7 @@ void Cla_SeeClassrooms (void) Cla_GetListClassrooms (Cla_ALL_DATA); /***** Table head *****/ - Box_StartBox (NULL,Txt_Classrooms,Cla_PutIconsListingClassrooms, + Box_BoxBegin (NULL,Txt_Classrooms,Cla_PutIconsListingClassrooms, Hlp_CENTRE_Classrooms,Box_NOT_CLOSABLE); HTM_TABLE_BeginWideMarginPadding (2); HTM_TR_Begin (NULL); @@ -177,7 +177,7 @@ void Cla_SeeClassrooms (void) } /***** End box *****/ - Box_EndBox (); + Box_BoxEnd (); /***** Free list of classrooms *****/ Cla_FreeListClassrooms (); @@ -250,7 +250,7 @@ static void Cla_EditClassroomsInternal (void) Cla_GetListClassrooms (Cla_ALL_DATA); /***** Start box *****/ - Box_StartBox (NULL,Txt_Classrooms,Cla_PutIconsEditingClassrooms, + Box_BoxBegin (NULL,Txt_Classrooms,Cla_PutIconsEditingClassrooms, Hlp_CENTRE_Classrooms_edit,Box_NOT_CLOSABLE); /***** Put a form to create a new classroom *****/ @@ -261,7 +261,7 @@ static void Cla_EditClassroomsInternal (void) Cla_ListClassroomsForEdition (); /***** End box *****/ - Box_EndBox (); + Box_BoxEnd (); /***** Free list of classrooms *****/ Cla_FreeListClassrooms (); diff --git a/swad_connected.c b/swad_connected.c index 43c06b00..0cb838b7 100644 --- a/swad_connected.c +++ b/swad_connected.c @@ -101,7 +101,7 @@ void Con_ShowConnectedUsrs (void) "%s" "
", Txt_Connected_users); - Box_StartBox (NULL,Gbl.Title,Con_PutIconToUpdateConnected, + Box_BoxBegin (NULL,Gbl.Title,Con_PutIconToUpdateConnected, Hlp_USERS_Connected,Box_NOT_CLOSABLE); fprintf (Gbl.F.Out,"