Version 22.77: Mar 18, 2023 New field Weight in rubric criteria.

This commit is contained in:
acanas 2023-03-18 08:30:29 +01:00
parent 09bfa8fb79
commit 4b463c43fb
11 changed files with 635 additions and 466 deletions

View File

@ -152,7 +152,7 @@ const struct Act_Actions ActLst_Actions[ActLst_NUM_ACTIONS] =
[ActRefNewPubGblTL ] = {1509,-1,TabUnk,ActSeeGblTL ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_AJAX_RFRESH,TmlWho_GetParWho ,Tml_RefreshNewTimelineGbl ,NULL}, [ActRefNewPubGblTL ] = {1509,-1,TabUnk,ActSeeGblTL ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_AJAX_RFRESH,TmlWho_GetParWho ,Tml_RefreshNewTimelineGbl ,NULL},
[ActRefOldPubGblTL ] = {1510,-1,TabUnk,ActSeeGblTL ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_AJAX_NORMAL,TmlWho_GetParWho ,Tml_RefreshOldTimelineGbl ,NULL}, [ActRefOldPubGblTL ] = {1510,-1,TabUnk,ActSeeGblTL ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_AJAX_NORMAL,TmlWho_GetParWho ,Tml_RefreshOldTimelineGbl ,NULL},
[ActRcvPstGblTL ] = {1492,-1,TabUnk,ActSeeGblTL ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_DATA,Act_BRW_1ST_TAB,TmlWho_GetParWho ,TmlPst_ReceivePostGbl ,NULL}, [ActRcvPstGblTL ] = {1492,-1,TabUnk,ActSeeGblTL ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_DATA,Act_BRW_1ST_TAB,TmlWho_GetParWho ,TmlPst_ReceivePostGbl ,NULL},
[ActRcvComGblTL ] = {1503,-1,TabUnk,ActSeeGblTL ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_DATA,Act_BRW_1ST_TAB,TmlWho_GetParWho ,TmlCom_ReceiveCommGbl ,NULL}, [ActRcvComGblTL ] = {1503,-1,TabUnk,ActSeeGblTL ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_DATA,Act_BRW_1ST_TAB,TmlWho_GetParWho ,TmlCom_ReceiveCommGbl ,NULL},
[ActShoHidComGblTL ] = {1806,-1,TabUnk,ActSeeGblTL ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_AJAX_NORMAL,NULL ,TmlCom_ShowHiddenCommsGbl ,NULL}, [ActShoHidComGblTL ] = {1806,-1,TabUnk,ActSeeGblTL ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_AJAX_NORMAL,NULL ,TmlCom_ShowHiddenCommsGbl ,NULL},
[ActAllShaNotGblTL ] = {1766,-1,TabUnk,ActSeeGblTL ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_AJAX_NORMAL,NULL ,TmlSha_ShowAllSharersNoteGbl ,NULL}, [ActAllShaNotGblTL ] = {1766,-1,TabUnk,ActSeeGblTL ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_AJAX_NORMAL,NULL ,TmlSha_ShowAllSharersNoteGbl ,NULL},
[ActAllFavNotGblTL ] = {1767,-1,TabUnk,ActSeeGblTL ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_AJAX_NORMAL,NULL ,TmlFav_ShowAllFaversNoteGbl ,NULL}, [ActAllFavNotGblTL ] = {1767,-1,TabUnk,ActSeeGblTL ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_AJAX_NORMAL,NULL ,TmlFav_ShowAllFaversNoteGbl ,NULL},
@ -354,7 +354,7 @@ const struct Act_Actions ActLst_Actions[ActLst_NUM_ACTIONS] =
[ActChgCtrPhoAtt ] = {1159,-1,TabUnk,ActSeeCtrInf , 0, 0, 0,0x380, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,CtrCfg_ChangeCtrPhotoAttr ,NULL}, [ActChgCtrPhoAtt ] = {1159,-1,TabUnk,ActSeeCtrInf , 0, 0, 0,0x380, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,CtrCfg_ChangeCtrPhotoAttr ,NULL},
[ActSeeDegTyp ] = {1013,-1,TabUnk,ActSeeDeg , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,DegTyp_SeeDegreeTypesInDegTab ,NULL}, [ActSeeDegTyp ] = {1013,-1,TabUnk,ActSeeDeg , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,DegTyp_SeeDegreeTypesInDegTab ,NULL},
[ActEdiDegTyp ] = { 573,-1,TabUnk,ActSeeDeg , 0, 0, 0,0x200, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,DegTyp_GetAndEditDegreeTypes ,NULL}, [ActEdiDegTyp ] = { 573,-1,TabUnk,ActSeeDeg , 0, 0, 0,0x200, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,DegTyp_GetAndEditDegreeTypes ,NULL},
[ActNewDegTyp ] = { 537,-1,TabUnk,ActSeeDeg , 0, 0, 0,0x200, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,DegTyp_ReceiveFormNewDegreeType,DegTyp_ContEditAfterChgDegTyp ,NULL}, [ActNewDegTyp ] = { 537,-1,TabUnk,ActSeeDeg , 0, 0, 0,0x200, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,DegTyp_ReceiveFormNewDegreeType,DegTyp_ContEditAfterChgDegTyp ,NULL},
[ActRemDegTyp ] = { 545,-1,TabUnk,ActSeeDeg , 0, 0, 0,0x200, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,DegTyp_RemoveDegreeType ,DegTyp_ContEditAfterChgDegTyp ,NULL}, [ActRemDegTyp ] = { 545,-1,TabUnk,ActSeeDeg , 0, 0, 0,0x200, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,DegTyp_RemoveDegreeType ,DegTyp_ContEditAfterChgDegTyp ,NULL},
[ActRenDegTyp ] = { 538,-1,TabUnk,ActSeeDeg , 0, 0, 0,0x200, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,DegTyp_RenameDegreeType ,DegTyp_ContEditAfterChgDegTyp ,NULL}, [ActRenDegTyp ] = { 538,-1,TabUnk,ActSeeDeg , 0, 0, 0,0x200, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,DegTyp_RenameDegreeType ,DegTyp_ContEditAfterChgDegTyp ,NULL},
@ -598,8 +598,8 @@ const struct Act_Actions ActLst_Actions[ActLst_NUM_ACTIONS] =
[ActSeeAllRub ] = {1951, 7,TabAss,ActSeeAllRub ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Rub_SeeAllRubrics ,"tasks" }, [ActSeeAllRub ] = {1951, 7,TabAss,ActSeeAllRub ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Rub_SeeAllRubrics ,"tasks" },
// Actions not in menu: // Actions not in menu:
[ActFrmNewAsg ] = { 812,-1,TabUnk,ActSeeAsg ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Asg_ReqCreatOrEditAsg ,NULL}, [ActFrmNewAsg ] = { 812,-1,TabUnk,ActSeeAsg ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Asg_ReqCreatOrEditAsg ,NULL},
[ActEdiOneAsg ] = { 814,-1,TabUnk,ActSeeAsg ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Asg_ReqCreatOrEditAsg ,NULL}, [ActEdiOneAsg ] = { 814,-1,TabUnk,ActSeeAsg ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Asg_ReqCreatOrEditAsg ,NULL},
[ActSeeOneAsg ] = {1942,-1,TabUnk,ActSeeAsg ,0x3F8,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Asg_SeeOneAssignment ,NULL}, [ActSeeOneAsg ] = {1942,-1,TabUnk,ActSeeAsg ,0x3F8,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Asg_SeeOneAssignment ,NULL},
[ActPrnOneAsg ] = {1637,-1,TabUnk,ActSeeAsg ,0x3F8,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_NEW_TAB,NULL ,Asg_PrintOneAssignment ,NULL}, [ActPrnOneAsg ] = {1637,-1,TabUnk,ActSeeAsg ,0x3F8,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_NEW_TAB,NULL ,Asg_PrintOneAssignment ,NULL},
[ActNewAsg ] = { 803,-1,TabUnk,ActSeeAsg ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Asg_ReceiveFormAssignment ,NULL}, [ActNewAsg ] = { 803,-1,TabUnk,ActSeeAsg ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Asg_ReceiveFormAssignment ,NULL},
@ -852,6 +852,7 @@ const struct Act_Actions ActLst_Actions[ActLst_NUM_ACTIONS] =
[ActChgTitRubCri ] = {1964,-1,TabUnk,ActSeeAllRub ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,RubCri_ChangeCriterionTitle ,NULL}, [ActChgTitRubCri ] = {1964,-1,TabUnk,ActSeeAllRub ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,RubCri_ChangeCriterionTitle ,NULL},
[ActChgMinRubCri ] = {1965,-1,TabUnk,ActSeeAllRub ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,RubCri_ChangeMinValueCriterion ,NULL}, [ActChgMinRubCri ] = {1965,-1,TabUnk,ActSeeAllRub ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,RubCri_ChangeMinValueCriterion ,NULL},
[ActChgMaxRubCri ] = {1966,-1,TabUnk,ActSeeAllRub ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,RubCri_ChangeMaxValueCriterion ,NULL}, [ActChgMaxRubCri ] = {1966,-1,TabUnk,ActSeeAllRub ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,RubCri_ChangeMaxValueCriterion ,NULL},
[ActChgWeiRubCri ] = {1967,-1,TabUnk,ActSeeAllRub ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,RubCri_ChangeWeightCriterion ,NULL},
// TabFil ****************************************************************** // TabFil ******************************************************************
// Actions in menu: // Actions in menu:
@ -1771,8 +1772,8 @@ const struct Act_Actions ActLst_Actions[ActLst_NUM_ACTIONS] =
[ActSeeSvy ] = { 982,-1,TabUnk,ActSeeAllSvy ,0x3F8,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Svy_SeeOneSurvey ,NULL}, [ActSeeSvy ] = { 982,-1,TabUnk,ActSeeAllSvy ,0x3F8,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Svy_SeeOneSurvey ,NULL},
[ActAnsSvy ] = { 983,-1,TabUnk,ActSeeAllSvy ,0x3F8,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Svy_ReceiveSurveyAnswers ,NULL}, [ActAnsSvy ] = { 983,-1,TabUnk,ActSeeAllSvy ,0x3F8,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Svy_ReceiveSurveyAnswers ,NULL},
[ActFrmNewSvy ] = { 973,-1,TabUnk,ActSeeAllSvy ,0x3E0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Svy_ReqCreatOrEditSvy ,NULL}, [ActFrmNewSvy ] = { 973,-1,TabUnk,ActSeeAllSvy ,0x3E0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Svy_ReqCreatOrEditSvy ,NULL},
[ActEdiOneSvy ] = { 974,-1,TabUnk,ActSeeAllSvy ,0x3E0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Svy_ReqCreatOrEditSvy ,NULL}, [ActEdiOneSvy ] = { 974,-1,TabUnk,ActSeeAllSvy ,0x3E0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Svy_ReqCreatOrEditSvy ,NULL},
[ActNewSvy ] = { 968,-1,TabUnk,ActSeeAllSvy ,0x3E0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Svy_ReceiveFormSurvey ,NULL}, [ActNewSvy ] = { 968,-1,TabUnk,ActSeeAllSvy ,0x3E0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Svy_ReceiveFormSurvey ,NULL},
[ActChgSvy ] = { 975,-1,TabUnk,ActSeeAllSvy ,0x3E0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Svy_ReceiveFormSurvey ,NULL}, [ActChgSvy ] = { 975,-1,TabUnk,ActSeeAllSvy ,0x3E0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Svy_ReceiveFormSurvey ,NULL},
[ActReqRemSvy ] = { 976,-1,TabUnk,ActSeeAllSvy ,0x3E0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Svy_AskRemSurvey ,NULL}, [ActReqRemSvy ] = { 976,-1,TabUnk,ActSeeAllSvy ,0x3E0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Svy_AskRemSurvey ,NULL},
@ -1866,7 +1867,7 @@ const struct Act_Actions ActLst_Actions[ActLst_NUM_ACTIONS] =
[ActChgCol ] = { 674,-1,TabUnk,ActReqEdiSet ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,Set_ChangeSideCols ,Set_EditSettings ,NULL}, [ActChgCol ] = { 674,-1,TabUnk,ActReqEdiSet ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,Set_ChangeSideCols ,Set_EditSettings ,NULL},
[ActChgIco ] = {1092,-1,TabUnk,ActReqEdiSet ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,Ico_ChangeIconSet ,Set_EditSettings ,NULL}, [ActChgIco ] = {1092,-1,TabUnk,ActReqEdiSet ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,Ico_ChangeIconSet ,Set_EditSettings ,NULL},
[ActChgMnu ] = {1243,-1,TabUnk,ActReqEdiSet ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,Mnu_ChangeMenu ,Set_EditSettings ,NULL}, [ActChgMnu ] = {1243,-1,TabUnk,ActReqEdiSet ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,Mnu_ChangeMenu ,Set_EditSettings ,NULL},
[ActChgUsrPho ] = {1917,-1,TabUnk,ActReqEdiSet ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,PhoSha_ChangePhotoShape ,Set_EditSettings ,NULL}, [ActChgUsrPho ] = {1917,-1,TabUnk,ActReqEdiSet ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,PhoSha_ChangePhotoShape ,Set_EditSettings ,NULL},
[ActChgPriPho ] = { 774,-1,TabUnk,ActReqEdiSet ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Pho_ChangePhotoVisibility ,NULL}, [ActChgPriPho ] = { 774,-1,TabUnk,ActReqEdiSet ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Pho_ChangePhotoVisibility ,NULL},
[ActChgBasPriPrf ] = {1404,-1,TabUnk,ActReqEdiSet ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prf_ChangeBasicProfileVis ,NULL}, [ActChgBasPriPrf ] = {1404,-1,TabUnk,ActReqEdiSet ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prf_ChangeBasicProfileVis ,NULL},
[ActChgExtPriPrf ] = {1765,-1,TabUnk,ActReqEdiSet ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prf_ChangeExtendedProfileVis ,NULL}, [ActChgExtPriPrf ] = {1765,-1,TabUnk,ActReqEdiSet ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prf_ChangeExtendedProfileVis ,NULL},
@ -1968,7 +1969,7 @@ Act_Action_t ActLst_FromActCodToAction[1 + ActLst_MAX_ACTION_COD] = // Do not re
-1, // #82 (obsolete action) -1, // #82 (obsolete action)
-1, // #83 (obsolete action) -1, // #83 (obsolete action)
ActSeeUseGbl, // #84 ActSeeUseGbl, // #84
ActSeeAllCfe, // #85 ActSeeAllCfe, // #85
-1, // #86 (obsolete action) -1, // #86 (obsolete action)
ActRemAllStdCrs, // #87 ActRemAllStdCrs, // #87
ActReqRemAllStdCrs, // #88 ActReqRemAllStdCrs, // #88
@ -3850,4 +3851,5 @@ Act_Action_t ActLst_FromActCodToAction[1 + ActLst_MAX_ACTION_COD] = // Do not re
ActChgTitRubCri, // #1964 ActChgTitRubCri, // #1964
ActChgMinRubCri, // #1965 ActChgMinRubCri, // #1965
ActChgMaxRubCri, // #1966 ActChgMaxRubCri, // #1966
ActChgWeiRubCri, // #1967
}; };

