[UI] Dynamic Survey View - Ask teacher for class info #4612

app.py

@@ -42,7 +42,7 @@
 from utils import dump_yaml_rt, is_debug_mode, load_yaml_rt, timems, version, strip_accents
 from website import (ab_proxying, achievements, admin, auth_pages, aws_helpers,
                      cdn, classes, database, for_teachers, s3_logger, parsons,
-                     profile, programs, querylog, quiz, statistics,
+                     profile, programs, querylog, quiz, statistics, surveys,
                      translating, tags)
 from website.auth import (current_user, is_admin, is_teacher, is_second_teacher, has_public_profile,
                           login_user_from_token_cookie, requires_login, requires_login_redirect, requires_teacher,
@@ -106,6 +106,7 @@
 ACHIEVEMENTS_TRANSLATIONS = hedyweb.AchievementTranslations()
 DATABASE = database.Database()
 ACHIEVEMENTS = achievements.Achievements(DATABASE, ACHIEVEMENTS_TRANSLATIONS)
+SURVEYS = surveys.SurveysModule(DATABASE)
 
 TAGS = collections.defaultdict(hedy_content.NoSuchAdventure)
 for lang in ALL_LANGUAGES.keys():
@@ -2475,7 +2476,7 @@ def current_user_allowed_to_see_program(program):
 app.register_blueprint(auth_pages.AuthModule(DATABASE))
 app.register_blueprint(profile.ProfileModule(DATABASE))
 app.register_blueprint(programs.ProgramsModule(DATABASE, ACHIEVEMENTS))
-app.register_blueprint(for_teachers.ForTeachersModule(DATABASE, ACHIEVEMENTS))
+app.register_blueprint(for_teachers.ForTeachersModule(DATABASE, ACHIEVEMENTS, SURVEYS))
 app.register_blueprint(classes.ClassModule(DATABASE, ACHIEVEMENTS))
 app.register_blueprint(classes.MiscClassPages(DATABASE, ACHIEVEMENTS))
 app.register_blueprint(admin.AdminModule(DATABASE))
@@ -2485,6 +2486,7 @@ def current_user_allowed_to_see_program(program):
 app.register_blueprint(statistics.StatisticsModule(DATABASE))
 app.register_blueprint(statistics.LiveStatisticsModule(DATABASE))
 app.register_blueprint(tags.TagsModule(DATABASE, ACHIEVEMENTS))
+app.register_blueprint(surveys.SurveysModule(DATABASE))
 
 
 # *** START SERVER ***

messages.pot

@@ -265,6 +265,12 @@ msgstr ""
 msgid "class_overview"
 msgstr ""
 
+msgid "class_survey_description"
+msgstr ""
+
+msgid "class_survey_questions"
+msgstr ""
+
 msgid "close"
 msgstr ""
 
@@ -1441,15 +1447,6 @@ msgstr ""
 msgid "surname"
 msgstr ""
 
-msgid "tag_deleted"
-msgstr ""
-
-msgid "tag_input_placeholder"
-msgstr ""
-
-msgid "tags"
-msgstr ""
-
 msgid "teacher"
 msgstr ""
 

static/css/generated.full.css

@@ -5521,6 +5521,10 @@ code {
   margin-top: -2rem;
 }
 
+.mt-1 {
+  margin-top: 0.25rem;
+}
+
 .mt-auto {
   margin-top: auto;
 }
@@ -16040,9 +16044,9 @@ code {
   border-color: rgb(104 211 145 / var(--tw-border-opacity));
 }
 
-.border-blue-600 {
+.border-green-400 {
   --tw-border-opacity: 1;
-  border-color: rgb(49 130 206 / var(--tw-border-opacity));
+  border-color: rgb(104 211 145 / var(--tw-border-opacity));
 }
 
 .border-blue-500 {

templates/class-overview.html

@@ -144,5 +144,8 @@ <h2>{{_('pending_invites')}}</h2>
         </div>
       {% endif %}
     </div>
+    {% if survey_id and description and questions %}
+      {{ render_partial('htmx-survey.html', survey_id=survey_id, description=description, questions=questions) }}
+    {% endif %}
 </div>
 {% endblock %}

templates/htmx-survey.html

@@ -0,0 +1,42 @@
+{% block regular_content %}
+<div id="survey" class="z-50 fixed w-screen h-screen" style="width: 30%; top: 50%; left: 50%; transform: translate(-50%, -50%);">
+    <div class="bg-blue-500 border border-black rounded-lg px-8 py-4 text-center">
+        <div id="description" class="text-white mb-8 text-l">{{ _(description) }}</div>
+        <form id="survey-form">
+        {% for question in questions %}
+        <div class="mb-4">
+                    <div id="question" class="text-white mb-4 text-xl">{{ _(question) }}</div>
+                    <div class="flex flex-row justify-center space-x-1">
+                        <input autofocus="autofocus" id="input" type="text" class="flex items-center border border-green-400 rounded p-2 px-3 w-4/5 mx-auto" name="{{ question }}">
+                    </div>
+                </div>
+            {% endfor %}
+            <div class="mt-4 flex flex-row justify-center">
+                <button type="submit" class="green-btn block mx-auto w-40 pb-4 pt-4"
+                hx-trigger="click"
+                hx-post="/surveys/submit-survey/{{ survey_id }}"
+                hx-include="[name='question']"
+                hx-swap="innerHTML"
+                _="on click toggle .hidden on #survey">
+                {{_('survey_submit')}}</button>
+                <button type="remind_later" class="red-btn block mx-auto w-40 pb-4 pt-4"
+                hx-trigger="click"
+                hx-post="/surveys/remind-later-survey/{{ survey_id }}"
+                hx-swap="innerHTML"
+                _="on click toggle .hidden on #survey">
+                {{_('survey_later')}}</button>
+            </div>
+            <div class="flex-row justify-center">
+            <button type="skip" class="text-white m-1 w-40 pb-4 pt-4"
+                hx-trigger="click"
+                hx-post="/surveys/skip-survey/{{ survey_id }}"
+                hx-swap="innerHTML"
+                _="on click toggle .hidden on #survey">
+                <u>{{_('survey_skip')}}</u></button>
+            </div>
+        </form>
+        </div>
+        </div>
+    </div>
+{% endblock %}
+

translations/ar/LC_MESSAGES/messages.po

@@ -369,6 +369,12 @@ msgstr "أدخل اسم الصف رجاء"
 msgid "class_overview"
 msgstr "Class overview"
 
+msgid "class_survey_description"
+msgstr ""
+
+msgid "class_survey_questions"
+msgstr ""
+
 #, fuzzy
 msgid "close"
 msgstr "Sluiten"

translations/bg/LC_MESSAGES/messages.po

@@ -1,3 +1,9 @@
+# Bulgarian translations for PROJECT.
+# Copyright (C) 2023 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2023.
+#
+#, fuzzy
 msgid ""
 msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2023-11-02 08:48+0200\nPO-Revision-Date: 2023-11-14 20:05+0000\nLast-Translator: Prefill add-on <[email protected]>\nLanguage-Team: LANGUAGE <[email protected]>\nLanguage: bg\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=2; plural=n != 1;\nX-Generator: Weblate 5.2-dev\n"
 
@@ -420,6 +426,12 @@ msgstr "Please enter the name of the class"
 msgid "class_overview"
 msgstr "Class overview"
 
+msgid "class_survey_description"
+msgstr ""
+
+msgid "class_survey_questions"
+msgstr ""
+
 #, fuzzy
 msgid "close"
 msgstr "Sluiten"
@@ -1992,6 +2004,15 @@ msgstr "Абонирай се за нашия журнал"
 msgid "surname"
 msgstr "Потребителско име"
 
+msgid "survey_later"
+msgstr ""
+
+msgid "survey_skip"
+msgstr ""
+
+msgid "survey_submit"
+msgstr ""
+
 #, fuzzy
 msgid "tag_deleted"
 msgstr "This tag was successfully deleted."

translations/bn/LC_MESSAGES/messages.po

@@ -1,3 +1,9 @@
+# Bangla translations for PROJECT.
+# Copyright (C) 2023 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2023.
+#
+#, fuzzy
 msgid ""
 msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2023-11-02 08:48+0200\nPO-Revision-Date: 2023-11-14 20:05+0000\nLast-Translator: Prefill add-on <[email protected]>\nLanguage-Team: LANGUAGE <[email protected]>\nLanguage: bn\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=2; plural=n > 1;\nX-Generator: Weblate 5.2-dev\n"
 
@@ -438,6 +444,12 @@ msgstr "Please enter the name of the class"
 msgid "class_overview"
 msgstr "Class overview"
 
+msgid "class_survey_description"
+msgstr ""
+
+msgid "class_survey_questions"
+msgstr ""
+
 #, fuzzy
 msgid "close"
 msgstr "Sluiten"
@@ -2077,18 +2089,6 @@ msgstr "Subscribe to the newsletter"
 msgid "surname"
 msgstr "Username"
 
-#, fuzzy
-msgid "tag_deleted"
-msgstr "This tag was successfully deleted।"
-
-#, fuzzy
-msgid "tag_input_placeholder"
-msgstr "Enter a new tag"
-
-#, fuzzy
-msgid "tags"
-msgstr "Tags"
-
 #, fuzzy
 msgid "teacher"
 msgstr "Looks like you are not a teacher!"
@@ -2554,3 +2554,19 @@ msgstr "Your program"
 
 #~ msgid "title_class statistics"
 #~ msgstr "My statistics"
+
+#, fuzzy
+msgid "invalid_level_comment"
+msgstr "# The provided level is invalid, level is set to level 1"
+
+#, fuzzy
+msgid "invalid_language_comment"
+msgstr "# The provided language is invalid, language set to English"
+
+#, fuzzy
+msgid "invalid_keyword_language_comment"
+msgstr "# The provided keyword language is invalid, keyword language is set to English"
+
+#, fuzzy
+msgid "invalid_program_comment"
+msgstr "# The provided program is invalid, please try again"

translations/ca/LC_MESSAGES/messages.po

@@ -356,6 +356,12 @@ msgstr "Si us plau, introdueix el nom de la nova classe"
 msgid "class_overview"
 msgstr "Visió general de la classe"
 
+msgid "class_survey_description"
+msgstr ""
+
+msgid "class_survey_questions"
+msgstr ""
+
 msgid "close"
 msgstr "Tanca"