From d647fd8f70533e148d140d6fa7c59175c0e35377 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Mon, 27 Mar 2017 01:14:38 +0200 Subject: [PATCH] Version 16.170.2 --- swad_action.c | 2 +- swad_changelog.h | 3 ++- swad_course.c | 15 +++++++++++++++ swad_course.h | 2 ++ swad_degree.c | 19 ------------------- swad_degree.h | 1 - swad_hierarchy.c | 27 +++++++++++++++++++++++++++ swad_hierarchy.h | 2 ++ 8 files changed, 49 insertions(+), 22 deletions(-) diff --git a/swad_action.c b/swad_action.c index c5a0f6d2..a7d86536 100644 --- a/swad_action.c +++ b/swad_action.c @@ -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" }, diff --git a/swad_changelog.h b/swad_changelog.h index b350af7b..c18de425 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -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) diff --git a/swad_course.c b/swad_course.c index e26d4481..9798c46a 100644 --- a/swad_course.c +++ b/swad_course.c @@ -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 *********************/ /*****************************************************************************/ diff --git a/swad_course.h b/swad_course.h index 8cfaf463..d98995e5 100644 --- a/swad_course.h +++ b/swad_course.h @@ -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); diff --git a/swad_degree.c b/swad_degree.c index fa07538f..ebd547fd 100644 --- a/swad_degree.c +++ b/swad_degree.c @@ -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 ***********************/ /*****************************************************************************/ diff --git a/swad_degree.h b/swad_degree.h index c0d3015d..5aba3790 100644 --- a/swad_degree.h +++ b/swad_degree.h @@ -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, diff --git a/swad_hierarchy.c b/swad_hierarchy.c index 207b08cb..a8220c3d 100644 --- a/swad_hierarchy.c +++ b/swad_hierarchy.c @@ -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,"
"); + + /* Put link to remove old courses */ + Crs_PutLinkToRemoveOldCrss (); + + fprintf (Gbl.F.Out,"
"); + + /***** 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 ****/ /*****************************************************************************/ diff --git a/swad_hierarchy.h b/swad_hierarchy.h index fc3e11f0..fa219e09 100644 --- a/swad_hierarchy.h +++ b/swad_hierarchy.h @@ -45,6 +45,8 @@ /***************************** Public prototypes *****************************/ /*****************************************************************************/ +void Hie_SeePending (void); + void Hie_WriteMenuHierarchy (void); void Hie_WriteHierarchyBreadcrumb (void); void Hie_WriteBigNameCtyInsCtrDegCrs (void);