From d723c44e636421481bb647c9548036f58d6584f2 Mon Sep 17 00:00:00 2001 From: Bernd Bestel Date: Sat, 1 Apr 2023 14:30:31 +0200 Subject: [PATCH] Applied code style --- controllers/StockController.php | 14 +- migrations/0216.sql | 32 ++--- public/viewjs/metrics.js | 188 +++++++++++++------------- views/layout/default.blade.php | 2 +- views/stockmetricspurchases.blade.php | 104 +++++++------- views/stockoverview.blade.php | 2 +- 6 files changed, 175 insertions(+), 167 deletions(-) diff --git a/controllers/StockController.php b/controllers/StockController.php index 850d861b..6648928b 100644 --- a/controllers/StockController.php +++ b/controllers/StockController.php @@ -517,11 +517,11 @@ class StockController extends BaseController public function StockMetricsPurchases(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args) { - if (isset($request->getQueryParams()['start_date']) AND isset($request->getQueryParams()['end_date'])) + if (isset($request->getQueryParams()['start_date']) and isset($request->getQueryParams()['end_date'])) { - $start_date = $request->getQueryParams()['start_date']; - $end_date = $request->getQueryParams()['end_date']; - $where = "purchased_date >= '$start_date' AND purchased_date <= '$end_date'"; + $startDate = $request->getQueryParams()['start_date']; + $endDate = $request->getQueryParams()['end_date']; + $where = "purchased_date >= '$startDate' AND purchased_date <= '$endDate'"; } else { @@ -535,14 +535,14 @@ class StockController extends BaseController $sql = " SELECT product_group_id as id, product_group as name, sum(quantity * price) as total FROM product_purchase_history - where $where + WHERE $where GROUP BY product_group ORDER BY product_group "; } else { - if (isset($request->getQueryParams()['product_group']) AND $request->getQueryParams()['product_group'] != 'all') + if (isset($request->getQueryParams()['product_group']) and $request->getQueryParams()['product_group'] != 'all') { $where = $where . ' AND product_group_id = ' . $request->getQueryParams()['product_group']; } @@ -559,7 +559,7 @@ class StockController extends BaseController return $this->renderPage($response, 'stockmetricspurchases', [ 'metrics' => $this->getDatabaseService()->ExecuteDbQuery($sql)->fetchAll(\PDO::FETCH_OBJ), 'productGroups' => $this->getDatabase()->product_groups()->orderBy('name', 'COLLATE NOCASE'), - 'selectedGroup' => isset($request->getQueryParams()['product_group']) ? $request->getQueryParams()['product_group'] : null, + 'selectedGroup' => isset($request->getQueryParams()['product_group']) ? $request->getQueryParams()['product_group'] : null, 'byGroup' => isset($request->getQueryParams()['byGroup']) ? $request->getQueryParams()['byGroup'] : null ]); } diff --git a/migrations/0216.sql b/migrations/0216.sql index 925130ac..2935b1cb 100644 --- a/migrations/0216.sql +++ b/migrations/0216.sql @@ -2,23 +2,19 @@ CREATE VIEW product_purchase_history AS SELECT 1 AS id, -- Dummy, LessQL needs an id column - p.id as product_id, - p.name as product_name, - g.id as product_group_id, - g.name as product_group, - s.amount as quantity, - s.price as price, - s.purchased_date as purchased_date -FROM - product_groups as g -INNER JOIN products as p + p.id AS product_id, + p.name AS product_name, + g.id AS product_group_id, + g.name AS product_group, + s.amount AS quantity, + s.price AS price, + s.purchased_date AS purchased_date +FROM product_groups g +JOIN products p ON p.product_group_id = g.id -INNER JOIN stock_log as s +JOIN stock_log s ON s.product_id = p.id -WHERE - s.transaction_type = 'purchase' -AND - s.undone = 0 -AND - s.price is not null -ORDER BY p.name ASC +WHERE s.transaction_type = 'purchase' + AND s.undone = 0 + AND s.price IS NOT NULL +ORDER BY p.name ASC; diff --git a/public/viewjs/metrics.js b/public/viewjs/metrics.js index 0819277c..7360bb35 100644 --- a/public/viewjs/metrics.js +++ b/public/viewjs/metrics.js @@ -1,39 +1,40 @@ -/* - * Metrics Javascript - */ - /* Charting */ var labels = []; var data = []; var totalAmount = 0; -$("#metrics-table tbody tr").each(function () { +$("#metrics-table tbody tr").each(function() +{ var self = $(this); - labels.push(self.find("td:eq(0)").attr('data-chart-label')); - var itemTotalRaw = parseFloat(self.find("td:eq(1)").attr('data-chart-value')); - var itemTotal = parseFloat((Math.round(itemTotalRaw * 100) / 100).toFixed(2)); + labels.push(self.find("td:eq(0)").attr("data-chart-label")); + var itemTotalRaw = Number.parseFloat(self.find("td:eq(1)").attr("data-chart-value")); + var itemTotal = Number.parseFloat((Math.round(itemTotalRaw * 100) / 100).toFixed(2)); data.push(itemTotal); - totalAmount = (parseFloat(totalAmount) + parseFloat(itemTotal)); + totalAmount = (Number.parseFloat(totalAmount) + Number.parseFloat(itemTotal)); }); totalAmount = totalAmount.toLocaleString(undefined, { style: "currency", currency: Grocy.Currency }); -var backgroundColorChoices=['#6C747C', - '#BFB8A4', - '#BFADA4', - '#4F575E', - '#918B78', - '#343A40', - '#635E4F', - '#63554F', - '#1A1F24', - '#383426', - '#382C26', - '#121B25', - '#383119', - '#382319'] -var backgroundColors=[]; +var backgroundColorChoices = [ + "#6C747C", + "#BFB8A4", + "#BFADA4", + "#4F575E", + "#918B78", + "#343A40", + "#635E4F", + "#63554F", + "#1A1F24", + "#383426", + "#382C26", + "#121B25", + "#383119", + "#382319" +] +var backgroundColors = []; var colorChoiceIndex = 0; -for(let i=0;i + rel="stylesheet"> - - - - @endpush +@push('componentScripts') + + + + +@endpush @endonce @section('content') @@ -20,26 +20,26 @@ @yield('title')

- +

@@ -50,40 +50,44 @@
+ id="table-filter-row">
 {{ $__t('Date range') }} - +
@if(!$byGroup) -
-
-
-  {{ $__t('Product group') }} -
- +
+
+
+  {{ $__t('Product group') }}
+
+
@endif
@@ -91,37 +95,39 @@
-
+
+ class="table table-sm table-striped nowrap w-100"> - - - - @if(!$byGroup) + + + + @if(!$byGroup) - @endif - + @endif + - @foreach($metrics as $metric) + @foreach($metrics as $metric) - @if(!$byGroup) - + @endif - @endforeach + @endforeach
{{ $__t('Name') }}{{ $__t('Total') }}
{{ $__t('Name') }}{{ $__t('Total') }}{{ $__t('Product group') }}
{{ $metric->name }} + {{ $metric->total }} - {{ $metric->group_name }} - + {{ $metric->group_name }} +
diff --git a/views/stockoverview.blade.php b/views/stockoverview.blade.php index 87a6ebf4..699bcc61 100755 --- a/views/stockoverview.blade.php +++ b/views/stockoverview.blade.php @@ -41,7 +41,7 @@ {{ $__t('Stock entries') }} + href="{{ $U('/stockmetricspurchases') }}"> {{ $__t('Metrics') }} @if(GROCY_FEATURE_FLAG_STOCK_LOCATION_TRACKING)