View File

@ -775,480 +775,481 @@
#define ActChgTitRubCri (ActChgCrsTT1stDay + 232) #define ActChgTitRubCri (ActChgCrsTT1stDay + 232)
#define ActChgMinRubCri (ActChgCrsTT1stDay + 233) #define ActChgMinRubCri (ActChgCrsTT1stDay + 233)
#define ActChgMaxRubCri (ActChgCrsTT1stDay + 234) #define ActChgMaxRubCri (ActChgCrsTT1stDay + 234)
#define ActChgWeiRubCri (ActChgCrsTT1stDay + 235)
/*****************************************************************************/ /*****************************************************************************/
/******************************** Files tab **********************************/ /******************************** Files tab **********************************/
/*****************************************************************************/ /*****************************************************************************/
// Actions in menu // Actions in menu
#define ActSeeAdmDocIns (ActChgMaxRubCri + 1) #define ActSeeAdmDocIns (ActChgWeiRubCri + 1)
#define ActAdmShaIns (ActChgMaxRubCri + 2) #define ActAdmShaIns (ActChgWeiRubCri + 2)
#define ActSeeAdmDocCtr (ActChgMaxRubCri + 3) #define ActSeeAdmDocCtr (ActChgWeiRubCri + 3)
#define ActAdmShaCtr (ActChgMaxRubCri + 4) #define ActAdmShaCtr (ActChgWeiRubCri + 4)
#define ActSeeAdmDocDeg (ActChgMaxRubCri + 5) #define ActSeeAdmDocDeg (ActChgWeiRubCri + 5)
#define ActAdmShaDeg (ActChgMaxRubCri + 6) #define ActAdmShaDeg (ActChgWeiRubCri + 6)
#define ActSeeAdmDocCrsGrp (ActChgMaxRubCri + 7) #define ActSeeAdmDocCrsGrp (ActChgWeiRubCri + 7)
#define ActAdmTchCrsGrp (ActChgMaxRubCri + 8) #define ActAdmTchCrsGrp (ActChgWeiRubCri + 8)
#define ActAdmShaCrsGrp (ActChgMaxRubCri + 9) #define ActAdmShaCrsGrp (ActChgWeiRubCri + 9)
#define ActAdmAsgWrkUsr (ActChgMaxRubCri + 10) #define ActAdmAsgWrkUsr (ActChgWeiRubCri + 10)
#define ActReqAsgWrkCrs (ActChgMaxRubCri + 11) #define ActReqAsgWrkCrs (ActChgWeiRubCri + 11)
#define ActSeeAdmMrk (ActChgMaxRubCri + 12) #define ActSeeAdmMrk (ActChgWeiRubCri + 12)
#define ActAdmBrf (ActChgMaxRubCri + 13) #define ActAdmBrf (ActChgWeiRubCri + 13)
// Secondary actions // Secondary actions
#define ActChgToSeeDocIns (ActChgMaxRubCri + 14) #define ActChgToSeeDocIns (ActChgWeiRubCri + 14)
#define ActSeeDocIns (ActChgMaxRubCri + 15) #define ActSeeDocIns (ActChgWeiRubCri + 15)
#define ActExpSeeDocIns (ActChgMaxRubCri + 16) #define ActExpSeeDocIns (ActChgWeiRubCri + 16)
#define ActConSeeDocIns (ActChgMaxRubCri + 17) #define ActConSeeDocIns (ActChgWeiRubCri + 17)
#define ActZIPSeeDocIns (ActChgMaxRubCri + 18) #define ActZIPSeeDocIns (ActChgWeiRubCri + 18)
#define ActReqDatSeeDocIns (ActChgMaxRubCri + 19) #define ActReqDatSeeDocIns (ActChgWeiRubCri + 19)
#define ActDowSeeDocIns (ActChgMaxRubCri + 20) #define ActDowSeeDocIns (ActChgWeiRubCri + 20)
#define ActChgToAdmDocIns (ActChgMaxRubCri + 21) #define ActChgToAdmDocIns (ActChgWeiRubCri + 21)
#define ActAdmDocIns (ActChgMaxRubCri + 22) #define ActAdmDocIns (ActChgWeiRubCri + 22)
#define ActReqRemFilDocIns (ActChgMaxRubCri + 23) #define ActReqRemFilDocIns (ActChgWeiRubCri + 23)
#define ActRemFilDocIns (ActChgMaxRubCri + 24) #define ActRemFilDocIns (ActChgWeiRubCri + 24)
#define ActRemFolDocIns (ActChgMaxRubCri + 25) #define ActRemFolDocIns (ActChgWeiRubCri + 25)
#define ActCopDocIns (ActChgMaxRubCri + 26) #define ActCopDocIns (ActChgWeiRubCri + 26)
#define ActPasDocIns (ActChgMaxRubCri + 27) #define ActPasDocIns (ActChgWeiRubCri + 27)
#define ActRemTreDocIns (ActChgMaxRubCri + 28) #define ActRemTreDocIns (ActChgWeiRubCri + 28)
#define ActFrmCreDocIns (ActChgMaxRubCri + 29) #define ActFrmCreDocIns (ActChgWeiRubCri + 29)
#define ActCreFolDocIns (ActChgMaxRubCri + 30) #define ActCreFolDocIns (ActChgWeiRubCri + 30)
#define ActCreLnkDocIns (ActChgMaxRubCri + 31) #define ActCreLnkDocIns (ActChgWeiRubCri + 31)
#define ActRenFolDocIns (ActChgMaxRubCri + 32) #define ActRenFolDocIns (ActChgWeiRubCri + 32)
#define ActRcvFilDocInsDZ (ActChgMaxRubCri + 33) #define ActRcvFilDocInsDZ (ActChgWeiRubCri + 33)
#define ActRcvFilDocInsCla (ActChgMaxRubCri + 34) #define ActRcvFilDocInsCla (ActChgWeiRubCri + 34)
#define ActExpAdmDocIns (ActChgMaxRubCri + 35) #define ActExpAdmDocIns (ActChgWeiRubCri + 35)
#define ActConAdmDocIns (ActChgMaxRubCri + 36) #define ActConAdmDocIns (ActChgWeiRubCri + 36)
#define ActZIPAdmDocIns (ActChgMaxRubCri + 37) #define ActZIPAdmDocIns (ActChgWeiRubCri + 37)
#define ActUnhDocIns (ActChgMaxRubCri + 38) #define ActUnhDocIns (ActChgWeiRubCri + 38)
#define ActHidDocIns (ActChgMaxRubCri + 39) #define ActHidDocIns (ActChgWeiRubCri + 39)
#define ActReqDatAdmDocIns (ActChgMaxRubCri + 40) #define ActReqDatAdmDocIns (ActChgWeiRubCri + 40)
#define ActChgDatAdmDocIns (ActChgMaxRubCri + 41) #define ActChgDatAdmDocIns (ActChgWeiRubCri + 41)
#define ActDowAdmDocIns (ActChgMaxRubCri + 42) #define ActDowAdmDocIns (ActChgWeiRubCri + 42)
#define ActReqRemFilShaIns (ActChgMaxRubCri + 43) #define ActReqRemFilShaIns (ActChgWeiRubCri + 43)
#define ActRemFilShaIns (ActChgMaxRubCri + 44) #define ActRemFilShaIns (ActChgWeiRubCri + 44)
#define ActRemFolShaIns (ActChgMaxRubCri + 45) #define ActRemFolShaIns (ActChgWeiRubCri + 45)
#define ActCopShaIns (ActChgMaxRubCri + 46) #define ActCopShaIns (ActChgWeiRubCri + 46)
#define ActPasShaIns (ActChgMaxRubCri + 47) #define ActPasShaIns (ActChgWeiRubCri + 47)
#define ActRemTreShaIns (ActChgMaxRubCri + 48) #define ActRemTreShaIns (ActChgWeiRubCri + 48)
#define ActFrmCreShaIns (ActChgMaxRubCri + 49) #define ActFrmCreShaIns (ActChgWeiRubCri + 49)
#define ActCreFolShaIns (ActChgMaxRubCri + 50) #define ActCreFolShaIns (ActChgWeiRubCri + 50)
#define ActCreLnkShaIns (ActChgMaxRubCri + 51) #define ActCreLnkShaIns (ActChgWeiRubCri + 51)
#define ActRenFolShaIns (ActChgMaxRubCri + 52) #define ActRenFolShaIns (ActChgWeiRubCri + 52)
#define ActRcvFilShaInsDZ (ActChgMaxRubCri + 53) #define ActRcvFilShaInsDZ (ActChgWeiRubCri + 53)
#define ActRcvFilShaInsCla (ActChgMaxRubCri + 54) #define ActRcvFilShaInsCla (ActChgWeiRubCri + 54)
#define ActExpShaIns (ActChgMaxRubCri + 55) #define ActExpShaIns (ActChgWeiRubCri + 55)
#define ActConShaIns (ActChgMaxRubCri + 56) #define ActConShaIns (ActChgWeiRubCri + 56)
#define ActZIPShaIns (ActChgMaxRubCri + 57) #define ActZIPShaIns (ActChgWeiRubCri + 57)
#define ActReqDatShaIns (ActChgMaxRubCri + 58) #define ActReqDatShaIns (ActChgWeiRubCri + 58)
#define ActChgDatShaIns (ActChgMaxRubCri + 59) #define ActChgDatShaIns (ActChgWeiRubCri + 59)
#define ActDowShaIns (ActChgMaxRubCri + 60) #define ActDowShaIns (ActChgWeiRubCri + 60)
#define ActChgToSeeDocCtr (ActChgMaxRubCri + 61) #define ActChgToSeeDocCtr (ActChgWeiRubCri + 61)
#define ActSeeDocCtr (ActChgMaxRubCri + 62) #define ActSeeDocCtr (ActChgWeiRubCri + 62)
#define ActExpSeeDocCtr (ActChgMaxRubCri + 63) #define ActExpSeeDocCtr (ActChgWeiRubCri + 63)
#define ActConSeeDocCtr (ActChgMaxRubCri + 64) #define ActConSeeDocCtr (ActChgWeiRubCri + 64)
#define ActZIPSeeDocCtr (ActChgMaxRubCri + 65) #define ActZIPSeeDocCtr (ActChgWeiRubCri + 65)
#define ActReqDatSeeDocCtr (ActChgMaxRubCri + 66) #define ActReqDatSeeDocCtr (ActChgWeiRubCri + 66)
#define ActDowSeeDocCtr (ActChgMaxRubCri + 67) #define ActDowSeeDocCtr (ActChgWeiRubCri + 67)
#define ActChgToAdmDocCtr (ActChgMaxRubCri + 68) #define ActChgToAdmDocCtr (ActChgWeiRubCri + 68)
#define ActAdmDocCtr (ActChgMaxRubCri + 69) #define ActAdmDocCtr (ActChgWeiRubCri + 69)
#define ActReqRemFilDocCtr (ActChgMaxRubCri + 70) #define ActReqRemFilDocCtr (ActChgWeiRubCri + 70)
#define ActRemFilDocCtr (ActChgMaxRubCri + 71) #define ActRemFilDocCtr (ActChgWeiRubCri + 71)
#define ActRemFolDocCtr (ActChgMaxRubCri + 72) #define ActRemFolDocCtr (ActChgWeiRubCri + 72)
#define ActCopDocCtr (ActChgMaxRubCri + 73) #define ActCopDocCtr (ActChgWeiRubCri + 73)
#define ActPasDocCtr (ActChgMaxRubCri + 74) #define ActPasDocCtr (ActChgWeiRubCri + 74)
#define ActRemTreDocCtr (ActChgMaxRubCri + 75) #define ActRemTreDocCtr (ActChgWeiRubCri + 75)
#define ActFrmCreDocCtr (ActChgMaxRubCri + 76) #define ActFrmCreDocCtr (ActChgWeiRubCri + 76)
#define ActCreFolDocCtr (ActChgMaxRubCri + 77) #define ActCreFolDocCtr (ActChgWeiRubCri + 77)
#define ActCreLnkDocCtr (ActChgMaxRubCri + 78) #define ActCreLnkDocCtr (ActChgWeiRubCri + 78)
#define ActRenFolDocCtr (ActChgMaxRubCri + 79) #define ActRenFolDocCtr (ActChgWeiRubCri + 79)
#define ActRcvFilDocCtrDZ (ActChgMaxRubCri + 80) #define ActRcvFilDocCtrDZ (ActChgWeiRubCri + 80)
#define ActRcvFilDocCtrCla (ActChgMaxRubCri + 81) #define ActRcvFilDocCtrCla (ActChgWeiRubCri + 81)
#define ActExpAdmDocCtr (ActChgMaxRubCri + 82) #define ActExpAdmDocCtr (ActChgWeiRubCri + 82)
#define ActConAdmDocCtr (ActChgMaxRubCri + 83) #define ActConAdmDocCtr (ActChgWeiRubCri + 83)
#define ActZIPAdmDocCtr (ActChgMaxRubCri + 84) #define ActZIPAdmDocCtr (ActChgWeiRubCri + 84)
#define ActUnhDocCtr (ActChgMaxRubCri + 85) #define ActUnhDocCtr (ActChgWeiRubCri + 85)
#define ActHidDocCtr (ActChgMaxRubCri + 86) #define ActHidDocCtr (ActChgWeiRubCri + 86)
#define ActReqDatAdmDocCtr (ActChgMaxRubCri + 87) #define ActReqDatAdmDocCtr (ActChgWeiRubCri + 87)
#define ActChgDatAdmDocCtr (ActChgMaxRubCri + 88) #define ActChgDatAdmDocCtr (ActChgWeiRubCri + 88)
#define ActDowAdmDocCtr (ActChgMaxRubCri + 89) #define ActDowAdmDocCtr (ActChgWeiRubCri + 89)
#define ActReqRemFilShaCtr (ActChgMaxRubCri + 90) #define ActReqRemFilShaCtr (ActChgWeiRubCri + 90)
#define ActRemFilShaCtr (ActChgMaxRubCri + 91) #define ActRemFilShaCtr (ActChgWeiRubCri + 91)
#define ActRemFolShaCtr (ActChgMaxRubCri + 92) #define ActRemFolShaCtr (ActChgWeiRubCri + 92)
#define ActCopShaCtr (ActChgMaxRubCri + 93) #define ActCopShaCtr (ActChgWeiRubCri + 93)
#define ActPasShaCtr (ActChgMaxRubCri + 94) #define ActPasShaCtr (ActChgWeiRubCri + 94)
#define ActRemTreShaCtr (ActChgMaxRubCri + 95) #define ActRemTreShaCtr (ActChgWeiRubCri + 95)
#define ActFrmCreShaCtr (ActChgMaxRubCri + 96) #define ActFrmCreShaCtr (ActChgWeiRubCri + 96)
#define ActCreFolShaCtr (ActChgMaxRubCri + 97) #define ActCreFolShaCtr (ActChgWeiRubCri + 97)
#define ActCreLnkShaCtr (ActChgMaxRubCri + 98) #define ActCreLnkShaCtr (ActChgWeiRubCri + 98)
#define ActRenFolShaCtr (ActChgMaxRubCri + 99) #define ActRenFolShaCtr (ActChgWeiRubCri + 99)
#define ActRcvFilShaCtrDZ (ActChgMaxRubCri + 100) #define ActRcvFilShaCtrDZ (ActChgWeiRubCri + 100)
#define ActRcvFilShaCtrCla (ActChgMaxRubCri + 101) #define ActRcvFilShaCtrCla (ActChgWeiRubCri + 101)
#define ActExpShaCtr (ActChgMaxRubCri + 102) #define ActExpShaCtr (ActChgWeiRubCri + 102)
#define ActConShaCtr (ActChgMaxRubCri + 103) #define ActConShaCtr (ActChgWeiRubCri + 103)
#define ActZIPShaCtr (ActChgMaxRubCri + 104) #define ActZIPShaCtr (ActChgWeiRubCri + 104)
#define ActReqDatShaCtr (ActChgMaxRubCri + 105) #define ActReqDatShaCtr (ActChgWeiRubCri + 105)
#define ActChgDatShaCtr (ActChgMaxRubCri + 106) #define ActChgDatShaCtr (ActChgWeiRubCri + 106)
#define ActDowShaCtr (ActChgMaxRubCri + 107) #define ActDowShaCtr (ActChgWeiRubCri + 107)
#define ActChgToSeeDocDeg (ActChgMaxRubCri + 108) #define ActChgToSeeDocDeg (ActChgWeiRubCri + 108)
#define ActSeeDocDeg (ActChgMaxRubCri + 109) #define ActSeeDocDeg (ActChgWeiRubCri + 109)
#define ActExpSeeDocDeg (ActChgMaxRubCri + 110) #define ActExpSeeDocDeg (ActChgWeiRubCri + 110)
#define ActConSeeDocDeg (ActChgMaxRubCri + 111) #define ActConSeeDocDeg (ActChgWeiRubCri + 111)
#define ActZIPSeeDocDeg (ActChgMaxRubCri + 112) #define ActZIPSeeDocDeg (ActChgWeiRubCri + 112)
#define ActReqDatSeeDocDeg (ActChgMaxRubCri + 113) #define ActReqDatSeeDocDeg (ActChgWeiRubCri + 113)
#define ActDowSeeDocDeg (ActChgMaxRubCri + 114) #define ActDowSeeDocDeg (ActChgWeiRubCri + 114)
#define ActChgToAdmDocDeg (ActChgMaxRubCri + 115) #define ActChgToAdmDocDeg (ActChgWeiRubCri + 115)
#define ActAdmDocDeg (ActChgMaxRubCri + 116) #define ActAdmDocDeg (ActChgWeiRubCri + 116)
#define ActReqRemFilDocDeg (ActChgMaxRubCri + 117) #define ActReqRemFilDocDeg (ActChgWeiRubCri + 117)
#define ActRemFilDocDeg (ActChgMaxRubCri + 118) #define ActRemFilDocDeg (ActChgWeiRubCri + 118)
#define ActRemFolDocDeg (ActChgMaxRubCri + 119) #define ActRemFolDocDeg (ActChgWeiRubCri + 119)
#define ActCopDocDeg (ActChgMaxRubCri + 120) #define ActCopDocDeg (ActChgWeiRubCri + 120)
#define ActPasDocDeg (ActChgMaxRubCri + 121) #define ActPasDocDeg (ActChgWeiRubCri + 121)
#define ActRemTreDocDeg (ActChgMaxRubCri + 122) #define ActRemTreDocDeg (ActChgWeiRubCri + 122)
#define ActFrmCreDocDeg (ActChgMaxRubCri + 123) #define ActFrmCreDocDeg (ActChgWeiRubCri + 123)
#define ActCreFolDocDeg (ActChgMaxRubCri + 124) #define ActCreFolDocDeg (ActChgWeiRubCri + 124)
#define ActCreLnkDocDeg (ActChgMaxRubCri + 125) #define ActCreLnkDocDeg (ActChgWeiRubCri + 125)
#define ActRenFolDocDeg (ActChgMaxRubCri + 126) #define ActRenFolDocDeg (ActChgWeiRubCri + 126)
#define ActRcvFilDocDegDZ (ActChgMaxRubCri + 127) #define ActRcvFilDocDegDZ (ActChgWeiRubCri + 127)
#define ActRcvFilDocDegCla (ActChgMaxRubCri + 128) #define ActRcvFilDocDegCla (ActChgWeiRubCri + 128)
#define ActExpAdmDocDeg (ActChgMaxRubCri + 129) #define ActExpAdmDocDeg (ActChgWeiRubCri + 129)
#define ActConAdmDocDeg (ActChgMaxRubCri + 130) #define ActConAdmDocDeg (ActChgWeiRubCri + 130)
#define ActZIPAdmDocDeg (ActChgMaxRubCri + 131) #define ActZIPAdmDocDeg (ActChgWeiRubCri + 131)
#define ActUnhDocDeg (ActChgMaxRubCri + 132) #define ActUnhDocDeg (ActChgWeiRubCri + 132)
#define ActHidDocDeg (ActChgMaxRubCri + 133) #define ActHidDocDeg (ActChgWeiRubCri + 133)
#define ActReqDatAdmDocDeg (ActChgMaxRubCri + 134) #define ActReqDatAdmDocDeg (ActChgWeiRubCri + 134)
#define ActChgDatAdmDocDeg (ActChgMaxRubCri + 135) #define ActChgDatAdmDocDeg (ActChgWeiRubCri + 135)
#define ActDowAdmDocDeg (ActChgMaxRubCri + 136) #define ActDowAdmDocDeg (ActChgWeiRubCri + 136)
#define ActReqRemFilShaDeg (ActChgMaxRubCri + 137) #define ActReqRemFilShaDeg (ActChgWeiRubCri + 137)
#define ActRemFilShaDeg (ActChgMaxRubCri + 138) #define ActRemFilShaDeg (ActChgWeiRubCri + 138)
#define ActRemFolShaDeg (ActChgMaxRubCri + 139) #define ActRemFolShaDeg (ActChgWeiRubCri + 139)
#define ActCopShaDeg (ActChgMaxRubCri + 140) #define ActCopShaDeg (ActChgWeiRubCri + 140)
#define ActPasShaDeg (ActChgMaxRubCri + 141) #define ActPasShaDeg (ActChgWeiRubCri + 141)
#define ActRemTreShaDeg (ActChgMaxRubCri + 142) #define ActRemTreShaDeg (ActChgWeiRubCri + 142)
#define ActFrmCreShaDeg (ActChgMaxRubCri + 143) #define ActFrmCreShaDeg (ActChgWeiRubCri + 143)
#define ActCreFolShaDeg (ActChgMaxRubCri + 144) #define ActCreFolShaDeg (ActChgWeiRubCri + 144)
#define ActCreLnkShaDeg (ActChgMaxRubCri + 145) #define ActCreLnkShaDeg (ActChgWeiRubCri + 145)
#define ActRenFolShaDeg (ActChgMaxRubCri + 146) #define ActRenFolShaDeg (ActChgWeiRubCri + 146)
#define ActRcvFilShaDegDZ (ActChgMaxRubCri + 147) #define ActRcvFilShaDegDZ (ActChgWeiRubCri + 147)
#define ActRcvFilShaDegCla (ActChgMaxRubCri + 148) #define ActRcvFilShaDegCla (ActChgWeiRubCri + 148)
#define ActExpShaDeg (ActChgMaxRubCri + 149) #define ActExpShaDeg (ActChgWeiRubCri + 149)
#define ActConShaDeg (ActChgMaxRubCri + 150) #define ActConShaDeg (ActChgWeiRubCri + 150)
#define ActZIPShaDeg (ActChgMaxRubCri + 151) #define ActZIPShaDeg (ActChgWeiRubCri + 151)
#define ActReqDatShaDeg (ActChgMaxRubCri + 152) #define ActReqDatShaDeg (ActChgWeiRubCri + 152)
#define ActChgDatShaDeg (ActChgMaxRubCri + 153) #define ActChgDatShaDeg (ActChgWeiRubCri + 153)
#define ActDowShaDeg (ActChgMaxRubCri + 154) #define ActDowShaDeg (ActChgWeiRubCri + 154)
#define ActChgToSeeDocCrs (ActChgMaxRubCri + 155) #define ActChgToSeeDocCrs (ActChgWeiRubCri + 155)
#define ActSeeDocCrs (ActChgMaxRubCri + 156) #define ActSeeDocCrs (ActChgWeiRubCri + 156)
#define ActExpSeeDocCrs (ActChgMaxRubCri + 157) #define ActExpSeeDocCrs (ActChgWeiRubCri + 157)
#define ActConSeeDocCrs (ActChgMaxRubCri + 158) #define ActConSeeDocCrs (ActChgWeiRubCri + 158)
#define ActZIPSeeDocCrs (ActChgMaxRubCri + 159) #define ActZIPSeeDocCrs (ActChgWeiRubCri + 159)
#define ActReqDatSeeDocCrs (ActChgMaxRubCri + 160) #define ActReqDatSeeDocCrs (ActChgWeiRubCri + 160)
#define ActReqLnkSeeDocCrs (ActChgMaxRubCri + 161) #define ActReqLnkSeeDocCrs (ActChgWeiRubCri + 161)
#define ActDowSeeDocCrs (ActChgMaxRubCri + 162) #define ActDowSeeDocCrs (ActChgWeiRubCri + 162)
#define ActSeeDocGrp (ActChgMaxRubCri + 163) #define ActSeeDocGrp (ActChgWeiRubCri + 163)
#define ActExpSeeDocGrp (ActChgMaxRubCri + 164) #define ActExpSeeDocGrp (ActChgWeiRubCri + 164)
#define ActConSeeDocGrp (ActChgMaxRubCri + 165) #define ActConSeeDocGrp (ActChgWeiRubCri + 165)
#define ActZIPSeeDocGrp (ActChgMaxRubCri + 166) #define ActZIPSeeDocGrp (ActChgWeiRubCri + 166)
#define ActReqDatSeeDocGrp (ActChgMaxRubCri + 167) #define ActReqDatSeeDocGrp (ActChgWeiRubCri + 167)
#define ActDowSeeDocGrp (ActChgMaxRubCri + 168) #define ActDowSeeDocGrp (ActChgWeiRubCri + 168)
#define ActChgToAdmDocCrs (ActChgMaxRubCri + 169) #define ActChgToAdmDocCrs (ActChgWeiRubCri + 169)
#define ActAdmDocCrs (ActChgMaxRubCri + 170) #define ActAdmDocCrs (ActChgWeiRubCri + 170)
#define ActReqRemFilDocCrs (ActChgMaxRubCri + 171) #define ActReqRemFilDocCrs (ActChgWeiRubCri + 171)
#define ActRemFilDocCrs (ActChgMaxRubCri + 172) #define ActRemFilDocCrs (ActChgWeiRubCri + 172)
#define ActRemFolDocCrs (ActChgMaxRubCri + 173) #define ActRemFolDocCrs (ActChgWeiRubCri + 173)
#define ActCopDocCrs (ActChgMaxRubCri + 174) #define ActCopDocCrs (ActChgWeiRubCri + 174)
#define ActPasDocCrs (ActChgMaxRubCri + 175) #define ActPasDocCrs (ActChgWeiRubCri + 175)
#define ActRemTreDocCrs (ActChgMaxRubCri + 176) #define ActRemTreDocCrs (ActChgWeiRubCri + 176)
#define ActFrmCreDocCrs (ActChgMaxRubCri + 177) #define ActFrmCreDocCrs (ActChgWeiRubCri + 177)
#define ActCreFolDocCrs (ActChgMaxRubCri + 178) #define ActCreFolDocCrs (ActChgWeiRubCri + 178)
#define ActCreLnkDocCrs (ActChgMaxRubCri + 179) #define ActCreLnkDocCrs (ActChgWeiRubCri + 179)
#define ActRenFolDocCrs (ActChgMaxRubCri + 180) #define ActRenFolDocCrs (ActChgWeiRubCri + 180)
#define ActRcvFilDocCrsDZ (ActChgMaxRubCri + 181) #define ActRcvFilDocCrsDZ (ActChgWeiRubCri + 181)
#define ActRcvFilDocCrsCla (ActChgMaxRubCri + 182) #define ActRcvFilDocCrsCla (ActChgWeiRubCri + 182)
#define ActExpAdmDocCrs (ActChgMaxRubCri + 183) #define ActExpAdmDocCrs (ActChgWeiRubCri + 183)
#define ActConAdmDocCrs (ActChgMaxRubCri + 184) #define ActConAdmDocCrs (ActChgWeiRubCri + 184)
#define ActZIPAdmDocCrs (ActChgMaxRubCri + 185) #define ActZIPAdmDocCrs (ActChgWeiRubCri + 185)
#define ActUnhDocCrs (ActChgMaxRubCri + 186) #define ActUnhDocCrs (ActChgWeiRubCri + 186)
#define ActHidDocCrs (ActChgMaxRubCri + 187) #define ActHidDocCrs (ActChgWeiRubCri + 187)
#define ActReqDatAdmDocCrs (ActChgMaxRubCri + 188) #define ActReqDatAdmDocCrs (ActChgWeiRubCri + 188)
#define ActChgDatAdmDocCrs (ActChgMaxRubCri + 189) #define ActChgDatAdmDocCrs (ActChgWeiRubCri + 189)
#define ActReqLnkAdmDocCrs (ActChgMaxRubCri + 190) #define ActReqLnkAdmDocCrs (ActChgWeiRubCri + 190)
#define ActDowAdmDocCrs (ActChgMaxRubCri + 191) #define ActDowAdmDocCrs (ActChgWeiRubCri + 191)
#define ActAdmDocGrp (ActChgMaxRubCri + 192) #define ActAdmDocGrp (ActChgWeiRubCri + 192)
#define ActReqRemFilDocGrp (ActChgMaxRubCri + 193) #define ActReqRemFilDocGrp (ActChgWeiRubCri + 193)
#define ActRemFilDocGrp (ActChgMaxRubCri + 194) #define ActRemFilDocGrp (ActChgWeiRubCri + 194)
#define ActRemFolDocGrp (ActChgMaxRubCri + 195) #define ActRemFolDocGrp (ActChgWeiRubCri + 195)
#define ActCopDocGrp (ActChgMaxRubCri + 196) #define ActCopDocGrp (ActChgWeiRubCri + 196)
#define ActPasDocGrp (ActChgMaxRubCri + 197) #define ActPasDocGrp (ActChgWeiRubCri + 197)
#define ActRemTreDocGrp (ActChgMaxRubCri + 198) #define ActRemTreDocGrp (ActChgWeiRubCri + 198)
#define ActFrmCreDocGrp (ActChgMaxRubCri + 199) #define ActFrmCreDocGrp (ActChgWeiRubCri + 199)
#define ActCreFolDocGrp (ActChgMaxRubCri + 200) #define ActCreFolDocGrp (ActChgWeiRubCri + 200)
#define ActCreLnkDocGrp (ActChgMaxRubCri + 201) #define ActCreLnkDocGrp (ActChgWeiRubCri + 201)
#define ActRenFolDocGrp (ActChgMaxRubCri + 202) #define ActRenFolDocGrp (ActChgWeiRubCri + 202)
#define ActRcvFilDocGrpDZ (ActChgMaxRubCri + 203) #define ActRcvFilDocGrpDZ (ActChgWeiRubCri + 203)
#define ActRcvFilDocGrpCla (ActChgMaxRubCri + 204) #define ActRcvFilDocGrpCla (ActChgWeiRubCri + 204)
#define ActExpAdmDocGrp (ActChgMaxRubCri + 205) #define ActExpAdmDocGrp (ActChgWeiRubCri + 205)
#define ActConAdmDocGrp (ActChgMaxRubCri + 206) #define ActConAdmDocGrp (ActChgWeiRubCri + 206)
#define ActZIPAdmDocGrp (ActChgMaxRubCri + 207) #define ActZIPAdmDocGrp (ActChgWeiRubCri + 207)
#define ActUnhDocGrp (ActChgMaxRubCri + 208) #define ActUnhDocGrp (ActChgWeiRubCri + 208)
#define ActHidDocGrp (ActChgMaxRubCri + 209) #define ActHidDocGrp (ActChgWeiRubCri + 209)
#define ActReqDatAdmDocGrp (ActChgMaxRubCri + 210) #define ActReqDatAdmDocGrp (ActChgWeiRubCri + 210)
#define ActChgDatAdmDocGrp (ActChgMaxRubCri + 211) #define ActChgDatAdmDocGrp (ActChgWeiRubCri + 211)
#define ActDowAdmDocGrp (ActChgMaxRubCri + 212) #define ActDowAdmDocGrp (ActChgWeiRubCri + 212)
#define ActChgToAdmTch (ActChgMaxRubCri + 213) #define ActChgToAdmTch (ActChgWeiRubCri + 213)
#define ActAdmTchCrs (ActChgMaxRubCri + 214) #define ActAdmTchCrs (ActChgWeiRubCri + 214)
#define ActReqRemFilTchCrs (ActChgMaxRubCri + 215) #define ActReqRemFilTchCrs (ActChgWeiRubCri + 215)
#define ActRemFilTchCrs (ActChgMaxRubCri + 216) #define ActRemFilTchCrs (ActChgWeiRubCri + 216)
#define ActRemFolTchCrs (ActChgMaxRubCri + 217) #define ActRemFolTchCrs (ActChgWeiRubCri + 217)
#define ActCopTchCrs (ActChgMaxRubCri + 218) #define ActCopTchCrs (ActChgWeiRubCri + 218)
#define ActPasTchCrs (ActChgMaxRubCri + 219) #define ActPasTchCrs (ActChgWeiRubCri + 219)
#define ActRemTreTchCrs (ActChgMaxRubCri + 220) #define ActRemTreTchCrs (ActChgWeiRubCri + 220)
#define ActFrmCreTchCrs (ActChgMaxRubCri + 221) #define ActFrmCreTchCrs (ActChgWeiRubCri + 221)
#define ActCreFolTchCrs (ActChgMaxRubCri + 222) #define ActCreFolTchCrs (ActChgWeiRubCri + 222)
#define ActCreLnkTchCrs (ActChgMaxRubCri + 223) #define ActCreLnkTchCrs (ActChgWeiRubCri + 223)
#define ActRenFolTchCrs (ActChgMaxRubCri + 224) #define ActRenFolTchCrs (ActChgWeiRubCri + 224)
#define ActRcvFilTchCrsDZ (ActChgMaxRubCri + 225) #define ActRcvFilTchCrsDZ (ActChgWeiRubCri + 225)
#define ActRcvFilTchCrsCla (ActChgMaxRubCri + 226) #define ActRcvFilTchCrsCla (ActChgWeiRubCri + 226)
#define ActExpTchCrs (ActChgMaxRubCri + 227) #define ActExpTchCrs (ActChgWeiRubCri + 227)
#define ActConTchCrs (ActChgMaxRubCri + 228) #define ActConTchCrs (ActChgWeiRubCri + 228)
#define ActZIPTchCrs (ActChgMaxRubCri + 229) #define ActZIPTchCrs (ActChgWeiRubCri + 229)
#define ActReqDatTchCrs (ActChgMaxRubCri + 230) #define ActReqDatTchCrs (ActChgWeiRubCri + 230)
#define ActChgDatTchCrs (ActChgMaxRubCri + 231) #define ActChgDatTchCrs (ActChgWeiRubCri + 231)
#define ActDowTchCrs (ActChgMaxRubCri + 232) #define ActDowTchCrs (ActChgWeiRubCri + 232)
#define ActAdmTchGrp (ActChgMaxRubCri + 233) #define ActAdmTchGrp (ActChgWeiRubCri + 233)
#define ActReqRemFilTchGrp (ActChgMaxRubCri + 234) #define ActReqRemFilTchGrp (ActChgWeiRubCri + 234)
#define ActRemFilTchGrp (ActChgMaxRubCri + 235) #define ActRemFilTchGrp (ActChgWeiRubCri + 235)
#define ActRemFolTchGrp (ActChgMaxRubCri + 236) #define ActRemFolTchGrp (ActChgWeiRubCri + 236)
#define ActCopTchGrp (ActChgMaxRubCri + 237) #define ActCopTchGrp (ActChgWeiRubCri + 237)
#define ActPasTchGrp (ActChgMaxRubCri + 238) #define ActPasTchGrp (ActChgWeiRubCri + 238)
#define ActRemTreTchGrp (ActChgMaxRubCri + 239) #define ActRemTreTchGrp (ActChgWeiRubCri + 239)
#define ActFrmCreTchGrp (ActChgMaxRubCri + 240) #define ActFrmCreTchGrp (ActChgWeiRubCri + 240)
#define ActCreFolTchGrp (ActChgMaxRubCri + 241) #define ActCreFolTchGrp (ActChgWeiRubCri + 241)
#define ActCreLnkTchGrp (ActChgMaxRubCri + 242) #define ActCreLnkTchGrp (ActChgWeiRubCri + 242)
#define ActRenFolTchGrp (ActChgMaxRubCri + 243) #define ActRenFolTchGrp (ActChgWeiRubCri + 243)
#define ActRcvFilTchGrpDZ (ActChgMaxRubCri + 244) #define ActRcvFilTchGrpDZ (ActChgWeiRubCri + 244)
#define ActRcvFilTchGrpCla (ActChgMaxRubCri + 245) #define ActRcvFilTchGrpCla (ActChgWeiRubCri + 245)
#define ActExpTchGrp (ActChgMaxRubCri + 246) #define ActExpTchGrp (ActChgWeiRubCri + 246)
#define ActConTchGrp (ActChgMaxRubCri + 247) #define ActConTchGrp (ActChgWeiRubCri + 247)
#define ActZIPTchGrp (ActChgMaxRubCri + 248) #define ActZIPTchGrp (ActChgWeiRubCri + 248)
#define ActReqDatTchGrp (ActChgMaxRubCri + 249) #define ActReqDatTchGrp (ActChgWeiRubCri + 249)
#define ActChgDatTchGrp (ActChgMaxRubCri + 250) #define ActChgDatTchGrp (ActChgWeiRubCri + 250)
#define ActDowTchGrp (ActChgMaxRubCri + 251) #define ActDowTchGrp (ActChgWeiRubCri + 251)
#define ActChgToAdmSha (ActChgMaxRubCri + 252) #define ActChgToAdmSha (ActChgWeiRubCri + 252)
#define ActAdmShaCrs (ActChgMaxRubCri + 253) #define ActAdmShaCrs (ActChgWeiRubCri + 253)
#define ActReqRemFilShaCrs (ActChgMaxRubCri + 254) #define ActReqRemFilShaCrs (ActChgWeiRubCri + 254)
#define ActRemFilShaCrs (ActChgMaxRubCri + 255) #define ActRemFilShaCrs (ActChgWeiRubCri + 255)
#define ActRemFolShaCrs (ActChgMaxRubCri + 256) #define ActRemFolShaCrs (ActChgWeiRubCri + 256)
#define ActCopShaCrs (ActChgMaxRubCri + 257) #define ActCopShaCrs (ActChgWeiRubCri + 257)
#define ActPasShaCrs (ActChgMaxRubCri + 258) #define ActPasShaCrs (ActChgWeiRubCri + 258)
#define ActRemTreShaCrs (ActChgMaxRubCri + 259) #define ActRemTreShaCrs (ActChgWeiRubCri + 259)
#define ActFrmCreShaCrs (ActChgMaxRubCri + 260) #define ActFrmCreShaCrs (ActChgWeiRubCri + 260)
#define ActCreFolShaCrs (ActChgMaxRubCri + 261) #define ActCreFolShaCrs (ActChgWeiRubCri + 261)
#define ActCreLnkShaCrs (ActChgMaxRubCri + 262) #define ActCreLnkShaCrs (ActChgWeiRubCri + 262)
#define ActRenFolShaCrs (ActChgMaxRubCri + 263) #define ActRenFolShaCrs (ActChgWeiRubCri + 263)
#define ActRcvFilShaCrsDZ (ActChgMaxRubCri + 264) #define ActRcvFilShaCrsDZ (ActChgWeiRubCri + 264)
#define ActRcvFilShaCrsCla (ActChgMaxRubCri + 265) #define ActRcvFilShaCrsCla (ActChgWeiRubCri + 265)
#define ActExpShaCrs (ActChgMaxRubCri + 266) #define ActExpShaCrs (ActChgWeiRubCri + 266)
#define ActConShaCrs (ActChgMaxRubCri + 267) #define ActConShaCrs (ActChgWeiRubCri + 267)
#define ActZIPShaCrs (ActChgMaxRubCri + 268) #define ActZIPShaCrs (ActChgWeiRubCri + 268)
#define ActReqDatShaCrs (ActChgMaxRubCri + 269) #define ActReqDatShaCrs (ActChgWeiRubCri + 269)
#define ActChgDatShaCrs (ActChgMaxRubCri + 270) #define ActChgDatShaCrs (ActChgWeiRubCri + 270)
#define ActDowShaCrs (ActChgMaxRubCri + 271) #define ActDowShaCrs (ActChgWeiRubCri + 271)
#define ActAdmShaGrp (ActChgMaxRubCri + 272) #define ActAdmShaGrp (ActChgWeiRubCri + 272)
#define ActReqRemFilShaGrp (ActChgMaxRubCri + 273) #define ActReqRemFilShaGrp (ActChgWeiRubCri + 273)
#define ActRemFilShaGrp (ActChgMaxRubCri + 274) #define ActRemFilShaGrp (ActChgWeiRubCri + 274)
#define ActRemFolShaGrp (ActChgMaxRubCri + 275) #define ActRemFolShaGrp (ActChgWeiRubCri + 275)
#define ActCopShaGrp (ActChgMaxRubCri + 276) #define ActCopShaGrp (ActChgWeiRubCri + 276)
#define ActPasShaGrp (ActChgMaxRubCri + 277) #define ActPasShaGrp (ActChgWeiRubCri + 277)
#define ActRemTreShaGrp (ActChgMaxRubCri + 278) #define ActRemTreShaGrp (ActChgWeiRubCri + 278)
#define ActFrmCreShaGrp (ActChgMaxRubCri + 279) #define ActFrmCreShaGrp (ActChgWeiRubCri + 279)
#define ActCreFolShaGrp (ActChgMaxRubCri + 280) #define ActCreFolShaGrp (ActChgWeiRubCri + 280)
#define ActCreLnkShaGrp (ActChgMaxRubCri + 281) #define ActCreLnkShaGrp (ActChgWeiRubCri + 281)
#define ActRenFolShaGrp (ActChgMaxRubCri + 282) #define ActRenFolShaGrp (ActChgWeiRubCri + 282)
#define ActRcvFilShaGrpDZ (ActChgMaxRubCri + 283) #define ActRcvFilShaGrpDZ (ActChgWeiRubCri + 283)
#define ActRcvFilShaGrpCla (ActChgMaxRubCri + 284) #define ActRcvFilShaGrpCla (ActChgWeiRubCri + 284)
#define ActExpShaGrp (ActChgMaxRubCri + 285) #define ActExpShaGrp (ActChgWeiRubCri + 285)
#define ActConShaGrp (ActChgMaxRubCri + 286) #define ActConShaGrp (ActChgWeiRubCri + 286)
#define ActZIPShaGrp (ActChgMaxRubCri + 287) #define ActZIPShaGrp (ActChgWeiRubCri + 287)
#define ActReqDatShaGrp (ActChgMaxRubCri + 288) #define ActReqDatShaGrp (ActChgWeiRubCri + 288)
#define ActChgDatShaGrp (ActChgMaxRubCri + 289) #define ActChgDatShaGrp (ActChgWeiRubCri + 289)
#define ActDowShaGrp (ActChgMaxRubCri + 290) #define ActDowShaGrp (ActChgWeiRubCri + 290)
#define ActAdmAsgWrkCrs (ActChgMaxRubCri + 291) #define ActAdmAsgWrkCrs (ActChgWeiRubCri + 291)
#define ActReqRemFilAsgUsr (ActChgMaxRubCri + 292) #define ActReqRemFilAsgUsr (ActChgWeiRubCri + 292)
#define ActRemFilAsgUsr (ActChgMaxRubCri + 293) #define ActRemFilAsgUsr (ActChgWeiRubCri + 293)
#define ActRemFolAsgUsr (ActChgMaxRubCri + 294) #define ActRemFolAsgUsr (ActChgWeiRubCri + 294)
#define ActCopAsgUsr (ActChgMaxRubCri + 295) #define ActCopAsgUsr (ActChgWeiRubCri + 295)
#define ActPasAsgUsr (ActChgMaxRubCri + 296) #define ActPasAsgUsr (ActChgWeiRubCri + 296)
#define ActRemTreAsgUsr (ActChgMaxRubCri + 297) #define ActRemTreAsgUsr (ActChgWeiRubCri + 297)
#define ActFrmCreAsgUsr (ActChgMaxRubCri + 298) #define ActFrmCreAsgUsr (ActChgWeiRubCri + 298)
#define ActCreFolAsgUsr (ActChgMaxRubCri + 299) #define ActCreFolAsgUsr (ActChgWeiRubCri + 299)
#define ActCreLnkAsgUsr (ActChgMaxRubCri + 300) #define ActCreLnkAsgUsr (ActChgWeiRubCri + 300)
#define ActRenFolAsgUsr (ActChgMaxRubCri + 301) #define ActRenFolAsgUsr (ActChgWeiRubCri + 301)
#define ActRcvFilAsgUsrDZ (ActChgMaxRubCri + 302) #define ActRcvFilAsgUsrDZ (ActChgWeiRubCri + 302)
#define ActRcvFilAsgUsrCla (ActChgMaxRubCri + 303) #define ActRcvFilAsgUsrCla (ActChgWeiRubCri + 303)
#define ActExpAsgUsr (ActChgMaxRubCri + 304) #define ActExpAsgUsr (ActChgWeiRubCri + 304)
#define ActConAsgUsr (ActChgMaxRubCri + 305) #define ActConAsgUsr (ActChgWeiRubCri + 305)
#define ActZIPAsgUsr (ActChgMaxRubCri + 306) #define ActZIPAsgUsr (ActChgWeiRubCri + 306)
#define ActReqDatAsgUsr (ActChgMaxRubCri + 307) #define ActReqDatAsgUsr (ActChgWeiRubCri + 307)
#define ActChgDatAsgUsr (ActChgMaxRubCri + 308) #define ActChgDatAsgUsr (ActChgWeiRubCri + 308)
#define ActDowAsgUsr (ActChgMaxRubCri + 309) #define ActDowAsgUsr (ActChgWeiRubCri + 309)
#define ActReqRemFilWrkUsr (ActChgMaxRubCri + 310) #define ActReqRemFilWrkUsr (ActChgWeiRubCri + 310)
#define ActRemFilWrkUsr (ActChgMaxRubCri + 311) #define ActRemFilWrkUsr (ActChgWeiRubCri + 311)
#define ActRemFolWrkUsr (ActChgMaxRubCri + 312) #define ActRemFolWrkUsr (ActChgWeiRubCri + 312)
#define ActCopWrkUsr (ActChgMaxRubCri + 313) #define ActCopWrkUsr (ActChgWeiRubCri + 313)
#define ActPasWrkUsr (ActChgMaxRubCri + 314) #define ActPasWrkUsr (ActChgWeiRubCri + 314)
#define ActRemTreWrkUsr (ActChgMaxRubCri + 315) #define ActRemTreWrkUsr (ActChgWeiRubCri + 315)
#define ActFrmCreWrkUsr (ActChgMaxRubCri + 316) #define ActFrmCreWrkUsr (ActChgWeiRubCri + 316)
#define ActCreFolWrkUsr (ActChgMaxRubCri + 317) #define ActCreFolWrkUsr (ActChgWeiRubCri + 317)
#define ActCreLnkWrkUsr (ActChgMaxRubCri + 318) #define ActCreLnkWrkUsr (ActChgWeiRubCri + 318)
#define ActRenFolWrkUsr (ActChgMaxRubCri + 319) #define ActRenFolWrkUsr (ActChgWeiRubCri + 319)
#define ActRcvFilWrkUsrDZ (ActChgMaxRubCri + 320) #define ActRcvFilWrkUsrDZ (ActChgWeiRubCri + 320)
#define ActRcvFilWrkUsrCla (ActChgMaxRubCri + 321) #define ActRcvFilWrkUsrCla (ActChgWeiRubCri + 321)
#define ActExpWrkUsr (ActChgMaxRubCri + 322) #define ActExpWrkUsr (ActChgWeiRubCri + 322)
#define ActConWrkUsr (ActChgMaxRubCri + 323) #define ActConWrkUsr (ActChgWeiRubCri + 323)
#define ActZIPWrkUsr (ActChgMaxRubCri + 324) #define ActZIPWrkUsr (ActChgWeiRubCri + 324)
#define ActReqDatWrkUsr (ActChgMaxRubCri + 325) #define ActReqDatWrkUsr (ActChgWeiRubCri + 325)
#define ActChgDatWrkUsr (ActChgMaxRubCri + 326) #define ActChgDatWrkUsr (ActChgWeiRubCri + 326)
#define ActDowWrkUsr (ActChgMaxRubCri + 327) #define ActDowWrkUsr (ActChgWeiRubCri + 327)
#define ActReqRemFilAsgCrs (ActChgMaxRubCri + 328) #define ActReqRemFilAsgCrs (ActChgWeiRubCri + 328)
#define ActRemFilAsgCrs (ActChgMaxRubCri + 329) #define ActRemFilAsgCrs (ActChgWeiRubCri + 329)
#define ActRemFolAsgCrs (ActChgMaxRubCri + 330) #define ActRemFolAsgCrs (ActChgWeiRubCri + 330)
#define ActCopAsgCrs (ActChgMaxRubCri + 331) #define ActCopAsgCrs (ActChgWeiRubCri + 331)
#define ActPasAsgCrs (ActChgMaxRubCri + 332) #define ActPasAsgCrs (ActChgWeiRubCri + 332)
#define ActRemTreAsgCrs (ActChgMaxRubCri + 333) #define ActRemTreAsgCrs (ActChgWeiRubCri + 333)
#define ActFrmCreAsgCrs (ActChgMaxRubCri + 334) #define ActFrmCreAsgCrs (ActChgWeiRubCri + 334)
#define ActCreFolAsgCrs (ActChgMaxRubCri + 335) #define ActCreFolAsgCrs (ActChgWeiRubCri + 335)
#define ActCreLnkAsgCrs (ActChgMaxRubCri + 336) #define ActCreLnkAsgCrs (ActChgWeiRubCri + 336)
#define ActRenFolAsgCrs (ActChgMaxRubCri + 337) #define ActRenFolAsgCrs (ActChgWeiRubCri + 337)
#define ActRcvFilAsgCrsDZ (ActChgMaxRubCri + 338) #define ActRcvFilAsgCrsDZ (ActChgWeiRubCri + 338)
#define ActRcvFilAsgCrsCla (ActChgMaxRubCri + 339) #define ActRcvFilAsgCrsCla (ActChgWeiRubCri + 339)
#define ActExpAsgCrs (ActChgMaxRubCri + 340) #define ActExpAsgCrs (ActChgWeiRubCri + 340)
#define ActConAsgCrs (ActChgMaxRubCri + 341) #define ActConAsgCrs (ActChgWeiRubCri + 341)
#define ActZIPAsgCrs (ActChgMaxRubCri + 342) #define ActZIPAsgCrs (ActChgWeiRubCri + 342)
#define ActReqDatAsgCrs (ActChgMaxRubCri + 343) #define ActReqDatAsgCrs (ActChgWeiRubCri + 343)
#define ActChgDatAsgCrs (ActChgMaxRubCri + 344) #define ActChgDatAsgCrs (ActChgWeiRubCri + 344)
#define ActDowAsgCrs (ActChgMaxRubCri + 345) #define ActDowAsgCrs (ActChgWeiRubCri + 345)
#define ActReqRemFilWrkCrs (ActChgMaxRubCri + 346) #define ActReqRemFilWrkCrs (ActChgWeiRubCri + 346)
#define ActRemFilWrkCrs (ActChgMaxRubCri + 347) #define ActRemFilWrkCrs (ActChgWeiRubCri + 347)
#define ActRemFolWrkCrs (ActChgMaxRubCri + 348) #define ActRemFolWrkCrs (ActChgWeiRubCri + 348)
#define ActCopWrkCrs (ActChgMaxRubCri + 349) #define ActCopWrkCrs (ActChgWeiRubCri + 349)
#define ActPasWrkCrs (ActChgMaxRubCri + 350) #define ActPasWrkCrs (ActChgWeiRubCri + 350)
#define ActRemTreWrkCrs (ActChgMaxRubCri + 351) #define ActRemTreWrkCrs (ActChgWeiRubCri + 351)
#define ActFrmCreWrkCrs (ActChgMaxRubCri + 352) #define ActFrmCreWrkCrs (ActChgWeiRubCri + 352)
#define ActCreFolWrkCrs (ActChgMaxRubCri + 353) #define ActCreFolWrkCrs (ActChgWeiRubCri + 353)
#define ActCreLnkWrkCrs (ActChgMaxRubCri + 354) #define ActCreLnkWrkCrs (ActChgWeiRubCri + 354)
#define ActRenFolWrkCrs (ActChgMaxRubCri + 355) #define ActRenFolWrkCrs (ActChgWeiRubCri + 355)
#define ActRcvFilWrkCrsDZ (ActChgMaxRubCri + 356) #define ActRcvFilWrkCrsDZ (ActChgWeiRubCri + 356)
#define ActRcvFilWrkCrsCla (ActChgMaxRubCri + 357) #define ActRcvFilWrkCrsCla (ActChgWeiRubCri + 357)
#define ActExpWrkCrs (ActChgMaxRubCri + 358) #define ActExpWrkCrs (ActChgWeiRubCri + 358)
#define ActConWrkCrs (ActChgMaxRubCri + 359) #define ActConWrkCrs (ActChgWeiRubCri + 359)
#define ActZIPWrkCrs (ActChgMaxRubCri + 360) #define ActZIPWrkCrs (ActChgWeiRubCri + 360)
#define ActReqDatWrkCrs (ActChgMaxRubCri + 361) #define ActReqDatWrkCrs (ActChgWeiRubCri + 361)
#define ActChgDatWrkCrs (ActChgMaxRubCri + 362) #define ActChgDatWrkCrs (ActChgWeiRubCri + 362)
#define ActDowWrkCrs (ActChgMaxRubCri + 363) #define ActDowWrkCrs (ActChgWeiRubCri + 363)
#define ActChgToSeeMrk (ActChgMaxRubCri + 364) #define ActChgToSeeMrk (ActChgWeiRubCri + 364)
#define ActSeeMrkCrs (ActChgMaxRubCri + 365) #define ActSeeMrkCrs (ActChgWeiRubCri + 365)
#define ActExpSeeMrkCrs (ActChgMaxRubCri + 366) #define ActExpSeeMrkCrs (ActChgWeiRubCri + 366)
#define ActConSeeMrkCrs (ActChgMaxRubCri + 367) #define ActConSeeMrkCrs (ActChgWeiRubCri + 367)
#define ActReqDatSeeMrkCrs (ActChgMaxRubCri + 368) #define ActReqDatSeeMrkCrs (ActChgWeiRubCri + 368)
#define ActReqLnkSeeMrkCrs (ActChgMaxRubCri + 369) #define ActReqLnkSeeMrkCrs (ActChgWeiRubCri + 369)
#define ActSeeMyMrkCrs (ActChgMaxRubCri + 370) #define ActSeeMyMrkCrs (ActChgWeiRubCri + 370)
#define ActSeeMrkGrp (ActChgMaxRubCri + 371) #define ActSeeMrkGrp (ActChgWeiRubCri + 371)
#define ActExpSeeMrkGrp (ActChgMaxRubCri + 372) #define ActExpSeeMrkGrp (ActChgWeiRubCri + 372)
#define ActConSeeMrkGrp (ActChgMaxRubCri + 373) #define ActConSeeMrkGrp (ActChgWeiRubCri + 373)
#define ActReqDatSeeMrkGrp (ActChgMaxRubCri + 374) #define ActReqDatSeeMrkGrp (ActChgWeiRubCri + 374)
#define ActSeeMyMrkGrp (ActChgMaxRubCri + 375) #define ActSeeMyMrkGrp (ActChgWeiRubCri + 375)
#define ActChgToAdmMrk (ActChgMaxRubCri + 376) #define ActChgToAdmMrk (ActChgWeiRubCri + 376)
#define ActAdmMrkCrs (ActChgMaxRubCri + 377) #define ActAdmMrkCrs (ActChgWeiRubCri + 377)
#define ActReqRemFilMrkCrs (ActChgMaxRubCri + 378) #define ActReqRemFilMrkCrs (ActChgWeiRubCri + 378)
#define ActRemFilMrkCrs (ActChgMaxRubCri + 379) #define ActRemFilMrkCrs (ActChgWeiRubCri + 379)
#define ActRemFolMrkCrs (ActChgMaxRubCri + 380) #define ActRemFolMrkCrs (ActChgWeiRubCri + 380)
#define ActCopMrkCrs (ActChgMaxRubCri + 381) #define ActCopMrkCrs (ActChgWeiRubCri + 381)
#define ActPasMrkCrs (ActChgMaxRubCri + 382) #define ActPasMrkCrs (ActChgWeiRubCri + 382)
#define ActRemTreMrkCrs (ActChgMaxRubCri + 383) #define ActRemTreMrkCrs (ActChgWeiRubCri + 383)
#define ActFrmCreMrkCrs (ActChgMaxRubCri + 384) #define ActFrmCreMrkCrs (ActChgWeiRubCri + 384)
#define ActCreFolMrkCrs (ActChgMaxRubCri + 385) #define ActCreFolMrkCrs (ActChgWeiRubCri + 385)
#define ActRenFolMrkCrs (ActChgMaxRubCri + 386) #define ActRenFolMrkCrs (ActChgWeiRubCri + 386)
#define ActRcvFilMrkCrsDZ (ActChgMaxRubCri + 387) #define ActRcvFilMrkCrsDZ (ActChgWeiRubCri + 387)
#define ActRcvFilMrkCrsCla (ActChgMaxRubCri + 388) #define ActRcvFilMrkCrsCla (ActChgWeiRubCri + 388)
#define ActExpAdmMrkCrs (ActChgMaxRubCri + 389) #define ActExpAdmMrkCrs (ActChgWeiRubCri + 389)
#define ActConAdmMrkCrs (ActChgMaxRubCri + 390) #define ActConAdmMrkCrs (ActChgWeiRubCri + 390)
#define ActZIPAdmMrkCrs (ActChgMaxRubCri + 391) #define ActZIPAdmMrkCrs (ActChgWeiRubCri + 391)
#define ActUnhMrkCrs (ActChgMaxRubCri + 392) #define ActUnhMrkCrs (ActChgWeiRubCri + 392)
#define ActHidMrkCrs (ActChgMaxRubCri + 393) #define ActHidMrkCrs (ActChgWeiRubCri + 393)
#define ActReqDatAdmMrkCrs (ActChgMaxRubCri + 394) #define ActReqDatAdmMrkCrs (ActChgWeiRubCri + 394)
#define ActChgDatAdmMrkCrs (ActChgMaxRubCri + 395) #define ActChgDatAdmMrkCrs (ActChgWeiRubCri + 395)
#define ActReqLnkAdmMrkCrs (ActChgMaxRubCri + 396) #define ActReqLnkAdmMrkCrs (ActChgWeiRubCri + 396)
#define ActDowAdmMrkCrs (ActChgMaxRubCri + 397) #define ActDowAdmMrkCrs (ActChgWeiRubCri + 397)
#define ActChgNumRowHeaCrs (ActChgMaxRubCri + 398) #define ActChgNumRowHeaCrs (ActChgWeiRubCri + 398)
#define ActChgNumRowFooCrs (ActChgMaxRubCri + 399) #define ActChgNumRowFooCrs (ActChgWeiRubCri + 399)
#define ActAdmMrkGrp (ActChgMaxRubCri + 400) #define ActAdmMrkGrp (ActChgWeiRubCri + 400)
#define ActReqRemFilMrkGrp (ActChgMaxRubCri + 401) #define ActReqRemFilMrkGrp (ActChgWeiRubCri + 401)
#define ActRemFilMrkGrp (ActChgMaxRubCri + 402) #define ActRemFilMrkGrp (ActChgWeiRubCri + 402)
#define ActRemFolMrkGrp (ActChgMaxRubCri + 403) #define ActRemFolMrkGrp (ActChgWeiRubCri + 403)
#define ActCopMrkGrp (ActChgMaxRubCri + 404) #define ActCopMrkGrp (ActChgWeiRubCri + 404)
#define ActPasMrkGrp (ActChgMaxRubCri + 405) #define ActPasMrkGrp (ActChgWeiRubCri + 405)
#define ActRemTreMrkGrp (ActChgMaxRubCri + 406) #define ActRemTreMrkGrp (ActChgWeiRubCri + 406)
#define ActFrmCreMrkGrp (ActChgMaxRubCri + 407) #define ActFrmCreMrkGrp (ActChgWeiRubCri + 407)
#define ActCreFolMrkGrp (ActChgMaxRubCri + 408) #define ActCreFolMrkGrp (ActChgWeiRubCri + 408)
#define ActRenFolMrkGrp (ActChgMaxRubCri + 409) #define ActRenFolMrkGrp (ActChgWeiRubCri + 409)
#define ActRcvFilMrkGrpDZ (ActChgMaxRubCri + 410) #define ActRcvFilMrkGrpDZ (ActChgWeiRubCri + 410)
#define ActRcvFilMrkGrpCla (ActChgMaxRubCri + 411) #define ActRcvFilMrkGrpCla (ActChgWeiRubCri + 411)
#define ActExpAdmMrkGrp (ActChgMaxRubCri + 412) #define ActExpAdmMrkGrp (ActChgWeiRubCri + 412)
#define ActConAdmMrkGrp (ActChgMaxRubCri + 413) #define ActConAdmMrkGrp (ActChgWeiRubCri + 413)
#define ActZIPAdmMrkGrp (ActChgMaxRubCri + 414) #define ActZIPAdmMrkGrp (ActChgWeiRubCri + 414)
#define ActUnhMrkGrp (ActChgMaxRubCri + 415) #define ActUnhMrkGrp (ActChgWeiRubCri + 415)
#define ActHidMrkGrp (ActChgMaxRubCri + 416) #define ActHidMrkGrp (ActChgWeiRubCri + 416)
#define ActReqDatAdmMrkGrp (ActChgMaxRubCri + 417) #define ActReqDatAdmMrkGrp (ActChgWeiRubCri + 417)
#define ActChgDatAdmMrkGrp (ActChgMaxRubCri + 418) #define ActChgDatAdmMrkGrp (ActChgWeiRubCri + 418)
#define ActDowAdmMrkGrp (ActChgMaxRubCri + 419) #define ActDowAdmMrkGrp (ActChgWeiRubCri + 419)
#define ActChgNumRowHeaGrp (ActChgMaxRubCri + 420) #define ActChgNumRowHeaGrp (ActChgWeiRubCri + 420)
#define ActChgNumRowFooGrp (ActChgMaxRubCri + 421) #define ActChgNumRowFooGrp (ActChgWeiRubCri + 421)
#define ActReqRemFilBrf (ActChgMaxRubCri + 422) #define ActReqRemFilBrf (ActChgWeiRubCri + 422)
#define ActRemFilBrf (ActChgMaxRubCri + 423) #define ActRemFilBrf (ActChgWeiRubCri + 423)
#define ActRemFolBrf (ActChgMaxRubCri + 424) #define ActRemFolBrf (ActChgWeiRubCri + 424)
#define ActCopBrf (ActChgMaxRubCri + 425) #define ActCopBrf (ActChgWeiRubCri + 425)
#define ActPasBrf (ActChgMaxRubCri + 426) #define ActPasBrf (ActChgWeiRubCri + 426)
#define ActRemTreBrf (ActChgMaxRubCri + 427) #define ActRemTreBrf (ActChgWeiRubCri + 427)
#define ActFrmCreBrf (ActChgMaxRubCri + 428) #define ActFrmCreBrf (ActChgWeiRubCri + 428)
#define ActCreFolBrf (ActChgMaxRubCri + 429) #define ActCreFolBrf (ActChgWeiRubCri + 429)
#define ActCreLnkBrf (ActChgMaxRubCri + 430) #define ActCreLnkBrf (ActChgWeiRubCri + 430)
#define ActRenFolBrf (ActChgMaxRubCri + 431) #define ActRenFolBrf (ActChgWeiRubCri + 431)
#define ActRcvFilBrfDZ (ActChgMaxRubCri + 432) #define ActRcvFilBrfDZ (ActChgWeiRubCri + 432)
#define ActRcvFilBrfCla (ActChgMaxRubCri + 433) #define ActRcvFilBrfCla (ActChgWeiRubCri + 433)
#define ActExpBrf (ActChgMaxRubCri + 434) #define ActExpBrf (ActChgWeiRubCri + 434)
#define ActConBrf (ActChgMaxRubCri + 435) #define ActConBrf (ActChgWeiRubCri + 435)
#define ActZIPBrf (ActChgMaxRubCri + 436) #define ActZIPBrf (ActChgWeiRubCri + 436)
#define ActReqDatBrf (ActChgMaxRubCri + 437) #define ActReqDatBrf (ActChgWeiRubCri + 437)
#define ActChgDatBrf (ActChgMaxRubCri + 438) #define ActChgDatBrf (ActChgWeiRubCri + 438)
#define ActDowBrf (ActChgMaxRubCri + 439) #define ActDowBrf (ActChgWeiRubCri + 439)
#define ActReqRemOldBrf (ActChgMaxRubCri + 440) #define ActReqRemOldBrf (ActChgWeiRubCri + 440)
#define ActRemOldBrf (ActChgMaxRubCri + 441) #define ActRemOldBrf (ActChgWeiRubCri + 441)
/*****************************************************************************/ /*****************************************************************************/
/******************************* Users tab ***********************************/ /******************************* Users tab ***********************************/
@ -1767,7 +1768,7 @@
#define ActLst_NUM_ACTIONS (ActChgMyTT1stDay + 1) #define ActLst_NUM_ACTIONS (ActChgMyTT1stDay + 1)
#define ActLst_MAX_ACTION_COD 1966 #define ActLst_MAX_ACTION_COD 1967
#define ActLst_DEFAULT_ACTION_AFTER_LOGIN ActSeeGblTL #define ActLst_DEFAULT_ACTION_AFTER_LOGIN ActSeeGblTL

