This repository was archived by the owner on Jul 18, 2019. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 63
Academic_procedures #92
Open
achintMI
wants to merge
50
commits into
Velle-log:master
Choose a base branch
from
achintMI:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
50 commits
Select commit
Hold shift + click to select a range
e821ff2
settings
anuraagheisenberg e2ca474
Merge branch 'master' of https://github.com/achintMI/FusionIIIT
anuraagheisenberg b8821d7
updated models
achintMI 5030a7e
models updated
achintMI 8b38d09
Update views.py
achintMI 4556dd2
pulled all the updated data from upstream
achintMI 76f5bbf
pulled all the data from upstream
achintMI a4a626b
some minor changes made
achintMI 9972485
Merge branch 'master' of https://github.com/3Peers/FusionIIIT
achintMI cf3133e
changes in add courses
achintMI 94167da
updated
anuraagheisenberg fab0554
Updates
anuraagheisenberg 0a6b994
Merge branch 'master' of https://github.com/achintMI/FusionIIIT
anuraagheisenberg c8456fc
pre-registration and registration completed
achintMI f3b247f
errors rectified for flake8
achintMI b9553b4
changes
achintMI e17e1ca
my final submission
achintMI cc452f4
conflicts changes
achintMI 08133e6
updated code
achintMI b6f2a10
conflicts resolved
achintMI 3530abc
Verify Grades Added
anuraagheisenberg 9702534
all features added
anuraagheisenberg 71b7eb7
ajax added
achintMI c879a6f
Merge pull request #7 from anuraagheisenberg/master
achintMI a0553df
minor changes in password field
achintMI 121251d
Course fetching error resolved
achintMI c6b36ca
Update views.py
achintMI 5826928
Update urls.py
achintMI 5ca6228
drop course, student list ajax added
anuraagheisenberg 1839ba6
erged with ajax added in some features
anuraagheisenberg 558e4da
ajax added in dome features
anuraagheisenberg 9a32dd8
ajax added in some features and minor corrections
anuraagheisenberg f1c6fe7
git ignore added
achintMI f2ef6ec
Course template modified
achintMI 0f05231
changes added
achintMI 0351b9f
minor changes
achintMI bfa12bb
minor changes modified
achintMI 84d8d2c
thesis added
achintMI ff1ee59
PG added
anuraagheisenberg 020017e
Al done flake done
anuraagheisenberg 5d5d932
ALL BUGS FIXED
anuraagheisenberg 795be7c
Merged with Academic Information
anuraagheisenberg e37d7f5
flake isort done
anuraagheisenberg 851e7a9
Merge pull request #8 from anuraagheisenberg/master
achintMI 04f460e
Update views.py
achintMI 3cc9fb2
Update views.py
achintMI d4179e8
Update urls.py
achintMI 95a47fc
Update views.py
achintMI 60dd2d6
Update views.py
achintMI c94d9e4
updated bracnch_change
achintMI File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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', ) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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) | ||
|
|
@@ -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) | ||
|
|
@@ -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' | ||
|
|
@@ -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): | ||
|
|
@@ -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') | ||
|
|
||
| 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') | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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' | ||
29 changes: 29 additions & 0 deletions
29
FusionIIIT/applications/academic_information/static/academic_information/scripts/minutes.js
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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"); | ||
| } | ||
| }); | ||
| }; | ||
|
|
||
|
|
||
|
|
28 changes: 28 additions & 0 deletions
28
...T/applications/academic_information/static/academic_information/scripts/senate_members.js
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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"); | ||
| } | ||
| }); | ||
| }; | ||
|
|
||
|
|
||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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'), | ||
| ] |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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