Merge branch 'master' into master

Author: Narosen Longkumer

.vscode/launch.json

@@ -0,0 +1,205 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Python",
+            "type": "python",
+            "request": "launch",
+            "stopOnEntry": true,
+            "pythonPath": "${config:python.pythonPath}",
+            "program": "${file}",
+            "cwd": "${workspaceRoot}",
+            "env": {},
+            "envFile": "${workspaceRoot}/.env",
+            "debugOptions": [
+                "WaitOnAbnormalExit",
+                "WaitOnNormalExit",
+                "RedirectOutput"
+            ]
+        },
+        {
+            "name": "PySpark",
+            "type": "python",
+            "request": "launch",
+            "stopOnEntry": true,
+            "osx": {
+                "pythonPath": "${env:SPARK_HOME}/bin/spark-submit"
+            },
+            "windows": {
+                "pythonPath": "${env:SPARK_HOME}/bin/spark-submit.cmd"
+            },
+            "linux": {
+                "pythonPath": "${env:SPARK_HOME}/bin/spark-submit"
+            },
+            "program": "${file}",
+            "cwd": "${workspaceRoot}",
+            "env": {},
+            "envFile": "${workspaceRoot}/.env",
+            "debugOptions": [
+                "WaitOnAbnormalExit",
+                "WaitOnNormalExit",
+                "RedirectOutput"
+            ]
+        },
+        {
+            "name": "Python Module",
+            "type": "python",
+            "request": "launch",
+            "stopOnEntry": true,
+            "pythonPath": "${config:python.pythonPath}",
+            "module": "module.name",
+            "cwd": "${workspaceRoot}",
+            "env": {},
+            "envFile": "${workspaceRoot}/.env",
+            "debugOptions": [
+                "WaitOnAbnormalExit",
+                "WaitOnNormalExit",
+                "RedirectOutput"
+            ]
+        },
+        {
+            "name": "Integrated Terminal/Console",
+            "type": "python",
+            "request": "launch",
+            "stopOnEntry": true,
+            "pythonPath": "${config:python.pythonPath}",
+            "program": "${file}",
+            "cwd": "",
+            "console": "integratedTerminal",
+            "env": {},
+            "envFile": "${workspaceRoot}/.env",
+            "debugOptions": [
+                "WaitOnAbnormalExit",
+                "WaitOnNormalExit"
+            ]
+        },
+        {
+            "name": "External Terminal/Console",
+            "type": "python",
+            "request": "launch",
+            "stopOnEntry": true,
+            "pythonPath": "${config:python.pythonPath}",
+            "program": "${file}",
+            "cwd": "",
+            "console": "externalTerminal",
+            "env": {},
+            "envFile": "${workspaceRoot}/.env",
+            "debugOptions": [
+                "WaitOnAbnormalExit",
+                "WaitOnNormalExit"
+            ]
+        },
+        {
+            "name": "Django",
+            "type": "python",
+            "request": "launch",
+            "stopOnEntry": true,
+            "pythonPath": "${config:python.pythonPath}",
+            "program": "${workspaceRoot}/manage.py",
+            "cwd": "${workspaceRoot}",
+            "args": [
+                "runserver",
+                "--noreload",
+                "--nothreading"
+            ],
+            "env": {},
+            "envFile": "${workspaceRoot}/.env",
+            "debugOptions": [
+                "WaitOnAbnormalExit",
+                "WaitOnNormalExit",
+                "RedirectOutput",
+                "DjangoDebugging"
+            ]
+        },
+        {
+            "name": "Flask",
+            "type": "python",
+            "request": "launch",
+            "stopOnEntry": false,
+            "pythonPath": "${config:python.pythonPath}",
+            "program": "fully qualified path fo 'flask' executable. Generally located along with python interpreter",
+            "cwd": "${workspaceRoot}",
+            "env": {
+                "FLASK_APP": "${workspaceRoot}/quickstart/app.py"
+            },
+            "args": [
+                "run",
+                "--no-debugger",
+                "--no-reload"
+            ],
+            "envFile": "${workspaceRoot}/.env",
+            "debugOptions": [
+                "WaitOnAbnormalExit",
+                "WaitOnNormalExit",
+                "RedirectOutput"
+            ]
+        },
+        {
+            "name": "Flask (old)",
+            "type": "python",
+            "request": "launch",
+            "stopOnEntry": false,
+            "pythonPath": "${config:python.pythonPath}",
+            "program": "${workspaceRoot}/run.py",
+            "cwd": "${workspaceRoot}",
+            "args": [],
+            "env": {},
+            "envFile": "${workspaceRoot}/.env",
+            "debugOptions": [
+                "WaitOnAbnormalExit",
+                "WaitOnNormalExit",
+                "RedirectOutput"
+            ]
+        },
+        {
+            "name": "Pyramid",
+            "type": "python",
+            "request": "launch",
+            "stopOnEntry": true,
+            "pythonPath": "${config:python.pythonPath}",
+            "cwd": "${workspaceRoot}",
+            "env": {},
+            "envFile": "${workspaceRoot}/.env",
+            "args": [
+                "${workspaceRoot}/development.ini"
+            ],
+            "debugOptions": [
+                "WaitOnAbnormalExit",
+                "WaitOnNormalExit",
+                "RedirectOutput",
+                "Pyramid"
+            ]
+        },
+        {
+            "name": "Watson",
+            "type": "python",
+            "request": "launch",
+            "stopOnEntry": true,
+            "pythonPath": "${config:python.pythonPath}",
+            "program": "${workspaceRoot}/console.py",
+            "cwd": "${workspaceRoot}",
+            "args": [
+                "dev",
+                "runserver",
+                "--noreload=True"
+            ],
+            "env": {},
+            "envFile": "${workspaceRoot}/.env",
+            "debugOptions": [
+                "WaitOnAbnormalExit",
+                "WaitOnNormalExit",
+                "RedirectOutput"
+            ]
+        },
+        {
+            "name": "Attach (Remote Debug)",
+            "type": "python",
+            "request": "attach",
+            "localRoot": "${workspaceRoot}",
+            "remoteRoot": "${workspaceRoot}",
+            "port": 3000,
+            "secret": "my_secret",
+            "host": "localhost"
+        }
+    ]
+}

