mirror of
https://github.com/acanas/swad-core.git
synced 2024-06-15 21:24:07 +02:00
Version 22.110.1: May 14, 2023 Changes in project rubrics.
This commit is contained in:
parent
a395f2014a
commit
941f191c50
|
@ -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.110 (2023-05-12)"
|
#define Log_PLATFORM_VERSION "SWAD 22.110.1 (2023-05-14)"
|
||||||
#define CSS_FILE "swad22.107.36.css"
|
#define CSS_FILE "swad22.107.36.css"
|
||||||
#define JS_FILE "swad22.49.js"
|
#define JS_FILE "swad22.49.js"
|
||||||
/*
|
/*
|
||||||
|
Version 22.110.1: May 14, 2023 Changes in project rubrics. (336462 lines)
|
||||||
Version 22.110: May 12, 2023 Code refactoring confirming removal. (336445 lines)
|
Version 22.110: May 12, 2023 Code refactoring confirming removal. (336445 lines)
|
||||||
Version 22.109: May 11, 2023 Code refactoring confirming removal. (336647 lines)
|
Version 22.109: May 11, 2023 Code refactoring confirming removal. (336647 lines)
|
||||||
Version 22.108: May 11, 2023 Code refactoring in forms. (337145 lines)
|
Version 22.108: May 11, 2023 Code refactoring in forms. (337145 lines)
|
||||||
|
|
|
@ -669,6 +669,7 @@ static void RubCri_ListOneOrMoreCriteriaForEdition (struct Rub_Rubrics *Rubrics,
|
||||||
{
|
{
|
||||||
extern const char *Txt_Criteria;
|
extern const char *Txt_Criteria;
|
||||||
extern const char *Txt_Movement_not_allowed;
|
extern const char *Txt_Movement_not_allowed;
|
||||||
|
extern const char *Txt_Total;
|
||||||
// Actions to change minimum/maximum criterion values
|
// Actions to change minimum/maximum criterion values
|
||||||
static Act_Action_t RubCri_ActionsValues[RubCri_NUM_VALUES] =
|
static Act_Action_t RubCri_ActionsValues[RubCri_NUM_VALUES] =
|
||||||
{
|
{
|
||||||
|
@ -678,6 +679,7 @@ static void RubCri_ListOneOrMoreCriteriaForEdition (struct Rub_Rubrics *Rubrics,
|
||||||
unsigned NumCriterion;
|
unsigned NumCriterion;
|
||||||
char *Anchor;
|
char *Anchor;
|
||||||
RubCri_ValueRange_t ValueRange;
|
RubCri_ValueRange_t ValueRange;
|
||||||
|
double SumOfWeights = 0.0;
|
||||||
|
|
||||||
/***** Begin table *****/
|
/***** Begin table *****/
|
||||||
HTM_TABLE_BeginWideMarginPadding (5);
|
HTM_TABLE_BeginWideMarginPadding (5);
|
||||||
|
@ -696,6 +698,7 @@ static void RubCri_ListOneOrMoreCriteriaForEdition (struct Rub_Rubrics *Rubrics,
|
||||||
|
|
||||||
/***** Get criterion data *****/
|
/***** Get criterion data *****/
|
||||||
RubCri_GetCriterionDataFromRow (mysql_res,&Rubrics->Criterion);
|
RubCri_GetCriterionDataFromRow (mysql_res,&Rubrics->Criterion);
|
||||||
|
SumOfWeights += Rubrics->Criterion.Weight;
|
||||||
|
|
||||||
/***** Build anchor string *****/
|
/***** Build anchor string *****/
|
||||||
Frm_SetAnchorStr (Rubrics->Criterion.CriCod,&Anchor);
|
Frm_SetAnchorStr (Rubrics->Criterion.CriCod,&Anchor);
|
||||||
|
@ -731,8 +734,7 @@ static void RubCri_ListOneOrMoreCriteriaForEdition (struct Rub_Rubrics *Rubrics,
|
||||||
HTM_TD_End ();
|
HTM_TD_End ();
|
||||||
|
|
||||||
/***** Index *****/
|
/***** Index *****/
|
||||||
HTM_TD_Begin ("class=\"RT %s\"",
|
HTM_TD_Begin ("class=\"RT %s\"",The_GetColorRows ());
|
||||||
The_GetColorRows ());
|
|
||||||
Lay_WriteIndex (Rubrics->Criterion.CriInd,"BIG_INDEX");
|
Lay_WriteIndex (Rubrics->Criterion.CriInd,"BIG_INDEX");
|
||||||
HTM_TD_End ();
|
HTM_TD_End ();
|
||||||
|
|
||||||
|
@ -801,6 +803,23 @@ static void RubCri_ListOneOrMoreCriteriaForEdition (struct Rub_Rubrics *Rubrics,
|
||||||
Frm_FreeAnchorStr (&Anchor);
|
Frm_FreeAnchorStr (&Anchor);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/***** Write total row *****/
|
||||||
|
HTM_TR_Begin (NULL);
|
||||||
|
|
||||||
|
/***** Label *****/
|
||||||
|
HTM_TD_Begin ("colspan=\"6\" class=\"RB LINE_TOP DAT_STRONG_%s\"",
|
||||||
|
The_GetSuffix ());
|
||||||
|
HTM_Txt (Txt_Total);
|
||||||
|
HTM_TD_End ();
|
||||||
|
|
||||||
|
/***** Sum of weights *****/
|
||||||
|
HTM_TD_Begin ("class=\"RB LINE_TOP DAT_STRONG_%s\"",The_GetSuffix ());
|
||||||
|
HTM_Double (SumOfWeights);
|
||||||
|
HTM_TD_End ();
|
||||||
|
|
||||||
|
/***** End row *****/
|
||||||
|
HTM_TR_End ();
|
||||||
|
|
||||||
/***** End table *****/
|
/***** End table *****/
|
||||||
HTM_TABLE_End ();
|
HTM_TABLE_End ();
|
||||||
}
|
}
|
||||||
|
@ -915,7 +934,7 @@ static void RubCri_ListOneOrMoreCriteriaInProject (struct Prj_Projects *Projects
|
||||||
HTM_TD_Begin ("class=\"RT DAT_%s %s\"",
|
HTM_TD_Begin ("class=\"RT DAT_%s %s\"",
|
||||||
The_GetSuffix (),
|
The_GetSuffix (),
|
||||||
The_GetColorRows ());
|
The_GetColorRows ());
|
||||||
HTM_Double (Criterion.Weight);
|
HTM_Double (Score * Criterion.Weight);
|
||||||
HTM_TD_End ();
|
HTM_TD_End ();
|
||||||
|
|
||||||
/***** End row *****/
|
/***** End row *****/
|
||||||
|
@ -1017,7 +1036,9 @@ static void RubCri_PutTableHeadingForCriteria (RubCri_PutColumnForIcons_t PutCol
|
||||||
if (PutColumnsForScore == RubCri_PUT_COLUMNS_FOR_SCORE)
|
if (PutColumnsForScore == RubCri_PUT_COLUMNS_FOR_SCORE)
|
||||||
{
|
{
|
||||||
HTM_TH (Txt_Score,HTM_HEAD_RIGHT);
|
HTM_TH (Txt_Score,HTM_HEAD_RIGHT);
|
||||||
if (asprintf (&Title,"%s × %s",Txt_Score,Txt_Weight) < 0)
|
|
||||||
|
if (asprintf (&Title,"%s × %s",
|
||||||
|
Txt_Score,Txt_Weight) < 0)
|
||||||
Err_NotEnoughMemoryExit ();
|
Err_NotEnoughMemoryExit ();
|
||||||
HTM_TH (Title,HTM_HEAD_RIGHT);
|
HTM_TH (Title,HTM_HEAD_RIGHT);
|
||||||
free (Title);
|
free (Title);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user