View File

@ -629,10 +629,15 @@ 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. 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.76 (2023-03-17)" #define Log_PLATFORM_VERSION "SWAD 22.77 (2023-03-18)"
#define CSS_FILE "swad22.57.1.css" #define CSS_FILE "swad22.57.1.css"
#define JS_FILE "swad22.49.js" #define JS_FILE "swad22.49.js"
/* /*
*
Version 22.77: Mar 18, 2023 New field Weight in rubric criteria. (337735 lines)
1 change necessary in database:
ALTER TABLE rub_criteria ADD COLUMN Weight DOUBLE PRECISION NOT NULL DEFAULT 1 AFTER MaxVal;
Version 22.76: Mar 17, 2023 Fixed moving rubric criteria up and down. (337585 lines) Version 22.76: Mar 17, 2023 Fixed moving rubric criteria up and down. (337585 lines)
Version 22.75: Mar 17, 2023 New module swad_rubric_criteria. (337631 lines) Version 22.75: Mar 17, 2023 New module swad_rubric_criteria. (337631 lines)
Code refactoring in exams. Code refactoring in exams.

View File

@ -2807,9 +2807,10 @@ mysql> DESCRIBE rub_criteria;
| CriInd | int | NO | | NULL | | | CriInd | int | NO | | NULL | |
| MinVal | double | NO | | 0 | | | MinVal | double | NO | | 0 | |
| MaxVal | double | NO | | 1 | | | MaxVal | double | NO | | 1 | |
| Weight | double | NO | | 1 | |
| Title | varchar(2047) | NO | | NULL | | | Title | varchar(2047) | NO | | NULL | |
+--------+---------------+------+-----+---------+----------------+ +--------+---------------+------+-----+---------+----------------+
6 rows in set (0,00 sec) 7 rows in set (0,00 sec)
*/ */
DB_CreateTable ("CREATE TABLE IF NOT EXISTS rub_criteria (" DB_CreateTable ("CREATE TABLE IF NOT EXISTS rub_criteria ("
"CriCod INT NOT NULL AUTO_INCREMENT," "CriCod INT NOT NULL AUTO_INCREMENT,"
@ -2817,6 +2818,7 @@ mysql> DESCRIBE rub_criteria;
"CriInd INT NOT NULL," "CriInd INT NOT NULL,"
"MinVal DOUBLE PRECISION NOT NULL DEFAULT 0," "MinVal DOUBLE PRECISION NOT NULL DEFAULT 0,"
"MaxVal DOUBLE PRECISION NOT NULL DEFAULT 1," "MaxVal DOUBLE PRECISION NOT NULL DEFAULT 1,"
"Weight DOUBLE PRECISION NOT NULL DEFAULT 1,"
"Title VARCHAR(2047) NOT NULL," "Title VARCHAR(2047) NOT NULL,"
"UNIQUE INDEX(CriCod)," "UNIQUE INDEX(CriCod),"
"UNIQUE INDEX(RubCod,CriInd))"); "UNIQUE INDEX(RubCod,CriInd))");

