Skip to content
This repository was archived by the owner on Jul 18, 2019. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
e821ff2
settings
anuraagheisenberg Oct 10, 2017
e2ca474
Merge branch 'master' of https://github.com/achintMI/FusionIIIT
anuraagheisenberg Oct 10, 2017
b8821d7
updated models
achintMI Oct 16, 2017
5030a7e
models updated
achintMI Oct 16, 2017
8b38d09
Update views.py
achintMI Oct 16, 2017
4556dd2
pulled all the updated data from upstream
achintMI Oct 17, 2017
76f5bbf
pulled all the data from upstream
achintMI Oct 17, 2017
a4a626b
some minor changes made
achintMI Oct 23, 2017
9972485
Merge branch 'master' of https://github.com/3Peers/FusionIIIT
achintMI Oct 23, 2017
cf3133e
changes in add courses
achintMI Oct 23, 2017
94167da
updated
anuraagheisenberg Oct 24, 2017
fab0554
Updates
anuraagheisenberg Oct 24, 2017
0a6b994
Merge branch 'master' of https://github.com/achintMI/FusionIIIT
anuraagheisenberg Oct 24, 2017
c8456fc
pre-registration and registration completed
achintMI Oct 24, 2017
f3b247f
errors rectified for flake8
achintMI Oct 24, 2017
b9553b4
changes
achintMI Oct 26, 2017
e17e1ca
my final submission
achintMI Oct 27, 2017
cc452f4
conflicts changes
achintMI Oct 27, 2017
08133e6
updated code
achintMI Oct 27, 2017
b6f2a10
conflicts resolved
achintMI Oct 28, 2017
3530abc
Verify Grades Added
anuraagheisenberg Oct 28, 2017
9702534
all features added
anuraagheisenberg Oct 28, 2017
71b7eb7
ajax added
achintMI Oct 31, 2017
c879a6f
Merge pull request #7 from anuraagheisenberg/master
achintMI Oct 31, 2017
a0553df
minor changes in password field
achintMI Oct 31, 2017
121251d
Course fetching error resolved
achintMI Oct 31, 2017
c6b36ca
Update views.py
achintMI Oct 31, 2017
5826928
Update urls.py
achintMI Oct 31, 2017
5ca6228
drop course, student list ajax added
anuraagheisenberg Oct 31, 2017
1839ba6
erged with ajax added in some features
anuraagheisenberg Oct 31, 2017
558e4da
ajax added in dome features
anuraagheisenberg Oct 31, 2017
9a32dd8
ajax added in some features and minor corrections
anuraagheisenberg Oct 31, 2017
f1c6fe7
git ignore added
achintMI Nov 2, 2017
f2ef6ec
Course template modified
achintMI Nov 2, 2017
0f05231
changes added
achintMI Nov 2, 2017
0351b9f
minor changes
achintMI Nov 2, 2017
bfa12bb
minor changes modified
achintMI Nov 4, 2017
84d8d2c
thesis added
achintMI Nov 4, 2017
ff1ee59
PG added
anuraagheisenberg Nov 4, 2017
020017e
Al done flake done
anuraagheisenberg Nov 5, 2017
5d5d932
ALL BUGS FIXED
anuraagheisenberg Nov 8, 2017
795be7c
Merged with Academic Information
anuraagheisenberg Nov 8, 2017
e37d7f5
flake isort done
anuraagheisenberg Nov 9, 2017
851e7a9
Merge pull request #8 from anuraagheisenberg/master
achintMI Nov 9, 2017
04f460e
Update views.py
achintMI Nov 9, 2017
3cc9fb2
Update views.py
achintMI Nov 9, 2017
d4179e8
Update urls.py
achintMI Nov 9, 2017
95a47fc
Update views.py
achintMI Nov 9, 2017
60dd2d6
Update views.py
achintMI Nov 9, 2017
c94d9e4
updated bracnch_change
achintMI Jan 25, 2018
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
14 changes: 7 additions & 7 deletions FusionIIIT/Fusion/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,24 +92,24 @@
'django.contrib.messages',
'django.contrib.staticfiles',
'django.contrib.sites',
'applications.academic_procedures.apps.AcademicProceduresConfig',
'allauth.account',
'allauth.socialaccount',
'allauth',
'allauth.socialaccount.providers.google',
'applications.globals.apps.GlobalsConfig',
'applications.academic_information.apps.AcademicInformationConfig',
'applications.academic_procedures.apps.AcademicProceduresConfig',
'applications.central_mess.apps.CentralMessConfig',
'applications.complaint_system.apps.ComplaintSystemConfig',
'applications.file_tracking.apps.FileTrackingConfig',
'applications.finance_accounts.apps.FinanceAccountsConfig',
'applications.globals.apps.GlobalsConfig',
'applications.health_center.apps.HealthCenterConfig',
'applications.leave.apps.LeaveConfig',
'applications.online_cms.apps.OnlineCmsConfig',
'applications.placement_cell.apps.PlacementCellConfig',
'applications.scholarships.apps.ScholarshipsConfig',
'applications.visitor_hostel.apps.VisitorHostelConfig',
'applications.eis.apps.EisConfig',
'allauth.account',
'allauth.socialaccount',
'allauth',
'allauth.socialaccount.providers.google',
]

