Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version 22.107.32:May 09, 2023 Changes in edition of rooms.

This commit is contained in:
acanas 2023-05-09 22:18:19 +02:00
parent 583f12b094
commit de36657627
4 changed files with 91 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
swad_changelog.h
View File

@ -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. 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 CSS_FILE "swad22.107.17.css"
#define JS_FILE "swad22.49.js" #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.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.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) Version 22.107.28:May 09, 2023 Changes in edition of notices. (337707 lines)

149
swad_room.c
View File

@ -657,7 +657,7 @@ static void Roo_ListRoomsForEdition (const struct Bld_Buildings *Buildings,
HTM_TD_End (); HTM_TD_End ();
/* Room code */ /* 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_ARTICLE_Begin (Anchor);
HTM_Long (Room->RooCod); HTM_Long (Room->RooCod);
HTM_ARTICLE_End (); HTM_ARTICLE_End ();
@ -1210,94 +1210,101 @@ void Roo_ContEditAfterChgRoom (void)
static void Roo_PutFormToCreateRoom (const struct Bld_Buildings *Buildings) 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 StrCapacity[Cns_MAX_DECIMAL_DIGITS_UINT + 1];
char MACstr[MAC_LENGTH_MAC_ADDRESS + 1]; // MAC address in xx:xx:xx:xx:xx:xx format char MACstr[MAC_LENGTH_MAC_ADDRESS + 1]; // MAC address in xx:xx:xx:xx:xx:xx format
/***** Begin form *****/ /***** Begin fieldset *****/
Frm_BeginForm (ActNewRoo); HTM_FIELDSET_Begin (NULL);
HTM_LEGEND (Txt_Actions[ActNewRoo]);
/***** Begin box and table *****/ /***** Begin form *****/
Box_BoxTableBegin (NULL,NULL, Frm_BeginForm (ActNewRoo);
NULL,NULL,
NULL,Box_NOT_CLOSABLE,2);
/***** Write heading *****/ /***** Begin table *****/
Roo_PutHeadRooms (); HTM_TABLE_BeginWidePadding (2);
HTM_TR_Begin (NULL); /***** Write heading *****/
Roo_PutHeadRooms ();
/***** Column to remove room, disabled here *****/ HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"BM\"");
HTM_TD_End ();
/***** Room code *****/ /***** Column to remove room, disabled here *****/
HTM_TD_Begin ("class=\"CODE\""); HTM_TD_Begin ("class=\"BM\"");
HTM_TD_End (); HTM_TD_End ();
/***** Building *****/ /***** Room code *****/
HTM_TD_Begin ("class=\"LM\""); HTM_TD_Begin ("class=\"CODE\"");
Roo_PutSelectorBuilding (Roo_EditingRoom->BldCod,Buildings, HTM_TD_End ();
HTM_DONT_SUBMIT_ON_CHANGE);
HTM_TD_End ();
/***** Floor *****/ /***** Building *****/
HTM_TD_Begin ("class=\"LM\""); HTM_TD_Begin ("class=\"LM\"");
HTM_INPUT_LONG ("Floor",(long) INT_MIN,(long) INT_MAX,(long) Roo_EditingRoom->Floor, Roo_PutSelectorBuilding (Roo_EditingRoom->BldCod,Buildings,
HTM_DONT_SUBMIT_ON_CHANGE,false, HTM_DONT_SUBMIT_ON_CHANGE);
"class=\"INPUT_LONG INPUT_%s\"", HTM_TD_End ();
The_GetSuffix ());
HTM_TD_End ();
/***** Room type *****/ /***** Floor *****/
HTM_TD_Begin ("class=\"LM\""); HTM_TD_Begin ("class=\"LM\"");
Roo_PutSelectorType (Roo_EditingRoom->Type, HTM_INPUT_LONG ("Floor",(long) INT_MIN,(long) INT_MAX,(long) Roo_EditingRoom->Floor,
HTM_DONT_SUBMIT_ON_CHANGE); HTM_DONT_SUBMIT_ON_CHANGE,false,
HTM_TD_End (); "class=\"INPUT_LONG INPUT_%s\"",
The_GetSuffix ());
HTM_TD_End ();
/***** Room short name *****/ /***** Room type *****/
HTM_TD_Begin ("class=\"LM\""); HTM_TD_Begin ("class=\"LM\"");
HTM_INPUT_TEXT ("ShortName",Roo_MAX_CHARS_SHRT_NAME,Roo_EditingRoom->ShrtName, Roo_PutSelectorType (Roo_EditingRoom->Type,
HTM_DONT_SUBMIT_ON_CHANGE, HTM_DONT_SUBMIT_ON_CHANGE);
"size=\"10\" class=\"INPUT_SHORT_NAME INPUT_%s\"" HTM_TD_End ();
" required=\"required\"",
The_GetSuffix ());
HTM_TD_End ();
/***** Room full name *****/ /***** Room short name *****/
HTM_TD_Begin ("class=\"LM\""); HTM_TD_Begin ("class=\"LM\"");
HTM_INPUT_TEXT ("FullName",Roo_MAX_CHARS_FULL_NAME,Roo_EditingRoom->FullName, HTM_INPUT_TEXT ("ShortName",Roo_MAX_CHARS_SHRT_NAME,Roo_EditingRoom->ShrtName,
HTM_DONT_SUBMIT_ON_CHANGE, HTM_DONT_SUBMIT_ON_CHANGE,
"size=\"20\" class=\"INPUT_FULL_NAME INPUT_%s\"" "size=\"10\" class=\"INPUT_SHORT_NAME INPUT_%s\""
" required=\"required\"", " required=\"required\"",
The_GetSuffix ()); The_GetSuffix ());
HTM_TD_End (); HTM_TD_End ();
/***** Seating capacity *****/ /***** Room full name *****/
HTM_TD_Begin ("class=\"LM\""); HTM_TD_Begin ("class=\"LM\"");
Roo_WriteCapacity (StrCapacity,Roo_EditingRoom->Capacity); HTM_INPUT_TEXT ("FullName",Roo_MAX_CHARS_FULL_NAME,Roo_EditingRoom->FullName,
HTM_INPUT_TEXT ("Capacity",Cns_MAX_DECIMAL_DIGITS_UINT,StrCapacity, HTM_DONT_SUBMIT_ON_CHANGE,
HTM_DONT_SUBMIT_ON_CHANGE, "size=\"20\" class=\"INPUT_FULL_NAME INPUT_%s\""
"size=\"3\" class=\"INPUT_%s\"", " required=\"required\"",
The_GetSuffix ()); The_GetSuffix ());
HTM_TD_End (); HTM_TD_End ();
/***** MAC address *****/ /***** Seating capacity *****/
HTM_TD_Begin ("class=\"LM\""); HTM_TD_Begin ("class=\"LM\"");
MAC_MACnumToMACstr (Roo_EditingRoom->MACnum,MACstr); Roo_WriteCapacity (StrCapacity,Roo_EditingRoom->Capacity);
HTM_INPUT_TEXT ("MAC",MAC_LENGTH_MAC_ADDRESS,MACstr, HTM_INPUT_TEXT ("Capacity",Cns_MAX_DECIMAL_DIGITS_UINT,StrCapacity,
HTM_DONT_SUBMIT_ON_CHANGE, HTM_DONT_SUBMIT_ON_CHANGE,
"size=\"8\" class=\"INPUT_%s\"", "size=\"3\" class=\"INPUT_%s\"",
The_GetSuffix ()); The_GetSuffix ());
HTM_TD_End (); 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 *****/ HTM_TR_End ();
Box_BoxTableWithButtonEnd (Btn_CREATE_BUTTON,Txt_Create_room);
/***** End form *****/ /***** End table and send button *****/
Frm_EndForm (); HTM_TABLE_End ();
Btn_PutButton (Btn_CREATE_BUTTON,Txt_Create);
/***** End form *****/
Frm_EndForm ();
/***** End fieldset *****/
HTM_FIELDSET_End ();
} }
/*****************************************************************************/ /*****************************************************************************/

