From cf8e802d4618c063020288e58c6b69f320389ad5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Fri, 15 Feb 2019 10:50:30 +0100 Subject: [PATCH] Version 18.45 --- swad_action.c | 97 ++---- swad_action.h | 770 +++++++++++++++++++++++------------------------ swad_calendar.c | 62 +--- swad_calendar.h | 5 - swad_changelog.h | 23 +- swad_layout.c | 10 +- swad_menu.c | 10 +- swad_text.c | 225 ++------------ 8 files changed, 462 insertions(+), 740 deletions(-) diff --git a/swad_action.c b/swad_action.c index faf0557e5..bf4337c90 100644 --- a/swad_action.c +++ b/swad_action.c @@ -217,7 +217,6 @@ System: Country: 59. ActSeeCtyInf Show information on the current country 60. ActSeeIns List institutions - 61. ActSeeCalCty Show the academic calendar 63. ActPrnCtyInf Print information on the current country 64. ActChgCtyMapAtt Change map attribution of country @@ -239,7 +238,6 @@ Institution: 77. ActSeeCtr List centres 78. ActSeePlc List places 79. ActSeeDpt List departments - 80. ActSeeCalIns Show the academic calendar 82. ActPrnInsInf Print information on the current institution 83. ActChgInsCtyCfg Change country of institution in institution configuration @@ -291,7 +289,6 @@ Centre: 123. ActSeeCtrInf Show information on the current centre 124. ActSeeDeg List degrees in a centre 125. ActSeeCla List classrooms in a centre - 126. ActSeeCalCtr Show the academic calendar 128. ActPrnCtrInf Print information on the current centre 129. ActChgCtrInsCfg Request change of the institution of a centre in centre configuration @@ -324,13 +321,9 @@ Centre: 154. ActChgClaMaxStd Change number of students in a classroom 155. ActRenClaLoc Change location of a classroom - 156. ActPrnCtrCrs Show print view of the academic calendar - 157. ActChgCtrCrs1stDay Change first day of week and show academic calendar - Degree: 159. ActSeeDegInf Show information on the current degree 160. ActSeeCrs List courses of a degree - 161. ActSeeCalDeg Show the academic calendar 163. ActPrnDegInf Print information on the current degree 164. ActChgDegCtrCfg Request change of the centre of a degree in degree configuration @@ -351,9 +344,6 @@ Degree: 178. ActRenCrsFul Request change of full name of a course 179. ActChgCrsSta Request change of status of a course - 180. ActPrnDegCrs Show print view of the academic calendar - 181. ActChgDegCrs1stDay Change first day of week and show academic calendar - Course: 183. ActSeeCrsInf Show information on the current course 184. ActSeeTchGui Show teaching guide of the course @@ -364,7 +354,6 @@ Course: 189. ActSeeFAQ Show the FAQ 190. ActSeeCrsLnk Show links related to the course 191. ActSeeCrsTT Show the timetable - 192. ActSeeCalCrs Show the academic calendar of the course with exam announcements 194. ActPrnCrsInf Print information on the course 195. ActChgCrsDegCfg Request change of degree in course configuration @@ -470,9 +459,6 @@ Course: 293. ActChgCrsTT Modify the timetable of the course 294. ActChgCrsTT1stDay Change first day of week and show timetable of the course - 295. ActPrnCalCrs Show print view of the academic calendar of the course - 296. ActChgCalCrs1stDay Change first day of week and show academic calendar of the course - Assessment: 297. ActSeeAss Show the assessment system 298. ActSeeAsg Show assignments @@ -1619,11 +1605,6 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActSeeSocTmlGbl */{1490, 2,TabSta,ActSeeSocTmlGbl ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,Soc_ShowTimelineGbl1 ,Soc_ShowTimelineGbl2 ,"comment-dots" }, /* ActSeeSocPrf */{1520, 3,TabSta,ActSeeSocPrf ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prf_SeeSocialProfiles ,"user-check" }, /* ActSeeCalSys */{1622, 4,TabSta,ActSeeCalSys ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cal_DrawCalendarSys ,"calendar" }, -// /* ActSeeCalCty */{1625, 2,TabCty,ActSeeCalCty , 0, 0, 0, 0, 0,0x3C7, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cal_DrawCalendarCty ,"calendar" }, -// /* ActSeeCalIns */{1628, 4,TabIns,ActSeeCalIns , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cal_DrawCalendarIns ,"calendar" }, -// /* ActSeeCalCtr */{1631, 3,TabCtr,ActSeeCalCtr , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cal_DrawCalendarCtr ,"calendar" }, -// /* ActSeeCalDeg */{1634, 2,TabDeg,ActSeeCalDeg , 0, 0,0x3C7, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cal_DrawCalendarDeg ,"calendar" }, -// /* ActSeeCalCrs */{ 16, 7,TabCrs,ActSeeCalCrs ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cal_DrawCalendarCrs ,"calendar" }, /* ActSeeNtf */{ 990, 5,TabSta,ActSeeNtf ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Ntf_ShowMyNotifications ,"bell" }, /* ActReqSndNewPwd */{ 665,-1,TabUnk,ActFrmLogIn , 0,0x001,0x001,0x001,0x001,0x001,0x001,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Pwd_ShowFormSendNewPwd ,NULL}, @@ -1673,17 +1654,7 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActSeeFlr */{1413,-1,TabUnk,ActSeeSocPrf ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Fol_ListFollowers ,NULL}, /* ActPrnCalSys */{1623,-1,TabUnk,ActSeeCalSys ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_NEW_TAB,NULL ,Cal_PrintCalendar ,NULL}, -// /* ActPrnCalCty */{1626,-1,TabUnk,ActSeeCalCty , 0, 0, 0, 0, 0,0x3C7, 0,Act_CONT_NORM,Act_BRW_NEW_TAB,NULL ,Cal_PrintCalendar ,NULL}, -// /* ActPrnCalIns */{1629,-1,TabUnk,ActSeeCalIns , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_NEW_TAB,NULL ,Cal_PrintCalendar ,NULL}, -// /* ActPrnCalCtr */{1632,-1,TabUnk,ActSeeCalCtr , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_BRW_NEW_TAB,NULL ,Cal_PrintCalendar ,NULL}, -// /* ActPrnCalDeg */{1635,-1,TabUnk,ActSeeCalDeg , 0, 0,0x3C7, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_NEW_TAB,NULL ,Cal_PrintCalendar ,NULL}, -// /* ActPrnCalCrs */{ 71,-1,TabUnk,ActSeeCalCrs ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_NEW_TAB,NULL ,Cal_PrintCalendar ,NULL}, /* ActChgCalSys1stDay*/{1624,-1,TabUnk,ActSeeCalSys ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,Cal_ChangeFirstDayOfWeek ,Cal_DrawCalendarSys ,NULL}, -// /* ActChgCalCty1stDay*/{1627,-1,TabUnk,ActSeeCalCty , 0, 0, 0, 0, 0,0x3C7, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Cal_ChangeFirstDayOfWeek ,Cal_DrawCalendarCty ,NULL}, -// /* ActChgCalIns1stDay*/{1630,-1,TabUnk,ActSeeCalIns , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Cal_ChangeFirstDayOfWeek ,Cal_DrawCalendarIns ,NULL}, -// /* ActChgCalCtr1stDay*/{1633,-1,TabUnk,ActSeeCalCtr , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Cal_ChangeFirstDayOfWeek ,Cal_DrawCalendarCtr ,NULL}, -// /* ActChgCalDeg1stDay*/{1636,-1,TabUnk,ActSeeCalDeg , 0, 0,0x3C7, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Cal_ChangeFirstDayOfWeek ,Cal_DrawCalendarDeg ,NULL}, -// /* ActChgCalCrs1stDay*/{1485,-1,TabUnk,ActSeeCalCrs ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Cal_ChangeFirstDayOfWeek ,Cal_DrawCalendarCrs ,NULL}, /* ActSeeNewNtf */{ 991,-1,TabUnk,ActSeeNtf ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Ntf_ShowMyNotifications ,NULL}, /* ActMrkNtfSee */{1146,-1,TabUnk,ActSeeNtf ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Ntf_MarkAllNotifAsSeen ,NULL}, @@ -1746,7 +1717,6 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = // Actions in menu: /* ActSeeCtyInf */{1155, 0,TabCty,ActSeeCtyInf , 0, 0, 0, 0, 0,0x3C7, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cty_ShowConfiguration ,"info" }, /* ActSeeIns */{ 696, 1,TabCty,ActSeeIns , 0, 0, 0, 0, 0,0x3C7, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Ins_ShowInssOfCurrentCty ,"university" }, - /* ActSeeCalCty */{1625, 2,TabCty,ActSeeCalCty , 0, 0, 0, 0, 0,0x3C7, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cal_DrawCalendarCty ,"calendar" }, // Actions not in menu: /* ActPrnCtyInf */{1156,-1,TabUnk,ActSeeCtyInf , 0, 0, 0, 0, 0,0x3C7, 0,Act_CONT_NORM,Act_BRW_NEW_TAB,NULL ,Cty_PrintConfiguration ,NULL}, @@ -1761,16 +1731,13 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActChgInsWWW */{ 700,-1,TabUnk,ActSeeIns , 0, 0, 0, 0, 0,0x3C6, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Ins_ChangeInsWWW ,NULL}, /* ActChgInsSta */{1211,-1,TabUnk,ActSeeIns , 0, 0, 0, 0, 0,0x3C6, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Ins_ChangeInsStatus ,NULL}, - /* ActPrnCalCty */{1626,-1,TabUnk,ActSeeCalCty , 0, 0, 0, 0, 0,0x3C7, 0,Act_CONT_NORM,Act_BRW_NEW_TAB,NULL ,Cal_PrintCalendar ,NULL}, - /* ActChgCalCty1stDay*/{1627,-1,TabUnk,ActSeeCalCty , 0, 0, 0, 0, 0,0x3C7, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Cal_ChangeFirstDayOfWeek ,Cal_DrawCalendarCty ,NULL}, - // TabIns ****************************************************************** // Actions in menu: /* ActSeeInsInf */{1153, 0,TabIns,ActSeeInsInf , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Ins_ShowConfiguration ,"info" }, /* ActSeeCtr */{ 676, 1,TabIns,ActSeeCtr , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Ctr_ShowCtrsOfCurrentIns ,"building" }, /* ActSeePlc */{ 703, 2,TabIns,ActSeePlc , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Plc_SeePlaces ,"map-marker-alt" }, /* ActSeeDpt */{ 675, 3,TabIns,ActSeeDpt , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Dpt_SeeDepts ,"users" }, - /* ActSeeCalIns */{1628, 4,TabIns,ActSeeCalIns , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cal_DrawCalendarIns ,"calendar" }, + /* ActSeeHld */{ 707,-1,TabIns,ActSeeHld , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Hld_SeeHolidays ,"calendar" }, // Actions not in menu: /* ActPrnInsInf */{1154,-1,TabUnk,ActSeeInsInf , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_NEW_TAB,NULL ,Ins_PrintConfiguration ,NULL}, @@ -1806,25 +1773,20 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActRenDptFul */{ 689,-1,TabUnk,ActSeeDpt , 0, 0, 0, 0,0x200, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Dpt_RenameDepartFull ,NULL}, /* ActChgDptWWW */{ 691,-1,TabUnk,ActSeeDpt , 0, 0, 0, 0,0x200, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Dpt_ChangeDptWWW ,NULL}, - /* ActSeeHld */{ 707,-1,TabUnk,ActSeeCalIns , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Hld_SeeHolidays ,NULL}, - /* ActEdiHld */{ 713,-1,TabUnk,ActSeeCalIns , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Hld_EditHolidays ,NULL}, - /* ActNewHld */{ 714,-1,TabUnk,ActSeeCalIns , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Hld_RecFormNewHoliday1 ,Hld_RecFormNewHoliday2 ,NULL}, - /* ActRemHld */{ 716,-1,TabUnk,ActSeeCalIns , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Hld_RemoveHoliday1 ,Hld_RemoveHoliday2 ,NULL}, - /* ActChgHldPlc */{ 896,-1,TabUnk,ActSeeCalIns , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Hld_ChangeHolidayPlace1 ,Hld_ChangeHolidayPlace2 ,NULL}, - /* ActChgHldTyp */{ 715,-1,TabUnk,ActSeeCalIns , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Hld_ChangeHolidayType1 ,Hld_ChangeHolidayType2 ,NULL}, - /* ActChgHldStrDat */{ 717,-1,TabUnk,ActSeeCalIns , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Hld_ChangeStartDate1 ,Hld_ChangeDate2 ,NULL}, - /* ActChgHldEndDat */{ 718,-1,TabUnk,ActSeeCalIns , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Hld_ChangeEndDate1 ,Hld_ChangeDate2 ,NULL}, - /* ActRenHld */{ 766,-1,TabUnk,ActSeeCalIns , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Hld_RenameHoliday1 ,Hld_RenameHoliday2 ,NULL}, - - /* ActPrnCalIns */{1629,-1,TabUnk,ActSeeCalIns , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_NEW_TAB,NULL ,Cal_PrintCalendar ,NULL}, - /* ActChgCalIns1stDay*/{1630,-1,TabUnk,ActSeeCalIns , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Cal_ChangeFirstDayOfWeek ,Cal_DrawCalendarIns ,NULL}, + /* ActEdiHld */{ 713,-1,TabUnk,ActSeeHld , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Hld_EditHolidays ,NULL}, + /* ActNewHld */{ 714,-1,TabUnk,ActSeeHld , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Hld_RecFormNewHoliday1 ,Hld_RecFormNewHoliday2 ,NULL}, + /* ActRemHld */{ 716,-1,TabUnk,ActSeeHld , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Hld_RemoveHoliday1 ,Hld_RemoveHoliday2 ,NULL}, + /* ActChgHldPlc */{ 896,-1,TabUnk,ActSeeHld , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Hld_ChangeHolidayPlace1 ,Hld_ChangeHolidayPlace2 ,NULL}, + /* ActChgHldTyp */{ 715,-1,TabUnk,ActSeeHld , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Hld_ChangeHolidayType1 ,Hld_ChangeHolidayType2 ,NULL}, + /* ActChgHldStrDat */{ 717,-1,TabUnk,ActSeeHld , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Hld_ChangeStartDate1 ,Hld_ChangeDate2 ,NULL}, + /* ActChgHldEndDat */{ 718,-1,TabUnk,ActSeeHld , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Hld_ChangeEndDate1 ,Hld_ChangeDate2 ,NULL}, + /* ActRenHld */{ 766,-1,TabUnk,ActSeeHld , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Hld_RenameHoliday1 ,Hld_RenameHoliday2 ,NULL}, // TabCtr ****************************************************************** // Actions in menu: /* ActSeeCtrInf */{1151, 0,TabCtr,ActSeeCtrInf , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Ctr_ShowConfiguration ,"info" }, /* ActSeeDeg */{1011, 1,TabCtr,ActSeeDeg , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Deg_ShowDegsOfCurrentCtr ,"graduation-cap" }, /* ActSeeCla */{1744, 2,TabCtr,ActSeeCla , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cla_SeeClassrooms ,"classroom" }, - /* ActSeeCalCtr */{1631, 3,TabCtr,ActSeeCalCtr , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cal_DrawCalendarCtr ,"calendar" }, // Actions not in menu: /* ActPrnCtrInf */{1152,-1,TabUnk,ActSeeCtrInf , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_BRW_NEW_TAB,NULL ,Ctr_PrintConfiguration ,NULL}, @@ -1864,14 +1826,10 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActChgClaMaxStd */{1750,-1,TabUnk,ActSeeCla , 0, 0, 0,0x3C6, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cla_ChangeCapacity ,NULL}, /* ActRenClaLoc */{1751,-1,TabUnk,ActSeeCla , 0, 0, 0,0x3C6, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cla_ChangeClassroomLocation ,NULL}, - /* ActPrnCalCtr */{1632,-1,TabUnk,ActSeeCalCtr , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_BRW_NEW_TAB,NULL ,Cal_PrintCalendar ,NULL}, - /* ActChgCalCtr1stDay*/{1633,-1,TabUnk,ActSeeCalCtr , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Cal_ChangeFirstDayOfWeek ,Cal_DrawCalendarCtr ,NULL}, - // TabDeg ****************************************************************** // Actions in menu: /* ActSeeDegInf */{1149, 0,TabDeg,ActSeeDegInf , 0, 0,0x3C7, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Deg_ShowConfiguration ,"info" }, /* ActSeeCrs */{1009, 1,TabDeg,ActSeeCrs , 0, 0,0x3C7, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Crs_ShowCrssOfCurrentDeg ,"list-ol" }, - /* ActSeeCalDeg */{1634, 2,TabDeg,ActSeeCalDeg , 0, 0,0x3C7, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cal_DrawCalendarDeg ,"calendar" }, // Actions not in menu: /* ActPrnDegInf */{1150,-1,TabUnk,ActSeeDegInf , 0, 0,0x3C7, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_NEW_TAB,NULL ,Deg_PrintConfiguration ,NULL}, @@ -1893,9 +1851,6 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActRenCrsFul */{ 564,-1,TabUnk,ActSeeCrs , 0, 0,0x3C6, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Crs_RenameCourseFull ,Crs_ContEditAfterChgCrs ,NULL}, /* ActChgCrsSta */{1055,-1,TabUnk,ActSeeCrs , 0, 0,0x3C0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Crs_ChangeCrsStatus ,Crs_ContEditAfterChgCrs ,NULL}, - /* ActPrnCalDeg */{1635,-1,TabUnk,ActSeeCalDeg , 0, 0,0x3C7, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_NEW_TAB,NULL ,Cal_PrintCalendar ,NULL}, - /* ActChgCalDeg1stDay*/{1636,-1,TabUnk,ActSeeCalDeg , 0, 0,0x3C7, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Cal_ChangeFirstDayOfWeek ,Cal_DrawCalendarDeg ,NULL}, - // TabCrs ****************************************************************** // Actions in menu: /* ActSeeCrsInf */{ 847, 0,TabCrs,ActSeeCrsInf ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Crs_ShowIntroduction ,"info" }, @@ -1905,7 +1860,6 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActSeeFAQ */{ 54, 4,TabCrs,ActSeeFAQ ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Inf_ShowInfo ,"question" }, /* ActSeeCrsLnk */{ 9, 5,TabCrs,ActSeeCrsLnk ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Inf_ShowInfo ,"link" }, /* ActSeeCrsTT */{ 25, 6,TabCrs,ActSeeCrsTT ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,TT_ShowClassTimeTable ,"clock" }, - /* ActSeeCalCrs */{ 16, 7,TabCrs,ActSeeCalCrs ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cal_DrawCalendarCrs ,"calendar" }, // Actions not in menu: /* ActPrnCrsInf */{1028,-1,TabUnk,ActSeeCrsInf ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_NEW_TAB,NULL ,Crs_PrintConfiguration ,NULL}, @@ -2026,9 +1980,6 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActChgCrsTT */{ 53,-1,TabUnk,ActSeeCrsTT ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,TT_EditCrsTimeTable ,NULL}, /* ActChgCrsTT1stDay */{1486,-1,TabUnk,ActSeeCrsTT ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Cal_ChangeFirstDayOfWeek ,TT_ShowClassTimeTable ,NULL}, - /* ActPrnCalCrs */{ 71,-1,TabUnk,ActSeeCalCrs ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_NEW_TAB,NULL ,Cal_PrintCalendar ,NULL}, - /* ActChgCalCrs1stDay*/{1485,-1,TabUnk,ActSeeCalCrs ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Cal_ChangeFirstDayOfWeek ,Cal_DrawCalendarCrs ,NULL}, - // TabAss ****************************************************************** // Actions in menu: /* ActSeeAss */{ 15, 0,TabAss,ActSeeAss ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Inf_ShowInfo ,"info" }, @@ -3212,7 +3163,7 @@ Act_Action_t Act_FromActCodToAction[1 + Act_MAX_ACTION_COD] = // Do not reuse un -1, // #13 (obsolete action) -1, // #14 (obsolete action) ActSeeAss, // #15 - ActSeeCalCrs, // #16 + -1, // #16 (obsolete action) ActSeeAdmMrk, // #17 -1, // #18 (obsolete action) -1, // #19 (obsolete action) @@ -3267,7 +3218,7 @@ Act_Action_t Act_FromActCodToAction[1 + Act_MAX_ACTION_COD] = // Do not reuse un -1, // #68 (obsolete action) ActEdiAss, // #69 ActSeeSntMsg, // #70 - ActPrnCalCrs, // #71 + -1, // #71 (obsolete action) -1, // #72 (obsolete action) ActRemNot, // #73 ActEdiSylPra, // #74 @@ -4681,7 +4632,7 @@ Act_Action_t Act_FromActCodToAction[1 + Act_MAX_ACTION_COD] = // Do not reuse un ActNewMaiStd, // #1482 ActNewMaiTch, // #1483 ActChg1stDay, // #1484 - ActChgCalCrs1stDay, // #1485 + -1, // #1485 (obsolete action) ActChgCrsTT1stDay, // #1486 ActChgMyTT1stDay, // #1487 ActReqRemOldBrf, // #1488 @@ -4821,18 +4772,18 @@ Act_Action_t Act_FromActCodToAction[1 + Act_MAX_ACTION_COD] = // Do not reuse un ActSeeCalSys, // #1622 ActPrnCalSys, // #1623 ActChgCalSys1stDay, // #1624 - ActSeeCalCty, // #1625 - ActPrnCalCty, // #1626 - ActChgCalCty1stDay, // #1627 - ActSeeCalIns, // #1628 - ActPrnCalIns, // #1629 - ActChgCalIns1stDay, // #1630 - ActSeeCalCtr, // #1631 - ActPrnCalCtr, // #1632 - ActChgCalCtr1stDay, // #1633 - ActSeeCalDeg, // #1634 - ActPrnCalDeg, // #1635 - ActChgCalDeg1stDay, // #1636 + -1, // #1625 (obsolete action) + -1, // #1626 (obsolete action) + -1, // #1627 (obsolete action) + -1, // #1628 (obsolete action) + -1, // #1629 (obsolete action) + -1, // #1630 (obsolete action) + -1, // #1631 (obsolete action) + -1, // #1632 (obsolete action) + -1, // #1633 (obsolete action) + -1, // #1634 (obsolete action) + -1, // #1635 (obsolete action) + -1, // #1636 (obsolete action) ActPrnOneAsg, // #1637 ActChgDatFmt, // #1638 ActReqAccEnrNET, // #1639 diff --git a/swad_action.h b/swad_action.h index 3d788303b..77d9db6da 100644 --- a/swad_action.h +++ b/swad_action.h @@ -61,7 +61,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 + 9 + 55 + 38 + 15 + 45 + 39 + 22 + 113 + 157 + 437 + 165 + 168 + 15 + 72) +#define Act_NUM_ACTIONS (1 + 9 + 55 + 38 + 12 + 42 + 36 + 19 + 110 + 157 + 437 + 165 + 168 + 15 + 72) #define Act_MAX_ACTION_COD 1752 @@ -210,460 +210,440 @@ typedef signed int Act_Action_t; // Must be a signed type, because -1 is used to // Actions in menu #define ActSeeCtyInf (ActChgPlgIP + 1) #define ActSeeIns (ActChgPlgIP + 2) -#define ActSeeCalCty (ActChgPlgIP + 3) // Secondary actions -#define ActPrnCtyInf (ActChgPlgIP + 4) -#define ActChgCtyMapAtt (ActChgPlgIP + 5) +#define ActPrnCtyInf (ActChgPlgIP + 3) +#define ActChgCtyMapAtt (ActChgPlgIP + 4) -#define ActEdiIns (ActChgPlgIP + 6) -#define ActReqIns (ActChgPlgIP + 7) -#define ActNewIns (ActChgPlgIP + 8) -#define ActRemIns (ActChgPlgIP + 9) -#define ActRenInsSho (ActChgPlgIP + 10) -#define ActRenInsFul (ActChgPlgIP + 11) -#define ActChgInsWWW (ActChgPlgIP + 12) -#define ActChgInsSta (ActChgPlgIP + 13) - -#define ActPrnCalCty (ActChgPlgIP + 14) -#define ActChgCalCty1stDay (ActChgPlgIP + 15) +#define ActEdiIns (ActChgPlgIP + 5) +#define ActReqIns (ActChgPlgIP + 6) +#define ActNewIns (ActChgPlgIP + 7) +#define ActRemIns (ActChgPlgIP + 8) +#define ActRenInsSho (ActChgPlgIP + 9) +#define ActRenInsFul (ActChgPlgIP + 10) +#define ActChgInsWWW (ActChgPlgIP + 11) +#define ActChgInsSta (ActChgPlgIP + 12) /*****************************************************************************/ /****************************** Institution tab ******************************/ /*****************************************************************************/ // Actions in menu -#define ActSeeInsInf (ActChgCalCty1stDay + 1) -#define ActSeeCtr (ActChgCalCty1stDay + 2) -#define ActSeePlc (ActChgCalCty1stDay + 3) -#define ActSeeDpt (ActChgCalCty1stDay + 4) -#define ActSeeCalIns (ActChgCalCty1stDay + 5) +#define ActSeeInsInf (ActChgInsSta + 1) +#define ActSeeCtr (ActChgInsSta + 2) +#define ActSeePlc (ActChgInsSta + 3) +#define ActSeeDpt (ActChgInsSta + 4) +#define ActSeeHld (ActChgInsSta + 5) // Secondary actions -#define ActPrnInsInf (ActChgCalCty1stDay + 6) -#define ActChgInsCtyCfg (ActChgCalCty1stDay + 7) -#define ActRenInsShoCfg (ActChgCalCty1stDay + 8) -#define ActRenInsFulCfg (ActChgCalCty1stDay + 9) -#define ActChgInsWWWCfg (ActChgCalCty1stDay + 10) -#define ActReqInsLog (ActChgCalCty1stDay + 11) -#define ActRecInsLog (ActChgCalCty1stDay + 12) -#define ActRemInsLog (ActChgCalCty1stDay + 13) +#define ActPrnInsInf (ActChgInsSta + 6) +#define ActChgInsCtyCfg (ActChgInsSta + 7) +#define ActRenInsShoCfg (ActChgInsSta + 8) +#define ActRenInsFulCfg (ActChgInsSta + 9) +#define ActChgInsWWWCfg (ActChgInsSta + 10) +#define ActReqInsLog (ActChgInsSta + 11) +#define ActRecInsLog (ActChgInsSta + 12) +#define ActRemInsLog (ActChgInsSta + 13) -#define ActEdiCtr (ActChgCalCty1stDay + 14) -#define ActReqCtr (ActChgCalCty1stDay + 15) -#define ActNewCtr (ActChgCalCty1stDay + 16) -#define ActRemCtr (ActChgCalCty1stDay + 17) -#define ActChgCtrPlc (ActChgCalCty1stDay + 18) -#define ActRenCtrSho (ActChgCalCty1stDay + 19) -#define ActRenCtrFul (ActChgCalCty1stDay + 20) -#define ActChgCtrWWW (ActChgCalCty1stDay + 21) -#define ActChgCtrSta (ActChgCalCty1stDay + 22) +#define ActEdiCtr (ActChgInsSta + 14) +#define ActReqCtr (ActChgInsSta + 15) +#define ActNewCtr (ActChgInsSta + 16) +#define ActRemCtr (ActChgInsSta + 17) +#define ActChgCtrPlc (ActChgInsSta + 18) +#define ActRenCtrSho (ActChgInsSta + 19) +#define ActRenCtrFul (ActChgInsSta + 20) +#define ActChgCtrWWW (ActChgInsSta + 21) +#define ActChgCtrSta (ActChgInsSta + 22) -#define ActEdiPlc (ActChgCalCty1stDay + 23) -#define ActNewPlc (ActChgCalCty1stDay + 24) -#define ActRemPlc (ActChgCalCty1stDay + 25) -#define ActRenPlcSho (ActChgCalCty1stDay + 26) -#define ActRenPlcFul (ActChgCalCty1stDay + 27) +#define ActEdiPlc (ActChgInsSta + 23) +#define ActNewPlc (ActChgInsSta + 24) +#define ActRemPlc (ActChgInsSta + 25) +#define ActRenPlcSho (ActChgInsSta + 26) +#define ActRenPlcFul (ActChgInsSta + 27) -#define ActEdiDpt (ActChgCalCty1stDay + 28) -#define ActNewDpt (ActChgCalCty1stDay + 29) -#define ActRemDpt (ActChgCalCty1stDay + 30) -#define ActChgDptIns (ActChgCalCty1stDay + 31) -#define ActRenDptSho (ActChgCalCty1stDay + 32) -#define ActRenDptFul (ActChgCalCty1stDay + 33) -#define ActChgDptWWW (ActChgCalCty1stDay + 34) +#define ActEdiDpt (ActChgInsSta + 28) +#define ActNewDpt (ActChgInsSta + 29) +#define ActRemDpt (ActChgInsSta + 30) +#define ActChgDptIns (ActChgInsSta + 31) +#define ActRenDptSho (ActChgInsSta + 32) +#define ActRenDptFul (ActChgInsSta + 33) +#define ActChgDptWWW (ActChgInsSta + 34) -#define ActSeeHld (ActChgCalCty1stDay + 35) -#define ActEdiHld (ActChgCalCty1stDay + 36) -#define ActNewHld (ActChgCalCty1stDay + 37) -#define ActRemHld (ActChgCalCty1stDay + 38) -#define ActChgHldPlc (ActChgCalCty1stDay + 39) -#define ActChgHldTyp (ActChgCalCty1stDay + 40) -#define ActChgHldStrDat (ActChgCalCty1stDay + 41) -#define ActChgHldEndDat (ActChgCalCty1stDay + 42) -#define ActRenHld (ActChgCalCty1stDay + 43) - -#define ActPrnCalIns (ActChgCalCty1stDay + 44) -#define ActChgCalIns1stDay (ActChgCalCty1stDay + 45) +#define ActEdiHld (ActChgInsSta + 35) +#define ActNewHld (ActChgInsSta + 36) +#define ActRemHld (ActChgInsSta + 37) +#define ActChgHldPlc (ActChgInsSta + 38) +#define ActChgHldTyp (ActChgInsSta + 39) +#define ActChgHldStrDat (ActChgInsSta + 40) +#define ActChgHldEndDat (ActChgInsSta + 41) +#define ActRenHld (ActChgInsSta + 42) /*****************************************************************************/ /********************************* Centre tab ********************************/ /*****************************************************************************/ // Actions in menu -#define ActSeeCtrInf (ActChgCalIns1stDay + 1) -#define ActSeeDeg (ActChgCalIns1stDay + 2) -#define ActSeeCla (ActChgCalIns1stDay + 3) -#define ActSeeCalCtr (ActChgCalIns1stDay + 4) +#define ActSeeCtrInf (ActRenHld + 1) +#define ActSeeDeg (ActRenHld + 2) +#define ActSeeCla (ActRenHld + 3) // Secondary actions -#define ActPrnCtrInf (ActChgCalIns1stDay + 5) -#define ActChgCtrInsCfg (ActChgCalIns1stDay + 6) -#define ActRenCtrShoCfg (ActChgCalIns1stDay + 7) -#define ActRenCtrFulCfg (ActChgCalIns1stDay + 8) -#define ActChgCtrPlcCfg (ActChgCalIns1stDay + 9) -#define ActChgCtrWWWCfg (ActChgCalIns1stDay + 10) -#define ActReqCtrLog (ActChgCalIns1stDay + 11) -#define ActRecCtrLog (ActChgCalIns1stDay + 12) -#define ActRemCtrLog (ActChgCalIns1stDay + 13) -#define ActReqCtrPho (ActChgCalIns1stDay + 14) -#define ActRecCtrPho (ActChgCalIns1stDay + 15) -#define ActChgCtrPhoAtt (ActChgCalIns1stDay + 16) +#define ActPrnCtrInf (ActRenHld + 4) +#define ActChgCtrInsCfg (ActRenHld + 5) +#define ActRenCtrShoCfg (ActRenHld + 6) +#define ActRenCtrFulCfg (ActRenHld + 7) +#define ActChgCtrPlcCfg (ActRenHld + 8) +#define ActChgCtrWWWCfg (ActRenHld + 9) +#define ActReqCtrLog (ActRenHld + 10) +#define ActRecCtrLog (ActRenHld + 11) +#define ActRemCtrLog (ActRenHld + 12) +#define ActReqCtrPho (ActRenHld + 13) +#define ActRecCtrPho (ActRenHld + 14) +#define ActChgCtrPhoAtt (ActRenHld + 15) -#define ActSeeDegTyp (ActChgCalIns1stDay + 17) -#define ActEdiDegTyp (ActChgCalIns1stDay + 18) -#define ActNewDegTyp (ActChgCalIns1stDay + 19) -#define ActRemDegTyp (ActChgCalIns1stDay + 20) -#define ActRenDegTyp (ActChgCalIns1stDay + 21) +#define ActSeeDegTyp (ActRenHld + 16) +#define ActEdiDegTyp (ActRenHld + 17) +#define ActNewDegTyp (ActRenHld + 18) +#define ActRemDegTyp (ActRenHld + 19) +#define ActRenDegTyp (ActRenHld + 20) -#define ActEdiDeg (ActChgCalIns1stDay + 22) -#define ActReqDeg (ActChgCalIns1stDay + 23) -#define ActNewDeg (ActChgCalIns1stDay + 24) -#define ActRemDeg (ActChgCalIns1stDay + 25) -#define ActRenDegSho (ActChgCalIns1stDay + 26) -#define ActRenDegFul (ActChgCalIns1stDay + 27) -#define ActChgDegTyp (ActChgCalIns1stDay + 28) -#define ActChgDegWWW (ActChgCalIns1stDay + 29) -#define ActChgDegSta (ActChgCalIns1stDay + 30) +#define ActEdiDeg (ActRenHld + 21) +#define ActReqDeg (ActRenHld + 22) +#define ActNewDeg (ActRenHld + 23) +#define ActRemDeg (ActRenHld + 24) +#define ActRenDegSho (ActRenHld + 25) +#define ActRenDegFul (ActRenHld + 26) +#define ActChgDegTyp (ActRenHld + 27) +#define ActChgDegWWW (ActRenHld + 28) +#define ActChgDegSta (ActRenHld + 29) -#define ActEdiCla (ActChgCalIns1stDay + 31) -#define ActNewCla (ActChgCalIns1stDay + 32) -#define ActRemCla (ActChgCalIns1stDay + 33) -#define ActRenClaSho (ActChgCalIns1stDay + 34) -#define ActRenClaFul (ActChgCalIns1stDay + 35) -#define ActChgClaMaxStd (ActChgCalIns1stDay + 36) -#define ActRenClaLoc (ActChgCalIns1stDay + 37) - -#define ActPrnCalCtr (ActChgCalIns1stDay + 38) -#define ActChgCalCtr1stDay (ActChgCalIns1stDay + 39) +#define ActEdiCla (ActRenHld + 30) +#define ActNewCla (ActRenHld + 31) +#define ActRemCla (ActRenHld + 32) +#define ActRenClaSho (ActRenHld + 33) +#define ActRenClaFul (ActRenHld + 34) +#define ActChgClaMaxStd (ActRenHld + 35) +#define ActRenClaLoc (ActRenHld + 36) /*****************************************************************************/ /********************************* Degree tab ********************************/ /*****************************************************************************/ // Actions in menu -#define ActSeeDegInf (ActChgCalCtr1stDay + 1) -#define ActSeeCrs (ActChgCalCtr1stDay + 2) -#define ActSeeCalDeg (ActChgCalCtr1stDay + 3) +#define ActSeeDegInf (ActRenClaLoc + 1) +#define ActSeeCrs (ActRenClaLoc + 2) // Secondary actions -#define ActPrnDegInf (ActChgCalCtr1stDay + 4) -#define ActChgDegCtrCfg (ActChgCalCtr1stDay + 5) -#define ActRenDegShoCfg (ActChgCalCtr1stDay + 6) -#define ActRenDegFulCfg (ActChgCalCtr1stDay + 7) -#define ActChgDegWWWCfg (ActChgCalCtr1stDay + 8) -#define ActReqDegLog (ActChgCalCtr1stDay + 9) -#define ActRecDegLog (ActChgCalCtr1stDay + 10) -#define ActRemDegLog (ActChgCalCtr1stDay + 11) +#define ActPrnDegInf (ActRenClaLoc + 3) +#define ActChgDegCtrCfg (ActRenClaLoc + 4) +#define ActRenDegShoCfg (ActRenClaLoc + 5) +#define ActRenDegFulCfg (ActRenClaLoc + 6) +#define ActChgDegWWWCfg (ActRenClaLoc + 7) +#define ActReqDegLog (ActRenClaLoc + 8) +#define ActRecDegLog (ActRenClaLoc + 9) +#define ActRemDegLog (ActRenClaLoc + 10) -#define ActEdiCrs (ActChgCalCtr1stDay + 12) -#define ActReqCrs (ActChgCalCtr1stDay + 13) -#define ActNewCrs (ActChgCalCtr1stDay + 14) -#define ActRemCrs (ActChgCalCtr1stDay + 15) -#define ActChgInsCrsCod (ActChgCalCtr1stDay + 16) -#define ActChgCrsYea (ActChgCalCtr1stDay + 17) -#define ActRenCrsSho (ActChgCalCtr1stDay + 18) -#define ActRenCrsFul (ActChgCalCtr1stDay + 19) -#define ActChgCrsSta (ActChgCalCtr1stDay + 20) - -#define ActPrnCalDeg (ActChgCalCtr1stDay + 21) -#define ActChgCalDeg1stDay (ActChgCalCtr1stDay + 22) +#define ActEdiCrs (ActRenClaLoc + 11) +#define ActReqCrs (ActRenClaLoc + 12) +#define ActNewCrs (ActRenClaLoc + 13) +#define ActRemCrs (ActRenClaLoc + 14) +#define ActChgInsCrsCod (ActRenClaLoc + 15) +#define ActChgCrsYea (ActRenClaLoc + 16) +#define ActRenCrsSho (ActRenClaLoc + 17) +#define ActRenCrsFul (ActRenClaLoc + 18) +#define ActChgCrsSta (ActRenClaLoc + 19) /*****************************************************************************/ /******************************** Course tab *********************************/ /*****************************************************************************/ // Actions in menu -#define ActSeeCrsInf (ActChgCalDeg1stDay + 1) -#define ActSeeTchGui (ActChgCalDeg1stDay + 2) -#define ActSeeSyl (ActChgCalDeg1stDay + 3) -#define ActSeeBib (ActChgCalDeg1stDay + 4) -#define ActSeeFAQ (ActChgCalDeg1stDay + 5) -#define ActSeeCrsLnk (ActChgCalDeg1stDay + 6) -#define ActSeeCrsTT (ActChgCalDeg1stDay + 7) -#define ActSeeCalCrs (ActChgCalDeg1stDay + 8) +#define ActSeeCrsInf (ActChgCrsSta + 1) +#define ActSeeTchGui (ActChgCrsSta + 2) +#define ActSeeSyl (ActChgCrsSta + 3) +#define ActSeeBib (ActChgCrsSta + 4) +#define ActSeeFAQ (ActChgCrsSta + 5) +#define ActSeeCrsLnk (ActChgCrsSta + 6) +#define ActSeeCrsTT (ActChgCrsSta + 7) // Secondary actions -#define ActPrnCrsInf (ActChgCalDeg1stDay + 9) -#define ActChgCrsDegCfg (ActChgCalDeg1stDay + 10) -#define ActRenCrsShoCfg (ActChgCalDeg1stDay + 11) -#define ActRenCrsFulCfg (ActChgCalDeg1stDay + 12) -#define ActChgInsCrsCodCfg (ActChgCalDeg1stDay + 13) -#define ActChgCrsYeaCfg (ActChgCalDeg1stDay + 14) -#define ActEdiCrsInf (ActChgCalDeg1stDay + 15) -#define ActEdiTchGui (ActChgCalDeg1stDay + 16) -#define ActSeeSylLec (ActChgCalDeg1stDay + 17) -#define ActSeeSylPra (ActChgCalDeg1stDay + 18) -#define ActEdiSylLec (ActChgCalDeg1stDay + 19) -#define ActEdiSylPra (ActChgCalDeg1stDay + 20) -#define ActDelItmSylLec (ActChgCalDeg1stDay + 21) -#define ActDelItmSylPra (ActChgCalDeg1stDay + 22) -#define ActUp_IteSylLec (ActChgCalDeg1stDay + 23) -#define ActUp_IteSylPra (ActChgCalDeg1stDay + 24) -#define ActDwnIteSylLec (ActChgCalDeg1stDay + 25) -#define ActDwnIteSylPra (ActChgCalDeg1stDay + 26) -#define ActRgtIteSylLec (ActChgCalDeg1stDay + 27) -#define ActRgtIteSylPra (ActChgCalDeg1stDay + 28) -#define ActLftIteSylLec (ActChgCalDeg1stDay + 29) -#define ActLftIteSylPra (ActChgCalDeg1stDay + 30) -#define ActInsIteSylLec (ActChgCalDeg1stDay + 31) -#define ActInsIteSylPra (ActChgCalDeg1stDay + 32) -#define ActModIteSylLec (ActChgCalDeg1stDay + 33) -#define ActModIteSylPra (ActChgCalDeg1stDay + 34) +#define ActPrnCrsInf (ActChgCrsSta + 8) +#define ActChgCrsDegCfg (ActChgCrsSta + 9) +#define ActRenCrsShoCfg (ActChgCrsSta + 10) +#define ActRenCrsFulCfg (ActChgCrsSta + 11) +#define ActChgInsCrsCodCfg (ActChgCrsSta + 12) +#define ActChgCrsYeaCfg (ActChgCrsSta + 13) +#define ActEdiCrsInf (ActChgCrsSta + 14) +#define ActEdiTchGui (ActChgCrsSta + 15) +#define ActSeeSylLec (ActChgCrsSta + 16) +#define ActSeeSylPra (ActChgCrsSta + 17) +#define ActEdiSylLec (ActChgCrsSta + 18) +#define ActEdiSylPra (ActChgCrsSta + 19) +#define ActDelItmSylLec (ActChgCrsSta + 20) +#define ActDelItmSylPra (ActChgCrsSta + 21) +#define ActUp_IteSylLec (ActChgCrsSta + 22) +#define ActUp_IteSylPra (ActChgCrsSta + 23) +#define ActDwnIteSylLec (ActChgCrsSta + 24) +#define ActDwnIteSylPra (ActChgCrsSta + 25) +#define ActRgtIteSylLec (ActChgCrsSta + 26) +#define ActRgtIteSylPra (ActChgCrsSta + 27) +#define ActLftIteSylLec (ActChgCrsSta + 28) +#define ActLftIteSylPra (ActChgCrsSta + 29) +#define ActInsIteSylLec (ActChgCrsSta + 30) +#define ActInsIteSylPra (ActChgCrsSta + 31) +#define ActModIteSylLec (ActChgCrsSta + 32) +#define ActModIteSylPra (ActChgCrsSta + 33) -#define ActEdiBib (ActChgCalDeg1stDay + 35) -#define ActEdiFAQ (ActChgCalDeg1stDay + 36) -#define ActEdiCrsLnk (ActChgCalDeg1stDay + 37) +#define ActEdiBib (ActChgCrsSta + 34) +#define ActEdiFAQ (ActChgCrsSta + 35) +#define ActEdiCrsLnk (ActChgCrsSta + 36) -#define ActChgFrcReaCrsInf (ActChgCalDeg1stDay + 38) -#define ActChgFrcReaTchGui (ActChgCalDeg1stDay + 39) -#define ActChgFrcReaSylLec (ActChgCalDeg1stDay + 40) -#define ActChgFrcReaSylPra (ActChgCalDeg1stDay + 41) -#define ActChgFrcReaBib (ActChgCalDeg1stDay + 42) -#define ActChgFrcReaFAQ (ActChgCalDeg1stDay + 43) -#define ActChgFrcReaCrsLnk (ActChgCalDeg1stDay + 44) +#define ActChgFrcReaCrsInf (ActChgCrsSta + 37) +#define ActChgFrcReaTchGui (ActChgCrsSta + 38) +#define ActChgFrcReaSylLec (ActChgCrsSta + 39) +#define ActChgFrcReaSylPra (ActChgCrsSta + 40) +#define ActChgFrcReaBib (ActChgCrsSta + 41) +#define ActChgFrcReaFAQ (ActChgCrsSta + 42) +#define ActChgFrcReaCrsLnk (ActChgCrsSta + 43) -#define ActChgHavReaCrsInf (ActChgCalDeg1stDay + 45) -#define ActChgHavReaTchGui (ActChgCalDeg1stDay + 46) -#define ActChgHavReaSylLec (ActChgCalDeg1stDay + 47) -#define ActChgHavReaSylPra (ActChgCalDeg1stDay + 48) -#define ActChgHavReaBib (ActChgCalDeg1stDay + 49) -#define ActChgHavReaFAQ (ActChgCalDeg1stDay + 50) -#define ActChgHavReaCrsLnk (ActChgCalDeg1stDay + 51) +#define ActChgHavReaCrsInf (ActChgCrsSta + 44) +#define ActChgHavReaTchGui (ActChgCrsSta + 45) +#define ActChgHavReaSylLec (ActChgCrsSta + 46) +#define ActChgHavReaSylPra (ActChgCrsSta + 47) +#define ActChgHavReaBib (ActChgCrsSta + 48) +#define ActChgHavReaFAQ (ActChgCrsSta + 49) +#define ActChgHavReaCrsLnk (ActChgCrsSta + 50) -#define ActSelInfSrcCrsInf (ActChgCalDeg1stDay + 52) -#define ActSelInfSrcTchGui (ActChgCalDeg1stDay + 53) -#define ActSelInfSrcSylLec (ActChgCalDeg1stDay + 54) -#define ActSelInfSrcSylPra (ActChgCalDeg1stDay + 55) -#define ActSelInfSrcBib (ActChgCalDeg1stDay + 56) -#define ActSelInfSrcFAQ (ActChgCalDeg1stDay + 57) -#define ActSelInfSrcCrsLnk (ActChgCalDeg1stDay + 58) -#define ActRcvURLCrsInf (ActChgCalDeg1stDay + 59) -#define ActRcvURLTchGui (ActChgCalDeg1stDay + 60) -#define ActRcvURLSylLec (ActChgCalDeg1stDay + 61) -#define ActRcvURLSylPra (ActChgCalDeg1stDay + 62) -#define ActRcvURLBib (ActChgCalDeg1stDay + 63) -#define ActRcvURLFAQ (ActChgCalDeg1stDay + 64) -#define ActRcvURLCrsLnk (ActChgCalDeg1stDay + 65) -#define ActRcvPagCrsInf (ActChgCalDeg1stDay + 66) -#define ActRcvPagTchGui (ActChgCalDeg1stDay + 67) -#define ActRcvPagSylLec (ActChgCalDeg1stDay + 68) -#define ActRcvPagSylPra (ActChgCalDeg1stDay + 69) -#define ActRcvPagBib (ActChgCalDeg1stDay + 70) -#define ActRcvPagFAQ (ActChgCalDeg1stDay + 71) -#define ActRcvPagCrsLnk (ActChgCalDeg1stDay + 72) -#define ActEditorCrsInf (ActChgCalDeg1stDay + 73) -#define ActEditorTchGui (ActChgCalDeg1stDay + 74) -#define ActEditorSylLec (ActChgCalDeg1stDay + 75) -#define ActEditorSylPra (ActChgCalDeg1stDay + 76) -#define ActEditorBib (ActChgCalDeg1stDay + 77) -#define ActEditorFAQ (ActChgCalDeg1stDay + 78) -#define ActEditorCrsLnk (ActChgCalDeg1stDay + 79) -#define ActPlaTxtEdiCrsInf (ActChgCalDeg1stDay + 80) -#define ActPlaTxtEdiTchGui (ActChgCalDeg1stDay + 81) -#define ActPlaTxtEdiSylLec (ActChgCalDeg1stDay + 82) -#define ActPlaTxtEdiSylPra (ActChgCalDeg1stDay + 83) -#define ActPlaTxtEdiBib (ActChgCalDeg1stDay + 84) -#define ActPlaTxtEdiFAQ (ActChgCalDeg1stDay + 85) -#define ActPlaTxtEdiCrsLnk (ActChgCalDeg1stDay + 86) -#define ActRchTxtEdiCrsInf (ActChgCalDeg1stDay + 87) -#define ActRchTxtEdiTchGui (ActChgCalDeg1stDay + 88) -#define ActRchTxtEdiSylLec (ActChgCalDeg1stDay + 89) -#define ActRchTxtEdiSylPra (ActChgCalDeg1stDay + 90) -#define ActRchTxtEdiBib (ActChgCalDeg1stDay + 91) -#define ActRchTxtEdiFAQ (ActChgCalDeg1stDay + 92) -#define ActRchTxtEdiCrsLnk (ActChgCalDeg1stDay + 93) -#define ActRcvPlaTxtCrsInf (ActChgCalDeg1stDay + 94) -#define ActRcvPlaTxtTchGui (ActChgCalDeg1stDay + 95) -#define ActRcvPlaTxtSylLec (ActChgCalDeg1stDay + 96) -#define ActRcvPlaTxtSylPra (ActChgCalDeg1stDay + 97) -#define ActRcvPlaTxtBib (ActChgCalDeg1stDay + 98) -#define ActRcvPlaTxtFAQ (ActChgCalDeg1stDay + 99) -#define ActRcvPlaTxtCrsLnk (ActChgCalDeg1stDay + 100) -#define ActRcvRchTxtCrsInf (ActChgCalDeg1stDay + 101) -#define ActRcvRchTxtTchGui (ActChgCalDeg1stDay + 102) -#define ActRcvRchTxtSylLec (ActChgCalDeg1stDay + 103) -#define ActRcvRchTxtSylPra (ActChgCalDeg1stDay + 104) -#define ActRcvRchTxtBib (ActChgCalDeg1stDay + 105) -#define ActRcvRchTxtFAQ (ActChgCalDeg1stDay + 106) -#define ActRcvRchTxtCrsLnk (ActChgCalDeg1stDay + 107) +#define ActSelInfSrcCrsInf (ActChgCrsSta + 51) +#define ActSelInfSrcTchGui (ActChgCrsSta + 52) +#define ActSelInfSrcSylLec (ActChgCrsSta + 53) +#define ActSelInfSrcSylPra (ActChgCrsSta + 54) +#define ActSelInfSrcBib (ActChgCrsSta + 55) +#define ActSelInfSrcFAQ (ActChgCrsSta + 56) +#define ActSelInfSrcCrsLnk (ActChgCrsSta + 57) +#define ActRcvURLCrsInf (ActChgCrsSta + 58) +#define ActRcvURLTchGui (ActChgCrsSta + 59) +#define ActRcvURLSylLec (ActChgCrsSta + 60) +#define ActRcvURLSylPra (ActChgCrsSta + 61) +#define ActRcvURLBib (ActChgCrsSta + 62) +#define ActRcvURLFAQ (ActChgCrsSta + 63) +#define ActRcvURLCrsLnk (ActChgCrsSta + 64) +#define ActRcvPagCrsInf (ActChgCrsSta + 65) +#define ActRcvPagTchGui (ActChgCrsSta + 66) +#define ActRcvPagSylLec (ActChgCrsSta + 67) +#define ActRcvPagSylPra (ActChgCrsSta + 68) +#define ActRcvPagBib (ActChgCrsSta + 69) +#define ActRcvPagFAQ (ActChgCrsSta + 70) +#define ActRcvPagCrsLnk (ActChgCrsSta + 71) +#define ActEditorCrsInf (ActChgCrsSta + 72) +#define ActEditorTchGui (ActChgCrsSta + 73) +#define ActEditorSylLec (ActChgCrsSta + 74) +#define ActEditorSylPra (ActChgCrsSta + 75) +#define ActEditorBib (ActChgCrsSta + 76) +#define ActEditorFAQ (ActChgCrsSta + 77) +#define ActEditorCrsLnk (ActChgCrsSta + 78) +#define ActPlaTxtEdiCrsInf (ActChgCrsSta + 79) +#define ActPlaTxtEdiTchGui (ActChgCrsSta + 80) +#define ActPlaTxtEdiSylLec (ActChgCrsSta + 81) +#define ActPlaTxtEdiSylPra (ActChgCrsSta + 82) +#define ActPlaTxtEdiBib (ActChgCrsSta + 83) +#define ActPlaTxtEdiFAQ (ActChgCrsSta + 84) +#define ActPlaTxtEdiCrsLnk (ActChgCrsSta + 85) +#define ActRchTxtEdiCrsInf (ActChgCrsSta + 86) +#define ActRchTxtEdiTchGui (ActChgCrsSta + 87) +#define ActRchTxtEdiSylLec (ActChgCrsSta + 88) +#define ActRchTxtEdiSylPra (ActChgCrsSta + 89) +#define ActRchTxtEdiBib (ActChgCrsSta + 90) +#define ActRchTxtEdiFAQ (ActChgCrsSta + 91) +#define ActRchTxtEdiCrsLnk (ActChgCrsSta + 92) +#define ActRcvPlaTxtCrsInf (ActChgCrsSta + 93) +#define ActRcvPlaTxtTchGui (ActChgCrsSta + 94) +#define ActRcvPlaTxtSylLec (ActChgCrsSta + 95) +#define ActRcvPlaTxtSylPra (ActChgCrsSta + 96) +#define ActRcvPlaTxtBib (ActChgCrsSta + 97) +#define ActRcvPlaTxtFAQ (ActChgCrsSta + 98) +#define ActRcvPlaTxtCrsLnk (ActChgCrsSta + 99) +#define ActRcvRchTxtCrsInf (ActChgCrsSta + 100) +#define ActRcvRchTxtTchGui (ActChgCrsSta + 101) +#define ActRcvRchTxtSylLec (ActChgCrsSta + 102) +#define ActRcvRchTxtSylPra (ActChgCrsSta + 103) +#define ActRcvRchTxtBib (ActChgCrsSta + 104) +#define ActRcvRchTxtFAQ (ActChgCrsSta + 105) +#define ActRcvRchTxtCrsLnk (ActChgCrsSta + 106) -#define ActPrnCrsTT (ActChgCalDeg1stDay + 108) -#define ActEdiCrsTT (ActChgCalDeg1stDay + 109) -#define ActChgCrsTT (ActChgCalDeg1stDay + 110) -#define ActChgCrsTT1stDay (ActChgCalDeg1stDay + 111) - -#define ActPrnCalCrs (ActChgCalDeg1stDay + 112) -#define ActChgCalCrs1stDay (ActChgCalDeg1stDay + 113) +#define ActPrnCrsTT (ActChgCrsSta + 107) +#define ActEdiCrsTT (ActChgCrsSta + 108) +#define ActChgCrsTT (ActChgCrsSta + 109) +#define ActChgCrsTT1stDay (ActChgCrsSta + 110) /*****************************************************************************/ /***************************** Assessment tab ********************************/ /*****************************************************************************/ // Actions in menu -#define ActSeeAss (ActChgCalCrs1stDay + 1) -#define ActSeeAsg (ActChgCalCrs1stDay + 2) -#define ActSeePrj (ActChgCalCrs1stDay + 3) -#define ActReqTst (ActChgCalCrs1stDay + 4) -#define ActSeeAllGam (ActChgCalCrs1stDay + 5) -#define ActSeeAllSvy (ActChgCalCrs1stDay + 6) -#define ActSeeAllExaAnn (ActChgCalCrs1stDay + 7) +#define ActSeeAss (ActChgCrsTT1stDay + 1) +#define ActSeeAsg (ActChgCrsTT1stDay + 2) +#define ActSeePrj (ActChgCrsTT1stDay + 3) +#define ActReqTst (ActChgCrsTT1stDay + 4) +#define ActSeeAllGam (ActChgCrsTT1stDay + 5) +#define ActSeeAllSvy (ActChgCrsTT1stDay + 6) +#define ActSeeAllExaAnn (ActChgCrsTT1stDay + 7) // Secondary actions -#define ActEdiAss (ActChgCalCrs1stDay + 8) -#define ActChgFrcReaAss (ActChgCalCrs1stDay + 9) -#define ActChgHavReaAss (ActChgCalCrs1stDay + 10) -#define ActSelInfSrcAss (ActChgCalCrs1stDay + 11) -#define ActRcvURLAss (ActChgCalCrs1stDay + 12) -#define ActRcvPagAss (ActChgCalCrs1stDay + 13) -#define ActEditorAss (ActChgCalCrs1stDay + 14) -#define ActPlaTxtEdiAss (ActChgCalCrs1stDay + 15) -#define ActRchTxtEdiAss (ActChgCalCrs1stDay + 16) -#define ActRcvPlaTxtAss (ActChgCalCrs1stDay + 17) -#define ActRcvRchTxtAss (ActChgCalCrs1stDay + 18) +#define ActEdiAss (ActChgCrsTT1stDay + 8) +#define ActChgFrcReaAss (ActChgCrsTT1stDay + 9) +#define ActChgHavReaAss (ActChgCrsTT1stDay + 10) +#define ActSelInfSrcAss (ActChgCrsTT1stDay + 11) +#define ActRcvURLAss (ActChgCrsTT1stDay + 12) +#define ActRcvPagAss (ActChgCrsTT1stDay + 13) +#define ActEditorAss (ActChgCrsTT1stDay + 14) +#define ActPlaTxtEdiAss (ActChgCrsTT1stDay + 15) +#define ActRchTxtEdiAss (ActChgCrsTT1stDay + 16) +#define ActRcvPlaTxtAss (ActChgCrsTT1stDay + 17) +#define ActRcvRchTxtAss (ActChgCrsTT1stDay + 18) -#define ActFrmNewAsg (ActChgCalCrs1stDay + 19) -#define ActEdiOneAsg (ActChgCalCrs1stDay + 20) -#define ActPrnOneAsg (ActChgCalCrs1stDay + 21) -#define ActNewAsg (ActChgCalCrs1stDay + 22) -#define ActChgAsg (ActChgCalCrs1stDay + 23) -#define ActReqRemAsg (ActChgCalCrs1stDay + 24) -#define ActRemAsg (ActChgCalCrs1stDay + 25) -#define ActHidAsg (ActChgCalCrs1stDay + 26) -#define ActShoAsg (ActChgCalCrs1stDay + 27) +#define ActFrmNewAsg (ActChgCrsTT1stDay + 19) +#define ActEdiOneAsg (ActChgCrsTT1stDay + 20) +#define ActPrnOneAsg (ActChgCrsTT1stDay + 21) +#define ActNewAsg (ActChgCrsTT1stDay + 22) +#define ActChgAsg (ActChgCrsTT1stDay + 23) +#define ActReqRemAsg (ActChgCrsTT1stDay + 24) +#define ActRemAsg (ActChgCrsTT1stDay + 25) +#define ActHidAsg (ActChgCrsTT1stDay + 26) +#define ActShoAsg (ActChgCrsTT1stDay + 27) -#define ActSeeTblAllPrj (ActChgCalCrs1stDay + 28) -#define ActFrmNewPrj (ActChgCalCrs1stDay + 29) -#define ActEdiOnePrj (ActChgCalCrs1stDay + 30) -#define ActPrnOnePrj (ActChgCalCrs1stDay + 31) -#define ActNewPrj (ActChgCalCrs1stDay + 32) -#define ActChgPrj (ActChgCalCrs1stDay + 33) -#define ActReqRemPrj (ActChgCalCrs1stDay + 34) -#define ActRemPrj (ActChgCalCrs1stDay + 35) -#define ActHidPrj (ActChgCalCrs1stDay + 36) -#define ActShoPrj (ActChgCalCrs1stDay + 37) -#define ActReqAddStdPrj (ActChgCalCrs1stDay + 38) -#define ActReqAddTutPrj (ActChgCalCrs1stDay + 39) -#define ActReqAddEvaPrj (ActChgCalCrs1stDay + 40) -#define ActAddStdPrj (ActChgCalCrs1stDay + 41) -#define ActAddTutPrj (ActChgCalCrs1stDay + 42) -#define ActAddEvaPrj (ActChgCalCrs1stDay + 43) -#define ActReqRemStdPrj (ActChgCalCrs1stDay + 44) -#define ActReqRemTutPrj (ActChgCalCrs1stDay + 45) -#define ActReqRemEvaPrj (ActChgCalCrs1stDay + 46) -#define ActRemStdPrj (ActChgCalCrs1stDay + 47) -#define ActRemTutPrj (ActChgCalCrs1stDay + 48) -#define ActRemEvaPrj (ActChgCalCrs1stDay + 49) +#define ActSeeTblAllPrj (ActChgCrsTT1stDay + 28) +#define ActFrmNewPrj (ActChgCrsTT1stDay + 29) +#define ActEdiOnePrj (ActChgCrsTT1stDay + 30) +#define ActPrnOnePrj (ActChgCrsTT1stDay + 31) +#define ActNewPrj (ActChgCrsTT1stDay + 32) +#define ActChgPrj (ActChgCrsTT1stDay + 33) +#define ActReqRemPrj (ActChgCrsTT1stDay + 34) +#define ActRemPrj (ActChgCrsTT1stDay + 35) +#define ActHidPrj (ActChgCrsTT1stDay + 36) +#define ActShoPrj (ActChgCrsTT1stDay + 37) +#define ActReqAddStdPrj (ActChgCrsTT1stDay + 38) +#define ActReqAddTutPrj (ActChgCrsTT1stDay + 39) +#define ActReqAddEvaPrj (ActChgCrsTT1stDay + 40) +#define ActAddStdPrj (ActChgCrsTT1stDay + 41) +#define ActAddTutPrj (ActChgCrsTT1stDay + 42) +#define ActAddEvaPrj (ActChgCrsTT1stDay + 43) +#define ActReqRemStdPrj (ActChgCrsTT1stDay + 44) +#define ActReqRemTutPrj (ActChgCrsTT1stDay + 45) +#define ActReqRemEvaPrj (ActChgCrsTT1stDay + 46) +#define ActRemStdPrj (ActChgCrsTT1stDay + 47) +#define ActRemTutPrj (ActChgCrsTT1stDay + 48) +#define ActRemEvaPrj (ActChgCrsTT1stDay + 49) -#define ActAdmDocPrj (ActChgCalCrs1stDay + 50) -#define ActReqRemFilDocPrj (ActChgCalCrs1stDay + 51) -#define ActRemFilDocPrj (ActChgCalCrs1stDay + 52) -#define ActRemFolDocPrj (ActChgCalCrs1stDay + 53) -#define ActCopDocPrj (ActChgCalCrs1stDay + 54) -#define ActPasDocPrj (ActChgCalCrs1stDay + 55) -#define ActRemTreDocPrj (ActChgCalCrs1stDay + 56) -#define ActFrmCreDocPrj (ActChgCalCrs1stDay + 57) -#define ActCreFolDocPrj (ActChgCalCrs1stDay + 58) -#define ActCreLnkDocPrj (ActChgCalCrs1stDay + 59) -#define ActRenFolDocPrj (ActChgCalCrs1stDay + 60) -#define ActRcvFilDocPrjDZ (ActChgCalCrs1stDay + 61) -#define ActRcvFilDocPrjCla (ActChgCalCrs1stDay + 62) -#define ActExpDocPrj (ActChgCalCrs1stDay + 63) -#define ActConDocPrj (ActChgCalCrs1stDay + 64) -#define ActZIPDocPrj (ActChgCalCrs1stDay + 65) -#define ActReqDatDocPrj (ActChgCalCrs1stDay + 66) -#define ActChgDatDocPrj (ActChgCalCrs1stDay + 67) -#define ActDowDocPrj (ActChgCalCrs1stDay + 68) +#define ActAdmDocPrj (ActChgCrsTT1stDay + 50) +#define ActReqRemFilDocPrj (ActChgCrsTT1stDay + 51) +#define ActRemFilDocPrj (ActChgCrsTT1stDay + 52) +#define ActRemFolDocPrj (ActChgCrsTT1stDay + 53) +#define ActCopDocPrj (ActChgCrsTT1stDay + 54) +#define ActPasDocPrj (ActChgCrsTT1stDay + 55) +#define ActRemTreDocPrj (ActChgCrsTT1stDay + 56) +#define ActFrmCreDocPrj (ActChgCrsTT1stDay + 57) +#define ActCreFolDocPrj (ActChgCrsTT1stDay + 58) +#define ActCreLnkDocPrj (ActChgCrsTT1stDay + 59) +#define ActRenFolDocPrj (ActChgCrsTT1stDay + 60) +#define ActRcvFilDocPrjDZ (ActChgCrsTT1stDay + 61) +#define ActRcvFilDocPrjCla (ActChgCrsTT1stDay + 62) +#define ActExpDocPrj (ActChgCrsTT1stDay + 63) +#define ActConDocPrj (ActChgCrsTT1stDay + 64) +#define ActZIPDocPrj (ActChgCrsTT1stDay + 65) +#define ActReqDatDocPrj (ActChgCrsTT1stDay + 66) +#define ActChgDatDocPrj (ActChgCrsTT1stDay + 67) +#define ActDowDocPrj (ActChgCrsTT1stDay + 68) -#define ActAdmAssPrj (ActChgCalCrs1stDay + 69) -#define ActReqRemFilAssPrj (ActChgCalCrs1stDay + 70) -#define ActRemFilAssPrj (ActChgCalCrs1stDay + 71) -#define ActRemFolAssPrj (ActChgCalCrs1stDay + 72) -#define ActCopAssPrj (ActChgCalCrs1stDay + 73) -#define ActPasAssPrj (ActChgCalCrs1stDay + 74) -#define ActRemTreAssPrj (ActChgCalCrs1stDay + 75) -#define ActFrmCreAssPrj (ActChgCalCrs1stDay + 76) -#define ActCreFolAssPrj (ActChgCalCrs1stDay + 77) -#define ActCreLnkAssPrj (ActChgCalCrs1stDay + 78) -#define ActRenFolAssPrj (ActChgCalCrs1stDay + 79) -#define ActRcvFilAssPrjDZ (ActChgCalCrs1stDay + 80) -#define ActRcvFilAssPrjCla (ActChgCalCrs1stDay + 81) -#define ActExpAssPrj (ActChgCalCrs1stDay + 82) -#define ActConAssPrj (ActChgCalCrs1stDay + 83) -#define ActZIPAssPrj (ActChgCalCrs1stDay + 84) -#define ActReqDatAssPrj (ActChgCalCrs1stDay + 85) -#define ActChgDatAssPrj (ActChgCalCrs1stDay + 86) -#define ActDowAssPrj (ActChgCalCrs1stDay + 87) +#define ActAdmAssPrj (ActChgCrsTT1stDay + 69) +#define ActReqRemFilAssPrj (ActChgCrsTT1stDay + 70) +#define ActRemFilAssPrj (ActChgCrsTT1stDay + 71) +#define ActRemFolAssPrj (ActChgCrsTT1stDay + 72) +#define ActCopAssPrj (ActChgCrsTT1stDay + 73) +#define ActPasAssPrj (ActChgCrsTT1stDay + 74) +#define ActRemTreAssPrj (ActChgCrsTT1stDay + 75) +#define ActFrmCreAssPrj (ActChgCrsTT1stDay + 76) +#define ActCreFolAssPrj (ActChgCrsTT1stDay + 77) +#define ActCreLnkAssPrj (ActChgCrsTT1stDay + 78) +#define ActRenFolAssPrj (ActChgCrsTT1stDay + 79) +#define ActRcvFilAssPrjDZ (ActChgCrsTT1stDay + 80) +#define ActRcvFilAssPrjCla (ActChgCrsTT1stDay + 81) +#define ActExpAssPrj (ActChgCrsTT1stDay + 82) +#define ActConAssPrj (ActChgCrsTT1stDay + 83) +#define ActZIPAssPrj (ActChgCrsTT1stDay + 84) +#define ActReqDatAssPrj (ActChgCrsTT1stDay + 85) +#define ActChgDatAssPrj (ActChgCrsTT1stDay + 86) +#define ActDowAssPrj (ActChgCrsTT1stDay + 87) -#define ActSeeTst (ActChgCalCrs1stDay + 88) -#define ActAssTst (ActChgCalCrs1stDay + 89) -#define ActEdiTstQst (ActChgCalCrs1stDay + 90) -#define ActEdiOneTstQst (ActChgCalCrs1stDay + 91) -#define ActReqImpTstQst (ActChgCalCrs1stDay + 92) -#define ActImpTstQst (ActChgCalCrs1stDay + 93) -#define ActLstTstQst (ActChgCalCrs1stDay + 94) -#define ActRcvTstQst (ActChgCalCrs1stDay + 95) -#define ActReqRemTstQst (ActChgCalCrs1stDay + 96) -#define ActRemTstQst (ActChgCalCrs1stDay + 97) -#define ActShfTstQst (ActChgCalCrs1stDay + 98) -#define ActCfgTst (ActChgCalCrs1stDay + 99) -#define ActEnableTag (ActChgCalCrs1stDay + 100) -#define ActDisableTag (ActChgCalCrs1stDay + 101) -#define ActRenTag (ActChgCalCrs1stDay + 102) -#define ActRcvCfgTst (ActChgCalCrs1stDay + 103) +#define ActSeeTst (ActChgCrsTT1stDay + 88) +#define ActAssTst (ActChgCrsTT1stDay + 89) +#define ActEdiTstQst (ActChgCrsTT1stDay + 90) +#define ActEdiOneTstQst (ActChgCrsTT1stDay + 91) +#define ActReqImpTstQst (ActChgCrsTT1stDay + 92) +#define ActImpTstQst (ActChgCrsTT1stDay + 93) +#define ActLstTstQst (ActChgCrsTT1stDay + 94) +#define ActRcvTstQst (ActChgCrsTT1stDay + 95) +#define ActReqRemTstQst (ActChgCrsTT1stDay + 96) +#define ActRemTstQst (ActChgCrsTT1stDay + 97) +#define ActShfTstQst (ActChgCrsTT1stDay + 98) +#define ActCfgTst (ActChgCrsTT1stDay + 99) +#define ActEnableTag (ActChgCrsTT1stDay + 100) +#define ActDisableTag (ActChgCrsTT1stDay + 101) +#define ActRenTag (ActChgCrsTT1stDay + 102) +#define ActRcvCfgTst (ActChgCrsTT1stDay + 103) -#define ActReqSeeMyTstRes (ActChgCalCrs1stDay + 104) -#define ActSeeMyTstRes (ActChgCalCrs1stDay + 105) -#define ActSeeOneTstResMe (ActChgCalCrs1stDay + 106) -#define ActReqSeeUsrTstRes (ActChgCalCrs1stDay + 107) -#define ActSeeUsrTstRes (ActChgCalCrs1stDay + 108) -#define ActSeeOneTstResOth (ActChgCalCrs1stDay + 109) +#define ActReqSeeMyTstRes (ActChgCrsTT1stDay + 104) +#define ActSeeMyTstRes (ActChgCrsTT1stDay + 105) +#define ActSeeOneTstResMe (ActChgCrsTT1stDay + 106) +#define ActReqSeeUsrTstRes (ActChgCrsTT1stDay + 107) +#define ActSeeUsrTstRes (ActChgCrsTT1stDay + 108) +#define ActSeeOneTstResOth (ActChgCrsTT1stDay + 109) -#define ActSeeOneGam (ActChgCalCrs1stDay + 110) -#define ActPlyGam (ActChgCalCrs1stDay + 111) -#define ActPlyGam1stQst (ActChgCalCrs1stDay + 112) -#define ActPlyGamNxtQst (ActChgCalCrs1stDay + 113) -#define ActPlyGamAns (ActChgCalCrs1stDay + 114) -#define ActAnsGam (ActChgCalCrs1stDay + 115) -#define ActFrmNewGam (ActChgCalCrs1stDay + 116) -#define ActEdiOneGam (ActChgCalCrs1stDay + 117) -#define ActNewGam (ActChgCalCrs1stDay + 118) -#define ActChgGam (ActChgCalCrs1stDay + 119) -#define ActReqRemGam (ActChgCalCrs1stDay + 120) -#define ActRemGam (ActChgCalCrs1stDay + 121) -#define ActReqRstGam (ActChgCalCrs1stDay + 122) -#define ActRstGam (ActChgCalCrs1stDay + 123) -#define ActHidGam (ActChgCalCrs1stDay + 124) -#define ActShoGam (ActChgCalCrs1stDay + 125) -#define ActAddOneGamQst (ActChgCalCrs1stDay + 126) -#define ActGamLstTstQst (ActChgCalCrs1stDay + 127) -#define ActAddTstQstToGam (ActChgCalCrs1stDay + 128) -#define ActReqRemGamQst (ActChgCalCrs1stDay + 129) -#define ActRemGamQst (ActChgCalCrs1stDay + 130) -#define ActUp_GamQst (ActChgCalCrs1stDay + 131) -#define ActDwnGamQst (ActChgCalCrs1stDay + 132) +#define ActSeeOneGam (ActChgCrsTT1stDay + 110) +#define ActPlyGam (ActChgCrsTT1stDay + 111) +#define ActPlyGam1stQst (ActChgCrsTT1stDay + 112) +#define ActPlyGamNxtQst (ActChgCrsTT1stDay + 113) +#define ActPlyGamAns (ActChgCrsTT1stDay + 114) +#define ActAnsGam (ActChgCrsTT1stDay + 115) +#define ActFrmNewGam (ActChgCrsTT1stDay + 116) +#define ActEdiOneGam (ActChgCrsTT1stDay + 117) +#define ActNewGam (ActChgCrsTT1stDay + 118) +#define ActChgGam (ActChgCrsTT1stDay + 119) +#define ActReqRemGam (ActChgCrsTT1stDay + 120) +#define ActRemGam (ActChgCrsTT1stDay + 121) +#define ActReqRstGam (ActChgCrsTT1stDay + 122) +#define ActRstGam (ActChgCrsTT1stDay + 123) +#define ActHidGam (ActChgCrsTT1stDay + 124) +#define ActShoGam (ActChgCrsTT1stDay + 125) +#define ActAddOneGamQst (ActChgCrsTT1stDay + 126) +#define ActGamLstTstQst (ActChgCrsTT1stDay + 127) +#define ActAddTstQstToGam (ActChgCrsTT1stDay + 128) +#define ActReqRemGamQst (ActChgCrsTT1stDay + 129) +#define ActRemGamQst (ActChgCrsTT1stDay + 130) +#define ActUp_GamQst (ActChgCrsTT1stDay + 131) +#define ActDwnGamQst (ActChgCrsTT1stDay + 132) -#define ActSeeOneSvy (ActChgCalCrs1stDay + 133) -#define ActAnsSvy (ActChgCalCrs1stDay + 134) -#define ActFrmNewSvy (ActChgCalCrs1stDay + 135) -#define ActEdiOneSvy (ActChgCalCrs1stDay + 136) -#define ActNewSvy (ActChgCalCrs1stDay + 137) -#define ActChgSvy (ActChgCalCrs1stDay + 138) -#define ActReqRemSvy (ActChgCalCrs1stDay + 139) -#define ActRemSvy (ActChgCalCrs1stDay + 140) -#define ActReqRstSvy (ActChgCalCrs1stDay + 141) -#define ActRstSvy (ActChgCalCrs1stDay + 142) -#define ActHidSvy (ActChgCalCrs1stDay + 143) -#define ActShoSvy (ActChgCalCrs1stDay + 144) -#define ActEdiOneSvyQst (ActChgCalCrs1stDay + 145) -#define ActRcvSvyQst (ActChgCalCrs1stDay + 146) -#define ActReqRemSvyQst (ActChgCalCrs1stDay + 147) -#define ActRemSvyQst (ActChgCalCrs1stDay + 148) +#define ActSeeOneSvy (ActChgCrsTT1stDay + 133) +#define ActAnsSvy (ActChgCrsTT1stDay + 134) +#define ActFrmNewSvy (ActChgCrsTT1stDay + 135) +#define ActEdiOneSvy (ActChgCrsTT1stDay + 136) +#define ActNewSvy (ActChgCrsTT1stDay + 137) +#define ActChgSvy (ActChgCrsTT1stDay + 138) +#define ActReqRemSvy (ActChgCrsTT1stDay + 139) +#define ActRemSvy (ActChgCrsTT1stDay + 140) +#define ActReqRstSvy (ActChgCrsTT1stDay + 141) +#define ActRstSvy (ActChgCrsTT1stDay + 142) +#define ActHidSvy (ActChgCrsTT1stDay + 143) +#define ActShoSvy (ActChgCrsTT1stDay + 144) +#define ActEdiOneSvyQst (ActChgCrsTT1stDay + 145) +#define ActRcvSvyQst (ActChgCrsTT1stDay + 146) +#define ActReqRemSvyQst (ActChgCrsTT1stDay + 147) +#define ActRemSvyQst (ActChgCrsTT1stDay + 148) -#define ActSeeOneExaAnn (ActChgCalCrs1stDay + 149) -#define ActSeeDatExaAnn (ActChgCalCrs1stDay + 150) -#define ActEdiExaAnn (ActChgCalCrs1stDay + 151) -#define ActRcvExaAnn (ActChgCalCrs1stDay + 152) -#define ActPrnExaAnn (ActChgCalCrs1stDay + 153) -#define ActReqRemExaAnn (ActChgCalCrs1stDay + 154) -#define ActRemExaAnn (ActChgCalCrs1stDay + 155) -#define ActHidExaAnn (ActChgCalCrs1stDay + 156) -#define ActShoExaAnn (ActChgCalCrs1stDay + 157) +#define ActSeeOneExaAnn (ActChgCrsTT1stDay + 149) +#define ActSeeDatExaAnn (ActChgCrsTT1stDay + 150) +#define ActEdiExaAnn (ActChgCrsTT1stDay + 151) +#define ActRcvExaAnn (ActChgCrsTT1stDay + 152) +#define ActPrnExaAnn (ActChgCrsTT1stDay + 153) +#define ActReqRemExaAnn (ActChgCrsTT1stDay + 154) +#define ActRemExaAnn (ActChgCrsTT1stDay + 155) +#define ActHidExaAnn (ActChgCrsTT1stDay + 156) +#define ActShoExaAnn (ActChgCrsTT1stDay + 157) /*****************************************************************************/ /******************************** Files tab **********************************/ diff --git a/swad_calendar.c b/swad_calendar.c index 869c1219a..24265d345 100644 --- a/swad_calendar.c +++ b/swad_calendar.c @@ -72,11 +72,6 @@ static void Cal_DrawCalendar (Act_Action_t ActionSeeCalendar, void (*FunctionToDrawContextualIcons) (void), bool PrintView); static void Cal_PutIconToPrintCalendarSys (void); -static void Cal_PutIconToPrintCalendarCty (void); -static void Cal_PutIconToPrintCalendarIns (void); -static void Cal_PutIconToPrintCalendarCtr (void); -static void Cal_PutIconToPrintCalendarDeg (void); -static void Cal_PutIconToPrintCalendarCrs (void); /*****************************************************************************/ /************** Put icons to select the first day of the week ****************/ @@ -242,31 +237,6 @@ void Cal_DrawCalendarSys (void) Cal_DrawCalendar (ActSeeCalSys,ActChgCalSys1stDay,Cal_PutIconToPrintCalendarSys,false); } -void Cal_DrawCalendarCty (void) - { - Cal_DrawCalendar (ActSeeCalCty,ActChgCalCty1stDay,Cal_PutIconToPrintCalendarCty,false); - } - -void Cal_DrawCalendarIns (void) - { - Cal_DrawCalendar (ActSeeCalIns,ActChgCalIns1stDay,Cal_PutIconToPrintCalendarIns,false); - } - -void Cal_DrawCalendarCtr (void) - { - Cal_DrawCalendar (ActSeeCalCtr,ActChgCalCtr1stDay,Cal_PutIconToPrintCalendarCtr,false); - } - -void Cal_DrawCalendarDeg (void) - { - Cal_DrawCalendar (ActSeeCalDeg,ActChgCalDeg1stDay,Cal_PutIconToPrintCalendarDeg,false); - } - -void Cal_DrawCalendarCrs (void) - { - Cal_DrawCalendar (ActSeeCalCrs,ActChgCalCrs1stDay,Cal_PutIconToPrintCalendarCrs,false); - } - void Cal_PrintCalendar (void) { Cal_DrawCalendar (ActUnk,ActUnk,NULL,true); @@ -334,41 +304,17 @@ static void Cal_DrawCalendar (Act_Action_t ActionSeeCalendar, /*****************************************************************************/ static void Cal_PutIconToPrintCalendarSys (void) - { - Ico_PutContextualIconToPrint (ActPrnCalSys,NULL); - } - -static void Cal_PutIconToPrintCalendarCty (void) - { - Ico_PutContextualIconToPrint (ActPrnCalCty,NULL); - } - -static void Cal_PutIconToPrintCalendarIns (void) { extern const char *Txt_Holidays; /***** Print calendar *****/ - Ico_PutContextualIconToPrint (ActPrnCalIns,NULL); + Ico_PutContextualIconToPrint (ActPrnCalSys,NULL); /***** View holidays *****/ - if (Gbl.Hlds.Num || // There are holidays - Gbl.Usrs.Me.Role.Logged >= Rol_INS_ADM) // Institution admin or system admin + if (Gbl.CurrentIns.Ins.InsCod > 0 && // Institution selected + (Gbl.Hlds.Num || // There are holidays + Gbl.Usrs.Me.Role.Logged >= Rol_INS_ADM)) // Institution admin or system admin Lay_PutContextualLinkOnlyIcon (ActSeeHld,NULL,NULL, "holiday.png", Txt_Holidays); } - -static void Cal_PutIconToPrintCalendarCtr (void) - { - Ico_PutContextualIconToPrint (ActPrnCalCtr,NULL); - } - -static void Cal_PutIconToPrintCalendarDeg (void) - { - Ico_PutContextualIconToPrint (ActPrnCalDeg,NULL); - } - -static void Cal_PutIconToPrintCalendarCrs (void) - { - Ico_PutContextualIconToPrint (ActPrnCalCrs,NULL); - } diff --git a/swad_calendar.h b/swad_calendar.h index 133c81c3f..a74fcc1e9 100644 --- a/swad_calendar.h +++ b/swad_calendar.h @@ -51,11 +51,6 @@ unsigned Cal_GetFirstDayOfWeekFromStr (const char *Str); void Cal_DrawCurrentMonth (void); void Cal_DrawCalendarSys (void); -void Cal_DrawCalendarCty (void); -void Cal_DrawCalendarIns (void); -void Cal_DrawCalendarCtr (void); -void Cal_DrawCalendarDeg (void); -void Cal_DrawCalendarCrs (void); void Cal_PrintCalendar (void); #endif diff --git a/swad_changelog.h b/swad_changelog.h index 8f47f597e..9ece3a93d 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -386,11 +386,30 @@ En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 18.44.1 (2019-02-15)" +#define Log_PLATFORM_VERSION "SWAD 18.45 (2019-02-15)" #define CSS_FILE "swad18.41.1.css" #define JS_FILE "swad18.32.1.js" /* - Version 18.44.1: Feb 15, 2019 Option system calendar is moved to start tab. (238654 lines) + Version 18.45: Feb 15, 2019 Removed calendar options from country, institution, centre, degree and course. + Holidays action is shown in menu. (238398 lines) + 15 changes necessary in database: +UPDATE actions SET Obsolete='Y' WHERE ActCod='1625'; +UPDATE actions SET Obsolete='Y' WHERE ActCod='1628'; +UPDATE actions SET Obsolete='Y' WHERE ActCod='1631'; +UPDATE actions SET Obsolete='Y' WHERE ActCod='1634'; +UPDATE actions SET Obsolete='Y' WHERE ActCod='16'; +UPDATE actions SET Obsolete='Y' WHERE ActCod='1626'; +UPDATE actions SET Obsolete='Y' WHERE ActCod='1629'; +UPDATE actions SET Obsolete='Y' WHERE ActCod='1632'; +UPDATE actions SET Obsolete='Y' WHERE ActCod='1635'; +UPDATE actions SET Obsolete='Y' WHERE ActCod='71'; +UPDATE actions SET Obsolete='Y' WHERE ActCod='1627'; +UPDATE actions SET Obsolete='Y' WHERE ActCod='1630'; +UPDATE actions SET Obsolete='Y' WHERE ActCod='1633'; +UPDATE actions SET Obsolete='Y' WHERE ActCod='1636'; +UPDATE actions SET Obsolete='Y' WHERE ActCod='1485'; + + Version 18.44.1: Feb 15, 2019 Option system calendar moved to start tab. (238654 lines) 3 changes necessary in database: UPDATE actions SET Txt='Ver calendario' WHERE ActCod='1622' AND Language='es'; UPDATE actions SET Txt='Imprimir calendario' WHERE ActCod='1623' AND Language='es'; diff --git a/swad_layout.c b/swad_layout.c index 3f00a0ec7..ab576549b 100644 --- a/swad_layout.c +++ b/swad_layout.c @@ -492,11 +492,11 @@ static void Lay_WriteScripts (void) Lay_WriteScriptParamsAJAX (); /***** Prepare script to draw months *****/ - if ((Gbl.Prefs.SideCols & Lay_SHOW_LEFT_COLUMN) || // Left column visible - Gbl.Action.Act == ActSeeCalIns || Gbl.Action.Act == ActPrnCalIns || - Gbl.Action.Act == ActSeeCalCtr || Gbl.Action.Act == ActPrnCalCtr || - Gbl.Action.Act == ActSeeCalDeg || Gbl.Action.Act == ActPrnCalDeg || - Gbl.Action.Act == ActSeeCalCrs || Gbl.Action.Act == ActPrnCalCrs) + if ((Gbl.Prefs.SideCols & Lay_SHOW_LEFT_COLUMN) || // Left column visible + (Gbl.CurrentIns.Ins.InsCod > 0 && // Institution selected + (Gbl.Action.Act == ActSeeCalSys || // Viewing calendar + Gbl.Action.Act == ActPrnCalSys || // Printing calendar + Gbl.Action.Act == ActChgCalSys1stDay))) // Changing first day { /***** Get list of holidays *****/ if (!Gbl.Hlds.LstIsRead) diff --git a/swad_menu.c b/swad_menu.c index c5e6c5256..46d102468 100644 --- a/swad_menu.c +++ b/swad_menu.c @@ -123,7 +123,7 @@ const Act_Action_t Mnu_MenuActions[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB { ActSeeCtyInf, // 0 ActSeeIns, // 1 - ActSeeCalCty, // 2 + 0, // 2 0, // 3 0, // 4 0, // 5 @@ -141,7 +141,7 @@ const Act_Action_t Mnu_MenuActions[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB ActSeeCtr, // 1 ActSeePlc, // 2 ActSeeDpt, // 3 - ActSeeCalIns, // 4 + ActSeeHld, // 4 0, // 5 0, // 6 0, // 7 @@ -156,7 +156,7 @@ const Act_Action_t Mnu_MenuActions[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB ActSeeCtrInf, // 0 ActSeeDeg, // 1 ActSeeCla, // 2 - ActSeeCalCtr, // 3 + 0, // 3 0, // 4 0, // 5 0, // 6 @@ -171,7 +171,7 @@ const Act_Action_t Mnu_MenuActions[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB { ActSeeDegInf, // 0 ActSeeCrs, // 1 - ActSeeCalDeg, // 2 + 0, // 2 0, // 3 0, // 4 0, // 5 @@ -192,7 +192,7 @@ const Act_Action_t Mnu_MenuActions[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB ActSeeFAQ, // 4 ActSeeCrsLnk, // 5 ActSeeCrsTT, // 6 - ActSeeCalCrs, // 7 + 0, // 7 0, // 8 0, // 9 0, // 10 diff --git a/swad_text.c b/swad_text.c index 13a11c4bd..ab7d5b894 100644 --- a/swad_text.c +++ b/swad_text.c @@ -17974,27 +17974,7 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Instituções" #endif , - // 2: ActSeeCalCty -#if L==1 // ca - "Calendari" -#elif L==2 // de - "Kalender" -#elif L==3 // en - "Calendar" -#elif L==4 // es - "Calendario" -#elif L==5 // fr - "Calendrier" -#elif L==6 // gn - "Arapapaha" -#elif L==7 // it - "Calendario" -#elif L==8 // pl - "Kalendarz" -#elif L==9 // pt - "Calendário" -#endif - , + NULL, // 2 NULL, // 3 NULL, // 4 NULL, // 5 @@ -18092,25 +18072,25 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Departamentos" #endif , - // 4: ActSeeCalIns + // 4: ActSeeHld #if L==1 // ca - "Calendari" + "Festius" #elif L==2 // de - "Kalender" + "Feiertage" #elif L==3 // en - "Calendar" + "Holidays" #elif L==4 // es - "Calendario" + "Festivos" #elif L==5 // fr - "Calendrier" + "Fériés" #elif L==6 // gn - "Arapapaha" + "Arete" #elif L==7 // it - "Calendario" + "Festività" #elif L==8 // pl - "Kalendarz" + "Noclegi" #elif L==9 // pt - "Calendário" + "Férias" #endif , NULL, // 5 @@ -18187,27 +18167,7 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Salas" #endif , - // 3: ActSeeCalCtr -#if L==1 // ca - "Calendari" -#elif L==2 // de - "Kalender" -#elif L==3 // en - "Calendar" -#elif L==4 // es - "Calendario" -#elif L==5 // fr - "Calendrier" -#elif L==6 // gn - "Arapapaha" -#elif L==7 // it - "Calendario" -#elif L==8 // pl - "Kalendarz" -#elif L==9 // pt - "Calendário" -#endif - , + NULL, // 3 NULL, // 4 NULL, // 5 NULL, // 6 @@ -18262,27 +18222,7 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Disciplinas" #endif , - // 2: ActSeeCalDeg -#if L==1 // ca - "Calendari" -#elif L==2 // de - "Kalender" -#elif L==3 // en - "Calendar" -#elif L==4 // es - "Calendario" -#elif L==5 // fr - "Calendrier" -#elif L==6 // gn - "Arapapaha" -#elif L==7 // it - "Calendario" -#elif L==8 // pl - "Kalendarz" -#elif L==9 // pt - "Calendário" -#endif - , + NULL, // 2 NULL, // 3 NULL, // 4 NULL, // 5 @@ -18443,27 +18383,7 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Horário" #endif , - // 7: ActSeeCalCrs -#if L==1 // ca - "Calendari" -#elif L==2 // de - "Kalender" -#elif L==3 // en - "Calendar" -#elif L==4 // es - "Calendario" -#elif L==5 // fr - "Calendrier" -#elif L==6 // gn - "Arapapaha" -#elif L==7 // it - "Calendario" -#elif L==8 // pl - "Kalendarz" -#elif L==9 // pt - "Calendário" -#endif - , + NULL, // 7 NULL, // 8 NULL, // 9 NULL, // 10 @@ -19861,27 +19781,7 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Instituções" #endif , - // 2: ActSeeCalCty -#if L==1 // ca - "Calendari acadèmic" -#elif L==2 // de - "Kalender" -#elif L==3 // en - "Academic calendar" -#elif L==4 // es - "Calendario académico" -#elif L==5 // fr - "Calendrier" -#elif L==6 // gn - "Calendario académico"// Okoteve traducción -#elif L==7 // it - "Calendario del corso" -#elif L==8 // pl - "Kalendarz akademicki" -#elif L==9 // pt - "Calendário" -#endif - , + NULL, // 2 NULL, // 3 NULL, // 4 NULL, // 5 @@ -19988,25 +19888,25 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Departamentos" #endif , - // 4: ActSeeCalIns + // 4: ActSeeHld #if L==1 // ca - "Calendari acadèmic" + "Dies festius" #elif L==2 // de - "Kalender" + "Feiertage" #elif L==3 // en - "Academic calendar" + "Holidays" #elif L==4 // es - "Calendario académico" + "Días festivos" #elif L==5 // fr - "Calendrier" + "Jours fériés" #elif L==6 // gn - "Calendario académico" // Okoteve traducción + "Arete" #elif L==7 // it - "Calendario del corso" + "Festività" #elif L==8 // pl - "Kalendarz akademicki" + "Noclegi" #elif L==9 // pt - "Calendário" + "Férias" #endif , NULL, // 5 @@ -20083,30 +19983,7 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Salas de aula, laboratórios ou outros locais onde as aulas são ministradas" #endif , - // 3: ActSeeCalCtr -#if L==1 // ca - "Calendari acadèmic (els dies festius" - " corresponen al lloc del centre seleccionada)" -#elif L==2 // de - "Kalender" -#elif L==3 // en - "Academic calendar" -#elif L==4 // es - "Calendario académico (los días festivos" - " corresponden al lugar del centro seleccionado)" -#elif L==5 // fr - "Calendrier" -#elif L==6 // gn - "Calendario académico (los días festivos" - " corresponden al lugar del centro seleccionado)"// Okoteve traducción -#elif L==7 // it - "Calendario del corso" -#elif L==8 // pl - "Kalendarz akademicki" -#elif L==9 // pt - "Calendário" -#endif - , + NULL, // 3 NULL, // 4 NULL, // 5 NULL, // 6 @@ -20161,30 +20038,7 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Disciplinas deste grau" #endif , - // 2: ActSeeCalDeg -#if L==1 // ca - "Calendari acadèmic (els dies festius" - " corresponen al lloc del centre seleccionada)" -#elif L==2 // de - "Kalender" -#elif L==3 // en - "Academic calendar" -#elif L==4 // es - "Calendario académico (los días festivos" - " corresponden al lugar del centro seleccionado)" -#elif L==5 // fr - "Calendrier" -#elif L==6 // gn - "Calendario académico (los días festivos" - " corresponden al lugar del centro seleccionado)"// Okoteve traducción -#elif L==7 // it - "Calendario del corso" -#elif L==8 // pl - "Kalendarz akademicki" -#elif L==9 // pt - "Calendário" -#endif - , + NULL, // 2 NULL, // 3 NULL, // 4 NULL, // 5 @@ -20345,30 +20199,7 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Horário" #endif , - // 7: ActSeeCalCrs -#if L==1 // ca - "Calendari acadèmic (els dies festius" - " corresponen al lloc del centre seleccionada)" -#elif L==2 // de - "Kalender" -#elif L==3 // en - "Academic calendar" -#elif L==4 // es - "Calendario académico (los días festivos" - " corresponden al lugar del centro seleccionado)" -#elif L==5 // fr - "Calendrier" -#elif L==6 // gn - "Calendario académico (los días festivos" - " corresponden al lugar del centro seleccionado)"// Okoteve traducción -#elif L==7 // it - "Calendario del corso" -#elif L==8 // pl - "Kalendarz akademicki" -#elif L==9 // pt - "Calendário" -#endif - , + NULL, // 7 NULL, // 8 NULL, // 9 NULL, // 10