Skip to content

Commit

Permalink
Merge pull request #171 from atharva-khewle/main
Browse files Browse the repository at this point in the history
railway logic fixed
atharva-khewle authored Jul 2, 2024
2 parents 6f9a507 + 52ccb34 commit a27485b
Showing 2 changed files with 53 additions and 22 deletions.
28 changes: 27 additions & 1 deletion lib/new_ui/screens/railway_screen/railway_screen.dart
Original file line number Diff line number Diff line change
@@ -438,6 +438,7 @@ class _RailwayConcessionScreenState
ref.read(concessionRequestProvider.notifier).getConcessionRequestData();
});
}




@@ -451,6 +452,18 @@ class _RailwayConcessionScreenState
? DateFormat('dd/MM/yyyy').format(lastPassIssued!)
: '';


bool buttonTrigger(ConcessionStatus){
if(status == ConcessionStatus.rejected){
return true;
}else if(status == ConcessionStatus.unserviced){
return false;
}else if(status == ConcessionStatus.serviced && canIssuePass(concessionDetails, lastPassIssued, duration)){
return true;
}else {
return false;
}
}
return SingleChildScrollView(
child: Center(
child: Column(
@@ -465,14 +478,27 @@ class _RailwayConcessionScreenState
splashFactory: NoSplash.splashFactory,
splashColor: Colors.transparent,
onTap: () {
if (canIssuePass(concessionDetails, lastPassIssued, duration)) {
//tried to put the saame logic in function but it didnt work
// if (buttonTrigger(ConcessionStatus)) {
if(status == ConcessionStatus.rejected){
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => const RailwayForm(),
),
);
}else if(status == ConcessionStatus.unserviced){
}else if(status == ConcessionStatus.serviced && canIssuePass(concessionDetails, lastPassIssued, duration)){
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => const RailwayForm(),
),
);
}else {
}

// }
},
child: ConcessionStatusModal(
canIssuePass: canIssuePass,
Original file line number Diff line number Diff line change
@@ -37,6 +37,29 @@ class _ConcessionStatusModalState extends ConsumerState<ConcessionStatusModal> {
// debugPrint(concessionDetails?.status);
// debugPrint(
// widget.canIssuePass(concessionDetails, lastPassIssued, duration).toString());
Color getColor(String? status) {
if(status == ConcessionStatus.rejected){
return Colors.green;
}else if(status == ConcessionStatus.unserviced){
return Colors.yellow.shade800;
}else if(status == ConcessionStatus.serviced && widget.canIssuePass(concessionDetails, lastPassIssued, duration)){
return Colors.green;
}else {
return Colors.blue;
}
}

String getStatusText(String status){
if(status == ConcessionStatus.rejected){
return "Apply Again";
}else if(status == ConcessionStatus.unserviced){
return "Pending";
}else if(status == ConcessionStatus.serviced && widget.canIssuePass(concessionDetails, lastPassIssued, duration)){
return "Apply for new pass";
}
return "Pass Approved";
}

return Padding(
padding: const EdgeInsets.all(8.0),
child: Container(
@@ -50,7 +73,7 @@ class _ConcessionStatusModalState extends ConsumerState<ConcessionStatusModal> {
child: Padding(
padding: const EdgeInsets.all(8.0),
child: Text(
concessionDetails?.status != null ? "Status : ${getStatusText(concessionDetails!.status)}" : "Can Apply for Pass",
concessionDetails?.status != null ? " ${getStatusText(concessionDetails!.status)}" : "Can Apply for Pass",
style: Theme.of(context).textTheme.headlineSmall!.copyWith(
color: Colors.white,
fontWeight: FontWeight.w600,
@@ -61,24 +84,6 @@ class _ConcessionStatusModalState extends ConsumerState<ConcessionStatusModal> {
);
}

Color getColor(String? status) {
if(status == ConcessionStatus.rejected){
return Colors.green;
}else if(status == ConcessionStatus.unserviced){
return Colors.yellow.shade800;
}else if(status == ConcessionStatus.serviced){
return Colors.green;
}
return Colors.green;
}
String getStatusText(String status){
if(status == ConcessionStatus.rejected){
return "Apply Again";
}else if(status == ConcessionStatus.unserviced){
return "Pending";
}else if(status == ConcessionStatus.serviced){
return "Pass Approved";
}
return "You can apply for new pass";
}


}

0 comments on commit a27485b

Please sign in to comment.