diff --git a/swad_action.c b/swad_action.c index 4fcfd0ef..2aeed38e 100644 --- a/swad_action.c +++ b/swad_action.c @@ -206,14 +206,10 @@ System: 57. ActChgSysCrs1stDay Change first day of week and show academic calendar Country: - 58. ActCtyReqSch Request search in country tab - 59. ActSeeCtyInf Show information on the current country 60. ActSeeIns List institutions 61. ActSeeCalCty Show the academic calendar - 62. ActCtySch Search for courses, teachers, documents... - 63. ActPrnCtyInf Print information on the current country 64. ActChgCtyMapAtt Change map attribution of country @@ -230,15 +226,12 @@ Country: 74. ActChgCtyCrs1stDay Change first day of week and show academic calendar Institution: - 75. ActInsReqSch Request search in institution tab 76. ActSeeInsInf Show information on the current institution 77. ActSeeCtr List centres 78. ActSeePlc List places 79. ActSeeDpt List departments 80. ActSeeCalIns Show the academic calendar - 81. ActInsSch Search for courses, teachers, documents... - 82. ActPrnInsInf Print information on the current institution 83. ActChgInsCtyCfg Change country of institution in institution configuration 84. ActRenInsShoCfg Change short name of institution in institution configuration @@ -286,14 +279,11 @@ Institution: 121. ActChgInsCrs1stDay Change first day of week and show academic calendar Centre: - 122. ActCtrReqSch Request search in centre tab 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 - 127. ActCtrSch Search for courses, teachers, documents... - 128. ActPrnCtrInf Print information on the current centre 129. ActChgCtrInsCfg Request change of the institution of a centre in centre configuration 130. ActRenCtrShoCfg Change short name centre in centre configuration @@ -329,13 +319,10 @@ Centre: 157. ActChgCtrCrs1stDay Change first day of week and show academic calendar Degree: - 158. ActDegReqSch Request search in degree tab 159. ActSeeDegInf Show information on the current degree 160. ActSeeCrs List courses of a degree 161. ActSeeCalDeg Show the academic calendar - 162. ActDegSch Search for courses, teachers, documents... - 163. ActPrnDegInf Print information on the current degree 164. ActChgDegCtrCfg Request change of the centre of a degree in degree configuration 165. ActRenDegShoCfg Request change of the short name of a degree in degree configuration @@ -359,8 +346,6 @@ Degree: 181. ActChgDegCrs1stDay Change first day of week and show academic calendar Course: - 182. ActCrsReqSch Request search in course tab - 183. ActSeeCrsInf Show information on the current course 184. ActSeeTchGui Show teaching guide of the course 185. ActSeeSyl Show syllabus (lectures or practicals) @@ -372,8 +357,6 @@ Course: 191. ActSeeCrsTT Show the timetable 192. ActSeeCalCrs Show the academic calendar of the course with exam announcements - 193. ActCrsSch Search for courses, teachers, documents... - 194. ActPrnCrsInf Print information on the course 195. ActChgCrsDegCfg Request change of degree in course configuration 196. ActRenCrsShoCfg Request change of short name of a course in course configuration @@ -1633,11 +1616,6 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = // TabSta ****************************************************************** /* ActFrmLogIn */{1521, 0,TabSta,ActFrmLogIn , 0,0x001,0x001,0x001,0x001,0x001,0x001,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Usr_WriteLandingPage ,"power-off" }, /* ActSysReqSch */{ 627, 1,TabSta,ActSysReqSch ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Sch_ReqSysSearch ,"search" }, -// /* ActCtyReqSch */{1176, 0,TabCty,ActCtyReqSch , 0, 0, 0, 0, 0,0x3C7, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Sch_ReqCtySearch ,"search" }, -// /* ActInsReqSch */{1177, 0,TabIns,ActInsReqSch , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Sch_ReqInsSearch ,"search" }, -// /* ActCtrReqSch */{1178, 0,TabCtr,ActCtrReqSch , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Sch_ReqCtrSearch ,"search" }, -// /* ActDegReqSch */{1179, 0,TabDeg,ActDegReqSch , 0, 0,0x3C7, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Sch_ReqDegSearch ,"search" }, -// /* ActCrsReqSch */{1180, 0,TabCrs,ActCrsReqSch ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Sch_ReqCrsSearch ,"search" }, /* 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" }, /* ActSeeNtf */{ 990, 4,TabSta,ActSeeNtf ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Ntf_ShowMyNotifications ,"bell" }, @@ -1647,11 +1625,6 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActLogOut */{ 10,-1,TabUnk,ActFrmLogIn ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,Ses_CloseSession ,Usr_Logout ,NULL}, /* ActSysSch */{ 628,-1,TabUnk,ActSysReqSch ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,Sch_GetParamsSearch ,Sch_SysSearch ,NULL}, -// /* ActCtySch */{1181,-1,TabUnk,ActCtyReqSch , 0, 0, 0, 0, 0,0x3C7, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Sch_GetParamsSearch ,Sch_CtySearch ,NULL}, -// /* ActInsSch */{1182,-1,TabUnk,ActInsReqSch , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Sch_GetParamsSearch ,Sch_InsSearch ,NULL}, -// /* ActCtrSch */{1183,-1,TabUnk,ActCtrReqSch , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Sch_GetParamsSearch ,Sch_CtrSearch ,NULL}, -// /* ActDegSch */{1184,-1,TabUnk,ActDegReqSch , 0, 0,0x3C7, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Sch_GetParamsSearch ,Sch_DegSearch ,NULL}, -// /* ActCrsSch */{1185,-1,TabUnk,ActCrsReqSch ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Sch_GetParamsSearch ,Sch_CrsSearch ,NULL}, /* ActRcvSocPstGbl */{1492,-1,TabUnk,ActSeeSocTmlGbl ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_DATA,Act_BRW_1ST_TAB,Soc_ShowTimelineGbl1 ,Soc_ReceiveSocialPostGbl ,NULL}, /* ActRcvSocComGbl */{1503,-1,TabUnk,ActSeeSocTmlGbl ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_DATA,Act_BRW_1ST_TAB,Soc_ShowTimelineGbl1 ,Soc_ReceiveCommentGbl ,NULL}, @@ -1756,14 +1729,11 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = // TabCty ****************************************************************** // Actions in menu: - /* ActCtyReqSch */{1176, 0,TabCty,ActCtyReqSch , 0, 0, 0, 0, 0,0x3C7, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Sch_ReqCtySearch ,"search" }, - /* ActSeeCtyInf */{1155, 1,TabCty,ActSeeCtyInf , 0, 0, 0, 0, 0,0x3C7, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cty_ShowConfiguration ,"info" }, - /* ActSeeIns */{ 696, 2,TabCty,ActSeeIns , 0, 0, 0, 0, 0,0x3C7, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Ins_ShowInssOfCurrentCty ,"university" }, - /* ActSeeCalCty */{1625, 3,TabCty,ActSeeCalCty , 0, 0, 0, 0, 0,0x3C7, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cal_DrawCalendarCty ,"calendar" }, + /* 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: - /* ActCtySch */{1181,-1,TabUnk,ActCtyReqSch , 0, 0, 0, 0, 0,0x3C7, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Sch_GetParamsSearch ,Sch_CtySearch ,NULL}, - /* ActPrnCtyInf */{1156,-1,TabUnk,ActSeeCtyInf , 0, 0, 0, 0, 0,0x3C7, 0,Act_CONT_NORM,Act_BRW_NEW_TAB,NULL ,Cty_PrintConfiguration ,NULL}, /* ActChgCtyMapAtt */{1158,-1,TabUnk,ActSeeCtyInf , 0, 0, 0, 0, 0,0x200, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cty_ChangeCtyMapAttribution ,NULL}, @@ -1781,16 +1751,13 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = // TabIns ****************************************************************** // Actions in menu: - /* ActInsReqSch */{1177, 0,TabIns,ActInsReqSch , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Sch_ReqInsSearch ,"search" }, - /* ActSeeInsInf */{1153, 1,TabIns,ActSeeInsInf , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Ins_ShowConfiguration ,"info" }, - /* ActSeeCtr */{ 676, 2,TabIns,ActSeeCtr , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Ctr_ShowCtrsOfCurrentIns ,"building" }, - /* ActSeePlc */{ 703, 3,TabIns,ActSeePlc , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Plc_SeePlaces ,"map-marker-alt" }, - /* ActSeeDpt */{ 675, 4,TabIns,ActSeeDpt , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Dpt_SeeDepts ,"users" }, - /* ActSeeCalIns */{1628, 5,TabIns,ActSeeCalIns , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cal_DrawCalendarIns ,"calendar" }, + /* 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" }, // Actions not in menu: - /* ActInsSch */{1182,-1,TabUnk,ActInsReqSch , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Sch_GetParamsSearch ,Sch_InsSearch ,NULL}, - /* ActPrnInsInf */{1154,-1,TabUnk,ActSeeInsInf , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_NEW_TAB,NULL ,Ins_PrintConfiguration ,NULL}, /* ActChgInsCtyCfg */{1590,-1,TabUnk,ActSeeInsInf , 0, 0, 0, 0,0x200, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Ins_ChangeInsCtyInConfig ,Ins_ContEditAfterChgInsInConfig,NULL}, /* ActRenInsShoCfg */{1592,-1,TabUnk,ActSeeInsInf , 0, 0, 0, 0,0x200, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Ins_RenameInsShortInConfig ,Ins_ContEditAfterChgInsInConfig,NULL}, @@ -1839,15 +1806,12 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = // TabCtr ****************************************************************** // Actions in menu: - /* ActCtrReqSch */{1178, 0,TabCtr,ActCtrReqSch , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Sch_ReqCtrSearch ,"search" }, - /* ActSeeCtrInf */{1151, 1,TabCtr,ActSeeCtrInf , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Ctr_ShowConfiguration ,"info" }, - /* ActSeeDeg */{1011, 2,TabCtr,ActSeeDeg , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Deg_ShowDegsOfCurrentCtr ,"graduation-cap" }, - /* ActSeeCla */{1744, 3,TabCtr,ActSeeCla , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cla_SeeClassrooms ,"classroom" }, - /* ActSeeCalCtr */{1631, 4,TabCtr,ActSeeCalCtr , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cal_DrawCalendarCtr ,"calendar" }, + /* 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: - /* ActCtrSch */{1183,-1,TabUnk,ActCtrReqSch , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Sch_GetParamsSearch ,Sch_CtrSearch ,NULL}, - /* ActPrnCtrInf */{1152,-1,TabUnk,ActSeeCtrInf , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_BRW_NEW_TAB,NULL ,Ctr_PrintConfiguration ,NULL}, /* ActChgCtrInsCfg */{1589,-1,TabUnk,ActSeeCtrInf , 0, 0, 0,0x200, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Ctr_ChangeCtrInsInConfig ,Ctr_ContEditAfterChgCtrInConfig,NULL}, /* ActRenCtrShoCfg */{1595,-1,TabUnk,ActSeeCtrInf , 0, 0, 0,0x300, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Ctr_RenameCentreShortInConfig ,Ctr_ContEditAfterChgCtrInConfig,NULL}, @@ -1890,14 +1854,11 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = // TabDeg ****************************************************************** // Actions in menu: - /* ActDegReqSch */{1179, 0,TabDeg,ActDegReqSch , 0, 0,0x3C7, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Sch_ReqDegSearch ,"search" }, - /* ActSeeDegInf */{1149, 1,TabDeg,ActSeeDegInf , 0, 0,0x3C7, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Deg_ShowConfiguration ,"info" }, - /* ActSeeCrs */{1009, 2,TabDeg,ActSeeCrs , 0, 0,0x3C7, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Crs_ShowCrssOfCurrentDeg ,"list-ol" }, - /* ActSeeCalDeg */{1634, 3,TabDeg,ActSeeCalDeg , 0, 0,0x3C7, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cal_DrawCalendarDeg ,"calendar" }, + /* 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: - /* ActDegSch */{1184,-1,TabUnk,ActDegReqSch , 0, 0,0x3C7, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Sch_GetParamsSearch ,Sch_DegSearch ,NULL}, - /* ActPrnDegInf */{1150,-1,TabUnk,ActSeeDegInf , 0, 0,0x3C7, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_NEW_TAB,NULL ,Deg_PrintConfiguration ,NULL}, /* ActChgDegCtrCfg */{1588,-1,TabUnk,ActSeeDegInf , 0, 0,0x300, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Deg_ChangeDegCtrInConfig ,Deg_ContEditAfterChgDegInConfig,NULL}, /* ActRenDegShoCfg */{1598,-1,TabUnk,ActSeeDegInf , 0, 0,0x380, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Deg_RenameDegreeShortInConfig ,Deg_ContEditAfterChgDegInConfig,NULL}, @@ -1922,19 +1883,16 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = // TabCrs ****************************************************************** // Actions in menu: - /* ActCrsReqSch */{1180, 0,TabCrs,ActCrsReqSch ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Sch_ReqCrsSearch ,"search" }, - /* ActSeeCrsInf */{ 847, 1,TabCrs,ActSeeCrsInf ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Crs_ShowIntroduction ,"info" }, - /* ActSeeTchGui */{ 784, 2,TabCrs,ActSeeTchGui ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Inf_ShowInfo ,"book-open" }, - /* ActSeeSyl */{1242, 3,TabCrs,ActSeeSyl ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Inf_ShowInfo ,"list-ol" }, - /* ActSeeBib */{ 32, 4,TabCrs,ActSeeBib ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Inf_ShowInfo ,"book" }, - /* ActSeeFAQ */{ 54, 5,TabCrs,ActSeeFAQ ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Inf_ShowInfo ,"question" }, - /* ActSeeCrsLnk */{ 9, 6,TabCrs,ActSeeCrsLnk ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Inf_ShowInfo ,"link" }, - /* ActSeeCrsTT */{ 25, 7,TabCrs,ActSeeCrsTT ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,TT_ShowClassTimeTable ,"clock" }, - /* ActSeeCalCrs */{ 16, 8,TabCrs,ActSeeCalCrs ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cal_DrawCalendarCrs ,"calendar" }, + /* ActSeeCrsInf */{ 847, 0,TabCrs,ActSeeCrsInf ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Crs_ShowIntroduction ,"info" }, + /* ActSeeTchGui */{ 784, 1,TabCrs,ActSeeTchGui ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Inf_ShowInfo ,"book-open" }, + /* ActSeeSyl */{1242, 2,TabCrs,ActSeeSyl ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Inf_ShowInfo ,"list-ol" }, + /* ActSeeBib */{ 32, 3,TabCrs,ActSeeBib ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Inf_ShowInfo ,"book" }, + /* 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: - /* ActCrsSch */{1185,-1,TabUnk,ActCrsReqSch ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Sch_GetParamsSearch ,Sch_CrsSearch ,NULL}, - /* ActPrnCrsInf */{1028,-1,TabUnk,ActSeeCrsInf ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_NEW_TAB,NULL ,Crs_PrintConfiguration ,NULL}, /* ActChgCrsDegCfg */{1587,-1,TabUnk,ActSeeCrsInf ,0x380,0x380, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Crs_ChangeCrsDegInConfig ,Crs_ContEditAfterChgCrsInConfig,NULL}, /* ActRenCrsShoCfg */{1601,-1,TabUnk,ActSeeCrsInf ,0x3C0,0x3C0, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Crs_RenameCourseShortInConfig ,Crs_ContEditAfterChgCrsInConfig,NULL}, @@ -4399,16 +4357,16 @@ Act_Action_t Act_FromActCodToAction[1 + Act_MAX_ACTION_COD] = // Do not reuse un ActChgMyNet, // #1173 ActSeeRecOneStd, // #1174 ActSeeRecOneTch, // #1175 - ActCtyReqSch, // #1176 - ActInsReqSch, // #1177 - ActCtrReqSch, // #1178 - ActDegReqSch, // #1179 - ActCrsReqSch, // #1180 - ActCtySch, // #1181 - ActInsSch, // #1182 - ActCtrSch, // #1183 - ActDegSch, // #1184 - ActCrsSch, // #1185 + -1, // #1176 (obsolete action) + -1, // #1177 (obsolete action) + -1, // #1178 (obsolete action) + -1, // #1179 (obsolete action) + -1, // #1180 (obsolete action) + -1, // #1181 (obsolete action) + -1, // #1182 (obsolete action) + -1, // #1183 (obsolete action) + -1, // #1184 (obsolete action) + -1, // #1185 (obsolete action) ActLstOth, // #1186 ActSeeRecSevGst, // #1187 ActPrnRecSevGst, // #1188 diff --git a/swad_action.h b/swad_action.h index 5cb5e6b3..672b1478 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 + 52 + 41 + 17 + 47 + 41 + 24 + 115 + 157 + 437 + 165 + 168 + 15 + 72) +#define Act_NUM_ACTIONS (1 + 9 + 52 + 41 + 15 + 45 + 39 + 22 + 113 + 157 + 437 + 165 + 168 + 15 + 72) #define Act_MAX_ACTION_COD 1752 @@ -208,299 +208,289 @@ typedef signed int Act_Action_t; // Must be a signed type, because -1 is used to /******************************** Country tab ********************************/ /*****************************************************************************/ // Actions in menu -#define ActCtyReqSch (ActChgCalSys1stDay + 1) -#define ActSeeCtyInf (ActChgCalSys1stDay + 2) -#define ActSeeIns (ActChgCalSys1stDay + 3) -#define ActSeeCalCty (ActChgCalSys1stDay + 4) +#define ActSeeCtyInf (ActChgCalSys1stDay + 1) +#define ActSeeIns (ActChgCalSys1stDay + 2) +#define ActSeeCalCty (ActChgCalSys1stDay + 3) // Secondary actions -#define ActCtySch (ActChgCalSys1stDay + 5) -#define ActPrnCtyInf (ActChgCalSys1stDay + 6) -#define ActChgCtyMapAtt (ActChgCalSys1stDay + 7) +#define ActPrnCtyInf (ActChgCalSys1stDay + 4) +#define ActChgCtyMapAtt (ActChgCalSys1stDay + 5) -#define ActEdiIns (ActChgCalSys1stDay + 8) -#define ActReqIns (ActChgCalSys1stDay + 9) -#define ActNewIns (ActChgCalSys1stDay + 10) -#define ActRemIns (ActChgCalSys1stDay + 11) -#define ActRenInsSho (ActChgCalSys1stDay + 12) -#define ActRenInsFul (ActChgCalSys1stDay + 13) -#define ActChgInsWWW (ActChgCalSys1stDay + 14) -#define ActChgInsSta (ActChgCalSys1stDay + 15) +#define ActEdiIns (ActChgCalSys1stDay + 6) +#define ActReqIns (ActChgCalSys1stDay + 7) +#define ActNewIns (ActChgCalSys1stDay + 8) +#define ActRemIns (ActChgCalSys1stDay + 9) +#define ActRenInsSho (ActChgCalSys1stDay + 10) +#define ActRenInsFul (ActChgCalSys1stDay + 11) +#define ActChgInsWWW (ActChgCalSys1stDay + 12) +#define ActChgInsSta (ActChgCalSys1stDay + 13) -#define ActPrnCalCty (ActChgCalSys1stDay + 16) -#define ActChgCalCty1stDay (ActChgCalSys1stDay + 17) +#define ActPrnCalCty (ActChgCalSys1stDay + 14) +#define ActChgCalCty1stDay (ActChgCalSys1stDay + 15) /*****************************************************************************/ /****************************** Institution tab ******************************/ /*****************************************************************************/ // Actions in menu -#define ActInsReqSch (ActChgCalCty1stDay + 1) -#define ActSeeInsInf (ActChgCalCty1stDay + 2) -#define ActSeeCtr (ActChgCalCty1stDay + 3) -#define ActSeePlc (ActChgCalCty1stDay + 4) -#define ActSeeDpt (ActChgCalCty1stDay + 5) -#define ActSeeCalIns (ActChgCalCty1stDay + 6) +#define ActSeeInsInf (ActChgCalCty1stDay + 1) +#define ActSeeCtr (ActChgCalCty1stDay + 2) +#define ActSeePlc (ActChgCalCty1stDay + 3) +#define ActSeeDpt (ActChgCalCty1stDay + 4) +#define ActSeeCalIns (ActChgCalCty1stDay + 5) // Secondary actions -#define ActInsSch (ActChgCalCty1stDay + 7) -#define ActPrnInsInf (ActChgCalCty1stDay + 8) -#define ActChgInsCtyCfg (ActChgCalCty1stDay + 9) -#define ActRenInsShoCfg (ActChgCalCty1stDay + 10) -#define ActRenInsFulCfg (ActChgCalCty1stDay + 11) -#define ActChgInsWWWCfg (ActChgCalCty1stDay + 12) -#define ActReqInsLog (ActChgCalCty1stDay + 13) -#define ActRecInsLog (ActChgCalCty1stDay + 14) -#define ActRemInsLog (ActChgCalCty1stDay + 15) +#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 ActEdiCtr (ActChgCalCty1stDay + 16) -#define ActReqCtr (ActChgCalCty1stDay + 17) -#define ActNewCtr (ActChgCalCty1stDay + 18) -#define ActRemCtr (ActChgCalCty1stDay + 19) -#define ActChgCtrPlc (ActChgCalCty1stDay + 20) -#define ActRenCtrSho (ActChgCalCty1stDay + 21) -#define ActRenCtrFul (ActChgCalCty1stDay + 22) -#define ActChgCtrWWW (ActChgCalCty1stDay + 23) -#define ActChgCtrSta (ActChgCalCty1stDay + 24) +#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 ActEdiPlc (ActChgCalCty1stDay + 25) -#define ActNewPlc (ActChgCalCty1stDay + 26) -#define ActRemPlc (ActChgCalCty1stDay + 27) -#define ActRenPlcSho (ActChgCalCty1stDay + 28) -#define ActRenPlcFul (ActChgCalCty1stDay + 29) +#define ActEdiPlc (ActChgCalCty1stDay + 23) +#define ActNewPlc (ActChgCalCty1stDay + 24) +#define ActRemPlc (ActChgCalCty1stDay + 25) +#define ActRenPlcSho (ActChgCalCty1stDay + 26) +#define ActRenPlcFul (ActChgCalCty1stDay + 27) -#define ActEdiDpt (ActChgCalCty1stDay + 30) -#define ActNewDpt (ActChgCalCty1stDay + 31) -#define ActRemDpt (ActChgCalCty1stDay + 32) -#define ActChgDptIns (ActChgCalCty1stDay + 33) -#define ActRenDptSho (ActChgCalCty1stDay + 34) -#define ActRenDptFul (ActChgCalCty1stDay + 35) -#define ActChgDptWWW (ActChgCalCty1stDay + 36) +#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 ActSeeHld (ActChgCalCty1stDay + 37) -#define ActEdiHld (ActChgCalCty1stDay + 38) -#define ActNewHld (ActChgCalCty1stDay + 39) -#define ActRemHld (ActChgCalCty1stDay + 40) -#define ActChgHldPlc (ActChgCalCty1stDay + 41) -#define ActChgHldTyp (ActChgCalCty1stDay + 42) -#define ActChgHldStrDat (ActChgCalCty1stDay + 43) -#define ActChgHldEndDat (ActChgCalCty1stDay + 44) -#define ActRenHld (ActChgCalCty1stDay + 45) +#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 + 46) -#define ActChgCalIns1stDay (ActChgCalCty1stDay + 47) +#define ActPrnCalIns (ActChgCalCty1stDay + 44) +#define ActChgCalIns1stDay (ActChgCalCty1stDay + 45) /*****************************************************************************/ /********************************* Centre tab ********************************/ /*****************************************************************************/ // Actions in menu -#define ActCtrReqSch (ActChgCalIns1stDay + 1) -#define ActSeeCtrInf (ActChgCalIns1stDay + 2) -#define ActSeeDeg (ActChgCalIns1stDay + 3) -#define ActSeeCla (ActChgCalIns1stDay + 4) -#define ActSeeCalCtr (ActChgCalIns1stDay + 5) +#define ActSeeCtrInf (ActChgCalIns1stDay + 1) +#define ActSeeDeg (ActChgCalIns1stDay + 2) +#define ActSeeCla (ActChgCalIns1stDay + 3) +#define ActSeeCalCtr (ActChgCalIns1stDay + 4) // Secondary actions -#define ActCtrSch (ActChgCalIns1stDay + 6) -#define ActPrnCtrInf (ActChgCalIns1stDay + 7) -#define ActChgCtrInsCfg (ActChgCalIns1stDay + 8) -#define ActRenCtrShoCfg (ActChgCalIns1stDay + 9) -#define ActRenCtrFulCfg (ActChgCalIns1stDay + 10) -#define ActChgCtrPlcCfg (ActChgCalIns1stDay + 11) -#define ActChgCtrWWWCfg (ActChgCalIns1stDay + 12) -#define ActReqCtrLog (ActChgCalIns1stDay + 13) -#define ActRecCtrLog (ActChgCalIns1stDay + 14) -#define ActRemCtrLog (ActChgCalIns1stDay + 15) -#define ActReqCtrPho (ActChgCalIns1stDay + 16) -#define ActRecCtrPho (ActChgCalIns1stDay + 17) -#define ActChgCtrPhoAtt (ActChgCalIns1stDay + 18) +#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 ActSeeDegTyp (ActChgCalIns1stDay + 19) -#define ActEdiDegTyp (ActChgCalIns1stDay + 20) -#define ActNewDegTyp (ActChgCalIns1stDay + 21) -#define ActRemDegTyp (ActChgCalIns1stDay + 22) -#define ActRenDegTyp (ActChgCalIns1stDay + 23) +#define ActSeeDegTyp (ActChgCalIns1stDay + 17) +#define ActEdiDegTyp (ActChgCalIns1stDay + 18) +#define ActNewDegTyp (ActChgCalIns1stDay + 19) +#define ActRemDegTyp (ActChgCalIns1stDay + 20) +#define ActRenDegTyp (ActChgCalIns1stDay + 21) -#define ActEdiDeg (ActChgCalIns1stDay + 24) -#define ActReqDeg (ActChgCalIns1stDay + 25) -#define ActNewDeg (ActChgCalIns1stDay + 26) -#define ActRemDeg (ActChgCalIns1stDay + 27) -#define ActRenDegSho (ActChgCalIns1stDay + 28) -#define ActRenDegFul (ActChgCalIns1stDay + 29) -#define ActChgDegTyp (ActChgCalIns1stDay + 30) -#define ActChgDegWWW (ActChgCalIns1stDay + 31) -#define ActChgDegSta (ActChgCalIns1stDay + 32) +#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 ActEdiCla (ActChgCalIns1stDay + 33) -#define ActNewCla (ActChgCalIns1stDay + 34) -#define ActRemCla (ActChgCalIns1stDay + 35) -#define ActRenClaSho (ActChgCalIns1stDay + 36) -#define ActRenClaFul (ActChgCalIns1stDay + 37) -#define ActChgClaMaxStd (ActChgCalIns1stDay + 38) -#define ActRenClaLoc (ActChgCalIns1stDay + 39) +#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 + 40) -#define ActChgCalCtr1stDay (ActChgCalIns1stDay + 41) +#define ActPrnCalCtr (ActChgCalIns1stDay + 38) +#define ActChgCalCtr1stDay (ActChgCalIns1stDay + 39) /*****************************************************************************/ /********************************* Degree tab ********************************/ /*****************************************************************************/ // Actions in menu -#define ActDegReqSch (ActChgCalCtr1stDay + 1) -#define ActSeeDegInf (ActChgCalCtr1stDay + 2) -#define ActSeeCrs (ActChgCalCtr1stDay + 3) -#define ActSeeCalDeg (ActChgCalCtr1stDay + 4) +#define ActSeeDegInf (ActChgCalCtr1stDay + 1) +#define ActSeeCrs (ActChgCalCtr1stDay + 2) +#define ActSeeCalDeg (ActChgCalCtr1stDay + 3) // Secondary actions -#define ActDegSch (ActChgCalCtr1stDay + 5) -#define ActPrnDegInf (ActChgCalCtr1stDay + 6) -#define ActChgDegCtrCfg (ActChgCalCtr1stDay + 7) -#define ActRenDegShoCfg (ActChgCalCtr1stDay + 8) -#define ActRenDegFulCfg (ActChgCalCtr1stDay + 9) -#define ActChgDegWWWCfg (ActChgCalCtr1stDay + 10) -#define ActReqDegLog (ActChgCalCtr1stDay + 11) -#define ActRecDegLog (ActChgCalCtr1stDay + 12) -#define ActRemDegLog (ActChgCalCtr1stDay + 13) +#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 ActEdiCrs (ActChgCalCtr1stDay + 14) -#define ActReqCrs (ActChgCalCtr1stDay + 15) -#define ActNewCrs (ActChgCalCtr1stDay + 16) -#define ActRemCrs (ActChgCalCtr1stDay + 17) -#define ActChgInsCrsCod (ActChgCalCtr1stDay + 18) -#define ActChgCrsYea (ActChgCalCtr1stDay + 19) -#define ActRenCrsSho (ActChgCalCtr1stDay + 20) -#define ActRenCrsFul (ActChgCalCtr1stDay + 21) -#define ActChgCrsSta (ActChgCalCtr1stDay + 22) +#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 + 23) -#define ActChgCalDeg1stDay (ActChgCalCtr1stDay + 24) +#define ActPrnCalDeg (ActChgCalCtr1stDay + 21) +#define ActChgCalDeg1stDay (ActChgCalCtr1stDay + 22) /*****************************************************************************/ /******************************** Course tab *********************************/ /*****************************************************************************/ // Actions in menu -#define ActCrsReqSch (ActChgCalDeg1stDay + 1) -#define ActSeeCrsInf (ActChgCalDeg1stDay + 2) -#define ActSeeTchGui (ActChgCalDeg1stDay + 3) -#define ActSeeSyl (ActChgCalDeg1stDay + 4) -#define ActSeeBib (ActChgCalDeg1stDay + 5) -#define ActSeeFAQ (ActChgCalDeg1stDay + 6) -#define ActSeeCrsLnk (ActChgCalDeg1stDay + 7) -#define ActSeeCrsTT (ActChgCalDeg1stDay + 8) -#define ActSeeCalCrs (ActChgCalDeg1stDay + 9) +#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) // Secondary actions -#define ActCrsSch (ActChgCalDeg1stDay + 10) -#define ActPrnCrsInf (ActChgCalDeg1stDay + 11) -#define ActChgCrsDegCfg (ActChgCalDeg1stDay + 12) -#define ActRenCrsShoCfg (ActChgCalDeg1stDay + 13) -#define ActRenCrsFulCfg (ActChgCalDeg1stDay + 14) -#define ActChgInsCrsCodCfg (ActChgCalDeg1stDay + 15) -#define ActChgCrsYeaCfg (ActChgCalDeg1stDay + 16) -#define ActEdiCrsInf (ActChgCalDeg1stDay + 17) -#define ActEdiTchGui (ActChgCalDeg1stDay + 18) -#define ActSeeSylLec (ActChgCalDeg1stDay + 19) -#define ActSeeSylPra (ActChgCalDeg1stDay + 20) -#define ActEdiSylLec (ActChgCalDeg1stDay + 21) -#define ActEdiSylPra (ActChgCalDeg1stDay + 22) -#define ActDelItmSylLec (ActChgCalDeg1stDay + 23) -#define ActDelItmSylPra (ActChgCalDeg1stDay + 24) -#define ActUp_IteSylLec (ActChgCalDeg1stDay + 25) -#define ActUp_IteSylPra (ActChgCalDeg1stDay + 26) -#define ActDwnIteSylLec (ActChgCalDeg1stDay + 27) -#define ActDwnIteSylPra (ActChgCalDeg1stDay + 28) -#define ActRgtIteSylLec (ActChgCalDeg1stDay + 29) -#define ActRgtIteSylPra (ActChgCalDeg1stDay + 30) -#define ActLftIteSylLec (ActChgCalDeg1stDay + 31) -#define ActLftIteSylPra (ActChgCalDeg1stDay + 32) -#define ActInsIteSylLec (ActChgCalDeg1stDay + 33) -#define ActInsIteSylPra (ActChgCalDeg1stDay + 34) -#define ActModIteSylLec (ActChgCalDeg1stDay + 35) -#define ActModIteSylPra (ActChgCalDeg1stDay + 36) +#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 ActEdiBib (ActChgCalDeg1stDay + 37) -#define ActEdiFAQ (ActChgCalDeg1stDay + 38) -#define ActEdiCrsLnk (ActChgCalDeg1stDay + 39) +#define ActEdiBib (ActChgCalDeg1stDay + 35) +#define ActEdiFAQ (ActChgCalDeg1stDay + 36) +#define ActEdiCrsLnk (ActChgCalDeg1stDay + 37) -#define ActChgFrcReaCrsInf (ActChgCalDeg1stDay + 40) -#define ActChgFrcReaTchGui (ActChgCalDeg1stDay + 41) -#define ActChgFrcReaSylLec (ActChgCalDeg1stDay + 42) -#define ActChgFrcReaSylPra (ActChgCalDeg1stDay + 43) -#define ActChgFrcReaBib (ActChgCalDeg1stDay + 44) -#define ActChgFrcReaFAQ (ActChgCalDeg1stDay + 45) -#define ActChgFrcReaCrsLnk (ActChgCalDeg1stDay + 46) +#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 ActChgHavReaCrsInf (ActChgCalDeg1stDay + 47) -#define ActChgHavReaTchGui (ActChgCalDeg1stDay + 48) -#define ActChgHavReaSylLec (ActChgCalDeg1stDay + 49) -#define ActChgHavReaSylPra (ActChgCalDeg1stDay + 50) -#define ActChgHavReaBib (ActChgCalDeg1stDay + 51) -#define ActChgHavReaFAQ (ActChgCalDeg1stDay + 52) -#define ActChgHavReaCrsLnk (ActChgCalDeg1stDay + 53) +#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 ActSelInfSrcCrsInf (ActChgCalDeg1stDay + 54) -#define ActSelInfSrcTchGui (ActChgCalDeg1stDay + 55) -#define ActSelInfSrcSylLec (ActChgCalDeg1stDay + 56) -#define ActSelInfSrcSylPra (ActChgCalDeg1stDay + 57) -#define ActSelInfSrcBib (ActChgCalDeg1stDay + 58) -#define ActSelInfSrcFAQ (ActChgCalDeg1stDay + 59) -#define ActSelInfSrcCrsLnk (ActChgCalDeg1stDay + 60) -#define ActRcvURLCrsInf (ActChgCalDeg1stDay + 61) -#define ActRcvURLTchGui (ActChgCalDeg1stDay + 62) -#define ActRcvURLSylLec (ActChgCalDeg1stDay + 63) -#define ActRcvURLSylPra (ActChgCalDeg1stDay + 64) -#define ActRcvURLBib (ActChgCalDeg1stDay + 65) -#define ActRcvURLFAQ (ActChgCalDeg1stDay + 66) -#define ActRcvURLCrsLnk (ActChgCalDeg1stDay + 67) -#define ActRcvPagCrsInf (ActChgCalDeg1stDay + 68) -#define ActRcvPagTchGui (ActChgCalDeg1stDay + 69) -#define ActRcvPagSylLec (ActChgCalDeg1stDay + 70) -#define ActRcvPagSylPra (ActChgCalDeg1stDay + 71) -#define ActRcvPagBib (ActChgCalDeg1stDay + 72) -#define ActRcvPagFAQ (ActChgCalDeg1stDay + 73) -#define ActRcvPagCrsLnk (ActChgCalDeg1stDay + 74) -#define ActEditorCrsInf (ActChgCalDeg1stDay + 75) -#define ActEditorTchGui (ActChgCalDeg1stDay + 76) -#define ActEditorSylLec (ActChgCalDeg1stDay + 77) -#define ActEditorSylPra (ActChgCalDeg1stDay + 78) -#define ActEditorBib (ActChgCalDeg1stDay + 79) -#define ActEditorFAQ (ActChgCalDeg1stDay + 80) -#define ActEditorCrsLnk (ActChgCalDeg1stDay + 81) -#define ActPlaTxtEdiCrsInf (ActChgCalDeg1stDay + 82) -#define ActPlaTxtEdiTchGui (ActChgCalDeg1stDay + 83) -#define ActPlaTxtEdiSylLec (ActChgCalDeg1stDay + 84) -#define ActPlaTxtEdiSylPra (ActChgCalDeg1stDay + 85) -#define ActPlaTxtEdiBib (ActChgCalDeg1stDay + 86) -#define ActPlaTxtEdiFAQ (ActChgCalDeg1stDay + 87) -#define ActPlaTxtEdiCrsLnk (ActChgCalDeg1stDay + 88) -#define ActRchTxtEdiCrsInf (ActChgCalDeg1stDay + 89) -#define ActRchTxtEdiTchGui (ActChgCalDeg1stDay + 90) -#define ActRchTxtEdiSylLec (ActChgCalDeg1stDay + 91) -#define ActRchTxtEdiSylPra (ActChgCalDeg1stDay + 92) -#define ActRchTxtEdiBib (ActChgCalDeg1stDay + 93) -#define ActRchTxtEdiFAQ (ActChgCalDeg1stDay + 94) -#define ActRchTxtEdiCrsLnk (ActChgCalDeg1stDay + 95) -#define ActRcvPlaTxtCrsInf (ActChgCalDeg1stDay + 96) -#define ActRcvPlaTxtTchGui (ActChgCalDeg1stDay + 97) -#define ActRcvPlaTxtSylLec (ActChgCalDeg1stDay + 98) -#define ActRcvPlaTxtSylPra (ActChgCalDeg1stDay + 99) -#define ActRcvPlaTxtBib (ActChgCalDeg1stDay + 100) -#define ActRcvPlaTxtFAQ (ActChgCalDeg1stDay + 101) -#define ActRcvPlaTxtCrsLnk (ActChgCalDeg1stDay + 102) -#define ActRcvRchTxtCrsInf (ActChgCalDeg1stDay + 103) -#define ActRcvRchTxtTchGui (ActChgCalDeg1stDay + 104) -#define ActRcvRchTxtSylLec (ActChgCalDeg1stDay + 105) -#define ActRcvRchTxtSylPra (ActChgCalDeg1stDay + 106) -#define ActRcvRchTxtBib (ActChgCalDeg1stDay + 107) -#define ActRcvRchTxtFAQ (ActChgCalDeg1stDay + 108) -#define ActRcvRchTxtCrsLnk (ActChgCalDeg1stDay + 109) +#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 ActPrnCrsTT (ActChgCalDeg1stDay + 110) -#define ActEdiCrsTT (ActChgCalDeg1stDay + 111) -#define ActChgCrsTT (ActChgCalDeg1stDay + 112) -#define ActChgCrsTT1stDay (ActChgCalDeg1stDay + 113) +#define ActPrnCrsTT (ActChgCalDeg1stDay + 108) +#define ActEdiCrsTT (ActChgCalDeg1stDay + 109) +#define ActChgCrsTT (ActChgCalDeg1stDay + 110) +#define ActChgCrsTT1stDay (ActChgCalDeg1stDay + 111) -#define ActPrnCalCrs (ActChgCalDeg1stDay + 114) -#define ActChgCalCrs1stDay (ActChgCalDeg1stDay + 115) +#define ActPrnCalCrs (ActChgCalDeg1stDay + 112) +#define ActChgCalCrs1stDay (ActChgCalDeg1stDay + 113) /*****************************************************************************/ /***************************** Assessment tab ********************************/ diff --git a/swad_changelog.h b/swad_changelog.h index 641610c3..758476d6 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -386,11 +386,24 @@ En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 18.43.7 (2019-02-14)" +#define Log_PLATFORM_VERSION "SWAD 18.44 (2019-02-15)" #define CSS_FILE "swad18.41.1.css" #define JS_FILE "swad18.32.1.js" /* - Version 18.43.7: Feb 14, 2019 Option system search is moved to start tab. (239027 lines) + Version 18.44: Feb 15, 2019 Removed options to search from country, institution, centre, degree and course. (238652 lines) + 10 changes necessary in database: +UPDATE actions SET Obsolete='Y' WHERE ActCod='1176'; +UPDATE actions SET Obsolete='Y' WHERE ActCod='1177'; +UPDATE actions SET Obsolete='Y' WHERE ActCod='1178'; +UPDATE actions SET Obsolete='Y' WHERE ActCod='1179'; +UPDATE actions SET Obsolete='Y' WHERE ActCod='1180'; +UPDATE actions SET Obsolete='Y' WHERE ActCod='1181'; +UPDATE actions SET Obsolete='Y' WHERE ActCod='1182'; +UPDATE actions SET Obsolete='Y' WHERE ActCod='1183'; +UPDATE actions SET Obsolete='Y' WHERE ActCod='1184'; +UPDATE actions SET Obsolete='Y' WHERE ActCod='1185'; + + Version 18.43.7: Feb 15, 2019 Option system search is moved to start tab. (239027 lines) 2 changes necessary in database: UPDATE actions SET Txt='Solicitar búsqueda' WHERE ActCod='627' AND Language='es'; UPDATE actions SET Txt='Buscar' WHERE ActCod='628' AND Language='es'; diff --git a/swad_course.c b/swad_course.c index d8606702..0c4dfa24 100644 --- a/swad_course.c +++ b/swad_course.c @@ -2961,12 +2961,7 @@ static void Crs_PutIconToSearchCourses (void) extern const char *Txt_Search_courses; /***** Put form to search / select courses *****/ - Lay_PutContextualLinkOnlyIcon ( Gbl.CurrentCrs.Crs.CrsCod > 0 ? ActCrsReqSch : - (Gbl.CurrentDeg.Deg.DegCod > 0 ? ActDegReqSch : - (Gbl.CurrentCtr.Ctr.CtrCod > 0 ? ActCtrReqSch : - (Gbl.CurrentIns.Ins.InsCod > 0 ? ActInsReqSch : - (Gbl.CurrentCty.Cty.CtyCod > 0 ? ActCtyReqSch : - ActSysReqSch)))), + Lay_PutContextualLinkOnlyIcon (ActSysReqSch, NULL,Sch_PutLinkToSearchCoursesParams, "search.svg", Txt_Search_courses); diff --git a/swad_menu.c b/swad_menu.c index 97534095..84242bf6 100644 --- a/swad_menu.c +++ b/swad_menu.c @@ -121,10 +121,10 @@ const Act_Action_t Mnu_MenuActions[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB }, // TabCty ******************* { - ActCtyReqSch, // 0 - ActSeeCtyInf, // 1 - ActSeeIns, // 2 - ActSeeCalCty, // 3 + ActSeeCtyInf, // 0 + ActSeeIns, // 1 + ActSeeCalCty, // 2 + 0, // 3 0, // 4 0, // 5 0, // 6 @@ -137,12 +137,12 @@ const Act_Action_t Mnu_MenuActions[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB }, // TabIns ******************* { - ActInsReqSch, // 0 - ActSeeInsInf, // 1 - ActSeeCtr, // 2 - ActSeePlc, // 3 - ActSeeDpt, // 4 - ActSeeCalIns, // 5 + ActSeeInsInf, // 0 + ActSeeCtr, // 1 + ActSeePlc, // 2 + ActSeeDpt, // 3 + ActSeeCalIns, // 4 + 0, // 5 0, // 6 0, // 7 0, // 8 @@ -153,11 +153,11 @@ const Act_Action_t Mnu_MenuActions[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB }, // TabCtr ******************* { - ActCtrReqSch, // 0 - ActSeeCtrInf, // 1 - ActSeeDeg, // 2 - ActSeeCla, // 3 - ActSeeCalCtr, // 4 + ActSeeCtrInf, // 0 + ActSeeDeg, // 1 + ActSeeCla, // 2 + ActSeeCalCtr, // 3 + 0, // 4 0, // 5 0, // 6 0, // 7 @@ -169,10 +169,10 @@ const Act_Action_t Mnu_MenuActions[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB }, // TabDeg ******************* { - ActDegReqSch, // 0 - ActSeeDegInf, // 1 - ActSeeCrs, // 2 - ActSeeCalDeg, // 3 + ActSeeDegInf, // 0 + ActSeeCrs, // 1 + ActSeeCalDeg, // 2 + 0, // 3 0, // 4 0, // 5 0, // 6 @@ -185,15 +185,15 @@ const Act_Action_t Mnu_MenuActions[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB }, // TabCrs ******************* { - ActCrsReqSch, // 0 - ActSeeCrsInf, // 1 - ActSeeTchGui, // 2 - ActSeeSyl, // 3 - ActSeeBib, // 4 - ActSeeFAQ, // 5 - ActSeeCrsLnk, // 6 - ActSeeCrsTT, // 7 - ActSeeCalCrs, // 8 + ActSeeCrsInf, // 0 + ActSeeTchGui, // 1 + ActSeeSyl, // 2 + ActSeeBib, // 3 + ActSeeFAQ, // 4 + ActSeeCrsLnk, // 5 + ActSeeCrsTT, // 6 + ActSeeCalCrs, // 7 + 0, // 8 0, // 9 0, // 10 0, // 11 diff --git a/swad_search.c b/swad_search.c index cb10e373..963adf2d 100644 --- a/swad_search.c +++ b/swad_search.c @@ -92,61 +92,6 @@ void Sch_ReqSysSearch (void) Sch_PutFormToSearchWithWhatToSearchAndScope (ActSysSch,Sco_SCOPE_SYS); } -/*****************************************************************************/ -/********************** Request search in country tab ************************/ -/*****************************************************************************/ - -void Sch_ReqCtySearch (void) - { - /***** Search courses, teachers, documents... *****/ - Sch_GetParamWhatToSearch (); - Sch_PutFormToSearchWithWhatToSearchAndScope (ActCtySch,Sco_SCOPE_CTY); - } - -/*****************************************************************************/ -/******************** Request search in institution tab **********************/ -/*****************************************************************************/ - -void Sch_ReqInsSearch (void) - { - /***** Search courses, teachers, documents... *****/ - Sch_GetParamWhatToSearch (); - Sch_PutFormToSearchWithWhatToSearchAndScope (ActInsSch,Sco_SCOPE_INS); - } - -/*****************************************************************************/ -/*********************** Request search in centre tab ************************/ -/*****************************************************************************/ - -void Sch_ReqCtrSearch (void) - { - /***** Search courses, teachers, documents... *****/ - Sch_GetParamWhatToSearch (); - Sch_PutFormToSearchWithWhatToSearchAndScope (ActCtrSch,Sco_SCOPE_CTR); - } - -/*****************************************************************************/ -/*********************** Request search in degree tab ************************/ -/*****************************************************************************/ - -void Sch_ReqDegSearch (void) - { - /***** Search courses, teachers, documents... *****/ - Sch_GetParamWhatToSearch (); - Sch_PutFormToSearchWithWhatToSearchAndScope (ActDegSch,Sco_SCOPE_DEG); - } - -/*****************************************************************************/ -/*********************** Request search in course tab ************************/ -/*****************************************************************************/ - -void Sch_ReqCrsSearch (void) - { - /***** Search courses, teachers, documents... *****/ - Sch_GetParamWhatToSearch (); - Sch_PutFormToSearchWithWhatToSearchAndScope (ActCrsSch,Sco_SCOPE_CRS); - } - /*****************************************************************************/ /****************** Put a form to search, including scope ********************/ /*****************************************************************************/ @@ -283,17 +228,9 @@ static bool Sch_CheckIfIHavePermissionToSearch (Sch_WhatToSearch_t WhatToSearch) void Sch_PutFormToSearchInPageTopHeading (void) { - Act_Action_t ActionSearch = - (Gbl.CurrentCrs.Crs.CrsCod > 0 ? ActCrsSch : - (Gbl.CurrentDeg.Deg.DegCod > 0 ? ActDegSch : - (Gbl.CurrentCtr.Ctr.CtrCod > 0 ? ActCtrSch : - (Gbl.CurrentIns.Ins.InsCod > 0 ? ActInsSch : - (Gbl.CurrentCty.Cty.CtyCod > 0 ? ActCtySch : - ActSysSch))))); - /***** Put form *****/ fprintf (Gbl.F.Out,"
"); - Frm_StartForm (ActionSearch); + Frm_StartForm (ActSysSch); Sco_PutParamScope ("ScopeSch",Sco_SCOPE_SYS); Sch_PutInputStringToSearch ("head_search_text"); Sch_PutMagnifyingGlassButton ("search-white.svg"); @@ -402,102 +339,6 @@ void Sch_SysSearch (void) Sch_ReqSysSearch (); } -/*****************************************************************************/ -/****************** Search courses, teachers, documents... *******************/ -/*****************************************************************************/ - -void Sch_CtySearch (void) - { - if (Gbl.Search.Str[0]) - { - /***** Show search form again *****/ - Sch_PutFormToSearchWithWhatToSearchAndScope (ActCtySch,Sco_SCOPE_CTY); - - /***** Show results of search *****/ - Sch_SearchInDB (); - } - else - /***** Show search form and selectors *****/ - Sch_ReqCtySearch (); - } - -/*****************************************************************************/ -/****************** Search courses, teachers, documents... *******************/ -/*****************************************************************************/ - -void Sch_InsSearch (void) - { - if (Gbl.Search.Str[0]) - { - /***** Show search form again *****/ - Sch_PutFormToSearchWithWhatToSearchAndScope (ActInsSch,Sco_SCOPE_INS); - - /***** Show results of search *****/ - Sch_SearchInDB (); - } - else - /***** Show search form and selectors *****/ - Sch_ReqInsSearch (); - } - -/*****************************************************************************/ -/****************** Search courses, teachers, documents... *******************/ -/*****************************************************************************/ - -void Sch_CtrSearch (void) - { - if (Gbl.Search.Str[0]) - { - /***** Show search form again *****/ - Sch_PutFormToSearchWithWhatToSearchAndScope (ActCtrSch,Sco_SCOPE_CTR); - - /***** Show results of search *****/ - Sch_SearchInDB (); - } - else - /***** Show search form and selectors *****/ - Sch_ReqCtrSearch (); - } - - -/*****************************************************************************/ -/****************** Search courses, teachers, documents... *******************/ -/*****************************************************************************/ - -void Sch_DegSearch (void) - { - if (Gbl.Search.Str[0]) - { - /***** Show search form again *****/ - Sch_PutFormToSearchWithWhatToSearchAndScope (ActDegSch,Sco_SCOPE_DEG); - - /***** Show results of search *****/ - Sch_SearchInDB (); - } - else - /***** Show search form and selectors *****/ - Sch_ReqDegSearch (); - } - -/*****************************************************************************/ -/****************** Search courses, teachers, documents... *******************/ -/*****************************************************************************/ - -void Sch_CrsSearch (void) - { - if (Gbl.Search.Str[0]) - { - /***** Show search form again *****/ - Sch_PutFormToSearchWithWhatToSearchAndScope (ActCrsSch,Sco_SCOPE_CRS); - - /***** Show results of search *****/ - Sch_SearchInDB (); - } - else - /***** Show search form and selectors *****/ - Sch_ReqCrsSearch (); - } - /*****************************************************************************/ /**** Search institutions, centres, degrees, courses, teachers, documents ****/ /*****************************************************************************/ diff --git a/swad_search.h b/swad_search.h index 3fd33ea3..0a871f77 100644 --- a/swad_search.h +++ b/swad_search.h @@ -70,11 +70,6 @@ typedef enum /*****************************************************************************/ void Sch_ReqSysSearch (void); -void Sch_ReqCtySearch (void); -void Sch_ReqInsSearch (void); -void Sch_ReqCtrSearch (void); -void Sch_ReqDegSearch (void); -void Sch_ReqCrsSearch (void); void Sch_PutFormToSearchInPageTopHeading (void); @@ -83,11 +78,6 @@ void Sch_PutMagnifyingGlassButton (const char *Icon); void Sch_GetParamWhatToSearch (void); void Sch_GetParamsSearch (void); void Sch_SysSearch (void); -void Sch_CtySearch (void); -void Sch_InsSearch (void); -void Sch_CtrSearch (void); -void Sch_DegSearch (void); -void Sch_CrsSearch (void); bool Sch_BuildSearchQuery (char SearchQuery[Sch_MAX_BYTES_SEARCH_QUERY + 1], const char *FieldName, diff --git a/swad_text.c b/swad_text.c index 73248643..66ebfe71 100644 --- a/swad_text.c +++ b/swad_text.c @@ -17932,28 +17932,7 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = }, { // TabCty ***************************************************** - // 0: ActCtyReqSch -#if L==1 // ca - "Cercar" -#elif L==2 // de - "Suchen" -#elif L==3 // en - "Search" -#elif L==4 // es - "Buscar" -#elif L==5 // fr - "Chercher" -#elif L==6 // gn - "Heka" -#elif L==7 // it - "Cercare" -#elif L==8 // pl - "Szukaj" -#elif L==9 // pt - "Procurar" -#endif - , - // 1: ActSeeCtyInf + // 0: ActSeeCtyInf #if L==1 // ca "Informació" #elif L==2 // de @@ -17974,7 +17953,7 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Informação" #endif , - // 2: ActSeeIns + // 1: ActSeeIns #if L==1 // ca "Institucions" #elif L==2 // de @@ -17995,7 +17974,7 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Instituções" #endif , - // 3: ActSeeCalCty + // 2: ActSeeCalCty #if L==1 // ca "Calendari" #elif L==2 // de @@ -18016,6 +17995,7 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Calendário" #endif , + NULL, // 3 NULL, // 4 NULL, // 5 NULL, // 6 @@ -18028,28 +18008,7 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = }, { // TabIns ***************************************************** - // 0: ActInsReqSch -#if L==1 // ca - "Cercar" -#elif L==2 // de - "Suchen" -#elif L==3 // en - "Search" -#elif L==4 // es - "Buscar" -#elif L==5 // fr - "Chercher" -#elif L==6 // gn - "Heka" -#elif L==7 // it - "Cercare" -#elif L==8 // pl - "Szukaj" -#elif L==9 // pt - "Procurar" -#endif - , - // 1: ActSeeInsInf + // 0: ActSeeInsInf #if L==1 // ca "Informació" #elif L==2 // de @@ -18070,7 +18029,7 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Informação" #endif , - // 2: ActSeeCtr + // 1: ActSeeCtr #if L==1 // ca "Centres" #elif L==2 // de @@ -18091,7 +18050,7 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Centros" #endif , - // 3: ActSeePlc + // 2: ActSeePlc #if L==1 // ca "Llocs" #elif L==2 // de @@ -18112,7 +18071,7 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Localizaçoes" #endif , - // 4: ActSeeDpt + // 3: ActSeeDpt #if L==1 // ca "Departaments" #elif L==2 // de @@ -18133,122 +18092,7 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Departamentos" #endif , - // 5: ActSeeCalIns -#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, // 6 - NULL, // 7 - NULL, // 8 - NULL, // 9 - NULL, // 10 - NULL, // 11 - NULL, // 12 - }, - { - // TabCtr ***************************************************** - // 0: ActCtrReqSch -#if L==1 // ca - "Cercar" -#elif L==2 // de - "Suchen" -#elif L==3 // en - "Search" -#elif L==4 // es - "Buscar" -#elif L==5 // fr - "Chercher" -#elif L==6 // gn - "Heka" -#elif L==7 // it - "Cercare" -#elif L==8 // pl - "Szukaj" -#elif L==9 // pt - "Procurar" -#endif - , - // 1: ActSeeCtrInf -#if L==1 // ca - "Informació" -#elif L==2 // de - "Information" -#elif L==3 // en - "Information" -#elif L==4 // es - "Información" -#elif L==5 // fr - "Information" -#elif L==6 // gn - "Información" // Okoteve traducción -#elif L==7 // it - "Informazione" -#elif L==8 // pl - "Informacja" -#elif L==9 // pt - "Informação" -#endif - , - // 2: ActSeeDeg -#if L==1 // ca - "Titulacions" -#elif L==2 // de - "Studiengang" -#elif L==3 // en - "Degrees" -#elif L==4 // es - "Titulaciones" -#elif L==5 // fr - "Études" -#elif L==6 // gn - "Arandurã" -#elif L==7 // it - "Lauree" -#elif L==8 // pl - "Stopnie" -#elif L==9 // pt - "Graus" -#endif - , - // 3: ActSeeCla -#if L==1 // ca - "Aules" -#elif L==2 // de - "Klassenzimmer" -#elif L==3 // en - "Classrooms" -#elif L==4 // es - "Aulas" -#elif L==5 // fr - "Salles" -#elif L==6 // gn - "Mbo'ehakoty" -#elif L==7 // it - "Aule" -#elif L==8 // pl - "Sale" -#elif L==9 // pt - "Salas" -#endif - , - // 4: ActSeeCalCtr + // 4: ActSeeCalIns #if L==1 // ca "Calendari" #elif L==2 // de @@ -18279,29 +18123,8 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = NULL, // 12 }, { - // TabDeg ***************************************************** - // 0: ActDegReqSch -#if L==1 // ca - "Cercar" -#elif L==2 // de - "Suchen" -#elif L==3 // en - "Search" -#elif L==4 // es - "Buscar" -#elif L==5 // fr - "Chercher" -#elif L==6 // gn - "Heka" -#elif L==7 // it - "Cercare" -#elif L==8 // pl - "Szukaj" -#elif L==9 // pt - "Procurar" -#endif - , - // 1: ActSeeDegInf + // TabCtr ***************************************************** + // 0: ActSeeCtrInf #if L==1 // ca "Informació" #elif L==2 // de @@ -18322,28 +18145,49 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Informação" #endif , - // 2: ActSeeCrs + // 1: ActSeeDeg #if L==1 // ca - "Assignatures" + "Titulacions" #elif L==2 // de - "Kursen" + "Studiengang" #elif L==3 // en - "Courses" + "Degrees" #elif L==4 // es - "Asignaturas" + "Titulaciones" #elif L==5 // fr - "Matières" + "Études" #elif L==6 // gn - "Mbo'esyry" + "Arandurã" #elif L==7 // it - "Corsi" + "Lauree" #elif L==8 // pl - "Kursów" + "Stopnie" #elif L==9 // pt - "Disciplinas" + "Graus" #endif , - // 3: ActSeeCalDeg + // 2: ActSeeCla +#if L==1 // ca + "Aules" +#elif L==2 // de + "Klassenzimmer" +#elif L==3 // en + "Classrooms" +#elif L==4 // es + "Aulas" +#elif L==5 // fr + "Salles" +#elif L==6 // gn + "Mbo'ehakoty" +#elif L==7 // it + "Aule" +#elif L==8 // pl + "Sale" +#elif L==9 // pt + "Salas" +#endif + , + // 3: ActSeeCalCtr #if L==1 // ca "Calendari" #elif L==2 // de @@ -18375,29 +18219,8 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = NULL, // 12 }, { - // TabCrs ***************************************************** - // 0: ActCtrReqSch -#if L==1 // ca - "Cercar" -#elif L==2 // de - "Suchen" -#elif L==3 // en - "Search" -#elif L==4 // es - "Buscar" -#elif L==5 // fr - "Chercher" -#elif L==6 // gn - "Heka" -#elif L==7 // it - "Cercare" -#elif L==8 // pl - "Szukaj" -#elif L==9 // pt - "Procurar" -#endif - , - // 1: ActSeeCrsInf + // TabDeg ***************************************************** + // 0: ActSeeDegInf #if L==1 // ca "Informació" #elif L==2 // de @@ -18418,133 +18241,28 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Informação" #endif , - // 2: ActSeeTchGui + // 1: ActSeeCrs #if L==1 // ca - "Guia" + "Assignatures" #elif L==2 // de - "Hinweise" + "Kursen" #elif L==3 // en - "Guide" + "Courses" #elif L==4 // es - "Guía" + "Asignaturas" #elif L==5 // fr - "Guide" + "Matières" #elif L==6 // gn - "Guía" // Okoteve traducción + "Mbo'esyry" #elif L==7 // it - "Guida" + "Corsi" #elif L==8 // pl - "Podręcznik" + "Kursów" #elif L==9 // pt - "Guia" + "Disciplinas" #endif , - // 3: ActSeeSyl -#if L==1 // ca - "Programa" -#elif L==2 // de - "Studienplan" -#elif L==3 // en - "Syllabus" -#elif L==4 // es - "Programa" -#elif L==5 // fr - "Plan" -#elif L==6 // gn - "Programa" // Okoteve traducción -#elif L==7 // it - "Programma" -#elif L==8 // pl - "Syllabus" -#elif L==9 // pt - "Programa" -#endif - , - // 4: ActSeeBib -#if L==1 // ca - "Bibliografia" -#elif L==2 // de - "Literatur" -#elif L==3 // en - "Bibliography" -#elif L==4 // es - "Bibliografía" -#elif L==5 // fr - "Bibliographie" -#elif L==6 // gn - "Arandukapurupyre" -#elif L==7 // it - "Bibliografia" -#elif L==8 // pl - "Bibliografia" -#elif L==9 // pt - "Bibliografia" -#endif - , - // 5: ActSeeFAQ -#if L==1 // ca - "FAQ" // Necessita traduccio -#elif L==2 // de - "FAQ" -#elif L==3 // en - "FAQ" -#elif L==4 // es - "FAQ" -#elif L==5 // fr - "FAQ" -#elif L==6 // gn - "FAQ" // Okoteve traducción -#elif L==7 // it - "FAQ" -#elif L==8 // pl - "FAQ" -#elif L==9 // pt - "FAQ" -#endif - , - // 6: ActSeeCrsLnk -#if L==1 // ca - "Enllaços" -#elif L==2 // de - "Links" -#elif L==3 // en - "Links" -#elif L==4 // es - "Enlaces" -#elif L==5 // fr - "Liens" -#elif L==6 // gn - "Ambuére" -#elif L==7 // it - "Link" -#elif L==8 // pl - "Linki" -#elif L==9 // pt - "Ligações" -#endif - , - // 7: ActSeeCrsTT -#if L==1 // ca - "Horari" -#elif L==2 // de - "Stundenplan" -#elif L==3 // en - "Timetable" -#elif L==4 // es - "Horario" -#elif L==5 // fr - "Horaire" -#elif L==6 // gn - "Horario" // Okoteve traducción -#elif L==7 // it - "Orario" -#elif L==8 // pl - "Plan" -#elif L==9 // pt - "Horário" -#endif - , - // 8: ActSeeCalCrs + // 2: ActSeeCalDeg #if L==1 // ca "Calendari" #elif L==2 // de @@ -18565,6 +18283,188 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Calendário" #endif , + NULL, // 3 + NULL, // 4 + NULL, // 5 + NULL, // 6 + NULL, // 7 + NULL, // 8 + NULL, // 9 + NULL, // 10 + NULL, // 11 + NULL, // 12 + }, + { + // TabCrs ***************************************************** + // 0: ActSeeCrsInf +#if L==1 // ca + "Informació" +#elif L==2 // de + "Information" +#elif L==3 // en + "Information" +#elif L==4 // es + "Información" +#elif L==5 // fr + "Information" +#elif L==6 // gn + "Información" // Okoteve traducción +#elif L==7 // it + "Informazione" +#elif L==8 // pl + "Informacja" +#elif L==9 // pt + "Informação" +#endif + , + // 1: ActSeeTchGui +#if L==1 // ca + "Guia" +#elif L==2 // de + "Hinweise" +#elif L==3 // en + "Guide" +#elif L==4 // es + "Guía" +#elif L==5 // fr + "Guide" +#elif L==6 // gn + "Guía" // Okoteve traducción +#elif L==7 // it + "Guida" +#elif L==8 // pl + "Podręcznik" +#elif L==9 // pt + "Guia" +#endif + , + // 2: ActSeeSyl +#if L==1 // ca + "Programa" +#elif L==2 // de + "Studienplan" +#elif L==3 // en + "Syllabus" +#elif L==4 // es + "Programa" +#elif L==5 // fr + "Plan" +#elif L==6 // gn + "Programa" // Okoteve traducción +#elif L==7 // it + "Programma" +#elif L==8 // pl + "Syllabus" +#elif L==9 // pt + "Programa" +#endif + , + // 3: ActSeeBib +#if L==1 // ca + "Bibliografia" +#elif L==2 // de + "Literatur" +#elif L==3 // en + "Bibliography" +#elif L==4 // es + "Bibliografía" +#elif L==5 // fr + "Bibliographie" +#elif L==6 // gn + "Arandukapurupyre" +#elif L==7 // it + "Bibliografia" +#elif L==8 // pl + "Bibliografia" +#elif L==9 // pt + "Bibliografia" +#endif + , + // 4: ActSeeFAQ +#if L==1 // ca + "FAQ" // Necessita traduccio +#elif L==2 // de + "FAQ" +#elif L==3 // en + "FAQ" +#elif L==4 // es + "FAQ" +#elif L==5 // fr + "FAQ" +#elif L==6 // gn + "FAQ" // Okoteve traducción +#elif L==7 // it + "FAQ" +#elif L==8 // pl + "FAQ" +#elif L==9 // pt + "FAQ" +#endif + , + // 5: ActSeeCrsLnk +#if L==1 // ca + "Enllaços" +#elif L==2 // de + "Links" +#elif L==3 // en + "Links" +#elif L==4 // es + "Enlaces" +#elif L==5 // fr + "Liens" +#elif L==6 // gn + "Ambuére" +#elif L==7 // it + "Link" +#elif L==8 // pl + "Linki" +#elif L==9 // pt + "Ligações" +#endif + , + // 6: ActSeeCrsTT +#if L==1 // ca + "Horari" +#elif L==2 // de + "Stundenplan" +#elif L==3 // en + "Timetable" +#elif L==4 // es + "Horario" +#elif L==5 // fr + "Horaire" +#elif L==6 // gn + "Horario" // Okoteve traducción +#elif L==7 // it + "Orario" +#elif L==8 // pl + "Plan" +#elif L==9 // pt + "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, // 8 NULL, // 9 NULL, // 10 NULL, // 11 @@ -19919,28 +19819,7 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = }, { // TabCty ***************************************************** - // 0: ActCtyReqSch -#if L==1 // ca - "Cerca d'assignatures, professors i documents" -#elif L==2 // de - "Suche Kursen, Lehrer und Dokumente" -#elif L==3 // en - "Search subjects, teachers and documents" -#elif L==4 // es - "Búsqueda de asignaturas, profesores y documentos" -#elif L==5 // fr - "Rechercher des matières, des enseignants et des documents" -#elif L==6 // gn - "Búsqueda de asignaturas, profesores y documentos"// Okoteve traducción -#elif L==7 // it - "Cercare corsi, professori e documenti" -#elif L==8 // pl - "Szukaj przedmiotów, nauczycieli i dokumenty" -#elif L==9 // pt - "Procurar disciplinas, professores e documentos" -#endif - , - // 1: ActSeeCtyInf + // 0: ActSeeCtyInf #if L==1 // ca "Informació d'aquest país" #elif L==2 // de @@ -19961,7 +19840,7 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Informação deste país" #endif , - // 2: ActSeeIns + // 1: ActSeeIns #if L==1 // ca "Llista d'institucions" #elif L==2 // de @@ -19982,7 +19861,7 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Instituções" #endif , - // 3: ActSeeCalCty + // 2: ActSeeCalCty #if L==1 // ca "Calendari acadèmic" #elif L==2 // de @@ -20003,6 +19882,7 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Calendário" #endif , + NULL, // 3 NULL, // 4 NULL, // 5 NULL, // 6 @@ -20015,28 +19895,7 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = }, { // TabIns ***************************************************** - // 0: ActInsReqSch -#if L==1 // ca - "Cerca d'assignatures, professors i documents" -#elif L==2 // de - "Suche Kursen, Lehrer und Dokumente" -#elif L==3 // en - "Search subjects, teachers and documents" -#elif L==4 // es - "Búsqueda de asignaturas, profesores y documentos" -#elif L==5 // fr - "Rechercher des matières, des enseignants et des documents" -#elif L==6 // gn - "Búsqueda de asignaturas, profesores y documentos"// Okoteve traducción -#elif L==7 // it - "Cercare corsi, professori e documenti" -#elif L==8 // pl - "Szukaj przedmiotów, nauczycieli i dokumenty" -#elif L==9 // pt - "Procurar disciplinas, professores e documentos" -#endif - , - // 1: ActSeeInsInf + // 0: ActSeeInsInf #if L==1 // ca "Informació d'aquesta institució" #elif L==2 // de @@ -20057,7 +19916,7 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Informação desta institução" #endif , - // 2: ActSeeCtr + // 1: ActSeeCtr #if L==1 // ca "Llista de centres" #elif L==2 // de @@ -20078,7 +19937,7 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Centros" #endif , - // 3: ActSeePlc + // 2: ActSeePlc #if L==1 // ca "Llocs o seus de la institució" " on s'ubica cada un dels centres." @@ -20108,7 +19967,7 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = " onde cada um dos centros está localizado." #endif , - // 4: ActSeeDpt + // 3: ActSeeDpt #if L==1 // ca "Llista de tots els departaments d'aquesta institució" #elif L==2 // de @@ -20129,7 +19988,7 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Departamentos" #endif , - // 5: ActSeeCalIns + // 4: ActSeeCalIns #if L==1 // ca "Calendari acadèmic" #elif L==2 // de @@ -20150,6 +20009,7 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Calendário" #endif , + NULL, // 5 NULL, // 6 NULL, // 7 NULL, // 8 @@ -20160,28 +20020,7 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = }, { // TabCtr ***************************************************** - // 0: ActCtrReqSch -#if L==1 // ca - "Cerca d'assignatures, professors i documents" -#elif L==2 // de - "Suche Kursen, Lehrer und Dokumente" -#elif L==3 // en - "Search subjects, teachers and documents" -#elif L==4 // es - "Búsqueda de asignaturas, profesores y documentos" -#elif L==5 // fr - "Rechercher des matières, des enseignants et des documents" -#elif L==6 // gn - "Búsqueda de asignaturas, profesores y documentos"// Okoteve traducción -#elif L==7 // it - "Cercare corsi, professori e documenti" -#elif L==8 // pl - "Szukaj przedmiotów, nauczycieli i dokumenty" -#elif L==9 // pt - "Procurar disciplinas, professores e documentos" -#endif - , - // 1: ActSeeCtrInf + // 0: ActSeeCtrInf #if L==1 // ca "Informació d'aquest centre" #elif L==2 // de @@ -20202,7 +20041,7 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Informação deste centro" #endif , - // 2: ActSeeDeg + // 1: ActSeeDeg #if L==1 // ca "Titulacions d'aquest centre" #elif L==2 // de @@ -20223,7 +20062,7 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Graus" #endif , - // 3: ActSeeCla + // 2: ActSeeCla #if L==1 // ca "Aules, laboratoris o altres llocs on s'imparteixen classes" #elif L==2 // de @@ -20244,105 +20083,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 , - // 4: 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, // 5 - NULL, // 6 - NULL, // 7 - NULL, // 8 - NULL, // 9 - NULL, // 10 - NULL, // 11 - NULL, // 12 - }, - { - // TabDeg ***************************************************** - // 0: ActDegReqSch -#if L==1 // ca - "Cerca d'assignatures, professors i documents" -#elif L==2 // de - "Suche Kursen, Lehrer und Dokumente" -#elif L==3 // en - "Search subjects, teachers and documents" -#elif L==4 // es - "Búsqueda de asignaturas, profesores y documentos" -#elif L==5 // fr - "Rechercher des matières, des enseignants et des documents" -#elif L==6 // gn - "Búsqueda de asignaturas, profesores y documentos"// Okoteve traducción -#elif L==7 // it - "Cercare corsi, professori e documenti" -#elif L==8 // pl - "Szukaj przedmiotów, nauczycieli i dokumenty" -#elif L==9 // pt - "Procurar disciplinas, professores e documentos" -#endif - , - // 1: ActSeeDegInf -#if L==1 // ca - "Informació d'aquesta titulació" -#elif L==2 // de - "Information dieses Studiengang" -#elif L==3 // en - "Information on this degree" -#elif L==4 // es - "Información sobre esta titulación" -#elif L==5 // fr - "Information de cet étude" -#elif L==6 // gn - "Información sobre esta titulación"// Okoteve traducción -#elif L==7 // it - "Informazione di questa laurea" -#elif L==8 // pl - "Informacja na ten stopień" -#elif L==9 // pt - "Informação sobre este grau" -#endif - , - // 2: ActSeeCrs -#if L==1 // ca - "Assignatures d'aquesta titulació" -#elif L==2 // de - "Kursen in diesem Studiengang" -#elif L==3 // en - "List of courses of the current degree" -#elif L==4 // es - "Lista de asignaturas de esta titulación" -#elif L==5 // fr - "Matières dans cet étude" -#elif L==6 // gn - "Lista de asignaturas de esta titulación"// Okoteve traducción -#elif L==7 // it - "Corsi di questa laurea" -#elif L==8 // pl - "Kursów w tym stopień" -#elif L==9 // pt - "Disciplinas deste grau" -#endif - , - // 3: ActSeeCalDeg + // 3: ActSeeCalCtr #if L==1 // ca "Calendari acadèmic (els dies festius" " corresponen al lloc del centre seleccionada)" @@ -20377,176 +20118,50 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = NULL, // 12 }, { - // TabCrs ***************************************************** - // 0: ActCrsReqSch + // TabDeg ***************************************************** + // 0: ActSeeDegInf #if L==1 // ca - "Cerca de professors i documents" + "Informació d'aquesta titulació" #elif L==2 // de - "Suche Lehrer und Dokumente" + "Information dieses Studiengang" #elif L==3 // en - "Search teachers and documents" + "Information on this degree" #elif L==4 // es - "Búsqueda de profesores y documentos" + "Información sobre esta titulación" #elif L==5 // fr - "Rechercher des enseignants et des documents" + "Information de cet étude" #elif L==6 // gn - "Búsqueda de profesores y documentos"// Okoteve traducción + "Información sobre esta titulación"// Okoteve traducción #elif L==7 // it - "Cercare professori e documenti" + "Informazione di questa laurea" #elif L==8 // pl - "Szukaj nauczycieli i dokumenty" + "Informacja na ten stopień" #elif L==9 // pt - "Procurar professores e documentos" + "Informação sobre este grau" #endif , - // 1: ActSeeCrsInf + // 1: ActSeeCrs #if L==1 // ca - "Informació d'aquesta assignatura" + "Assignatures d'aquesta titulació" #elif L==2 // de - "Information dieses Kurs" + "Kursen in diesem Studiengang" #elif L==3 // en - "Information on this course" + "List of courses of the current degree" #elif L==4 // es - "Información sobre esta asignatura" + "Lista de asignaturas de esta titulación" #elif L==5 // fr - "Information de cette matière" + "Matières dans cet étude" #elif L==6 // gn - "Información sobre esta asignatura"// Okoteve traducción + "Lista de asignaturas de esta titulación"// Okoteve traducción #elif L==7 // it - "Informazione di questo corso" + "Corsi di questa laurea" #elif L==8 // pl - "Informacja na ten kurs" + "Kursów w tym stopień" #elif L==9 // pt - "Informação desta disciplina" + "Disciplinas deste grau" #endif , - // 2: ActSeeTchGui -#if L==1 // ca - "Guia docent de l'assignatura" -#elif L==2 // de - "Hinweise zur Kurs" -#elif L==3 // en - "Teaching guide" -#elif L==4 // es - "Guía docente de la asignatura" -#elif L==5 // fr - "Guide pédagogique de la matière" -#elif L==6 // gn - "Guía docente de la asignatura"// Okoteve traducción -#elif L==7 // it - "Guida didattica del corso" -#elif L==8 // pl - "Nauczanie przypomnienie" -#elif L==9 // pt - "Guia de ensino" -#endif - , - // 3: ActSeeSyl -#if L==1 // ca - "Programa de l'assignatura" -#elif L==2 // de - "Studienplan" -#elif L==3 // en - "Syllabus" -#elif L==4 // es - "Programa de la asignatura" -#elif L==5 // fr - "Plan" -#elif L==6 // gn - "Programa de la asignatura"// Okoteve traducción -#elif L==7 // it - "Programma" -#elif L==8 // pl - "Syllabus" -#elif L==9 // pt - "Programa" -#endif - , - // 4: ActSeeBib -#if L==1 // ca - "Bibliografia relacionada amb els continguts de l'assignatura" -#elif L==2 // de - "Literatur" -#elif L==3 // en - "Bibliography" -#elif L==4 // es - "Bibliografía relacionada con los contenidos de la asignatura" -#elif L==5 // fr - "Bibliographie" -#elif L==6 // gn - "Bibliografía relacionada con los contenidos de la asignatura"// Okoteve traducción -#elif L==7 // it - "Bibliografia" -#elif L==8 // pl - "Bibliografia" // Potrzebujesz tlumaczenie -#elif L==9 // pt - "Bibliografia" -#endif - , - // 5: ActSeeFAQ -#if L==1 // ca - "FAQ (preguntes freqüentment formulades i les seves respostes)" -#elif L==2 // de - "FAQ" -#elif L==3 // en - "FAQ (Frequently Asked Questions)" -#elif L==4 // es - "FAQ (preguntas frecuentemente formuladas y sus respuestas)" -#elif L==5 // fr - "FAQ" -#elif L==6 // gn - "FAQ (preguntas frecuentemente formuladas y sus respuestas)"// Okoteve traducción -#elif L==7 // it - "FAQ" -#elif L==8 // pl - "FAQ (Frequently Asked Questions)" -#elif L==9 // pt - "FAQ" -#endif - , - // 6: ActSeeCrsLnk -#if L==1 // ca - "Enllaços relacionats amb els continguts de l'assignatura" -#elif L==2 // de - "Links" -#elif L==3 // en - "Links" -#elif L==4 // es - "Enlaces relacionados con los contenidos de la asignatura" -#elif L==5 // fr - "Liens" -#elif L==6 // gn - "Enlaces relacionados con los contenidos de la asignatura"// Okoteve traducción -#elif L==7 // it - "Link" -#elif L==8 // pl - "Linki" -#elif L==9 // pt - "Ligações" -#endif - , - // 7: ActSeeCrsTT -#if L==1 // ca - "Horari de classes de l'assignatura" -#elif L==2 // de - "Stundenplan" -#elif L==3 // en - "Class timetable" -#elif L==4 // es - "Horario de clases de la asignatura" -#elif L==5 // fr - "Horaire" -#elif L==6 // gn - "Horario de clases de la asignatura" // Okoteve traducción -#elif L==7 // it - "Orario del corso" -#elif L==8 // pl - "Harmonogram klasy" -#elif L==9 // pt - "Horário" -#endif - , - // 8: ActSeeCalCrs + // 2: ActSeeCalDeg #if L==1 // ca "Calendari acadèmic (els dies festius" " corresponen al lloc del centre seleccionada)" @@ -20570,6 +20185,191 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Calendário" #endif , + NULL, // 3 + NULL, // 4 + NULL, // 5 + NULL, // 6 + NULL, // 7 + NULL, // 8 + NULL, // 9 + NULL, // 10 + NULL, // 11 + NULL, // 12 + }, + { + // TabCrs ***************************************************** + // 0: ActSeeCrsInf +#if L==1 // ca + "Informació d'aquesta assignatura" +#elif L==2 // de + "Information dieses Kurs" +#elif L==3 // en + "Information on this course" +#elif L==4 // es + "Información sobre esta asignatura" +#elif L==5 // fr + "Information de cette matière" +#elif L==6 // gn + "Información sobre esta asignatura"// Okoteve traducción +#elif L==7 // it + "Informazione di questo corso" +#elif L==8 // pl + "Informacja na ten kurs" +#elif L==9 // pt + "Informação desta disciplina" +#endif + , + // 1: ActSeeTchGui +#if L==1 // ca + "Guia docent de l'assignatura" +#elif L==2 // de + "Hinweise zur Kurs" +#elif L==3 // en + "Teaching guide" +#elif L==4 // es + "Guía docente de la asignatura" +#elif L==5 // fr + "Guide pédagogique de la matière" +#elif L==6 // gn + "Guía docente de la asignatura"// Okoteve traducción +#elif L==7 // it + "Guida didattica del corso" +#elif L==8 // pl + "Nauczanie przypomnienie" +#elif L==9 // pt + "Guia de ensino" +#endif + , + // 2: ActSeeSyl +#if L==1 // ca + "Programa de l'assignatura" +#elif L==2 // de + "Studienplan" +#elif L==3 // en + "Syllabus" +#elif L==4 // es + "Programa de la asignatura" +#elif L==5 // fr + "Plan" +#elif L==6 // gn + "Programa de la asignatura"// Okoteve traducción +#elif L==7 // it + "Programma" +#elif L==8 // pl + "Syllabus" +#elif L==9 // pt + "Programa" +#endif + , + // 3: ActSeeBib +#if L==1 // ca + "Bibliografia relacionada amb els continguts de l'assignatura" +#elif L==2 // de + "Literatur" +#elif L==3 // en + "Bibliography" +#elif L==4 // es + "Bibliografía relacionada con los contenidos de la asignatura" +#elif L==5 // fr + "Bibliographie" +#elif L==6 // gn + "Bibliografía relacionada con los contenidos de la asignatura"// Okoteve traducción +#elif L==7 // it + "Bibliografia" +#elif L==8 // pl + "Bibliografia" // Potrzebujesz tlumaczenie +#elif L==9 // pt + "Bibliografia" +#endif + , + // 4: ActSeeFAQ +#if L==1 // ca + "FAQ (preguntes freqüentment formulades i les seves respostes)" +#elif L==2 // de + "FAQ" +#elif L==3 // en + "FAQ (Frequently Asked Questions)" +#elif L==4 // es + "FAQ (preguntas frecuentemente formuladas y sus respuestas)" +#elif L==5 // fr + "FAQ" +#elif L==6 // gn + "FAQ (preguntas frecuentemente formuladas y sus respuestas)"// Okoteve traducción +#elif L==7 // it + "FAQ" +#elif L==8 // pl + "FAQ (Frequently Asked Questions)" +#elif L==9 // pt + "FAQ" +#endif + , + // 5: ActSeeCrsLnk +#if L==1 // ca + "Enllaços relacionats amb els continguts de l'assignatura" +#elif L==2 // de + "Links" +#elif L==3 // en + "Links" +#elif L==4 // es + "Enlaces relacionados con los contenidos de la asignatura" +#elif L==5 // fr + "Liens" +#elif L==6 // gn + "Enlaces relacionados con los contenidos de la asignatura"// Okoteve traducción +#elif L==7 // it + "Link" +#elif L==8 // pl + "Linki" +#elif L==9 // pt + "Ligações" +#endif + , + // 6: ActSeeCrsTT +#if L==1 // ca + "Horari de classes de l'assignatura" +#elif L==2 // de + "Stundenplan" +#elif L==3 // en + "Class timetable" +#elif L==4 // es + "Horario de clases de la asignatura" +#elif L==5 // fr + "Horaire" +#elif L==6 // gn + "Horario de clases de la asignatura" // Okoteve traducción +#elif L==7 // it + "Orario del corso" +#elif L==8 // pl + "Harmonogram klasy" +#elif L==9 // pt + "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, // 8 NULL, // 9 NULL, // 10 NULL, // 11