From 5edab2e44312dffab89f42981e01d1659f4c0b6e Mon Sep 17 00:00:00 2001
From: int2001 <int2001@users.noreply.github.com>
Date: Mon, 24 Jul 2023 09:57:03 +0000
Subject: [PATCH] Take care of maxage for map/list

---
 application/views/bandmap/index.php | 1 +
 application/views/bandmap/list.php  | 1 +
 assets/js/sections/bandmap.js       | 8 ++++----
 assets/js/sections/bandmap_list.js  | 8 ++++----
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/application/views/bandmap/index.php b/application/views/bandmap/index.php
index 968fccf2..f5c353b7 100644
--- a/application/views/bandmap/index.php
+++ b/application/views/bandmap/index.php
@@ -1,5 +1,6 @@
 <script>
 	var dxcluster_provider="<?php echo base_url(); ?>index.php/dxcluster";
+	var dxcluster_maxage=<?php echo $this->optionslib->get_option('dxcluster_maxage'); ?>;
 	var cat_timeout_interval="<?php echo $this->optionslib->get_option('cat_timeout_interval'); ?>";
 </script>
 
diff --git a/application/views/bandmap/list.php b/application/views/bandmap/list.php
index e1249275..e6ba866c 100644
--- a/application/views/bandmap/list.php
+++ b/application/views/bandmap/list.php
@@ -1,6 +1,7 @@
 <script>
 	var dxcluster_provider="<?php echo base_url(); ?>index.php/dxcluster";
 	var cat_timeout_interval="<?php echo $this->optionslib->get_option('cat_timeout_interval'); ?>";
+	var dxcluster_maxage=<?php echo $this->optionslib->get_option('dxcluster_maxage'); ?>;
 	var custom_date_format = "<?php echo $custom_date_format ?>";
 </script>
 
diff --git a/assets/js/sections/bandmap.js b/assets/js/sections/bandmap.js
index e6df82f4..368135aa 100644
--- a/assets/js/sections/bandmap.js
+++ b/assets/js/sections/bandmap.js
@@ -179,14 +179,14 @@ $(function() {
 		}
 	});
 
-	set_chart($('#band option:selected').val(), $('#decontSelect option:selected').val(), 30);
-	setInterval(function () { update_chart($('#band option:selected').val(),30); },60000);
+	set_chart($('#band option:selected').val(), $('#decontSelect option:selected').val(), dxcluster_maxage);
+	setInterval(function () { update_chart($('#band option:selected').val(),dxcluster_maxage); },60000);
 	$("#band").on("change",function() {
-		set_chart($('#band option:selected').val(), $('#decontSelect option:selected').val(), 30);
+		set_chart($('#band option:selected').val(), $('#decontSelect option:selected').val(), dxcluster_maxage);
 	});
 
 	$("#decontSelect").on("change",function() {
-		set_chart($('#band option:selected').val(), $('#decontSelect option:selected').val(), 30);
+		set_chart($('#band option:selected').val(), $('#decontSelect option:selected').val(), dxcluster_maxage);
 	});
 });
 
diff --git a/assets/js/sections/bandmap_list.js b/assets/js/sections/bandmap_list.js
index 78f1733a..b326e3de 100644
--- a/assets/js/sections/bandmap_list.js
+++ b/assets/js/sections/bandmap_list.js
@@ -68,18 +68,18 @@ $(function() {
 
 	$('.spottable').DataTable().order([1, 'asc']);
 	$('.spottable').DataTable().clear();
-	fill_list($('#band option:selected').val(), $('#decontSelect option:selected').val(),30);
-	setInterval(function () { fill_list($('#band option:selected').val(), $('#decontSelect option:selected').val(),30); },60000);
+	fill_list($('#band option:selected').val(), $('#decontSelect option:selected').val(),dxcluster_maxage);
+	setInterval(function () { fill_list($('#band option:selected').val(), $('#decontSelect option:selected').val(),dxcluster_maxage); },60000);
 
 	$("#decontSelect").on("change",function() {
 		$('.spottable').DataTable().clear();
-		fill_list($('#band option:selected').val(), $('#decontSelect option:selected').val(),30);
+		fill_list($('#band option:selected').val(), $('#decontSelect option:selected').val(),dxcluster_maxage);
 	});
 
 	$("#band").on("change",function() {
 		$('.spottable').DataTable().order([1, 'asc']);
 		$('.spottable').DataTable().clear();
-		fill_list($('#band option:selected').val(), $('#decontSelect option:selected').val(),30);
+		fill_list($('#band option:selected').val(), $('#decontSelect option:selected').val(),dxcluster_maxage);
 	});
 
 	$("#spottertoggle").on("click", function() {