Version 15.40.4

swad_centre.c

@@ -101,7 +101,6 @@ void Ctr_SeeCtrWithPendingDegs (void)
    extern const char *Txt_Centres_with_pending_degrees;
    extern const char *Txt_Centre;
    extern const char *Txt_Degrees_ABBREVIATION;
-   extern const char *Txt_Go_to_X;
    extern const char *Txt_There_are_no_centres_with_requests_for_degrees_to_be_confirmed;
    char Query[1024];
    MYSQL_RES *mysql_res;
@@ -171,16 +170,8 @@ void Ctr_SeeCtrWithPendingDegs (void)
          fprintf (Gbl.F.Out,"<tr>"
                             "<td class=\"LEFT_MIDDLE %s\">",
                   BgColor);
-         Act_FormGoToStart (ActSeeDeg);
+         Ctr_DrawCentreLogoAndNameWithLink (&Ctr,ActSeeDeg,
-         Ctr_PutParamCtrCod (Ctr.CtrCod);
+                                            "DAT_NOBR","CENTER_MIDDLE");
-         sprintf (Gbl.Title,Txt_Go_to_X,Ctr.FullName);
-         Act_LinkFormSubmit (Gbl.Title,"DAT_NOBR");
-         Log_DrawLogo (Sco_SCOPE_CTR,Ctr.CtrCod,Ctr.ShortName,
-                       16,"CENTER_MIDDLE",true);
-         fprintf (Gbl.F.Out,"&nbsp;%s"
-                            "</a>",
-	          Ctr.FullName);
-         Act_FormEnd ();
          fprintf (Gbl.F.Out,"</td>");
 
          /* Number of pending degrees (row[1]) */
@@ -202,6 +193,34 @@ void Ctr_SeeCtrWithPendingDegs (void)
    DB_FreeMySQLResult (&mysql_res);
   }
 
+/*****************************************************************************/
+/****************** Draw institution logo and name with link *****************/
+/*****************************************************************************/
+
+void Ctr_DrawCentreLogoAndNameWithLink (struct Centre *Ctr,Act_Action_t Action,
+                                        const char *ClassLink,const char *ClassLogo)
+  {
+   extern const char *Txt_Go_to_X;
+
+   /***** Start form *****/
+   Act_FormGoToStart (Action);
+   Ctr_PutParamCtrCod (Ctr->CtrCod);
+
+   /***** Link to action *****/
+   sprintf (Gbl.Title,Txt_Go_to_X,Ctr->FullName);
+   Act_LinkFormSubmit (Gbl.Title,ClassLink);
+
+   /***** Draw institution logo *****/
+   Log_DrawLogo (Sco_SCOPE_CTR,Ctr->CtrCod,Ctr->ShortName,
+		 16,ClassLogo,true);
+
+   /***** End link *****/
+   fprintf (Gbl.F.Out,"&nbsp;%s</a>",Ctr->FullName);
+
+   /***** End form *****/
+   Act_FormEnd ();
+  }
+
 /*****************************************************************************/
 /****************** Show information of the current centre *******************/
 /*****************************************************************************/
@@ -608,17 +627,9 @@ static void Ctr_ListOneCentreForSeeing (struct Centre *Ctr,unsigned NumCtr)
             NumCtr);
 
    /***** Centre logo and name *****/
-   fprintf (Gbl.F.Out,"<td class=\"%s LEFT_MIDDLE %s\">",
+   fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE %s\">",BgColor);
-	    TxtClassStrong,BgColor);
+   Ctr_DrawCentreLogoAndNameWithLink (Ctr,ActSeeDeg,
-   Act_FormGoToStart (ActSeeDeg);
+                                      TxtClassStrong,"CENTER_MIDDLE");
-   Ctr_PutParamCtrCod (Ctr->CtrCod);
-   sprintf (Gbl.Title,Txt_Go_to_X,Ctr->FullName);
-   Act_LinkFormSubmit (Gbl.Title,TxtClassStrong);
-   Log_DrawLogo (Sco_SCOPE_CTR,Ctr->CtrCod,Ctr->ShortName,
-                 16,"CENTER_MIDDLE",true);
-   fprintf (Gbl.F.Out,"&nbsp;%s</a>",
-	    Ctr->FullName);
-   Act_FormEnd ();
    fprintf (Gbl.F.Out,"</td>");
 
    /***** Number of teachers *****/

