Marown/swad-core
Marown/swad-core
1
0
Fork 0
mirror of https://github.com/acanas/swad-core.git synced 2024-05-29 04:53:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version 22.103: Apr 25, 2023 Fixed issue in list of rubric criteria.

Browse Source
This commit is contained in:
acanas 2023-04-25 11:39:49 +02:00
parent 2c04f87d61
commit 1d181d04eb
3 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
css/swad22.95.css → css/swad22.103.css
View File

@ -3253,16 +3253,16 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;}
.BIG_INDEX_PURPLE, .BIG_INDEX_PURPLE,
.BIG_INDEX_BLUE, .BIG_INDEX_BLUE,
.BIG_INDEX_YELLOW, .BIG_INDEX_YELLOW,
.BIG_INDEX_PINK {color:#808080; font-size:20pt; font-weight:bold;} .BIG_INDEX_PINK {color:#808080; font-size:16pt; font-weight:bold;}
.BIG_INDEX_DARK {color:#d0d0d0; font-size:20pt; font-weight:bold;} .BIG_INDEX_DARK {color:#d0d0d0; font-size:16pt; font-weight:bold;}
.BIG_INDEX_RED_WHITE, .BIG_INDEX_RED_WHITE,
.BIG_INDEX_RED_GREY, .BIG_INDEX_RED_GREY,
.BIG_INDEX_RED_PURPLE, .BIG_INDEX_RED_PURPLE,
.BIG_INDEX_RED_BLUE, .BIG_INDEX_RED_BLUE,
.BIG_INDEX_RED_YELLOW, .BIG_INDEX_RED_YELLOW,
.BIG_INDEX_RED_PINK {color:#660000; font-size:20pt; font-weight:bold;} .BIG_INDEX_RED_PINK {color:#660000; font-size:16pt; font-weight:bold;}
.BIG_INDEX_RED_DARK {color:#ff8080; font-size:20pt; font-weight:bold;} .BIG_INDEX_RED_DARK {color:#ff8080; font-size:16pt; font-weight:bold;}
/******************************** Update links *******************************/ /******************************** Update links *******************************/
.UPD .UPD

5
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.102.3 (2023-04-21)" #define Log_PLATFORM_VERSION "SWAD 22.103 (2023-04-25)"
#define CSS_FILE "swad22.95.css" #define CSS_FILE "swad22.103.css"
#define JS_FILE "swad22.49.js" #define JS_FILE "swad22.49.js"
/* /*
Version 22.103: Apr 25, 2023 Fixed issue in list of rubric criteria. (337537 lines)
Version 22.102.3: Apr 21, 2023 Changes in exams. (337538 lines) Version 22.102.3: Apr 21, 2023 Changes in exams. (337538 lines)
Version 22.102.2: Apr 21, 2023 Changes in games. (337454 lines) Version 22.102.2: Apr 21, 2023 Changes in games. (337454 lines)
Version 22.102.1: Apr 21, 2023 Changes in rubrics. (337378 lines) Version 22.102.1: Apr 21, 2023 Changes in rubrics. (337378 lines)

50
swad_rubric_criteria.c
View File

@ -66,6 +66,16 @@ static const char *RubCri_ParValues[RubCri_NUM_VALUES] =
#define RubCri_WEIGHT_MAX 1.0 #define RubCri_WEIGHT_MAX 1.0
#define RubCri_WEIGHT_STEP 0.000001 #define RubCri_WEIGHT_STEP 0.000001
/*****************************************************************************/
/******************************* Private types *******************************/
/*****************************************************************************/
typedef enum
{
RubCri_DONT_PUT_COLUMN_FOR_ICONS,
RubCri_PUT_COLUMN_FOR_ICONS,
} RubCri_PutColumnForIcons_t;
/*****************************************************************************/ /*****************************************************************************/
/***************************** Private prototypes ****************************/ /***************************** Private prototypes ****************************/
/*****************************************************************************/ /*****************************************************************************/
@ -92,7 +102,7 @@ static void RubCri_ListOneOrMoreCriteriaForEdition (struct Rub_Rubrics *Rubrics,
static void RubCri_GetCriterionDataFromRow (MYSQL_RES *mysql_res, static void RubCri_GetCriterionDataFromRow (MYSQL_RES *mysql_res,
struct RubCri_Criterion *Criterion); struct RubCri_Criterion *Criterion);
static void RubCri_PutTableHeadingForCriteria (void); static void RubCri_PutTableHeadingForCriteria (RubCri_PutColumnForIcons_t PutColumnForIcons);
static void RubCri_GetAndCheckRubricAndCriterion (struct Rub_Rubrics *Rubrics); static void RubCri_GetAndCheckRubricAndCriterion (struct Rub_Rubrics *Rubrics);
@ -159,15 +169,11 @@ static void RubCri_PutFormNewCriterion (struct Rub_Rubrics *Rubrics,
NULL,Box_NOT_CLOSABLE,2); NULL,Box_NOT_CLOSABLE,2);
/***** Table heading *****/ /***** Table heading *****/
RubCri_PutTableHeadingForCriteria (); RubCri_PutTableHeadingForCriteria (RubCri_DONT_PUT_COLUMN_FOR_ICONS);
/***** Begin row *****/ /***** Begin row *****/
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
/***** Empty column for buttons *****/
HTM_TD_Begin ("class=\"BT\"");
HTM_TD_End ();
/***** Index *****/ /***** Index *****/
HTM_TD_Begin ("class=\"RT\""); HTM_TD_Begin ("class=\"RT\"");
Lay_WriteIndex (MaxCriInd + 1,"BIG_INDEX"); Lay_WriteIndex (MaxCriInd + 1,"BIG_INDEX");
@ -494,11 +500,11 @@ void RubCri_ListCriteriaForSeeing (const struct Rub_Rubrics *Rubrics)
if (NumCriteria) if (NumCriteria)
RubCri_ListOneOrMoreCriteriaForSeeing (NumCriteria,mysql_res); RubCri_ListOneOrMoreCriteriaForSeeing (NumCriteria,mysql_res);
/***** Free structure that stores the query result *****/
DB_FreeMySQLResult (&mysql_res);
/***** End box *****/ /***** End box *****/
Box_BoxEnd (); Box_BoxEnd ();
/***** Free structure that stores the query result *****/
DB_FreeMySQLResult (&mysql_res);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -531,15 +537,15 @@ void RubCri_ListCriteriaForEdition (struct Rub_Rubrics *Rubrics)
MaxCriInd, MaxCriInd,
NumCriteria,mysql_res); NumCriteria,mysql_res);
/***** Free structure that stores the query result *****/
DB_FreeMySQLResult (&mysql_res);
/***** Put forms to create/edit a criterion *****/ /***** Put forms to create/edit a criterion *****/
if (ICanEditCriteria) if (ICanEditCriteria)
RubCri_PutFormNewCriterion (Rubrics,MaxCriInd); RubCri_PutFormNewCriterion (Rubrics,MaxCriInd);
/***** End box *****/ /***** End box *****/
Box_BoxEnd (); Box_BoxEnd ();
/***** Free structure that stores the query result *****/
DB_FreeMySQLResult (&mysql_res);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -558,7 +564,7 @@ static void RubCri_ListOneOrMoreCriteriaForSeeing (unsigned NumCriteria,
HTM_TABLE_BeginWideMarginPadding (5); HTM_TABLE_BeginWideMarginPadding (5);
/***** Write the heading *****/ /***** Write the heading *****/
RubCri_PutTableHeadingForCriteria (); RubCri_PutTableHeadingForCriteria (RubCri_DONT_PUT_COLUMN_FOR_ICONS);
/***** Write rows *****/ /***** Write rows *****/
for (NumCriterion = 0, The_ResetRowColor (); for (NumCriterion = 0, The_ResetRowColor ();
@ -574,11 +580,6 @@ static void RubCri_ListOneOrMoreCriteriaForSeeing (unsigned NumCriteria,
/***** Begin first row *****/ /***** Begin first row *****/
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
/***** Icons *****/
HTM_TD_Begin ("rowspan=\"2\" class=\"BT %s\"",
The_GetColorRows ());
HTM_TD_End ();
/***** Index *****/ /***** Index *****/
HTM_TD_Begin ("rowspan=\"2\" class=\"RT %s\"", HTM_TD_Begin ("rowspan=\"2\" class=\"RT %s\"",
The_GetColorRows ()); The_GetColorRows ());
@ -596,11 +597,7 @@ static void RubCri_ListOneOrMoreCriteriaForSeeing (unsigned NumCriteria,
HTM_TD_Begin ("class=\"LT DAT_%s %s\"", HTM_TD_Begin ("class=\"LT DAT_%s %s\"",
The_GetSuffix (), The_GetSuffix (),
The_GetColorRows ()); The_GetColorRows ());
// TODO: Write source Rsc_WriteLinkName (&Criterion.Link,Frm_DONT_PUT_FORM_TO_GO);
// Frm_BeginFormAnchor (ActChgLnkRubCri,Anchor);
// RubCri_PutParsOneCriterion (Rubrics);
// Rsc_ShowClipboardToChangeLink (&Criterion.Link);
// Frm_EndForm ();
HTM_TD_End (); HTM_TD_End ();
/***** Minimum and maximum values of criterion *****/ /***** Minimum and maximum values of criterion *****/
@ -669,7 +666,7 @@ static void RubCri_ListOneOrMoreCriteriaForEdition (struct Rub_Rubrics *Rubrics,
HTM_TABLE_BeginWideMarginPadding (5); HTM_TABLE_BeginWideMarginPadding (5);
/***** Write the heading *****/ /***** Write the heading *****/
RubCri_PutTableHeadingForCriteria (); RubCri_PutTableHeadingForCriteria (RubCri_PUT_COLUMN_FOR_ICONS);
/***** Write rows *****/ /***** Write rows *****/
for (NumCriterion = 0, The_ResetRowColor (); for (NumCriterion = 0, The_ResetRowColor ();
@ -856,7 +853,7 @@ static void RubCri_GetCriterionDataFromRow (MYSQL_RES *mysql_res,
/****************** Put table heading for rubric criteria ********************/ /****************** Put table heading for rubric criteria ********************/
/*****************************************************************************/ /*****************************************************************************/
static void RubCri_PutTableHeadingForCriteria (void) static void RubCri_PutTableHeadingForCriteria (RubCri_PutColumnForIcons_t PutColumnForIcons)
{ {
extern const char *Txt_No_INDEX; extern const char *Txt_No_INDEX;
extern const char *Txt_Criterion; extern const char *Txt_Criterion;
@ -869,7 +866,8 @@ static void RubCri_PutTableHeadingForCriteria (void)
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
/***** Header cells *****/ /***** Header cells *****/
HTM_TH_Empty (1); if (PutColumnForIcons == RubCri_PUT_COLUMN_FOR_ICONS)
HTM_TH_Empty (1);
HTM_TH (Txt_No_INDEX ,HTM_HEAD_RIGHT); HTM_TH (Txt_No_INDEX ,HTM_HEAD_RIGHT);
HTM_TH (Txt_Criterion,HTM_HEAD_LEFT ); HTM_TH (Txt_Criterion,HTM_HEAD_LEFT );
HTM_TH (Txt_Source ,HTM_HEAD_LEFT ); HTM_TH (Txt_Source ,HTM_HEAD_LEFT );