Version19.68

This commit is contained in:
Antonio Cañas Vargas 2019-11-14 09:39:21 +01:00
parent fa87093776
commit 377302b6d8
8 changed files with 215 additions and 225 deletions

View File

@ -496,6 +496,7 @@ Assessment:
354. ActHidAsg Hide assignment
355. ActShoAsg Show assignment
NEW. ActReqUsrPrj Select users to list their projects
356. ActSeeTblAllPrj Show all projects in a table
NEW. ActCfgPrj Configure all projects
NEW. ActRcvCfgPrj Receive configuration of all projects
@ -2062,13 +2063,14 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
/* ActHidAsg */{ 964,-1,TabUnk,ActSeeAsg ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Asg_HideAssignment ,NULL},
/* ActShoAsg */{ 965,-1,TabUnk,ActSeeAsg ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Asg_ShowAssignment ,NULL},
/* ActSeeTblAllPrj */{1696,-1,TabUnk,ActSeePrj ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_NEW_TAB,NULL ,Prj_ShowTableSelectedProjects ,NULL},
/* ActReqUsrPrj */{1805,-1,TabUnk,ActSeePrj ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prj_ListUsrsToSelect ,NULL},
/* ActSeeTblAllPrj */{1696,-1,TabUnk,ActSeePrj ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_NEW_TAB,NULL ,Prj_ShowTableSelectedPrjs ,NULL},
/* ActCfgPrj */{1803,-1,TabUnk,ActSeePrj ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prj_ShowFormConfig ,NULL},
/* ActRcvCfgPrj */{1804,-1,TabUnk,ActSeePrj ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prj_ReceiveConfigPrj ,NULL},
/* ActReqLckAllPrj */{1775,-1,TabUnk,ActSeePrj ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prj_ReqLockSelectedProjectsEdition ,NULL},
/* ActReqUnlAllPrj */{1776,-1,TabUnk,ActSeePrj ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prj_ReqUnlockSelectedProjectsEdition,NULL},
/* ActLckAllPrj */{1777,-1,TabUnk,ActSeePrj ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prj_LockSelectedProjectsEdition ,NULL},
/* ActUnlAllPrj */{1778,-1,TabUnk,ActSeePrj ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prj_UnlockSelectedProjectsEdition ,NULL},
/* ActReqLckAllPrj */{1775,-1,TabUnk,ActSeePrj ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prj_ReqLockSelectedPrjsEdition ,NULL},
/* ActReqUnlAllPrj */{1776,-1,TabUnk,ActSeePrj ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prj_ReqUnloSelectedPrjsEdition ,NULL},
/* ActLckAllPrj */{1777,-1,TabUnk,ActSeePrj ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prj_LockSelectedPrjsEdition ,NULL},
/* ActUnlAllPrj */{1778,-1,TabUnk,ActSeePrj ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prj_UnloSelectedPrjsEdition ,NULL},
/* ActFrmNewPrj */{1675,-1,TabUnk,ActSeePrj ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prj_RequestCreatePrj ,NULL},
/* ActEdiOnePrj */{1676,-1,TabUnk,ActSeePrj ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prj_RequestEditPrj ,NULL},
/* ActPrnOnePrj */{1677,-1,TabUnk,ActSeePrj ,0x3F8,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_NEW_TAB,NULL ,Prj_PrintOneProject ,NULL},
@ -2079,7 +2081,7 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
/* ActHidPrj */{1682,-1,TabUnk,ActSeePrj ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prj_HideProject ,NULL},
/* ActShoPrj */{1683,-1,TabUnk,ActSeePrj ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prj_ShowProject ,NULL},
/* ActLckPrj */{1773,-1,TabUnk,ActSeePrj ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_AJAX_NORMAL,NULL ,Prj_LockProjectEdition ,NULL},
/* ActUnlPrj */{1774,-1,TabUnk,ActSeePrj ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_AJAX_NORMAL,NULL ,Prj_UnlockProjectEdition ,NULL},
/* ActUnlPrj */{1774,-1,TabUnk,ActSeePrj ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_AJAX_NORMAL,NULL ,Prj_UnloProjectEdition ,NULL},
/* ActReqAddStdPrj */{1684,-1,TabUnk,ActSeePrj ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prj_ReqAddStds ,NULL},
/* ActReqAddTutPrj */{1685,-1,TabUnk,ActSeePrj ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prj_ReqAddTuts ,NULL},
/* ActReqAddEvlPrj */{1686,-1,TabUnk,ActSeePrj ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prj_ReqAddEvls ,NULL},
@ -5039,6 +5041,7 @@ Act_Action_t Act_FromActCodToAction[1 + Act_MAX_ACTION_COD] = // Do not reuse un
ActChgNumColMch, // #1802
ActCfgPrj, // #1803
ActRcvCfgPrj, // #1804
ActReqUsrPrj, // #1805
};
/*****************************************************************************/

View File