23
swad_text.c
View File

@ -6848,29 +6848,6 @@ const char *Txt_Create_question =
"Create question"; // Çeviri lazim! "Create question"; // Çeviri lazim!
#endif #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 = const char *Txt_Create_type_of_degree =
#if L==1 // ca #if L==1 // ca
"Crear tipus de titulació"; "Crear tipus de titulació";

20
swad_text_action.c
View File

@ -4779,25 +4779,25 @@ const char *Txt_Actions[ActLst_NUM_ACTIONS] =
, ,
[ActNewRoo] = [ActNewRoo] =
#if L==1 // ca #if L==1 // ca
"Request creation of room" // Necessita traducció "Crear sala"
#elif L==2 // de #elif L==2 // de
"Request creation of room" // Need Übersetzung "Raum eingeben"
#elif L==3 // en #elif L==3 // en
"Request creation of room" "Create room"
#elif L==4 // es #elif L==4 // es
"Solicitar creación de sala" "Crear sala"
#elif L==5 // fr #elif L==5 // fr
"Request creation of room" // Besoin de traduction "Créer salle"
#elif L==6 // gn #elif L==6 // gn
"Solicitar creación de sala" // Okoteve traducción "Crear sala" // Okoteve traducción
#elif L==7 // it #elif L==7 // it
"Request creation of room" // Bisogno di traduzione "Crea aula"
#elif L==8 // pl #elif L==8 // pl
"Request creation of room" // Potrzebujesz tlumaczenie "Utwórz klasa"
#elif L==9 // pt #elif L==9 // pt
"Request creation of room" // Precisa de tradução "Criar sala"
#elif L==10 // tr #elif L==10 // tr
"Request creation of room" // Çeviri lazim! "Create room" // Çeviri lazim!
#endif #endif
, ,
[ActRemRoo] = [ActRemRoo] =