Merge branch 'master' of https://github.com/Narosen/FusionIIIT

Author: sirisha-rambha

FusionIIIT/Fusion/settings.py

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

FusionIIIT/Fusion/urls.py

@@ -39,7 +39,6 @@
     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)

FusionIIIT/applications/academic_information/forms.py

@@ -0,0 +1,7 @@
+from django import forms
+from .models import Meeting
+
+class MinuteForm(forms.ModelForm):
+    class Meta:
+        model = Meeting
+        fields = ('date', 'minutes_file', )

FusionIIIT/applications/academic_information/models.py

@@ -39,6 +39,8 @@ class Constants:
 
 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)
@@ -62,22 +64,16 @@ class Meta:
         unique_together = ('course_id', 'course_name', 'sem')
 
     def __str__(self):
-        return self.course_name
+        return str(self.id)
 
 
 class Meeting(models.Model):
     date = models.DateField()
-    time = models.CharField(max_length=20)
-    agenda = models.FileField()
-    minutes_file = models.FileField(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()
@@ -116,14 +112,17 @@ 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):

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

@@ -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");
+        }
+    });
+};
+    
+    
+       

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

@@ -8,18 +8,18 @@ $(document).ready(function() {
 function create_member() {
     $.ajax({
         type : "POST", // http method
-        url : "senate/", // the endpoint
+        url : "senator/", // the endpoint
         dataType: 'json',
         data : {
             'rollno' : $('#rollno').val()
         },
         // data sent with the post request
         // handle a successful response
         success : function(data) {
-            alert("success");
+            alert("New Senator Added");
         },
         error : function(data) {
-            alert("fail");
+            alert("Something went wrong");
         }
     });
 };

FusionIIIT/applications/academic_information/urls.py

@@ -5,9 +5,17 @@
 
 urlpatterns = [
     url(r'^$', views.homepage, name='homepage'),
+<<<<<<< HEAD
     url(r'^senate/$', views.senate, name='senate'),
     url(r'^delete/$', views.delete, name='delete'),
     url(r'^edit_convenor/$', views.edit_convenor, name='edit_convenor'),
     url(r'^delete1/$', views.delete1, name='delete1'),
     url(r'^delete2/$', views.delete2, name='delete2'),
+=======
+    url(r'^senator/$', views.senator, name='senator'),
+    url(r'^minutes/$', views.minutes, name='minutes'),
+    url(r'^delete/$', views.delete, name='delete'),
+  url(r'^attendance',views.add_attendance,name="add_attendance"),
+    url(r'^get_attendance',views.get_attendance,name="get_attendance")
+>>>>>>> 912a11178daaef08de17299f53b8a62bbc63b12b
 ]

FusionIIIT/applications/academic_information/views.py

@@ -1,16 +1,17 @@
-# from django.shortcuts import render
-
 from django.shortcuts import render
-from .models import Student
+from .models import Student, Meeting, Student_attendance,Course,Student
 from applications.globals.models import ExtraInfo, Designation, DepartmentInfo
 from django.http import HttpResponse
 from django.db.models.query import QuerySet
 from django.views.decorators.csrf import csrf_exempt
+from django.contrib import messages
 from django.http import JsonResponse
+from .forms import MinuteForm
 import json
 
 
 def homepage(request):
+    form = MinuteForm()
     try:
         s = Designation.objects.get(name = 'senate')
         v = Designation.objects.get(name = 'Convenor')
@@ -19,20 +20,37 @@ def homepage(request):
         Convenor = ExtraInfo.objects.filter(designation = v)
         CoConvenor = ExtraInfo.objects.filter(designation = t)
         students = Student.objects.filter(id__in = senates)
-        
+        meetings = Meeting.objects.all()
     except:
         senates = ""
         students = ""
+<<<<<<< HEAD
         Convenor = ""
         CoConvenor = ""
+=======
+        meetings = ""
+>>>>>>> 912a11178daaef08de17299f53b8a62bbc63b12b
         pass
 
     context = {
          'senates':senates,
          'students':students,
+<<<<<<< HEAD
          'Convenor':Convenor,
          'CoConvenor':CoConvenor,
     }    
+=======
+         'meetings' : meetings,
+         'form': form,
+    } 
+    if request.method == 'POST':
+        form = MinuteForm(request.POST, request.FILES)
+        if form.is_valid():
+            form.save()
+            return HttpResponse('sucess')            
+        else:
+            return HttpResponse('not uploaded')   
+>>>>>>> 912a11178daaef08de17299f53b8a62bbc63b12b
     return render(request, "ais/ais.html", context)
 
 def delete(request):
@@ -42,11 +60,11 @@ def delete(request):
    return HttpResponse("Deleted")
 
 @csrf_exempt
-def senate(request):    
+def senator(request):    
     if request.method == 'POST':
         rollno = request.POST.get('rollno')
-        s = Designation.objects.get(name = 'senate')
         extraInfo = ExtraInfo.objects.get(id = rollno)
+        s = Designation.objects.get(name = 'senate')
         extraInfo.designation.add(s)
         extraInfo.save()
         student = Student.objects.get(id = extraInfo)
@@ -61,6 +79,7 @@ def senate(request):
         data = {}
         return JsonResponse(data)
 
+<<<<<<< HEAD
 def edit_convenor(request):
     s = Designation.objects.get(name = 'Convenor')
     p = Designation.objects.get(name = 'Co Convenor')
@@ -87,3 +106,93 @@ def delete2(request):
    student.designation.remove(s)
    return HttpResponse("Deleted")
 
+=======
+def add_attendance(request):
+    if request.method == 'POST':
+        student_attend = Student_attendance()
+        s_id = request.POST.get('student_id')
+        c_id = request.POST.get('course_id')
+        print(s_id)
+        print(c_id)
+        context={}
+        try:
+           student_attend.student_id = Student.objects.get(id_id=s_id)
+        except:
+            error_mess = "Student Data Not Found"
+            context['result']='Failure'
+            context['message']=error_mess
+            messages.error(request, error_mess)
+            return HttpResponse(json.dumps(context), content_type='add_attendance/json')
+
+
+        try:
+            student_attend.course_id = Course.objects.get(course_id=c_id)
+        except:
+            error_mess = "Course Data Not Found"
+            context['result'] = 'Failure'
+            context['message'] = error_mess
+            messages.error(request, error_mess)
+            return HttpResponse(json.dumps(context), content_type='add_attendance/json')
+
+    # print('student_id ',student_attend.student_id)
+
+
+        student_attend.present_attend = request.POST.get('present_attend')
+        student_attend.total_attend = request.POST.get('total_attend')
+
+        if student_attend.present_attend > student_attend.total_attend :
+            error_mess = "Present attendance should not be greater than Total attendance"
+            context['result'] = 'Failure'
+            context['message'] = error_mess
+            return HttpResponse(json.dumps(context), content_type='add_attendance/json')
+
+
+        success_mess = "Your Data has been successfully added"
+        messages.success(request, success_mess)
+        student_attend.save()
+        context['result'] = 'Success'
+        context['message'] = success_mess
+        messages.error(request, success_mess)
+        return HttpResponse(json.dumps(context), content_type='add_attendance/json')
+
+
+def get_attendance(request):
+    course_id=request.GET.get('course_id')
+    print(course_id)
+    c_id=Course.objects.get(course_id=course_id)
+    # data=Student_attendance.objects.filter(course_id_id=c_id).values_list('student_id_id','course_id_id')
+    data = Student_attendance.objects.filter(course_id_id=c_id).values_list('course_id_id','student_id_id','present_attend','total_attend')
+    stud_data={}
+    stud_data['name']=[]
+    stud_data['programme']=[]
+    stud_data['batch']=[]
+    for obj in data:
+        roll = data[0][1]
+        extra_info = ExtraInfo.objects.get(id=roll)
+        s_id = Student.objects.get(id=extra_info)
+
+        s_name=s_id.name
+        s_programme=s_id.programme
+        s_batch=s_id.batch
+        print(s_name)
+        print(s_programme)
+        stud_data['name'].append(s_name)
+        stud_data['programme'].append(s_programme)
+        stud_data['batch'].append(s_batch)
+
+    print(stud_data)
+    context={}
+    try:
+        context['result'] = 'Success'
+        context['tuples'] = list(data)
+        context['stud_data']=stud_data
+
+    except:
+        context['result'] = 'Failure'
+
+
+    print(data[0][1])
+    print(stud_data['name'][0])
+    print(context)
+    return HttpResponse(json.dumps(context),content_type='get_attendance/json')
+>>>>>>> 912a11178daaef08de17299f53b8a62bbc63b12b