From d084861e52cebd808fa0742d9f76210012bbde49 Mon Sep 17 00:00:00 2001 From: acanas Date: Sun, 7 May 2023 23:46:53 +0200 Subject: [PATCH] Version 22.107.13:May 07, 2023 Changes in edition of exam sessions. --- swad_changelog.h | 4 +- swad_exam_session.c | 93 ++++++++++++++++++++++++--------------------- swad_text.c | 75 +++++++++++++++++++++++------------- swad_text_action.c | 36 +++++++++--------- 4 files changed, 119 insertions(+), 89 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index b61f1d8cf..8e8928856 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -629,10 +629,12 @@ 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.11 (2023-05-07)" +#define Log_PLATFORM_VERSION "SWAD 22.107.13 (2023-05-07)" #define CSS_FILE "swad22.107.css" #define JS_FILE "swad22.49.js" /* + Version 22.107.13:May 07, 2023 Changes in edition of exam sessions. (337957 lines) + Version 22.107.12:May 07, 2023 Changes in edition of rubrics. (337930 lines) Version 22.107.11:May 07, 2023 Changes in edition of surveys. (337952 lines) Version 22.107.10:May 07, 2023 Changes in edition of projects. (337973 lines) Version 22.107.9: May 07, 2023 Changes in edition of rubric criterions. (338015 lines) diff --git a/swad_exam_session.c b/swad_exam_session.c index 7fb0401ca..eba28e1c1 100644 --- a/swad_exam_session.c +++ b/swad_exam_session.c @@ -959,10 +959,9 @@ void ExaSes_GetAndCheckPars (struct Exa_Exams *Exams, static void ExaSes_PutFormSession (const struct ExaSes_Session *Session) { - extern const char *Hlp_ASSESSMENT_Exams_sessions; - extern const char *Txt_Session; + extern const char *Txt_Actions[ActLst_NUM_ACTIONS]; extern const char *Txt_Title; - extern const char *Txt_Create_session; + extern const char *Txt_Create; extern const char *Txt_Save_changes; static const Dat_SetHMS SetHMS[Dat_NUM_START_END_TIME] = { @@ -970,56 +969,62 @@ static void ExaSes_PutFormSession (const struct ExaSes_Session *Session) [Dat_END_TIME] = Dat_HMS_DO_NOT_SET }; bool ItsANewSession = Session->SesCod <= 0; + Act_Action_t NextAction = ItsANewSession ? ActNewExaSes : + ActChgExaSes; /***** Begin section for a new exam session *****/ HTM_SECTION_Begin (ExaSes_NEW_SESSION_SECTION_ID); - /***** Begin form *****/ - Frm_BeginForm (ItsANewSession ? ActNewExaSes : // New session - ActChgExaSes); // Existing session - ParCod_PutPar (ParCod_Exa,Session->ExaCod); - if (!ItsANewSession) // Existing session - ParCod_PutPar (ParCod_Ses,Session->SesCod); + /***** Begin fieldset *****/ + HTM_FIELDSET_Begin (NULL); + HTM_LEGEND (Txt_Actions[NextAction]); - /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,ItsANewSession ? Txt_Session : - Session->Title, - NULL,NULL, - Hlp_ASSESSMENT_Exams_sessions,Box_NOT_CLOSABLE,2); + /***** Begin form *****/ + Frm_BeginForm (NextAction); + ParCod_PutPar (ParCod_Exa,Session->ExaCod); + if (!ItsANewSession) // Existing session + ParCod_PutPar (ParCod_Ses,Session->SesCod); - /***** Session title *****/ - HTM_TR_Begin (NULL); + /***** Begin table *****/ + HTM_TABLE_BeginWidePadding (2); - /* Label */ - Frm_LabelColumn ("RT","Title",Txt_Title); + /***** Session title *****/ + HTM_TR_Begin (NULL); - /* Data */ - HTM_TD_Begin ("class=\"LT\""); - HTM_INPUT_TEXT ("Title",ExaSes_MAX_CHARS_TITLE,Session->Title, - HTM_DONT_SUBMIT_ON_CHANGE, - "id=\"Title\" size=\"45\" class=\"INPUT_%s\"" - " required=\"required\"", - The_GetSuffix ()); - HTM_TD_End (); + /* Label */ + Frm_LabelColumn ("RT","Title",Txt_Title); - HTM_TR_End (); + /* Data */ + HTM_TD_Begin ("class=\"LT\""); + HTM_INPUT_TEXT ("Title",ExaSes_MAX_CHARS_TITLE,Session->Title, + HTM_DONT_SUBMIT_ON_CHANGE, + "id=\"Title\" size=\"45\" class=\"INPUT_%s\"" + " required=\"required\"", + The_GetSuffix ()); + HTM_TD_End (); - /***** Start and end dates *****/ - Dat_PutFormStartEndClientLocalDateTimes (Session->TimeUTC, - Dat_FORM_SECONDS_OFF, - SetHMS); + HTM_TR_End (); - /***** Groups *****/ - ExaSes_ShowLstGrpsToCreateSession (Session->SesCod); + /***** Start and end dates *****/ + Dat_PutFormStartEndClientLocalDateTimes (Session->TimeUTC, + Dat_FORM_SECONDS_OFF, + SetHMS); - /***** End table, send button and end box *****/ - if (ItsANewSession) - Box_BoxTableWithButtonEnd (Btn_CREATE_BUTTON,Txt_Create_session); - else - Box_BoxTableWithButtonEnd (Btn_CONFIRM_BUTTON,Txt_Save_changes); + /***** Groups *****/ + ExaSes_ShowLstGrpsToCreateSession (Session->SesCod); - /***** End form *****/ - Frm_EndForm (); + /***** End table and send button *****/ + HTM_TABLE_End (); + if (ItsANewSession) + Btn_PutButton (Btn_CREATE_BUTTON,Txt_Create); + else + Btn_PutButton (Btn_CONFIRM_BUTTON,Txt_Save_changes); + + /***** End form *****/ + Frm_EndForm (); + + /***** End fieldset *****/ + HTM_FIELDSET_End (); /***** End section for a new exam session *****/ HTM_SECTION_End (); @@ -1139,8 +1144,8 @@ void ExaSes_ReqCreatOrEditSes (void) void ExaSes_ReceiveFormSession (void) { - extern const char *Txt_Created_new_event_X; - extern const char *Txt_The_event_has_been_modified; + extern const char *Txt_Created_new_session_X; + extern const char *Txt_The_session_has_been_modified; struct Exa_Exams Exams; struct ExaSes_Session Session; bool ItsANewSession; @@ -1203,10 +1208,10 @@ void ExaSes_ReceiveFormSession (void) /***** Write success message *****/ if (ItsANewSession) - Ale_ShowAlert (Ale_SUCCESS,Txt_Created_new_event_X, + Ale_ShowAlert (Ale_SUCCESS,Txt_Created_new_session_X, Session.Title); else - Ale_ShowAlert (Ale_SUCCESS,Txt_The_event_has_been_modified); + Ale_ShowAlert (Ale_SUCCESS,Txt_The_session_has_been_modified); /***** Get exam data again to update it after changes in session *****/ Exa_GetExamDataByCod (&Exams.Exam); diff --git a/swad_text.c b/swad_text.c index 9cdc1de67..4c5035952 100644 --- a/swad_text.c +++ b/swad_text.c @@ -7262,29 +7262,6 @@ const char *Txt_Create_room = "Create room"; // Çeviri lazim! #endif -const char *Txt_Create_session = -#if L==1 // ca - "Crear sessió"; -#elif L==2 // de - "Sitzung erstellen"; -#elif L==3 // en - "Create session"; -#elif L==4 // es - "Crear sesión"; -#elif L==5 // fr - "Créer session"; -#elif L==6 // gn - "Crear sesión"; // Okoteve traducción -#elif L==7 // it - "Crea sessione"; -#elif L==8 // pl - "Utwórz sesji"; -#elif L==9 // pt - "Criar sessão"; -#elif L==10 // tr - "Create session"; // Çeviri lazim! -#endif - const char *Txt_Create_type_of_degree = #if L==1 // ca "Crear tipus de titulació"; @@ -7632,7 +7609,7 @@ const char *Txt_Created_new_event_X = // Warning: it is very important to includ const char *Txt_Created_new_exam_X = // Warning: it is very important to include %s in the following sentences #if L==1 // ca - "reat nou examen %s."; + "Creat nou examen %s."; #elif L==2 // de "Neues Prüfung %s eingegeben."; #elif L==3 // en @@ -7906,6 +7883,29 @@ const char *Txt_Created_new_rubric_X = // Warning: it is very important to inclu "Yeni değerlendirme listesi %s oluşturuldu."; #endif +const char *Txt_Created_new_session_X = // Warning: it is very important to include %s in the following sentences +#if L==1 // ca + "Creat nova sessió %s."; +#elif L==2 // de + "Neue Sitzung %s eingegeben."; +#elif L==3 // en + "Created new session %s."; +#elif L==4 // es + "Creada nueva sesión %s."; +#elif L==5 // fr + "Créée nouvelle session %s."; +#elif L==6 // gn + "Ojejapo sesión pyahu %s."; +#elif L==7 // it + "Creata nuova sessione %s."; +#elif L==8 // pl + "Utworzono nową sesję %s."; +#elif L==9 // pt + "Criada nova sessão %s."; +#elif L==10 // tr + "Yeni oturum %s oluşturuldu."; +#endif + const char *Txt_Created_new_set_of_questions_X = // Warning: it is very important to include %s in the following sentences #if L==1 // ca "Creat nou conjunt de preguntes %s."; @@ -51867,7 +51867,7 @@ const char *Txt_The_rubric_has_been_modified = #elif L==5 // fr "La rubrique a été modifiée."; #elif L==6 // gn - "La rúbrica ha sido modificada."; // Okoteve traducción + "Oñemoambue pe rúbrica."; #elif L==7 // it "La rubrica è stata modificata."; #elif L==8 // pl @@ -51934,6 +51934,29 @@ const char *Txt_The_search_text_must_be_longer = "The search text must be longer."; // Çeviri lazim! #endif +const char *Txt_The_session_has_been_modified = +#if L==1 // ca + "La sessió ha estat modificada."; +#elif L==2 // de + "Die Sitzung wurde geändert."; +#elif L==3 // en + "The session has been modified."; +#elif L==4 // es + "La sesión ha sido modificada."; +#elif L==5 // fr + "La session a été modifiée."; +#elif L==6 // gn + "Oñemoambue pe sesión."; +#elif L==7 // it + "La sessione è stata modificata."; +#elif L==8 // pl + "Sesja została zmieniona."; +#elif L==9 // pt + "A sessão foi modificada."; +#elif L==10 // tr + "Oturum değiştirildi."; +#endif + const char *Txt_The_session_has_expired = #if L==1 // ca "La sessió ha expirat."; @@ -51954,7 +51977,7 @@ const char *Txt_The_session_has_expired = #elif L==9 // pt "A sessão expirou."; #elif L==10 // tr - "The session has expired."; // Çeviri lazim! + "Oturumun süresi doldu."; // Çeviri lazim! #endif /* const char *Txt_The_set_of_questions_has_been_modified = diff --git a/swad_text_action.c b/swad_text_action.c index c84f8a7fa..6c8f00e25 100644 --- a/swad_text_action.c +++ b/swad_text_action.c @@ -12438,48 +12438,48 @@ const char *Txt_Actions[ActLst_NUM_ACTIONS] = , [ActNewExaSes] = #if L==1 // ca - "Create new exam session" // Necessita traducció + "Crear sessió d'examen" #elif L==2 // de - "Create new exam session" // Need Übersetzung + "Prüfungssitzung erstellen" #elif L==3 // en - "Create new exam session" + "Create exam session" #elif L==4 // es - "Crear nueva sesión de examen" + "Crear sesión de examen" #elif L==5 // fr - "Create new exam session" // Besoin de traduction + "Créer session d'examen" #elif L==6 // gn - "Crear nueva sesión de examen" // Okoteve traducción + "Omoheñói sesión de examen" #elif L==7 // it - "Create new exam session" // Bisogno di traduzione + "Crea sessione d'esame" #elif L==8 // pl - "Create new exam session" // Potrzebujesz tlumaczenie + "Utwórz sesję egzaminacyjną" #elif L==9 // pt - "Create new exam session" // Precisa de tradução + "Criar sessão de exame" #elif L==10 // tr - "Create new exam session" // Çeviri lazim! + "Sınav oturumu oluştur" #endif , [ActChgExaSes] = #if L==1 // ca - "Change exam session" // Necessita traducció + "Canviar sessió d'examen" #elif L==2 // de - "Change exam session" // Need Übersetzung + "Prüfungssitzung ändern" #elif L==3 // en "Change exam session" #elif L==4 // es "Cambiar sesión de examen" #elif L==5 // fr - "Change exam session" // Besoin de traduction + "Modifier session d'examen" #elif L==6 // gn - "Cambiar sesión de examen" // Okoteve traducción + "Omoambue sesión de examen" #elif L==7 // it - "Change exam session" // Bisogno di traduzione + "Cambia sessione d'esame" #elif L==8 // pl - "Change exam session" // Potrzebujesz tlumaczenie + "Zmienić sesję egzaminacyjną" #elif L==9 // pt - "Change exam session" // Precisa de tradução + "Alterar sessão de exame" #elif L==10 // tr - "Change exam session" // Çeviri lazim! + "Sınav oturumu değiştir" #endif , [ActReqRemExaSes] =