Version 16.170.2

This commit is contained in:
Antonio Cañas Vargas 2017-03-27 01:14:38 +02:00
parent 63c4d4dfea
commit d647fd8f70
8 changed files with 49 additions and 22 deletions

View File

@ -1518,7 +1518,7 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
// Actions in menu:
/* ActSysReqSch */{ 627, 0,TabSys,ActSysReqSch , 0, 0, 0, 0, 0, 0,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Sch_ReqSysSearch ,"search64x64.gif" },
/* ActSeeCty */{ 862, 1,TabSys,ActSeeCty , 0, 0, 0, 0, 0, 0,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,Cty_ListCountries1 ,Cty_ListCountries2 ,"earth64x64.gif" },
/* ActSeePen */{1060, 2,TabSys,ActSeePen , 0, 0, 0, 0, 0, 0,0x1E0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Deg_SeePending ,"hierarchy64x64.png" },
/* ActSeePen */{1060, 2,TabSys,ActSeePen , 0, 0, 0, 0, 0, 0,0x1E0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Hie_SeePending ,"hierarchy64x64.png" },
/* ActReqRemOldCrs */{1109, 3,TabSys,ActReqRemOldCrs , 0, 0, 0, 0, 0, 0,0x100,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Crs_AskRemoveOldCrss ,"removeusers64x64.gif" },
/* ActSeeLnk */{ 748, 4,TabSys,ActSeeLnk , 0, 0, 0, 0, 0, 0,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Lnk_SeeLinks ,"link64x64.gif" },
/* ActLstPlg */{ 777, 5,TabSys,ActLstPlg , 0, 0, 0, 0, 0, 0,0x100,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Plg_ListPlugins ,"blocks64x64.gif" },

View File

@ -211,13 +211,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.170.1 (2017-03-27)"
#define Log_PLATFORM_VERSION "SWAD 16.170.2 (2017-03-27)"
#define CSS_FILE "swad16.166.css"
#define JS_FILE "swad16.144.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.170.2: Mar 27, 2017 Link to remove old courses from Hierarchy. (217573 lines)
Version 16.170.1: Mar 27, 2017 Pending is renamed as Hierarchy. (217554 lines)
Version 16.170: Mar 27, 2017 Action to view banners removed from main menu. (217553 lines)
Version 16.169.3: Mar 26, 2017 Link to banners from institutional links. (217592 lines)

View File

@ -3296,6 +3296,21 @@ void Crs_UpdateCrsLast (void)
}
}
/*****************************************************************************/
/********************** Put link to remove old courses ***********************/
/*****************************************************************************/
void Crs_PutLinkToRemoveOldCrss (void)
{
extern const char *Txt_Eliminate_old_courses;
/***** Put form to remove old courses *****/
Lay_PutContextualLink (ActReqRemOldCrs,NULL,
"remove-on64x64.png",
Txt_Eliminate_old_courses,Txt_Eliminate_old_courses,
NULL);
}
/*****************************************************************************/
/********************** Write form to remove old courses *********************/
/*****************************************************************************/

View File

@ -141,6 +141,8 @@ void Crs_GetAndWriteCrssOfAUsr (const struct UsrData *UsrDat,Rol_Role_t Role);
unsigned Crs_ListCrssFound (const char *Query);
void Crs_UpdateCrsLast (void);
void Crs_PutLinkToRemoveOldCrss (void);
void Crs_AskRemoveOldCrss (void);
void Crs_RemoveOldCrss (void);

View File

@ -112,25 +112,6 @@ static void Deg_UpdateDegNameDB (long DegCod,const char *FieldName,const char *N
static void Deg_UpdateDegCtrDB (long DegCod,long CtrCod);
static void Deg_UpdateDegWWWDB (long DegCod,const char NewWWW[Cns_MAX_BYTES_WWW + 1]);
/*****************************************************************************/
/********** List pending institutions, centres, degrees and courses **********/
/*****************************************************************************/
void Deg_SeePending (void)
{
/***** List countries with pending institutions *****/
Cty_SeeCtyWithPendingInss ();
/***** List institutions with pending centres *****/
Ins_SeeInsWithPendingCtrs ();
/***** List centres with pending degrees *****/
Ctr_SeeCtrWithPendingDegs ();
/***** List degrees with pending courses *****/
Deg_SeeDegWithPendingCrss ();
}
/*****************************************************************************/
/******************* List degrees with pending courses ***********************/
/*****************************************************************************/

View File

@ -87,7 +87,6 @@ struct ListDegrees
/***************************** Public prototypes *****************************/
/*****************************************************************************/
void Deg_SeePending (void);
void Deg_SeeDegWithPendingCrss (void);
void Deg_DrawDegreeLogoAndNameWithLink (struct Degree *Deg,Act_Action_t Action,

View File

@ -56,6 +56,33 @@ extern struct Globals Gbl;
/**************************** Private prototypes *****************************/
/*****************************************************************************/
/*****************************************************************************/
/********** List pending institutions, centres, degrees and courses **********/
/*****************************************************************************/
void Hie_SeePending (void)
{
/***** Put contextual links *****/
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
/* Put link to remove old courses */
Crs_PutLinkToRemoveOldCrss ();
fprintf (Gbl.F.Out,"</div>");
/***** List countries with pending institutions *****/
Cty_SeeCtyWithPendingInss ();
/***** List institutions with pending centres *****/
Ins_SeeInsWithPendingCtrs ();
/***** List centres with pending degrees *****/
Ctr_SeeCtrWithPendingDegs ();
/***** List degrees with pending courses *****/
Deg_SeeDegWithPendingCrss ();
}
/*****************************************************************************/
/*** Write menu to select country, institution, centre, degree and course ****/
/*****************************************************************************/

View File

@ -45,6 +45,8 @@
/***************************** Public prototypes *****************************/
/*****************************************************************************/
void Hie_SeePending (void);
void Hie_WriteMenuHierarchy (void);
void Hie_WriteHierarchyBreadcrumb (void);
void Hie_WriteBigNameCtyInsCtrDegCrs (void);