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.

Sign up for GitHub

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

Jump to bottom

SA-3: Gymkhana #133

Open
wants to merge 3 commits into
base: test
Choose a base branch
from
Open

SA-3: Gymkhana #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5febbd5
Implement 3 screen of Admin and make changes in the profile of admin.…
Apr 8, 2023
c4cad89
added functionality
Apr 20, 2023
6c4929f
added api functionality and enchanced UI design
Apr 20, 2023
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
3 changes: 2 additions & 1 deletion android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:4.2.2'
// classpath 'com.android.tools.build:gradle:4.2.2'
classpath 'com.android.tools.build:gradle:7.1.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
Expand Down
63 changes: 63 additions & 0 deletions h.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
[
{
"status": "200",
"message": "Previous Scholarship and Awards Details",
"data": [
{
"application_id": 1,
"type": "Award",
"data": [
{
"Award_Name": "Name",
"Winner": "winner Name",
"Email": "[email protected]",
"Year": "2018",
"Phone Number": "984635378",
"Description": "This is Description"
}
]
},
{
"application_id": 2,
"type": "Scholarship",
"data": [
{
"Scholarship_Name": "Name",
"Winner": "winner name",
"Email": "[email protected]",
"Year": "2018",
"Phone Number": "984635378",
"Description": "This is Description"
}
]
}
]
},
{
"status": "200",
"message": "SPACS Applications",
"data": [
{
"application_id": 1,
"data": {
"Name": "Application Name",
"Applied Date": "2021-03-14",
"Status": "Pending"
}
},
{
"application_id": 2,
"data": {
"Name": "Application Name",
"Applied Date": "2020-08-12",
"Status": "Pending"
}
}
]
},
{
"status": "200",
"data": "Application added successfully"
}

]
11 changes: 11 additions & 0 deletions j.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
url(r'^$', views.spacs, name='spacs'),
url(r'^student_view/$', views.student_view, name='student_view'),
url(r'^convener_view/$', views.convener_view, name='convener_view'),
url(r'^staff_view/$', views.staff_view, name='staff_view'),
url(r'^stats/$', views.stats, name='stats'),
url(r'^convenerCatalogue/$', views.convenerCatalogue, name='convenerCatalogue'),
url(r'^getWinners/$', views.getWinners, name='getWinners'),
url(r'^get_MCM_Flag/$', views.get_MCM_Flag, name='get_MCM_Flag'),
url(r'^getConvocationFlag/$', views.getConvocationFlag, name='getConvocationFlag'),
url(r'^getContent/$', views.getContent, name='getContent'),
url(r'^updateEndDate/$', views.updateEndDate, name='updateEndDate'),
Binary file added lib.zip
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions lib/Components/appBar.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,4 @@ class DefaultAppBar {
);
}
}

Empty file added lib/Components/button.dart
View file
Open in desktop
Empty file.
29 changes: 20 additions & 9 deletions lib/Components/side_drawer.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,25 +122,36 @@ class _SideDrawerState extends State<SideDrawer> {
isActive: true,
),
ModulesPadding(
line: 'Gymkhana Module',
pageMover: '/gymkhana_homepage'),
line: 'Gymkhana Module',
pageMover: '/gymkhana_homepage',
isActive: true,),

ModulesPadding(
line: 'Establishment Module',
pageMover: '/establishment'),
pageMover: '/establishment',
isActive: true,),
ModulesPadding(
line: 'Library Module',
pageMover: '/library_homepage'),
ModulesPadding(line: 'Awards & Scholarship Module'),
pageMover: '/library_homepage',
isActive: true,),
ModulesPadding(
line: 'Complaint Module', pageMover: '/complaint'),
ModulesPadding(line: 'Central Mess Module'),
ModulesPadding(line: 'Feeds Module'),
line: 'Awards & Scholarship Module',
pageMover: '/scholarship_awards',
isActive: true,
),
ModulesPadding(
line: 'Complaint Module', pageMover: '/complaint',
isActive: true,),
ModulesPadding(line: 'Central Mess Module',
isActive: true,),
ModulesPadding(line: 'Feeds Module',
isActive: true,),
ModulesPadding(
line: 'Health Center Module',
pageMover: '/health_center',
),
ModulesPadding(line: 'Leave Module'),
ModulesPadding(line: 'Placement Module'),
ModulesPadding(line: 'Placement Module', isActive:true),
ModulesPadding(line: 'Visitors Hostel Module'),
ModulesPadding(line: 'File Tracking Module'),
],
Expand Down
7 changes: 5 additions & 2 deletions lib/api.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
//Server and local links
String klocalLink = "127.0.0.1:8000";
String kserverLink = "172.27.16.215:80";
String kserverLink = "172.27.16.214:80";

