From b5270999070251be966fd226bf38b8f595982944 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Tue, 23 Jun 2015 09:23:29 -0400
Subject: [PATCH] (fix) Events list display in Calendar module

Fixes #3261
---
 NEWS                                 |  1 +
 UI/WebServerResources/SchedulerUI.js | 30 ++++++++++++++++++++++++++--
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index e195967d3..9d18569c5 100644
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,7 @@ Bug fixes
  - properly support big characters in EAS and fix encoding QP EAS error for Outlook (#3082)
  - properly encode id of DOM elements in Address Book module (#3239, #3245)
  - fixed multi-domain support for sogo-tool backup/restore (#2600)
+ - fixed data ordering in events list of Calendar module (#3261)
 
 2.3.0 (2015-06-01)
 -------------------
diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js
index 5ee6cb528..7d0a1a353 100644
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/UI/WebServerResources/SchedulerUI.js
@@ -1015,6 +1015,32 @@ function eventsListCallback(http) {
 
         if (http.responseText.length > 0) {
             var data = http.responseText.evalJSON(true);
+
+            // [0] Event ID
+            // [1] Calendar ID
+            // [2] Calendar name
+            // [3] Status
+            // [4] Title
+            // [5] Start date
+            // [6] End date
+            // [7] Location
+            // [8] Is all day?
+            // [9] Classification (0 = public, 1, = private, 2 = confidential)
+            // [10] Category
+            // [11] Participants email addresses
+            // [12] Participants states
+            // [13] Owner
+            // [14] Is cyclic?
+            // [15] Next alarm
+            // [16] recurrence-id
+            // [17] isException
+            // [18] Editable?
+            // [19] Erasable?
+            // [20] Owner is organizer?
+            // [21] Description
+            // [22] Formatted start date
+            // [23] Formatted end date
+
             for (var i = 0; i < data.length; i++) {
                 var row = createElement("tr");
                 table.tBodies[0].appendChild(row);
@@ -1056,12 +1082,12 @@ function eventsListCallback(http) {
                 td = createElement("td");
                 row.appendChild(td);
                 td.observe("mousedown", listRowMouseDownHandler, true);
-                td.update(data[i][21]); // start date
+                td.update(data[i][22]); // start date
 
                 td = createElement("td");
                 row.appendChild(td);
                 td.observe("mousedown", listRowMouseDownHandler, true);
-                td.update(data[i][22]); // end date
+                td.update(data[i][23]); // end date
 
                 td = createElement("td");
                 row.appendChild(td);