View File

@ -130,7 +130,8 @@ void RubCri_GetDataOfCriterionByCod (struct RubCri_Criterion *Criterion)
row[2] CriInd row[2] CriInd
row[3] MinVal row[3] MinVal
row[4] MaxVal row[4] MaxVal
row[5] Title row[5] Weight
row[6] Title
*/ */
/* Get criterion code (row[0]) */ /* Get criterion code (row[0]) */
Criterion->CriCod = Str_ConvertStrCodToLongCod (row[0]); Criterion->CriCod = Str_ConvertStrCodToLongCod (row[0]);
@ -147,8 +148,11 @@ void RubCri_GetDataOfCriterionByCod (struct RubCri_Criterion *Criterion)
ValueRange++) ValueRange++)
Criterion->Values[ValueRange] = Str_GetDoubleFromStr (row[3 + ValueRange]); Criterion->Values[ValueRange] = Str_GetDoubleFromStr (row[3 + ValueRange]);
/* Get the title of the criterion (row[5]) */ /* Get criterion weight (row[5]) */
Str_Copy (Criterion->Title,row[3 + RubCri_NUM_VALUES],sizeof (Criterion->Title) - 1); Criterion->Weight = Str_GetDoubleFromStr (row[3 + RubCri_NUM_VALUES]);
/* Get the title of the criterion (row[6]) */
Str_Copy (Criterion->Title,row[3 + RubCri_NUM_VALUES + 1],sizeof (Criterion->Title) - 1);
} }
else else
/* Initialize to empty criterion */ /* Initialize to empty criterion */
@ -217,6 +221,14 @@ static void RubCri_PutFormNewCriterion (struct Rub_Rubrics *Rubrics,
HTM_TD_End (); HTM_TD_End ();
} }
/***** Weight of the criterion *****/
HTM_TD_Begin ("class=\"RM\"");
HTM_INPUT_FLOAT ("Weight",0.0,1.0,0.01,
Criterion->Weight,false,
" class=\"INPUT_%s\" required=\"required\"",
The_GetSuffix ());
HTM_TD_End ();
/***** End row *****/ /***** End row *****/
HTM_TR_End (); HTM_TR_End ();
@ -267,6 +279,7 @@ static void RubCri_ReceiveCriterionFieldsFromForm (struct RubCri_Criterion *Crit
{ {
RubCri_ValueRange_t ValueRange; RubCri_ValueRange_t ValueRange;
char ValueStr[64]; char ValueStr[64];
char WeightStr[64];
/***** Get criterion title *****/ /***** Get criterion title *****/
Par_GetParText ("Title",Criterion->Title,RubCri_MAX_BYTES_TITLE); Par_GetParText ("Title",Criterion->Title,RubCri_MAX_BYTES_TITLE);
@ -279,6 +292,10 @@ static void RubCri_ReceiveCriterionFieldsFromForm (struct RubCri_Criterion *Crit
Par_GetParText (RubCri_ParValues[ValueRange],ValueStr,sizeof (ValueStr) - 1); Par_GetParText (RubCri_ParValues[ValueRange],ValueStr,sizeof (ValueStr) - 1);
Criterion->Values[ValueRange] = Str_GetDoubleFromStr (ValueStr); Criterion->Values[ValueRange] = Str_GetDoubleFromStr (ValueStr);
} }
/***** Get criterion weight *****/
Par_GetParText ("Weight",WeightStr,sizeof (WeightStr) - 1);
Criterion->Weight = Str_GetDoubleFromStr (WeightStr);
} }
static bool RubCri_CheckCriterionTitleReceivedFromForm (const struct RubCri_Criterion *Criterion, static bool RubCri_CheckCriterionTitleReceivedFromForm (const struct RubCri_Criterion *Criterion,
@ -412,6 +429,51 @@ static void RubCri_ChangeValueCriterion (RubCri_ValueRange_t ValueRange)
false); // It's not a new rubric false); // It's not a new rubric
} }
/*****************************************************************************/
/********* Receive form to change minimum/maximum value of criterion *********/
/*****************************************************************************/
void RubCri_ChangeWeightCriterion (void)
{
struct Rub_Rubrics Rubrics;
struct RubCri_Criterion Criterion;
char WeightStr[64];
/***** Check if I can edit rubrics *****/
if (!Rub_CheckIfICanEditRubrics ())
Err_NoPermissionExit ();
/***** Reset rubrics context *****/
Rub_ResetRubrics (&Rubrics);
Rub_ResetRubric (&Rubrics.Rubric);
RubCri_ResetCriterion (&Criterion);
/***** Get parameters *****/
Rub_GetPars (&Rubrics,true);
Criterion.RubCod = Rubrics.Rubric.RubCod;
Rubrics.CriCod = Criterion.CriCod = ParCod_GetAndCheckPar (ParCod_Cri);
/***** Get and check parameters *****/
RubCri_GetAndCheckPars (&Rubrics,&Criterion);
/***** Check if rubric is editable *****/
if (!Rub_CheckIfEditable (&Rubrics.Rubric))
Err_NoPermissionExit ();
/***** Receive new value from form *****/
Par_GetParText ("Weight",WeightStr,sizeof (WeightStr) - 1);
Criterion.Weight = Str_GetDoubleFromStr (WeightStr);
/***** Change value *****/
/* Update the table changing old value by new value */
Rub_DB_UpdateCriterionWeight (Criterion.CriCod,Criterion.RubCod,
Criterion.Weight);
/***** Show current rubric and its criteria *****/
Rub_PutFormsOneRubric (&Rubrics,&Criterion,
false); // It's not a new rubric
}
/*****************************************************************************/ /*****************************************************************************/
/************************ Create a new rubric criterion **********************/ /************************ Create a new rubric criterion **********************/
/*****************************************************************************/ /*****************************************************************************/
@ -526,7 +588,8 @@ static void RubCri_ListOneOrMoreCriteriaForEdition (struct Rub_Rubrics *Rubrics,
row[1] CriInd row[1] CriInd
row[2] MinVal row[2] MinVal
row[3] MaxVal row[3] MaxVal
row[4] Title row[4] Weight
row[5] Title
*/ */
/* Get criterion code (row[0]) */ /* Get criterion code (row[0]) */
Criterion.CriCod = Str_ConvertStrCodToLongCod (row[0]); Criterion.CriCod = Str_ConvertStrCodToLongCod (row[0]);
@ -540,8 +603,11 @@ static void RubCri_ListOneOrMoreCriteriaForEdition (struct Rub_Rubrics *Rubrics,
ValueRange++) ValueRange++)
Criterion.Values[ValueRange] = Str_GetDoubleFromStr (row[2 + ValueRange]); Criterion.Values[ValueRange] = Str_GetDoubleFromStr (row[2 + ValueRange]);
/* Get the title of the criterion (row[4]) */ /* Get weight (row[4]) */
Str_Copy (Criterion.Title,row[2 + RubCri_NUM_VALUES],sizeof (Criterion.Title) - 1); Criterion.Weight = Str_GetDoubleFromStr (row[2 + RubCri_NUM_VALUES]);
/* Get the title of the criterion (row[5]) */
Str_Copy (Criterion.Title,row[2 + RubCri_NUM_VALUES + 1],sizeof (Criterion.Title) - 1);
/* Initialize context */ /* Initialize context */
Rubrics->CriCod = Criterion.CriCod; Rubrics->CriCod = Criterion.CriCod;
@ -639,6 +705,26 @@ static void RubCri_ListOneOrMoreCriteriaForEdition (struct Rub_Rubrics *Rubrics,
HTM_TD_End (); HTM_TD_End ();
} }
/***** Criterion weight *****/
HTM_TD_Begin ("class=\"RT %s\"",The_GetColorRows ());
if (ICanEditCriteria)
{
Frm_BeginFormAnchor (ActChgWeiRubCri,Anchor);
RubCri_PutParsOneCriterion (Rubrics);
HTM_INPUT_FLOAT ("Weight",0.0,1.0,0.01,
Criterion.Weight,false,
" class=\"INPUT_%s\" required=\"required\"",
The_GetSuffix ());
Frm_EndForm ();
}
else
{
HTM_SPAN_Begin ("class=\"CRI_VALUE\"");
HTM_Unsigned (Criterion.Weight);
HTM_SPAN_End ();
}
HTM_TD_End ();
/***** End first row *****/ /***** End first row *****/
HTM_TR_End (); HTM_TR_End ();
@ -672,6 +758,7 @@ static void RubCri_PutTableHeadingForCriteria (void)
extern const char *Txt_Criterion; extern const char *Txt_Criterion;
extern const char *Txt_Minimum; extern const char *Txt_Minimum;
extern const char *Txt_Maximum; extern const char *Txt_Maximum;
extern const char *Txt_Weight;
/***** Begin row *****/ /***** Begin row *****/
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
@ -682,6 +769,7 @@ static void RubCri_PutTableHeadingForCriteria (void)
HTM_TH (Txt_Criterion,HTM_HEAD_LEFT ); HTM_TH (Txt_Criterion,HTM_HEAD_LEFT );
HTM_TH (Txt_Minimum ,HTM_HEAD_RIGHT); HTM_TH (Txt_Minimum ,HTM_HEAD_RIGHT);
HTM_TH (Txt_Maximum ,HTM_HEAD_RIGHT); HTM_TH (Txt_Maximum ,HTM_HEAD_RIGHT);
HTM_TH (Txt_Weight ,HTM_HEAD_RIGHT);
/***** End row *****/ /***** End row *****/
HTM_TR_End (); HTM_TR_End ();
@ -701,14 +789,15 @@ void RubCri_ResetCriterion (struct RubCri_Criterion *Criterion)
}; };
RubCri_ValueRange_t ValueRange; RubCri_ValueRange_t ValueRange;
Criterion->RubCod = -1L; Criterion->RubCod = -1L;
Criterion->CriCod = -1L; Criterion->CriCod = -1L;
Criterion->CriInd = 0; Criterion->CriInd = 0;
Criterion->Title[0] = '\0'; Criterion->Title[0] = '\0';
for (ValueRange = (RubCri_ValueRange_t) 0; for (ValueRange = (RubCri_ValueRange_t) 0;
ValueRange <= (RubCri_ValueRange_t) (RubCri_NUM_VALUES - 1); ValueRange <= (RubCri_ValueRange_t) (RubCri_NUM_VALUES - 1);
ValueRange++) ValueRange++)
Criterion->Values[ValueRange] = RubCri_DefaultValues[ValueRange]; Criterion->Values[ValueRange] = RubCri_DefaultValues[ValueRange];
Criterion->Weight = 1.0;
} }
/*****************************************************************************/ /*****************************************************************************/

