Ac 3 - Added views and Local server Api

android/build.gradle

@@ -1,12 +1,12 @@
 buildscript {
- ext.kotlin_version = '1.6.10'
+ ext.kotlin_version = '1.8.21'
  repositories {
  google()
  jcenter()
  }
 
  dependencies {
- classpath 'com.android.tools.build:gradle:4.2.2'
+ classpath 'com.android.tools.build:gradle:7.4.2'
  classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
  }
 }
@@ -26,6 +26,6 @@ subprojects {
  project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
  delete rootProject.buildDir
 }

android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip

lib/Components/side_drawer.dart

@@ -13,6 +13,7 @@ class _SideDrawerState extends State<SideDrawer> {
  int count = 0;
  String? name;
  String? depttype;
+ late String userType;
  @override
  void initState() {
  super.initState();
@@ -23,6 +24,10 @@ class _SideDrawerState extends State<SideDrawer> {
  depttype = service.profileData.profile!['department']!['name'] +
  " " +
  service.profileData.profile!['user_type'];
+ userType = service.profileData.profile!['user_type'];
+ print(name);
+ print(depttype);
+ print("usertype$userType");
  }
 
  @override
@@ -121,6 +126,16 @@ class _SideDrawerState extends State<SideDrawer> {
  pageMover: '/programme_curriculum_home',
  isActive: true,
  ),
+ userType.toLowerCase().contains('staff')?
+ ModulesPadding(
+ line: "Timetable & Calender",
+ pageMover: '/acad_admin/academic_admin_homepage',
+ isActive: true,
+ ):ModulesPadding(
+ line: "Courses Module",
+ pageMover: '/registered_courses',
+ isActive: true,
+ ),
  ModulesPadding(
  line: 'Gymkhana Module',
  pageMover: '/gymkhana_homepage'),

lib/api.dart

@@ -1,10 +1,11 @@
 //Server and local links
 String klocalLink = "127.0.0.1:8000";
-String kserverLink = "172.27.16.215:80";
+String kserverLink = "172.27.16.214:8000";
 
 //Login Service
-String kAuthUrl = "172.27.16.215:80";
+String kAuthUrl = "172.27.16.214:8000";
 String kAuthLogin = "/api/auth/login/";
+// String kAuthLogin = "/accounts/login";
 
 //Profile Service
 String kProfile = "/api/profile/";

lib/main.dart

@@ -42,6 +42,21 @@ import 'package:fusion/screens/Healthcenter/viewschedule.dart';
 import 'package:fusion/screens/Healthcenter/history.dart';
 import 'package:fusion/screens/Healthcenter/HealthCenter.dart';
 import 'package:fusion/services/service_locator.dart';
+import 'package:fusion/screens/Courses/Registered_Courses_Home.dart';
+import 'package:fusion/screens/Courses/course_home.dart';
+import 'package:fusion/screens/Courses/Students/progress/progress.dart';
+import 'package:fusion/screens/Courses/Students/course_content/course_content.dart';
+import 'package:fusion/screens/Courses/Students/announcements/announcements.dart';
+import 'package:fusion/screens/Courses/Students/assignments/assignments.dart';
+import 'package:fusion/screens/Courses/Instructor/content/course_contentIns.dart';
+import 'package:fusion/screens/Courses/Students/assignments/upload_assignment.dart';
+import 'package:fusion/screens/Courses/Instructor/Announcements/Announcement.dart';
+import 'package:fusion/screens/Courses/Acad_admin/academic_admin_homepage.dart';
+import 'package:fusion/screens/Courses/Acad_admin/calender.dart';
+import 'package:fusion/screens/Courses/Acad_admin/timetablepage.dart';
+import 'package:fusion/screens/Courses/Instructor/evaluation/evaluation.dart';
+import 'package:fusion/screens/Courses/Instructor/evaluation/grading_scheme.dart';
+import 'package:fusion/screens/Courses/Instructor/evaluation/submissions.dart';
 
 void main() {
  WidgetsFlutterBinding.ensureInitialized();
@@ -60,7 +75,7 @@ class MyApp extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
  MediaQueryData windowData =
- MediaQueryData.fromWindow(WidgetsBinding.instance.window);
+  MediaQueryData.fromWindow(WidgetsBinding.instance.window);
  windowData = windowData.copyWith(
  textScaleFactor: 1,
  );
@@ -71,10 +86,10 @@ class MyApp extends StatelessWidget {
  title: 'Fusion',
  debugShowCheckedModeBanner: false,
  theme: ThemeData(
-  // primarySwatch: Colors.blueGrey,
+ // primarySwatch: Colors.blueGrey,
  // colorSchemeSeed: Color(0xFF2085D0),
  colorSchemeSeed: Color(0xFFF36C35),
-  fontFamily: 'Nunito',
+ fontFamily: 'Nunito',
  useMaterial3: true,
  ),
  initialRoute: '/landing',
@@ -127,6 +142,31 @@ class MyApp extends StatelessWidget {
  '/health_center/feedback': (context) => FeedBack(),
  '/health_center/viewschedule': (context) => ViewSchedule(),
  '/health_center/history': (context) => History(),
+ '/registered_courses': (context) => RegisteredCoursesHome(),
+ '/registered_courses/course_home': (context) => CourseHome(),
+ '/registered_courses/course_home/progress': (context) => Progress(),
+ '/registered_courses/course_home/course_content': (context) =>
+ CourseContent(),
+ '/registered_courses/course_home/announcement': (context) =>
+ Announcement(),
+ '/registered_courses/course_home/assignment': (context) =>
+ Assignment(),
+ '/registered_courses/course_home/instructor/course_content':
+ (context) => CourseContentIns(),
+ '/registered_courses/course_home/assignment/upload_assignment':
+ (context) => uploadAssignment(),
+ '/registered_courses/course_home/assignment/announcements':
+ (context) => AnnouncementIns(),
+ '/acad_admin/academic_admin_homepage': (context) =>
+ AcademicAdminHomePage(),
+ '/acad_admin/calender': (context) => CalendarPage(),
+ '/acad_admin/timetablepage': (context) => TimeTablePage(),
+ '/registered_courses/course_home/instructor/evaluation/evaluation':
+ (context) => Evaluation(),
+ '/registered_courses/course_home/instructor/evaluation/grading_scheme':
+ (context) => GradingScheme(),
+ '/registered_courses/course_home/instructor/evaluation/submissions':
+ (context) => Submissions(),
  },
  ),
  );

lib/screens/Academic/Registration/final_registration.dart

@@ -32,7 +32,7 @@ class _FinalRegistrationState extends State<FinalRegistration> {
  children: [
  SizedBox(height: 10),
  Text("Final Choices Of Courses"),
- if (finalData != null && finalData[0].length > 0)
+ if (finalData?[0].length > 0)
  SingleChildScrollView(
  scrollDirection: Axis.vertical,
  child: SingleChildScrollView(
@@ -61,7 +61,7 @@ class _FinalRegistrationState extends State<FinalRegistration> {
  ], rows: getRows(finalData)),
  ),
  ),
- if (finalData == null || finalData[0].length == 0)
+ if (finalData?[0].length == 0)
  Expanded(
  child: Center(
  child: Text(

lib/screens/Complaint/ComplaintHistory/update_complaint.dart

@@ -172,8 +172,8 @@ class _UpdateComplaintState extends State<UpdateComplaint> {
  widget.id!,
  complaint_date,
  finishedDate,
- complaint_type!,
- location!,
+ complaint_type,
+ location,
  specific_location!,
  details!,
  status,

lib/screens/Complaint/complaint.dart

@@ -4,12 +4,9 @@ import 'package:fusion/Components/appBar.dart';
 import 'package:fusion/models/profile.dart';
 import 'package:fusion/services/profile_service.dart';
 import 'package:http/http.dart';
-import 'ComplaintHistory/complain_history.dart';
 import 'package:flutter/material.dart';
 import 'package:fusion/Components/side_drawer.dart';
 import 'dart:ui';
-import 'LodgeComplaint/lodge_complaint.dart';
-import 'Feedback/feedback.dart';
 import 'package:provider/provider.dart';
 
 class Complaint extends StatefulWidget {