Updates & fixes

lib/models/items_for_sale/get_employee_ads_list.dart

@@ -22,11 +22,10 @@ class EmployeePostedAds {
   String? status;
   List<ItemAttachments>? itemAttachments;
   String? created;
-  dynamic? comments;
-  dynamic? isActive;
+  bool? isActive;
   int? pageSize;
   int? pageNo;
-  dynamic? languageId;
+  int? languageId;
 
   EmployeePostedAds(
       {this.itemSaleID,
@@ -52,7 +51,6 @@ class EmployeePostedAds {
         this.status,
         this.itemAttachments,
         this.created,
-        this.comments,
         this.isActive,
         this.pageSize,
         this.pageNo,
@@ -87,7 +85,6 @@ class EmployeePostedAds {
       });
     }
     created = json['created'];
-    comments = json['comments'];
     isActive = json['isActive'];
     pageSize = json['pageSize'];
     pageNo = json['pageNo'];
@@ -122,7 +119,6 @@ class EmployeePostedAds {
           this.itemAttachments!.map((v) => v.toJson()).toList();
     }
     data['created'] = this.created;
-    data['comments'] = this.comments;
     data['isActive'] = this.isActive;
     data['pageSize'] = this.pageSize;
     data['pageNo'] = this.pageNo;
@@ -137,7 +133,7 @@ class ItemAttachments {
   String? contentType;
   String? attachFileStream;
   String? base64String;
-  dynamic? isActive;
+  bool? isActive;
   int? referenceItemId;
   String? content;
   String? filePath;

lib/models/my_requests/get_ccp_dff_structure_model.dart

@@ -13,7 +13,6 @@ class GetCCPDFFStructureModel {
   String? dISPLAYFLAG;
   String? eNABLEDFLAG;
   ESERVICESDV? eSERVICESDV;
-  // List<Null>? eSERVICESVS;
   String? fLEXVALUESETNAME;
   String? fORMATTYPE;
   String? fORMATTYPEDSP;
@@ -95,12 +94,6 @@ class GetCCPDFFStructureModel {
     eSERVICESDV = json['E_SERVICES_DV'] != null
         ? new ESERVICESDV.fromJson(json['E_SERVICES_DV'])
         : null;
-    // if (json['E_SERVICES_VS'] != null) {
-    //   eSERVICESVS = <Null>[];
-    //   json['E_SERVICES_VS'].forEach((v) {
-    //     eSERVICESVS!.add(new Null.fromJson(v));
-    //   });
-    // }
     fLEXVALUESETNAME = json['FLEX_VALUE_SET_NAME'];
     fORMATTYPE = json['FORMAT_TYPE'];
     fORMATTYPEDSP = json['FORMAT_TYPE_DSP'];
@@ -112,19 +105,6 @@ class GetCCPDFFStructureModel {
     nUMBERPRECISION = json['NUMBER_PRECISION'];
     nUMERICMODEENABLEDFLAG = json['NUMERIC_MODE_ENABLED_FLAG'];
     pARENTSEGMENTSDV = json['PARENT_SEGMENTS_DV'];
-    // if (json['PARENT_SEGMENTS_DV_Splited'] != null) {
-    //   pARENTSEGMENTSDVSplited = <Null>[];
-    //   json['PARENT_SEGMENTS_DV_Splited'].forEach((v) {
-    //     pARENTSEGMENTSDVSplited!.add(new Null.fromJson(v));
-    //   });
-    // }
-    // pARENTSEGMENTSVS = json['PARENT_SEGMENTS_VS'];
-    // if (json['PARENT_SEGMENTS_VS_SplitedVS'] != null) {
-    //   pARENTSEGMENTSVSSplitedVS = <Null>[];
-    //   json['PARENT_SEGMENTS_VS_SplitedVS'].forEach((v) {
-    //     pARENTSEGMENTSVSSplitedVS!.add(new Null.fromJson(v));
-    //   });
-    // }
     rEADONLY = json['READ_ONLY'];
     rEQUIREDFLAG = json['REQUIRED_FLAG'];
     sEGMENTNAME = json['SEGMENT_NAME'];

lib/ui/screens/items_for_sale/item_for_sale_detail.dart

@@ -29,9 +29,11 @@ class _ItemForSaleDetailPageState extends State<ItemForSaleDetailPage> {
       appBar: AppBarWidget(context,
           // title: LocaleKeys.mowadhafhiRequest.tr(),
           title: "Items for sale",
-          showHomeButton: true),
+          showHomeButton: true,),
       body: SingleChildScrollView(
-        child: AspectRatio(
+        child: Column(
+          children: [
+            AspectRatio(
               aspectRatio: 336 / 554,
               child: Container(
                 decoration: BoxDecoration(
@@ -100,8 +102,7 @@ class _ItemForSaleDetailPageState extends State<ItemForSaleDetailPage> {
                 ),
               ).paddingAll(21),
             ),
-      ),
-      bottomSheet: Container(
+            Container(
               decoration: const BoxDecoration(
                 color: MyColors.white,
                 boxShadow: [
@@ -131,6 +132,9 @@ class _ItemForSaleDetailPageState extends State<ItemForSaleDetailPage> {
                 ],
               ),
             ),
+          ],
+        ),
+      ),
     );
   }
 }

lib/ui/screens/my_requests/my_requests.dart

@@ -13,7 +13,6 @@ import 'package:mohem_flutter_app/extensions/int_extensions.dart';
 import 'package:mohem_flutter_app/extensions/string_extensions.dart';
 import 'package:mohem_flutter_app/extensions/widget_extensions.dart';
 import 'package:mohem_flutter_app/generated/locale_keys.g.dart';
-import 'package:mohem_flutter_app/models/get_eit_dff_structure_list_model.dart';
 import 'package:mohem_flutter_app/models/my_requests/get_ccp_output_model.dart';
 import 'package:mohem_flutter_app/models/my_requests/get_ccp_transactions_model.dart';
 import 'package:mohem_flutter_app/models/my_requests/get_concurrent_programs_model.dart';
@@ -151,11 +150,8 @@ class _MyRequestsState extends State<MyRequests> {
                     },
                     separatorBuilder: (BuildContext context, int index) => 12.height,
                     itemCount: getCCPTransactionsList.length ?? 0)),
-              80.height
-            ],
-          ),
-        ),
-        bottomSheet: Container(
+            80.height,
+            Container(
               decoration: const BoxDecoration(
                 color: MyColors.white,
                 boxShadow: [
@@ -165,7 +161,11 @@ class _MyRequestsState extends State<MyRequests> {
               child: DefaultButton(LocaleKeys.createRequest.tr(), () async {
                 openNewRequest();
               }).insideContainer,
-        ));
+            )
+          ],
+        ),
+      ),
+    );
   }
 
   void openNewRequest() async {

lib/ui/screens/my_requests/new_request.dart

@@ -78,11 +78,8 @@ class _NewRequestState extends State<NewRequest> {
                         itemBuilder: (cxt, int parentIndex) => parseDynamicFormatType(getCCPDFFStructureModelList[parentIndex], parentIndex),
                         separatorBuilder: (cxt, index) => 0.height,
                         itemCount: getCCPDFFStructureModelList.length))