View File

@ -39,6 +39,7 @@ void RubCri_ReceiveFormCriterion (void);
void RubCri_ChangeCriterionTitle (void); void RubCri_ChangeCriterionTitle (void);
void RubCri_ChangeMinValueCriterion (void); void RubCri_ChangeMinValueCriterion (void);
void RubCri_ChangeMaxValueCriterion (void); void RubCri_ChangeMaxValueCriterion (void);
void RubCri_ChangeWeightCriterion (void);
void RubCri_ListCriteria (struct Rub_Rubrics *Rubrics, void RubCri_ListCriteria (struct Rub_Rubrics *Rubrics,
struct RubCri_Criterion *Criterion); struct RubCri_Criterion *Criterion);

View File

@ -356,15 +356,16 @@ long Rub_DB_CreateCriterion (const struct RubCri_Criterion *Criterion)
CriCod = CriCod =
DB_QueryINSERTandReturnCode ("can not create new criterion", DB_QueryINSERTandReturnCode ("can not create new criterion",
"INSERT INTO rub_criteria" "INSERT INTO rub_criteria"
" (RubCod,CriInd,%s,%s,Title)" " (RubCod,CriInd,%s,%s,Weight,Title)"
" VALUES" " VALUES"
" (%ld,%u,%.15lg,%.15lg,'%s')", " (%ld,%u,%.15lg,%.15lg,%.15lg,'%s')",
RubCri_ValuesFields[RubCri_MIN], RubCri_ValuesFields[RubCri_MIN],
RubCri_ValuesFields[RubCri_MAX], RubCri_ValuesFields[RubCri_MAX],
Criterion->RubCod, Criterion->RubCod,
Criterion->CriInd, Criterion->CriInd,
Criterion->Values[RubCri_MIN], Criterion->Values[RubCri_MIN],
Criterion->Values[RubCri_MAX], Criterion->Values[RubCri_MAX],
Criterion->Weight,
Criterion->Title); Criterion->Title);
Str_SetDecimalPointToLocal (); // Return to local system Str_SetDecimalPointToLocal (); // Return to local system
@ -407,6 +408,24 @@ void Rub_DB_UpdateCriterionValue (long CriCod,long RubCod,
Str_SetDecimalPointToLocal (); // Return to local system Str_SetDecimalPointToLocal (); // Return to local system
} }
/*****************************************************************************/
/********************* Update criterion weight in database *******************/
/*****************************************************************************/
void Rub_DB_UpdateCriterionWeight (long CriCod,long RubCod,double Weight)
{
Str_SetDecimalPointToUS (); // To write the decimal point as a dot
DB_QueryUPDATE ("can not update the value of a criterion",
"UPDATE rub_criteria"
" SET Weight=%.15lg"
" WHERE CriCod=%ld"
" AND RubCod=%ld", // Extra check
Weight,
CriCod,
RubCod);
Str_SetDecimalPointToLocal (); // Return to local system
}
/*****************************************************************************/ /*****************************************************************************/
/************ Update indexes of criteria greater than a given one ************/ /************ Update indexes of criteria greater than a given one ************/
/*****************************************************************************/ /*****************************************************************************/
@ -570,7 +589,8 @@ unsigned Rub_DB_GetCriteria (MYSQL_RES **mysql_res,long RubCod)
"CriInd," // row[1] "CriInd," // row[1]
"%s," // row[2] "%s," // row[2]
"%s," // row[3] "%s," // row[3]
"Title" // row[4] "Weight," // row[4]
"Title" // row[5]
" FROM rub_criteria" " FROM rub_criteria"
" WHERE RubCod=%ld" " WHERE RubCod=%ld"
" ORDER BY CriInd", " ORDER BY CriInd",
@ -592,7 +612,8 @@ unsigned Rub_DB_GetDataOfCriterionByCod (MYSQL_RES **mysql_res,long CriCod)
"CriInd," // row[2] "CriInd," // row[2]
"%s," // row[3] "%s," // row[3]
"%s," // row[4] "%s," // row[4]
"Title" // row[5] "Weight," // row[5]
"Title" // row[6]
" FROM rub_criteria" " FROM rub_criteria"
" WHERE CriCod=%ld", " WHERE CriCod=%ld",
RubCri_ValuesFields[RubCri_MIN], RubCri_ValuesFields[RubCri_MIN],

