From 9114dec695fab7658b9ad121b7eb293772945b82 Mon Sep 17 00:00:00 2001 From: Bernd Bestel Date: Sun, 5 Nov 2017 14:48:43 +0100 Subject: [PATCH] This is 1.6 --- Grocy.php | 6 +++--- GrocyDemoDataGenerator.php | 10 +++++----- build.bat | 2 +- version.txt | 2 +- views/batteriesoverview.js | 2 +- views/batteriesoverview.php | 2 +- views/habitsoverview.php | 2 +- views/layout.php | 2 ++ 8 files changed, 15 insertions(+), 13 deletions(-) diff --git a/Grocy.php b/Grocy.php index fed4f217..0cfbc580 100644 --- a/Grocy.php +++ b/Grocy.php @@ -59,7 +59,7 @@ class Grocy */ public static function ExecuteDbStatement(PDO $pdo, string $sql) { - if ($pdo->exec(utf8_encode($sql)) === false) + if ($pdo->exec($sql) === false) { throw new Exception($pdo->errorInfo()); } @@ -74,7 +74,7 @@ class Grocy { if (self::ExecuteDbStatement($pdo, $sql) === true) { - return $pdo->query(utf8_encode($sql)); + return $pdo->query($sql); } return false; @@ -96,7 +96,7 @@ class Grocy { if (self::$InstalledVersion == null) { - self::$InstalledVersion = file_get_contents(__DIR__ . '/version.txt'); + self::$InstalledVersion = preg_replace("/\r|\n/", '', file_get_contents(__DIR__ . '/version.txt')); } return self::$InstalledVersion; diff --git a/GrocyDemoDataGenerator.php b/GrocyDemoDataGenerator.php index 95cee54c..c35de379 100644 --- a/GrocyDemoDataGenerator.php +++ b/GrocyDemoDataGenerator.php @@ -9,11 +9,11 @@ class GrocyDemoDataGenerator { $sql = " UPDATE locations SET name = 'Vorratskammer', description = '' WHERE id = 1; - INSERT INTO locations (name) VALUES ('S��igkeitenschrank'); --2 + INSERT INTO locations (name) VALUES ('Süßigkeitenschrank'); --2 INSERT INTO locations (name) VALUES ('Konservenschrank'); --3 - INSERT INTO locations (name) VALUES ('K�hlschrank'); --4 + INSERT INTO locations (name) VALUES ('Kühlschrank'); --4 - UPDATE quantity_units SET name = 'St�ck' WHERE id = 1; + UPDATE quantity_units SET name = 'Stück' WHERE id = 1; INSERT INTO quantity_units (name) VALUES ('Packung'); --2 INSERT INTO quantity_units (name) VALUES ('Glas'); --3 INSERT INTO quantity_units (name) VALUES ('Dose'); --4 @@ -21,14 +21,14 @@ class GrocyDemoDataGenerator INSERT INTO quantity_units (name) VALUES ('Bund'); --6 DELETE FROM products WHERE id IN (1, 2); - INSERT INTO products (name, location_id, qu_id_purchase, qu_id_stock, qu_factor_purchase_to_stock, min_stock_amount) VALUES ('Gummib�rchen', 2, 2, 2, 1, 8); --3 + INSERT INTO products (name, location_id, qu_id_purchase, qu_id_stock, qu_factor_purchase_to_stock, min_stock_amount) VALUES ('Gummibärchen', 2, 2, 2, 1, 8); --3 INSERT INTO products (name, location_id, qu_id_purchase, qu_id_stock, qu_factor_purchase_to_stock, min_stock_amount) VALUES ('Chips', 2, 2, 2, 1, 10); --4 INSERT INTO products (name, location_id, qu_id_purchase, qu_id_stock, qu_factor_purchase_to_stock) VALUES ('Eier', 1, 2, 1, 10); --5 INSERT INTO products (name, location_id, qu_id_purchase, qu_id_stock, qu_factor_purchase_to_stock) VALUES ('Nudeln', 1, 2, 2, 1); --6 INSERT INTO products (name, location_id, qu_id_purchase, qu_id_stock, qu_factor_purchase_to_stock) VALUES ('Essiggurken', 3, 3, 3, 1); --7 INSERT INTO products (name, location_id, qu_id_purchase, qu_id_stock, qu_factor_purchase_to_stock) VALUES ('Gulaschsuppe', 3, 4, 4, 1); --8 INSERT INTO products (name, location_id, qu_id_purchase, qu_id_stock, qu_factor_purchase_to_stock) VALUES ('Joghurt', 4, 5, 5, 1); --9 - INSERT INTO products (name, location_id, qu_id_purchase, qu_id_stock, qu_factor_purchase_to_stock) VALUES ('K�se', 4, 2, 2, 1); --10 + INSERT INTO products (name, location_id, qu_id_purchase, qu_id_stock, qu_factor_purchase_to_stock) VALUES ('Käse', 4, 2, 2, 1); --10 INSERT INTO products (name, location_id, qu_id_purchase, qu_id_stock, qu_factor_purchase_to_stock) VALUES ('Aufschnitt', 4, 2, 2, 1); --11 INSERT INTO products (name, location_id, qu_id_purchase, qu_id_stock, qu_factor_purchase_to_stock) VALUES ('Paprika', 4, 1, 1, 1); --12 INSERT INTO products (name, location_id, qu_id_purchase, qu_id_stock, qu_factor_purchase_to_stock) VALUES ('Gurke', 4, 1, 1, 1); --13 diff --git a/build.bat b/build.bat index fa09b3b3..09b38c85 100644 --- a/build.bat +++ b/build.bat @@ -7,6 +7,6 @@ mkdir "%releasePath%" for /f "tokens=*" %%a in ('type version.txt') do set version=%%a del "%releasePath%\grocy_%version%.zip" -"build_tools\7za.exe" a -r "%releasePath%\grocy_%version%.zip" "%projectPath%\*" -xr!.* -xr!build_tools -xr!build.bat -xr!composer.json -xr!composer.lock -xr!composer.phar -xr!grocy.phpproj -xr!grocy.phpproj.user -xr!grocy.sln -xr!bower.json -xr!publication_assets +"build_tools\7za.exe" a -r "%releasePath%\grocy_%version%.zip" "%projectPath%\*" -xr!.* -xr!build_tools -xr!build.bat -xr!composer.json -xr!composer.lock -xr!bower.json -xr!publication_assets "build_tools\7za.exe" a -r "%releasePath%\grocy_%version%.zip" "%projectPath%\.htaccess" "build_tools\7za.exe" d "%releasePath%\grocy_%version%.zip" data\*.* data\sessions diff --git a/version.txt b/version.txt index 3e1ad720..dc1e644a 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.5.0 \ No newline at end of file +1.6.0 diff --git a/views/batteriesoverview.js b/views/batteriesoverview.js index 4d7fb551..e1a32725 100644 --- a/views/batteriesoverview.js +++ b/views/batteriesoverview.js @@ -1,6 +1,6 @@ $(function() { - $('#habits-overview-table').DataTable({ + $('#batteries-overview-table').DataTable({ 'pageLength': 50, 'order': [[1, 'desc']] }); diff --git a/views/batteriesoverview.php b/views/batteriesoverview.php index 9e9fa55f..54aa507b 100644 --- a/views/batteriesoverview.php +++ b/views/batteriesoverview.php @@ -26,7 +26,7 @@ battery_id); ?> - Whenever you want... + ... diff --git a/views/habitsoverview.php b/views/habitsoverview.php index 49d61e43..ecdeb7a6 100644 --- a/views/habitsoverview.php +++ b/views/habitsoverview.php @@ -22,7 +22,7 @@ habit_id); ?> - Whenever you want... + ... diff --git a/views/layout.php b/views/layout.php index a3ce8587..032bf38e 100644 --- a/views/layout.php +++ b/views/layout.php @@ -64,6 +64,7 @@