Corrected view all questions

ARFA/ARFA_app/migrations/0001_initial.py

 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.16 on 2018-11-27 03:10
+# Generated by Django 1.11.16 on 2018-11-27 03:40
 from __future__ import unicode_literals
 
 import django.core.validators

ARFA/ARFA_app/static/ARFA_app/QuestionImages/.gitignore

+
+
+*.jpg
+*.png
+*.jpeg
\ No newline at end of file

ARFA/ARFA_app/templates/ARFA_app/create_Test.html

@@ -49,6 +49,19 @@
     function dispNumQuestions() {
         $('#num_questions').html(num_questions);
     }
+
+    function getDiff()
+    {
+        var listItem = document.getElementsByClassName("bigclass");
+        var diffle = document.getElementById("di").value ; 
+
+        for (var i=0; i < listItem.length; i++) {
+            listItem[i].style.display = "" ;
+           if (listItem[i].id != diffle && diffle != "")
+           listItem[i].style.display = "None" ;
+        } 
+        
+    }
 </script>
 {%endblock%}
 
@@ -69,16 +82,22 @@ Create Test
     
         <!-- <ul> -->
         <div>
-            <div style="float:right ; margin-right: 30px  ">
+            <div style="float:right ; margin-right: 35px  ">
                 
  Total Marks : <p id='total_marks' style="float:right;"></p>
             </div>
             <br/> <br/> 
-            <div style="float:right ;margin-right: 30px ">
+            <div style="float:right ;margin-right: 35px ">
                 Number of Questions : <p id='num_questions' style="float:right;"></p>
             </div>
+            <br/> <br/>            
+            <div style="float:right ;margin-right: 30px ">
+            <input id="di" placeholder="Set difficulty" type="text" style="float:left;">
+             <button onclick="getDiff()" style="background-color:rgb(71, 118, 219); color: ">Filter </button>
             </div>
     </div>
+    </div>
+        
         <form method="POST" action="create_Test">
             {% csrf_token %}
             {{ TestForm.as_p }}
@@ -86,14 +105,15 @@ Create Test
             {{TestForm.non_field_errors}}
             {%for question in questions%}
             
-            <li class="list-group-item">
-                <div class="row toggle" style="margin-left:10%">
+            <li class="list-group-item bigclass" id={{question.difficulty_set}}>
+                <div class="row toggle" style="margin-left:10%" >
                     <div class="col-xs-10">
                             <input type="checkbox" value= "True" name = "{{question.q_id}}" 
                             id = "{{question.q_id}}" onclick="handleCheckBoxClick(this)"
                             posMarksID="{{question.q_id}}pos_marks">
                             <!-- link to posmarks in checkbox -->
                             {{question.question_text}} </br>
+                            <p style="float:right;"><b>Difficulty: </b> {{question.difficulty_set}}</p>
                             {%if question.ip%}
                             {%load static%}
                             <div align="center">

ARFA/ARFA_app/templates/ARFA_app/create_question.html

@@ -111,7 +111,7 @@ function prevTab(elem) {
         question_data['subject_ID'] = subject.value ;
         question_data['question_text'] =  qtext ;  
         question_data['difficulty_set'] = document.getElementById('diff').value;
-        question_data['visibilility'] = document.getElementById('visible').value ; 
+        question_data['visibility'] = document.getElementById('visible').value ; 
         console.log(question_data) ; 
     	document.getElementById('l2').click() ; 
     }

ARFA/ARFA_app/templates/ARFA_app/view_personal_question.html

@@ -10,7 +10,6 @@ p {
 }
 </style>
 <h2 align="center">  View personal questions here </h2>
-<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" >

ARFA/ARFA_app/utilities.py

@@ -114,7 +114,7 @@ def getOptions(question):   #returns queryset
 def get_all_questions(request):
     args={'username':request.session['username']}
     cursor = connection.cursor()
-    cursor.execute(''' SELECT s.subject,q."q_ID" as q_ID,q.question_text,q.topic,q.subtopic,q.source,
+    cursor.execute(''' SELECT q."q_ID" as q_ID,s.subject,q.question_text,q.topic,q.subtopic,q.source,
         q.difficulty_set,q.visibility,q.ownership,q.image as ip , q."imageDesc" as imdesc,
         o."option_Value" as option_details,
         o."is_Answer" 

ARFA/ARFA_app/views.py

@@ -394,7 +394,7 @@ def view_personal_question(request):
     args={'username':request.session['username'], 'is_session':True}
     cursor = connection.cursor()
     cursor.execute(''' SELECT q."q_ID" as q_ID,s.subject,q.question_text,q.topic,q.subtopic,q.source,
-        q.difficulty_set,q.visibility,q.ownership,q.image as ip , q."imageDesc" as imdesc,
+        q.difficulty_set,q.visibility,q.image as ip , q."imageDesc" as imdesc,
         o."option_Value" as option_details, 
         o."is_Answer" 
         FROM ("ARFA_app_question" as u LEFT OUTER JOIN "ARFA_app_questionimage" as v ON
@@ -573,11 +573,8 @@ def add_question(request):
             
 
             args['faculty'] = models.Faculty.objects.filter(username=request.session['username']).get()
-            print args['faculty']
             options = question_data['options_details']
-            print options
             args['subject_ID'] = models.Subject.objects.filter(subject_ID = args['subject_ID']).get()
-            print args['subject_ID']
             flag = False
             for i in range(0,len(options)):
                 if options[str(i)]['option_Value']:
@@ -585,9 +582,7 @@ def add_question(request):
                     break
             if not(flag):
                 return HttpResponse(json.dumps({'status':'Failed','reason':'No correct option provided'}))
-            print args
             question = models.Question(**args)
-            print question
             question.save()
             print "saved"
             for i in range(0,len(options)):
@@ -606,8 +601,8 @@ def view_personal_Test(request):
         return render(request,'ARFA_app/not_a_faculty.html',request.session.get('args',None))
 
     cursor = connection.cursor()
-    cursor.execute(''' SELECT t."test_ID" as test_ID,t.test_name,t.visibility_student,
-        t.ownership,t.expected_time_for_completion as duration,t.start_time,t.max_marks
+    cursor.execute(''' SELECT t."test_ID" as test_ID,t.test_name,
+        t.expected_time_for_completion as duration,t.start_time,t.max_marks
         FROM "ARFA_app_created_by" as c,
         "ARFA_app_test" as t
         WHERE c."test_ID_id" = t."test_ID" and  c.faculty_id = %s
@@ -629,10 +624,10 @@ def view_all_Test(request):
         return render(request,'ARFA_app/not_a_faculty.html',request.session.get('args',None))
 
     cursor = connection.cursor()
-    cursor.execute(''' SELECT t."test_ID" as test_ID,t.test_name,t.visibility_student,
-        t.ownership,t.expected_time_for_completion,t.start_time,t.max_marks
+    cursor.execute(''' SELECT t."test_ID" as test_ID,t.test_name,
+    t.expected_time_for_completion,t.start_time,t.max_marks
         FROM "ARFA_app_test" as t
-        WHERE t.ownership = 'public' or t.start_time < current_timestamp
+        WHERE t.start_time < current_timestamp
         order by t.start_time desc ''')
     rows = cursor.fetchall()
     print rows