Skip to content
This repository has been archived by the owner on Jul 18, 2019. It is now read-only.

Academic information module so far #84

Open
wants to merge 66 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 51 commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
1e943d2
Update models.py
sirisha-rambha Oct 16, 2017
250a603
Merge pull request #1 from sirisha-rambha/sirisha-rambha-patch-1
sirisha-rambha Oct 16, 2017
b02a8e4
Merge pull request #4 from 3Peers/master
Oct 23, 2017
542af57
Merge pull request #5 from 3Peers/master
Oct 26, 2017
fc3bb10
Merge pull request #2 from 3Peers/master
sirisha-rambha Oct 26, 2017
2ffa927
Merge pull request #6 from 3Peers/master
Oct 26, 2017
1e2718b
urls added
narolkr Oct 26, 2017
d8d08ec
Senate view so far
narolkr Oct 28, 2017
0f7f19f
Merge pull request #3 from Narosen/master
sirisha-rambha Oct 28, 2017
3f8d66d
resolved conflicts
Viv3kshukla Oct 28, 2017
53c1b29
Merge pull request #4 from 3Peers/master
sirisha-rambha Oct 31, 2017
6e9412e
updated views for attendance
Viv3kshukla Oct 31, 2017
7440683
updated ajaxified attendance
Viv3kshukla Oct 31, 2017
9bdb57f
attendance data post using ajax
Viv3kshukla Oct 31, 2017
4841b71
updated ais.html
Viv3kshukla Oct 31, 2017
2298a92
updated attendance
Viv3kshukla Nov 1, 2017
0f26533
removed minor errors
Viv3kshukla Nov 1, 2017
f43367c
added batch in models
Viv3kshukla Nov 3, 2017
1ef1cbd
updated models and views
Viv3kshukla Nov 3, 2017
fd3d330
Merge pull request #7 from 3Peers/master
Nov 3, 2017
e85cbbb
senate update
narolkr Nov 3, 2017
4985e30
Merge remote-tracking branch 'upstream/master'
Viv3kshukla Nov 3, 2017
4975afb
Merge pull request #5 from 3Peers/master
sirisha-rambha Nov 3, 2017
023aebb
Update urls.py
sirisha-rambha Nov 3, 2017
0945c52
Update models.py
sirisha-rambha Nov 3, 2017
af70d8e
Update views.py
sirisha-rambha Nov 3, 2017
23be440
Update senate.html
sirisha-rambha Nov 3, 2017
cc97ddf
Merge branch 'master' into master
Nov 3, 2017
d1be293
Merge branch 'master' into master
Nov 3, 2017
8a51072
Merge pull request #8 from sirisha-rambha/master
Nov 3, 2017
9be0523
student profile + time table
MehtaDevang Nov 4, 2017
912a111
Revert "student profile + time table"
MehtaDevang Nov 4, 2017
25337ea
Senate Update
narolkr Nov 4, 2017
f47dca9
Merge branch 'master' into master
Viv3kshukla Nov 4, 2017
d9d7e14
Merge branch 'master' into master
Viv3kshukla Nov 4, 2017
db75fbd
Merge pull request #9 from Viv3kshukla/master
Viv3kshukla Nov 4, 2017
b3c6a72
Update urls.py
sirisha-rambha Nov 4, 2017
dfb63c0
update
sirisha-rambha Nov 4, 2017
2d9adc9
Merge branch 'master' of https://github.com/Narosen/FusionIIIT
sirisha-rambha Nov 4, 2017
08a201d
update
sirisha-rambha Nov 4, 2017
42bfee4
update
sirisha-rambha Nov 4, 2017
d3da153
Merge branch 'master' into master
Nov 4, 2017
6271f52
Merge branch 'master' into master
Nov 4, 2017
c8df939
Merge pull request #10 from sirisha-rambha/master
Nov 4, 2017
cc90772
Update
narolkr Nov 4, 2017
2af6c43
Merge remote-tracking branch 'origin/master'
narolkr Nov 4, 2017
d4bb7be
minor changes
narolkr Nov 4, 2017
cb0f493
minor changes
narolkr Nov 4, 2017
f6e277b
Devang's code (Time table & Student profile) and some fixes
narolkr Nov 4, 2017
865461b
isort and flake8
narolkr Nov 7, 2017
a92c8ca
updating gitignore
narolkr Nov 7, 2017
00036ae
ajax implimentation for adding data
narolkr Nov 9, 2017
d22ce23
modified
Viv3kshukla Nov 9, 2017
310c147
senate update
narolkr Nov 10, 2017
9337269
merged attendance branches
Viv3kshukla Nov 10, 2017
24d1b9b
added action buttons
Viv3kshukla Nov 10, 2017
ce5460f
added delete attendance
Viv3kshukla Nov 10, 2017
9f66631
minor changes
narolkr Nov 10, 2017
762ba60
modified delete attendance
Viv3kshukla Nov 10, 2017
4459189
added comments
Viv3kshukla Nov 10, 2017
979e833
Merge pull request #11 from Viv3kshukla/master
Viv3kshukla Nov 11, 2017
a1216ce
updates
narolkr Nov 11, 2017
e4e66e4
updates
narolkr Nov 11, 2017
cc04e60
Merge remote-tracking branch 'origin/master'
narolkr Nov 11, 2017
c8cced7
update
narolkr Nov 11, 2017
391dcc1
changes the view.py according to HoldDestination
narolkr Feb 15, 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
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,10 @@ docs/_templates

