Skip to content
Snippets Groups Projects
Commit f2207bd9 authored by Wen-Hsuan Hu's avatar Wen-Hsuan Hu
Browse files

fix some bugs

parent 60fa3105
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
app/routes.py
+ 8
− 3
View file @ f2207bd9
......@@ -737,8 +737,8 @@ def fill_the_blanks():
"module_id": q.module_id,
"question": q.question,
"answer": q.answer,
"difficulty": q.difficulty,
"learning_obj": q.learning_obj
"difficulty": q.difficulty.value if q.difficulty else "",
"learning_obj": q.learning_obj.value if q.learning_obj else ""
})
total_questions = len(formatted_questions)
......@@ -810,7 +810,7 @@ def editFIB(id):
return redirect(url_for('routes.fill_the_blanks'))
if request.method == 'POST':
fib.question = request.form.get('new_question')
fib.question = strip_html_tags(request.form.get('new_question'))
fib.answer = request.form.get('answer')
fib.difficulty = request.form.get('difficulty')
fib.learning_obj = request.form.get('learning_obj')
......@@ -1072,3 +1072,8 @@ def logout():
logout_user()
session.clear()
return redirect(url_for("routes.login"))
def strip_html_tags(text):
clean = re.compile('<.*?>')
return re.sub(clean, '', text).strip()
app/templates/fillTheBlanks.html
+ 44
− 41
View file @ f2207bd9
......@@ -11,48 +11,51 @@
<!-- <form action="{{ url_for('routes.fill_the_blanks') }}" method="GET" class="row g-2"> -->
<!-- Question Type Selection -->
<div class="row g-2">
<div class="form-group mb-3 col-md-3">
<label for="question-type" class="form-label">Question Type</label>
<select name="question-type" class="form-select" id="question-type" required>
<option value="mcq">MCQ (Multiple Choice)</option>
<option selected value="flb">Fill the blanks</option>
</select>
</div>
<!-- Module Selection -->
<div class="form-group mb-3 col-md-3">
<label for="module" class="form-label">Module</label>
<select name="module" class="form-select" id="module">
<option value="cmt313" {% if module=='cmt313' %}selected{% endif %}>CMT313</option>
<option value="cmt220" {% if module=='cmt220' %}selected{% endif %}>CMT220</option>
</select>
</div>
<form action="{{ url_for('routes.fill_the_blanks') }}" method="GET" class="row g-2" id="filter-form">
<!-- Difficulty -->
<div class="form-group mb-3 col-md-3">
<label for="sort-by-dif" class="form-label">Difficulty</label>
<select name="sort-by-dif" class="form-select" id="sort-by-dif">
<option value="" {% if not difficulty %}selected{% endif %}>All</option>
<option value="Easy" {% if difficulty=="Easy" %}selected{% endif %}>Easy</option>
<option value="Intermediate" {% if difficulty=="Intermediate" %}selected{% endif %}>Intermediate
</option>
<option value="Hard" {% if difficulty=="Hard" %}selected{% endif %}>Hard</option>
</select>
</div>
<!-- Learning Objective -->
<div class="form-group mb-3 col-md-3">
<label for="sort-by-obj" class="form-label">Learning Objective</label>
<select name="sort-by-obj" class="form-select" id="sort-by-obj">
<option value="" {% if not learning_obj %}selected{% endif %}>All</option>
<option value="Remember" {% if learning_obj=="Remember" %}selected{% endif %}>Remember</option>
<option value="Understand" {% if learning_obj=="Understand" %}selected{% endif %}>Understand
</option>
<option value="Apply" {% if learning_obj=="Apply" %}selected{% endif %}>Apply</option>
<option value="Analyse" {% if learning_obj=="Analyse" %}selected{% endif %}>Analyse</option>
<option value="Evaluate" {% if learning_obj=="Evaluate" %}selected{% endif %}>Evaluate</option>
<option value="Create" {% if learning_obj=="Create" %}selected{% endif %}>Create</option>
</select>
</div>
<!-- Question Type -->
<div class="form-group mb-3 col-md-3">
<label for="question-type" class="form-label">Question Type</label>
<select name="question-type" class="form-select" id="question-type" required>
<option value="mcq">MCQ (Multiple Choice)</option>
<option selected value="flb">Fill the blanks</option>
</select>
</div>
<!-- Module -->
<div class="form-group mb-3 col-md-3">
<label for="module" class="form-label">Module</label>
<select name="module" class="form-select" id="module" onchange="this.form.submit()">
<option value="cmt313" {% if module=='cmt313' %}selected{% endif %}>CMT313</option>
<option value="cmt220" {% if module=='cmt220' %}selected{% endif %}>CMT220</option>
</select>
</div>
<!-- Difficulty -->
<div class="form-group mb-3 col-md-3">
<label for="sort-by-dif" class="form-label">Difficulty</label>
<select name="sort-by-dif" class="form-select" id="sort-by-dif" onchange="this.form.submit()">
<option value="" {% if not difficulty %}selected{% endif %}>All</option>
<option value="Easy" {% if difficulty=="Easy" %}selected{% endif %}>Easy</option>
<option value="Intermediate" {% if difficulty=="Intermediate" %}selected{% endif %}>Intermediate</option>
<option value="Hard" {% if difficulty=="Hard" %}selected{% endif %}>Hard</option>
</select>
</div>
<!-- Learning Objective -->
<div class="form-group mb-3 col-md-3">
<label for="sort-by-obj" class="form-label">Learning Objective</label>
<select name="sort-by-obj" class="form-select" id="sort-by-obj" onchange="this.form.submit()">
<option value="" {% if not learning_obj %}selected{% endif %}>All</option>
<option value="Remember" {% if learning_obj=="Remember" %}selected{% endif %}>Remember</option>
<option value="Understand" {% if learning_obj=="Understand" %}selected{% endif %}>Understand</option>
<option value="Apply" {% if learning_obj=="Apply" %}selected{% endif %}>Apply</option>
<option value="Analyse" {% if learning_obj=="Analyse" %}selected{% endif %}>Analyse</option>
<option value="Evaluate" {% if learning_obj=="Evaluate" %}selected{% endif %}>Evaluate</option>
<option value="Create" {% if learning_obj=="Create" %}selected{% endif %}>Create</option>
</select>
</div>
</form>
<div class="form-group mb-3 col-md-12 d-flex justify-content-between align-items-center">
<label for="question-list" class="form-label">Existing Questions</label>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment