From 68bd4d4db854cddaaf41e10b2be12ad620099ef4 Mon Sep 17 00:00:00 2001 From: acanas Date: Sat, 4 Mar 2023 13:14:24 +0100 Subject: [PATCH] Version 22.66.3: Mar 04, 2023 New action to edit a new rubric criterion. Not finished. --- swad_action_list.c | 3 + swad_action_list.h | 886 +++++++++++++++++++++-------------------- swad_changelog.h | 3 +- swad_rubric.c | 4 +- swad_rubric.h | 2 +- swad_rubric_criteria.c | 59 ++- swad_rubric_criteria.h | 2 + swad_text.c | 92 ++--- swad_text_action.c | 23 ++ 9 files changed, 578 insertions(+), 496 deletions(-) diff --git a/swad_action_list.c b/swad_action_list.c index 49f605ce3..52505feb8 100644 --- a/swad_action_list.c +++ b/swad_action_list.c @@ -100,6 +100,7 @@ #include "swad_report.h" #include "swad_role.h" #include "swad_rubric.h" +#include "swad_rubric_criteria.h" #include "swad_search.h" #include "swad_session.h" #include "swad_setting.h" @@ -842,6 +843,7 @@ const struct Act_Actions ActLst_Actions[ActLst_NUM_ACTIONS] = [ActChgRub ] = {1956,-1,TabUnk,ActSeeAllRub ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Rub_ReceiveFormRubric ,NULL}, [ActReqRemRub ] = {1957,-1,TabUnk,ActSeeAllRub ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Rub_AskRemRubric ,NULL}, [ActRemRub ] = {1958,-1,TabUnk,ActSeeAllRub ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Rub_RemoveRubric ,NULL}, + [ActFrmNewRubCri ] = {1959,-1,TabUnk,ActSeeAllRub ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,RubCri_RequestCreatOrEditCri ,NULL}, // TabFil ****************************************************************** // Actions in menu: @@ -3832,4 +3834,5 @@ Act_Action_t ActLst_FromActCodToAction[1 + ActLst_MAX_ACTION_COD] = // Do not re ActChgRub, // #1956 ActReqRemRub, // #1957 ActRemRub, // #1958 + ActFrmNewRubCri, // #1959 }; diff --git a/swad_action_list.h b/swad_action_list.h index 6accd5c4d..857007f72 100644 --- a/swad_action_list.h +++ b/swad_action_list.h @@ -767,479 +767,481 @@ #define ActReqRemRub (ActChgCrsTT1stDay + 225) #define ActRemRub (ActChgCrsTT1stDay + 226) +#define ActFrmNewRubCri (ActChgCrsTT1stDay + 227) + /*****************************************************************************/ /******************************** Files tab **********************************/ /*****************************************************************************/ // Actions in menu -#define ActSeeAdmDocIns (ActRemRub + 1) -#define ActAdmShaIns (ActRemRub + 2) -#define ActSeeAdmDocCtr (ActRemRub + 3) -#define ActAdmShaCtr (ActRemRub + 4) -#define ActSeeAdmDocDeg (ActRemRub + 5) -#define ActAdmShaDeg (ActRemRub + 6) -#define ActSeeAdmDocCrsGrp (ActRemRub + 7) -#define ActAdmTchCrsGrp (ActRemRub + 8) -#define ActAdmShaCrsGrp (ActRemRub + 9) -#define ActAdmAsgWrkUsr (ActRemRub + 10) -#define ActReqAsgWrkCrs (ActRemRub + 11) -#define ActSeeAdmMrk (ActRemRub + 12) -#define ActAdmBrf (ActRemRub + 13) +#define ActSeeAdmDocIns (ActFrmNewRubCri + 1) +#define ActAdmShaIns (ActFrmNewRubCri + 2) +#define ActSeeAdmDocCtr (ActFrmNewRubCri + 3) +#define ActAdmShaCtr (ActFrmNewRubCri + 4) +#define ActSeeAdmDocDeg (ActFrmNewRubCri + 5) +#define ActAdmShaDeg (ActFrmNewRubCri + 6) +#define ActSeeAdmDocCrsGrp (ActFrmNewRubCri + 7) +#define ActAdmTchCrsGrp (ActFrmNewRubCri + 8) +#define ActAdmShaCrsGrp (ActFrmNewRubCri + 9) +#define ActAdmAsgWrkUsr (ActFrmNewRubCri + 10) +#define ActReqAsgWrkCrs (ActFrmNewRubCri + 11) +#define ActSeeAdmMrk (ActFrmNewRubCri + 12) +#define ActAdmBrf (ActFrmNewRubCri + 13) // Secondary actions -#define ActChgToSeeDocIns (ActRemRub + 14) -#define ActSeeDocIns (ActRemRub + 15) -#define ActExpSeeDocIns (ActRemRub + 16) -#define ActConSeeDocIns (ActRemRub + 17) -#define ActZIPSeeDocIns (ActRemRub + 18) -#define ActReqDatSeeDocIns (ActRemRub + 19) -#define ActDowSeeDocIns (ActRemRub + 20) -#define ActChgToAdmDocIns (ActRemRub + 21) -#define ActAdmDocIns (ActRemRub + 22) -#define ActReqRemFilDocIns (ActRemRub + 23) -#define ActRemFilDocIns (ActRemRub + 24) -#define ActRemFolDocIns (ActRemRub + 25) -#define ActCopDocIns (ActRemRub + 26) -#define ActPasDocIns (ActRemRub + 27) -#define ActRemTreDocIns (ActRemRub + 28) -#define ActFrmCreDocIns (ActRemRub + 29) -#define ActCreFolDocIns (ActRemRub + 30) -#define ActCreLnkDocIns (ActRemRub + 31) -#define ActRenFolDocIns (ActRemRub + 32) -#define ActRcvFilDocInsDZ (ActRemRub + 33) -#define ActRcvFilDocInsCla (ActRemRub + 34) -#define ActExpAdmDocIns (ActRemRub + 35) -#define ActConAdmDocIns (ActRemRub + 36) -#define ActZIPAdmDocIns (ActRemRub + 37) -#define ActUnhDocIns (ActRemRub + 38) -#define ActHidDocIns (ActRemRub + 39) -#define ActReqDatAdmDocIns (ActRemRub + 40) -#define ActChgDatAdmDocIns (ActRemRub + 41) -#define ActDowAdmDocIns (ActRemRub + 42) +#define ActChgToSeeDocIns (ActFrmNewRubCri + 14) +#define ActSeeDocIns (ActFrmNewRubCri + 15) +#define ActExpSeeDocIns (ActFrmNewRubCri + 16) +#define ActConSeeDocIns (ActFrmNewRubCri + 17) +#define ActZIPSeeDocIns (ActFrmNewRubCri + 18) +#define ActReqDatSeeDocIns (ActFrmNewRubCri + 19) +#define ActDowSeeDocIns (ActFrmNewRubCri + 20) +#define ActChgToAdmDocIns (ActFrmNewRubCri + 21) +#define ActAdmDocIns (ActFrmNewRubCri + 22) +#define ActReqRemFilDocIns (ActFrmNewRubCri + 23) +#define ActRemFilDocIns (ActFrmNewRubCri + 24) +#define ActRemFolDocIns (ActFrmNewRubCri + 25) +#define ActCopDocIns (ActFrmNewRubCri + 26) +#define ActPasDocIns (ActFrmNewRubCri + 27) +#define ActRemTreDocIns (ActFrmNewRubCri + 28) +#define ActFrmCreDocIns (ActFrmNewRubCri + 29) +#define ActCreFolDocIns (ActFrmNewRubCri + 30) +#define ActCreLnkDocIns (ActFrmNewRubCri + 31) +#define ActRenFolDocIns (ActFrmNewRubCri + 32) +#define ActRcvFilDocInsDZ (ActFrmNewRubCri + 33) +#define ActRcvFilDocInsCla (ActFrmNewRubCri + 34) +#define ActExpAdmDocIns (ActFrmNewRubCri + 35) +#define ActConAdmDocIns (ActFrmNewRubCri + 36) +#define ActZIPAdmDocIns (ActFrmNewRubCri + 37) +#define ActUnhDocIns (ActFrmNewRubCri + 38) +#define ActHidDocIns (ActFrmNewRubCri + 39) +#define ActReqDatAdmDocIns (ActFrmNewRubCri + 40) +#define ActChgDatAdmDocIns (ActFrmNewRubCri + 41) +#define ActDowAdmDocIns (ActFrmNewRubCri + 42) -#define ActReqRemFilShaIns (ActRemRub + 43) -#define ActRemFilShaIns (ActRemRub + 44) -#define ActRemFolShaIns (ActRemRub + 45) -#define ActCopShaIns (ActRemRub + 46) -#define ActPasShaIns (ActRemRub + 47) -#define ActRemTreShaIns (ActRemRub + 48) -#define ActFrmCreShaIns (ActRemRub + 49) -#define ActCreFolShaIns (ActRemRub + 50) -#define ActCreLnkShaIns (ActRemRub + 51) -#define ActRenFolShaIns (ActRemRub + 52) -#define ActRcvFilShaInsDZ (ActRemRub + 53) -#define ActRcvFilShaInsCla (ActRemRub + 54) -#define ActExpShaIns (ActRemRub + 55) -#define ActConShaIns (ActRemRub + 56) -#define ActZIPShaIns (ActRemRub + 57) -#define ActReqDatShaIns (ActRemRub + 58) -#define ActChgDatShaIns (ActRemRub + 59) -#define ActDowShaIns (ActRemRub + 60) +#define ActReqRemFilShaIns (ActFrmNewRubCri + 43) +#define ActRemFilShaIns (ActFrmNewRubCri + 44) +#define ActRemFolShaIns (ActFrmNewRubCri + 45) +#define ActCopShaIns (ActFrmNewRubCri + 46) +#define ActPasShaIns (ActFrmNewRubCri + 47) +#define ActRemTreShaIns (ActFrmNewRubCri + 48) +#define ActFrmCreShaIns (ActFrmNewRubCri + 49) +#define ActCreFolShaIns (ActFrmNewRubCri + 50) +#define ActCreLnkShaIns (ActFrmNewRubCri + 51) +#define ActRenFolShaIns (ActFrmNewRubCri + 52) +#define ActRcvFilShaInsDZ (ActFrmNewRubCri + 53) +#define ActRcvFilShaInsCla (ActFrmNewRubCri + 54) +#define ActExpShaIns (ActFrmNewRubCri + 55) +#define ActConShaIns (ActFrmNewRubCri + 56) +#define ActZIPShaIns (ActFrmNewRubCri + 57) +#define ActReqDatShaIns (ActFrmNewRubCri + 58) +#define ActChgDatShaIns (ActFrmNewRubCri + 59) +#define ActDowShaIns (ActFrmNewRubCri + 60) -#define ActChgToSeeDocCtr (ActRemRub + 61) -#define ActSeeDocCtr (ActRemRub + 62) -#define ActExpSeeDocCtr (ActRemRub + 63) -#define ActConSeeDocCtr (ActRemRub + 64) -#define ActZIPSeeDocCtr (ActRemRub + 65) -#define ActReqDatSeeDocCtr (ActRemRub + 66) -#define ActDowSeeDocCtr (ActRemRub + 67) -#define ActChgToAdmDocCtr (ActRemRub + 68) -#define ActAdmDocCtr (ActRemRub + 69) -#define ActReqRemFilDocCtr (ActRemRub + 70) -#define ActRemFilDocCtr (ActRemRub + 71) -#define ActRemFolDocCtr (ActRemRub + 72) -#define ActCopDocCtr (ActRemRub + 73) -#define ActPasDocCtr (ActRemRub + 74) -#define ActRemTreDocCtr (ActRemRub + 75) -#define ActFrmCreDocCtr (ActRemRub + 76) -#define ActCreFolDocCtr (ActRemRub + 77) -#define ActCreLnkDocCtr (ActRemRub + 78) -#define ActRenFolDocCtr (ActRemRub + 79) -#define ActRcvFilDocCtrDZ (ActRemRub + 80) -#define ActRcvFilDocCtrCla (ActRemRub + 81) -#define ActExpAdmDocCtr (ActRemRub + 82) -#define ActConAdmDocCtr (ActRemRub + 83) -#define ActZIPAdmDocCtr (ActRemRub + 84) -#define ActUnhDocCtr (ActRemRub + 85) -#define ActHidDocCtr (ActRemRub + 86) -#define ActReqDatAdmDocCtr (ActRemRub + 87) -#define ActChgDatAdmDocCtr (ActRemRub + 88) -#define ActDowAdmDocCtr (ActRemRub + 89) +#define ActChgToSeeDocCtr (ActFrmNewRubCri + 61) +#define ActSeeDocCtr (ActFrmNewRubCri + 62) +#define ActExpSeeDocCtr (ActFrmNewRubCri + 63) +#define ActConSeeDocCtr (ActFrmNewRubCri + 64) +#define ActZIPSeeDocCtr (ActFrmNewRubCri + 65) +#define ActReqDatSeeDocCtr (ActFrmNewRubCri + 66) +#define ActDowSeeDocCtr (ActFrmNewRubCri + 67) +#define ActChgToAdmDocCtr (ActFrmNewRubCri + 68) +#define ActAdmDocCtr (ActFrmNewRubCri + 69) +#define ActReqRemFilDocCtr (ActFrmNewRubCri + 70) +#define ActRemFilDocCtr (ActFrmNewRubCri + 71) +#define ActRemFolDocCtr (ActFrmNewRubCri + 72) +#define ActCopDocCtr (ActFrmNewRubCri + 73) +#define ActPasDocCtr (ActFrmNewRubCri + 74) +#define ActRemTreDocCtr (ActFrmNewRubCri + 75) +#define ActFrmCreDocCtr (ActFrmNewRubCri + 76) +#define ActCreFolDocCtr (ActFrmNewRubCri + 77) +#define ActCreLnkDocCtr (ActFrmNewRubCri + 78) +#define ActRenFolDocCtr (ActFrmNewRubCri + 79) +#define ActRcvFilDocCtrDZ (ActFrmNewRubCri + 80) +#define ActRcvFilDocCtrCla (ActFrmNewRubCri + 81) +#define ActExpAdmDocCtr (ActFrmNewRubCri + 82) +#define ActConAdmDocCtr (ActFrmNewRubCri + 83) +#define ActZIPAdmDocCtr (ActFrmNewRubCri + 84) +#define ActUnhDocCtr (ActFrmNewRubCri + 85) +#define ActHidDocCtr (ActFrmNewRubCri + 86) +#define ActReqDatAdmDocCtr (ActFrmNewRubCri + 87) +#define ActChgDatAdmDocCtr (ActFrmNewRubCri + 88) +#define ActDowAdmDocCtr (ActFrmNewRubCri + 89) -#define ActReqRemFilShaCtr (ActRemRub + 90) -#define ActRemFilShaCtr (ActRemRub + 91) -#define ActRemFolShaCtr (ActRemRub + 92) -#define ActCopShaCtr (ActRemRub + 93) -#define ActPasShaCtr (ActRemRub + 94) -#define ActRemTreShaCtr (ActRemRub + 95) -#define ActFrmCreShaCtr (ActRemRub + 96) -#define ActCreFolShaCtr (ActRemRub + 97) -#define ActCreLnkShaCtr (ActRemRub + 98) -#define ActRenFolShaCtr (ActRemRub + 99) -#define ActRcvFilShaCtrDZ (ActRemRub + 100) -#define ActRcvFilShaCtrCla (ActRemRub + 101) -#define ActExpShaCtr (ActRemRub + 102) -#define ActConShaCtr (ActRemRub + 103) -#define ActZIPShaCtr (ActRemRub + 104) -#define ActReqDatShaCtr (ActRemRub + 105) -#define ActChgDatShaCtr (ActRemRub + 106) -#define ActDowShaCtr (ActRemRub + 107) +#define ActReqRemFilShaCtr (ActFrmNewRubCri + 90) +#define ActRemFilShaCtr (ActFrmNewRubCri + 91) +#define ActRemFolShaCtr (ActFrmNewRubCri + 92) +#define ActCopShaCtr (ActFrmNewRubCri + 93) +#define ActPasShaCtr (ActFrmNewRubCri + 94) +#define ActRemTreShaCtr (ActFrmNewRubCri + 95) +#define ActFrmCreShaCtr (ActFrmNewRubCri + 96) +#define ActCreFolShaCtr (ActFrmNewRubCri + 97) +#define ActCreLnkShaCtr (ActFrmNewRubCri + 98) +#define ActRenFolShaCtr (ActFrmNewRubCri + 99) +#define ActRcvFilShaCtrDZ (ActFrmNewRubCri + 100) +#define ActRcvFilShaCtrCla (ActFrmNewRubCri + 101) +#define ActExpShaCtr (ActFrmNewRubCri + 102) +#define ActConShaCtr (ActFrmNewRubCri + 103) +#define ActZIPShaCtr (ActFrmNewRubCri + 104) +#define ActReqDatShaCtr (ActFrmNewRubCri + 105) +#define ActChgDatShaCtr (ActFrmNewRubCri + 106) +#define ActDowShaCtr (ActFrmNewRubCri + 107) -#define ActChgToSeeDocDeg (ActRemRub + 108) -#define ActSeeDocDeg (ActRemRub + 109) -#define ActExpSeeDocDeg (ActRemRub + 110) -#define ActConSeeDocDeg (ActRemRub + 111) -#define ActZIPSeeDocDeg (ActRemRub + 112) -#define ActReqDatSeeDocDeg (ActRemRub + 113) -#define ActDowSeeDocDeg (ActRemRub + 114) -#define ActChgToAdmDocDeg (ActRemRub + 115) -#define ActAdmDocDeg (ActRemRub + 116) -#define ActReqRemFilDocDeg (ActRemRub + 117) -#define ActRemFilDocDeg (ActRemRub + 118) -#define ActRemFolDocDeg (ActRemRub + 119) -#define ActCopDocDeg (ActRemRub + 120) -#define ActPasDocDeg (ActRemRub + 121) -#define ActRemTreDocDeg (ActRemRub + 122) -#define ActFrmCreDocDeg (ActRemRub + 123) -#define ActCreFolDocDeg (ActRemRub + 124) -#define ActCreLnkDocDeg (ActRemRub + 125) -#define ActRenFolDocDeg (ActRemRub + 126) -#define ActRcvFilDocDegDZ (ActRemRub + 127) -#define ActRcvFilDocDegCla (ActRemRub + 128) -#define ActExpAdmDocDeg (ActRemRub + 129) -#define ActConAdmDocDeg (ActRemRub + 130) -#define ActZIPAdmDocDeg (ActRemRub + 131) -#define ActUnhDocDeg (ActRemRub + 132) -#define ActHidDocDeg (ActRemRub + 133) -#define ActReqDatAdmDocDeg (ActRemRub + 134) -#define ActChgDatAdmDocDeg (ActRemRub + 135) -#define ActDowAdmDocDeg (ActRemRub + 136) +#define ActChgToSeeDocDeg (ActFrmNewRubCri + 108) +#define ActSeeDocDeg (ActFrmNewRubCri + 109) +#define ActExpSeeDocDeg (ActFrmNewRubCri + 110) +#define ActConSeeDocDeg (ActFrmNewRubCri + 111) +#define ActZIPSeeDocDeg (ActFrmNewRubCri + 112) +#define ActReqDatSeeDocDeg (ActFrmNewRubCri + 113) +#define ActDowSeeDocDeg (ActFrmNewRubCri + 114) +#define ActChgToAdmDocDeg (ActFrmNewRubCri + 115) +#define ActAdmDocDeg (ActFrmNewRubCri + 116) +#define ActReqRemFilDocDeg (ActFrmNewRubCri + 117) +#define ActRemFilDocDeg (ActFrmNewRubCri + 118) +#define ActRemFolDocDeg (ActFrmNewRubCri + 119) +#define ActCopDocDeg (ActFrmNewRubCri + 120) +#define ActPasDocDeg (ActFrmNewRubCri + 121) +#define ActRemTreDocDeg (ActFrmNewRubCri + 122) +#define ActFrmCreDocDeg (ActFrmNewRubCri + 123) +#define ActCreFolDocDeg (ActFrmNewRubCri + 124) +#define ActCreLnkDocDeg (ActFrmNewRubCri + 125) +#define ActRenFolDocDeg (ActFrmNewRubCri + 126) +#define ActRcvFilDocDegDZ (ActFrmNewRubCri + 127) +#define ActRcvFilDocDegCla (ActFrmNewRubCri + 128) +#define ActExpAdmDocDeg (ActFrmNewRubCri + 129) +#define ActConAdmDocDeg (ActFrmNewRubCri + 130) +#define ActZIPAdmDocDeg (ActFrmNewRubCri + 131) +#define ActUnhDocDeg (ActFrmNewRubCri + 132) +#define ActHidDocDeg (ActFrmNewRubCri + 133) +#define ActReqDatAdmDocDeg (ActFrmNewRubCri + 134) +#define ActChgDatAdmDocDeg (ActFrmNewRubCri + 135) +#define ActDowAdmDocDeg (ActFrmNewRubCri + 136) -#define ActReqRemFilShaDeg (ActRemRub + 137) -#define ActRemFilShaDeg (ActRemRub + 138) -#define ActRemFolShaDeg (ActRemRub + 139) -#define ActCopShaDeg (ActRemRub + 140) -#define ActPasShaDeg (ActRemRub + 141) -#define ActRemTreShaDeg (ActRemRub + 142) -#define ActFrmCreShaDeg (ActRemRub + 143) -#define ActCreFolShaDeg (ActRemRub + 144) -#define ActCreLnkShaDeg (ActRemRub + 145) -#define ActRenFolShaDeg (ActRemRub + 146) -#define ActRcvFilShaDegDZ (ActRemRub + 147) -#define ActRcvFilShaDegCla (ActRemRub + 148) -#define ActExpShaDeg (ActRemRub + 149) -#define ActConShaDeg (ActRemRub + 150) -#define ActZIPShaDeg (ActRemRub + 151) -#define ActReqDatShaDeg (ActRemRub + 152) -#define ActChgDatShaDeg (ActRemRub + 153) -#define ActDowShaDeg (ActRemRub + 154) +#define ActReqRemFilShaDeg (ActFrmNewRubCri + 137) +#define ActRemFilShaDeg (ActFrmNewRubCri + 138) +#define ActRemFolShaDeg (ActFrmNewRubCri + 139) +#define ActCopShaDeg (ActFrmNewRubCri + 140) +#define ActPasShaDeg (ActFrmNewRubCri + 141) +#define ActRemTreShaDeg (ActFrmNewRubCri + 142) +#define ActFrmCreShaDeg (ActFrmNewRubCri + 143) +#define ActCreFolShaDeg (ActFrmNewRubCri + 144) +#define ActCreLnkShaDeg (ActFrmNewRubCri + 145) +#define ActRenFolShaDeg (ActFrmNewRubCri + 146) +#define ActRcvFilShaDegDZ (ActFrmNewRubCri + 147) +#define ActRcvFilShaDegCla (ActFrmNewRubCri + 148) +#define ActExpShaDeg (ActFrmNewRubCri + 149) +#define ActConShaDeg (ActFrmNewRubCri + 150) +#define ActZIPShaDeg (ActFrmNewRubCri + 151) +#define ActReqDatShaDeg (ActFrmNewRubCri + 152) +#define ActChgDatShaDeg (ActFrmNewRubCri + 153) +#define ActDowShaDeg (ActFrmNewRubCri + 154) -#define ActChgToSeeDocCrs (ActRemRub + 155) -#define ActSeeDocCrs (ActRemRub + 156) -#define ActExpSeeDocCrs (ActRemRub + 157) -#define ActConSeeDocCrs (ActRemRub + 158) -#define ActZIPSeeDocCrs (ActRemRub + 159) -#define ActReqDatSeeDocCrs (ActRemRub + 160) -#define ActReqLnkSeeDocCrs (ActRemRub + 161) -#define ActDowSeeDocCrs (ActRemRub + 162) +#define ActChgToSeeDocCrs (ActFrmNewRubCri + 155) +#define ActSeeDocCrs (ActFrmNewRubCri + 156) +#define ActExpSeeDocCrs (ActFrmNewRubCri + 157) +#define ActConSeeDocCrs (ActFrmNewRubCri + 158) +#define ActZIPSeeDocCrs (ActFrmNewRubCri + 159) +#define ActReqDatSeeDocCrs (ActFrmNewRubCri + 160) +#define ActReqLnkSeeDocCrs (ActFrmNewRubCri + 161) +#define ActDowSeeDocCrs (ActFrmNewRubCri + 162) -#define ActSeeDocGrp (ActRemRub + 163) -#define ActExpSeeDocGrp (ActRemRub + 164) -#define ActConSeeDocGrp (ActRemRub + 165) -#define ActZIPSeeDocGrp (ActRemRub + 166) -#define ActReqDatSeeDocGrp (ActRemRub + 167) -#define ActDowSeeDocGrp (ActRemRub + 168) +#define ActSeeDocGrp (ActFrmNewRubCri + 163) +#define ActExpSeeDocGrp (ActFrmNewRubCri + 164) +#define ActConSeeDocGrp (ActFrmNewRubCri + 165) +#define ActZIPSeeDocGrp (ActFrmNewRubCri + 166) +#define ActReqDatSeeDocGrp (ActFrmNewRubCri + 167) +#define ActDowSeeDocGrp (ActFrmNewRubCri + 168) -#define ActChgToAdmDocCrs (ActRemRub + 169) -#define ActAdmDocCrs (ActRemRub + 170) -#define ActReqRemFilDocCrs (ActRemRub + 171) -#define ActRemFilDocCrs (ActRemRub + 172) -#define ActRemFolDocCrs (ActRemRub + 173) -#define ActCopDocCrs (ActRemRub + 174) -#define ActPasDocCrs (ActRemRub + 175) -#define ActRemTreDocCrs (ActRemRub + 176) -#define ActFrmCreDocCrs (ActRemRub + 177) -#define ActCreFolDocCrs (ActRemRub + 178) -#define ActCreLnkDocCrs (ActRemRub + 179) -#define ActRenFolDocCrs (ActRemRub + 180) -#define ActRcvFilDocCrsDZ (ActRemRub + 181) -#define ActRcvFilDocCrsCla (ActRemRub + 182) -#define ActExpAdmDocCrs (ActRemRub + 183) -#define ActConAdmDocCrs (ActRemRub + 184) -#define ActZIPAdmDocCrs (ActRemRub + 185) -#define ActUnhDocCrs (ActRemRub + 186) -#define ActHidDocCrs (ActRemRub + 187) -#define ActReqDatAdmDocCrs (ActRemRub + 188) -#define ActChgDatAdmDocCrs (ActRemRub + 189) -#define ActReqLnkAdmDocCrs (ActRemRub + 190) -#define ActDowAdmDocCrs (ActRemRub + 191) +#define ActChgToAdmDocCrs (ActFrmNewRubCri + 169) +#define ActAdmDocCrs (ActFrmNewRubCri + 170) +#define ActReqRemFilDocCrs (ActFrmNewRubCri + 171) +#define ActRemFilDocCrs (ActFrmNewRubCri + 172) +#define ActRemFolDocCrs (ActFrmNewRubCri + 173) +#define ActCopDocCrs (ActFrmNewRubCri + 174) +#define ActPasDocCrs (ActFrmNewRubCri + 175) +#define ActRemTreDocCrs (ActFrmNewRubCri + 176) +#define ActFrmCreDocCrs (ActFrmNewRubCri + 177) +#define ActCreFolDocCrs (ActFrmNewRubCri + 178) +#define ActCreLnkDocCrs (ActFrmNewRubCri + 179) +#define ActRenFolDocCrs (ActFrmNewRubCri + 180) +#define ActRcvFilDocCrsDZ (ActFrmNewRubCri + 181) +#define ActRcvFilDocCrsCla (ActFrmNewRubCri + 182) +#define ActExpAdmDocCrs (ActFrmNewRubCri + 183) +#define ActConAdmDocCrs (ActFrmNewRubCri + 184) +#define ActZIPAdmDocCrs (ActFrmNewRubCri + 185) +#define ActUnhDocCrs (ActFrmNewRubCri + 186) +#define ActHidDocCrs (ActFrmNewRubCri + 187) +#define ActReqDatAdmDocCrs (ActFrmNewRubCri + 188) +#define ActChgDatAdmDocCrs (ActFrmNewRubCri + 189) +#define ActReqLnkAdmDocCrs (ActFrmNewRubCri + 190) +#define ActDowAdmDocCrs (ActFrmNewRubCri + 191) -#define ActAdmDocGrp (ActRemRub + 192) -#define ActReqRemFilDocGrp (ActRemRub + 193) -#define ActRemFilDocGrp (ActRemRub + 194) -#define ActRemFolDocGrp (ActRemRub + 195) -#define ActCopDocGrp (ActRemRub + 196) -#define ActPasDocGrp (ActRemRub + 197) -#define ActRemTreDocGrp (ActRemRub + 198) -#define ActFrmCreDocGrp (ActRemRub + 199) -#define ActCreFolDocGrp (ActRemRub + 200) -#define ActCreLnkDocGrp (ActRemRub + 201) -#define ActRenFolDocGrp (ActRemRub + 202) -#define ActRcvFilDocGrpDZ (ActRemRub + 203) -#define ActRcvFilDocGrpCla (ActRemRub + 204) -#define ActExpAdmDocGrp (ActRemRub + 205) -#define ActConAdmDocGrp (ActRemRub + 206) -#define ActZIPAdmDocGrp (ActRemRub + 207) -#define ActUnhDocGrp (ActRemRub + 208) -#define ActHidDocGrp (ActRemRub + 209) -#define ActReqDatAdmDocGrp (ActRemRub + 210) -#define ActChgDatAdmDocGrp (ActRemRub + 211) -#define ActDowAdmDocGrp (ActRemRub + 212) +#define ActAdmDocGrp (ActFrmNewRubCri + 192) +#define ActReqRemFilDocGrp (ActFrmNewRubCri + 193) +#define ActRemFilDocGrp (ActFrmNewRubCri + 194) +#define ActRemFolDocGrp (ActFrmNewRubCri + 195) +#define ActCopDocGrp (ActFrmNewRubCri + 196) +#define ActPasDocGrp (ActFrmNewRubCri + 197) +#define ActRemTreDocGrp (ActFrmNewRubCri + 198) +#define ActFrmCreDocGrp (ActFrmNewRubCri + 199) +#define ActCreFolDocGrp (ActFrmNewRubCri + 200) +#define ActCreLnkDocGrp (ActFrmNewRubCri + 201) +#define ActRenFolDocGrp (ActFrmNewRubCri + 202) +#define ActRcvFilDocGrpDZ (ActFrmNewRubCri + 203) +#define ActRcvFilDocGrpCla (ActFrmNewRubCri + 204) +#define ActExpAdmDocGrp (ActFrmNewRubCri + 205) +#define ActConAdmDocGrp (ActFrmNewRubCri + 206) +#define ActZIPAdmDocGrp (ActFrmNewRubCri + 207) +#define ActUnhDocGrp (ActFrmNewRubCri + 208) +#define ActHidDocGrp (ActFrmNewRubCri + 209) +#define ActReqDatAdmDocGrp (ActFrmNewRubCri + 210) +#define ActChgDatAdmDocGrp (ActFrmNewRubCri + 211) +#define ActDowAdmDocGrp (ActFrmNewRubCri + 212) -#define ActChgToAdmTch (ActRemRub + 213) +#define ActChgToAdmTch (ActFrmNewRubCri + 213) -#define ActAdmTchCrs (ActRemRub + 214) -#define ActReqRemFilTchCrs (ActRemRub + 215) -#define ActRemFilTchCrs (ActRemRub + 216) -#define ActRemFolTchCrs (ActRemRub + 217) -#define ActCopTchCrs (ActRemRub + 218) -#define ActPasTchCrs (ActRemRub + 219) -#define ActRemTreTchCrs (ActRemRub + 220) -#define ActFrmCreTchCrs (ActRemRub + 221) -#define ActCreFolTchCrs (ActRemRub + 222) -#define ActCreLnkTchCrs (ActRemRub + 223) -#define ActRenFolTchCrs (ActRemRub + 224) -#define ActRcvFilTchCrsDZ (ActRemRub + 225) -#define ActRcvFilTchCrsCla (ActRemRub + 226) -#define ActExpTchCrs (ActRemRub + 227) -#define ActConTchCrs (ActRemRub + 228) -#define ActZIPTchCrs (ActRemRub + 229) -#define ActReqDatTchCrs (ActRemRub + 230) -#define ActChgDatTchCrs (ActRemRub + 231) -#define ActDowTchCrs (ActRemRub + 232) +#define ActAdmTchCrs (ActFrmNewRubCri + 214) +#define ActReqRemFilTchCrs (ActFrmNewRubCri + 215) +#define ActRemFilTchCrs (ActFrmNewRubCri + 216) +#define ActRemFolTchCrs (ActFrmNewRubCri + 217) +#define ActCopTchCrs (ActFrmNewRubCri + 218) +#define ActPasTchCrs (ActFrmNewRubCri + 219) +#define ActRemTreTchCrs (ActFrmNewRubCri + 220) +#define ActFrmCreTchCrs (ActFrmNewRubCri + 221) +#define ActCreFolTchCrs (ActFrmNewRubCri + 222) +#define ActCreLnkTchCrs (ActFrmNewRubCri + 223) +#define ActRenFolTchCrs (ActFrmNewRubCri + 224) +#define ActRcvFilTchCrsDZ (ActFrmNewRubCri + 225) +#define ActRcvFilTchCrsCla (ActFrmNewRubCri + 226) +#define ActExpTchCrs (ActFrmNewRubCri + 227) +#define ActConTchCrs (ActFrmNewRubCri + 228) +#define ActZIPTchCrs (ActFrmNewRubCri + 229) +#define ActReqDatTchCrs (ActFrmNewRubCri + 230) +#define ActChgDatTchCrs (ActFrmNewRubCri + 231) +#define ActDowTchCrs (ActFrmNewRubCri + 232) -#define ActAdmTchGrp (ActRemRub + 233) -#define ActReqRemFilTchGrp (ActRemRub + 234) -#define ActRemFilTchGrp (ActRemRub + 235) -#define ActRemFolTchGrp (ActRemRub + 236) -#define ActCopTchGrp (ActRemRub + 237) -#define ActPasTchGrp (ActRemRub + 238) -#define ActRemTreTchGrp (ActRemRub + 239) -#define ActFrmCreTchGrp (ActRemRub + 240) -#define ActCreFolTchGrp (ActRemRub + 241) -#define ActCreLnkTchGrp (ActRemRub + 242) -#define ActRenFolTchGrp (ActRemRub + 243) -#define ActRcvFilTchGrpDZ (ActRemRub + 244) -#define ActRcvFilTchGrpCla (ActRemRub + 245) -#define ActExpTchGrp (ActRemRub + 246) -#define ActConTchGrp (ActRemRub + 247) -#define ActZIPTchGrp (ActRemRub + 248) -#define ActReqDatTchGrp (ActRemRub + 249) -#define ActChgDatTchGrp (ActRemRub + 250) -#define ActDowTchGrp (ActRemRub + 251) +#define ActAdmTchGrp (ActFrmNewRubCri + 233) +#define ActReqRemFilTchGrp (ActFrmNewRubCri + 234) +#define ActRemFilTchGrp (ActFrmNewRubCri + 235) +#define ActRemFolTchGrp (ActFrmNewRubCri + 236) +#define ActCopTchGrp (ActFrmNewRubCri + 237) +#define ActPasTchGrp (ActFrmNewRubCri + 238) +#define ActRemTreTchGrp (ActFrmNewRubCri + 239) +#define ActFrmCreTchGrp (ActFrmNewRubCri + 240) +#define ActCreFolTchGrp (ActFrmNewRubCri + 241) +#define ActCreLnkTchGrp (ActFrmNewRubCri + 242) +#define ActRenFolTchGrp (ActFrmNewRubCri + 243) +#define ActRcvFilTchGrpDZ (ActFrmNewRubCri + 244) +#define ActRcvFilTchGrpCla (ActFrmNewRubCri + 245) +#define ActExpTchGrp (ActFrmNewRubCri + 246) +#define ActConTchGrp (ActFrmNewRubCri + 247) +#define ActZIPTchGrp (ActFrmNewRubCri + 248) +#define ActReqDatTchGrp (ActFrmNewRubCri + 249) +#define ActChgDatTchGrp (ActFrmNewRubCri + 250) +#define ActDowTchGrp (ActFrmNewRubCri + 251) -#define ActChgToAdmSha (ActRemRub + 252) +#define ActChgToAdmSha (ActFrmNewRubCri + 252) -#define ActAdmShaCrs (ActRemRub + 253) -#define ActReqRemFilShaCrs (ActRemRub + 254) -#define ActRemFilShaCrs (ActRemRub + 255) -#define ActRemFolShaCrs (ActRemRub + 256) -#define ActCopShaCrs (ActRemRub + 257) -#define ActPasShaCrs (ActRemRub + 258) -#define ActRemTreShaCrs (ActRemRub + 259) -#define ActFrmCreShaCrs (ActRemRub + 260) -#define ActCreFolShaCrs (ActRemRub + 261) -#define ActCreLnkShaCrs (ActRemRub + 262) -#define ActRenFolShaCrs (ActRemRub + 263) -#define ActRcvFilShaCrsDZ (ActRemRub + 264) -#define ActRcvFilShaCrsCla (ActRemRub + 265) -#define ActExpShaCrs (ActRemRub + 266) -#define ActConShaCrs (ActRemRub + 267) -#define ActZIPShaCrs (ActRemRub + 268) -#define ActReqDatShaCrs (ActRemRub + 269) -#define ActChgDatShaCrs (ActRemRub + 270) -#define ActDowShaCrs (ActRemRub + 271) +#define ActAdmShaCrs (ActFrmNewRubCri + 253) +#define ActReqRemFilShaCrs (ActFrmNewRubCri + 254) +#define ActRemFilShaCrs (ActFrmNewRubCri + 255) +#define ActRemFolShaCrs (ActFrmNewRubCri + 256) +#define ActCopShaCrs (ActFrmNewRubCri + 257) +#define ActPasShaCrs (ActFrmNewRubCri + 258) +#define ActRemTreShaCrs (ActFrmNewRubCri + 259) +#define ActFrmCreShaCrs (ActFrmNewRubCri + 260) +#define ActCreFolShaCrs (ActFrmNewRubCri + 261) +#define ActCreLnkShaCrs (ActFrmNewRubCri + 262) +#define ActRenFolShaCrs (ActFrmNewRubCri + 263) +#define ActRcvFilShaCrsDZ (ActFrmNewRubCri + 264) +#define ActRcvFilShaCrsCla (ActFrmNewRubCri + 265) +#define ActExpShaCrs (ActFrmNewRubCri + 266) +#define ActConShaCrs (ActFrmNewRubCri + 267) +#define ActZIPShaCrs (ActFrmNewRubCri + 268) +#define ActReqDatShaCrs (ActFrmNewRubCri + 269) +#define ActChgDatShaCrs (ActFrmNewRubCri + 270) +#define ActDowShaCrs (ActFrmNewRubCri + 271) -#define ActAdmShaGrp (ActRemRub + 272) -#define ActReqRemFilShaGrp (ActRemRub + 273) -#define ActRemFilShaGrp (ActRemRub + 274) -#define ActRemFolShaGrp (ActRemRub + 275) -#define ActCopShaGrp (ActRemRub + 276) -#define ActPasShaGrp (ActRemRub + 277) -#define ActRemTreShaGrp (ActRemRub + 278) -#define ActFrmCreShaGrp (ActRemRub + 279) -#define ActCreFolShaGrp (ActRemRub + 280) -#define ActCreLnkShaGrp (ActRemRub + 281) -#define ActRenFolShaGrp (ActRemRub + 282) -#define ActRcvFilShaGrpDZ (ActRemRub + 283) -#define ActRcvFilShaGrpCla (ActRemRub + 284) -#define ActExpShaGrp (ActRemRub + 285) -#define ActConShaGrp (ActRemRub + 286) -#define ActZIPShaGrp (ActRemRub + 287) -#define ActReqDatShaGrp (ActRemRub + 288) -#define ActChgDatShaGrp (ActRemRub + 289) -#define ActDowShaGrp (ActRemRub + 290) +#define ActAdmShaGrp (ActFrmNewRubCri + 272) +#define ActReqRemFilShaGrp (ActFrmNewRubCri + 273) +#define ActRemFilShaGrp (ActFrmNewRubCri + 274) +#define ActRemFolShaGrp (ActFrmNewRubCri + 275) +#define ActCopShaGrp (ActFrmNewRubCri + 276) +#define ActPasShaGrp (ActFrmNewRubCri + 277) +#define ActRemTreShaGrp (ActFrmNewRubCri + 278) +#define ActFrmCreShaGrp (ActFrmNewRubCri + 279) +#define ActCreFolShaGrp (ActFrmNewRubCri + 280) +#define ActCreLnkShaGrp (ActFrmNewRubCri + 281) +#define ActRenFolShaGrp (ActFrmNewRubCri + 282) +#define ActRcvFilShaGrpDZ (ActFrmNewRubCri + 283) +#define ActRcvFilShaGrpCla (ActFrmNewRubCri + 284) +#define ActExpShaGrp (ActFrmNewRubCri + 285) +#define ActConShaGrp (ActFrmNewRubCri + 286) +#define ActZIPShaGrp (ActFrmNewRubCri + 287) +#define ActReqDatShaGrp (ActFrmNewRubCri + 288) +#define ActChgDatShaGrp (ActFrmNewRubCri + 289) +#define ActDowShaGrp (ActFrmNewRubCri + 290) -#define ActAdmAsgWrkCrs (ActRemRub + 291) +#define ActAdmAsgWrkCrs (ActFrmNewRubCri + 291) -#define ActReqRemFilAsgUsr (ActRemRub + 292) -#define ActRemFilAsgUsr (ActRemRub + 293) -#define ActRemFolAsgUsr (ActRemRub + 294) -#define ActCopAsgUsr (ActRemRub + 295) -#define ActPasAsgUsr (ActRemRub + 296) -#define ActRemTreAsgUsr (ActRemRub + 297) -#define ActFrmCreAsgUsr (ActRemRub + 298) -#define ActCreFolAsgUsr (ActRemRub + 299) -#define ActCreLnkAsgUsr (ActRemRub + 300) -#define ActRenFolAsgUsr (ActRemRub + 301) -#define ActRcvFilAsgUsrDZ (ActRemRub + 302) -#define ActRcvFilAsgUsrCla (ActRemRub + 303) -#define ActExpAsgUsr (ActRemRub + 304) -#define ActConAsgUsr (ActRemRub + 305) -#define ActZIPAsgUsr (ActRemRub + 306) -#define ActReqDatAsgUsr (ActRemRub + 307) -#define ActChgDatAsgUsr (ActRemRub + 308) -#define ActDowAsgUsr (ActRemRub + 309) +#define ActReqRemFilAsgUsr (ActFrmNewRubCri + 292) +#define ActRemFilAsgUsr (ActFrmNewRubCri + 293) +#define ActRemFolAsgUsr (ActFrmNewRubCri + 294) +#define ActCopAsgUsr (ActFrmNewRubCri + 295) +#define ActPasAsgUsr (ActFrmNewRubCri + 296) +#define ActRemTreAsgUsr (ActFrmNewRubCri + 297) +#define ActFrmCreAsgUsr (ActFrmNewRubCri + 298) +#define ActCreFolAsgUsr (ActFrmNewRubCri + 299) +#define ActCreLnkAsgUsr (ActFrmNewRubCri + 300) +#define ActRenFolAsgUsr (ActFrmNewRubCri + 301) +#define ActRcvFilAsgUsrDZ (ActFrmNewRubCri + 302) +#define ActRcvFilAsgUsrCla (ActFrmNewRubCri + 303) +#define ActExpAsgUsr (ActFrmNewRubCri + 304) +#define ActConAsgUsr (ActFrmNewRubCri + 305) +#define ActZIPAsgUsr (ActFrmNewRubCri + 306) +#define ActReqDatAsgUsr (ActFrmNewRubCri + 307) +#define ActChgDatAsgUsr (ActFrmNewRubCri + 308) +#define ActDowAsgUsr (ActFrmNewRubCri + 309) -#define ActReqRemFilWrkUsr (ActRemRub + 310) -#define ActRemFilWrkUsr (ActRemRub + 311) -#define ActRemFolWrkUsr (ActRemRub + 312) -#define ActCopWrkUsr (ActRemRub + 313) -#define ActPasWrkUsr (ActRemRub + 314) -#define ActRemTreWrkUsr (ActRemRub + 315) -#define ActFrmCreWrkUsr (ActRemRub + 316) -#define ActCreFolWrkUsr (ActRemRub + 317) -#define ActCreLnkWrkUsr (ActRemRub + 318) -#define ActRenFolWrkUsr (ActRemRub + 319) -#define ActRcvFilWrkUsrDZ (ActRemRub + 320) -#define ActRcvFilWrkUsrCla (ActRemRub + 321) -#define ActExpWrkUsr (ActRemRub + 322) -#define ActConWrkUsr (ActRemRub + 323) -#define ActZIPWrkUsr (ActRemRub + 324) -#define ActReqDatWrkUsr (ActRemRub + 325) -#define ActChgDatWrkUsr (ActRemRub + 326) -#define ActDowWrkUsr (ActRemRub + 327) +#define ActReqRemFilWrkUsr (ActFrmNewRubCri + 310) +#define ActRemFilWrkUsr (ActFrmNewRubCri + 311) +#define ActRemFolWrkUsr (ActFrmNewRubCri + 312) +#define ActCopWrkUsr (ActFrmNewRubCri + 313) +#define ActPasWrkUsr (ActFrmNewRubCri + 314) +#define ActRemTreWrkUsr (ActFrmNewRubCri + 315) +#define ActFrmCreWrkUsr (ActFrmNewRubCri + 316) +#define ActCreFolWrkUsr (ActFrmNewRubCri + 317) +#define ActCreLnkWrkUsr (ActFrmNewRubCri + 318) +#define ActRenFolWrkUsr (ActFrmNewRubCri + 319) +#define ActRcvFilWrkUsrDZ (ActFrmNewRubCri + 320) +#define ActRcvFilWrkUsrCla (ActFrmNewRubCri + 321) +#define ActExpWrkUsr (ActFrmNewRubCri + 322) +#define ActConWrkUsr (ActFrmNewRubCri + 323) +#define ActZIPWrkUsr (ActFrmNewRubCri + 324) +#define ActReqDatWrkUsr (ActFrmNewRubCri + 325) +#define ActChgDatWrkUsr (ActFrmNewRubCri + 326) +#define ActDowWrkUsr (ActFrmNewRubCri + 327) -#define ActReqRemFilAsgCrs (ActRemRub + 328) -#define ActRemFilAsgCrs (ActRemRub + 329) -#define ActRemFolAsgCrs (ActRemRub + 330) -#define ActCopAsgCrs (ActRemRub + 331) -#define ActPasAsgCrs (ActRemRub + 332) -#define ActRemTreAsgCrs (ActRemRub + 333) -#define ActFrmCreAsgCrs (ActRemRub + 334) -#define ActCreFolAsgCrs (ActRemRub + 335) -#define ActCreLnkAsgCrs (ActRemRub + 336) -#define ActRenFolAsgCrs (ActRemRub + 337) -#define ActRcvFilAsgCrsDZ (ActRemRub + 338) -#define ActRcvFilAsgCrsCla (ActRemRub + 339) -#define ActExpAsgCrs (ActRemRub + 340) -#define ActConAsgCrs (ActRemRub + 341) -#define ActZIPAsgCrs (ActRemRub + 342) -#define ActReqDatAsgCrs (ActRemRub + 343) -#define ActChgDatAsgCrs (ActRemRub + 344) -#define ActDowAsgCrs (ActRemRub + 345) +#define ActReqRemFilAsgCrs (ActFrmNewRubCri + 328) +#define ActRemFilAsgCrs (ActFrmNewRubCri + 329) +#define ActRemFolAsgCrs (ActFrmNewRubCri + 330) +#define ActCopAsgCrs (ActFrmNewRubCri + 331) +#define ActPasAsgCrs (ActFrmNewRubCri + 332) +#define ActRemTreAsgCrs (ActFrmNewRubCri + 333) +#define ActFrmCreAsgCrs (ActFrmNewRubCri + 334) +#define ActCreFolAsgCrs (ActFrmNewRubCri + 335) +#define ActCreLnkAsgCrs (ActFrmNewRubCri + 336) +#define ActRenFolAsgCrs (ActFrmNewRubCri + 337) +#define ActRcvFilAsgCrsDZ (ActFrmNewRubCri + 338) +#define ActRcvFilAsgCrsCla (ActFrmNewRubCri + 339) +#define ActExpAsgCrs (ActFrmNewRubCri + 340) +#define ActConAsgCrs (ActFrmNewRubCri + 341) +#define ActZIPAsgCrs (ActFrmNewRubCri + 342) +#define ActReqDatAsgCrs (ActFrmNewRubCri + 343) +#define ActChgDatAsgCrs (ActFrmNewRubCri + 344) +#define ActDowAsgCrs (ActFrmNewRubCri + 345) -#define ActReqRemFilWrkCrs (ActRemRub + 346) -#define ActRemFilWrkCrs (ActRemRub + 347) -#define ActRemFolWrkCrs (ActRemRub + 348) -#define ActCopWrkCrs (ActRemRub + 349) -#define ActPasWrkCrs (ActRemRub + 350) -#define ActRemTreWrkCrs (ActRemRub + 351) -#define ActFrmCreWrkCrs (ActRemRub + 352) -#define ActCreFolWrkCrs (ActRemRub + 353) -#define ActCreLnkWrkCrs (ActRemRub + 354) -#define ActRenFolWrkCrs (ActRemRub + 355) -#define ActRcvFilWrkCrsDZ (ActRemRub + 356) -#define ActRcvFilWrkCrsCla (ActRemRub + 357) -#define ActExpWrkCrs (ActRemRub + 358) -#define ActConWrkCrs (ActRemRub + 359) -#define ActZIPWrkCrs (ActRemRub + 360) -#define ActReqDatWrkCrs (ActRemRub + 361) -#define ActChgDatWrkCrs (ActRemRub + 362) -#define ActDowWrkCrs (ActRemRub + 363) +#define ActReqRemFilWrkCrs (ActFrmNewRubCri + 346) +#define ActRemFilWrkCrs (ActFrmNewRubCri + 347) +#define ActRemFolWrkCrs (ActFrmNewRubCri + 348) +#define ActCopWrkCrs (ActFrmNewRubCri + 349) +#define ActPasWrkCrs (ActFrmNewRubCri + 350) +#define ActRemTreWrkCrs (ActFrmNewRubCri + 351) +#define ActFrmCreWrkCrs (ActFrmNewRubCri + 352) +#define ActCreFolWrkCrs (ActFrmNewRubCri + 353) +#define ActCreLnkWrkCrs (ActFrmNewRubCri + 354) +#define ActRenFolWrkCrs (ActFrmNewRubCri + 355) +#define ActRcvFilWrkCrsDZ (ActFrmNewRubCri + 356) +#define ActRcvFilWrkCrsCla (ActFrmNewRubCri + 357) +#define ActExpWrkCrs (ActFrmNewRubCri + 358) +#define ActConWrkCrs (ActFrmNewRubCri + 359) +#define ActZIPWrkCrs (ActFrmNewRubCri + 360) +#define ActReqDatWrkCrs (ActFrmNewRubCri + 361) +#define ActChgDatWrkCrs (ActFrmNewRubCri + 362) +#define ActDowWrkCrs (ActFrmNewRubCri + 363) -#define ActChgToSeeMrk (ActRemRub + 364) +#define ActChgToSeeMrk (ActFrmNewRubCri + 364) -#define ActSeeMrkCrs (ActRemRub + 365) -#define ActExpSeeMrkCrs (ActRemRub + 366) -#define ActConSeeMrkCrs (ActRemRub + 367) -#define ActReqDatSeeMrkCrs (ActRemRub + 368) -#define ActReqLnkSeeMrkCrs (ActRemRub + 369) -#define ActSeeMyMrkCrs (ActRemRub + 370) +#define ActSeeMrkCrs (ActFrmNewRubCri + 365) +#define ActExpSeeMrkCrs (ActFrmNewRubCri + 366) +#define ActConSeeMrkCrs (ActFrmNewRubCri + 367) +#define ActReqDatSeeMrkCrs (ActFrmNewRubCri + 368) +#define ActReqLnkSeeMrkCrs (ActFrmNewRubCri + 369) +#define ActSeeMyMrkCrs (ActFrmNewRubCri + 370) -#define ActSeeMrkGrp (ActRemRub + 371) -#define ActExpSeeMrkGrp (ActRemRub + 372) -#define ActConSeeMrkGrp (ActRemRub + 373) -#define ActReqDatSeeMrkGrp (ActRemRub + 374) -#define ActSeeMyMrkGrp (ActRemRub + 375) +#define ActSeeMrkGrp (ActFrmNewRubCri + 371) +#define ActExpSeeMrkGrp (ActFrmNewRubCri + 372) +#define ActConSeeMrkGrp (ActFrmNewRubCri + 373) +#define ActReqDatSeeMrkGrp (ActFrmNewRubCri + 374) +#define ActSeeMyMrkGrp (ActFrmNewRubCri + 375) -#define ActChgToAdmMrk (ActRemRub + 376) +#define ActChgToAdmMrk (ActFrmNewRubCri + 376) -#define ActAdmMrkCrs (ActRemRub + 377) -#define ActReqRemFilMrkCrs (ActRemRub + 378) -#define ActRemFilMrkCrs (ActRemRub + 379) -#define ActRemFolMrkCrs (ActRemRub + 380) -#define ActCopMrkCrs (ActRemRub + 381) -#define ActPasMrkCrs (ActRemRub + 382) -#define ActRemTreMrkCrs (ActRemRub + 383) -#define ActFrmCreMrkCrs (ActRemRub + 384) -#define ActCreFolMrkCrs (ActRemRub + 385) -#define ActRenFolMrkCrs (ActRemRub + 386) -#define ActRcvFilMrkCrsDZ (ActRemRub + 387) -#define ActRcvFilMrkCrsCla (ActRemRub + 388) -#define ActExpAdmMrkCrs (ActRemRub + 389) -#define ActConAdmMrkCrs (ActRemRub + 390) -#define ActZIPAdmMrkCrs (ActRemRub + 391) -#define ActUnhMrkCrs (ActRemRub + 392) -#define ActHidMrkCrs (ActRemRub + 393) -#define ActReqDatAdmMrkCrs (ActRemRub + 394) -#define ActChgDatAdmMrkCrs (ActRemRub + 395) -#define ActReqLnkAdmMrkCrs (ActRemRub + 396) -#define ActDowAdmMrkCrs (ActRemRub + 397) -#define ActChgNumRowHeaCrs (ActRemRub + 398) -#define ActChgNumRowFooCrs (ActRemRub + 399) +#define ActAdmMrkCrs (ActFrmNewRubCri + 377) +#define ActReqRemFilMrkCrs (ActFrmNewRubCri + 378) +#define ActRemFilMrkCrs (ActFrmNewRubCri + 379) +#define ActRemFolMrkCrs (ActFrmNewRubCri + 380) +#define ActCopMrkCrs (ActFrmNewRubCri + 381) +#define ActPasMrkCrs (ActFrmNewRubCri + 382) +#define ActRemTreMrkCrs (ActFrmNewRubCri + 383) +#define ActFrmCreMrkCrs (ActFrmNewRubCri + 384) +#define ActCreFolMrkCrs (ActFrmNewRubCri + 385) +#define ActRenFolMrkCrs (ActFrmNewRubCri + 386) +#define ActRcvFilMrkCrsDZ (ActFrmNewRubCri + 387) +#define ActRcvFilMrkCrsCla (ActFrmNewRubCri + 388) +#define ActExpAdmMrkCrs (ActFrmNewRubCri + 389) +#define ActConAdmMrkCrs (ActFrmNewRubCri + 390) +#define ActZIPAdmMrkCrs (ActFrmNewRubCri + 391) +#define ActUnhMrkCrs (ActFrmNewRubCri + 392) +#define ActHidMrkCrs (ActFrmNewRubCri + 393) +#define ActReqDatAdmMrkCrs (ActFrmNewRubCri + 394) +#define ActChgDatAdmMrkCrs (ActFrmNewRubCri + 395) +#define ActReqLnkAdmMrkCrs (ActFrmNewRubCri + 396) +#define ActDowAdmMrkCrs (ActFrmNewRubCri + 397) +#define ActChgNumRowHeaCrs (ActFrmNewRubCri + 398) +#define ActChgNumRowFooCrs (ActFrmNewRubCri + 399) -#define ActAdmMrkGrp (ActRemRub + 400) -#define ActReqRemFilMrkGrp (ActRemRub + 401) -#define ActRemFilMrkGrp (ActRemRub + 402) -#define ActRemFolMrkGrp (ActRemRub + 403) -#define ActCopMrkGrp (ActRemRub + 404) -#define ActPasMrkGrp (ActRemRub + 405) -#define ActRemTreMrkGrp (ActRemRub + 406) -#define ActFrmCreMrkGrp (ActRemRub + 407) -#define ActCreFolMrkGrp (ActRemRub + 408) -#define ActRenFolMrkGrp (ActRemRub + 409) -#define ActRcvFilMrkGrpDZ (ActRemRub + 410) -#define ActRcvFilMrkGrpCla (ActRemRub + 411) -#define ActExpAdmMrkGrp (ActRemRub + 412) -#define ActConAdmMrkGrp (ActRemRub + 413) -#define ActZIPAdmMrkGrp (ActRemRub + 414) -#define ActUnhMrkGrp (ActRemRub + 415) -#define ActHidMrkGrp (ActRemRub + 416) -#define ActReqDatAdmMrkGrp (ActRemRub + 417) -#define ActChgDatAdmMrkGrp (ActRemRub + 418) -#define ActDowAdmMrkGrp (ActRemRub + 419) -#define ActChgNumRowHeaGrp (ActRemRub + 420) -#define ActChgNumRowFooGrp (ActRemRub + 421) +#define ActAdmMrkGrp (ActFrmNewRubCri + 400) +#define ActReqRemFilMrkGrp (ActFrmNewRubCri + 401) +#define ActRemFilMrkGrp (ActFrmNewRubCri + 402) +#define ActRemFolMrkGrp (ActFrmNewRubCri + 403) +#define ActCopMrkGrp (ActFrmNewRubCri + 404) +#define ActPasMrkGrp (ActFrmNewRubCri + 405) +#define ActRemTreMrkGrp (ActFrmNewRubCri + 406) +#define ActFrmCreMrkGrp (ActFrmNewRubCri + 407) +#define ActCreFolMrkGrp (ActFrmNewRubCri + 408) +#define ActRenFolMrkGrp (ActFrmNewRubCri + 409) +#define ActRcvFilMrkGrpDZ (ActFrmNewRubCri + 410) +#define ActRcvFilMrkGrpCla (ActFrmNewRubCri + 411) +#define ActExpAdmMrkGrp (ActFrmNewRubCri + 412) +#define ActConAdmMrkGrp (ActFrmNewRubCri + 413) +#define ActZIPAdmMrkGrp (ActFrmNewRubCri + 414) +#define ActUnhMrkGrp (ActFrmNewRubCri + 415) +#define ActHidMrkGrp (ActFrmNewRubCri + 416) +#define ActReqDatAdmMrkGrp (ActFrmNewRubCri + 417) +#define ActChgDatAdmMrkGrp (ActFrmNewRubCri + 418) +#define ActDowAdmMrkGrp (ActFrmNewRubCri + 419) +#define ActChgNumRowHeaGrp (ActFrmNewRubCri + 420) +#define ActChgNumRowFooGrp (ActFrmNewRubCri + 421) -#define ActReqRemFilBrf (ActRemRub + 422) -#define ActRemFilBrf (ActRemRub + 423) -#define ActRemFolBrf (ActRemRub + 424) -#define ActCopBrf (ActRemRub + 425) -#define ActPasBrf (ActRemRub + 426) -#define ActRemTreBrf (ActRemRub + 427) -#define ActFrmCreBrf (ActRemRub + 428) -#define ActCreFolBrf (ActRemRub + 429) -#define ActCreLnkBrf (ActRemRub + 430) -#define ActRenFolBrf (ActRemRub + 431) -#define ActRcvFilBrfDZ (ActRemRub + 432) -#define ActRcvFilBrfCla (ActRemRub + 433) -#define ActExpBrf (ActRemRub + 434) -#define ActConBrf (ActRemRub + 435) -#define ActZIPBrf (ActRemRub + 436) -#define ActReqDatBrf (ActRemRub + 437) -#define ActChgDatBrf (ActRemRub + 438) -#define ActDowBrf (ActRemRub + 439) -#define ActReqRemOldBrf (ActRemRub + 440) -#define ActRemOldBrf (ActRemRub + 441) +#define ActReqRemFilBrf (ActFrmNewRubCri + 422) +#define ActRemFilBrf (ActFrmNewRubCri + 423) +#define ActRemFolBrf (ActFrmNewRubCri + 424) +#define ActCopBrf (ActFrmNewRubCri + 425) +#define ActPasBrf (ActFrmNewRubCri + 426) +#define ActRemTreBrf (ActFrmNewRubCri + 427) +#define ActFrmCreBrf (ActFrmNewRubCri + 428) +#define ActCreFolBrf (ActFrmNewRubCri + 429) +#define ActCreLnkBrf (ActFrmNewRubCri + 430) +#define ActRenFolBrf (ActFrmNewRubCri + 431) +#define ActRcvFilBrfDZ (ActFrmNewRubCri + 432) +#define ActRcvFilBrfCla (ActFrmNewRubCri + 433) +#define ActExpBrf (ActFrmNewRubCri + 434) +#define ActConBrf (ActFrmNewRubCri + 435) +#define ActZIPBrf (ActFrmNewRubCri + 436) +#define ActReqDatBrf (ActFrmNewRubCri + 437) +#define ActChgDatBrf (ActFrmNewRubCri + 438) +#define ActDowBrf (ActFrmNewRubCri + 439) +#define ActReqRemOldBrf (ActFrmNewRubCri + 440) +#define ActRemOldBrf (ActFrmNewRubCri + 441) /*****************************************************************************/ /******************************* Users tab ***********************************/ @@ -1758,7 +1760,7 @@ #define ActLst_NUM_ACTIONS (ActChgMyTT1stDay + 1) -#define ActLst_MAX_ACTION_COD 1958 +#define ActLst_MAX_ACTION_COD 1959 #define ActLst_DEFAULT_ACTION_AFTER_LOGIN ActSeeGblTL diff --git a/swad_changelog.h b/swad_changelog.h index 0ca1b60aa..5e7fc63e6 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -629,10 +629,11 @@ TODO: Emilce Barrera Mesa: Podr TODO: Emilce Barrera Mesa: Mis estudiantes presentan muchas dificultades a la hora de poner la foto porque la plataforma es muy exigente respecto al fondo de la imagen. */ -#define Log_PLATFORM_VERSION "SWAD 22.66.2 (2023-03-03)" +#define Log_PLATFORM_VERSION "SWAD 22.66.3 (2023-03-04)" #define CSS_FILE "swad22.57.1.css" #define JS_FILE "swad22.49.js" /* + Version 22.66.3: Mar 04, 2023 New action to edit a new rubric criterion. Not finished. (337198 lines) Version 22.66.2: Mar 03, 2023 Fixed bugs in figures. (337128 lines) Version 22.66.1: Mar 02, 2023 Rubric removal. (337126 lines) Version 22.66: Mar 02, 2023 New module swad_rubric_criteria for rubric criteria. (337125 lines) diff --git a/swad_rubric.c b/swad_rubric.c index 424919b44..9611430e9 100644 --- a/swad_rubric.c +++ b/swad_rubric.c @@ -336,7 +336,7 @@ void Rub_ShowOnlyOneRubricBegin (struct Rub_Rubrics *Rubrics, /***** Show main data of this rubric *****/ Rub_ShowRubricMainData (Rubrics, - true); // Show only this rubric + true); // Show only this rubric /***** Write criteria of this rubric *****/ if (ListRubricCriteria) @@ -355,7 +355,7 @@ void Rub_ShowOnlyOneRubricEnd (void) /*****************************************************************************/ static void Rub_ShowRubricMainData (struct Rub_Rubrics *Rubrics, - bool ShowOnlyThisRubric) + bool ShowOnlyThisRubric) { extern const char *Txt_View_rubric; extern const char *Txt_Number_of_criteria; diff --git a/swad_rubric.h b/swad_rubric.h index 532a73b28..4d9bcfb2f 100644 --- a/swad_rubric.h +++ b/swad_rubric.h @@ -44,7 +44,7 @@ struct Rub_Rubric long CrsCod; // Course code long UsrCod; // Author code char Title[Rub_MAX_BYTES_TITLE + 1]; - unsigned NumCriteria; // Number of criteria in the rubric + unsigned NumCriteria; // Number of criteria in the rubric }; struct Rub_Rubrics diff --git a/swad_rubric_criteria.c b/swad_rubric_criteria.c index 3ed176d71..65d759bf2 100644 --- a/swad_rubric_criteria.c +++ b/swad_rubric_criteria.c @@ -209,7 +209,7 @@ void RubCri_WriteCriterionTitle (const char *Title,const char *ClassTitle,bool V void RubCri_PutIconToAddNewCriterion (void *Rubrics) { - Ico_PutContextualIconToAdd (ActAddOneGamQst,NULL,Rub_PutParams,Rubrics); + Ico_PutContextualIconToAdd (ActFrmNewRubCri,NULL,Rub_PutParams,Rubrics); } /*****************************************************************************/ @@ -218,12 +218,12 @@ void RubCri_PutIconToAddNewCriterion (void *Rubrics) void RubCri_PutButtonToAddNewCriterion (struct Rub_Rubrics *Rubrics) { - extern const char *Txt_Add_criteria; + extern const char *Txt_New_criterion; - Frm_BeginForm (ActAddOneGamQst); + Frm_BeginForm (ActFrmNewRubCri); Rub_PutParams (Rubrics); - Btn_PutConfirmButton (Txt_Add_criteria); + Btn_PutConfirmButton (Txt_New_criterion); Frm_EndForm (); } @@ -423,3 +423,54 @@ static void RubCri_PutParamsOneCriterion (void *Rubrics) if (Rubrics) Rub_PutParams (Rubrics); } + +/*****************************************************************************/ +/************ Request the creation or edition of a rubric criterion **********/ +/*****************************************************************************/ + +void RubCri_RequestCreatOrEditCri (void) + { + struct Rub_Rubrics Rubrics; + bool ItsANewCriterion; + char Txt[Cns_MAX_BYTES_TEXT + 1]; + + Err_ShowErrorAndExit ("Not implemented."); + + /***** Reset rubrics context *****/ + Rub_ResetRubrics (&Rubrics); + + /***** Reset rubric *****/ + Rub_ResetRubric (&Rubrics.Rubric); + + /***** Check if I can edit rubrics *****/ + if (!Rub_CheckIfICanEditRubrics ()) + Err_NoPermissionExit (); + + /***** Get parameters *****/ + ItsANewCriterion = ((Rubrics.Rubric.RubCod = Rub_GetParams (&Rubrics)) <= 0); + + /***** Get rubric data *****/ + if (ItsANewCriterion) + { + /* Initialize to empty rubric */ + Rub_ResetRubric (&Rubrics.Rubric); + Txt[0] = '\0'; + } + else + { + /* Get rubric data from database */ + Rub_GetDataOfRubricByCod (&Rubrics.Rubric); + Rub_DB_GetRubricTxt (Rubrics.Rubric.RubCod,Txt); + } + + /***** Put forms to create/edit a rubric *****/ + // Rub_PutFormsEditionRubric (&Rubrics,Txt,ItsANewCriterion); + + /***** Show rubrics or criteria *****/ + if (ItsANewCriterion) + /* Show rubrics again */ + Rub_ListAllRubrics (&Rubrics); + else + /* Show criteria of the rubric ready to be edited */ + RubCri_ListRubricCriteria (&Rubrics); + } diff --git a/swad_rubric_criteria.h b/swad_rubric_criteria.h index b75584b3b..a049dc59f 100644 --- a/swad_rubric_criteria.h +++ b/swad_rubric_criteria.h @@ -64,4 +64,6 @@ unsigned RubCri_GetParamCriInd (void); void RubCri_ListRubricCriteria (struct Rub_Rubrics *Rubrics); +void RubCri_RequestCreatOrEditCri (void); + #endif diff --git a/swad_text.c b/swad_text.c index ec5bed9e6..362e49143 100644 --- a/swad_text.c +++ b/swad_text.c @@ -1060,29 +1060,6 @@ const char *Txt_Action = "Eylem"; #endif -const char *Txt_Add_criteria = -#if L==1 // ca - "Afegir criteris"; -#elif L==2 // de - "Fügen Kriterien"; -#elif L==3 // en - "Add criteria"; -#elif L==4 // es - "Añadir criterios"; -#elif L==5 // fr - "Ajouter critères"; -#elif L==6 // gn - "Añadir criterios"; // Okoteve traducción -#elif L==7 // it - "Aggiungere criteri"; -#elif L==8 // pl - "Dodaj kryteria"; -#elif L==9 // pt - "Adicionar critérios"; -#elif L==10 // tr - "Kriter ekle"; -#endif - const char *Txt_Add_questions = #if L==1 // ca "Afegir preguntes"; @@ -24925,29 +24902,6 @@ const char *Txt_New_announcement = "Yeni duyuru"; #endif -const char *Txt_New_call_FOR_EXAM = -#if L==1 // ca - "Nova convocatòria"; -#elif L==2 // de - "Neuer Aufruf"; -#elif L==3 // en - "New call"; -#elif L==4 // es - "Nueva convocatoria"; -#elif L==5 // fr - "Nouvelle convocation"; -#elif L==6 // gn - "Nueva convocatoria"; // Okoteve traducción -#elif L==7 // it - "Nuova sessione"; -#elif L==8 // pl - "Nowe ogloszenie"; -#elif L==9 // pt - "Nova chamada"; -#elif L==10 // tr - "Yeni çağrı"; -#endif - const char *Txt_New_banner = #if L==1 // ca "Nou banner"; @@ -24994,6 +24948,29 @@ const char *Txt_New_building = "Yeni bina"; #endif +const char *Txt_New_call_FOR_EXAM = +#if L==1 // ca + "Nova convocatòria"; +#elif L==2 // de + "Neuer Aufruf"; +#elif L==3 // en + "New call"; +#elif L==4 // es + "Nueva convocatoria"; +#elif L==5 // fr + "Nouvelle convocation"; +#elif L==6 // gn + "Nueva convocatoria"; // Okoteve traducción +#elif L==7 // it + "Nuova sessione"; +#elif L==8 // pl + "Nowe ogloszenie"; +#elif L==9 // pt + "Nova chamada"; +#elif L==10 // tr + "Yeni çağrı"; +#endif + const char *Txt_New_center = #if L==1 // ca "Nou center" @@ -25083,6 +25060,29 @@ const char *Txt_New_course = " (ders, konu, disiplin...)"; #endif +const char *Txt_New_criterion = +#if L==1 // ca + "Nou criteri"; +#elif L==2 // de + "Neues Kriterium"; +#elif L==3 // en + "New criterion"; +#elif L==4 // es + "Nuevo criterio"; +#elif L==5 // fr + "Nouveau critère"; +#elif L==6 // gn + "Nuevo criterio"; // Okoteve traducción +#elif L==7 // it + "Nuovo criterio"; +#elif L==8 // pl + "Nowe kryterium"; +#elif L==9 // pt + "Novo critério"; +#elif L==10 // tr + "Yeni kriter"; +#endif + const char *Txt_New_degree = #if L==1 // ca "Nova titulació" diff --git a/swad_text_action.c b/swad_text_action.c index d6f8c117f..322605c53 100644 --- a/swad_text_action.c +++ b/swad_text_action.c @@ -13998,6 +13998,29 @@ const char *Txt_Actions[ActLst_NUM_ACTIONS] = "Remove rubric" // Precisa de tradução #elif L==10 // tr "Remove rubric" // Çeviri lazim! +#endif + , + [ActFrmNewRubCri] = +#if L==1 // ca + "Edit new rubric criterion" // Necessita traducció +#elif L==2 // de + "Edit new rubric criterion" // Need Übersetzung +#elif L==3 // en + "Edit new rubric criterion" +#elif L==4 // es + "Editar nuevo criterio de rúbrica" +#elif L==5 // fr + "Edit new rubric criterion" // Besoin de traduction +#elif L==6 // gn + "Editar nuevo criterio de rúbrica" // Okoteve traducción +#elif L==7 // it + "Edit new rubric criterion" // Bisogno di traduzione +#elif L==8 // pl + "Edit new rubric criterion" // Potrzebujesz tlumaczenie +#elif L==9 // pt + "Edit new rubric criterion" // Precisa de tradução +#elif L==10 // tr + "Edit new rubric criterion" // Çeviri lazim! #endif , [ActSeeAdmDocIns] =