From e945e68df00b8cffc9480f79657ab92137963483 Mon Sep 17 00:00:00 2001
From: Marco Libanori <marco.libanori@eng.it>
Date: Mon, 9 Mar 2020 12:05:37 +0100
Subject: [PATCH] Fix ordering and select-all button in map's filters
 functionality

---
 .../directives/cockpit-widget/widget/mapWidget/mapWidget.js   | 4 +++-
 .../mapWidgetMultiSelectFilterValueDialogTemplate.html        | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/knowagecockpitengine/src/main/webapp/js/src/angular_1.4/cockpit/directives/cockpit-widget/widget/mapWidget/mapWidget.js b/knowagecockpitengine/src/main/webapp/js/src/angular_1.4/cockpit/directives/cockpit-widget/widget/mapWidget/mapWidget.js
index 18705d93ef6..73d864ff717 100644
--- a/knowagecockpitengine/src/main/webapp/js/src/angular_1.4/cockpit/directives/cockpit-widget/widget/mapWidget/mapWidget.js
+++ b/knowagecockpitengine/src/main/webapp/js/src/angular_1.4/cockpit/directives/cockpit-widget/widget/mapWidget/mapWidget.js
@@ -1291,7 +1291,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 					// If sizes match, all items are already selected
 					var allAvailablesValuesSize = allAvailablesValues.length;
-					var selectablesSize = scope.selectables.length;
+					var selectablesSize = scope.selectables
+						.filter(function(elem) { return elem.selected; })
+						.length;
 
 					scope.allSelected = allAvailablesValuesSize == selectablesSize;
 
diff --git a/knowagecockpitengine/src/main/webapp/js/src/angular_1.4/cockpit/directives/cockpit-widget/widget/mapWidget/templates/mapWidgetMultiSelectFilterValueDialogTemplate.html b/knowagecockpitengine/src/main/webapp/js/src/angular_1.4/cockpit/directives/cockpit-widget/widget/mapWidget/templates/mapWidgetMultiSelectFilterValueDialogTemplate.html
index 82a639fcc07..89e679be049 100644
--- a/knowagecockpitengine/src/main/webapp/js/src/angular_1.4/cockpit/directives/cockpit-widget/widget/mapWidget/templates/mapWidgetMultiSelectFilterValueDialogTemplate.html
+++ b/knowagecockpitengine/src/main/webapp/js/src/angular_1.4/cockpit/directives/cockpit-widget/widget/mapWidget/templates/mapWidgetMultiSelectFilterValueDialogTemplate.html
@@ -24,7 +24,7 @@ <h2 class="text-transform-none">{{title}}</h2>
 		</div>
 		<md-list>
 			<md-virtual-repeat-container id="vertical-container">
-				<md-list-item class="selectableList" md-virtual-repeat="item in (availableItems = (selectables | filter:searchText)) | orderBy : 'item.value'">
+				<md-list-item class="selectableList" md-virtual-repeat="item in (availableItems = (selectables | filter:searchText)) | orderBy : 'value'">
 					<p class="truncated"> {{ item.value }} </p>
 					<md-checkbox class="md-secondary" ng-model="item.selected"></md-checkbox>
 				</md-list-item>