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

Updates on academic_service.dart file and screens for Academic module as provided in master file (AC-2) #126

Open
wants to merge 9 commits into
base: test
Choose a base branch
from
145 changes: 79 additions & 66 deletions lib/screens/Academic/Add_Drop_Courses/add_drop_courses.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,77 +9,90 @@ class AddDropCourses extends StatefulWidget {
class _AddDropCoursesState extends State<AddDropCourses> {
@override
Widget build(BuildContext context) {
return DefaultTabController(
length: 2,
child: Scaffold(
appBar: AppBar(
backgroundColor: Colors.black,
title: Text(
"FUSION",
style: TextStyle(color: Colors.white),
return Scaffold(
appBar: AppBar(
backgroundColor: Colors.deepOrangeAccent,
title: Text(
"Add/Drop Courses",
style: TextStyle(color: Colors.white),
),
actions: <Widget>[
Padding(
padding: EdgeInsets.all(8.0),
child: Icon(Icons.search),
),
actions: <Widget>[
Padding(
padding: EdgeInsets.all(8.0),
child: Icon(Icons.search),
),
Padding(
padding: EdgeInsets.all(8.0),
child: Icon(Icons.notifications),
),
Padding(
padding: EdgeInsets.all(8.0),
child: Icon(Icons.more_vert),
),
],
bottom: TabBar(
isScrollable: true,
indicatorColor: Colors.white,
indicatorWeight: 6.0,
tabs: [
Tab(
child: Container(
child: Text(
'Add Course',
),
),
),
Tab(
child: Container(
child: Text(
'Drop Course',
),
),
),
],
Padding(
padding: EdgeInsets.all(8.0),
child: Icon(Icons.notifications),
),
),
drawer: SideDrawer(),
body: Column(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
mainAxisSize: MainAxisSize.min,
children: [
Flexible(
child: TabBarView(
children: [
Center(
child: Text(
"Add Course(s)\nYou have to wait for the date",
textAlign: TextAlign.center,
Padding(
padding: EdgeInsets.all(8.0),
child: Icon(Icons.more_vert),
),
],
), // Appbar
drawer: SideDrawer(),
body: Container(
child: ListView(
shrinkWrap: true,
physics: ClampingScrollPhysics(),
children: <Widget>[
DefaultTabController(
length: 2, // length of tabs
initialIndex: 0,
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: <Widget>[
Container(
child: TabBar(
labelColor: Colors.deepOrangeAccent,
unselectedLabelColor: Colors.black,
indicatorColor: Colors.black,
tabs: [
Tab(
child: Container(
child: Text(
'Add Course',
),
),
),
Tab(
child: Container(
child: Text(
'Drop Course',
),
),
),
],
),
),
),
Center(
child: Text(
"Drop Course(s)\nYou have to wait for the date",
textAlign: TextAlign.center,
Container(
height: 400, //height of TabBarView
decoration: BoxDecoration(
border: Border(
top: BorderSide(color: Colors.grey, width: 0.5))),
child: TabBarView(
children: [
Center(
child: Text(
"Add Course(s)\nYou have to wait for the date",
textAlign: TextAlign.center,
),
),
Center(
child: Text(
"Drop Course(s)\nYou have to wait for the date",
textAlign: TextAlign.center,
),
),
],
),
),
),
],
Center(child: Text('Current Credits : 0')),
],
),
),
),
Center(child: Text('Current Credits : 0')),
],
),
]),
),
);
}
Expand Down
139 changes: 86 additions & 53 deletions lib/screens/Academic/Check_Dues/dues.dart
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class _DuesState extends State<Dues> {
length: 5,
child: Scaffold(
appBar: AppBar(
backgroundColor: Colors.black,
backgroundColor: Colors.deepOrangeAccent,
title: Text(
"Check Dues",
style: TextStyle(color: Colors.white),
Expand All @@ -43,59 +43,92 @@ class _DuesState extends State<Dues> {
child: Icon(Icons.more_vert),
),
],
//TabBar for a horizontal scrollable tob bar
bottom: TabBar(
isScrollable: true,
indicatorColor: Colors.white,
indicatorWeight: 6.0,
tabs: [
Tab(
child: Container(
child: Text(
'Mess Due History',
),
),
),
Tab(
child: Container(
child: Text(
'Library Due History',
),
),
),
Tab(
child: Container(
child: Text(
'Hostel Due History',
),
),
),
Tab(
child: Container(
child: Text(
'Placement Cell due history',
),
),
),
Tab(
child: Container(
child: Text(
'Overall',
),
),
),
],
),
),
//TabBarView contains all the children to be called when tapped.
body: TabBarView(
children: [
MessDues(),
LibraryDues(),
HostelDues(),
PlaccementDues(),
OverallDues()
],

body: Container(
child: ListView(
shrinkWrap: true,
physics: ClampingScrollPhysics(),
children: <Widget>[
DefaultTabController(
length: 5, // length of tabs
initialIndex: 0,
child: Column(children: <Widget>[
Container(
child: TabBar(
labelColor: Colors.deepOrangeAccent,
unselectedLabelColor: Colors.black,
isScrollable: true,
indicatorColor: Colors.black,
indicatorWeight: 6.0,
tabs: [
Tab(
child: Container(
child: Text(
'Mess Due History',
),
),
),
Tab(
child: Container(
child: Text(
'Library Due History',
),
),
),
Tab(
child: Container(
child: Text(
'Hostel Due History',
),
),
),
Tab(
child: Container(
child: Text(
'Placement Cell due history',
),
),
),
Tab(
child: Container(
child: Text(
'Overall',
),
),
),
],
),
),
Container(
height: 400, //height of TabBarView
decoration: BoxDecoration(
border: Border(
top: BorderSide(color: Colors.grey, width: 0.5))),
//TabBarView contains all the children to be called when tapped.
child: TabBarView(
children: [
Container(
child: MessDues(),
),
Container(
child: LibraryDues(),
),
Container(
child: HostelDues(),
),
Container(
child: PlaccementDues(),
),
Container(
child: OverallDues(),
),
],
),
),
]),
),
]),
),
),
);
Expand Down
Loading