Skip to content
This repository has been archived by the owner on Nov 26, 2024. It is now read-only.

PFM-5577 #712

Merged
merged 2 commits into from
Feb 4, 2024
Merged

PFM-5577 #712

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e170a63
PFM-5577
rahuldevgarg Feb 2, 2024
bf737ea
PFM-5577
rahuldevgarg Feb 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
91 changes: 48 additions & 43 deletions frontend/mgramseva/lib/providers/bill_generation_details_provider.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ class BillGenerationProvider with ChangeNotifier {
billGenerateDetails.billYear = null;
selectedBillCycle = null;
billGenerateDetails.billCycle = null;
selectedBillPeriod = null;
notifyListeners();
}
void onChangeOfBillCycle(cycle) {
Expand Down Expand Up @@ -360,47 +361,48 @@ class BillGenerationProvider with ChangeNotifier {
navigatorKey.currentContext!,
listen: false);
var rate = rateProvider.wcBillingSlabs!.wCBillingSlabs!.where((element) => element.connectionType=='Non_Metered').toList();
showDialog(context: context, builder: (context)=>AlertDialog(
surfaceTintColor: Colors.white,
title: Text('${ApplicationLocalizations.of(context).translate(i18.common.CORE_CONFIRM)}'),
content: Container(
height: 370,
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text('${ApplicationLocalizations.of(context).translate(i18.demandGenerate.ARE_YOU_SURE_TO_GENERATE_DEMAND_FOR)} "${ApplicationLocalizations.of(context).translate(billGenerateDetails.serviceType!)}" ${ApplicationLocalizations.of(context).translate(i18.demandGenerate.WITH_MINIMUM_CHARGE_OF)} : '),
SizedBox(height: 10,),
FittedBox(
child: DataTable(
border: TableBorder.all(
if(selectedBillPeriod!=null){
showDialog(context: context, builder: (context)=>AlertDialog(
surfaceTintColor: Colors.white,
title: Text('${ApplicationLocalizations.of(context).translate(i18.common.CORE_CONFIRM)}'),
content: Container(
height: 370,
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text('${ApplicationLocalizations.of(context).translate(i18.demandGenerate.ARE_YOU_SURE_TO_GENERATE_DEMAND_FOR)} "${ApplicationLocalizations.of(context).translate(billGenerateDetails.serviceType!)}" ${ApplicationLocalizations.of(context).translate(i18.demandGenerate.WITH_MINIMUM_CHARGE_OF)} : '),
SizedBox(height: 10,),
FittedBox(
child: DataTable(
border: TableBorder.all(
width: 0.5, borderRadius: BorderRadius.all(Radius.circular(5)),
color: Colors.grey,), columns: [
DataColumn(
label: Text(
"${ApplicationLocalizations.of(context).translate(i18.searchWaterConnection.CONNECTION_TYPE)}",
style:
TextStyle(color: Colors.black, fontWeight: FontWeight.bold),
)),
DataColumn(
label: Text(
"${ApplicationLocalizations.of(context).translate(i18.common.RATE_PERCENTAGE)}",
style:
TextStyle(color: Colors.black, fontWeight: FontWeight.bold),
)),], rows: [
...rate.map((e) => DataRow(cells: [
DataCell(Text(
"${ApplicationLocalizations.of(context).translate("${e.buildingType}")}")),
DataCell(Text("${e.minimumCharge}"))
])).toList()
],),
color: Colors.grey,), columns: [
DataColumn(
label: Text(
"${ApplicationLocalizations.of(context).translate(i18.searchWaterConnection.CONNECTION_TYPE)}",
style:
TextStyle(color: Colors.black, fontWeight: FontWeight.bold),
)),
DataColumn(
label: Text(
"${ApplicationLocalizations.of(context).translate(i18.common.RATE_PERCENTAGE)}",
style:
TextStyle(color: Colors.black, fontWeight: FontWeight.bold),
)),], rows: [
...rate.map((e) => DataRow(cells: [
DataCell(Text(
"${ApplicationLocalizations.of(context).translate("${e.buildingType}")}")),
DataCell(Text("${e.minimumCharge}"))
])).toList()
],),
),
SizedBox(height: 10,),
Text('${ApplicationLocalizations.of(context).translate(i18.demandGenerate.NO_DEMAND_GEN_WITH_RATE_0)}'), //* Note : No Demand will be generated for the Service Type with rate set to 0.
],
),
SizedBox(height: 10,),
Text('${ApplicationLocalizations.of(context).translate(i18.demandGenerate.NO_DEMAND_GEN_WITH_RATE_0)}'), //* Note : No Demand will be generated for the Service Type with rate set to 0.
],
),
),
actions:
actions:
(rateProvider.wcBillingSlabs!.wCBillingSlabs!.where((element) => element.connectionType=='Non_Metered').length- rateProvider.wcBillingSlabs!.wCBillingSlabs!.where((element) => element.connectionType=='Non_Metered' && element.minimumCharge==0).length == 0 )
?
[TextButton(onPressed: (){
Expand Down Expand Up @@ -445,11 +447,14 @@ class BillGenerationProvider with ChangeNotifier {
}));
}
}, child: Text('${ApplicationLocalizations.of(context).translate(i18.common.YES)}')),
TextButton(onPressed: (){
Navigator.pop(context);
}, child: Text('${ApplicationLocalizations.of(context).translate(i18.common.NO)}')),]
,
));
TextButton(onPressed: (){
Navigator.pop(context);
}, child: Text('${ApplicationLocalizations.of(context).translate(i18.common.NO)}')),]
,
));
}else{
Notifiers.getToastMessage(context, '${ApplicationLocalizations.of(context).translate(i18.common.SELECT_BILLING_CYCLE)}', 'ERROR'); //Please select billing cycle
}
} else {
autoValidation = true;
notifyListeners();
Expand Down
Loading