From 0459ab14e2f74bb3ddcc5aa7125d703cd169c768 Mon Sep 17 00:00:00 2001
From: zaid_daoud <zaid.daoud@cloudsolutions.com.sa>
Date: Tue, 11 Jul 2023 10:26:41 +0300
Subject: [PATCH] PPM Updates Done

---
 lib/models/pantry/pentry.dart                 |  4 +-
 .../pages/user/visits/pantry/edit_pentry.dart | 51 ++++++++++---------
 .../pentry/pentry_calibration_tool_form.dart  |  5 +-
 .../widgets/pentry/pentry_info_form.dart      | 28 ++++++----
 4 files changed, 48 insertions(+), 40 deletions(-)

diff --git a/lib/models/pantry/pentry.dart b/lib/models/pantry/pentry.dart
index 45bd477b..40a9034e 100644
--- a/lib/models/pantry/pentry.dart
+++ b/lib/models/pantry/pentry.dart
@@ -58,7 +58,7 @@ class Pentry {
   Map<String, dynamic> toMap(int visitId) {
     Map<String, dynamic> map = {};
     map["visitStatusId"] = ppmVisitStatus?.id.toString();
-    //if(status != null) map["visitStatusId"] = status?.id.toString();
+    if (status != null) map["deviceStatusId"] = status?.id.toString();
     if (travelingHours != null) map["travelingHours"] = travelingHours;
     //if(imageFile != null) map["file_attachement"] = base64Encode(imageFile.readAsBytesSync());
     map["actualDate"] = actualVisitDate.toIso8601String();
@@ -73,7 +73,7 @@ class Pentry {
         {"attachmentName": (imageFile.path.split("/").last + base64Encode(imageFile.readAsBytesSync()))}
       ];
     }
-
+    map["travelingHours"] = travelingHours;
     // if(contacts?.isNotEmpty == true) {
     //   for(int i = 0;i<contacts.length;i++){
     //     contacts[i].toMap().forEach((key, value) {
diff --git a/lib/views/pages/user/visits/pantry/edit_pentry.dart b/lib/views/pages/user/visits/pantry/edit_pentry.dart
index f0c1c887..d2d52054 100644
--- a/lib/views/pages/user/visits/pantry/edit_pentry.dart
+++ b/lib/views/pages/user/visits/pantry/edit_pentry.dart
@@ -17,6 +17,8 @@ import 'package:test_sa/views/widgets/pentry/pentry_calibration_tool_form.dart';
 import 'package:test_sa/views/widgets/pentry/pentry_pm_kit_form.dart';
 import 'package:test_sa/views/widgets/pentry/pentry_ppm_check_list_form.dart';
 
+import '../../../../widgets/pentry/pentry_info_form.dart';
+
 class EditPentry extends StatefulWidget {
   final Pentry pentry;
   final Visit visit;
@@ -72,7 +74,7 @@ class _EditPentryState extends State<EditPentry> with SingleTickerProviderStateM
     if (_pentry.pmKits.isEmpty) _pentry.pmKits.add(PMKit());
     if (_pentry.calibrationTools.isEmpty) _pentry.calibrationTools.add(CalibrationTool());
     if (_pentry.ppmCheckLists.isEmpty) _pentry.ppmCheckLists.add(PPMCheckList());
-    _tabController = TabController(length: 3, vsync: this);
+    _tabController = TabController(length: 4, vsync: this);
     super.initState();
   }
 
@@ -103,25 +105,26 @@ class _EditPentryState extends State<EditPentry> with SingleTickerProviderStateM
                   child: Padding(
                     padding: const EdgeInsets.all(2.0),
                     child: TabBar(
-                        controller: _tabController,
-                        isScrollable: true,
-                        onTap: (index) {
-                          setState(() {});
-                        },
-                        tabs: const [
-                          Tab(
-                            text: "PPM Check List",
-                          ),
-                          Tab(
-                            text: "Calibration Tools",
-                          ),
-                          Tab(
-                            text: "PM Kits",
-                          ),
-                          // Tab(
-                          //   text: "PM Entry",
-                          // ),
-                        ]),
+                      controller: _tabController,
+                      isScrollable: true,
+                      onTap: (index) {
+                        setState(() {});
+                      },
+                      tabs: const [
+                        Tab(
+                          text: "PPM Check List",
+                        ),
+                        Tab(
+                          text: "Calibration Tools",
+                        ),
+                        Tab(
+                          text: "PM Kits",
+                        ),
+                        Tab(
+                          text: "PM Entry",
+                        ),
+                      ],
+                    ),
                   ),
                 ),
                 Expanded(
@@ -143,10 +146,10 @@ class _EditPentryState extends State<EditPentry> with SingleTickerProviderStateM
                             models: _pentry.pmKits,
                             enableValidate: _validate,
                           ),
