From 9691a142798f86aa8e8782d6b3aca766e6f78a97 Mon Sep 17 00:00:00 2001
From: Ralf Becker <RalfBecker@outdoor-training.de>
Date: Mon, 1 Mar 2021 23:08:13 +0200
Subject: [PATCH] interface for nm getValue() and activeFilters

---
 api/js/etemplate/et2_extension_nextmatch.js |  3 +--
 api/js/etemplate/et2_extension_nextmatch.ts | 28 ++++++++++++---------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/api/js/etemplate/et2_extension_nextmatch.js b/api/js/etemplate/et2_extension_nextmatch.js
index f6251d35ac..6bcac7fd3e 100644
--- a/api/js/etemplate/et2_extension_nextmatch.js
+++ b/api/js/etemplate/et2_extension_nextmatch.js
@@ -85,7 +85,6 @@ var et2_INextmatchSortable = "et2_INextmatchSortable";
 function implements_et2_INextmatchSortable(obj) {
     return implements_methods(obj, ["setSortmode"]);
 }
-;
 /**
  * Class which implements the "nextmatch" XET-Tag
  *
@@ -2014,7 +2013,7 @@ var et2_nextmatch = /** @class */ (function (_super) {
             idsArr[i] = idsArr[i].split("::").pop();
         }
         var value = {
-            "selected": idsArr,
+            selected: idsArr,
             col_filter: {}
         };
         jQuery.extend(value, this.activeFilters, this.value);
diff --git a/api/js/etemplate/et2_extension_nextmatch.ts b/api/js/etemplate/et2_extension_nextmatch.ts
index 1a17ca2343..70974d7a96 100644
--- a/api/js/etemplate/et2_extension_nextmatch.ts
+++ b/api/js/etemplate/et2_extension_nextmatch.ts
@@ -106,7 +106,18 @@ interface PrintSettings
 	old_height: number,
 	row_selector: string,
 	orientation_style: HTMLStyleElement
-};
+}
+
+interface ActiveFilters
+{
+	search? : string,
+	filter? : any,
+	filter2? : any,
+	col_filter: {[key:string]: any},
+	selectcols?: string[],
+	searchletter?: string,
+	selected? : string[]
+}
 
 /**
  * Class which implements the "nextmatch" XET-Tag
@@ -211,14 +222,7 @@ export class et2_nextmatch extends et2_DOMWidget implements et2_IResizeable, et2
 	};
 
 	// Currently active filters
-	activeFilters: {
-		search? : string,
-		filter? : any,
-		filter2? : any,
-		col_filter: {},
-		selectcols?: string[],
-		searchletter?: string
-	};
+	activeFilters : ActiveFilters;
 
 	/**
 	 * Update types
@@ -2696,7 +2700,7 @@ export class et2_nextmatch extends et2_DOMWidget implements et2_IResizeable, et2
 	/**
 	 * Get the current 'value' for the nextmatch
 	 */
-	getValue( )
+	getValue( ) : ActiveFilters
 	{
 		const _ids = this.getSelection();
 
@@ -2706,8 +2710,8 @@ export class et2_nextmatch extends et2_DOMWidget implements et2_IResizeable, et2
 		{
 			idsArr[i] = idsArr[i].split("::").pop();
 		}
-		const value = {
-			"selected": idsArr,
+		const value : ActiveFilters = {
+			selected: idsArr,
 			col_filter: {}
 		};
 		jQuery.extend(value, this.activeFilters, this.value);