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 16.225.8

This commit is contained in:
Antonio Cañas Vargas 2017-05-29 10:32:45 +02:00
parent ea255a5fa3
commit ee247f0266
4 changed files with 48 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
swad_action.c
View File

@ -2874,8 +2874,8 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
/* ActPrnPhoDeg */{ 448,-1,TabUnk,ActSeePhoDeg ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BLNK_WINDOW,NULL ,Pho_PrintPhotoDegree ,NULL},
/* ActCalPhoDeg */{ 444,-1,TabUnk,ActSeePhoDeg ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Pho_CalcPhotoDegree ,NULL},
/* ActSeeAccGbl */{ 79,-1,TabUnk,ActReqAccGbl ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Sta_SeeGblAccesses ,NULL},
/* ActReqAccCrs */{ 594,-1,TabUnk,ActReqAccGbl ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,Sta_SetIniEndDates ,Sta_AskShowCrsHits ,NULL},
/* ActSeeAccCrs */{ 119,-1,TabUnk,ActReqAccGbl ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Sta_SeeCrsAccesses ,NULL},
/* ActReqAccCrs */{ 594,-1,TabUnk,ActReqAccGbl ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,Sta_SetIniEndDates ,Sta_AskShowCrsHits ,NULL},
/* ActSeeAccCrs */{ 119,-1,TabUnk,ActReqAccGbl ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Sta_SeeCrsAccesses ,NULL},
/* ActSeeAllStaCrs */{ 768,-1,TabUnk,ActReqAccGbl ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BLNK_WINDOW,NULL ,Ind_ShowIndicatorsCourses ,NULL},
/* ActSeeMyUsgRep */{1582,-1,TabUnk,ActReqMyUsgRep ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Rep_ShowMyUsageReport ,NULL},

6
swad_changelog.h
View File

