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.107.5: May 06, 2023 Changes in edition of rubric.

This commit is contained in:
acanas 2023-05-06 14:05:58 +02:00
parent 9f6e10af0c
commit deecbe7e63
7 changed files with 78 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
css/swad22.107.css
View File

@ -2023,10 +2023,10 @@ a:hover img.CENTER_PHOTO_SHOW
.ALERT_TXT_DARK {color:white;} .ALERT_TXT_DARK {color:white;}
/*********************************** Icons ***********************************/ /*********************************** Icons ***********************************/
.ICOx16 { height:16px; vertical-align:middle;} .ICOx16 { height:16px; vertical-align:middle;}
.ICO16x16 {width:16px; height:16px; vertical-align:middle;} .ICO16x16 {width:16px; height:16px; vertical-align:middle;}
.ICO20x20 {width:20px; height:20px; vertical-align:middle;} .ICO20x20 {width:20px; height:20px; vertical-align:middle;}
.ICOx20 { height:20px; vertical-align:middle; margin:0 auto;} .ICOx20 { height:20px; vertical-align:middle; margin:0 auto;}
.ICO25x25 {width:25px; height:25px; vertical-align:middle;} .ICO25x25 {width:25px; height:25px; vertical-align:middle;}
.ICO40x40 {width:40px; height:40px; vertical-align:middle;} .ICO40x40 {width:40px; height:40px; vertical-align:middle;}
.ICO64x64 {width:64px; height:64px; vertical-align:middle;} .ICO64x64 {width:64px; height:64px; vertical-align:middle;}

10
swad_HTML.c
View File

@ -222,19 +222,11 @@ void HTM_TABLE_BeginWide (void)
void HTM_TABLE_BeginWideMarginPadding (unsigned CellPadding) void HTM_TABLE_BeginWideMarginPadding (unsigned CellPadding)
{ {
if (CellPadding) if (CellPadding)
{
HTM_TxtF ("<table class=\"FRAME_TBL_WIDE_MARGIN CELLS_PAD_%u\">", HTM_TxtF ("<table class=\"FRAME_TBL_WIDE_MARGIN CELLS_PAD_%u\">",
CellPadding); // CellPadding must be 0, 1, 2, 5, 10, 20 CellPadding); // CellPadding must be 0, 1, 2, 5, 10, 20
HTM_TABLE_NestingLevel++;
}
else else
HTM_TABLE_BeginWideMargin (); HTM_Txt ("<table class=\"FRAME_TBL_WIDE_MARGIN\">");
}
void HTM_TABLE_BeginWideMargin (void)
{
HTM_Txt ("<table class=\"FRAME_TBL_WIDE_MARGIN\">");
HTM_TABLE_NestingLevel++; HTM_TABLE_NestingLevel++;
} }

1
swad_HTML.h
View File

@ -80,7 +80,6 @@ void HTM_TABLE_BeginCenter (void);
void HTM_TABLE_BeginWidePadding (unsigned CellPadding); void HTM_TABLE_BeginWidePadding (unsigned CellPadding);
void HTM_TABLE_BeginWide (void); void HTM_TABLE_BeginWide (void);
void HTM_TABLE_BeginWideMarginPadding (unsigned CellPadding); void HTM_TABLE_BeginWideMarginPadding (unsigned CellPadding);
void HTM_TABLE_BeginWideMargin (void);
void HTM_TABLE_End (void); void HTM_TABLE_End (void);
void HTM_TBODY_Begin (const char *fmt,...); void HTM_TBODY_Begin (const char *fmt,...);

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.107.4 (2023-05-06)" #define Log_PLATFORM_VERSION "SWAD 22.107.5 (2023-05-06)"
#define CSS_FILE "swad22.107.css" #define CSS_FILE "swad22.107.css"
#define JS_FILE "swad22.49.js" #define JS_FILE "swad22.49.js"
/* /*
Version 22.107.5: May 06, 2023 Changes in edition of rubric. (338027 lines)
Version 22.107.4: May 06, 2023 Changes in edition of exam. (338040 lines) Version 22.107.4: May 06, 2023 Changes in edition of exam. (338040 lines)
Version 22.107.3: May 06, 2023 Changes in edition of exam. (338045 lines) Version 22.107.3: May 06, 2023 Changes in edition of exam. (338045 lines)
Version 22.107.2: May 05, 2023 Removed unused action in exam sets. (338044 lines) Version 22.107.2: May 05, 2023 Removed unused action in exam sets. (338044 lines)

2
swad_exam.c
View File

@ -1345,7 +1345,7 @@ static void Exa_PutFormEditionExam (struct Exa_Exams *Exams,
Exa_PutPars (Exams); Exa_PutPars (Exams);
/***** Begin table *****/ /***** Begin table *****/
HTM_TABLE_BeginWidePadding (2); HTM_TABLE_BeginCenterPadding (2);
/***** Exam title *****/ /***** Exam title *****/
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);

