From 7572f5c4cb54289c1480688f9e6cf2a52ace9926 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= <acanas@ugr.es>
Date: Sat, 23 Apr 2016 15:08:32 +0200
Subject: [PATCH] Version 15.202.15

---
 swad_changelog.h |  3 +-
 swad_record.c    | 71 ++++++++++++++++++++++++++++--------------------
 2 files changed, 44 insertions(+), 30 deletions(-)

diff --git a/swad_changelog.h b/swad_changelog.h
index 5b032ae85..247f971ff 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -134,13 +134,14 @@
 /****************************** Public constants *****************************/
 /*****************************************************************************/
 
-#define Log_PLATFORM_VERSION	"SWAD 15.202.14 (2016-04-23)"
+#define Log_PLATFORM_VERSION	"SWAD 15.202.15 (2016-04-23)"
 #define CSS_FILE		"swad15.202.css"
 #define JS_FILE			"swad15.197.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.202.15:Apr 23, 2016	Code refactoring in record card. (201059 lines)
         Version 15.202.14:Apr 23, 2016	Code refactoring in record card. (201048 lines)
         Version 15.202.13:Apr 23, 2016	Code refactoring in record card. (201037 lines)
         Version 15.202.12:Apr 23, 2016	Code refactoring in record card. (201026 lines)
diff --git a/swad_record.c b/swad_record.c
index 369aa4582..a344bf7cd 100644
--- a/swad_record.c
+++ b/swad_record.c
@@ -138,6 +138,8 @@ static void Rec_ShowInstitution (struct Institution *Ins,
                                  bool ShowData,const char *ClassForm);
 static void Rec_ShowCentre (struct UsrData *UsrDat,
                             bool ShowData,const char *ClassForm);
+static void Rec_ShowDepartment (struct UsrData *UsrDat,
+                                bool ShowData,const char *ClassForm);
 
 static void Rec_WriteLinkToDataProtectionClause (void);
 
@@ -2000,7 +2002,6 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
                               struct UsrData *UsrDat)
   {
    extern const char *The_ClassForm[The_NUM_THEMES];
-   extern const char *Txt_Department;
    extern const char *Txt_Office;
    extern const char *Txt_Phone;
    extern const char *Txt_Save_changes;
@@ -2038,7 +2039,6 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
 			     TypeOfView == Rec_RECORD_PRINT) &&
 			    UsrDat->RoleInCurrentCrsDB == Rol_TEACHER));	// He/she is a teacher in the current course
    struct Institution Ins;
-   struct Department Dpt;
 
    /***** Initializations *****/
    switch (TypeOfView)
@@ -2175,33 +2175,8 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
 	 /***** Centre *****/
          Rec_ShowCentre (UsrDat,ShowData,ClassForm);
 
-	 /* Department */
-	 fprintf (Gbl.F.Out,"<tr>"
-			    "<td class=\"%s RIGHT_MIDDLE\""
-			    " style=\"width:%upx;\">"
-			    "%s:"
-			    "</td>"
-			    "<td class=\"REC_DAT_BOLD LEFT_MIDDLE\""
-			    " style=\"width:%upx;\">",
-		  ClassForm,Rec_C1_BOTTOM,Txt_Department,
-		  Rec_C2_BOTTOM);
-	 if (ShowData)
-	   {
-	    if (UsrDat->Tch.DptCod > 0)
-	      {
-	       Dpt.DptCod = UsrDat->Tch.DptCod;
-	       Dpt_GetDataOfDepartmentByCod (&Dpt);
-	       if (Dpt.WWW[0])
-		  fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\""
-			             " class=\"REC_DAT_BOLD\">",
-			   Dpt.WWW);
-	       fprintf (Gbl.F.Out,"%s",Dpt.FullName);
-	       if (Dpt.WWW[0])
-		  fprintf (Gbl.F.Out,"</a>");
-	      }
-	   }
-	 fprintf (Gbl.F.Out,"</td>"
-			    "</tr>");
+	 /***** Department *****/
+         Rec_ShowDepartment (UsrDat,ShowData,ClassForm);
 
 	 /* Office */
 	 fprintf (Gbl.F.Out,"<tr>"
@@ -3433,6 +3408,44 @@ static void Rec_ShowCentre (struct UsrData *UsrDat,
 		      "</tr>");
   }
 
+/*****************************************************************************/
+/************************* Show user's department ****************************/
+/*****************************************************************************/
+
+static void Rec_ShowDepartment (struct UsrData *UsrDat,
+                                bool ShowData,const char *ClassForm)
+  {
+   extern const char *Txt_Department;
+   struct Department Dpt;
+
+   fprintf (Gbl.F.Out,"<tr>"
+		      "<td class=\"%s RIGHT_MIDDLE\""
+		      " style=\"width:%upx;\">"
+		      "%s:"
+		      "</td>"
+		      "<td class=\"REC_DAT_BOLD LEFT_MIDDLE\""
+		      " style=\"width:%upx;\">",
+	    ClassForm,Rec_C1_BOTTOM,Txt_Department,
+	    Rec_C2_BOTTOM);
+   if (ShowData)
+     {
+      if (UsrDat->Tch.DptCod > 0)
+	{
+	 Dpt.DptCod = UsrDat->Tch.DptCod;
+	 Dpt_GetDataOfDepartmentByCod (&Dpt);
+	 if (Dpt.WWW[0])
+	    fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\""
+			       " class=\"REC_DAT_BOLD\">",
+		     Dpt.WWW);
+	 fprintf (Gbl.F.Out,"%s",Dpt.FullName);
+	 if (Dpt.WWW[0])
+	    fprintf (Gbl.F.Out,"</a>");
+	}
+     }
+   fprintf (Gbl.F.Out,"</td>"
+		      "</tr>");
+  }
+
 /*****************************************************************************/
 /*********************** Write a link to netiquette rules ********************/
 /*****************************************************************************/