From 8e7541d531a8d4010053bd688a11035362129578 Mon Sep 17 00:00:00 2001 From: acanas Date: Tue, 9 May 2023 22:47:22 +0200 Subject: [PATCH] Version 22.107.33:May 09, 2023 Changes in edition of degree types. --- swad_changelog.h | 3 +- swad_degree_type.c | 90 ++++++++++++++++++++++------------------------ swad_text.c | 46 ------------------------ swad_text_action.c | 12 +++---- 4 files changed, 51 insertions(+), 100 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index 890518ce..27087fce 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.32 (2023-05-09)" +#define Log_PLATFORM_VERSION "SWAD 22.107.33 (2023-05-09)" #define CSS_FILE "swad22.107.17.css" #define JS_FILE "swad22.49.js" /* + Version 22.107.33:May 09, 2023 Changes in edition of degree types. (337591 lines) Version 22.107.32:May 09, 2023 Changes in edition of rooms. (337639 lines) Version 22.107.31:May 09, 2023 Changes in edition of record fields. (337655 lines) Version 22.107.30:May 09, 2023 Changes in edition of plugins. (337694 lines) diff --git a/swad_degree_type.c b/swad_degree_type.c index b55d1d2a..a44109fa 100644 --- a/swad_degree_type.c +++ b/swad_degree_type.c @@ -199,8 +199,6 @@ static void DegTyp_ListDegreeTypes (const struct DegTyp_DegTypes *DegTypes, extern const char *Hlp_ANALYTICS_Figures_types_of_degree; extern const char *Txt_Types_of_degree; extern const char *Txt_No_types_of_degree; - extern const char *Txt_Create_another_type_of_degree; - extern const char *Txt_Create_type_of_degree; /***** Begin box *****/ switch (NextAction) @@ -236,15 +234,6 @@ static void DegTyp_ListDegreeTypes (const struct DegTyp_DegTypes *DegTypes, else // No degree types created Ale_ShowAlert (Ale_INFO,Txt_No_types_of_degree); - /***** Button to create degree type *****/ - if (DegTyp_CheckIfICanCreateDegreeTypes ()) - { - Frm_BeginForm (ActEdiDegTyp); - Btn_PutConfirmButton (DegTypes->Num ? Txt_Create_another_type_of_degree : - Txt_Create_type_of_degree); - Frm_EndForm (); - } - /***** End box *****/ Box_BoxEnd (); } @@ -423,7 +412,7 @@ static void DegTyp_ListDegreeTypesForEdition (const struct DegTyp_DegTypes *DegT HTM_TD_End (); /* Degree type code */ - HTM_TD_Begin ("class=\"DAT_%s CODE\"",The_GetSuffix ()); + HTM_TD_Begin ("class=\"CODE DAT_%s\"",The_GetSuffix ()); HTM_Long (DegTypes->Lst[NumDegTyp].DegTypCod); HTM_TD_End (); @@ -468,52 +457,59 @@ bool DegTyp_CheckIfICanCreateDegreeTypes (void) static void DegTyp_PutFormToCreateDegreeType (void) { - extern const char *Txt_Create_type_of_degree; + extern const char *Txt_Actions[ActLst_NUM_ACTIONS]; + extern const char *Txt_Create; - /***** Begin form *****/ - Frm_BeginForm (ActNewDegTyp); + /***** Begin fieldset *****/ + HTM_FIELDSET_Begin (NULL); + HTM_LEGEND (Txt_Actions[ActNewDegTyp]); - /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,NULL, - NULL,NULL, - NULL,Box_NOT_CLOSABLE,2); + /***** Begin form *****/ + Frm_BeginForm (ActNewDegTyp); - /***** Write heading *****/ - DegTyp_PutHeadDegreeTypesForEdition (); + /***** Begin table *****/ + HTM_TABLE_BeginWidePadding (2); - /***** Begin table row *****/ - HTM_TR_Begin (NULL); + /***** Write heading *****/ + DegTyp_PutHeadDegreeTypesForEdition (); - /***** Column to remove degree type, disabled here *****/ - HTM_TD_Begin ("class=\"BM\""); - HTM_TD_End (); + /***** Begin table row *****/ + HTM_TR_Begin (NULL); - /***** Degree type code *****/ - HTM_TD_Begin ("class=\"CODE\""); - HTM_TD_End (); + /***** Column to remove degree type, disabled here *****/ + HTM_TD_Begin ("class=\"BM\""); + HTM_TD_End (); - /***** Degree type name *****/ - HTM_TD_Begin ("class=\"LM\""); - HTM_INPUT_TEXT ("DegTypName",DegTyp_MAX_CHARS_DEGREE_TYPE_NAME,DegTyp_EditingDegTyp->DegTypName, - HTM_DONT_SUBMIT_ON_CHANGE, - "size=\"25\" class=\"INPUT_%s\"" - " required=\"required\"", - The_GetSuffix ()); - HTM_TD_End (); + /***** Degree type code *****/ + HTM_TD_Begin ("class=\"CODE\""); + HTM_TD_End (); - /***** Number of degrees of this degree type ****/ - HTM_TD_Begin ("class=\"RM DAT_%s\"",The_GetSuffix ()); - HTM_Unsigned (0); - HTM_TD_End (); + /***** Degree type name *****/ + HTM_TD_Begin ("class=\"LM\""); + HTM_INPUT_TEXT ("DegTypName",DegTyp_MAX_CHARS_DEGREE_TYPE_NAME,DegTyp_EditingDegTyp->DegTypName, + HTM_DONT_SUBMIT_ON_CHANGE, + "size=\"25\" class=\"INPUT_%s\"" + " required=\"required\"", + The_GetSuffix ()); + HTM_TD_End (); - /***** End table row *****/ - HTM_TR_End (); + /***** Number of degrees of this degree type ****/ + HTM_TD_Begin ("class=\"RM DAT_%s\"",The_GetSuffix ()); + HTM_Unsigned (0); + HTM_TD_End (); - /***** End table, send button and end box *****/ - Box_BoxTableWithButtonEnd (Btn_CREATE_BUTTON,Txt_Create_type_of_degree); + /***** End table row *****/ + HTM_TR_End (); - /***** End form *****/ - Frm_EndForm (); + /***** End table and send button *****/ + HTM_TABLE_End (); + Btn_PutButton (Btn_CREATE_BUTTON,Txt_Create); + + /***** End form *****/ + Frm_EndForm (); + + /***** End fieldset *****/ + HTM_FIELDSET_End (); } /*****************************************************************************/ diff --git a/swad_text.c b/swad_text.c index 4d89ce88..75ee2d56 100644 --- a/swad_text.c +++ b/swad_text.c @@ -6595,29 +6595,6 @@ const char *Txt_Create_account = "Hesabı oluştur"; #endif -const char *Txt_Create_another_type_of_degree = -#if L==1 // ca - "Crear un altre tipus de titulació"; -#elif L==2 // de - "Erstellen Sie ein anderes Abschlussart"; -#elif L==3 // en - "Create another type of degree"; -#elif L==4 // es - "Crear otro tipo de titulación"; -#elif L==5 // fr - "Créer un autre type d'étude"; -#elif L==6 // gn - "Crear otro tipo de titulación"; // Okoteve traducción -#elif L==7 // it - "Crea un altro tipo di laurea"; -#elif L==8 // pl - "Utwórz inny typu stopnia"; -#elif L==9 // pt - "Criar outro tipo de grau"; -#elif L==10 // tr - "Create another type of degree"; // Çeviri lazim! -#endif - const char *Txt_Create_email_domain = #if L==1 // ca "Crear domini de correu"; @@ -6848,29 +6825,6 @@ const char *Txt_Create_question = "Create question"; // Çeviri lazim! #endif -const char *Txt_Create_type_of_degree = -#if L==1 // ca - "Crear tipus de titulació"; -#elif L==2 // de - "Abschlussart definieren"; -#elif L==3 // en - "Create type of degree"; -#elif L==4 // es - "Crear tipo de titulación"; -#elif L==5 // fr - "Créer type d'étude"; -#elif L==6 // gn - "Crear tipo de titulación"; // Okoteve traducción -#elif L==7 // it - "Crea tipo di laurea"; -#elif L==8 // pl - "Utwórz typu stopnia"; -#elif L==9 // pt - "Criar tipo de grau"; -#elif L==10 // tr - "Create type of degree"; // Çeviri lazim! -#endif - const char *Txt_Create_type_of_group = #if L==1 // ca "Crear tipus de grup"; diff --git a/swad_text_action.c b/swad_text_action.c index b7e28855..f89fb857 100644 --- a/swad_text_action.c +++ b/swad_text_action.c @@ -4342,23 +4342,23 @@ const char *Txt_Actions[ActLst_NUM_ACTIONS] = , [ActNewDegTyp] = #if L==1 // ca - "Create type of degree" // Necessita traducció + "Crear tipus de titulació" #elif L==2 // de - "Create type of degree" // Need Übersetzung + "Abschlussart definieren" #elif L==3 // en "Create type of degree" #elif L==4 // es "Crear tipo de titulación" #elif L==5 // fr - "Create type of degree" // Besoin de traduction + "Créer type d'étude" #elif L==6 // gn "Crear tipo de titulación" // Okoteve traducción #elif L==7 // it - "Create type of degree" // Bisogno di traduzione + "Crea tipo di laurea" #elif L==8 // pl - "Create type of degree" // Potrzebujesz tlumaczenie + "Utwórz typu stopnia" #elif L==9 // pt - "Create type of degree" // Precisa de tradução + "Criar tipo de grau" #elif L==10 // tr "Create type of degree" // Çeviri lazim! #endif