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 21.46.5: Oct 27, 2021 Queries moved to module swad_test_database.

This commit is contained in:
acanas 2021-10-27 20:47:01 +02:00
parent a07872fdb6
commit ca0730f7c9
4 changed files with 249 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
swad_changelog.h
View File

@ -602,14 +602,15 @@ TODO: FIX BUG, URGENT! En las fechas como par
TODO: En las encuestas, que los estudiantes no puedan ver los resultados hasta que no finalice el plazo. TODO: En las encuestas, que los estudiantes no puedan ver los resultados hasta que no finalice el plazo.
*/ */
#define Log_PLATFORM_VERSION "SWAD 21.46.4 (2021-10-27)" #define Log_PLATFORM_VERSION "SWAD 21.46.5 (2021-10-27)"
#define CSS_FILE "swad20.45.css" #define CSS_FILE "swad20.45.css"
#define JS_FILE "swad20.69.1.js" #define JS_FILE "swad20.69.1.js"
/* /*
TODO: Rename CENTRE to CENTER in help wiki. TODO: Rename CENTRE to CENTER in help wiki.
TODO: Rename ASSESSMENT.Announcements to ASSESSMENT.Calls_for_exams TODO: Rename ASSESSMENT.Announcements to ASSESSMENT.Calls_for_exams
Version 21.46.4: Oct 27, 2021 Code refactoring in test prints. (? lines) Version 21.46.5: Oct 27, 2021 Queries moved to module swad_test_database. (321140 lines)
Version 21.46.4: Oct 27, 2021 Code refactoring in test prints. (321059 lines)
Version 21.46.3: Oct 27, 2021 Queries moved to module swad_test_database. (321054 lines) Version 21.46.3: Oct 27, 2021 Queries moved to module swad_test_database. (321054 lines)
Version 21.46.2: Oct 26, 2021 Queries moved to module swad_test_database. (321062 lines) Version 21.46.2: Oct 26, 2021 Queries moved to module swad_test_database. (321062 lines)
Version 21.46.1: Oct 26, 2021 Queries moved to module swad_test_database. (321058 lines) Version 21.46.1: Oct 26, 2021 Queries moved to module swad_test_database. (321058 lines)

195
swad_test_database.c
View File

@ -420,3 +420,198 @@ void Tst_DB_UpdatePrint (const struct TstPrn_Print *Print)
Gbl.Usrs.Me.UsrDat.UsrCod); Gbl.Usrs.Me.UsrDat.UsrCod);
Str_SetDecimalPointToLocal (); // Return to local system Str_SetDecimalPointToLocal (); // Return to local system
} }
/*****************************************************************************/
/************ Get the test prints of a user in the current course ************/
/*****************************************************************************/
unsigned Tst_DB_GetUsrPrintsInCurrentCrs (MYSQL_RES **mysql_res,long UsrCod)
{
/***** Make database query *****/
/* From here... ...to here
___________|_____ _____|___________
-----|______Exam_|_____|-----------------|_____|_Exam______|-----> time
Start | End Start | End
*/
return (unsigned)
DB_QuerySELECT (mysql_res,"can not get tests of a user",
"SELECT ExaCod" // row[0]
" FROM tst_exams"
" WHERE CrsCod=%ld"
" AND UsrCod=%ld"
" AND EndTime>=FROM_UNIXTIME(%ld)"
" AND StartTime<=FROM_UNIXTIME(%ld)"
" ORDER BY ExaCod",
Gbl.Hierarchy.Crs.CrsCod,
UsrCod,
(long) Gbl.DateRange.TimeUTC[Dat_STR_TIME],
(long) Gbl.DateRange.TimeUTC[Dat_END_TIME]);
}
/*****************************************************************************/
/**************** Get data of a test using its test code *********************/
/*****************************************************************************/
unsigned Tst_DB_GetPrintDataByPrnCod (MYSQL_RES **mysql_res,long PrnCod)
{
return (unsigned)
DB_QuerySELECT (mysql_res,"can not get data of a test print",
"SELECT UsrCod," // row[0]
"UNIX_TIMESTAMP(StartTime)," // row[1]
"UNIX_TIMESTAMP(EndTime)," // row[2]
"NumQsts," // row[3]
"NumQstsNotBlank," // row[4]
"Sent," // row[5]
"AllowTeachers," // row[6]
"Score" // row[7]
" FROM tst_exams"
" WHERE ExaCod=%ld"
" AND CrsCod=%ld", // Extra check
PrnCod,
Gbl.Hierarchy.Crs.CrsCod);
}
/*****************************************************************************/
/****************** Remove test prints made by a given user ******************/
/*****************************************************************************/
void Tst_DB_RemovePrintsMadeByUsrInAllCrss (long UsrCod)
{
DB_QueryDELETE ("can not remove tests made by a user",
"DELETE FROM tst_exams"
" WHERE UsrCod=%ld",
UsrCod);
}
/*****************************************************************************/
/************** Remove test prints made by a user in a course ****************/
/*****************************************************************************/
void Tst_DB_RemovePrintsMadeByUsrInCrs (long UsrCod,long CrsCod)
{
DB_QueryDELETE ("can not remove tests made by a user in a course",
"DELETE FROM tst_exams"
" WHERE CrsCod=%ld"
" AND UsrCod=%ld",
CrsCod,
UsrCod);
}
/*****************************************************************************/
/****************** Remove all test prints made in a course ******************/
/*****************************************************************************/
void Tst_DB_RemovePrintsMadeByInCrs (long CrsCod)
{
DB_QueryDELETE ("can not remove tests made in a course",
"DELETE FROM tst_exams"
" WHERE CrsCod=%ld",
CrsCod);
}
/*****************************************************************************/
/************ Store user's answers of an test print into database ************/
/*****************************************************************************/
void Tst_DB_StoreOneQstOfPrint (const struct TstPrn_Print *Print,unsigned QstInd)
{
/***** Insert question and user's answers into database *****/
Str_SetDecimalPointToUS (); // To print the floating point as a dot
DB_QueryREPLACE ("can not update a question of a test",
"REPLACE INTO tst_exam_questions"
" (ExaCod,QstCod,QstInd,Score,Indexes,Answers)"
" VALUES"
" (%ld,%ld,%u,'%.15lg','%s','%s')",
Print->PrnCod,
Print->PrintedQuestions[QstInd].QstCod,
QstInd, // 0, 1, 2, 3...
Print->PrintedQuestions[QstInd].Score,
Print->PrintedQuestions[QstInd].StrIndexes,
Print->PrintedQuestions[QstInd].StrAnswers);
Str_SetDecimalPointToLocal (); // Return to local system
}
/*****************************************************************************/
/**************** Get all tags of questions in a test print ******************/
/*****************************************************************************/
unsigned Tst_DB_GetTagsPresentInAPrint (MYSQL_RES **mysql_res,long PrnCod)
{
return (unsigned)
DB_QuerySELECT (mysql_res,"can not get tags present in a test",
"SELECT tst_tags.TagTxt" // row[0]
" FROM (SELECT DISTINCT(tst_question_tags.TagCod)"
" FROM tst_question_tags,"
"tst_exam_questions"
" WHERE tst_exam_questions.ExaCod=%ld"
" AND tst_exam_questions.QstCod=tst_question_tags.QstCod) AS TagsCods,"
"tst_tags"
" WHERE TagsCods.TagCod=tst_tags.TagCod"
" ORDER BY tst_tags.TagTxt",
PrnCod);
}
/*****************************************************************************/
/************* Get the questions of a test print from database ***************/
/*****************************************************************************/
unsigned Tst_DB_GetPrintQuestions (MYSQL_RES **mysql_res,long PrnCod)
{
return (unsigned)
DB_QuerySELECT (mysql_res,"can not get questions of a test",
"SELECT QstCod," // row[0]
"Score," // row[1]
"Indexes," // row[2]
"Answers" // row[3]
" FROM tst_exam_questions"
" WHERE ExaCod=%ld"
" ORDER BY QstInd",
PrnCod);
}
/*****************************************************************************/
/*************** Remove test prints questions for a given user ***************/
/*****************************************************************************/
void Tst_DB_RemovePrintQuestionsMadeByUsrInAllCrss (long UsrCod)
{
DB_QueryDELETE ("can not remove tests made by a user",
"DELETE FROM tst_exam_questions"
" USING tst_exams,"
"tst_exam_questions"
" WHERE tst_exams.UsrCod=%ld"
" AND tst_exams.ExaCod=tst_exam_questions.ExaCod",
UsrCod);
}
/*****************************************************************************/
/********* Remove test prints questions made by a user in a course ***********/
/*****************************************************************************/
void Tst_DB_RemovePrintQuestionsMadeByUsrInCrs (long UsrCod,long CrsCod)
{
DB_QueryDELETE ("can not remove tests made by a user in a course",
"DELETE FROM tst_exam_questions"
" USING tst_exams,"
"tst_exam_questions"
" WHERE tst_exams.CrsCod=%ld"
" AND tst_exams.UsrCod=%ld"
" AND tst_exams.ExaCod=tst_exam_questions.ExaCod",
CrsCod,
UsrCod);
}
/*****************************************************************************/
/******* Remove all test prints questions made by any user in a course *******/
/*****************************************************************************/
void Tst_DB_RemovePrintQuestionsMadeInCrs (long CrsCod)
{
DB_QueryDELETE ("can not remove tests made in a course",
"DELETE FROM tst_exam_questions"
" USING tst_exams,"
"tst_exam_questions"
" WHERE tst_exams.CrsCod=%ld"
" AND tst_exams.ExaCod=tst_exam_questions.ExaCod",
CrsCod);
}

