Fix the "enabled by default" nature of the benchmark feature - #77

tsumaru720 · Feb 22, 2023 · 0c7b11b · 0c7b11b
1 parent 4c204e1
commit 0c7b11b
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 13 deletions.
diff --git a/app/Main.php b/app/Main.php
@@ -22,7 +22,7 @@ class Main {
     public static $outputMethod = 'html';
 
     // The current expected database schema version.
-    public static $expectedSchema = 4;
+    public static $expectedSchema = 5;
 
     // variable initialization
     private $config = null;

diff --git a/schema/5.php b/schema/5.php
@@ -0,0 +1,8 @@
+<?php
+
+$q = $db->query(<<<'EOT'
+ALTER TABLE `settings` CHANGE `value` `value` VARCHAR(2048) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL;
+
+UPDATE `settings` SET `value` = '5' WHERE `settings`.`setting` = 'db_version';
+EOT
+);
diff --git a/themes/default/app/item_view.php b/themes/default/app/item_view.php
@@ -101,6 +101,16 @@ public function __construct(&$main, &$twig, $vars) {
             }
         }
 
+        $q = $this->db->query("SELECT value from settings WHERE setting = 'benchmark_url' LIMIT 1");
+        if ($r = $this->db->fetch($q)) {
+            if (array_key_exists('value', $r)) {
+                if (filter_var($r['value'], FILTER_VALIDATE_URL)) {
+                    $vars['enable_benchmark'] = true;
+                    $vars['benchmark_url'] = $r['value'];
+                }
+            }
+        }
+
         $vars['hide_total_pct'] = true;
 
         $vars['payments'] = [];

diff --git a/themes/default/html/item_view.html b/themes/default/html/item_view.html
@@ -256,6 +256,7 @@ <h4><small>Adjusted TWR<br>{{ mostRecent.twr_str_adj }}%</small></h4>
 {% endfor %}
 ];
 
+{% if enable_benchmark == true %}
 //////////////////////////////////////////////////////////////////////////////////////////
 
 var data5 = new Array();
@@ -266,7 +267,8 @@ <h4><small>Adjusted TWR<br>{{ mostRecent.twr_str_adj }}%</small></h4>
 ];
 
 bench = new Array();
-var dataURL = "https://cache1.agari.co/4d0eabfdf45f0ba15f6a10797dcef522/global.php";
+var dataURL = "{{ benchmark_url }}";
+//var dataURL = "https://cache1.agari.co/4d0eabfdf45f0ba15f6a10797dcef522/global.php";
 //var dataURL = "https://cache1.agari.co/4d0eabfdf45f0ba15f6a10797dcef522/us.php";
 //var dataURL = "https://cache1.agari.co/4d0eabfdf45f0ba15f6a10797dcef522/nasdaq.php";
 fetch(dataURL).then(response => response.json()).then(function(data) {
@@ -304,7 +306,20 @@ <h4><small>Adjusted TWR<br>{{ mostRecent.twr_str_adj }}%</small></h4>
     growth_chart.update();
 });
 
+benchmark_hash = {
+    label: 'Benchmark',
+    borderColor: 'rgb(180, 180, 180)',
+    backgroundColor: 'rgb(180, 180, 180)',
+    fill: false,
+    lineTension: 0.3,
+    data: data5,
+    hidden: false,
+    borderWidth: 1.5,
+    pointRadius: 1
+};
+
 //////////////////////////////////////////////////////////////////////////////////////////
+{% endif %}
 
 var ctx = document.getElementById('growth_chart');
 var growth_chart = new Chart(ctx, {
@@ -355,17 +370,10 @@ <h4><small>Adjusted TWR<br>{{ mostRecent.twr_str_adj }}%</small></h4>
             data: data2,
             hidden: {% if std_dev <= 5 %}false{% else %}true{% endif %},
             borderWidth: 1
-        }, {
-            label: 'Benchmark',
-            borderColor: 'rgb(180, 180, 180)',
-            backgroundColor: 'rgb(180, 180, 180)',
-            fill: false,
-            lineTension: 0.3,
-            data: data5,
-            hidden: false,
-            borderWidth: 1.5,
-            pointRadius: 1
-        }]
+        },
+        {% if enable_benchmark == true %}
+          benchmark_hash
+        {% endif %}]
     },
     options: {
         animation: false,