Remove field to select question paper type #52

Jayashrri · 2019-09-28T17:17:29Z

This fixes issue #36

Passes question paper type selected at home as URL parameter
Checks URL parameter in student view and display the corresponding heading
Redirect back to home for invalid parameter passed

ishanisri · 2019-10-22T05:29:34Z

searchapp/templates/home.html

@@ -21,19 +21,19 @@
    </div>
  <div class="ui grid">
    <div class="four wide column">
-      <div class="button" id="test"><a href="student_view" class="button">Test Paper</a>
+      <div class="button" id="test"><a href="" onclick="set_paper_type('test'); return false;" class="button">Test Paper</a>


Can you write the onClick function for this in a js file? I think that will look cleaner. And also, we should get rid of <a></a> tags if possible here and use a button instead.

ishanisri · 2019-10-22T05:29:46Z

searchapp/templates/home.html

      <br>
      <br>
      A Test Paper is a worksheet in the format of the board question paper.Great for pre-board preparation and
      to practice all the question types. The fellow needs to choose which chapters to test.
      </div></div>
-    <div class="four wide column" id="generic"><div class="button"><a href="student_view" class="button">Generic Paper</a>
+    <div class="four wide column" id="generic"><div class="button"><a href="" onclick="set_paper_type('generic'); return false;" class="button">Generic Paper</a>


ishanisri · 2019-10-22T05:30:19Z

searchapp/templates/home.html

    <br>
    <br>
    A Generic Paper is designed as per the fellow requirements. You can choose the chapters
    and the number of questions of each type. Great for specific question type and differentiated practice.
    </div></div>
-    <div class="four wide column" id="customized"><div class="button"><a href="student_view" class="button">Customized Paper</a>
+    <div class="four wide column" id="customized"><div class="button"><a href="" onclick="set_paper_type('customized'); return false;" class="button">Customized Paper</a>


ishanisri · 2019-10-22T19:30:36Z

searchapp/static/student_view.js


 	// function called when submit button clicked
 	function submit_click(e) {
-		let worksheetType = $("#worksheetType").dropdown('get value');
+		let worksheet = $("#worksheetType").text();


The worksheet type is the argument value in display_form_sections and that can be used instead of finding worksheet type again.

ishanisri · 2019-10-22T19:31:11Z

searchapp/static/student_view.js

@@ -122,7 +127,11 @@ $(document).ready(function(){
 }

 function upload_click(e) {
-	let worksheetType = $("#worksheetType").dropdown('get value');
+	let worksheet = $("#worksheetType").text();


Code repetition. It is not needed.

ishanisri · 2019-10-22T19:31:48Z

searchapp/static/student_view.js

@@ -166,7 +175,11 @@ function upload_click(e) {
 }

 function populate_grades(value,text, $selectedItem) {
-	let worksheetType = document.getElementById("worksheetType") ? $("#worksheetType").dropdown('get value') : 'paper';
+	let worksheet = document.getElementById("worksheetType") ? $("#worksheetType").text() : 'paper';


Code repetition. It is not needed.

ishanisri · 2019-10-22T19:32:25Z

searchapp/static/student_view.js

@@ -188,7 +201,11 @@ function populate_grades(value,text, $selectedItem) {
 }

 function populate_subjects(value,text, $selectedItem) {
-	let worksheetType = document.getElementById("worksheetType") ? $("#worksheetType").dropdown('get value') : 'paper';
+	let worksheet = document.getElementById("worksheetType") ? $("#worksheetType").text() : 'paper';
+	var worksheetType;


Code repetition. It is not needed.

ishanisri · 2019-10-22T19:32:40Z

searchapp/static/student_view.js

@@ -210,7 +227,11 @@ function populate_subjects(value,text, $selectedItem) {
 }

 	function populate_chapters(value, text, $selectedItem) {
-		let worksheetType = document.getElementById("worksheetType") ? $("#worksheetType").dropdown('get value') : 'paper';
+		let worksheet = document.getElementById("worksheetType") ? $("#worksheetType").text() : 'paper';


Code repetition. It is not needed.

ishanisri · 2019-10-22T19:40:52Z

searchapp/templates/home.html

@@ -21,19 +21,19 @@
    </div>
  <div class="ui grid">
    <div class="four wide column">
-      <div class="button" id="test"><a href="student_view" class="button">Test Paper</a>
+      <div class="button" id="test"><button onclick="set_paper_type('test')">Test Paper</button>


Create a .js file for home.html and use .click function in it to get the worksheet type based on id. Remove the outer div with class button. Move id from <div></div> to <button></button> and have the same class . This will help to have a single function for all 3 and worksheet type can be set based on id.

ishanisri · 2019-10-22T19:41:53Z

searchapp/views.py

@@ -55,9 +55,10 @@ def contact(request):


 def student_view(request):
+    paper_type = request.GET.get('type')


Make paper_type as worksheet_type. The same to be changed anywhere where paper_type has been used.

ishanisri · 2019-10-22T19:43:54Z

searchapp/static/student_view.js

@@ -596,6 +625,10 @@ function populate_subjects(value,text, $selectedItem) {
 	});
 });

+function set_paper_type(type){


Change set_paper_type to set_worksheet_type.

ishanisri reviewed Oct 22, 2019

View reviewed changes

Jayashrri added 4 commits October 23, 2019 00:28

Pass paper type selected from home as URL parameter

bfd1fbf

Display selected type in student view instead of dropdown

ae3f84b

Change paper type selecting link to button

dcb82e8

Get worksheet type from div instead of dropdown

836fce9

Jayashrri force-pushed the fix/remove_field_to_select_question_paper_type branch from 6e1da04 to 836fce9 Compare October 22, 2019 19:23

ishanisri reviewed Oct 22, 2019

View reviewed changes

Removes redundant parts and makes code neater

b36a241

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove field to select question paper type #52

Remove field to select question paper type #52

Jayashrri commented Sep 28, 2019

ishanisri Oct 22, 2019

ishanisri Oct 22, 2019

ishanisri Oct 22, 2019

ishanisri Oct 22, 2019

ishanisri Oct 22, 2019

ishanisri Oct 22, 2019

ishanisri Oct 22, 2019

ishanisri Oct 22, 2019

ishanisri Oct 22, 2019

ishanisri Oct 22, 2019

ishanisri Oct 22, 2019

		@@ -55,9 +55,10 @@ def contact(request):


		def student_view(request):
		paper_type = request.GET.get('type')

Remove field to select question paper type #52

Are you sure you want to change the base?

Remove field to select question paper type #52

Conversation

Jayashrri commented Sep 28, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment