minor corrections

ARFA/ARFA_app/static/ARFA_app/lib/bootstrap-3.3.7-dist/js/npm.js

+// This file is autogenerated via the `commonjs` Grunt task. You can require() this file in a CommonJS environment.
+require('../../js/transition.js')
+require('../../js/alert.js')
+require('../../js/button.js')
+require('../../js/carousel.js')
+require('../../js/collapse.js')
+require('../../js/dropdown.js')
+require('../../js/modal.js')
+require('../../js/tooltip.js')
+require('../../js/popover.js')
+require('../../js/scrollspy.js')
+require('../../js/tab.js')
+require('../../js/affix.js')
\ No newline at end of file

ARFA/ARFA_app/templates/ARFA_app/create_Test.html

@@ -18,8 +18,7 @@ Create Test
         </div>   
         <ul class="list-group">
         <!-- <ul> -->
-        <!-- <form method="POST" action="create_Test"> -->
-            <form action="" method="POST">
+        <form method="POST" action="create_Test">
             {% csrf_token %}
             {{ TestForm }}
             {{TestForm.errors}}
@@ -27,9 +26,10 @@ Create Test
             {%for question in questions%}
             <li class="list-group-item">
             <!-- <li> -->
+                 <input type="checkbox" value= "True" name = "{{question.q_id}}" >
                 <div class="row toggle">
                     <div class="col-xs-10">
-                            <input type="checkbox" value= "True" name = "{{question.q_id}}" >
+                           
                             {{question.question_text}} {{question.q_id}} </br>
                     </div>
                 </div>
@@ -45,8 +45,8 @@ Create Test
                             {%endfor%}
 
                             <label>  marks 
-                            <input type="number" name="{{question.q_id}}" min="0" max="10" placeholder="4" step="0.25" value="4">
-                            <input type="number" name="{{question.q_id}}" min="-10" max="0" placeholder="-1" step="0.25" value="0">
+                            <input type="number" name="{{question.q_id}}1" min="0" max="10" placeholder="4" step="0.25" value="4">
+                            <input type="number" name="{{question.q_id}}2" min="-10" max="0" placeholder="-1" step="0.25" value="0">
                             </label>
                             
                           </ul>

ARFA/ARFA_app/templates/ARFA_app/faculty_home.html

@@ -233,7 +233,7 @@ profile
 
 </p>
 
-<!-- <button type="button" class="btn btn-login float-right">Load Test</button> -->
+ <button type="button" class="btn btn-login float-right">Load Test</button> -->
 <h2>
  -->
 

ARFA/ARFA_app/templates/ARFA_app/student_test_page.html

+{%extends 'base2.html'%}
+
+{%block head%}
+
+<script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/MathJax.js?config=TeX-MML-AM_CHTML">
+  MathJax.Hub.Config({tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}});
+</script>
+{%endblock%}
+{%block title%}
+View personal Question
+{%endblock%}
+{%block body%}
+<h1> You CAN VIEW all your tests HERE student {{username}}</h1>
+<link rel="stylesheet" href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.min.css">
+
+<div class="container">
+	<div class="panel-default">
+        <div class="panel-heading">
+            <h3 class="panel-title">LIST OF QUESTIONS</h3>
+        </div>   
+        <ul class="list-group">
+        <!-- <ul> -->
+            {%for question in questions%}
+            <li class="list-group-item">
+            <!-- <li> -->
+                <div class="row toggle">
+                    <div class="col-xs-10">
+                        {{question.question_text}}
+                    </div>
+                </div>
+                <div>
+                    <hr></hr>
+                    <!-- <div class="container"> -->
+                        <!-- <div class="fluid-row"> -->
+                          <ul>
+                            {%for option in question.option_details%}
+                            <!-- <div class="col-xs-1"> -->
+                             <li>   {{option.is_answer}}
+                            <!-- </div> -->
+                            <!-- <div class="col-xs-5"> -->
+                                {{option.option_text}}
+                            <!-- </div> -->
+                            </li>
+                            {%endfor%}
+                          </ul>
+                        <!-- </div> -->
+                    <!-- </div> -->
+                </div>
+            </li>
+            {%endfor%}
+        </ul>
+	</div>
+</div> 
+
+{%endblock%}
\ No newline at end of file

ARFA/ARFA_app/templates/base.html

@@ -3,9 +3,13 @@
   <html>
     <head>
         <!-- Latest compiled and minified CSS -->
-        <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
-        <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
-  		<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
+        {% load static %}
+        <link rel="stylesheet" href="{% static 'ARFA_app/lib/bootstrap-3.3.7-dist/css/bootstrap.min.css' %}" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
+        <!-- <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous"> -->
+        <script src="{% static 'ARFA_app/lib/jquery/jquery-3.3.1.min.js' %}"></script>
+        <!-- <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script> -->
+        <script src="{% static 'ARFA_app/lib/bootstrap-3.3.7-dist/js/bootstrap.min.js' %}"></script>
+        <!-- <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script> -->
   		<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
   		<link href="https://fonts.googleapis.com/css?family=Architects+Daughter|Bellefair|Inconsolata|Indie+Flower|Lemonada|Lobster|Noto+Sans|Oswald|Plaster" rel="stylesheet">
         <title>

ARFA/ARFA_app/urls.py