//Login Service
String kAuthUrl = "172.27.16.215:80";
String kAuthUrl = "172.27.16.214:80";
String kAuthLogin = "/api/auth/login/";

//Profile Service
Expand All @@ -29,6 +29,9 @@ const kGymkhanaMemberRecords = '/api/gymkhana/members_record';
//HealthCentre
String kHealthCentreStudent = "/healthcenter/api/student";

// Scholarship
String kAwardsCatalogue = "/spacs/api/awardcatalogue";

//------------Screens------------

//screens/Academic/Current_Semester
Expand Down
2 changes: 1 addition & 1 deletion lib/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,4 +131,4 @@ class MyApp extends StatelessWidget {
),
);
}
}
}
67 changes: 55 additions & 12 deletions lib/screens/Gymkhana/Apply.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ class _ApplyState extends State<Apply> with SingleTickerProviderStateMixin {

@override
Widget build(BuildContext context) {

//TODO : Create Drop Down For Club Selection, Automatic Form Filling
//final GymkhanaData data = ModalRoute.of(context)!.settings.arguments as GymkhanaData;

Expand Down Expand Up @@ -112,7 +111,8 @@ class _ApplyState extends State<Apply> with SingleTickerProviderStateMixin {
contentPadding:
EdgeInsets.fromLTRB(20.0, 10.0, 20.0, 10.0),
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(32.0),
borderRadius: BorderRadius.circular(0),
// borderRadius: BorderRadius.zero(32.0)
),
),
validator: formvalidate,
Expand All @@ -126,7 +126,7 @@ class _ApplyState extends State<Apply> with SingleTickerProviderStateMixin {
contentPadding:
EdgeInsets.fromLTRB(20.0, 10.0, 20.0, 10.0),
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(32.0),
borderRadius: BorderRadius.circular(0),
),
),
validator: formvalidate,
Expand All @@ -140,7 +140,7 @@ class _ApplyState extends State<Apply> with SingleTickerProviderStateMixin {
contentPadding:
EdgeInsets.fromLTRB(20.0, 10.0, 20.0, 10.0),
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(32.0),
borderRadius: BorderRadius.circular(0),
),
),
validator: formvalidate,
Expand All @@ -149,13 +149,14 @@ class _ApplyState extends State<Apply> with SingleTickerProviderStateMixin {
Padding(
padding: EdgeInsets.only(top: 20.0),
child: TextFormField(
maxLength: 3,
maxLength: 8,
maxLines: 5,
decoration: InputDecoration(
hintText: "Achievements",
contentPadding:
EdgeInsets.fromLTRB(20.0, 10.0, 20.0, 10.0),
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(32.0),
borderRadius: BorderRadius.circular(0),
),
),
validator: formvalidate,
Expand All @@ -173,6 +174,11 @@ class _ApplyState extends State<Apply> with SingleTickerProviderStateMixin {
),
),
style: ButtonStyle(
shape: MaterialStateProperty.all<
RoundedRectangleBorder>(
RoundedRectangleBorder(
borderRadius: BorderRadius.circular(18.0),
side: BorderSide(color: Colors.red))),
backgroundColor:
MaterialStateProperty.resolveWith<Color>(
(Set<MaterialState> states) {
Expand Down Expand Up @@ -241,7 +247,7 @@ class _ApplyState extends State<Apply> with SingleTickerProviderStateMixin {
contentPadding:
EdgeInsets.fromLTRB(20.0, 10.0, 20.0, 10.0),
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(32.0),
borderRadius: BorderRadius.circular(0),
),
),
validator: formvalidate,
Expand All @@ -255,7 +261,7 @@ class _ApplyState extends State<Apply> with SingleTickerProviderStateMixin {
contentPadding:
EdgeInsets.fromLTRB(20.0, 10.0, 20.0, 10.0),
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(32.0),
borderRadius: BorderRadius.circular(0),
),
),
validator: formvalidate,
Expand All @@ -269,7 +275,7 @@ class _ApplyState extends State<Apply> with SingleTickerProviderStateMixin {
contentPadding:
EdgeInsets.fromLTRB(20.0, 10.0, 20.0, 10.0),
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(32.0),
borderRadius: BorderRadius.circular(0),
),
),
validator: formvalidate,
Expand All @@ -283,7 +289,7 @@ class _ApplyState extends State<Apply> with SingleTickerProviderStateMixin {
contentPadding:
EdgeInsets.fromLTRB(20.0, 10.0, 20.0, 10.0),
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(32.0),
borderRadius: BorderRadius.circular(0),
),
),
validator: formvalidate,
Expand All @@ -297,21 +303,53 @@ class _ApplyState extends State<Apply> with SingleTickerProviderStateMixin {
contentPadding:
EdgeInsets.fromLTRB(20.0, 10.0, 20.0, 10.0),
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(32.0),
borderRadius: BorderRadius.circular(0),
),
),
validator: formvalidate,
),
),
Padding(
padding: EdgeInsets.all(25.0),
child: ElevatedButton(
onPressed: validate,
child: Padding(
padding: const EdgeInsets.all(8.0),
child: Text(
"Choose File",
style: TextStyle(fontSize: 14.0),
),
),
style: ButtonStyle(
padding: MaterialStateProperty.all<EdgeInsets>(
EdgeInsets.all(4)),
shape: MaterialStateProperty.all<
RoundedRectangleBorder>(
RoundedRectangleBorder(
borderRadius: BorderRadius.circular(18.0),
side: BorderSide(color: Colors.red))),
backgroundColor:
MaterialStateProperty.resolveWith<Color>(
(Set<MaterialState> states) {
if (states.contains(MaterialState.pressed))
return Colors.deepOrange;
return Colors
.deepOrangeAccent; // Use the component's default.
},
),
),
),
),
Padding(
padding: EdgeInsets.only(top: 20.0),
child: TextFormField(
maxLines: 5,
decoration: InputDecoration(
hintText: "Detail and Description",
contentPadding:
EdgeInsets.fromLTRB(20.0, 10.0, 20.0, 10.0),
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(32.0),
borderRadius: BorderRadius.circular(0),
),
),
validator: formvalidate,
Expand All @@ -329,6 +367,11 @@ class _ApplyState extends State<Apply> with SingleTickerProviderStateMixin {
),
),
style: ButtonStyle(
shape: MaterialStateProperty.all<
RoundedRectangleBorder>(
RoundedRectangleBorder(
borderRadius: BorderRadius.circular(18.0),
side: BorderSide(color: Colors.red))),
backgroundColor:
MaterialStateProperty.resolveWith<Color>(
(Set<MaterialState> states) {
Expand Down
5 changes: 5 additions & 0 deletions lib/screens/Gymkhana/Club.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ class _ClubState extends State<Club> {
border: Border(top: BorderSide(color: Colors.grey, width: 0.5))),
child: TabBarView(
children: <Widget>[

clubDetails(data.clubDetails),
//DropDownDemo(),
//Center(child: Text("Working on...."),),
Expand All @@ -76,7 +77,9 @@ class _ClubState extends State<Club> {
}

Widget clubEvents(data) {

TableRow header = TableRow(children: [

Center(
child: Text("\nClub\n",
style: TextStyle(
Expand Down Expand Up @@ -149,6 +152,7 @@ class _ClubState extends State<Club> {
}

Widget clubDetails(data) {

TableRow header = TableRow(children: [
Center(
child: Text("\nClub\n",
Expand Down Expand Up @@ -246,6 +250,7 @@ class _ClubState extends State<Club> {
return Container(
color: Colors.white,
padding: EdgeInsets.symmetric(vertical: 15, horizontal: 5),

child: Table(
border: TableBorder.all(color: Colors.black),
children: [
Expand Down
Loading