From 9962b9b2f0690e349cd0384cc9fc184be7d84aab Mon Sep 17 00:00:00 2001 From: acanas Date: Sat, 6 May 2023 00:00:10 +0200 Subject: [PATCH] Version 22.107.2: May 05, 2023 Removed unused action in exam sets. --- swad_action_list.c | 3 +- swad_action_list.h | 205 ++++++++++++++++++++++----------------------- swad_changelog.h | 3 +- swad_exam_set.c | 44 ---------- swad_exam_set.h | 2 - swad_text_action.c | 23 ----- 6 files changed, 105 insertions(+), 175 deletions(-) diff --git a/swad_action_list.c b/swad_action_list.c index d5812559e..302b5e861 100644 --- a/swad_action_list.c +++ b/swad_action_list.c @@ -743,7 +743,6 @@ const struct Act_Actions ActLst_Actions[ActLst_NUM_ACTIONS] = [ActUnhExa ] = {1884,-1,TabUnk,ActSeeAllExa ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Exa_UnhideExam ,NULL}, [ActReqLnkExa ] = {1936,-1,TabUnk,ActSeeAllExa ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,ExaRsc_GetLinkToExam ,NULL}, - [ActFrmNewExaSet ] = {1892,-1,TabUnk,ActSeeAllExa ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Dat_SetIniEndDatesToPastAndNow ,ExaSet_ReqCreatOrEditSet ,NULL}, [ActNewExaSet ] = {1898,-1,TabUnk,ActSeeAllExa ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,ExaSet_ReceiveFormSet ,NULL}, [ActReqRemExaSet ] = {1893,-1,TabUnk,ActSeeAllExa ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,ExaSet_ReqRemSet ,NULL}, [ActRemExaSet ] = {1894,-1,TabUnk,ActSeeAllExa ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,ExaSet_RemoveSet ,NULL}, @@ -3785,7 +3784,7 @@ Act_Action_t ActLst_FromActCodToAction[1 + ActLst_MAX_ACTION_COD] = // Do not re ActRemExaQst, // #1889 -1, // #1890 (obsolete action) -1, // #1891 (obsolete action) - ActFrmNewExaSet, // #1892 + -1, // #1892 (obsolete action) ActReqRemExaSet, // #1893 ActRemExaSet, // #1894 ActUp_ExaSet, // #1895 diff --git a/swad_action_list.h b/swad_action_list.h index 0809f5099..0ea509847 100644 --- a/swad_action_list.h +++ b/swad_action_list.h @@ -668,122 +668,121 @@ #define ActUnhExa (ActChgCrsTT1stDay + 136) #define ActReqLnkExa (ActChgCrsTT1stDay + 137) -#define ActFrmNewExaSet (ActChgCrsTT1stDay + 138) -#define ActNewExaSet (ActChgCrsTT1stDay + 139) -#define ActReqRemExaSet (ActChgCrsTT1stDay + 140) -#define ActRemExaSet (ActChgCrsTT1stDay + 141) -#define ActUp_ExaSet (ActChgCrsTT1stDay + 142) -#define ActDwnExaSet (ActChgCrsTT1stDay + 143) -#define ActChgTitExaSet (ActChgCrsTT1stDay + 144) -#define ActChgNumQstExaSet (ActChgCrsTT1stDay + 145) +#define ActNewExaSet (ActChgCrsTT1stDay + 138) +#define ActReqRemExaSet (ActChgCrsTT1stDay + 139) +#define ActRemExaSet (ActChgCrsTT1stDay + 140) +#define ActUp_ExaSet (ActChgCrsTT1stDay + 141) +#define ActDwnExaSet (ActChgCrsTT1stDay + 142) +#define ActChgTitExaSet (ActChgCrsTT1stDay + 143) +#define ActChgNumQstExaSet (ActChgCrsTT1stDay + 144) -#define ActReqAddQstExaSet (ActChgCrsTT1stDay + 146) -#define ActLstTstQstForSet (ActChgCrsTT1stDay + 147) -#define ActAddQstToExa (ActChgCrsTT1stDay + 148) -#define ActReqRemSetQst (ActChgCrsTT1stDay + 149) -#define ActRemExaQst (ActChgCrsTT1stDay + 150) -#define ActValSetQst (ActChgCrsTT1stDay + 151) -#define ActInvSetQst (ActChgCrsTT1stDay + 152) +#define ActReqAddQstExaSet (ActChgCrsTT1stDay + 145) +#define ActLstTstQstForSet (ActChgCrsTT1stDay + 146) +#define ActAddQstToExa (ActChgCrsTT1stDay + 147) +#define ActReqRemSetQst (ActChgCrsTT1stDay + 148) +#define ActRemExaQst (ActChgCrsTT1stDay + 149) +#define ActValSetQst (ActChgCrsTT1stDay + 150) +#define ActInvSetQst (ActChgCrsTT1stDay + 151) -#define ActReqNewExaSes (ActChgCrsTT1stDay + 153) -#define ActEdiOneExaSes (ActChgCrsTT1stDay + 154) -#define ActNewExaSes (ActChgCrsTT1stDay + 155) -#define ActChgExaSes (ActChgCrsTT1stDay + 156) -#define ActReqRemExaSes (ActChgCrsTT1stDay + 157) -#define ActRemExaSes (ActChgCrsTT1stDay + 158) -#define ActHidExaSes (ActChgCrsTT1stDay + 159) -#define ActUnhExaSes (ActChgCrsTT1stDay + 160) +#define ActReqNewExaSes (ActChgCrsTT1stDay + 152) +#define ActEdiOneExaSes (ActChgCrsTT1stDay + 153) +#define ActNewExaSes (ActChgCrsTT1stDay + 154) +#define ActChgExaSes (ActChgCrsTT1stDay + 155) +#define ActReqRemExaSes (ActChgCrsTT1stDay + 156) +#define ActRemExaSes (ActChgCrsTT1stDay + 157) +#define ActHidExaSes (ActChgCrsTT1stDay + 158) +#define ActUnhExaSes (ActChgCrsTT1stDay + 159) -#define ActSeeExaPrn (ActChgCrsTT1stDay + 161) -#define ActAnsExaPrn (ActChgCrsTT1stDay + 162) -#define ActEndExaPrn (ActChgCrsTT1stDay + 163) +#define ActSeeExaPrn (ActChgCrsTT1stDay + 160) +#define ActAnsExaPrn (ActChgCrsTT1stDay + 161) +#define ActEndExaPrn (ActChgCrsTT1stDay + 162) -#define ActSeeMyExaResCrs (ActChgCrsTT1stDay + 164) -#define ActSeeMyExaResExa (ActChgCrsTT1stDay + 165) -#define ActSeeMyExaResSes (ActChgCrsTT1stDay + 166) -#define ActSeeOneExaResMe (ActChgCrsTT1stDay + 167) -#define ActReqSeeUsrExaRes (ActChgCrsTT1stDay + 168) -#define ActSeeUsrExaResCrs (ActChgCrsTT1stDay + 169) -#define ActSeeUsrExaResExa (ActChgCrsTT1stDay + 170) -#define ActSeeUsrExaResSes (ActChgCrsTT1stDay + 171) -#define ActSeeOneExaResOth (ActChgCrsTT1stDay + 172) -#define ActChgVisExaRes (ActChgCrsTT1stDay + 173) +#define ActSeeMyExaResCrs (ActChgCrsTT1stDay + 163) +#define ActSeeMyExaResExa (ActChgCrsTT1stDay + 164) +#define ActSeeMyExaResSes (ActChgCrsTT1stDay + 165) +#define ActSeeOneExaResMe (ActChgCrsTT1stDay + 166) +#define ActReqSeeUsrExaRes (ActChgCrsTT1stDay + 167) +#define ActSeeUsrExaResCrs (ActChgCrsTT1stDay + 168) +#define ActSeeUsrExaResExa (ActChgCrsTT1stDay + 169) +#define ActSeeUsrExaResSes (ActChgCrsTT1stDay + 170) +#define ActSeeOneExaResOth (ActChgCrsTT1stDay + 171) +#define ActChgVisExaRes (ActChgCrsTT1stDay + 172) -#define ActSeeOneGam (ActChgCrsTT1stDay + 174) -#define ActReqRemMch (ActChgCrsTT1stDay + 175) -#define ActRemMch (ActChgCrsTT1stDay + 176) -#define ActEdiMch (ActChgCrsTT1stDay + 177) -#define ActChgMch (ActChgCrsTT1stDay + 178) -#define ActReqNewMch (ActChgCrsTT1stDay + 179) -#define ActNewMch (ActChgCrsTT1stDay + 180) -#define ActResMch (ActChgCrsTT1stDay + 181) -#define ActBckMch (ActChgCrsTT1stDay + 182) -#define ActPlyPauMch (ActChgCrsTT1stDay + 183) -#define ActFwdMch (ActChgCrsTT1stDay + 184) -#define ActChgNumColMch (ActChgCrsTT1stDay + 185) -#define ActChgVisResMchQst (ActChgCrsTT1stDay + 186) -#define ActMchCntDwn (ActChgCrsTT1stDay + 187) -#define ActRefMchTch (ActChgCrsTT1stDay + 188) +#define ActSeeOneGam (ActChgCrsTT1stDay + 173) +#define ActReqRemMch (ActChgCrsTT1stDay + 174) +#define ActRemMch (ActChgCrsTT1stDay + 175) +#define ActEdiMch (ActChgCrsTT1stDay + 176) +#define ActChgMch (ActChgCrsTT1stDay + 177) +#define ActReqNewMch (ActChgCrsTT1stDay + 178) +#define ActNewMch (ActChgCrsTT1stDay + 179) +#define ActResMch (ActChgCrsTT1stDay + 180) +#define ActBckMch (ActChgCrsTT1stDay + 181) +#define ActPlyPauMch (ActChgCrsTT1stDay + 182) +#define ActFwdMch (ActChgCrsTT1stDay + 183) +#define ActChgNumColMch (ActChgCrsTT1stDay + 184) +#define ActChgVisResMchQst (ActChgCrsTT1stDay + 185) +#define ActMchCntDwn (ActChgCrsTT1stDay + 186) +#define ActRefMchTch (ActChgCrsTT1stDay + 187) -#define ActJoiMch (ActChgCrsTT1stDay + 189) -#define ActSeeMchAnsQstStd (ActChgCrsTT1stDay + 190) -#define ActRemMchAnsQstStd (ActChgCrsTT1stDay + 191) -#define ActAnsMchQstStd (ActChgCrsTT1stDay + 192) -#define ActRefMchStd (ActChgCrsTT1stDay + 193) +#define ActJoiMch (ActChgCrsTT1stDay + 188) +#define ActSeeMchAnsQstStd (ActChgCrsTT1stDay + 189) +#define ActRemMchAnsQstStd (ActChgCrsTT1stDay + 190) +#define ActAnsMchQstStd (ActChgCrsTT1stDay + 191) +#define ActRefMchStd (ActChgCrsTT1stDay + 192) -#define ActSeeMyMchResCrs (ActChgCrsTT1stDay + 194) -#define ActSeeMyMchResGam (ActChgCrsTT1stDay + 195) -#define ActSeeMyMchResMch (ActChgCrsTT1stDay + 196) -#define ActSeeOneMchResMe (ActChgCrsTT1stDay + 197) +#define ActSeeMyMchResCrs (ActChgCrsTT1stDay + 193) +#define ActSeeMyMchResGam (ActChgCrsTT1stDay + 194) +#define ActSeeMyMchResMch (ActChgCrsTT1stDay + 195) +#define ActSeeOneMchResMe (ActChgCrsTT1stDay + 196) -#define ActReqSeeUsrMchRes (ActChgCrsTT1stDay + 198) -#define ActSeeUsrMchResCrs (ActChgCrsTT1stDay + 199) -#define ActSeeUsrMchResGam (ActChgCrsTT1stDay + 200) -#define ActSeeUsrMchResMch (ActChgCrsTT1stDay + 201) -#define ActSeeOneMchResOth (ActChgCrsTT1stDay + 202) +#define ActReqSeeUsrMchRes (ActChgCrsTT1stDay + 197) +#define ActSeeUsrMchResCrs (ActChgCrsTT1stDay + 198) +#define ActSeeUsrMchResGam (ActChgCrsTT1stDay + 199) +#define ActSeeUsrMchResMch (ActChgCrsTT1stDay + 200) +#define ActSeeOneMchResOth (ActChgCrsTT1stDay + 201) -#define ActChgVisResMchUsr (ActChgCrsTT1stDay + 203) +#define ActChgVisResMchUsr (ActChgCrsTT1stDay + 202) -#define ActLstOneGam (ActChgCrsTT1stDay + 204) +#define ActLstOneGam (ActChgCrsTT1stDay + 203) -#define ActFrmNewGam (ActChgCrsTT1stDay + 205) -#define ActEdiOneGam (ActChgCrsTT1stDay + 206) -#define ActNewGam (ActChgCrsTT1stDay + 207) -#define ActChgGam (ActChgCrsTT1stDay + 208) -#define ActReqRemGam (ActChgCrsTT1stDay + 209) -#define ActRemGam (ActChgCrsTT1stDay + 210) -#define ActHidGam (ActChgCrsTT1stDay + 211) -#define ActUnhGam (ActChgCrsTT1stDay + 212) -#define ActAddOneGamQst (ActChgCrsTT1stDay + 213) -#define ActGamLstTstQst (ActChgCrsTT1stDay + 214) -#define ActAddTstQstToGam (ActChgCrsTT1stDay + 215) -#define ActReqRemGamQst (ActChgCrsTT1stDay + 216) -#define ActRemGamQst (ActChgCrsTT1stDay + 217) -#define ActUp_GamQst (ActChgCrsTT1stDay + 218) -#define ActDwnGamQst (ActChgCrsTT1stDay + 219) -#define ActReqLnkGam (ActChgCrsTT1stDay + 220) +#define ActFrmNewGam (ActChgCrsTT1stDay + 204) +#define ActEdiOneGam (ActChgCrsTT1stDay + 205) +#define ActNewGam (ActChgCrsTT1stDay + 206) +#define ActChgGam (ActChgCrsTT1stDay + 207) +#define ActReqRemGam (ActChgCrsTT1stDay + 208) +#define ActRemGam (ActChgCrsTT1stDay + 209) +#define ActHidGam (ActChgCrsTT1stDay + 210) +#define ActUnhGam (ActChgCrsTT1stDay + 211) +#define ActAddOneGamQst (ActChgCrsTT1stDay + 212) +#define ActGamLstTstQst (ActChgCrsTT1stDay + 213) +#define ActAddTstQstToGam (ActChgCrsTT1stDay + 214) +#define ActReqRemGamQst (ActChgCrsTT1stDay + 215) +#define ActRemGamQst (ActChgCrsTT1stDay + 216) +#define ActUp_GamQst (ActChgCrsTT1stDay + 217) +#define ActDwnGamQst (ActChgCrsTT1stDay + 218) +#define ActReqLnkGam (ActChgCrsTT1stDay + 219) -#define ActSeeOneRub (ActChgCrsTT1stDay + 221) -#define ActFrmNewRub (ActChgCrsTT1stDay + 222) -#define ActEdiOneRub (ActChgCrsTT1stDay + 223) -#define ActNewRub (ActChgCrsTT1stDay + 224) -#define ActChgRub (ActChgCrsTT1stDay + 225) -#define ActReqRemRub (ActChgCrsTT1stDay + 226) -#define ActRemRub (ActChgCrsTT1stDay + 227) -#define ActReqLnkRub (ActChgCrsTT1stDay + 228) +#define ActSeeOneRub (ActChgCrsTT1stDay + 220) +#define ActFrmNewRub (ActChgCrsTT1stDay + 221) +#define ActEdiOneRub (ActChgCrsTT1stDay + 222) +#define ActNewRub (ActChgCrsTT1stDay + 223) +#define ActChgRub (ActChgCrsTT1stDay + 224) +#define ActReqRemRub (ActChgCrsTT1stDay + 225) +#define ActRemRub (ActChgCrsTT1stDay + 226) +#define ActReqLnkRub (ActChgCrsTT1stDay + 227) -#define ActSeeRscCli_InRub (ActChgCrsTT1stDay + 229) -#define ActRemRscCli_InRub (ActChgCrsTT1stDay + 230) -#define ActNewRubCri (ActChgCrsTT1stDay + 231) -#define ActReqRemRubCri (ActChgCrsTT1stDay + 232) -#define ActRemRubCri (ActChgCrsTT1stDay + 233) -#define ActUp_RubCri (ActChgCrsTT1stDay + 234) -#define ActDwnRubCri (ActChgCrsTT1stDay + 235) -#define ActChgTitRubCri (ActChgCrsTT1stDay + 236) -#define ActChgLnkRubCri (ActChgCrsTT1stDay + 237) -#define ActChgMinRubCri (ActChgCrsTT1stDay + 238) -#define ActChgMaxRubCri (ActChgCrsTT1stDay + 239) -#define ActChgWeiRubCri (ActChgCrsTT1stDay + 240) +#define ActSeeRscCli_InRub (ActChgCrsTT1stDay + 228) +#define ActRemRscCli_InRub (ActChgCrsTT1stDay + 229) +#define ActNewRubCri (ActChgCrsTT1stDay + 230) +#define ActReqRemRubCri (ActChgCrsTT1stDay + 231) +#define ActRemRubCri (ActChgCrsTT1stDay + 232) +#define ActUp_RubCri (ActChgCrsTT1stDay + 233) +#define ActDwnRubCri (ActChgCrsTT1stDay + 234) +#define ActChgTitRubCri (ActChgCrsTT1stDay + 235) +#define ActChgLnkRubCri (ActChgCrsTT1stDay + 236) +#define ActChgMinRubCri (ActChgCrsTT1stDay + 237) +#define ActChgMaxRubCri (ActChgCrsTT1stDay + 238) +#define ActChgWeiRubCri (ActChgCrsTT1stDay + 239) /*****************************************************************************/ /******************************** Files tab **********************************/ diff --git a/swad_changelog.h b/swad_changelog.h index 8281d5812..f6f78deec 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -629,10 +629,11 @@ TODO: Emilce Barrera Mesa: Podr TODO: Emilce Barrera Mesa: Mis estudiantes presentan muchas dificultades a la hora de poner la foto porque la plataforma es muy exigente respecto al fondo de la imagen. */ -#define Log_PLATFORM_VERSION "SWAD 22.107.1 (2023-05-05)" +#define Log_PLATFORM_VERSION "SWAD 22.107.2 (2023-05-05)" #define CSS_FILE "swad22.107.css" #define JS_FILE "swad22.49.js" /* + Version 22.107.2: May 05, 2023 Removed unused action in exam sets. (338044 lines) Version 22.107.1: May 05, 2023 Changes in list of users to follow. (338105 lines) Version 22.107: May 05, 2023 Changes in layout institutional links and connected users. (338108 lines) Version 22.106: May 05, 2023 Changes in layout of frequent actions. (338126 lines) diff --git a/swad_exam_set.c b/swad_exam_set.c index ab21e9abd..79dac53d3 100644 --- a/swad_exam_set.c +++ b/swad_exam_set.c @@ -429,50 +429,6 @@ static void ExaSet_CreateSet (struct ExaSet_Set *Set) Set->Title); } -/*****************************************************************************/ -/********** Request the creation or edition of an set of questions ***********/ -/*****************************************************************************/ - -void ExaSet_ReqCreatOrEditSet (void) - { - struct Exa_Exams Exams; - struct ExaSet_Set Set; - bool ItsANewSet; - char Txt[Cns_MAX_BYTES_TEXT + 1]; - - /***** Check if I can edit exams *****/ - if (!Exa_CheckIfICanEditExams ()) - Err_NoPermissionExit (); - - /***** Reset exams context *****/ - Exa_ResetExams (&Exams); - Exa_ResetExam (&Exams.Exam); - ExaSet_ResetSet (&Set); - - /***** Get parameters *****/ - Exa_GetPars (&Exams,Exa_CHECK_EXA_COD); - Exams.SetCod = Set.SetCod = ParCod_GetPar (ParCod_Set); - ItsANewSet = (Set.SetCod <= 0); - - /***** Get exam data from database *****/ - Exa_GetExamDataByCod (&Exams.Exam); - Exa_DB_GetExamTxt (Exams.Exam.ExaCod,Txt); - - /***** Get set data *****/ - if (ItsANewSet) - /* Initialize to empty set */ - ExaSet_ResetSet (&Set); - else - { - /* Get set data from database */ - ExaSet_GetSetDataByCod (&Set); - Exams.SetCod = Set.SetCod; - } - - /***** Put form to edit the exam created or updated *****/ - Exa_PutFormEditionExam (&Exams,Txt,Exa_EXISTING_EXAM); - } - /*****************************************************************************/ /*** Request the selection of questions to be added to a set of questions ****/ /*****************************************************************************/ diff --git a/swad_exam_set.h b/swad_exam_set.h index 621a07a0a..01b9c8777 100644 --- a/swad_exam_set.h +++ b/swad_exam_set.h @@ -43,8 +43,6 @@ void ExaSet_ReceiveFormSet (void); void ExaSet_ChangeSetTitle (void); void ExaSet_ChangeNumQstsToExam (void); -void ExaSet_ReqCreatOrEditSet (void); - void ExaSet_ReqSelectQstsToAddToSet (void); void ExaSet_ListQstsToAddToSet (void); diff --git a/swad_text_action.c b/swad_text_action.c index 8c450478f..d41f245f2 100644 --- a/swad_text_action.c +++ b/swad_text_action.c @@ -12066,29 +12066,6 @@ const char *Txt_Actions[ActLst_NUM_ACTIONS] = "Copy link to exam" // Precisa de tradução #elif L==10 // tr "Copy link to exam" // Çeviri lazim! -#endif - , - [ActFrmNewExaSet] = -#if L==1 // ca - "Request new exam set" // Necessita traducció -#elif L==2 // de - "Request new exam set" // Need Übersetzung -#elif L==3 // en - "Request new exam set" -#elif L==4 // es - "Solicitar nuevo conjunto de preguntas" -#elif L==5 // fr - "Request new exam set" // Besoin de traduction -#elif L==6 // gn - "Solicitar nuevo conjunto de preguntas" // Okoteve traducción -#elif L==7 // it - "Request new exam set" // Bisogno di traduzione -#elif L==8 // pl - "Request new exam set" // Potrzebujesz tlumaczenie -#elif L==9 // pt - "Request new exam set" // Precisa de tradução -#elif L==10 // tr - "Request new exam set" // Çeviri lazim! #endif , [ActNewExaSet] =