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

Annelein · 2023-11-03T15:28:38Z

Fixes #4612

Survey view:

Takes a survey_id, a description and questions
'Remind me later' sets 'skip' in survey to todays date, so you could modify the survey to pop up tomorrow/next week
'Don't ask again' sets 'skip' in survey to True, so you could choose to never show the survey again
Option to only show unanswered questions

Survey table:

Survey_id is: survey_name + '_' + response_id (for ex for the class survey: 'class_class_id')
Responses
Skip option

ghost · 2023-11-03T15:30:33Z

👇 Click on the image for a new way to code review

Legend

jpelay · 2023-11-07T21:01:35Z

Hi, @Annelein! I reckon I helped you out a bit on Discord about the HTMX issue, is there anything else you need help?

Annelein · 2023-11-08T14:03:41Z

Hi, @Annelein! I reckon I helped you out a bit on Discord about the HTMX issue, is there anything else you need help?

Yes you definitely helped! But working on some Hour of Code issues right now, after that I will get back at it and will get in touch with you if I need any help, thanks!!

jpelay · 2023-11-10T14:41:56Z

Hi, @Annelein! I reckon I helped you out a bit on Discord about the HTMX issue, is there anything else you need help?

Yes you definitely helped! But working on some Hour of Code issues right now, after that I will get back at it and will get in touch with you if I need any help, thanks!!

Great! Since this is a PR still in progress I'll set it as a draft 😄 when this is done you can set it as ready for review.

Annelein · 2023-11-16T14:50:27Z

Can someone help me out on how to make the view grow with the screen size?

Felienne · 2023-11-16T15:55:31Z

translations/en/LC_MESSAGES/messages.po

-"You tried to use the variable {name} on line {access_line_number}, but "
-"you set it on line {definition_line_number}. Set a variable before using "
-"it."
+msgstr "You tried to use the variable {name} on line {access_line_number}, but you set it on line {definition_line_number}. Set a variable before using it."


I am not sure why all these weird changes happen, I think @hasan-sh had a similar issue, do you remember that?

Yep by omitting the --no-wrap flag.

pybabel extract -F babel.cfg -o messages.pot . --no-location --sort-output --omit-header pybabel update -i messages.pot -d translations -N --omit-header

translations/en/LC_MESSAGES/messages.po

Co-authored-by: Felienne Hermans <felienne@gmail.com>

jpelay · 2023-11-21T21:14:20Z

website/__init__.py

I think the deletion of this file is what is causing the validation problems in the Unit test job, can you add it again and see if it solves the issue?

Felienne · 2023-11-22T07:07:22Z

Woooohooo, the unit tests are passing now! Leaving the final approval to @hasan-sh since he still has a "request changes" review pending.

Annelein · 2023-11-22T10:26:30Z

@Felienne @jpelay only the English and Arabic translations are there, all the other ones are gone, also the Dutch ones..?

Felienne · 2023-11-22T10:50:09Z

@Felienne @jpelay only the English and Arabic translations are there, all the other ones are gone, also the Dutch ones..?

Ah yes that happened when I was fixing merge conflicts, sorry. Feel free to add them again, but if we run into conflicts we can also add them later in a next PR.

hasan-sh · 2023-11-22T12:17:31Z

website/for_teachers.py

@@ -297,6 +310,29 @@ def get_class_customization_page(self, user, class_id):
                class_id=class_id
            ))

+    def class_survey(self, class_id):


great now:)

hasan-sh · 2023-11-22T12:18:06Z

utils.py

@@ -359,3 +359,23 @@ def can_edit_class(user, Class):
    return Class["teacher"] == user["username"] or \
        any(second_teacher["username"] == user["username"] and second_teacher["role"] == "teacher"
            for second_teacher in Class.get("second_teachers", []))
+
+
+def get_unanswered_questions(survey, new_questions):


amazing job!

hasan-sh · 2023-11-22T12:18:30Z

translations/en/LC_MESSAGES/messages.po

+msgid "class_survey_later"
+msgstr "Remind me tomorrow"
+
+msgid "class_survey_question1"


ok different questions are fine for now

hasan-sh · 2023-11-22T12:19:03Z

website/for_teachers.py

+        questions.append(gettext("class_survey_question2"))
+        questions.append(gettext("class_survey_question3"))
+        questions.append(gettext("class_survey_question4"))
+        unanswered_questions, translate_db = utils.get_unanswered_questions(survey, questions)


makes more sense from the utils of survey;)

hasan-sh

Tested it with the latest changes. I removed the style property since we center the parent with flex, check it out @Annelein ! Will approve there after!

Felienne · 2023-11-22T14:20:51Z

Wow that was a lot of hassle @Annelein!! Thanks for being so patient!!

Annelein · 2023-11-22T14:24:03Z

Wow that was a lot of hassle @Annelein!! Thanks for being so patient!!

Ofcourse! Always on the first pull request, getting used to the whole environment :))

mergify · 2023-11-22T16:20:29Z

Thank you for contributing! Your pull request is now going on the merge train (choo choo! Do not click update from main anymore, and be sure to allow changes to be pushed to your fork).

Annelein and others added 5 commits November 2, 2023 13:24

Setting up survey view that takes x questions

f026c7b

Setting up survey view that takes x questions

8a55a78

Setting up survey view that takes x questions

17704fd

Layout of view is done

7d66ff4

Looking into parsing form responses

114cf5c

styling done, responses are parsed, looking into saving in database

451ff6b

jpelay marked this pull request as draft November 10, 2023 14:42

Annelein added 5 commits November 10, 2023 17:29

Skip survey saved to database

7e0c5a3

Survey description and questions as translations

2deef69

Trigger should when class contains students

43b28fe

Trigger should when class contains students

aa9ed60

Triggered if class contains students

e619095

Annelein mentioned this pull request Nov 11, 2023

[UI idea] Ask teacher for class info #4612

Closed

Felienne assigned Annelein Nov 14, 2023

Annelein added 3 commits November 15, 2023 18:08

bigger text, remind me later button, survey table

9fb621a

surveymodule, needs documentation

3447e18

translations

e05df59

screen size

afe352b

Annelein marked this pull request as ready for review November 16, 2023 15:01

Annelein requested review from jpelay, hasan-sh and Felienne November 16, 2023 15:01

Felienne reviewed Nov 16, 2023

View reviewed changes

translations/en/LC_MESSAGES/messages.po Outdated Show resolved Hide resolved

Update translations/en/LC_MESSAGES/messages.po

570dc22

Co-authored-by: Felienne Hermans <felienne@gmail.com>

Annelein and others added 6 commits November 21, 2023 18:03

small mistake

170ecef

few test fixes

ae7f286

few test fixes

b93829f

Merge branch 'main' into survey-class-info

cfa7ab5

==

44404bc

Merge branch 'main' of github.com:hedyorg/hedy into survey-class-info

56ba7be

jpelay reviewed Nov 21, 2023

View reviewed changes

Annelein and others added 2 commits November 21, 2023 22:22

__init__.py

ac81a5b

remove double strings

0fbce2f

class test need to hide survey

cec5d62

Annelein requested a review from hasan-sh November 22, 2023 10:22

unneeded styles

8661469

hasan-sh reviewed Nov 22, 2023

View reviewed changes

hasan-sh approved these changes Nov 22, 2023

View reviewed changes

remove hiding survey in test

37b3fba

hasan-sh and others added 2 commits November 22, 2023 16:20

hide survey when testing class activities

6e62860

hide survey when testing class activities - student copy link

eb41886

mergify bot merged commit b0c6bdf into main Nov 22, 2023
11 checks passed

mergify bot deleted the survey-class-info branch November 22, 2023 16:21

hasan-sh mentioned this pull request Nov 23, 2023

[FIX] Remove indexes from surveys table #4787

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

Annelein commented Nov 3, 2023 •

edited

Loading

ghost commented Nov 3, 2023 •

edited by ghost

Loading

Legend

jpelay commented Nov 7, 2023

Annelein commented Nov 8, 2023

jpelay commented Nov 10, 2023

Annelein commented Nov 16, 2023

Felienne Nov 16, 2023

hasan-sh Nov 20, 2023

jpelay Nov 21, 2023

Felienne commented Nov 22, 2023

Annelein commented Nov 22, 2023

Felienne commented Nov 22, 2023

hasan-sh Nov 22, 2023

hasan-sh Nov 22, 2023

hasan-sh Nov 22, 2023

hasan-sh Nov 22, 2023 •

edited

Loading

hasan-sh left a comment

Felienne commented Nov 22, 2023

Annelein commented Nov 22, 2023

mergify bot commented Nov 22, 2023

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

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

Conversation

Annelein commented Nov 3, 2023 • edited Loading

ghost commented Nov 3, 2023 • edited by ghost Loading

Legend

jpelay commented Nov 7, 2023

Annelein commented Nov 8, 2023

jpelay commented Nov 10, 2023

Annelein commented Nov 16, 2023

Felienne Nov 16, 2023

Choose a reason for hiding this comment

hasan-sh Nov 20, 2023

Choose a reason for hiding this comment

jpelay Nov 21, 2023

Choose a reason for hiding this comment

Felienne commented Nov 22, 2023

Annelein commented Nov 22, 2023

Felienne commented Nov 22, 2023

hasan-sh Nov 22, 2023

Choose a reason for hiding this comment

hasan-sh Nov 22, 2023

Choose a reason for hiding this comment

hasan-sh Nov 22, 2023

Choose a reason for hiding this comment

hasan-sh Nov 22, 2023 • edited Loading

Choose a reason for hiding this comment

hasan-sh left a comment

Choose a reason for hiding this comment

Felienne commented Nov 22, 2023

Annelein commented Nov 22, 2023

mergify bot commented Nov 22, 2023

Annelein commented Nov 3, 2023 •

edited

Loading

ghost commented Nov 3, 2023 •

edited by ghost

Loading

hasan-sh Nov 22, 2023 •

edited

Loading