diff --git a/css/swad22.103.css b/css/swad22.104.4.css similarity index 100% rename from css/swad22.103.css rename to css/swad22.104.4.css diff --git a/swad_browser.c b/swad_browser.c index b620ec39a..942509f3b 100644 --- a/swad_browser.c +++ b/swad_browser.c @@ -2714,23 +2714,32 @@ void Brw_ShowFileBrowserNormal (void) void Brw_ShowFileBrowserProject (long PrjCod) { - Brw_WriteTopBeforeShowingFileBrowser (); + extern const char *Txt_Documents; - if (Prj_CheckIfICanViewProjectDocuments (PrjCod)) - { - /***** Show the tree with the project documents *****/ - Gbl.FileBrowser.Type = Brw_ADMI_DOC_PRJ; - Brw_InitializeFileBrowser (); - Brw_ShowFileBrowser (); - } + /***** Begin fieldset *****/ + HTM_FIELDSET_Begin (); + HTM_LEYEND (Txt_Documents); - if (Prj_CheckIfICanViewProjectAssessment (PrjCod)) - { - /***** Show the tree with the project assessment *****/ - Gbl.FileBrowser.Type = Brw_ADMI_ASS_PRJ; - Brw_InitializeFileBrowser (); - Brw_ShowFileBrowser (); - } + Brw_WriteTopBeforeShowingFileBrowser (); + + if (Prj_CheckIfICanViewProjectDocuments (PrjCod)) + { + /***** Show the tree with the project documents *****/ + Gbl.FileBrowser.Type = Brw_ADMI_DOC_PRJ; + Brw_InitializeFileBrowser (); + Brw_ShowFileBrowser (); + } + + if (Prj_CheckIfICanViewProjectAssessment (PrjCod)) + { + /***** Show the tree with the project assessment *****/ + Gbl.FileBrowser.Type = Brw_ADMI_ASS_PRJ; + Brw_InitializeFileBrowser (); + Brw_ShowFileBrowser (); + } + + /***** End fieldset *****/ + HTM_FIELDSET_End (); } /*****************************************************************************/ @@ -3087,7 +3096,7 @@ static void Brw_ShowFileBrowser (void) extern const char *Hlp_FILES_Homework_for_teachers; extern const char *Hlp_FILES_Marks; extern const char *Hlp_FILES_Briefcase; - extern const char *Hlp_ASSESSMENT_Projects; + // extern const char *Hlp_ASSESSMENT_Projects; extern const char *Txt_Documents_area; extern const char *Txt_Documents_management_area; @@ -3100,6 +3109,7 @@ static void Brw_ShowFileBrowser (void) extern const char *Txt_Temporary_private_storage_area; extern const char *Txt_Project_documents; extern const char *Txt_Project_assessment; + extern const char *Txt_NULL; extern const char *Txt_Files_of_marks_must_contain_a_table_in_HTML_format_; static const char **Brw_TitleOfFileBrowser[Brw_NUM_TYPES_FILE_BROWSER] = @@ -3163,8 +3173,8 @@ static void Brw_ShowFileBrowser (void) [Brw_ADMI_SHR_INS] = &Hlp_FILES_Shared, [Brw_ADMI_TCH_CRS] = &Hlp_FILES_Private, [Brw_ADMI_TCH_GRP] = &Hlp_FILES_Private, - [Brw_ADMI_DOC_PRJ] = &Hlp_ASSESSMENT_Projects, - [Brw_ADMI_ASS_PRJ] = &Hlp_ASSESSMENT_Projects, + [Brw_ADMI_DOC_PRJ] = &Txt_NULL, + [Brw_ADMI_ASS_PRJ] = &Txt_NULL, }; struct Brw_NumObjects Removed; char FileBrowserSectionId[32]; diff --git a/swad_changelog.h b/swad_changelog.h index 2f930b815..8ce416ba1 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -629,12 +629,13 @@ 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.5 (2023-05-04)" +#define Log_PLATFORM_VERSION "SWAD 22.104.6 (2023-05-04)" #define CSS_FILE "swad22.104.4.css" #define JS_FILE "swad22.49.js" /* - Version 22.104.5: May 04, 2023 Fixed issue in indicators (342853 lines) - Version 22.104.4: May 04, 2023 Changes in lists. Changes in project edition. (342853 lines) + Version 22.104.6: May 04, 2023 Changes in projects. (338079 lines) + Version 22.104.5: May 04, 2023 Fixed issue in indicators. (338079 lines) + Version 22.104.4: May 04, 2023 Changes in lists. Changes in project edition. (338079 lines) 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) diff --git a/swad_project.c b/swad_project.c index cf237238f..4b11e2b76 100644 --- a/swad_project.c +++ b/swad_project.c @@ -1346,16 +1346,18 @@ void Prj_ShowBoxWithOneProject (struct Prj_Projects *Projects) Prj_PutIconsOnePrj,Projects, Hlp_ASSESSMENT_Projects,Box_NOT_CLOSABLE); - /***** Begin table *****/ - HTM_TABLE_BeginWidePadding (2); + /***** Show project data *****/ + HTM_FIELDSET_Begin (); + HTM_LEYEND (Txt_Project); + HTM_TABLE_BeginWidePadding (2); - /***** Table head and project *****/ - Projects->View = Prj_VIEW_ONE_PROJECT; - Prj_ShowProjectsHead (Projects); - Prj_ShowProjectRow (Projects); + /***** Table head and project *****/ + Projects->View = Prj_VIEW_ONE_PROJECT; + Prj_ShowProjectsHead (Projects); + Prj_ShowProjectRow (Projects); - /***** End table *****/ - HTM_TABLE_End (); + HTM_TABLE_End (); + HTM_FIELDSET_End (); /***** Show project file browsers *****/ if (Prj_CheckIfICanViewProjectFiles (Projects->Prj.PrjCod)) @@ -4487,45 +4489,43 @@ static Prj_ReviewStatus_t Prj_GetParReviewStatus (void) static void Prj_ShowRubrics (struct Prj_Projects *Projects) { - extern const char *Hlp_ASSESSMENT_Projects; - extern const char *Txt_Rubrics; + extern const char *Txt_Assessment; extern const char *Txt_PROJECT_RUBRIC[PrjCfg_NUM_RUBRICS]; struct Rub_Rubric Rubric; PrjCfg_Rubric_t WhichRubric; - /***** Begin box *****/ - Box_BoxBegin ("100%",Txt_Rubrics, - NULL,NULL, - Hlp_ASSESSMENT_Projects,Box_NOT_CLOSABLE); + /***** Begin fieldset *****/ + HTM_FIELDSET_Begin (); + HTM_LEYEND (Txt_Assessment); - /***** Begin table *****/ - HTM_TABLE_BeginWideMarginPadding (5); + /***** Begin table *****/ + HTM_TABLE_BeginWideMarginPadding (5); - /***** Rubrics *****/ - for (WhichRubric = (PrjCfg_Rubric_t) 1; - WhichRubric <= (PrjCfg_Rubric_t) (PrjCfg_NUM_RUBRICS - 1); - WhichRubric++) - if (Prj_CheckIfICanViewRubric (Projects->Prj.PrjCod,WhichRubric)) - { - /***** Get rubric data *****/ - Rub_RubricConstructor (&Rubric); - Rubric.RubCod = Projects->Config.RubCod[WhichRubric]; - Rub_GetRubricDataByCod (&Rubric); + /***** Rubrics *****/ + for (WhichRubric = (PrjCfg_Rubric_t) 1; + WhichRubric <= (PrjCfg_Rubric_t) (PrjCfg_NUM_RUBRICS - 1); + WhichRubric++) + if (Prj_CheckIfICanViewRubric (Projects->Prj.PrjCod,WhichRubric)) + { + /***** Get rubric data *****/ + Rub_RubricConstructor (&Rubric); + Rubric.RubCod = Projects->Config.RubCod[WhichRubric]; + Rub_GetRubricDataByCod (&Rubric); - /***** Show this rubric ready to fill it *****/ - Rub_ShowRubricInProject (Projects,&Rubric, - Txt_PROJECT_RUBRIC[WhichRubric], - Prj_CheckIfICanFillRubric (Projects->Prj.PrjCod,WhichRubric)); + /***** Show this rubric ready to fill it *****/ + Rub_ShowRubricInProject (Projects,&Rubric, + Txt_PROJECT_RUBRIC[WhichRubric], + Prj_CheckIfICanFillRubric (Projects->Prj.PrjCod,WhichRubric)); - /***** Free memory used for rubric *****/ - Rub_RubricDestructor (&Rubric); - } + /***** Free memory used for rubric *****/ + Rub_RubricDestructor (&Rubric); + } - /***** End table *****/ - HTM_TABLE_End (); + /***** End table *****/ + HTM_TABLE_End (); - /***** End box *****/ - Box_BoxEnd (); + /***** End fieldset *****/ + HTM_FIELDSET_End (); } /*****************************************************************************/ diff --git a/swad_text.c b/swad_text.c index 200d2cef9..51d1092fd 100644 --- a/swad_text.c +++ b/swad_text.c @@ -111,6 +111,7 @@ const unsigned Txt_Current_CGI_SWAD_Language = ((unsigned) L); +const char *Txt_NULL = NULL; const char *Txt_NEW_LINE = "\r\n"; // End of line in a file. If we put only \n the file does not look good in some Windows text editors // The HTML entity for "ß" is ß It stands for "S-Z ligature", because this symbol comes from the ligature of a Gothic S and a Z. @@ -2474,6 +2475,29 @@ const char *Txt_Application_key = "Application key"; // Çeviri lazim! #endif +const char *Txt_Assessment = +#if L==1 // ca + "Avaluació"; +#elif L==2 // de + "Bewertung"; +#elif L==3 // en + "Assessment"; +#elif L==4 // es + "Evaluación"; +#elif L==5 // fr + "Évaluation"; +#elif L==6 // gn + "Mbohepy"; +#elif L==7 // it + "Valutazione"; +#elif L==8 // pl + "Ocena"; +#elif L==9 // pt + "Avaliação"; +#elif L==10 // tr + "Değ erlendirme"; +#endif + const char *Txt_Assessment_criteria = #if L==1 // ca "Criteris d'avaluació";