17
swad_test_database.h
View File

@ -73,4 +73,21 @@ void Tst_DB_RemoveTstConfig (long CrsCod);
long Tst_DB_CreatePrint (unsigned NumQsts); long Tst_DB_CreatePrint (unsigned NumQsts);
void Tst_DB_UpdatePrint (const struct TstPrn_Print *Print); void Tst_DB_UpdatePrint (const struct TstPrn_Print *Print);
unsigned Tst_DB_GetUsrPrintsInCurrentCrs (MYSQL_RES **mysql_res,long UsrCod);
unsigned Tst_DB_GetPrintDataByPrnCod (MYSQL_RES **mysql_res,long PrnCod);
void Tst_DB_RemovePrintsMadeByUsrInAllCrss (long UsrCod);
void Tst_DB_RemovePrintsMadeByUsrInCrs (long UsrCod,long CrsCod);
void Tst_DB_RemovePrintsMadeByInCrs (long CrsCod);
//-------------------------- Test print questions -----------------------------
void Tst_DB_StoreOneQstOfPrint (const struct TstPrn_Print *Print,unsigned QstInd);
unsigned Tst_DB_GetTagsPresentInAPrint (MYSQL_RES **mysql_res,long PrnCod);
unsigned Tst_DB_GetPrintQuestions (MYSQL_RES **mysql_res,long PrnCod);
void Tst_DB_RemovePrintQuestionsMadeByUsrInAllCrss (long UsrCod);
void Tst_DB_RemovePrintQuestionsMadeByUsrInCrs (long UsrCod,long CrsCod);
void Tst_DB_RemovePrintQuestionsMadeInCrs (long CrsCod);
#endif #endif

