From de366576272775ce92b3f093614cfe0adb5864bb Mon Sep 17 00:00:00 2001 From: acanas Date: Tue, 9 May 2023 22:18:19 +0200 Subject: [PATCH] Version 22.107.32:May 09, 2023 Changes in edition of rooms. --- swad_changelog.h | 5 +- swad_room.c | 149 ++++++++++++++++++++++++--------------------- swad_text.c | 23 ------- swad_text_action.c | 20 +++--- 4 files changed, 91 insertions(+), 106 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index 9f4f81fa..890518ce 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -629,11 +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.31 (2023-05-09)" +#define Log_PLATFORM_VERSION "SWAD 22.107.32 (2023-05-09)" #define CSS_FILE "swad22.107.17.css" #define JS_FILE "swad22.49.js" /* - Version 22.107.31:May 09, 2023 Changes in edition of record fields. (? 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) Version 22.107.29:May 09, 2023 Changes in edition of places. (337713 lines) Version 22.107.28:May 09, 2023 Changes in edition of notices. (337707 lines) diff --git a/swad_room.c b/swad_room.c index b8e65c60..82779c79 100644 --- a/swad_room.c +++ b/swad_room.c @@ -657,7 +657,7 @@ static void Roo_ListRoomsForEdition (const struct Bld_Buildings *Buildings, HTM_TD_End (); /* Room code */ - HTM_TD_Begin ("class=\"RT DAT_%s\"",The_GetSuffix ()); + HTM_TD_Begin ("class=\"CODE DAT_%s\"",The_GetSuffix ()); HTM_ARTICLE_Begin (Anchor); HTM_Long (Room->RooCod); HTM_ARTICLE_End (); @@ -1210,94 +1210,101 @@ void Roo_ContEditAfterChgRoom (void) static void Roo_PutFormToCreateRoom (const struct Bld_Buildings *Buildings) { - extern const char *Txt_Create_room; + extern const char *Txt_Actions[ActLst_NUM_ACTIONS]; + extern const char *Txt_Create; char StrCapacity[Cns_MAX_DECIMAL_DIGITS_UINT + 1]; char MACstr[MAC_LENGTH_MAC_ADDRESS + 1]; // MAC address in xx:xx:xx:xx:xx:xx format - /***** Begin form *****/ - Frm_BeginForm (ActNewRoo); + /***** Begin fieldset *****/ + HTM_FIELDSET_Begin (NULL); + HTM_LEGEND (Txt_Actions[ActNewRoo]); - /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,NULL, - NULL,NULL, - NULL,Box_NOT_CLOSABLE,2); + /***** Begin form *****/ + Frm_BeginForm (ActNewRoo); - /***** Write heading *****/ - Roo_PutHeadRooms (); + /***** Begin table *****/ + HTM_TABLE_BeginWidePadding (2); - HTM_TR_Begin (NULL); + /***** Write heading *****/ + Roo_PutHeadRooms (); - /***** Column to remove room, disabled here *****/ - HTM_TD_Begin ("class=\"BM\""); - HTM_TD_End (); + HTM_TR_Begin (NULL); - /***** Room code *****/ - HTM_TD_Begin ("class=\"CODE\""); - HTM_TD_End (); + /***** Column to remove room, disabled here *****/ + HTM_TD_Begin ("class=\"BM\""); + HTM_TD_End (); - /***** Building *****/ - HTM_TD_Begin ("class=\"LM\""); - Roo_PutSelectorBuilding (Roo_EditingRoom->BldCod,Buildings, - HTM_DONT_SUBMIT_ON_CHANGE); - HTM_TD_End (); + /***** Room code *****/ + HTM_TD_Begin ("class=\"CODE\""); + HTM_TD_End (); - /***** Floor *****/ - HTM_TD_Begin ("class=\"LM\""); - HTM_INPUT_LONG ("Floor",(long) INT_MIN,(long) INT_MAX,(long) Roo_EditingRoom->Floor, - HTM_DONT_SUBMIT_ON_CHANGE,false, - "class=\"INPUT_LONG INPUT_%s\"", - The_GetSuffix ()); - HTM_TD_End (); + /***** Building *****/ + HTM_TD_Begin ("class=\"LM\""); + Roo_PutSelectorBuilding (Roo_EditingRoom->BldCod,Buildings, + HTM_DONT_SUBMIT_ON_CHANGE); + HTM_TD_End (); - /***** Room type *****/ - HTM_TD_Begin ("class=\"LM\""); - Roo_PutSelectorType (Roo_EditingRoom->Type, - HTM_DONT_SUBMIT_ON_CHANGE); - HTM_TD_End (); + /***** Floor *****/ + HTM_TD_Begin ("class=\"LM\""); + HTM_INPUT_LONG ("Floor",(long) INT_MIN,(long) INT_MAX,(long) Roo_EditingRoom->Floor, + HTM_DONT_SUBMIT_ON_CHANGE,false, + "class=\"INPUT_LONG INPUT_%s\"", + The_GetSuffix ()); + HTM_TD_End (); - /***** Room short name *****/ - HTM_TD_Begin ("class=\"LM\""); - HTM_INPUT_TEXT ("ShortName",Roo_MAX_CHARS_SHRT_NAME,Roo_EditingRoom->ShrtName, - HTM_DONT_SUBMIT_ON_CHANGE, - "size=\"10\" class=\"INPUT_SHORT_NAME INPUT_%s\"" - " required=\"required\"", - The_GetSuffix ()); - HTM_TD_End (); + /***** Room type *****/ + HTM_TD_Begin ("class=\"LM\""); + Roo_PutSelectorType (Roo_EditingRoom->Type, + HTM_DONT_SUBMIT_ON_CHANGE); + HTM_TD_End (); - /***** Room full name *****/ - HTM_TD_Begin ("class=\"LM\""); - HTM_INPUT_TEXT ("FullName",Roo_MAX_CHARS_FULL_NAME,Roo_EditingRoom->FullName, - HTM_DONT_SUBMIT_ON_CHANGE, - "size=\"20\" class=\"INPUT_FULL_NAME INPUT_%s\"" - " required=\"required\"", - The_GetSuffix ()); - HTM_TD_End (); + /***** Room short name *****/ + HTM_TD_Begin ("class=\"LM\""); + HTM_INPUT_TEXT ("ShortName",Roo_MAX_CHARS_SHRT_NAME,Roo_EditingRoom->ShrtName, + HTM_DONT_SUBMIT_ON_CHANGE, + "size=\"10\" class=\"INPUT_SHORT_NAME INPUT_%s\"" + " required=\"required\"", + The_GetSuffix ()); + HTM_TD_End (); - /***** Seating capacity *****/ - HTM_TD_Begin ("class=\"LM\""); - Roo_WriteCapacity (StrCapacity,Roo_EditingRoom->Capacity); - HTM_INPUT_TEXT ("Capacity",Cns_MAX_DECIMAL_DIGITS_UINT,StrCapacity, - HTM_DONT_SUBMIT_ON_CHANGE, - "size=\"3\" class=\"INPUT_%s\"", - The_GetSuffix ()); - HTM_TD_End (); + /***** Room full name *****/ + HTM_TD_Begin ("class=\"LM\""); + HTM_INPUT_TEXT ("FullName",Roo_MAX_CHARS_FULL_NAME,Roo_EditingRoom->FullName, + HTM_DONT_SUBMIT_ON_CHANGE, + "size=\"20\" class=\"INPUT_FULL_NAME INPUT_%s\"" + " required=\"required\"", + The_GetSuffix ()); + HTM_TD_End (); - /***** MAC address *****/ - HTM_TD_Begin ("class=\"LM\""); - MAC_MACnumToMACstr (Roo_EditingRoom->MACnum,MACstr); - HTM_INPUT_TEXT ("MAC",MAC_LENGTH_MAC_ADDRESS,MACstr, - HTM_DONT_SUBMIT_ON_CHANGE, - "size=\"8\" class=\"INPUT_%s\"", - The_GetSuffix ()); - HTM_TD_End (); + /***** Seating capacity *****/ + HTM_TD_Begin ("class=\"LM\""); + Roo_WriteCapacity (StrCapacity,Roo_EditingRoom->Capacity); + HTM_INPUT_TEXT ("Capacity",Cns_MAX_DECIMAL_DIGITS_UINT,StrCapacity, + HTM_DONT_SUBMIT_ON_CHANGE, + "size=\"3\" class=\"INPUT_%s\"", + The_GetSuffix ()); + HTM_TD_End (); - HTM_TR_End (); + /***** MAC address *****/ + HTM_TD_Begin ("class=\"LM\""); + MAC_MACnumToMACstr (Roo_EditingRoom->MACnum,MACstr); + HTM_INPUT_TEXT ("MAC",MAC_LENGTH_MAC_ADDRESS,MACstr, + HTM_DONT_SUBMIT_ON_CHANGE, + "size=\"8\" class=\"INPUT_%s\"", + The_GetSuffix ()); + HTM_TD_End (); - /***** End table, send button and end box *****/ - Box_BoxTableWithButtonEnd (Btn_CREATE_BUTTON,Txt_Create_room); + 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 5644de9b..4d89ce88 100644 --- a/swad_text.c +++ b/swad_text.c @@ -6848,29 +6848,6 @@ const char *Txt_Create_question = "Create question"; // Çeviri lazim! #endif -const char *Txt_Create_room = -#if L==1 // ca - "Crear sala"; -#elif L==2 // de - "Raum eingeben"; -#elif L==3 // en - "Create room"; -#elif L==4 // es - "Crear sala"; -#elif L==5 // fr - "Créer salle"; -#elif L==6 // gn - "Crear sala"; // Okoteve traducción -#elif L==7 // it - "Crea aula"; -#elif L==8 // pl - "Utwórz klasa"; -#elif L==9 // pt - "Criar sala"; -#elif L==10 // tr - "Create room"; // Çeviri lazim! -#endif - const char *Txt_Create_type_of_degree = #if L==1 // ca "Crear tipus de titulació"; diff --git a/swad_text_action.c b/swad_text_action.c index dadeb6ee..b7e28855 100644 --- a/swad_text_action.c +++ b/swad_text_action.c @@ -4779,25 +4779,25 @@ const char *Txt_Actions[ActLst_NUM_ACTIONS] = , [ActNewRoo] = #if L==1 // ca - "Request creation of room" // Necessita traducció + "Crear sala" #elif L==2 // de - "Request creation of room" // Need Übersetzung + "Raum eingeben" #elif L==3 // en - "Request creation of room" + "Create room" #elif L==4 // es - "Solicitar creación de sala" + "Crear sala" #elif L==5 // fr - "Request creation of room" // Besoin de traduction + "Créer salle" #elif L==6 // gn - "Solicitar creación de sala" // Okoteve traducción + "Crear sala" // Okoteve traducción #elif L==7 // it - "Request creation of room" // Bisogno di traduzione + "Crea aula" #elif L==8 // pl - "Request creation of room" // Potrzebujesz tlumaczenie + "Utwórz klasa" #elif L==9 // pt - "Request creation of room" // Precisa de tradução + "Criar sala" #elif L==10 // tr - "Request creation of room" // Çeviri lazim! + "Create room" // Çeviri lazim! #endif , [ActRemRoo] =