From be158b5a568aed38c21b3f22aae2a27b97b3ee25 Mon Sep 17 00:00:00 2001 From: acanas Date: Tue, 9 May 2023 09:02:34 +0200 Subject: [PATCH] Version 22.107.21:May 09, 2023 Changes in edition of degrees. --- swad_changelog.h | 3 +- swad_degree.c | 177 ++++++++++++++++++++++++--------------------- swad_text.c | 23 ------ swad_text_action.c | 12 +-- 4 files changed, 102 insertions(+), 113 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index c82a90a34..b5e9b48f6 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.20 (2023-05-09)" +#define Log_PLATFORM_VERSION "SWAD 22.107.21 (2023-05-09)" #define CSS_FILE "swad22.107.17.css" #define JS_FILE "swad22.49.js" /* + Version 22.107.21:May 09, 2023 Changes in edition of degrees. (337829 lines) Version 22.107.20:May 09, 2023 Changes in edition of countries. (337842 lines) Version 22.107.19:May 09, 2023 Changes in edition of institutions. (337858 lines) Version 22.107.18:May 09, 2023 Changes in edition of centers. (337871 lines) diff --git a/swad_degree.c b/swad_degree.c index 8fa06dbe7..7c6134c40 100644 --- a/swad_degree.c +++ b/swad_degree.c @@ -513,113 +513,124 @@ static bool Deg_CheckIfICanEditADegree (struct Deg_Degree *Deg) static void Deg_PutFormToCreateDegree (const struct DegTyp_DegTypes *DegTypes) { - extern const char *Txt_Create_degree; + extern const char *Txt_Actions[ActLst_NUM_ACTIONS]; + extern const char *Txt_Create; + Act_Action_t NextAction = ActUnk; unsigned NumDegTyp; struct DegTyp_DegreeType *DegTypInLst; - /***** Begin form *****/ + /***** Set action depending on role *****/ if (Gbl.Usrs.Me.Role.Logged >= Rol_CTR_ADM) - Frm_BeginForm (ActNewDeg); + NextAction = ActNewDeg; else if (Gbl.Usrs.Me.Role.Max >= Rol_GST) - Frm_BeginForm (ActReqDeg); + NextAction = ActReqDeg; else Err_NoPermissionExit (); - /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,NULL, - NULL,NULL, - NULL,Box_NOT_CLOSABLE,2); + /***** Begin fieldset *****/ + HTM_FIELDSET_Begin (NULL); + HTM_LEGEND (Txt_Actions[NextAction]); - /***** Write heading *****/ - Deg_PutHeadDegreesForEdition (); + /***** Begin form *****/ + Frm_BeginForm (NextAction); - HTM_TR_Begin (NULL); + /***** Begin table *****/ + HTM_TABLE_BeginWidePadding (2); - /***** Column to remove degree, disabled here *****/ - HTM_TD_Begin ("class=\"BM\""); - HTM_TD_End (); + /***** Write heading *****/ + Deg_PutHeadDegreesForEdition (); - /***** Degree code *****/ - HTM_TD_Begin ("class=\"CODE\""); - HTM_TD_End (); + HTM_TR_Begin (NULL); - /***** Degree logo *****/ - HTM_TD_Begin ("title=\"%s\" class=\"HIE_LOGO\"",Deg_EditingDeg->FullName); - Lgo_DrawLogo (HieLvl_DEG,-1L,"",20,NULL,true); - HTM_TD_End (); + /***** Column to remove degree, disabled here *****/ + HTM_TD_Begin ("class=\"BM\""); + HTM_TD_End (); - /***** Degree short name *****/ - HTM_TD_Begin ("class=\"LM\""); - HTM_INPUT_TEXT ("ShortName",Cns_HIERARCHY_MAX_CHARS_SHRT_NAME,Deg_EditingDeg->ShrtName, - HTM_DONT_SUBMIT_ON_CHANGE, - "class=\"INPUT_SHORT_NAME INPUT_%s\"" - " required=\"required\"", - The_GetSuffix ()); - HTM_TD_End (); + /***** Degree code *****/ + HTM_TD_Begin ("class=\"CODE\""); + HTM_TD_End (); - /***** Degree full name *****/ - HTM_TD_Begin ("class=\"LM\""); - HTM_INPUT_TEXT ("FullName",Cns_HIERARCHY_MAX_CHARS_FULL_NAME,Deg_EditingDeg->FullName, - HTM_DONT_SUBMIT_ON_CHANGE, - "class=\"INPUT_FULL_NAME INPUT_%s\"" - " required=\"required\"", - The_GetSuffix ()); - HTM_TD_End (); + /***** Degree logo *****/ + HTM_TD_Begin ("title=\"%s\" class=\"HIE_LOGO\"",Deg_EditingDeg->FullName); + Lgo_DrawLogo (HieLvl_DEG,-1L,"",20,NULL,true); + HTM_TD_End (); - /***** Degree type *****/ - HTM_TD_Begin ("class=\"LM\""); - HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE,NULL, - "name=\"OthDegTypCod\"" - " class=\"HIE_SEL_NARROW INPUT_%s\"", - The_GetSuffix ()); - for (NumDegTyp = 0; - NumDegTyp < DegTypes->Num; - NumDegTyp++) - { - DegTypInLst = &DegTypes->Lst[NumDegTyp]; - HTM_OPTION (HTM_Type_LONG,&DegTypInLst->DegTypCod, - DegTypInLst->DegTypCod == Deg_EditingDeg->DegTypCod, // Selected? - HTM_OPTION_ENABLED, - "%s",DegTypInLst->DegTypName); - } - HTM_SELECT_End (); - HTM_TD_End (); + /***** Degree short name *****/ + HTM_TD_Begin ("class=\"LM\""); + HTM_INPUT_TEXT ("ShortName",Cns_HIERARCHY_MAX_CHARS_SHRT_NAME,Deg_EditingDeg->ShrtName, + HTM_DONT_SUBMIT_ON_CHANGE, + "class=\"INPUT_SHORT_NAME INPUT_%s\"" + " required=\"required\"", + The_GetSuffix ()); + HTM_TD_End (); - /***** Degree WWW *****/ - HTM_TD_Begin ("class=\"LM\""); - HTM_INPUT_URL ("WWW",Deg_EditingDeg->WWW,HTM_DONT_SUBMIT_ON_CHANGE, - "class=\"INPUT_WWW_NARROW INPUT_%s\"" - " required=\"required\"", - The_GetSuffix ()); - HTM_TD_End (); + /***** Degree full name *****/ + HTM_TD_Begin ("class=\"LM\""); + HTM_INPUT_TEXT ("FullName",Cns_HIERARCHY_MAX_CHARS_FULL_NAME,Deg_EditingDeg->FullName, + HTM_DONT_SUBMIT_ON_CHANGE, + "class=\"INPUT_FULL_NAME INPUT_%s\"" + " required=\"required\"", + The_GetSuffix ()); + HTM_TD_End (); - /***** Number of courses in this degree *****/ - HTM_TD_Begin ("class=\"RM DAT_%s\"",The_GetSuffix ()); - HTM_Unsigned (0); - HTM_TD_End (); + /***** Degree type *****/ + HTM_TD_Begin ("class=\"LM\""); + HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE,NULL, + "name=\"OthDegTypCod\"" + " class=\"HIE_SEL_NARROW INPUT_%s\"", + The_GetSuffix ()); + for (NumDegTyp = 0; + NumDegTyp < DegTypes->Num; + NumDegTyp++) + { + DegTypInLst = &DegTypes->Lst[NumDegTyp]; + HTM_OPTION (HTM_Type_LONG,&DegTypInLst->DegTypCod, + DegTypInLst->DegTypCod == Deg_EditingDeg->DegTypCod, // Selected? + HTM_OPTION_ENABLED, + "%s",DegTypInLst->DegTypName); + } + HTM_SELECT_End (); + HTM_TD_End (); - /***** Number of users in courses of this degree *****/ - HTM_TD_Begin ("class=\"RM DAT_%s\"",The_GetSuffix ()); - HTM_Unsigned (0); - HTM_TD_End (); + /***** Degree WWW *****/ + HTM_TD_Begin ("class=\"LM\""); + HTM_INPUT_URL ("WWW",Deg_EditingDeg->WWW,HTM_DONT_SUBMIT_ON_CHANGE, + "class=\"INPUT_WWW_NARROW INPUT_%s\"" + " required=\"required\"", + The_GetSuffix ()); + HTM_TD_End (); - /***** Degree requester *****/ - HTM_TD_Begin ("class=\"LT DAT_%s INPUT_REQUESTER\"", - The_GetSuffix ()); - Msg_WriteMsgAuthor (&Gbl.Usrs.Me.UsrDat,true); - HTM_TD_End (); + /***** Number of courses in this degree *****/ + HTM_TD_Begin ("class=\"RM DAT_%s\"",The_GetSuffix ()); + HTM_Unsigned (0); + HTM_TD_End (); - /***** Degree status *****/ - HTM_TD_Begin ("class=\"LM DAT_%s\"",The_GetSuffix ()); - HTM_TD_End (); + /***** Number of users in courses of this degree *****/ + HTM_TD_Begin ("class=\"RM DAT_%s\"",The_GetSuffix ()); + HTM_Unsigned (0); + HTM_TD_End (); - HTM_TR_End (); + /***** Degree requester *****/ + HTM_TD_Begin ("class=\"LT DAT_%s INPUT_REQUESTER\"", + The_GetSuffix ()); + Msg_WriteMsgAuthor (&Gbl.Usrs.Me.UsrDat,true); + HTM_TD_End (); - /***** End table, send button and end box *****/ - Box_BoxTableWithButtonEnd (Btn_CREATE_BUTTON,Txt_Create_degree); + /***** Degree status *****/ + HTM_TD_Begin ("class=\"LM DAT_%s\"",The_GetSuffix ()); + HTM_TD_End (); - /***** End form *****/ - Frm_EndForm (); + HTM_TR_End (); + + /***** 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 53fb948bd..764d0f91a 100644 --- a/swad_text.c +++ b/swad_text.c @@ -6641,29 +6641,6 @@ const char *Txt_Create_course = "Create course"; // Çeviri lazim! #endif -const char *Txt_Create_degree = -#if L==1 // ca - "Crear titulació"; -#elif L==2 // de - "Studiengang eingeben"; -#elif L==3 // en - "Create degree"; -#elif L==4 // es - "Crear titulación"; -#elif L==5 // fr - "Créer étude"; -#elif L==6 // gn - "Crear titulación"; // Okoteve traducción -#elif L==7 // it - "Crea laurea"; -#elif L==8 // pl - "Utwórz stopnia"; -#elif L==9 // pt - "Criar grau"; -#elif L==10 // tr - "Create degree"; // Çeviri lazim! -#endif - const char *Txt_Create_department = #if L==1 // ca "Crear departament"; diff --git a/swad_text_action.c b/swad_text_action.c index a61c96201..6faf8e2b3 100644 --- a/swad_text_action.c +++ b/swad_text_action.c @@ -4457,23 +4457,23 @@ const char *Txt_Actions[ActLst_NUM_ACTIONS] = , [ActNewDeg] = #if L==1 // ca - "Create degree" // Necessita traducció + "Crear titulació" #elif L==2 // de - "Create degree" // Need Übersetzung + "Studiengang eingeben" #elif L==3 // en "Create degree" #elif L==4 // es "Crear titulación" #elif L==5 // fr - "Create degree" // Besoin de traduction + "Créer étude" #elif L==6 // gn "Crear titulación" // Okoteve traducción #elif L==7 // it - "Create degree" // Bisogno di traduzione + "Crea laurea" #elif L==8 // pl - "Create degree" // Potrzebujesz tlumaczenie + "Utwórz stopnia" #elif L==9 // pt - "Create degree" // Precisa de tradução + "Criar grau" #elif L==10 // tr "Create degree" // Çeviri lazim! #endif