180
swad_test_print.c
View File

@ -162,9 +162,6 @@ static void TstPrn_WriteTxtAnsPrint (struct UsrData *UsrDat,
static void TstPrn_WriteHeadUserCorrect (struct UsrData *UsrDat); static void TstPrn_WriteHeadUserCorrect (struct UsrData *UsrDat);
static void Tst_DB_StoreOneQstOfPrint (const struct TstPrn_Print *Print,
unsigned QstInd);
static void TstPrn_PutFormToSelectUsrsToViewUsrsPrints (__attribute__((unused)) void *Args); static void TstPrn_PutFormToSelectUsrsToViewUsrsPrints (__attribute__((unused)) void *Args);
static void TstPrn_ShowUsrsPrints (__attribute__((unused)) void *Args); static void TstPrn_ShowUsrsPrints (__attribute__((unused)) void *Args);
@ -179,7 +176,7 @@ static void TstRes_CheckIfICanSeePrintResult (const struct TstPrn_Print *Print,
long UsrCod, long UsrCod,
struct TstRes_ICanView *ICanView); struct TstRes_ICanView *ICanView);
static void TstPrn_ShowTagsPresentInAPrint (long ResCod); static void TstPrn_ShowTagsPresentInAPrint (long PrnCod);
/*****************************************************************************/ /*****************************************************************************/
/***************************** Reset test print ******************************/ /***************************** Reset test print ******************************/
@ -752,7 +749,7 @@ void TstPrn_ComputeScoresAndStoreQuestionsOfPrint (struct TstPrn_Print *Print,
/* Store test question in database */ /* Store test question in database */
Tst_DB_StoreOneQstOfPrint (Print, Tst_DB_StoreOneQstOfPrint (Print,
QstInd); // 0, 1, 2, 3... QstInd); // 0, 1, 2, 3...
/* Accumulate total score */ /* Accumulate total score */
Print->Score += Print->PrintedQuestions[QstInd].Score; Print->Score += Print->PrintedQuestions[QstInd].Score;
@ -1287,10 +1284,10 @@ static void TstPrn_WriteFltAnsPrint (struct UsrData *UsrDat,
"ANS_BAD") : "ANS_BAD") :
"ANS_0"); "ANS_0");
HTM_Double (FloatAnsUsr); HTM_Double (FloatAnsUsr);
HTM_TD_End ();
} }
else // If user has omitted the answer else // If user has omitted the answer
HTM_TD_Begin (NULL); HTM_TD_Empty (1);
HTM_TD_End ();
/***** Write the correct answer *****/ /***** Write the correct answer *****/
HTM_TD_Begin ("class=\"ANS_0 CM\""); HTM_TD_Begin ("class=\"ANS_0 CM\"");
@ -1487,7 +1484,7 @@ static void TstPrn_WriteChoAnsPrint (struct UsrData *UsrDat,
if (Question->Answer.Options[Indexes[NumOpt]].Feedback[0]) if (Question->Answer.Options[Indexes[NumOpt]].Feedback[0])
{ {
HTM_DIV_Begin ("class=\"%s\"",ClassFeedback); HTM_DIV_Begin ("class=\"%s\"",ClassFeedback);
HTM_Txt (Question->Answer.Options[Indexes[NumOpt]].Feedback); HTM_Txt (Question->Answer.Options[Indexes[NumOpt]].Feedback);
HTM_DIV_End (); HTM_DIV_End ();
} }
@ -1562,13 +1559,13 @@ static void TstPrn_WriteTxtAnsPrint (struct UsrData *UsrDat,
} }
HTM_TD_Begin ("class=\"%s CT\"", HTM_TD_Begin ("class=\"%s CT\"",
ICanView[TstVis_VISIBLE_CORRECT_ANSWER] ? (Correct ? "ANS_OK" : ICanView[TstVis_VISIBLE_CORRECT_ANSWER] ? (Correct ? "ANS_OK" :
"ANS_BAD") : "ANS_BAD") :
"ANS_0"); "ANS_0");
HTM_Txt (PrintedQuestion->StrAnswers); HTM_Txt (PrintedQuestion->StrAnswers);
HTM_TD_End ();
} }
else // If user has omitted the answer else // If user has omitted the answer
HTM_TD_Begin (NULL); HTM_TD_Empty (1);
HTM_TD_End ();
/***** Write the correct answers *****/ /***** Write the correct answers *****/
if (ICanView[TstVis_VISIBLE_CORRECT_ANSWER]) if (ICanView[TstVis_VISIBLE_CORRECT_ANSWER])
@ -1641,29 +1638,6 @@ static void TstPrn_WriteHeadUserCorrect (struct UsrData *UsrDat)
HTM_TD_End (); HTM_TD_End ();
} }
/*****************************************************************************/
/************ Store user's answers of an test print into database ************/
/*****************************************************************************/
static void Tst_DB_StoreOneQstOfPrint (const struct TstPrn_Print *Print,
unsigned QstInd)
{
/***** Insert question and user's answers into database *****/
Str_SetDecimalPointToUS (); // To print the floating point as a dot
DB_QueryREPLACE ("can not update a question of a test",
"REPLACE INTO tst_exam_questions"
" (ExaCod,QstCod,QstInd,Score,Indexes,Answers)"
" VALUES"
" (%ld,%ld,%u,'%.15lg','%s','%s')",
Print->PrnCod,
Print->PrintedQuestions[QstInd].QstCod,
QstInd, // 0, 1, 2, 3...
Print->PrintedQuestions[QstInd].Score,
Print->PrintedQuestions[QstInd].StrIndexes,
Print->PrintedQuestions[QstInd].StrAnswers);
Str_SetDecimalPointToLocal (); // Return to local system
}
/*****************************************************************************/ /*****************************************************************************/
/*************** Select users and dates to show their tests ******************/ /*************** Select users and dates to show their tests ******************/
/*****************************************************************************/ /*****************************************************************************/
@ -1863,7 +1837,6 @@ static void TstPrn_ShowUsrPrints (struct UsrData *UsrDat)
{ {
extern const char *Txt_View_test; extern const char *Txt_View_test;
MYSQL_RES *mysql_res; MYSQL_RES *mysql_res;
MYSQL_ROW row;
unsigned NumPrints; unsigned NumPrints;
unsigned NumPrint; unsigned NumPrint;
static unsigned UniqueId = 0; static unsigned UniqueId = 0;
@ -1884,24 +1857,7 @@ static void TstPrn_ShowUsrPrints (struct UsrData *UsrDat)
TotalScore = 0.0; TotalScore = 0.0;
/***** Make database query *****/ /***** Make database query *****/
/* From here... ...to here NumPrints = Tst_DB_GetUsrPrintsInCurrentCrs (&mysql_res,UsrDat->UsrCod);
___________|_____ _____|___________
-----|______Exam_|_____|-----------------|_____|_Exam______|-----> time
Start | End Start | End
*/
NumPrints = (unsigned)
DB_QuerySELECT (&mysql_res,"can not get tests of a user",
"SELECT ExaCod" // row[0]
" FROM tst_exams"
" WHERE CrsCod=%ld"
" AND UsrCod=%ld"
" AND EndTime>=FROM_UNIXTIME(%ld)"
" AND StartTime<=FROM_UNIXTIME(%ld)"
" ORDER BY ExaCod",
Gbl.Hierarchy.Crs.CrsCod,
UsrDat->UsrCod,
(long) Gbl.DateRange.TimeUTC[Dat_STR_TIME],
(long) Gbl.DateRange.TimeUTC[Dat_END_TIME]);
/***** Show user's data *****/ /***** Show user's data *****/
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
@ -1915,10 +1871,8 @@ static void TstPrn_ShowUsrPrints (struct UsrData *UsrDat)
NumPrint < NumPrints; NumPrint < NumPrints;
NumPrint++) NumPrint++)
{ {
row = mysql_fetch_row (mysql_res);
/* Get print code (row[0]) */ /* Get print code (row[0]) */
if ((Print.PrnCod = Str_ConvertStrCodToLongCod (row[0])) <= 0) if ((Print.PrnCod = DB_GetNextCode (mysql_res)) <= 0)
Err_WrongTestExit (); Err_WrongTestExit ();
/* Get print data */ /* Get print data */
@ -2029,7 +1983,7 @@ static void TstPrn_ShowUsrPrints (struct UsrData *UsrDat)
Frm_BeginForm (Gbl.Action.Act == ActSeeMyTstResCrs ? ActSeeOneTstResMe : Frm_BeginForm (Gbl.Action.Act == ActSeeMyTstResCrs ? ActSeeOneTstResMe :
ActSeeOneTstResOth); ActSeeOneTstResOth);
TstPrn_PutParamPrnCod (Print.PrnCod); TstPrn_PutParamPrnCod (Print.PrnCod);
Ico_PutIconLink ("tasks.svg",Txt_View_test); Ico_PutIconLink ("tasks.svg",Txt_View_test);
Frm_EndForm (); Frm_EndForm ();
} }
else else
@ -2442,24 +2396,13 @@ static void TstRes_CheckIfICanSeePrintResult (const struct TstPrn_Print *Print,
/************************ Show test tags in this test ************************/ /************************ Show test tags in this test ************************/
/*****************************************************************************/ /*****************************************************************************/
static void TstPrn_ShowTagsPresentInAPrint (long ResCod) static void TstPrn_ShowTagsPresentInAPrint (long PrnCod)
{ {
MYSQL_RES *mysql_res; MYSQL_RES *mysql_res;
unsigned NumTags; unsigned NumTags;
/***** Get all tags of questions in this test *****/ /***** Get all tags of questions in this test print *****/
NumTags = (unsigned) NumTags = Tst_DB_GetTagsPresentInAPrint (&mysql_res,PrnCod);
DB_QuerySELECT (&mysql_res,"can not get tags present in a test",
"SELECT tst_tags.TagTxt" // row[0]
" FROM (SELECT DISTINCT(tst_question_tags.TagCod)"
" FROM tst_question_tags,"
"tst_exam_questions"
" WHERE tst_exam_questions.ExaCod=%ld"
" AND tst_exam_questions.QstCod=tst_question_tags.QstCod) AS TagsCods,"
"tst_tags"
" WHERE TagsCods.TagCod=tst_tags.TagCod"
" ORDER BY tst_tags.TagTxt",
ResCod);
Tag_ShowTagList (NumTags,mysql_res); Tag_ShowTagList (NumTags,mysql_res);
/***** Free structure that stores the query result *****/ /***** Free structure that stores the query result *****/
@ -2515,20 +2458,7 @@ void TstPrn_GetPrintDataByPrnCod (struct TstPrn_Print *Print)
MYSQL_ROW row; MYSQL_ROW row;
/***** Make database query *****/ /***** Make database query *****/
if (DB_QuerySELECT (&mysql_res,"can not get data of a test", if (Tst_DB_GetPrintDataByPrnCod (&mysql_res,Print->PrnCod) == 1)
"SELECT UsrCod," // row[0]
"UNIX_TIMESTAMP(StartTime)," // row[1]
"UNIX_TIMESTAMP(EndTime)," // row[2]
"NumQsts," // row[3]
"NumQstsNotBlank," // row[4]
"Sent," // row[5]
"AllowTeachers," // row[6]
"Score" // row[7]
" FROM tst_exams"
" WHERE ExaCod=%ld"
" AND CrsCod=%ld",
Print->PrnCod,
Gbl.Hierarchy.Crs.CrsCod) == 1)
{ {
row = mysql_fetch_row (mysql_res); row = mysql_fetch_row (mysql_res);
@ -2539,18 +2469,16 @@ void TstPrn_GetPrintDataByPrnCod (struct TstPrn_Print *Print)
Print->TimeUTC[Dat_STR_TIME] = Dat_GetUNIXTimeFromStr (row[1]); Print->TimeUTC[Dat_STR_TIME] = Dat_GetUNIXTimeFromStr (row[1]);
Print->TimeUTC[Dat_END_TIME] = Dat_GetUNIXTimeFromStr (row[2]); Print->TimeUTC[Dat_END_TIME] = Dat_GetUNIXTimeFromStr (row[2]);
/* Get number of questions (row[3]) */ /* Get number of questions (row[3])
if (sscanf (row[3],"%u",&Print->NumQsts.All) != 1) and number of questions not blank (row[4]) */
Print->NumQsts.All = 0; if (sscanf (row[3],"%u",&Print->NumQsts.All ) != 1)
Print->NumQsts.All = 0;
/* Get number of questions not blank (row[4]) */
if (sscanf (row[4],"%u",&Print->NumQsts.NotBlank) != 1) if (sscanf (row[4],"%u",&Print->NumQsts.NotBlank) != 1)
Print->NumQsts.NotBlank = 0; Print->NumQsts.NotBlank = 0;
/* Get if exam has been sent (row[5]) */ /* Get if print has been sent (row[5])
Print->Sent = (row[5][0] == 'Y'); and if teachers are allowed to see this test print (row[6]) */
Print->Sent = (row[5][0] == 'Y');
/* Get if teachers are allowed to see this test (row[6]) */
Print->AllowTeachers = (row[6][0] == 'Y'); Print->AllowTeachers = (row[6][0] == 'Y');
/* Get score (row[7]) */ /* Get score (row[7]) */
@ -2578,16 +2506,7 @@ void TstPrn_GetPrintQuestionsFromDB (struct TstPrn_Print *Print)
unsigned QstInd; unsigned QstInd;
/***** Get questions of a test print from database *****/ /***** Get questions of a test print from database *****/
NumQsts = (unsigned) NumQsts = Tst_DB_GetPrintQuestions (&mysql_res,Print->PrnCod);
DB_QuerySELECT (&mysql_res,"can not get questions of a test",
"SELECT QstCod," // row[0]
"Score," // row[1]
"Indexes," // row[2]
"Answers" // row[3]
" FROM tst_exam_questions"
" WHERE ExaCod=%ld"
" ORDER BY QstInd",
Print->PrnCod);
/***** Get questions *****/ /***** Get questions *****/
if (NumQsts == Print->NumQsts.All) if (NumQsts == Print->NumQsts.All)
@ -2607,11 +2526,10 @@ void TstPrn_GetPrintQuestionsFromDB (struct TstPrn_Print *Print)
Err_ShowErrorAndExit ("Wrong question score."); Err_ShowErrorAndExit ("Wrong question score.");
Str_SetDecimalPointToLocal (); // Return to local system Str_SetDecimalPointToLocal (); // Return to local system
/* Get indexes for this question (row[2]) */ /* Get indexes for this question (row[2])
and answers selected by user for this question (row[3]) */
Str_Copy (Print->PrintedQuestions[QstInd].StrIndexes,row[2], Str_Copy (Print->PrintedQuestions[QstInd].StrIndexes,row[2],
sizeof (Print->PrintedQuestions[QstInd].StrIndexes) - 1); sizeof (Print->PrintedQuestions[QstInd].StrIndexes) - 1);
/* Get answers selected by user for this question (row[3]) */
Str_Copy (Print->PrintedQuestions[QstInd].StrAnswers,row[3], Str_Copy (Print->PrintedQuestions[QstInd].StrAnswers,row[3],
sizeof (Print->PrintedQuestions[QstInd].StrAnswers) - 1); sizeof (Print->PrintedQuestions[QstInd].StrAnswers) - 1);
} }
@ -2630,19 +2548,10 @@ void TstPrn_GetPrintQuestionsFromDB (struct TstPrn_Print *Print)
void TstPrn_RemovePrintsMadeByUsrInAllCrss (long UsrCod) void TstPrn_RemovePrintsMadeByUsrInAllCrss (long UsrCod)
{ {
/***** Remove test prints questions for the given user *****/ /***** Remove test prints questions for the given user *****/
DB_QueryDELETE ("can not remove tests made by a user", Tst_DB_RemovePrintQuestionsMadeByUsrInAllCrss (UsrCod);
"DELETE FROM tst_exam_questions"
" USING tst_exams,"
"tst_exam_questions"
" WHERE tst_exams.UsrCod=%ld"
" AND tst_exams.ExaCod=tst_exam_questions.ExaCod",
UsrCod);
/***** Remove test prints made by the given user *****/ /***** Remove test prints made by the given user *****/
DB_QueryDELETE ("can not remove tests made by a user", Tst_DB_RemovePrintsMadeByUsrInAllCrss (UsrCod);
"DELETE FROM tst_exams"
" WHERE UsrCod=%ld",
UsrCod);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -2651,23 +2560,11 @@ void TstPrn_RemovePrintsMadeByUsrInAllCrss (long UsrCod)
void TstPrn_RemovePrintsMadeByUsrInCrs (long UsrCod,long CrsCod) void TstPrn_RemovePrintsMadeByUsrInCrs (long UsrCod,long CrsCod)
{ {
/***** Remove tests made by the given user *****/ /***** Remove test prints questions for the given user *****/
DB_QueryDELETE ("can not remove tests made by a user in a course", Tst_DB_RemovePrintQuestionsMadeByUsrInCrs (UsrCod,CrsCod);
"DELETE FROM tst_exam_questions"
" USING tst_exams,"
"tst_exam_questions"
" WHERE tst_exams.CrsCod=%ld"
" AND tst_exams.UsrCod=%ld"
" AND tst_exams.ExaCod=tst_exam_questions.ExaCod",
CrsCod,
UsrCod);
DB_QueryDELETE ("can not remove tests made by a user in a course", /***** Remove test prints made by the given user *****/
"DELETE FROM tst_exams" Tst_DB_RemovePrintsMadeByUsrInCrs (UsrCod,CrsCod);
" WHERE CrsCod=%ld"
" AND UsrCod=%ld",
CrsCod,
UsrCod);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -2677,19 +2574,10 @@ void TstPrn_RemovePrintsMadeByUsrInCrs (long UsrCod,long CrsCod)
void TstPrn_RemoveCrsPrints (long CrsCod) void TstPrn_RemoveCrsPrints (long CrsCod)
{ {
/***** Remove questions of tests made in the course *****/ /***** Remove questions of tests made in the course *****/
DB_QueryDELETE ("can not remove tests made in a course", Tst_DB_RemovePrintQuestionsMadeInCrs (CrsCod);
"DELETE FROM tst_exam_questions"
" USING tst_exams,"
"tst_exam_questions"
" WHERE tst_exams.CrsCod=%ld"
" AND tst_exams.ExaCod=tst_exam_questions.ExaCod",
CrsCod);
/***** Remove tests made in the course *****/ /***** Remove tests made in the course *****/
DB_QueryDELETE ("can not remove tests made in a course", Tst_DB_RemovePrintsMadeByInCrs (CrsCod);
"DELETE FROM tst_exams"
" WHERE CrsCod=%ld",
CrsCod);
} }
/*****************************************************************************/ /*****************************************************************************/