Merge pull request #244 from SayedZeeshanHyder/main

Fixed Null
TSEC-MAD-Club · Jul 28, 2024 · 5cf12a3 · 5cf12a3
2 parents 8b3a39c + e745510
commit 5cf12a3
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/lib/new_ui/screens/AnnouncementScreen/announcementscreen.dart b/lib/new_ui/screens/AnnouncementScreen/announcementscreen.dart
@@ -17,14 +17,14 @@ class AnnouncementScreen extends ConsumerStatefulWidget {
 class _AnnouncementScreenState extends ConsumerState<AnnouncementScreen> {
   final DateTime _lastDate = DateTime.now();
 
-  late StudentModel studentModel;
+  late StudentModel? studentModel;
 
   @override
   void initState() {
     super.initState();
     final UserModel? data = ref.read(userModelProvider);
     setState(() {
-      studentModel = data!.studentModel!;
+      studentModel = data?.studentModel;
     });
   }
 
@@ -82,13 +82,17 @@ class _AnnouncementScreenState extends ConsumerState<AnnouncementScreen> {
                     return SizedBox();
                   }
 
+                  if(studentModel==null && announcement.batch!.contains("All")){
+                    return listTile;
+                  }
+
                   //Condition if it is for all
                   if(announcement.batch!.contains("All")) {
                     return listTile;
                   }
 
                   //Condition if the student cannot see the Announcement
-                  if(studentModel.branch != announcement.branch || studentModel.batch != announcement.batch || studentModel.div != announcement.div || studentModel.gradyear != announcement.gradYear) {
+                  if(studentModel!.branch != announcement.branch || studentModel!.batch != announcement.batch || studentModel!.div != announcement.div || studentModel!.gradyear != announcement.gradYear) {
                     return SizedBox();
                   }