From 6f8778760dec0440e3787f577b6f0efff339540a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= <acanas@ugr.es>
Date: Thu, 9 Jun 2016 17:19:10 +0200
Subject: [PATCH] Version 15.222.1

---
 swad_changelog.h   |  3 ++-
 swad_degree_type.c |  3 ---
 swad_department.c  |  3 ---
 swad_indicator.c   | 25 +++++++++++++++++--------
 4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/swad_changelog.h b/swad_changelog.h
index 739879360..9472f9aaf 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -135,13 +135,14 @@
 /****************************** Public constants *****************************/
 /*****************************************************************************/
 
-#define Log_PLATFORM_VERSION	"SWAD 15.222.1 (2016-06-09)"
+#define Log_PLATFORM_VERSION	"SWAD 15.222.2 (2016-06-09)"
 #define CSS_FILE		"swad15.218.css"
 #define JS_FILE			"swad15.216.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 15.222.2: Jun 09, 2016	Code refactoring in indicators. (202233 lines)
         Version 15.222.1: Jun 09, 2016	Optimization in number of indicators. (202230 lines)
         Version 15.222:   Jun 09, 2016	Number of indicators is stored in table of courses. (202224 lines)
         Version 15.221.4: Jun 09, 2016	New columns in table of courses to store number of indicators. (202153 lines)
diff --git a/swad_degree_type.c b/swad_degree_type.c
index 26a097c97..c1faaed23 100644
--- a/swad_degree_type.c
+++ b/swad_degree_type.c
@@ -88,9 +88,6 @@ void DT_WriteSelectorDegreeTypes (void)
    extern const char *Txt_Any_type_of_degree;
    unsigned NumDegTyp;
 
-   /***** Get degree type code *****/
-   Gbl.Stat.DegTypCod = DT_GetParamOtherDegTypCod ();
-
    /***** Get list of degree types *****/
    DT_GetListDegreeTypes ();
 
diff --git a/swad_department.c b/swad_department.c
index 6a2fb2500..b986eeef6 100644
--- a/swad_department.c
+++ b/swad_department.c
@@ -1106,9 +1106,6 @@ void Dpt_WriteSelectorDepartment (long InsCod)
    extern const char *Txt_Any_department;
    unsigned NumDpt;
 
-   /***** Get department code *****/
-   Gbl.Stat.DptCod = Dpt_GetParamDptCod ();
-
    /***** Form to select department *****/
    /* Get list of departments */
    Dpt_GetListDepartments (InsCod);
diff --git a/swad_indicator.c b/swad_indicator.c
index f867087bc..0feffd385 100644
--- a/swad_indicator.c
+++ b/swad_indicator.c
@@ -102,6 +102,23 @@ void Ind_ReqIndicatorsCourses (void)
    unsigned NumCrssToList;
    unsigned Ind;
 
+   /***** Get parameters *****/
+   /* Get scope */
+   Gbl.Scope.Allowed = 1 << Sco_SCOPE_SYS |
+	               1 << Sco_SCOPE_CTY |
+		       1 << Sco_SCOPE_INS |
+		       1 << Sco_SCOPE_CTR |
+		       1 << Sco_SCOPE_DEG |
+		       1 << Sco_SCOPE_CRS;
+   Gbl.Scope.Default = Sco_SCOPE_CRS;
+   Sco_GetScope ();
+
+   /* Get degree type code */
+   Gbl.Stat.DegTypCod = DT_GetParamOtherDegTypCod ();
+
+   /* Get department code */
+   Gbl.Stat.DptCod = Dpt_GetParamDptCod ();
+
    /***** Start frame *****/
    Lay_StartRoundFrame (NULL,Txt_Indicators_of_courses,NULL);
 
@@ -117,14 +134,6 @@ void Ind_ReqIndicatorsCourses (void)
                       "</td>"
                       "<td class=\"LEFT_MIDDLE\">",
             The_ClassForm[Gbl.Prefs.Theme],Txt_Scope);
-   Gbl.Scope.Allowed = 1 << Sco_SCOPE_SYS |
-	               1 << Sco_SCOPE_CTY |
-		       1 << Sco_SCOPE_INS |
-		       1 << Sco_SCOPE_CTR |
-		       1 << Sco_SCOPE_DEG |
-		       1 << Sco_SCOPE_CRS;
-   Gbl.Scope.Default = Sco_SCOPE_CRS;
-   Sco_GetScope ();
    Sco_PutSelectorScope (false);
    fprintf (Gbl.F.Out,"</td>"
 	              "</tr>");