MIDDLEWARE = [
Expand Down Expand Up @@ -152,7 +152,7 @@
'ENGINE': 'django.db.backends.mysql',
'NAME': 'fusion',
'USER': 'root',
'PASSWORD': '',
'PASSWORD': '1',
'HOST': '127.0.0.1',
'PORT': '3306',
},
Expand Down
1 change: 1 addition & 0 deletions FusionIIIT/Fusion/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
url(r'^logout/', auth_views.logout, name='logout'),
url(r'^academic-procedures/', include('applications.academic_procedures.urls',
namespace='procedures')),
url(r'^aims/', include('applications.academic_information.urls')),

]
if settings.DEBUG:
Expand Down
9 changes: 9 additions & 0 deletions FusionIIIT/applications/academic_information/forms.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
from django import forms

from .models import Meeting


class MinuteForm(forms.ModelForm):
class Meta:
model = Meeting
fields = ('date', 'minutes_file', )
28 changes: 23 additions & 5 deletions FusionIIIT/applications/academic_information/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,19 @@ class Constants:
('OBC', 'Other Backward Classes')
)

MTechSpecialization = (
('Power and Control', 'Power and Control'),
('Microwave and Communication Engineering', 'Microwave and Communication Engineering'),
('Micro-nano Electronics', 'Micro-nano Electronics'),
('CAD/CAM', 'CAD/CAM'),
('Design', 'Design'),
('Manufacturing', 'Manufacturing'),
('CSE', 'CSE'),
('Mechatronics', 'Mechatronics'),
('MDes', 'MDes'),
('None', 'None')
)


class Student(models.Model):
id = models.OneToOneField(ExtraInfo, on_delete=models.CASCADE, primary_key=True)
Expand All @@ -39,6 +52,8 @@ class Student(models.Model):
mother_name = models.CharField(max_length=40, default='')
hall_no = models.IntegerField(default=1)
room_no = models.CharField(max_length=10, blank=True, null=True)
specialization = models.CharField(max_length=20,
choices=Constants.MTechSpecialization, null=True)

def __str__(self):
return str(self.id)
Expand All @@ -49,6 +64,7 @@ class Course(models.Model):
course_name = models.CharField(max_length=100)
sem = models.IntegerField()
credits = models.IntegerField()
optional = models.BooleanField(default=False)