2
swad_question.c
View File

@ -159,7 +159,7 @@ void Qst_ShowFormRequestEditQsts (struct Qst_Questions *Questions)
Frm_BeginForm (ActLstTstQst); Frm_BeginForm (ActLstTstQst);
Par_PutParUnsigned (NULL,"Order",(unsigned) Qst_DEFAULT_ORDER); Par_PutParUnsigned (NULL,"Order",(unsigned) Qst_DEFAULT_ORDER);
HTM_TABLE_BeginPadding (2); HTM_TABLE_BeginCenterPadding (2);
/***** Selection of tags *****/ /***** Selection of tags *****/
Tag_ShowFormSelTags (&Questions->Tags,mysql_res,false); Tag_ShowFormSelTags (&Questions->Tags,mysql_res,false);

146
swad_rubric.c
View File

@ -821,21 +821,40 @@ void Rub_ReqCreatOrEditRubric (void)
void Rub_PutFormsOneRubric (struct Rub_Rubrics *Rubrics, void Rub_PutFormsOneRubric (struct Rub_Rubrics *Rubrics,
Rub_ExistingNewRubric_t ExistingNewRubric) Rub_ExistingNewRubric_t ExistingNewRubric)
{ {
/***** Put form to create/edit a rubric *****/ extern const char *Hlp_ASSESSMENT_Rubrics_new_rubric;
Rub_PutFormEditionRubric (Rubrics,ExistingNewRubric); extern const char *Hlp_ASSESSMENT_Rubrics_edit_rubric;
extern const char *Txt_Rubric;
/***** Show other lists *****/ static void (*FunctionToDrawContextualIcons[]) (void *Args) =
switch (ExistingNewRubric)
{ {
case Rub_EXISTING_RUBRIC: [Rub_EXISTING_RUBRIC] = Rub_PutIconsEditingOneRubric,
/* Show list of criteria */ [Rub_NEW_RUBRIC ] = NULL,
};
static const char **HelpLink[] =
{
[Rub_EXISTING_RUBRIC] = &Hlp_ASSESSMENT_Rubrics_edit_rubric,
[Rub_NEW_RUBRIC ] = &Hlp_ASSESSMENT_Rubrics_new_rubric,
};
/***** Begin box *****/
Box_BoxBegin (NULL,
Rubrics->Rubric.Title[0] ? Rubrics->Rubric.Title :
Txt_Rubric,
FunctionToDrawContextualIcons[ExistingNewRubric],Rubrics,
*HelpLink[ExistingNewRubric],Box_NOT_CLOSABLE);
/***** Put form to create/edit a rubric *****/
Rub_PutFormEditionRubric (Rubrics,ExistingNewRubric);
/***** Show list of criteria inside box *****/
if (ExistingNewRubric == Rub_EXISTING_RUBRIC)
RubCri_ListCriteriaForEdition (Rubrics); RubCri_ListCriteriaForEdition (Rubrics);
break;
case Rub_NEW_RUBRIC: /***** End box ****/
/* Show rubrics again */ Box_BoxEnd ();
Rub_ListAllRubrics (Rubrics);
break; /***** Show rubrics again outside box *****/
} if (ExistingNewRubric == Rub_NEW_RUBRIC)
Rub_ListAllRubrics (Rubrics);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -845,18 +864,10 @@ void Rub_PutFormsOneRubric (struct Rub_Rubrics *Rubrics,
static void Rub_PutFormEditionRubric (struct Rub_Rubrics *Rubrics, static void Rub_PutFormEditionRubric (struct Rub_Rubrics *Rubrics,
Rub_ExistingNewRubric_t ExistingNewRubric) Rub_ExistingNewRubric_t ExistingNewRubric)
{ {
extern const char *Hlp_ASSESSMENT_Rubrics_new_rubric;
extern const char *Hlp_ASSESSMENT_Rubrics_edit_rubric;
extern const char *Txt_Rubric;
extern const char *Txt_Title; extern const char *Txt_Title;
extern const char *Txt_Description; extern const char *Txt_Description;
extern const char *Txt_Create_rubric; extern const char *Txt_Create_rubric;
extern const char *Txt_Save_changes; extern const char *Txt_Save_changes;
static void (*FunctionToDrawContextualIcons[]) (void *Args) =
{
[Rub_EXISTING_RUBRIC] = Rub_PutIconsEditingOneRubric,
[Rub_NEW_RUBRIC ] = NULL,
};
static Act_Action_t NextAction[] = static Act_Action_t NextAction[] =
{ {
[Rub_EXISTING_RUBRIC] = ActChgRub, [Rub_EXISTING_RUBRIC] = ActChgRub,
@ -867,78 +878,63 @@ static void Rub_PutFormEditionRubric (struct Rub_Rubrics *Rubrics,
[Rub_EXISTING_RUBRIC] = Btn_CONFIRM_BUTTON, [Rub_EXISTING_RUBRIC] = Btn_CONFIRM_BUTTON,
[Rub_NEW_RUBRIC ] = Btn_CREATE_BUTTON, [Rub_NEW_RUBRIC ] = Btn_CREATE_BUTTON,
}; };
const char *HelpLink[] =
{
[Rub_EXISTING_RUBRIC] = Hlp_ASSESSMENT_Rubrics_edit_rubric,
[Rub_NEW_RUBRIC ] = Hlp_ASSESSMENT_Rubrics_new_rubric,
};
const char *TxtButton[] = const char *TxtButton[] =
{ {
[Rub_EXISTING_RUBRIC] = Txt_Save_changes, [Rub_EXISTING_RUBRIC] = Txt_Save_changes,
[Rub_NEW_RUBRIC ] = Txt_Create_rubric, [Rub_NEW_RUBRIC ] = Txt_Create_rubric,
}; };
/***** Begin box *****/ /***** Begin form *****/
Box_BoxBegin (NULL, Frm_BeginForm (NextAction[ExistingNewRubric]);
Rubrics->Rubric.Title[0] ? Rubrics->Rubric.Title : Rub_PutPars (Rubrics);
Txt_Rubric,
FunctionToDrawContextualIcons[ExistingNewRubric],Rubrics,
HelpLink[ExistingNewRubric],Box_NOT_CLOSABLE);
/***** Begin form *****/ /***** Begin table *****/
Frm_BeginForm (NextAction[ExistingNewRubric]); HTM_TABLE_BeginCenterPadding (2);
Rub_PutPars (Rubrics);
/***** Begin table *****/ /***** Rubric title *****/
HTM_TABLE_BeginWidePadding (2); HTM_TR_Begin (NULL);
/***** Rubric title *****/ /* Label */
HTM_TR_Begin (NULL); Frm_LabelColumn ("RT","Title",Txt_Title);
/* Label */ /* Data */
Frm_LabelColumn ("RT","Title",Txt_Title); HTM_TD_Begin ("class=\"LT\"");
HTM_INPUT_TEXT ("Title",Rub_MAX_CHARS_TITLE,Rubrics->Rubric.Title,
HTM_DONT_SUBMIT_ON_CHANGE,
"id=\"Title\""
" class=\"TITLE_DESCRIPTION_WIDTH INPUT_%s\""
" required=\"required\"",
The_GetSuffix ());
HTM_TD_End ();
/* Data */ HTM_TR_End ();
HTM_TD_Begin ("class=\"LT\"");
HTM_INPUT_TEXT ("Title",Rub_MAX_CHARS_TITLE,Rubrics->Rubric.Title,
HTM_DONT_SUBMIT_ON_CHANGE,
"id=\"Title\""
" class=\"TITLE_DESCRIPTION_WIDTH INPUT_%s\""
" required=\"required\"",
The_GetSuffix ());
HTM_TD_End ();
HTM_TR_End (); /***** Rubric text *****/
HTM_TR_Begin (NULL);
/***** Rubric text *****/ /* Label */
HTM_TR_Begin (NULL); Frm_LabelColumn ("RT","Txt",Txt_Description);
/* Label */ /* Data */
Frm_LabelColumn ("RT","Txt",Txt_Description); HTM_TD_Begin ("class=\"LT\"");
HTM_TEXTAREA_Begin ("id=\"Txt\" name=\"Txt\" rows=\"5\""
" class=\"TITLE_DESCRIPTION_WIDTH INPUT_%s\"",
The_GetSuffix ());
HTM_Txt (Rubrics->Rubric.Txt);
HTM_TEXTAREA_End ();
HTM_TD_End ();
/* Data */ HTM_TR_End ();
HTM_TD_Begin ("class=\"LT\"");
HTM_TEXTAREA_Begin ("id=\"Txt\" name=\"Txt\" rows=\"5\""
" class=\"TITLE_DESCRIPTION_WIDTH INPUT_%s\"",
The_GetSuffix ());
HTM_Txt (Rubrics->Rubric.Txt);
HTM_TEXTAREA_End ();
HTM_TD_End ();
HTM_TR_End (); /***** End table ****/
HTM_TABLE_End ();
/***** End table ****/ /***** Send button *****/
HTM_TABLE_End (); Btn_PutButton (Button[ExistingNewRubric],
TxtButton[ExistingNewRubric]);
/***** Send button *****/ /***** End form *****/
Btn_PutButton (Button[ExistingNewRubric], Frm_EndForm ();
TxtButton[ExistingNewRubric]);
/***** End form *****/
Frm_EndForm ();
/***** End box ****/
Box_BoxEnd ();
} }
/*****************************************************************************/ /*****************************************************************************/