View File

@ -59,6 +59,7 @@ void Rub_DB_UpdateCriterionTitle (long CriCod,long RubCod,
const char NewTitle[RubCri_MAX_BYTES_TITLE + 1]); const char NewTitle[RubCri_MAX_BYTES_TITLE + 1]);
void Rub_DB_UpdateCriterionValue (long CriCod,long RubCod, void Rub_DB_UpdateCriterionValue (long CriCod,long RubCod,
RubCri_ValueRange_t ValueRange,double Value); RubCri_ValueRange_t ValueRange,double Value);
void Rub_DB_UpdateCriterionWeight (long CriCod,long RubCod,double Weight);
void Rub_DB_UpdateCriteriaIndexesInRubricGreaterThan (long RubCod,unsigned CriInd); void Rub_DB_UpdateCriteriaIndexesInRubricGreaterThan (long RubCod,unsigned CriInd);
void Rub_DB_UpdateCriterionIndex (long CriInd,long CriCod,long RubCod); void Rub_DB_UpdateCriterionIndex (long CriInd,long CriCod,long RubCod);
void Rub_DB_LockTable (void); void Rub_DB_LockTable (void);

View File

@ -79,6 +79,7 @@ struct RubCri_Criterion
long CriCod; // Criterion code long CriCod; // Criterion code
unsigned CriInd; // Criterion index (position in the rubric) unsigned CriInd; // Criterion index (position in the rubric)
double Values[RubCri_NUM_VALUES]; double Values[RubCri_NUM_VALUES];
double Weight; // Relative weight (from 0.0 to 1.0)
char Title[RubCri_MAX_BYTES_TITLE + 1]; // Title of the criterion char Title[RubCri_MAX_BYTES_TITLE + 1]; // Title of the criterion
}; };

