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 23.59.3: Jan 24, 2024 Responsive design in course hits.

This commit is contained in:
acanas 2024-01-24 18:29:11 +01:00
parent f14d5a22fc
commit a735b4e393
7 changed files with 68 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
css/swad23.58.1.css
View File

@ -5044,12 +5044,6 @@ button.PAG_DARK:hover, .PAG_CUR_DARK {background-color:#707070;}
height:10px;
}
/********************************** Statistics *******************************/
.STAT_SEL
{
width:300px;
}
/******************************** User's report ******************************/
.TITLE_REPORT
{

2
swad_action_list.c
View File

@ -1801,7 +1801,7 @@ const struct Act_Actions ActLst_Actions[ActLst_NUM_ACTIONS] =
[ActRemSvyQst ] = { 981,-1,TabUnk,ActSeeAllSvy ,0x3E0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Svy_RemoveQst ,NULL},
[ActSeeAccGbl ] = { 79,-1,TabUnk,ActReqAccGbl ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Sta_SeeGblAccesses ,NULL},
[ActReqAccCrs ] = { 594,-1,TabUnk,ActReqAccGbl ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Dat_SetIniEndDatesToRecentWeeks,Sta_AskShowCrsHits ,NULL},
[ActReqAccCrs ] = { 594,-1,TabUnk,ActReqAccGbl ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Dat_SetIniEndDatesToRecentWeeks,Sta_ReqCrsHits ,NULL},
[ActSeeAccCrs ] = { 119,-1,TabUnk,ActReqAccGbl ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Sta_SeeCrsAccesses ,NULL},
[ActLstClk ] = { 989,-1,TabUnk,ActReqAccGbl ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Log_ShowLastClicks ,NULL},

3
swad_changelog.h
View File

@ -633,10 +633,11 @@ Me sale este error, no s
"can npt create received message (duplicated entry '243218-2160773' for key 'UsrCod_MsgCod')
*/
#define Log_PLATFORM_VERSION "SWAD 23.59.2 (2024-01-24)"
#define Log_PLATFORM_VERSION "SWAD 23.59.3 (2024-01-24)"
#define CSS_FILE "swad23.58.1.css"
#define JS_FILE "swad23.53.6.js"
/*
Version 23.59.3: Jan 24, 2024 Responsive design in course hits. (335698 lines)
Version 23.59.2: Jan 24, 2024 Responsive design in global hits. (335672 lines)
Version 23.59.1: Jan 24, 2024 Responsive design in surveys. (335668 lines)
Version 23.59: Jan 24, 2024 Responsive design in assignments. (335664 lines)

48
swad_statistic.c
View File

@ -192,10 +192,10 @@ void Sta_ResetStats (struct Sta_Stats *Stats)
}
/*****************************************************************************/
/******************** Show a form to make a query of clicks ******************/
/**************** Show a form to make a query of course hits *****************/
/*****************************************************************************/
void Sta_AskShowCrsHits (void)
void Sta_ReqCrsHits (void)
{
struct Sta_Stats Stats;
@ -212,6 +212,7 @@ static void Sta_PutFormCrsHits (struct Sta_Stats *Stats)
extern const char *Txt_Statistics_of_visits_to_the_course_X;
extern const char *Txt_Users;
extern const char *Txt_Show;
extern const char *Txt_Graph;
extern const char *Txt_distributed_by;
extern const char *Txt_STAT_CLICKS_GROUPED_BY[Sta_NUM_CLICKS_GROUPED_BY];
extern const char *Txt_results_per_page;
@ -296,12 +297,16 @@ static void Sta_PutFormCrsHits (struct Sta_Stats *Stats)
Par_PutParLong (NULL,"FirstRow",0);
Par_PutParLong (NULL,"LastRow",0);
/***** Put list of users to select some of them *****/
HTM_TABLE_BeginCenterPadding (2);
/***** List of users to select some of them *****/
HTM_TR_Begin (NULL);
HTM_TD_TxtColon (Txt_Users);
HTM_TD_Begin ("class=\"LT FORM_IN_%s\"",
/* Label */
Frm_LabelColumn ("REC_C1_BOT RT","",Txt_Users);
/* Data */
HTM_TD_Begin ("class=\"REC_C2_BOT LT FORM_IN_%s\"",
The_GetSuffix ());
HTM_TABLE_Begin (NULL);
Usr_ListUsersToSelect (Rol_TCH,&Gbl.Usrs.Selected);
@ -327,26 +332,33 @@ static void Sta_PutFormCrsHits (struct Sta_Stats *Stats)
/***** Selection of action *****/
Sta_WriteSelectorAction (Stats);
/***** Option a) Listing of clicks distributed by some metric *****/
/***** Listing of clicks (graphic or detailed) *****/
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RM FORM_IN_%s\"",
The_GetSuffix ());
HTM_TxtColon (Txt_Show);
HTM_TD_End ();
/* Label */
Frm_LabelColumn ("REC_C1_BOT RT","",Txt_Show);
HTM_TD_Begin ("class=\"LM\"");
/* Data */
HTM_TD_Begin ("class=\"REC_C2_BOT LM\"");
if ((Stats->ClicksGroupedBy < Sta_CLICKS_CRS_PER_USR ||
Stats->ClicksGroupedBy > Sta_CLICKS_CRS_PER_ACTION) &&
Stats->ClicksGroupedBy != Sta_CLICKS_CRS_DETAILED_LIST)
Stats->ClicksGroupedBy = Sta_CLICKS_GROUPED_BY_DEFAULT;
HTM_INPUT_RADIO ("GroupedOrDetailed",HTM_DONT_SUBMIT_ON_CLICK,
"value=\"%u\"%s onclick=\"disableDetailedClicks();\"",
(unsigned) Sta_CLICKS_GROUPED,
Stats->ClicksGroupedBy == Sta_CLICKS_CRS_DETAILED_LIST ? "" :
" checked=\"checked\"");
/***** Option a) Graphic of clicks in this course *****/
HTM_LABEL_Begin ("class=\"FORM_IN_%s\"",
The_GetSuffix ());
HTM_INPUT_RADIO ("GroupedOrDetailed",HTM_DONT_SUBMIT_ON_CLICK,
"value=\"%u\"%s onclick=\"disableDetailedClicks();\"",
(unsigned) Sta_CLICKS_GROUPED,
Stats->ClicksGroupedBy == Sta_CLICKS_CRS_DETAILED_LIST ? "" :
" checked=\"checked\"");
HTM_Txt (Txt_Graph);
HTM_LABEL_End ();
/* Separator */
HTM_BR ();
/* Selection of count type (number of pages generated, accesses per user, etc.) */
Sta_WriteSelectorCountType (Stats);
@ -377,7 +389,7 @@ static void Sta_PutFormCrsHits (struct Sta_Stats *Stats)
/***** Option b) Listing of detailed clicks to this course *****/
HTM_LABEL_Begin ("class=\"FORM_IN_%s\"",
The_GetSuffix ());
The_GetSuffix ());
HTM_INPUT_RADIO ("GroupedOrDetailed",HTM_DONT_SUBMIT_ON_CLICK,
"value=\"%u\"%s onclick=\"enableDetailedClicks();\"",
(unsigned) Sta_CLICKS_DETAILED,
@ -387,7 +399,7 @@ static void Sta_PutFormCrsHits (struct Sta_Stats *Stats)
HTM_LABEL_End ();
/* Separator */
HTM_SP ();
HTM_BR ();
/* Number of rows per page */
// To use getElementById in Firefox, it's necessary to have the id attribute

2
swad_statistic.h
View File

@ -152,7 +152,7 @@ struct Sta_Stats
void Sta_ResetStats (struct Sta_Stats *Stats);
void Sta_AskShowCrsHits (void);
void Sta_ReqCrsHits (void);
void Sta_AskShowGblHits (void);
void Sta_PutLinkToCourseHits (void);
void Sta_PutLinkToGlobalHits (void);

2
swad_survey.c
View File

@ -1701,7 +1701,7 @@ void Svy_ReqCreatOrEditSvy (void)
HTM_TR_Begin (NULL);
/* Label */
Frm_LabelColumn ("REC_C1_BOT RT","Txt",Txt_Users);
Frm_LabelColumn ("REC_C1_BOT RT","",Txt_Users);
/* Data */
HTM_TD_Begin ("class=\"LM DAT_%s\"",The_GetSuffix ());

43
swad_text.c
View File

@ -14995,6 +14995,29 @@ const char *Txt_Grade =
"Vas&inodot;f";
#endif
const char *Txt_Graph =
#if L==1 // ca
"Gr&agrave;fica";
#elif L==2 // de
"Graph";
#elif L==3 // en
"Graph";
#elif L==4 // es
"Gr&aacute;fica";
#elif L==5 // fr
"Graphique";
#elif L==6 // gn
"Gr&aacute;fica"; // Okoteve traducción
#elif L==7 // it
"Grafico";
#elif L==8 // pl
"Wykres";
#elif L==9 // pt
"Gr&aacute;fico";
#elif L==10 // tr
"Grafik";
#endif
const char *Txt_Group =
#if L==1 // ca
"Grup";
@ -42764,25 +42787,25 @@ const char *Txt_STAT_CLICKS_GROUPED_BY[Sta_NUM_CLICKS_GROUPED_BY] =
{
[Sta_CLICKS_CRS_DETAILED_LIST] =
#if L==1 // ca
"clics detallats"
"Clics detallats"
#elif L==2 // de
"detaillierte Klicks"
"Detaillierte Klicks"
#elif L==3 // en
"detailed clicks"
"Detailed clicks"
#elif L==4 // es
"clics detallados"
"Clics detallados"
#elif L==5 // fr
"clics d&eacute;taill&eacute;es"
"Clics d&eacute;taill&eacute;es"
#elif L==6 // gn
"clics detallados" // Okoteve traducción
"Clics detallados" // Okoteve traducción
#elif L==7 // it
"dettagli di scatto"
"Dettagli di scatto"
#elif L==8 // pl
"szczeg&oacute;&lstrok;owe klikni&eogon;&cacute;"
"Szczeg&oacute;&lstrok;owe klikni&eogon;&cacute;"
#elif L==9 // pt
"detalhadamente cliques"
"Detalhadamente cliques"
#elif L==10 // tr
"detailed clicks" // Çeviri lazim!
"Detailed clicks" // Çeviri lazim!
#endif
,
[Sta_CLICKS_CRS_PER_USR] =