Skip to content

Commit

Permalink
Merge pull request #1 from Saurabhn16/sa1
Browse files Browse the repository at this point in the history
Your commit message here
  • Loading branch information
Saurabhn16 authored Apr 22, 2024
2 parents e71302c + 8bce429 commit 4bfaf31
Show file tree
Hide file tree
Showing 49 changed files with 4,678 additions and 2,652 deletions.
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ Flutter: Use Stable Version *2.0*
* `git checkout <module-name>`
* Switches to the branch you just created

## To update your Project

* `git fetch upstream`
* Gets the new commits on the main repository
Expand Down
23 changes: 23 additions & 0 deletions lib/Components/side_drawer.dart
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ class _SideDrawerState extends State<SideDrawer> {
int count = 0;
String? name;
String? depttype;

late String user;
@override
void initState() {
super.initState();
Expand All @@ -23,6 +25,7 @@ class _SideDrawerState extends State<SideDrawer> {
depttype = service.profileData.profile!['department']!['name'] +
" " +
service.profileData.profile!['user_type'];
user = service.profileData.profile!['user_type'];
}

@override
Expand Down Expand Up @@ -124,6 +127,26 @@ class _SideDrawerState extends State<SideDrawer> {
ModulesPadding(
line: 'Gymkhana Module',
pageMover: '/gymkhana_homepage'),
user.toLowerCase().contains("student")?
ModulesPadding(
line: 'Hostel',
pageMover:'/superadmin/hostel_admin',
// pageMover: '/caretaker/hostel_caretaker',
// pageMover: '/student/hostel_student',
isActive: true,
):user.toLowerCase().contains('warden')?
ModulesPadding(
line: 'Hostel',
pageMover: '/warden/hostel_warden',
isActive: true,
):ModulesPadding(
line: 'Hostel',
// pageMover: '/caretaker/hostel_caretaker',
pageMover: '/student/hostel_student',
// pageMover:'/superadmin/hostel_admin',
isActive: true,
),

ModulesPadding(
line: 'Establishment Module',
pageMover: '/establishment'),
Expand Down
42 changes: 26 additions & 16 deletions lib/main.dart
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import 'package:flutter/material.dart';
import 'dart:async';
import 'package:fusion/screens/Academic/Add_Drop_Courses/add_drop_courses.dart';
import 'package:fusion/screens/Complaint/ComplaintHistory/complain_history.dart';
import 'package:fusion/screens/Complaint/Feedback/feedback.dart';
import 'package:fusion/screens/Complaint/LodgeComplaint/lodge_complaint.dart';
// import 'package:fusion/screens/Complaint/ComplaintHistory/complain_history.dart';
// import 'package:fusion/screens/Complaint/Feedback/feedback.dart';
// import 'package:fusion/screens/Complaint/LodgeComplaint/lodge_complaint.dart';
import 'package:fusion/screens/Establishment/establishment_home_page.dart';
import 'package:fusion/screens/Library/Book_Search.dart';
import 'package:fusion/screens/Library/dues.dart';
// import 'package:fusion/screens/Library/dues.dart';
import 'package:fusion/screens/Library/issued_items.dart';
import 'package:fusion/screens/Library/lib_home_screen.dart';
import 'package:fusion/screens/LoginandDashboard/DashboardComponents/news.dart';
Expand All @@ -28,7 +28,7 @@ import 'package:fusion/screens/Gymkhana/Polls.dart';
import 'package:fusion/screens/Gymkhana/Apply.dart';
import 'package:fusion/screens/Gymkhana/Record.dart';
import 'package:fusion/screens/Gymkhana/Club.dart';
import 'package:fusion/screens/Complaint/complaint.dart';
// import 'package:fusion/screens/Complaint/complaint.dart';
import 'package:fusion/screens/Profile/profile.dart';
import 'package:fusion/screens/Programme_Curriculum/Batches/batches.dart';
import 'package:fusion/screens/Programme_Curriculum/Courses/courses.dart';
Expand All @@ -45,6 +45,11 @@ 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/Hostel/caretaker/hostel_caretaker.dart';
import 'package:fusion/screens/Hostel/student/hostel_student.dart';
import 'package:fusion/screens/Hostel/warden/hostel_warden.dart';
import 'package:fusion/screens/Hostel/superadmin/hostel_admin.dart';


void main() {
WidgetsFlutterBinding.ensureInitialized();
Expand All @@ -63,8 +68,9 @@ class MyApp extends StatelessWidget {
@override
Widget build(BuildContext context) {
MediaQueryData windowData =
MediaQueryData.fromView(WidgetsBinding.instance.window);
windowData = windowData.copyWith(
MediaQueryData.fromView(WidgetsBinding.instance.window);

windowData = windowData.copyWith(
textScaler: TextScaler.linear(1),
);
return MediaQuery(
Expand All @@ -74,10 +80,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',
Expand Down Expand Up @@ -119,20 +125,24 @@ class MyApp extends StatelessWidget {
'/library_homepage': (context) => LibraryHomeScreen(),
'/library_homepage/book_search': (context) => BookSearch(),
'/library_homepage/issued_items': (context) => IssuedItems(),
'/library_homepage/dues': (context) => LibraryDues(),
'/complaint': (context) =>
Complaint(ModalRoute.of(context)!.settings.arguments.toString()),
'/complaint/lodge_complaint': (context) => LodgeComplaint(
ModalRoute.of(context)!.settings.arguments.toString()),
'/complaint/complaint_history': (context) => ComplainHistory(),
'/complaint/feedback': (context) => ComplaintFeedBack(),
// '/library_homepage/dues': (context) => LibraryDues(),
// '/complaint': (context) =>
// Complaint(ModalRoute.of(context)!.settings.arguments.toString()),
// '/complaint/lodge_complaint': (context) => LodgeComplaint(
// ModalRoute.of(context)!.settings.arguments.toString()),
// '/complaint/complaint_history': (context) => ComplainHistory(),
// '/complaint/feedback': (context) => ComplaintFeedBack(),
'/profile': (context) => Profile(),
'/health_center': (context) => HealthCenterMod(
ModalRoute.of(context)!.settings.arguments.toString()),
'/health_center/healthcenter': (context) => HealthCenter(),
'/health_center/feedback': (context) => FeedBack(),
'/health_center/viewschedule': (context) => ViewSchedule(),
'/health_center/history': (context) => History(),
'/caretaker/hostel_caretaker': (context) => Hostelcaretaker(),
'/wardern/hostel_wardern': (context) => Hostelwarden(),
'/student/hostel_student': (context) => Hostelstudent(),
'/superadmin/hostel_admin': (context) => HostelAdmin(),
},
),
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,8 @@ class _UpdateComplaintState extends State<UpdateComplaint> {
widget.id!,
complaint_date,
finishedDate,
complaint_type!,
location!,
complaint_type,
location,
specific_location!,
details!,
status,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
148 changes: 74 additions & 74 deletions lib/screens/Academic/Registration/final_registration.dart
Original file line number Diff line number Diff line change
@@ -1,74 +1,74 @@
import 'package:flutter/material.dart';

class FinalRegistration extends StatefulWidget {
final data;
const FinalRegistration({Key? key, this.data}) : super(key: key);
@override
_FinalRegistrationState createState() => _FinalRegistrationState();
}

class _FinalRegistrationState extends State<FinalRegistration> {
getRows(List? map) {
List<DataRow> list = [];
map?.forEach((element) {
element.length > 0
? list.add(DataRow(cells: [
DataCell(Text(element[0]['course_id']['id'].toString())),
DataCell(Text(element[0]['course_code'].toString())),
DataCell(Text(element[0]['course_id']['course_name'].toString())),
DataCell(Text(element[0]['credits'].toString())),
DataCell(Text(element[0]['sem'].toString()))
]))
: true;
});
return list;
}

@override
Widget build(BuildContext context) {
List? finalData = widget.data?.final_registration_choices;
return Container(
child: Column(
children: [
SizedBox(height: 10),
Text("Final Choices Of Courses"),
if (finalData != null && finalData[0].length > 0)
SingleChildScrollView(
scrollDirection: Axis.vertical,
child: SingleChildScrollView(
scrollDirection: Axis.horizontal,
child: DataTable(columns: <DataColumn>[
DataColumn(
label: Text("Course ID"),
numeric: false,
),
DataColumn(
label: Text("Course Code"),
numeric: false,
),
DataColumn(
label: Text("Course Name"),
numeric: false,
),
DataColumn(
label: Text("Credits"),
numeric: false,
),
DataColumn(
label: Text("Semester"),
numeric: false,
)
], rows: getRows(finalData)),
),
),
if (finalData == null || finalData[0].length == 0)
Expanded(
child: Center(
child: Text(
'Final Registration Date is yet to come',
style: TextStyle(color: Colors.red, fontWeight: FontWeight.bold),
)))
],
));
}
}
// import 'package:flutter/material.dart';
//
// class FinalRegistration extends StatefulWidget {
// final data;
// const FinalRegistration({Key? key, this.data}) : super(key: key);
// @override
// _FinalRegistrationState createState() => _FinalRegistrationState();
// }
//
// class _FinalRegistrationState extends State<FinalRegistration> {
// getRows(List? map) {
// List<DataRow> list = [];
// map?.forEach((element) {
// element.length > 0
// ? list.add(DataRow(cells: [
// DataCell(Text(element[0]['course_id']['id'].toString())),
// DataCell(Text(element[0]['course_code'].toString())),
// DataCell(Text(element[0]['course_id']['course_name'].toString())),
// DataCell(Text(element[0]['credits'].toString())),
// DataCell(Text(element[0]['sem'].toString()))
// ]))
// : true;
// });
// return list;
// }
//
// @override
// Widget build(BuildContext context) {
// List? finalData = widget.data?.final_registration_choices;
// return Container(
// child: Column(
// children: [
// SizedBox(height: 10),
// Text("Final Choices Of Courses"),
// if (finalData[0].length > 0)
// SingleChildScrollView(
// scrollDirection: Axis.vertical,
// child: SingleChildScrollView(
// scrollDirection: Axis.horizontal,
// child: DataTable(columns: <DataColumn>[
// DataColumn(
// label: Text("Course ID"),
// numeric: false,
// ),
// DataColumn(
// label: Text("Course Code"),
// numeric: false,
// ),
// DataColumn(
// label: Text("Course Name"),
// numeric: false,
// ),
// DataColumn(
// label: Text("Credits"),
// numeric: false,
// ),
// DataColumn(
// label: Text("Semester"),
// numeric: false,
// )
// ], rows: getRows(finalData)),
// ),
// ),
// if (finalData[0].length == 0)
// Expanded(
// child: Center(
// child: Text(
// 'Final Registration Date is yet to come',
// style: TextStyle(color: Colors.red, fontWeight: FontWeight.bold),
// )))
// ],
// ));
// }
// }
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ class _RegistrationHomePageState extends State<RegistrationHomePage> {
children: [
Courses(data: data.currently_registered),
PreRegistration(),
FinalRegistration(data: data)
// FinalRegistration(data: data)
// FinalRegistration(data: data)
],
),
Expand Down
8 changes: 4 additions & 4 deletions lib/screens/Gymkhana/Record.dart
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,10 @@ class Srecord {
late String Category;

Srecord(
{this.Name: "default-name",
this.Rollno: "000000",
this.Club: "default-club",
this.Category: "default-category"});
{this.Name = "default-name",
this.Rollno = "000000",
this.Club = "default-club",
this.Category = "default-category"});
}

var Srecords = <Srecord>[
Expand Down
Loading

0 comments on commit 4bfaf31

Please sign in to comment.