personal tests & some changes in create tests

ARFA/ARFA_app/forms.py

@@ -19,12 +19,17 @@ from datetimepicker.widgets import DateTimePicker
 
 VISIBILITY_CHOICES= ('1980', '1981', '1982')
 
-class TestForm(forms.ModelForm):
-    # start_time = forms.DateTimeField(widget=DateTimePicker(), initial=datetime.datetime.now())
-    start_time = forms.DateTimeField(widget=DateTimeInput, initial=datetime.datetime.now())
-    expected_time_for_completion = forms.TimeField(widget=TimeInput,initial=datetime.datetime.now())
-
-    class Meta:
-        model = Test
-        exclude = ['test_ID', 'ownership']
-		
+# class TestForm(forms.ModelForm):
+#     # start_time = forms.DateTimeField(widget=DateTimePicker(), initial=datetime.datetime.now())
+#     start_time = forms.DateTimeField(widget=DateTimeInput, initial=datetime.datetime.now())
+#     expected_time_for_completion = forms.TimeField(widget=TimeInput,initial=datetime.datetime.now())
+
+#     class Meta:
+#         model = Test
+#         exclude = ['test_ID', 'ownership']
+
\ No newline at end of file
+
+class TestForm(forms.ModelForm): 	
+	class Meta:
+		model = Test 		
+		exclude = ['test_ID', 'ownsership']
\ No newline at end of file

ARFA/ARFA_app/templates/ARFA_app/create_Test.html

@@ -57,8 +57,8 @@ Create Test
                             {%endfor%}
 
                             <label>  marks 
-                            <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">
+                            <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">
                             </label>
                             
                           </ul>

ARFA/ARFA_app/templates/ARFA_app/view_personal_Test.html

@@ -16,7 +16,7 @@ View personal Question
 <div class="container">
 	<div class="panel-default">
         <div class="panel-heading">
-            <h3 class="panel-title">LIST OF QUESTIONS</h3>
+            <h3 class="panel-title">LIST OF TESTS</h3>
         </div>   
         <ul class="list-group">
         <!-- <ul> -->

ARFA/ARFA_app/views.py

@@ -311,15 +311,10 @@ def create_Test(request):
 
     res = utilities.get_all_questions(request)
     test = None
-<<<<<<< HEAD
-    TestForm = forms.TestForm()
-    args={'username':request.session['username'],'questions':res, 'TestForm':TestForm}
-    args.update(request.session.get('args',None))
-=======
+
     form = forms.TestForm()
     args={'username':request.session['username'],'questions':res, 'TestForm':TestForm,
     'is_session':True}
->>>>>>> 8d3997dd058602c30fc1a3457cea76834f0106cc
     if request.method == "GET":
         return render(request,'ARFA_app/create_Test.html',args)
     if request.method == "POST":
@@ -331,8 +326,9 @@ def create_Test(request):
         
         if form.is_valid():
             test = form.save()
+            creator = models.Created_BY(test_ID=test,faculty=models.Faculty.objects.filter(username=request.session['username']).get())
+            creator.save()
         else:
-            print form
             if form.errors:
                 for field in form   :
                     print field.errors
@@ -340,7 +336,7 @@ def create_Test(request):
 
         
         for attr in dir(Test):
-            print attr
+            # print attr
             try:
                 data.pop(attr)
             except KeyError as e:
@@ -356,14 +352,14 @@ def create_Test(request):
             if len(data[q]) != 3:
                 continue
             try:
-            	if q[0] != 'i':
-            		continue ; 
+            	# 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:
@@ -371,7 +367,7 @@ def create_Test(request):
                 continue
 
         # for q in data:
-
+        # return HttpResponse("Test Created")
     return view_personal_Test(request)
         
 
@@ -433,8 +429,11 @@ def view_personal_Test(request):
         WHERE c."test_ID_id" = t."test_ID" and  c.faculty_id = %s
         order by t.start_time desc ''',[request.session['username']])
     rows = cursor.fetchall()
+    print rows
     columns = [col[0] for col in cursor.description]
-    res = dict(zip(columns[:-1], rows))
+    res = []
+    for val in rows:
+        res.append(dict(zip(columns,val)))
     args={'username':request.session['username'],'tests':res}
     return render(request,'ARFA_app/view_personal_Test.html',args)