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

This commit is contained in:
Antonio Cañas Vargas 2017-03-24 13:58:35 +01:00
parent 3778a7d644
commit 8ded27bdfe
2 changed files with 39 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -209,13 +209,14 @@
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.164.2 (2017-03-24)" #define Log_PLATFORM_VERSION "SWAD 16.164.4 (2017-03-24)"
#define CSS_FILE "swad16.161.css" #define CSS_FILE "swad16.161.css"
#define JS_FILE "swad16.144.js" #define JS_FILE "swad16.144.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.164.4: Mar 24, 2017 Link to figures in types of degree. (217604 lines)
Version 16.164.3: Mar 24, 2017 Fixed bug in types of degree. Version 16.164.3: Mar 24, 2017 Fixed bug in types of degree.
Types of degree in system tab restricted to system admins only. (217579 lines) Types of degree in system tab restricted to system admins only. (217579 lines)
Version 16.164.2: Mar 24, 2017 Code refactoring in types of degree. (217576 lines) Version 16.164.2: Mar 24, 2017 Code refactoring in types of degree. (217576 lines)

47
swad_degree_type.c
View File

@ -69,6 +69,7 @@ static DT_Order_t DT_GetParamDegTypOrder (DT_Order_t DefaultOrder);
static void DT_ListDegreeTypes (Act_Action_t NextAction,DT_Order_t SelectedOrder); static void DT_ListDegreeTypes (Act_Action_t NextAction,DT_Order_t SelectedOrder);
static void DT_EditDegreeTypes (void); static void DT_EditDegreeTypes (void);
static void DT_ListDegreeTypesForSeeing (void); static void DT_ListDegreeTypesForSeeing (void);
static void DT_PutIconsListDegTypes (void);
static void DT_PutIconToEditDegTypes (void); static void DT_PutIconToEditDegTypes (void);
static void DT_ListDegreeTypesForEdition (void); static void DT_ListDegreeTypesForEdition (void);
@ -201,12 +202,23 @@ static void DT_ListDegreeTypes (Act_Action_t NextAction,DT_Order_t SelectedOrder
if (Gbl.Degs.DegTypes.Num) if (Gbl.Degs.DegTypes.Num)
{ {
/***** Write heading *****/ /***** Write heading *****/
Lay_StartRoundFrameTable (NULL,Txt_Types_of_degree, switch (NextAction)
Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM ? DT_PutIconToEditDegTypes : {
NULL, case ActSeeDegTyp:
(NextAction == ActSeeDegTyp) ? Hlp_SYSTEM_Studies : Lay_StartRoundFrameTable (NULL,Txt_Types_of_degree,
Hlp_STATS_Figures_types_of_degree, DT_PutIconsListDegTypes,
2); Hlp_SYSTEM_Studies,
2);
break;
case ActSeeUseGbl:
Lay_StartRoundFrameTable (NULL,Txt_Types_of_degree,
DT_PutIconToEditDegTypes,
Hlp_STATS_Figures_types_of_degree,
2);
break;
default: // Bad call
return;
}
DT_PutHeadDegreeTypesForSeeing (NextAction,SelectedOrder); DT_PutHeadDegreeTypesForSeeing (NextAction,SelectedOrder);
/***** List current degree types for seeing *****/ /***** List current degree types for seeing *****/
@ -281,6 +293,20 @@ static void DT_ListDegreeTypesForSeeing (void)
} }
} }
/*****************************************************************************/
/************** Put contextual icons in list of degree types *****************/
/*****************************************************************************/
static void DT_PutIconsListDegTypes (void)
{
/***** Put icon to edit degree types *****/
DT_PutIconToEditDegTypes ();
/***** Put icon to show a figure *****/
Gbl.Stat.FigureType = Sta_DEGREE_TYPES;
Sta_PutIconToShowFigure ();
}
/*****************************************************************************/ /*****************************************************************************/
/******************* Put link (form) to edit degree types ********************/ /******************* Put link (form) to edit degree types ********************/
/*****************************************************************************/ /*****************************************************************************/
@ -289,10 +315,11 @@ static void DT_PutIconToEditDegTypes (void)
{ {
extern const char *Txt_Edit; extern const char *Txt_Edit;
Lay_PutContextualLink (ActEdiDegTyp,NULL, if (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM)
"edit64x64.png", Lay_PutContextualLink (ActEdiDegTyp,NULL,
Txt_Edit,NULL, "edit64x64.png",
NULL); Txt_Edit,NULL,
NULL);
} }
/*****************************************************************************/ /*****************************************************************************/