From 5c15d07dc87f22b6570e5e448879b6a6efba060f Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Sun, 21 Aug 2022 15:13:06 +0300 Subject: [PATCH] updates --- lib/models/generic_response_model.dart | 5 -- .../screens/mowadhafhi/mowadhafhi_home.dart | 65 ++++++++++++------- 2 files changed, 42 insertions(+), 28 deletions(-) diff --git a/lib/models/generic_response_model.dart b/lib/models/generic_response_model.dart index e548a92..300ded9 100644 --- a/lib/models/generic_response_model.dart +++ b/lib/models/generic_response_model.dart @@ -745,8 +745,6 @@ class GenericResponseModel { getCEIDFFStructureList = json['GetCEIDFFStructureList']; getCEITransactionList = json['GetCEITransactionList']; getCcpTransactionsList = json['GetCcpTransactionsList']; - getCcpTransactionsListNew = json['GetCcpTransactionsList_New']; - getConcurrentProgramsList = json['GetConcurrentProgramsList']; if (json['GetContactDetailsList'] != null) { getContactDetailsList = []; json['GetContactDetailsList'].forEach((v) { @@ -1367,8 +1365,6 @@ class GenericResponseModel { data['GetCEIDFFStructureList'] = this.getCEIDFFStructureList; data['GetCEITransactionList'] = this.getCEITransactionList; data['GetCcpTransactionsList'] = this.getCcpTransactionsList; - data['GetCcpTransactionsList_New'] = this.getCcpTransactionsListNew; - data['GetConcurrentProgramsList'] = this.getConcurrentProgramsList; if (this.getContactDetailsList != null) { data['GetContactDetailsList'] = this.getContactDetailsList!.map((v) => v.toJson()).toList(); } @@ -1378,7 +1374,6 @@ class GenericResponseModel { if (this.getContactDffStructureList != null) { data['GetContactDffStructureList'] = this.getContactDffStructureList!.map((v) => v.toJson()).toList(); } - // data['GetCcpTransactionsList_New'] = this.getCcpTransactionsListNew; data['GetContactColsStructureList'] = this.getContactColsStructureList; data['GetContactDetailsList'] = this.getContactDetailsList; data['GetContactDffStructureList'] = this.getContactDffStructureList; diff --git a/lib/ui/screens/mowadhafhi/mowadhafhi_home.dart b/lib/ui/screens/mowadhafhi/mowadhafhi_home.dart index edf6b03..e9f17b2 100644 --- a/lib/ui/screens/mowadhafhi/mowadhafhi_home.dart +++ b/lib/ui/screens/mowadhafhi/mowadhafhi_home.dart @@ -53,8 +53,6 @@ class _MowadhafhiHomeState extends State { }, child: Container( width: double.infinity, - // height: 100.0, - padding: const EdgeInsets.only(left: 12, right: 12, top: 10, bottom: 10), margin: const EdgeInsets.only(left: 12, right: 12, top: 10, bottom: 10), decoration: BoxDecoration( color: Colors.white, @@ -67,31 +65,52 @@ class _MowadhafhiHomeState extends State { ), ], ), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + clipBehavior: Clip.antiAlias, + child: Stack( + clipBehavior: Clip.antiAlias, children: [ - Row( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - getTicketsByEmployeeList[index].ticketTypeName!.toText14(color: MyColors.grey57Color), - getTicketsByEmployeeList[index].created!.split(" ")[0].toText12(color: MyColors.grey70Color), - ], - ), - Container( - padding: const EdgeInsets.only(top: 10.0), - child: getTicketsByEmployeeList[index].description!.toText12(color: MyColors.grey57Color), + Positioned( + left: -20, + top: -10, + child: Transform.rotate( + angle: 15, + child: Container( + width: 50, + height: 30, + color: Colors.amber, + ), + ), ), Container( - padding: const EdgeInsets.only(top: 10.0), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, + padding: const EdgeInsets.only(left: 15, right: 15, top: 20, bottom: 10), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, children: [ - getTicketsByEmployeeList[index].ticketStatusInternalName!.toText14(color: MyColors.gradiantEndColor), - SvgPicture.asset( - "assets/images/arrow_next.svg", - color: MyColors.darkIconColor, - ) + Row( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + getTicketsByEmployeeList[index].ticketTypeName!.toText14(color: MyColors.grey57Color), + getTicketsByEmployeeList[index].created!.split(" ")[0].toText12(color: MyColors.grey70Color), + ], + ), + Container( + padding: const EdgeInsets.only(top: 10.0), + child: getTicketsByEmployeeList[index].description!.toText12(color: MyColors.grey57Color), + ), + Container( + padding: const EdgeInsets.only(top: 10.0), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + getTicketsByEmployeeList[index].ticketStatusInternalName!.toText14(color: MyColors.gradiantEndColor), + SvgPicture.asset( + "assets/images/arrow_next.svg", + color: MyColors.darkIconColor, + ) + ], + ), + ), ], ), ),