@@ -18,6 +18,7 @@ urlpatterns=[
     url(r'^success_mantra',views.success_mantra),
     url(r'^timetable',views.timetable),
     url(r'^students',views.students),
+    url(r'^view_my_test',views.students),
     url(r'^faculty',views.faculty),
     url(r'^ContactUs',views.ContactUs),
     url(r'^send_mess',views.send_mess),

ARFA/ARFA_app/views.py

@@ -27,7 +27,6 @@ def login(request):
     print("session currently is "+str(request.session.get('session',None)))
         
     if(request.session.get('session',None)==True):
-        print(request.session['session'])
         return redirect('/arfa/profile')
     return render(request,'ARFA_app/login.html')   
 
@@ -46,31 +45,16 @@ def reg(request):
     if(request.method=="POST"):
         role=request.POST['role']
         data={'username': request.POST['username'], 'name':request.POST['name'],'email_ID': request.POST['email_ID'],'address':request.POST['email_ID'],'password':request.POST['password'],'phone_number':request.POST['phone_number']}
-        # data = dict(request.POST.copy()) #copy to make QueryDict mutable. HttpResponse is immutable
-        # data.pop('csrfmiddlewaretoken')
-        # data.pop('role')
-        # data.pop('repassword')
-        # data['phone_number']=str(data['phone_number'])
-        # data.pop('phone_number')
-        # data={'name':request.POST['name']}
-        # print(data)
-        # data = list(map(lambda x: x, data))
-        # print(data)
-            
+        
         if(role=="Student"):
             s=models.Student(**data)
             s.save()
-            # print "me"
         else:
             data['salary']=0
-            # print (request.POST['subject_ID'])
             data['subject_ID']=models.Subject.objects.filter(subject_ID=request.POST['subject_ID']).get()
             s=models.Faculty(**data)
-            # print(s)
             s.save()
         
-        # args={'phone_number':requestphone_number}
-        # print (request.POST)
         return redirect('/arfa/register')
     else:        
         return redirect('/arfa')   
@@ -78,7 +62,6 @@ def reg(request):
 
 def students(request):
     students=models.Student.objects.all().values()
-    print students
     args={'students':students}
     args2=request.session.get('args',None)
     if args2!=None:
@@ -87,7 +70,6 @@ def students(request):
 
 def faculty(request):
     faculty=models.Faculty.objects.all().values()
-    print faculty
     args={'facultys':faculty}
     args2=request.session.get('args',None)
     if args2!=None:
@@ -106,6 +88,7 @@ def send_mess(request):
         args={'name':name,'phone_number':phone_number,'email_ID':email_ID,'text':message}
         Info=models.ContactUs(**args)
         Info.save()
+        args.update(request.session.get('args',None))
         return render(request,'ARFA_app/Success.html',args)
     else:
         return redirect('/arfa/ContactUs')   
@@ -124,7 +107,6 @@ def profile(request):
             if(not(authenticated["status"])):
                 return redirect('/arfa/',authenticated)
             else:
-                # return redirect(request,'ARFA_app/home.html',args)   
                 request.session['username'] = args['user']
                 request.session['session'] = True
                 request.session.get('role',None)
@@ -162,7 +144,6 @@ def check_auth(args):
 
 def logout(request):
     request.session['session']=False
-    # print(request.session.get('username',None))
     request.session.flush()
     return render(request,'ARFA_app/logout.html')
 
@@ -212,25 +193,14 @@ def testHome(request):
 
     # return HttpResponse(json)
     json['questions'] = questionsJSON
-    print json
     return render(request, 'ARFA_app/home.html', {'data':json})
 
 def result(request):
     if request.method == 'POST':
-        print request.POST
-        print request.session
         data = dict(request.POST.copy()) #copy to make QueryDict mutable. HttpResponse is immutable
         data.pop('csrfmiddlewaretoken')
-        print data
         responseObj = Responses()
-
-        # responseData = {'Student_ID':request.session['username']}
-        # responseData['test_ID'] = data.pop('testID')
-        print request.session['username']
         responseObj.student_ID = Student.objects.get(username=request.session['username'])
-        # print responseObj.student_ID
-        # print data['testID']
-        # print data.pop('testID')[0]
         try:
             responseObj.test_ID = Test.objects.get(test_ID=int(data.pop('testID')[0]))    
         except Test.DoesNotExist as e:
@@ -287,7 +257,6 @@ def view_personal_question(request):
         WHERE  q.faculty_id = %s and s."subject_ID" = q."subject_ID_id" and q."q_ID" = o."q_ID_id"
         order by s.subject,q_ID ''',[args['username']])
     rows = cursor.fetchall()
-    # print(len(rows))
     columns = [col[0] for col in cursor.description]
     res=[]
     options_so_far = []
@@ -343,9 +312,9 @@ def create_Test(request):
     res = utilities.get_all_questions(request)
     test = None
     form = forms.TestForm()
-    args={'username':request.session['username'],'questions':res, 'TestForm':TestForm}
+    args={'username':request.session['username'],'questions':res, 'TestForm':TestForm,
+    'is_session':True}
     if request.method == "GET":
-        print res
         return render(request,'ARFA_app/create_Test.html',args)
     if request.method == "POST":
         form = TestForm(request.POST)
@@ -381,11 +350,14 @@ def create_Test(request):
             if len(data[q]) != 3:
                 continue
             try:
+            	if q[0] != 'i':
+            		continue ; 
                 int(q)
                 containsObj.q_ID_id = q
+                print q
                 #data[q] is an array ['True', 'pos_marks', 'neg_marks']
-                containsObj.marks_pos = data[q][1]
-                containsObj.marks_neg = data[q][2]
+                containsObj.marks_pos = data[q + "1"]
+                containsObj.marks_neg = data[q + "2"]
                 containsObj.pk = None
                 containsObj.save()
             except ValueError as e: