Version 22.107.26:May 09, 2023 Changes in edition of holidays.

This commit is contained in:
acanas 2023-05-09 14:41:57 +02:00
parent 5bb6ed309c
commit 23adb04688
5 changed files with 109 additions and 126 deletions

View File

@ -767,7 +767,7 @@ static void Ctr_ListCentersForEdition (const struct Plc_Places *Places)
HTM_TD_End (); HTM_TD_End ();
/* Center code */ /* Center code */
HTM_TD_Begin ("class=\"DAT_%s CODE\"",The_GetSuffix ()); HTM_TD_Begin ("class=\"CODE DAT_%s\"",The_GetSuffix ());
HTM_Long (Ctr->CtrCod); HTM_Long (Ctr->CtrCod);
HTM_TD_End (); HTM_TD_End ();

View File

@ -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. 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.25 (2023-05-09)" #define Log_PLATFORM_VERSION "SWAD 22.107.26 (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.26:May 09, 2023 Changes in edition of holidays. (337740 lines)
Version 22.107.25:May 09, 2023 Changes in edition of games. (337760 lines) Version 22.107.25:May 09, 2023 Changes in edition of games. (337760 lines)
Version 22.107.24:May 09, 2023 Changes in edition of exams. (337781 lines) Version 22.107.24:May 09, 2023 Changes in edition of exams. (337781 lines)
Version 22.107.23:May 09, 2023 Changes in edition of departments. (337802 lines) Version 22.107.23:May 09, 2023 Changes in edition of departments. (337802 lines)

View File

@ -530,7 +530,7 @@ static void Hld_ListHolidaysForEdition (const struct Hld_Holidays *Holidays,
HTM_TD_End (); HTM_TD_End ();
/* Holiday code */ /* Holiday code */
HTM_TD_Begin ("class=\"RM DAT_%s\"",The_GetSuffix ()); HTM_TD_Begin ("class=\"CODE DAT_%s\"",The_GetSuffix ());
HTM_TxtF ("%ld ",HldInLst->HldCod); HTM_TxtF ("%ld ",HldInLst->HldCod);
HTM_TD_End (); HTM_TD_End ();
@ -884,38 +884,39 @@ void Hld_ContEditAfterChgHld (void)
static void Hld_PutFormToCreateHoliday (const struct Plc_Places *Places) static void Hld_PutFormToCreateHoliday (const struct Plc_Places *Places)
{ {
extern const char *Txt_Actions[ActLst_NUM_ACTIONS];
extern const char *Txt_All_places; extern const char *Txt_All_places;
extern const char *Txt_Place;
extern const char *Txt_Type;
extern const char *Txt_START_END_TIME[Dat_NUM_START_END_TIME];
extern const char *Txt_Holiday;
extern const char *Txt_HOLIDAY_TYPES[Hld_NUM_TYPES_HOLIDAY]; extern const char *Txt_HOLIDAY_TYPES[Hld_NUM_TYPES_HOLIDAY];
extern const char *Txt_Create_holiday; extern const char *Txt_Create;
unsigned NumPlc; unsigned NumPlc;
const struct Plc_Place *PlcInLst; const struct Plc_Place *PlcInLst;
Hld_HolidayType_t HolidayType; Hld_HolidayType_t HolidayType;
unsigned HolidayTypeUnsigned; unsigned HolidayTypeUnsigned;
unsigned CurrentYear = Dat_GetCurrentYear (); unsigned CurrentYear = Dat_GetCurrentYear ();
/***** Begin fieldset *****/
HTM_FIELDSET_Begin (NULL);
HTM_LEGEND (Txt_Actions[ActNewHld]);
/***** Begin form *****/ /***** Begin form *****/
Frm_BeginForm (ActNewHld); Frm_BeginForm (ActNewHld);
/***** Begin box and table *****/ /***** Begin table *****/
Box_BoxTableBegin (NULL,NULL, HTM_TABLE_BeginWidePadding (2);
NULL,NULL,
NULL,Box_NOT_CLOSABLE,2);
/***** Write heading *****/ /***** Write heading *****/
HTM_TR_Begin (NULL); Hld_PutHeadHolidays ();
HTM_TH (Txt_Place ,HTM_HEAD_LEFT);
HTM_TH (Txt_Type ,HTM_HEAD_LEFT);
HTM_TH (Txt_START_END_TIME[Dat_STR_TIME],HTM_HEAD_LEFT);
HTM_TH (Txt_START_END_TIME[Dat_END_TIME],HTM_HEAD_LEFT);
HTM_TH (Txt_Holiday ,HTM_HEAD_LEFT);
HTM_TR_End ();
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
/***** Column to remove holiday, disabled here *****/
HTM_TD_Begin ("class=\"BM\"");
HTM_TD_End ();
/***** Holiday code *****/
HTM_TD_Begin ("class=\"CODE\"");
HTM_TD_End ();
/***** Holiday place *****/ /***** Holiday place *****/
HTM_TD_Begin ("class=\"CM\""); HTM_TD_Begin ("class=\"CM\"");
HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE,NULL, HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE,NULL,
@ -990,11 +991,15 @@ static void Hld_PutFormToCreateHoliday (const struct Plc_Places *Places)
HTM_TR_End (); HTM_TR_End ();
/***** End table, send button and end box *****/ /***** End table and send button *****/
Box_BoxTableWithButtonEnd (Btn_CREATE_BUTTON,Txt_Create_holiday); HTM_TABLE_End ();
Btn_PutButton (Btn_CREATE_BUTTON,Txt_Create);
/***** End form *****/ /***** End form *****/
Frm_EndForm (); Frm_EndForm ();
/***** End fieldset *****/
HTM_FIELDSET_End ();
} }
/*****************************************************************************/ /*****************************************************************************/

View File

@ -6733,29 +6733,6 @@ const char *Txt_Create_group =
"Create group"; // Çeviri lazim! "Create group"; // Çeviri lazim!
#endif #endif
const char *Txt_Create_holiday =
#if L==1 // ca
"Crear festivitat";
#elif L==2 // de
"Feiertag eingeben";
#elif L==3 // en
"Create holiday";
#elif L==4 // es
"Crear festividad";
#elif L==5 // fr
"Créer fête";
#elif L==6 // gn
"Omoheñói arete";
#elif L==7 // it
"Crea festività";
#elif L==8 // pl
"Utwórz wakacje";
#elif L==9 // pt
"Criar féria";
#elif L==10 // tr
"Tatil oluştur";
#endif
const char *Txt_Create_item = const char *Txt_Create_item =
#if L==1 // ca #if L==1 // ca
"Crear ítem"; "Crear ítem";

View File

@ -3698,25 +3698,25 @@ const char *Txt_Actions[ActLst_NUM_ACTIONS] =
, ,
[ActNewHld] = [ActNewHld] =
#if L==1 // ca #if L==1 // ca
"Request creation of a holiday" // Necessita traducció "Crear festivitat"
#elif L==2 // de #elif L==2 // de
"Request creation of a holiday" // Need Übersetzung "Feiertag eingeben"
#elif L==3 // en #elif L==3 // en
"Request creation of a holiday" "Create holiday"
#elif L==4 // es #elif L==4 // es
"Solicitar creación de un festivo" "Crear festividad"
#elif L==5 // fr #elif L==5 // fr
"Request creation of a holiday" // Besoin de traduction "Créer fête"
#elif L==6 // gn #elif L==6 // gn
"Solicitar creación de un festivo" // Okoteve traducción "Omoheñói arete"
#elif L==7 // it #elif L==7 // it
"Request creation of a holiday" // Bisogno di traduzione "Crea festività"
#elif L==8 // pl #elif L==8 // pl
"Request creation of a holiday" // Potrzebujesz tlumaczenie "Utwórz wakacje"
#elif L==9 // pt #elif L==9 // pt
"Request creation of a holiday" // Precisa de tradução "Criar féria"
#elif L==10 // tr #elif L==10 // tr
"Request creation of a holiday" // Çeviri lazim! "Tatil oluştur"
#endif #endif
, ,
[ActRemHld] = [ActRemHld] =