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.36.1: Sep 30, 2022 Changes in layout of exams.

This commit is contained in:
acanas 2022-09-30 22:35:11 +02:00
parent 1a1a46dd5b
commit 9ec703e908
2 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -606,10 +606,11 @@ TODO: Fix bug: error al enviar un mensaje a dos recipientes, error on duplicate
TODO: Attach pdf files in multimedia.
*/
#define Log_PLATFORM_VERSION "SWAD 22.36 (2022-09-30)"
#define Log_PLATFORM_VERSION "SWAD 22.36.1 (2022-09-30)"
#define CSS_FILE "swad22.35.css"
#define JS_FILE "swad21.100.js"
/*
Version 22.36.1: Sep 30, 2022 Changes in layout of exams. (332596 lines)
Version 22.36: Sep 30, 2022 Code refactoring in exams. (332589 lines)
Version 22.35: Sep 30, 2022 Changes in layout of projects. (332690 lines)
Version 22.34: Sep 29, 2022 Changes in layout of assignments. (332721 lines)

43
swad_exam.c
View File

@ -486,19 +486,14 @@ static void Exa_ShowOneExam (struct Exa_Exams *Exams,bool ShowOnlyThisExam)
HTM_TR_Begin (NULL);
/***** Icons related to this exam *****/
if (Exa_CheckIfICanEditExams ())
{
if (ShowOnlyThisExam)
HTM_TD_Begin ("rowspan=\"2\" class=\"CONTEXT_COL\"");
else
if (!ShowOnlyThisExam)
if (Exa_CheckIfICanEditExams ())
{
HTM_TD_Begin ("rowspan=\"2\" class=\"CONTEXT_COL %s\"",
The_GetColorRows ());
/* Icons to remove/edit this exam */
Exa_PutIconsToRemEditOneExam (Exams,Anchor);
HTM_TD_End ();
}
The_GetColorRows ());
Exa_PutIconsToRemEditOneExam (Exams,Anchor);
HTM_TD_End ();
}
/***** Start/end date/time *****/
UniqueId++;
@ -632,6 +627,8 @@ static void Exa_ShowOneExam (struct Exa_Exams *Exams,bool ShowOnlyThisExam)
static void Exa_PutIconsOneExam (void *Exams)
{
char *Anchor;
/*
static const Act_Action_t NextAction[Rol_NUM_ROLES] =
{
[Rol_STD ] = ActSeeMyExaResExa,
@ -639,18 +636,28 @@ static void Exa_PutIconsOneExam (void *Exams)
[Rol_TCH ] = ActSeeUsrExaResExa,
[Rol_SYS_ADM] = ActSeeUsrExaResExa,
};
*/
if (Exams)
{
/***** Put icon to view results of sessions in exam *****/
if (NextAction[Gbl.Usrs.Me.Role.Logged])
Ico_PutContextualIconToShowResults (NextAction[Gbl.Usrs.Me.Role.Logged],ExaRes_RESULTS_BOX_ID,
Exa_PutParams,Exams);
// if (NextAction[Gbl.Usrs.Me.Role.Logged])
// Ico_PutContextualIconToShowResults (NextAction[Gbl.Usrs.Me.Role.Logged],ExaRes_RESULTS_BOX_ID,
// Exa_PutParams,Exams);
/***** Link to get resource link *****/
if (PrgRsc_CheckIfICanGetLink ())
Ico_PutContextualIconToGetLink (ActReqLnkExa,NULL,
Exa_PutParams,Exams);
// if (PrgRsc_CheckIfICanGetLink ())
// Ico_PutContextualIconToGetLink (ActReqLnkExa,NULL,
// Exa_PutParams,Exams);
/***** Build anchor string *****/
Frm_SetAnchorStr (((struct Exa_Exams *) Exams)->Exam.ExaCod,&Anchor);
/***** Icons to remove/edit this exam *****/
Exa_PutIconsToRemEditOneExam ((struct Exa_Exams *) Exams,Anchor);
/***** Free anchor string *****/
Frm_FreeAnchorStr (Anchor);
}
}