Add sorting to widget configuration

AuraQ · Nov 30, 2015 · aaf6de9 · aaf6de9
1 parent f014716
commit aaf6de9
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 4 deletions.
diff --git a/dist/BootstrapMultiSelectForMendix.mpk b/dist/BootstrapMultiSelectForMendix.mpk
diff --git a/src/BootstrapMultiSelectForMendix/BootstrapMultiSelect.xml b/src/BootstrapMultiSelectForMendix/BootstrapMultiSelect.xml
@@ -25,7 +25,39 @@ iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAACXBIWXMAAAsTAAALEwEAmpwYAAAKT2lD
             <caption>Data constraint</caption>
             <category>Data source</category>
             <description>Optional constraint to filter the available options</description>
-        </property>      
+        </property>  
+        <property key="sortContainer" type="object" isList="true" required="false">
+            <caption>Sort order</caption>
+            <category>Data source</category>
+            <description>The sort order of the objects</description>
+            <properties>
+                <property key="sortAttribute" type="attribute" isPath="optional" pathType="reference" entityProperty="../dataAssociation">
+                    <caption>Attribute</caption>
+                    <category>Data source</category>
+                    <description>An attribute to sort on</description>
+                    <attributeTypes>
+                        <attributeType name="AutoNumber"/>
+                        <attributeType name="Boolean"/>
+                        <attributeType name="Currency"/>
+                        <attributeType name="DateTime"/>
+                        <attributeType name="Enum"/>
+                        <attributeType name="Float"/>
+                        <attributeType name="Integer"/>
+                        <attributeType name="Long"/>
+                        <attributeType name="String"/>
+                    </attributeTypes>
+                </property>
+                <property key="sortOrder" type="enumeration" defaultValue="asc">
+                    <caption>Order</caption>
+                    <category>Data source</category>
+                    <description>The order in which to sort</description>
+                    <enumerationValues>
+                        <enumerationValue key="asc">Ascending</enumerationValue>
+                        <enumerationValue key="desc">Descending</enumerationValue>
+                    </enumerationValues>
+                </property>
+            </properties>
+        </property>
         <property key="showLabel" type="boolean" defaultValue="true">
             <caption>Show Label</caption>
             <category>Display</category>

diff --git a/src/BootstrapMultiSelectForMendix/widget/BootstrapMultiSelect.js b/src/BootstrapMultiSelectForMendix/widget/BootstrapMultiSelect.js
@@ -3,9 +3,9 @@
     ========================
 
     @file      : BootstrapMultiSelect.js
-    @version   : 1.3
+    @version   : 1.5
     @author    : Iain Lindsay
-    @date      : Thur, 24 Sep 2015 19:42:00 GMT
+    @date      : Mon, 30 Nov 2015 11:57:00 GMT
     @copyright : AuraQ Limited 2015
     @license   : Apache v2
 
@@ -76,6 +76,7 @@ require({
         _$alertdiv: null,
         _$combo: null,
         _comboData : [],
+        _sortParams : [],
 
         constructor: function () {
             this._handles = [];
@@ -87,6 +88,12 @@ require({
             this._reference = this.dataAssociation.split('/')[0];
             this._labelAttribute = this.labelAttribute.split('/')[2];
 
+            // create our sort order array
+            for(var i=0;i<this.sortContainer.length;i++) {
+                var item = this.sortContainer[i];
+                this._sortParams.push([item.sortAttribute, item.sortOrder]);
+            }
+
             // make sure we only select the control for the current id or we'll overwrite previous instances
             var selector = '#' + this.id + ' select.multiSelect';
             this._$combo = $(selector);  
@@ -204,7 +211,7 @@ require({
             mx.data.get({
                 xpath: xpath,
                 filter: {
-                    sort: [[this._labelAttribute, "asc"]],
+                    sort: this._sortParams,
                     offset: 0
                 },
                 callback: lang.hitch(this, this._processComboData)

diff --git a/test/Test.mpr b/test/Test.mpr
diff --git a/test/widgets/BootstrapMultiSelectForMendix.mpk b/test/widgets/BootstrapMultiSelectForMendix.mpk