From 618d9f245b9b6621e8bfb5fa0cc1e6b707cedef1 Mon Sep 17 00:00:00 2001 From: acanas Date: Thu, 20 Apr 2023 18:39:44 +0200 Subject: [PATCH] Version 22.101.7: Apr 20, 2023 Changes in edition of exams and games. --- swad_changelog.h | 3 ++- swad_exam.c | 2 +- swad_exam_set.c | 22 +---------------- swad_game.c | 26 ++++---------------- swad_text_action.c | 60 +++++++++++++++++++++++----------------------- 5 files changed, 38 insertions(+), 75 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index d33324047..a36ee83e8 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.101.6 (2023-04-20)" +#define Log_PLATFORM_VERSION "SWAD 22.101.7 (2023-04-20)" #define CSS_FILE "swad22.95.css" #define JS_FILE "swad22.49.js" /* + Version 22.101.7: Apr 20, 2023 Changes in edition of exams and games. (337342 lines) Version 22.101.6: Apr 20, 2023 Changes in edition of program items. (337370 lines) Version 22.101.5: Apr 20, 2023 Changes in edition of buildings and rooms. (337392 lines) Version 22.101.4: Apr 20, 2023 Changes in edition of plugins. (337393 lines) diff --git a/swad_exam.c b/swad_exam.c index 8307d1fa9..31308691a 100644 --- a/swad_exam.c +++ b/swad_exam.c @@ -1335,7 +1335,7 @@ void Exa_PutFormEditionExam (struct Exa_Exams *Exams, /***** Visibility of results *****/ HTM_TR_Begin (NULL); - HTM_TD_Begin ("class=\"RT %s\"",The_GetSuffix ()); + HTM_TD_Begin ("class=\"RT FORM_IN_%s\"",The_GetSuffix ()); HTM_TxtColon (Txt_Result_visibility); HTM_TD_End (); diff --git a/swad_exam_set.c b/swad_exam_set.c index 0f628ddd1..165e3beab 100644 --- a/swad_exam_set.c +++ b/swad_exam_set.c @@ -118,7 +118,6 @@ static void ExaSet_ExchangeSets (long ExaCod, unsigned SetIndTop,unsigned SetIndBottom); static void ExaSet_PutIconToAddNewQuestions (void *Exams); -static void ExaSet_PutButtonToAddNewQuestions (struct Exa_Exams *Exams); /*****************************************************************************/ /************ Put parameter to move/remove one set of questions **************/ @@ -181,7 +180,6 @@ static void ExaSet_PutFormNewSet (struct Exa_Exams *Exams, struct ExaSet_Set *Set, unsigned MaxSetInd) { - extern const char *Txt_Set_of_questions; extern const char *Txt_Create_set_of_questions; /***** Begin form *****/ @@ -189,7 +187,7 @@ static void ExaSet_PutFormNewSet (struct Exa_Exams *Exams, Exa_PutPars (Exams); /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,Txt_Set_of_questions, + Box_BoxTableBegin (NULL,NULL, NULL,NULL, NULL,Box_NOT_CLOSABLE,2); @@ -599,10 +597,6 @@ static void ExaSet_ListSetQuestions (struct Exa_Exams *Exams, ExaSet_ListOneOrMoreQuestionsForEdition (Exams,NumQsts,mysql_res, ICanEditQuestions); - /***** Put button to add a new question in this set *****/ - if (ICanEditQuestions) // I can edit questions - ExaSet_PutButtonToAddNewQuestions (Exams); - /***** Free structure that stores the query result *****/ DB_FreeMySQLResult (&mysql_res); @@ -1698,20 +1692,6 @@ static void ExaSet_PutIconToAddNewQuestions (void *Exams) ExaSet_PutParsOneSet,Exams); } -/*****************************************************************************/ -/***************** Put button to add new questions to exam *******************/ -/*****************************************************************************/ - -static void ExaSet_PutButtonToAddNewQuestions (struct Exa_Exams *Exams) - { - extern const char *Txt_Add_questions; - - Frm_BeginForm (ActReqAddQstExaSet); - ExaSet_PutParsOneSet (Exams); - Btn_PutConfirmButtonInline (Txt_Add_questions); - Frm_EndForm (); - } - /*****************************************************************************/ /******************* Show title of exam set in exam print ********************/ /*****************************************************************************/ diff --git a/swad_game.c b/swad_game.c index ab6f312ce..9b8ebcb3a 100644 --- a/swad_game.c +++ b/swad_game.c @@ -150,7 +150,6 @@ static void Gam_ListOneOrMoreQuestionsForEdition (struct Gam_Games *Games, bool ICanEditQuestions); static void Gam_PutIconToAddNewQuestions (void *Games); -static void Gam_PutButtonToAddNewQuestions (struct Gam_Games *Games); static void Gam_AllocateListSelectedQuestions (struct Gam_Games *Games); static void Gam_FreeListsSelectedQuestions (struct Gam_Games *Games); @@ -573,7 +572,7 @@ static void Gam_ShowGameMainData (struct Gam_Games *Games, /* Number of questions, maximum grade, visibility of results */ HTM_DIV_Begin ("class=\"%s_%s\"", Games->Game.Hidden ? "ASG_GRP_LIGHT" : - "ASG_GRP", + "ASG_GRP", The_GetSuffix ()); HTM_TxtColonNBSP (Txt_Number_of_questions); HTM_Unsigned (Games->Game.NumQsts); @@ -1606,10 +1605,6 @@ static void Gam_ListGameQuestions (struct Gam_Games *Games) Gam_ListOneOrMoreQuestionsForEdition (Games,NumQsts,mysql_res, ICanEditQuestions); - /***** Put button to add a new question in this game *****/ - if (ICanEditQuestions) // I can edit questions - Gam_PutButtonToAddNewQuestions (Games); - /***** Free structure that stores the query result *****/ DB_FreeMySQLResult (&mysql_res); @@ -1751,22 +1746,6 @@ static void Gam_PutIconToAddNewQuestions (void *Games) Ico_PutContextualIconToAdd (ActAddOneGamQst,NULL,Gam_PutPars,Games); } -/*****************************************************************************/ -/***************** Put button to add new questions to game *******************/ -/*****************************************************************************/ - -static void Gam_PutButtonToAddNewQuestions (struct Gam_Games *Games) - { - extern const char *Txt_Add_questions; - - Frm_BeginForm (ActAddOneGamQst); - Gam_PutPars (Games); - - Btn_PutConfirmButton (Txt_Add_questions); - - Frm_EndForm (); - } - /*****************************************************************************/ /******************** Add selected test questions to game ********************/ /*****************************************************************************/ @@ -1844,6 +1823,9 @@ void Gam_AddQstsToGame (void) /***** Free space for selected question codes *****/ Gam_FreeListsSelectedQuestions (&Games); + /***** Get game data again (to update number of questions) *****/ + Gam_GetGameDataByCod (&Games.Game); + /***** Show current game *****/ Gam_ShowOnlyOneGame (&Games, true, // List game questions diff --git a/swad_text_action.c b/swad_text_action.c index b349c6369..c306e0bd1 100644 --- a/swad_text_action.c +++ b/swad_text_action.c @@ -12231,71 +12231,71 @@ const char *Txt_Actions[ActLst_NUM_ACTIONS] = , [ActReqAddQstExaSet] = #if L==1 // ca - "Request add question to exam" // Necessita traducció + "Request add questions to exam" // Necessita traducció #elif L==2 // de - "Request add question to exam" // Need Übersetzung + "Request add questions to exam" // Need Übersetzung #elif L==3 // en - "Request add question to exam" + "Request add questions to exam" #elif L==4 // es - "Solicitar añadir pregunta a examen" + "Solicitar añadir preguntas a examen" #elif L==5 // fr - "Request add question to exam" // Besoin de traduction + "Request add questions to exam" // Besoin de traduction #elif L==6 // gn - "Solicitar añadir pregunta a examen" // Okoteve traducción + "Solicitar añadir preguntas a examen" // Okoteve traducción #elif L==7 // it - "Request add question to exam" // Bisogno di traduzione + "Request add questions to exam" // Bisogno di traduzione #elif L==8 // pl - "Request add question to exam" // Potrzebujesz tlumaczenie + "Request add questions to exam" // Potrzebujesz tlumaczenie #elif L==9 // pt - "Request add question to exam" // Precisa de tradução + "Request add questions to exam" // Precisa de tradução #elif L==10 // tr - "Request add question to exam" // Çeviri lazim! + "Request add questions to exam" // Çeviri lazim! #endif , [ActLstTstQstForSet] = #if L==1 // ca - "List test questions for exam" // Necessita traducció + "List questions for exam" // Necessita traducció #elif L==2 // de - "List test questions for exam" // Need Übersetzung + "List questions for exam" // Need Übersetzung #elif L==3 // en - "List test questions for exam" + "List questions for exam" #elif L==4 // es - "Listar preguntas de test para examen" + "Listar preguntas para examen" #elif L==5 // fr - "List test questions for exam" // Besoin de traduction + "List questions for exam" // Besoin de traduction #elif L==6 // gn - "Listar preguntas de test para examen" // Okoteve traducción + "Listar preguntas para examen" // Okoteve traducción #elif L==7 // it - "List test questions for exam" // Bisogno di traduzione + "List questions for exam" // Bisogno di traduzione #elif L==8 // pl - "List test questions for exam" // Potrzebujesz tlumaczenie + "List questions for exam" // Potrzebujesz tlumaczenie #elif L==9 // pt - "List test questions for exam" // Precisa de tradução + "List questions for exam" // Precisa de tradução #elif L==10 // tr - "List test questions for exam" // Çeviri lazim! + "List questions for exam" // Çeviri lazim! #endif , [ActAddQstToExa] = #if L==1 // ca - "Add question to exam" // Necessita traducció + "Add questions to exam" // Necessita traducció #elif L==2 // de - "Add question to exam" // Need Übersetzung + "Add questions to exam" // Need Übersetzung #elif L==3 // en - "Add question to exam" + "Add questions to exam" #elif L==4 // es - "Añadir pregunta a examen" + "Añadir preguntas a examen" #elif L==5 // fr - "Add question to exam" // Besoin de traduction + "Add questions to exam" // Besoin de traduction #elif L==6 // gn - "Añadir pregunta a examen" // Okoteve traducción + "Añadir preguntas a examen" // Okoteve traducción #elif L==7 // it - "Add question to exam" // Bisogno di traduzione + "Add questions to exam" // Bisogno di traduzione #elif L==8 // pl - "Add question to exam" // Potrzebujesz tlumaczenie + "Add questions to exam" // Potrzebujesz tlumaczenie #elif L==9 // pt - "Add question to exam" // Precisa de tradução + "Add questions to exam" // Precisa de tradução #elif L==10 // tr - "Add question to exam" // Çeviri lazim! + "Add questions to exam" // Çeviri lazim! #endif , [ActReqRemSetQst] =