flutter_upgrade_with_timesheet_changes
aamir-csol 2 days ago
parent deffeda015
commit e1f2819fe6

@ -25,16 +25,23 @@ class EITApiClient {
postParams.addAll(AppState().postParamsJson); postParams.addAll(AppState().postParamsJson);
return await ApiClient().postJsonForObject( return await ApiClient().postJsonForObject(
(json) { (json) {
// Check if GetEITTransactionList exists and is not empty
if (json['GetEITTransactionList'] == null || (json['GetEITTransactionList'] is List && json['GetEITTransactionList'].isEmpty)) {
return isCompleteList ? <List<CollectionTransaction>>[] : <CollectionTransaction>[];
}
if (isCompleteList) { if (isCompleteList) {
List<List<CollectionTransaction>> responseData = []; List<List<CollectionTransaction>> responseData = [];
json['GetEITTransactionList'].forEach((element) { json['GetEITTransactionList'].forEach((element) {
var transactionList = GetEitTransactionsModel.fromJson(element).collectionTransaction; var transactionList = GetEitTransactionsModel.fromJson(element).collectionTransaction;
if (transactionList != null) responseData.add(transactionList); if (transactionList != null && transactionList.isNotEmpty) {
responseData.add(transactionList);
}
}); });
return responseData; return responseData;
} else { } else {
List<CollectionTransaction>? responseData = GetEitTransactionsModel.fromJson(json['GetEITTransactionList'][0]).collectionTransaction; List<CollectionTransaction>? responseData = GetEitTransactionsModel.fromJson(json['GetEITTransactionList'][0]).collectionTransaction;
return responseData; return responseData ?? <CollectionTransaction>[];
} }
}, },
url, url,

@ -115,13 +115,12 @@ class _TicketDetailedScreenState extends State<TicketDetailedScreen> {
), ),
), ),
const SizedBox(height: 21), const SizedBox(height: 21),
dashboardProviderModel == null && dashboardProviderModel!.ticketHistoryTransactionList == null (dashboardProviderModel != null && dashboardProviderModel!.ticketHistoryTransactionList != null && dashboardProviderModel!.ticketHistoryTransactionList!.isNotEmpty)
? const SizedBox() ? ListView(
: ListView(
shrinkWrap: true, shrinkWrap: true,
physics: const NeverScrollableScrollPhysics(), physics: const NeverScrollableScrollPhysics(),
children: <Widget>[ children: <Widget>[
"Tickets History".toText20().expanded, "Tickets History".toText20(),
12.height, 12.height,
ListView.separated( ListView.separated(
physics: const NeverScrollableScrollPhysics(), physics: const NeverScrollableScrollPhysics(),
@ -219,7 +218,8 @@ class _TicketDetailedScreenState extends State<TicketDetailedScreen> {
itemCount: dashboardProviderModel!.ticketHistoryTransactionList!.length, itemCount: dashboardProviderModel!.ticketHistoryTransactionList!.length,
), ),
], ],
), )
: const SizedBox(),
], ],
], ],
).expanded, ).expanded,

Loading…
Cancel
Save