@ -64,9 +64,9 @@ typedef enum
typedef signed int Act_Action_t; // Must be a signed type, because -1 is used to indicate obsolete action
#define Act_NUM_ACTIONS (1 + 4 + 64 + 38 + 12 + 42 + 36 + 19 + 110 + 179 + 437 + 176 + 169 + 16 + 68)
#define Act_NUM_ACTIONS (1 + 4 + 64 + 38 + 12 + 42 + 36 + 19 + 110 + 180 + 437 + 176 + 169 + 16 + 68)
#define Act_MAX_ACTION_COD 1804
#define Act_MAX_ACTION_COD 1805
#define Act_MAX_OPTIONS_IN_MENU_PER_TAB 13
@ -513,169 +513,170 @@ typedef signed int Act_Action_t; // Must be a signed type, because -1 is used to
#define ActHidAsg (ActChgCrsTT1stDay + 26)
#define ActShoAsg (ActChgCrsTT1stDay + 27)
#define ActSeeTblAllPrj (ActChgCrsTT1stDay + 28)
#define ActCfgPrj (ActChgCrsTT1stDay + 29)
#define ActRcvCfgPrj (ActChgCrsTT1stDay + 30)
#define ActReqLckAllPrj (ActChgCrsTT1stDay + 31)
#define ActReqUnlAllPrj (ActChgCrsTT1stDay + 32)
#define ActLckAllPrj (ActChgCrsTT1stDay + 33)
#define ActUnlAllPrj (ActChgCrsTT1stDay + 34)
#define ActFrmNewPrj (ActChgCrsTT1stDay + 35)
#define ActEdiOnePrj (ActChgCrsTT1stDay + 36)
#define ActPrnOnePrj (ActChgCrsTT1stDay + 37)
#define ActNewPrj (ActChgCrsTT1stDay + 38)
#define ActChgPrj (ActChgCrsTT1stDay + 39)
#define ActReqRemPrj (ActChgCrsTT1stDay + 40)
#define ActRemPrj (ActChgCrsTT1stDay + 41)
#define ActHidPrj (ActChgCrsTT1stDay + 42)
#define ActShoPrj (ActChgCrsTT1stDay + 43)
#define ActLckPrj (ActChgCrsTT1stDay + 44)
#define ActUnlPrj (ActChgCrsTT1stDay + 45)
#define ActReqAddStdPrj (ActChgCrsTT1stDay + 46)
#define ActReqAddTutPrj (ActChgCrsTT1stDay + 47)
#define ActReqAddEvlPrj (ActChgCrsTT1stDay + 48)
#define ActAddStdPrj (ActChgCrsTT1stDay + 49)
#define ActAddTutPrj (ActChgCrsTT1stDay + 50)
#define ActAddEvlPrj (ActChgCrsTT1stDay + 51)
#define ActReqRemStdPrj (ActChgCrsTT1stDay + 52)
#define ActReqRemTutPrj (ActChgCrsTT1stDay + 53)
#define ActReqRemEvlPrj (ActChgCrsTT1stDay + 54)
#define ActRemStdPrj (ActChgCrsTT1stDay + 55)
#define ActRemTutPrj (ActChgCrsTT1stDay + 56)
#define ActRemEvlPrj (ActChgCrsTT1stDay + 57)
#define ActReqUsrPrj (ActChgCrsTT1stDay + 28)
#define ActSeeTblAllPrj (ActChgCrsTT1stDay + 29)
#define ActCfgPrj (ActChgCrsTT1stDay + 30)
#define ActRcvCfgPrj (ActChgCrsTT1stDay + 31)
#define ActReqLckAllPrj (ActChgCrsTT1stDay + 32)
#define ActReqUnlAllPrj (ActChgCrsTT1stDay + 33)
#define ActLckAllPrj (ActChgCrsTT1stDay + 34)
#define ActUnlAllPrj (ActChgCrsTT1stDay + 35)
#define ActFrmNewPrj (ActChgCrsTT1stDay + 36)
#define ActEdiOnePrj (ActChgCrsTT1stDay + 37)
#define ActPrnOnePrj (ActChgCrsTT1stDay + 38)
#define ActNewPrj (ActChgCrsTT1stDay + 39)
#define ActChgPrj (ActChgCrsTT1stDay + 40)
#define ActReqRemPrj (ActChgCrsTT1stDay + 41)
#define ActRemPrj (ActChgCrsTT1stDay + 42)
#define ActHidPrj (ActChgCrsTT1stDay + 43)
#define ActShoPrj (ActChgCrsTT1stDay + 44)
#define ActLckPrj (ActChgCrsTT1stDay + 45)
#define ActUnlPrj (ActChgCrsTT1stDay + 46)
#define ActReqAddStdPrj (ActChgCrsTT1stDay + 47)
#define ActReqAddTutPrj (ActChgCrsTT1stDay + 48)
#define ActReqAddEvlPrj (ActChgCrsTT1stDay + 49)
#define ActAddStdPrj (ActChgCrsTT1stDay + 50)
#define ActAddTutPrj (ActChgCrsTT1stDay + 51)
#define ActAddEvlPrj (ActChgCrsTT1stDay + 52)
#define ActReqRemStdPrj (ActChgCrsTT1stDay + 53)
#define ActReqRemTutPrj (ActChgCrsTT1stDay + 54)
#define ActReqRemEvlPrj (ActChgCrsTT1stDay + 55)
#define ActRemStdPrj (ActChgCrsTT1stDay + 56)
#define ActRemTutPrj (ActChgCrsTT1stDay + 57)
#define ActRemEvlPrj (ActChgCrsTT1stDay + 58)
#define ActAdmDocPrj (ActChgCrsTT1stDay + 58)
#define ActReqRemFilDocPrj (ActChgCrsTT1stDay + 59)
#define ActRemFilDocPrj (ActChgCrsTT1stDay + 60)
#define ActRemFolDocPrj (ActChgCrsTT1stDay + 61)
#define ActCopDocPrj (ActChgCrsTT1stDay + 62)
#define ActPasDocPrj (ActChgCrsTT1stDay + 63)
#define ActRemTreDocPrj (ActChgCrsTT1stDay + 64)
#define ActFrmCreDocPrj (ActChgCrsTT1stDay + 65)
#define ActCreFolDocPrj (ActChgCrsTT1stDay + 66)
#define ActCreLnkDocPrj (ActChgCrsTT1stDay + 67)
#define ActRenFolDocPrj (ActChgCrsTT1stDay + 68)
#define ActRcvFilDocPrjDZ (ActChgCrsTT1stDay + 69)
#define ActRcvFilDocPrjCla (ActChgCrsTT1stDay + 70)
#define ActExpDocPrj (ActChgCrsTT1stDay + 71)
#define ActConDocPrj (ActChgCrsTT1stDay + 72)
#define ActZIPDocPrj (ActChgCrsTT1stDay + 73)
#define ActReqDatDocPrj (ActChgCrsTT1stDay + 74)
#define ActChgDatDocPrj (ActChgCrsTT1stDay + 75)
#define ActDowDocPrj (ActChgCrsTT1stDay + 76)
#define ActAdmDocPrj (ActChgCrsTT1stDay + 59)
#define ActReqRemFilDocPrj (ActChgCrsTT1stDay + 60)
#define ActRemFilDocPrj (ActChgCrsTT1stDay + 61)
#define ActRemFolDocPrj (ActChgCrsTT1stDay + 62)
#define ActCopDocPrj (ActChgCrsTT1stDay + 63)
#define ActPasDocPrj (ActChgCrsTT1stDay + 64)
#define ActRemTreDocPrj (ActChgCrsTT1stDay + 65)
#define ActFrmCreDocPrj (ActChgCrsTT1stDay + 66)
#define ActCreFolDocPrj (ActChgCrsTT1stDay + 67)
#define ActCreLnkDocPrj (ActChgCrsTT1stDay + 68)
#define ActRenFolDocPrj (ActChgCrsTT1stDay + 69)
#define ActRcvFilDocPrjDZ (ActChgCrsTT1stDay + 70)
#define ActRcvFilDocPrjCla (ActChgCrsTT1stDay + 71)
#define ActExpDocPrj (ActChgCrsTT1stDay + 72)
#define ActConDocPrj (ActChgCrsTT1stDay + 73)
#define ActZIPDocPrj (ActChgCrsTT1stDay + 74)
#define ActReqDatDocPrj (ActChgCrsTT1stDay + 75)
#define ActChgDatDocPrj (ActChgCrsTT1stDay + 76)
#define ActDowDocPrj (ActChgCrsTT1stDay + 77)
#define ActAdmAssPrj (ActChgCrsTT1stDay + 77)
#define ActReqRemFilAssPrj (ActChgCrsTT1stDay + 78)
#define ActRemFilAssPrj (ActChgCrsTT1stDay + 79)
#define ActRemFolAssPrj (ActChgCrsTT1stDay + 80)
#define ActCopAssPrj (ActChgCrsTT1stDay + 81)
#define ActPasAssPrj (ActChgCrsTT1stDay + 82)
#define ActRemTreAssPrj (ActChgCrsTT1stDay + 83)
#define ActFrmCreAssPrj (ActChgCrsTT1stDay + 84)
#define ActCreFolAssPrj (ActChgCrsTT1stDay + 85)
#define ActCreLnkAssPrj (ActChgCrsTT1stDay + 86)
#define ActRenFolAssPrj (ActChgCrsTT1stDay + 87)
#define ActRcvFilAssPrjDZ (ActChgCrsTT1stDay + 88)
#define ActRcvFilAssPrjCla (ActChgCrsTT1stDay + 89)
#define ActExpAssPrj (ActChgCrsTT1stDay + 90)
#define ActConAssPrj (ActChgCrsTT1stDay + 91)
#define ActZIPAssPrj (ActChgCrsTT1stDay + 92)
#define ActReqDatAssPrj (ActChgCrsTT1stDay + 93)
#define ActChgDatAssPrj (ActChgCrsTT1stDay + 94)
#define ActDowAssPrj (ActChgCrsTT1stDay + 95)
#define ActAdmAssPrj (ActChgCrsTT1stDay + 78)
#define ActReqRemFilAssPrj (ActChgCrsTT1stDay + 79)
#define ActRemFilAssPrj (ActChgCrsTT1stDay + 80)
#define ActRemFolAssPrj (ActChgCrsTT1stDay + 81)
#define ActCopAssPrj (ActChgCrsTT1stDay + 82)
#define ActPasAssPrj (ActChgCrsTT1stDay + 83)
#define ActRemTreAssPrj (ActChgCrsTT1stDay + 84)
#define ActFrmCreAssPrj (ActChgCrsTT1stDay + 85)
#define ActCreFolAssPrj (ActChgCrsTT1stDay + 86)
#define ActCreLnkAssPrj (ActChgCrsTT1stDay + 87)
#define ActRenFolAssPrj (ActChgCrsTT1stDay + 88)
#define ActRcvFilAssPrjDZ (ActChgCrsTT1stDay + 89)
#define ActRcvFilAssPrjCla (ActChgCrsTT1stDay + 90)
#define ActExpAssPrj (ActChgCrsTT1stDay + 91)
#define ActConAssPrj (ActChgCrsTT1stDay + 92)
#define ActZIPAssPrj (ActChgCrsTT1stDay + 93)
#define ActReqDatAssPrj (ActChgCrsTT1stDay + 94)
#define ActChgDatAssPrj (ActChgCrsTT1stDay + 95)
#define ActDowAssPrj (ActChgCrsTT1stDay + 96)
#define ActSeeTst (ActChgCrsTT1stDay + 96)
#define ActAssTst (ActChgCrsTT1stDay + 97)
#define ActEdiTstQst (ActChgCrsTT1stDay + 98)
#define ActEdiOneTstQst (ActChgCrsTT1stDay + 99)
#define ActReqImpTstQst (ActChgCrsTT1stDay + 100)
#define ActImpTstQst (ActChgCrsTT1stDay + 101)
#define ActLstTstQst (ActChgCrsTT1stDay + 102)
#define ActRcvTstQst (ActChgCrsTT1stDay + 103)
#define ActReqRemTstQst (ActChgCrsTT1stDay + 104)
#define ActRemTstQst (ActChgCrsTT1stDay + 105)
#define ActShfTstQst (ActChgCrsTT1stDay + 106)
#define ActCfgTst (ActChgCrsTT1stDay + 107)
#define ActEnableTag (ActChgCrsTT1stDay + 108)
#define ActDisableTag (ActChgCrsTT1stDay + 109)
#define ActRenTag (ActChgCrsTT1stDay + 110)
#define ActRcvCfgTst (ActChgCrsTT1stDay + 111)
#define ActSeeTst (ActChgCrsTT1stDay + 97)
#define ActAssTst (ActChgCrsTT1stDay + 98)
#define ActEdiTstQst (ActChgCrsTT1stDay + 99)
#define ActEdiOneTstQst (ActChgCrsTT1stDay + 100)
#define ActReqImpTstQst (ActChgCrsTT1stDay + 101)
#define ActImpTstQst (ActChgCrsTT1stDay + 102)
#define ActLstTstQst (ActChgCrsTT1stDay + 103)
#define ActRcvTstQst (ActChgCrsTT1stDay + 104)
#define ActReqRemTstQst (ActChgCrsTT1stDay + 105)
#define ActRemTstQst (ActChgCrsTT1stDay + 106)
#define ActShfTstQst (ActChgCrsTT1stDay + 107)
#define ActCfgTst (ActChgCrsTT1stDay + 108)
#define ActEnableTag (ActChgCrsTT1stDay + 109)
#define ActDisableTag (ActChgCrsTT1stDay + 110)
#define ActRenTag (ActChgCrsTT1stDay + 111)
#define ActRcvCfgTst (ActChgCrsTT1stDay + 112)
#define ActReqSeeMyTstRes (ActChgCrsTT1stDay + 112)
#define ActSeeMyTstRes (ActChgCrsTT1stDay + 113)
#define ActSeeOneTstResMe (ActChgCrsTT1stDay + 114)
#define ActReqSeeUsrTstRes (ActChgCrsTT1stDay + 115)
#define ActSeeUsrTstRes (ActChgCrsTT1stDay + 116)
#define ActSeeOneTstResOth (ActChgCrsTT1stDay + 117)
#define ActReqSeeMyTstRes (ActChgCrsTT1stDay + 113)
#define ActSeeMyTstRes (ActChgCrsTT1stDay + 114)
#define ActSeeOneTstResMe (ActChgCrsTT1stDay + 115)
#define ActReqSeeUsrTstRes (ActChgCrsTT1stDay + 116)
#define ActSeeUsrTstRes (ActChgCrsTT1stDay + 117)
#define ActSeeOneTstResOth (ActChgCrsTT1stDay + 118)
#define ActSeeGam (ActChgCrsTT1stDay + 118)
#define ActReqRemMch (ActChgCrsTT1stDay + 119)
#define ActRemMch (ActChgCrsTT1stDay + 120)
#define ActReqNewMch (ActChgCrsTT1stDay + 121)
#define ActNewMch (ActChgCrsTT1stDay + 122)
#define ActResMch (ActChgCrsTT1stDay + 123)
#define ActBckMch (ActChgCrsTT1stDay + 124)
#define ActPlyPauMch (ActChgCrsTT1stDay + 125)
#define ActFwdMch (ActChgCrsTT1stDay + 126)
#define ActChgNumColMch (ActChgCrsTT1stDay + 127)
#define ActChgVisResMchQst (ActChgCrsTT1stDay + 128)
#define ActRefMchTch (ActChgCrsTT1stDay + 129)
#define ActSeeGam (ActChgCrsTT1stDay + 119)
#define ActReqRemMch (ActChgCrsTT1stDay + 120)
#define ActRemMch (ActChgCrsTT1stDay + 121)
#define ActReqNewMch (ActChgCrsTT1stDay + 122)
#define ActNewMch (ActChgCrsTT1stDay + 123)
#define ActResMch (ActChgCrsTT1stDay + 124)
#define ActBckMch (ActChgCrsTT1stDay + 125)
#define ActPlyPauMch (ActChgCrsTT1stDay + 126)
#define ActFwdMch (ActChgCrsTT1stDay + 127)
#define ActChgNumColMch (ActChgCrsTT1stDay + 128)
#define ActChgVisResMchQst (ActChgCrsTT1stDay + 129)
#define ActRefMchTch (ActChgCrsTT1stDay + 130)
#define ActJoiMch (ActChgCrsTT1stDay + 130)
#define ActAnsMchQstStd (ActChgCrsTT1stDay + 131)
#define ActRefMchStd (ActChgCrsTT1stDay + 132)
#define ActJoiMch (ActChgCrsTT1stDay + 131)
#define ActAnsMchQstStd (ActChgCrsTT1stDay + 132)
#define ActRefMchStd (ActChgCrsTT1stDay + 133)
#define ActReqSeeMyMchRes (ActChgCrsTT1stDay + 133)
#define ActSeeMyMchRes (ActChgCrsTT1stDay + 134)
#define ActSeeOneMchResMe (ActChgCrsTT1stDay + 135)
#define ActReqSeeMyMchRes (ActChgCrsTT1stDay + 134)
#define ActSeeMyMchRes (ActChgCrsTT1stDay + 135)
#define ActSeeOneMchResMe (ActChgCrsTT1stDay + 136)
#define ActReqSeeUsrMchRes (ActChgCrsTT1stDay + 136)
#define ActSeeUsrMchRes (ActChgCrsTT1stDay + 137)
#define ActSeeOneMchResOth (ActChgCrsTT1stDay + 138)
#define ActChgVisResMchUsr (ActChgCrsTT1stDay + 139)
#define ActReqSeeUsrMchRes (ActChgCrsTT1stDay + 137)
#define ActSeeUsrMchRes (ActChgCrsTT1stDay + 138)
#define ActSeeOneMchResOth (ActChgCrsTT1stDay + 139)
#define ActChgVisResMchUsr (ActChgCrsTT1stDay + 140)
#define ActFrmNewGam (ActChgCrsTT1stDay + 140)
#define ActEdiOneGam (ActChgCrsTT1stDay + 141)
#define ActNewGam (ActChgCrsTT1stDay + 142)
#define ActChgGam (ActChgCrsTT1stDay + 143)
#define ActReqRemGam (ActChgCrsTT1stDay + 144)
#define ActRemGam (ActChgCrsTT1stDay + 145)
#define ActHidGam (ActChgCrsTT1stDay + 146)
#define ActShoGam (ActChgCrsTT1stDay + 147)
#define ActAddOneGamQst (ActChgCrsTT1stDay + 148)
#define ActGamLstTstQst (ActChgCrsTT1stDay + 149)
#define ActAddTstQstToGam (ActChgCrsTT1stDay + 150)
#define ActReqRemGamQst (ActChgCrsTT1stDay + 151)
#define ActRemGamQst (ActChgCrsTT1stDay + 152)
#define ActUp_GamQst (ActChgCrsTT1stDay + 153)
#define ActDwnGamQst (ActChgCrsTT1stDay + 154)
#define ActFrmNewGam (ActChgCrsTT1stDay + 141)
#define ActEdiOneGam (ActChgCrsTT1stDay + 142)
#define ActNewGam (ActChgCrsTT1stDay + 143)
#define ActChgGam (ActChgCrsTT1stDay + 144)
#define ActReqRemGam (ActChgCrsTT1stDay + 145)
#define ActRemGam (ActChgCrsTT1stDay + 146)
#define ActHidGam (ActChgCrsTT1stDay + 147)
#define ActShoGam (ActChgCrsTT1stDay + 148)
#define ActAddOneGamQst (ActChgCrsTT1stDay + 149)
#define ActGamLstTstQst (ActChgCrsTT1stDay + 150)
#define ActAddTstQstToGam (ActChgCrsTT1stDay + 151)
#define ActReqRemGamQst (ActChgCrsTT1stDay + 152)
#define ActRemGamQst (ActChgCrsTT1stDay + 153)
#define ActUp_GamQst (ActChgCrsTT1stDay + 154)
#define ActDwnGamQst (ActChgCrsTT1stDay + 155)
#define ActSeeSvy (ActChgCrsTT1stDay + 155)
#define ActAnsSvy (ActChgCrsTT1stDay + 156)
#define ActFrmNewSvy (ActChgCrsTT1stDay + 157)
#define ActEdiOneSvy (ActChgCrsTT1stDay + 158)
#define ActNewSvy (ActChgCrsTT1stDay + 159)
#define ActChgSvy (ActChgCrsTT1stDay + 160)
#define ActReqRemSvy (ActChgCrsTT1stDay + 161)
#define ActRemSvy (ActChgCrsTT1stDay + 162)
#define ActReqRstSvy (ActChgCrsTT1stDay + 163)
#define ActRstSvy (ActChgCrsTT1stDay + 164)
#define ActHidSvy (ActChgCrsTT1stDay + 165)
#define ActShoSvy (ActChgCrsTT1stDay + 166)
#define ActEdiOneSvyQst (ActChgCrsTT1stDay + 167)
#define ActRcvSvyQst (ActChgCrsTT1stDay + 168)
#define ActReqRemSvyQst (ActChgCrsTT1stDay + 169)
#define ActRemSvyQst (ActChgCrsTT1stDay + 170)
#define ActSeeSvy (ActChgCrsTT1stDay + 156)
#define ActAnsSvy (ActChgCrsTT1stDay + 157)
#define ActFrmNewSvy (ActChgCrsTT1stDay + 158)
#define ActEdiOneSvy (ActChgCrsTT1stDay + 159)
#define ActNewSvy (ActChgCrsTT1stDay + 160)
#define ActChgSvy (ActChgCrsTT1stDay + 161)
#define ActReqRemSvy (ActChgCrsTT1stDay + 162)
#define ActRemSvy (ActChgCrsTT1stDay + 163)
#define ActReqRstSvy (ActChgCrsTT1stDay + 164)
#define ActRstSvy (ActChgCrsTT1stDay + 165)
#define ActHidSvy (ActChgCrsTT1stDay + 166)
#define ActShoSvy (ActChgCrsTT1stDay + 167)
#define ActEdiOneSvyQst (ActChgCrsTT1stDay + 168)
#define ActRcvSvyQst (ActChgCrsTT1stDay + 169)
#define ActReqRemSvyQst (ActChgCrsTT1stDay + 170)
#define ActRemSvyQst (ActChgCrsTT1stDay + 171)
#define ActSeeOneExaAnn (ActChgCrsTT1stDay + 171)
#define ActSeeDatExaAnn (ActChgCrsTT1stDay + 172)
#define ActEdiExaAnn (ActChgCrsTT1stDay + 173)
#define ActRcvExaAnn (ActChgCrsTT1stDay + 174)
#define ActPrnExaAnn (ActChgCrsTT1stDay + 175)
#define ActReqRemExaAnn (ActChgCrsTT1stDay + 176)
#define ActRemExaAnn (ActChgCrsTT1stDay + 177)
#define ActHidExaAnn (ActChgCrsTT1stDay + 178)
#define ActShoExaAnn (ActChgCrsTT1stDay + 179)
#define ActSeeOneExaAnn (ActChgCrsTT1stDay + 172)
#define ActSeeDatExaAnn (ActChgCrsTT1stDay + 173)
#define ActEdiExaAnn (ActChgCrsTT1stDay + 174)
#define ActRcvExaAnn (ActChgCrsTT1stDay + 175)
#define ActPrnExaAnn (ActChgCrsTT1stDay + 176)
#define ActReqRemExaAnn (ActChgCrsTT1stDay + 177)
#define ActRemExaAnn (ActChgCrsTT1stDay + 178)
#define ActHidExaAnn (ActChgCrsTT1stDay + 179)
#define ActShoExaAnn (ActChgCrsTT1stDay + 180)
/*****************************************************************************/
/******************************** Files tab **********************************/