-                .expanded
-          ],
-        ),
-      ),
-        bottomSheet: Container(
+                .expanded,
+            Container(
               decoration: const BoxDecoration(
                 color: MyColors.white,
                 boxShadow: [
@@ -91,8 +88,13 @@ class _NewRequestState extends State<NewRequest> {
               ),
               child: DefaultButton(LocaleKeys.submit.tr(), () async {
                 // openNewRequest();
-          }).insideContainer,
+              })
+                  .insideContainer,
             )
+          ],
+        ),
+      ),
+      // bottomSheet:
     );
   }
 
@@ -412,8 +414,7 @@ class _NewRequestState extends State<NewRequest> {
         ),
       );
     } else {
-      DateTime? picked =
-          await showDatePicker(context: context, initialDate: selectedDate, initialEntryMode: DatePickerEntryMode.calendarOnly, firstDate: DateTime(2015, 8), lastDate: DateTime(2101));
+      DateTime? picked = await showDatePicker(context: context, initialDate: selectedDate, initialEntryMode: DatePickerEntryMode.calendarOnly, firstDate: DateTime(2015, 8), lastDate: DateTime(2101));
       if (picked != null && picked != selectedDate) {
         time = picked;
       }

lib/ui/screens/offers_and_discounts/offers_and_discounts_details.dart

@@ -167,26 +167,7 @@ class _OffersAndDiscountsDetailsState extends State<OffersAndDiscountsDetails> {
   }
 
   Widget getItemCard(OffersListModel getOffersList) {
-    return InkWell(
-      onTap: () {
-        this.getOffersList[0] = getOffersList;
-        _scrollToTop();
-        setState(() {});
-      },
-      child: Container(
-        padding: const EdgeInsets.all(10.0),
-        decoration: BoxDecoration(
-          color: Colors.white,
-          borderRadius: BorderRadius.circular(10),
-          boxShadow: [
-            BoxShadow(
-              color: const Color(0xff000000).withOpacity(.05),
-              blurRadius: 26,
-              offset: const Offset(0, -3),
-            ),
-          ],
-        ),
-        child: Column(
+    return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       mainAxisSize: MainAxisSize.min,
       children: [
@@ -215,15 +196,17 @@ class _OffersAndDiscountsDetailsState extends State<OffersAndDiscountsDetails> {
         getOffersList.description!.toText12(maxLine: 2, color: const Color(0xff535353)),
         16.height,
         getOffersList.discount!.toText14(isBold: true, maxlines: 1),
-            10.height,
+        8.height,
         Row(
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
           children: [checkDate(getOffersList.endDate!), SvgPicture.asset("assets/images/arrow_next.svg").paddingOnly(bottom: 4)],
         ),
       ],
-        ),
-      ),
-    );
+    ).objectContainerView().onPress(() {
+      this.getOffersList[0] = getOffersList;
+      _scrollToTop();
+      setState(() {});
+    });
   }
 
   void getOfferLocation() {}