diff --git a/sql/cambios.sql b/sql/cambios.sql index 369b4b1a..05a07ec0 100644 --- a/sql/cambios.sql +++ b/sql/cambios.sql @@ -11698,3 +11698,12 @@ ALTER TABLE surveys DROP COLUMN CrsCod; SELECT LENGTH(Subject) AS Len,COUNT(*) AS N FROM forum_post GROUP BY Len ORDER BY Len DESC; + + + +CREATE TABLE timetable_crs_backup LIKE timetable_crs; +INSERT INTO timetable_crs_backup SELECT * FROM timetable_crs; + +CREATE TABLE timetable_tut_backup LIKE timetable_tut; +INSERT INTO timetable_tut_backup SELECT * FROM timetable_tut; + diff --git a/swad_action.c b/swad_action.c index 81d35196..6563d26a 100644 --- a/swad_action.c +++ b/swad_action.c @@ -422,6 +422,7 @@ Assessment: 299. ActSeeAsg Show assignments 300. ActReqTst Request a test of self-assesment 301. ActSeeAllExaAnn Show the exam announcements + 1140. ActSeeAllSvy List all surveys in pages 302. ActEdiAss Edit the assessment system 303. ActChgFrcReaAss Change force students to read assessment system @@ -476,6 +477,22 @@ Assessment: 350. ActHidExaAnn Hide exam announcement 351. ActShoExaAnn Show exam announcement + 1147. ActSeeOneSvy Show one survey + 1148. ActAnsSvy Answer a survey + 1149. ActFrmNewSvy Form to create a new survey + 1150. ActEdiOneSvy Edit one survey + 1151. ActNewSvy Create new survey + 1152. ActChgSvy Modify data of an existing survey + 1153. ActReqRemSvy Request the removal of a survey + 1154. ActRemSvy Remove survey + 1155. ActReqRstSvy Request the reset of answers of a survey + 1156. ActRstSvy Reset answers of survey + 1157. ActHidSvy Hide survey + 1158. ActShoSvy Show survey + 1159. ActEdiOneSvyQst Edit a new question for a survey + 1160. ActRcvSvyQst Receive a question of a survey + 1161. ActReqRemSvyQst Request the removal of a question of a survey + 1162. ActRemSvyQst Confirm the removal of a question of a survey Files: 352. ActSeeAdmDocIns Documents zone of the institution (see or admin) 353. ActAdmShaIns Admin the shared files zone of the institution @@ -1334,7 +1351,6 @@ Messages: 1139. ActUnbUsrLst Unban a user when listing banned users Statistics: - 1140. ActSeeAllSvy List all surveys in pages 1141. ActReqUseGbl Request showing use of the platform 1142. ActSeePhoDeg Show a class photo with the average photos of the students of each degree 1143. ActReqStaCrs Request statistics of courses @@ -1342,22 +1358,6 @@ Statistics: 1145. ActReqMyUsgRep Request my usage report 1146. ActMFUAct Show most frequently used actions - 1147. ActSeeOneSvy Show one survey - 1148. ActAnsSvy Answer a survey - 1149. ActFrmNewSvy Form to create a new survey - 1150. ActEdiOneSvy Edit one survey - 1151. ActNewSvy Create new survey - 1152. ActChgSvy Modify data of an existing survey - 1153. ActReqRemSvy Request the removal of a survey - 1154. ActRemSvy Remove survey - 1155. ActReqRstSvy Request the reset of answers of a survey - 1156. ActRstSvy Reset answers of survey - 1157. ActHidSvy Hide survey - 1158. ActShoSvy Show survey - 1159. ActEdiOneSvyQst Edit a new question for a survey - 1160. ActRcvSvyQst Receive a question of a survey - 1161. ActReqRemSvyQst Request the removal of a question of a survey - 1162. ActRemSvyQst Confirm the removal of a question of a survey 1163. ActSeeUseGbl Show use of the platform 1164. ActPrnPhoDeg Show vista of impresión of the class photo with the average photos of the students of each degree. 1165. ActCalPhoDeg Compute the average photos of the students of each degree @@ -1866,6 +1866,7 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActSeeAsg */{ 801, 1,TabAss,ActSeeAsg ,0x118,0x100, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Asg_SeeAssignments ,"desk64x64.gif" }, /* ActReqTst */{ 103, 2,TabAss,ActReqTst ,0x118,0x100, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Tst_ShowFormAskTst ,"test64x64.gif" }, /* ActSeeAllExaAnn */{ 85, 3,TabAss,ActSeeAllExaAnn ,0x1FF,0x1FF, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Exa_ListExamAnnouncementsSee ,"announce64x64.gif" }, + /* ActSeeAllSvy */{ 966, 4,TabAss,ActSeeAllSvy ,0x1F8,0x1F8,0x1F8,0x1F8,0x1F8,0x1F8,0x1F8,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Svy_SeeAllSurveys ,"survey64x64.gif" }, // Actions not in menu: /* ActEdiAss */{ 69,-1,TabUnk,ActSeeAss ,0x110,0x100, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Inf_FormsToSelSendInfo ,NULL}, @@ -1925,6 +1926,25 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActHidExaAnn */{1620,-1,TabUnk,ActSeeAllExaAnn ,0x110,0x100, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,Exa_HideExamAnnouncement1 ,Exa_HideExamAnnouncement2 ,NULL}, /* ActShoExaAnn */{1621,-1,TabUnk,ActSeeAllExaAnn ,0x110,0x100, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,Exa_UnhideExamAnnouncement1 ,Exa_UnhideExamAnnouncement2 ,NULL}, + /* ActSeeOneSvy */{ 982,-1,TabUnk,ActSeeAllSvy ,0x1F8,0x1F8,0x1F8,0x1F8,0x1F8,0x1F8,0x1F8,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Svy_SeeOneSurvey ,NULL}, + /* ActAnsSvy */{ 983,-1,TabUnk,ActSeeAllSvy ,0x1F8,0x1F8,0x1F8,0x1F8,0x1F8,0x1F8,0x1F8,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Svy_ReceiveSurveyAnswers ,NULL}, + /* ActFrmNewSvy */{ 973,-1,TabUnk,ActSeeAllSvy ,0x1F0,0x1E0,0x1E0,0x1E0,0x1E0,0x1E0,0x1E0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Svy_RequestCreatOrEditSvy ,NULL}, + /* ActEdiOneSvy */{ 974,-1,TabUnk,ActSeeAllSvy ,0x1F0,0x1E0,0x1E0,0x1E0,0x1E0,0x1E0,0x1E0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Svy_RequestCreatOrEditSvy ,NULL}, + /* ActNewSvy */{ 968,-1,TabUnk,ActSeeAllSvy ,0x1F0,0x1E0,0x1E0,0x1E0,0x1E0,0x1E0,0x1E0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Svy_RecFormSurvey ,NULL}, + /* ActChgSvy */{ 975,-1,TabUnk,ActSeeAllSvy ,0x1F0,0x1E0,0x1E0,0x1E0,0x1E0,0x1E0,0x1E0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Svy_RecFormSurvey ,NULL}, + /* ActReqRemSvy */{ 976,-1,TabUnk,ActSeeAllSvy ,0x1F0,0x1E0,0x1E0,0x1E0,0x1E0,0x1E0,0x1E0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Svy_AskRemSurvey ,NULL}, + /* ActRemSvy */{ 969,-1,TabUnk,ActSeeAllSvy ,0x1F0,0x1E0,0x1E0,0x1E0,0x1E0,0x1E0,0x1E0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Svy_RemoveSurvey ,NULL}, + + /* ActReqRstSvy */{ 984,-1,TabUnk,ActSeeAllSvy ,0x1F0,0x1E0,0x1E0,0x1E0,0x1E0,0x1E0,0x1E0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Svy_AskResetSurvey ,NULL}, + /* ActRstSvy */{ 985,-1,TabUnk,ActSeeAllSvy ,0x1F0,0x1E0,0x1E0,0x1E0,0x1E0,0x1E0,0x1E0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Svy_ResetSurvey ,NULL}, + + /* ActHidSvy */{ 977,-1,TabUnk,ActSeeAllSvy ,0x1F0,0x1E0,0x1E0,0x1E0,0x1E0,0x1E0,0x1E0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Svy_HideSurvey ,NULL}, + /* ActShoSvy */{ 978,-1,TabUnk,ActSeeAllSvy ,0x1F0,0x1E0,0x1E0,0x1E0,0x1E0,0x1E0,0x1E0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Svy_UnhideSurvey ,NULL}, + /* ActEdiOneSvyQst */{ 979,-1,TabUnk,ActSeeAllSvy ,0x1F0,0x1E0,0x1E0,0x1E0,0x1E0,0x1E0,0x1E0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Svy_RequestEditQuestion ,NULL}, + /* ActRcvSvyQst */{ 980,-1,TabUnk,ActSeeAllSvy ,0x1F0,0x1E0,0x1E0,0x1E0,0x1E0,0x1E0,0x1E0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Svy_ReceiveQst ,NULL}, + /* ActReqRemSvyQst */{1524,-1,TabUnk,ActSeeAllSvy ,0x1F0,0x1E0,0x1E0,0x1E0,0x1E0,0x1E0,0x1E0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Svy_RequestRemoveQst ,NULL}, + /* ActRemSvyQst */{ 981,-1,TabUnk,ActSeeAllSvy ,0x1F0,0x1E0,0x1E0,0x1E0,0x1E0,0x1E0,0x1E0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Svy_RemoveQst ,NULL}, + // TabFil ****************************************************************** // Actions in menu: /* ActSeeAdmDocIns */{1249, 0,TabFil,ActSeeAdmDocIns , 0, 0, 0, 0,0x1FF, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Brw_ShowFileBrowserOrWorks ,"folder64x64.gif" }, @@ -2827,34 +2847,14 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = // TabSta ****************************************************************** // Actions in menu: - /* ActSeeAllSvy */{ 966, 0,TabSta,ActSeeAllSvy ,0x1F8,0x1F8,0x1F8,0x1F8,0x1F8,0x1F8,0x1F8,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Svy_SeeAllSurveys ,"survey64x64.gif" }, - /* ActReqUseGbl */{ 761, 1,TabSta,ActReqUseGbl ,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Sta_ReqShowFigures ,"pie64x64.gif" }, - /* ActSeePhoDeg */{ 447, 2,TabSta,ActSeePhoDeg ,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Pho_ShowPhotoDegree ,"classphoto64x64.gif" }, - /* ActReqStaCrs */{ 767, 3,TabSta,ActReqStaCrs ,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Ind_ReqIndicatorsCourses ,"tablestats64x64.gif" }, - /* ActReqAccGbl */{ 591, 4,TabSta,ActReqAccGbl ,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,Sta_SetIniEndDates ,Sta_AskShowGblHits ,"stats64x64.gif" }, - /* ActReqMyUsgRep */{1586, 5,TabSta,ActReqMyUsgRep ,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Rep_ReqMyUsageReport ,"report64x64.png" }, - /* ActMFUAct */{ 993, 6,TabSta,ActMFUAct ,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,MFU_ShowMyMFUActions ,"star64x64.gif" }, + /* ActReqUseGbl */{ 761, 0,TabSta,ActReqUseGbl ,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Sta_ReqShowFigures ,"pie64x64.gif" }, + /* ActSeePhoDeg */{ 447, 1,TabSta,ActSeePhoDeg ,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Pho_ShowPhotoDegree ,"classphoto64x64.gif" }, + /* ActReqStaCrs */{ 767, 2,TabSta,ActReqStaCrs ,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Ind_ReqIndicatorsCourses ,"tablestats64x64.gif" }, + /* ActReqAccGbl */{ 591, 3,TabSta,ActReqAccGbl ,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,Sta_SetIniEndDates ,Sta_AskShowGblHits ,"stats64x64.gif" }, + /* ActReqMyUsgRep */{1586, 4,TabSta,ActReqMyUsgRep ,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Rep_ReqMyUsageReport ,"report64x64.png" }, + /* ActMFUAct */{ 993, 5,TabSta,ActMFUAct ,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,MFU_ShowMyMFUActions ,"star64x64.gif" }, // Actions not in menu: - /* ActSeeOneSvy */{ 982,-1,TabUnk,ActSeeAllSvy ,0x1F8,0x1F8,0x1F8,0x1F8,0x1F8,0x1F8,0x1F8,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Svy_SeeOneSurvey ,NULL}, - /* ActAnsSvy */{ 983,-1,TabUnk,ActSeeAllSvy ,0x1F8,0x1F8,0x1F8,0x1F8,0x1F8,0x1F8,0x1F8,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Svy_ReceiveSurveyAnswers ,NULL}, - /* ActFrmNewSvy */{ 973,-1,TabUnk,ActSeeAllSvy ,0x1F0,0x1E0,0x1E0,0x1E0,0x1E0,0x1E0,0x1E0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Svy_RequestCreatOrEditSvy ,NULL}, - /* ActEdiOneSvy */{ 974,-1,TabUnk,ActSeeAllSvy ,0x1F0,0x1E0,0x1E0,0x1E0,0x1E0,0x1E0,0x1E0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Svy_RequestCreatOrEditSvy ,NULL}, - /* ActNewSvy */{ 968,-1,TabUnk,ActSeeAllSvy ,0x1F0,0x1E0,0x1E0,0x1E0,0x1E0,0x1E0,0x1E0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Svy_RecFormSurvey ,NULL}, - /* ActChgSvy */{ 975,-1,TabUnk,ActSeeAllSvy ,0x1F0,0x1E0,0x1E0,0x1E0,0x1E0,0x1E0,0x1E0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Svy_RecFormSurvey ,NULL}, - /* ActReqRemSvy */{ 976,-1,TabUnk,ActSeeAllSvy ,0x1F0,0x1E0,0x1E0,0x1E0,0x1E0,0x1E0,0x1E0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Svy_AskRemSurvey ,NULL}, - /* ActRemSvy */{ 969,-1,TabUnk,ActSeeAllSvy ,0x1F0,0x1E0,0x1E0,0x1E0,0x1E0,0x1E0,0x1E0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Svy_RemoveSurvey ,NULL}, - - /* ActReqRstSvy */{ 984,-1,TabUnk,ActSeeAllSvy ,0x1F0,0x1E0,0x1E0,0x1E0,0x1E0,0x1E0,0x1E0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Svy_AskResetSurvey ,NULL}, - /* ActRstSvy */{ 985,-1,TabUnk,ActSeeAllSvy ,0x1F0,0x1E0,0x1E0,0x1E0,0x1E0,0x1E0,0x1E0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Svy_ResetSurvey ,NULL}, - - /* ActHidSvy */{ 977,-1,TabUnk,ActSeeAllSvy ,0x1F0,0x1E0,0x1E0,0x1E0,0x1E0,0x1E0,0x1E0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Svy_HideSurvey ,NULL}, - /* ActShoSvy */{ 978,-1,TabUnk,ActSeeAllSvy ,0x1F0,0x1E0,0x1E0,0x1E0,0x1E0,0x1E0,0x1E0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Svy_UnhideSurvey ,NULL}, - /* ActEdiOneSvyQst */{ 979,-1,TabUnk,ActSeeAllSvy ,0x1F0,0x1E0,0x1E0,0x1E0,0x1E0,0x1E0,0x1E0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Svy_RequestEditQuestion ,NULL}, - /* ActRcvSvyQst */{ 980,-1,TabUnk,ActSeeAllSvy ,0x1F0,0x1E0,0x1E0,0x1E0,0x1E0,0x1E0,0x1E0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Svy_ReceiveQst ,NULL}, - /* ActReqRemSvyQst */{1524,-1,TabUnk,ActSeeAllSvy ,0x1F0,0x1E0,0x1E0,0x1E0,0x1E0,0x1E0,0x1E0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Svy_RequestRemoveQst ,NULL}, - /* ActRemSvyQst */{ 981,-1,TabUnk,ActSeeAllSvy ,0x1F0,0x1E0,0x1E0,0x1E0,0x1E0,0x1E0,0x1E0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Svy_RemoveQst ,NULL}, - /* ActSeeUseGbl */{ 84,-1,TabUnk,ActReqUseGbl ,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Sta_ShowFigures ,NULL}, /* ActPrnPhoDeg */{ 448,-1,TabUnk,ActSeePhoDeg ,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_BLNK_WINDOW,NULL ,Pho_PrintPhotoDegree ,NULL}, /* ActCalPhoDeg */{ 444,-1,TabUnk,ActSeePhoDeg ,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Pho_CalcPhotoDegree ,NULL}, diff --git a/swad_action.h b/swad_action.h index d24c07c1..d2268ca0 100644 --- a/swad_action.h +++ b/swad_action.h @@ -57,7 +57,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 + 43 + 17 + 47 + 32 + 24 + 115 + 54 + 416 + 159 + 172 + 42 + 31 + 96) +#define Act_NUM_ACTIONS (1 + 9 + 43 + 17 + 47 + 32 + 24 + 115 + 71 + 416 + 159 + 172 + 42 + 14 + 96) #define Act_MAX_ACTION_COD 1636 @@ -430,513 +430,532 @@ typedef signed int Act_Action_t; // Must be a signed type, because -1 is used to /***************************** Assessment tab ********************************/ /*****************************************************************************/ // Actions in menu -#define ActSeeAss (ActChgCalCrs1stDay + 1) -#define ActSeeAsg (ActChgCalCrs1stDay + 2) -#define ActReqTst (ActChgCalCrs1stDay + 3) -#define ActSeeAllExaAnn (ActChgCalCrs1stDay + 4) +#define ActSeeAss (ActChgCalCrs1stDay + 1) +#define ActSeeAsg (ActChgCalCrs1stDay + 2) +#define ActReqTst (ActChgCalCrs1stDay + 3) +#define ActSeeAllExaAnn (ActChgCalCrs1stDay + 4) +#define ActSeeAllSvy (ActChgCalCrs1stDay + 5) + // Secondary actions -#define ActEdiAss (ActChgCalCrs1stDay + 5) -#define ActChgFrcReaAss (ActChgCalCrs1stDay + 6) -#define ActChgHavReaAss (ActChgCalCrs1stDay + 7) -#define ActSelInfSrcAss (ActChgCalCrs1stDay + 8) -#define ActRcvURLAss (ActChgCalCrs1stDay + 9) -#define ActRcvPagAss (ActChgCalCrs1stDay + 10) -#define ActEditorAss (ActChgCalCrs1stDay + 11) -#define ActPlaTxtEdiAss (ActChgCalCrs1stDay + 12) -#define ActRchTxtEdiAss (ActChgCalCrs1stDay + 13) -#define ActRcvPlaTxtAss (ActChgCalCrs1stDay + 14) -#define ActRcvRchTxtAss (ActChgCalCrs1stDay + 15) +#define ActEdiAss (ActChgCalCrs1stDay + 6) +#define ActChgFrcReaAss (ActChgCalCrs1stDay + 7) +#define ActChgHavReaAss (ActChgCalCrs1stDay + 8) +#define ActSelInfSrcAss (ActChgCalCrs1stDay + 9) +#define ActRcvURLAss (ActChgCalCrs1stDay + 10) +#define ActRcvPagAss (ActChgCalCrs1stDay + 11) +#define ActEditorAss (ActChgCalCrs1stDay + 12) +#define ActPlaTxtEdiAss (ActChgCalCrs1stDay + 13) +#define ActRchTxtEdiAss (ActChgCalCrs1stDay + 14) +#define ActRcvPlaTxtAss (ActChgCalCrs1stDay + 15) +#define ActRcvRchTxtAss (ActChgCalCrs1stDay + 16) -#define ActFrmNewAsg (ActChgCalCrs1stDay + 16) -#define ActEdiOneAsg (ActChgCalCrs1stDay + 17) -#define ActNewAsg (ActChgCalCrs1stDay + 18) -#define ActChgAsg (ActChgCalCrs1stDay + 19) -#define ActReqRemAsg (ActChgCalCrs1stDay + 20) -#define ActRemAsg (ActChgCalCrs1stDay + 21) -#define ActHidAsg (ActChgCalCrs1stDay + 22) -#define ActShoAsg (ActChgCalCrs1stDay + 23) +#define ActFrmNewAsg (ActChgCalCrs1stDay + 17) +#define ActEdiOneAsg (ActChgCalCrs1stDay + 18) +#define ActNewAsg (ActChgCalCrs1stDay + 19) +#define ActChgAsg (ActChgCalCrs1stDay + 20) +#define ActReqRemAsg (ActChgCalCrs1stDay + 21) +#define ActRemAsg (ActChgCalCrs1stDay + 22) +#define ActHidAsg (ActChgCalCrs1stDay + 23) +#define ActShoAsg (ActChgCalCrs1stDay + 24) -#define ActSeeTst (ActChgCalCrs1stDay + 24) -#define ActAssTst (ActChgCalCrs1stDay + 25) -#define ActEdiTstQst (ActChgCalCrs1stDay + 26) -#define ActEdiOneTstQst (ActChgCalCrs1stDay + 27) -#define ActReqImpTstQst (ActChgCalCrs1stDay + 28) -#define ActImpTstQst (ActChgCalCrs1stDay + 29) -#define ActLstTstQst (ActChgCalCrs1stDay + 30) -#define ActRcvTstQst (ActChgCalCrs1stDay + 31) -#define ActReqRemTstQst (ActChgCalCrs1stDay + 32) -#define ActRemTstQst (ActChgCalCrs1stDay + 33) -#define ActShfTstQst (ActChgCalCrs1stDay + 34) -#define ActCfgTst (ActChgCalCrs1stDay + 35) -#define ActEnableTag (ActChgCalCrs1stDay + 36) -#define ActDisableTag (ActChgCalCrs1stDay + 37) -#define ActRenTag (ActChgCalCrs1stDay + 38) -#define ActRcvCfgTst (ActChgCalCrs1stDay + 39) +#define ActSeeTst (ActChgCalCrs1stDay + 25) +#define ActAssTst (ActChgCalCrs1stDay + 26) +#define ActEdiTstQst (ActChgCalCrs1stDay + 27) +#define ActEdiOneTstQst (ActChgCalCrs1stDay + 28) +#define ActReqImpTstQst (ActChgCalCrs1stDay + 29) +#define ActImpTstQst (ActChgCalCrs1stDay + 30) +#define ActLstTstQst (ActChgCalCrs1stDay + 31) +#define ActRcvTstQst (ActChgCalCrs1stDay + 32) +#define ActReqRemTstQst (ActChgCalCrs1stDay + 33) +#define ActRemTstQst (ActChgCalCrs1stDay + 34) +#define ActShfTstQst (ActChgCalCrs1stDay + 35) +#define ActCfgTst (ActChgCalCrs1stDay + 36) +#define ActEnableTag (ActChgCalCrs1stDay + 37) +#define ActDisableTag (ActChgCalCrs1stDay + 38) +#define ActRenTag (ActChgCalCrs1stDay + 39) +#define ActRcvCfgTst (ActChgCalCrs1stDay + 40) -#define ActReqSeeMyTstRes (ActChgCalCrs1stDay + 40) -#define ActSeeMyTstRes (ActChgCalCrs1stDay + 41) -#define ActSeeOneTstResMe (ActChgCalCrs1stDay + 42) -#define ActReqSeeUsrTstRes (ActChgCalCrs1stDay + 43) -#define ActSeeUsrTstRes (ActChgCalCrs1stDay + 44) -#define ActSeeOneTstResOth (ActChgCalCrs1stDay + 45) +#define ActReqSeeMyTstRes (ActChgCalCrs1stDay + 41) +#define ActSeeMyTstRes (ActChgCalCrs1stDay + 42) +#define ActSeeOneTstResMe (ActChgCalCrs1stDay + 43) +#define ActReqSeeUsrTstRes (ActChgCalCrs1stDay + 44) +#define ActSeeUsrTstRes (ActChgCalCrs1stDay + 45) +#define ActSeeOneTstResOth (ActChgCalCrs1stDay + 46) -#define ActSeeOneExaAnn (ActChgCalCrs1stDay + 46) -#define ActSeeDatExaAnn (ActChgCalCrs1stDay + 47) -#define ActEdiExaAnn (ActChgCalCrs1stDay + 48) -#define ActRcvExaAnn (ActChgCalCrs1stDay + 49) -#define ActPrnExaAnn (ActChgCalCrs1stDay + 50) -#define ActReqRemExaAnn (ActChgCalCrs1stDay + 51) -#define ActRemExaAnn (ActChgCalCrs1stDay + 52) -#define ActHidExaAnn (ActChgCalCrs1stDay + 53) -#define ActShoExaAnn (ActChgCalCrs1stDay + 54) +#define ActSeeOneExaAnn (ActChgCalCrs1stDay + 47) +#define ActSeeDatExaAnn (ActChgCalCrs1stDay + 48) +#define ActEdiExaAnn (ActChgCalCrs1stDay + 49) +#define ActRcvExaAnn (ActChgCalCrs1stDay + 50) +#define ActPrnExaAnn (ActChgCalCrs1stDay + 51) +#define ActReqRemExaAnn (ActChgCalCrs1stDay + 52) +#define ActRemExaAnn (ActChgCalCrs1stDay + 53) +#define ActHidExaAnn (ActChgCalCrs1stDay + 54) +#define ActShoExaAnn (ActChgCalCrs1stDay + 55) + +#define ActSeeOneSvy (ActChgCalCrs1stDay + 56) +#define ActAnsSvy (ActChgCalCrs1stDay + 57) +#define ActFrmNewSvy (ActChgCalCrs1stDay + 58) +#define ActEdiOneSvy (ActChgCalCrs1stDay + 59) +#define ActNewSvy (ActChgCalCrs1stDay + 60) +#define ActChgSvy (ActChgCalCrs1stDay + 61) +#define ActReqRemSvy (ActChgCalCrs1stDay + 62) +#define ActRemSvy (ActChgCalCrs1stDay + 63) +#define ActReqRstSvy (ActChgCalCrs1stDay + 64) +#define ActRstSvy (ActChgCalCrs1stDay + 65) +#define ActHidSvy (ActChgCalCrs1stDay + 66) +#define ActShoSvy (ActChgCalCrs1stDay + 67) +#define ActEdiOneSvyQst (ActChgCalCrs1stDay + 68) +#define ActRcvSvyQst (ActChgCalCrs1stDay + 69) +#define ActReqRemSvyQst (ActChgCalCrs1stDay + 70) +#define ActRemSvyQst (ActChgCalCrs1stDay + 71) /*****************************************************************************/ /******************************** Files tab **********************************/ /*****************************************************************************/ // Actions in menu -#define ActSeeAdmDocIns (ActShoExaAnn + 1) -#define ActAdmShaIns (ActShoExaAnn + 2) -#define ActSeeAdmDocCtr (ActShoExaAnn + 3) -#define ActAdmShaCtr (ActShoExaAnn + 4) -#define ActSeeAdmDocDeg (ActShoExaAnn + 5) -#define ActAdmShaDeg (ActShoExaAnn + 6) -#define ActSeeAdmDocCrsGrp (ActShoExaAnn + 7) -#define ActAdmTchCrsGrp (ActShoExaAnn + 8) -#define ActAdmShaCrsGrp (ActShoExaAnn + 9) -#define ActAdmAsgWrkUsr (ActShoExaAnn + 10) -#define ActReqAsgWrkCrs (ActShoExaAnn + 11) -#define ActSeeAdmMrk (ActShoExaAnn + 12) +#define ActSeeAdmDocIns (ActRemSvyQst + 1) +#define ActAdmShaIns (ActRemSvyQst + 2) +#define ActSeeAdmDocCtr (ActRemSvyQst + 3) +#define ActAdmShaCtr (ActRemSvyQst + 4) +#define ActSeeAdmDocDeg (ActRemSvyQst + 5) +#define ActAdmShaDeg (ActRemSvyQst + 6) +#define ActSeeAdmDocCrsGrp (ActRemSvyQst + 7) +#define ActAdmTchCrsGrp (ActRemSvyQst + 8) +#define ActAdmShaCrsGrp (ActRemSvyQst + 9) +#define ActAdmAsgWrkUsr (ActRemSvyQst + 10) +#define ActReqAsgWrkCrs (ActRemSvyQst + 11) +#define ActSeeAdmMrk (ActRemSvyQst + 12) // Secondary actions -#define ActChgToSeeDocIns (ActShoExaAnn + 13) -#define ActSeeDocIns (ActShoExaAnn + 14) -#define ActExpSeeDocIns (ActShoExaAnn + 15) -#define ActConSeeDocIns (ActShoExaAnn + 16) -#define ActZIPSeeDocIns (ActShoExaAnn + 17) -#define ActReqDatSeeDocIns (ActShoExaAnn + 18) -#define ActDowSeeDocIns (ActShoExaAnn + 19) -#define ActChgToAdmDocIns (ActShoExaAnn + 20) -#define ActAdmDocIns (ActShoExaAnn + 21) -#define ActReqRemFilDocIns (ActShoExaAnn + 22) -#define ActRemFilDocIns (ActShoExaAnn + 23) -#define ActRemFolDocIns (ActShoExaAnn + 24) -#define ActCopDocIns (ActShoExaAnn + 25) -#define ActPasDocIns (ActShoExaAnn + 26) -#define ActRemTreDocIns (ActShoExaAnn + 27) -#define ActFrmCreDocIns (ActShoExaAnn + 28) -#define ActCreFolDocIns (ActShoExaAnn + 29) -#define ActCreLnkDocIns (ActShoExaAnn + 30) -#define ActRenFolDocIns (ActShoExaAnn + 31) -#define ActRcvFilDocInsDZ (ActShoExaAnn + 32) -#define ActRcvFilDocInsCla (ActShoExaAnn + 33) -#define ActExpAdmDocIns (ActShoExaAnn + 34) -#define ActConAdmDocIns (ActShoExaAnn + 35) -#define ActZIPAdmDocIns (ActShoExaAnn + 36) -#define ActShoDocIns (ActShoExaAnn + 37) -#define ActHidDocIns (ActShoExaAnn + 38) -#define ActReqDatAdmDocIns (ActShoExaAnn + 39) -#define ActChgDatAdmDocIns (ActShoExaAnn + 40) -#define ActDowAdmDocIns (ActShoExaAnn + 41) +#define ActChgToSeeDocIns (ActRemSvyQst + 13) +#define ActSeeDocIns (ActRemSvyQst + 14) +#define ActExpSeeDocIns (ActRemSvyQst + 15) +#define ActConSeeDocIns (ActRemSvyQst + 16) +#define ActZIPSeeDocIns (ActRemSvyQst + 17) +#define ActReqDatSeeDocIns (ActRemSvyQst + 18) +#define ActDowSeeDocIns (ActRemSvyQst + 19) +#define ActChgToAdmDocIns (ActRemSvyQst + 20) +#define ActAdmDocIns (ActRemSvyQst + 21) +#define ActReqRemFilDocIns (ActRemSvyQst + 22) +#define ActRemFilDocIns (ActRemSvyQst + 23) +#define ActRemFolDocIns (ActRemSvyQst + 24) +#define ActCopDocIns (ActRemSvyQst + 25) +#define ActPasDocIns (ActRemSvyQst + 26) +#define ActRemTreDocIns (ActRemSvyQst + 27) +#define ActFrmCreDocIns (ActRemSvyQst + 28) +#define ActCreFolDocIns (ActRemSvyQst + 29) +#define ActCreLnkDocIns (ActRemSvyQst + 30) +#define ActRenFolDocIns (ActRemSvyQst + 31) +#define ActRcvFilDocInsDZ (ActRemSvyQst + 32) +#define ActRcvFilDocInsCla (ActRemSvyQst + 33) +#define ActExpAdmDocIns (ActRemSvyQst + 34) +#define ActConAdmDocIns (ActRemSvyQst + 35) +#define ActZIPAdmDocIns (ActRemSvyQst + 36) +#define ActShoDocIns (ActRemSvyQst + 37) +#define ActHidDocIns (ActRemSvyQst + 38) +#define ActReqDatAdmDocIns (ActRemSvyQst + 39) +#define ActChgDatAdmDocIns (ActRemSvyQst + 40) +#define ActDowAdmDocIns (ActRemSvyQst + 41) -#define ActReqRemFilShaIns (ActShoExaAnn + 42) -#define ActRemFilShaIns (ActShoExaAnn + 43) -#define ActRemFolShaIns (ActShoExaAnn + 44) -#define ActCopShaIns (ActShoExaAnn + 45) -#define ActPasShaIns (ActShoExaAnn + 46) -#define ActRemTreShaIns (ActShoExaAnn + 47) -#define ActFrmCreShaIns (ActShoExaAnn + 48) -#define ActCreFolShaIns (ActShoExaAnn + 49) -#define ActCreLnkShaIns (ActShoExaAnn + 50) -#define ActRenFolShaIns (ActShoExaAnn + 51) -#define ActRcvFilShaInsDZ (ActShoExaAnn + 52) -#define ActRcvFilShaInsCla (ActShoExaAnn + 53) -#define ActExpShaIns (ActShoExaAnn + 54) -#define ActConShaIns (ActShoExaAnn + 55) -#define ActZIPShaIns (ActShoExaAnn + 56) -#define ActReqDatShaIns (ActShoExaAnn + 57) -#define ActChgDatShaIns (ActShoExaAnn + 58) -#define ActDowShaIns (ActShoExaAnn + 59) +#define ActReqRemFilShaIns (ActRemSvyQst + 42) +#define ActRemFilShaIns (ActRemSvyQst + 43) +#define ActRemFolShaIns (ActRemSvyQst + 44) +#define ActCopShaIns (ActRemSvyQst + 45) +#define ActPasShaIns (ActRemSvyQst + 46) +#define ActRemTreShaIns (ActRemSvyQst + 47) +#define ActFrmCreShaIns (ActRemSvyQst + 48) +#define ActCreFolShaIns (ActRemSvyQst + 49) +#define ActCreLnkShaIns (ActRemSvyQst + 50) +#define ActRenFolShaIns (ActRemSvyQst + 51) +#define ActRcvFilShaInsDZ (ActRemSvyQst + 52) +#define ActRcvFilShaInsCla (ActRemSvyQst + 53) +#define ActExpShaIns (ActRemSvyQst + 54) +#define ActConShaIns (ActRemSvyQst + 55) +#define ActZIPShaIns (ActRemSvyQst + 56) +#define ActReqDatShaIns (ActRemSvyQst + 57) +#define ActChgDatShaIns (ActRemSvyQst + 58) +#define ActDowShaIns (ActRemSvyQst + 59) -#define ActChgToSeeDocCtr (ActShoExaAnn + 60) -#define ActSeeDocCtr (ActShoExaAnn + 61) -#define ActExpSeeDocCtr (ActShoExaAnn + 62) -#define ActConSeeDocCtr (ActShoExaAnn + 63) -#define ActZIPSeeDocCtr (ActShoExaAnn + 64) -#define ActReqDatSeeDocCtr (ActShoExaAnn + 65) -#define ActDowSeeDocCtr (ActShoExaAnn + 66) -#define ActChgToAdmDocCtr (ActShoExaAnn + 67) -#define ActAdmDocCtr (ActShoExaAnn + 68) -#define ActReqRemFilDocCtr (ActShoExaAnn + 69) -#define ActRemFilDocCtr (ActShoExaAnn + 70) -#define ActRemFolDocCtr (ActShoExaAnn + 71) -#define ActCopDocCtr (ActShoExaAnn + 72) -#define ActPasDocCtr (ActShoExaAnn + 73) -#define ActRemTreDocCtr (ActShoExaAnn + 74) -#define ActFrmCreDocCtr (ActShoExaAnn + 75) -#define ActCreFolDocCtr (ActShoExaAnn + 76) -#define ActCreLnkDocCtr (ActShoExaAnn + 77) -#define ActRenFolDocCtr (ActShoExaAnn + 78) -#define ActRcvFilDocCtrDZ (ActShoExaAnn + 79) -#define ActRcvFilDocCtrCla (ActShoExaAnn + 80) -#define ActExpAdmDocCtr (ActShoExaAnn + 81) -#define ActConAdmDocCtr (ActShoExaAnn + 82) -#define ActZIPAdmDocCtr (ActShoExaAnn + 83) -#define ActShoDocCtr (ActShoExaAnn + 84) -#define ActHidDocCtr (ActShoExaAnn + 85) -#define ActReqDatAdmDocCtr (ActShoExaAnn + 86) -#define ActChgDatAdmDocCtr (ActShoExaAnn + 87) -#define ActDowAdmDocCtr (ActShoExaAnn + 88) +#define ActChgToSeeDocCtr (ActRemSvyQst + 60) +#define ActSeeDocCtr (ActRemSvyQst + 61) +#define ActExpSeeDocCtr (ActRemSvyQst + 62) +#define ActConSeeDocCtr (ActRemSvyQst + 63) +#define ActZIPSeeDocCtr (ActRemSvyQst + 64) +#define ActReqDatSeeDocCtr (ActRemSvyQst + 65) +#define ActDowSeeDocCtr (ActRemSvyQst + 66) +#define ActChgToAdmDocCtr (ActRemSvyQst + 67) +#define ActAdmDocCtr (ActRemSvyQst + 68) +#define ActReqRemFilDocCtr (ActRemSvyQst + 69) +#define ActRemFilDocCtr (ActRemSvyQst + 70) +#define ActRemFolDocCtr (ActRemSvyQst + 71) +#define ActCopDocCtr (ActRemSvyQst + 72) +#define ActPasDocCtr (ActRemSvyQst + 73) +#define ActRemTreDocCtr (ActRemSvyQst + 74) +#define ActFrmCreDocCtr (ActRemSvyQst + 75) +#define ActCreFolDocCtr (ActRemSvyQst + 76) +#define ActCreLnkDocCtr (ActRemSvyQst + 77) +#define ActRenFolDocCtr (ActRemSvyQst + 78) +#define ActRcvFilDocCtrDZ (ActRemSvyQst + 79) +#define ActRcvFilDocCtrCla (ActRemSvyQst + 80) +#define ActExpAdmDocCtr (ActRemSvyQst + 81) +#define ActConAdmDocCtr (ActRemSvyQst + 82) +#define ActZIPAdmDocCtr (ActRemSvyQst + 83) +#define ActShoDocCtr (ActRemSvyQst + 84) +#define ActHidDocCtr (ActRemSvyQst + 85) +#define ActReqDatAdmDocCtr (ActRemSvyQst + 86) +#define ActChgDatAdmDocCtr (ActRemSvyQst + 87) +#define ActDowAdmDocCtr (ActRemSvyQst + 88) -#define ActReqRemFilShaCtr (ActShoExaAnn + 89) -#define ActRemFilShaCtr (ActShoExaAnn + 90) -#define ActRemFolShaCtr (ActShoExaAnn + 91) -#define ActCopShaCtr (ActShoExaAnn + 92) -#define ActPasShaCtr (ActShoExaAnn + 93) -#define ActRemTreShaCtr (ActShoExaAnn + 94) -#define ActFrmCreShaCtr (ActShoExaAnn + 95) -#define ActCreFolShaCtr (ActShoExaAnn + 96) -#define ActCreLnkShaCtr (ActShoExaAnn + 97) -#define ActRenFolShaCtr (ActShoExaAnn + 98) -#define ActRcvFilShaCtrDZ (ActShoExaAnn + 99) -#define ActRcvFilShaCtrCla (ActShoExaAnn + 100) -#define ActExpShaCtr (ActShoExaAnn + 101) -#define ActConShaCtr (ActShoExaAnn + 102) -#define ActZIPShaCtr (ActShoExaAnn + 103) -#define ActReqDatShaCtr (ActShoExaAnn + 104) -#define ActChgDatShaCtr (ActShoExaAnn + 105) -#define ActDowShaCtr (ActShoExaAnn + 106) +#define ActReqRemFilShaCtr (ActRemSvyQst + 89) +#define ActRemFilShaCtr (ActRemSvyQst + 90) +#define ActRemFolShaCtr (ActRemSvyQst + 91) +#define ActCopShaCtr (ActRemSvyQst + 92) +#define ActPasShaCtr (ActRemSvyQst + 93) +#define ActRemTreShaCtr (ActRemSvyQst + 94) +#define ActFrmCreShaCtr (ActRemSvyQst + 95) +#define ActCreFolShaCtr (ActRemSvyQst + 96) +#define ActCreLnkShaCtr (ActRemSvyQst + 97) +#define ActRenFolShaCtr (ActRemSvyQst + 98) +#define ActRcvFilShaCtrDZ (ActRemSvyQst + 99) +#define ActRcvFilShaCtrCla (ActRemSvyQst + 100) +#define ActExpShaCtr (ActRemSvyQst + 101) +#define ActConShaCtr (ActRemSvyQst + 102) +#define ActZIPShaCtr (ActRemSvyQst + 103) +#define ActReqDatShaCtr (ActRemSvyQst + 104) +#define ActChgDatShaCtr (ActRemSvyQst + 105) +#define ActDowShaCtr (ActRemSvyQst + 106) -#define ActChgToSeeDocDeg (ActShoExaAnn + 107) -#define ActSeeDocDeg (ActShoExaAnn + 108) -#define ActExpSeeDocDeg (ActShoExaAnn + 109) -#define ActConSeeDocDeg (ActShoExaAnn + 110) -#define ActZIPSeeDocDeg (ActShoExaAnn + 111) -#define ActReqDatSeeDocDeg (ActShoExaAnn + 112) -#define ActDowSeeDocDeg (ActShoExaAnn + 113) -#define ActChgToAdmDocDeg (ActShoExaAnn + 114) -#define ActAdmDocDeg (ActShoExaAnn + 115) -#define ActReqRemFilDocDeg (ActShoExaAnn + 116) -#define ActRemFilDocDeg (ActShoExaAnn + 117) -#define ActRemFolDocDeg (ActShoExaAnn + 118) -#define ActCopDocDeg (ActShoExaAnn + 119) -#define ActPasDocDeg (ActShoExaAnn + 120) -#define ActRemTreDocDeg (ActShoExaAnn + 121) -#define ActFrmCreDocDeg (ActShoExaAnn + 122) -#define ActCreFolDocDeg (ActShoExaAnn + 123) -#define ActCreLnkDocDeg (ActShoExaAnn + 124) -#define ActRenFolDocDeg (ActShoExaAnn + 125) -#define ActRcvFilDocDegDZ (ActShoExaAnn + 126) -#define ActRcvFilDocDegCla (ActShoExaAnn + 127) -#define ActExpAdmDocDeg (ActShoExaAnn + 128) -#define ActConAdmDocDeg (ActShoExaAnn + 129) -#define ActZIPAdmDocDeg (ActShoExaAnn + 130) -#define ActShoDocDeg (ActShoExaAnn + 131) -#define ActHidDocDeg (ActShoExaAnn + 132) -#define ActReqDatAdmDocDeg (ActShoExaAnn + 133) -#define ActChgDatAdmDocDeg (ActShoExaAnn + 134) -#define ActDowAdmDocDeg (ActShoExaAnn + 135) +#define ActChgToSeeDocDeg (ActRemSvyQst + 107) +#define ActSeeDocDeg (ActRemSvyQst + 108) +#define ActExpSeeDocDeg (ActRemSvyQst + 109) +#define ActConSeeDocDeg (ActRemSvyQst + 110) +#define ActZIPSeeDocDeg (ActRemSvyQst + 111) +#define ActReqDatSeeDocDeg (ActRemSvyQst + 112) +#define ActDowSeeDocDeg (ActRemSvyQst + 113) +#define ActChgToAdmDocDeg (ActRemSvyQst + 114) +#define ActAdmDocDeg (ActRemSvyQst + 115) +#define ActReqRemFilDocDeg (ActRemSvyQst + 116) +#define ActRemFilDocDeg (ActRemSvyQst + 117) +#define ActRemFolDocDeg (ActRemSvyQst + 118) +#define ActCopDocDeg (ActRemSvyQst + 119) +#define ActPasDocDeg (ActRemSvyQst + 120) +#define ActRemTreDocDeg (ActRemSvyQst + 121) +#define ActFrmCreDocDeg (ActRemSvyQst + 122) +#define ActCreFolDocDeg (ActRemSvyQst + 123) +#define ActCreLnkDocDeg (ActRemSvyQst + 124) +#define ActRenFolDocDeg (ActRemSvyQst + 125) +#define ActRcvFilDocDegDZ (ActRemSvyQst + 126) +#define ActRcvFilDocDegCla (ActRemSvyQst + 127) +#define ActExpAdmDocDeg (ActRemSvyQst + 128) +#define ActConAdmDocDeg (ActRemSvyQst + 129) +#define ActZIPAdmDocDeg (ActRemSvyQst + 130) +#define ActShoDocDeg (ActRemSvyQst + 131) +#define ActHidDocDeg (ActRemSvyQst + 132) +#define ActReqDatAdmDocDeg (ActRemSvyQst + 133) +#define ActChgDatAdmDocDeg (ActRemSvyQst + 134) +#define ActDowAdmDocDeg (ActRemSvyQst + 135) -#define ActReqRemFilShaDeg (ActShoExaAnn + 136) -#define ActRemFilShaDeg (ActShoExaAnn + 137) -#define ActRemFolShaDeg (ActShoExaAnn + 138) -#define ActCopShaDeg (ActShoExaAnn + 139) -#define ActPasShaDeg (ActShoExaAnn + 140) -#define ActRemTreShaDeg (ActShoExaAnn + 141) -#define ActFrmCreShaDeg (ActShoExaAnn + 142) -#define ActCreFolShaDeg (ActShoExaAnn + 143) -#define ActCreLnkShaDeg (ActShoExaAnn + 144) -#define ActRenFolShaDeg (ActShoExaAnn + 145) -#define ActRcvFilShaDegDZ (ActShoExaAnn + 146) -#define ActRcvFilShaDegCla (ActShoExaAnn + 147) -#define ActExpShaDeg (ActShoExaAnn + 148) -#define ActConShaDeg (ActShoExaAnn + 149) -#define ActZIPShaDeg (ActShoExaAnn + 150) -#define ActReqDatShaDeg (ActShoExaAnn + 151) -#define ActChgDatShaDeg (ActShoExaAnn + 152) -#define ActDowShaDeg (ActShoExaAnn + 153) +#define ActReqRemFilShaDeg (ActRemSvyQst + 136) +#define ActRemFilShaDeg (ActRemSvyQst + 137) +#define ActRemFolShaDeg (ActRemSvyQst + 138) +#define ActCopShaDeg (ActRemSvyQst + 139) +#define ActPasShaDeg (ActRemSvyQst + 140) +#define ActRemTreShaDeg (ActRemSvyQst + 141) +#define ActFrmCreShaDeg (ActRemSvyQst + 142) +#define ActCreFolShaDeg (ActRemSvyQst + 143) +#define ActCreLnkShaDeg (ActRemSvyQst + 144) +#define ActRenFolShaDeg (ActRemSvyQst + 145) +#define ActRcvFilShaDegDZ (ActRemSvyQst + 146) +#define ActRcvFilShaDegCla (ActRemSvyQst + 147) +#define ActExpShaDeg (ActRemSvyQst + 148) +#define ActConShaDeg (ActRemSvyQst + 149) +#define ActZIPShaDeg (ActRemSvyQst + 150) +#define ActReqDatShaDeg (ActRemSvyQst + 151) +#define ActChgDatShaDeg (ActRemSvyQst + 152) +#define ActDowShaDeg (ActRemSvyQst + 153) -#define ActChgToSeeDocCrs (ActShoExaAnn + 154) -#define ActSeeDocCrs (ActShoExaAnn + 155) -#define ActExpSeeDocCrs (ActShoExaAnn + 156) -#define ActConSeeDocCrs (ActShoExaAnn + 157) -#define ActZIPSeeDocCrs (ActShoExaAnn + 158) -#define ActReqDatSeeDocCrs (ActShoExaAnn + 159) -#define ActDowSeeDocCrs (ActShoExaAnn + 160) +#define ActChgToSeeDocCrs (ActRemSvyQst + 154) +#define ActSeeDocCrs (ActRemSvyQst + 155) +#define ActExpSeeDocCrs (ActRemSvyQst + 156) +#define ActConSeeDocCrs (ActRemSvyQst + 157) +#define ActZIPSeeDocCrs (ActRemSvyQst + 158) +#define ActReqDatSeeDocCrs (ActRemSvyQst + 159) +#define ActDowSeeDocCrs (ActRemSvyQst + 160) -#define ActSeeDocGrp (ActShoExaAnn + 161) -#define ActExpSeeDocGrp (ActShoExaAnn + 162) -#define ActConSeeDocGrp (ActShoExaAnn + 163) -#define ActZIPSeeDocGrp (ActShoExaAnn + 164) -#define ActReqDatSeeDocGrp (ActShoExaAnn + 165) -#define ActDowSeeDocGrp (ActShoExaAnn + 166) +#define ActSeeDocGrp (ActRemSvyQst + 161) +#define ActExpSeeDocGrp (ActRemSvyQst + 162) +#define ActConSeeDocGrp (ActRemSvyQst + 163) +#define ActZIPSeeDocGrp (ActRemSvyQst + 164) +#define ActReqDatSeeDocGrp (ActRemSvyQst + 165) +#define ActDowSeeDocGrp (ActRemSvyQst + 166) -#define ActChgToAdmDocCrs (ActShoExaAnn + 167) -#define ActAdmDocCrs (ActShoExaAnn + 168) -#define ActReqRemFilDocCrs (ActShoExaAnn + 169) -#define ActRemFilDocCrs (ActShoExaAnn + 170) -#define ActRemFolDocCrs (ActShoExaAnn + 171) -#define ActCopDocCrs (ActShoExaAnn + 172) -#define ActPasDocCrs (ActShoExaAnn + 173) -#define ActRemTreDocCrs (ActShoExaAnn + 174) -#define ActFrmCreDocCrs (ActShoExaAnn + 175) -#define ActCreFolDocCrs (ActShoExaAnn + 176) -#define ActCreLnkDocCrs (ActShoExaAnn + 177) -#define ActRenFolDocCrs (ActShoExaAnn + 178) -#define ActRcvFilDocCrsDZ (ActShoExaAnn + 179) -#define ActRcvFilDocCrsCla (ActShoExaAnn + 180) -#define ActExpAdmDocCrs (ActShoExaAnn + 181) -#define ActConAdmDocCrs (ActShoExaAnn + 182) -#define ActZIPAdmDocCrs (ActShoExaAnn + 183) -#define ActShoDocCrs (ActShoExaAnn + 184) -#define ActHidDocCrs (ActShoExaAnn + 185) -#define ActReqDatAdmDocCrs (ActShoExaAnn + 186) -#define ActChgDatAdmDocCrs (ActShoExaAnn + 187) -#define ActDowAdmDocCrs (ActShoExaAnn + 188) +#define ActChgToAdmDocCrs (ActRemSvyQst + 167) +#define ActAdmDocCrs (ActRemSvyQst + 168) +#define ActReqRemFilDocCrs (ActRemSvyQst + 169) +#define ActRemFilDocCrs (ActRemSvyQst + 170) +#define ActRemFolDocCrs (ActRemSvyQst + 171) +#define ActCopDocCrs (ActRemSvyQst + 172) +#define ActPasDocCrs (ActRemSvyQst + 173) +#define ActRemTreDocCrs (ActRemSvyQst + 174) +#define ActFrmCreDocCrs (ActRemSvyQst + 175) +#define ActCreFolDocCrs (ActRemSvyQst + 176) +#define ActCreLnkDocCrs (ActRemSvyQst + 177) +#define ActRenFolDocCrs (ActRemSvyQst + 178) +#define ActRcvFilDocCrsDZ (ActRemSvyQst + 179) +#define ActRcvFilDocCrsCla (ActRemSvyQst + 180) +#define ActExpAdmDocCrs (ActRemSvyQst + 181) +#define ActConAdmDocCrs (ActRemSvyQst + 182) +#define ActZIPAdmDocCrs (ActRemSvyQst + 183) +#define ActShoDocCrs (ActRemSvyQst + 184) +#define ActHidDocCrs (ActRemSvyQst + 185) +#define ActReqDatAdmDocCrs (ActRemSvyQst + 186) +#define ActChgDatAdmDocCrs (ActRemSvyQst + 187) +#define ActDowAdmDocCrs (ActRemSvyQst + 188) -#define ActAdmDocGrp (ActShoExaAnn + 189) -#define ActReqRemFilDocGrp (ActShoExaAnn + 190) -#define ActRemFilDocGrp (ActShoExaAnn + 191) -#define ActRemFolDocGrp (ActShoExaAnn + 192) -#define ActCopDocGrp (ActShoExaAnn + 193) -#define ActPasDocGrp (ActShoExaAnn + 194) -#define ActRemTreDocGrp (ActShoExaAnn + 195) -#define ActFrmCreDocGrp (ActShoExaAnn + 196) -#define ActCreFolDocGrp (ActShoExaAnn + 197) -#define ActCreLnkDocGrp (ActShoExaAnn + 198) -#define ActRenFolDocGrp (ActShoExaAnn + 199) -#define ActRcvFilDocGrpDZ (ActShoExaAnn + 200) -#define ActRcvFilDocGrpCla (ActShoExaAnn + 201) -#define ActExpAdmDocGrp (ActShoExaAnn + 202) -#define ActConAdmDocGrp (ActShoExaAnn + 203) -#define ActZIPAdmDocGrp (ActShoExaAnn + 204) -#define ActShoDocGrp (ActShoExaAnn + 205) -#define ActHidDocGrp (ActShoExaAnn + 206) -#define ActReqDatAdmDocGrp (ActShoExaAnn + 207) -#define ActChgDatAdmDocGrp (ActShoExaAnn + 208) -#define ActDowAdmDocGrp (ActShoExaAnn + 209) +#define ActAdmDocGrp (ActRemSvyQst + 189) +#define ActReqRemFilDocGrp (ActRemSvyQst + 190) +#define ActRemFilDocGrp (ActRemSvyQst + 191) +#define ActRemFolDocGrp (ActRemSvyQst + 192) +#define ActCopDocGrp (ActRemSvyQst + 193) +#define ActPasDocGrp (ActRemSvyQst + 194) +#define ActRemTreDocGrp (ActRemSvyQst + 195) +#define ActFrmCreDocGrp (ActRemSvyQst + 196) +#define ActCreFolDocGrp (ActRemSvyQst + 197) +#define ActCreLnkDocGrp (ActRemSvyQst + 198) +#define ActRenFolDocGrp (ActRemSvyQst + 199) +#define ActRcvFilDocGrpDZ (ActRemSvyQst + 200) +#define ActRcvFilDocGrpCla (ActRemSvyQst + 201) +#define ActExpAdmDocGrp (ActRemSvyQst + 202) +#define ActConAdmDocGrp (ActRemSvyQst + 203) +#define ActZIPAdmDocGrp (ActRemSvyQst + 204) +#define ActShoDocGrp (ActRemSvyQst + 205) +#define ActHidDocGrp (ActRemSvyQst + 206) +#define ActReqDatAdmDocGrp (ActRemSvyQst + 207) +#define ActChgDatAdmDocGrp (ActRemSvyQst + 208) +#define ActDowAdmDocGrp (ActRemSvyQst + 209) -#define ActChgToAdmTch (ActShoExaAnn + 210) +#define ActChgToAdmTch (ActRemSvyQst + 210) -#define ActAdmTchCrs (ActShoExaAnn + 211) -#define ActReqRemFilTchCrs (ActShoExaAnn + 212) -#define ActRemFilTchCrs (ActShoExaAnn + 213) -#define ActRemFolTchCrs (ActShoExaAnn + 214) -#define ActCopTchCrs (ActShoExaAnn + 215) -#define ActPasTchCrs (ActShoExaAnn + 216) -#define ActRemTreTchCrs (ActShoExaAnn + 217) -#define ActFrmCreTchCrs (ActShoExaAnn + 218) -#define ActCreFolTchCrs (ActShoExaAnn + 219) -#define ActCreLnkTchCrs (ActShoExaAnn + 220) -#define ActRenFolTchCrs (ActShoExaAnn + 221) -#define ActRcvFilTchCrsDZ (ActShoExaAnn + 222) -#define ActRcvFilTchCrsCla (ActShoExaAnn + 223) -#define ActExpTchCrs (ActShoExaAnn + 224) -#define ActConTchCrs (ActShoExaAnn + 225) -#define ActZIPTchCrs (ActShoExaAnn + 226) -#define ActReqDatTchCrs (ActShoExaAnn + 227) -#define ActChgDatTchCrs (ActShoExaAnn + 228) -#define ActDowTchCrs (ActShoExaAnn + 229) +#define ActAdmTchCrs (ActRemSvyQst + 211) +#define ActReqRemFilTchCrs (ActRemSvyQst + 212) +#define ActRemFilTchCrs (ActRemSvyQst + 213) +#define ActRemFolTchCrs (ActRemSvyQst + 214) +#define ActCopTchCrs (ActRemSvyQst + 215) +#define ActPasTchCrs (ActRemSvyQst + 216) +#define ActRemTreTchCrs (ActRemSvyQst + 217) +#define ActFrmCreTchCrs (ActRemSvyQst + 218) +#define ActCreFolTchCrs (ActRemSvyQst + 219) +#define ActCreLnkTchCrs (ActRemSvyQst + 220) +#define ActRenFolTchCrs (ActRemSvyQst + 221) +#define ActRcvFilTchCrsDZ (ActRemSvyQst + 222) +#define ActRcvFilTchCrsCla (ActRemSvyQst + 223) +#define ActExpTchCrs (ActRemSvyQst + 224) +#define ActConTchCrs (ActRemSvyQst + 225) +#define ActZIPTchCrs (ActRemSvyQst + 226) +#define ActReqDatTchCrs (ActRemSvyQst + 227) +#define ActChgDatTchCrs (ActRemSvyQst + 228) +#define ActDowTchCrs (ActRemSvyQst + 229) -#define ActAdmTchGrp (ActShoExaAnn + 230) -#define ActReqRemFilTchGrp (ActShoExaAnn + 231) -#define ActRemFilTchGrp (ActShoExaAnn + 232) -#define ActRemFolTchGrp (ActShoExaAnn + 233) -#define ActCopTchGrp (ActShoExaAnn + 234) -#define ActPasTchGrp (ActShoExaAnn + 235) -#define ActRemTreTchGrp (ActShoExaAnn + 236) -#define ActFrmCreTchGrp (ActShoExaAnn + 237) -#define ActCreFolTchGrp (ActShoExaAnn + 238) -#define ActCreLnkTchGrp (ActShoExaAnn + 239) -#define ActRenFolTchGrp (ActShoExaAnn + 240) -#define ActRcvFilTchGrpDZ (ActShoExaAnn + 241) -#define ActRcvFilTchGrpCla (ActShoExaAnn + 242) -#define ActExpTchGrp (ActShoExaAnn + 243) -#define ActConTchGrp (ActShoExaAnn + 244) -#define ActZIPTchGrp (ActShoExaAnn + 245) -#define ActReqDatTchGrp (ActShoExaAnn + 246) -#define ActChgDatTchGrp (ActShoExaAnn + 247) -#define ActDowTchGrp (ActShoExaAnn + 248) +#define ActAdmTchGrp (ActRemSvyQst + 230) +#define ActReqRemFilTchGrp (ActRemSvyQst + 231) +#define ActRemFilTchGrp (ActRemSvyQst + 232) +#define ActRemFolTchGrp (ActRemSvyQst + 233) +#define ActCopTchGrp (ActRemSvyQst + 234) +#define ActPasTchGrp (ActRemSvyQst + 235) +#define ActRemTreTchGrp (ActRemSvyQst + 236) +#define ActFrmCreTchGrp (ActRemSvyQst + 237) +#define ActCreFolTchGrp (ActRemSvyQst + 238) +#define ActCreLnkTchGrp (ActRemSvyQst + 239) +#define ActRenFolTchGrp (ActRemSvyQst + 240) +#define ActRcvFilTchGrpDZ (ActRemSvyQst + 241) +#define ActRcvFilTchGrpCla (ActRemSvyQst + 242) +#define ActExpTchGrp (ActRemSvyQst + 243) +#define ActConTchGrp (ActRemSvyQst + 244) +#define ActZIPTchGrp (ActRemSvyQst + 245) +#define ActReqDatTchGrp (ActRemSvyQst + 246) +#define ActChgDatTchGrp (ActRemSvyQst + 247) +#define ActDowTchGrp (ActRemSvyQst + 248) -#define ActChgToAdmSha (ActShoExaAnn + 249) +#define ActChgToAdmSha (ActRemSvyQst + 249) -#define ActAdmShaCrs (ActShoExaAnn + 250) -#define ActReqRemFilShaCrs (ActShoExaAnn + 251) -#define ActRemFilShaCrs (ActShoExaAnn + 252) -#define ActRemFolShaCrs (ActShoExaAnn + 253) -#define ActCopShaCrs (ActShoExaAnn + 254) -#define ActPasShaCrs (ActShoExaAnn + 255) -#define ActRemTreShaCrs (ActShoExaAnn + 256) -#define ActFrmCreShaCrs (ActShoExaAnn + 257) -#define ActCreFolShaCrs (ActShoExaAnn + 258) -#define ActCreLnkShaCrs (ActShoExaAnn + 259) -#define ActRenFolShaCrs (ActShoExaAnn + 260) -#define ActRcvFilShaCrsDZ (ActShoExaAnn + 261) -#define ActRcvFilShaCrsCla (ActShoExaAnn + 262) -#define ActExpShaCrs (ActShoExaAnn + 263) -#define ActConShaCrs (ActShoExaAnn + 264) -#define ActZIPShaCrs (ActShoExaAnn + 265) -#define ActReqDatShaCrs (ActShoExaAnn + 266) -#define ActChgDatShaCrs (ActShoExaAnn + 267) -#define ActDowShaCrs (ActShoExaAnn + 268) +#define ActAdmShaCrs (ActRemSvyQst + 250) +#define ActReqRemFilShaCrs (ActRemSvyQst + 251) +#define ActRemFilShaCrs (ActRemSvyQst + 252) +#define ActRemFolShaCrs (ActRemSvyQst + 253) +#define ActCopShaCrs (ActRemSvyQst + 254) +#define ActPasShaCrs (ActRemSvyQst + 255) +#define ActRemTreShaCrs (ActRemSvyQst + 256) +#define ActFrmCreShaCrs (ActRemSvyQst + 257) +#define ActCreFolShaCrs (ActRemSvyQst + 258) +#define ActCreLnkShaCrs (ActRemSvyQst + 259) +#define ActRenFolShaCrs (ActRemSvyQst + 260) +#define ActRcvFilShaCrsDZ (ActRemSvyQst + 261) +#define ActRcvFilShaCrsCla (ActRemSvyQst + 262) +#define ActExpShaCrs (ActRemSvyQst + 263) +#define ActConShaCrs (ActRemSvyQst + 264) +#define ActZIPShaCrs (ActRemSvyQst + 265) +#define ActReqDatShaCrs (ActRemSvyQst + 266) +#define ActChgDatShaCrs (ActRemSvyQst + 267) +#define ActDowShaCrs (ActRemSvyQst + 268) -#define ActAdmShaGrp (ActShoExaAnn + 269) -#define ActReqRemFilShaGrp (ActShoExaAnn + 270) -#define ActRemFilShaGrp (ActShoExaAnn + 271) -#define ActRemFolShaGrp (ActShoExaAnn + 272) -#define ActCopShaGrp (ActShoExaAnn + 273) -#define ActPasShaGrp (ActShoExaAnn + 274) -#define ActRemTreShaGrp (ActShoExaAnn + 275) -#define ActFrmCreShaGrp (ActShoExaAnn + 276) -#define ActCreFolShaGrp (ActShoExaAnn + 277) -#define ActCreLnkShaGrp (ActShoExaAnn + 278) -#define ActRenFolShaGrp (ActShoExaAnn + 279) -#define ActRcvFilShaGrpDZ (ActShoExaAnn + 280) -#define ActRcvFilShaGrpCla (ActShoExaAnn + 281) -#define ActExpShaGrp (ActShoExaAnn + 282) -#define ActConShaGrp (ActShoExaAnn + 283) -#define ActZIPShaGrp (ActShoExaAnn + 284) -#define ActReqDatShaGrp (ActShoExaAnn + 285) -#define ActChgDatShaGrp (ActShoExaAnn + 286) -#define ActDowShaGrp (ActShoExaAnn + 287) +#define ActAdmShaGrp (ActRemSvyQst + 269) +#define ActReqRemFilShaGrp (ActRemSvyQst + 270) +#define ActRemFilShaGrp (ActRemSvyQst + 271) +#define ActRemFolShaGrp (ActRemSvyQst + 272) +#define ActCopShaGrp (ActRemSvyQst + 273) +#define ActPasShaGrp (ActRemSvyQst + 274) +#define ActRemTreShaGrp (ActRemSvyQst + 275) +#define ActFrmCreShaGrp (ActRemSvyQst + 276) +#define ActCreFolShaGrp (ActRemSvyQst + 277) +#define ActCreLnkShaGrp (ActRemSvyQst + 278) +#define ActRenFolShaGrp (ActRemSvyQst + 279) +#define ActRcvFilShaGrpDZ (ActRemSvyQst + 280) +#define ActRcvFilShaGrpCla (ActRemSvyQst + 281) +#define ActExpShaGrp (ActRemSvyQst + 282) +#define ActConShaGrp (ActRemSvyQst + 283) +#define ActZIPShaGrp (ActRemSvyQst + 284) +#define ActReqDatShaGrp (ActRemSvyQst + 285) +#define ActChgDatShaGrp (ActRemSvyQst + 286) +#define ActDowShaGrp (ActRemSvyQst + 287) -#define ActAdmAsgWrkCrs (ActShoExaAnn + 288) +#define ActAdmAsgWrkCrs (ActRemSvyQst + 288) -#define ActReqRemFilAsgUsr (ActShoExaAnn + 289) -#define ActRemFilAsgUsr (ActShoExaAnn + 290) -#define ActRemFolAsgUsr (ActShoExaAnn + 291) -#define ActCopAsgUsr (ActShoExaAnn + 292) -#define ActPasAsgUsr (ActShoExaAnn + 293) -#define ActRemTreAsgUsr (ActShoExaAnn + 294) -#define ActFrmCreAsgUsr (ActShoExaAnn + 295) -#define ActCreFolAsgUsr (ActShoExaAnn + 296) -#define ActCreLnkAsgUsr (ActShoExaAnn + 297) -#define ActRenFolAsgUsr (ActShoExaAnn + 298) -#define ActRcvFilAsgUsrDZ (ActShoExaAnn + 299) -#define ActRcvFilAsgUsrCla (ActShoExaAnn + 300) -#define ActExpAsgUsr (ActShoExaAnn + 301) -#define ActConAsgUsr (ActShoExaAnn + 302) -#define ActZIPAsgUsr (ActShoExaAnn + 303) -#define ActReqDatAsgUsr (ActShoExaAnn + 304) -#define ActChgDatAsgUsr (ActShoExaAnn + 305) -#define ActDowAsgUsr (ActShoExaAnn + 306) +#define ActReqRemFilAsgUsr (ActRemSvyQst + 289) +#define ActRemFilAsgUsr (ActRemSvyQst + 290) +#define ActRemFolAsgUsr (ActRemSvyQst + 291) +#define ActCopAsgUsr (ActRemSvyQst + 292) +#define ActPasAsgUsr (ActRemSvyQst + 293) +#define ActRemTreAsgUsr (ActRemSvyQst + 294) +#define ActFrmCreAsgUsr (ActRemSvyQst + 295) +#define ActCreFolAsgUsr (ActRemSvyQst + 296) +#define ActCreLnkAsgUsr (ActRemSvyQst + 297) +#define ActRenFolAsgUsr (ActRemSvyQst + 298) +#define ActRcvFilAsgUsrDZ (ActRemSvyQst + 299) +#define ActRcvFilAsgUsrCla (ActRemSvyQst + 300) +#define ActExpAsgUsr (ActRemSvyQst + 301) +#define ActConAsgUsr (ActRemSvyQst + 302) +#define ActZIPAsgUsr (ActRemSvyQst + 303) +#define ActReqDatAsgUsr (ActRemSvyQst + 304) +#define ActChgDatAsgUsr (ActRemSvyQst + 305) +#define ActDowAsgUsr (ActRemSvyQst + 306) -#define ActReqRemFilWrkUsr (ActShoExaAnn + 307) -#define ActRemFilWrkUsr (ActShoExaAnn + 308) -#define ActRemFolWrkUsr (ActShoExaAnn + 309) -#define ActCopWrkUsr (ActShoExaAnn + 310) -#define ActPasWrkUsr (ActShoExaAnn + 311) -#define ActRemTreWrkUsr (ActShoExaAnn + 312) -#define ActFrmCreWrkUsr (ActShoExaAnn + 313) -#define ActCreFolWrkUsr (ActShoExaAnn + 314) -#define ActCreLnkWrkUsr (ActShoExaAnn + 315) -#define ActRenFolWrkUsr (ActShoExaAnn + 316) -#define ActRcvFilWrkUsrDZ (ActShoExaAnn + 317) -#define ActRcvFilWrkUsrCla (ActShoExaAnn + 318) -#define ActExpWrkUsr (ActShoExaAnn + 319) -#define ActConWrkUsr (ActShoExaAnn + 320) -#define ActZIPWrkUsr (ActShoExaAnn + 321) -#define ActReqDatWrkUsr (ActShoExaAnn + 322) -#define ActChgDatWrkUsr (ActShoExaAnn + 323) -#define ActDowWrkUsr (ActShoExaAnn + 324) +#define ActReqRemFilWrkUsr (ActRemSvyQst + 307) +#define ActRemFilWrkUsr (ActRemSvyQst + 308) +#define ActRemFolWrkUsr (ActRemSvyQst + 309) +#define ActCopWrkUsr (ActRemSvyQst + 310) +#define ActPasWrkUsr (ActRemSvyQst + 311) +#define ActRemTreWrkUsr (ActRemSvyQst + 312) +#define ActFrmCreWrkUsr (ActRemSvyQst + 313) +#define ActCreFolWrkUsr (ActRemSvyQst + 314) +#define ActCreLnkWrkUsr (ActRemSvyQst + 315) +#define ActRenFolWrkUsr (ActRemSvyQst + 316) +#define ActRcvFilWrkUsrDZ (ActRemSvyQst + 317) +#define ActRcvFilWrkUsrCla (ActRemSvyQst + 318) +#define ActExpWrkUsr (ActRemSvyQst + 319) +#define ActConWrkUsr (ActRemSvyQst + 320) +#define ActZIPWrkUsr (ActRemSvyQst + 321) +#define ActReqDatWrkUsr (ActRemSvyQst + 322) +#define ActChgDatWrkUsr (ActRemSvyQst + 323) +#define ActDowWrkUsr (ActRemSvyQst + 324) -#define ActReqRemFilAsgCrs (ActShoExaAnn + 325) -#define ActRemFilAsgCrs (ActShoExaAnn + 326) -#define ActRemFolAsgCrs (ActShoExaAnn + 327) -#define ActCopAsgCrs (ActShoExaAnn + 328) -#define ActPasAsgCrs (ActShoExaAnn + 329) -#define ActRemTreAsgCrs (ActShoExaAnn + 330) -#define ActFrmCreAsgCrs (ActShoExaAnn + 331) -#define ActCreFolAsgCrs (ActShoExaAnn + 332) -#define ActCreLnkAsgCrs (ActShoExaAnn + 333) -#define ActRenFolAsgCrs (ActShoExaAnn + 334) -#define ActRcvFilAsgCrsDZ (ActShoExaAnn + 335) -#define ActRcvFilAsgCrsCla (ActShoExaAnn + 336) -#define ActExpAsgCrs (ActShoExaAnn + 337) -#define ActConAsgCrs (ActShoExaAnn + 338) -#define ActZIPAsgCrs (ActShoExaAnn + 339) -#define ActReqDatAsgCrs (ActShoExaAnn + 340) -#define ActChgDatAsgCrs (ActShoExaAnn + 341) -#define ActDowAsgCrs (ActShoExaAnn + 342) +#define ActReqRemFilAsgCrs (ActRemSvyQst + 325) +#define ActRemFilAsgCrs (ActRemSvyQst + 326) +#define ActRemFolAsgCrs (ActRemSvyQst + 327) +#define ActCopAsgCrs (ActRemSvyQst + 328) +#define ActPasAsgCrs (ActRemSvyQst + 329) +#define ActRemTreAsgCrs (ActRemSvyQst + 330) +#define ActFrmCreAsgCrs (ActRemSvyQst + 331) +#define ActCreFolAsgCrs (ActRemSvyQst + 332) +#define ActCreLnkAsgCrs (ActRemSvyQst + 333) +#define ActRenFolAsgCrs (ActRemSvyQst + 334) +#define ActRcvFilAsgCrsDZ (ActRemSvyQst + 335) +#define ActRcvFilAsgCrsCla (ActRemSvyQst + 336) +#define ActExpAsgCrs (ActRemSvyQst + 337) +#define ActConAsgCrs (ActRemSvyQst + 338) +#define ActZIPAsgCrs (ActRemSvyQst + 339) +#define ActReqDatAsgCrs (ActRemSvyQst + 340) +#define ActChgDatAsgCrs (ActRemSvyQst + 341) +#define ActDowAsgCrs (ActRemSvyQst + 342) -#define ActReqRemFilWrkCrs (ActShoExaAnn + 343) -#define ActRemFilWrkCrs (ActShoExaAnn + 344) -#define ActRemFolWrkCrs (ActShoExaAnn + 345) -#define ActCopWrkCrs (ActShoExaAnn + 346) -#define ActPasWrkCrs (ActShoExaAnn + 347) -#define ActRemTreWrkCrs (ActShoExaAnn + 348) -#define ActFrmCreWrkCrs (ActShoExaAnn + 349) -#define ActCreFolWrkCrs (ActShoExaAnn + 350) -#define ActCreLnkWrkCrs (ActShoExaAnn + 351) -#define ActRenFolWrkCrs (ActShoExaAnn + 352) -#define ActRcvFilWrkCrsDZ (ActShoExaAnn + 353) -#define ActRcvFilWrkCrsCla (ActShoExaAnn + 354) -#define ActExpWrkCrs (ActShoExaAnn + 355) -#define ActConWrkCrs (ActShoExaAnn + 356) -#define ActZIPWrkCrs (ActShoExaAnn + 357) -#define ActReqDatWrkCrs (ActShoExaAnn + 358) -#define ActChgDatWrkCrs (ActShoExaAnn + 359) -#define ActDowWrkCrs (ActShoExaAnn + 360) +#define ActReqRemFilWrkCrs (ActRemSvyQst + 343) +#define ActRemFilWrkCrs (ActRemSvyQst + 344) +#define ActRemFolWrkCrs (ActRemSvyQst + 345) +#define ActCopWrkCrs (ActRemSvyQst + 346) +#define ActPasWrkCrs (ActRemSvyQst + 347) +#define ActRemTreWrkCrs (ActRemSvyQst + 348) +#define ActFrmCreWrkCrs (ActRemSvyQst + 349) +#define ActCreFolWrkCrs (ActRemSvyQst + 350) +#define ActCreLnkWrkCrs (ActRemSvyQst + 351) +#define ActRenFolWrkCrs (ActRemSvyQst + 352) +#define ActRcvFilWrkCrsDZ (ActRemSvyQst + 353) +#define ActRcvFilWrkCrsCla (ActRemSvyQst + 354) +#define ActExpWrkCrs (ActRemSvyQst + 355) +#define ActConWrkCrs (ActRemSvyQst + 356) +#define ActZIPWrkCrs (ActRemSvyQst + 357) +#define ActReqDatWrkCrs (ActRemSvyQst + 358) +#define ActChgDatWrkCrs (ActRemSvyQst + 359) +#define ActDowWrkCrs (ActRemSvyQst + 360) -#define ActChgToSeeMrk (ActShoExaAnn + 361) +#define ActChgToSeeMrk (ActRemSvyQst + 361) -#define ActSeeMrkCrs (ActShoExaAnn + 362) -#define ActExpSeeMrkCrs (ActShoExaAnn + 363) -#define ActConSeeMrkCrs (ActShoExaAnn + 364) -#define ActReqDatSeeMrkCrs (ActShoExaAnn + 365) -#define ActSeeMyMrkCrs (ActShoExaAnn + 366) +#define ActSeeMrkCrs (ActRemSvyQst + 362) +#define ActExpSeeMrkCrs (ActRemSvyQst + 363) +#define ActConSeeMrkCrs (ActRemSvyQst + 364) +#define ActReqDatSeeMrkCrs (ActRemSvyQst + 365) +#define ActSeeMyMrkCrs (ActRemSvyQst + 366) -#define ActSeeMrkGrp (ActShoExaAnn + 367) -#define ActExpSeeMrkGrp (ActShoExaAnn + 368) -#define ActConSeeMrkGrp (ActShoExaAnn + 369) -#define ActReqDatSeeMrkGrp (ActShoExaAnn + 370) -#define ActSeeMyMrkGrp (ActShoExaAnn + 371) +#define ActSeeMrkGrp (ActRemSvyQst + 367) +#define ActExpSeeMrkGrp (ActRemSvyQst + 368) +#define ActConSeeMrkGrp (ActRemSvyQst + 369) +#define ActReqDatSeeMrkGrp (ActRemSvyQst + 370) +#define ActSeeMyMrkGrp (ActRemSvyQst + 371) -#define ActChgToAdmMrk (ActShoExaAnn + 372) +#define ActChgToAdmMrk (ActRemSvyQst + 372) -#define ActAdmMrkCrs (ActShoExaAnn + 373) -#define ActReqRemFilMrkCrs (ActShoExaAnn + 374) -#define ActRemFilMrkCrs (ActShoExaAnn + 375) -#define ActRemFolMrkCrs (ActShoExaAnn + 376) -#define ActCopMrkCrs (ActShoExaAnn + 377) -#define ActPasMrkCrs (ActShoExaAnn + 378) -#define ActRemTreMrkCrs (ActShoExaAnn + 379) -#define ActFrmCreMrkCrs (ActShoExaAnn + 380) -#define ActCreFolMrkCrs (ActShoExaAnn + 381) -#define ActRenFolMrkCrs (ActShoExaAnn + 382) -#define ActRcvFilMrkCrsDZ (ActShoExaAnn + 383) -#define ActRcvFilMrkCrsCla (ActShoExaAnn + 384) -#define ActExpAdmMrkCrs (ActShoExaAnn + 385) -#define ActConAdmMrkCrs (ActShoExaAnn + 386) -#define ActZIPAdmMrkCrs (ActShoExaAnn + 387) -#define ActShoMrkCrs (ActShoExaAnn + 388) -#define ActHidMrkCrs (ActShoExaAnn + 389) -#define ActReqDatAdmMrkCrs (ActShoExaAnn + 390) -#define ActChgDatAdmMrkCrs (ActShoExaAnn + 391) -#define ActDowAdmMrkCrs (ActShoExaAnn + 392) -#define ActChgNumRowHeaCrs (ActShoExaAnn + 393) -#define ActChgNumRowFooCrs (ActShoExaAnn + 394) +#define ActAdmMrkCrs (ActRemSvyQst + 373) +#define ActReqRemFilMrkCrs (ActRemSvyQst + 374) +#define ActRemFilMrkCrs (ActRemSvyQst + 375) +#define ActRemFolMrkCrs (ActRemSvyQst + 376) +#define ActCopMrkCrs (ActRemSvyQst + 377) +#define ActPasMrkCrs (ActRemSvyQst + 378) +#define ActRemTreMrkCrs (ActRemSvyQst + 379) +#define ActFrmCreMrkCrs (ActRemSvyQst + 380) +#define ActCreFolMrkCrs (ActRemSvyQst + 381) +#define ActRenFolMrkCrs (ActRemSvyQst + 382) +#define ActRcvFilMrkCrsDZ (ActRemSvyQst + 383) +#define ActRcvFilMrkCrsCla (ActRemSvyQst + 384) +#define ActExpAdmMrkCrs (ActRemSvyQst + 385) +#define ActConAdmMrkCrs (ActRemSvyQst + 386) +#define ActZIPAdmMrkCrs (ActRemSvyQst + 387) +#define ActShoMrkCrs (ActRemSvyQst + 388) +#define ActHidMrkCrs (ActRemSvyQst + 389) +#define ActReqDatAdmMrkCrs (ActRemSvyQst + 390) +#define ActChgDatAdmMrkCrs (ActRemSvyQst + 391) +#define ActDowAdmMrkCrs (ActRemSvyQst + 392) +#define ActChgNumRowHeaCrs (ActRemSvyQst + 393) +#define ActChgNumRowFooCrs (ActRemSvyQst + 394) -#define ActAdmMrkGrp (ActShoExaAnn + 395) -#define ActReqRemFilMrkGrp (ActShoExaAnn + 396) -#define ActRemFilMrkGrp (ActShoExaAnn + 397) -#define ActRemFolMrkGrp (ActShoExaAnn + 398) -#define ActCopMrkGrp (ActShoExaAnn + 399) -#define ActPasMrkGrp (ActShoExaAnn + 400) -#define ActRemTreMrkGrp (ActShoExaAnn + 401) -#define ActFrmCreMrkGrp (ActShoExaAnn + 402) -#define ActCreFolMrkGrp (ActShoExaAnn + 403) -#define ActRenFolMrkGrp (ActShoExaAnn + 404) -#define ActRcvFilMrkGrpDZ (ActShoExaAnn + 405) -#define ActRcvFilMrkGrpCla (ActShoExaAnn + 406) -#define ActExpAdmMrkGrp (ActShoExaAnn + 407) -#define ActConAdmMrkGrp (ActShoExaAnn + 408) -#define ActZIPAdmMrkGrp (ActShoExaAnn + 409) -#define ActShoMrkGrp (ActShoExaAnn + 410) -#define ActHidMrkGrp (ActShoExaAnn + 411) -#define ActReqDatAdmMrkGrp (ActShoExaAnn + 412) -#define ActChgDatAdmMrkGrp (ActShoExaAnn + 413) -#define ActDowAdmMrkGrp (ActShoExaAnn + 414) -#define ActChgNumRowHeaGrp (ActShoExaAnn + 415) -#define ActChgNumRowFooGrp (ActShoExaAnn + 416) +#define ActAdmMrkGrp (ActRemSvyQst + 395) +#define ActReqRemFilMrkGrp (ActRemSvyQst + 396) +#define ActRemFilMrkGrp (ActRemSvyQst + 397) +#define ActRemFolMrkGrp (ActRemSvyQst + 398) +#define ActCopMrkGrp (ActRemSvyQst + 399) +#define ActPasMrkGrp (ActRemSvyQst + 400) +#define ActRemTreMrkGrp (ActRemSvyQst + 401) +#define ActFrmCreMrkGrp (ActRemSvyQst + 402) +#define ActCreFolMrkGrp (ActRemSvyQst + 403) +#define ActRenFolMrkGrp (ActRemSvyQst + 404) +#define ActRcvFilMrkGrpDZ (ActRemSvyQst + 405) +#define ActRcvFilMrkGrpCla (ActRemSvyQst + 406) +#define ActExpAdmMrkGrp (ActRemSvyQst + 407) +#define ActConAdmMrkGrp (ActRemSvyQst + 408) +#define ActZIPAdmMrkGrp (ActRemSvyQst + 409) +#define ActShoMrkGrp (ActRemSvyQst + 410) +#define ActHidMrkGrp (ActRemSvyQst + 411) +#define ActReqDatAdmMrkGrp (ActRemSvyQst + 412) +#define ActChgDatAdmMrkGrp (ActRemSvyQst + 413) +#define ActDowAdmMrkGrp (ActRemSvyQst + 414) +#define ActChgNumRowHeaGrp (ActRemSvyQst + 415) +#define ActChgNumRowFooGrp (ActRemSvyQst + 416) /*****************************************************************************/ /******************************* Users tab ***********************************/ @@ -1362,41 +1381,23 @@ typedef signed int Act_Action_t; // Must be a signed type, because -1 is used to /****************************** Statistics tab *******************************/ /*****************************************************************************/ // Actions in menu -#define ActSeeAllSvy (ActUnbUsrLst + 1) -#define ActReqUseGbl (ActUnbUsrLst + 2) -#define ActSeePhoDeg (ActUnbUsrLst + 3) -#define ActReqStaCrs (ActUnbUsrLst + 4) -#define ActReqAccGbl (ActUnbUsrLst + 5) -#define ActReqMyUsgRep (ActUnbUsrLst + 6) -#define ActMFUAct (ActUnbUsrLst + 7) +#define ActReqUseGbl (ActUnbUsrLst + 1) +#define ActSeePhoDeg (ActUnbUsrLst + 2) +#define ActReqStaCrs (ActUnbUsrLst + 3) +#define ActReqAccGbl (ActUnbUsrLst + 4) +#define ActReqMyUsgRep (ActUnbUsrLst + 5) +#define ActMFUAct (ActUnbUsrLst + 6) // Secondary actions -#define ActSeeOneSvy (ActUnbUsrLst + 8) -#define ActAnsSvy (ActUnbUsrLst + 9) -#define ActFrmNewSvy (ActUnbUsrLst + 10) -#define ActEdiOneSvy (ActUnbUsrLst + 11) -#define ActNewSvy (ActUnbUsrLst + 12) -#define ActChgSvy (ActUnbUsrLst + 13) -#define ActReqRemSvy (ActUnbUsrLst + 14) -#define ActRemSvy (ActUnbUsrLst + 15) -#define ActReqRstSvy (ActUnbUsrLst + 16) -#define ActRstSvy (ActUnbUsrLst + 17) -#define ActHidSvy (ActUnbUsrLst + 18) -#define ActShoSvy (ActUnbUsrLst + 19) -#define ActEdiOneSvyQst (ActUnbUsrLst + 20) -#define ActRcvSvyQst (ActUnbUsrLst + 21) -#define ActReqRemSvyQst (ActUnbUsrLst + 22) -#define ActRemSvyQst (ActUnbUsrLst + 23) +#define ActSeeUseGbl (ActUnbUsrLst + 7) +#define ActPrnPhoDeg (ActUnbUsrLst + 8) +#define ActCalPhoDeg (ActUnbUsrLst + 9) +#define ActSeeAccGbl (ActUnbUsrLst + 10) +#define ActReqAccCrs (ActUnbUsrLst + 11) +#define ActSeeAccCrs (ActUnbUsrLst + 12) +#define ActSeeAllStaCrs (ActUnbUsrLst + 13) -#define ActSeeUseGbl (ActUnbUsrLst + 24) -#define ActPrnPhoDeg (ActUnbUsrLst + 25) -#define ActCalPhoDeg (ActUnbUsrLst + 26) -#define ActSeeAccGbl (ActUnbUsrLst + 27) -#define ActReqAccCrs (ActUnbUsrLst + 28) -#define ActSeeAccCrs (ActUnbUsrLst + 29) -#define ActSeeAllStaCrs (ActUnbUsrLst + 30) - -#define ActSeeMyUsgRep (ActUnbUsrLst + 31) +#define ActSeeMyUsgRep (ActUnbUsrLst + 14) /*****************************************************************************/ /******************************** Profile tab ********************************/ diff --git a/swad_changelog.h b/swad_changelog.h index 6337ec79..fddaae13 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -211,21 +211,24 @@ // TODO: En información de un centro, poner icono que enlace a edición de lugares, y posibilidad de editar lugar del centro en un menú desplegable. Lugar debería ir encima de Acceso directo. // TODO: Cuando se está editando instituciones, centros, titulaciones y asignaturas, poner un icono Ver (ojo) en la esquina superior izquierda. -// TODO: Changes in timetable (hours end in 24h). - // TODO: Fix bug: An URL like https://openswad.org/es?a gives Internal Server Error +// TODO: Fix bug: En Compartidos, si se borra la posibilidad de carpetas en un grupo ==> sale mensaje "The group has no file zones." + +// TODO: Change numbers of notifications in program and database to match order in tabs + /*****************************************************************************/ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.192.1 (2017-04-25)" +#define Log_PLATFORM_VERSION "SWAD 16.193 (2017-04-27)" #define CSS_FILE "swad16.192.css" #define JS_FILE "swad16.181.js" // Number of lines (includes comments but not blank lines) has been got with the following command: // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*?.h sql/swad*.sql | tail -1 /* + Version 16.193: Apr 27, 2017 Surveys action moved from statistics to assessment tab. (218262 lines) Version 16.192.1: Apr 25, 2017 Code refactoring in timetable. (218258 lines) Version 16.192: Apr 25, 2017 Changes in layout and code refactoring in timetable. (218262 lines) Version 16.191: Apr 25, 2017 Changes in layout of timetable. (218183 lines) diff --git a/swad_group.c b/swad_group.c index d6caf5d5..efc3bda7 100644 --- a/swad_group.c +++ b/swad_group.c @@ -4311,8 +4311,8 @@ void Grp_GetParamWhichGrps (void) case ActPrnCrsTT: case ActChgCrsTT1stDay: case ActSeeAsg: - case ActSeeAtt: case ActSeeAllSvy: + case ActSeeAtt: WhichGroupsDefault = Gbl.Usrs.Me.IBelongToCurrentCrs ? Grp_ONLY_MY_GROUPS : // If I belong to this course ==> see only my groups Grp_ALL_GROUPS; // If I don't belong to this course ==> see all groups break; diff --git a/swad_menu.c b/swad_menu.c index 40f4119d..94eb2d02 100644 --- a/swad_menu.c +++ b/swad_menu.c @@ -179,7 +179,7 @@ const Act_Action_t Mnu_MenuActions[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB ActSeeAsg, // 1 ActReqTst, // 2 ActSeeAllExaAnn, // 3 - 0, // 4 + ActSeeAllSvy, // 4 0, // 5 0, // 6 0, // 7 @@ -250,13 +250,13 @@ const Act_Action_t Mnu_MenuActions[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB }, // TabSta ******************* { - ActSeeAllSvy, // 0 - ActReqUseGbl, // 1 - ActSeePhoDeg, // 2 - ActReqStaCrs, // 3 - ActReqAccGbl, // 4 - ActReqMyUsgRep, // 5 - ActMFUAct, // 6 + ActReqUseGbl, // 0 + ActSeePhoDeg, // 1 + ActReqStaCrs, // 2 + ActReqAccGbl, // 3 + ActReqMyUsgRep, // 4 + ActMFUAct, // 5 + 0, // 6 0, // 7 0, // 8 0, // 9 diff --git a/swad_notification.c b/swad_notification.c index 1907eb1d..791979b6 100644 --- a/swad_notification.c +++ b/swad_notification.c @@ -124,11 +124,11 @@ static const Act_Action_t Ntf_DefaultActions[Ntf_NUM_NOTIFY_EVENTS] = ActSeeFor, // Ntf_EVENT_FORUM_REPLY /* Messages tab */ - ActSeeOneNot, // Ntf_EVENT_NOTICE + ActSeeOneNot, // Ntf_EVENT_NOTICE ActExpRcvMsg, // Ntf_EVENT_MESSAGE /* Statistics tab */ - ActSeeAllSvy, // Ntf_EVENT_SURVEY + ActSeeAllSvy, // Ntf_EVENT_SURVEY TODO: Move to assessment tab (also necessary in database) !!!!!!!!! /* Profile tab */ }; diff --git a/swad_notification.h b/swad_notification.h index 7d51d519..1076b40c 100644 --- a/swad_notification.h +++ b/swad_notification.h @@ -54,14 +54,17 @@ typedef enum Ntf_EVENT_UNKNOWN = 0, /* Course tab */ - Ntf_EVENT_DOCUMENT_FILE = 1, - Ntf_EVENT_TEACHERS_FILE = 2, - Ntf_EVENT_SHARED_FILE = 3, /* Assessment tab */ Ntf_EVENT_ASSIGNMENT = 4, Ntf_EVENT_EXAM_ANNOUNCEMENT = 5, Ntf_EVENT_MARKS_FILE = 6, + Ntf_EVENT_SURVEY = 19, // TODO: Change numbers (also in database)!!!!!!!!!!!!!! + + /* Files tab */ + Ntf_EVENT_DOCUMENT_FILE = 1, // TODO: Change numbers (also in database)!!!!!!!!!!!!!! + Ntf_EVENT_TEACHERS_FILE = 2, // TODO: Change numbers (also in database)!!!!!!!!!!!!!! + Ntf_EVENT_SHARED_FILE = 3, // TODO: Change numbers (also in database)!!!!!!!!!!!!!! /* Users tab */ Ntf_EVENT_ENROLMENT_STUDENT = 7, @@ -82,7 +85,6 @@ typedef enum Ntf_EVENT_MESSAGE = 18, /* Statistics tab */ - Ntf_EVENT_SURVEY = 19, /* Profile tab */ diff --git a/swad_pagination.c b/swad_pagination.c index 085f8c19..bbe3d6cc 100644 --- a/swad_pagination.c +++ b/swad_pagination.c @@ -48,12 +48,12 @@ extern const Act_Action_t For_ActionsSeePstFor[For_NUM_TYPES_FORUM]; static const char *Pag_ParamNumPag[Pag_NUM_WHAT_PAGINATE] = { "NumPagAsg", // Pag_ASSIGNMENTS + "NumPagSvy", // Pag_SURVEYS "NumPagAtt", // Pag_ATT_EVENTS "NumPagThr", // Pag_THREADS_FORUM "NumPagPst", // Pag_POSTS_FORUM "NumPagRcv", // Pag_MESSAGES_RECEIVED "NumPagSnt", // Pag_MESSAGES_SENT - "NumPagSvy", // Pag_SURVEYS "NumPagMyAgd", // Pag_MY_AGENDA "NumPagOthAgd", // Pag_ANOTHER_AGENDA }; @@ -159,6 +159,12 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate, Asg_PutHiddenParamAsgOrder (); Grp_PutParamWhichGrps (); break; + case Pag_SURVEYS: + Act_FormStartAnchor (ActSeeAllSvy,Pagination->Anchor); + Pag_PutHiddenParamPagNum (WhatPaginate,1); + Asg_PutHiddenParamAsgOrder (); + Grp_PutParamWhichGrps (); + break; case Pag_ATT_EVENTS: Act_FormStartAnchor (ActSeeAtt,Pagination->Anchor); Pag_PutHiddenParamPagNum (WhatPaginate,1); @@ -197,12 +203,6 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate, Pag_PutHiddenParamPagNum (WhatPaginate,1); Msg_PutHiddenParamsMsgsFilters (); break; - case Pag_SURVEYS: - Act_FormStartAnchor (ActSeeAllSvy,Pagination->Anchor); - Pag_PutHiddenParamPagNum (WhatPaginate,1); - Asg_PutHiddenParamAsgOrder (); - Grp_PutParamWhichGrps (); - break; case Pag_MY_AGENDA: Act_FormStartAnchor (ActSeeMyAgd,Pagination->Anchor); Agd_PutParamsMyAgenda (Gbl.Agenda.Past__FutureEvents, @@ -254,6 +254,12 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate, Asg_PutHiddenParamAsgOrder (); Grp_PutParamWhichGrps (); break; + case Pag_SURVEYS: + Act_FormStartAnchor (ActSeeAllSvy,Pagination->Anchor); + Pag_PutHiddenParamPagNum (WhatPaginate,1); + Asg_PutHiddenParamAsgOrder (); + Grp_PutParamWhichGrps (); + break; case Pag_ATT_EVENTS: Act_FormStartAnchor (ActSeeAtt,Pagination->Anchor); Pag_PutHiddenParamPagNum (WhatPaginate,1); @@ -292,12 +298,6 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate, Pag_PutHiddenParamPagNum (WhatPaginate,1); Msg_PutHiddenParamsMsgsFilters (); break; - case Pag_SURVEYS: - Act_FormStartAnchor (ActSeeAllSvy,Pagination->Anchor); - Pag_PutHiddenParamPagNum (WhatPaginate,1); - Asg_PutHiddenParamAsgOrder (); - Grp_PutParamWhichGrps (); - break; case Pag_MY_AGENDA: Act_FormStartAnchor (ActSeeMyAgd,Pagination->Anchor); Agd_PutParamsMyAgenda (Gbl.Agenda.Past__FutureEvents, @@ -335,6 +335,12 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate, Asg_PutHiddenParamAsgOrder (); Grp_PutParamWhichGrps (); break; + case Pag_SURVEYS: + Act_FormStartAnchor (ActSeeAllSvy,Pagination->Anchor); + Pag_PutHiddenParamPagNum (WhatPaginate,Pagination->LeftPage); + Asg_PutHiddenParamAsgOrder (); + Grp_PutParamWhichGrps (); + break; case Pag_ATT_EVENTS: Act_FormStartAnchor (ActSeeAtt,Pagination->Anchor); Pag_PutHiddenParamPagNum (WhatPaginate,Pagination->LeftPage); @@ -373,12 +379,6 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate, Pag_PutHiddenParamPagNum (WhatPaginate,Pagination->LeftPage); Msg_PutHiddenParamsMsgsFilters (); break; - case Pag_SURVEYS: - Act_FormStartAnchor (ActSeeAllSvy,Pagination->Anchor); - Pag_PutHiddenParamPagNum (WhatPaginate,Pagination->LeftPage); - Asg_PutHiddenParamAsgOrder (); - Grp_PutParamWhichGrps (); - break; case Pag_MY_AGENDA: Act_FormStartAnchor (ActSeeMyAgd,Pagination->Anchor); Agd_PutParamsMyAgenda (Gbl.Agenda.Past__FutureEvents, @@ -427,6 +427,12 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate, Asg_PutHiddenParamAsgOrder (); Grp_PutParamWhichGrps (); break; + case Pag_SURVEYS: + Act_FormStartAnchor (ActSeeAllSvy,Pagination->Anchor); + Pag_PutHiddenParamPagNum (WhatPaginate,NumPage); + Asg_PutHiddenParamAsgOrder (); + Grp_PutParamWhichGrps (); + break; case Pag_ATT_EVENTS: Act_FormStartAnchor (ActSeeAtt,Pagination->Anchor); Pag_PutHiddenParamPagNum (WhatPaginate,NumPage); @@ -465,12 +471,6 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate, Pag_PutHiddenParamPagNum (WhatPaginate,NumPage); Msg_PutHiddenParamsMsgsFilters (); break; - case Pag_SURVEYS: - Act_FormStartAnchor (ActSeeAllSvy,Pagination->Anchor); - Pag_PutHiddenParamPagNum (WhatPaginate,NumPage); - Asg_PutHiddenParamAsgOrder (); - Grp_PutParamWhichGrps (); - break; case Pag_MY_AGENDA: Act_FormStartAnchor (ActSeeMyAgd,Pagination->Anchor); Agd_PutParamsMyAgenda (Gbl.Agenda.Past__FutureEvents, @@ -507,6 +507,12 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate, Asg_PutHiddenParamAsgOrder (); Grp_PutParamWhichGrps (); break; + case Pag_SURVEYS: + Act_FormStartAnchor (ActSeeAllSvy,Pagination->Anchor); + Pag_PutHiddenParamPagNum (WhatPaginate,Pagination->RightPage); + Asg_PutHiddenParamAsgOrder (); + Grp_PutParamWhichGrps (); + break; case Pag_ATT_EVENTS: Act_FormStartAnchor (ActSeeAtt,Pagination->Anchor); Pag_PutHiddenParamPagNum (WhatPaginate,Pagination->RightPage); @@ -545,12 +551,6 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate, Pag_PutHiddenParamPagNum (WhatPaginate,Pagination->RightPage); Msg_PutHiddenParamsMsgsFilters (); break; - case Pag_SURVEYS: - Act_FormStartAnchor (ActSeeAllSvy,Pagination->Anchor); - Pag_PutHiddenParamPagNum (WhatPaginate,Pagination->RightPage); - Asg_PutHiddenParamAsgOrder (); - Grp_PutParamWhichGrps (); - break; case Pag_MY_AGENDA: Act_FormStartAnchor (ActSeeMyAgd,Pagination->Anchor); Agd_PutParamsMyAgenda (Gbl.Agenda.Past__FutureEvents, @@ -586,6 +586,12 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate, Asg_PutHiddenParamAsgOrder (); Grp_PutParamWhichGrps (); break; + case Pag_SURVEYS: + Act_FormStartAnchor (ActSeeAllSvy,Pagination->Anchor); + Pag_PutHiddenParamPagNum (WhatPaginate,Pagination->NumPags); + Asg_PutHiddenParamAsgOrder (); + Grp_PutParamWhichGrps (); + break; case Pag_ATT_EVENTS: Act_FormStartAnchor (ActSeeAtt,Pagination->Anchor); Pag_PutHiddenParamPagNum (WhatPaginate,Pagination->NumPags); @@ -624,12 +630,6 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate, Pag_PutHiddenParamPagNum (WhatPaginate,Pagination->NumPags); Msg_PutHiddenParamsMsgsFilters (); break; - case Pag_SURVEYS: - Act_FormStartAnchor (ActSeeAllSvy,Pagination->Anchor); - Pag_PutHiddenParamPagNum (WhatPaginate,Pagination->NumPags); - Asg_PutHiddenParamAsgOrder (); - Grp_PutParamWhichGrps (); - break; case Pag_MY_AGENDA: Act_FormStartAnchor (ActSeeMyAgd,Pagination->Anchor); Agd_PutParamsMyAgenda (Gbl.Agenda.Past__FutureEvents, diff --git a/swad_pagination.h b/swad_pagination.h index 4f2c09be..7a207f1b 100644 --- a/swad_pagination.h +++ b/swad_pagination.h @@ -41,12 +41,12 @@ typedef enum { Pag_ASSIGNMENTS = 0, - Pag_ATT_EVENTS = 1, - Pag_THREADS_FORUM = 2, - Pag_POSTS_FORUM = 3, - Pag_MESSAGES_RECEIVED = 4, - Pag_MESSAGES_SENT = 5, - Pag_SURVEYS = 6, + Pag_SURVEYS = 1, + Pag_ATT_EVENTS = 2, + Pag_THREADS_FORUM = 3, + Pag_POSTS_FORUM = 4, + Pag_MESSAGES_RECEIVED = 5, + Pag_MESSAGES_SENT = 6, Pag_MY_AGENDA = 7, Pag_ANOTHER_AGENDA = 8, } Pag_WhatPaginate_t; diff --git a/swad_tab.c b/swad_tab.c index d467b5c1..3d8b675a 100644 --- a/swad_tab.c +++ b/swad_tab.c @@ -185,7 +185,6 @@ static bool Tab_CheckIfICanViewTab (Tab_Tab_t Tab) return (Gbl.CurrentDeg.Deg.DegCod > 0 && Gbl.CurrentCrs.Crs.CrsCod <= 0); case TabCrs: - case TabAss: return (Gbl.CurrentCrs.Crs.CrsCod > 0); case TabFil: return (Gbl.CurrentIns.Ins.InsCod > 0); diff --git a/swad_text.c b/swad_text.c index f9cd9355..693cd724 100644 --- a/swad_text.c +++ b/swad_text.c @@ -18843,7 +18843,27 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Chamadas" #endif , - NULL, // 4 + // 4: ActSeeAllSvy +#if L==1 + "Enquestes" +#elif L==2 + "Umfragen" +#elif L==3 + "Surveys" +#elif L==4 + "Encuestas" +#elif L==5 + "Sondages" +#elif L==6 + "Encuestas" // Okoteve traducción +#elif L==7 + "Sondaggi" +#elif L==8 + "Ankiety" +#elif L==9 + "Inquéritos" +#endif + , NULL, // 5 NULL, // 6 NULL, // 7 @@ -19533,28 +19553,7 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = }, { // TabSta ********************************************************************** - // 0: ActSeeAllSvy -#if L==1 - "Enquestes" -#elif L==2 - "Umfragen" -#elif L==3 - "Surveys" -#elif L==4 - "Encuestas" -#elif L==5 - "Sondages" -#elif L==6 - "Encuestas" // Okoteve traducción -#elif L==7 - "Sondaggi" -#elif L==8 - "Ankiety" -#elif L==9 - "Inquéritos" -#endif - , - // 1: ActReqUseGbl + // 0: ActReqUseGbl #if L==1 "Xifres" #elif L==2 @@ -19575,7 +19574,7 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Números" #endif , - // 2: ActSeePhoDeg + // 1: ActSeePhoDeg #if L==1 "Titulacions" #elif L==2 @@ -19596,7 +19595,7 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Titulaçãos" #endif , - // 3: ActReqStaCrs + // 2: ActReqStaCrs #if L==1 "Indicadors" #elif L==2 @@ -19617,7 +19616,7 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Indicadores" #endif , - // 4: ActReqAccGbl + // 3: ActReqAccGbl #if L==1 "Accessos" #elif L==2 @@ -19638,7 +19637,7 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Visitas" #endif , - // 5: ActReqMyUsgRep + // 4: ActReqMyUsgRep #if L==1 "Informe" #elif L==2 @@ -19659,7 +19658,7 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Relatório" #endif , - // 6: ActMFUAct + // 5: ActMFUAct #if L==1 "Freqüents" #elif L==2 @@ -19680,6 +19679,7 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Freqüentes" #endif , + NULL, // 6 NULL, // 7 NULL, // 8 NULL, // 9 @@ -20768,7 +20768,27 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Chamadas para exames" #endif , - NULL, // 4 + // 4: ActSeeAllSvy +#if L==1 + "Enquestes anònimes" +#elif L==2 + "Umfragen" +#elif L==3 + "Surveys" +#elif L==4 + "Encuestas anónimas" +#elif L==5 + "Sondages" +#elif L==6 + "Encuestas anónimas" // Okoteve traducción +#elif L==7 + "Sondaggi" +#elif L==8 + "Ankiety" +#elif L==9 + "Inquéritos" +#endif + , NULL, // 5 NULL, // 6 NULL, // 7 @@ -21499,28 +21519,7 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = }, { // TabSta ***************************************************** - // 0: ActSeeAllSvy -#if L==1 - "Enquestes anònimes" -#elif L==2 - "Umfragen" -#elif L==3 - "Surveys" -#elif L==4 - "Encuestas anónimas" -#elif L==5 - "Sondages" -#elif L==6 - "Encuestas anónimas" // Okoteve traducción -#elif L==7 - "Sondaggi" -#elif L==8 - "Ankiety" -#elif L==9 - "Inquéritos" -#endif - , - // 1: ActReqUseGbl + // 0: ActReqUseGbl #if L==1 "Grans nombres sobre l'ús actual de tota la plataforma," " o d'aquesta titulació o assignatura" @@ -21544,7 +21543,7 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Utilização de SWAD" #endif , - // 2: ActSeePhoDeg + // 1: ActSeePhoDeg #if L==1 "Estadístiques del nombre d'estudiants en cada titulació" " representades per les fotos mitjana dels estudiants" @@ -21568,7 +21567,7 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Fotografia titulaçoes" #endif , - // 3: ActReqStaCrs + // 2: ActReqStaCrs #if L==1 "Indicadors d'assignatures per al contracte-programa" #elif L==2 @@ -21589,7 +21588,7 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Indicadores de disciplinas para o contrato programa" #endif , - // 4: ActReqAccGbl + // 3: ActReqAccGbl #if L==1 "Estadístiques d'accesso a la plataforma" #elif L==2 @@ -21610,7 +21609,7 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Estatísticas de acesso à plataforma" #endif , - // 5: ActReqMyUsgRep + // 4: ActReqMyUsgRep #if L==1 "Informe sobre el meu ús de la plataforma" #elif L==2 @@ -21631,7 +21630,7 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Relatório sobre o meu uso da plataforma" #endif , - // 6: ActMFUAct + // 5: ActMFUAct #if L==1 "Accés directe a les meves accions més freqüents" #elif L==2 @@ -21652,6 +21651,7 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Acesso direto das minhas ações mais freqüentes" #endif , + NULL, // 6 NULL, // 7 NULL, // 8 NULL, // 9 diff --git a/swad_timetable.c b/swad_timetable.c index 8ebda16d..727d92ba 100644 --- a/swad_timetable.c +++ b/swad_timetable.c @@ -27,6 +27,7 @@ #include // For NULL #include // For fprintf, etc. +#include // For malloc, calloc, free #include // For string functions #include "swad_calendar.h" @@ -1054,7 +1055,7 @@ static void TT_FillTimeTableFromDB (long UsrCod) } /*****************************************************************************/ -/****************** Get resolution given a time in seconds *******************/ +/** Calculate range of a cell (start hour, end hour, minutes per interval) ***/ /*****************************************************************************/ static void TT_CalculateRangeCell (unsigned StartTimeSeconds, @@ -1091,6 +1092,9 @@ static void TT_CalculateRangeCell (unsigned StartTimeSeconds, } } +/*****************************************************************************/ +/*********************** Calculate minutes per interval **********************/ +/*****************************************************************************/ // Example: if Seconds == 42300 (time == 11:45:00) => Minutes = 45 => Resolution = 15 static unsigned TT_CalculateMinutesPerInterval (unsigned Seconds) @@ -1389,13 +1393,11 @@ static unsigned TT_CalculateColsToDrawInCell (bool TopCall, static bool *TT_IntervalsChecked; if (TopCall) // Top call, non recursive call - { /****** Allocate space to store list of intervals already checked and initialize to false by using calloc *****/ if ((TT_IntervalsChecked = (bool *) calloc (Gbl.TimeTable.Config.IntervalsPerDay, sizeof (bool))) == NULL) Lay_ShowErrorAndExit ("Error allocating memory for timetable."); - } ColumnsToDraw = TT_TimeTable[Weekday][Interval].NumColumns; @@ -1405,13 +1407,13 @@ static unsigned TT_CalculateColsToDrawInCell (bool TopCall, for (Column = 0; Column < TT_MAX_COLUMNS_PER_CELL; Column++) - { switch (TT_TimeTable[Weekday][Interval].Columns[Column].IntervalType) { case TT_FREE_INTERVAL: break; case TT_FIRST_INTERVAL: - /* Check from first hour (this one) to last hour searching maximum number of columns */ + /* Check from first hour (this one) to last hour + searching maximum number of columns */ for (i = Interval + 1; i < Interval + TT_TimeTable[Weekday][Interval].Columns[Column].DurationIntervals; i++) @@ -1429,7 +1431,8 @@ static unsigned TT_CalculateColsToDrawInCell (bool TopCall, TT_TimeTable[Weekday][FirstHour].Columns[Column].IntervalType == TT_NEXT_INTERVAL; FirstHour--); - /* Check from first hour to last hour searching maximum number of columns */ + /* Check from first hour to last hour + searching maximum number of columns */ for (i = FirstHour; i < FirstHour + TT_TimeTable[Weekday][FirstHour].Columns[Column].DurationIntervals; i++) @@ -1442,7 +1445,6 @@ static unsigned TT_CalculateColsToDrawInCell (bool TopCall, } break; } - } } if (TopCall) // Top call, non recursive call