Marown/swad-core
Marown/swad-core
1
0
Fork 0
mirror of https://github.com/acanas/swad-core.git synced 2024-06-26 10:25:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version19.248.1

Browse Source
This commit is contained in:
acanas 2020-05-30 19:33:55 +02:00
parent 08af524f2d
commit 2e30c73367
2 changed files with 73 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
swad_changelog.h
View File

@ -556,12 +556,11 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - *
En OpenSWAD: En OpenSWAD:
ps2pdf source.ps destination.pdf ps2pdf source.ps destination.pdf
*/ */
#define Log_PLATFORM_VERSION "SWAD 19.248 (2020-05-25)" #define Log_PLATFORM_VERSION "SWAD 19.248.1 (2020-05-25)"
#define CSS_FILE "swad19.238.2.css" #define CSS_FILE "swad19.238.2.css"
#define JS_FILE "swad19.246.1.js" #define JS_FILE "swad19.246.1.js"
/* /*
Version 19.248.1: May 30, 2020 Exam session results can not be marked as visible if end of time is not in the past. (302825 lines)
Version 19.248.1: May 30, 2020 Exam session results can not be marked as visible if end of time is not in the past. (? lines)
Version 19.248: May 30, 2020 New API function getLastLocation. (302787 lines) Version 19.248: May 30, 2020 New API function getLastLocation. (302787 lines)
Version 19.247.1: May 29, 2020 Do not show exam results in hidden exams or hidden exam sessions. (302646 lines) Version 19.247.1: May 29, 2020 Do not show exam results in hidden exams or hidden exam sessions. (302646 lines)
Version 19.247: May 24, 2020 New API function sendMyCurrentLocation. (302622 lines) Version 19.247: May 24, 2020 New API function sendMyCurrentLocation. (302622 lines)

101
swad_exam_session.c
View File

@ -84,6 +84,7 @@ static void ExaSes_ListOneOrMoreSessions (struct Exa_Exams *Exams,
static void ExaSes_ListOneOrMoreSessionsHeading (bool ICanEditSessions); static void ExaSes_ListOneOrMoreSessionsHeading (bool ICanEditSessions);
static bool ExaSes_CheckIfICanEditSessions (void); static bool ExaSes_CheckIfICanEditSessions (void);
static bool ExaSes_CheckIfICanEditThisSession (const struct ExaSes_Session *Session); static bool ExaSes_CheckIfICanEditThisSession (const struct ExaSes_Session *Session);
static bool ExaSes_CheckIfVisibilityOfResultsCanBeChanged (const struct ExaSes_Session *Session);
static void ExaSes_ListOneOrMoreSessionsIcons (struct Exa_Exams *Exams, static void ExaSes_ListOneOrMoreSessionsIcons (struct Exa_Exams *Exams,
const struct ExaSes_Session *Session, const struct ExaSes_Session *Session,
const char *Anchor); const char *Anchor);
@ -511,6 +512,20 @@ static bool ExaSes_CheckIfICanEditThisSession (const struct ExaSes_Session *Sess
} }
} }
/*****************************************************************************/
/********** Check if visibility of session results can be changed ************/
/*****************************************************************************/
static bool ExaSes_CheckIfVisibilityOfResultsCanBeChanged (const struct ExaSes_Session *Session)
{
if (Session->ShowUsrResults || // Results are currently visible
Session->TimeUTC[Dat_END_TIME] < Gbl.StartExecutionTimeUTC) // End of time is in the past
if (ExaSes_CheckIfICanEditThisSession (Session))
return true;
return false;
}
/*****************************************************************************/ /*****************************************************************************/
/************************* Put a column for icons ****************************/ /************************* Put a column for icons ****************************/
/*****************************************************************************/ /*****************************************************************************/
@ -757,19 +772,20 @@ static void ExaSes_ListOneOrMoreSessionsResultTch (struct Exa_Exams *Exams,
extern const char *Txt_Hidden_results; extern const char *Txt_Hidden_results;
extern const char *Txt_Results; extern const char *Txt_Results;
/***** Can I edit exam session vivibility? *****/ Exams->ExaCod = Session->ExaCod;
if (ExaSes_CheckIfICanEditThisSession (Session)) Exams->SesCod = Session->SesCod;
{
Exams->ExaCod = Session->ExaCod;
Exams->SesCod = Session->SesCod;
/* Show exam session results */ /***** Show exam session results *****/
if (ExaSes_CheckIfICanEditThisSession (Session))
Lay_PutContextualLinkOnlyIcon (ActSeeUsrExaResSes,ExaRes_RESULTS_BOX_ID, Lay_PutContextualLinkOnlyIcon (ActSeeUsrExaResSes,ExaRes_RESULTS_BOX_ID,
ExaSes_PutParamsEdit,Exams, ExaSes_PutParamsEdit,Exams,
"trophy.svg", "trophy.svg",
Txt_Results); Txt_Results);
/* I can edit visibility */ /***** Check if visibility of session results can be changed *****/
if (ExaSes_CheckIfVisibilityOfResultsCanBeChanged (Session))
{
/***** Put form to change visibility of session results *****/
Lay_PutContextualLinkOnlyIcon (ActChgVisExaRes,NULL, Lay_PutContextualLinkOnlyIcon (ActChgVisExaRes,NULL,
ExaSes_PutParamsEdit,Exams, ExaSes_PutParamsEdit,Exams,
Session->ShowUsrResults ? "eye-green.svg" : Session->ShowUsrResults ? "eye-green.svg" :
@ -777,8 +793,8 @@ static void ExaSes_ListOneOrMoreSessionsResultTch (struct Exa_Exams *Exams,
Session->ShowUsrResults ? Txt_Visible_results : Session->ShowUsrResults ? Txt_Visible_results :
Txt_Hidden_results); Txt_Hidden_results);
} }
else else // Don't put form
/* I can not edit visibility */ /***** Put icon showing the current visibility of session results *****/
Ico_PutIconOff (Session->ShowUsrResults ? "eye-green.svg" : Ico_PutIconOff (Session->ShowUsrResults ? "eye-green.svg" :
"eye-slash-red.svg", "eye-slash-red.svg",
Session->ShowUsrResults ? Txt_Visible_results : Session->ShowUsrResults ? Txt_Visible_results :
@ -803,19 +819,24 @@ void ExaSes_ToggleVisResultsSesUsr (void)
/***** Get and check parameters *****/ /***** Get and check parameters *****/
ExaSes_GetAndCheckParameters (&Exams,&Exam,&Session); ExaSes_GetAndCheckParameters (&Exams,&Exam,&Session);
/***** Check if I have permission to change visibility *****/ /***** Check if visibility of session results can be changed *****/
if (!ExaSes_CheckIfICanEditThisSession (&Session)) if (!ExaSes_CheckIfVisibilityOfResultsCanBeChanged (&Session))
Lay_NoPermissionExit (); Lay_NoPermissionExit ();
/***** Toggle visibility of exam session results *****/ /***** Toggle visibility of exam session results *****/
Session.ShowUsrResults = !Session.ShowUsrResults; Session.ShowUsrResults = !Session.ShowUsrResults;
DB_QueryUPDATE ("can not toggle visibility of session results", DB_QueryUPDATE ("can not toggle visibility of session results",
"UPDATE exa_sessions" "UPDATE exa_sessions,exa_exams"
" SET ShowUsrResults='%c'" " SET exa_sessions.ShowUsrResults='%c'"
" WHERE SesCod=%ld", " WHERE exa_sessions.SesCod=%ld"
" AND exa_sessions.ExaCod=%ld" // Extra check
" AND exa_sessions.ExaCod=exa_exams.ExaCod"
" AND exa_exams.CrsCod=%ld", // Extra check
Session.ShowUsrResults ? 'Y' : Session.ShowUsrResults ? 'Y' :
'N', 'N',
Session.SesCod); Session.SesCod,
Session.ExaCod,
Gbl.Hierarchy.Crs.CrsCod);
/***** Show current exam *****/ /***** Show current exam *****/
Exa_ShowOnlyOneExam (&Exams,&Exam,&Session, Exa_ShowOnlyOneExam (&Exams,&Exam,&Session,
@ -1122,10 +1143,15 @@ void ExaSes_HideSession (void)
/***** Hide session *****/ /***** Hide session *****/
DB_QueryUPDATE ("can not hide exam sessions", DB_QueryUPDATE ("can not hide exam sessions",
"UPDATE exa_sessions SET Hidden='Y'" "UPDATE exa_sessions,exa_exams"
" WHERE SesCod=%ld" " SET exa_sessions.Hidden='Y'"
" AND ExaCod=%ld", // Extra check " WHERE exa_sessions.SesCod=%ld"
Session.SesCod,Session.ExaCod); " AND exa_sessions.ExaCod=%ld" // Extra check
" AND exa_sessions.ExaCod=exa_exams.ExaCod"
" AND exa_exams.CrsCod=%ld", // Extra check
Session.SesCod,
Session.ExaCod,
Gbl.Hierarchy.Crs.CrsCod);
/***** Show current exam *****/ /***** Show current exam *****/
Exa_ShowOnlyOneExam (&Exams,&Exam,&Session, Exa_ShowOnlyOneExam (&Exams,&Exam,&Session,
@ -1156,10 +1182,15 @@ void ExaSes_UnhideSession (void)
/***** Unhide session *****/ /***** Unhide session *****/
DB_QueryUPDATE ("can not unhide exam session", DB_QueryUPDATE ("can not unhide exam session",
"UPDATE exa_sessions SET Hidden='N'" "UPDATE exa_sessions,exa_exams"
" WHERE SesCod=%ld" " SET exa_sessions.Hidden='N'"
" AND ExaCod=%ld", // Extra check " WHERE exa_sessions.SesCod=%ld"
Session.SesCod,Session.ExaCod); " AND exa_sessions.ExaCod=%ld" // Extra check
" AND exa_sessions.ExaCod=exa_exams.ExaCod"
" AND exa_exams.CrsCod=%ld", // Extra check
Session.SesCod,
Session.ExaCod,
Gbl.Hierarchy.Crs.CrsCod);
/***** Show current exam *****/ /***** Show current exam *****/
Exa_ShowOnlyOneExam (&Exams,&Exam,&Session, Exa_ShowOnlyOneExam (&Exams,&Exam,&Session,
@ -1489,7 +1520,11 @@ void ExaSes_ReceiveFormSession (void)
if (ItsANewSession) if (ItsANewSession)
ExaSes_CreateSession (&Session); ExaSes_CreateSession (&Session);
else else
{
if (Session.TimeUTC[Dat_END_TIME] >= Gbl.StartExecutionTimeUTC) // End of time is in the future
Session.ShowUsrResults = false; // Force results to be hidden
ExaSes_UpdateSession (&Session); ExaSes_UpdateSession (&Session);
}
/***** Free memory for list of selected groups *****/ /***** Free memory for list of selected groups *****/
Grp_FreeListCodSelectedGrps (); Grp_FreeListCodSelectedGrps ();
@ -1550,19 +1585,25 @@ static void ExaSes_UpdateSession (struct ExaSes_Session *Session)
/***** Insert this new exam session into database *****/ /***** Insert this new exam session into database *****/
DB_QueryUPDATE ("can not update exam session", DB_QueryUPDATE ("can not update exam session",
"UPDATE exa_sessions,exa_exams" "UPDATE exa_sessions,exa_exams"
" SET exa_sessions.StartTime=FROM_UNIXTIME(%ld)," " SET exa_sessions.Hidden='%c',"
"exa_sessions.StartTime=FROM_UNIXTIME(%ld),"
"exa_sessions.EndTime=FROM_UNIXTIME(%ld)," "exa_sessions.EndTime=FROM_UNIXTIME(%ld),"
"exa_sessions.Title='%s'," "exa_sessions.Title='%s',"
"exa_sessions.Hidden='%c'" "exa_sessions.ShowUsrResults='%c'"
" WHERE exa_sessions.SesCod=%ld" " WHERE exa_sessions.SesCod=%ld"
" AND exa_sessions.ExaCod=%ld" // Extra check
" AND exa_sessions.ExaCod=exa_exams.ExaCod" " AND exa_sessions.ExaCod=exa_exams.ExaCod"
" AND exa_exams.CrsCod=%ld", // Extra check " AND exa_exams.CrsCod=%ld", // Extra check
Session->TimeUTC[Dat_START_TIME], // Start time Session->Hidden ? 'Y' :
'N',
Session->TimeUTC[Dat_START_TIME], // Start time
Session->TimeUTC[Dat_END_TIME ], // End time Session->TimeUTC[Dat_END_TIME ], // End time
Session->Title, Session->Title,
Session->Hidden ? 'Y' : Session->ShowUsrResults ? 'Y' :
'N', 'N',
Session->SesCod,Gbl.Hierarchy.Crs.CrsCod); Session->SesCod,
Session->ExaCod,
Gbl.Hierarchy.Crs.CrsCod);
/***** Update groups associated to the exam session *****/ /***** Update groups associated to the exam session *****/
ExaSes_RemoveGroups (Session->SesCod); // Remove all groups associated to this session ExaSes_RemoveGroups (Session->SesCod); // Remove all groups associated to this session