Merge branch 'development_sultan' into 'master'

Development sultan

See merge request mirza.shafique/mohem_flutter_app!25

lib/api/profile_api_client.dart

@@ -122,10 +122,7 @@ class ProfileApiClient {
 
   Future<List<GetPhoneNumberTypesModel>> getPhoneNumberTypes() async {
     String url = "${ApiConsts.erpRest}GET_OBJECT_VALUES";
-    Map<String, dynamic> postParams = {
+    Map<String, dynamic> postParams = {"P_MENU_TYPE": "E", "P_SELECTED_RESP_ID": -999, "P_OBJECT_NAME": "PHONE_TYPE", "P_OBJECT_TYPE": "LOOKUP"};
-      "P_MENU_TYPE": "E",
-      "P_SELECTED_RESP_ID": -999,
-    };
     postParams.addAll(AppState().postParamsJson);
     return await ApiClient().postJsonForObject((json) {
       GenericResponseModel? responseData = GenericResponseModel.fromJson(json);

lib/main.dart

@@ -30,7 +30,7 @@ Future<void> main() async {
   await EasyLocalization.ensureInitialized();
   await Firebase.initializeApp();
   AppState().setPostParamsModel(
-    PostParamsModel(channel: 31, versionID: 3.4, mobileType: Platform.isAndroid ? "android" : "ios"),
+    PostParamsModel(channel: 31, versionID: 3.6, mobileType: Platform.isAndroid ? "android" : "ios"),
   );
   runApp(
     EasyLocalization(

lib/models/get_employee_phones_model.dart

@@ -1,4 +1,3 @@
-
 class GetEmployeePhonesList {
   String? dATEFROM;
   String? dATETO;
@@ -10,20 +9,12 @@ class GetEmployeePhonesList {
   String? pHONETYPE;
   String? pHONETYPEMEANING;
   int? rOWINDEX;
-
+  String? aCTION;
   GetEmployeePhonesList(
-      {this.dATEFROM,
+      {this.aCTION, this.dATEFROM, this.dATETO, this.oBJECTVERSIONNUMBER, this.pARENTID, this.pARENTTABLE, this.pHONEID, this.pHONENUMBER, this.pHONETYPE, this.pHONETYPEMEANING, this.rOWINDEX});
-        this.dATETO,
-        this.oBJECTVERSIONNUMBER,
-        this.pARENTID,
-        this.pARENTTABLE,
-        this.pHONEID,
-        this.pHONENUMBER,
-        this.pHONETYPE,
-        this.pHONETYPEMEANING,
-        this.rOWINDEX});
 
   GetEmployeePhonesList.fromJson(Map<String, dynamic> json) {
+    aCTION = json['ACTION'];
     dATEFROM = json['DATE_FROM'];
     dATETO = json['DATE_TO'];
     oBJECTVERSIONNUMBER = json['OBJECT_VERSION_NUMBER'];
@@ -38,6 +29,7 @@ class GetEmployeePhonesList {
 
   Map<String, dynamic> toJson() {
     final Map<String, dynamic> data = new Map<String, dynamic>();
+    data['ACTION'] = this.aCTION;
     data['DATE_FROM'] = this.dATEFROM;
     data['DATE_TO'] = this.dATETO;
     data['OBJECT_VERSION_NUMBER'] = this.oBJECTVERSIONNUMBER;

lib/ui/profile/contact_details.dart

@@ -75,7 +75,8 @@ class _ContactDetailsState extends State<ContactDetails> {
         ),
         backgroundColor: MyColors.backgroundColor,
         bottomSheet: footer(),
-        body: Column(children: [
+        body: SingleChildScrollView(
+            child: Column(children: [
           Container(
               width: double.infinity,
               margin: EdgeInsets.only(
@@ -84,7 +85,8 @@ class _ContactDetailsState extends State<ContactDetails> {
                 right: 26,
               ),
               padding: EdgeInsets.only(left: 14, right: 14, top: 5, bottom: 20),
-              height: 200,
+
+              ///height: 200,
               decoration: BoxDecoration(
                 boxShadow: [
                   BoxShadow(
@@ -139,7 +141,7 @@ class _ContactDetailsState extends State<ContactDetails> {
                 right: 26,
               ),
               padding: EdgeInsets.only(left: 14, right: 14, top: 5, bottom: 20),
-              height: 400,
+              // height: 400,
               decoration: BoxDecoration(
                 boxShadow: [
                   BoxShadow(
@@ -152,7 +154,6 @@ class _ContactDetailsState extends State<ContactDetails> {
                 color: Colors.white,
                 borderRadius: BorderRadius.circular(10.0),
               ),
-              child: SingleChildScrollView(
               child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
                 Row(
                   mainAxisAlignment: MainAxisAlignment.end,
@@ -177,7 +178,7 @@ class _ContactDetailsState extends State<ContactDetails> {
                               ),
                             ]))
                         .toList())
-              ])))
+              ]))
           // "${getEmployeeAddressList[0].sEGMENTPROMPT}".toText13(color: MyColors.lightGrayColor),
           // "${getEmployeeAddressList[0].sEGMENTVALUEDSP}".toText16(isBold: true, color: MyColors.blackColor),
           // SizedBox(
@@ -208,7 +209,7 @@ class _ContactDetailsState extends State<ContactDetails> {
           //]),
           //),
           //],
-        ]));
+        ])));
   }
 
   footer() {

lib/ui/profile/phone_numbers.dart

@@ -48,16 +48,43 @@ class _PhoneNumbersState extends State<PhoneNumbers> {
         ),
         backgroundColor: MyColors.backgroundColor,
         bottomSheet: footer(),
-        body: Column(children: [
+        body: SingleChildScrollView(
+            child: Column(children: [
           Container(
+            width: double.infinity,
+            margin: EdgeInsets.only(left: 25, right: 25, top: 25),
+            padding: EdgeInsets.all(20),
+            // height: 400,
+            decoration: BoxDecoration(color: Colors.white, borderRadius: BorderRadius.circular(10.0), border: Border.all(color: Color.fromARGB(255, 209, 207, 207))),
+            child: InkWell(
+              child: Row(mainAxisAlignment: MainAxisAlignment.center, children: [
+                Icon(
+                  Icons.add,
+                  color: Color(0xff259CB8),
+                ),
+                Text(
+                  'Add new row',
+                  style: TextStyle(color: Color(0xff259CB8), fontWeight: FontWeight.bold),
+                )
+              ]),
+              onTap: () {
+                addNewRow();
+              },
+            ),
+          ),
+          Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: widget.getEmployeePhonesList
+                  .map((e) => e.aCTION != 'DELETE_ROW'
+                      ? Container(
                           width: double.infinity,
                           margin: EdgeInsets.only(
                             top: 20,
                             left: 26,
                             right: 26,
                           ),
-              padding: EdgeInsets.only(left: 14, right: 14, top: 5, bottom: 20),
+                          padding: EdgeInsets.only(left: 14, right: 14, top: 15, bottom: 15),
-              height: 400,
+                          // height: 400,
                           decoration: BoxDecoration(
                             boxShadow: [
                               BoxShadow(
@@ -70,16 +97,12 @@ class _PhoneNumbersState extends State<PhoneNumbers> {
                             color: Colors.white,
                             borderRadius: BorderRadius.circular(10.0),
                           ),
-              child: SingleChildScrollView(
+                          child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
-                  child: Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: widget.getEmployeePhonesList
-                          .map((e) => Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
                             PopupMenuButton(
                                 child: DynamicTextFieldWidget(
                                   "Please Select *",
                                   e.pHONETYPEMEANING ?? "",
-                                      isEnable: true,
+                                  isEnable: false,
                                   isPopup: true,
                                 ).paddingOnly(bottom: 12),
                                 itemBuilder: (_) => <PopupMenuItem<int>>[
@@ -87,12 +110,46 @@ class _PhoneNumbersState extends State<PhoneNumbers> {
                                     ],
                                 onSelected: (int index) {
                                   e.pHONETYPEMEANING = getPhoneNumberTypesList[index].mEANING;
+                                  e.pHONETYPE = getPhoneNumberTypesList[index].cODE;
                                   setState(() {});
                                 }),
-                                "${e.pHONENUMBER}".toText16(isBold: true, color: MyColors.blackColor),
+                            DynamicTextFieldWidget(
+                              "",
+                              e.pHONENUMBER ?? "",
+                              isReadOnly: false,
+                              onChange: (text) {
+                                e.pHONENUMBER = text;
+                              },
+                            ).paddingOnly(bottom: 12),
+                            InkWell(
+                              child: Row(mainAxisAlignment: MainAxisAlignment.end, children: [
+                                Icon(
+                                  Icons.delete,
+                                  color: Colors.red,
+                                  size: 18,
+                                ),
+                                Text(
+                                  'Delete',
+                                  style: TextStyle(color: Colors.red, fontWeight: FontWeight.bold),
+                                )
+                              ]),
+                              onTap: () {
+                                // widget.getEmployeePhonesList.removeWhere((item) => item.pHONEID == e.pHONEID);
+                                setState(() {
+                                  deleteRow(e);
+                                });
+                              },
+                            ),
+                            SizedBox(
+                              height: 10,
+                            ),
                           ]))
-                          .toList())))
+                      : Container())
-        ]));
+                  .toList()),
+          SizedBox(
+            height: 80,
+          )
+        ])));
   }
 
   footer() {
@@ -105,11 +162,24 @@ class _PhoneNumbersState extends State<PhoneNumbers> {
         ],
       ),
       child: DefaultButton(LocaleKeys.update.tr(), () async {
+        updatePhone();
         //     context.setLocale(const Locale("en", "US")); // to change Loacle
-        Profile();
+        // Profile();
       }).insideContainer,
     );
   }
 
-  updatePhone() {}
+  void updatePhone() {
+    print(widget.getEmployeePhonesList);
+  }
+
+  void addNewRow() {
+    setState(() {
+      widget.getEmployeePhonesList.add(GetEmployeePhonesList(aCTION: 'NEW_ROW'));
+    });
+  }
+
+  void deleteRow(GetEmployeePhonesList row) {
+    row.aCTION = 'DELETE_ROW';
+  }
 }