View File

@ -59854,6 +59854,29 @@ const char *Txt_Week =
"Week"; // Çeviri lazim! "Week"; // Çeviri lazim!
#endif #endif
const char *Txt_Weight =
#if L==1 // ca
"Pes";
#elif L==2 // de
"Gewicht";
#elif L==3 // en
"Weight";
#elif L==4 // es
"Peso";
#elif L==5 // fr
"Poids";
#elif L==6 // gn
"Peso"; // Okoteve traducción
#elif L==7 // it
"Peso";
#elif L==8 // pl
"Waga";
#elif L==9 // pt
"Peso";
#elif L==10 // tr
"A&gbreve;&inodot;rl&inodot;k";
#endif
const char *Txt_What_would_you_like_to_do = const char *Txt_What_would_you_like_to_do =
#if L==1 // ca #if L==1 // ca
"&iquest;Qu&egrave; voleu fer?"; "&iquest;Qu&egrave; voleu fer?";

View File

@ -14228,6 +14228,29 @@ const char *Txt_Actions[ActLst_NUM_ACTIONS] =
"Change maximum value of rubric criterion" // Precisa de tradução "Change maximum value of rubric criterion" // Precisa de tradução
#elif L==10 // tr #elif L==10 // tr
"Change maximum value of rubric criterion" // Çeviri lazim! "Change maximum value of rubric criterion" // Çeviri lazim!
#endif
,
[ActChgWeiRubCri] =
#if L==1 // ca
"Change weight of rubric criterion" // Necessita traducció
#elif L==2 // de
"Change weight of rubric criterion" // Need Übersetzung
#elif L==3 // en
"Change weight of rubric criterion"
#elif L==4 // es
"Cambiar peso de criterio de r&uacute;brica"
#elif L==5 // fr
"Change weight of rubric criterion" // Besoin de traduction
#elif L==6 // gn
"Cambiar peso de criterio de r&uacute;brica" // Okoteve traducción
#elif L==7 // it
"Change weight of rubric criterion" // Bisogno di traduzione
#elif L==8 // pl
"Change weight of rubric criterion" // Potrzebujesz tlumaczenie
#elif L==9 // pt
"Change weight of rubric criterion" // Precisa de tradução
#elif L==10 // tr
"Change weight of rubric criterion" // Çeviri lazim!
#endif #endif
, ,
[ActSeeAdmDocIns] = [ActSeeAdmDocIns] =