swad_centre.h

@@ -85,6 +85,9 @@ typedef enum
 
 void Ctr_SeeCtrWithPendingDegs (void);
 
+void Ctr_DrawCentreLogoAndNameWithLink (struct Centre *Ctr,Act_Action_t Action,
+                                        const char *ClassLink,const char *ClassLogo);
+
 void Ctr_ShowConfiguration (void);
 void Ctr_PrintConfiguration (void);
 

swad_changelog.h

@@ -111,11 +111,12 @@
 /****************************** Public constants *****************************/
 /*****************************************************************************/
 
-#define Log_PLATFORM_VERSION	"SWAD 15.40.3 (2015/11/19)"
+#define Log_PLATFORM_VERSION	"SWAD 15.40.4 (2015/11/19)"
 
 // 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.40.4:  Nov 19, 2015	Code refactoring in centres. (187279 lines)
         Version 15.40.3:  Nov 19, 2015	Code refactoring in institutions. (187281 lines)
         Version 15.40.2:  Nov 19, 2015	Some links to countries, institutions, centres and degrees removed. (187281 lines)
         Version 15.40.1:  Nov 19, 2015	Changes in behaviour of links to countries, institutions, centres and degrees. (187288 lines)

swad_institution.c

@@ -184,7 +184,6 @@ void Ins_SeeInsWithPendingCtrs (void)
    DB_FreeMySQLResult (&mysql_res);
   }
 
-
 /*****************************************************************************/
 /****************** Draw institution logo and name with link *****************/
 /*****************************************************************************/
@@ -572,10 +571,9 @@ static void Ins_ListOneInstitutionForSeeing (struct Institution *Ins,unsigned Nu
             NumIns);
 
    /***** Institution logo and name *****/
-   fprintf (Gbl.F.Out,"<td class=\"%s LEFT_MIDDLE %s\">",
+   fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE %s\">",BgColor);
-	    TxtClassStrong,BgColor);
    Ins_DrawInstitutionLogoAndNameWithLink (Ins,ActSeeCtr,
-                                           "DAT_NOBR","CENTER_MIDDLE");
+                                           TxtClassStrong,"CENTER_MIDDLE");
    fprintf (Gbl.F.Out,"</td>");
 
    /***** Stats *****/

swad_statistic.c

@@ -3465,7 +3465,6 @@ static void Sta_ShowNumHitsPerCentre (unsigned long NumRows,
 
 static void Sta_WriteCentre (long CtrCod)
   {
-   extern const char *Txt_Go_to_X;
    struct Centre Ctr;
 
    /***** Start cell *****/
@@ -3482,15 +3481,8 @@ static void Sta_WriteCentre (long CtrCod)
                Ctr.FullName);
 
       /***** Form to go to centre *****/
-      Act_FormGoToStart (ActSeeCtrInf);
+      Ctr_DrawCentreLogoAndNameWithLink (&Ctr,ActSeeCtrInf,
-      Ctr_PutParamCtrCod (CtrCod);
+                                         "LOG","CENTER_TOP");
-      sprintf (Gbl.Title,Txt_Go_to_X,Ctr.ShortName);
-      Act_LinkFormSubmit (Gbl.Title,"LOG");
-      Log_DrawLogo (Sco_SCOPE_CTR,Ctr.CtrCod,Ctr.ShortName,
-		    16,"CENTER_TOP",true);
-      fprintf (Gbl.F.Out,"&nbsp;%s&nbsp;</a>",
-               Ctr.ShortName);
-      Act_FormEnd ();
      }
    else			// Hit with no centre selected
       /***** No centre selected *****/