Skip to content

Commit 5b7a035

Browse files
committed
enabled question delete
1 parent 4e3dd83 commit 5b7a035

File tree

7 files changed

+31
-7
lines changed

7 files changed

+31
-7
lines changed

deimos/static/deimos/css/style.css

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -737,6 +737,8 @@ more than assignment display */
737737

738738
.original-size {
739739
font-size: initial;
740+
width: auto;
741+
height: auto;
740742
}
741743
@keyframes blink {
742744
0%, 100% {

deimos/templates/deimos/answer_question.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,9 +230,9 @@ <h3 class="original-size">Question {{question_dict.question.number}}</h3>
230230
{% elif question_dict.questtype == 'mp' %}
231231
<input type="hidden" value="mp" class="question-type"/>
232232
{% if not question_dict.question_student.success %}
233-
<div class="suggestion"> Match the following pairs </div>
233+
<div class="suggestion" style="width: 100%;"> Match the following pairs </div>
234234
{% else %}
235-
<div class="suggestion"> You correctly matched the pairs. </div>
235+
<div class="suggestion" style="width: 100%;"> You correctly matched the pairs. </div>
236236
{% endif %}
237237
<div class="mp-section">
238238
<!--Yet to be passed attempts -->

deimos/templates/deimos/course_management.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<li><a href="{% url 'deimos:index' %}">Home</a></li>
1111
<li><a href="{% url 'astros:course_info' course_id=course.id %}">Course Info</a></li>
1212
<li><a href="{% url 'deimos:search_question' %}">Search Question</a></li>
13-
<li><a href="{% url 'deimos:practice_test_settings' course_id=course.id %}">Practice Test</a></li>
13+
<!--<li><a href="{% url 'deimos:practice_test_settings' course_id=course.id %}">Practice Test</a></li>-->
1414
</ul>
1515
</div>
1616

phobos/static/phobos/css/style.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -799,8 +799,8 @@ more than assignment display */
799799

800800
.original-size {
801801
font-size: initial;
802-
width: initial;
803-
height: initial;
802+
width: auto;
803+
height: auto;
804804
}
805805

806806

phobos/templates/phobos/question_view.html

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,17 @@
1313
<li><a href="{% url 'phobos:course_management' course_id=question.assignment.course.id %}">Assignments</a></li>
1414
{% endif %}
1515
<li><a href="{% url 'phobos:search_question' %}">Search Question</a></li>
16-
<li><a href="{% url 'phobos:edit_question' question_id=question.id %}">Edit Question</a></li>
17-
<li id="btn-export_question"> <a>Export this question</a> </li>
16+
<!--<li><a href="{% url 'phobos:edit_question' question_id=question.id %}">Edit Question</a></li>-->
1817
</ul>
1918
</div>
2019

20+
<nav class="navbar-custom">
21+
<a class="nav-link home-btn" href="{% url 'phobos:index' %}">Home </a>
22+
<a class="nav-link" href="{% url 'phobos:assignment_management' assignment_id=question.assignment.id course_id=question.assignment.course.id %}">Questions</a>
23+
<a class="nav-link" href="{% url 'phobos:course_management' course_id=question.assignment.course.id %}">Assignments</a>
24+
<a class="nav-link" id="btn-export_question" style="color:white">Export</a>
25+
<a class="nav-link" href="{% url 'phobos:delete_question' question_id=question.id %}">Delete</a>
26+
</nav>
2127

2228
<div class="export_question">
2329
<div class="form-container" style="display: none;">

phobos/urls.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
path('edit_question/<int:question_id>',views.edit_question,
2020
name='edit_question'
2121
),
22+
path('delete_question/<int:question_id>', views.delete_question, name='delete_question'),
2223
path('question_bank', views.question_bank, name='question_bank'),
2324
path('courses/<int:course_id>', views.course_management, name='course_management'),
2425
path('courses/<int:course_id>/create_assignment',\

phobos/views.py

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -605,6 +605,21 @@ def create_question(request, assignment_id=None, question_nums_types=None):
605605
'question_difficulties': question_difficulties
606606
})
607607

608+
@transaction.atomic
609+
@login_required(login_url='astros:login')
610+
def delete_question(request, question_id):
611+
# Making sure the request is done by a professor.
612+
professor = get_object_or_404(Professor, pk=request.user.id)
613+
question = get_object_or_404(Question, pk=question_id)
614+
if not question.assignment.course.professors.filter(pk=request.user.pk).exists():
615+
return HttpResponseForbidden('You are not authorized delete this question.')
616+
# delete question
617+
question.delete()
618+
# redirect to assignment management
619+
return HttpResponseRedirect(reverse("phobos:assignment_management",\
620+
kwargs={'course_id':question.assignment.course.id,\
621+
'assignment_id':question.assignment.id}))
622+
608623
# NOTE: The function below was to be useD for a better front end design of the export question functionality.
609624
# The function was to enable the prof select a course then select an assignment in that course.
610625
#this function raises an ATTRIBUTE ERROR. WHY ???

0 commit comments

Comments
 (0)