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 18.34

This commit is contained in:
Antonio Cañas Vargas 2019-02-11 22:15:18 +01:00
parent bce8f69dc8
commit 6b8aa08337
10 changed files with 58 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
swad_action.c
View File

@ -2084,7 +2084,7 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
/* ActSeeTst */{ 29,-1,TabUnk,ActReqTst ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Tst_ShowNewTest ,NULL},
/* ActAssTst */{ 98,-1,TabUnk,ActReqTst ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Tst_AssessTest ,NULL},
/* ActEdiTstQst */{ 104,-1,TabUnk,ActReqTst ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Tst_SetIniEndDates ,Tst_ShowFormAskEditTsts ,NULL},
/* ActEdiTstQst */{ 104,-1,TabUnk,ActReqTst ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Dat_SetIniEndDates ,Tst_ShowFormAskEditTsts ,NULL},
/* ActEdiOneTstQst */{ 105,-1,TabUnk,ActReqTst ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Tst_ShowFormEditOneQst ,NULL},
/* ActReqImpTstQst */{1007,-1,TabUnk,ActReqTst ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,TsI_ShowFormImportQstsFromXML ,NULL},
/* ActImpTstQst */{1008,-1,TabUnk,ActReqTst ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_DATA,Act_BRW_1ST_TAB,NULL ,TsI_ImportQstsFromXML ,NULL},
@ -2100,10 +2100,10 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
/* ActRenTag */{ 143,-1,TabUnk,ActReqTst ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Tst_RenameTag ,NULL},
/* ActRcvCfgTst */{ 454,-1,TabUnk,ActReqTst ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Tst_ReceiveConfigTst ,NULL},
/* ActReqSeeMyTstRes */{1083,-1,TabUnk,ActReqTst ,0x208,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Tst_SetIniEndDates ,Tst_SelDatesToSeeMyTestResults ,NULL},
/* ActReqSeeMyTstRes */{1083,-1,TabUnk,ActReqTst ,0x208,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Dat_SetIniEndDates ,Tst_SelDatesToSeeMyTestResults ,NULL},
/* ActSeeMyTstRes */{1084,-1,TabUnk,ActReqTst ,0x208,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Tst_ShowMyTestResults ,NULL},
/* ActSeeOneTstResMe */{1085,-1,TabUnk,ActReqTst ,0x208,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Tst_ShowOneTestResult ,NULL},
/* ActReqSeeUsrTstRes*/{1080,-1,TabUnk,ActReqTst ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Tst_SetIniEndDates ,Tst_SelUsrsToSeeUsrsTestResults,NULL},
/* ActReqSeeUsrTstRes*/{1080,-1,TabUnk,ActReqTst ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Dat_SetIniEndDates ,Tst_SelUsrsToSeeUsrsTestResults,NULL},
/* ActSeeUsrTstRes */{1081,-1,TabUnk,ActReqTst ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Tst_ShowUsrsTestResults ,NULL},
/* ActSeeOneTstResOth*/{1082,-1,TabUnk,ActReqTst ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Tst_ShowOneTestResult ,NULL},

5
swad_changelog.h
View File

