Skip to content

Remove field to select question paper type #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Jayashrri wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Remove field to select question paper type #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bfd1fbf
Pass paper type selected from home as URL parameter
Jayashrri Sep 28, 2019
ae3f84b
Display selected type in student view instead of dropdown
Jayashrri Sep 28, 2019
dcb82e8
Change paper type selecting link to button
Jayashrri Oct 22, 2019
836fce9
Get worksheet type from div instead of dropdown
Jayashrri Oct 22, 2019
b36a241
Removes redundant parts and makes code neater
Jayashrri Oct 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions searchapp/static/home.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,12 @@
#grid{
grid-row-gap:70px;
}
.button{
.typeInfo{
outline:none;
}/* Style the links inside the navigation bar */
.button a {
.typeInfo button{
outline:0;
background-color: transparent;
font-weight:800;
color:black;
text-align: center;
Expand All @@ -37,10 +38,11 @@
white-space: -o-pre-wrap; /* Opera 7 */
word-wrap: break-word;
}
.button a:hover {
.typeInfo button:hover {
color: black;
cursor: pointer;
}
.button a:active{
.typeInfo button:active{
outline:0;
border:none;
-moz-outline-style:none;
Expand All @@ -50,4 +52,4 @@
background:black;
color:white;
border-radius:5px;
}
}
9 changes: 9 additions & 0 deletions searchapp/static/home.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
$(document).ready(function(){
function set_worksheet_type(type){
window.location.href="student_view" + "?type=" + type;
}

$('.selectType').click(function(){
set_worksheet_type($(this).attr('id'));
});
});
49 changes: 27 additions & 22 deletions searchapp/static/student_view.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
$(document).ready(function(){

// on selecting type of worksheet
$('#worksheetType').dropdown({
onChange: function (value, text, $selectedItem) {
if(value == 'test') {
$("#test-div").show();
$("#generic-div").hide();
$("#customized-div").hide();
} else if(value == 'generic') {
$("#test-div").hide();
$("#generic-div").show();
$("#customized-div").hide();
} else if(value == 'customized') {
$("#test-div").hide();
$("#generic-div").hide();
$("#customized-div").show();
}
},
});
function display_form_sections (value) {
if(value == 'test') {
$('#worksheetType').text('Test Paper');
$("#test-div").show();
$("#generic-div").hide();
$("#customized-div").hide();
} else if(value == 'generic') {
$('#worksheetType').text('Generic Paper');
$("#test-div").hide();
$("#generic-div").show();
$("#customized-div").hide();
} else if(value == 'customized') {
$('#worksheetType').text('Customized Paper');
$("#test-div").hide();
$("#generic-div").hide();
$("#customized-div").show();
}
}

// function called when submit button clicked
function submit_click(e) {
let worksheetType = $("#worksheetType").dropdown('get value');
if (worksheetType == 'test') {
let subject = $("#test-subject").dropdown('get value');
let chapters = $('#test-chapter').dropdown('get values');
Expand Down Expand Up @@ -122,7 +122,6 @@ $(document).ready(function(){
}

function upload_click(e) {
let worksheetType = $("#worksheetType").dropdown('get value');
if (worksheetType == 'customized') {
let subject = $("#customized-subject").dropdown('get value');
let file_data = $('#realfile').prop("files")[0];
Expand Down Expand Up @@ -166,7 +165,6 @@ function upload_click(e) {
}

function populate_grades(value,text, $selectedItem) {
let worksheetType = document.getElementById("worksheetType") ? $("#worksheetType").dropdown('get value') : 'paper';
let boardData = {
"board": $(`#${worksheetType}-board`).dropdown('get value')
};
Expand All @@ -188,7 +186,6 @@ function populate_grades(value,text, $selectedItem) {
}

function populate_subjects(value,text, $selectedItem) {
let worksheetType = document.getElementById("worksheetType") ? $("#worksheetType").dropdown('get value') : 'paper';
let gradeData = {
"grade": $(`#${worksheetType}-grade`).dropdown('get value')
};
Expand All @@ -210,7 +207,6 @@ function populate_subjects(value,text, $selectedItem) {
}

function populate_chapters(value, text, $selectedItem) {
let worksheetType = document.getElementById("worksheetType") ? $("#worksheetType").dropdown('get value') : 'paper';
let formData = {
"subject": $(`#${worksheetType}-subject`).dropdown('get value'),
"board": $(`#${worksheetType}-board`).dropdown('get value')
Expand Down Expand Up @@ -580,6 +576,15 @@ function populate_subjects(value,text, $selectedItem) {
},
});

var worksheetType;
if(window.location.pathname == "/student_view"){
const urlParams = new URLSearchParams(window.location.search);
worksheetType = urlParams.get('type');
if(['test','generic','customized'].includes(worksheetType))
display_form_sections(worksheetType);
else window.location.href="/";
}

$('#upload').click(upload_click);
$("#submit").click(submit_click);
$("#add-chapter-button").click(add_chapter);
Expand Down
6 changes: 4 additions & 2 deletions searchapp/static/student_view_style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@
margin-top:2%;
margin-left:auto;
margin-right:auto;
width:50%;
display:block;
text-align:center;
font-size: 17px;
color: black;
font-weight: 800;
}

#subject_splits {
Expand Down
14 changes: 7 additions & 7 deletions searchapp/templates/home.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,25 +20,25 @@
</div>
</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="four wide column typeInfo">
<button id="test" class="selectType">Test Paper</button>
<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>
<div class="four wide column typeInfo"><button class="selectType" id="generic">Generic Paper</button>
<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>
<div class="four wide column typeInfo"><button class="selectType" id="customized">Customized Paper</button>
<br>
<br>
A customized paper is generated based on the performance of each student. The fellow uploads the tracker of the class,
and a separate worksheet is created for each student to practice at and just above their level.
This is currently under development. </div>
This is currently under development.
</div>
</div>
{% endblock %}
3 changes: 2 additions & 1 deletion searchapp/templates/layout.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.2.14/semantic.js"></script>
<script src="https://cdn.jsdelivr.net/g/filesaver.js"></script>
<script type="text/javascript" src="{% static 'student_view.js' %}"></script>
<script type="text/javascript" src="{% static 'pnotify.custom.min.js' %}"></script>
<script type="text/javascript" src="{% static 'pnotify.custom.min.js' %}"></script>
<script type="text/javascript" src="{% static 'home.js' %}"></script>
<script>
var csrftoken = "{{ csrf_token }}";
var BASE_DIR = "http://localhost:8000";
Expand Down
13 changes: 2 additions & 11 deletions searchapp/templates/student_view.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,10 @@
{% endblock %}
{% block student_view %}
<!-- Select worksheet type -->
<div id="worksheetType" class="ui selection dropdown">
<input name="worksheetType" type="hidden">
<i class="dropdown icon"></i>
<div class="default text">Select Worksheet Type</div>
<div class="menu">
<div class="item" data-value="test">Test Paper</div>
<div class="item" data-value="generic">Generic Worksheet</div>
<div class="item" data-value="customized">Customized Worksheet</div>
</div>
</div>
<div id="worksheetType"></div>
<br>

<div id="test-div" style="display: none;">
<div id="test-div">
<div id="test-board" class="ui selection dropdown board show-display">
<input name="board" type="hidden">
<i class="dropdown icon"></i>
Expand Down
3 changes: 2 additions & 1 deletion searchapp/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,10 @@ def contact(request):


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

@ishanisri ishanisri Oct 22, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

board_list = Board.objects.all().values_list('board', flat=True)
board_list = list(board_list)
return render(request, 'student_view.html', {'data': board_list})
return render(request, 'student_view.html', {'data': board_list, 'type': paper_type})


def login_view(request):
Expand Down