Fix #7

Author: kimbtech

VERSION

@@ -1,4 +1,4 @@
 latest
-0.4.2
+0.4.3
 0.4
 0

php/core/Stats.php

@@ -13,8 +13,9 @@
 
 class Stats {
 
-	// max plain data elements for plots
-	const MAX_PLAIN_ELEMENTS = 2000;
+	// max and default plain data elements for plots
+	const MAX_PLAIN_ELEMENTS = 200000;
+	const DEFAULT_PLAIN_ELEMENTS = 2000;
 
 	private Template $temp;
 	private Login $login;
@@ -64,9 +65,22 @@ public function __construct( Template $temp, Login $login ) {
 	}
 
 	private function displayContent(array $data) : void {
+		if(!empty($_POST['plainlimit']) ){
+			$plainLimit = intval($_POST['plainlimit']);
+			if( $plainLimit < self::DEFAULT_PLAIN_ELEMENTS ){
+				$plainLimit = self::DEFAULT_PLAIN_ELEMENTS;
+			}
+			else if( $plainLimit > self::MAX_PLAIN_ELEMENTS ){
+				$plainLimit = self::MAX_PLAIN_ELEMENTS;
+			}
+		}
+		else {
+			$plainLimit = self::DEFAULT_PLAIN_ELEMENTS;
+		}
+
 		$this->temp->setContent('COMBIDATA', json_encode($data['combi']));
-		$this->temp->setContent('PLAINDATA', json_encode(array_slice($data['plain'], 0, self::MAX_PLAIN_ELEMENTS)));
-		if(count($data['plain']) > self::MAX_PLAIN_ELEMENTS){
+		$this->temp->setContent('PLAINDATA', json_encode(array_slice($data['plain'], 0, $plainLimit)));
+		if(count($data['plain']) > $plainLimit){
 			$this->temp->setContent('LESSDATADISABLE', '');
 		}
 		$this->temp->setContent('TABLEA', $this->arrayToTable($data['table']));
@@ -245,6 +259,8 @@ function ($s) {
 				)
 			))
 		));
+
+		$this->temp->setContent('DEFAULT_PLAIN_ELEMENTS', self::DEFAULT_PLAIN_ELEMENTS );
 	}
 
 }

php/core/templates/stats.json

@@ -21,5 +21,6 @@
 	"%%PLAINDATA%%" : "[]",
 	"%%SINGLEDAYDATA%%" : "false",
 	"%%CMD%%" : "",
-	"%%GRAPHES%%" : ""
+	"%%GRAPHES%%" : "",
+	"%%DEFAULT_PLAIN_ELEMENTS%%" : ""
 }

php/core/templates/stats_en.html

@@ -63,20 +63,24 @@ <h3>Select data</h3>
 		</div>
 		<div class="form-group row %%SHARESDIABLE%%">
 			<label for="shares" class="col-sm-2 col-form-label">Include shares</label>
-			<div class="col-sm-10">
+			<div class="col-sm-8">
 				<select name="shares[]" id="shares" class="custom-select" size=4 multiple>
 					<!--MULTIPLE-Shares-BEGIN-->
 						<option value="%%VALUE%%">%%NAME%%</option>
 					<!--MULTIPLE-Shares-END-->
 				</select>
 			</div>
+			<div class="col-sm-2">
+				<button type="button" id="deselectall" class="btn btn-light">Deselect</button>
+			</div>
 		</div>
 		<div class="form-group row">
 			<div class="col-sm-2">&nbsp;</div>
 			<div class="col-sm-10">
 				<input type="submit" value="Show" class="btn btn-secondary">
 			</div>
 		</div>
+		<input type="hidden" name="plainlimit" id="plainlimit" value="%%DEFAULT_PLAIN_ELEMENTS%%">
 	</form>
 	<input type="hidden" id="datepickerFrom">
 	<input type="hidden" id="datepickerTo">
@@ -93,12 +97,10 @@ <h3>Select data</h3>
 	$("form").on("submit", () => {
 		var values = {};
 		$("input, select").each((k,v) => {
-			if($(v).attr('id') !== 'shares' ){
-				values[$(v).attr("name")] = { 
-					value : $(v).val(),
-					tag : $(v).prop("tagName")
-				};
-			}
+			values[$(v).attr("name")] = { 
+				value : $(v).val(),
+				tag : $(v).prop("tagName")
+			};
 		});
 		localStorage.setItem( 'lastServerStats', JSON.stringify(values));
 	});
@@ -137,6 +139,9 @@ <h3>Select data</h3>
 		minLength: 1,
 		delay: 50
 	});
+	$( "button#deselectall").click( () => {
+		$("select#shares option").prop("selected", false);
+	});
 </script>
 
 <h3>Tables</h3>
@@ -163,7 +168,8 @@ <h3>Graph</h3>
 		<button id="displaygraph" class="btn btn-secondary">Display Graph</button>
 	</div>
 	<div class="alert alert-danger %%LESSDATADISABLE%% m-2" role="alert">
-		The selected timespan contains a huge amount of data, some graphs may not display all data!
+		<p>The selected timespan contains a huge amount of data, some graphs may not display all data!</p>
+		<button type="button" id="increaselimit" class="btn btn-warning">Increase the limit</button>
 	</div>
 
 </div> <!-- opened in main.html -->
@@ -209,4 +215,15 @@ <h3>Graph</h3>
 		});
 		$("select[name=time]").trigger('change');
 	}
+
+	if(!sessionStorage.hasOwnProperty( 'lastPlainDataLimit' )){
+		sessionStorage.setItem('lastPlainDataLimit', "%%DEFAULT_PLAIN_ELEMENTS%%");
+		$("input#plainlimit").val( "%%DEFAULT_PLAIN_ELEMENTS%%" );
+	}
+	$("button#increaselimit").click( () => {
+		$("button#increaselimit").prop("disabled", true);
+		sessionStorage.setItem('lastPlainDataLimit', parseInt(sessionStorage.getItem('lastPlainDataLimit')) * 2 )
+		$("input#plainlimit").val( sessionStorage.getItem('lastPlainDataLimit') )
+		$("form").submit()
+	});
 </script>