Fix #1359 Can mark questions as longform question as shop owner

migrations/versions/3447b58b5c69_add_is_longform_question_to_question.py

@@ -0,0 +1,31 @@
+"""add is_longform_question to question
+
+Revision ID: 3447b58b5c69
+Revises: da154873f3ab
+Create Date: 2024-06-17 21:31:27.252460
+
+"""
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = "3447b58b5c69"
+down_revision = "da154873f3ab"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+
+    with op.batch_alter_table("question", schema=None) as batch_op:
+        batch_op.add_column(
+            sa.Column(
+                "is_longform_question", sa.Boolean(), nullable=True, default=False
+            )
+        )
+
+
+def downgrade():
+    pass

subscribie/blueprints/admin/choice_group.py

@@ -108,6 +108,11 @@ def add_question():
     if form.validate_on_submit():
         question = Question()
         question.title = request.form["title"]
+        if request.form.get("is_longform_question"):
+            question.is_longform_question = True
+        else:
+            question.is_longform_question = False
+
         database.session.add(question)
         database.session.commit()
         flash("Added new question")
@@ -122,6 +127,10 @@ def edit_question(id):
     question = Question.query.get(id)
     if request.method == "POST":
         question.title = request.form["title"]
+        if request.form.get("is_longform_question"):
+            question.is_longform_question = True
+        else:
+            question.is_longform_question = False
         database.session.commit()
         flash("Question updated")
     return render_template("admin/question/edit_question.html", question=question)

subscribie/blueprints/admin/static/style.css

@@ -11601,3 +11601,8 @@ h3{
   margin: .5em;
   padding: 0;
 }
+
+
+.text-muted {
+  color: #717d84 !important;
+}

subscribie/blueprints/admin/templates/admin/choice_group/add_question.html

@@ -31,6 +31,16 @@ <h3>Add Question</h3>
             <input class="form-control" type="title" name="title" required>
           </div>
         </div>
+
+        <div class="form-group row mt-4 mb-4" style="padding-left: 1.25rem;">
+          <div class="form-check">
+            <input class="form-check-input" type="checkbox" id="is_longform_question" name="is_longform_question">
+            <label class="form-check-label" for="is_longform_question">
+              Is this a longform question?
+            </label>
+          </div>
+          <p class="text-muted">A long-form question shows as a large text box rather than a small box.</p>
+        </div>
 
         <button type="submit" class="btn btn-primary btn-block mb-3">Save</button>
       </form>

subscribie/blueprints/admin/templates/admin/question/edit_question.html

@@ -9,7 +9,7 @@ <h2 class="text-center text-dark mb-3">Edit Question</h2>
   <ul class="breadcrumb">
     <li class="breadcrumb-item"><a href="/">Shop</a></li>
     <li class="breadcrumb-item"><a href="{{ url_for('admin.dashboard') }}">Manage My Shop</a></li>
-    <li class="breadcrumb-item"><a href="{{ url_for('admin.list_questions') }}">Questions</a></li> 
+    <li class="breadcrumb-item"><a href="{{ url_for('admin.list_questions') }}">Questions</a></li>
     <li class="breadcrumb-item active" aria-current="page">Edit Question</li>
   </ul>
 </div>
@@ -19,23 +19,38 @@ <h2 class="text-center text-dark mb-3">Edit Question</h2>
     <div class="container">
 
       <h3>Edit Question</h3>
-      <p class="card-subtitle mb-3 text-muted">Edit the Question below.</p>
 
       <hr>
 
-      <form action="#" method="POST">
-        <div class="form-group row py-md-3">
-          <label for="title" class="col-sm-2 col-form-label">Question:</label>
-          <div class="col-sm-10">
-            <input name="title" id="title" type="text" value="{{ question.title }}" autofocus class="form-control">
+      <form action="" method="POST" action="/" class="col-md-7 py-3">
+        <div class="form-group row">
+          <label class="col-sm-3 col-form-label" for="title">Title:</label>
+          <div class="col-sm-9">
+            <input class="form-control" type="title" name="title" value="{{ question.title }}" required>
           </div>
         </div>
 
-        <input type="submit" value="Save" class="btn btn-primary btn-block col-md-6 my-3 mx-auto">
+        <div class="form-group row mt-4 mb-4" style="padding-left: 1.25rem;">
+          <div class="form-check">
+            <input class="form-check-input" type="checkbox" id="is_longform_question" name="is_longform_question"
+            {% if question.is_longform_question %}
+              checked
+            {% endif %}
+            />
+            <label class="form-check-label" for="is_longform_question">
+              Is this a longform question?
+            </label>
+          </div>
+          <p class="text-muted">A long-form question shows as a large text box rather than a small box.</p>
+        </div>
+
+        <button type="submit" class="btn btn-primary btn-block mb-3">Save</button>
       </form>
 
-    </div><!--end container-->
-  </div><!--end section-->
+    </div> <!-- end container-->
+  </div> <!-- end section-->
 </main>
 
-{% endblock body %}
+
+
+{% endblock %}

subscribie/models.py

@@ -1198,6 +1198,9 @@ class Question(database.Model):
         database.DateTime, default=datetime.datetime.now(datetime.UTC)
     )
     options = relationship("QuestionOption", back_populates="question")
+    is_longform_question = database.Column(
+        database.Boolean(), default=False
+    )
     title = database.Column(database.String())
 
 

subscribie/themes/theme-jesmond/jesmond/set_questions.html

@@ -37,7 +37,11 @@ <h3 class="body">{{ _('The') }} <span class="body-lg">{{ plan.title }}</span> {{
               {% endfor %}
             </select>
           {% else %}
-            <input class="form-control" type="text" name="question-{{ plan_question_assoc.question.id }}" placeholder="Please enter..." id="{{ plan_question_assoc.question.id }}" required>
+            {% if plan_question_assoc.question.is_longform_question %}
+              <textarea cols="30" rows="10" name="question-{{ plan_question_assoc.question.id }}" placeholder="Please enter..." id="{{ plan_question_assoc.question.id }}" required></textarea>
+            {% else %}
+              <input class="form-control" type="text" name="question-{{ plan_question_assoc.question.id }}" placeholder="Please enter..." id="{{ plan_question_assoc.question.id }}" required>
+            {% endif %}
           {% endif %}
         </div>
         {% endfor %}