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.47.3

This commit is contained in:
Antonio Cañas Vargas 2016-11-06 21:51:21 +01:00
parent 1b9f08ed79
commit 40d7ece537
3 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -156,13 +156,14 @@
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.47.2 (2016-11-06)" #define Log_PLATFORM_VERSION "SWAD 16.47.3 (2016-11-06)"
#define CSS_FILE "swad16.32.1.css" #define CSS_FILE "swad16.32.1.css"
#define JS_FILE "swad16.46.1.js" #define JS_FILE "swad16.46.1.js"
// Number of lines (includes comments but not blank lines) has been got with the following command: // 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 // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1
/* /*
Version 16.47.3: Nov 06, 2016 Icon in list of institutions to show figure (statistics). (206155 lines)
Version 16.47.2: Nov 06, 2016 Icon in list of countries to show figure (statistics). (206141 lines) Version 16.47.2: Nov 06, 2016 Icon in list of countries to show figure (statistics). (206141 lines)
Version 16.47.1: Nov 06, 2016 Icon in list of notices to show figure (statistics). (206129 lines) Version 16.47.1: Nov 06, 2016 Icon in list of notices to show figure (statistics). (206129 lines)
Copy icon/pie64x64.gif to icon directory Copy icon/pie64x64.gif to icon directory

22
swad_institution.c
View File

@ -67,6 +67,7 @@ static void Ins_Configuration (bool PrintView);
static void Ins_PutIconsToPrintAndUpload (void); static void Ins_PutIconsToPrintAndUpload (void);
static void Ins_ListInstitutions (void); static void Ins_ListInstitutions (void);
static void Ins_PutIconsInstitutions (void);
static void Ins_PutIconToEditInstitutions (void); static void Ins_PutIconToEditInstitutions (void);
static void Ins_ListOneInstitutionForSeeing (struct Instit *Ins,unsigned NumIns); static void Ins_ListOneInstitutionForSeeing (struct Instit *Ins,unsigned NumIns);
static void Ins_PutHeadInstitutionsForSeeing (bool OrderSelectable); static void Ins_PutHeadInstitutionsForSeeing (bool OrderSelectable);
@ -657,12 +658,10 @@ static void Ins_ListInstitutions (void)
extern const char *Txt_Create_another_institution; extern const char *Txt_Create_another_institution;
extern const char *Txt_Create_institution; extern const char *Txt_Create_institution;
unsigned NumIns; unsigned NumIns;
bool ICanEdit = (Gbl.Usrs.Me.LoggedRole >= Rol__GUEST_);
/***** Start frame *****/ /***** Start frame *****/
sprintf (Gbl.Title,Txt_Institutions_of_COUNTRY_X,Gbl.CurrentCty.Cty.Name[Gbl.Prefs.Language]); sprintf (Gbl.Title,Txt_Institutions_of_COUNTRY_X,Gbl.CurrentCty.Cty.Name[Gbl.Prefs.Language]);
Lay_StartRoundFrame (NULL,Gbl.Title,ICanEdit ? Ins_PutIconToEditInstitutions : Lay_StartRoundFrame (NULL,Gbl.Title,Ins_PutIconsInstitutions);
NULL);
if (Gbl.Inss.Num) // There are institutions in the current country if (Gbl.Inss.Num) // There are institutions in the current country
{ {
@ -683,7 +682,7 @@ static void Ins_ListInstitutions (void)
Lay_ShowAlert (Lay_INFO,Txt_No_institutions); Lay_ShowAlert (Lay_INFO,Txt_No_institutions);
/***** Button to create institution *****/ /***** Button to create institution *****/
if (ICanEdit) if (Gbl.Usrs.Me.LoggedRole >= Rol__GUEST_)
{ {
Act_FormStart (ActEdiIns); Act_FormStart (ActEdiIns);
Lay_PutConfirmButton (Gbl.Inss.Num ? Txt_Create_another_institution : Lay_PutConfirmButton (Gbl.Inss.Num ? Txt_Create_another_institution :
@ -694,6 +693,21 @@ static void Ins_ListInstitutions (void)
Lay_EndRoundFrame (); Lay_EndRoundFrame ();
} }
/*****************************************************************************/
/*************** Put contextual icons in list of institutions ****************/
/*****************************************************************************/
static void Ins_PutIconsInstitutions (void)
{
/***** Put icon to edit countries *****/
if (Gbl.Usrs.Me.LoggedRole >= Rol__GUEST_)
Ins_PutIconToEditInstitutions ();
/***** Put icon to show a figure *****/
Gbl.Stat.FigureType = Sta_INSTITS;
Sta_PutIconToShowFigure ();
}
/*****************************************************************************/ /*****************************************************************************/
/******************** Put link (form) to edit institutions *******************/ /******************** Put link (form) to edit institutions *******************/
/*****************************************************************************/ /*****************************************************************************/

2
swad_statistic.c
View File

@ -3874,6 +3874,8 @@ static void Sta_PutParamsToShowFigure (void)
Gbl.Scope.Current = Sco_SCOPE_CTR; Gbl.Scope.Current = Sco_SCOPE_CTR;
else if (Gbl.CurrentIns.Ins.InsCod > 0) else if (Gbl.CurrentIns.Ins.InsCod > 0)
Gbl.Scope.Current = Sco_SCOPE_INS; Gbl.Scope.Current = Sco_SCOPE_INS;
else if (Gbl.CurrentCty.Cty.CtyCod > 0)
Gbl.Scope.Current = Sco_SCOPE_CTY;
else else
Gbl.Scope.Current = Sco_SCOPE_SYS; Gbl.Scope.Current = Sco_SCOPE_SYS;