mirror of https://github.com/acanas/swad-core.git
Version 16.47.3
This commit is contained in:
parent
1b9f08ed79
commit
40d7ece537
|
@ -156,13 +156,14 @@
|
|||
/****************************** 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 JS_FILE "swad16.46.1.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.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.1: Nov 06, 2016 Icon in list of notices to show figure (statistics). (206129 lines)
|
||||
Copy icon/pie64x64.gif to icon directory
|
||||
|
|
|
@ -67,6 +67,7 @@ static void Ins_Configuration (bool PrintView);
|
|||
static void Ins_PutIconsToPrintAndUpload (void);
|
||||
|
||||
static void Ins_ListInstitutions (void);
|
||||
static void Ins_PutIconsInstitutions (void);
|
||||
static void Ins_PutIconToEditInstitutions (void);
|
||||
static void Ins_ListOneInstitutionForSeeing (struct Instit *Ins,unsigned NumIns);
|
||||
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_institution;
|
||||
unsigned NumIns;
|
||||
bool ICanEdit = (Gbl.Usrs.Me.LoggedRole >= Rol__GUEST_);
|
||||
|
||||
/***** Start frame *****/
|
||||
sprintf (Gbl.Title,Txt_Institutions_of_COUNTRY_X,Gbl.CurrentCty.Cty.Name[Gbl.Prefs.Language]);
|
||||
Lay_StartRoundFrame (NULL,Gbl.Title,ICanEdit ? Ins_PutIconToEditInstitutions :
|
||||
NULL);
|
||||
Lay_StartRoundFrame (NULL,Gbl.Title,Ins_PutIconsInstitutions);
|
||||
|
||||
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);
|
||||
|
||||
/***** Button to create institution *****/
|
||||
if (ICanEdit)
|
||||
if (Gbl.Usrs.Me.LoggedRole >= Rol__GUEST_)
|
||||
{
|
||||
Act_FormStart (ActEdiIns);
|
||||
Lay_PutConfirmButton (Gbl.Inss.Num ? Txt_Create_another_institution :
|
||||
|
@ -694,6 +693,21 @@ static void Ins_ListInstitutions (void)
|
|||
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 *******************/
|
||||
/*****************************************************************************/
|
||||
|
|
|
@ -3874,6 +3874,8 @@ static void Sta_PutParamsToShowFigure (void)
|
|||
Gbl.Scope.Current = Sco_SCOPE_CTR;
|
||||
else if (Gbl.CurrentIns.Ins.InsCod > 0)
|
||||
Gbl.Scope.Current = Sco_SCOPE_INS;
|
||||
else if (Gbl.CurrentCty.Cty.CtyCod > 0)
|
||||
Gbl.Scope.Current = Sco_SCOPE_CTY;
|
||||
else
|
||||
Gbl.Scope.Current = Sco_SCOPE_SYS;
|
||||
|
||||
|
|
Loading…
Reference in New Issue