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.101.8: Apr 20, 2023 Changes in edition of rubrics, degree types and departments.

This commit is contained in:
acanas 2023-04-20 22:59:13 +02:00
parent 618d9f245b
commit 36674253f1
4 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
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.101.7 (2023-04-20)" #define Log_PLATFORM_VERSION "SWAD 22.101.8 (2023-04-20)"
#define CSS_FILE "swad22.95.css" #define CSS_FILE "swad22.95.css"
#define JS_FILE "swad22.49.js" #define JS_FILE "swad22.49.js"
/* /*
Version 22.101.8: Apr 20, 2023 Changes in edition of rubrics, degree types and departments. (337350 lines)
Version 22.101.7: Apr 20, 2023 Changes in edition of exams and games. (337342 lines) Version 22.101.7: Apr 20, 2023 Changes in edition of exams and games. (337342 lines)
Version 22.101.6: Apr 20, 2023 Changes in edition of program items. (337370 lines) Version 22.101.6: Apr 20, 2023 Changes in edition of program items. (337370 lines)
Version 22.101.5: Apr 20, 2023 Changes in edition of buildings and rooms. (337392 lines) Version 22.101.5: Apr 20, 2023 Changes in edition of buildings and rooms. (337392 lines)

3
swad_degree_type.c
View File

@ -467,14 +467,13 @@ bool DegTyp_CheckIfICanCreateDegreeTypes (void)
static void DegTyp_PutFormToCreateDegreeType (void) static void DegTyp_PutFormToCreateDegreeType (void)
{ {
extern const char *Txt_Type_of_degree;
extern const char *Txt_Create_type_of_degree; extern const char *Txt_Create_type_of_degree;
/***** Begin form *****/ /***** Begin form *****/
Frm_BeginForm (ActNewDegTyp); Frm_BeginForm (ActNewDegTyp);
/***** Begin box and table *****/ /***** Begin box and table *****/
Box_BoxTableBegin (NULL,Txt_Type_of_degree, Box_BoxTableBegin (NULL,NULL,
NULL,NULL, NULL,NULL,
NULL,Box_NOT_CLOSABLE,2); NULL,Box_NOT_CLOSABLE,2);

17
swad_department.c
View File

