diff options
| author | Simon Rettberg | 2018-04-19 14:27:14 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2018-04-19 14:27:14 +0200 |
| commit | 36bd71573754711a45f4ddcc03cc88dad9b8e8a1 (patch) | |
| tree | 547b2cad2d2fe2b620f597edb9891435b8c51f10 | |
| parent | [locationinfo] davinchi: Reuse curl handle (diff) | |
| download | slx-admin-36bd71573754711a45f4ddcc03cc88dad9b8e8a1.tar.gz slx-admin-36bd71573754711a45f4ddcc03cc88dad9b8e8a1.tar.xz slx-admin-36bd71573754711a45f4ddcc03cc88dad9b8e8a1.zip | |
[statistics] Fix select items in filterbox, tweak ID44 size grouping
| -rw-r--r-- | modules-available/statistics/page.inc.php | 2 | ||||
| -rw-r--r-- | modules-available/statistics/templates/filterbox.html | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/modules-available/statistics/page.inc.php b/modules-available/statistics/page.inc.php index d493d87a..b4d3a42d 100644 --- a/modules-available/statistics/page.inc.php +++ b/modules-available/statistics/page.inc.php @@ -8,7 +8,7 @@ for ($i = 0; $i < 10; ++$i) { $STATS_COLORS[] = '#55' . sprintf('%02s%02s', dechex((($i + 1) * ($i + 1)) / .3922), dechex(abs((5 - $i) * 51))); } //$STATS_COLORS = array('#57e', '#ee8', '#5ae', '#fb7', '#6d7', '#e77', '#3af', '#666', '#e0e', '#999'); -$SIZE_ID44 = array(0, 8, 16, 24, 30, 40, 50, 60, 80, 100, 120, 150, 180, 250, 300, 350, 400, 450, 500); +$SIZE_ID44 = array(0, 8, 16, 24, 30, 40, 50, 60, 80, 100, 120, 150, 180, 250, 300, 400, 500, 1000, 2000, 4000); $SIZE_RAM = array(1, 2, 3, 4, 6, 8, 10, 12, 16, 24, 32, 48, 64, 96, 128, 192, 256, 320, 480, 512, 768, 1024); class Page_Statistics extends Page diff --git a/modules-available/statistics/templates/filterbox.html b/modules-available/statistics/templates/filterbox.html index 0178d7ea..cd8ec24d 100644 --- a/modules-available/statistics/templates/filterbox.html +++ b/modules-available/statistics/templates/filterbox.html @@ -169,16 +169,16 @@ document.addEventListener("DOMContentLoaded", function () { })); }); /* also set the type of the input */ - if (columns[col]['type'] == 'date') { + if (columns[col]['type'] === 'date') { $('#argumentInput').datepicker({format : 'yyyy-mm-dd'}); $('#argumentSelect').hide(); - } else if(columns[col]['type'] == 'enum') { + } else if(columns[col]['type'] === 'enum') { $('#argumentSelect').empty(); $('#argumentInput').hide(); $('#argumentSelect').show(); columns[col]['values'].forEach(function (v) { var t = v; - var disabled = true; + var disabled = (col === 'location'); if (col === 'location' && slxLocations['L' + v]) { t = slxLocations['L' + v].pad + ' ' + slxLocations['L' + v].name; disabled = slxLocations['L' + v].disabled; |