Merge branch 'refs/heads/design_3.0_non_hmg_emp_flow' into design_3.0_ppm_new_flow

# Conflicts: # lib/l10n/app_ar.arb # lib/l10n/app_en.arb # lib/new_views/pages/land_page/widgets/request_item_view_list.dart
9 months ago · ecaf58fcdc
parent d181c81029 114d493f5f
commit ecaf58fcdc
10 changed files with 123 additions and 12 deletions
--- a/lib/controllers/providers/api/gas_refill_provider.dart
+++ b/lib/controllers/providers/api/gas_refill_provider.dart
@ -47,6 +47,7 @@ class GasRefillProvider extends ChangeNotifier {
  Future<GasRefillModel?> getGasRefillObjectById(num id) async {
    try {
      Response response = await ApiManager.instance.get(URLs.getGasRefillById + "?gazRefillId=$id");
+
      if (response.statusCode >= 200 && response.statusCode < 300) {
        return GasRefillModel.fromJson(json.decode(response.body)["data"]);
      } else {
--- a/lib/l10n/app_ar.arb
+++ b/lib/l10n/app_ar.arb
@ -526,6 +526,11 @@
   "userName": "اسم المستخدم",
   "siteName": "اسم الموقع",
   "pointName": "اسم النقطة",
+   "checkIn": "تسجيل الدخول",
+   "createdDate": "تاريخ الإنشاء",
+     "employeeId": "رقم الموظف",
+     "extensionNo": "رقم التمديد",
+     "recurrentWo": "أمر العمل المتكرر"
   "checkIn": "تسجيل الدخول",
     "pmWo": "أمر العمل الوقائي",
     "recurrentWo": "أمر العمل المتكرر",
--- a/lib/l10n/app_en.arb
+++ b/lib/l10n/app_en.arb
@ -538,4 +538,9 @@
       "scheduledDate": "Scheduled Date",
       "complete": "Complete",
       "recurrentWo": "Recurrent WO"
+     "checkIn": "Check in",
+     "createdDate": "Created Date",
+       "employeeId": "Employee ID",
+       "extensionNo": "Extension No",
+       "recurrentWo": "Recurrent WO"
 }
--- a/lib/models/device/asset_transfer.dart
+++ b/lib/models/device/asset_transfer.dart
@ -52,6 +52,10 @@ class AssetTransfer {
      this.destDepartmentName,
      this.destBuildingName,
      this.applied,
+      this.extensionNo,
+      this.name,
+      this.employeeId,
+      this.createdDate,
      this.createdOn,
      this.destFloorName,
      this.destSiteName,
@ -155,6 +159,10 @@ class AssetTransfer {
    destDepartmentName = json['destDepartmentName'];
    destBuildingName = json['destBuildingName'];
    applied = json['applied'];
+    extensionNo = json['extensionNo'];
+    employeeId = json['employeeId'];
+    name = json['name'];
+    createdDate = json['createdDate'];
    createdOn = json['createdOn'];
    destFloorName = json['destFloorName'];
    destSiteName = json['destSiteName'];
@ -234,6 +242,10 @@ class AssetTransfer {
  String? receiverMachineStatusName;
  String? receiverEngSignatureUrl;
  bool? applied;
+  dynamic extensionNo;
+  String? employeeId;
+  String? name;
+  String? createdDate;
  String? createdOn;
  String? modifiedOn;
  List<VisitTimers>? senderVisitTimers;
@ -293,6 +305,10 @@ class AssetTransfer {
          String? receiverMachineStatusName,
          String? receiverEngSignatureUrl,
          bool? applied,
+          dynamic extensionNo,
+          String? employeeId,
+          String? name,
+          String? createdDate,
          String? createdOn,
          String? modifiedOn,
          String? assetSerialNo,
@ -359,6 +375,10 @@ class AssetTransfer {
          receiverMachineStatusName: receiverMachineStatusName ?? this.receiverMachineStatusName,
          receiverEngSignatureUrl: receiverEngSignatureUrl ?? this.receiverEngSignatureUrl,
          applied: applied ?? this.applied,
+          extensionNo: extensionNo??this.extensionNo,
+          employeeId: employeeId??this.employeeId,
+          name: name??this.name,
+          createdDate: createdDate??this.createdDate,
          createdOn: createdOn ?? this.createdOn,
          modifiedOn: modifiedOn ?? this.modifiedOn,
          assetSerialNo: assetSerialNo ?? this.assetSerialNo,
@ -436,6 +456,10 @@ class AssetTransfer {
    map["receiverMachineStatusName"] = receiverMachineStatusName;
    map["receiverEngSignatureUrl"] = receiverEngSignatureUrl;
    map["applied"] = applied;
+    map["extensionNo"] = extensionNo;
+    map["employeeId"] = employeeId;
+    map["name"] = name;
+    map["createdDate"] = createdDate;
    map["createdOn"] = createdOn;
    map["modifiedOn"] = modifiedOn;
    map["assetSerialNo"] = assetSerialNo;
@ -552,6 +576,10 @@ class AssetTransfer {
    receiverMachineStatusName = assetTransfer.receiverMachineStatusName;
    receiverEngSignatureUrl = assetTransfer.receiverEngSignatureUrl;
    applied = assetTransfer.applied;
+    extensionNo = assetTransfer.extensionNo;
+    employeeId = assetTransfer.employeeId;
+    name = assetTransfer.name;
+    createdDate = assetTransfer.createdDate;
    createdOn = assetTransfer.createdOn;
    modifiedOn = assetTransfer.modifiedOn;
    assetSerialNo = assetTransfer.assetSerialNo;
--- a/lib/models/new_models/gas_refill_model.dart
+++ b/lib/models/new_models/gas_refill_model.dart
@ -24,6 +24,10 @@ class GasRefillModel {
      this.engSignature,
      this.nurseSignature,
      this.workingHours,
+      this.extensionNo,
+      this.employeeId,
+      this.name,
+      this.createdDate,
      this.site,
      this.building,
      this.floor,
@ -47,6 +51,10 @@ class GasRefillModel {
    endTime = json['endTime'];
    comment = json['comment'];
    workingHours = json['workingHours'];
+    extensionNo = json['extensionNo'];
+    employeeId = json['employeeId'];
+    name = json['name'];
+    createdDate = json['createdDate'];
    try {
      final DateTime? sd = DateTime.tryParse(startDate ?? "");
      final DateTime? st = DateTime.tryParse(startTime ?? "");
@ -90,7 +98,11 @@ class GasRefillModel {
  String? endTime; // Now nullable
  String? engSignature; // Now nullable
  String? nurseSignature; // Now nullable
-  num? workingHours; // Now nullable
+  num? workingHours;
+  dynamic extensionNo;
+  String? employeeId;
+  String? name;
+  String? createdDate;
  Site? site; // Now nullable
  Building? building; // Now nullable
  Floor? floor; // Now nullable
@ -115,6 +127,10 @@ class GasRefillModel {
    String? engSignature,
    String? nurseSignature,
    num? workingHours,
+    num? extensionNo,
+    num? employeeId,
+    String? name,
+    String? createdDate,
    Site? site,
    Building? building,
    Floor? floor,
@ -161,6 +177,10 @@ class GasRefillModel {
    map['engSignature'] = engSignature;
    map['nurseSignature'] = nurseSignature;
    map['workingHours'] = workingHours;
+    map['extensionNo'] = extensionNo;
+    map['employeeId'] = employeeId;
+    map['name'] = name;
+    map['createdDate'] = createdDate;
    map['comment'] = comment;
    if (site != null) {
      map['site'] = site?.toJson(addBuildings: false); // Use '?.' for null safety
@ -223,6 +243,10 @@ class GasRefillModel {
    engSignature = model.engSignature;
    nurseSignature = model.nurseSignature;
    workingHours = model.workingHours;
+    extensionNo = model.extensionNo;
+    employeeId = model.employeeId;
+    name = model.name;
+    createdDate = model.createdDate;
  }
 }

--- a/lib/views/pages/device_transfer/device_transfer_details.dart
+++ b/lib/views/pages/device_transfer/device_transfer_details.dart
@ -79,6 +79,11 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
                                  _buildTextWidget('${context.translation.sn} : ${_model?.assetSerialNo ?? ""}'),
                                  if (_model?.receiverEndUserName != null) _buildTextWidget('${context.translation.receiverName} : ${_model?.receiverEndUserName ?? ""}'),
                                  _buildTextWidget('${context.translation.requestNo} : ${_model?.transferCode ?? ""}'),
+                                  //TODO need to confirm where to display this new data...
+                                  infoText(label:context.translation.gasRequest ,value:_model?.extensionNo ),
+                                  infoText(label:context.translation.employeeId ,value:_model?.employeeId ),
+                                  infoText(label:context.translation.name ,value:_model?.name ),
+                                  infoText(label:context.translation.createdDate ,value:_model?.createdDate?.toInitialVisitCardFormat),
                                  if ((_model?.comment ?? "").isNotEmpty) ...[
                                    8.height,
                                    const Divider().defaultStyle(context),
@ -223,4 +228,13 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
      ],
    ).toShadowContainer(context);
  }
+  Widget infoText({String ?label,String ?value,}){
+    if(value==null||value.isEmpty){
+      return const  SizedBox();
+    }
+    else {
+      return '$label: $value'.bodyText(context);
+    }
+
+  }
 }
--- a/lib/views/pages/user/gas_refill/gas_refill_details.dart
+++ b/lib/views/pages/user/gas_refill/gas_refill_details.dart
@ -108,12 +108,19 @@ class _GasRefillDetailsPageState extends State<GasRefillDetailsPage> {
                8.height,
                context.translation.gasRefillRequest.heading5(context),
                8.height,
+
                '${context.translation.gasRequest}: ${gasRefillModel.gazRefillDetails![0].gasType?.name}'.bodyText(context),
                '${context.translation.cylinderType}: ${gasRefillModel.gazRefillDetails![0].cylinderType?.name}'.bodyText(context),
                '${context.translation.cylinderSize}: ${gasRefillModel.gazRefillDetails![0].cylinderSize?.name}'.bodyText(context),
                '${context.translation.site}: ${gasRefillModel.site?.name?.cleanupWhitespace.capitalizeFirstOfEach}'.bodyText(context),
                '${context.translation.department}: ${gasRefillModel.department?.name?.cleanupWhitespace.capitalizeFirstOfEach}'.bodyText(context),
                '${context.translation.requestNo}: ${gasRefillModel.gazRefillNo}'.bodyText(context),
+                //TODO need to confirm where to display this new data...
+                infoText(label:context.translation.gasRequest ,value:gasRefillModel.extensionNo ),
+                infoText(label:context.translation.employeeId ,value:gasRefillModel.employeeId ),
+                infoText(label:context.translation.name ,value:gasRefillModel.name ),
+                infoText(label:context.translation.createdDate ,value:gasRefillModel.createdDate?.toInitialVisitCardFormat),
+
                const Divider().defaultStyle(context),
                '${context.translation.requestedQuantity}: ${gasRefillModel.gazRefillDetails![0].requestedQty ?? 0}'.bodyText(context),
                '${context.translation.deliveredQuantity}: ${gasRefillModel.gazRefillDetails![0].deliverdQty ?? 0}'.bodyText(context),
@ -221,4 +228,14 @@ class _GasRefillDetailsPageState extends State<GasRefillDetailsPage> {
      ],
    ).toShadowContainer(context, padding: 0);
  }
+
+  Widget infoText({String ?label,String ?value,}){
+    if(value==null||value.isEmpty){
+      return const  SizedBox();
+    }
+    else {
+      return '$label: $value'.bodyText(context);
+    }
+
+  }
 }
--- a/lib/views/pages/user/gas_refill/request_gas_refill.dart
+++ b/lib/views/pages/user/gas_refill/request_gas_refill.dart
@ -176,6 +176,7 @@ class _RequestGasRefillState extends State<RequestGasRefill> {

  @override
  Widget build(BuildContext context) {
+
    _userProvider = Provider.of<UserProvider>(context);
    _settingProvider = Provider.of<SettingProvider>(context);
    _gasRefillProvider ??= Provider.of<GasRefillProvider>(context, listen: false);
--- a/pubspec.lock
+++ b/pubspec.lock
@ -1061,14 +1061,22 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "0.0.2"
-  package_info:
+  package_info_plus:
    dependency: "direct main"
    description:
-      name: package_info
-      sha256: "6c07d9d82c69e16afeeeeb6866fe43985a20b3b50df243091bfc4a4ad2b03b75"
+      name: package_info_plus
+      sha256: b15fad91c4d3d1f2b48c053dd41cb82da007c27407dc9ab5f9aa59881d0e39d4
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.2"
+    version: "8.1.4"
+  package_info_plus_platform_interface:
+    dependency: transitive
+    description:
+      name: package_info_plus_platform_interface
+      sha256: a5ef9986efc7bf772f2696183a3992615baa76c1ffb1189318dd8803778fb05b
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.2"
  path:
    dependency: transitive
    description:
@ -1317,14 +1325,22 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "0.28.0"
-  share:
+  share_plus:
    dependency: "direct main"
    description:
-      name: share
-      sha256: "97e6403f564ed1051a01534c2fc919cb6e40ea55e60a18ec23cee6e0ce19f4be"
+      name: share_plus
+      sha256: fce43200aa03ea87b91ce4c3ac79f0cecd52e2a7a56c7a4185023c271fbfa6da
+      url: "https://pub.dev"
+    source: hosted
+    version: "10.1.4"
+  share_plus_platform_interface:
+    dependency: transitive
+    description:
+      name: share_plus_platform_interface
+      sha256: cc012a23fc2d479854e6c80150696c4a5f5bb62cb89af4de1c505cf78d0a5d0b
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.4"
+    version: "5.0.2"
  shared_preferences:
    dependency: "direct main"
    description:
--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 1.3.0+13
+version: 1.3.1+14

 environment:
  sdk: ">=3.5.0 <4.0.0"
@ -45,8 +45,8 @@ dependencies:
  image_picker: ^1.1.2
  url_launcher: ^6.1.6
  flutter_launcher_icons: ^0.13.1
-  package_info: ^2.0.2
-  share: ^2.0.4
+  package_info_plus: ^8.1.4
+  share_plus: ^10.1.4
  flutter_local_notifications: ^17.2.2
  cached_network_image: ^3.2.2
  carousel_slider: ^5.0.0