@ -80,6 +80,7 @@ static void Dpt_ResetDepartments (struct Dpt_Departments *Departments);
static Dpt_Order_t Dpt_GetParDptOrder (void); static Dpt_Order_t Dpt_GetParDptOrder (void);
static void Dpt_PutIconToEditDpts (__attribute__((unused)) void *Args); static void Dpt_PutIconToEditDpts (__attribute__((unused)) void *Args);
static void Dpt_PutIconToViewDpts (__attribute__((unused)) void *Args);
static void Dpt_EditDepartmentsInternal (void); static void Dpt_EditDepartmentsInternal (void);
static void Dpt_GetListDepartments (struct Dpt_Departments *Departments,long InsCod); static void Dpt_GetListDepartments (struct Dpt_Departments *Departments,long InsCod);
@ -269,6 +270,16 @@ static void Dpt_PutIconToEditDpts (__attribute__((unused)) void *Args)
NULL,NULL); NULL,NULL);
} }
/*****************************************************************************/
/************************ Put icon to view departments ***********************/
/*****************************************************************************/
static void Dpt_PutIconToViewDpts (__attribute__((unused)) void *Args)
{
Ico_PutContextualIconToView (ActSeeDpt,NULL,
NULL,NULL);
}
/*****************************************************************************/ /*****************************************************************************/
/******* Put forms to edit the departments of the current institution ********/ /******* Put forms to edit the departments of the current institution ********/
/*****************************************************************************/ /*****************************************************************************/
@ -308,7 +319,8 @@ static void Dpt_EditDepartmentsInternal (void)
/***** Begin box *****/ /***** Begin box *****/
if (asprintf (&Title,Txt_Departments_of_INSTITUTION_X,Gbl.Hierarchy.Ins.FullName) < 0) if (asprintf (&Title,Txt_Departments_of_INSTITUTION_X,Gbl.Hierarchy.Ins.FullName) < 0)
Err_NotEnoughMemoryExit (); Err_NotEnoughMemoryExit ();
Box_BoxBegin (NULL,Title,NULL,NULL, Box_BoxBegin (NULL,Title,
Dpt_PutIconToViewDpts,NULL,
Hlp_INSTITUTION_Departments_edit,Box_NOT_CLOSABLE); Hlp_INSTITUTION_Departments_edit,Box_NOT_CLOSABLE);
free (Title); free (Title);
@ -798,7 +810,6 @@ void Dpt_ContEditAfterChgDpt (void)
static void Dpt_PutFormToCreateDepartment (void) static void Dpt_PutFormToCreateDepartment (void)
{ {
extern const char *Txt_Department;
extern const char *Txt_Institution; extern const char *Txt_Institution;
extern const char *Txt_Short_name; extern const char *Txt_Short_name;
extern const char *Txt_Full_name; extern const char *Txt_Full_name;
@ -812,7 +823,7 @@ static void Dpt_PutFormToCreateDepartment (void)
Frm_BeginForm (ActNewDpt); Frm_BeginForm (ActNewDpt);
/***** Begin box and table *****/ /***** Begin box and table *****/
Box_BoxTableBegin (NULL,Txt_Department, Box_BoxTableBegin (NULL,NULL,
NULL,NULL, NULL,NULL,
NULL,Box_NOT_CLOSABLE,2); NULL,Box_NOT_CLOSABLE,2);

7
swad_rubric_criteria.c
View File

@ -146,7 +146,6 @@ void RubCri_GetCriterionDataByCod (struct RubCri_Criterion *Criterion)
static void RubCri_PutFormNewCriterion (struct Rub_Rubrics *Rubrics, static void RubCri_PutFormNewCriterion (struct Rub_Rubrics *Rubrics,
unsigned MaxCriInd) unsigned MaxCriInd)
{ {
extern const char *Txt_Criterion;
extern const char *Txt_Create_criterion; extern const char *Txt_Create_criterion;
RubCri_ValueRange_t ValueRange; RubCri_ValueRange_t ValueRange;
@ -155,7 +154,7 @@ static void RubCri_PutFormNewCriterion (struct Rub_Rubrics *Rubrics,
Rub_PutPars (Rubrics); Rub_PutPars (Rubrics);
/***** Begin box and table *****/ /***** Begin box and table *****/
Box_BoxTableBegin (NULL,Txt_Criterion, Box_BoxTableBegin (NULL,NULL,
NULL,NULL, NULL,NULL,
NULL,Box_NOT_CLOSABLE,2); NULL,Box_NOT_CLOSABLE,2);
@ -194,7 +193,7 @@ static void RubCri_PutFormNewCriterion (struct Rub_Rubrics *Rubrics,
ValueRange <= (RubCri_ValueRange_t) (RubCri_NUM_VALUES - 1); ValueRange <= (RubCri_ValueRange_t) (RubCri_NUM_VALUES - 1);
ValueRange++) ValueRange++)
{ {
HTM_TD_Begin ("class=\"RM\""); HTM_TD_Begin ("class=\"RT\"");
HTM_INPUT_FLOAT (RubCri_ParValues[ValueRange],0.0,DBL_MAX,0.1, HTM_INPUT_FLOAT (RubCri_ParValues[ValueRange],0.0,DBL_MAX,0.1,
Rubrics->Criterion.Values[ValueRange],false, Rubrics->Criterion.Values[ValueRange],false,
" class=\"INPUT_FLOAT INPUT_%s\" required=\"required\"", " class=\"INPUT_FLOAT INPUT_%s\" required=\"required\"",
@ -203,7 +202,7 @@ static void RubCri_PutFormNewCriterion (struct Rub_Rubrics *Rubrics,
} }
/***** Weight *****/ /***** Weight *****/
HTM_TD_Begin ("class=\"RM\""); HTM_TD_Begin ("class=\"RT\"");
HTM_INPUT_FLOAT ("Weight", HTM_INPUT_FLOAT ("Weight",
RubCri_WEIGHT_MIN, RubCri_WEIGHT_MIN,
RubCri_WEIGHT_MAX, RubCri_WEIGHT_MAX,