FusionIIIT/Fusion/settings.py

@@ -152,7 +152,7 @@
             'ENGINE': 'django.db.backends.mysql',
             'NAME': 'fusion',
             'USER': 'root',
-            'PASSWORD': '',
+            'PASSWORD': 'root',
             'HOST': '127.0.0.1',
             'PORT': '3306',
         },

FusionIIIT/Fusion/urls.py

@@ -38,8 +38,8 @@
     url(r'^logout/', auth_views.logout, name='logout'),
     url(r'^academic-procedures/', include('applications.academic_procedures.urls',
                                           namespace='procedures')),
-    url(r'^academic-information-system/', include('applications.academic_information.urls')),
-
+    url(r'^aims/', include('applications.academic_information.urls')),
 ]
+
 if settings.DEBUG:
     urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

FusionIIIT/applications/academic_information/models.py

@@ -46,7 +46,6 @@ 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)
-    category = models.CharField(max_length=10, choices=Constants.CATEGORY),
 
     def __str__(self):
         return str(self.id)
@@ -67,12 +66,12 @@ def __str__(self):
 
 
 class Meeting(models.Model):
-    venue = models.CharField(max_length=50)
     date = models.DateField()
     time = models.CharField(max_length=20)
     agenda = models.FileField()
     minutes_file = models.FileField(max_length=40)
 
+
     class Meta:
         db_table = 'Meeting'
 

FusionIIIT/applications/academic_information/static/academic_information/scripts/senate_members.js

@@ -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 : "senate/", // the endpoint
+        dataType: 'json',
+        data : {
+            'rollno' : $('#rollno').val()
+        },
+        // data sent with the post request
+        // handle a successful response
+        success : function(data) {
+            alert("success");
+        },
+        error : function(data) {
+            alert("fail");
+        }
+    });
+};
+    
+    
+       

FusionIIIT/applications/academic_information/urls.py

@@ -1,9 +1,11 @@
 from django.conf.urls import url
-
 from . import views 
 
+app_name = 'academic_information'
+
 urlpatterns = [
     url(r'^$', views.homepage, name='homepage'),
+    url(r'^senate/$', views.senate, name='senate'),
     url(r'^input/$', views.test, name='input'),
     url(r'^delete/$', views.delete, name='delete'),
-]
+]

FusionIIIT/applications/academic_information/views.py

@@ -3,38 +3,52 @@
 from django.shortcuts import render
 from .models import Student
 from applications.globals.models import ExtraInfo, Designation, DepartmentInfo
-from django.template.defaulttags import csrf_token
 from django.http import HttpResponse
+from django.db.models.query import QuerySet
+from django.views.decorators.csrf import csrf_exempt
+from django.http import JsonResponse
+import json
 
 
 def homepage(request):
-
-    s = Designation.objects.get(name = 'senate')
     try:
+        s = Designation.objects.get(name = 'senate')
         senates = ExtraInfo.objects.filter(designation = s)
+        students = Student.objects.filter(id__in = senates)
+        
     except:
         senates = ""
+        students = ""
         pass
 
     context = {
          'senates':senates,
-    }
-    
+         'students':students,
+    }    
     return render(request, "ais/ais.html", context)
 
-def test(request):
-    s = Designation.objects.get(name = 'senate')
-    if request.method == 'POST':
-        extraInfo = ExtraInfo.objects.get(id = request.POST['Roll Number'])
-        extraInfo.designation.add(s)
-        extraInfo.save()
-    return HttpResponse("Data Inputed")
-
-
 def delete(request):
    s = Designation.objects.get(name = "senate")
    student = ExtraInfo.objects.get(id = request.POST["delete"])
    student.designation.remove(s)
    return HttpResponse("Deleted")
 
-
+@csrf_exempt
+def senate(request):    
+    if request.method == 'POST':
+        rollno = request.POST.get('rollno')
+        s = Designation.objects.get(name = 'senate')
+        extraInfo = ExtraInfo.objects.get(id = rollno)
+        extraInfo.designation.add(s)
+        extraInfo.save()
+        student = Student.objects.get(id = extraInfo)
+        data = {
+            'name' : extraInfo.user.username,
+            'rollno' : extraInfo.id,
+            'programme' : student.programme,
+            'branch' : extraInfo.department.name
+        }
+        return JsonResponse(data)
+    else:        
+        data = {}
+        return JsonResponse(data)