@ -365,8 +365,6 @@ Buenos d
// TODO: Arreglar tamaño de iconos al ver la asistencia de un estudiante.
// TODO: Fix bug: En una ficha de un alumno, al pulsar sobre "Ver test" no se ven los test que ha hecho
// TODO: Sale de vez en cuando un mensaje "Can not get information about a file or folder.", por ejemplo en el timeline.
/*****************************************************************************/
@ -388,10 +386,11 @@ En OpenSWAD:
ps2pdf source.ps destination.pdf
*/
#define Log_PLATFORM_VERSION "SWAD 18.33.3 (2019-02-11)"
#define Log_PLATFORM_VERSION "SWAD 18.34 (2019-02-11)"
#define CSS_FILE "swad18.33.css"
#define JS_FILE "swad18.32.1.js"
/*
Version 18.34: Feb 11, 2019 Fixed bug in test results. (239110 lines)
Version 18.33.3: Feb 11, 2019 Changed Type to Role in some stats. (239093 lines)
Version 18.33.2: Feb 11, 2019 Icon to view places in centre configuration. (239093 lines)
Version 18.33.1: Jan 15, 2019 Fixed bug in file browser, reported by Miguel Damas.

20
swad_date.c
View File

@ -917,6 +917,26 @@ void Dat_GetDateFromForm (const char *ParamNameDay,const char *ParamNameMonth,co
*Year = (unsigned) Par_GetParToUnsignedLong (ParamNameYear ,0,UINT_MAX,0);
}
/*****************************************************************************/
/******* Set initial date to distant past and end date to current date *******/
/*****************************************************************************/
void Dat_SetIniEndDates (void)
{
Gbl.DateRange.TimeUTC[0] = (time_t) 0;
Gbl.DateRange.TimeUTC[1] = Gbl.StartExecutionTimeUTC;
}
/*****************************************************************************/
/******** Write parameters of initial and final dates *****/
/*****************************************************************************/
void Dat_WriteParamsIniEndDates (void)
{
Par_PutHiddenParamUnsigned ("StartTimeUTC",Gbl.DateRange.TimeUTC[0]);
Par_PutHiddenParamUnsigned ("EndTimeUTC" ,Gbl.DateRange.TimeUTC[1]);
}
/*****************************************************************************/
/************************** Get initial and end dates ************************/
/*****************************************************************************/

2
swad_date.h
View File