# media
FusionIIIT/media

#ignoring settings.py
FusionIIIT/Fusion/settings.py

FusionIIIT/Fusion/settings.py
#ignoring misc
.vscode/
FusionIIIT/.vscode/
8 changes: 7 additions & 1 deletion FusionIIIT/Fusion/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -135,11 +135,17 @@
'django.template.context_processors.request',
'django.contrib.auth.context_processors.auth',
'django.contrib.messages.context_processors.messages',
'django.template.context_processors.media',
],
},
},
]

FILE_UPLOAD_HANDLERS = [
'django.core.files.uploadhandler.MemoryFileUploadHandler',
'django.core.files.uploadhandler.TemporaryFileUploadHandler',
]

WSGI_APPLICATION = 'Fusion.wsgi.application'


Expand All @@ -152,7 +158,7 @@
'ENGINE': 'django.db.backends.mysql',
'NAME': 'fusion',
'USER': 'root',
'PASSWORD': '',
'PASSWORD': 'root',
'HOST': '127.0.0.1',
'PORT': '3306',
},
Expand Down
3 changes: 1 addition & 2 deletions FusionIIIT/Fusion/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
1. Import the include() function: from django.conf.urls import url, include
2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls'))
"""

from django.conf import settings
from django.conf.urls import include, url
from django.conf.urls.static import static
Expand All @@ -38,7 +37,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:
urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
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', )
52 changes: 26 additions & 26 deletions FusionIIIT/applications/academic_information/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,47 +30,45 @@ class Constants:
)


class Course(models.Model):
course_id = models.CharField(max_length=100, unique=True)
course_name = models.CharField(max_length=100)
sem = models.IntegerField()
credits = models.IntegerField()


class Meta:
db_table = 'Course'
unique_together = ('course_id', 'course_name', 'sem')

def __str__(self):
return self.course_id


class Student(models.Model):
id = models.OneToOneField(ExtraInfo, on_delete=models.CASCADE, primary_key=True)
name = models.CharField(max_length=50, default='')
batch = models.CharField(max_length=10, default='2015')
programme = models.CharField(max_length=10, choices=Constants.PROGRAMME)
cpi = models.FloatField(default=0)
category = models.CharField(max_length=10, choices=Constants.CATEGORY, null=False)
father_name = models.CharField(max_length=40, default='')
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)
courses = models.ManyToManyField(Course)

def __str__(self):
return str(self.id)


class Course(models.Model):
course_id = models.CharField(max_length=100, unique=True)
course_name = models.CharField(max_length=100)
sem = models.IntegerField()
credits = models.IntegerField()

class Meta:
db_table = 'Course'
unique_together = ('course_id', 'course_name', 'sem')

def __str__(self):
return self.course_name


class Meeting(models.Model):
venue = models.CharField(max_length=50)
date = models.DateField()
time = models.CharField(max_length=20)
agenda = models.TextField()
minutes_file = models.CharField(max_length=40)
minutes_file = models.FileField(upload_to='documents/')

class Meta:
db_table = 'Meeting'

def __str__(self):
return self.date


class Calendar(models.Model):
from_date = models.DateField()
Expand Down Expand Up @@ -109,14 +107,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 +146,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')

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')

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