-                          // PentryInfoForm(
-                          //   model: _pentry,
-                          //   enableValidate: _validate,
-                          // )
+                          PentryInfoForm(
+                            model: _pentry,
+                            enableValidate: _validate,
+                          ),
                         ],
                       ),
                       Align(
diff --git a/lib/views/widgets/pentry/pentry_calibration_tool_form.dart b/lib/views/widgets/pentry/pentry_calibration_tool_form.dart
index 048e113c..27033ba2 100644
--- a/lib/views/widgets/pentry/pentry_calibration_tool_form.dart
+++ b/lib/views/widgets/pentry/pentry_calibration_tool_form.dart
@@ -43,9 +43,8 @@ class _PentryCalibrationToolFormState extends State<PentryCalibrationToolForm> {
             );
           }
           final model = widget.models[index];
-          return ListView(
-            shrinkWrap: true,
-            physics: const ClampingScrollPhysics(),
+          return Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
             children: [
               Row(
                 mainAxisAlignment: MainAxisAlignment.spaceBetween,
diff --git a/lib/views/widgets/pentry/pentry_info_form.dart b/lib/views/widgets/pentry/pentry_info_form.dart
index 290b873d..33ccd2ed 100644
--- a/lib/views/widgets/pentry/pentry_info_form.dart
+++ b/lib/views/widgets/pentry/pentry_info_form.dart
@@ -1,7 +1,6 @@
 import 'dart:convert';
 
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
 import 'package:test_sa/controllers/localization/localization.dart';
 import 'package:test_sa/controllers/providers/api/user_provider.dart';
@@ -15,6 +14,8 @@ import 'package:test_sa/views/widgets/status/pentry/pentry_visit_status_mune.dar
 import 'package:test_sa/views/widgets/timer/app_timer.dart';
 import 'package:test_sa/views/widgets/titles/app_sub_title.dart';
 
+import '../status/pentry/pentry_status_mune.dart';
+
 class PentryInfoForm extends StatefulWidget {
   final Pentry model;
   final bool enableValidate;
@@ -79,16 +80,21 @@ class _PentryInfoFormState extends State<PentryInfoForm> {
         const SizedBox(
           height: 8,
         ),
-        // const ASubTitle("Status"),
-        // // if(widget.enableValidate && widget.model.status == null)
-        // //   ASubTitle(subtitle.requiredWord,color: Colors.red,),
-        // const SizedBox(height: 4,),
-        // PentryStatusMenu(
-        //   initialValue: widget.model.status,
-        //   onSelect: (status){
-        //     widget.model.status = status;
-        //   },
-        // ),
+        const ASubTitle("Status"),
+        if (widget.enableValidate && widget.model.status == null)
+          ASubTitle(
+            subtitle.requiredWord,
+            color: Colors.red,
+          ),
+        const SizedBox(
+          height: 4,
+        ),
+        PentryStatusMenu(
+          initialValue: widget.model.status,
+          onSelect: (status) {
+            widget.model.status = status;
+          },
+        ),
         const SizedBox(
           height: 8,
         ),