@ -160,6 +160,8 @@ void Dat_WriteFormDate (unsigned FirstYear,unsigned LastYear,
void Dat_GetDateFromForm (const char *ParamNameDay,const char *ParamNameMonth,const char *ParamNameYear,
unsigned *Day,unsigned *Month,unsigned *Year);
void Dat_SetIniEndDates (void);
void Dat_WriteParamsIniEndDates (void);
void Dat_GetIniEndDatesFromForm (void);
void Dat_WriteRFC822DateFromTM (FILE *File,struct tm *tm);

20
swad_record.c
View File

@ -106,6 +106,8 @@ static void Rec_ShowMyCrsRecordUpdated (void);
static bool Rec_CheckIfICanEditField (Rec_VisibilityRecordFields_t Visibility);
static void Rec_PutIconsCommands (void);
static void Rec_PutParamsMyTsts (void);
static void Rec_PutParamsStdTsts (void);
static void Rec_PutParamsWorks (void);
static void Rec_PutParamsStudent (void);
static void Rec_PutParamsMsgUsr (void);
@ -2621,12 +2623,13 @@ static void Rec_PutIconsCommands (void)
if (Usr_CheckIfICanViewTst (Gbl.Record.UsrDat))
{
if (ItsMe)
Lay_PutContextualLinkOnlyIcon (ActSeeMyTstRes,NULL,NULL,
Lay_PutContextualLinkOnlyIcon (ActSeeMyTstRes,NULL,
Rec_PutParamsMyTsts,
"check.svg",
Txt_View_test_results);
else // Not me
Lay_PutContextualLinkOnlyIcon (ActSeeUsrTstRes,NULL,
Rec_PutParamsStudent,
Rec_PutParamsStdTsts,
"check.svg",
Txt_View_test_results);
}
@ -2702,6 +2705,19 @@ void Rec_PutParamUsrCodEncrypted (void)
Usr_PutParamUsrCodEncrypted (Gbl.Record.UsrDat->EncryptedUsrCod);
}
static void Rec_PutParamsMyTsts (void)
{
Dat_SetIniEndDates ();
Dat_WriteParamsIniEndDates ();
}
static void Rec_PutParamsStdTsts (void)
{
Rec_PutParamsStudent ();
Dat_SetIniEndDates ();
Dat_WriteParamsIniEndDates ();
}
static void Rec_PutParamsWorks (void)
{
Rec_PutParamsStudent ();

16
swad_statistic.c
View File

@ -1703,7 +1703,7 @@ static void Sta_ShowDetailedAccessesList (unsigned long NumRows,MYSQL_RES *mysql
if (FirstRow > 1)
{
Frm_StartFormAnchor (ActSeeAccCrs,Sta_STAT_RESULTS_SECTION_ID);
Sta_WriteParamsDatesSeeAccesses ();
Dat_WriteParamsIniEndDates ();
Par_PutHiddenParamUnsigned ("GroupedBy",(unsigned) Sta_CLICKS_CRS_DETAILED_LIST);
Par_PutHiddenParamUnsigned ("StatAct" ,(unsigned) Gbl.Stat.NumAction);
Par_PutHiddenParamLong ("FirstRow",FirstRow - Gbl.Stat.RowsPerPage);
@ -1739,7 +1739,7 @@ static void Sta_ShowDetailedAccessesList (unsigned long NumRows,MYSQL_RES *mysql
if (LastRow < NumRows)
{
Frm_StartFormAnchor (ActSeeAccCrs,Sta_STAT_RESULTS_SECTION_ID);
Sta_WriteParamsDatesSeeAccesses ();
Dat_WriteParamsIniEndDates ();
Par_PutHiddenParamUnsigned ("GroupedBy",(unsigned) Sta_CLICKS_CRS_DETAILED_LIST);
Par_PutHiddenParamUnsigned ("StatAct" ,(unsigned) Gbl.Stat.NumAction);
Par_PutHiddenParamUnsigned ("FirstRow" ,(unsigned) (LastRow + 1));
@ -2215,7 +2215,7 @@ static void Sta_ShowDistrAccessesPerDayAndHour (unsigned long NumRows,MYSQL_RES
"<td colspan=\"26\" class=\"CENTER_MIDDLE\">");
Frm_StartFormAnchor (Gbl.Action.Act,Sta_STAT_RESULTS_SECTION_ID);
Sta_WriteParamsDatesSeeAccesses ();
Dat_WriteParamsIniEndDates ();
Par_PutHiddenParamUnsigned ("GroupedBy",(unsigned) Gbl.Stat.ClicksGroupedBy);
Par_PutHiddenParamUnsigned ("CountType",(unsigned) Gbl.Stat.CountType);
Par_PutHiddenParamUnsigned ("StatAct" ,(unsigned) Gbl.Stat.NumAction);
@ -4049,16 +4049,6 @@ static void Sta_DrawBarNumHits (char Color,
"</tr>");
}
/*****************************************************************************/
/**** Write parameters of initial and final dates in the query of clicks *****/
/*****************************************************************************/
void Sta_WriteParamsDatesSeeAccesses (void)
{
Par_PutHiddenParamUnsigned ("StartTimeUTC",Gbl.DateRange.TimeUTC[0]);
Par_PutHiddenParamUnsigned ("EndTimeUTC" ,Gbl.DateRange.TimeUTC[1]);
}
/*****************************************************************************/
/************************** Show use of the platform *************************/
/*****************************************************************************/

2
swad_statistic.h
View File

@ -184,8 +184,6 @@ void Sta_PutIconToShowFigure (void);
void Sta_PutHiddenParamFigures (void);
void Sta_ShowFigures (void);
void Sta_WriteParamsDatesSeeAccesses (void);
void Sta_ComputeTimeToGeneratePage (void);
void Sta_ComputeTimeToSendPage (void);
void Sta_WriteTimeToGenerateAndSendPage (void);

24
swad_test.c
View File

@ -1296,17 +1296,6 @@ static void Tst_UpdateLastAccTst (void)
Gbl.Usrs.Me.UsrDat.UsrCod);
}
/*****************************************************************************/
/************ Set end date to current date ************/
/************ and set initial date to end date minus several days ************/
/*****************************************************************************/
void Tst_SetIniEndDates (void)
{
Gbl.DateRange.TimeUTC[0] = (time_t) 0;
Gbl.DateRange.TimeUTC[1] = Gbl.StartExecutionTimeUTC;
}
/*****************************************************************************/
/******* Select tags and dates for edition of the self-assessment test *******/
/*****************************************************************************/
@ -2908,7 +2897,7 @@ static void Tst_ListOneOrMoreQuestionsForEdition (unsigned long NumRows,
if (NumRows > 1)
{
Frm_StartForm (ActLstTstQst);
Sta_WriteParamsDatesSeeAccesses ();
Dat_WriteParamsIniEndDates ();
Tst_WriteParamEditQst ();
Par_PutHiddenParamUnsigned ("Order",(unsigned) Order);
Frm_LinkFormSubmit (Txt_TST_STR_ORDER_FULL[Order],"TIT_TBL",NULL);
@ -2966,7 +2955,7 @@ static void Tst_ListOneOrMoreQuestionsForEdition (unsigned long NumRows,
Tst_PutParamQstCod ();
if (NumRows == 1)
Par_PutHiddenParamChar ("OnlyThisQst",'Y'); // If there are only one row, don't list again after removing
Sta_WriteParamsDatesSeeAccesses ();
Dat_WriteParamsIniEndDates ();
Tst_WriteParamEditQst ();
Ico_PutIconRemove ();
Frm_EndForm ();
@ -3021,7 +3010,7 @@ static void Tst_ListOneOrMoreQuestionsForEdition (unsigned long NumRows,
{
Frm_StartForm (ActShfTstQst);
Tst_PutParamQstCod ();
Sta_WriteParamsDatesSeeAccesses ();
Dat_WriteParamsIniEndDates ();
Tst_WriteParamEditQst ();
if (NumRows == 1)
Par_PutHiddenParamChar ("OnlyThisQst",'Y'); // If editing only one question, don't edit others
@ -6425,7 +6414,7 @@ static void Tst_PutParamsRemoveOneQst (void)
static void Tst_PutParamsRemoveQst (void)
{
Tst_PutParamQstCod ();
Sta_WriteParamsDatesSeeAccesses ();
Dat_WriteParamsIniEndDates ();
Tst_WriteParamEditQst ();
}
@ -7807,6 +7796,11 @@ static void Tst_ShowTestResults (struct UsrData *UsrDat)
time_t TimeUTC;
char *ClassDat;
sprintf (Gbl.Alert.Txt,"Gbl.DateRange.TimeUTC[0] = %ld / Gbl.DateRange.TimeUTC[1] = %ld",
(long) Gbl.DateRange.TimeUTC[0],
(long) Gbl.DateRange.TimeUTC[1]);
Ale_ShowAlert (Ale_INFO,Gbl.Alert.Txt);
/***** Make database query *****/
NumExams =
(unsigned) DB_QuerySELECT (&mysql_res,"can not get test exams of a user",

1
swad_test.h
View File

@ -151,7 +151,6 @@ void Tst_WriteQstAndAnsTest (Tst_ActionToDoWithQuestions_t ActionToDoWithQuestio
void Tst_WriteQstStem (const char *Stem,const char *ClassStem);
void Tst_WriteQstFeedback (const char *Feedback,const char *ClassFeedback);
void Tst_SetIniEndDates (void);
void Tst_ShowFormAskEditTsts (void);
void Tst_ShowFormAskSelectTstsForGame (long GamCod);
void Tst_ListQuestionsToEdit (void);

2
swad_test_import.c
View File

@ -101,7 +101,7 @@ void TsI_PutFormToExportQuestions (void)
static void TsI_PutParamsExportQsts (void)
{
Sta_WriteParamsDatesSeeAccesses ();
Dat_WriteParamsIniEndDates ();
Tst_WriteParamEditQst ();
Par_PutHiddenParamChar ("OnlyThisQst",'N');
Par_PutHiddenParamUnsigned ("Order",(unsigned) Gbl.Test.SelectedOrder);