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.110.1: May 14, 2023 Changes in project rubrics.

This commit is contained in:
acanas 2023-05-14 23:25:06 +02:00
parent a395f2014a
commit 941f191c50
2 changed files with 28 additions and 6 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.
*/
#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 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.109: May 11, 2023 Code refactoring confirming removal. (336647 lines)
Version 22.108: May 11, 2023 Code refactoring in forms. (337145 lines)

31
swad_rubric_criteria.c
View File

@ -669,6 +669,7 @@ static void RubCri_ListOneOrMoreCriteriaForEdition (struct Rub_Rubrics *Rubrics,
{
extern const char *Txt_Criteria;
extern const char *Txt_Movement_not_allowed;
extern const char *Txt_Total;
// Actions to change minimum/maximum criterion values
static Act_Action_t RubCri_ActionsValues[RubCri_NUM_VALUES] =
{
@ -678,6 +679,7 @@ static void RubCri_ListOneOrMoreCriteriaForEdition (struct Rub_Rubrics *Rubrics,
unsigned NumCriterion;
char *Anchor;
RubCri_ValueRange_t ValueRange;
double SumOfWeights = 0.0;
/***** Begin table *****/
HTM_TABLE_BeginWideMarginPadding (5);
@ -696,6 +698,7 @@ static void RubCri_ListOneOrMoreCriteriaForEdition (struct Rub_Rubrics *Rubrics,
/***** Get criterion data *****/
RubCri_GetCriterionDataFromRow (mysql_res,&Rubrics->Criterion);
SumOfWeights += Rubrics->Criterion.Weight;
/***** Build anchor string *****/
Frm_SetAnchorStr (Rubrics->Criterion.CriCod,&Anchor);
@ -731,8 +734,7 @@ static void RubCri_ListOneOrMoreCriteriaForEdition (struct Rub_Rubrics *Rubrics,
HTM_TD_End ();
/***** Index *****/
HTM_TD_Begin ("class=\"RT %s\"",
The_GetColorRows ());
HTM_TD_Begin ("class=\"RT %s\"",The_GetColorRows ());
Lay_WriteIndex (Rubrics->Criterion.CriInd,"BIG_INDEX");
HTM_TD_End ();
@ -801,6 +803,23 @@ static void RubCri_ListOneOrMoreCriteriaForEdition (struct Rub_Rubrics *Rubrics,
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 *****/
HTM_TABLE_End ();
}
@ -915,7 +934,7 @@ static void RubCri_ListOneOrMoreCriteriaInProject (struct Prj_Projects *Projects
HTM_TD_Begin ("class=\"RT DAT_%s %s\"",
The_GetSuffix (),
The_GetColorRows ());
HTM_Double (Criterion.Weight);
HTM_Double (Score * Criterion.Weight);
HTM_TD_End ();
/***** End row *****/
@ -1016,8 +1035,10 @@ static void RubCri_PutTableHeadingForCriteria (RubCri_PutColumnForIcons_t PutCol
HTM_TH (Txt_Weight ,HTM_HEAD_RIGHT);
if (PutColumnsForScore == RubCri_PUT_COLUMNS_FOR_SCORE)
{
HTM_TH (Txt_Score ,HTM_HEAD_RIGHT);
if (asprintf (&Title,"%s&nbsp;&times;&nbsp;%s",Txt_Score,Txt_Weight) < 0)
HTM_TH (Txt_Score,HTM_HEAD_RIGHT);
if (asprintf (&Title,"%s&nbsp;&times;&nbsp;%s",
Txt_Score,Txt_Weight) < 0)
Err_NotEnoughMemoryExit ();
HTM_TH (Title,HTM_HEAD_RIGHT);
free (Title);