diff --git a/README.md b/README.md index b0b6ee6..7fe0cb7 100644 --- a/README.md +++ b/README.md @@ -6,8 +6,8 @@ - - + + diff --git a/lib/db/months.dart b/lib/db/months.dart index 4507e46..64a5dde 100644 --- a/lib/db/months.dart +++ b/lib/db/months.dart @@ -23,12 +23,13 @@ class MonthService { final dbClient = await _databaseHelper.db; String query = ''' - WITH RECURSIVE MonthDates(monthDate) AS ( - SELECT DATETIME((SELECT MIN(date) FROM entries), 'start of month') + WITH RECURSIVE MonthDates AS ( + SELECT DATE(MIN(date), 'start of month') AS monthStart + FROM entries UNION ALL - SELECT DATETIME(monthDate, '+1 month') + SELECT DATE(monthStart, '+1 month') FROM MonthDates - WHERE DATETIME(monthDate, '+1 month') < CURRENT_DATE + WHERE monthStart < DATE('now', 'start of month') ), ForexPairs AS ( SELECT @@ -107,9 +108,9 @@ class MonthService { ), 0) AS expense, ? AS currency FROM ( - SELECT - REPLACE(DATETIME(monthDate, 'start of month'), ' ', 'T') || 'Z' as startDate, - REPLACE(DATETIME(monthDate, 'start of month', '+1 month', '-1 second'), ' ', 'T') || 'Z' as endDate + SELECT + monthStart || 'T00:00:00Z' AS startDate, + DATE(monthStart, '+1 month', '-1 second') || 'T23:59:59Z' AS endDate FROM MonthDates ) AS months LEFT JOIN ConsolidatedEntries e ON e.date BETWEEN months.startDate AND months.endDate diff --git a/pubspec.lock b/pubspec.lock index 7278831..015a98f 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -220,10 +220,10 @@ packages: dependency: "direct main" description: name: go_router - sha256: "3b40e751eaaa855179b416974d59d29669e750d2e50fcdb2b37f1cb0ca8c803a" + sha256: "07ee2436909f749d606f53521dc1725dd738dc5196e5ff815bc254253c594075" url: "https://pub.dev" source: hosted - version: "13.0.1" + version: "13.1.0" google_fonts: dependency: "direct main" description: @@ -244,10 +244,10 @@ packages: dependency: "direct main" description: name: http - sha256: d4872660c46d929f6b8a9ef4e7a7eff7e49bbf0c4ec3f385ee32df5119175139 + sha256: a2bbf9d017fcced29139daa8ed2bba4ece450ab222871df93ca9eec6f80c34ba url: "https://pub.dev" source: hosted - version: "1.1.2" + version: "1.2.0" http_multi_server: dependency: transitive description: @@ -641,10 +641,10 @@ packages: dependency: "direct main" description: name: sqflite - sha256: "591f1602816e9c31377d5f008c2d9ef7b8aca8941c3f89cc5fd9d84da0c38a9a" + sha256: a9016f495c927cb90557c909ff26a6d92d9bd54fc42ba92e19d4e79d61e798c6 url: "https://pub.dev" source: hosted - version: "2.3.0" + version: "2.3.2" sqflite_common: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 99828e4..5612e54 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: finease description: "A full stack mobile app to keep track of financial transactions" publish_to: 'none' -version: 1.0.26 +version: 1.0.27 environment: sdk: '>=3.2.3 <4.0.0' @@ -13,10 +13,10 @@ dependencies: fl_chart: 0.66.0 flutter: sdk: flutter - go_router: 13.0.1 + go_router: 13.1.0 google_fonts: 6.1.0 hive: 2.2.3 - http: 1.1.2 + http: 1.2.0 intl: 0.17.0 local_auth: 2.1.8 material_design_icons_flutter: 7.0.7296 @@ -27,7 +27,7 @@ dependencies: pointycastle: 3.7.4 responsive_builder: 0.7.0 share_plus: 7.0.2 - sqflite: 2.3.0 + sqflite: 2.3.2 url_launcher: 6.2.3 xml: 6.5.0