From a6146d3b3f6ebc3a19dfa8fef0d306ae18cd4eb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Wed, 31 Dec 2014 01:09:25 +0100 Subject: [PATCH] Version 14.48.6 --- icon/stats16x16.gif | Bin 0 -> 124 bytes icon/stop16x16.gif | Bin 0 -> 164 bytes icon/sys16x16.gif | Bin 0 -> 154 bytes swad_action.c | 13 +++-- swad_action.h | 44 ++++++++-------- swad_changelog.h | 8 +-- swad_statistic.c | 4 +- swad_text.c | 120 +++++++++++--------------------------------- 8 files changed, 65 insertions(+), 124 deletions(-) create mode 100644 icon/stats16x16.gif create mode 100644 icon/stop16x16.gif create mode 100644 icon/sys16x16.gif diff --git a/icon/stats16x16.gif b/icon/stats16x16.gif new file mode 100644 index 0000000000000000000000000000000000000000..a84c4c65be37a1c6cfb742818f4856038b60894f GIT binary patch literal 124 zcmZ?wbhEHb6krfw*v!D-;Nals=;-Y1?B?e7|NnmmLO}5+3nK#q3xf_wA;=5{7R?DK wJXi0vXrHJpAp5oT@{Qbb%6A^8LW000jFEC2ui01yBW000D0@X1N5z4)yGz*rd<7)Ib- zoI;sIwE*gL00O{JLqN^Q0~8d1K?dkO2)c<-!kZu|PeU;{oG<_;qa*=vR5$_(7ibX` S3LWx=fesWJnYjEC0RTH^l{!5D literal 0 HcmV?d00001 diff --git a/icon/sys16x16.gif b/icon/sys16x16.gif new file mode 100644 index 0000000000000000000000000000000000000000..18611d16a471631aa085c1847273b91401775e26 GIT binary patch literal 154 zcmV;L0A>G2Nk%w1VGsZi0J8u9KtMo5L_|qRNls2qRaI48U0q~kWNK<^adB~Wc6OAM zl$n{Cot>Seq@<~-ssI1~A^8LW000jFEC2ui01yBW000C>@X1N5y;u$aNS+)Jd{Q`) zMGzRIv^3wM%*Qb+OT{EkkMKSRMZuU5jYSQ|v*|pVo`*@w8BM7oEC72d2m~xI_#tMs I&X))PJApGebpQYW literal 0 HcmV?d00001 diff --git a/swad_action.c b/swad_action.c index e545c9c97..cae17551e 100644 --- a/swad_action.c +++ b/swad_action.c @@ -937,7 +937,6 @@ Statistics: 801. ActReqUseGbl Request showing use of the platform 802. ActSeePhoDeg Show a class photo with the average photos of the students of each degree 803. ActReqStaCrs Request statistics of courses - 804. ActReqAccCrs Request query of clicks in the course 805. ActReqAccGbl Request query of clicks to the complete platform 806. ActLstClk List last clicks in real time @@ -960,6 +959,7 @@ Statistics: 823. ActPrnPhoDeg Show vista of impresión of the class photo with the average photos of the students of each degree. 824. ActCalPhoDeg Compute the average photos of the students of each degree 825. ActSeeAccGbl Query clicks to the complete platform + 804. ActReqAccCrs Request query of clicks in the course 826. ActSeeAccCrs Query clicks to current course 827. ActSeeAllStaCrs Show statistics of courses Profile: @@ -1173,7 +1173,6 @@ const struct Act_Menu Act_Menu[Act_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = {ActSeePhoDeg ,false}, {ActReqStaCrs ,true }, - {ActReqAccCrs ,false}, {ActReqAccGbl ,false}, {ActLstClk ,true }, }, @@ -2149,9 +2148,8 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActReqUseGbl */{ 761, 1,TabSta,ActReqUseGbl ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Sta_ReqUseOfPlatform ,"pie" }, /* ActSeePhoDeg */{ 447, 2,TabSta,ActSeePhoDeg ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Pho_ShowPhotoDegree ,"classphoto" }, /* ActReqStaCrs */{ 767, 3,TabSta,ActReqStaCrs ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Ind_ReqIndicatorsCourses ,"tablestats" }, - /* ActReqAccCrs */{ 594, 4,TabSta,ActReqAccCrs ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,Sta_SetIniEndDates ,Sta_AskSeeCrsAccesses ,"statsuser" }, - /* ActReqAccGbl */{ 591, 5,TabSta,ActReqAccGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,Sta_SetIniEndDates ,Sta_AskSeeGblAccesses ,"stats" }, - /* ActLstClk */{ 989, 6,TabSta,ActLstClk ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Con_ShowLastClicks ,"recyclelist" }, + /* ActReqAccGbl */{ 591, 4,TabSta,ActReqAccGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,Sta_SetIniEndDates ,Sta_AskSeeGblAccesses ,"stats" }, + /* ActLstClk */{ 989, 5,TabSta,ActLstClk ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Con_ShowLastClicks ,"recyclelist" }, // Actions not in menu: /* ActSeeOneSvy */{ 982,-1,TabSta,ActSeeAllSvy ,0x1F8,0x1F8,0x1F8,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Svy_SeeOneSurvey ,NULL}, @@ -2176,8 +2174,9 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActPrnPhoDeg */{ 448,-1,TabSta,ActSeePhoDeg ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_NEW_WINDOW ,NULL ,Pho_PrintPhotoDegree ,NULL}, /* ActCalPhoDeg */{ 444,-1,TabSta,ActSeePhoDeg ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Pho_CalcPhotoDegree ,NULL}, /* ActSeeAccGbl */{ 79,-1,TabSta,ActReqAccGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Sta_SeeGblAccesses ,NULL}, - /* ActSeeAccCrs */{ 119,-1,TabSta,ActReqAccCrs ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Sta_SeeCrsAccesses ,NULL}, - /* ActSeeAllStaCrs */{ 768,-1,TabSta,ActReqStaCrs ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_NEW_WINDOW ,NULL ,Ind_ShowIndicatorsCourses ,NULL}, + /* ActReqAccCrs */{ 594,-1,TabSta,ActReqAccGbl ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,Sta_SetIniEndDates ,Sta_AskSeeCrsAccesses ,NULL}, + /* ActSeeAccCrs */{ 119,-1,TabSta,ActReqAccGbl ,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Sta_SeeCrsAccesses ,NULL}, + /* ActSeeAllStaCrs */{ 768,-1,TabSta,ActReqAccGbl ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_NEW_WINDOW ,NULL ,Ind_ShowIndicatorsCourses ,NULL}, // TabPrf ****************************************************************** // Actions in menu: diff --git a/swad_action.h b/swad_action.h index 3f830f188..4b691b50c 100644 --- a/swad_action.h +++ b/swad_action.h @@ -999,30 +999,30 @@ typedef int Act_Action_t; // Must be a signed type, because -1 is used to indica #define ActReqUseGbl (ActCht+ 2) #define ActSeePhoDeg (ActCht+ 3) #define ActReqStaCrs (ActCht+ 4) -#define ActReqAccCrs (ActCht+ 5) -#define ActReqAccGbl (ActCht+ 6) -#define ActLstClk (ActCht+ 7) +#define ActReqAccGbl (ActCht+ 5) +#define ActLstClk (ActCht+ 6) // Secondary actions -#define ActSeeOneSvy (ActCht+ 8) -#define ActAnsSvy (ActCht+ 9) -#define ActFrmNewSvy (ActCht+10) -#define ActEdiOneSvy (ActCht+11) -#define ActNewSvy (ActCht+12) -#define ActChgSvy (ActCht+13) -#define ActReqRemSvy (ActCht+14) -#define ActRemSvy (ActCht+15) -#define ActReqRstSvy (ActCht+16) -#define ActRstSvy (ActCht+17) -#define ActHidSvy (ActCht+18) -#define ActShoSvy (ActCht+19) -#define ActEdiOneSvyQst (ActCht+20) -#define ActRcvSvyQst (ActCht+21) -#define ActRemSvyQst (ActCht+22) +#define ActSeeOneSvy (ActCht+ 7) +#define ActAnsSvy (ActCht+ 8) +#define ActFrmNewSvy (ActCht+ 9) +#define ActEdiOneSvy (ActCht+10) +#define ActNewSvy (ActCht+11) +#define ActChgSvy (ActCht+12) +#define ActReqRemSvy (ActCht+13) +#define ActRemSvy (ActCht+14) +#define ActReqRstSvy (ActCht+15) +#define ActRstSvy (ActCht+16) +#define ActHidSvy (ActCht+17) +#define ActShoSvy (ActCht+18) +#define ActEdiOneSvyQst (ActCht+19) +#define ActRcvSvyQst (ActCht+20) +#define ActRemSvyQst (ActCht+21) -#define ActSeeUseGbl (ActCht+23) -#define ActPrnPhoDeg (ActCht+24) -#define ActCalPhoDeg (ActCht+25) -#define ActSeeAccGbl (ActCht+26) +#define ActSeeUseGbl (ActCht+22) +#define ActPrnPhoDeg (ActCht+23) +#define ActCalPhoDeg (ActCht+24) +#define ActSeeAccGbl (ActCht+25) +#define ActReqAccCrs (ActCht+26) #define ActSeeAccCrs (ActCht+27) #define ActSeeAllStaCrs (ActCht+28) diff --git a/swad_changelog.h b/swad_changelog.h index 955ccbe65..d41992bc9 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -35,14 +35,16 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 14.48.5 (2014/12/31)" +#define Log_PLATFORM_VERSION "SWAD 14.48.6 (2014/12/31)" // 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 | tail -1 /* - Version 14.48.5 :Dec 30, 2014 New links to see accesses to the current course in platform accesses. (174463 lines) + Version 14.48.6 :Dec 31, 2014 Option to see accesses to the current course removed from main menu. + The text of some menu items has been reduced to a single word. (174404 lines) + Version 14.48.5 :Dec 31, 2014 New links to see accesses to the current course in platform accesses. (174463 lines) Version 14.48.4 :Dec 31, 2014 The text of some menu items has been reduced to a single word. - Fixed bugs in layout. (174420 lines) + Fixed bugs in layout. (174420 lines) Version 14.48.3 :Dec 30, 2014 Options to see the results of test exams removed from main menu. (174418 lines) Version 14.48.2 :Dec 30, 2014 New links to see the results of test exams. (174539 lines) Version 14.48.1 :Dec 30, 2014 The text of some menu items has been reduced to a single word. diff --git a/swad_statistic.c b/swad_statistic.c index 24c8275e7..8cbbde039 100644 --- a/swad_statistic.c +++ b/swad_statistic.c @@ -379,7 +379,7 @@ void Sta_AskSeeCrsAccesses (void) extern const char *Txt_STAT_CLICK_STAT_TYPES[Sta_NUM_TYPES_CLICK_STATS]; extern const char *Txt_results_per_page; static unsigned long RowsPerPage[] = {10,20,30,40,50,100,500,1000,5000,10000,50000,100000}; -#define NUM_OPTIONS_ROSvc_PER_PAGE (sizeof (RowsPerPage) / sizeof (RowsPerPage[0])) +#define NUM_OPTIONS_ROWS_PER_PAGE (sizeof (RowsPerPage) / sizeof (RowsPerPage[0])) Sta_ClicksStatType_t ClicksStatType; unsigned long i; @@ -481,7 +481,7 @@ void Sta_AskSeeCrsAccesses (void) fprintf (Gbl.F.Out," disabled=\"disabled\""); fprintf (Gbl.F.Out,">"); for (i = 0; - i < NUM_OPTIONS_ROSvc_PER_PAGE; + i < NUM_OPTIONS_ROWS_PER_PAGE; i++) { fprintf (Gbl.F.Out,"assignatura" -#elif L==1 - "Anmeldungen
bei Kurs" -#elif L==2 - "Visits to
course" -#elif L==3 - "Accesos
asignatura" -#elif L==4 - "Visites
matière" -#elif L==5 - "Accesos
asignatura" // Okoteve traducción -#elif L==6 - "Accessi
corso" -#elif L==7 - "Odiwedzic
kursów" -#elif L==8 - "Visitas
disciplina" #endif , // ActReqAccGbl #if L==0 - "Accessos
SWAD" + "Accessos" #elif L==1 - "Anmeldungen
bei SWAD" + "Anmeldungen" #elif L==2 - "Logins to
SWAD" + "Logins" #elif L==3 - "Accesos
SWAD" + "Accesos" #elif L==4 - "Visites
SWAD" + "Visites" #elif L==5 - "Accesos
SWAD" // Okoteve traducción + "Accesos" // Okoteve traducción #elif L==6 - "Accessi
SWAD" + "Accessi" #elif L==7 - "Logowanie sie do
SWAD" + "Logowanie" #elif L==8 - "Visitas
SWAD" + "Visitas" #endif , // ActLstClk @@ -17167,6 +17146,7 @@ const char *Txt_MENU_BR[Act_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = NULL, NULL, NULL, + NULL, }, { // TabPrf ***************************************************** @@ -18943,48 +18923,27 @@ const char *Txt_MENU_NO_BR[Act_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Wskaźniki" #elif L==8 "Indicadores" -#endif - , - // ActReqAccCrs -#if L==0 - "Accessos assignatura" -#elif L==1 - "Anmeldungen bei Kurs" -#elif L==2 - "Visits to course" -#elif L==3 - "Accesos asignatura" -#elif L==4 - "Visites matière" -#elif L==5 - "Accesos asignatura" // Okoteve traducción -#elif L==6 - "Accessi al corso" -#elif L==7 - "Wizyty w trakcie" -#elif L==8 - "Visitas disciplina" #endif , // ActReqAccGbl #if L==0 - "Accessos SWAD" + "Accessos" #elif L==1 - "Anmeldungen bei SWAD" + "Anmeldungen" #elif L==2 - "Logins to SWAD" + "Logins" #elif L==3 - "Accesos SWAD" + "Accesos" #elif L==4 - "Visites SWAD" + "Visites" #elif L==5 - "Accesos SWAD" // Okoteve traducción + "Accesos" // Okoteve traducción #elif L==6 - "Accessi SWAD" + "Accessi" #elif L==7 - "Logowanie sie do SWAD" + "Logowanie" #elif L==8 - "Visitas SWAD" + "Visitas" #endif , // ActLstClk @@ -19021,6 +18980,7 @@ const char *Txt_MENU_NO_BR[Act_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = NULL, NULL, NULL, + NULL, }, { // TabPrf ***************************************************** @@ -20854,48 +20814,27 @@ const char *Txt_MENU_SUBTITLE[Act_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Wskaźniki kursów dla umowy programu" #elif L==8 "Indicadores de disciplinas para o contrato programa" -#endif - , - // ActReqAccCrs -#if L==0 - "Estadístiques d'accessos a aquesta assignatura" -#elif L==1 - "Anmeldungen bei Kurs" -#elif L==2 - "Visits to course" -#elif L==3 - "Estadísticas de accesos a esta asignatura" -#elif L==4 - "Visites matière" -#elif L==5 - "Estadísticas de accesos a esta asignatura"// Okoteve traducción -#elif L==6 - "Accessi al corso" -#elif L==7 - "Wizyty w trakcie" -#elif L==8 - "Visitas disciplina" #endif , // ActReqAccGbl #if L==0 - "Estadístiques d'accessos a tota la plataforma" + "Estadístiques d'accesso a la plataforma" #elif L==1 - "Anmeldungen bei SWAD" + "Zugriffsstatistik auf die Plattform" #elif L==2 - "Logins to SWAD" + "Access statistics to the platform" #elif L==3 - "Estadísticas de accesos a toda la plataforma" + "Estadísticas de acceso a la plataforma" #elif L==4 - "Visites SWAD" + "Statistiques de connexion à la plate-forme" #elif L==5 - "Estadísticas de accesos a toda la plataforma"// Okoteve traducción + "Estadísticas de acceso a la plataforma" // Okoteve traducción #elif L==6 - "Accessi SWAD" + "Statistiche di accesso alla piattaforma" #elif L==7 - "Logowanie sie do SWAD" + "Statystyki dostęp do platformy" #elif L==8 - "Visitas SWAD" + "Estatísticas de acesso à plataforma" #endif , // ActLstClk @@ -20932,6 +20871,7 @@ const char *Txt_MENU_SUBTITLE[Act_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = NULL, NULL, NULL, + NULL, }, { // TabPrf *****************************************************