class Meta:
db_table = 'Course'
Expand Down Expand Up @@ -109,14 +125,16 @@ class Meta:
class Student_attendance(models.Model):
student_id = models.ForeignKey(Student)
course_id = models.ForeignKey(Course)
attend = models.CharField(max_length=6, choices=Constants.ATTEND_CHOICES)
date = models.DateField()
# attend = models.CharField(max_length=6, choices=Constants.ATTEND_CHOICES)
date = models.DateField(auto_now=True)
present_attend = models.IntegerField(default=0)
total_attend = models.IntegerField(default=0)

class Meta:
db_table = 'Student_attendance'

def __self__(self):
return self.date
return self.course_id


class Instructor(models.Model):
Expand Down Expand Up @@ -146,15 +164,15 @@ def __self__(self):

class Timetable(models.Model):
upload_date = models.DateTimeField(auto_now_add=True)
time_table = models.CharField(max_length=20)
time_table = models.FileField(upload_to='documents/%Y/%m/%d')

@Samy-33 Samy-33 Nov 10, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@3Peers/academic-information-management, Look at this ==> #90

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Samy-33 it's correct I copied their models


class Meta:
db_table = 'Timetable'


class Exam_timetable(models.Model):
upload_date = models.DateField(auto_now_add=True)
exam_time_table = models.CharField(max_length=20)
exam_time_table = models.FileField(upload_to='documents/%Y/%m/%d')

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@3Peers/academic-information-management, Look at this ==> #90


class Meta:
db_table = 'Exam_Timetable'
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
// Submit post on submit
$(document).ready(function() {
$('#minutes').on('submit', function(event){
create_member();
});
});

function create_member() {
$.ajax({
type : "POST", // http method
url : "minutes/", // the endpoint
dataType: 'json',
data : {
'date' : $('#date').val(),
'minute' : $('#minute').val(),
},
// data sent with the post request
// handle a successful response
success : function(data) {
alert("Your file is uploaded");
},
error : function(data) {
alert("Cannot be uploaded");
}
});
};



Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
// Submit post on submit
$(document).ready(function() {
$('#senate-member').on('submit', function(event){
create_member();
});
});

function create_member() {
$.ajax({
type : "POST", // http method
url : "senator/", // the endpoint
dataType: 'json',
data : {
'rollno' : $('#rollno').val()
},
// data sent with the post request
// handle a successful response
success : function(data) {
alert("Data Entered");
},
error : function(data) {
alert("Data Entered");
}
});
};



27 changes: 27 additions & 0 deletions FusionIIIT/applications/academic_information/urls.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
from django.conf.urls import url

from . import views

app_name = 'academic_information'

urlpatterns = [
url(r'^$', views.homepage, name='homepage'),
url(r'^senator/$', views.senator, name='senator'),
url(r'^deleteSenator/$', views.deleteSenator, name='deleteSenator'),
url(r'^add_convenor/$', views.add_convenor, name='add_convenor'),
url(r'^delete1/$', views.delete1, name='delete1'),
url(r'^delete2/$', views.delete2, name='delete2'),
url(r'^deleteMinute/$', views.deleteMinute, name='deleteMinute'),
url(r'^attendance', views.add_attendance, name="add_attendance"),
url(r'^get_attendance', views.get_attendance, name="get_attendance"),
url(r'^add_basic_profile/$', views.add_basic_profile, name='add_basic_profile'),
url(r'^add_advanced_profile', views.add_advanced_profile, name='add_advanced_profile'),
url(r'^add_grade', views.add_grade, name='add_grade'),
url(r'^add_course', views.add_course, name='add_course'),
url(r'^delete_advanced_profile', views.delete_advanced_profile, name="delete_advanced_profile"),
url(r'^delete_basic_profile', views.delete_basic_profile, name="delete_basic_profile"),
url(r'^delete_grade', views.delete_grade, name="delete_grade"),
url(r'^add_exam_timetable', views.add_exam_timetable, name="add_exam_timetable"),
url(r'^add_timetable', views.add_timetable, name="add_timetable"),
url(r'^delete_timetable', views.delete_timetable, name='delete_timetable'),
]
Loading