From f6bf59fc175860ca25cbbd76c340965a7c00d814 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= <acanas@ugr.es>
Date: Fri, 27 Sep 2019 00:46:02 +0200
Subject: [PATCH] Version19.16.6

---
 swad_assignment.c | 58 +++++++++++++++++++----------------------------
 swad_attendance.c | 58 +++++++++++++++++++----------------------------
 swad_changelog.h  |  6 +++--
 swad_match.c      | 50 +++++++++++++++++-----------------------
 4 files changed, 71 insertions(+), 101 deletions(-)

diff --git a/swad_assignment.c b/swad_assignment.c
index e5e237e6..4bf3067a 100644
--- a/swad_assignment.c
+++ b/swad_assignment.c
@@ -344,6 +344,7 @@ static void Asg_ShowOneAssignment (long AsgCod,bool PrintView)
    char *Anchor = NULL;
    static unsigned UniqueId = 0;
    struct Assignment Asg;
+   Dat_StartEndTime_t StartEndTime;
    char Txt[Cns_MAX_BYTES_TEXT + 1];
 
    /***** Get data of this assignment *****/
@@ -366,43 +367,30 @@ static void Asg_ShowOneAssignment (long AsgCod,bool PrintView)
      }
    fprintf (Gbl.F.Out,"</td>");
 
-   /* Start date/time */
+   /* Start/end date/time */
    UniqueId++;
-   fprintf (Gbl.F.Out,"<td id=\"asg_date_start_%u\" class=\"%s LEFT_BOTTOM",
-	    UniqueId,
-            Asg.Hidden ? (Asg.Open ? "DATE_GREEN_LIGHT" :
-        	                     "DATE_RED_LIGHT") :
-                         (Asg.Open ? "DATE_GREEN" :
-                                     "DATE_RED"));
-   if (!PrintView)
-      fprintf (Gbl.F.Out," COLOR%u",Gbl.RowEvenOdd);
-   fprintf (Gbl.F.Out,"\">"
-                      "<script type=\"text/javascript\">"
-                      "writeLocalDateHMSFromUTC('asg_date_start_%u',%ld,"
-                      "%u,'<br />','%s',true,true,0x7);"
-                      "</script>"
-	              "</td>",
-            UniqueId,Asg.TimeUTC[Dat_START_TIME],
-            (unsigned) Gbl.Prefs.DateFormat,Txt_Today);
 
-   /* End date/time */
-   UniqueId++;
-   fprintf (Gbl.F.Out,"<td id=\"asg_date_end_%u\" class=\"%s LEFT_BOTTOM",
-	    UniqueId,
-            Asg.Hidden ? (Asg.Open ? "DATE_GREEN_LIGHT" :
-        	                     "DATE_RED_LIGHT") :
-                         (Asg.Open ? "DATE_GREEN" :
-                                     "DATE_RED"));
-   if (!PrintView)
-      fprintf (Gbl.F.Out," COLOR%u",Gbl.RowEvenOdd);
-   fprintf (Gbl.F.Out,"\">"
-                      "<script type=\"text/javascript\">"
-                      "writeLocalDateHMSFromUTC('asg_date_end_%u',%ld,"
-                      "%u,'<br />','%s',false,true,0x7);"
-                      "</script>"
-	              "</td>",
-            UniqueId,Asg.TimeUTC[Dat_END_TIME],
-            (unsigned) Gbl.Prefs.DateFormat,Txt_Today);
+   for (StartEndTime = (Dat_StartEndTime_t) 0;
+	StartEndTime <= (Dat_StartEndTime_t) (Dat_NUM_START_END_TIME - 1);
+	StartEndTime++)
+     {
+      fprintf (Gbl.F.Out,"<td id=\"asg_date_%u_%u\" class=\"%s LEFT_BOTTOM",
+	       (unsigned) StartEndTime,UniqueId,
+	       Asg.Hidden ? (Asg.Open ? "DATE_GREEN_LIGHT" :
+					"DATE_RED_LIGHT") :
+			    (Asg.Open ? "DATE_GREEN" :
+					"DATE_RED"));
+      if (!PrintView)
+	 fprintf (Gbl.F.Out," COLOR%u",Gbl.RowEvenOdd);
+      fprintf (Gbl.F.Out,"\">"
+			 "<script type=\"text/javascript\">"
+			 "writeLocalDateHMSFromUTC('asg_date_%u_%u',%ld,"
+			 "%u,'<br />','%s',true,true,0x7);"
+			 "</script>"
+			 "</td>",
+	       (unsigned) StartEndTime,UniqueId,Asg.TimeUTC[StartEndTime],
+	       (unsigned) Gbl.Prefs.DateFormat,Txt_Today);
+     }
 
    /* Assignment title */
    fprintf (Gbl.F.Out,"<td class=\"%s LEFT_TOP",
diff --git a/swad_attendance.c b/swad_attendance.c
index 5745216c..a93ed444 100644
--- a/swad_attendance.c
+++ b/swad_attendance.c
@@ -375,6 +375,7 @@ static void Att_ShowOneAttEvent (struct AttendanceEvent *Att,bool ShowOnlyThisAt
    extern const char *Txt_View_event;
    char *Anchor = NULL;
    static unsigned UniqueId = 0;
+   Dat_StartEndTime_t StartEndTime;
    char Description[Cns_MAX_BYTES_TEXT + 1];
 
    /***** Get data of this attendance event *****/
@@ -402,42 +403,29 @@ static void Att_ShowOneAttEvent (struct AttendanceEvent *Att,bool ShowOnlyThisAt
      }
    fprintf (Gbl.F.Out,"</td>");
 
-   /* Start date/time */
+   /* Start/end date/time */
    UniqueId++;
-   fprintf (Gbl.F.Out,"<td id=\"att_date_start_%u\" class=\"%s LEFT_BOTTOM",
-	    UniqueId,
-            Att->Hidden ? (Att->Open ? "DATE_GREEN_LIGHT" :
-        	                       "DATE_RED_LIGHT") :
-                          (Att->Open ? "DATE_GREEN" :
-                        	       "DATE_RED"));
-   if (!ShowOnlyThisAttEventComplete)
-      fprintf (Gbl.F.Out," COLOR%u",Gbl.RowEvenOdd);
-   fprintf (Gbl.F.Out,"\">"
-                      "<script type=\"text/javascript\">"
-                      "writeLocalDateHMSFromUTC('att_date_start_%u',%ld,"
-                      "%u,'<br />','%s',true,true,0x7);"
-                      "</script>"
-	              "</td>",
-            UniqueId,Att->TimeUTC[Att_START_TIME],
-            (unsigned) Gbl.Prefs.DateFormat,Txt_Today);
-
-   /* End date/time */
-   fprintf (Gbl.F.Out,"<td id=\"att_date_end_%u\" class=\"%s LEFT_BOTTOM",
-            UniqueId,
-            Att->Hidden ? (Att->Open ? "DATE_GREEN_LIGHT" :
-        	                       "DATE_RED_LIGHT") :
-                          (Att->Open ? "DATE_GREEN" :
-                        	       "DATE_RED"));
-   if (!ShowOnlyThisAttEventComplete)
-      fprintf (Gbl.F.Out," COLOR%u",Gbl.RowEvenOdd);
-   fprintf (Gbl.F.Out,"\">"
-                      "<script type=\"text/javascript\">"
-                      "writeLocalDateHMSFromUTC('att_date_end_%u',%ld,"
-                      "%u,'<br />','%s',false,true,0x7);"
-                      "</script>"
-	              "</td>",
-            UniqueId,Att->TimeUTC[Att_END_TIME],
-            (unsigned) Gbl.Prefs.DateFormat,Txt_Today);
+   for (StartEndTime = (Dat_StartEndTime_t) 0;
+	StartEndTime <= (Dat_StartEndTime_t) (Dat_NUM_START_END_TIME - 1);
+	StartEndTime++)
+     {
+      fprintf (Gbl.F.Out,"<td id=\"att_date_%u_%u\" class=\"%s LEFT_BOTTOM",
+	       (unsigned) StartEndTime,UniqueId,
+	       Att->Hidden ? (Att->Open ? "DATE_GREEN_LIGHT" :
+					  "DATE_RED_LIGHT") :
+			     (Att->Open ? "DATE_GREEN" :
+					  "DATE_RED"));
+      if (!ShowOnlyThisAttEventComplete)
+	 fprintf (Gbl.F.Out," COLOR%u",Gbl.RowEvenOdd);
+      fprintf (Gbl.F.Out,"\">"
+			 "<script type=\"text/javascript\">"
+			 "writeLocalDateHMSFromUTC('att_date_%u_%u',%ld,"
+			 "%u,'<br />','%s',true,true,0x7);"
+			 "</script>"
+			 "</td>",
+	       (unsigned) StartEndTime,UniqueId,Att->TimeUTC[StartEndTime],
+	       (unsigned) Gbl.Prefs.DateFormat,Txt_Today);
+     }
 
    /* Attendance event title */
    fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP");
diff --git a/swad_changelog.h b/swad_changelog.h
index 6d28d039..ee7d7640 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -470,11 +470,13 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - *
 En OpenSWAD:
 ps2pdf source.ps destination.pdf
 */
-#define Log_PLATFORM_VERSION	"SWAD 19.16.4 (2019-09-27)"
+#define Log_PLATFORM_VERSION	"SWAD 19.16.6 (2019-09-27)"
 #define CSS_FILE		"swad19.15.css"
 #define JS_FILE			"swad19.15.js"
 /*
-	Version 19.16.4:  Sep 27, 2019	Code refactoring in agenda. (246407 lines)
+	Version 19.16.6:  Sep 27, 2019	Code refactoring in match dates. (246378 lines)
+	Version 19.16.5:  Sep 27, 2019	Code refactoring in assignment dates. (246396 lines)
+	Version 19.16.4:  Sep 27, 2019	Code refactoring in agenda dates. (246407 lines)
 	Version 19.16.3:  Sep 27, 2019	Code refactoring in game dates. (246414 lines)
 	Version 19.16.2:  Sep 26, 2019	Fixed bugs in edition of games.
 				        Changed listing of games and surveys. (246422 lines)
diff --git a/swad_match.c b/swad_match.c
index abd89633..09f39261 100644
--- a/swad_match.c
+++ b/swad_match.c
@@ -3554,6 +3554,7 @@ void Mch_ShowOneMchResult (void)
    Usr_MeOrOther_t MeOrOther;
    struct UsrData *UsrDat;
    time_t TimeUTC[Dat_NUM_START_END_TIME];	// Match result UTC date-time
+   Dat_StartEndTime_t StartEndTime;
    unsigned NumQsts;
    unsigned NumQstsNotBlank;
    double TotalScore;
@@ -3695,35 +3696,26 @@ void Mch_ShowOneMchResult (void)
       fprintf (Gbl.F.Out,"</td>"
 			 "</tr>");
 
-      /* Start time (for user in this match) */
-      fprintf (Gbl.F.Out,"<tr>"
-			 "<td class=\"DAT_N RIGHT_TOP\">"
-			 "%s:"
-			 "</td>"
-			 "<td id=\"match_start\" class=\"DAT LEFT_TOP\">"
-			 "<script type=\"text/javascript\">"
-			 "writeLocalDateHMSFromUTC('match_start',%ld,"
-			 "%u,',&nbsp;','%s',true,true,0x7);"
-			 "</script>"
-			 "</td>"
-			 "</tr>",
-	       Txt_START_END_TIME[Dat_START_TIME],
-	       TimeUTC[Dat_START_TIME],(unsigned) Gbl.Prefs.DateFormat,Txt_Today);
-
-      /* End time (for user in this match) */
-      fprintf (Gbl.F.Out,"<tr>"
-			 "<td class=\"DAT_N RIGHT_TOP\">"
-			 "%s:"
-			 "</td>"
-			 "<td id=\"match_end\" class=\"DAT LEFT_TOP\">"
-			 "<script type=\"text/javascript\">"
-			 "writeLocalDateHMSFromUTC('match_end',%ld,"
-			 "%u,',&nbsp;','%s',true,true,0x7);"
-			 "</script>"
-			 "</td>"
-			 "</tr>",
-	       Txt_START_END_TIME[Dat_END_TIME],
-	       TimeUTC[Dat_END_TIME],(unsigned) Gbl.Prefs.DateFormat,Txt_Today);
+      /* Start/end time (for user in this match) */
+      for (StartEndTime = (Dat_StartEndTime_t) 0;
+	   StartEndTime <= (Dat_StartEndTime_t) (Dat_NUM_START_END_TIME - 1);
+	   StartEndTime++)
+	 fprintf (Gbl.F.Out,"<tr>"
+			    "<td class=\"DAT_N RIGHT_TOP\">"
+			    "%s:"
+			    "</td>"
+			    "<td id=\"match_%u\" class=\"DAT LEFT_TOP\">"
+			    "<script type=\"text/javascript\">"
+			    "writeLocalDateHMSFromUTC('match_%u',%ld,"
+			    "%u,',&nbsp;','%s',true,true,0x7);"
+			    "</script>"
+			    "</td>"
+			    "</tr>",
+		  Txt_START_END_TIME[StartEndTime],
+		  (unsigned) StartEndTime,
+		  (unsigned) StartEndTime,
+		  TimeUTC[StartEndTime],
+		  (unsigned) Gbl.Prefs.DateFormat,Txt_Today);
 
       /* Number of questions */
       fprintf (Gbl.F.Out,"<tr>"