View File

@ -487,7 +487,7 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - *
En OpenSWAD:
ps2pdf source.ps destination.pdf
*/
#define Log_PLATFORM_VERSION "SWAD 19.67.1 (2019-11-14)"
#define Log_PLATFORM_VERSION "SWAD 19.68 (2019-11-14)"
#define CSS_FILE "swad19.47.css"
#define JS_FILE "swad19.65.js"
/*
@ -495,6 +495,10 @@ ps2pdf source.ps destination.pdf
// TODO: Impedir la creación y edición de proyectos si no son editables.
// TODO: Code refactoring in HTML h1, title, meta, video, p, iframe, input hidden, area
Version 19.68: Nov 14, 2019 Code refactoring in projects. (246642 lines)
1 change necessary in database:
INSERT INTO actions (ActCod,Language,Obsolete,Txt) VALUES ('1805','es','N','Seleccionar usuarios para ver sus proyectos');
Version 19.67.1: Nov 14, 2019 Code refactoring in HTML. (246651 lines)
Version 19.67: Nov 14, 2019 Filter projects by selected users. (246729 lines)
Version 19.66.5: Nov 13, 2019 Code refactoring in list of users in attendance event. (246704 lines)

View File

@ -383,7 +383,6 @@ void Grp_ShowFormToSelectSeveralGroups (void (*FuncParams) (void),
Frm_StartFormAnchor (Gbl.Action.Act, // Repeat current action
Usr_USER_LIST_SECTION_ID);
Usr_PutParamsPrefsAboutUsrList ();
Usr_PutHiddenParamRequestUsrs ();
if (FuncParams)
FuncParams ();

View File

@ -124,8 +124,8 @@ struct Prj_Faults
/***************************** Private prototypes ****************************/
/*****************************************************************************/
static void Prj_ReqUsrsToSelect (void);
static void Prj_GetSelectedUsrsAndShowPrjs (void);
static void Prj_ReqListUsrsToSelect (void);
static void Prj_ShowProjectsInCurrentPage (void);
@ -231,6 +231,32 @@ static void Prj_PutIconOffLockedUnlocked (const struct Project *Prj);
static void Prj_LockProjectEditionInDB (long PrjCod);
static void Prj_UnlockProjectEditionInDB (long PrjCod);
/*****************************************************************************/
/**************************** List users to select ***************************/
/*****************************************************************************/
void Prj_ListUsrsToSelect (void)
{
/***** Get parameters *****/
Prj_GetParams ();
/***** Show list of users to select some of them *****/
Prj_ReqUsrsToSelect ();
}
static void Prj_ReqUsrsToSelect (void)
{
extern const char *Hlp_ASSESSMENT_Projects;
extern const char *Txt_Projects;
extern const char *Txt_View_projects;
/***** List users to select some of them *****/
Usr_PutFormToSelectUsrsToGoToAct (ActSeePrj,Prj_PutCurrentParams,
Txt_Projects,
Hlp_ASSESSMENT_Projects,
Txt_View_projects);
}
/*****************************************************************************/
/******************************* Show projects *******************************/
/*****************************************************************************/
@ -249,10 +275,10 @@ void Prj_SeeProjects (void)
Prj_ShowProjectsInCurrentPage ();
break;
case Usr_WHO_SELECTED:
if (Gbl.Prjs.Filter.ReqUsrs) // Request the selection of users
// if (Gbl.Prjs.Filter.ReqUsrs) // Request the selection of users
/* List users to select some of them */
Prj_ReqListUsrsToSelect ();
else
// Prj_ReqListUsrsToSelect ();
//else
/* Show projects of selected users */
Prj_GetSelectedUsrsAndShowPrjs ();
break;
@ -268,31 +294,14 @@ void Prj_SeeProjects (void)
static void Prj_GetSelectedUsrsAndShowPrjs (void)
{
Usr_GetSelectedUsrsAndGoToAct (Prj_ShowProjectsInCurrentPage,// when user(s) selected
Prj_ReqListUsrsToSelect); // when no user selected
}
/*****************************************************************************/
/**************************** List users to select ***************************/
/*****************************************************************************/
static void Prj_ReqListUsrsToSelect (void)
{
extern const char *Hlp_ASSESSMENT_Projects;
extern const char *Txt_Projects;
extern const char *Txt_View_projects;
/***** List users to select some of them *****/
Usr_PutFormToSelectUsrsToGoToAct (ActSeePrj,Prj_PutCurrentParams,
Txt_Projects,
Hlp_ASSESSMENT_Projects,
Txt_View_projects);
Prj_ReqUsrsToSelect); // when no user selected
}
/*****************************************************************************/
/********************** Show selected projects in a table ********************/
/*****************************************************************************/
void Prj_ShowTableSelectedProjects (void)
void Prj_ShowTableSelectedPrjs (void)
{
extern const char *Txt_No_projects;
unsigned NumPrj;
@ -472,7 +481,8 @@ static void Prj_ShowFormToFilterByMy_All (void)
HTM_DIV_Begin ("class=\"%s\"",
(Gbl.Prjs.Filter.Who == Who) ? "PREF_ON" :
"PREF_OFF");
Frm_StartForm (ActSeePrj);
Frm_StartForm (Who == Usr_WHO_SELECTED ? ActReqUsrPrj :
ActSeePrj);
Filter.Who = Who;
Filter.Assign = Gbl.Prjs.Filter.Assign;
Filter.Hidden = Gbl.Prjs.Filter.Hidden;
@ -813,12 +823,6 @@ static void Prj_GetParamWho (void)
/***** If parameter Who is unknown, set it to default *****/
if (Gbl.Prjs.Filter.Who == Usr_WHO_UNKNOWN)
Gbl.Prjs.Filter.Who = Prj_FILTER_WHO_DEFAULT;
/***** Request users? / Some users should have been selected? *****/
if (Gbl.Prjs.Filter.Who == Usr_WHO_SELECTED)
Gbl.Prjs.Filter.ReqUsrs = Usr_GetHiddenParamRequestUsrs ();
else
Gbl.Prjs.Filter.ReqUsrs = false;
}
/*****************************************************************************/
@ -4010,7 +4014,7 @@ static void Prj_PutIconsToLockUnlockAllProjects (void)
/********** Request locking/unlocking edition of selected projects ***********/
/*****************************************************************************/
void Prj_ReqLockSelectedProjectsEdition (void)
void Prj_ReqLockSelectedPrjsEdition (void)
{
extern const char *Txt_Lock_editing;
extern const char *Txt_Do_you_want_to_lock_the_editing_of_the_X_selected_projects;
@ -4044,7 +4048,7 @@ void Prj_ReqLockSelectedProjectsEdition (void)
Prj_ShowProjectsInCurrentPage ();
}
void Prj_ReqUnlockSelectedProjectsEdition (void)
void Prj_ReqUnloSelectedPrjsEdition (void)
{
extern const char *Txt_Unlock_editing;
extern const char *Txt_Do_you_want_to_unlock_the_editing_of_the_X_selected_projects;
@ -4082,7 +4086,7 @@ void Prj_ReqUnlockSelectedProjectsEdition (void)
/***************** Lock/unlock edition of selected projects ******************/
/*****************************************************************************/
void Prj_LockSelectedProjectsEdition (void)
void Prj_LockSelectedPrjsEdition (void)
{
extern const char *Txt_No_projects;
unsigned NumPrj;
@ -4115,7 +4119,7 @@ void Prj_LockSelectedProjectsEdition (void)
Prj_ShowProjectsInCurrentPage ();
}
void Prj_UnlockSelectedProjectsEdition (void)
void Prj_UnloSelectedPrjsEdition (void)
{
extern const char *Txt_No_projects;
unsigned NumPrj;
@ -4244,7 +4248,7 @@ static void Prj_LockProjectEditionInDB (long PrjCod)
/************************* Unlock edition of a project ***********************/
/*****************************************************************************/
void Prj_UnlockProjectEdition (void)
void Prj_UnloProjectEdition (void)
{
struct Project Prj;

View File

@ -90,7 +90,6 @@ typedef enum
struct Prj_Filter
{
Usr_Who_t Who; // Show my / selected users' / all projects
bool ReqUsrs; // Request selection of users to view their projects?
unsigned Assign; // Show assigned / non assigned projects
unsigned Hidden; // Show hidden / visible projects
unsigned Faulti; // Show faulty / faultless projects
@ -157,8 +156,9 @@ struct Project
/***************************** Public prototypes *****************************/
/*****************************************************************************/
void Prj_ListUsrsToSelect (void);
void Prj_SeeProjects (void);
void Prj_ShowTableSelectedProjects (void);
void Prj_ShowTableSelectedPrjs (void);
void Prj_PutParams (struct Prj_Filter *Filter,
Prj_Order_t Order,
@ -213,12 +213,12 @@ void Prj_RecFormProject (void);
void Prj_ShowFormConfig (void);
void Prj_ReceiveConfigPrj (void);
void Prj_ReqLockSelectedProjectsEdition (void);
void Prj_ReqUnlockSelectedProjectsEdition (void);
void Prj_LockSelectedProjectsEdition (void);
void Prj_UnlockSelectedProjectsEdition (void);
void Prj_ReqLockSelectedPrjsEdition (void);
void Prj_ReqUnloSelectedPrjsEdition (void);
void Prj_LockSelectedPrjsEdition (void);
void Prj_UnloSelectedPrjsEdition (void);
void Prj_LockProjectEdition (void);
void Prj_UnlockProjectEdition (void);
void Prj_UnloProjectEdition (void);
void Prj_RemoveCrsProjects (long CrsCod);
void Prj_RemoveUsrFromProjects (long UsrCod);

View File

@ -9856,11 +9856,6 @@ void Usr_PutWhoIcon (Usr_Who_t Who)
"ICO_HIGHLIGHT PHOTO15x20");
break;
case Usr_WHO_SELECTED:
Usr_PutHiddenParamRequestUsrs ();
HTM_INPUT_IMAGE (Cfg_URL_ICON_PUBLIC,"user-check.svg",
Txt_WHO[Who],
"ICO_HIGHLIGHT ICOx20");
break;
case Usr_WHO_FOLLOWED:
HTM_INPUT_IMAGE (Cfg_URL_ICON_PUBLIC,"user-check.svg",
Txt_WHO[Who],
@ -9894,17 +9889,3 @@ Usr_Who_t Usr_GetHiddenParamWho (void)
Usr_NUM_WHO - 1,
Usr_WHO_UNKNOWN);
}
/*****************************************************************************/
/************* Put hidden param to request a form to select users ************/
/*****************************************************************************/
void Usr_PutHiddenParamRequestUsrs (void)
{
Par_PutHiddenParamChar ("RequestUsrs",'Y');
}
bool Usr_GetHiddenParamRequestUsrs (void)
{
return Par_GetParToBool ("RequestUsrs");
}

View File

@ -512,7 +512,5 @@ void Usr_ShowTableCellWithUsrData (struct UsrData *UsrDat,unsigned NumRows);
void Usr_PutWhoIcon (Usr_Who_t Who);
void Usr_PutHiddenParamWho (Usr_Who_t Who);
Usr_Who_t Usr_GetHiddenParamWho (void);
void Usr_PutHiddenParamRequestUsrs (void);
bool Usr_GetHiddenParamRequestUsrs (void);
#endif