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.102.1: Apr 21, 2023 Changes in rubrics.

This commit is contained in:
acanas 2023-04-21 19:22:20 +02:00
parent adcdd5a0e9
commit 81381deda6
2 changed files with 80 additions and 59 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.102 (2023-04-21)"
#define Log_PLATFORM_VERSION "SWAD 22.102.1 (2023-04-21)"
#define CSS_FILE "swad22.95.css"
#define JS_FILE "swad22.49.js"
/*
Version 22.102.1: Apr 21, 2023 Changes in rubrics. (337378 lines)
Version 22.102: Apr 21, 2023 Rubrics in project. Not finished. (337360 lines)
Version 22.101.12:Apr 21, 2023 Code refactoring in attendance and match results. (337275 lines)
Version 22.101.11:Apr 21, 2023 Changes in edition of centers and places. (337289 lines)

136
swad_rubric.c
View File

@ -66,10 +66,10 @@ static void Rub_PutParsToCreateNewRubric (void *Rubrics);
static void Rub_ShowRubricMainData (struct Rub_Rubrics *Rubrics,
bool ShowOnlyThisRubric);
static void Rub_PutIconsOneRubric (void *Rubrics);
static void Rub_WriteAuthor (const struct Rub_Rubric *Rubric);
static void Rub_PutIconsViewingOneRubric (void *Rubrics);
static void Rub_PutIconsEditingOneRubric (void *Rubrics);
static void Rub_PutIconsToRemEditOneRubric (struct Rub_Rubrics *Rubrics);
static void Rub_WriteAuthor (const struct Rub_Rubric *Rubric);
static void Rub_RemoveRubricFromAllTables (long RubCod);
@ -350,7 +350,7 @@ void Rub_ShowOnlyOneRubric (struct Rub_Rubrics *Rubrics)
/***** Begin box *****/
Box_BoxBegin (NULL,Rubrics->Rubric.Title[0] ? Rubrics->Rubric.Title :
Txt_Rubric,
Rub_PutIconsOneRubric,Rubrics,
Rub_PutIconsViewingOneRubric,Rubrics,
Hlp_ASSESSMENT_Rubrics,Box_NOT_CLOSABLE);
/***** Show main data of this rubric *****/
@ -450,28 +450,29 @@ static void Rub_ShowRubricMainData (struct Rub_Rubrics *Rubrics,
}
/*****************************************************************************/
/******************* Put icons to remove/edit one rubric *********************/
/*************** Put icons when viewing ot editing one rubric ****************/
/*****************************************************************************/
static void Rub_PutIconsOneRubric (void *Rubrics)
static void Rub_PutIconsViewingOneRubric (void *Rubrics)
{
if (Rubrics)
Rub_PutIconsToRemEditOneRubric (Rubrics);
}
/*****************************************************************************/
/*********************** Write the author of a rubric ************************/
/*****************************************************************************/
static void Rub_WriteAuthor (const struct Rub_Rubric *Rubric)
static void Rub_PutIconsEditingOneRubric (void *Rubrics)
{
Usr_WriteAuthor1Line (Rubric->UsrCod,
false); // Not hidden
}
if (Rubrics)
{
/***** Icon to view rubric *****/
Ico_PutContextualIconToView (ActSeeOneRub,NULL,
Rub_PutPars,Rubrics);
/*****************************************************************************/
/******************* Put icons to remove/edit one rubric *********************/
/*****************************************************************************/
/***** Link to get resource link *****/
if (Rsc_CheckIfICanGetLink ())
Ico_PutContextualIconToGetLink (ActReqLnkRub,NULL,
Rub_PutPars,Rubrics);
}
}
static void Rub_PutIconsToRemEditOneRubric (struct Rub_Rubrics *Rubrics)
{
@ -492,6 +493,16 @@ static void Rub_PutIconsToRemEditOneRubric (struct Rub_Rubrics *Rubrics)
}
}
/*****************************************************************************/
/*********************** Write the author of a rubric ************************/
/*****************************************************************************/
static void Rub_WriteAuthor (const struct Rub_Rubric *Rubric)
{
Usr_WriteAuthor1Line (Rubric->UsrCod,
false); // Not hidden
}
/*****************************************************************************/
/*********************** Params used to edit a rubric ************************/
/*****************************************************************************/
@ -819,58 +830,67 @@ void Rub_PutFormEditionRubric (struct Rub_Rubrics *Rubrics,
[Rub_NEW_RUBRIC ] = Txt_Create_rubric,
};
/***** Begin form *****/
Frm_BeginForm (NextAction[ExistingNewRubric]);
Rub_PutPars (Rubrics);
/***** Begin box *****/
Box_BoxBegin (NULL,
Rubrics->Rubric.Title[0] ? Rubrics->Rubric.Title :
Txt_Rubric,
Rub_PutIconsEditingOneRubric,Rubrics,
HelpLink[ExistingNewRubric],Box_NOT_CLOSABLE);
/***** Begin box and table *****/
Box_BoxTableBegin (NULL,
Rubrics->Rubric.Title[0] ? Rubrics->Rubric.Title :
Txt_Rubric,
NULL,NULL,
HelpLink[ExistingNewRubric],Box_NOT_CLOSABLE,2);
/***** Begin form *****/
Frm_BeginForm (NextAction[ExistingNewRubric]);
Rub_PutPars (Rubrics);
/***** Rubric title *****/
HTM_TR_Begin (NULL);
/***** Begin table *****/
HTM_TABLE_BeginWidePadding (2);
/* Label */
Frm_LabelColumn ("RT","Title",Txt_Title);
/***** Rubric title *****/
HTM_TR_Begin (NULL);
/* Data */
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 ();
/* Label */
Frm_LabelColumn ("RT","Title",Txt_Title);
HTM_TR_End ();
/* Data */
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 ();
/***** Rubric text *****/
HTM_TR_Begin (NULL);
HTM_TR_End ();
/* Label */
Frm_LabelColumn ("RT","Txt",Txt_Description);
/***** Rubric text *****/
HTM_TR_Begin (NULL);
/* Data */
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 ();
/* Label */
Frm_LabelColumn ("RT","Txt",Txt_Description);
HTM_TR_End ();
/* Data */
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 ();
/***** End table, send button and end box *****/
Box_BoxTableWithButtonEnd (Button[ExistingNewRubric],
TxtButton[ExistingNewRubric]);
HTM_TR_End ();
/***** End form *****/
Frm_EndForm ();
/***** End table ****/
HTM_TABLE_End ();
/***** Send button *****/
Btn_PutButton (Button[ExistingNewRubric],
TxtButton[ExistingNewRubric]);
/***** End form *****/
Frm_EndForm ();
/***** End box ****/
Box_BoxEnd ();
}
/*****************************************************************************/