@ -229,19 +229,19 @@
// TODO: Al listar administradores, debería estar marcado por defecto "Incluir fotos"
// TODO: Statistics of hits in course accessible by non-editing teachers.
/*****************************************************************************/
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.225.7 (2017-05-26)"
#define Log_PLATFORM_VERSION "SWAD 16.225.8 (2017-05-29)"
#define CSS_FILE "swad16.222.css"
#define JS_FILE "swad16.206.3.js"
// Number of lines (includes comments but not blank lines) has been got with the following command:
// nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*?.h sql/swad*.sql | tail -1
/*
Version 16.225.8: May 29, 2017 Statistics of hits in course accessible by non-editing teachers.
Changes in error handlong in stats of hits. (220514 lines)
Version 16.225.7: May 26, 2017 Fix bug in order of users when listing record cards of teachers.
Code refactoring in checkboxes to select users. (220509 lines)
Version 16.225.6: May 26, 2017 Fixed bug printing classphoto of teachers. (220553 lines)

75
swad_statistic.c
View File

@ -95,7 +95,6 @@ const unsigned Sta_CellPadding[Sta_NUM_CLICKS_GROUPED_BY] =
1, // Sta_CLICKS_GBL_PER_COURSE
};
#define Sta_STAT_FORM_SECTION_ID "stat_form"
#define Sta_STAT_RESULTS_SECTION_ID "stat_results"
/*****************************************************************************/
@ -487,9 +486,6 @@ void Sta_AskShowCrsHits (void)
{
if (Usr_GetIfShowBigList (NumTotalUsrs,NULL))
{
/***** Get lists of selected users *****/
Usr_GetListsSelectedUsrsCods ();
/***** Form to select type of list used for select several users *****/
Usr_ShowFormsToSelectUsrListType (ActReqAccCrs);
@ -603,9 +599,6 @@ void Sta_AskShowCrsHits (void)
/***** End form *****/
Act_FormEnd ();
/* Free memory used by list of selected users' codes */
Usr_FreeListsSelectedUsrsCods ();
}
}
else // No teachers nor students found
@ -650,13 +643,20 @@ void Sta_AskShowGblHits (void)
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
/* Put form to go to test edition and configuration */
if (Gbl.CurrentCrs.Crs.CrsCod > 0 && // Course selected
(Gbl.Usrs.Me.LoggedRole == Rol_TCH ||
Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM))
Lay_PutContextualLink (ActReqAccCrs,NULL,NULL,
"stats64x64.gif",
Txt_Visits_to_course,Txt_Visits_to_course,
NULL);
if (Gbl.CurrentCrs.Crs.CrsCod > 0) // Course selected
switch (Gbl.Usrs.Me.LoggedRole)
{
case Rol_NET:
case Rol_TCH:
case Rol_SYS_ADM:
Lay_PutContextualLink (ActReqAccCrs,NULL,NULL,
"stats64x64.gif",
Txt_Visits_to_course,Txt_Visits_to_course,
NULL);
break;
default:
break;
}
/* Link to show last clicks in real time */
Con_PutLinkToLastClicks ();
@ -664,10 +664,9 @@ void Sta_AskShowGblHits (void)
fprintf (Gbl.F.Out,"</div>");
/***** Start form *****/
Act_FormStartAnchor (ActSeeAccGbl,Sta_STAT_FORM_SECTION_ID);
Act_FormStartAnchor (ActSeeAccGbl,Sta_STAT_RESULTS_SECTION_ID);
/***** Start frame *****/
Lay_StartSection (Sta_STAT_FORM_SECTION_ID);
Lay_StartRoundFrameTable (NULL,Txt_Statistics_of_all_visits,NULL,
Hlp_STATS_Visits_global_visits,2);
@ -756,7 +755,6 @@ void Sta_AskShowGblHits (void)
/***** End frame with button *****/
Lay_EndRoundFrameWithButton (Lay_CONFIRM_BUTTON,Txt_Show_hits);
Lay_EndSection ();
/***** End form *****/
Act_FormEnd ();
@ -890,9 +888,6 @@ static void Sta_ShowHits (Sta_GlobalOrCourseAccesses_t GlobalOrCourse)
unsigned NumDays;
bool ICanQueryWholeRange;
/***** Initialize data structure of the user *****/
Usr_UsrDataConstructor (&UsrDat);
/***** Get initial and ending dates *****/
Dat_GetIniEndDatesFromForm ();
@ -960,14 +955,17 @@ static void Sta_ShowHits (Sta_GlobalOrCourseAccesses_t GlobalOrCourse)
/***** Show form again *****/
Sta_AskShowGblHits ();
/***** The following types of query will never give a valid result *****/
/***** Start results section *****/
Lay_StartSection (Sta_STAT_RESULTS_SECTION_ID);
/***** Check selection *****/
if ((Gbl.Stat.Role == Sta_ROLE_ALL_USRS ||
Gbl.Stat.Role == Sta_ROLE_UNKNOWN_USRS) &&
(Gbl.Stat.CountType == Sta_DISTINCT_USRS ||
Gbl.Stat.CountType == Sta_CLICKS_PER_USR))
Gbl.Stat.CountType == Sta_CLICKS_PER_USR)) // These types of query will never give a valid result
{
/* Write warning message and abort */
Ale_ShowAlert (Ale_WARNING,Txt_There_is_no_knowing_how_many_users_not_logged_have_accessed);
Usr_UsrDataDestructor (&UsrDat);
return;
}
break;
@ -993,16 +991,21 @@ static void Sta_ShowHits (Sta_GlobalOrCourseAccesses_t GlobalOrCourse)
Sta_DEF_ROWS_PER_PAGE);
}
/***** Show form again *****/
Sta_AskShowCrsHits ();
/****** Get lists of selected users ******/
Usr_GetListsSelectedUsrsCods ();
/* Check the number of users whose clicks will be shown */
if (!Usr_CountNumUsrsInListOfSelectedUsrs ()) // If there are no users selected...
{ // ...write warning message and show the form again
/***** Show the form again *****/
Sta_AskShowCrsHits ();
/***** Start results section *****/
Lay_StartSection (Sta_STAT_RESULTS_SECTION_ID);
/***** Check selection *****/
if (!Usr_CountNumUsrsInListOfSelectedUsrs ()) // Error: there are no users selected
{
/* Write warning message, clean and abort */
Ale_ShowAlert (Ale_WARNING,Txt_You_must_select_one_ore_more_users);
Usr_FreeListsSelectedUsrsCods ();
return;
}
break;
@ -1312,6 +1315,10 @@ static void Sta_ShowHits (Sta_GlobalOrCourseAccesses_t GlobalOrCourse)
LogTable,Gbl.CurrentCrs.Crs.CrsCod);
Str_Concat (Query,QueryAux,
Sta_MAX_BYTES_QUERY_ACCESS);
/***** Initialize data structure of the user *****/
Usr_UsrDataConstructor (&UsrDat);
LengthQuery = strlen (Query);
NumUsr = 0;
Ptr = Gbl.Usrs.Select[Rol_UNK];
@ -1336,6 +1343,9 @@ static void Sta_ShowHits (Sta_GlobalOrCourseAccesses_t GlobalOrCourse)
}
Str_Concat (Query,")",
Sta_MAX_BYTES_QUERY_ACCESS);
/***** Free memory used by the data of the user *****/
Usr_UsrDataDestructor (&UsrDat);
break;
}
@ -1448,8 +1458,6 @@ static void Sta_ShowHits (Sta_GlobalOrCourseAccesses_t GlobalOrCourse)
else
{
/***** Put the table with the clicks *****/
/* Write start of table frame */
Lay_StartSection (Sta_STAT_RESULTS_SECTION_ID);
if (Gbl.Stat.ClicksGroupedBy == Sta_CLICKS_CRS_DETAILED_LIST)
Lay_StartRoundFrame ("95%",Txt_List_of_detailed_clicks,
NULL,NULL);
@ -1538,9 +1546,6 @@ static void Sta_ShowHits (Sta_GlobalOrCourseAccesses_t GlobalOrCourse)
if (Gbl.Action.Act == ActSeeAccCrs)
Usr_FreeListsSelectedUsrsCods ();
/***** Free memory used by the data of the user *****/
Usr_UsrDataDestructor (&UsrDat);
/***** Write time zone used in the calculation of these statistics *****/
switch (Gbl.Stat.ClicksGroupedBy)
{
@ -2153,7 +2158,7 @@ static void Sta_ShowDistrAccessesPerDaysAndHour (unsigned long NumRows,MYSQL_RES
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"26\" class=\"CENTER_MIDDLE\">");
Act_FormStartAnchor (Gbl.Action.Act,Sta_STAT_FORM_SECTION_ID);
Act_FormStartAnchor (Gbl.Action.Act,Sta_STAT_RESULTS_SECTION_ID);
Sta_WriteParamsDatesSeeAccesses ();
Par_PutHiddenParamUnsigned ("GroupedBy",(unsigned) Gbl.Stat.ClicksGroupedBy);
Par_PutHiddenParamUnsigned ("CountType",(unsigned) Gbl.Stat.CountType);

6
swad_user.c
View File

@ -5233,13 +5233,13 @@ void Usr_GetListsSelectedUsrsCods (void)
if (Gbl.Session.IsOpen) // If the session is open, get parameter from DB
{
Ses_GetHiddenParFromDB (Gbl.Action.Act,Usr_ParamUsrCod[Rol_UNK],Gbl.Usrs.Select[Rol_UNK],
Usr_MAX_BYTES_LIST_ENCRYPTED_USR_CODS);
Usr_MAX_BYTES_LIST_ENCRYPTED_USR_CODS);
Str_ChangeFormat (Str_FROM_FORM,Str_TO_TEXT,Gbl.Usrs.Select[Rol_UNK],
Usr_MAX_BYTES_LIST_ENCRYPTED_USR_CODS,true);
Usr_MAX_BYTES_LIST_ENCRYPTED_USR_CODS,true);
}
else
Par_GetParMultiToText (Usr_ParamUsrCod[Rol_UNK],Gbl.Usrs.Select[Rol_UNK],
Usr_MAX_BYTES_LIST_ENCRYPTED_USR_CODS);
Usr_MAX_BYTES_LIST_ENCRYPTED_USR_CODS);
/***** Get list of selected users for each possible role *****/
for (Role = Rol_TCH; // From the highest possible role of selected users...