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.104.6: May 04, 2023 Changes in projects.

This commit is contained in:
acanas 2023-05-04 22:46:39 +02:00
parent c45d5cf81d
commit 01e07f8c8b
5 changed files with 93 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
css/swad22.103.css → css/swad22.104.4.css
View File

46
swad_browser.c
View File

@ -2714,23 +2714,32 @@ void Brw_ShowFileBrowserNormal (void)
void Brw_ShowFileBrowserProject (long PrjCod) void Brw_ShowFileBrowserProject (long PrjCod)
{ {
Brw_WriteTopBeforeShowingFileBrowser (); extern const char *Txt_Documents;
if (Prj_CheckIfICanViewProjectDocuments (PrjCod)) /***** Begin fieldset *****/
{ HTM_FIELDSET_Begin ();
/***** Show the tree with the project documents *****/ HTM_LEYEND (Txt_Documents);
Gbl.FileBrowser.Type = Brw_ADMI_DOC_PRJ;
Brw_InitializeFileBrowser ();
Brw_ShowFileBrowser ();
}
if (Prj_CheckIfICanViewProjectAssessment (PrjCod)) Brw_WriteTopBeforeShowingFileBrowser ();
{
/***** Show the tree with the project assessment *****/ if (Prj_CheckIfICanViewProjectDocuments (PrjCod))
Gbl.FileBrowser.Type = Brw_ADMI_ASS_PRJ; {
Brw_InitializeFileBrowser (); /***** Show the tree with the project documents *****/
Brw_ShowFileBrowser (); 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_Homework_for_teachers;
extern const char *Hlp_FILES_Marks; extern const char *Hlp_FILES_Marks;
extern const char *Hlp_FILES_Briefcase; 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_area;
extern const char *Txt_Documents_management_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_Temporary_private_storage_area;
extern const char *Txt_Project_documents; extern const char *Txt_Project_documents;
extern const char *Txt_Project_assessment; 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_; extern const char *Txt_Files_of_marks_must_contain_a_table_in_HTML_format_;
static const char **Brw_TitleOfFileBrowser[Brw_NUM_TYPES_FILE_BROWSER] = 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_SHR_INS] = &Hlp_FILES_Shared,
[Brw_ADMI_TCH_CRS] = &Hlp_FILES_Private, [Brw_ADMI_TCH_CRS] = &Hlp_FILES_Private,
[Brw_ADMI_TCH_GRP] = &Hlp_FILES_Private, [Brw_ADMI_TCH_GRP] = &Hlp_FILES_Private,
[Brw_ADMI_DOC_PRJ] = &Hlp_ASSESSMENT_Projects, [Brw_ADMI_DOC_PRJ] = &Txt_NULL,
[Brw_ADMI_ASS_PRJ] = &Hlp_ASSESSMENT_Projects, [Brw_ADMI_ASS_PRJ] = &Txt_NULL,
}; };
struct Brw_NumObjects Removed; struct Brw_NumObjects Removed;
char FileBrowserSectionId[32]; char FileBrowserSectionId[32];

7
swad_changelog.h
View File

@ -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. 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 CSS_FILE "swad22.104.4.css"
#define JS_FILE "swad22.49.js" #define JS_FILE "swad22.49.js"
/* /*
Version 22.104.5: May 04, 2023 Fixed issue in indicators (342853 lines) Version 22.104.6: May 04, 2023 Changes in projects. (338079 lines)
Version 22.104.4: May 04, 2023 Changes in lists. Changes in project edition. (342853 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.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.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.1: May 04, 2023 Rubrics in project. Code refactoring in file browsers. (338014 lines)

74
swad_project.c
View File

@ -1346,16 +1346,18 @@ void Prj_ShowBoxWithOneProject (struct Prj_Projects *Projects)
Prj_PutIconsOnePrj,Projects, Prj_PutIconsOnePrj,Projects,
Hlp_ASSESSMENT_Projects,Box_NOT_CLOSABLE); Hlp_ASSESSMENT_Projects,Box_NOT_CLOSABLE);
/***** Begin table *****/ /***** Show project data *****/
HTM_TABLE_BeginWidePadding (2); HTM_FIELDSET_Begin ();
HTM_LEYEND (Txt_Project);
HTM_TABLE_BeginWidePadding (2);
/***** Table head and project *****/ /***** Table head and project *****/
Projects->View = Prj_VIEW_ONE_PROJECT; Projects->View = Prj_VIEW_ONE_PROJECT;
Prj_ShowProjectsHead (Projects); Prj_ShowProjectsHead (Projects);
Prj_ShowProjectRow (Projects); Prj_ShowProjectRow (Projects);
/***** End table *****/ HTM_TABLE_End ();
HTM_TABLE_End (); HTM_FIELDSET_End ();
/***** Show project file browsers *****/ /***** Show project file browsers *****/
if (Prj_CheckIfICanViewProjectFiles (Projects->Prj.PrjCod)) 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) static void Prj_ShowRubrics (struct Prj_Projects *Projects)
{ {
extern const char *Hlp_ASSESSMENT_Projects; extern const char *Txt_Assessment;
extern const char *Txt_Rubrics;
extern const char *Txt_PROJECT_RUBRIC[PrjCfg_NUM_RUBRICS]; extern const char *Txt_PROJECT_RUBRIC[PrjCfg_NUM_RUBRICS];
struct Rub_Rubric Rubric; struct Rub_Rubric Rubric;
PrjCfg_Rubric_t WhichRubric; PrjCfg_Rubric_t WhichRubric;
/***** Begin box *****/ /***** Begin fieldset *****/
Box_BoxBegin ("100%",Txt_Rubrics, HTM_FIELDSET_Begin ();
NULL,NULL, HTM_LEYEND (Txt_Assessment);
Hlp_ASSESSMENT_Projects,Box_NOT_CLOSABLE);
/***** Begin table *****/ /***** Begin table *****/
HTM_TABLE_BeginWideMarginPadding (5); HTM_TABLE_BeginWideMarginPadding (5);
/***** Rubrics *****/ /***** Rubrics *****/
for (WhichRubric = (PrjCfg_Rubric_t) 1; for (WhichRubric = (PrjCfg_Rubric_t) 1;
WhichRubric <= (PrjCfg_Rubric_t) (PrjCfg_NUM_RUBRICS - 1); WhichRubric <= (PrjCfg_Rubric_t) (PrjCfg_NUM_RUBRICS - 1);
WhichRubric++) WhichRubric++)
if (Prj_CheckIfICanViewRubric (Projects->Prj.PrjCod,WhichRubric)) if (Prj_CheckIfICanViewRubric (Projects->Prj.PrjCod,WhichRubric))
{ {
/***** Get rubric data *****/ /***** Get rubric data *****/
Rub_RubricConstructor (&Rubric); Rub_RubricConstructor (&Rubric);
Rubric.RubCod = Projects->Config.RubCod[WhichRubric]; Rubric.RubCod = Projects->Config.RubCod[WhichRubric];
Rub_GetRubricDataByCod (&Rubric); Rub_GetRubricDataByCod (&Rubric);
/***** Show this rubric ready to fill it *****/ /***** Show this rubric ready to fill it *****/
Rub_ShowRubricInProject (Projects,&Rubric, Rub_ShowRubricInProject (Projects,&Rubric,
Txt_PROJECT_RUBRIC[WhichRubric], Txt_PROJECT_RUBRIC[WhichRubric],
Prj_CheckIfICanFillRubric (Projects->Prj.PrjCod,WhichRubric)); Prj_CheckIfICanFillRubric (Projects->Prj.PrjCod,WhichRubric));
/***** Free memory used for rubric *****/ /***** Free memory used for rubric *****/
Rub_RubricDestructor (&Rubric); Rub_RubricDestructor (&Rubric);
} }
/***** End table *****/ /***** End table *****/
HTM_TABLE_End (); HTM_TABLE_End ();
/***** End box *****/ /***** End fieldset *****/
Box_BoxEnd (); HTM_FIELDSET_End ();
} }
/*****************************************************************************/ /*****************************************************************************/

24
swad_text.c
View File

@ -111,6 +111,7 @@
const unsigned Txt_Current_CGI_SWAD_Language = ((unsigned) L); 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 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 &szlig; It stands for "S-Z ligature", because this symbol comes from the ligature of a Gothic S and a Z. // The HTML entity for "ß" is &szlig; 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! "Application key"; // Çeviri lazim!
#endif #endif
const char *Txt_Assessment =
#if L==1 // ca
"Avaluaci&oacute;";
#elif L==2 // de
"Bewertung";
#elif L==3 // en
"Assessment";
#elif L==4 // es
"Evaluaci&oacute;n";
#elif L==5 // fr
"&Eacute;valuation";
#elif L==6 // gn
"Mbohepy";
#elif L==7 // it
"Valutazione";
#elif L==8 // pl
"Ocena";
#elif L==9 // pt
"Avalia&ccedil;&atilde;o";
#elif L==10 // tr
"De&gbreve; erlendirme";
#endif
const char *Txt_Assessment_criteria = const char *Txt_Assessment_criteria =
#if L==1 // ca #if L==1 // ca
"Criteris d'avaluaci&oacute;"; "Criteris d'avaluaci&oacute;";