From 322b25bb5831f7725487f3ac67ee9b50e0e162ea Mon Sep 17 00:00:00 2001
From: a-takashima-k <a-takashima.k@buildsystem.jp>
Date: Tue, 10 Apr 2018 16:20:22 +0900
Subject: [PATCH] add resource order property

---
 src/calendar/calendar-scheduler.xml | 17 +++++++++++++++++
 src/calendar/widget/calendar.js     |  3 +++
 2 files changed, 20 insertions(+)

diff --git a/src/calendar/calendar-scheduler.xml b/src/calendar/calendar-scheduler.xml
index d12b1c3..dc6cca1 100644
--- a/src/calendar/calendar-scheduler.xml
+++ b/src/calendar/calendar-scheduler.xml
@@ -425,6 +425,23 @@
             <category>Scheduler</category>
             <description>The association from the resource to the event</description>
         </property>
+        <property key="resourceOrder" type="attribute" required="false" isPath="optional" pathType="reference" entityProperty="resourceEntity">
+            <caption>Resource Order</caption>
+            <category>Scheduler</category>
+            <description>Order of the resource</description>
+            <attributeTypes>
+                <attributeType name="Integer" />
+            </attributeTypes>
+        </property>
+        <property key="orderType" type="enumeration" defaultValue="asc">
+            <caption>Resource Order Type</caption>
+            <category>Scheduler</category>
+            <description></description>
+            <enumerationValues>
+                <enumerationValue key="asc">ASC</enumerationValue>
+                <enumerationValue key="desc">DESC</enumerationValue>
+            </enumerationValues>
+        </property>
         <property key="resourceLabelText" type="string">
             <caption>Resource Label Title</caption>
             <category>Scheduler</category>
diff --git a/src/calendar/widget/calendar.js b/src/calendar/widget/calendar.js
index ab9c14e..bb8a9cd 100644
--- a/src/calendar/widget/calendar.js
+++ b/src/calendar/widget/calendar.js
@@ -122,6 +122,9 @@ define([
             logger.debug(this.id + "._getResources");
             mx.data.get({
                 xpath: "//" + this.resourceEntity,
+                filter: {
+                    sort: this.resourceOrder !== "" ? [[this.resourceOrder, this.orderType]] : null
+                },
                 callback: lang.hitch(this, function(objs) {
                     logger.debug(this.id + "._getResources callback:", objs ? objs.length + " objects" : "null");
                     if (callback) {