Giancarlo Voci 7 years ago
parent
commit
472f436076

+ 1 - 3
src/OpenMind/FindBox/FindBoxCoreSystem.php

@@ -336,9 +336,7 @@ class FindBoxCoreSystem
 
 
 		$svgNode = $svgTemplate->getElementsByTagName('svg');
 		$svgNode = $svgTemplate->getElementsByTagName('svg');
 		if ($svgNode->length > 0) {
 		if ($svgNode->length > 0) {
-			$svgNode[0]->setAttribute('class', 'w-100'); // Just fit everywhere
-//			$svgNode[0]->setAttribute('width', 300);
-//			$svgNode[0]->setAttribute('height', 180);
+			$svgNode[0]->setAttribute('class', 'w-100 h-100'); // Just fit everywhere
 			$svgNode[0]->removeAttribute('transform');
 			$svgNode[0]->removeAttribute('transform');
 		}
 		}
 
 

+ 1 - 9
ui/admin/assets/js/ModalEslDetails.js

@@ -75,7 +75,6 @@ export class ModalEslDetails {
 
 
 		$('#spinnerloader').removeClass('d-none');
 		$('#spinnerloader').removeClass('d-none');
 
 
-
 		let req = AjaxReq(`${BASEURL}/admin/config`, {
 		let req = AjaxReq(`${BASEURL}/admin/config`, {
 			method: 'POST',
 			method: 'POST',
 			body: JSON.stringify({"method": "geteslstatus", "label_id": labelID})
 			body: JSON.stringify({"method": "geteslstatus", "label_id": labelID})
@@ -90,14 +89,7 @@ export class ModalEslDetails {
 						self.RefreshESLStatus(labelID);
 						self.RefreshESLStatus(labelID);
 					}, 3000);
 					}, 3000);
 			})
 			})
-			.catch(err => {
-				if (err.name === 'AbortError')
-					return;
-				if (err.url !== undefined)
-					toastr.error(err.url, `${err.status} (${err.statusText})`);
-				else
-					toastr.error(err);
-			})
+			.catch(err => console.log)
 			.finally(function () {
 			.finally(function () {
 				$('#spinnerloader').addClass('d-none');
 				$('#spinnerloader').addClass('d-none');
 			});
 			});

+ 13 - 6
ui/admin/assets/js/OMGUtils.js

@@ -16,9 +16,11 @@ const fetchHeaders = {
  *
  *
  * @param url URL of RESTful api to call
  * @param url URL of RESTful api to call
  * @param options the fetch() options
  * @param options the fetch() options
+ * @param complete Promise resolve callback
+ * @param error Promise reject callback
  * @returns Object {Promise, signal: AbortController}
  * @returns Object {Promise, signal: AbortController}
  */
  */
-export function AjaxReq(url, options) {
+export function AjaxReq(url, options, complete, error) {
 	let fetchSignal = new AbortController();
 	let fetchSignal = new AbortController();
 	let defaults = {
 	let defaults = {
 		headers: fetchHeaders,
 		headers: fetchHeaders,
@@ -33,16 +35,21 @@ export function AjaxReq(url, options) {
 				return resp.json();
 				return resp.json();
 			else
 			else
 				return Promise.reject(resp);
 				return Promise.reject(resp);
+		})
+		.catch(err => {
+			if (err.name === 'AbortError')
+				return;
+			if (err.url !== undefined)
+				toastr.error(err.url, `${err.status} (${err.statusText})`);
+			else
+				toastr.error(err);
 		});
 		});
 
 
 	// Add some properties to return value
 	// Add some properties to return value
-	let ret = {};
-	Object.assign(ret, {
+	return {
 		fetchPromise: () => fetchPromise,
 		fetchPromise: () => fetchPromise,
 		abort: function () {
 		abort: function () {
 			fetchSignal.abort()
 			fetchSignal.abort()
 		}
 		}
-	});
-
-	return ret;
+	};
 }
 }

+ 1 - 1
ui/admin/assets/js/admin.js

@@ -70,7 +70,7 @@ function TemplateSelector(clearCache) {
 
 
 function ToggleSelectAll(className, selectAll) {
 function ToggleSelectAll(className, selectAll) {
 	if (selectAll)
 	if (selectAll)
-		$(className).DataTable().rows().select();
+		$(className).DataTable().rows({page: 'current'}).select();
 	else
 	else
 		$(className).DataTable().rows().deselect();
 		$(className).DataTable().rows().deselect();
 }
 }

+ 1 - 1
ui/admin/labelstatus.tpl

@@ -50,7 +50,7 @@
 					<tr>
 					<tr>
 						<td class="text-center"></td>
 						<td class="text-center"></td>
 						<td class="text-white font-weight-bold">{{@LABEL_ID}}</td>
 						<td class="text-white font-weight-bold">{{@LABEL_ID}}</td>
-						<td class="text-center"><i class="text-warning fa fa-battery-{{@BATLEV_ICONS[@STATUS['status']['bat_level']]}}"></i></td>
+						<td data-filter="{{@STATUS['status']['bat_level']}}" class="text-center"><i class="text-warning fa fa-battery-{{@BATLEV_ICONS[@STATUS['status']['bat_level']]}}"></i></td>
 						<td class="text-center"><span class="badge badge-{{@STATUS_BADGE_COLOR[@STATUS['data']['esl_state']]??'primary'}}">{{@STATUS['data']['esl_state']}}</span></td>
 						<td class="text-center"><span class="badge badge-{{@STATUS_BADGE_COLOR[@STATUS['data']['esl_state']]??'primary'}}">{{@STATUS['data']['esl_state']}}</span></td>
 						<td>[{{@STATUS['data']['template_id']}}] {{@STATUS['data']['template_name']}}</td>
 						<td>[{{@STATUS['data']['template_id']}}] {{@STATUS['data']['template_name']}}</td>
 						<td>{{@STATUS['data']['devicename']}}</td>
 						<td>{{@STATUS['data']['devicename']}}</td>