Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added the loading part in concession request #159

Merged
merged 3 commits into from
Jun 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class ContainerIconWithName extends StatelessWidget {
//height: MediaQuery.of(context).size.height * 0.14,
width: MediaQuery.of(context).size.width,
decoration: BoxDecoration(
color: _theme.colorScheme.onSecondary,
color: Colors.yellow.shade800,
borderRadius: BorderRadius.circular(15.0),
boxShadow: [
BoxShadow(
Expand Down
1 change: 0 additions & 1 deletion lib/new_ui/screens/main_screen/main_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import 'package:tsec_app/new_ui/colors.dart';
import 'package:tsec_app/new_ui/screens/coming_soon_screen/coming_soon.dart';
import 'package:tsec_app/new_ui/screens/about_us_screen/about_us.dart';
import 'package:tsec_app/new_ui/screens/erp_screen/erp_screen.dart';
import 'package:tsec_app/new_ui/screens/games/dino_screen/dino_screen.dart';
import 'package:tsec_app/new_ui/screens/home_screen/widgets/home_widget.dart';
import 'package:tsec_app/new_ui/screens/main_screen/widgets/main_bottom_nav_bar.dart';
import 'package:tsec_app/new_ui/screens/notes_screen/notes_screen.dart';
Expand Down
21 changes: 20 additions & 1 deletion lib/new_ui/screens/railway_screen/railwayform.dart
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,7 @@ class _RailwayForm extends ConsumerState<RailwayForm> {
StudentModel student = ref.watch(userModelProvider)!.studentModel!;
ConcessionDetailsModel? concessionDetails =
ref.watch(concessionDetailsProvider);
String currState = ref.watch(concessionProvider);
return Scaffold(
appBar: AppBar(
shadowColor: Colors.transparent,
Expand All @@ -436,7 +437,25 @@ class _RailwayForm extends ConsumerState<RailwayForm> {
Navigator.pop(context);
},),
),
body: SingleChildScrollView(
body: currState != ""
? Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
const CircularProgressIndicator(),
const SizedBox(height: 40.0,),
SizedBox(
width: 300.0,
child: Text(
currState,
textAlign: TextAlign.center,
style: Theme.of(context).textTheme.bodyMedium!.copyWith(color: Colors.white),
),
),
],
),
)
: SingleChildScrollView(
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Expand Down
26 changes: 7 additions & 19 deletions lib/provider/concession_provider.dart
Original file line number Diff line number Diff line change
Expand Up @@ -20,55 +20,43 @@ final concessionDetailsProvider = StateProvider<ConcessionDetailsModel?>((ref) {
});

final concessionProvider =
StateNotifierProvider<ConcessionProvider, bool>(((ref) {
StateNotifierProvider<ConcessionProvider, String>(((ref) {
return ConcessionProvider(
ref: ref, concessionService: ref.watch(concessionServiceProvider));
}));

class ConcessionProvider extends StateNotifier<bool> {
class ConcessionProvider extends StateNotifier<String> {
final ConcessionService _concessionService;

final Ref _ref;

ConcessionProvider({concessionService, ref})
: _concessionService = concessionService,
_ref = ref,
super(false);
super("");

Future applyConcession(ConcessionDetailsModel concessionDetails,
File idCardPhoto, File previousPassPhoto, BuildContext context) async {
// concessionDetails.status = ConcessionStatus.unserviced;
// concessionDetails.statusMessage =
// await _concessionService.getWaitingMessage();
// _ref.read(concessionDetailsProvider.notifier).state = concessionDetails;
state="Application processing...";

ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(
content: Text('Applying for concession, please be patient'),
),
);
ConcessionDetailsModel concessionDetailsData =
await _concessionService.applyConcession(concessionDetails);

ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(
content: Text(
'We are uploading your photos, this might take some time. We will notify you when the process completes.'),
),
);
state="Uploading files...";

_ref.read(concessionDetailsProvider.notifier).state = concessionDetailsData;

concessionDetailsData.idCardURL =
await _concessionService.uploadPhoto(idCardPhoto, "idCard");
concessionDetailsData.previousPassURL =
await _concessionService.uploadPhoto(previousPassPhoto, "prevpass");
await _concessionService.applyConcession(concessionDetailsData);
state="";

ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(
content: Text('All the attached photos have been uploaded.\n Concession Successfully Applied.'),
),
);
}

Future getConcessionData() async {
Expand Down
56 changes: 44 additions & 12 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -744,6 +744,30 @@ packages:
url: "https://pub.dev"
source: hosted
version: "6.8.0"
leak_tracker:
dependency: transitive
description:
name: leak_tracker
sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
url: "https://pub.dev"
source: hosted
version: "10.0.4"
leak_tracker_flutter_testing:
dependency: transitive
description:
name: leak_tracker_flutter_testing
sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
url: "https://pub.dev"
source: hosted
version: "3.0.3"
leak_tracker_testing:
dependency: transitive
description:
name: leak_tracker_testing
sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
url: "https://pub.dev"
source: hosted
version: "3.0.1"
linkify:
dependency: transitive
description:
Expand Down Expand Up @@ -780,26 +804,26 @@ packages:
dependency: transitive
description:
name: matcher
sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
url: "https://pub.dev"
source: hosted
version: "0.12.16"
version: "0.12.16+1"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
url: "https://pub.dev"
source: hosted
version: "0.5.0"
version: "0.8.0"
meta:
dependency: transitive
description:
name: meta
sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
url: "https://pub.dev"
source: hosted
version: "1.10.0"
version: "1.12.0"
mime:
dependency: transitive
description:
Expand Down Expand Up @@ -836,10 +860,10 @@ packages:
dependency: transitive
description:
name: path
sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
url: "https://pub.dev"
source: hosted
version: "1.8.3"
version: "1.9.0"
path_provider:
dependency: "direct main"
description:
Expand Down Expand Up @@ -1185,10 +1209,10 @@ packages:
dependency: transitive
description:
name: test_api
sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
url: "https://pub.dev"
source: hosted
version: "0.6.1"
version: "0.7.0"
textfield_search:
dependency: "direct main"
description:
Expand Down Expand Up @@ -1301,6 +1325,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.1.4"
vm_service:
dependency: transitive
description:
name: vm_service
sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
url: "https://pub.dev"
source: hosted
version: "14.2.1"
watcher:
dependency: transitive
description:
Expand Down Expand Up @@ -1390,5 +1422,5 @@ packages:
source: hosted
version: "3.1.2"
sdks:
dart: ">=3.2.3 <4.0.0"
flutter: ">=3.16.6"
dart: ">=3.3.0 <4.0.0"
flutter: ">=3.18.0-18.0.pre.54"
Loading