Enhancements 1.1 (#102)

* feat: use filters from user settings #91 * fix: timeformat exception * fix: null check * feat: add reference link in linkfield #90 * feat: add dynamic link #90 #80 * fix: empty list in child table, shortcut filters for basefields, * feat: date format according to system settings #99 * feat: bigger session expiry for device mobile * fix: ios downloader fix * fix: parsedate empty string handling
frappe · Oct 21, 2021 · 673b308 · 673b308
1 parent 7762767
commit 673b308
Show file tree

Hide file tree

Showing 30 changed files with 962 additions and 304 deletions.
diff --git a/assets/icons/arrow_right_2.svg b/assets/icons/arrow_right_2.svg
diff --git a/ios/Podfile b/ios/Podfile
@@ -29,6 +29,7 @@ flutter_ios_podfile_setup
 
 target 'Runner' do
   use_frameworks!
+  pod 'SQLite.swift'
   use_modular_headers!
 
   flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -78,6 +78,9 @@ PODS:
   - sqflite (0.0.2):
     - Flutter
     - FMDB (>= 2.7.5)
+  - SQLite.swift (0.13.0):
+    - SQLite.swift/standard (= 0.13.0)
+  - SQLite.swift/standard (0.13.0)
   - Toast (4.0.0)
   - url_launcher (0.0.1):
     - Flutter
@@ -103,6 +106,7 @@ DEPENDENCIES:
   - permission_handler (from `.symlinks/plugins/permission_handler/ios`)
   - shared_preferences (from `.symlinks/plugins/shared_preferences/ios`)
   - sqflite (from `.symlinks/plugins/sqflite/ios`)
+  - SQLite.swift
   - url_launcher (from `.symlinks/plugins/url_launcher/ios`)
   - video_player (from `.symlinks/plugins/video_player/ios`)
   - wakelock (from `.symlinks/plugins/wakelock/ios`)
@@ -118,6 +122,7 @@ SPEC REPOS:
     - Reachability
     - SDWebImage
     - SDWebImageFLPlugin
+    - SQLite.swift
     - Toast
 
 EXTERNAL SOURCES:
@@ -181,12 +186,13 @@ SPEC CHECKSUMS:
   SDWebImageFLPlugin: 6c2295fb1242d44467c6c87dc5db6b0a13228fd8
   shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d
   sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
+  SQLite.swift: 8add701609fd0ef78d097dcc75d20a9782e6f5fc
   Toast: 91b396c56ee72a5790816f40d3a94dd357abc196
   url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef
   video_player: 9cc823b1d9da7e8427ee591e8438bfbcde500e6e
   wakelock: b0843b2479edbf6504d8d262c2959446f35373aa
   webview_flutter: 9f491a9b5a66f2573946a389b2677987b0ff8c0b
 
-PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c
+PODFILE CHECKSUM: c990cab2bdc393dc88aba776a5ef266622e941de
 
 COCOAPODS: 1.10.1
diff --git a/lib/app/locator.config.dart b/lib/app/locator.config.dart
diff --git a/lib/config/frappe_icons.dart b/lib/config/frappe_icons.dart
@@ -33,6 +33,7 @@ class FrappeIcons {
   static const home_outlined = '$_basePath/home_outlined.svg';
   static const select = '$_basePath/select.svg';
   static const arrow_right = '$_basePath/arrow_right.svg';
+  static const arrow_right_2 = '$_basePath/arrow_right_2.svg';
   static const email = '$_basePath/email.svg';
   static const unlock = '$_basePath/unlock.svg';
   static const sort_ascending = '$_basePath/sort_ascending.svg';

diff --git a/lib/form/controls/control.dart b/lib/form/controls/control.dart
@@ -3,6 +3,7 @@ import 'package:frappe_app/config/frappe_palette.dart';
 
 import 'package:frappe_app/config/palette.dart';
 import 'package:frappe_app/form/controls/currency.dart';
+import 'package:frappe_app/form/controls/dynamic_link.dart';
 import 'package:frappe_app/form/controls/read_only.dart';
 import 'package:frappe_app/form/controls/text.dart';
 import 'package:frappe_app/model/common.dart';
@@ -47,6 +48,16 @@ Widget makeControl({
       }
       break;
 
+    case "Dynamic Link":
+      {
+        control = DynamicLink(
+          doctypeField: field,
+          doc: doc,
+          onControlChanged: onControlChanged,
+        );
+      }
+      break;
+
     case "Autocomplete":
       {
         control = AutoComplete(

diff --git a/lib/form/controls/custom_table.dart b/lib/form/controls/custom_table.dart
@@ -19,7 +19,7 @@ class CustomTable extends StatelessWidget {
       name: doctypeField.fieldname,
       context: context,
       doctype: doctypeField.options,
-      value: doc[doctypeField.fieldname],
+      initialValue: doc[doctypeField.fieldname],
     );
   }
 }
diff --git a/lib/form/controls/date.dart b/lib/form/controls/date.dart
@@ -1,5 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_form_builder/flutter_form_builder.dart';
+import 'package:frappe_app/model/offline_storage.dart';
+import 'package:frappe_app/model/system_settings_response.dart';
+import 'package:frappe_app/utils/constants.dart';
+import 'package:intl/intl.dart';
 
 import '../../config/palette.dart';
 import '../../model/doctype_response.dart';
@@ -32,12 +36,19 @@ class Date extends StatelessWidget with Control, ControlInput {
       );
     }
 
+    var dateFormat = SystemSettingsResponse.fromJson(
+      OfflineStorage.getItem("systemSettings")["data"],
+    ).message.defaults.dateFormat;
+
     return FormBuilderDateTimePicker(
       key: key,
       inputType: InputType.date,
       valueTransformer: (val) {
         return val?.toIso8601String();
       },
+      format: DateFormat(
+        Constants.frappeFlutterDateFormatMapping[dateFormat],
+      ),
       initialValue:
           doc != null ? parseDate(doc![doctypeField.fieldname]) : null,
       keyboardType: TextInputType.number,