From 69af32cbe069097ef8f6408c6bfd6ab7b04761bf Mon Sep 17 00:00:00 2001 From: acanas Date: Thu, 4 May 2023 18:27:32 +0200 Subject: [PATCH] Version 22.104.3: May 04, 2023 Changes in project configuration. --- swad_HTML.c | 21 +++++++++++++++ swad_HTML.h | 4 +++ swad_changelog.h | 3 ++- swad_project_config.c | 53 +++++++++++++++++--------------------- swad_rubric.c | 3 +++ swad_text.c | 60 +++++++++++++++++++++---------------------- 6 files changed, 83 insertions(+), 61 deletions(-) diff --git a/swad_HTML.c b/swad_HTML.c index 20bbd974..a6ffffe3 100644 --- a/swad_HTML.c +++ b/swad_HTML.c @@ -997,6 +997,27 @@ void HTM_PARAM (const char *Name, } } +/*****************************************************************************/ +/********************************* Fieldsets *********************************/ +/*****************************************************************************/ + +void HTM_FIELDSET_Begin (void) + { + HTM_Txt ("
"); + } + +void HTM_FIELDSET_End (void) + { + HTM_Txt ("
"); + } + +void HTM_LEYEND (const char *Txt) + { + HTM_Txt (""); + HTM_Txt (Txt); + HTM_Txt (""); + } + /*****************************************************************************/ /*********************************** Labels **********************************/ /*****************************************************************************/ diff --git a/swad_HTML.h b/swad_HTML.h index 47dbfeb1..f7902af8 100644 --- a/swad_HTML.h +++ b/swad_HTML.h @@ -143,6 +143,10 @@ void HTM_SCRIPT_End (void); void HTM_PARAM (const char *Name, const char *fmt,...); +void HTM_FIELDSET_Begin (void); +void HTM_FIELDSET_End (void); +void HTM_LEYEND (const char *Txt); + void HTM_LABEL_Begin (const char *fmt,...); void HTM_LABEL_End (void); diff --git a/swad_changelog.h b/swad_changelog.h index 6be33fcc..1c0e64ea 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.104.2 (2023-05-04)" +#define Log_PLATFORM_VERSION "SWAD 22.104.3 (2023-05-04)" #define CSS_FILE "swad22.103.css" #define JS_FILE "swad22.49.js" /* + Version 22.104.3: May 04, 2023 Changes in project configuration. (338043 lines) Version 22.104.2: May 04, 2023 Rubrics in project. Changes in input numbers. (338022 lines) Version 22.104.1: May 04, 2023 Rubrics in project. Code refactoring in file browsers. (338014 lines) Version 22.104: May 03, 2023 Rubrics in project. Not finished. (338000 lines) diff --git a/swad_project_config.c b/swad_project_config.c index bac22da9..be9d22b1 100644 --- a/swad_project_config.c +++ b/swad_project_config.c @@ -130,6 +130,8 @@ void PrjCfg_ShowFormConfig (void) { extern const char *Hlp_ASSESSMENT_Projects; extern const char *Txt_Configure_projects; + extern const char *Txt_Create_project; + extern const char *Txt_Rubrics; extern const char *Txt_Save_changes; struct Prj_Projects Projects; @@ -144,15 +146,17 @@ void PrjCfg_ShowFormConfig (void) /***** Begin form *****/ Frm_BeginForm (ActRcvCfgPrj); - HTM_TABLE_BeginCenterPadding (2); - - /***** Projects are editable by non-editing teachers? *****/ + /***** Projects are editable by non-editing teachers? *****/ + HTM_FIELDSET_Begin (); + HTM_LEYEND (Txt_Create_project); PrjCfg_ShowFormNETCanCreate (&Projects.Config); + HTM_FIELDSET_End (); - /***** Rubrics *****/ + /***** Rubrics *****/ + HTM_FIELDSET_Begin (); + HTM_LEYEND (Txt_Rubrics); PrjCfg_ShowFormRubrics (&Projects.Config); - - HTM_TABLE_End (); + HTM_FIELDSET_End (); /***** Send button *****/ Btn_PutConfirmButton (Txt_Save_changes); @@ -180,10 +184,12 @@ static void PrjCfg_ShowFormRubrics (const struct PrjCfg_Config *Config) Rub_GetListRubrics (&Rubrics); /***** Rubric selectors *****/ - for (WhichRubric = (PrjCfg_Rubric_t) 1; - WhichRubric <= (PrjCfg_Rubric_t) (PrjCfg_NUM_RUBRICS - 1); - WhichRubric++) - PrjCfg_ShowFormRubric (Config,&Rubrics,WhichRubric); + HTM_TABLE_BeginCenterPadding (2); + for (WhichRubric = (PrjCfg_Rubric_t) 1; + WhichRubric <= (PrjCfg_Rubric_t) (PrjCfg_NUM_RUBRICS - 1); + WhichRubric++) + PrjCfg_ShowFormRubric (Config,&Rubrics,WhichRubric); + HTM_TABLE_End (); /***** Free list of rubrics *****/ Rub_FreeListRubrics (&Rubrics); @@ -308,28 +314,15 @@ PrjCfg_Rubric_t PrjCfg_GetRubricFromString (const char *Str) static void PrjCfg_ShowFormNETCanCreate (const struct PrjCfg_Config *Config) { - extern const char *Txt_Create_project; extern const char *Txt_Non_editing_teachers_can_create_new_projects; - HTM_TR_Begin (NULL); - - /***** Label *****/ - HTM_TD_Begin ("class=\"RM FORM_IN_%s\"",The_GetSuffix ()); - HTM_TxtColon (Txt_Create_project); - HTM_TD_End (); - - /***** Data *****/ - HTM_TD_Begin ("class=\"LM\""); - HTM_LABEL_Begin ("class=\"DAT_%s\"",The_GetSuffix ()); - HTM_INPUT_CHECKBOX ("NETCanCreate",HTM_DONT_SUBMIT_ON_CHANGE, - "id=\"NETCanCreate\" value=\"Y\"%s", - Config->NETCanCreate ? " checked=\"checked\"" : - ""); - HTM_Txt (Txt_Non_editing_teachers_can_create_new_projects); - HTM_LABEL_End (); - HTM_TD_End (); - - HTM_TR_End (); + HTM_LABEL_Begin ("class=\"LT DAT_%s\"",The_GetSuffix ()); + HTM_INPUT_CHECKBOX ("NETCanCreate",HTM_DONT_SUBMIT_ON_CHANGE, + "id=\"NETCanCreate\" value=\"Y\"%s", + Config->NETCanCreate ? " checked=\"checked\"" : + ""); + HTM_Txt (Txt_Non_editing_teachers_can_create_new_projects); + HTM_LABEL_End (); } /*****************************************************************************/ diff --git a/swad_rubric.c b/swad_rubric.c index 32453fb5..4ff49974 100644 --- a/swad_rubric.c +++ b/swad_rubric.c @@ -487,6 +487,9 @@ void Rub_ShowRubricInProject (struct Prj_Projects *Projects, /***** End 2nd row of this rubric *****/ HTM_TR_End (); + /***** Change color for rubric criteria *****/ + The_ChangeRowColor (); + /***** Write criteria of this rubric *****/ RubCri_ListCriteriaInProject (Projects,Rubric->RubCod,ICanFill); diff --git a/swad_text.c b/swad_text.c index e1dc0f35..200d2cef 100644 --- a/swad_text.c +++ b/swad_text.c @@ -32394,71 +32394,71 @@ const char *Txt_PROJECT_RUBRIC[PrjCfg_NUM_RUBRICS] = { [PrjCfg_RUBRIC_TUT] = #if L==1 // ca - "Rúbrica per a tutors" + "Tutors" #elif L==2 // de - "Rubrik für Tutoren" + "Tutoren" #elif L==3 // en - "Rubric for tutors" + "Tutors" #elif L==4 // es - "Rúbrica para tutores" + "Tutores" #elif L==5 // fr - "Rubrique pour les tuteurs" + "Tuteurs" #elif L==6 // gn - "Rúbrica tutor-kuérape guarã" + "Tutor" #elif L==7 // it - "Rubrica per precettori" + "Precettori" #elif L==8 // pl - "Rubryka dla nauczyciele" + "Nauczyciele" #elif L==9 // pt - "Rubrica para tutores" + "Tutores" #elif L==10 // tr - "Öğretmenler için değerlendirme listesi" + "Öğretmenler" #endif , [PrjCfg_RUBRIC_EVL] = #if L==1 // ca - "Rúbrica per a avaluadors" + "Avaluadors" #elif L==2 // de - "Rubrik für Auswerter" + "Auswerter" #elif L==3 // en - "Rubric for evaluators" + "Evaluators" #elif L==4 // es - "Rúbrica para evaluadores" + "Evaluadores" #elif L==5 // fr - "Rubrique pour les évaluateurs" + "Évaluateurs" #elif L==6 // gn - "Rúbrica evaluador-kuérape guarã" + "Evaluador" #elif L==7 // it - "Rubrica per valutatori" + "Valutatori" #elif L==8 // pl - "Rubryka dla ewaluatorów" + "Ewaluatorów" #elif L==9 // pt - "Rubrica para avaliadores" + "Avaliadores" #elif L==10 // tr - "Değerlendiriciler için değerlendirme listesi" + "Değerlendiriciler" #endif , [PrjCfg_RUBRIC_GBL] = #if L==1 // ca - "Rúbrica global" + "Global" #elif L==2 // de - "Gesamtrubrik" + "Gesamt" #elif L==3 // en - "Globale rubric" + "Globale" #elif L==4 // es - "Rúbrica global" + "Global" #elif L==5 // fr - "Rubrique globale" + "Globale" #elif L==6 // gn - "Rúbrica general" + "General" #elif L==7 // it - "Rubrica complessiva" + "Complessiva" #elif L==8 // pl - "Globalna rubryka" + "Globalna" #elif L==9 // pt - "Rubrica geral" + "Geral" #elif L==10 // tr - "Genel değerlendirme listesi" + "Genel" #endif };