Haroon6138
/
mohemm-flutter-app
1
0
Fork 0
Code Issues Pull Requests 3 Packages Projects Releases Wiki Activity

updates

Browse Source
merge-requests/1/merge
haroon amjad 3 years ago
parent 1719c7029e
commit 5c15d07dc8
2 changed files with 42 additions and 28 deletions
Show Stats Download Patch File Download Diff File

5
lib/models/generic_response_model.dart
Unescape Escape View File

@ -745,8 +745,6 @@ class GenericResponseModel {
getCEIDFFStructureList = json['GetCEIDFFStructureList']; getCEIDFFStructureList = json['GetCEIDFFStructureList'];
getCEITransactionList = json['GetCEITransactionList']; getCEITransactionList = json['GetCEITransactionList'];
getCcpTransactionsList = json['GetCcpTransactionsList']; getCcpTransactionsList = json['GetCcpTransactionsList'];
getCcpTransactionsListNew = json['GetCcpTransactionsList_New'];
getConcurrentProgramsList = json['GetConcurrentProgramsList'];
if (json['GetContactDetailsList'] != null) { if (json['GetContactDetailsList'] != null) {
getContactDetailsList = <GetContactDetailsList>[]; getContactDetailsList = <GetContactDetailsList>[];
json['GetContactDetailsList'].forEach((v) { json['GetContactDetailsList'].forEach((v) {
@ -1367,8 +1365,6 @@ class GenericResponseModel {
data['GetCEIDFFStructureList'] = this.getCEIDFFStructureList; data['GetCEIDFFStructureList'] = this.getCEIDFFStructureList;
data['GetCEITransactionList'] = this.getCEITransactionList; data['GetCEITransactionList'] = this.getCEITransactionList;
data['GetCcpTransactionsList'] = this.getCcpTransactionsList; data['GetCcpTransactionsList'] = this.getCcpTransactionsList;
data['GetCcpTransactionsList_New'] = this.getCcpTransactionsListNew;
data['GetConcurrentProgramsList'] = this.getConcurrentProgramsList;
if (this.getContactDetailsList != null) { if (this.getContactDetailsList != null) {
data['GetContactDetailsList'] = this.getContactDetailsList!.map((v) => v.toJson()).toList(); data['GetContactDetailsList'] = this.getContactDetailsList!.map((v) => v.toJson()).toList();
} }
@ -1378,7 +1374,6 @@ class GenericResponseModel {
if (this.getContactDffStructureList != null) { if (this.getContactDffStructureList != null) {
data['GetContactDffStructureList'] = this.getContactDffStructureList!.map((v) => v.toJson()).toList(); data['GetContactDffStructureList'] = this.getContactDffStructureList!.map((v) => v.toJson()).toList();
} }
// data['GetCcpTransactionsList_New'] = this.getCcpTransactionsListNew;
data['GetContactColsStructureList'] = this.getContactColsStructureList; data['GetContactColsStructureList'] = this.getContactColsStructureList;
data['GetContactDetailsList'] = this.getContactDetailsList; data['GetContactDetailsList'] = this.getContactDetailsList;
data['GetContactDffStructureList'] = this.getContactDffStructureList; data['GetContactDffStructureList'] = this.getContactDffStructureList;

65
lib/ui/screens/mowadhafhi/mowadhafhi_home.dart
Unescape Escape View File

@ -53,8 +53,6 @@ class _MowadhafhiHomeState extends State<MowadhafhiHome> {
}, },
child: Container( child: Container(
width: double.infinity, 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), margin: const EdgeInsets.only(left: 12, right: 12, top: 10, bottom: 10),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: Colors.white,
@ -67,31 +65,52 @@ class _MowadhafhiHomeState extends State<MowadhafhiHome> {
), ),
], ],
), ),
child: Column( clipBehavior: Clip.antiAlias,
crossAxisAlignment: CrossAxisAlignment.start, child: Stack(
clipBehavior: Clip.antiAlias,
children: [ children: [
Row( Positioned(
crossAxisAlignment: CrossAxisAlignment.start, left: -20,
mainAxisAlignment: MainAxisAlignment.spaceBetween, top: -10,
children: [ child: Transform.rotate(
getTicketsByEmployeeList[index].ticketTypeName!.toText14(color: MyColors.grey57Color), angle: 15,
getTicketsByEmployeeList[index].created!.split(" ")[0].toText12(color: MyColors.grey70Color), child: Container(
], width: 50,
), height: 30,
Container( color: Colors.amber,
padding: const EdgeInsets.only(top: 10.0), ),
child: getTicketsByEmployeeList[index].description!.toText12(color: MyColors.grey57Color), ),
), ),
Container( Container(
padding: const EdgeInsets.only(top: 10.0), padding: const EdgeInsets.only(left: 15, right: 15, top: 20, bottom: 10),
child: Row( child: Column(
mainAxisAlignment: MainAxisAlignment.spaceBetween, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
getTicketsByEmployeeList[index].ticketStatusInternalName!.toText14(color: MyColors.gradiantEndColor), Row(
SvgPicture.asset( crossAxisAlignment: CrossAxisAlignment.start,
"assets/images/arrow_next.svg", mainAxisAlignment: MainAxisAlignment.spaceBetween,
color: MyColors.darkIconColor, 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,
)
],
),
),
], ],
), ),
), ),

Write Preview
Loading…
Cancel
Save