From 80d9f7f71ec8de921bbc40b900381b0c81a0ca7c Mon Sep 17 00:00:00 2001
From: Florian <florianbuerckel@gmail.com>
Date: Wed, 4 Dec 2024 14:21:14 +0100
Subject: [PATCH 001/103] add action_text

Signed-off-by: Florian <florianbuerckel@gmail.com>
---
 .rspec                                        |  1 +
 app/assets/stylesheets/actiontext.css         | 31 ++++++++++
 app/views/active_storage/blobs/_blob.html.erb | 14 +++++
 .../action_text/contents/_content.html.erb    |  3 +
 ...te_active_storage_tables.active_storage.rb | 57 +++++++++++++++++++
 ...0_create_action_text_tables.action_text.rb | 26 +++++++++
 db/schema.rb                                  | 42 +++++++++++++-
 package.json                                  |  2 +
 yarn.lock                                     | 24 ++++++++
 9 files changed, 199 insertions(+), 1 deletion(-)
 create mode 100644 .rspec
 create mode 100644 app/assets/stylesheets/actiontext.css
 create mode 100644 app/views/active_storage/blobs/_blob.html.erb
 create mode 100644 app/views/layouts/action_text/contents/_content.html.erb
 create mode 100644 db/migrate/20241204132029_create_active_storage_tables.active_storage.rb
 create mode 100644 db/migrate/20241204132030_create_action_text_tables.action_text.rb

diff --git a/.rspec b/.rspec
new file mode 100644
index 000000000..c99d2e739
--- /dev/null
+++ b/.rspec
@@ -0,0 +1 @@
+--require spec_helper
diff --git a/app/assets/stylesheets/actiontext.css b/app/assets/stylesheets/actiontext.css
new file mode 100644
index 000000000..3cfcb2b75
--- /dev/null
+++ b/app/assets/stylesheets/actiontext.css
@@ -0,0 +1,31 @@
+/*
+ * Provides a drop-in pointer for the default Trix stylesheet that will format the toolbar and
+ * the trix-editor content (whether displayed or under editing). Feel free to incorporate this
+ * inclusion directly in any other asset bundle and remove this file.
+ *
+ *= require trix
+*/
+
+/*
+ * We need to override trix.css’s image gallery styles to accommodate the
+ * <action-text-attachment> element we wrap around attachments. Otherwise,
+ * images in galleries will be squished by the max-width: 33%; rule.
+*/
+.trix-content .attachment-gallery > action-text-attachment,
+.trix-content .attachment-gallery > .attachment {
+  flex: 1 0 33%;
+  padding: 0 0.5em;
+  max-width: 33%;
+}
+
+.trix-content .attachment-gallery.attachment-gallery--2 > action-text-attachment,
+.trix-content .attachment-gallery.attachment-gallery--2 > .attachment, .trix-content .attachment-gallery.attachment-gallery--4 > action-text-attachment,
+.trix-content .attachment-gallery.attachment-gallery--4 > .attachment {
+  flex-basis: 50%;
+  max-width: 50%;
+}
+
+.trix-content action-text-attachment .attachment {
+  padding: 0 !important;
+  max-width: 100% !important;
+}
diff --git a/app/views/active_storage/blobs/_blob.html.erb b/app/views/active_storage/blobs/_blob.html.erb
new file mode 100644
index 000000000..49ba357dd
--- /dev/null
+++ b/app/views/active_storage/blobs/_blob.html.erb
@@ -0,0 +1,14 @@
+<figure class="attachment attachment--<%= blob.representable? ? "preview" : "file" %> attachment--<%= blob.filename.extension %>">
+  <% if blob.representable? %>
+    <%= image_tag blob.representation(resize_to_limit: local_assigns[:in_gallery] ? [ 800, 600 ] : [ 1024, 768 ]) %>
+  <% end %>
+
+  <figcaption class="attachment__caption">
+    <% if caption = blob.try(:caption) %>
+      <%= caption %>
+    <% else %>
+      <span class="attachment__name"><%= blob.filename %></span>
+      <span class="attachment__size"><%= number_to_human_size blob.byte_size %></span>
+    <% end %>
+  </figcaption>
+</figure>
diff --git a/app/views/layouts/action_text/contents/_content.html.erb b/app/views/layouts/action_text/contents/_content.html.erb
new file mode 100644
index 000000000..9e3c0d0df
--- /dev/null
+++ b/app/views/layouts/action_text/contents/_content.html.erb
@@ -0,0 +1,3 @@
+<div class="trix-content">
+  <%= yield -%>
+</div>
diff --git a/db/migrate/20241204132029_create_active_storage_tables.active_storage.rb b/db/migrate/20241204132029_create_active_storage_tables.active_storage.rb
new file mode 100644
index 000000000..e4706aa21
--- /dev/null
+++ b/db/migrate/20241204132029_create_active_storage_tables.active_storage.rb
@@ -0,0 +1,57 @@
+# This migration comes from active_storage (originally 20170806125915)
+class CreateActiveStorageTables < ActiveRecord::Migration[7.0]
+  def change
+    # Use Active Record's configured type for primary and foreign keys
+    primary_key_type, foreign_key_type = primary_and_foreign_key_types
+
+    create_table :active_storage_blobs, id: primary_key_type do |t|
+      t.string   :key,          null: false
+      t.string   :filename,     null: false
+      t.string   :content_type
+      t.text     :metadata
+      t.string   :service_name, null: false
+      t.bigint   :byte_size,    null: false
+      t.string   :checksum
+
+      if connection.supports_datetime_with_precision?
+        t.datetime :created_at, precision: 6, null: false
+      else
+        t.datetime :created_at, null: false
+      end
+
+      t.index [ :key ], unique: true
+    end
+
+    create_table :active_storage_attachments, id: primary_key_type do |t|
+      t.string     :name,     null: false
+      t.references :record,   null: false, polymorphic: true, index: false, type: foreign_key_type
+      t.references :blob,     null: false, type: foreign_key_type
+
+      if connection.supports_datetime_with_precision?
+        t.datetime :created_at, precision: 6, null: false
+      else
+        t.datetime :created_at, null: false
+      end
+
+      t.index [ :record_type, :record_id, :name, :blob_id ], name: :index_active_storage_attachments_uniqueness, unique: true
+      t.foreign_key :active_storage_blobs, column: :blob_id
+    end
+
+    create_table :active_storage_variant_records, id: primary_key_type do |t|
+      t.belongs_to :blob, null: false, index: false, type: foreign_key_type
+      t.string :variation_digest, null: false
+
+      t.index [ :blob_id, :variation_digest ], name: :index_active_storage_variant_records_uniqueness, unique: true
+      t.foreign_key :active_storage_blobs, column: :blob_id
+    end
+  end
+
+  private
+    def primary_and_foreign_key_types
+      config = Rails.configuration.generators
+      setting = config.options[config.orm][:primary_key_type]
+      primary_key_type = setting || :primary_key
+      foreign_key_type = setting || :bigint
+      [primary_key_type, foreign_key_type]
+    end
+end
diff --git a/db/migrate/20241204132030_create_action_text_tables.action_text.rb b/db/migrate/20241204132030_create_action_text_tables.action_text.rb
new file mode 100644
index 000000000..1be48d70b
--- /dev/null
+++ b/db/migrate/20241204132030_create_action_text_tables.action_text.rb
@@ -0,0 +1,26 @@
+# This migration comes from action_text (originally 20180528164100)
+class CreateActionTextTables < ActiveRecord::Migration[6.0]
+  def change
+    # Use Active Record's configured type for primary and foreign keys
+    primary_key_type, foreign_key_type = primary_and_foreign_key_types
+
+    create_table :action_text_rich_texts, id: primary_key_type do |t|
+      t.string     :name, null: false
+      t.text       :body, size: :long
+      t.references :record, null: false, polymorphic: true, index: false, type: foreign_key_type
+
+      t.timestamps
+
+      t.index [ :record_type, :record_id, :name ], name: "index_action_text_rich_texts_uniqueness", unique: true
+    end
+  end
+
+  private
+    def primary_and_foreign_key_types
+      config = Rails.configuration.generators
+      setting = config.options[config.orm][:primary_key_type]
+      primary_key_type = setting || :primary_key
+      foreign_key_type = setting || :bigint
+      [primary_key_type, foreign_key_type]
+    end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 0a6d204ba..29c7fcaf9 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,11 +10,49 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.1].define(version: 2024_09_21_221000) do
+ActiveRecord::Schema[7.1].define(version: 2024_12_04_132030) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pgcrypto"
   enable_extension "plpgsql"
 
+  create_table "action_text_rich_texts", force: :cascade do |t|
+    t.string "name", null: false
+    t.text "body"
+    t.string "record_type", null: false
+    t.bigint "record_id", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["record_type", "record_id", "name"], name: "index_action_text_rich_texts_uniqueness", unique: true
+  end
+
+  create_table "active_storage_attachments", force: :cascade do |t|
+    t.string "name", null: false
+    t.string "record_type", null: false
+    t.bigint "record_id", null: false
+    t.bigint "blob_id", null: false
+    t.datetime "created_at", null: false
+    t.index ["blob_id"], name: "index_active_storage_attachments_on_blob_id"
+    t.index ["record_type", "record_id", "name", "blob_id"], name: "index_active_storage_attachments_uniqueness", unique: true
+  end
+
+  create_table "active_storage_blobs", force: :cascade do |t|
+    t.string "key", null: false
+    t.string "filename", null: false
+    t.string "content_type"
+    t.text "metadata"
+    t.string "service_name", null: false
+    t.bigint "byte_size", null: false
+    t.string "checksum"
+    t.datetime "created_at", null: false
+    t.index ["key"], name: "index_active_storage_blobs_on_key", unique: true
+  end
+
+  create_table "active_storage_variant_records", force: :cascade do |t|
+    t.bigint "blob_id", null: false
+    t.string "variation_digest", null: false
+    t.index ["blob_id", "variation_digest"], name: "index_active_storage_variant_records_uniqueness", unique: true
+  end
+
   create_table "annotations", force: :cascade do |t|
     t.bigint "medium_id", null: false
     t.bigint "user_id", null: false
@@ -962,6 +1000,8 @@
     t.index ["watchlist_entry_id"], name: "index_watchlists_on_watchlist_entry_id"
   end
 
+  add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id"
+  add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id"
   add_foreign_key "annotations", "media"
   add_foreign_key "annotations", "users"
   add_foreign_key "announcements", "lectures"
diff --git a/package.json b/package.json
index 92b90cc56..60f7c0edf 100644
--- a/package.json
+++ b/package.json
@@ -2,6 +2,7 @@
   "name": "mampf",
   "private": true,
   "dependencies": {
+    "@rails/actiontext": "^8.0.0",
     "@rails/webpacker": "5.4.4",
     "@webpack-cli/serve": "^1.7.0",
     "coffee-loader": "^1.0.1",
@@ -13,6 +14,7 @@
     "regenerator-runtime": "^0.13.11",
     "sass": "^1.63.4",
     "sass-loader": "^10.1.1",
+    "trix": "^2.1.8",
     "webpack": "^4.46.0",
     "webpack-cli": "^4.10.0",
     "webpack-dev-server": "^4.15.1"
diff --git a/yarn.lock b/yarn.lock
index 5399feb94..7fcd78eec 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1126,6 +1126,20 @@
     "@parcel/watcher-win32-ia32" "2.5.0"
     "@parcel/watcher-win32-x64" "2.5.0"
 
+"@rails/actiontext@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@rails/actiontext/-/actiontext-8.0.0.tgz#01133b7bbb2eb541890bf3a8bdc761fc27f9a649"
+  integrity sha512-8pvXDEHqlVHptzfYDUXmBpstHsfHAVacYxO47cWDRjRmp1zdVXusLcom8UvqkRdTcAPXpte+LkjcfpD9S4DSSQ==
+  dependencies:
+    "@rails/activestorage" ">= 8.0.0-alpha"
+
+"@rails/activestorage@>= 8.0.0-alpha":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@rails/activestorage/-/activestorage-8.0.0.tgz#be5dd10acc141b95ffa2b3026e61790c36f1679c"
+  integrity sha512-qoA7U1gMcWXhDnImwDIyRQDXkQKzThT2lu2Xpim8CnTOCEeAgkQ5Co2kzodpAI2grF1JSDvwXSPYNWwVAswndA==
+  dependencies:
+    spark-md5 "^3.0.1"
+
 "@rails/webpacker@5.4.4":
   version "5.4.4"
   resolved "https://registry.yarnpkg.com/@rails/webpacker/-/webpacker-5.4.4.tgz#971a41b987c096c908ce4088accd57c1a9a7e2f7"
@@ -7415,6 +7429,11 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
+spark-md5@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/spark-md5/-/spark-md5-3.0.2.tgz#7952c4a30784347abcee73268e473b9c0167e3fc"
+  integrity sha512-wcFzz9cDfbuqe0FZzfi2or1sgyIrsDwmPwfZC4hiNidPdPINjeUwNfv5kldczoEAcjl9Y1L3SM7Uz2PUEQzxQw==
+
 spdy-transport@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31"
@@ -7792,6 +7811,11 @@ toidentifier@1.0.1:
   resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
   integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==
 
+trix@^2.1.8:
+  version "2.1.8"
+  resolved "https://registry.yarnpkg.com/trix/-/trix-2.1.8.tgz#b9383af8cd9c1a0a0818d6b4e0c9e771bf7fd564"
+  integrity sha512-y1h5mKQcjMsZDsUOqOgyIUfw+Z31u4Fe9JqXtKGUzIC7FM9cTpxZFFWxQggwXBo18ccIKYx1Fn9toVO5mCpn9g==
+
 ts-api-utils@^1.0.1:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.4.3.tgz#bfc2215fe6528fecab2b0fba570a2e8a4263b064"

From 63c9672fec16077b9af7763f8f9e89be7e7f8906 Mon Sep 17 00:00:00 2001
From: Florian <florianbuerckel@gmail.com>
Date: Wed, 4 Dec 2024 14:40:38 +0100
Subject: [PATCH 002/103] add questionaire and slide model for vignettes

Signed-off-by: Florian <florianbuerckel@gmail.com>
---
 .../vignettes/questionnaires_controller.rb    | 22 ++++++++
 .../vignettes/slides_controller.rb            | 22 ++++++++
 .../vignettes/questionnaires_helper.rb        |  2 +
 app/helpers/vignettes/slides_helper.rb        |  2 +
 app/models/vignettes.rb                       |  5 ++
 app/models/vignettes/questionnaire.rb         |  5 ++
 app/models/vignettes/slide.rb                 |  6 +++
 .../vignettes/questionnaires/create.html.erb  |  2 +
 .../vignettes/questionnaires/destroy.html.erb |  2 +
 .../vignettes/questionnaires/edit.html.erb    |  2 +
 .../vignettes/questionnaires/index.html.erb   |  2 +
 .../vignettes/questionnaires/new.html.erb     |  2 +
 .../vignettes/questionnaires/show.html.erb    |  2 +
 .../vignettes/questionnaires/update.html.erb  |  2 +
 app/views/vignettes/slides/create.html.erb    |  2 +
 app/views/vignettes/slides/destroy.html.erb   |  2 +
 app/views/vignettes/slides/edit.html.erb      |  2 +
 app/views/vignettes/slides/index.html.erb     |  2 +
 app/views/vignettes/slides/new.html.erb       |  2 +
 app/views/vignettes/slides/show.html.erb      |  2 +
 app/views/vignettes/slides/update.html.erb    |  2 +
 config/routes.rb                              | 21 ++++++++
 ...4132354_create_vignettes_questionnaires.rb |  9 ++++
 .../20241204132407_create_vignettes_slides.rb |  9 ++++
 db/schema.rb                                  | 16 +++++-
 spec/factories/vignettes/questionnaires.rb    |  5 ++
 spec/factories/vignettes/slides.rb            |  6 +++
 .../vignettes/questionnaires_helper_spec.rb   | 15 ++++++
 spec/helpers/vignettes/slides_helper_spec.rb  | 15 ++++++
 spec/models/vignettes/questionnaire_spec.rb   |  5 ++
 spec/models/vignettes/slide_spec.rb           |  5 ++
 .../requests/vignettes/questionnaires_spec.rb | 53 +++++++++++++++++++
 spec/requests/vignettes/slides_spec.rb        | 53 +++++++++++++++++++
 .../questionnaires/create.html.erb_spec.rb    |  5 ++
 .../questionnaires/destroy.html.erb_spec.rb   |  5 ++
 .../questionnaires/edit.html.erb_spec.rb      |  5 ++
 .../questionnaires/index.html.erb_spec.rb     |  5 ++
 .../questionnaires/new.html.erb_spec.rb       |  5 ++
 .../questionnaires/show.html.erb_spec.rb      |  5 ++
 .../questionnaires/update.html.erb_spec.rb    |  5 ++
 .../vignettes/slides/create.html.erb_spec.rb  |  5 ++
 .../vignettes/slides/destroy.html.erb_spec.rb |  5 ++
 .../vignettes/slides/edit.html.erb_spec.rb    |  5 ++
 .../vignettes/slides/index.html.erb_spec.rb   |  5 ++
 .../vignettes/slides/new.html.erb_spec.rb     |  5 ++
 .../vignettes/slides/show.html.erb_spec.rb    |  5 ++
 .../vignettes/slides/update.html.erb_spec.rb  |  5 ++
 47 files changed, 373 insertions(+), 1 deletion(-)
 create mode 100644 app/controllers/vignettes/questionnaires_controller.rb
 create mode 100644 app/controllers/vignettes/slides_controller.rb
 create mode 100644 app/helpers/vignettes/questionnaires_helper.rb
 create mode 100644 app/helpers/vignettes/slides_helper.rb
 create mode 100644 app/models/vignettes.rb
 create mode 100644 app/models/vignettes/questionnaire.rb
 create mode 100644 app/models/vignettes/slide.rb
 create mode 100644 app/views/vignettes/questionnaires/create.html.erb
 create mode 100644 app/views/vignettes/questionnaires/destroy.html.erb
 create mode 100644 app/views/vignettes/questionnaires/edit.html.erb
 create mode 100644 app/views/vignettes/questionnaires/index.html.erb
 create mode 100644 app/views/vignettes/questionnaires/new.html.erb
 create mode 100644 app/views/vignettes/questionnaires/show.html.erb
 create mode 100644 app/views/vignettes/questionnaires/update.html.erb
 create mode 100644 app/views/vignettes/slides/create.html.erb
 create mode 100644 app/views/vignettes/slides/destroy.html.erb
 create mode 100644 app/views/vignettes/slides/edit.html.erb
 create mode 100644 app/views/vignettes/slides/index.html.erb
 create mode 100644 app/views/vignettes/slides/new.html.erb
 create mode 100644 app/views/vignettes/slides/show.html.erb
 create mode 100644 app/views/vignettes/slides/update.html.erb
 create mode 100644 db/migrate/20241204132354_create_vignettes_questionnaires.rb
 create mode 100644 db/migrate/20241204132407_create_vignettes_slides.rb
 create mode 100644 spec/factories/vignettes/questionnaires.rb
 create mode 100644 spec/factories/vignettes/slides.rb
 create mode 100644 spec/helpers/vignettes/questionnaires_helper_spec.rb
 create mode 100644 spec/helpers/vignettes/slides_helper_spec.rb
 create mode 100644 spec/models/vignettes/questionnaire_spec.rb
 create mode 100644 spec/models/vignettes/slide_spec.rb
 create mode 100644 spec/requests/vignettes/questionnaires_spec.rb
 create mode 100644 spec/requests/vignettes/slides_spec.rb
 create mode 100644 spec/views/vignettes/questionnaires/create.html.erb_spec.rb
 create mode 100644 spec/views/vignettes/questionnaires/destroy.html.erb_spec.rb
 create mode 100644 spec/views/vignettes/questionnaires/edit.html.erb_spec.rb
 create mode 100644 spec/views/vignettes/questionnaires/index.html.erb_spec.rb
 create mode 100644 spec/views/vignettes/questionnaires/new.html.erb_spec.rb
 create mode 100644 spec/views/vignettes/questionnaires/show.html.erb_spec.rb
 create mode 100644 spec/views/vignettes/questionnaires/update.html.erb_spec.rb
 create mode 100644 spec/views/vignettes/slides/create.html.erb_spec.rb
 create mode 100644 spec/views/vignettes/slides/destroy.html.erb_spec.rb
 create mode 100644 spec/views/vignettes/slides/edit.html.erb_spec.rb
 create mode 100644 spec/views/vignettes/slides/index.html.erb_spec.rb
 create mode 100644 spec/views/vignettes/slides/new.html.erb_spec.rb
 create mode 100644 spec/views/vignettes/slides/show.html.erb_spec.rb
 create mode 100644 spec/views/vignettes/slides/update.html.erb_spec.rb

diff --git a/app/controllers/vignettes/questionnaires_controller.rb b/app/controllers/vignettes/questionnaires_controller.rb
new file mode 100644
index 000000000..0f3942bcd
--- /dev/null
+++ b/app/controllers/vignettes/questionnaires_controller.rb
@@ -0,0 +1,22 @@
+class Vignettes::QuestionnairesController < ApplicationController
+  def index
+  end
+
+  def show
+  end
+
+  def new
+  end
+
+  def create
+  end
+
+  def edit
+  end
+
+  def update
+  end
+
+  def destroy
+  end
+end
diff --git a/app/controllers/vignettes/slides_controller.rb b/app/controllers/vignettes/slides_controller.rb
new file mode 100644
index 000000000..a4e54cd39
--- /dev/null
+++ b/app/controllers/vignettes/slides_controller.rb
@@ -0,0 +1,22 @@
+class Vignettes::SlidesController < ApplicationController
+  def index
+  end
+
+  def show
+  end
+
+  def new
+  end
+
+  def create
+  end
+
+  def edit
+  end
+
+  def update
+  end
+
+  def destroy
+  end
+end
diff --git a/app/helpers/vignettes/questionnaires_helper.rb b/app/helpers/vignettes/questionnaires_helper.rb
new file mode 100644
index 000000000..1dc3753e9
--- /dev/null
+++ b/app/helpers/vignettes/questionnaires_helper.rb
@@ -0,0 +1,2 @@
+module Vignettes::QuestionnairesHelper
+end
diff --git a/app/helpers/vignettes/slides_helper.rb b/app/helpers/vignettes/slides_helper.rb
new file mode 100644
index 000000000..9d82aa8d2
--- /dev/null
+++ b/app/helpers/vignettes/slides_helper.rb
@@ -0,0 +1,2 @@
+module Vignettes::SlidesHelper
+end
diff --git a/app/models/vignettes.rb b/app/models/vignettes.rb
new file mode 100644
index 000000000..b118ac843
--- /dev/null
+++ b/app/models/vignettes.rb
@@ -0,0 +1,5 @@
+module Vignettes
+  def self.table_name_prefix
+    "vignettes_"
+  end
+end
diff --git a/app/models/vignettes/questionnaire.rb b/app/models/vignettes/questionnaire.rb
new file mode 100644
index 000000000..a38152173
--- /dev/null
+++ b/app/models/vignettes/questionnaire.rb
@@ -0,0 +1,5 @@
+module Vignettes
+  class Questionnaire < ApplicationRecord
+    has_many :slides, dependent: :destroy
+  end
+end
diff --git a/app/models/vignettes/slide.rb b/app/models/vignettes/slide.rb
new file mode 100644
index 000000000..77460997c
--- /dev/null
+++ b/app/models/vignettes/slide.rb
@@ -0,0 +1,6 @@
+module Vignettes
+  class Slide < ApplicationRecord
+    belongs_to :questionnaire
+    has_rich_text :content
+  end
+end
diff --git a/app/views/vignettes/questionnaires/create.html.erb b/app/views/vignettes/questionnaires/create.html.erb
new file mode 100644
index 000000000..99c8ff6d1
--- /dev/null
+++ b/app/views/vignettes/questionnaires/create.html.erb
@@ -0,0 +1,2 @@
+<h1>Vignettes::Questionnaires#create</h1>
+<p>Find me in app/views/vignettes/questionnaires/create.html.erb</p>
diff --git a/app/views/vignettes/questionnaires/destroy.html.erb b/app/views/vignettes/questionnaires/destroy.html.erb
new file mode 100644
index 000000000..6d04570ad
--- /dev/null
+++ b/app/views/vignettes/questionnaires/destroy.html.erb
@@ -0,0 +1,2 @@
+<h1>Vignettes::Questionnaires#destroy</h1>
+<p>Find me in app/views/vignettes/questionnaires/destroy.html.erb</p>
diff --git a/app/views/vignettes/questionnaires/edit.html.erb b/app/views/vignettes/questionnaires/edit.html.erb
new file mode 100644
index 000000000..e28205dde
--- /dev/null
+++ b/app/views/vignettes/questionnaires/edit.html.erb
@@ -0,0 +1,2 @@
+<h1>Vignettes::Questionnaires#edit</h1>
+<p>Find me in app/views/vignettes/questionnaires/edit.html.erb</p>
diff --git a/app/views/vignettes/questionnaires/index.html.erb b/app/views/vignettes/questionnaires/index.html.erb
new file mode 100644
index 000000000..2d9e58aeb
--- /dev/null
+++ b/app/views/vignettes/questionnaires/index.html.erb
@@ -0,0 +1,2 @@
+<h1>Vignettes::Questionnaires#index</h1>
+<p>Find me in app/views/vignettes/questionnaires/index.html.erb</p>
diff --git a/app/views/vignettes/questionnaires/new.html.erb b/app/views/vignettes/questionnaires/new.html.erb
new file mode 100644
index 000000000..b6366f5ff
--- /dev/null
+++ b/app/views/vignettes/questionnaires/new.html.erb
@@ -0,0 +1,2 @@
+<h1>Vignettes::Questionnaires#new</h1>
+<p>Find me in app/views/vignettes/questionnaires/new.html.erb</p>
diff --git a/app/views/vignettes/questionnaires/show.html.erb b/app/views/vignettes/questionnaires/show.html.erb
new file mode 100644
index 000000000..f490def29
--- /dev/null
+++ b/app/views/vignettes/questionnaires/show.html.erb
@@ -0,0 +1,2 @@
+<h1>Vignettes::Questionnaires#show</h1>
+<p>Find me in app/views/vignettes/questionnaires/show.html.erb</p>
diff --git a/app/views/vignettes/questionnaires/update.html.erb b/app/views/vignettes/questionnaires/update.html.erb
new file mode 100644
index 000000000..4b2ab2794
--- /dev/null
+++ b/app/views/vignettes/questionnaires/update.html.erb
@@ -0,0 +1,2 @@
+<h1>Vignettes::Questionnaires#update</h1>
+<p>Find me in app/views/vignettes/questionnaires/update.html.erb</p>
diff --git a/app/views/vignettes/slides/create.html.erb b/app/views/vignettes/slides/create.html.erb
new file mode 100644
index 000000000..dfc01807c
--- /dev/null
+++ b/app/views/vignettes/slides/create.html.erb
@@ -0,0 +1,2 @@
+<h1>Vignettes::Slides#create</h1>
+<p>Find me in app/views/vignettes/slides/create.html.erb</p>
diff --git a/app/views/vignettes/slides/destroy.html.erb b/app/views/vignettes/slides/destroy.html.erb
new file mode 100644
index 000000000..85a83ef18
--- /dev/null
+++ b/app/views/vignettes/slides/destroy.html.erb
@@ -0,0 +1,2 @@
+<h1>Vignettes::Slides#destroy</h1>
+<p>Find me in app/views/vignettes/slides/destroy.html.erb</p>
diff --git a/app/views/vignettes/slides/edit.html.erb b/app/views/vignettes/slides/edit.html.erb
new file mode 100644
index 000000000..75c8efd20
--- /dev/null
+++ b/app/views/vignettes/slides/edit.html.erb
@@ -0,0 +1,2 @@
+<h1>Vignettes::Slides#edit</h1>
+<p>Find me in app/views/vignettes/slides/edit.html.erb</p>
diff --git a/app/views/vignettes/slides/index.html.erb b/app/views/vignettes/slides/index.html.erb
new file mode 100644
index 000000000..b63293821
--- /dev/null
+++ b/app/views/vignettes/slides/index.html.erb
@@ -0,0 +1,2 @@
+<h1>Vignettes::Slides#index</h1>
+<p>Find me in app/views/vignettes/slides/index.html.erb</p>
diff --git a/app/views/vignettes/slides/new.html.erb b/app/views/vignettes/slides/new.html.erb
new file mode 100644
index 000000000..0d878fe23
--- /dev/null
+++ b/app/views/vignettes/slides/new.html.erb
@@ -0,0 +1,2 @@
+<h1>Vignettes::Slides#new</h1>
+<p>Find me in app/views/vignettes/slides/new.html.erb</p>
diff --git a/app/views/vignettes/slides/show.html.erb b/app/views/vignettes/slides/show.html.erb
new file mode 100644
index 000000000..7947d6abe
--- /dev/null
+++ b/app/views/vignettes/slides/show.html.erb
@@ -0,0 +1,2 @@
+<h1>Vignettes::Slides#show</h1>
+<p>Find me in app/views/vignettes/slides/show.html.erb</p>
diff --git a/app/views/vignettes/slides/update.html.erb b/app/views/vignettes/slides/update.html.erb
new file mode 100644
index 000000000..7fb2828e4
--- /dev/null
+++ b/app/views/vignettes/slides/update.html.erb
@@ -0,0 +1,2 @@
+<h1>Vignettes::Slides#update</h1>
+<p>Find me in app/views/vignettes/slides/update.html.erb</p>
diff --git a/config/routes.rb b/config/routes.rb
index f567579cd..77fce6cb7 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -561,6 +561,27 @@
     resources :vertices, except: [:index, :show, :edit]
   end
 
+  # vignettes routes
+  namespace :vignettes do
+    get 'slides/index'
+    get 'slides/show'
+    get 'slides/new'
+    get 'slides/create'
+    get 'slides/edit'
+    get 'slides/update'
+    get 'slides/destroy'
+    get 'questionnaires/index'
+    get 'questionnaires/show'
+    get 'questionnaires/new'
+    get 'questionnaires/create'
+    get 'questionnaires/edit'
+    get 'questionnaires/update'
+    get 'questionnaires/destroy'
+    resources :questionnaires do
+      resources :slides
+    end
+  end
+
   # readers routes
 
   patch "readers/update",
diff --git a/db/migrate/20241204132354_create_vignettes_questionnaires.rb b/db/migrate/20241204132354_create_vignettes_questionnaires.rb
new file mode 100644
index 000000000..37e074575
--- /dev/null
+++ b/db/migrate/20241204132354_create_vignettes_questionnaires.rb
@@ -0,0 +1,9 @@
+class CreateVignettesQuestionnaires < ActiveRecord::Migration[7.1]
+  def change
+    create_table :vignettes_questionnaires do |t|
+      t.string :title
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20241204132407_create_vignettes_slides.rb b/db/migrate/20241204132407_create_vignettes_slides.rb
new file mode 100644
index 000000000..d1ccc77ed
--- /dev/null
+++ b/db/migrate/20241204132407_create_vignettes_slides.rb
@@ -0,0 +1,9 @@
+class CreateVignettesSlides < ActiveRecord::Migration[7.1]
+  def change
+    create_table :vignettes_slides do |t|
+      t.references :vignettes_questionnaire, null: false, foreign_key: true
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 29c7fcaf9..c9facb30b 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.1].define(version: 2024_12_04_132030) do
+ActiveRecord::Schema[7.1].define(version: 2024_12_04_132407) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pgcrypto"
   enable_extension "plpgsql"
@@ -943,6 +943,19 @@
     t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
   end
 
+  create_table "vignettes_questionnaires", force: :cascade do |t|
+    t.string "title"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
+  create_table "vignettes_slides", force: :cascade do |t|
+    t.bigint "vignettes_questionnaire_id", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["vignettes_questionnaire_id"], name: "index_vignettes_slides_on_vignettes_questionnaire_id"
+  end
+
   create_table "votes", force: :cascade do |t|
     t.string "votable_type"
     t.bigint "votable_id"
@@ -1047,6 +1060,7 @@
   add_foreign_key "user_favorite_lecture_joins", "lectures"
   add_foreign_key "user_favorite_lecture_joins", "users"
   add_foreign_key "user_submission_joins", "users"
+  add_foreign_key "vignettes_slides", "vignettes_questionnaires"
   add_foreign_key "vouchers", "lectures"
   add_foreign_key "watchlist_entries", "media"
   add_foreign_key "watchlist_entries", "watchlists"
diff --git a/spec/factories/vignettes/questionnaires.rb b/spec/factories/vignettes/questionnaires.rb
new file mode 100644
index 000000000..7ae3ba864
--- /dev/null
+++ b/spec/factories/vignettes/questionnaires.rb
@@ -0,0 +1,5 @@
+FactoryBot.define do
+  factory :vignettes_questionnaire, class: 'Vignettes::Questionnaire' do
+    title { "MyString" }
+  end
+end
diff --git a/spec/factories/vignettes/slides.rb b/spec/factories/vignettes/slides.rb
new file mode 100644
index 000000000..eabab927b
--- /dev/null
+++ b/spec/factories/vignettes/slides.rb
@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :vignettes_slide, class: 'Vignettes::Slide' do
+    questionnaire { nil }
+    content { nil }
+  end
+end
diff --git a/spec/helpers/vignettes/questionnaires_helper_spec.rb b/spec/helpers/vignettes/questionnaires_helper_spec.rb
new file mode 100644
index 000000000..009a4f672
--- /dev/null
+++ b/spec/helpers/vignettes/questionnaires_helper_spec.rb
@@ -0,0 +1,15 @@
+require 'rails_helper'
+
+# Specs in this file have access to a helper object that includes
+# the Vignettes::QuestionnairesHelper. For example:
+#
+# describe Vignettes::QuestionnairesHelper do
+#   describe "string concat" do
+#     it "concats two strings with spaces" do
+#       expect(helper.concat_strings("this","that")).to eq("this that")
+#     end
+#   end
+# end
+RSpec.describe Vignettes::QuestionnairesHelper, type: :helper do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/helpers/vignettes/slides_helper_spec.rb b/spec/helpers/vignettes/slides_helper_spec.rb
new file mode 100644
index 000000000..85ae90fbb
--- /dev/null
+++ b/spec/helpers/vignettes/slides_helper_spec.rb
@@ -0,0 +1,15 @@
+require 'rails_helper'
+
+# Specs in this file have access to a helper object that includes
+# the Vignettes::SlidesHelper. For example:
+#
+# describe Vignettes::SlidesHelper do
+#   describe "string concat" do
+#     it "concats two strings with spaces" do
+#       expect(helper.concat_strings("this","that")).to eq("this that")
+#     end
+#   end
+# end
+RSpec.describe Vignettes::SlidesHelper, type: :helper do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/models/vignettes/questionnaire_spec.rb b/spec/models/vignettes/questionnaire_spec.rb
new file mode 100644
index 000000000..8fc5b7c72
--- /dev/null
+++ b/spec/models/vignettes/questionnaire_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe Vignettes::Questionnaire, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/models/vignettes/slide_spec.rb b/spec/models/vignettes/slide_spec.rb
new file mode 100644
index 000000000..fe0d7f6b3
--- /dev/null
+++ b/spec/models/vignettes/slide_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe Vignettes::Slide, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/requests/vignettes/questionnaires_spec.rb b/spec/requests/vignettes/questionnaires_spec.rb
new file mode 100644
index 000000000..ac5d63b76
--- /dev/null
+++ b/spec/requests/vignettes/questionnaires_spec.rb
@@ -0,0 +1,53 @@
+require 'rails_helper'
+
+RSpec.describe "Vignettes::Questionnaires", type: :request do
+  describe "GET /index" do
+    it "returns http success" do
+      get "/vignettes/questionnaires/index"
+      expect(response).to have_http_status(:success)
+    end
+  end
+
+  describe "GET /show" do
+    it "returns http success" do
+      get "/vignettes/questionnaires/show"
+      expect(response).to have_http_status(:success)
+    end
+  end
+
+  describe "GET /new" do
+    it "returns http success" do
+      get "/vignettes/questionnaires/new"
+      expect(response).to have_http_status(:success)
+    end
+  end
+
+  describe "GET /create" do
+    it "returns http success" do
+      get "/vignettes/questionnaires/create"
+      expect(response).to have_http_status(:success)
+    end
+  end
+
+  describe "GET /edit" do
+    it "returns http success" do
+      get "/vignettes/questionnaires/edit"
+      expect(response).to have_http_status(:success)
+    end
+  end
+
+  describe "GET /update" do
+    it "returns http success" do
+      get "/vignettes/questionnaires/update"
+      expect(response).to have_http_status(:success)
+    end
+  end
+
+  describe "GET /destroy" do
+    it "returns http success" do
+      get "/vignettes/questionnaires/destroy"
+      expect(response).to have_http_status(:success)
+    end
+  end
+
+end
diff --git a/spec/requests/vignettes/slides_spec.rb b/spec/requests/vignettes/slides_spec.rb
new file mode 100644
index 000000000..968b1f14f
--- /dev/null
+++ b/spec/requests/vignettes/slides_spec.rb
@@ -0,0 +1,53 @@
+require 'rails_helper'
+
+RSpec.describe "Vignettes::Slides", type: :request do
+  describe "GET /index" do
+    it "returns http success" do
+      get "/vignettes/slides/index"
+      expect(response).to have_http_status(:success)
+    end
+  end
+
+  describe "GET /show" do
+    it "returns http success" do
+      get "/vignettes/slides/show"
+      expect(response).to have_http_status(:success)
+    end
+  end
+
+  describe "GET /new" do
+    it "returns http success" do
+      get "/vignettes/slides/new"
+      expect(response).to have_http_status(:success)
+    end
+  end
+
+  describe "GET /create" do
+    it "returns http success" do
+      get "/vignettes/slides/create"
+      expect(response).to have_http_status(:success)
+    end
+  end
+
+  describe "GET /edit" do
+    it "returns http success" do
+      get "/vignettes/slides/edit"
+      expect(response).to have_http_status(:success)
+    end
+  end
+
+  describe "GET /update" do
+    it "returns http success" do
+      get "/vignettes/slides/update"
+      expect(response).to have_http_status(:success)
+    end
+  end
+
+  describe "GET /destroy" do
+    it "returns http success" do
+      get "/vignettes/slides/destroy"
+      expect(response).to have_http_status(:success)
+    end
+  end
+
+end
diff --git a/spec/views/vignettes/questionnaires/create.html.erb_spec.rb b/spec/views/vignettes/questionnaires/create.html.erb_spec.rb
new file mode 100644
index 000000000..f1a74e4ed
--- /dev/null
+++ b/spec/views/vignettes/questionnaires/create.html.erb_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe "questionnaires/create.html.erb", type: :view do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/views/vignettes/questionnaires/destroy.html.erb_spec.rb b/spec/views/vignettes/questionnaires/destroy.html.erb_spec.rb
new file mode 100644
index 000000000..b0a776f71
--- /dev/null
+++ b/spec/views/vignettes/questionnaires/destroy.html.erb_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe "questionnaires/destroy.html.erb", type: :view do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/views/vignettes/questionnaires/edit.html.erb_spec.rb b/spec/views/vignettes/questionnaires/edit.html.erb_spec.rb
new file mode 100644
index 000000000..cdd07dc2d
--- /dev/null
+++ b/spec/views/vignettes/questionnaires/edit.html.erb_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe "questionnaires/edit.html.erb", type: :view do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/views/vignettes/questionnaires/index.html.erb_spec.rb b/spec/views/vignettes/questionnaires/index.html.erb_spec.rb
new file mode 100644
index 000000000..0f8ab3c4b
--- /dev/null
+++ b/spec/views/vignettes/questionnaires/index.html.erb_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe "questionnaires/index.html.erb", type: :view do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/views/vignettes/questionnaires/new.html.erb_spec.rb b/spec/views/vignettes/questionnaires/new.html.erb_spec.rb
new file mode 100644
index 000000000..0f7656fce
--- /dev/null
+++ b/spec/views/vignettes/questionnaires/new.html.erb_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe "questionnaires/new.html.erb", type: :view do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/views/vignettes/questionnaires/show.html.erb_spec.rb b/spec/views/vignettes/questionnaires/show.html.erb_spec.rb
new file mode 100644
index 000000000..dd8f2f440
--- /dev/null
+++ b/spec/views/vignettes/questionnaires/show.html.erb_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe "questionnaires/show.html.erb", type: :view do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/views/vignettes/questionnaires/update.html.erb_spec.rb b/spec/views/vignettes/questionnaires/update.html.erb_spec.rb
new file mode 100644
index 000000000..86f285c7b
--- /dev/null
+++ b/spec/views/vignettes/questionnaires/update.html.erb_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe "questionnaires/update.html.erb", type: :view do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/views/vignettes/slides/create.html.erb_spec.rb b/spec/views/vignettes/slides/create.html.erb_spec.rb
new file mode 100644
index 000000000..fada1b1e1
--- /dev/null
+++ b/spec/views/vignettes/slides/create.html.erb_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe "slides/create.html.erb", type: :view do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/views/vignettes/slides/destroy.html.erb_spec.rb b/spec/views/vignettes/slides/destroy.html.erb_spec.rb
new file mode 100644
index 000000000..77e93ad3c
--- /dev/null
+++ b/spec/views/vignettes/slides/destroy.html.erb_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe "slides/destroy.html.erb", type: :view do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/views/vignettes/slides/edit.html.erb_spec.rb b/spec/views/vignettes/slides/edit.html.erb_spec.rb
new file mode 100644
index 000000000..0b3cd04d6
--- /dev/null
+++ b/spec/views/vignettes/slides/edit.html.erb_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe "slides/edit.html.erb", type: :view do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/views/vignettes/slides/index.html.erb_spec.rb b/spec/views/vignettes/slides/index.html.erb_spec.rb
new file mode 100644
index 000000000..d40718a37
--- /dev/null
+++ b/spec/views/vignettes/slides/index.html.erb_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe "slides/index.html.erb", type: :view do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/views/vignettes/slides/new.html.erb_spec.rb b/spec/views/vignettes/slides/new.html.erb_spec.rb
new file mode 100644
index 000000000..72ac17646
--- /dev/null
+++ b/spec/views/vignettes/slides/new.html.erb_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe "slides/new.html.erb", type: :view do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/views/vignettes/slides/show.html.erb_spec.rb b/spec/views/vignettes/slides/show.html.erb_spec.rb
new file mode 100644
index 000000000..a2abbc42c
--- /dev/null
+++ b/spec/views/vignettes/slides/show.html.erb_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe "slides/show.html.erb", type: :view do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/views/vignettes/slides/update.html.erb_spec.rb b/spec/views/vignettes/slides/update.html.erb_spec.rb
new file mode 100644
index 000000000..8342a8929
--- /dev/null
+++ b/spec/views/vignettes/slides/update.html.erb_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe "slides/update.html.erb", type: :view do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

From 0664a270cbb767c4acedcd3e376cd6f0b1f1c85f Mon Sep 17 00:00:00 2001
From: Florian <florianbuerckel@gmail.com>
Date: Thu, 5 Dec 2024 17:04:46 +0100
Subject: [PATCH 003/103] add basic views for create, list and edit
 questionnaire and slides

Signed-off-by: Florian <florianbuerckel@gmail.com>
---
 .../vignettes/questionnaires_controller.rb    | 40 ++++++++++++-------
 .../vignettes/slides_controller.rb            | 40 ++++++++++++-------
 app/models/vignettes/questionnaire.rb         |  4 +-
 app/models/vignettes/slide.rb                 |  2 +-
 .../vignettes/questionnaires/edit.html.erb    |  3 +-
 .../vignettes/questionnaires/index.html.erb   | 12 +++++-
 .../vignettes/questionnaires/new.html.erb     | 12 +++++-
 .../vignettes/questionnaires/show.html.erb    | 11 ++++-
 app/views/vignettes/slides/new.html.erb       | 16 +++++++-
 config/application.rb                         |  2 +-
 config/routes.rb                              | 14 -------
 11 files changed, 101 insertions(+), 55 deletions(-)

diff --git a/app/controllers/vignettes/questionnaires_controller.rb b/app/controllers/vignettes/questionnaires_controller.rb
index 0f3942bcd..96e7f54d6 100644
--- a/app/controllers/vignettes/questionnaires_controller.rb
+++ b/app/controllers/vignettes/questionnaires_controller.rb
@@ -1,22 +1,34 @@
-class Vignettes::QuestionnairesController < ApplicationController
-  def index
-  end
+module Vignettes
+  class QuestionnairesController < ApplicationController
+    def index
+      @questionnaires = Questionnaire.all
+    end
 
-  def show
-  end
+    def show
+      @questionnaire = Questionnaire.find(params[:id])
+    end
 
-  def new
-  end
+    def new
+      @questionnaire = Questionnaire.new
+    end
 
-  def create
-  end
+    def create
+      @questionnaire = Questionnaire.new(questionnaire_params)
+      if @questionnaire.save
+        redirect_to @questionnaire
+      else
+        render :new, status: :unprocessable_entity
+      end
+    end
 
-  def edit
-  end
+    def edit
+      @questionnaire = Questionnaire.find(params[:id])
+    end
 
-  def update
-  end
+    private
 
-  def destroy
+      def questionnaire_params
+        params.require(:questionnaire).permit(:title)
+      end
   end
 end
diff --git a/app/controllers/vignettes/slides_controller.rb b/app/controllers/vignettes/slides_controller.rb
index a4e54cd39..1c2fa03b8 100644
--- a/app/controllers/vignettes/slides_controller.rb
+++ b/app/controllers/vignettes/slides_controller.rb
@@ -1,22 +1,34 @@
-class Vignettes::SlidesController < ApplicationController
-  def index
-  end
+module Vignettes
+  class SlidesController < ApplicationController
+    before_action :set_questionnaire
+    def index
+    end
 
-  def show
-  end
+    def show
+      @slide = @questionnaire.slides.find(params[:id])
+    end
 
-  def new
-  end
+    def new
+      @slide = @questionnaire.slides.new
+    end
 
-  def create
-  end
+    def create
+      @slide = @questionnaire.slides.new(slide_params)
+      if @slide.save
+        redirect_to @questionnaire, notice: "Slide was successfully created"
+      else
+        render :new, status: :unprocessable_entity
+      end
+    end
 
-  def edit
-  end
+    private
 
-  def update
-  end
+      def set_questionnaire
+        @questionnaire = Questionnaire.find(params[:questionnaire_id])
+      end
 
-  def destroy
+      def slide_params
+        params.require(:slide).permit(:content)
+      end
   end
 end
diff --git a/app/models/vignettes/questionnaire.rb b/app/models/vignettes/questionnaire.rb
index a38152173..73041f3b6 100644
--- a/app/models/vignettes/questionnaire.rb
+++ b/app/models/vignettes/questionnaire.rb
@@ -1,5 +1,7 @@
 module Vignettes
   class Questionnaire < ApplicationRecord
-    has_many :slides, dependent: :destroy
+    has_many :slides,
+             foreign_key: "vignettes_questionnaire_id",
+             dependent: :destroy
   end
 end
diff --git a/app/models/vignettes/slide.rb b/app/models/vignettes/slide.rb
index 77460997c..cd187990a 100644
--- a/app/models/vignettes/slide.rb
+++ b/app/models/vignettes/slide.rb
@@ -1,6 +1,6 @@
 module Vignettes
   class Slide < ApplicationRecord
-    belongs_to :questionnaire
+    belongs_to :questionnaire, foreign_key: "vignettes_questionnaire_id"
     has_rich_text :content
   end
 end
diff --git a/app/views/vignettes/questionnaires/edit.html.erb b/app/views/vignettes/questionnaires/edit.html.erb
index e28205dde..5f6b801b7 100644
--- a/app/views/vignettes/questionnaires/edit.html.erb
+++ b/app/views/vignettes/questionnaires/edit.html.erb
@@ -1,2 +1 @@
-<h1>Vignettes::Questionnaires#edit</h1>
-<p>Find me in app/views/vignettes/questionnaires/edit.html.erb</p>
+<%= button_to 'Create new slide', new_vignettes_questionnaire_slide_path(@questionnaire), method: :get, class: 'btn btn-primary' %>
diff --git a/app/views/vignettes/questionnaires/index.html.erb b/app/views/vignettes/questionnaires/index.html.erb
index 2d9e58aeb..c03293afc 100644
--- a/app/views/vignettes/questionnaires/index.html.erb
+++ b/app/views/vignettes/questionnaires/index.html.erb
@@ -1,2 +1,10 @@
-<h1>Vignettes::Questionnaires#index</h1>
-<p>Find me in app/views/vignettes/questionnaires/index.html.erb</p>
+<h1>Vignetten</h1>
+
+<ul>
+    <% @questionnaires.each do |questionnaire| %>
+        <li>
+            <%= questionnaire.title %>
+        </li>
+    <%end%>
+</ul>
+<%= button_to 'Create new Vignette', new_vignettes_questionnaire_path(), method: :get, class: 'btn btn-primary' %>
\ No newline at end of file
diff --git a/app/views/vignettes/questionnaires/new.html.erb b/app/views/vignettes/questionnaires/new.html.erb
index b6366f5ff..0496a7c16 100644
--- a/app/views/vignettes/questionnaires/new.html.erb
+++ b/app/views/vignettes/questionnaires/new.html.erb
@@ -1,2 +1,10 @@
-<h1>Vignettes::Questionnaires#new</h1>
-<p>Find me in app/views/vignettes/questionnaires/new.html.erb</p>
+<%= form_with local: true, scope: :questionnaire, model: @questionnaire do |form| %>
+    <div>
+        <%= form.label :title %> <br>
+        <%= form.text_field :title %>
+    </div>
+    <br>
+    <div>
+        <%= form.submit 'Create Questionnaire', class: 'btn btn-primary'%>
+    </div>
+<%end%>
diff --git a/app/views/vignettes/questionnaires/show.html.erb b/app/views/vignettes/questionnaires/show.html.erb
index f490def29..3c52e4f72 100644
--- a/app/views/vignettes/questionnaires/show.html.erb
+++ b/app/views/vignettes/questionnaires/show.html.erb
@@ -1,2 +1,9 @@
-<h1>Vignettes::Questionnaires#show</h1>
-<p>Find me in app/views/vignettes/questionnaires/show.html.erb</p>
+<h1> Slides for vignette <%= @questionnaire.title %> </h1>
+<ul>
+    <% @questionnaire.slides.each do |slide| %>
+    <li>
+        <%= slide.title %>
+    </li>
+    <% end %>
+</ul>
+<%= button_to 'Create new slide', new_vignettes_questionnaire_slide_path(@questionnaire), method: :get, class: 'btn btn-primary' %>
\ No newline at end of file
diff --git a/app/views/vignettes/slides/new.html.erb b/app/views/vignettes/slides/new.html.erb
index 0d878fe23..0feda7e10 100644
--- a/app/views/vignettes/slides/new.html.erb
+++ b/app/views/vignettes/slides/new.html.erb
@@ -1,2 +1,14 @@
-<h1>Vignettes::Slides#new</h1>
-<p>Find me in app/views/vignettes/slides/new.html.erb</p>
+<%= form_with(model: @slide, url: vignettes_questionnaire_slides_path(@questionnaire), local: true) do |form| %>
+<!-- Other form fields for Slide -->
+
+<%= form.label :title%>
+<br>
+<%= form.text_field :title%> 
+
+<br>
+
+<%= form.label :content %>
+<%= form.rich_text_area :content %>
+
+<%= form.submit 'Create Slide' %>
+<% end %>
diff --git a/config/application.rb b/config/application.rb
index de5fae844..901c42a6f 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -14,7 +14,7 @@ class Application < Rails::Application
 
     # Autoload subfolders of modules (recursively)
     # https://stackoverflow.com/a/4794775/
-    additional_paths = Rails.root.glob("app/models/**/")
+    additional_paths = Rails.root.glob("app/models/voucher/")
     config.autoload_paths += additional_paths
     config.eager_load_paths += additional_paths
 
diff --git a/config/routes.rb b/config/routes.rb
index 77fce6cb7..86e9492eb 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -563,20 +563,6 @@
 
   # vignettes routes
   namespace :vignettes do
-    get 'slides/index'
-    get 'slides/show'
-    get 'slides/new'
-    get 'slides/create'
-    get 'slides/edit'
-    get 'slides/update'
-    get 'slides/destroy'
-    get 'questionnaires/index'
-    get 'questionnaires/show'
-    get 'questionnaires/new'
-    get 'questionnaires/create'
-    get 'questionnaires/edit'
-    get 'questionnaires/update'
-    get 'questionnaires/destroy'
     resources :questionnaires do
       resources :slides
     end

From a1f4762ce4eae9c001794908811fd26856853a18 Mon Sep 17 00:00:00 2001
From: Florian <florianbuerckel@gmail.com>
Date: Sun, 8 Dec 2024 21:32:10 +0100
Subject: [PATCH 004/103] add modal create vignette panel

Signed-off-by: Florian <florianbuerckel@gmail.com>
---
 .../vignettes/questionnaires_controller.rb          |  4 +++-
 app/controllers/vignettes/slides_controller.rb      |  2 +-
 .../questionnaires/_vignette_form.html.erb          |  9 +++++++++
 .../questionnaires/_vignette_modal.html.erb         | 13 +++++++++++++
 app/views/vignettes/questionnaires/edit.html.erb    |  9 +++++++++
 app/views/vignettes/questionnaires/index.html.erb   |  8 ++++++--
 app/views/vignettes/questionnaires/show.html.erb    |  4 ++--
 config/application.rb                               |  5 ++++-
 8 files changed, 47 insertions(+), 7 deletions(-)
 create mode 100644 app/views/vignettes/questionnaires/_vignette_form.html.erb
 create mode 100644 app/views/vignettes/questionnaires/_vignette_modal.html.erb

diff --git a/app/controllers/vignettes/questionnaires_controller.rb b/app/controllers/vignettes/questionnaires_controller.rb
index 96e7f54d6..904e47548 100644
--- a/app/controllers/vignettes/questionnaires_controller.rb
+++ b/app/controllers/vignettes/questionnaires_controller.rb
@@ -2,6 +2,8 @@ module Vignettes
   class QuestionnairesController < ApplicationController
     def index
       @questionnaires = Questionnaire.all
+      # Because the create model form works on the index page.
+      @questionnaire = Questionnaire.new
     end
 
     def show
@@ -28,7 +30,7 @@ def edit
     private
 
       def questionnaire_params
-        params.require(:questionnaire).permit(:title)
+        params.require(:vignettes_questionnaire).permit(:title)
       end
   end
 end
diff --git a/app/controllers/vignettes/slides_controller.rb b/app/controllers/vignettes/slides_controller.rb
index 1c2fa03b8..5c7a7f9e6 100644
--- a/app/controllers/vignettes/slides_controller.rb
+++ b/app/controllers/vignettes/slides_controller.rb
@@ -28,7 +28,7 @@ def set_questionnaire
       end
 
       def slide_params
-        params.require(:slide).permit(:content)
+        params.require(:vignettes_slide).permit(:content)
       end
   end
 end
diff --git a/app/views/vignettes/questionnaires/_vignette_form.html.erb b/app/views/vignettes/questionnaires/_vignette_form.html.erb
new file mode 100644
index 000000000..e9fce2e21
--- /dev/null
+++ b/app/views/vignettes/questionnaires/_vignette_form.html.erb
@@ -0,0 +1,9 @@
+<%= form_with(model: @questionnaire, local: true) do |form| %>
+  <div class="mb-3">
+    <%= form.label :title %>
+    <%= form.text_field :title, class: 'form-control', placeholder: 'Enter title' %>
+  </div>
+  <div class="mb-3">
+    <%= form.submit 'Create Vignette', class: 'btn btn-primary' %>
+  </div>
+<% end %>
\ No newline at end of file
diff --git a/app/views/vignettes/questionnaires/_vignette_modal.html.erb b/app/views/vignettes/questionnaires/_vignette_modal.html.erb
new file mode 100644
index 000000000..dc8393783
--- /dev/null
+++ b/app/views/vignettes/questionnaires/_vignette_modal.html.erb
@@ -0,0 +1,13 @@
+<div class="modal fade" id="vignetteModal" tabindex="-1" role="dialog" aria-labelledby="vignetteModalLabel" aria-hidden="true">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title" id="vignetteModalLabel">Create New Vignette</h5>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+      </div>
+      <div class="modal-body">
+        <%= render 'vignettes/questionnaires/vignette_form' %>
+      </div>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/views/vignettes/questionnaires/edit.html.erb b/app/views/vignettes/questionnaires/edit.html.erb
index 5f6b801b7..628c47f5e 100644
--- a/app/views/vignettes/questionnaires/edit.html.erb
+++ b/app/views/vignettes/questionnaires/edit.html.erb
@@ -1 +1,10 @@
+<h1> Slides </h1>
+
+<ul>
+    <% @questionnaire.slides.each() do |slide| %>
+        <li>
+            <%= link_to slide.id, edit_vignettes_questionnaire_slide_path(slide) %>
+        </li>
+    <%end%>
+</ul>
 <%= button_to 'Create new slide', new_vignettes_questionnaire_slide_path(@questionnaire), method: :get, class: 'btn btn-primary' %>
diff --git a/app/views/vignettes/questionnaires/index.html.erb b/app/views/vignettes/questionnaires/index.html.erb
index c03293afc..6c99a8367 100644
--- a/app/views/vignettes/questionnaires/index.html.erb
+++ b/app/views/vignettes/questionnaires/index.html.erb
@@ -3,8 +3,12 @@
 <ul>
     <% @questionnaires.each do |questionnaire| %>
         <li>
-            <%= questionnaire.title %>
+            <%= link_to questionnaire.title, edit_vignettes_questionnaire_path(questionnaire) %>
         </li>
     <%end%>
 </ul>
-<%= button_to 'Create new Vignette', new_vignettes_questionnaire_path(), method: :get, class: 'btn btn-primary' %>
\ No newline at end of file
+<button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#vignetteModal">
+  Create new Vignette
+</button>
+
+<%= render 'vignettes/questionnaires/vignette_modal' %>
\ No newline at end of file
diff --git a/app/views/vignettes/questionnaires/show.html.erb b/app/views/vignettes/questionnaires/show.html.erb
index 3c52e4f72..197a4d1e4 100644
--- a/app/views/vignettes/questionnaires/show.html.erb
+++ b/app/views/vignettes/questionnaires/show.html.erb
@@ -2,8 +2,8 @@
 <ul>
     <% @questionnaire.slides.each do |slide| %>
     <li>
-        <%= slide.title %>
+        <%= slide.id %>
     </li>
     <% end %>
 </ul>
-<%= button_to 'Create new slide', new_vignettes_questionnaire_slide_path(@questionnaire), method: :get, class: 'btn btn-primary' %>
\ No newline at end of file
+<%= button_to 'Edit vignette', edit_vignettes_questionnaire_path(@questionnaire), method: :get, class: 'btn btn-primary' %>
\ No newline at end of file
diff --git a/config/application.rb b/config/application.rb
index 901c42a6f..45e82a3fd 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -14,9 +14,12 @@ class Application < Rails::Application
 
     # Autoload subfolders of modules (recursively)
     # https://stackoverflow.com/a/4794775/
-    additional_paths = Rails.root.glob("app/models/voucher/")
+    additional_paths = Rails.root.glob("app/models/**/")
+    namespace_paths = Rails.root.glob("app/models/vignettes/**/")
     config.autoload_paths += additional_paths
     config.eager_load_paths += additional_paths
+    config.autoload_paths -= namespace_paths
+    config.eager_load_paths -= namespace_paths
 
     # Autoload lib extensions path
     config.autoload_lib(ignore: ["assets", "collectors", "core_ext", "scrapers", "tasks"])

From d59dbf04a6d50eedcf83226026d97bc0917c024c Mon Sep 17 00:00:00 2001
From: Florian <florianbuerckel@gmail.com>
Date: Tue, 10 Dec 2024 17:11:46 +0100
Subject: [PATCH 005/103] Update action of slide

Signed-off-by: Florian <florianbuerckel@gmail.com>
---
 app/assets/stylesheets/application.scss         |  6 +++---
 app/controllers/vignettes/slides_controller.rb  | 13 +++++++++++++
 .../vignettes/questionnaires/edit.html.erb      |  2 +-
 .../vignettes/questionnaires/show.html.erb      |  2 +-
 app/views/vignettes/slides/_form.html.erb       | 17 +++++++++++++++++
 app/views/vignettes/slides/edit.html.erb        |  6 ++++--
 app/views/vignettes/slides/new.html.erb         | 15 ++-------------
 app/views/vignettes/slides/show.html.erb        |  3 +--
 8 files changed, 42 insertions(+), 22 deletions(-)
 create mode 100644 app/views/vignettes/slides/_form.html.erb

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index eaa73aa06..6d1d6c9ab 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -68,9 +68,9 @@ trix-toolbar .trix-button-row {
   flex-wrap: wrap;
 }
 
-.trix-button-group--file-tools {
-  display: none !important;
-}
+// .trix-button-group--file-tools {
+//   display: none !important;
+// }
 
 .kaviar-sidebar {
   padding-left: 1rem;
diff --git a/app/controllers/vignettes/slides_controller.rb b/app/controllers/vignettes/slides_controller.rb
index 5c7a7f9e6..5861660e0 100644
--- a/app/controllers/vignettes/slides_controller.rb
+++ b/app/controllers/vignettes/slides_controller.rb
@@ -12,6 +12,10 @@ def new
       @slide = @questionnaire.slides.new
     end
 
+    def edit
+      @slide = @questionnaire.slides.find(params[:id])
+    end
+
     def create
       @slide = @questionnaire.slides.new(slide_params)
       if @slide.save
@@ -21,6 +25,15 @@ def create
       end
     end
 
+    def update
+      @slide = @questionnaire.slides.find(params[:id])
+      if @slide.update(slide_params)
+        redirect_to @questionnaire, notice: "Slide was successfully updated"
+      else
+        render :edit, status: :unprocessable_entity
+      end
+    end
+
     private
 
       def set_questionnaire
diff --git a/app/views/vignettes/questionnaires/edit.html.erb b/app/views/vignettes/questionnaires/edit.html.erb
index 628c47f5e..87715de2d 100644
--- a/app/views/vignettes/questionnaires/edit.html.erb
+++ b/app/views/vignettes/questionnaires/edit.html.erb
@@ -3,7 +3,7 @@
 <ul>
     <% @questionnaire.slides.each() do |slide| %>
         <li>
-            <%= link_to slide.id, edit_vignettes_questionnaire_slide_path(slide) %>
+            <%= link_to slide.id, edit_vignettes_questionnaire_slide_path(@questionnaire, slide) %>
         </li>
     <%end%>
 </ul>
diff --git a/app/views/vignettes/questionnaires/show.html.erb b/app/views/vignettes/questionnaires/show.html.erb
index 197a4d1e4..e15e0ab98 100644
--- a/app/views/vignettes/questionnaires/show.html.erb
+++ b/app/views/vignettes/questionnaires/show.html.erb
@@ -2,7 +2,7 @@
 <ul>
     <% @questionnaire.slides.each do |slide| %>
     <li>
-        <%= slide.id %>
+        <%= link_to slide.id, vignettes_questionnaire_slide_path(@questionnaire, slide) %>
     </li>
     <% end %>
 </ul>
diff --git a/app/views/vignettes/slides/_form.html.erb b/app/views/vignettes/slides/_form.html.erb
new file mode 100644
index 000000000..c1e7d2a66
--- /dev/null
+++ b/app/views/vignettes/slides/_form.html.erb
@@ -0,0 +1,17 @@
+<%= form_with(
+      model: [@questionnaire, @slide],
+      url: @slide.new_record? ? vignettes_questionnaire_slides_path(@questionnaire) : vignettes_questionnaire_slide_path(@questionnaire, @slide),
+      local: true
+    ) do |form| %>
+  <div>
+    <%= form.label :title %><br>
+    <%= form.text_field :title %>
+  </div>
+  <div>
+    <%= form.label :content %><br>
+    <%= form.rich_text_area :content %>
+  </div>
+  <div>
+    <%= form.submit @slide.new_record? ? 'Create Slide' : 'Update Slide' %>
+  </div>
+<% end %>
\ No newline at end of file
diff --git a/app/views/vignettes/slides/edit.html.erb b/app/views/vignettes/slides/edit.html.erb
index 75c8efd20..943bba215 100644
--- a/app/views/vignettes/slides/edit.html.erb
+++ b/app/views/vignettes/slides/edit.html.erb
@@ -1,2 +1,4 @@
-<h1>Vignettes::Slides#edit</h1>
-<p>Find me in app/views/vignettes/slides/edit.html.erb</p>
+<!-- app/views/vignettes/slides/edit.html.erb -->
+<h1>Edit Slide</h1>
+
+<%= render 'form' %>
diff --git a/app/views/vignettes/slides/new.html.erb b/app/views/vignettes/slides/new.html.erb
index 0feda7e10..aaa474add 100644
--- a/app/views/vignettes/slides/new.html.erb
+++ b/app/views/vignettes/slides/new.html.erb
@@ -1,14 +1,3 @@
-<%= form_with(model: @slide, url: vignettes_questionnaire_slides_path(@questionnaire), local: true) do |form| %>
-<!-- Other form fields for Slide -->
+<h1>New Slide</h1>
 
-<%= form.label :title%>
-<br>
-<%= form.text_field :title%> 
-
-<br>
-
-<%= form.label :content %>
-<%= form.rich_text_area :content %>
-
-<%= form.submit 'Create Slide' %>
-<% end %>
+<%= render 'form' %>
diff --git a/app/views/vignettes/slides/show.html.erb b/app/views/vignettes/slides/show.html.erb
index 7947d6abe..3fb5911b5 100644
--- a/app/views/vignettes/slides/show.html.erb
+++ b/app/views/vignettes/slides/show.html.erb
@@ -1,2 +1 @@
-<h1>Vignettes::Slides#show</h1>
-<p>Find me in app/views/vignettes/slides/show.html.erb</p>
+<%= @slide.content %>
\ No newline at end of file

From 12ef9b53572773889ebeb54e04d14f64391c7592 Mon Sep 17 00:00:00 2001
From: Florian <florianbuerckel@gmail.com>
Date: Sun, 15 Dec 2024 17:39:54 +0100
Subject: [PATCH 006/103] add import statement of trix in application.js

Signed-off-by: Florian <florianbuerckel@gmail.com>
---
 app/javascript/packs/application.js       | 5 +++++
 app/views/vignettes/slides/_form.html.erb | 1 -
 db/schema.rb                              | 8 +++++++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js
index 889b776c1..86f78216f 100644
--- a/app/javascript/packs/application.js
+++ b/app/javascript/packs/application.js
@@ -18,6 +18,11 @@ import {
   WidgetInstance,
 } from "friendly-challenge";
 
+import "trix";
+import "@rails/actiontext";
+import * as ActiveStorage from "@rails/activestorage";
+ActiveStorage.start();
+
 document.addEventListener("turbolinks:load", function () {
   var doneCallback, element, options;
 
diff --git a/app/views/vignettes/slides/_form.html.erb b/app/views/vignettes/slides/_form.html.erb
index c1e7d2a66..e0cddad03 100644
--- a/app/views/vignettes/slides/_form.html.erb
+++ b/app/views/vignettes/slides/_form.html.erb
@@ -1,7 +1,6 @@
 <%= form_with(
       model: [@questionnaire, @slide],
       url: @slide.new_record? ? vignettes_questionnaire_slides_path(@questionnaire) : vignettes_questionnaire_slide_path(@questionnaire, @slide),
-      local: true
     ) do |form| %>
   <div>
     <%= form.label :title %><br>
diff --git a/db/schema.rb b/db/schema.rb
index c9facb30b..4375da35a 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.1].define(version: 2024_12_04_132407) do
+ActiveRecord::Schema[7.1].define(version: 2024_12_15_132228) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pgcrypto"
   enable_extension "plpgsql"
@@ -103,6 +103,12 @@
     t.index ["medium_id"], name: "index_assignments_on_medium_id"
   end
 
+  create_table "blogs", force: :cascade do |t|
+    t.string "title"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
   create_table "chapters", force: :cascade do |t|
     t.integer "lecture_id"
     t.string "title"

From 0002f39821726357fcfc5df9c5e18f598dfc4535 Mon Sep 17 00:00:00 2001
From: Florian <florianbuerckel@gmail.com>
Date: Sun, 15 Dec 2024 17:48:59 +0100
Subject: [PATCH 007/103] rebased dev into vignette

Signed-off-by: Florian <florianbuerckel@gmail.com>
---
 spec/models/user_cleaner_spec.rb              |  93 ++++-
 .../models/user_cleaner_spec_BACKUP_140121.rb | 352 ++++++++++++++++++
 spec/models/user_cleaner_spec_BASE_140121.rb  | 282 ++++++++++++++
 spec/models/user_cleaner_spec_LOCAL_140121.rb | 336 +++++++++++++++++
 .../models/user_cleaner_spec_REMOTE_140121.rb | 329 ++++++++++++++++
 5 files changed, 1387 insertions(+), 5 deletions(-)
 create mode 100644 spec/models/user_cleaner_spec_BACKUP_140121.rb
 create mode 100644 spec/models/user_cleaner_spec_BASE_140121.rb
 create mode 100644 spec/models/user_cleaner_spec_LOCAL_140121.rb
 create mode 100644 spec/models/user_cleaner_spec_REMOTE_140121.rb

diff --git a/spec/models/user_cleaner_spec.rb b/spec/models/user_cleaner_spec.rb
index eb00e07ad..3b2b01178 100644
--- a/spec/models/user_cleaner_spec.rb
+++ b/spec/models/user_cleaner_spec.rb
@@ -4,15 +4,18 @@
   # Non-generic users are either admins, teachers or editors
   let(:user_admin) do
     return FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day, admin: true)
+    return FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day, admin: true)
   end
 
   let(:user_teacher) do
+    user_teacher = FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day)
     user_teacher = FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day)
     FactoryBot.create(:lecture, teacher: user_teacher)
     return user_teacher
   end
 
   let(:user_editor) do
+    user_editor = FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day)
     user_editor = FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day)
     FactoryBot.create(:lecture, editors: [user_editor])
     return user_editor
@@ -23,6 +26,15 @@
   end
 
   describe("#inactive_users") do
+    context "when user is confirmed" do
+      it "counts users without current_sign_in_at date as inactive" do
+        # but only if also the confirmation date is older than the threshold
+        FactoryBot.create(:confirmed_user, :with_confirmation_sent_date,
+                          confirmation_sent_date: 5.months.ago, current_sign_in_at: nil)
+        FactoryBot.create(:confirmed_user, :with_confirmation_sent_date,
+                          confirmation_sent_date: 7.months.ago, current_sign_in_at: nil)
+        expect(UserCleaner.new.inactive_users.count).to eq(1)
+      end
     context "when user is confirmed" do
       it "counts users without current_sign_in_at date as inactive" do
         # but only if also the confirmation date is older than the threshold
@@ -37,7 +49,46 @@
         FactoryBot.create(:confirmed_user, current_sign_in_at: 7.months.ago)
         expect(UserCleaner.new.inactive_users.count).to eq(1)
       end
+      it("counts users with current_sign_in_at date older than threshold as inactive") do
+        FactoryBot.create(:confirmed_user, current_sign_in_at: 7.months.ago)
+        expect(UserCleaner.new.inactive_users.count).to eq(1)
+      end
+
+      it "does not count users with current_sign_in_at date younger than threshold as inactive" do
+        FactoryBot.create(:confirmed_user, current_sign_in_at: 5.months.ago)
+        expect(UserCleaner.new.inactive_users.count).to eq(0)
+      end
+    end
+
+    context "when user is not confirmed yet" do
+      def test_non_confirmed_user(confirmation_sent_date, expected_inactive_users_count)
+        user = FactoryBot.create(:user, :with_confirmation_sent_date,
+                                 confirmation_sent_date: confirmation_sent_date,
+                                 current_sign_in_at: nil)
+        FactoryBot.create(:user, :with_confirmation_sent_date,
+                          confirmation_sent_date: confirmation_sent_date,
+                          current_sign_in_at: 5.months.ago)
+        FactoryBot.create(:user, :with_confirmation_sent_date,
+                          confirmation_sent_date: confirmation_sent_date,
+                          current_sign_in_at: 7.months.ago)
+
+        expect(user.confirmed_at).to be_nil
+        expect(user.confirmation_sent_at).to eq(confirmation_sent_date)
+
+        expect(UserCleaner.new.inactive_users.count).to eq(expected_inactive_users_count)
+      end
+
+      context "when registration was recently" do
+        it "does not count user as inactive regardless of value of last_sign_in_date" do
+          test_non_confirmed_user(5.days.ago, 0)
+        end
+      end
 
+      context "when registration was long ago" do
+        it "counts users as inactive regardless of value of last_sign_in_date" do
+          test_non_confirmed_user(7.months.ago, 3)
+        end
+      end
       it "does not count users with current_sign_in_at date younger than threshold as inactive" do
         FactoryBot.create(:confirmed_user, current_sign_in_at: 5.months.ago)
         expect(UserCleaner.new.inactive_users.count).to eq(0)
@@ -83,14 +134,20 @@ def test_non_confirmed_user(confirmation_sent_date, expected_inactive_users_coun
         inactive_user2 = FactoryBot.create(:user, :with_confirmation_sent_date,
                                            confirmation_sent_date: 7.months.ago)
         active_user = FactoryBot.create(:confirmed_user, current_sign_in_at: 5.months.ago)
+        inactive_user = FactoryBot.create(:confirmed_user, current_sign_in_at: 7.months.ago)
+        inactive_user2 = FactoryBot.create(:user, :with_confirmation_sent_date,
+                                           confirmation_sent_date: 7.months.ago)
+        active_user = FactoryBot.create(:confirmed_user, current_sign_in_at: 5.months.ago)
 
         UserCleaner.new.set_deletion_date_for_inactive_users
         inactive_user.reload
         inactive_user2.reload
+        inactive_user2.reload
         active_user.reload
 
         expect(inactive_user.deletion_date).to eq(Date.current + 40.days)
         expect(inactive_user2.deletion_date).to eq(Date.current + 40.days)
+        expect(inactive_user2.deletion_date).to eq(Date.current + 40.days)
         expect(active_user.deletion_date).to be_nil
       end
 
@@ -98,6 +155,8 @@ def test_non_confirmed_user(confirmation_sent_date, expected_inactive_users_coun
         max_deletions = 3
         UserCleaner::MAX_DELETIONS_PER_RUN = max_deletions
 
+        FactoryBot.create_list(:confirmed_user, max_deletions + 2,
+                               current_sign_in_at: 7.months.ago)
         FactoryBot.create_list(:confirmed_user, max_deletions + 2,
                                current_sign_in_at: 7.months.ago)
 
@@ -115,13 +174,20 @@ def test_non_confirmed_user(confirmation_sent_date, expected_inactive_users_coun
         user2 = FactoryBot.create(:user, :with_confirmation_sent_date,
                                   confirmation_sent_date: 7.months.ago,
                                   deletion_date: Date.current + 44.days)
+        user = FactoryBot.create(:confirmed_user, current_sign_in_at: 7.months.ago,
+                                                  deletion_date: Date.current + 42.days)
+        user2 = FactoryBot.create(:user, :with_confirmation_sent_date,
+                                  confirmation_sent_date: 7.months.ago,
+                                  deletion_date: Date.current + 44.days)
 
         UserCleaner.new.set_deletion_date_for_inactive_users
         user.reload
         user2.reload
+        user2.reload
 
         expect(user.deletion_date).to eq(Date.current + 42.days)
         expect(user2.deletion_date).to eq(Date.current + 44.days)
+        expect(user2.deletion_date).to eq(Date.current + 44.days)
       end
     end
 
@@ -133,6 +199,12 @@ def test_non_confirmed_user(confirmation_sent_date, expected_inactive_users_coun
                                                           current_sign_in_at: 6.months.ago - 1.day)
       user_active = FactoryBot.create(:confirmed_user, deletion_date: deletion_date,
                                                        current_sign_in_at: 2.days.ago)
+      user_inactive = FactoryBot.create(:confirmed_user, deletion_date: deletion_date,
+                                                         current_sign_in_at: 7.months.ago)
+      user_inactive2 = FactoryBot.create(:confirmed_user, deletion_date: deletion_date,
+                                                          current_sign_in_at: 6.months.ago - 1.day)
+      user_active = FactoryBot.create(:confirmed_user, deletion_date: deletion_date,
+                                                       current_sign_in_at: 2.days.ago)
 
       UserCleaner.new.unset_deletion_date_for_recently_active_users
       user_inactive.reload
@@ -150,6 +222,9 @@ def test_non_confirmed_user(confirmation_sent_date, expected_inactive_users_coun
       user_past1 = FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day)
       user_past2 = FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.year)
       user_present = FactoryBot.create(:confirmed_user, deletion_date: Date.current)
+      user_past1 = FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day)
+      user_past2 = FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.year)
+      user_present = FactoryBot.create(:confirmed_user, deletion_date: Date.current)
 
       UserCleaner.new.delete_users_according_to_deletion_date!
 
@@ -161,6 +236,8 @@ def test_non_confirmed_user(confirmation_sent_date, expected_inactive_users_coun
     it "does not delete users with a deletion date in the future" do
       user_future1 = FactoryBot.create(:confirmed_user, deletion_date: Date.current + 1.day)
       user_future2 = FactoryBot.create(:confirmed_user, deletion_date: Date.current + 1.year)
+      user_future1 = FactoryBot.create(:confirmed_user, deletion_date: Date.current + 1.day)
+      user_future2 = FactoryBot.create(:confirmed_user, deletion_date: Date.current + 1.year)
 
       UserCleaner.new.delete_users_according_to_deletion_date!
 
@@ -169,12 +246,14 @@ def test_non_confirmed_user(confirmation_sent_date, expected_inactive_users_coun
     end
 
     it "does not delete users without a deletion date" do
+      user = FactoryBot.create(:confirmed_user, deletion_date: nil)
       user = FactoryBot.create(:confirmed_user, deletion_date: nil)
       UserCleaner.new.delete_users_according_to_deletion_date!
       expect(User.where(id: user.id)).to exist
     end
 
     it "deletes only generic users" do
+      user_generic = FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day)
       user_generic = FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day)
       user_admin
       user_teacher
@@ -192,7 +271,7 @@ def test_non_confirmed_user(confirmation_sent_date, expected_inactive_users_coun
   describe("mails") do
     context "when setting a deletion date" do
       it "enqueues a deletion warning mail (40 days)" do
-        user = FactoryBot.create(:confirmed_user, current_sign_in_at: 7.months.ago)
+        FactoryBot.create(:confirmed_user, current_sign_in_at: 7.months.ago)
 
         expect do
           UserCleaner.new.set_deletion_date_for_inactive_users
@@ -213,7 +292,7 @@ def test_non_confirmed_user(confirmation_sent_date, expected_inactive_users_coun
 
     context "when a deletion date is assigned" do
       def test_enqueues_additional_deletion_warning_mails(num_days)
-        user = FactoryBot.create(:confirmed_user, deletion_date: Date.current + num_days.days)
+        FactoryBot.create(:confirmed_user, deletion_date: Date.current + num_days.days)
 
         expect do
           UserCleaner.new.send_additional_warning_mails
@@ -229,6 +308,7 @@ def test_enqueues_additional_deletion_warning_mails(num_days)
 
       it "does not enqueue an additional deletion warning mail for 40 days" do
         FactoryBot.create(:confirmed_user, deletion_date: Date.current + 40.days)
+        FactoryBot.create(:confirmed_user, deletion_date: Date.current + 40.days)
 
         expect do
           UserCleaner.new.send_additional_warning_mails
@@ -248,7 +328,7 @@ def test_enqueues_additional_deletion_warning_mails(num_days)
 
     context "when a user is finally deleted" do
       it "enqueues a deletion mail" do
-        user = FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day)
+        FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day)
 
         expect do
           UserCleaner.new.delete_users_according_to_deletion_date!
@@ -261,11 +341,12 @@ def test_enqueues_additional_deletion_warning_mails(num_days)
   describe("#pending_deletion_mail") do
     let(:user_de) { FactoryBot.create(:confirmed_user, locale: "de") }
     let(:user_en) { FactoryBot.create(:confirmed_user, locale: "en") }
+    let(:user_de) { FactoryBot.create(:confirmed_user, locale: "de") }
+    let(:user_en) { FactoryBot.create(:confirmed_user, locale: "en") }
 
     def test_subject_line(num_days)
       user = FactoryBot.create(:confirmed_user)
-      mailer = UserCleanerMailer
-               .pending_deletion_email(user.email, user.locale, num_days)
+      mailer = UserCleanerMailer.with(user: user).pending_deletion_email(num_days)
       expect(mailer.subject).to include(num_days.to_s)
     end
 
@@ -307,6 +388,8 @@ def test_subject_line(num_days)
   describe("#deletion_mail") do
     let(:user_de) { FactoryBot.create(:confirmed_user, locale: "de") }
     let(:user_en) { FactoryBot.create(:confirmed_user, locale: "en") }
+    let(:user_de) { FactoryBot.create(:confirmed_user, locale: "de") }
+    let(:user_en) { FactoryBot.create(:confirmed_user, locale: "en") }
 
     it "has mail subject localized to the user's locale" do
       mailer = UserCleanerMailer.deletion_email(user_de.email, user_de.locale)
diff --git a/spec/models/user_cleaner_spec_BACKUP_140121.rb b/spec/models/user_cleaner_spec_BACKUP_140121.rb
new file mode 100644
index 000000000..d53b20697
--- /dev/null
+++ b/spec/models/user_cleaner_spec_BACKUP_140121.rb
@@ -0,0 +1,352 @@
+require "rails_helper"
+
+RSpec.describe(UserCleaner, type: :model) do
+  # Non-generic users are either admins, teachers or editors
+  let(:user_admin) do
+    return FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day, admin: true)
+  end
+
+  let(:user_teacher) do
+    user_teacher = FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day)
+    FactoryBot.create(:lecture, teacher: user_teacher)
+    return user_teacher
+  end
+
+  let(:user_editor) do
+    user_editor = FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day)
+    FactoryBot.create(:lecture, editors: [user_editor])
+    return user_editor
+  end
+
+  before(:each) do
+    UserCleaner::INACTIVE_USER_THRESHOLD = 6.months
+  end
+
+  describe("#inactive_users") do
+    context "when user is confirmed" do
+      it "counts users without current_sign_in_at date as inactive" do
+        # but only if also the confirmation date is older than the threshold
+        FactoryBot.create(:confirmed_user, :with_confirmation_sent_date,
+                          confirmation_sent_date: 5.months.ago, current_sign_in_at: nil)
+        FactoryBot.create(:confirmed_user, :with_confirmation_sent_date,
+                          confirmation_sent_date: 7.months.ago, current_sign_in_at: nil)
+        expect(UserCleaner.new.inactive_users.count).to eq(1)
+      end
+
+      it("counts users with current_sign_in_at date older than threshold as inactive") do
+        FactoryBot.create(:confirmed_user, current_sign_in_at: 7.months.ago)
+        expect(UserCleaner.new.inactive_users.count).to eq(1)
+      end
+
+      it "does not count users with current_sign_in_at date younger than threshold as inactive" do
+        FactoryBot.create(:confirmed_user, current_sign_in_at: 5.months.ago)
+        expect(UserCleaner.new.inactive_users.count).to eq(0)
+      end
+    end
+
+    context "when user is not confirmed yet" do
+      def test_non_confirmed_user(confirmation_sent_date, expected_inactive_users_count)
+        user = FactoryBot.create(:user, :with_confirmation_sent_date,
+                                 confirmation_sent_date: confirmation_sent_date,
+                                 current_sign_in_at: nil)
+        FactoryBot.create(:user, :with_confirmation_sent_date,
+                          confirmation_sent_date: confirmation_sent_date,
+                          current_sign_in_at: 5.months.ago)
+        FactoryBot.create(:user, :with_confirmation_sent_date,
+                          confirmation_sent_date: confirmation_sent_date,
+                          current_sign_in_at: 7.months.ago)
+
+        expect(user.confirmed_at).to be_nil
+        expect(user.confirmation_sent_at).to eq(confirmation_sent_date)
+
+        expect(UserCleaner.new.inactive_users.count).to eq(expected_inactive_users_count)
+      end
+
+      context "when registration was recently" do
+        it "does not count user as inactive regardless of value of last_sign_in_date" do
+          test_non_confirmed_user(5.days.ago, 0)
+        end
+      end
+
+      context "when registration was long ago" do
+        it "counts users as inactive regardless of value of last_sign_in_date" do
+          test_non_confirmed_user(7.months.ago, 3)
+        end
+      end
+    end
+  end
+
+  describe("#set/unset_deletion_date") do
+    context "when deletion date is nil" do
+      it "assigns a deletion date to inactive users" do
+        inactive_user = FactoryBot.create(:confirmed_user, current_sign_in_at: 7.months.ago)
+        inactive_user2 = FactoryBot.create(:user, :with_confirmation_sent_date,
+                                           confirmation_sent_date: 7.months.ago)
+        active_user = FactoryBot.create(:confirmed_user, current_sign_in_at: 5.months.ago)
+
+        UserCleaner.new.set_deletion_date_for_inactive_users
+        inactive_user.reload
+        inactive_user2.reload
+        active_user.reload
+
+        expect(inactive_user.deletion_date).to eq(Date.current + 40.days)
+        expect(inactive_user2.deletion_date).to eq(Date.current + 40.days)
+        expect(active_user.deletion_date).to be_nil
+      end
+
+      it "only assigns a deletion date to a limited number of users" do
+        max_deletions = 3
+        UserCleaner::MAX_DELETIONS_PER_RUN = max_deletions
+
+        FactoryBot.create_list(:confirmed_user, max_deletions + 2,
+                               current_sign_in_at: 7.months.ago)
+
+        UserCleaner.new.set_deletion_date_for_inactive_users
+
+        users_flagged = User.where(deletion_date: Date.current + 40.days)
+        expect(users_flagged.count).to eq(max_deletions)
+      end
+    end
+
+    context "when a deletion date is assigned" do
+      it "does not overwrite the deletion date" do
+        user = FactoryBot.create(:confirmed_user, current_sign_in_at: 7.months.ago,
+                                                  deletion_date: Date.current + 42.days)
+        user2 = FactoryBot.create(:user, :with_confirmation_sent_date,
+                                  confirmation_sent_date: 7.months.ago,
+                                  deletion_date: Date.current + 44.days)
+
+        UserCleaner.new.set_deletion_date_for_inactive_users
+        user.reload
+        user2.reload
+
+        expect(user.deletion_date).to eq(Date.current + 42.days)
+        expect(user2.deletion_date).to eq(Date.current + 44.days)
+      end
+    end
+
+    it "unassigns a deletion date from recently active users" do
+      deletion_date = Date.current + 5.days
+      user_inactive = FactoryBot.create(:confirmed_user, deletion_date: deletion_date,
+                                                         current_sign_in_at: 7.months.ago)
+      user_inactive2 = FactoryBot.create(:confirmed_user, deletion_date: deletion_date,
+                                                          current_sign_in_at: 6.months.ago - 1.day)
+      user_active = FactoryBot.create(:confirmed_user, deletion_date: deletion_date,
+                                                       current_sign_in_at: 2.days.ago)
+
+      UserCleaner.new.unset_deletion_date_for_recently_active_users
+      user_inactive.reload
+      user_inactive2.reload
+      user_active.reload
+
+      expect(user_inactive.deletion_date).to eq(deletion_date)
+      expect(user_inactive2.deletion_date).to eq(deletion_date)
+      expect(user_active.deletion_date).to be_nil
+    end
+  end
+
+  describe("#delete_users") do
+    it "deletes users with a deletion date in the past or present" do
+      user_past1 = FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day)
+      user_past2 = FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.year)
+      user_present = FactoryBot.create(:confirmed_user, deletion_date: Date.current)
+
+      UserCleaner.new.delete_users_according_to_deletion_date!
+
+      expect(User.where(id: user_past1.id)).not_to exist
+      expect(User.where(id: user_past2.id)).not_to exist
+      expect(User.where(id: user_present.id)).not_to exist
+    end
+
+    it "does not delete users with a deletion date in the future" do
+      user_future1 = FactoryBot.create(:confirmed_user, deletion_date: Date.current + 1.day)
+      user_future2 = FactoryBot.create(:confirmed_user, deletion_date: Date.current + 1.year)
+
+      UserCleaner.new.delete_users_according_to_deletion_date!
+
+      expect(User.where(id: user_future1.id)).to exist
+      expect(User.where(id: user_future2.id)).to exist
+    end
+
+    it "does not delete users without a deletion date" do
+      user = FactoryBot.create(:confirmed_user, deletion_date: nil)
+      UserCleaner.new.delete_users_according_to_deletion_date!
+      expect(User.where(id: user.id)).to exist
+    end
+
+    it "deletes only generic users" do
+      user_generic = FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day)
+      user_admin
+      user_teacher
+      user_editor
+
+      UserCleaner.new.delete_users_according_to_deletion_date!
+
+      expect(User.where(id: user_generic.id)).not_to exist
+      expect(User.where(id: user_admin.id)).to exist
+      expect(User.where(id: user_teacher.id)).to exist
+      expect(User.where(id: user_editor.id)).to exist
+    end
+  end
+
+  describe("mails") do
+    context "when setting a deletion date" do
+      it "enqueues a deletion warning mail (40 days)" do
+<<<<<<< HEAD
+        user = FactoryBot.create(:confirmed_user, current_sign_in_at: 7.months.ago)
+=======
+        FactoryBot.create(:confirmed_user, current_sign_in_at: 7.months.ago)
+>>>>>>> 2dc4bd6b (Deal with registration edge cases in UserCleaner (#693) (#716))
+
+        expect do
+          UserCleaner.new.set_deletion_date_for_inactive_users
+        end.to(have_enqueued_mail(UserCleanerMailer, :pending_deletion_email)
+          .with(user.email, user.locale, 40))
+      end
+
+      it "does not enqueue a deletion warning mail (40 days) for non-generic users" do
+        user_admin
+        user_teacher
+        user_editor
+
+        expect do
+          UserCleaner.new.set_deletion_date_for_inactive_users
+        end.not_to have_enqueued_mail(UserCleanerMailer, :pending_deletion_email)
+      end
+    end
+
+    context "when a deletion date is assigned" do
+      def test_enqueues_additional_deletion_warning_mails(num_days)
+<<<<<<< HEAD
+        user = FactoryBot.create(:confirmed_user, deletion_date: Date.current + num_days.days)
+=======
+        FactoryBot.create(:confirmed_user, deletion_date: Date.current + num_days.days)
+>>>>>>> 2dc4bd6b (Deal with registration edge cases in UserCleaner (#693) (#716))
+
+        expect do
+          UserCleaner.new.send_additional_warning_mails
+        end.to(have_enqueued_mail(UserCleanerMailer, :pending_deletion_email)
+        .with(user.email, user.locale, num_days))
+      end
+
+      it "enqueues additional deletion warning mails" do
+        test_enqueues_additional_deletion_warning_mails(14)
+        test_enqueues_additional_deletion_warning_mails(7)
+        test_enqueues_additional_deletion_warning_mails(2)
+      end
+
+      it "does not enqueue an additional deletion warning mail for 40 days" do
+        FactoryBot.create(:confirmed_user, deletion_date: Date.current + 40.days)
+
+        expect do
+          UserCleaner.new.send_additional_warning_mails
+        end.not_to have_enqueued_mail(UserCleanerMailer, :pending_deletion_email)
+      end
+
+      it "does not enqueue additional deletion warning mails for non-generic users" do
+        user_admin.update(deletion_date: Date.current + 14.days)
+        user_teacher.update(deletion_date: Date.current + 7.days)
+        user_editor.update(deletion_date: Date.current + 2.days)
+
+        expect do
+          UserCleaner.new.send_additional_warning_mails
+        end.not_to have_enqueued_mail(UserCleanerMailer, :pending_deletion_email)
+      end
+    end
+
+    context "when a user is finally deleted" do
+      it "enqueues a deletion mail" do
+<<<<<<< HEAD
+        user = FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day)
+=======
+        FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day)
+>>>>>>> 2dc4bd6b (Deal with registration edge cases in UserCleaner (#693) (#716))
+
+        expect do
+          UserCleaner.new.delete_users_according_to_deletion_date!
+        end.to(have_enqueued_mail(UserCleanerMailer, :deletion_email)
+          .with(user.email, user.locale))
+      end
+    end
+  end
+
+  describe("#pending_deletion_mail") do
+    let(:user_de) { FactoryBot.create(:confirmed_user, locale: "de") }
+    let(:user_en) { FactoryBot.create(:confirmed_user, locale: "en") }
+
+    def test_subject_line(num_days)
+      user = FactoryBot.create(:confirmed_user)
+<<<<<<< HEAD
+      mailer = UserCleanerMailer
+               .pending_deletion_email(user.email, user.locale, num_days)
+=======
+      mailer = UserCleanerMailer.with(user: user).pending_deletion_email(num_days)
+>>>>>>> 2dc4bd6b (Deal with registration edge cases in UserCleaner (#693) (#716))
+      expect(mailer.subject).to include(num_days.to_s)
+    end
+
+    it "has mail subject containing the number of days until deletion" do
+      test_subject_line(40)
+      test_subject_line(14)
+      test_subject_line(7)
+      test_subject_line(2)
+    end
+
+    it "has mail subject localized to the user's locale" do
+      mailer = UserCleanerMailer
+               .pending_deletion_email(user_de.email, user_de.locale, 40)
+      expect(mailer.subject).to include("Tage")
+      expect(mailer.subject).not_to include("days")
+
+      mailer = UserCleanerMailer
+               .pending_deletion_email(user_en.email, user_en.locale, 40)
+      expect(mailer.subject).to include("days")
+      expect(mailer.subject).not_to include("Tage")
+    end
+
+    it "has mail body localized to the user's locale" do
+      expected_de = "verloren"
+      expected_en = "lost"
+
+      mailer = UserCleanerMailer
+               .pending_deletion_email(user_de.email, user_de.locale, 40)
+      expect(mailer.html_part.body).to include(expected_de)
+      expect(mailer.html_part.body).not_to include(expected_en)
+
+      mailer = UserCleanerMailer
+               .pending_deletion_email(user_en.email, user_en.locale, 40)
+      expect(mailer.html_part.body).to include(expected_en)
+      expect(mailer.html_part.body).not_to include(expected_de)
+    end
+  end
+
+  describe("#deletion_mail") do
+    let(:user_de) { FactoryBot.create(:confirmed_user, locale: "de") }
+    let(:user_en) { FactoryBot.create(:confirmed_user, locale: "en") }
+
+    it "has mail subject localized to the user's locale" do
+      mailer = UserCleanerMailer.deletion_email(user_de.email, user_de.locale)
+      expect(mailer.subject).to include("gelöscht")
+      expect(mailer.subject).not_to include("deleted")
+
+      mailer = UserCleanerMailer.deletion_email(user_en.email, user_en.locale)
+      expect(mailer.subject).to include("deleted")
+      expect(mailer.subject).not_to include("gelöscht")
+    end
+
+    it "has mail body localized to the user's locale" do
+      expected_de = "vollständig gelöscht"
+      expected_en = "deleted entirely"
+
+      mailer = UserCleanerMailer.deletion_email(user_de.email, user_de.locale)
+
+      expect(mailer.html_part.body).to include(expected_de)
+      expect(mailer.html_part.body).not_to include(expected_en)
+
+      mailer = UserCleanerMailer.deletion_email(user_en.email, user_en.locale)
+
+      expect(mailer.html_part.body).to include(expected_en)
+      expect(mailer.html_part.body).not_to include(expected_de)
+    end
+  end
+end
diff --git a/spec/models/user_cleaner_spec_BASE_140121.rb b/spec/models/user_cleaner_spec_BASE_140121.rb
new file mode 100644
index 000000000..689962e3e
--- /dev/null
+++ b/spec/models/user_cleaner_spec_BASE_140121.rb
@@ -0,0 +1,282 @@
+require "rails_helper"
+
+RSpec.describe(UserCleaner, type: :model) do
+  # Non-generic users are either admins, teachers or editors
+  let(:user_admin) do
+    return FactoryBot.create(:user, deletion_date: Date.current - 1.day, admin: true)
+  end
+
+  let(:user_teacher) do
+    user_teacher = FactoryBot.create(:user, deletion_date: Date.current - 1.day)
+    FactoryBot.create(:lecture, teacher: user_teacher)
+    return user_teacher
+  end
+
+  let(:user_editor) do
+    user_editor = FactoryBot.create(:user, deletion_date: Date.current - 1.day)
+    FactoryBot.create(:lecture, editors: [user_editor])
+    return user_editor
+  end
+
+  before(:each) do
+    UserCleaner::INACTIVE_USER_THRESHOLD = 6.months
+  end
+
+  describe("#inactive_users") do
+    it "counts users without last_sign_in_at date as inactive" do
+      FactoryBot.create(:user, last_sign_in_at: nil)
+      expect(UserCleaner.new.inactive_users.count).to eq(1)
+    end
+
+    it("counts users with last_sign_in_at date older than threshold as inactive") do
+      FactoryBot.create(:user, last_sign_in_at: 7.months.ago)
+      expect(UserCleaner.new.inactive_users.count).to eq(1)
+    end
+
+    it "does not count users with last_sign_in_at date younger than threshold as inactive" do
+      FactoryBot.create(:user, last_sign_in_at: 5.months.ago)
+      expect(UserCleaner.new.inactive_users.count).to eq(0)
+    end
+  end
+
+  describe("#set/unset_deletion_date") do
+    context "when deletion date is nil" do
+      it "assigns a deletion date to inactive users" do
+        inactive_user = FactoryBot.create(:user, last_sign_in_at: 7.months.ago)
+        active_user = FactoryBot.create(:user, last_sign_in_at: 5.months.ago)
+
+        UserCleaner.new.set_deletion_date_for_inactive_users
+        inactive_user.reload
+        active_user.reload
+
+        expect(inactive_user.deletion_date).to eq(Date.current + 40.days)
+        expect(active_user.deletion_date).to be_nil
+      end
+
+      it "only assigns a deletion date to a limited number of users" do
+        max_deletions = 3
+        UserCleaner::MAX_DELETIONS_PER_RUN = max_deletions
+
+        FactoryBot.create_list(:user, max_deletions + 2, last_sign_in_at: 7.months.ago)
+
+        UserCleaner.new.set_deletion_date_for_inactive_users
+
+        users_flagged = User.where(deletion_date: Date.current + 40.days)
+        expect(users_flagged.count).to eq(max_deletions)
+      end
+    end
+
+    context "when a deletion date is assigned" do
+      it "does not overwrite the deletion date" do
+        user = FactoryBot.create(:user, last_sign_in_at: 7.months.ago,
+                                        deletion_date: Date.current + 42.days)
+
+        UserCleaner.new.set_deletion_date_for_inactive_users
+        user.reload
+
+        expect(user.deletion_date).to eq(Date.current + 42.days)
+      end
+    end
+
+    it "unassigns a deletion date from recently active users" do
+      deletion_date = Date.current + 5.days
+      user_inactive = FactoryBot.create(:user, deletion_date: deletion_date,
+                                               last_sign_in_at: 7.months.ago)
+      user_inactive2 = FactoryBot.create(:user, deletion_date: deletion_date,
+                                                last_sign_in_at: 6.months.ago - 1.day)
+      user_active = FactoryBot.create(:user, deletion_date: deletion_date,
+                                             last_sign_in_at: 2.days.ago)
+
+      UserCleaner.new.unset_deletion_date_for_recently_active_users
+      user_inactive.reload
+      user_inactive2.reload
+      user_active.reload
+
+      expect(user_inactive.deletion_date).to eq(deletion_date)
+      expect(user_inactive2.deletion_date).to eq(deletion_date)
+      expect(user_active.deletion_date).to be_nil
+    end
+  end
+
+  describe("#delete_users") do
+    it "deletes users with a deletion date in the past or present" do
+      user_past1 = FactoryBot.create(:user, deletion_date: Date.current - 1.day)
+      user_past2 = FactoryBot.create(:user, deletion_date: Date.current - 1.year)
+      user_present = FactoryBot.create(:user, deletion_date: Date.current)
+
+      UserCleaner.new.delete_users_according_to_deletion_date!
+
+      expect(User.where(id: user_past1.id)).not_to exist
+      expect(User.where(id: user_past2.id)).not_to exist
+      expect(User.where(id: user_present.id)).not_to exist
+    end
+
+    it "does not delete users with a deletion date in the future" do
+      user_future1 = FactoryBot.create(:user, deletion_date: Date.current + 1.day)
+      user_future2 = FactoryBot.create(:user, deletion_date: Date.current + 1.year)
+
+      UserCleaner.new.delete_users_according_to_deletion_date!
+
+      expect(User.where(id: user_future1.id)).to exist
+      expect(User.where(id: user_future2.id)).to exist
+    end
+
+    it "does not delete users without a deletion date" do
+      user = FactoryBot.create(:user, deletion_date: nil)
+      UserCleaner.new.delete_users_according_to_deletion_date!
+      expect(User.where(id: user.id)).to exist
+    end
+
+    it "deletes only generic users" do
+      user_generic = FactoryBot.create(:user, deletion_date: Date.current - 1.day)
+      user_admin
+      user_teacher
+      user_editor
+
+      UserCleaner.new.delete_users_according_to_deletion_date!
+
+      expect(User.where(id: user_generic.id)).not_to exist
+      expect(User.where(id: user_admin.id)).to exist
+      expect(User.where(id: user_teacher.id)).to exist
+      expect(User.where(id: user_editor.id)).to exist
+    end
+  end
+
+  describe("mails") do
+    context "when setting a deletion date" do
+      it "enqueues a deletion warning mail (40 days)" do
+        FactoryBot.create(:user, last_sign_in_at: 7.months.ago)
+
+        expect do
+          UserCleaner.new.set_deletion_date_for_inactive_users
+        end.to have_enqueued_mail(UserCleanerMailer, :pending_deletion_email)
+          .with(a_hash_including(args: [40]))
+      end
+
+      it "does not enqueue a deletion warning mail (40 days) for non-generic users" do
+        user_admin
+        user_teacher
+        user_editor
+
+        expect do
+          UserCleaner.new.set_deletion_date_for_inactive_users
+        end.not_to have_enqueued_mail(UserCleanerMailer, :pending_deletion_email)
+      end
+    end
+
+    context "when a deletion date is assigned" do
+      def test_enqueues_additional_deletion_warning_mails(num_days)
+        FactoryBot.create(:user, deletion_date: Date.current + num_days.days)
+
+        expect do
+          UserCleaner.new.send_additional_warning_mails
+        end.to have_enqueued_mail(UserCleanerMailer, :pending_deletion_email)
+          .with(a_hash_including(args: [num_days]))
+      end
+
+      it "enqueues additional deletion warning mails" do
+        test_enqueues_additional_deletion_warning_mails(14)
+        test_enqueues_additional_deletion_warning_mails(7)
+        test_enqueues_additional_deletion_warning_mails(2)
+      end
+
+      it "does not enqueue an additional deletion warning mail for 40 days" do
+        FactoryBot.create(:user, deletion_date: Date.current + 40.days)
+
+        expect do
+          UserCleaner.new.send_additional_warning_mails
+        end.not_to have_enqueued_mail(UserCleanerMailer, :pending_deletion_email)
+      end
+
+      it "does not enqueue additional deletion warning mails for non-generic users" do
+        user_admin.update(deletion_date: Date.current + 14.days)
+        user_teacher.update(deletion_date: Date.current + 7.days)
+        user_editor.update(deletion_date: Date.current + 2.days)
+
+        expect do
+          UserCleaner.new.send_additional_warning_mails
+        end.not_to have_enqueued_mail(UserCleanerMailer, :pending_deletion_email)
+      end
+    end
+
+    context "when a user is finally deleted" do
+      it "enqueues a deletion mail" do
+        FactoryBot.create(:user, deletion_date: Date.current - 1.day)
+
+        expect do
+          UserCleaner.new.delete_users_according_to_deletion_date!
+        end.to have_enqueued_mail(UserCleanerMailer, :deletion_email)
+      end
+    end
+  end
+
+  describe("#pending_deletion_mail") do
+    let(:user_de) { FactoryBot.create(:user, locale: "de") }
+    let(:user_en) { FactoryBot.create(:user, locale: "en") }
+
+    def test_subject_line(num_days)
+      user = FactoryBot.create(:user)
+      mailer = UserCleanerMailer.with(user: user).pending_deletion_email(num_days)
+      expect(mailer.subject).to include(num_days.to_s)
+    end
+
+    it "has mail subject containing the number of days until deletion" do
+      test_subject_line(40)
+      test_subject_line(14)
+      test_subject_line(7)
+      test_subject_line(2)
+    end
+
+    it "has mail subject localized to the user's locale" do
+      mailer = UserCleanerMailer.with(user: user_de).pending_deletion_email(40)
+      expect(mailer.subject).to include("Tage")
+      expect(mailer.subject).not_to include("days")
+
+      mailer = UserCleanerMailer.with(user: user_en).pending_deletion_email(40)
+      expect(mailer.subject).to include("days")
+      expect(mailer.subject).not_to include("Tage")
+    end
+
+    it "has mail body localized to the user's locale" do
+      expected_de = "verloren"
+      expected_en = "lost"
+
+      mailer = UserCleanerMailer.with(user: user_de).pending_deletion_email(40)
+      expect(mailer.html_part.body).to include(expected_de)
+      expect(mailer.html_part.body).not_to include(expected_en)
+
+      mailer = UserCleanerMailer.with(user: user_en).pending_deletion_email(40)
+      expect(mailer.html_part.body).to include(expected_en)
+      expect(mailer.html_part.body).not_to include(expected_de)
+    end
+  end
+
+  describe("#deletion_mail") do
+    let(:user_de) { FactoryBot.create(:user, locale: "de") }
+    let(:user_en) { FactoryBot.create(:user, locale: "en") }
+
+    it "has mail subject localized to the user's locale" do
+      mailer = UserCleanerMailer.with(user: user_de).deletion_email
+      expect(mailer.subject).to include("gelöscht")
+      expect(mailer.subject).not_to include("deleted")
+
+      mailer = UserCleanerMailer.with(user: user_en).deletion_email
+      expect(mailer.subject).to include("deleted")
+      expect(mailer.subject).not_to include("gelöscht")
+    end
+
+    it "has mail body localized to the user's locale" do
+      expected_de = "vollständig gelöscht"
+      expected_en = "deleted entirely"
+
+      mailer = UserCleanerMailer.with(user: user_de).deletion_email
+
+      expect(mailer.html_part.body).to include(expected_de)
+      expect(mailer.html_part.body).not_to include(expected_en)
+
+      mailer = UserCleanerMailer.with(user: user_en).deletion_email
+      expect(mailer.html_part.body).to include(expected_en)
+      expect(mailer.html_part.body).not_to include(expected_de)
+    end
+  end
+end
diff --git a/spec/models/user_cleaner_spec_LOCAL_140121.rb b/spec/models/user_cleaner_spec_LOCAL_140121.rb
new file mode 100644
index 000000000..eb00e07ad
--- /dev/null
+++ b/spec/models/user_cleaner_spec_LOCAL_140121.rb
@@ -0,0 +1,336 @@
+require "rails_helper"
+
+RSpec.describe(UserCleaner, type: :model) do
+  # Non-generic users are either admins, teachers or editors
+  let(:user_admin) do
+    return FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day, admin: true)
+  end
+
+  let(:user_teacher) do
+    user_teacher = FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day)
+    FactoryBot.create(:lecture, teacher: user_teacher)
+    return user_teacher
+  end
+
+  let(:user_editor) do
+    user_editor = FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day)
+    FactoryBot.create(:lecture, editors: [user_editor])
+    return user_editor
+  end
+
+  before(:each) do
+    UserCleaner::INACTIVE_USER_THRESHOLD = 6.months
+  end
+
+  describe("#inactive_users") do
+    context "when user is confirmed" do
+      it "counts users without current_sign_in_at date as inactive" do
+        # but only if also the confirmation date is older than the threshold
+        FactoryBot.create(:confirmed_user, :with_confirmation_sent_date,
+                          confirmation_sent_date: 5.months.ago, current_sign_in_at: nil)
+        FactoryBot.create(:confirmed_user, :with_confirmation_sent_date,
+                          confirmation_sent_date: 7.months.ago, current_sign_in_at: nil)
+        expect(UserCleaner.new.inactive_users.count).to eq(1)
+      end
+
+      it("counts users with current_sign_in_at date older than threshold as inactive") do
+        FactoryBot.create(:confirmed_user, current_sign_in_at: 7.months.ago)
+        expect(UserCleaner.new.inactive_users.count).to eq(1)
+      end
+
+      it "does not count users with current_sign_in_at date younger than threshold as inactive" do
+        FactoryBot.create(:confirmed_user, current_sign_in_at: 5.months.ago)
+        expect(UserCleaner.new.inactive_users.count).to eq(0)
+      end
+    end
+
+    context "when user is not confirmed yet" do
+      def test_non_confirmed_user(confirmation_sent_date, expected_inactive_users_count)
+        user = FactoryBot.create(:user, :with_confirmation_sent_date,
+                                 confirmation_sent_date: confirmation_sent_date,
+                                 current_sign_in_at: nil)
+        FactoryBot.create(:user, :with_confirmation_sent_date,
+                          confirmation_sent_date: confirmation_sent_date,
+                          current_sign_in_at: 5.months.ago)
+        FactoryBot.create(:user, :with_confirmation_sent_date,
+                          confirmation_sent_date: confirmation_sent_date,
+                          current_sign_in_at: 7.months.ago)
+
+        expect(user.confirmed_at).to be_nil
+        expect(user.confirmation_sent_at).to eq(confirmation_sent_date)
+
+        expect(UserCleaner.new.inactive_users.count).to eq(expected_inactive_users_count)
+      end
+
+      context "when registration was recently" do
+        it "does not count user as inactive regardless of value of last_sign_in_date" do
+          test_non_confirmed_user(5.days.ago, 0)
+        end
+      end
+
+      context "when registration was long ago" do
+        it "counts users as inactive regardless of value of last_sign_in_date" do
+          test_non_confirmed_user(7.months.ago, 3)
+        end
+      end
+    end
+  end
+
+  describe("#set/unset_deletion_date") do
+    context "when deletion date is nil" do
+      it "assigns a deletion date to inactive users" do
+        inactive_user = FactoryBot.create(:confirmed_user, current_sign_in_at: 7.months.ago)
+        inactive_user2 = FactoryBot.create(:user, :with_confirmation_sent_date,
+                                           confirmation_sent_date: 7.months.ago)
+        active_user = FactoryBot.create(:confirmed_user, current_sign_in_at: 5.months.ago)
+
+        UserCleaner.new.set_deletion_date_for_inactive_users
+        inactive_user.reload
+        inactive_user2.reload
+        active_user.reload
+
+        expect(inactive_user.deletion_date).to eq(Date.current + 40.days)
+        expect(inactive_user2.deletion_date).to eq(Date.current + 40.days)
+        expect(active_user.deletion_date).to be_nil
+      end
+
+      it "only assigns a deletion date to a limited number of users" do
+        max_deletions = 3
+        UserCleaner::MAX_DELETIONS_PER_RUN = max_deletions
+
+        FactoryBot.create_list(:confirmed_user, max_deletions + 2,
+                               current_sign_in_at: 7.months.ago)
+
+        UserCleaner.new.set_deletion_date_for_inactive_users
+
+        users_flagged = User.where(deletion_date: Date.current + 40.days)
+        expect(users_flagged.count).to eq(max_deletions)
+      end
+    end
+
+    context "when a deletion date is assigned" do
+      it "does not overwrite the deletion date" do
+        user = FactoryBot.create(:confirmed_user, current_sign_in_at: 7.months.ago,
+                                                  deletion_date: Date.current + 42.days)
+        user2 = FactoryBot.create(:user, :with_confirmation_sent_date,
+                                  confirmation_sent_date: 7.months.ago,
+                                  deletion_date: Date.current + 44.days)
+
+        UserCleaner.new.set_deletion_date_for_inactive_users
+        user.reload
+        user2.reload
+
+        expect(user.deletion_date).to eq(Date.current + 42.days)
+        expect(user2.deletion_date).to eq(Date.current + 44.days)
+      end
+    end
+
+    it "unassigns a deletion date from recently active users" do
+      deletion_date = Date.current + 5.days
+      user_inactive = FactoryBot.create(:confirmed_user, deletion_date: deletion_date,
+                                                         current_sign_in_at: 7.months.ago)
+      user_inactive2 = FactoryBot.create(:confirmed_user, deletion_date: deletion_date,
+                                                          current_sign_in_at: 6.months.ago - 1.day)
+      user_active = FactoryBot.create(:confirmed_user, deletion_date: deletion_date,
+                                                       current_sign_in_at: 2.days.ago)
+
+      UserCleaner.new.unset_deletion_date_for_recently_active_users
+      user_inactive.reload
+      user_inactive2.reload
+      user_active.reload
+
+      expect(user_inactive.deletion_date).to eq(deletion_date)
+      expect(user_inactive2.deletion_date).to eq(deletion_date)
+      expect(user_active.deletion_date).to be_nil
+    end
+  end
+
+  describe("#delete_users") do
+    it "deletes users with a deletion date in the past or present" do
+      user_past1 = FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day)
+      user_past2 = FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.year)
+      user_present = FactoryBot.create(:confirmed_user, deletion_date: Date.current)
+
+      UserCleaner.new.delete_users_according_to_deletion_date!
+
+      expect(User.where(id: user_past1.id)).not_to exist
+      expect(User.where(id: user_past2.id)).not_to exist
+      expect(User.where(id: user_present.id)).not_to exist
+    end
+
+    it "does not delete users with a deletion date in the future" do
+      user_future1 = FactoryBot.create(:confirmed_user, deletion_date: Date.current + 1.day)
+      user_future2 = FactoryBot.create(:confirmed_user, deletion_date: Date.current + 1.year)
+
+      UserCleaner.new.delete_users_according_to_deletion_date!
+
+      expect(User.where(id: user_future1.id)).to exist
+      expect(User.where(id: user_future2.id)).to exist
+    end
+
+    it "does not delete users without a deletion date" do
+      user = FactoryBot.create(:confirmed_user, deletion_date: nil)
+      UserCleaner.new.delete_users_according_to_deletion_date!
+      expect(User.where(id: user.id)).to exist
+    end
+
+    it "deletes only generic users" do
+      user_generic = FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day)
+      user_admin
+      user_teacher
+      user_editor
+
+      UserCleaner.new.delete_users_according_to_deletion_date!
+
+      expect(User.where(id: user_generic.id)).not_to exist
+      expect(User.where(id: user_admin.id)).to exist
+      expect(User.where(id: user_teacher.id)).to exist
+      expect(User.where(id: user_editor.id)).to exist
+    end
+  end
+
+  describe("mails") do
+    context "when setting a deletion date" do
+      it "enqueues a deletion warning mail (40 days)" do
+        user = FactoryBot.create(:confirmed_user, current_sign_in_at: 7.months.ago)
+
+        expect do
+          UserCleaner.new.set_deletion_date_for_inactive_users
+        end.to(have_enqueued_mail(UserCleanerMailer, :pending_deletion_email)
+          .with(user.email, user.locale, 40))
+      end
+
+      it "does not enqueue a deletion warning mail (40 days) for non-generic users" do
+        user_admin
+        user_teacher
+        user_editor
+
+        expect do
+          UserCleaner.new.set_deletion_date_for_inactive_users
+        end.not_to have_enqueued_mail(UserCleanerMailer, :pending_deletion_email)
+      end
+    end
+
+    context "when a deletion date is assigned" do
+      def test_enqueues_additional_deletion_warning_mails(num_days)
+        user = FactoryBot.create(:confirmed_user, deletion_date: Date.current + num_days.days)
+
+        expect do
+          UserCleaner.new.send_additional_warning_mails
+        end.to(have_enqueued_mail(UserCleanerMailer, :pending_deletion_email)
+        .with(user.email, user.locale, num_days))
+      end
+
+      it "enqueues additional deletion warning mails" do
+        test_enqueues_additional_deletion_warning_mails(14)
+        test_enqueues_additional_deletion_warning_mails(7)
+        test_enqueues_additional_deletion_warning_mails(2)
+      end
+
+      it "does not enqueue an additional deletion warning mail for 40 days" do
+        FactoryBot.create(:confirmed_user, deletion_date: Date.current + 40.days)
+
+        expect do
+          UserCleaner.new.send_additional_warning_mails
+        end.not_to have_enqueued_mail(UserCleanerMailer, :pending_deletion_email)
+      end
+
+      it "does not enqueue additional deletion warning mails for non-generic users" do
+        user_admin.update(deletion_date: Date.current + 14.days)
+        user_teacher.update(deletion_date: Date.current + 7.days)
+        user_editor.update(deletion_date: Date.current + 2.days)
+
+        expect do
+          UserCleaner.new.send_additional_warning_mails
+        end.not_to have_enqueued_mail(UserCleanerMailer, :pending_deletion_email)
+      end
+    end
+
+    context "when a user is finally deleted" do
+      it "enqueues a deletion mail" do
+        user = FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day)
+
+        expect do
+          UserCleaner.new.delete_users_according_to_deletion_date!
+        end.to(have_enqueued_mail(UserCleanerMailer, :deletion_email)
+          .with(user.email, user.locale))
+      end
+    end
+  end
+
+  describe("#pending_deletion_mail") do
+    let(:user_de) { FactoryBot.create(:confirmed_user, locale: "de") }
+    let(:user_en) { FactoryBot.create(:confirmed_user, locale: "en") }
+
+    def test_subject_line(num_days)
+      user = FactoryBot.create(:confirmed_user)
+      mailer = UserCleanerMailer
+               .pending_deletion_email(user.email, user.locale, num_days)
+      expect(mailer.subject).to include(num_days.to_s)
+    end
+
+    it "has mail subject containing the number of days until deletion" do
+      test_subject_line(40)
+      test_subject_line(14)
+      test_subject_line(7)
+      test_subject_line(2)
+    end
+
+    it "has mail subject localized to the user's locale" do
+      mailer = UserCleanerMailer
+               .pending_deletion_email(user_de.email, user_de.locale, 40)
+      expect(mailer.subject).to include("Tage")
+      expect(mailer.subject).not_to include("days")
+
+      mailer = UserCleanerMailer
+               .pending_deletion_email(user_en.email, user_en.locale, 40)
+      expect(mailer.subject).to include("days")
+      expect(mailer.subject).not_to include("Tage")
+    end
+
+    it "has mail body localized to the user's locale" do
+      expected_de = "verloren"
+      expected_en = "lost"
+
+      mailer = UserCleanerMailer
+               .pending_deletion_email(user_de.email, user_de.locale, 40)
+      expect(mailer.html_part.body).to include(expected_de)
+      expect(mailer.html_part.body).not_to include(expected_en)
+
+      mailer = UserCleanerMailer
+               .pending_deletion_email(user_en.email, user_en.locale, 40)
+      expect(mailer.html_part.body).to include(expected_en)
+      expect(mailer.html_part.body).not_to include(expected_de)
+    end
+  end
+
+  describe("#deletion_mail") do
+    let(:user_de) { FactoryBot.create(:confirmed_user, locale: "de") }
+    let(:user_en) { FactoryBot.create(:confirmed_user, locale: "en") }
+
+    it "has mail subject localized to the user's locale" do
+      mailer = UserCleanerMailer.deletion_email(user_de.email, user_de.locale)
+      expect(mailer.subject).to include("gelöscht")
+      expect(mailer.subject).not_to include("deleted")
+
+      mailer = UserCleanerMailer.deletion_email(user_en.email, user_en.locale)
+      expect(mailer.subject).to include("deleted")
+      expect(mailer.subject).not_to include("gelöscht")
+    end
+
+    it "has mail body localized to the user's locale" do
+      expected_de = "vollständig gelöscht"
+      expected_en = "deleted entirely"
+
+      mailer = UserCleanerMailer.deletion_email(user_de.email, user_de.locale)
+
+      expect(mailer.html_part.body).to include(expected_de)
+      expect(mailer.html_part.body).not_to include(expected_en)
+
+      mailer = UserCleanerMailer.deletion_email(user_en.email, user_en.locale)
+
+      expect(mailer.html_part.body).to include(expected_en)
+      expect(mailer.html_part.body).not_to include(expected_de)
+    end
+  end
+end
diff --git a/spec/models/user_cleaner_spec_REMOTE_140121.rb b/spec/models/user_cleaner_spec_REMOTE_140121.rb
new file mode 100644
index 000000000..1223a9048
--- /dev/null
+++ b/spec/models/user_cleaner_spec_REMOTE_140121.rb
@@ -0,0 +1,329 @@
+require "rails_helper"
+
+RSpec.describe(UserCleaner, type: :model) do
+  # Non-generic users are either admins, teachers or editors
+  let(:user_admin) do
+    return FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day, admin: true)
+  end
+
+  let(:user_teacher) do
+    user_teacher = FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day)
+    FactoryBot.create(:lecture, teacher: user_teacher)
+    return user_teacher
+  end
+
+  let(:user_editor) do
+    user_editor = FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day)
+    FactoryBot.create(:lecture, editors: [user_editor])
+    return user_editor
+  end
+
+  before(:each) do
+    UserCleaner::INACTIVE_USER_THRESHOLD = 6.months
+  end
+
+  describe("#inactive_users") do
+    context "when user is confirmed" do
+      it "counts users without current_sign_in_at date as inactive" do
+        # but only if also the confirmation date is older than the threshold
+        FactoryBot.create(:confirmed_user, :with_confirmation_sent_date,
+                          confirmation_sent_date: 5.months.ago, current_sign_in_at: nil)
+        FactoryBot.create(:confirmed_user, :with_confirmation_sent_date,
+                          confirmation_sent_date: 7.months.ago, current_sign_in_at: nil)
+        expect(UserCleaner.new.inactive_users.count).to eq(1)
+      end
+
+      it("counts users with current_sign_in_at date older than threshold as inactive") do
+        FactoryBot.create(:confirmed_user, current_sign_in_at: 7.months.ago)
+        expect(UserCleaner.new.inactive_users.count).to eq(1)
+      end
+
+      it "does not count users with current_sign_in_at date younger than threshold as inactive" do
+        FactoryBot.create(:confirmed_user, current_sign_in_at: 5.months.ago)
+        expect(UserCleaner.new.inactive_users.count).to eq(0)
+      end
+    end
+
+    context "when user is not confirmed yet" do
+      def test_non_confirmed_user(confirmation_sent_date, expected_inactive_users_count)
+        user = FactoryBot.create(:user, :with_confirmation_sent_date,
+                                 confirmation_sent_date: confirmation_sent_date,
+                                 current_sign_in_at: nil)
+        FactoryBot.create(:user, :with_confirmation_sent_date,
+                          confirmation_sent_date: confirmation_sent_date,
+                          current_sign_in_at: 5.months.ago)
+        FactoryBot.create(:user, :with_confirmation_sent_date,
+                          confirmation_sent_date: confirmation_sent_date,
+                          current_sign_in_at: 7.months.ago)
+
+        expect(user.confirmed_at).to be_nil
+        expect(user.confirmation_sent_at).to eq(confirmation_sent_date)
+
+        expect(UserCleaner.new.inactive_users.count).to eq(expected_inactive_users_count)
+      end
+
+      context "when registration was recently" do
+        it "does not count user as inactive regardless of value of last_sign_in_date" do
+          test_non_confirmed_user(5.days.ago, 0)
+        end
+      end
+
+      context "when registration was long ago" do
+        it "counts users as inactive regardless of value of last_sign_in_date" do
+          test_non_confirmed_user(7.months.ago, 3)
+        end
+      end
+    end
+  end
+
+  describe("#set/unset_deletion_date") do
+    context "when deletion date is nil" do
+      it "assigns a deletion date to inactive users" do
+        inactive_user = FactoryBot.create(:confirmed_user, current_sign_in_at: 7.months.ago)
+        inactive_user2 = FactoryBot.create(:user, :with_confirmation_sent_date,
+                                           confirmation_sent_date: 7.months.ago)
+        active_user = FactoryBot.create(:confirmed_user, current_sign_in_at: 5.months.ago)
+
+        UserCleaner.new.set_deletion_date_for_inactive_users
+        inactive_user.reload
+        inactive_user2.reload
+        active_user.reload
+
+        expect(inactive_user.deletion_date).to eq(Date.current + 40.days)
+        expect(inactive_user2.deletion_date).to eq(Date.current + 40.days)
+        expect(active_user.deletion_date).to be_nil
+      end
+
+      it "only assigns a deletion date to a limited number of users" do
+        max_deletions = 3
+        UserCleaner::MAX_DELETIONS_PER_RUN = max_deletions
+
+        FactoryBot.create_list(:confirmed_user, max_deletions + 2,
+                               current_sign_in_at: 7.months.ago)
+
+        UserCleaner.new.set_deletion_date_for_inactive_users
+
+        users_flagged = User.where(deletion_date: Date.current + 40.days)
+        expect(users_flagged.count).to eq(max_deletions)
+      end
+    end
+
+    context "when a deletion date is assigned" do
+      it "does not overwrite the deletion date" do
+        user = FactoryBot.create(:confirmed_user, current_sign_in_at: 7.months.ago,
+                                                  deletion_date: Date.current + 42.days)
+        user2 = FactoryBot.create(:user, :with_confirmation_sent_date,
+                                  confirmation_sent_date: 7.months.ago,
+                                  deletion_date: Date.current + 44.days)
+
+        UserCleaner.new.set_deletion_date_for_inactive_users
+        user.reload
+        user2.reload
+
+        expect(user.deletion_date).to eq(Date.current + 42.days)
+        expect(user2.deletion_date).to eq(Date.current + 44.days)
+      end
+    end
+
+    it "unassigns a deletion date from recently active users" do
+      deletion_date = Date.current + 5.days
+      user_inactive = FactoryBot.create(:confirmed_user, deletion_date: deletion_date,
+                                                         current_sign_in_at: 7.months.ago)
+      user_inactive2 = FactoryBot.create(:confirmed_user, deletion_date: deletion_date,
+                                                          current_sign_in_at: 6.months.ago - 1.day)
+      user_active = FactoryBot.create(:confirmed_user, deletion_date: deletion_date,
+                                                       current_sign_in_at: 2.days.ago)
+
+      UserCleaner.new.unset_deletion_date_for_recently_active_users
+      user_inactive.reload
+      user_inactive2.reload
+      user_active.reload
+
+      expect(user_inactive.deletion_date).to eq(deletion_date)
+      expect(user_inactive2.deletion_date).to eq(deletion_date)
+      expect(user_active.deletion_date).to be_nil
+    end
+  end
+
+  describe("#delete_users") do
+    it "deletes users with a deletion date in the past or present" do
+      user_past1 = FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day)
+      user_past2 = FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.year)
+      user_present = FactoryBot.create(:confirmed_user, deletion_date: Date.current)
+
+      UserCleaner.new.delete_users_according_to_deletion_date!
+
+      expect(User.where(id: user_past1.id)).not_to exist
+      expect(User.where(id: user_past2.id)).not_to exist
+      expect(User.where(id: user_present.id)).not_to exist
+    end
+
+    it "does not delete users with a deletion date in the future" do
+      user_future1 = FactoryBot.create(:confirmed_user, deletion_date: Date.current + 1.day)
+      user_future2 = FactoryBot.create(:confirmed_user, deletion_date: Date.current + 1.year)
+
+      UserCleaner.new.delete_users_according_to_deletion_date!
+
+      expect(User.where(id: user_future1.id)).to exist
+      expect(User.where(id: user_future2.id)).to exist
+    end
+
+    it "does not delete users without a deletion date" do
+      user = FactoryBot.create(:confirmed_user, deletion_date: nil)
+      UserCleaner.new.delete_users_according_to_deletion_date!
+      expect(User.where(id: user.id)).to exist
+    end
+
+    it "deletes only generic users" do
+      user_generic = FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day)
+      user_admin
+      user_teacher
+      user_editor
+
+      UserCleaner.new.delete_users_according_to_deletion_date!
+
+      expect(User.where(id: user_generic.id)).not_to exist
+      expect(User.where(id: user_admin.id)).to exist
+      expect(User.where(id: user_teacher.id)).to exist
+      expect(User.where(id: user_editor.id)).to exist
+    end
+  end
+
+  describe("mails") do
+    context "when setting a deletion date" do
+      it "enqueues a deletion warning mail (40 days)" do
+        FactoryBot.create(:confirmed_user, current_sign_in_at: 7.months.ago)
+
+        expect do
+          UserCleaner.new.set_deletion_date_for_inactive_users
+        end.to have_enqueued_mail(UserCleanerMailer, :pending_deletion_email)
+          .with(a_hash_including(args: [40]))
+      end
+
+      it "does not enqueue a deletion warning mail (40 days) for non-generic users" do
+        user_admin
+        user_teacher
+        user_editor
+
+        expect do
+          UserCleaner.new.set_deletion_date_for_inactive_users
+        end.not_to have_enqueued_mail(UserCleanerMailer, :pending_deletion_email)
+      end
+    end
+
+    context "when a deletion date is assigned" do
+      def test_enqueues_additional_deletion_warning_mails(num_days)
+        FactoryBot.create(:confirmed_user, deletion_date: Date.current + num_days.days)
+
+        expect do
+          UserCleaner.new.send_additional_warning_mails
+        end.to have_enqueued_mail(UserCleanerMailer, :pending_deletion_email)
+          .with(a_hash_including(args: [num_days]))
+      end
+
+      it "enqueues additional deletion warning mails" do
+        test_enqueues_additional_deletion_warning_mails(14)
+        test_enqueues_additional_deletion_warning_mails(7)
+        test_enqueues_additional_deletion_warning_mails(2)
+      end
+
+      it "does not enqueue an additional deletion warning mail for 40 days" do
+        FactoryBot.create(:confirmed_user, deletion_date: Date.current + 40.days)
+
+        expect do
+          UserCleaner.new.send_additional_warning_mails
+        end.not_to have_enqueued_mail(UserCleanerMailer, :pending_deletion_email)
+      end
+
+      it "does not enqueue additional deletion warning mails for non-generic users" do
+        user_admin.update(deletion_date: Date.current + 14.days)
+        user_teacher.update(deletion_date: Date.current + 7.days)
+        user_editor.update(deletion_date: Date.current + 2.days)
+
+        expect do
+          UserCleaner.new.send_additional_warning_mails
+        end.not_to have_enqueued_mail(UserCleanerMailer, :pending_deletion_email)
+      end
+    end
+
+    context "when a user is finally deleted" do
+      it "enqueues a deletion mail" do
+        FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day)
+
+        expect do
+          UserCleaner.new.delete_users_according_to_deletion_date!
+        end.to have_enqueued_mail(UserCleanerMailer, :deletion_email)
+      end
+    end
+  end
+
+  describe("#pending_deletion_mail") do
+    let(:user_de) { FactoryBot.create(:confirmed_user, locale: "de") }
+    let(:user_en) { FactoryBot.create(:confirmed_user, locale: "en") }
+
+    def test_subject_line(num_days)
+      user = FactoryBot.create(:confirmed_user)
+      mailer = UserCleanerMailer.with(user: user).pending_deletion_email(num_days)
+      expect(mailer.subject).to include(num_days.to_s)
+    end
+
+    it "has mail subject containing the number of days until deletion" do
+      test_subject_line(40)
+      test_subject_line(14)
+      test_subject_line(7)
+      test_subject_line(2)
+    end
+
+    it "has mail subject localized to the user's locale" do
+      mailer = UserCleanerMailer.with(user: user_de).pending_deletion_email(40)
+      expect(mailer.subject).to include("Tage")
+      expect(mailer.subject).not_to include("days")
+
+      mailer = UserCleanerMailer.with(user: user_en).pending_deletion_email(40)
+      expect(mailer.subject).to include("days")
+      expect(mailer.subject).not_to include("Tage")
+    end
+
+    it "has mail body localized to the user's locale" do
+      expected_de = "verloren"
+      expected_en = "lost"
+
+      mailer = UserCleanerMailer.with(user: user_de).pending_deletion_email(40)
+      expect(mailer.html_part.body).to include(expected_de)
+      expect(mailer.html_part.body).not_to include(expected_en)
+
+      mailer = UserCleanerMailer.with(user: user_en).pending_deletion_email(40)
+      expect(mailer.html_part.body).to include(expected_en)
+      expect(mailer.html_part.body).not_to include(expected_de)
+    end
+  end
+
+  describe("#deletion_mail") do
+    let(:user_de) { FactoryBot.create(:confirmed_user, locale: "de") }
+    let(:user_en) { FactoryBot.create(:confirmed_user, locale: "en") }
+
+    it "has mail subject localized to the user's locale" do
+      mailer = UserCleanerMailer.with(user: user_de).deletion_email
+      expect(mailer.subject).to include("gelöscht")
+      expect(mailer.subject).not_to include("deleted")
+
+      mailer = UserCleanerMailer.with(user: user_en).deletion_email
+      expect(mailer.subject).to include("deleted")
+      expect(mailer.subject).not_to include("gelöscht")
+    end
+
+    it "has mail body localized to the user's locale" do
+      expected_de = "vollständig gelöscht"
+      expected_en = "deleted entirely"
+
+      mailer = UserCleanerMailer.with(user: user_de).deletion_email
+
+      expect(mailer.html_part.body).to include(expected_de)
+      expect(mailer.html_part.body).not_to include(expected_en)
+
+      mailer = UserCleanerMailer.with(user: user_en).deletion_email
+      expect(mailer.html_part.body).to include(expected_en)
+      expect(mailer.html_part.body).not_to include(expected_de)
+    end
+  end
+end

From 7ed2702b73185943cb0cc03e8e41cfac5c424609 Mon Sep 17 00:00:00 2001
From: Florian <florianbuerckel@gmail.com>
Date: Mon, 16 Dec 2024 10:52:09 +0100
Subject: [PATCH 008/103] fix active storage direct upload routing error

Signed-off-by: Florian <florianbuerckel@gmail.com>
---
 config/routes.rb                           |   8 +++++++-
 storage/17/zz/17zz1muveku4uty3cn9joxiyat6f | Bin 0 -> 6734 bytes
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 storage/17/zz/17zz1muveku4uty3cn9joxiyat6f

diff --git a/config/routes.rb b/config/routes.rb
index 86e9492eb..6f722f922 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -955,7 +955,13 @@
 
   # redirect bs requests to error page
 
-  match "*path", to: "main#error", via: :all
+  # match "*path", to: "main#error", via: :all
+
+  # Wildcard route at the very bottom, with a constraint to exclude Active Storage paths
+  match "*path", to: "main#error", via: :all, constraints: lambda { |req|
+    !req.path.start_with?("/rails/active_storage")
+  }
+
   match "/", to: "main#error", via: [:post, :put, :patch, :delete]
 
   # For details on the DSL available within this file,
diff --git a/storage/17/zz/17zz1muveku4uty3cn9joxiyat6f b/storage/17/zz/17zz1muveku4uty3cn9joxiyat6f
new file mode 100644
index 0000000000000000000000000000000000000000..78abe57880647de98f30cb8ee56bf8045bc39000
GIT binary patch
literal 6734
zcmcIpcQBl7zut)U@+L$CQ4`T3Y7i|*BBFOf)UZnQzRD_*M6?$Xy{t}jL6o(+AbO&N
zRaXhYu2om(+`gGJ^PP9*oS8H8e)k_{*Y5nD`?;U%cm1yG+HfrmMG8g=2n2FPS?Q?`
z1aj#+cs)%{1paD9*d{|DjC9IRAM5#~<7VviXbombH+dgX!`X@KZQe-TzZ69oN%_+A
zDG@nY)UB*+{YSB{!g68<IKtSe|570eB_>e}ZNtzcLU?UmKfIJ;6y?2@>vnVTfxx%n
zOGb1r8jer3Y}Ys)pXdgZFlEkt`dHq)A9RhixWsuTM_yk3E(D?_%O8=mu&{6-a2fJ4
zjFOUa1cM@lyfz>qqKCYuCKiA|Zj+lpAWx|4A&_^sTrWY$A7h9h)NfizAh(EvDIt%@
z|A{ZY>HRS_mTzaoN4H~24(a~SUhMDNKe$a7iNj)_vTL8u={$eFytZbft)1Q90Es6L
zraTc65_0wM@Njo`_w@AN#5|spHZU-N`}rBYc#)ElqK=SC(2IgF%VUV-UZq~8ppf!d
zRs)~p=Udy@*to#yZrpfbXh=&-Yh`QO-PLuK>A_!)`H*yQhMA5|PLYw3HDA6oHa4=~
zxr4%g`1o-Fi{*<|+TPijnVC5(y!Kjz+ynz^{aPLQL_+k~({nePMOvyQ{^Q3giw@E&
zSEAC>nc;BwnLROvl!*R798SRY_p7BAKrJmNJSf>?UoCb;xg*mhzx_fzgIvAk`k0f?
z=nD@IPgqXj>({Rd1Xx6l>;dL-irVt8U%&A9A#X3p^droh;)xoE@!i#t^|iG;ox2L!
zH8nM$kgA5pGD-k42+HXH{{5R-#!t`KIPH*IeZ<br?&#>qf1ITCCb2*vwTH(J2J_Np
zs=K?ptt}WI0jYo2N-{=6L&Hu@E-EH=hn@YPoa8ms$e$jvDV?hrLq`#kkdRPNP~bmK
z)G7=rr0>td@jY?e{sxy?Wx#u8Zf@>oRfrZvddL5XIvzKpi9v*P!ng#avDeefOYZCd
z+FZgQWKH4>z^<nk|B;dGwLyAwvn<j6`ReNGK&D(~!K(MHucERkq_t#qZLEYQd}(<g
zO}9X89+eoZ{T!ph@zG;tP<WkiuZR-jBPJ;=ohbt+$eka?Op*u)q+a^RJK^u({O=}|
z=XTAM4d6}cJ1i%HWEre6*0Zp%c;jdJd3co6)OHDk2VjYbIXO5mSyg}1Kp53IvnYz`
zjE#-mzI|I(R@OvJ$<W%`T1~Bgp)*olP3=7un{42TkDy>hwe8ThX%c&e44jUY)!E5O
z#-^Vk_|Z#C%LP0>Xudt<@q@J3*h=Rasqm-m+9~pn;qYTDy4o)FYy*WqC|B5f_x^ov
zLRNNmu$}qMsJ>s@)6>)XCC>*kWYSo|A|v}=GCJDXZSCw-fBx)qa^SX7!Oh9JM<_%2
z?b*AOg?BD!%AM-nqSm6V@mw92Ju<DfQICmou(P{jBOzl{>-ZujAc|3}_;}DfU~eq!
z+8w{?x$*J3hK7b?V=j&KiN&+%=;(*h3cLyLLqpep|Mr|qDOfEtt|LqY%5}3Rr~m{k
zhF|BNt#^C7BV1e*7Dm1dPe35b@&wY;(|IC#`}%Zsj#X$F8H>w<`%*>iXhyW3JbBX|
zH99)lkB}b!@k5(E*3&oqiixS|%*n~g`}gnZ&+o+bG>DIV|4x15hM4=362agLzSYUa
z#nuSy8X0&hwG)?zZ4Fp2s{_^3($dhCo@fz1zS8b`3&0nk-93E`931YA7(t=AN*t*|
z7DU0V0jq}o0ReX-{7(1APft&Cb92YbjBTBrXMOp|s93SHXRo{54>m32<vTJ1kHU8>
ziV>9b0<Y}t*<InZ7kmFi%ixYYshbOg)}jj;3)j}xkRB_wH8r5Cn+TH*O*k7TrzW4R
zh1ffaYbR9dBc=p2${XLCa8FuF3X8)Xqfv>8bR(0S^Btem(`o~bVV%!}Z<(2yB_<|<
zqsAIawWP+zUZbbCef26iKHhU>5CQsK+Is_VfalrCAy#(0-1K-UPP0L@q^xY<3l}vx
zAUDZ}lDV6P1pHiPMn<!BUt%Z~8>^J(t78H#=y+<5mzVcrTpU^k+^ey%F_{RRx%nKG
z+{yRO&iuwklRxD3nAFwP0d94Q;_*-PlKjY=6%-VlocI;ApFMk~`$<DTD`aIT6IEZY
zr?3BOX-UWy;+I=daX$Prk?+OF%uF^G7DQT_wEZX#$=WI|j<4>BK^5>)fqGhjW@g~w
z_OB==@zmtx->a)B$;qWANF5FuP`?r$xHo2CP+^A4rJwEAF)*kLI3{$2QgL%|c>b~Q
z`Za_=)ddJkMMdRk<5xa3JR+j1veM1X4H<NP_NbRl=gr%<;EA8_ev;cV4O`Q}w}S3`
z`G8io(X`3W>&1%~CMMGdTZ?4oL-BWYC!9JNv4Nv%hDJsJ3X6d5qN1WujZa4|IG&E*
z=<A8DK$5Mk?fws1JXBd-{i1{mJ%2}g`vg@>%h{2`oO+WdA0s1UczC#&m{?zuAU?41
zg!kLfketuvOMCm`j11Pfn!@tiH1z;1dKesFX(SSPom;~M1>+yj*TxD~`$_sAY}PtW
zHGJYP*;$=o5_kSkta`1^c_tz%3Ww9TDJQCy@!S2~<}GgBOY7o-A08gw;5L5Wn3|fp
zKNob~K_%x2gDs=z5(>J4r$$FTw-ywZe|P-&;g;n>AKA$kuzPJsQb|=+RZ^@t1t4as
z&V`JWlu#LiK+H^3LQ|Y74b_T86__9TXn~`SVMz|30+kV;P=7wt(xO(-HV-=WngiF%
z*jpcuVV1lvAP^0(fM6usINVv8nwq*Bktz)BN*0Ea9ub=0`zjnXsRc=b=H=-`V^kvE
z+xcvNpcl<GuKsyAJTY;wIWNCl#l+1W&l6Gg<qMcY2`c$a4;(Rhk83`pruwao7VYlt
z&MsdgQjNNtgb1EHBraFuI_{P`v#_@2q$al+Oh-@k6B-(%Y?_m5YWCR94-|DcOQd9E
zWXQ-ulQy{GdXl5;Mhfn>@K`HrYPvW%fro;F7S|9xeE5(jqQP~(9c)_C5%x#}A=Rm-
z%Kd%(^mxC{5lsU~7YdcnlJ*kMBQoHl1NT*7iXwpK92gh?4eadfETf^*GdKud6!7%^
z{F&%DCf_!L@=m!zPfy?Mp#2>;RR>VP$HzxONqH=Co_9VQc<f~Jc8ZzpgZEs(1zGOI
z({RT2ST#2{$8o8%iy+*{wZ>Z$lsNM9^Jx{L7=$f1rjh*tg)S|pwb|M83HJ=HvPgZ!
zKG)Ut0NuLbA_v1VRA>L}e$`l5T57c{JCq_4dWC+^eSgDLQ*-FrooDG1Zf|yw4%k%;
zpjAL6&P;gj)Plu@g`Aw6=7R;weApK-ssMVx5nFV;zgv@gTi*2Y{xs5~KYRTR38kl}
zCjc^?fC=cw!x`_nfmE@+p&?BmFVNM;M3hcWPT0o2!RyE@xrrA2H6N`zNqtnz5-%+*
zw)zBH09UJ}J>Zv>&6pDS>#x7gHbdovR4Gi5?jciM$3wHTfm5|k78Vw5ZEY$I*XO~E
zkByB5?AIlzeO}~%fk|e5hT)8;sA7iX&eIPU052q`kNy0)aW<l*t=(3zS?{*^jjo&k
zHqR50D(=E6ecOQlgfQh|9(b5vRAl$)(IZ{m>pPu5zI^yVovk(T<42o?IhJZn75_=A
zI60XiTPyj)2Mh+Yxx1?C%oMb>5K>pSe{#4Z?lk$;sZV}Ni+uXsyLa;)p^A!%)fH88
zzpHHq)|%~m0Orv+*^OTz8vrm~r$=5gGEH|Bqc=_aT2D@PhJYq3FE8&)<X_*;%mCzk
z^JWjYtn~!gR!D~pSwz7q0C~0+4^4Q1TFS@x_^)O-=0-4UcLC7=CTN_S%`qFj@4CLe
zp5hw~C>5}6cMO}Y=Hz{#pt>C=&}gq9_zF5VU~Z5S0cM9KxD>5IeqP=Oq*Ic-fPg?|
z(3!8lzyI^+&-L~7{rvn^B%QXlwt$c`+3O_rGc{!~aN>QYsJH?eJ=1?X{3$#7i(MRO
zoL_xOWOI&yG%YPHb#!QCZ(WTyA}v?qusnM{g+`N*k`{dW<ef4%>y4>uAqCiFWVAnI
z!E^$7vN40Azjp05EyZEEwHA<fO-)ULrVXOL+g8i>1kD=1_4Lda2f(D(9$l^jA0;>d
z*nk<;-`hJpJ}$`5j}WmP1YJeuVg4*2;1u8>iQl-^evCJS$=ABbdYYD=UW5rKq>PLV
zY{iwuAGwPC?_f?&xR$fMikZ2=S<lEXxE7$50tskaFqeddh5g6duK?zDX+C^^`n3Nn
zmh~Zl%rPq%sAee>$wWc(L0TXcqS@qRp<RFZ?ksb1a>@jq`Df)$)w|{D@v3WRu>NKW
z&f%$P%ukRBo|>4b2VWAXsA`e)Sngll`biI)<*Z9mdH?x%A1`R$Jl)yJ2}lcXRBr`#
zH9z0>F!^<dE(Nv}qMyN+pM9}}zl(fM5-^p5VJG@iM2-yw-<)c2adQLRn2LsZd6`yO
z^<Y$3DMkfd9UL6cC1%&IT?4}nU)2#KclOP3x0Z(=<!b5RP@>1HKca6F<_kvqaK7q5
zfB$_Ek<i(k>l+&zYM3frdeVx@%2+hRZ~hxtOSSaAfq}jK{fd&3k?-FPD=kSpMnZ{j
zLW*C(S%M`vb9jtzv90TlVhU~5?`u7s4`oY+)0x9@HGpSebHOt0IGlj~<;$00#_X}K
z@Z2BNBa@R2o~t@wg2!=d!p^525cekwzeQs<ueuOC8i-W=T{Q%fTxJ>)keAzgdwC@#
zeSem|@TcEf(`jk79^&@#^%WNBm%bj^Def|BC1A1(^VkQ+fyVXrst`N7<mnV?@st)9
z(}X{j_c~*i)?FJApIa(cf8dH1T~P&hUsvZ1gAod~b1k9J%S1$^zBBD@ZS(o6q8GbB
z@+2V;xYbq3<c;^Ndno&_q~$0SeBWRwQ*P+wQGc3vMV-j2#qJo}Pt_;;E$8|+mG)`^
zNiFAR$2V@=2nh)R3bG0Jb9D3zwEJpRzFWAdpa1G`zDZ4w>~33cZ$!z18@H1B0{s1}
zs;hB0oXcz@5*R%b&SgaEDH%{Y!epO8OW+%KH1=5nk5;*DplxqR`n$jdQRY+@<E5+q
z*WVd^=&_;~Frf~A+8gMur=;}l0>OZY#b<qTV`d(>%uerL4S413EWpcq1h!cADvJ5#
z^Ccl+;d%R;xxKx;M@N3k@#BrYI}&!f!t?X<K(_#FfxTB8eDu-GlvP(!l5k%l#}66n
zRs;Oammv_QF%GKL`^my`>-SR}0eJ%-y1JdtDJLgqqYn8sgBz5!4Vluva0bBIrd&GP
z?4VL<h`7PT1jn=n14Tkk{HD0Lctct#f7o^?gOh_}X=#argM;TgP<&+x31e@`sCXhK
z8@$#53)J)Yzf4U_)78;QwpDlc!o{Cn;Bt0<dqu@-xjzLAM&LU|9CBKEK}kM-eg}K|
zWMfW|`}ckLo()91qFZrWZwwU`$>3Y@lG;o+Z`whjBd5H<xw(tRE=`>#7P?(k+2H80
zJro3F``djiT7=6f1$ubV<t2&IzywE!g@MyEt9PAegIicxi8}l&1-wii(mpu!4&RcK
z!_MV&H{xg^QV<N)jy;LOmh)3QB^@96pMPTAIwh9zDxiIBGXn}H?xgzZ>FIrS<XJ?j
zpK`?Y)H=^FUcdhKi}jO4W#fpPs;a69NsdM^sc~EW?E`7zDI{B>qN0<NlR#4k0o2Ss
zCy5FRdnxO%TdRa@Uvl^L@sW@o_zgG?U@iU2wDr%t`&WlrP6<=ZY?ULOM|<lx)(dwG
zt?sAXXBA>)W<FVrk=vN68=9U@M>f@X#H5M4oNf0BUZ<e}lCaC-6SroDm27Y&cg?qZ
zJUj<Gndki{@8nm=cB5FN6X#HeV|QIMANsa4lL06F!pI1;@+mQQT+gh}ViXv|V9m;U
zRv6VpC_7!1v*h67YCxf4*yNgbr1JRr`2iQFOM90mC5>+_c9V^qtyi>UBqvK)v=c99
zZG(TA=$)RIo1&K2*Qd@oHTwJeY0XyVIy#`IM|-5Cr2PYT(_=zp%D(b_Lju6Goct1e
zk}br=#U&*4eROoU?JXG)PW@}tCU^Pyo4nTP)JIS-+`?ycuu-Fro0%DF3`rp^P;Cfl
zZ$<_NwTy?7A|i2fW3bV?u3+m+?no1Xii!&SmR||b)>=HY<ix;RS5{Vbc6MTAuF9wY
z<`%YmYH!bb91i^;d-OXO02>U?z93EBgv9uGD=Vu~K!hJm9cLR4!C)76o)!`nU0PE%
z;S&+5uC0CG+j3>uZ~U`G$5m#DTXc~r$5$oTC>6AQeSLxAttl%j140ex2{o>JU<nF}
zKX?FoRmyjpV}%lVpYk0k2}#lFFgBe>P|!B;p`NXVp_NshAzw4NQM{&)c6FqUpjejt
zH!$eIsxWIxeW9q5;^o%=?b|mnWV$>2Yec{tipZfwZ56oyI0Xj>UzU=;&p<C|);};H
zCN7R&L}NE2bU)oOvEJO<o2jzyYYsRzYj9*qQQY1e0ZN-y#xHNvU7c4fv9z>QA(Bo#
zRaCjMuH@T=mjPT1wX)hB3Oe&pn*B(Y&S0-tPZ1UqQ&Cj3wYkZ|&(9(ab96zuNuaZ+
zPG6W8*VK%4ciZl7%uvWB7<qMV0}~3KOO>u5Z59O-h}L`0OFt-a0JqTuR8FwpBlV^=
z#d>V}!QkMaY9imN+u+^YygUwme)ZsA*rSTtTG;v7X#oBXT_ngyKp&5nzQ}b|1TOla
z_l5}^j%w#`90hk^cBB`!z3mRN4B+t8Gi6QZqkY%_`>#jbxEBaqcqF~x!m8PKabf`l
z?fAsRpV{)EvjO|2OiXFB%SOuiI&yL?z)TOHcl1~Z0-CFB14g9LGv$ZFc=_S+F_pXa
zB)}zla?;+xLFClECiPuqrLc6O_?-XFN@mao{QTp`k3en1wiY_yuEx(*3I&}5N202t
z!ljnnsyr_A?gyY;ppnw+?!_tr(X6*ZYb<Bl?2r8X`SZ?KwIaRAsVZc@;NdMe7DRD4
zSjUDYlqruuAj}r{yA9KebYvfoi;0R#nBRP^(B;1H^^YRGwfTAB1J>;GbOZvVygS<$
zY<y5|4QX$0cfGpr4IX3zpF~bkQPC)g2S_Qx`0tls_dcT)N3LhFL$xc+eK0H<ATR!>
zli&X>@A_Nl{6j|v1(Hm3mYvZ>R(H=~v``xuB7XznmlEwHkiFajMfYB*_OX!>D3$vq
z2t*OY)l2`6xcc$0-)n2bqWpA`hXTZ}p?|yje<Je!w;Mm9j_icNVC=Dl=Pq~e-ShDB
zDl071vN46IfZ#Ncfq|hOiIfCON=nveGYgL>DJcQAv#hif@M3`mLZ$c_B>J{%Fq^14
z83_qO(xU);GCT}KTXmgGWJJV;Go+vZiUJCShF)QMR;zOn;s$Hh*46?>11$@Z9^i>)
zyp@!d-C(dpC62?xLoieQN69Y&-Azzy8>GQR!MCKO{JNuA5aue%%IMD)Z{NRv2F77i
zlT45pk?UoUm8Z$TVKz2g>LWlMW054WN?+U-pCL^KnU}Ur??A|?>$7M;vH{ZYr`meJ
zIKko43fgS`o55;a0FT@I`zt6Zi1S6hjGe4;INDwH^6~=tPfj5qDYwNgPHyfUQ+kLk
zD8maJV>GKwF-V(E;{IiI0s;b>*NHHH64C30A(6hWu0qwg#l=Morqx>kV)6v@#{Q2#
z{<ua?3<3rqd;gU*^EXpM4iG@-Q-%N?siLc^+w5=&!vHD_!tqV}OFh?{OCT6l@IE>&
z?)n@jgok8s{@)(kKlIzj|E$Qu$k^+B1p=vfcYZl+XZmTgVUZU2p$MX^pz*Z)$;&tY
E1#5D(_y7O^

literal 0
HcmV?d00001


From b9176b082e62dbf3acc47d08e84d75620d932641 Mon Sep 17 00:00:00 2001
From: Florian <florianbuerckel@gmail.com>
Date: Tue, 24 Dec 2024 09:32:23 +0100
Subject: [PATCH 009/103] fix activeStorage routing bug and add libsvips42

Signed-off-by: Florian <florianbuerckel@gmail.com>
---
 .gitignore                    | 3 +++
 Gemfile                       | 1 +
 Gemfile.lock                  | 1 +
 config/routes.rb              | 6 +-----
 docker/development/Dockerfile | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index fa5ed4bd3..488dc111b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,6 +39,9 @@ coverage
 # Ignore shrine store
 /public/uploads
 
+# Ignore activeStorage uploads
+/storage/*
+
 # Ignore environment variables
 completed_initial_run
 /public/uploads.zip
diff --git a/Gemfile b/Gemfile
index 182d74061..645764650 100644
--- a/Gemfile
+++ b/Gemfile
@@ -51,6 +51,7 @@ gem "rails-i18n", "~> 7.0"
 gem "responders", "~> 3.1"
 gem "rgl", "~> 0.6"
 gem "rqrcode", "~> 2.2"
+# gem "ruby-vips", "~> 2.2", ">= 2.2.2"
 gem "rubyzip", "~> 2.3"
 gem "sass-rails", "~> 6.0" # SCSS for stylesheets
 gem "shrine", "~> 3.6"
diff --git a/Gemfile.lock b/Gemfile.lock
index 4bd07aa0e..6983eb032 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -728,6 +728,7 @@ DEPENDENCIES
   rubocop (~> 1.65)
   rubocop-performance (~> 1.21)
   rubocop-rails (~> 2.24)
+  ruby-vips (~> 2.2, >= 2.2.2)
   rubyzip (~> 2.3)
   sass-rails (~> 6.0)
   selenium-webdriver (~> 4.10.0)
diff --git a/config/routes.rb b/config/routes.rb
index 6f722f922..c7d20d051 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -953,11 +953,7 @@
 
   mount Thredded::Engine => "/forum"
 
-  # redirect bs requests to error page
-
-  # match "*path", to: "main#error", via: :all
-
-  # Wildcard route at the very bottom, with a constraint to exclude Active Storage paths
+  # redirect bs requests to error page (except active storage routes)
   match "*path", to: "main#error", via: :all, constraints: lambda { |req|
     !req.path.start_with?("/rails/active_storage")
   }
diff --git a/docker/development/Dockerfile b/docker/development/Dockerfile
index 7a3efdf5b..83fb79cbc 100644
--- a/docker/development/Dockerfile
+++ b/docker/development/Dockerfile
@@ -53,7 +53,7 @@ RUN yarn set version "${YARN_VERSION}"
 RUN apt update && \
     apt-get install -y --no-install-recommends \
         ffmpeg imagemagick pdftk ghostscript shared-mime-info \
-        libarchive-tools postgresql-client-13 wget wait-for-it graphviz
+        libarchive-tools postgresql-client-13 wget wait-for-it graphviz libvips42
 
 # Setup ImageMagick
 RUN sed -i '/disable ghostscript format types/,+6d' /etc/ImageMagick-6/policy.xml

From 695ab131616d9226d5daca7dc244a55d6012cb8a Mon Sep 17 00:00:00 2001
From: Florian <florianbuerckel@gmail.com>
Date: Thu, 26 Dec 2024 13:43:24 +0100
Subject: [PATCH 010/103] add question model to vignettes and plain javascript
 approach for dynamic form

Signed-off-by: Florian <florianbuerckel@gmail.com>
---
 app/assets/config/manifest.js                 |  1 +
 .../javascripts/vignettes/question_type.js    | 24 +++++++++++++++++++
 app/models/vignettes/question.rb              | 10 ++++++++
 app/models/vignettes/slide.rb                 |  1 +
 app/models/vignettes/text_question.rb         |  4 ++++
 app/views/vignettes/slides/_form.html.erb     | 11 +++++++++
 ...241224094245_create_vignettes_questions.rb | 11 +++++++++
 db/schema.rb                                  | 15 +++++++++++-
 spec/factories/vignettes/questions.rb         |  7 ++++++
 spec/models/vignettes/question_spec.rb        |  5 ++++
 10 files changed, 88 insertions(+), 1 deletion(-)
 create mode 100644 app/assets/javascripts/vignettes/question_type.js
 create mode 100644 app/models/vignettes/question.rb
 create mode 100644 app/models/vignettes/text_question.rb
 create mode 100644 db/migrate/20241224094245_create_vignettes_questions.rb
 create mode 100644 spec/factories/vignettes/questions.rb
 create mode 100644 spec/models/vignettes/question_spec.rb

diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js
index ff4d5c580..8c87ffd3a 100644
--- a/app/assets/config/manifest.js
+++ b/app/assets/config/manifest.js
@@ -1,4 +1,5 @@
 //= link_tree ../images
+//= link_directory ../javascripts/vignettes .js
 //= link_directory ../javascripts .js
 //= link_directory ../stylesheets .css
 //= link commontator/manifest.js
diff --git a/app/assets/javascripts/vignettes/question_type.js b/app/assets/javascripts/vignettes/question_type.js
new file mode 100644
index 000000000..2d7bb9610
--- /dev/null
+++ b/app/assets/javascripts/vignettes/question_type.js
@@ -0,0 +1,24 @@
+var questionTypeHTML = {
+  TextQuestion: `
+    <div>
+        <%= form.label :question_text, "Question Text" %><br>
+        <%= form.text_area :question_text %>
+    </div> 
+    `,
+};
+document.addEventListener("turbolinks:load", () => {
+  const questionTypeDropdown = document.getElementById("question_type");
+  const questionField = document.getElementById("question_field");
+  if (questionTypeDropdown && questionField) {
+    questionTypeDropdown.addEventListener("change", function (event) {
+      const selectedType = event.target.value;
+      if (selectedType == "") {
+        questionField.innerHTML = "";
+        return;
+      }
+      else {
+        questionField.innerHTML = questionTypeHTML[selectedType];
+      }
+    });
+  };
+});
diff --git a/app/models/vignettes/question.rb b/app/models/vignettes/question.rb
new file mode 100644
index 000000000..0eb94be4c
--- /dev/null
+++ b/app/models/vignettes/question.rb
@@ -0,0 +1,10 @@
+module Vignettes
+  class Question < ApplicationRecord
+    # Uses single table inheritance to store different types of answers
+    belongs_to :slide
+
+    validates :question_text, presence: true
+
+    self.abstract_class = false
+  end
+end
diff --git a/app/models/vignettes/slide.rb b/app/models/vignettes/slide.rb
index cd187990a..85502e2c9 100644
--- a/app/models/vignettes/slide.rb
+++ b/app/models/vignettes/slide.rb
@@ -2,5 +2,6 @@ module Vignettes
   class Slide < ApplicationRecord
     belongs_to :questionnaire, foreign_key: "vignettes_questionnaire_id"
     has_rich_text :content
+    has_one :question, dependent: :destroy, inverse_of: :vignettes_slide
   end
 end
diff --git a/app/models/vignettes/text_question.rb b/app/models/vignettes/text_question.rb
new file mode 100644
index 000000000..73895965c
--- /dev/null
+++ b/app/models/vignettes/text_question.rb
@@ -0,0 +1,4 @@
+module Vignettes
+  class TextQuestion < Question
+  end
+end
diff --git a/app/views/vignettes/slides/_form.html.erb b/app/views/vignettes/slides/_form.html.erb
index e0cddad03..d27ce3e2f 100644
--- a/app/views/vignettes/slides/_form.html.erb
+++ b/app/views/vignettes/slides/_form.html.erb
@@ -1,3 +1,4 @@
+<%= javascript_include_tag 'vignettes/question_type' %>
 <%= form_with(
       model: [@questionnaire, @slide],
       url: @slide.new_record? ? vignettes_questionnaire_slides_path(@questionnaire) : vignettes_questionnaire_slide_path(@questionnaire, @slide),
@@ -13,4 +14,14 @@
   <div>
     <%= form.submit @slide.new_record? ? 'Create Slide' : 'Update Slide' %>
   </div>
+  <div>
+    <%= form.label :type, "Question Type" %>
+    <%= form.select :type, options_for_select([
+        ['No Question', ''],
+        ['Text Field', 'TextQuestion']
+    ]), {}, { id: "question_type" } %>
+  </div>
+  <!-- This div will dynamically be replaced in the question_type.js file -->
+  <div id="question_field">
+  </div>
 <% end %>
\ No newline at end of file
diff --git a/db/migrate/20241224094245_create_vignettes_questions.rb b/db/migrate/20241224094245_create_vignettes_questions.rb
new file mode 100644
index 000000000..e419f3430
--- /dev/null
+++ b/db/migrate/20241224094245_create_vignettes_questions.rb
@@ -0,0 +1,11 @@
+class CreateVignettesQuestions < ActiveRecord::Migration[7.1]
+  def change
+    create_table :vignettes_questions do |t|
+      t.string :type
+      t.text :question_text
+      t.references :vignettes_slide, null: false, foreign_key: true
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 4375da35a..0cdff38cd 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.1].define(version: 2024_12_15_132228) do
+ActiveRecord::Schema[7.1].define(version: 2024_12_24_094245) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pgcrypto"
   enable_extension "plpgsql"
@@ -955,10 +955,22 @@
     t.datetime "updated_at", null: false
   end
 
+  create_table "vignettes_questions", force: :cascade do |t|
+    t.string "type"
+    t.text "question_text"
+    t.bigint "vignettes_slide_id", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["vignettes_slide_id"], name: "index_vignettes_questions_on_vignettes_slide_id"
+  end
+
   create_table "vignettes_slides", force: :cascade do |t|
     t.bigint "vignettes_questionnaire_id", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.string "questionable_type"
+    t.bigint "questionable_id"
+    t.index ["questionable_type", "questionable_id"], name: "index_vignettes_slides_on_questionable"
     t.index ["vignettes_questionnaire_id"], name: "index_vignettes_slides_on_vignettes_questionnaire_id"
   end
 
@@ -1066,6 +1078,7 @@
   add_foreign_key "user_favorite_lecture_joins", "lectures"
   add_foreign_key "user_favorite_lecture_joins", "users"
   add_foreign_key "user_submission_joins", "users"
+  add_foreign_key "vignettes_questions", "vignettes_slides"
   add_foreign_key "vignettes_slides", "vignettes_questionnaires"
   add_foreign_key "vouchers", "lectures"
   add_foreign_key "watchlist_entries", "media"
diff --git a/spec/factories/vignettes/questions.rb b/spec/factories/vignettes/questions.rb
new file mode 100644
index 000000000..4beaf73cd
--- /dev/null
+++ b/spec/factories/vignettes/questions.rb
@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :vignettes_question, class: 'Vignettes::Question' do
+    type { "" }
+    question_text { "MyText" }
+    slide { nil }
+  end
+end
diff --git a/spec/models/vignettes/question_spec.rb b/spec/models/vignettes/question_spec.rb
new file mode 100644
index 000000000..b5d837b21
--- /dev/null
+++ b/spec/models/vignettes/question_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe Vignettes::Question, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

From c772b2ebaa45c91dfea1afbed056944c98dc0ec9 Mon Sep 17 00:00:00 2001
From: Florian <florianbuerckel@gmail.com>
Date: Thu, 26 Dec 2024 14:19:52 +0100
Subject: [PATCH 011/103] add stimulus

Signed-off-by: Florian <florianbuerckel@gmail.com>
---
 Gemfile                                        |  1 +
 Gemfile.lock                                   |  4 +++-
 app/javascript/controllers/application.js      |  9 +++++++++
 app/javascript/controllers/hello_controller.js |  7 +++++++
 app/javascript/controllers/index.js            |  8 ++++++++
 app/views/vignettes/slides/_form.html.erb      | 16 ++++++++++------
 package.json                                   |  1 +
 yarn.lock                                      |  5 +++++
 8 files changed, 44 insertions(+), 7 deletions(-)
 create mode 100644 app/javascript/controllers/application.js
 create mode 100644 app/javascript/controllers/hello_controller.js
 create mode 100644 app/javascript/controllers/index.js

diff --git a/Gemfile b/Gemfile
index 645764650..8ee6894eb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -58,6 +58,7 @@ gem "shrine", "~> 3.6"
 gem "sidekiq", "~> 7.3"
 gem "sidekiq-cron", "~> 1.12"
 gem "sprockets-rails", "~>3.5"
+gem "stimulus-rails"
 gem "streamio-ffmpeg", "~> 3.0"
 gem "sunspot_rails", "~> 2.7"
 gem "sunspot_solr", "~> 2.7"
diff --git a/Gemfile.lock b/Gemfile.lock
index 6983eb032..3d5d7bf80 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -602,6 +602,8 @@ GEM
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       sprockets (>= 3.0.0)
+    stimulus-rails (1.3.4)
+      railties (>= 6.0.0)
     stream (0.5.5)
     streamio-ffmpeg (3.0.2)
       multi_json (~> 1.8)
@@ -728,7 +730,6 @@ DEPENDENCIES
   rubocop (~> 1.65)
   rubocop-performance (~> 1.21)
   rubocop-rails (~> 2.24)
-  ruby-vips (~> 2.2, >= 2.2.2)
   rubyzip (~> 2.3)
   sass-rails (~> 6.0)
   selenium-webdriver (~> 4.10.0)
@@ -740,6 +741,7 @@ DEPENDENCIES
   spring (~> 2.1)
   spring-watcher-listen (~> 2.0)
   sprockets-rails (~> 3.5)
+  stimulus-rails
   streamio-ffmpeg (~> 3.0)
   sunspot_rails (~> 2.7)
   sunspot_solr (~> 2.7)
diff --git a/app/javascript/controllers/application.js b/app/javascript/controllers/application.js
new file mode 100644
index 000000000..1213e85c7
--- /dev/null
+++ b/app/javascript/controllers/application.js
@@ -0,0 +1,9 @@
+import { Application } from "@hotwired/stimulus"
+
+const application = Application.start()
+
+// Configure Stimulus development experience
+application.debug = false
+window.Stimulus   = application
+
+export { application }
diff --git a/app/javascript/controllers/hello_controller.js b/app/javascript/controllers/hello_controller.js
new file mode 100644
index 000000000..5975c0789
--- /dev/null
+++ b/app/javascript/controllers/hello_controller.js
@@ -0,0 +1,7 @@
+import { Controller } from "@hotwired/stimulus"
+
+export default class extends Controller {
+  connect() {
+    this.element.textContent = "Hello World!"
+  }
+}
diff --git a/app/javascript/controllers/index.js b/app/javascript/controllers/index.js
new file mode 100644
index 000000000..d0685d3b7
--- /dev/null
+++ b/app/javascript/controllers/index.js
@@ -0,0 +1,8 @@
+// This file is auto-generated by ./bin/rails stimulus:manifest:update
+// Run that command whenever you add a new controller or create them with
+// ./bin/rails generate stimulus controllerName
+
+import { application } from "./application"
+
+import HelloController from "./hello_controller"
+application.register("hello", HelloController)
diff --git a/app/views/vignettes/slides/_form.html.erb b/app/views/vignettes/slides/_form.html.erb
index d27ce3e2f..bab5b286b 100644
--- a/app/views/vignettes/slides/_form.html.erb
+++ b/app/views/vignettes/slides/_form.html.erb
@@ -11,17 +11,21 @@
     <%= form.label :content %><br>
     <%= form.rich_text_area :content %>
   </div>
-  <div>
-    <%= form.submit @slide.new_record? ? 'Create Slide' : 'Update Slide' %>
-  </div>
   <div>
     <%= form.label :type, "Question Type" %>
     <%= form.select :type, options_for_select([
         ['No Question', ''],
         ['Text Field', 'TextQuestion']
-    ]), {}, { id: "question_type" } %>
+    ]), {}, data: { action: "change->toggle-fields#switch" } %>
   </div>
-  <!-- This div will dynamically be replaced in the question_type.js file -->
-  <div id="question_field">
+  <fieldset data-type="TextQuestion">
+    <%= form.label :question_text, "Question Text" %>
+    <br>
+    <%= form.text_area :question_text %>
+  </fieldset>
+  <div>
+    <%= form.submit @slide.new_record? ? 'Create Slide' : 'Update Slide' %>
   </div>
+
+
 <% end %>
\ No newline at end of file
diff --git a/package.json b/package.json
index 60f7c0edf..063cc1af0 100644
--- a/package.json
+++ b/package.json
@@ -2,6 +2,7 @@
   "name": "mampf",
   "private": true,
   "dependencies": {
+    "@hotwired/stimulus": "^3.2.2",
     "@rails/actiontext": "^8.0.0",
     "@rails/webpacker": "5.4.4",
     "@webpack-cli/serve": "^1.7.0",
diff --git a/yarn.lock b/yarn.lock
index 7fcd78eec..563252a47 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -927,6 +927,11 @@
   resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
   integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
 
+"@hotwired/stimulus@^3.2.2":
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/@hotwired/stimulus/-/stimulus-3.2.2.tgz#071aab59c600fed95b97939e605ff261a4251608"
+  integrity sha512-eGeIqNOQpXoPAIP7tC1+1Yc1yl1xnwYqg+3mzqxyrbE5pg5YFBZcA6YoTiByJB6DKAEsiWtl6tjTJS4IYtbB7A==
+
 "@humanfs/core@^0.19.1":
   version "0.19.1"
   resolved "https://registry.yarnpkg.com/@humanfs/core/-/core-0.19.1.tgz#17c55ca7d426733fe3c561906b8173c336b40a77"

From c754ba167d685de571d69df500a9baa84b06bcbf Mon Sep 17 00:00:00 2001
From: Florian <florianbuerckel@gmail.com>
Date: Sun, 29 Dec 2024 18:39:11 +0100
Subject: [PATCH 012/103] add multiple choice option for questionnaire

Signed-off-by: Florian <florianbuerckel@gmail.com>
---
 .../javascripts/vignettes/question_type.js    | 29 +++++-------
 .../vignettes/slides_controller.rb            | 15 +++++-
 .../vignettes/multiple_choice_question.rb     |  4 ++
 app/models/vignettes/option.rb                |  6 +++
 app/models/vignettes/question.rb              |  5 +-
 app/models/vignettes/slide.rb                 |  3 +-
 app/views/vignettes/slides/_form.html.erb     | 47 +++++++++++++++----
 .../questions/_text_question_field.html.erb   |  4 ++
 ...move_questionable_from_vignettes_slides.rb |  7 +++
 db/migrate/20241228200302_create_options.rb   | 10 ++++
 db/schema.rb                                  | 14 ++++--
 spec/factories/options.rb                     |  6 +++
 spec/models/option_spec.rb                    |  5 ++
 13 files changed, 122 insertions(+), 33 deletions(-)
 create mode 100644 app/models/vignettes/multiple_choice_question.rb
 create mode 100644 app/models/vignettes/option.rb
 create mode 100644 app/views/vignettes/slides/questions/_text_question_field.html.erb
 create mode 100644 db/migrate/20241228184829_remove_questionable_from_vignettes_slides.rb
 create mode 100644 db/migrate/20241228200302_create_options.rb
 create mode 100644 spec/factories/options.rb
 create mode 100644 spec/models/option_spec.rb

diff --git a/app/assets/javascripts/vignettes/question_type.js b/app/assets/javascripts/vignettes/question_type.js
index 2d7bb9610..d5dfde800 100644
--- a/app/assets/javascripts/vignettes/question_type.js
+++ b/app/assets/javascripts/vignettes/question_type.js
@@ -1,23 +1,20 @@
-var questionTypeHTML = {
-  TextQuestion: `
-    <div>
-        <%= form.label :question_text, "Question Text" %><br>
-        <%= form.text_area :question_text %>
-    </div> 
-    `,
-};
 document.addEventListener("turbolinks:load", () => {
   const questionTypeDropdown = document.getElementById("question_type");
-  const questionField = document.getElementById("question_field");
-  if (questionTypeDropdown && questionField) {
+  if (questionTypeDropdown) {
     questionTypeDropdown.addEventListener("change", function (event) {
-      const selectedType = event.target.value;
-      if (selectedType == "") {
-        questionField.innerHTML = "";
-        return;
+      // Disable all fields by default
+      const allQuestionFields = document.getElementsByClassName("question-field");
+      for (let field of allQuestionFields) {
+        field.style.display = "none";
       }
-      else {
-        questionField.innerHTML = questionTypeHTML[selectedType];
+      // make selected field visible
+      const selectedType = event.target.value;
+      if (selectedType) {
+        const selectedField = document.getElementById(selectedType);
+        console.log(selectedField);
+        if (selectedField) {
+          selectedField.style.display = "block";
+        }
       }
     });
   };
diff --git a/app/controllers/vignettes/slides_controller.rb b/app/controllers/vignettes/slides_controller.rb
index 5861660e0..db1ee6657 100644
--- a/app/controllers/vignettes/slides_controller.rb
+++ b/app/controllers/vignettes/slides_controller.rb
@@ -10,10 +10,14 @@ def show
 
     def new
       @slide = @questionnaire.slides.new
+      @slide.build_question
+      @slide.question.options.build
     end
 
     def edit
       @slide = @questionnaire.slides.find(params[:id])
+      @slide.build_question unless @slide.question
+      @slide.question.options.build unless @slide.question.options.any?
     end
 
     def create
@@ -41,7 +45,16 @@ def set_questionnaire
       end
 
       def slide_params
-        params.require(:vignettes_slide).permit(:content)
+        params.require(:vignettes_slide).permit(
+          :content,
+          question_attributes: [
+            :id,
+            :type,
+            :question_text,
+            :_destroy,
+            { options_attributes: [:id, :text, :_destroy] }
+          ]
+        )
       end
   end
 end
diff --git a/app/models/vignettes/multiple_choice_question.rb b/app/models/vignettes/multiple_choice_question.rb
new file mode 100644
index 000000000..8435b083a
--- /dev/null
+++ b/app/models/vignettes/multiple_choice_question.rb
@@ -0,0 +1,4 @@
+module Vignettes
+  class MultipleChoiceQuestion < Question
+  end
+end
diff --git a/app/models/vignettes/option.rb b/app/models/vignettes/option.rb
new file mode 100644
index 000000000..76f78785e
--- /dev/null
+++ b/app/models/vignettes/option.rb
@@ -0,0 +1,6 @@
+module Vignettes
+  class Option < ApplicationRecord
+    belongs_to :question, inverse_of: :options, foreign_key: "vignettes_question_id"
+    validates :text, presence: true
+  end
+end
diff --git a/app/models/vignettes/question.rb b/app/models/vignettes/question.rb
index 0eb94be4c..b3b563400 100644
--- a/app/models/vignettes/question.rb
+++ b/app/models/vignettes/question.rb
@@ -1,7 +1,10 @@
 module Vignettes
   class Question < ApplicationRecord
     # Uses single table inheritance to store different types of answers
-    belongs_to :slide
+    belongs_to :slide, inverse_of: :question, foreign_key: "vignettes_slide_id"
+    has_many :options, dependent: :destroy, inverse_of: :question
+
+    accepts_nested_attributes_for :options, allow_destroy: true, reject_if: :all_blank
 
     validates :question_text, presence: true
 
diff --git a/app/models/vignettes/slide.rb b/app/models/vignettes/slide.rb
index 85502e2c9..02bf79df9 100644
--- a/app/models/vignettes/slide.rb
+++ b/app/models/vignettes/slide.rb
@@ -2,6 +2,7 @@ module Vignettes
   class Slide < ApplicationRecord
     belongs_to :questionnaire, foreign_key: "vignettes_questionnaire_id"
     has_rich_text :content
-    has_one :question, dependent: :destroy, inverse_of: :vignettes_slide
+    has_one :question, dependent: :destroy, inverse_of: :slide
+    accepts_nested_attributes_for :question, allow_destroy: true
   end
 end
diff --git a/app/views/vignettes/slides/_form.html.erb b/app/views/vignettes/slides/_form.html.erb
index d27ce3e2f..135527dd7 100644
--- a/app/views/vignettes/slides/_form.html.erb
+++ b/app/views/vignettes/slides/_form.html.erb
@@ -11,17 +11,44 @@
     <%= form.label :content %><br>
     <%= form.rich_text_area :content %>
   </div>
+  <%= form.fields_for :question do |question_form| %>
+
+    <div>
+      <%= question_form.label :type, "Question Type" %>
+      <%= question_form.select :type, options_for_select([
+          ['No Question', ''],
+          ['Text Field', 'TextQuestion'],
+          ['Multiple Choice', 'MultipleChoiceQuestion']
+      ]), {}, { id: "question_type" } %>
+    </div>
+
+    <div id="TextQuestion" class="question-field" style="display: none;">
+      <%= question_form.label :question_text, "Question Text" %><br>
+      <%= question_form.text_area :question_text, placeholder: "Enter your question here" %>
+    </div>
+
+    <div id="MultipleChoiceQuestion" class="question-field" style="display: none;">
+      <%= question_form.label :question_text, "Question Text" %><br>
+      <%= question_form.text_area :question_text, placeholder: "Enter your question here" %>
+
+      <div>so to save some time, I don't expect reviewers to test everything manually (it really takes quite some time to do this). Maybe just read carefully through the replacements, compare them and then go on. Double-check entries marked with ⚠️
+        <%= question_form.label :options, "Options" %>
+        <div id="options-container">
+          <% question_form.object.options.each do |option| %>
+            <div class="option-block">
+              <%= question_form.fields_for :options, option do |option_form| %>
+                <%= option_form.text_field :text, placeholder: "Option Text"%>
+                <%= option_form.check_box :_destroy %>
+                <%= option_form.label :_destroy, "Remove option" %>
+              <% end %>
+            </div>
+          <% end %>
+        </div>
+        <button type="button" id="add-option">Add Option</button>
+      </div>
+    </div>
+  <% end %>
   <div>
     <%= form.submit @slide.new_record? ? 'Create Slide' : 'Update Slide' %>
   </div>
-  <div>
-    <%= form.label :type, "Question Type" %>
-    <%= form.select :type, options_for_select([
-        ['No Question', ''],
-        ['Text Field', 'TextQuestion']
-    ]), {}, { id: "question_type" } %>
-  </div>
-  <!-- This div will dynamically be replaced in the question_type.js file -->
-  <div id="question_field">
-  </div>
 <% end %>
\ No newline at end of file
diff --git a/app/views/vignettes/slides/questions/_text_question_field.html.erb b/app/views/vignettes/slides/questions/_text_question_field.html.erb
new file mode 100644
index 000000000..cccddf583
--- /dev/null
+++ b/app/views/vignettes/slides/questions/_text_question_field.html.erb
@@ -0,0 +1,4 @@
+<div id="TextQuestion_field" class="question-type-field">
+    <%= form.label :question_text, "Question Text" %><br>
+    <%= form.text_area :question_text, placeholder: "Enter your question here" %>
+</div>
\ No newline at end of file
diff --git a/db/migrate/20241228184829_remove_questionable_from_vignettes_slides.rb b/db/migrate/20241228184829_remove_questionable_from_vignettes_slides.rb
new file mode 100644
index 000000000..779d81381
--- /dev/null
+++ b/db/migrate/20241228184829_remove_questionable_from_vignettes_slides.rb
@@ -0,0 +1,7 @@
+class RemoveQuestionableFromVignettesSlides < ActiveRecord::Migration[7.1]
+  def change
+    remove_index :vignettes_slides, name: "index_vignettes_slides_on_questionable"
+    remove_column :vignettes_slides, :questionable_type, :string
+    remove_column :vignettes_slides, :questionable_id, :bigint
+  end
+end
diff --git a/db/migrate/20241228200302_create_options.rb b/db/migrate/20241228200302_create_options.rb
new file mode 100644
index 000000000..47a4cb59a
--- /dev/null
+++ b/db/migrate/20241228200302_create_options.rb
@@ -0,0 +1,10 @@
+class CreateOptions < ActiveRecord::Migration[7.1]
+  def change
+    create_table :vignettes_options do |t|
+      t.string :text
+      t.references :vignettes_question, null: false, foreign_key: true
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 0cdff38cd..049dfe442 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.1].define(version: 2024_12_24_094245) do
+ActiveRecord::Schema[7.1].define(version: 2024_12_28_200302) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pgcrypto"
   enable_extension "plpgsql"
@@ -949,6 +949,14 @@
     t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
   end
 
+  create_table "vignettes_options", force: :cascade do |t|
+    t.string "text"
+    t.bigint "vignettes_question_id", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["vignettes_question_id"], name: "index_vignettes_options_on_vignettes_question_id"
+  end
+
   create_table "vignettes_questionnaires", force: :cascade do |t|
     t.string "title"
     t.datetime "created_at", null: false
@@ -968,9 +976,6 @@
     t.bigint "vignettes_questionnaire_id", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.string "questionable_type"
-    t.bigint "questionable_id"
-    t.index ["questionable_type", "questionable_id"], name: "index_vignettes_slides_on_questionable"
     t.index ["vignettes_questionnaire_id"], name: "index_vignettes_slides_on_vignettes_questionnaire_id"
   end
 
@@ -1078,6 +1083,7 @@
   add_foreign_key "user_favorite_lecture_joins", "lectures"
   add_foreign_key "user_favorite_lecture_joins", "users"
   add_foreign_key "user_submission_joins", "users"
+  add_foreign_key "vignettes_options", "vignettes_questions"
   add_foreign_key "vignettes_questions", "vignettes_slides"
   add_foreign_key "vignettes_slides", "vignettes_questionnaires"
   add_foreign_key "vouchers", "lectures"
diff --git a/spec/factories/options.rb b/spec/factories/options.rb
new file mode 100644
index 000000000..08e0687a1
--- /dev/null
+++ b/spec/factories/options.rb
@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :option do
+    text { "MyString" }
+    question { nil }
+  end
+end
diff --git a/spec/models/option_spec.rb b/spec/models/option_spec.rb
new file mode 100644
index 000000000..eeda255a3
--- /dev/null
+++ b/spec/models/option_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe Option, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

From b220ab9f38719e6170cda4c826b5f680088a3663 Mon Sep 17 00:00:00 2001
From: Florian <florianbuerckel@gmail.com>
Date: Sun, 5 Jan 2025 18:12:44 +0100
Subject: [PATCH 013/103] ensure correct post request for dynamic form

Signed-off-by: Florian <florianbuerckel@gmail.com>
---
 Gemfile                                       |  1 -
 .../javascripts/vignettes/question_type.js    | 37 ++++++++++++++++++-
 app/views/vignettes/slides/_form.html.erb     | 33 +++++++++++------
 app/views/vignettes/slides/show.html.erb      | 14 ++++++-
 4 files changed, 71 insertions(+), 14 deletions(-)

diff --git a/Gemfile b/Gemfile
index 8ee6894eb..645764650 100644
--- a/Gemfile
+++ b/Gemfile
@@ -58,7 +58,6 @@ gem "shrine", "~> 3.6"
 gem "sidekiq", "~> 7.3"
 gem "sidekiq-cron", "~> 1.12"
 gem "sprockets-rails", "~>3.5"
-gem "stimulus-rails"
 gem "streamio-ffmpeg", "~> 3.0"
 gem "sunspot_rails", "~> 2.7"
 gem "sunspot_solr", "~> 2.7"
diff --git a/app/assets/javascripts/vignettes/question_type.js b/app/assets/javascripts/vignettes/question_type.js
index d5dfde800..6d79ce2ad 100644
--- a/app/assets/javascripts/vignettes/question_type.js
+++ b/app/assets/javascripts/vignettes/question_type.js
@@ -1,5 +1,5 @@
 document.addEventListener("turbolinks:load", () => {
-  const questionTypeDropdown = document.getElementById("question_type");
+  const questionTypeDropdown = document.getElementById("question-type");
   if (questionTypeDropdown) {
     questionTypeDropdown.addEventListener("change", function (event) {
       // Disable all fields by default
@@ -17,5 +17,40 @@ document.addEventListener("turbolinks:load", () => {
         }
       }
     });
+
+    questionTypeDropdown.dispatchEvent(new Event("change"));
   };
+  const optionsContainer = document.getElementById("options-container");
+
+  // Handle dynamic addition of options
+  const addOptionButton = document.getElementById("add-option");
+  const optionTemplate = document.getElementById("new-option-template");
+  if (addOptionButton) {
+    addOptionButton.addEventListener("click", (e) => {
+      const optionTemplateHTML = optionTemplate.innerHTML;
+      const uniqueId = new Date().getTime().toString();
+      const newBlockHTML = optionTemplateHTML.replace(/NEW_RECORD/g, uniqueId);
+
+      optionsContainer.insertAdjacentHTML("beforeend", newBlockHTML);
+    });
+  }
+
+  // Handle removal of options
+  if (optionsContainer) {
+    optionsContainer.addEventListener("click", (e) => {
+      console.log(e.target);
+      if (e.target.className == "remove-option") {
+        e.preventDefault();
+        const optionBlock = e.target.parentElement;
+        if (optionBlock.className == "option-field") {
+          const destroyField = optionBlock.querySelector("input[type='hidden'][name*='_destroy']");
+          console.log(destroyField);
+          if (destroyField) {
+            destroyField.value = "1";
+            optionBlock.style.display = "none";
+          }
+        }
+      }
+    });
+  }
 });
diff --git a/app/views/vignettes/slides/_form.html.erb b/app/views/vignettes/slides/_form.html.erb
index 135527dd7..7c2eec7f8 100644
--- a/app/views/vignettes/slides/_form.html.erb
+++ b/app/views/vignettes/slides/_form.html.erb
@@ -17,32 +17,43 @@
       <%= question_form.label :type, "Question Type" %>
       <%= question_form.select :type, options_for_select([
           ['No Question', ''],
-          ['Text Field', 'TextQuestion'],
-          ['Multiple Choice', 'MultipleChoiceQuestion']
-      ]), {}, { id: "question_type" } %>
+          ['Text Field', 'Vignettes::TextQuestion'],
+          ['Multiple Choice', 'Vignettes::MultipleChoiceQuestion']
+      ], question_form.object.type), {}, { id: "question-type" } %>
     </div>
-
-    <div id="TextQuestion" class="question-field" style="display: none;">
+    
+    <!-- The id must be the name of the corresponding class -->
+    <div id="Vignettes::TextQuestion" class="question-field" style="display: none;">
       <%= question_form.label :question_text, "Question Text" %><br>
       <%= question_form.text_area :question_text, placeholder: "Enter your question here" %>
     </div>
 
-    <div id="MultipleChoiceQuestion" class="question-field" style="display: none;">
+    <div id="Vignettes::MultipleChoiceQuestion" class="question-field" style="display: none;">
       <%= question_form.label :question_text, "Question Text" %><br>
       <%= question_form.text_area :question_text, placeholder: "Enter your question here" %>
 
-      <div>so to save some time, I don't expect reviewers to test everything manually (it really takes quite some time to do this). Maybe just read carefully through the replacements, compare them and then go on. Double-check entries marked with ⚠️
+      <div>
         <%= question_form.label :options, "Options" %>
         <div id="options-container">
           <% question_form.object.options.each do |option| %>
             <div class="option-block">
               <%= question_form.fields_for :options, option do |option_form| %>
-                <%= option_form.text_field :text, placeholder: "Option Text"%>
-                <%= option_form.check_box :_destroy %>
-                <%= option_form.label :_destroy, "Remove option" %>
-              <% end %>
+                <div class="option-field">
+                  <%= option_form.text_field :text, placeholder: "Option Text" %>
+                  <%= option_form.hidden_field :_destroy %>
+                  <button type="button" class="remove-option">Remove</button>
+                </div>
+            <% end %>
             </div>
           <% end %>
+          <div id="new-option-template" style="display: none;">
+            <%= question_form.fields_for :options, question_form.object.options.build, child_index: "NEW_RECORD" do |option_form|%>
+              <div class="option-block">
+                <%= option_form.text_field :text %>
+                <button type="button" class="remove-option">Remove</button>
+              </div>
+            <% end %>
+          </div>
         </div>
         <button type="button" id="add-option">Add Option</button>
       </div>
diff --git a/app/views/vignettes/slides/show.html.erb b/app/views/vignettes/slides/show.html.erb
index 3fb5911b5..5f4950cd2 100644
--- a/app/views/vignettes/slides/show.html.erb
+++ b/app/views/vignettes/slides/show.html.erb
@@ -1 +1,13 @@
-<%= @slide.content %>
\ No newline at end of file
+<%= @slide.content %>
+<%= @slide.question.question_text %>
+
+<br>
+
+<% case @slide.question.type %> 
+  <% when "Vignettes::TextQuestion" %>
+    <%= @slide.content %>
+  <% when "Vignettes::MultipleChoiceQuestion" %>
+    <% @slide.question.options.each do |option| %>
+        <%= option.text %> <br>
+    <% end %>
+<% end %>
\ No newline at end of file

From 80ad4cf833356677227701969109b32335c90482 Mon Sep 17 00:00:00 2001
From: Florian <florianbuerckel@gmail.com>
Date: Tue, 7 Jan 2025 12:32:51 +0100
Subject: [PATCH 014/103] add video support for action text

Signed-off-by: Florian <florianbuerckel@gmail.com>
---
 app/views/active_storage/blobs/_blob.html.erb |  5 ++++-
 config/initializers/html_sanitization.rb      | 12 ++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 config/initializers/html_sanitization.rb

diff --git a/app/views/active_storage/blobs/_blob.html.erb b/app/views/active_storage/blobs/_blob.html.erb
index 49ba357dd..a1c81ef03 100644
--- a/app/views/active_storage/blobs/_blob.html.erb
+++ b/app/views/active_storage/blobs/_blob.html.erb
@@ -1,7 +1,10 @@
 <figure class="attachment attachment--<%= blob.representable? ? "preview" : "file" %> attachment--<%= blob.filename.extension %>">
-  <% if blob.representable? %>
+  <% if blob.image? %>
     <%= image_tag blob.representation(resize_to_limit: local_assigns[:in_gallery] ? [ 800, 600 ] : [ 1024, 768 ]) %>
   <% end %>
+  <% if blob.video? %>
+    <%= video_tag url_for(blob.attachable), controls: true %>
+  <% end %>
 
   <figcaption class="attachment__caption">
     <% if caption = blob.try(:caption) %>
diff --git a/config/initializers/html_sanitization.rb b/config/initializers/html_sanitization.rb
new file mode 100644
index 000000000..d4d087e66
--- /dev/null
+++ b/config/initializers/html_sanitization.rb
@@ -0,0 +1,12 @@
+Rails.application.config.after_initialize do
+  default_allowed_attributes = Rails::HTML5::Sanitizer.safe_list_sanitizer.allowed_attributes + ActionText::Attachment::ATTRIBUTES.to_set
+  custom_allowed_attributes = Set.new(["controls"])
+  ActionText::ContentHelper.allowed_attributes = (default_allowed_attributes + custom_allowed_attributes).freeze
+
+  default_allowed_tags = Rails::HTML5::Sanitizer.safe_list_sanitizer.allowed_tags +
+                         Set.new([
+                                   ActionText::Attachment.tag_name, "figure", "figcaption"
+                                 ])
+  custom_allowed_tags = Set.new(["audio", "video", "source"])
+  ActionText::ContentHelper.allowed_tags = (default_allowed_tags + custom_allowed_tags).freeze
+end

From bb9c05eb8e2d288c168f1ec4ea0594bbc75722b1 Mon Sep 17 00:00:00 2001
From: Florian <florianbuerckel@gmail.com>
Date: Fri, 17 Jan 2025 21:35:50 +0100
Subject: [PATCH 015/103] add position attribute to slides

---
 app/controllers/vignettes/slides_controller.rb      | 2 ++
 app/views/vignettes/questionnaires/edit.html.erb    | 2 +-
 app/views/vignettes/questionnaires/show.html.erb    | 2 +-
 db/migrate/20250110151936_add_position_to_slides.rb | 6 ++++++
 db/schema.rb                                        | 2 ++
 5 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 db/migrate/20250110151936_add_position_to_slides.rb

diff --git a/app/controllers/vignettes/slides_controller.rb b/app/controllers/vignettes/slides_controller.rb
index db1ee6657..38a2debca 100644
--- a/app/controllers/vignettes/slides_controller.rb
+++ b/app/controllers/vignettes/slides_controller.rb
@@ -22,6 +22,7 @@ def edit
 
     def create
       @slide = @questionnaire.slides.new(slide_params)
+      @slide.position = @questionnaire.slides.maximum(:position).to_i + 1
       if @slide.save
         redirect_to @questionnaire, notice: "Slide was successfully created"
       else
@@ -47,6 +48,7 @@ def set_questionnaire
       def slide_params
         params.require(:vignettes_slide).permit(
           :content,
+          :position,
           question_attributes: [
             :id,
             :type,
diff --git a/app/views/vignettes/questionnaires/edit.html.erb b/app/views/vignettes/questionnaires/edit.html.erb
index 87715de2d..1075f68d2 100644
--- a/app/views/vignettes/questionnaires/edit.html.erb
+++ b/app/views/vignettes/questionnaires/edit.html.erb
@@ -3,7 +3,7 @@
 <ul>
     <% @questionnaire.slides.each() do |slide| %>
         <li>
-            <%= link_to slide.id, edit_vignettes_questionnaire_slide_path(@questionnaire, slide) %>
+            <%= link_to slide.position, edit_vignettes_questionnaire_slide_path(@questionnaire, slide) %>
         </li>
     <%end%>
 </ul>
diff --git a/app/views/vignettes/questionnaires/show.html.erb b/app/views/vignettes/questionnaires/show.html.erb
index e15e0ab98..bd6f5f15e 100644
--- a/app/views/vignettes/questionnaires/show.html.erb
+++ b/app/views/vignettes/questionnaires/show.html.erb
@@ -2,7 +2,7 @@
 <ul>
     <% @questionnaire.slides.each do |slide| %>
     <li>
-        <%= link_to slide.id, vignettes_questionnaire_slide_path(@questionnaire, slide) %>
+        <%= link_to slide.position, vignettes_questionnaire_slide_path(@questionnaire, slide) %>
     </li>
     <% end %>
 </ul>
diff --git a/db/migrate/20250110151936_add_position_to_slides.rb b/db/migrate/20250110151936_add_position_to_slides.rb
new file mode 100644
index 000000000..5cb015579
--- /dev/null
+++ b/db/migrate/20250110151936_add_position_to_slides.rb
@@ -0,0 +1,6 @@
+class AddPositionToSlides < ActiveRecord::Migration[7.1]
+  def change
+    add_column :vignettes_slides, :position, :integer
+    add_index :vignettes_slides, :position
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 049dfe442..5da92e09b 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -976,6 +976,8 @@
     t.bigint "vignettes_questionnaire_id", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.integer "position"
+    t.index ["position"], name: "index_vignettes_slides_on_position"
     t.index ["vignettes_questionnaire_id"], name: "index_vignettes_slides_on_vignettes_questionnaire_id"
   end
 

From 700bd0de59987da8e8375851f0e0ecc85ccdfbad Mon Sep 17 00:00:00 2001
From: Florian <florianbuerckel@gmail.com>
Date: Fri, 17 Jan 2025 21:50:16 +0100
Subject: [PATCH 016/103] add answer model for vignettes

answer model for single answer to slide of questionnaire,

user_answer model to store all answers made by a user on a specific
questionnaire.
---
 .../vignettes/slides_controller.rb            |  1 +
 app/models/user.rb                            |  3 ++
 app/models/vignettes/answer.rb                | 18 +++++++++
 app/models/vignettes/likert_scale_answer.rb   | 11 ++++++
 app/models/vignettes/likert_scale_question.rb | 11 ++++++
 .../vignettes/multiple_choice_answer.rb       |  4 ++
 app/models/vignettes/option.rb                |  2 +
 app/models/vignettes/slide.rb                 |  3 ++
 app/models/vignettes/text_answer.rb           |  5 +++
 app/models/vignettes/user_answer.rb           |  8 ++++
 ...20250105171326_create_vignettes_answers.rb | 11 ++++++
 ...53418_create_join_table_answers_options.rb | 11 ++++++
 ...111144808_create_vignettes_user_answers.rb | 10 +++++
 ...250111144832_add_user_answer_to_answers.rb |  5 +++
 .../20250111200240_add_text_to_answers.rb     |  5 +++
 db/schema.rb                                  | 39 +++++++++++++++++++
 spec/factories/multiple_choice_answers.rb     |  5 +++
 spec/factories/vignettes/answers.rb           |  7 ++++
 spec/factories/vignettes/text_answers.rb      |  5 +++
 spec/factories/vignettes/user_answers.rb      |  6 +++
 spec/models/multiple_choice_answer_spec.rb    |  5 +++
 spec/models/vignettes/answer_spec.rb          |  5 +++
 spec/models/vignettes/text_answer_spec.rb     |  5 +++
 spec/models/vignettes/user_answer_spec.rb     |  5 +++
 24 files changed, 190 insertions(+)
 create mode 100644 app/models/vignettes/answer.rb
 create mode 100644 app/models/vignettes/likert_scale_answer.rb
 create mode 100644 app/models/vignettes/likert_scale_question.rb
 create mode 100644 app/models/vignettes/multiple_choice_answer.rb
 create mode 100644 app/models/vignettes/text_answer.rb
 create mode 100644 app/models/vignettes/user_answer.rb
 create mode 100644 db/migrate/20250105171326_create_vignettes_answers.rb
 create mode 100644 db/migrate/20250110153418_create_join_table_answers_options.rb
 create mode 100644 db/migrate/20250111144808_create_vignettes_user_answers.rb
 create mode 100644 db/migrate/20250111144832_add_user_answer_to_answers.rb
 create mode 100644 db/migrate/20250111200240_add_text_to_answers.rb
 create mode 100644 spec/factories/multiple_choice_answers.rb
 create mode 100644 spec/factories/vignettes/answers.rb
 create mode 100644 spec/factories/vignettes/text_answers.rb
 create mode 100644 spec/factories/vignettes/user_answers.rb
 create mode 100644 spec/models/multiple_choice_answer_spec.rb
 create mode 100644 spec/models/vignettes/answer_spec.rb
 create mode 100644 spec/models/vignettes/text_answer_spec.rb
 create mode 100644 spec/models/vignettes/user_answer_spec.rb

diff --git a/app/controllers/vignettes/slides_controller.rb b/app/controllers/vignettes/slides_controller.rb
index 38a2debca..066d7a526 100644
--- a/app/controllers/vignettes/slides_controller.rb
+++ b/app/controllers/vignettes/slides_controller.rb
@@ -6,6 +6,7 @@ def index
 
     def show
       @slide = @questionnaire.slides.find(params[:id])
+      @answer = Answer.build(slide: @slide, type: @slide.question.type.gsub("Question", "Answer"))
     end
 
     def new
diff --git a/app/models/user.rb b/app/models/user.rb
index 7c9d9d8b8..d96df6e91 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -76,6 +76,9 @@ class User < ApplicationRecord
   # and claiming the certificate
   has_many :quiz_certificates, dependent: :destroy
 
+  # a user may have many user answers for questionnaires that they filled out.
+  has_many :vignettes_user_answers, dependent: :destroy, class_name: "Vignettes::UserAnswer"
+
   # a user has a watchlist with watchlist_entries
   has_many :watchlists, dependent: :destroy
 
diff --git a/app/models/vignettes/answer.rb b/app/models/vignettes/answer.rb
new file mode 100644
index 000000000..820543206
--- /dev/null
+++ b/app/models/vignettes/answer.rb
@@ -0,0 +1,18 @@
+module Vignettes
+  class Answer < ApplicationRecord
+    belongs_to :question, class_name: "Vignettes::Question", foreign_key: "vignettes_question_id"
+    belongs_to :slide, class_name: "Vignettes::Slide", foreign_key: "vignettes_slide_id"
+
+    has_one :slide_statistic, class_name: "Vignettes::SlideStatistic",
+                              foreign_key: "vignettes_answer_id", inverse_of: :answer, dependent: :destroy
+
+    accepts_nested_attributes_for :slide_statistic, allow_destroy: true
+
+    belongs_to :user_answer, class_name: "Vignettes::UserAnswer",
+                             foreign_key: "vignettes_user_answer_id"
+
+    has_and_belongs_to_many :options, class_name: "Vignettes::Option",
+                                      join_table: :vignettes_answers_options, association_foreign_key: "vignettes_option_id",
+                                      foreign_key: "vignettes_answer_id"
+  end
+end
diff --git a/app/models/vignettes/likert_scale_answer.rb b/app/models/vignettes/likert_scale_answer.rb
new file mode 100644
index 000000000..79e9a60db
--- /dev/null
+++ b/app/models/vignettes/likert_scale_answer.rb
@@ -0,0 +1,11 @@
+module Vignettes
+  class LikertScaleAnswer < Answer
+    enum likert_scale_value: {
+      strongly_agree: 5,
+      agree: 4,
+      neither_agree_nor_disagree: 3,
+      disagree: 2,
+      strongly_disagree: 1
+    }
+  end
+end
diff --git a/app/models/vignettes/likert_scale_question.rb b/app/models/vignettes/likert_scale_question.rb
new file mode 100644
index 000000000..5307871ed
--- /dev/null
+++ b/app/models/vignettes/likert_scale_question.rb
@@ -0,0 +1,11 @@
+module Vignettes
+  class LikertScaleQuestion < Question
+    LIKERT_OPTIONS = {
+      5 => "Strongly Agree",
+      4 => "Agree",
+      3 => "Neither agree nor disagree",
+      2 => "Disagree",
+      1 => "Strongly Disagree"
+    }.freeze
+  end
+end
diff --git a/app/models/vignettes/multiple_choice_answer.rb b/app/models/vignettes/multiple_choice_answer.rb
new file mode 100644
index 000000000..ad8a7be27
--- /dev/null
+++ b/app/models/vignettes/multiple_choice_answer.rb
@@ -0,0 +1,4 @@
+module Vignettes
+  class MultipleChoiceAnswer < Answer
+  end
+end
diff --git a/app/models/vignettes/option.rb b/app/models/vignettes/option.rb
index 76f78785e..f1551e7e7 100644
--- a/app/models/vignettes/option.rb
+++ b/app/models/vignettes/option.rb
@@ -1,6 +1,8 @@
 module Vignettes
   class Option < ApplicationRecord
     belongs_to :question, inverse_of: :options, foreign_key: "vignettes_question_id"
+    has_and_belongs_to_many :answers, class_name: "Vignettes::Answer",
+                                      join_table: :vignettes_answers_options, association_foreign_key: "vignettes_answer_id", foreign_key: "vignettes_option_id"
     validates :text, presence: true
   end
 end
diff --git a/app/models/vignettes/slide.rb b/app/models/vignettes/slide.rb
index 02bf79df9..594d2ab00 100644
--- a/app/models/vignettes/slide.rb
+++ b/app/models/vignettes/slide.rb
@@ -3,6 +3,9 @@ class Slide < ApplicationRecord
     belongs_to :questionnaire, foreign_key: "vignettes_questionnaire_id"
     has_rich_text :content
     has_one :question, dependent: :destroy, inverse_of: :slide
+    has_many :answers, dependent: :destroy, inverse_of: :slide
     accepts_nested_attributes_for :question, allow_destroy: true
+    validates :position, presence: true, numericality: { only_integer: true }
+    validates :position, uniqueness: { scope: :vignettes_questionnaire_id }
   end
 end
diff --git a/app/models/vignettes/text_answer.rb b/app/models/vignettes/text_answer.rb
new file mode 100644
index 000000000..18aa689f5
--- /dev/null
+++ b/app/models/vignettes/text_answer.rb
@@ -0,0 +1,5 @@
+module Vignettes
+  class TextAnswer < Answer
+    validates :text, presence: true
+  end
+end
diff --git a/app/models/vignettes/user_answer.rb b/app/models/vignettes/user_answer.rb
new file mode 100644
index 000000000..ac3995bff
--- /dev/null
+++ b/app/models/vignettes/user_answer.rb
@@ -0,0 +1,8 @@
+module Vignettes
+  class UserAnswer < ApplicationRecord
+    belongs_to :user
+    belongs_to :questionnaire, foreign_key: "vignettes_questionnaire_id"
+    has_many :answers, class_name: "Vignettes::Answer", foreign_key: "vignettes_user_answer_id",
+                       dependent: :destroy
+  end
+end
diff --git a/db/migrate/20250105171326_create_vignettes_answers.rb b/db/migrate/20250105171326_create_vignettes_answers.rb
new file mode 100644
index 000000000..1f097648b
--- /dev/null
+++ b/db/migrate/20250105171326_create_vignettes_answers.rb
@@ -0,0 +1,11 @@
+class CreateVignettesAnswers < ActiveRecord::Migration[7.1]
+  def change
+    create_table :vignettes_answers do |t|
+      t.string :type
+      t.references :vignettes_question, null: false, foreign_key: true
+      t.references :vignettes_slide, null: false, foreign_key: true
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20250110153418_create_join_table_answers_options.rb b/db/migrate/20250110153418_create_join_table_answers_options.rb
new file mode 100644
index 000000000..290f2d3dd
--- /dev/null
+++ b/db/migrate/20250110153418_create_join_table_answers_options.rb
@@ -0,0 +1,11 @@
+class CreateJoinTableAnswersOptions < ActiveRecord::Migration[7.1]
+  def change
+    create_join_table :vignettes_answers, :vignettes_options,
+                      table_name: :vignettes_answers_options do |t|
+      t.index [:vignettes_answer_id, :vignettes_option_id],
+              name: "index_answers_options_on_answer_id_and_option_id"
+      t.index [:vignettes_option_id, :vignettes_answer_id],
+              name: "index_answers_options_on_option_id_and_answer_id"
+    end
+  end
+end
diff --git a/db/migrate/20250111144808_create_vignettes_user_answers.rb b/db/migrate/20250111144808_create_vignettes_user_answers.rb
new file mode 100644
index 000000000..ec44f7b0e
--- /dev/null
+++ b/db/migrate/20250111144808_create_vignettes_user_answers.rb
@@ -0,0 +1,10 @@
+class CreateVignettesUserAnswers < ActiveRecord::Migration[7.1]
+  def change
+    create_table :vignettes_user_answers do |t|
+      t.references :user, null: false, foreign_key: true
+      t.references :vignettes_questionnaire, null: false, foreign_key: true
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20250111144832_add_user_answer_to_answers.rb b/db/migrate/20250111144832_add_user_answer_to_answers.rb
new file mode 100644
index 000000000..a1942cd38
--- /dev/null
+++ b/db/migrate/20250111144832_add_user_answer_to_answers.rb
@@ -0,0 +1,5 @@
+class AddUserAnswerToAnswers < ActiveRecord::Migration[7.1]
+  def change
+    add_reference :vignettes_answers, :vignettes_user_answer, null: false, foreign_key: true
+  end
+end
diff --git a/db/migrate/20250111200240_add_text_to_answers.rb b/db/migrate/20250111200240_add_text_to_answers.rb
new file mode 100644
index 000000000..6375cdf72
--- /dev/null
+++ b/db/migrate/20250111200240_add_text_to_answers.rb
@@ -0,0 +1,5 @@
+class AddTextToAnswers < ActiveRecord::Migration[7.1]
+  def change
+    add_column :vignettes_answers, :text, :text
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 5da92e09b..6c820717f 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -949,6 +949,31 @@
     t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
   end
 
+  create_table "vignettes_answers", force: :cascade do |t|
+    t.string "type"
+    t.bigint "vignettes_question_id", null: false
+    t.bigint "vignettes_slide_id", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.bigint "vignettes_user_answer_id", null: false
+    t.text "text"
+    t.integer "likert_scale_value"
+    t.index ["vignettes_question_id"], name: "index_vignettes_answers_on_vignettes_question_id"
+    t.index ["vignettes_slide_id"], name: "index_vignettes_answers_on_vignettes_slide_id"
+    t.index ["vignettes_user_answer_id"], name: "index_vignettes_answers_on_vignettes_user_answer_id"
+  end
+
+  create_table "vignettes_answers_options", id: false, force: :cascade do |t|
+    t.bigint "vignettes_answer_id", null: false
+    t.bigint "vignettes_option_id", null: false
+    t.index ["vignettes_answer_id", "vignettes_option_id"], name: "idx_on_vignettes_answer_id_vignettes_option_id_95dc8573a3"
+    t.index ["vignettes_option_id", "vignettes_answer_id"], name: "idx_on_vignettes_option_id_vignettes_answer_id_239ee34098"
+  end
+  create_table "vignettes_multiple_choice_answers_options", id: false, force: :cascade do |t|
+    t.bigint "vignettes_multiple_choice_answer_id", null: false
+    t.bigint "vignettes_option_id", null: false
+  end
+
   create_table "vignettes_options", force: :cascade do |t|
     t.string "text"
     t.bigint "vignettes_question_id", null: false
@@ -981,6 +1006,15 @@
     t.index ["vignettes_questionnaire_id"], name: "index_vignettes_slides_on_vignettes_questionnaire_id"
   end
 
+  create_table "vignettes_user_answers", force: :cascade do |t|
+    t.bigint "user_id", null: false
+    t.bigint "vignettes_questionnaire_id", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["user_id"], name: "index_vignettes_user_answers_on_user_id"
+    t.index ["vignettes_questionnaire_id"], name: "index_vignettes_user_answers_on_vignettes_questionnaire_id"
+  end
+
   create_table "votes", force: :cascade do |t|
     t.string "votable_type"
     t.bigint "votable_id"
@@ -1085,9 +1119,14 @@
   add_foreign_key "user_favorite_lecture_joins", "lectures"
   add_foreign_key "user_favorite_lecture_joins", "users"
   add_foreign_key "user_submission_joins", "users"
+  add_foreign_key "vignettes_answers", "vignettes_questions"
+  add_foreign_key "vignettes_answers", "vignettes_slides"
+  add_foreign_key "vignettes_answers", "vignettes_user_answers"
   add_foreign_key "vignettes_options", "vignettes_questions"
   add_foreign_key "vignettes_questions", "vignettes_slides"
   add_foreign_key "vignettes_slides", "vignettes_questionnaires"
+  add_foreign_key "vignettes_user_answers", "users"
+  add_foreign_key "vignettes_user_answers", "vignettes_questionnaires"
   add_foreign_key "vouchers", "lectures"
   add_foreign_key "watchlist_entries", "media"
   add_foreign_key "watchlist_entries", "watchlists"
diff --git a/spec/factories/multiple_choice_answers.rb b/spec/factories/multiple_choice_answers.rb
new file mode 100644
index 000000000..bbc530c69
--- /dev/null
+++ b/spec/factories/multiple_choice_answers.rb
@@ -0,0 +1,5 @@
+FactoryBot.define do
+  factory :multiple_choice_answer do
+    
+  end
+end
diff --git a/spec/factories/vignettes/answers.rb b/spec/factories/vignettes/answers.rb
new file mode 100644
index 000000000..9478a986e
--- /dev/null
+++ b/spec/factories/vignettes/answers.rb
@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :vignettes_answer, class: 'Vignettes::Answer' do
+    type { "" }
+    question { nil }
+    slide { nil }
+  end
+end
diff --git a/spec/factories/vignettes/text_answers.rb b/spec/factories/vignettes/text_answers.rb
new file mode 100644
index 000000000..cc43c443a
--- /dev/null
+++ b/spec/factories/vignettes/text_answers.rb
@@ -0,0 +1,5 @@
+FactoryBot.define do
+  factory :vignettes_text_answer, class: 'Vignettes::TextAnswer' do
+    
+  end
+end
diff --git a/spec/factories/vignettes/user_answers.rb b/spec/factories/vignettes/user_answers.rb
new file mode 100644
index 000000000..ab76ed02b
--- /dev/null
+++ b/spec/factories/vignettes/user_answers.rb
@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :vignettes_user_answer, class: 'Vignettes::UserAnswer' do
+    user { nil }
+    questionnaire { nil }
+  end
+end
diff --git a/spec/models/multiple_choice_answer_spec.rb b/spec/models/multiple_choice_answer_spec.rb
new file mode 100644
index 000000000..b7623d79a
--- /dev/null
+++ b/spec/models/multiple_choice_answer_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe MultipleChoiceAnswer, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/models/vignettes/answer_spec.rb b/spec/models/vignettes/answer_spec.rb
new file mode 100644
index 000000000..b1779b174
--- /dev/null
+++ b/spec/models/vignettes/answer_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe Vignettes::Answer, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/models/vignettes/text_answer_spec.rb b/spec/models/vignettes/text_answer_spec.rb
new file mode 100644
index 000000000..780386da6
--- /dev/null
+++ b/spec/models/vignettes/text_answer_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe Vignettes::TextAnswer, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/models/vignettes/user_answer_spec.rb b/spec/models/vignettes/user_answer_spec.rb
new file mode 100644
index 000000000..c2faf9e9c
--- /dev/null
+++ b/spec/models/vignettes/user_answer_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe Vignettes::UserAnswer, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

From 7c56f4f178c8a54cdf57df7e9db09c9a651ff1a0 Mon Sep 17 00:00:00 2001
From: Florian <florianbuerckel@gmail.com>
Date: Fri, 17 Jan 2025 21:52:40 +0100
Subject: [PATCH 017/103] improve video playback view

---
 app/views/active_storage/blobs/_blob.html.erb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views/active_storage/blobs/_blob.html.erb b/app/views/active_storage/blobs/_blob.html.erb
index a1c81ef03..99ec6efef 100644
--- a/app/views/active_storage/blobs/_blob.html.erb
+++ b/app/views/active_storage/blobs/_blob.html.erb
@@ -3,7 +3,9 @@
     <%= image_tag blob.representation(resize_to_limit: local_assigns[:in_gallery] ? [ 800, 600 ] : [ 1024, 768 ]) %>
   <% end %>
   <% if blob.video? %>
-    <%= video_tag url_for(blob.attachable), controls: true %>
+    <video controls="true" width="75%">
+      <source src=<%= rails_blob_url(blob) %>, type=<%= blob.content_type %> >
+    </video>
   <% end %>
 
   <figcaption class="attachment__caption">

From a782b5fa7664ca949367dc4064cb4cada42d2d6f Mon Sep 17 00:00:00 2001
From: Florian <florianbuerckel@gmail.com>
Date: Fri, 17 Jan 2025 22:07:40 +0100
Subject: [PATCH 018/103] feat: take vignette questionnaire

---
 .../vignettes/questionnaires_controller.rb    | 44 ++++++++++++
 .../vignettes/questionnaires/take.html.erb    | 26 +++++++
 app/views/vignettes/slides/_form.html.erb     | 67 ++++---------------
 .../vignettes/slides/_form_content.html.erb   |  4 ++
 .../vignettes/slides/_form_question.html.erb  | 47 +++++++++++++
 config/routes.rb                              |  4 ++
 6 files changed, 139 insertions(+), 53 deletions(-)
 create mode 100644 app/views/vignettes/questionnaires/take.html.erb
 create mode 100644 app/views/vignettes/slides/_form_content.html.erb
 create mode 100644 app/views/vignettes/slides/_form_question.html.erb

diff --git a/app/controllers/vignettes/questionnaires_controller.rb b/app/controllers/vignettes/questionnaires_controller.rb
index 904e47548..26869c522 100644
--- a/app/controllers/vignettes/questionnaires_controller.rb
+++ b/app/controllers/vignettes/questionnaires_controller.rb
@@ -10,6 +10,40 @@ def show
       @questionnaire = Questionnaire.find(params[:id])
     end
 
+    def take
+      if params[:position]
+        @slide = @questionnaire.slides.find_by(position: params[:position])
+        if @slide.nil?
+          redirect_to controller: "questionnaires", action: "index"
+          return
+        end
+      else
+        @slide = @questionnaire.slides.order(:position).first
+      end
+      # Create answer so the form renders correct and nested attributes work.
+      @answer = @slide.answers.build
+    end
+
+    def submit_answer
+      Rails.logger.debug { "Params: #{params.inspect}" }
+
+      @slide = @questionnaire.slides.find(answer_params[:slide_id])
+      @answer = @slide.answers.build(answer_params.except(:slide_id))
+      @answer.question = @slide.question
+      @answer.type = @slide.question.type.gsub("Question", "Answer")
+      @user_answer = current_user.vignettes_user_answers.find_or_create_by(user: current_user,
+                                                                           questionnaire: @questionnaire)
+      @answer.user_answer = @user_answer
+
+      if @answer.save
+        # @answer.build_slide_statistic(answer_params[:slide_statistic_attributes].merge(user: current_user))
+        redirect_to vignettes_take_questionnaire_path(@questionnaire, position: @slide.position + 1)
+      else
+        Rails.logger.debug { "Answer save failed: #{@answer.errors.full_messages.join(", ")}" }
+        render :take, status: :unprocessable_entity
+      end
+    end
+
     def new
       @questionnaire = Questionnaire.new
     end
@@ -29,8 +63,18 @@ def edit
 
     private
 
+      def set_questionnaire
+        @questionnaire = Questionnaire.find(params[:id])
+      end
+
       def questionnaire_params
         params.require(:vignettes_questionnaire).permit(:title)
       end
+
+      def answer_params
+        params.require(:vignettes_answer).permit(:slide_id, :text, :likert_scale_value,
+                                                 option_ids: [],
+                                                 slide_statistic_attributes: [:user_id, :time_on_slide, :time_on_info_slide])
+      end
   end
 end
diff --git a/app/views/vignettes/questionnaires/take.html.erb b/app/views/vignettes/questionnaires/take.html.erb
new file mode 100644
index 000000000..f1e523f83
--- /dev/null
+++ b/app/views/vignettes/questionnaires/take.html.erb
@@ -0,0 +1,26 @@
+<div id="current-slide-container" data-slide-id="<%= @slide.id %>" data-questionnaire-id="<%= @questionnaire.id %>" >
+
+    <h2> Slide <%= @slide.position %> </h2>
+    <%= @slide.content %>
+    <%= @slide.question.question_text %>
+
+    <br>
+
+    <%= form_with(model: @answer, id: "answer_form", url: submit_answer_vignettes_questionnaire_url(@questionnaire), local: true) do |form| %>
+
+
+        <%= form.hidden_field :slide_id, value: @slide.id %>
+        <% case @slide.question.type %> 
+            <% when "Vignettes::TextQuestion" %>
+                <%= form.label :text, "Your Answer" %>
+                <%= form.text_area :text %>
+            <% when "Vignettes::MultipleChoiceQuestion" %>
+                <% @slide.question.options.each do |option| %>
+                    <%= option.text %>
+                    <%= check_box_tag "vignettes_answer[option_ids][]", option.id, @answer.option_ids.include?(option.id) %>
+                <% end %>
+        <% end %>
+        <br>
+        <%= form.submit "Submit Answer!", class: "btn btn-primary" %>
+    <% end %>
+</div>
diff --git a/app/views/vignettes/slides/_form.html.erb b/app/views/vignettes/slides/_form.html.erb
index 7c2eec7f8..98391285b 100644
--- a/app/views/vignettes/slides/_form.html.erb
+++ b/app/views/vignettes/slides/_form.html.erb
@@ -2,63 +2,24 @@
 <%= form_with(
       model: [@questionnaire, @slide],
       url: @slide.new_record? ? vignettes_questionnaire_slides_path(@questionnaire) : vignettes_questionnaire_slide_path(@questionnaire, @slide),
+      id: "slide-form"
     ) do |form| %>
-  <div>
-    <%= form.label :title %><br>
-    <%= form.text_field :title %>
-  </div>
-  <div>
-    <%= form.label :content %><br>
-    <%= form.rich_text_area :content %>
-  </div>
-  <%= form.fields_for :question do |question_form| %>
 
-    <div>
-      <%= question_form.label :type, "Question Type" %>
-      <%= question_form.select :type, options_for_select([
-          ['No Question', ''],
-          ['Text Field', 'Vignettes::TextQuestion'],
-          ['Multiple Choice', 'Vignettes::MultipleChoiceQuestion']
-      ], question_form.object.type), {}, { id: "question-type" } %>
-    </div>
-    
-    <!-- The id must be the name of the corresponding class -->
-    <div id="Vignettes::TextQuestion" class="question-field" style="display: none;">
-      <%= question_form.label :question_text, "Question Text" %><br>
-      <%= question_form.text_area :question_text, placeholder: "Enter your question here" %>
-    </div>
+  <%= hidden_field_tag :redirect_info_slide, 'false', id: 'redirect-info-slide-field' %>
 
-    <div id="Vignettes::MultipleChoiceQuestion" class="question-field" style="display: none;">
-      <%= question_form.label :question_text, "Question Text" %><br>
-      <%= question_form.text_area :question_text, placeholder: "Enter your question here" %>
-
-      <div>
-        <%= question_form.label :options, "Options" %>
-        <div id="options-container">
-          <% question_form.object.options.each do |option| %>
-            <div class="option-block">
-              <%= question_form.fields_for :options, option do |option_form| %>
-                <div class="option-field">
-                  <%= option_form.text_field :text, placeholder: "Option Text" %>
-                  <%= option_form.hidden_field :_destroy %>
-                  <button type="button" class="remove-option">Remove</button>
-                </div>
-            <% end %>
-            </div>
-          <% end %>
-          <div id="new-option-template" style="display: none;">
-            <%= question_form.fields_for :options, question_form.object.options.build, child_index: "NEW_RECORD" do |option_form|%>
-              <div class="option-block">
-                <%= option_form.text_field :text %>
-                <button type="button" class="remove-option">Remove</button>
-              </div>
-            <% end %>
-          </div>
-        </div>
-        <button type="button" id="add-option">Add Option</button>
-      </div>
-    </div>
+  <% if @slide.info_slide %>
+    <%= link_to "Edit Info Slide", edit_vignettes_questionnaire_slide_info_slide_path(@questionnaire, @slide), class: "btn btn-secondary" %>
+  <% elsif !@slide.new_record? %>
+    <%= link_to "Create Info Slide", new_vignettes_questionnaire_slide_info_slide_path(@questionnaire, @slide), class: "btn btn-primary" if @slide.info_slide.nil? %>
+  <% else %>
+    <button type="button" id="create-info-slide-button" class="btn btn-primary">
+      Create Info Slide and save Slide
+    </button>
   <% end %>
+
+  <%= render partial: 'form_content', locals: { form: form } %>
+  <%= render partial: 'form_question', locals: { form: form } %>
+
   <div>
     <%= form.submit @slide.new_record? ? 'Create Slide' : 'Update Slide' %>
   </div>
diff --git a/app/views/vignettes/slides/_form_content.html.erb b/app/views/vignettes/slides/_form_content.html.erb
new file mode 100644
index 000000000..b7fa78f4f
--- /dev/null
+++ b/app/views/vignettes/slides/_form_content.html.erb
@@ -0,0 +1,4 @@
+<div>
+  <%= form.label :content %><br>
+  <%= form.rich_text_area :content %>
+</div>
\ No newline at end of file
diff --git a/app/views/vignettes/slides/_form_question.html.erb b/app/views/vignettes/slides/_form_question.html.erb
new file mode 100644
index 000000000..13529cf7d
--- /dev/null
+++ b/app/views/vignettes/slides/_form_question.html.erb
@@ -0,0 +1,47 @@
+<%= form.fields_for :question do |question_form| %>
+  <div>
+    <%= question_form.label :type, "Question Type" %>
+    <%= question_form.select :type, options_for_select([
+        ['No Question', ''],
+        ['Text Field', 'Vignettes::TextQuestion'],
+        ['Multiple Choice', 'Vignettes::MultipleChoiceQuestion'],
+    ], question_form.object.type), {}, { id:  "question-type" } %>
+  </div>
+
+  <%= question_form.label :question_text, "Question Text" %><br>
+  <%= question_form.text_area :question_text, placeholder: "Enter your question here" %>
+
+  <!-- The id must be the name of the corresponding class -->
+  <div id="Vignettes::TextQuestion" class="question-field" style="display: none;">
+  </div>
+
+
+  <div id="Vignettes::MultipleChoiceQuestion" class="question-field" style="display: none;">
+    <div>
+      <%= question_form.label :options, "Options" %>
+      <div id="options-container">
+        <% question_form.object.options.each do |option| %>
+          <div class="option-block">
+            <%= question_form.fields_for :options, option do |option_form| %>
+              <div class="option-field">
+                <%= option_form.text_field :text, placeholder: "Option Text" %>
+                <%= option_form.hidden_field :_destroy %>
+                <button type="button" class="remove-option">Remove</button>
+              </div>
+            <% end %>
+          </div>
+        <% end %>
+        <div id="new-option-template" style="display: none;">
+          <%= question_form.fields_for :options, question_form.object.options.build, child_index: "NEW_RECORD" do |option_form|%>
+            <div class="option-field">
+              <%= option_form.text_field :text %>
+              <%= option_form.hidden_field :_destroy %>
+              <button type="button" class="remove-option">Remove</button>
+            </div>
+          <% end %>
+        </div>
+      </div>
+      <button type="button" id="add-option">Add Option</button>
+    </div>
+  </div>
+<% end %>
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index c7d20d051..70de0b497 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -563,6 +563,10 @@
 
   # vignettes routes
   namespace :vignettes do
+    get "questionnaires/:id/take",
+        to: "questionnaires#take",
+        as: "take_questionnaire"
+
     resources :questionnaires do
       resources :slides
     end

From b931d185d24ddc32ca9db6b62e511287389d4e4a Mon Sep 17 00:00:00 2001
From: Florian <florianbuerckel@gmail.com>
Date: Fri, 17 Jan 2025 22:20:07 +0100
Subject: [PATCH 019/103] Track slide statistics for questionnaire answers

---
 .../vignettes/take_questionnaire.js           | 53 +++++++++++++++++++
 app/models/vignettes/slide.rb                 |  1 +
 app/models/vignettes/slide_statistic.rb       |  7 +++
 .../vignettes/questionnaires/take.html.erb    |  7 +++
 config/routes.rb                              |  7 ++-
 ...00_change_slide_statistics_associations.rb |  7 +++
 ...61035_create_vignettes_slide_statistics.rb | 12 +++++
 db/schema.rb                                  | 13 +++++
 spec/factories/vignettes/slide_statistics.rb  |  8 +++
 spec/models/vignettes/slide_statistic_spec.rb |  5 ++
 10 files changed, 119 insertions(+), 1 deletion(-)
 create mode 100644 app/assets/javascripts/vignettes/take_questionnaire.js
 create mode 100644 app/models/vignettes/slide_statistic.rb
 create mode 100644 db/migrate/20231010100000_change_slide_statistics_associations.rb
 create mode 100644 db/migrate/20250112161035_create_vignettes_slide_statistics.rb
 create mode 100644 spec/factories/vignettes/slide_statistics.rb
 create mode 100644 spec/models/vignettes/slide_statistic_spec.rb

diff --git a/app/assets/javascripts/vignettes/take_questionnaire.js b/app/assets/javascripts/vignettes/take_questionnaire.js
new file mode 100644
index 000000000..58e4803a9
--- /dev/null
+++ b/app/assets/javascripts/vignettes/take_questionnaire.js
@@ -0,0 +1,53 @@
+document.addEventListener("turbolinks:load", () => {
+  const showInfoSlideBtn = document.getElementById("info-slide-button");
+  const closeInfoSlideBtn = document.getElementById("close-info-slide-button");
+  const infoSlideContainer = document.getElementById("info-slide-container");
+  const slideContainer = document.getElementById("current-slide-container");
+
+  const timeOnSlideField = document.getElementById("time-on-slide-field");
+  const timeOnInfoSlideField = document.getElementById("time-on-info-slide-field");
+
+  const form = document.querySelector("form");
+
+  let SlideStartTime = new Date();
+  let InfoSlideStartTime = null;
+
+  // Time in seconds
+  let totalSlideTime = 0;
+  let totalInfoSlideTime = 0;
+
+  showInfoSlideBtn?.addEventListener("click", (e) => {
+    infoSlideContainer.style.display = "block";
+    slideContainer.style.display = "none";
+
+    totalSlideTime += (Date.now() - SlideStartTime);
+    SlideStartTime = null;
+
+    InfoSlideStartTime = Date.now();
+  });
+
+  closeInfoSlideBtn?.addEventListener("click", (e) => {
+    infoSlideContainer.style.display = "none";
+    slideContainer.style.display = "block";
+
+    totalInfoSlideTime += (Date.now() - InfoSlideStartTime);
+    InfoSlideStartTime = null;
+
+    SlideStartTime = Date.now();
+  });
+
+  form.addEventListener("submit", (e) => {
+    event.preventDefault();
+  });
+
+  $(document).on("submit", "#answer_form", (e) => {
+    if (SlideStartTime) {
+      totalSlideTime += (Date.now() - SlideStartTime);
+    }
+    else if (InfoSlideStartTime) {
+      totalInfoSlideTime += (Date.now() - InfoSlideStartTime);
+    }
+    timeOnSlideField.value = Math.floor(totalSlideTime / 1000);
+    timeOnInfoSlideField.value = Math.floor(totalInfoSlideTime / 1000);
+  });
+});
diff --git a/app/models/vignettes/slide.rb b/app/models/vignettes/slide.rb
index 594d2ab00..716f039f7 100644
--- a/app/models/vignettes/slide.rb
+++ b/app/models/vignettes/slide.rb
@@ -4,6 +4,7 @@ class Slide < ApplicationRecord
     has_rich_text :content
     has_one :question, dependent: :destroy, inverse_of: :slide
     has_many :answers, dependent: :destroy, inverse_of: :slide
+    has_many :slide_statistics, through: :answers
     accepts_nested_attributes_for :question, allow_destroy: true
     validates :position, presence: true, numericality: { only_integer: true }
     validates :position, uniqueness: { scope: :vignettes_questionnaire_id }
diff --git a/app/models/vignettes/slide_statistic.rb b/app/models/vignettes/slide_statistic.rb
new file mode 100644
index 000000000..ef75f3526
--- /dev/null
+++ b/app/models/vignettes/slide_statistic.rb
@@ -0,0 +1,7 @@
+module Vignettes
+  class SlideStatistic < ApplicationRecord
+    belongs_to :user
+    belongs_to :answer, class_name: "Vignettes::Answer", foreign_key: "vignettes_answer_id",
+                        inverse_of: :slide_statistic
+  end
+end
diff --git a/app/views/vignettes/questionnaires/take.html.erb b/app/views/vignettes/questionnaires/take.html.erb
index f1e523f83..717b85026 100644
--- a/app/views/vignettes/questionnaires/take.html.erb
+++ b/app/views/vignettes/questionnaires/take.html.erb
@@ -10,6 +10,13 @@
 
 
         <%= form.hidden_field :slide_id, value: @slide.id %>
+
+        <%= form.fields_for :slide_statistic do |stat_form| %>
+            <%= stat_form.hidden_field :user_id, value: current_user.id %>
+            <%= stat_form.hidden_field :time_on_slide, id: "time-on-slide-field" %>
+            <%= stat_form.hidden_field :time_on_info_slide, id: "time-on-info-slide-field" %>
+        <% end %>
+
         <% case @slide.question.type %> 
             <% when "Vignettes::TextQuestion" %>
                 <%= form.label :text, "Your Answer" %>
diff --git a/config/routes.rb b/config/routes.rb
index 70de0b497..18d33e5db 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -568,7 +568,12 @@
         as: "take_questionnaire"
 
     resources :questionnaires do
-      resources :slides
+      member do
+        post :submit_answer
+      end
+      resources :slides do
+        resources :answers, only: [:new, :create]
+      end
     end
   end
 
diff --git a/db/migrate/20231010100000_change_slide_statistics_associations.rb b/db/migrate/20231010100000_change_slide_statistics_associations.rb
new file mode 100644
index 000000000..4d76c8fc4
--- /dev/null
+++ b/db/migrate/20231010100000_change_slide_statistics_associations.rb
@@ -0,0 +1,7 @@
+class ChangeSlideStatisticsAssociations < ActiveRecord::Migration[7.0]
+  def change
+    remove_reference :vignettes_slide_statistics, :vignettes_slide, foreign_key: true
+    add_reference :vignettes_slide_statistics, :vignettes_answer,
+                  foreign_key: { to_table: :vignettes_answers }
+  end
+end
diff --git a/db/migrate/20250112161035_create_vignettes_slide_statistics.rb b/db/migrate/20250112161035_create_vignettes_slide_statistics.rb
new file mode 100644
index 000000000..28119040f
--- /dev/null
+++ b/db/migrate/20250112161035_create_vignettes_slide_statistics.rb
@@ -0,0 +1,12 @@
+class CreateVignettesSlideStatistics < ActiveRecord::Migration[7.1]
+  def change
+    create_table :vignettes_slide_statistics do |t|
+      t.references :user, null: false, foreign_key: true
+      t.references :vignettes_slide, null: false, foreign_key: true
+      t.integer :time_on_slide
+      t.integer :time_on_info_slide
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 6c820717f..2f59a1de3 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -997,6 +997,17 @@
     t.index ["vignettes_slide_id"], name: "index_vignettes_questions_on_vignettes_slide_id"
   end
 
+  create_table "vignettes_slide_statistics", force: :cascade do |t|
+    t.bigint "user_id", null: false
+    t.integer "time_on_slide"
+    t.integer "time_on_info_slide"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.bigint "vignettes_answer_id"
+    t.index ["user_id"], name: "index_vignettes_slide_statistics_on_user_id"
+    t.index ["vignettes_answer_id"], name: "index_vignettes_slide_statistics_on_vignettes_answer_id"
+  end
+
   create_table "vignettes_slides", force: :cascade do |t|
     t.bigint "vignettes_questionnaire_id", null: false
     t.datetime "created_at", null: false
@@ -1124,6 +1135,8 @@
   add_foreign_key "vignettes_answers", "vignettes_user_answers"
   add_foreign_key "vignettes_options", "vignettes_questions"
   add_foreign_key "vignettes_questions", "vignettes_slides"
+  add_foreign_key "vignettes_slide_statistics", "users"
+  add_foreign_key "vignettes_slide_statistics", "vignettes_answers"
   add_foreign_key "vignettes_slides", "vignettes_questionnaires"
   add_foreign_key "vignettes_user_answers", "users"
   add_foreign_key "vignettes_user_answers", "vignettes_questionnaires"
diff --git a/spec/factories/vignettes/slide_statistics.rb b/spec/factories/vignettes/slide_statistics.rb
new file mode 100644
index 000000000..e4ff732ed
--- /dev/null
+++ b/spec/factories/vignettes/slide_statistics.rb
@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :vignettes_slide_statistic, class: 'Vignettes::SlideStatistic' do
+    user { nil }
+    slide { nil }
+    time_on_slide { 1 }
+    time_on_info_slide { 1 }
+  end
+end
diff --git a/spec/models/vignettes/slide_statistic_spec.rb b/spec/models/vignettes/slide_statistic_spec.rb
new file mode 100644
index 000000000..76a72211b
--- /dev/null
+++ b/spec/models/vignettes/slide_statistic_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe Vignettes::SlideStatistic, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

From 67cac526b99579cc499b4abf26f269f047b3f55d Mon Sep 17 00:00:00 2001
From: Florian <florianbuerckel@gmail.com>
Date: Fri, 17 Jan 2025 22:23:12 +0100
Subject: [PATCH 020/103] Add route to export questionnaire answers as csv

---
 .../vignettes/questionnaires_controller.rb    | 29 +++++++++++++++++++
 config/routes.rb                              |  1 +
 2 files changed, 30 insertions(+)

diff --git a/app/controllers/vignettes/questionnaires_controller.rb b/app/controllers/vignettes/questionnaires_controller.rb
index 26869c522..6e384eb44 100644
--- a/app/controllers/vignettes/questionnaires_controller.rb
+++ b/app/controllers/vignettes/questionnaires_controller.rb
@@ -1,5 +1,8 @@
+require "csv"
+
 module Vignettes
   class QuestionnairesController < ApplicationController
+    before_action :set_questionnaire, only: [:show, :take, :submit_answer]
     def index
       @questionnaires = Questionnaire.all
       # Because the create model form works on the index page.
@@ -22,6 +25,7 @@ def take
       end
       # Create answer so the form renders correct and nested attributes work.
       @answer = @slide.answers.build
+      @answer.build_slide_statistic
     end
 
     def submit_answer
@@ -44,6 +48,31 @@ def submit_answer
       end
     end
 
+    def export_answers
+      questionnaire = Questionnaire.find(params[:id])
+      answers = questionnaire.slides.includes(:answers).flat_map(&:answers)
+
+      csv_data = CSV.generate(headers: true) do |csv|
+        csv << ["Answer ID", "User", "Question Slide", "Time on slide", "Time on info slide",
+                "Question Text", "Answer", "Selected Options"]
+        answers.each do |answer|
+          row = [answer.id, answer.user_answer.user.name_or_email, answer.slide.position,
+                 answer.slide_statistic.time_on_slide, answer.slide_statistic.time_on_info_slide, answer.slide.question.question_text]
+          case answer.type
+          when "Vignettes::TextAnswer"
+            row << answer.text
+          when "Vignettes::MultipleChoiceAnswer"
+            selected_options = answer.options.map(&:text).join(", ")
+            row << ""
+            row << selected_options
+          end
+          csv << row
+        end
+      end
+
+      send_data(csv_data, filename: "questionnaire-#{questionnaire.id}-answers.csv")
+    end
+
     def new
       @questionnaire = Questionnaire.new
     end
diff --git a/config/routes.rb b/config/routes.rb
index 18d33e5db..5e377352b 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -569,6 +569,7 @@
 
     resources :questionnaires do
       member do
+        get :export_answers
         post :submit_answer
       end
       resources :slides do

From 02050b0d92301502f0aef75352c49aafffe1a246 Mon Sep 17 00:00:00 2001
From: Florian <florianbuerckel@gmail.com>
Date: Fri, 17 Jan 2025 23:48:56 +0100
Subject: [PATCH 021/103] Add likert scale as vignette question type

---
 app/models/vignettes/likert_scale_answer.rb   |  8 +-------
 app/models/vignettes/likert_scale_question.rb | 20 +++++++++++++------
 .../vignettes/questionnaires/take.html.erb    |  7 +++++++
 .../vignettes/slides/_form_question.html.erb  |  3 +++
 ...52_add_scale_value_to_vignettes_answers.rb |  5 +++++
 ...021_rename_vignettes_answer_scale_value.rb |  5 +++++
 6 files changed, 35 insertions(+), 13 deletions(-)
 create mode 100644 db/migrate/20250116192352_add_scale_value_to_vignettes_answers.rb
 create mode 100644 db/migrate/20250116194021_rename_vignettes_answer_scale_value.rb

diff --git a/app/models/vignettes/likert_scale_answer.rb b/app/models/vignettes/likert_scale_answer.rb
index 79e9a60db..6ed4c4734 100644
--- a/app/models/vignettes/likert_scale_answer.rb
+++ b/app/models/vignettes/likert_scale_answer.rb
@@ -1,11 +1,5 @@
 module Vignettes
   class LikertScaleAnswer < Answer
-    enum likert_scale_value: {
-      strongly_agree: 5,
-      agree: 4,
-      neither_agree_nor_disagree: 3,
-      disagree: 2,
-      strongly_disagree: 1
-    }
+    enum likert_scale_value: Vignettes::LikertScaleQuestion::LIKERT_ENUM
   end
 end
diff --git a/app/models/vignettes/likert_scale_question.rb b/app/models/vignettes/likert_scale_question.rb
index 5307871ed..f238f41c1 100644
--- a/app/models/vignettes/likert_scale_question.rb
+++ b/app/models/vignettes/likert_scale_question.rb
@@ -1,11 +1,19 @@
 module Vignettes
   class LikertScaleQuestion < Question
-    LIKERT_OPTIONS = {
-      5 => "Strongly Agree",
-      4 => "Agree",
-      3 => "Neither agree nor disagree",
-      2 => "Disagree",
-      1 => "Strongly Disagree"
+    LIKERT_ENUM = {
+      strongly_disagree: 1,
+      disagree: 2,
+      neither_agree_nor_disagree: 3,
+      agree: 4,
+      strongly_agree: 5
+    }.freeze
+
+    LIKERT_LABELS = {
+      strongly_disagree: "Strongly Disagree",
+      disagree: "Disagree",
+      neither_agree_nor_disagree: "Neither agree nor disagree",
+      agree: "Agree",
+      strongly_agree: "Strongly Agree"
     }.freeze
   end
 end
diff --git a/app/views/vignettes/questionnaires/take.html.erb b/app/views/vignettes/questionnaires/take.html.erb
index 717b85026..e426281fb 100644
--- a/app/views/vignettes/questionnaires/take.html.erb
+++ b/app/views/vignettes/questionnaires/take.html.erb
@@ -26,6 +26,13 @@
                     <%= option.text %>
                     <%= check_box_tag "vignettes_answer[option_ids][]", option.id, @answer.option_ids.include?(option.id) %>
                 <% end %>
+            <% when "Vignettes::LikertScaleQuestion" %>
+                <% Vignettes::LikertScaleQuestion::LIKERT_LABELS.each do |value, label| %>
+                <div>
+                    <%= form.radio_button :likert_scale_value, value %>
+                    <%= form.label :likert_scale_value, label %>
+                </div>
+                <% end %>
         <% end %>
         <br>
         <%= form.submit "Submit Answer!", class: "btn btn-primary" %>
diff --git a/app/views/vignettes/slides/_form_question.html.erb b/app/views/vignettes/slides/_form_question.html.erb
index 13529cf7d..ac22ec1c9 100644
--- a/app/views/vignettes/slides/_form_question.html.erb
+++ b/app/views/vignettes/slides/_form_question.html.erb
@@ -5,6 +5,7 @@
         ['No Question', ''],
         ['Text Field', 'Vignettes::TextQuestion'],
         ['Multiple Choice', 'Vignettes::MultipleChoiceQuestion'],
+        ['Likert Scale', 'Vignettes::LikertScaleQuestion']
     ], question_form.object.type), {}, { id:  "question-type" } %>
   </div>
 
@@ -15,6 +16,8 @@
   <div id="Vignettes::TextQuestion" class="question-field" style="display: none;">
   </div>
 
+  <div id="Vignettes::LikertScaleQuestion", class="question-field" style="display: none;">
+  </div>
 
   <div id="Vignettes::MultipleChoiceQuestion" class="question-field" style="display: none;">
     <div>
diff --git a/db/migrate/20250116192352_add_scale_value_to_vignettes_answers.rb b/db/migrate/20250116192352_add_scale_value_to_vignettes_answers.rb
new file mode 100644
index 000000000..65e265cab
--- /dev/null
+++ b/db/migrate/20250116192352_add_scale_value_to_vignettes_answers.rb
@@ -0,0 +1,5 @@
+class AddScaleValueToVignettesAnswers < ActiveRecord::Migration[7.1]
+  def change
+    add_column :vignettes_answers, :scale_value, :integer
+  end
+end
diff --git a/db/migrate/20250116194021_rename_vignettes_answer_scale_value.rb b/db/migrate/20250116194021_rename_vignettes_answer_scale_value.rb
new file mode 100644
index 000000000..9d5a636b1
--- /dev/null
+++ b/db/migrate/20250116194021_rename_vignettes_answer_scale_value.rb
@@ -0,0 +1,5 @@
+class RenameVignettesAnswerScaleValue < ActiveRecord::Migration[7.1]
+  def change
+    rename_column :vignettes_answers, :scale_value, :likert_scale_value
+  end
+end

From b8e409fde13395a52759676d6ca0e5e58caa9ada Mon Sep 17 00:00:00 2001
From: Florian <florianbuerckel@gmail.com>
Date: Sat, 18 Jan 2025 10:09:11 +0100
Subject: [PATCH 022/103] add info slide version 1

Signed-off-by: Florian <florianbuerckel@gmail.com>
---
 .../javascripts/vignettes/question_type.js    |  14 +++++-
 .../vignettes/info_slides_controller.rb       |  44 ++++++++++++++++++
 .../vignettes/slides_controller.rb            |  10 ++++
 app/models/vignettes/info_slide.rb            |   9 ++++
 app/models/vignettes/slide.rb                 |   6 +++
 .../vignettes/info_slides/_form.html.erb      |  11 +++++
 app/views/vignettes/info_slides/edit.html.erb |   2 +
 app/views/vignettes/info_slides/new.html.erb  |   2 +
 .../questionnaires/_take_slide.html.erb       |  18 +++++++
 .../vignettes/questionnaires/take.html.erb    |  14 ++++++
 app/views/vignettes/slides/create.html.erb    |   2 -
 app/views/vignettes/slides/show.html.erb      |  14 ++++--
 config/routes.rb                              |   1 +
 ...0112122902_create_vignettes_info_slides.rb |   9 ++++
 ...08_create_join_table_info_slides_slides.rb |   8 ++++
 db/schema.rb                                  |  16 ++++++-
 spec/factories/vignettes/info_slides.rb       |   5 ++
 spec/models/vignettes/info_slide_spec.rb      |   5 ++
 storage/17/zz/17zz1muveku4uty3cn9joxiyat6f    | Bin 6734 -> 0 bytes
 19 files changed, 181 insertions(+), 9 deletions(-)
 create mode 100644 app/controllers/vignettes/info_slides_controller.rb
 create mode 100644 app/models/vignettes/info_slide.rb
 create mode 100644 app/views/vignettes/info_slides/_form.html.erb
 create mode 100644 app/views/vignettes/info_slides/edit.html.erb
 create mode 100644 app/views/vignettes/info_slides/new.html.erb
 create mode 100644 app/views/vignettes/questionnaires/_take_slide.html.erb
 delete mode 100644 app/views/vignettes/slides/create.html.erb
 create mode 100644 db/migrate/20250112122902_create_vignettes_info_slides.rb
 create mode 100644 db/migrate/20250117225808_create_join_table_info_slides_slides.rb
 create mode 100644 spec/factories/vignettes/info_slides.rb
 create mode 100644 spec/models/vignettes/info_slide_spec.rb
 delete mode 100644 storage/17/zz/17zz1muveku4uty3cn9joxiyat6f

diff --git a/app/assets/javascripts/vignettes/question_type.js b/app/assets/javascripts/vignettes/question_type.js
index 6d79ce2ad..1f006eab9 100644
--- a/app/assets/javascripts/vignettes/question_type.js
+++ b/app/assets/javascripts/vignettes/question_type.js
@@ -11,7 +11,6 @@ document.addEventListener("turbolinks:load", () => {
       const selectedType = event.target.value;
       if (selectedType) {
         const selectedField = document.getElementById(selectedType);
-        console.log(selectedField);
         if (selectedField) {
           selectedField.style.display = "block";
         }
@@ -53,4 +52,17 @@ document.addEventListener("turbolinks:load", () => {
       }
     });
   }
+
+  // Handle creation of info slide when slide has not yet been saved.
+  const createInfoSlideButton = document.getElementById("create-info-slide-button");
+  const redirectInfoSlideField = document.getElementById("redirect-info-slide-field");
+  const form = document.getElementById("slide-form");
+
+  if (createInfoSlideButton && redirectInfoSlideField) {
+    createInfoSlideButton.addEventListener("click", (e) => {
+      event.preventDefault();
+      redirectInfoSlideField.value = true;
+      form.submit();
+    });
+  }
 });
diff --git a/app/controllers/vignettes/info_slides_controller.rb b/app/controllers/vignettes/info_slides_controller.rb
new file mode 100644
index 000000000..9b1a56db1
--- /dev/null
+++ b/app/controllers/vignettes/info_slides_controller.rb
@@ -0,0 +1,44 @@
+module Vignettes
+  class InfoSlidesController < ApplicationController
+    before_action :set_slide
+
+    def new
+      @info_slide = InfoSlide.new
+    end
+
+    def create
+      @info_slide = InfoSlide.new(info_slide_params)
+      @info_slide.slides << @slide
+      if @info_slide.save
+        redirect_to edit_vignettes_questionnaire_slide_path(@slide.questionnaire, @slide),
+                    notice: "Info slide created."
+      else
+        render :new
+      end
+    end
+
+    def edit
+      @info_slide = @slide.info_slide
+    end
+
+    def update
+      @info_slide = @slide.info_slide
+      if @info_slide.update(info_slide_params)
+        redirect_to edit_vignettes_questionnaire_slide_path(@slide.questionnaire, @slide),
+                    notice: "Info slide updated."
+      else
+        render :edit
+      end
+    end
+
+    private
+
+      def set_slide
+        @slide = Slide.find(params[:slide_id])
+      end
+
+      def info_slide_params
+        params.require(:vignettes_info_slide).permit(:content)
+      end
+  end
+end
diff --git a/app/controllers/vignettes/slides_controller.rb b/app/controllers/vignettes/slides_controller.rb
index 066d7a526..0329cf5dc 100644
--- a/app/controllers/vignettes/slides_controller.rb
+++ b/app/controllers/vignettes/slides_controller.rb
@@ -1,6 +1,7 @@
 module Vignettes
   class SlidesController < ApplicationController
     before_action :set_questionnaire
+
     def index
     end
 
@@ -25,8 +26,13 @@ def create
       @slide = @questionnaire.slides.new(slide_params)
       @slide.position = @questionnaire.slides.maximum(:position).to_i + 1
       if @slide.save
+        if redirect_params[:redirect_info_slide] == "true"
+          redirect_to new_vignettes_questionnaire_slide_info_slide_path(@questionnaire, @slide)
+          return
+        end
         redirect_to @questionnaire, notice: "Slide was successfully created"
       else
+        flash[:alert] = "Failed to create slide: #{@slide.errors.full_messages.join(", ")}"
         render :new, status: :unprocessable_entity
       end
     end
@@ -46,6 +52,10 @@ def set_questionnaire
         @questionnaire = Questionnaire.find(params[:questionnaire_id])
       end
 
+      def redirect_params
+        params.permit(:redirect_info_slide)
+      end
+
       def slide_params
         params.require(:vignettes_slide).permit(
           :content,
diff --git a/app/models/vignettes/info_slide.rb b/app/models/vignettes/info_slide.rb
new file mode 100644
index 000000000..7ac25e727
--- /dev/null
+++ b/app/models/vignettes/info_slide.rb
@@ -0,0 +1,9 @@
+module Vignettes
+  class InfoSlide < ApplicationRecord
+    has_and_belongs_to_many :slides, class_name: "Vignettes::Slide",
+                                     join_table: "vignettes_info_slides_slides"
+    has_rich_text :content
+
+    has_one :questionnaire, through: :slide
+  end
+end
diff --git a/app/models/vignettes/slide.rb b/app/models/vignettes/slide.rb
index 716f039f7..fb77cec01 100644
--- a/app/models/vignettes/slide.rb
+++ b/app/models/vignettes/slide.rb
@@ -6,6 +6,12 @@ class Slide < ApplicationRecord
     has_many :answers, dependent: :destroy, inverse_of: :slide
     has_many :slide_statistics, through: :answers
     accepts_nested_attributes_for :question, allow_destroy: true
+
+    has_and_belongs_to_many :info_slides, class_name: "Vignettes::InfoSlide",
+                                          join_table: "vignettes_info_slides_slides"
+
+    has_one :info_slide, class_name: "Vignettes::InfoSlide", foreign_key: "vignettes_slide_id",
+                         dependent: :destroy
     validates :position, presence: true, numericality: { only_integer: true }
     validates :position, uniqueness: { scope: :vignettes_questionnaire_id }
   end
diff --git a/app/views/vignettes/info_slides/_form.html.erb b/app/views/vignettes/info_slides/_form.html.erb
new file mode 100644
index 000000000..a4cba47fc
--- /dev/null
+++ b/app/views/vignettes/info_slides/_form.html.erb
@@ -0,0 +1,11 @@
+<%= form_with(
+      model: @info_slide,
+      url: @info_slide.new_record? ? vignettes_questionnaire_slide_info_slide_path(@slide.questionnaire, @slide) : vignettes_questionnaire_slide_info_slide_path(@slide.questionnaire, @slide),
+      local: true
+    ) do |form| %>
+  <%= render partial: 'vignettes/slides/form_content', locals: { form: form } %>
+
+  <div>
+    <%= form.submit @info_slide.new_record? ? 'Create Info Slide' : 'Update Info Slide' %>
+  </div>
+<% end %>
\ No newline at end of file
diff --git a/app/views/vignettes/info_slides/edit.html.erb b/app/views/vignettes/info_slides/edit.html.erb
new file mode 100644
index 000000000..8df9f08b7
--- /dev/null
+++ b/app/views/vignettes/info_slides/edit.html.erb
@@ -0,0 +1,2 @@
+<h1>Edit Info Slide</h1>
+<%= render 'form', info_slide: @info_slide %>
\ No newline at end of file
diff --git a/app/views/vignettes/info_slides/new.html.erb b/app/views/vignettes/info_slides/new.html.erb
new file mode 100644
index 000000000..8e7f42444
--- /dev/null
+++ b/app/views/vignettes/info_slides/new.html.erb
@@ -0,0 +1,2 @@
+<h1>New Info Slide</h1>
+<%= render 'form', info_slide: @info_slide %>
\ No newline at end of file
diff --git a/app/views/vignettes/questionnaires/_take_slide.html.erb b/app/views/vignettes/questionnaires/_take_slide.html.erb
new file mode 100644
index 000000000..17e2d4e2b
--- /dev/null
+++ b/app/views/vignettes/questionnaires/_take_slide.html.erb
@@ -0,0 +1,18 @@
+<h2> Slide <%= slide.position %> </h2>
+<%= slide.content %>
+<%= slide.question.question_text %>
+
+<br>
+
+<%= form_with(model: answer, url: vignettes_questionnaire_slide_answers_path(@questionnaire, @slide), local: true) do |form| %>
+  <% case slide.question.type %> 
+    <% when "Vignettes::TextQuestion" %>
+      <%= form.label :text, "Your Answer" %>
+      <%= form.text_area :text%>
+    <% when "Vignettes::MultipleChoiceQuestion" %>
+      <% slide.question.options.each do |option| %>
+        <%= option.text %> <br>
+        <%= form.check_box :option_ids, {multiple: true}, option.id, nil %>
+    <% end %>
+  <% end %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/vignettes/questionnaires/take.html.erb b/app/views/vignettes/questionnaires/take.html.erb
index e426281fb..6112381e0 100644
--- a/app/views/vignettes/questionnaires/take.html.erb
+++ b/app/views/vignettes/questionnaires/take.html.erb
@@ -1,6 +1,20 @@
+<%= javascript_include_tag 'vignettes/take_questionnaire' %>
+
+
+<% if @slide.info_slide %>
+<div id="info-slide-container" style="display: none;">
+    <h2> Info Slide </h2>
+    <button id="close-info-slide-button" class="btn btn-primary">Close Info Slide</button>
+    <%= @slide.info_slide.content %>
+</div>
+<% end %>
+
 <div id="current-slide-container" data-slide-id="<%= @slide.id %>" data-questionnaire-id="<%= @questionnaire.id %>" >
 
     <h2> Slide <%= @slide.position %> </h2>
+    <% if @slide.info_slide %>
+        <button id="info-slide-button" class="btn btn-primary">Show Info Slide</button>
+    <% end %>
     <%= @slide.content %>
     <%= @slide.question.question_text %>
 
diff --git a/app/views/vignettes/slides/create.html.erb b/app/views/vignettes/slides/create.html.erb
deleted file mode 100644
index dfc01807c..000000000
--- a/app/views/vignettes/slides/create.html.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-<h1>Vignettes::Slides#create</h1>
-<p>Find me in app/views/vignettes/slides/create.html.erb</p>
diff --git a/app/views/vignettes/slides/show.html.erb b/app/views/vignettes/slides/show.html.erb
index 5f4950cd2..800822225 100644
--- a/app/views/vignettes/slides/show.html.erb
+++ b/app/views/vignettes/slides/show.html.erb
@@ -3,11 +3,15 @@
 
 <br>
 
-<% case @slide.question.type %> 
-  <% when "Vignettes::TextQuestion" %>
-    <%= @slide.content %>
-  <% when "Vignettes::MultipleChoiceQuestion" %>
-    <% @slide.question.options.each do |option| %>
+<%= form_with(model: @answer, url: vignettes_questionnaire_slide_answers_path(@questionnaire, @slide), local: true) do |form| %>
+  <% case @slide.question.type %> 
+    <% when "Vignettes::TextQuestion" %>
+      <%= form.label :text, "Your Answer" %>
+      <%= form.text_area :text%>
+    <% when "Vignettes::MultipleChoiceQuestion" %>
+      <% @slide.question.options.each do |option| %>
         <%= option.text %> <br>
+        <%= form.check_box :option_ids, {multiple: true}, option.id, nil %>
     <% end %>
+  <% end %>
 <% end %>
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 5e377352b..682c17226 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -573,6 +573,7 @@
         post :submit_answer
       end
       resources :slides do
+        resource :info_slide, only: [:new, :create, :edit, :update]
         resources :answers, only: [:new, :create]
       end
     end
diff --git a/db/migrate/20250112122902_create_vignettes_info_slides.rb b/db/migrate/20250112122902_create_vignettes_info_slides.rb
new file mode 100644
index 000000000..6180138d5
--- /dev/null
+++ b/db/migrate/20250112122902_create_vignettes_info_slides.rb
@@ -0,0 +1,9 @@
+class CreateVignettesInfoSlides < ActiveRecord::Migration[7.1]
+  def change
+    create_table :vignettes_info_slides do |t|
+      t.references :vignettes_slide, null: false, foreign_key: true
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20250117225808_create_join_table_info_slides_slides.rb b/db/migrate/20250117225808_create_join_table_info_slides_slides.rb
new file mode 100644
index 000000000..75cad66cc
--- /dev/null
+++ b/db/migrate/20250117225808_create_join_table_info_slides_slides.rb
@@ -0,0 +1,8 @@
+class CreateJoinTableInfoSlidesSlides < ActiveRecord::Migration[7.1]
+  def change
+    create_join_table :vignettes_info_slides, :vignettes_slides do |t|
+      t.index [:vignettes_info_slide_id, :vignettes_slide_id]
+      t.index [:vignettes_slide_id, :vignettes_info_slide_id]
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 2f59a1de3..43e1bb08c 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.1].define(version: 2024_12_28_200302) do
+ActiveRecord::Schema[7.1].define(version: 2025_01_17_225808) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pgcrypto"
   enable_extension "plpgsql"
@@ -969,6 +969,19 @@
     t.index ["vignettes_answer_id", "vignettes_option_id"], name: "idx_on_vignettes_answer_id_vignettes_option_id_95dc8573a3"
     t.index ["vignettes_option_id", "vignettes_answer_id"], name: "idx_on_vignettes_option_id_vignettes_answer_id_239ee34098"
   end
+
+  create_table "vignettes_info_slides", force: :cascade do |t|
+    t.bigint "vignettes_slide_id", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["vignettes_slide_id"], name: "index_vignettes_info_slides_on_vignettes_slide_id"
+  end
+
+  create_table "vignettes_info_slides_slides", id: false, force: :cascade do |t|
+    t.bigint "vignettes_info_slide_id", null: false
+    t.bigint "vignettes_slide_id", null: false
+  end
+
   create_table "vignettes_multiple_choice_answers_options", id: false, force: :cascade do |t|
     t.bigint "vignettes_multiple_choice_answer_id", null: false
     t.bigint "vignettes_option_id", null: false
@@ -1133,6 +1146,7 @@
   add_foreign_key "vignettes_answers", "vignettes_questions"
   add_foreign_key "vignettes_answers", "vignettes_slides"
   add_foreign_key "vignettes_answers", "vignettes_user_answers"
+  add_foreign_key "vignettes_info_slides", "vignettes_slides"
   add_foreign_key "vignettes_options", "vignettes_questions"
   add_foreign_key "vignettes_questions", "vignettes_slides"
   add_foreign_key "vignettes_slide_statistics", "users"
diff --git a/spec/factories/vignettes/info_slides.rb b/spec/factories/vignettes/info_slides.rb
new file mode 100644
index 000000000..e51b44752
--- /dev/null
+++ b/spec/factories/vignettes/info_slides.rb
@@ -0,0 +1,5 @@
+FactoryBot.define do
+  factory :vignettes_info_slide, class: 'Vignettes::InfoSlide' do
+    vignettes_slide { nil }
+  end
+end
diff --git a/spec/models/vignettes/info_slide_spec.rb b/spec/models/vignettes/info_slide_spec.rb
new file mode 100644
index 000000000..1f8a0991c
--- /dev/null
+++ b/spec/models/vignettes/info_slide_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe Vignettes::InfoSlide, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/storage/17/zz/17zz1muveku4uty3cn9joxiyat6f b/storage/17/zz/17zz1muveku4uty3cn9joxiyat6f
deleted file mode 100644
index 78abe57880647de98f30cb8ee56bf8045bc39000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6734
zcmcIpcQBl7zut)U@+L$CQ4`T3Y7i|*BBFOf)UZnQzRD_*M6?$Xy{t}jL6o(+AbO&N
zRaXhYu2om(+`gGJ^PP9*oS8H8e)k_{*Y5nD`?;U%cm1yG+HfrmMG8g=2n2FPS?Q?`
z1aj#+cs)%{1paD9*d{|DjC9IRAM5#~<7VviXbombH+dgX!`X@KZQe-TzZ69oN%_+A
zDG@nY)UB*+{YSB{!g68<IKtSe|570eB_>e}ZNtzcLU?UmKfIJ;6y?2@>vnVTfxx%n
zOGb1r8jer3Y}Ys)pXdgZFlEkt`dHq)A9RhixWsuTM_yk3E(D?_%O8=mu&{6-a2fJ4
zjFOUa1cM@lyfz>qqKCYuCKiA|Zj+lpAWx|4A&_^sTrWY$A7h9h)NfizAh(EvDIt%@
z|A{ZY>HRS_mTzaoN4H~24(a~SUhMDNKe$a7iNj)_vTL8u={$eFytZbft)1Q90Es6L
zraTc65_0wM@Njo`_w@AN#5|spHZU-N`}rBYc#)ElqK=SC(2IgF%VUV-UZq~8ppf!d
zRs)~p=Udy@*to#yZrpfbXh=&-Yh`QO-PLuK>A_!)`H*yQhMA5|PLYw3HDA6oHa4=~
zxr4%g`1o-Fi{*<|+TPijnVC5(y!Kjz+ynz^{aPLQL_+k~({nePMOvyQ{^Q3giw@E&
zSEAC>nc;BwnLROvl!*R798SRY_p7BAKrJmNJSf>?UoCb;xg*mhzx_fzgIvAk`k0f?
z=nD@IPgqXj>({Rd1Xx6l>;dL-irVt8U%&A9A#X3p^droh;)xoE@!i#t^|iG;ox2L!
zH8nM$kgA5pGD-k42+HXH{{5R-#!t`KIPH*IeZ<br?&#>qf1ITCCb2*vwTH(J2J_Np
zs=K?ptt}WI0jYo2N-{=6L&Hu@E-EH=hn@YPoa8ms$e$jvDV?hrLq`#kkdRPNP~bmK
z)G7=rr0>td@jY?e{sxy?Wx#u8Zf@>oRfrZvddL5XIvzKpi9v*P!ng#avDeefOYZCd
z+FZgQWKH4>z^<nk|B;dGwLyAwvn<j6`ReNGK&D(~!K(MHucERkq_t#qZLEYQd}(<g
zO}9X89+eoZ{T!ph@zG;tP<WkiuZR-jBPJ;=ohbt+$eka?Op*u)q+a^RJK^u({O=}|
z=XTAM4d6}cJ1i%HWEre6*0Zp%c;jdJd3co6)OHDk2VjYbIXO5mSyg}1Kp53IvnYz`
zjE#-mzI|I(R@OvJ$<W%`T1~Bgp)*olP3=7un{42TkDy>hwe8ThX%c&e44jUY)!E5O
z#-^Vk_|Z#C%LP0>Xudt<@q@J3*h=Rasqm-m+9~pn;qYTDy4o)FYy*WqC|B5f_x^ov
zLRNNmu$}qMsJ>s@)6>)XCC>*kWYSo|A|v}=GCJDXZSCw-fBx)qa^SX7!Oh9JM<_%2
z?b*AOg?BD!%AM-nqSm6V@mw92Ju<DfQICmou(P{jBOzl{>-ZujAc|3}_;}DfU~eq!
z+8w{?x$*J3hK7b?V=j&KiN&+%=;(*h3cLyLLqpep|Mr|qDOfEtt|LqY%5}3Rr~m{k
zhF|BNt#^C7BV1e*7Dm1dPe35b@&wY;(|IC#`}%Zsj#X$F8H>w<`%*>iXhyW3JbBX|
zH99)lkB}b!@k5(E*3&oqiixS|%*n~g`}gnZ&+o+bG>DIV|4x15hM4=362agLzSYUa
z#nuSy8X0&hwG)?zZ4Fp2s{_^3($dhCo@fz1zS8b`3&0nk-93E`931YA7(t=AN*t*|
z7DU0V0jq}o0ReX-{7(1APft&Cb92YbjBTBrXMOp|s93SHXRo{54>m32<vTJ1kHU8>
ziV>9b0<Y}t*<InZ7kmFi%ixYYshbOg)}jj;3)j}xkRB_wH8r5Cn+TH*O*k7TrzW4R
zh1ffaYbR9dBc=p2${XLCa8FuF3X8)Xqfv>8bR(0S^Btem(`o~bVV%!}Z<(2yB_<|<
zqsAIawWP+zUZbbCef26iKHhU>5CQsK+Is_VfalrCAy#(0-1K-UPP0L@q^xY<3l}vx
zAUDZ}lDV6P1pHiPMn<!BUt%Z~8>^J(t78H#=y+<5mzVcrTpU^k+^ey%F_{RRx%nKG
z+{yRO&iuwklRxD3nAFwP0d94Q;_*-PlKjY=6%-VlocI;ApFMk~`$<DTD`aIT6IEZY
zr?3BOX-UWy;+I=daX$Prk?+OF%uF^G7DQT_wEZX#$=WI|j<4>BK^5>)fqGhjW@g~w
z_OB==@zmtx->a)B$;qWANF5FuP`?r$xHo2CP+^A4rJwEAF)*kLI3{$2QgL%|c>b~Q
z`Za_=)ddJkMMdRk<5xa3JR+j1veM1X4H<NP_NbRl=gr%<;EA8_ev;cV4O`Q}w}S3`
z`G8io(X`3W>&1%~CMMGdTZ?4oL-BWYC!9JNv4Nv%hDJsJ3X6d5qN1WujZa4|IG&E*
z=<A8DK$5Mk?fws1JXBd-{i1{mJ%2}g`vg@>%h{2`oO+WdA0s1UczC#&m{?zuAU?41
zg!kLfketuvOMCm`j11Pfn!@tiH1z;1dKesFX(SSPom;~M1>+yj*TxD~`$_sAY}PtW
zHGJYP*;$=o5_kSkta`1^c_tz%3Ww9TDJQCy@!S2~<}GgBOY7o-A08gw;5L5Wn3|fp
zKNob~K_%x2gDs=z5(>J4r$$FTw-ywZe|P-&;g;n>AKA$kuzPJsQb|=+RZ^@t1t4as
z&V`JWlu#LiK+H^3LQ|Y74b_T86__9TXn~`SVMz|30+kV;P=7wt(xO(-HV-=WngiF%
z*jpcuVV1lvAP^0(fM6usINVv8nwq*Bktz)BN*0Ea9ub=0`zjnXsRc=b=H=-`V^kvE
z+xcvNpcl<GuKsyAJTY;wIWNCl#l+1W&l6Gg<qMcY2`c$a4;(Rhk83`pruwao7VYlt
z&MsdgQjNNtgb1EHBraFuI_{P`v#_@2q$al+Oh-@k6B-(%Y?_m5YWCR94-|DcOQd9E
zWXQ-ulQy{GdXl5;Mhfn>@K`HrYPvW%fro;F7S|9xeE5(jqQP~(9c)_C5%x#}A=Rm-
z%Kd%(^mxC{5lsU~7YdcnlJ*kMBQoHl1NT*7iXwpK92gh?4eadfETf^*GdKud6!7%^
z{F&%DCf_!L@=m!zPfy?Mp#2>;RR>VP$HzxONqH=Co_9VQc<f~Jc8ZzpgZEs(1zGOI
z({RT2ST#2{$8o8%iy+*{wZ>Z$lsNM9^Jx{L7=$f1rjh*tg)S|pwb|M83HJ=HvPgZ!
zKG)Ut0NuLbA_v1VRA>L}e$`l5T57c{JCq_4dWC+^eSgDLQ*-FrooDG1Zf|yw4%k%;
zpjAL6&P;gj)Plu@g`Aw6=7R;weApK-ssMVx5nFV;zgv@gTi*2Y{xs5~KYRTR38kl}
zCjc^?fC=cw!x`_nfmE@+p&?BmFVNM;M3hcWPT0o2!RyE@xrrA2H6N`zNqtnz5-%+*
zw)zBH09UJ}J>Zv>&6pDS>#x7gHbdovR4Gi5?jciM$3wHTfm5|k78Vw5ZEY$I*XO~E
zkByB5?AIlzeO}~%fk|e5hT)8;sA7iX&eIPU052q`kNy0)aW<l*t=(3zS?{*^jjo&k
zHqR50D(=E6ecOQlgfQh|9(b5vRAl$)(IZ{m>pPu5zI^yVovk(T<42o?IhJZn75_=A
zI60XiTPyj)2Mh+Yxx1?C%oMb>5K>pSe{#4Z?lk$;sZV}Ni+uXsyLa;)p^A!%)fH88
zzpHHq)|%~m0Orv+*^OTz8vrm~r$=5gGEH|Bqc=_aT2D@PhJYq3FE8&)<X_*;%mCzk
z^JWjYtn~!gR!D~pSwz7q0C~0+4^4Q1TFS@x_^)O-=0-4UcLC7=CTN_S%`qFj@4CLe
zp5hw~C>5}6cMO}Y=Hz{#pt>C=&}gq9_zF5VU~Z5S0cM9KxD>5IeqP=Oq*Ic-fPg?|
z(3!8lzyI^+&-L~7{rvn^B%QXlwt$c`+3O_rGc{!~aN>QYsJH?eJ=1?X{3$#7i(MRO
zoL_xOWOI&yG%YPHb#!QCZ(WTyA}v?qusnM{g+`N*k`{dW<ef4%>y4>uAqCiFWVAnI
z!E^$7vN40Azjp05EyZEEwHA<fO-)ULrVXOL+g8i>1kD=1_4Lda2f(D(9$l^jA0;>d
z*nk<;-`hJpJ}$`5j}WmP1YJeuVg4*2;1u8>iQl-^evCJS$=ABbdYYD=UW5rKq>PLV
zY{iwuAGwPC?_f?&xR$fMikZ2=S<lEXxE7$50tskaFqeddh5g6duK?zDX+C^^`n3Nn
zmh~Zl%rPq%sAee>$wWc(L0TXcqS@qRp<RFZ?ksb1a>@jq`Df)$)w|{D@v3WRu>NKW
z&f%$P%ukRBo|>4b2VWAXsA`e)Sngll`biI)<*Z9mdH?x%A1`R$Jl)yJ2}lcXRBr`#
zH9z0>F!^<dE(Nv}qMyN+pM9}}zl(fM5-^p5VJG@iM2-yw-<)c2adQLRn2LsZd6`yO
z^<Y$3DMkfd9UL6cC1%&IT?4}nU)2#KclOP3x0Z(=<!b5RP@>1HKca6F<_kvqaK7q5
zfB$_Ek<i(k>l+&zYM3frdeVx@%2+hRZ~hxtOSSaAfq}jK{fd&3k?-FPD=kSpMnZ{j
zLW*C(S%M`vb9jtzv90TlVhU~5?`u7s4`oY+)0x9@HGpSebHOt0IGlj~<;$00#_X}K
z@Z2BNBa@R2o~t@wg2!=d!p^525cekwzeQs<ueuOC8i-W=T{Q%fTxJ>)keAzgdwC@#
zeSem|@TcEf(`jk79^&@#^%WNBm%bj^Def|BC1A1(^VkQ+fyVXrst`N7<mnV?@st)9
z(}X{j_c~*i)?FJApIa(cf8dH1T~P&hUsvZ1gAod~b1k9J%S1$^zBBD@ZS(o6q8GbB
z@+2V;xYbq3<c;^Ndno&_q~$0SeBWRwQ*P+wQGc3vMV-j2#qJo}Pt_;;E$8|+mG)`^
zNiFAR$2V@=2nh)R3bG0Jb9D3zwEJpRzFWAdpa1G`zDZ4w>~33cZ$!z18@H1B0{s1}
zs;hB0oXcz@5*R%b&SgaEDH%{Y!epO8OW+%KH1=5nk5;*DplxqR`n$jdQRY+@<E5+q
z*WVd^=&_;~Frf~A+8gMur=;}l0>OZY#b<qTV`d(>%uerL4S413EWpcq1h!cADvJ5#
z^Ccl+;d%R;xxKx;M@N3k@#BrYI}&!f!t?X<K(_#FfxTB8eDu-GlvP(!l5k%l#}66n
zRs;Oammv_QF%GKL`^my`>-SR}0eJ%-y1JdtDJLgqqYn8sgBz5!4Vluva0bBIrd&GP
z?4VL<h`7PT1jn=n14Tkk{HD0Lctct#f7o^?gOh_}X=#argM;TgP<&+x31e@`sCXhK
z8@$#53)J)Yzf4U_)78;QwpDlc!o{Cn;Bt0<dqu@-xjzLAM&LU|9CBKEK}kM-eg}K|
zWMfW|`}ckLo()91qFZrWZwwU`$>3Y@lG;o+Z`whjBd5H<xw(tRE=`>#7P?(k+2H80
zJro3F``djiT7=6f1$ubV<t2&IzywE!g@MyEt9PAegIicxi8}l&1-wii(mpu!4&RcK
z!_MV&H{xg^QV<N)jy;LOmh)3QB^@96pMPTAIwh9zDxiIBGXn}H?xgzZ>FIrS<XJ?j
zpK`?Y)H=^FUcdhKi}jO4W#fpPs;a69NsdM^sc~EW?E`7zDI{B>qN0<NlR#4k0o2Ss
zCy5FRdnxO%TdRa@Uvl^L@sW@o_zgG?U@iU2wDr%t`&WlrP6<=ZY?ULOM|<lx)(dwG
zt?sAXXBA>)W<FVrk=vN68=9U@M>f@X#H5M4oNf0BUZ<e}lCaC-6SroDm27Y&cg?qZ
zJUj<Gndki{@8nm=cB5FN6X#HeV|QIMANsa4lL06F!pI1;@+mQQT+gh}ViXv|V9m;U
zRv6VpC_7!1v*h67YCxf4*yNgbr1JRr`2iQFOM90mC5>+_c9V^qtyi>UBqvK)v=c99
zZG(TA=$)RIo1&K2*Qd@oHTwJeY0XyVIy#`IM|-5Cr2PYT(_=zp%D(b_Lju6Goct1e
zk}br=#U&*4eROoU?JXG)PW@}tCU^Pyo4nTP)JIS-+`?ycuu-Fro0%DF3`rp^P;Cfl
zZ$<_NwTy?7A|i2fW3bV?u3+m+?no1Xii!&SmR||b)>=HY<ix;RS5{Vbc6MTAuF9wY
z<`%YmYH!bb91i^;d-OXO02>U?z93EBgv9uGD=Vu~K!hJm9cLR4!C)76o)!`nU0PE%
z;S&+5uC0CG+j3>uZ~U`G$5m#DTXc~r$5$oTC>6AQeSLxAttl%j140ex2{o>JU<nF}
zKX?FoRmyjpV}%lVpYk0k2}#lFFgBe>P|!B;p`NXVp_NshAzw4NQM{&)c6FqUpjejt
zH!$eIsxWIxeW9q5;^o%=?b|mnWV$>2Yec{tipZfwZ56oyI0Xj>UzU=;&p<C|);};H
zCN7R&L}NE2bU)oOvEJO<o2jzyYYsRzYj9*qQQY1e0ZN-y#xHNvU7c4fv9z>QA(Bo#
zRaCjMuH@T=mjPT1wX)hB3Oe&pn*B(Y&S0-tPZ1UqQ&Cj3wYkZ|&(9(ab96zuNuaZ+
zPG6W8*VK%4ciZl7%uvWB7<qMV0}~3KOO>u5Z59O-h}L`0OFt-a0JqTuR8FwpBlV^=
z#d>V}!QkMaY9imN+u+^YygUwme)ZsA*rSTtTG;v7X#oBXT_ngyKp&5nzQ}b|1TOla
z_l5}^j%w#`90hk^cBB`!z3mRN4B+t8Gi6QZqkY%_`>#jbxEBaqcqF~x!m8PKabf`l
z?fAsRpV{)EvjO|2OiXFB%SOuiI&yL?z)TOHcl1~Z0-CFB14g9LGv$ZFc=_S+F_pXa
zB)}zla?;+xLFClECiPuqrLc6O_?-XFN@mao{QTp`k3en1wiY_yuEx(*3I&}5N202t
z!ljnnsyr_A?gyY;ppnw+?!_tr(X6*ZYb<Bl?2r8X`SZ?KwIaRAsVZc@;NdMe7DRD4
zSjUDYlqruuAj}r{yA9KebYvfoi;0R#nBRP^(B;1H^^YRGwfTAB1J>;GbOZvVygS<$
zY<y5|4QX$0cfGpr4IX3zpF~bkQPC)g2S_Qx`0tls_dcT)N3LhFL$xc+eK0H<ATR!>
zli&X>@A_Nl{6j|v1(Hm3mYvZ>R(H=~v``xuB7XznmlEwHkiFajMfYB*_OX!>D3$vq
z2t*OY)l2`6xcc$0-)n2bqWpA`hXTZ}p?|yje<Je!w;Mm9j_icNVC=Dl=Pq~e-ShDB
zDl071vN46IfZ#Ncfq|hOiIfCON=nveGYgL>DJcQAv#hif@M3`mLZ$c_B>J{%Fq^14
z83_qO(xU);GCT}KTXmgGWJJV;Go+vZiUJCShF)QMR;zOn;s$Hh*46?>11$@Z9^i>)
zyp@!d-C(dpC62?xLoieQN69Y&-Azzy8>GQR!MCKO{JNuA5aue%%IMD)Z{NRv2F77i
zlT45pk?UoUm8Z$TVKz2g>LWlMW054WN?+U-pCL^KnU}Ur??A|?>$7M;vH{ZYr`meJ
zIKko43fgS`o55;a0FT@I`zt6Zi1S6hjGe4;INDwH^6~=tPfj5qDYwNgPHyfUQ+kLk
zD8maJV>GKwF-V(E;{IiI0s;b>*NHHH64C30A(6hWu0qwg#l=Morqx>kV)6v@#{Q2#
z{<ua?3<3rqd;gU*^EXpM4iG@-Q-%N?siLc^+w5=&!vHD_!tqV}OFh?{OCT6l@IE>&
z?)n@jgok8s{@)(kKlIzj|E$Qu$k^+B1p=vfcYZl+XZmTgVUZU2p$MX^pz*Z)$;&tY
E1#5D(_y7O^


From fbbe1378c1a61d5e7ea9885f9983b25359016eee Mon Sep 17 00:00:00 2001
From: Florian <florianbuerckel@gmail.com>
Date: Wed, 22 Jan 2025 16:17:28 +0100
Subject: [PATCH 023/103] -Add validation of position in questionnaire#take

-Track how often each info slide was accessed

-minor bug fixes
---
 .../javascripts/vignettes/question_type.js    | 27 +++++---
 .../vignettes/take_questionnaire.js           | 66 +++++++++++++------
 .../vignettes/info_slides_controller.rb       | 24 +++----
 .../vignettes/questionnaires_controller.rb    | 59 ++++++++++++-----
 .../vignettes/slides_controller.rb            |  1 +
 app/models/vignettes/info_slide.rb            | 11 ++--
 app/models/vignettes/question.rb              |  3 +-
 app/models/vignettes/questionnaire.rb         | 11 +++-
 app/models/vignettes/slide.rb                 |  9 +--
 app/models/vignettes/user_answer.rb           | 14 ++++
 .../vignettes/info_slides/_form.html.erb      |  3 +-
 app/views/vignettes/info_slides/new.html.erb  |  2 +-
 .../vignettes/questionnaires/edit.html.erb    | 10 ++-
 .../vignettes/questionnaires/show.html.erb    |  6 +-
 .../vignettes/questionnaires/take.html.erb    | 29 ++++----
 app/views/vignettes/slides/_form.html.erb     | 23 +++----
 .../vignettes/slides/_form_question.html.erb  |  6 +-
 config/routes.rb                              |  2 +-
 ...4255_add_title_to_vignettes_info_slides.rb |  5 ++
 ...tes_slide_id_from_vignettes_info_slides.rb |  5 ++
 ...d_vignettes_questionnaire_to_info_slide.rb |  5 ++
 ...es_info_slides_type_in_slide_statistics.rb |  7 ++
 ...ess_count_to_vignettes_slide_statistics.rb |  5 ++
 db/schema.rb                                  | 11 ++--
 spec/factories/vignettes/slide_statistics.rb  |  4 +-
 25 files changed, 241 insertions(+), 107 deletions(-)
 create mode 100644 db/migrate/20250118094255_add_title_to_vignettes_info_slides.rb
 create mode 100644 db/migrate/20250118120051_remove_vignettes_slide_id_from_vignettes_info_slides.rb
 create mode 100644 db/migrate/20250118123124_add_vignettes_questionnaire_to_info_slide.rb
 create mode 100644 db/migrate/20250118153311_change_time_on_vignettes_info_slides_type_in_slide_statistics.rb
 create mode 100644 db/migrate/20250122142057_add_info_slide_access_count_to_vignettes_slide_statistics.rb

diff --git a/app/assets/javascripts/vignettes/question_type.js b/app/assets/javascripts/vignettes/question_type.js
index 1f006eab9..4784c2f14 100644
--- a/app/assets/javascripts/vignettes/question_type.js
+++ b/app/assets/javascripts/vignettes/question_type.js
@@ -4,13 +4,20 @@ document.addEventListener("turbolinks:load", () => {
     questionTypeDropdown.addEventListener("change", function (event) {
       // Disable all fields by default
       const allQuestionFields = document.getElementsByClassName("question-field");
+      const questionTextField = document.getElementById("question-text");
       for (let field of allQuestionFields) {
         field.style.display = "none";
+        if (questionTextField) {
+          questionTextField.style.display = "none";
+        }
       }
       // make selected field visible
       const selectedType = event.target.value;
       if (selectedType) {
         const selectedField = document.getElementById(selectedType);
+        if (questionTextField && selectedType != "") {
+          questionTextField.style.display = "block";
+        }
         if (selectedField) {
           selectedField.style.display = "block";
         }
@@ -54,15 +61,15 @@ document.addEventListener("turbolinks:load", () => {
   }
 
   // Handle creation of info slide when slide has not yet been saved.
-  const createInfoSlideButton = document.getElementById("create-info-slide-button");
-  const redirectInfoSlideField = document.getElementById("redirect-info-slide-field");
-  const form = document.getElementById("slide-form");
+  // const createInfoSlideButton = document.getElementById("create-info-slide-button");
+  // const redirectInfoSlideField = document.getElementById("redirect-info-slide-field");
+  // const form = document.getElementById("slide-form");
 
-  if (createInfoSlideButton && redirectInfoSlideField) {
-    createInfoSlideButton.addEventListener("click", (e) => {
-      event.preventDefault();
-      redirectInfoSlideField.value = true;
-      form.submit();
-    });
-  }
+  // if (createInfoSlideButton && redirectInfoSlideField) {
+  //   createInfoSlideButton.addEventListener("click", (e) => {
+  //     event.preventDefault();
+  //     redirectInfoSlideField.value = true;
+  //     form.submit();
+  //   });
+  // }
 });
diff --git a/app/assets/javascripts/vignettes/take_questionnaire.js b/app/assets/javascripts/vignettes/take_questionnaire.js
index 58e4803a9..0593ad182 100644
--- a/app/assets/javascripts/vignettes/take_questionnaire.js
+++ b/app/assets/javascripts/vignettes/take_questionnaire.js
@@ -1,39 +1,61 @@
 document.addEventListener("turbolinks:load", () => {
-  const showInfoSlideBtn = document.getElementById("info-slide-button");
-  const closeInfoSlideBtn = document.getElementById("close-info-slide-button");
-  const infoSlideContainer = document.getElementById("info-slide-container");
+  const infoSlideButtons = document.querySelectorAll(".info-slide-button");
+  const closeInfoSlideButtons = document.querySelectorAll(".close-info-slide-button");
+  const infoSlideContainers = document.querySelectorAll(".info-slide-container");
   const slideContainer = document.getElementById("current-slide-container");
 
   const timeOnSlideField = document.getElementById("time-on-slide-field");
-  const timeOnInfoSlideField = document.getElementById("time-on-info-slide-field");
+  const timeOnInfoSlidesField = document.getElementById("time-on-info-slides-field");
+  const infoSlidesAccessCountField = document.getElementById("info-slides-access-count-field");
 
   const form = document.querySelector("form");
 
   let SlideStartTime = new Date();
   let InfoSlideStartTime = null;
 
+  var activeInfoSlideIndex = null;
+
   // Time in seconds
   let totalSlideTime = 0;
-  let totalInfoSlideTime = 0;
+  let infoSlideTimes = {};
+
+  let infoSlidesAccessCount = {};
+
+  infoSlideButtons.forEach((button) => {
+    button.addEventListener("click", (e) => {
+      const index = button.getAttribute("data-index");
+      activeInfoSlideIndex = index;
 
-  showInfoSlideBtn?.addEventListener("click", (e) => {
-    infoSlideContainer.style.display = "block";
-    slideContainer.style.display = "none";
+      // Hide all info slides and the slide
+      infoSlideContainers.forEach(container => container.style.display = "none");
+      slideContainer.style.display = "none";
+      // Make selected info slide visible
+      document.getElementById(`info-slide-container-${index}`).style.display = "block";
 
-    totalSlideTime += (Date.now() - SlideStartTime);
-    SlideStartTime = null;
+      // Increase access count on selected info slide
+      infoSlidesAccessCount[index] = (infoSlidesAccessCount[index] || 0) + 1;
+      console.log("infoSlidesAccessCount", infoSlidesAccessCount);
 
-    InfoSlideStartTime = Date.now();
+      totalSlideTime += (Date.now() - SlideStartTime);
+      SlideStartTime = null;
+
+      InfoSlideStartTime = Date.now();
+    });
   });
 
-  closeInfoSlideBtn?.addEventListener("click", (e) => {
-    infoSlideContainer.style.display = "none";
-    slideContainer.style.display = "block";
+  closeInfoSlideButtons.forEach((button) => {
+    button.addEventListener("click", (e) => {
+      activeInfoSlideIndex = null;
+      const index = button.getAttribute("data-index");
+      document.getElementById(`info-slide-container-${index}`).style.display = "none";
+      slideContainer.style.display = "block";
 
-    totalInfoSlideTime += (Date.now() - InfoSlideStartTime);
-    InfoSlideStartTime = null;
+      const timeSpentOnInfoSlide = (Date.now() - InfoSlideStartTime);
+      infoSlideTimes[index] = (timeSpentOnInfoSlide[index] || 0) + timeSpentOnInfoSlide;
+      InfoSlideStartTime = null;
 
-    SlideStartTime = Date.now();
+      SlideStartTime = Date.now();
+    });
   });
 
   form.addEventListener("submit", (e) => {
@@ -44,10 +66,14 @@ document.addEventListener("turbolinks:load", () => {
     if (SlideStartTime) {
       totalSlideTime += (Date.now() - SlideStartTime);
     }
-    else if (InfoSlideStartTime) {
-      totalInfoSlideTime += (Date.now() - InfoSlideStartTime);
+    else if (activeInfoSlideIndex) {
+      infoSlideTimes[activeInfoSlideIndex] += (Date.now() - InfoSlideStartTime);
+    }
+    for (let key in infoSlideTimes) {
+      infoSlideTimes[key] = Math.floor(infoSlideTimes[key] / 1000);
     }
     timeOnSlideField.value = Math.floor(totalSlideTime / 1000);
-    timeOnInfoSlideField.value = Math.floor(totalInfoSlideTime / 1000);
+    timeOnInfoSlidesField.value = JSON.stringify(infoSlideTimes);
+    infoSlidesAccessCountField.value = JSON.stringify(infoSlidesAccessCount);
   });
 });
diff --git a/app/controllers/vignettes/info_slides_controller.rb b/app/controllers/vignettes/info_slides_controller.rb
index 9b1a56db1..a4cfac9de 100644
--- a/app/controllers/vignettes/info_slides_controller.rb
+++ b/app/controllers/vignettes/info_slides_controller.rb
@@ -1,31 +1,27 @@
 module Vignettes
   class InfoSlidesController < ApplicationController
-    before_action :set_slide
+    before_action :set_questionnaire
+    before_action :set_info_slide, only: [:edit, :update]
 
     def new
       @info_slide = InfoSlide.new
     end
 
     def create
-      @info_slide = InfoSlide.new(info_slide_params)
-      @info_slide.slides << @slide
+      @info_slide = @questionnaire.info_slides.new(info_slide_params)
       if @info_slide.save
-        redirect_to edit_vignettes_questionnaire_slide_path(@slide.questionnaire, @slide),
-                    notice: "Info slide created."
+        redirect_to edit_vignettes_questionnaire_path(@questionnaire), notice: "Info slide created."
       else
         render :new
       end
     end
 
     def edit
-      @info_slide = @slide.info_slide
     end
 
     def update
-      @info_slide = @slide.info_slide
       if @info_slide.update(info_slide_params)
-        redirect_to edit_vignettes_questionnaire_slide_path(@slide.questionnaire, @slide),
-                    notice: "Info slide updated."
+        redirect_to edit_vignettes_questionnaire_path(@questionnaire), notice: "Info slide updated."
       else
         render :edit
       end
@@ -33,12 +29,16 @@ def update
 
     private
 
-      def set_slide
-        @slide = Slide.find(params[:slide_id])
+      def set_questionnaire
+        @questionnaire = Questionnaire.find(params[:questionnaire_id])
+      end
+
+      def set_info_slide
+        @info_slide = @questionnaire.info_slides.find(params[:id])
       end
 
       def info_slide_params
-        params.require(:vignettes_info_slide).permit(:content)
+        params.require(:vignettes_info_slide).permit(:title, :content)
       end
   end
 end
diff --git a/app/controllers/vignettes/questionnaires_controller.rb b/app/controllers/vignettes/questionnaires_controller.rb
index 6e384eb44..f93207c8d 100644
--- a/app/controllers/vignettes/questionnaires_controller.rb
+++ b/app/controllers/vignettes/questionnaires_controller.rb
@@ -11,36 +11,58 @@ def index
 
     def show
       @questionnaire = Questionnaire.find(params[:id])
+      @slides = @questionnaire.slides.order(:position)
     end
 
     def take
-      if params[:position]
-        @slide = @questionnaire.slides.find_by(position: params[:position])
-        if @slide.nil?
-          redirect_to controller: "questionnaires", action: "index"
-          return
-        end
-      else
-        @slide = @questionnaire.slides.order(:position).first
+      user_answer = current_user.vignettes_user_answers.find_or_create_by(user: current_user,
+                                                                          questionnaire: @questionnaire)
+
+      if params[:position].to_i == -1
+        # ONLY FOR DEBUG
+        user_answer.destroy
+        redirect_to vignettes_questionnaire_path, notice: "user answer was destroyed"
+        return
+      end
+
+      # Vignettes was already fully answered by user
+      if user_answer.last_slide_answered?
+        redirect_to vignettes_questionnaire_path, notice: "Vignette was already answered"
+        return
+      end
+
+      first_unanswered_slide = user_answer.first_unanswered_slide
+      # This case should never happen
+      if first_unanswered_slide.nil?
+        redirect_to vignettes_questionnaire_path, notice: "No slides to answer"
+        return
       end
-      # Create answer so the form renders correct and nested attributes work.
+
+      requested_position = params[:position].to_i
+
+      # If there is no position given or the requested position is invalid
+      if requested_position.zero? || requested_position != first_unanswered_slide.position
+        Rails.logger.debug { "Invalid position: #{requested_position}" }
+        redirect_to vignettes_take_questionnaire_path(@questionnaire,
+                                                      position: first_unanswered_slide.position)
+        return
+      end
+
+      @slide = @questionnaire.slides.find_by(position: requested_position)
       @answer = @slide.answers.build
       @answer.build_slide_statistic
     end
 
     def submit_answer
-      Rails.logger.debug { "Params: #{params.inspect}" }
-
       @slide = @questionnaire.slides.find(answer_params[:slide_id])
       @answer = @slide.answers.build(answer_params.except(:slide_id))
       @answer.question = @slide.question
       @answer.type = @slide.question.type.gsub("Question", "Answer")
-      @user_answer = current_user.vignettes_user_answers.find_or_create_by(user: current_user,
-                                                                           questionnaire: @questionnaire)
+      @user_answer = current_user.vignettes_user_answers.find_by(user: current_user,
+                                                                 questionnaire: @questionnaire)
       @answer.user_answer = @user_answer
 
       if @answer.save
-        # @answer.build_slide_statistic(answer_params[:slide_statistic_attributes].merge(user: current_user))
         redirect_to vignettes_take_questionnaire_path(@questionnaire, position: @slide.position + 1)
       else
         Rails.logger.debug { "Answer save failed: #{@answer.errors.full_messages.join(", ")}" }
@@ -54,10 +76,12 @@ def export_answers
 
       csv_data = CSV.generate(headers: true) do |csv|
         csv << ["Answer ID", "User", "Question Slide", "Time on slide", "Time on info slide",
-                "Question Text", "Answer", "Selected Options"]
+                "Info slide accessed", "Question Text", "Answer", "Selected Options"]
         answers.each do |answer|
           row = [answer.id, answer.user_answer.user.name_or_email, answer.slide.position,
-                 answer.slide_statistic.time_on_slide, answer.slide_statistic.time_on_info_slide, answer.slide.question.question_text]
+                 answer.slide_statistic.time_on_slide, answer.slide_statistic.time_on_info_slides,
+                 answer.slide_statistic.info_slides_access_count,
+                 answer.slide.question.question_text]
           case answer.type
           when "Vignettes::TextAnswer"
             row << answer.text
@@ -88,6 +112,7 @@ def create
 
     def edit
       @questionnaire = Questionnaire.find(params[:id])
+      @slides = @questionnaire.slides.order(:position)
     end
 
     private
@@ -103,7 +128,7 @@ def questionnaire_params
       def answer_params
         params.require(:vignettes_answer).permit(:slide_id, :text, :likert_scale_value,
                                                  option_ids: [],
-                                                 slide_statistic_attributes: [:user_id, :time_on_slide, :time_on_info_slide])
+                                                 slide_statistic_attributes: [:user_id, :time_on_slide, :time_on_info_slides, :info_slides_access_count])
       end
   end
 end
diff --git a/app/controllers/vignettes/slides_controller.rb b/app/controllers/vignettes/slides_controller.rb
index 0329cf5dc..a8ef424d6 100644
--- a/app/controllers/vignettes/slides_controller.rb
+++ b/app/controllers/vignettes/slides_controller.rb
@@ -60,6 +60,7 @@ def slide_params
         params.require(:vignettes_slide).permit(
           :content,
           :position,
+          { info_slide_ids: [] },
           question_attributes: [
             :id,
             :type,
diff --git a/app/models/vignettes/info_slide.rb b/app/models/vignettes/info_slide.rb
index 7ac25e727..bb76522fa 100644
--- a/app/models/vignettes/info_slide.rb
+++ b/app/models/vignettes/info_slide.rb
@@ -1,9 +1,12 @@
 module Vignettes
   class InfoSlide < ApplicationRecord
-    has_and_belongs_to_many :slides, class_name: "Vignettes::Slide",
-                                     join_table: "vignettes_info_slides_slides"
-    has_rich_text :content
+    has_and_belongs_to_many :slides,
+                            class_name: "Vignettes::Slide",
+                            join_table: "vignettes_info_slides_slides",
+                            foreign_key: "vignettes_info_slide_id",
+                            association_foreign_key: "vignettes_slide_id"
 
-    has_one :questionnaire, through: :slide
+    has_rich_text :content
+    belongs_to :questionnaire, foreign_key: "vignettes_questionnaire_id", inverse_of: :info_slides
   end
 end
diff --git a/app/models/vignettes/question.rb b/app/models/vignettes/question.rb
index b3b563400..1c385124e 100644
--- a/app/models/vignettes/question.rb
+++ b/app/models/vignettes/question.rb
@@ -3,11 +3,10 @@ class Question < ApplicationRecord
     # Uses single table inheritance to store different types of answers
     belongs_to :slide, inverse_of: :question, foreign_key: "vignettes_slide_id"
     has_many :options, dependent: :destroy, inverse_of: :question
+    has_many :answers, dependent: :destroy, inverse_of: :question
 
     accepts_nested_attributes_for :options, allow_destroy: true, reject_if: :all_blank
 
-    validates :question_text, presence: true
-
     self.abstract_class = false
   end
 end
diff --git a/app/models/vignettes/questionnaire.rb b/app/models/vignettes/questionnaire.rb
index 73041f3b6..725011762 100644
--- a/app/models/vignettes/questionnaire.rb
+++ b/app/models/vignettes/questionnaire.rb
@@ -2,6 +2,15 @@ module Vignettes
   class Questionnaire < ApplicationRecord
     has_many :slides,
              foreign_key: "vignettes_questionnaire_id",
-             dependent: :destroy
+             dependent: :destroy,
+             inverse_of: :questionnaire
+    has_many :info_slides,
+             foreign_key: "vignettes_questionnaire_id",
+             dependent: :destroy,
+             inverse_of: :questionnaire
+    has_many :user_answers,
+             foreign_key: "vignettes_questionnaire_id",
+             dependent: :destroy,
+             inverse_of: :questionnaire
   end
 end
diff --git a/app/models/vignettes/slide.rb b/app/models/vignettes/slide.rb
index fb77cec01..487f5fc38 100644
--- a/app/models/vignettes/slide.rb
+++ b/app/models/vignettes/slide.rb
@@ -7,11 +7,12 @@ class Slide < ApplicationRecord
     has_many :slide_statistics, through: :answers
     accepts_nested_attributes_for :question, allow_destroy: true
 
-    has_and_belongs_to_many :info_slides, class_name: "Vignettes::InfoSlide",
-                                          join_table: "vignettes_info_slides_slides"
+    has_and_belongs_to_many :info_slides,
+                            class_name: "Vignettes::InfoSlide",
+                            join_table: "vignettes_info_slides_slides",
+                            foreign_key: "vignettes_slide_id",
+                            association_foreign_key: "vignettes_info_slide_id"
 
-    has_one :info_slide, class_name: "Vignettes::InfoSlide", foreign_key: "vignettes_slide_id",
-                         dependent: :destroy
     validates :position, presence: true, numericality: { only_integer: true }
     validates :position, uniqueness: { scope: :vignettes_questionnaire_id }
   end
diff --git a/app/models/vignettes/user_answer.rb b/app/models/vignettes/user_answer.rb
index ac3995bff..bd351e16f 100644
--- a/app/models/vignettes/user_answer.rb
+++ b/app/models/vignettes/user_answer.rb
@@ -4,5 +4,19 @@ class UserAnswer < ApplicationRecord
     belongs_to :questionnaire, foreign_key: "vignettes_questionnaire_id"
     has_many :answers, class_name: "Vignettes::Answer", foreign_key: "vignettes_user_answer_id",
                        dependent: :destroy
+
+    def answered_slide_ids
+      answers.pluck(:vignettes_slide_id).uniq
+    end
+
+    def last_slide_answered?
+      answered_slide_ids.include?(questionnaire.slides.order(:position).last.id)
+    end
+
+    def first_unanswered_slide
+      questionnaire.slides.order(:position).find do |slide|
+        answered_slide_ids.exclude?(slide.id)
+      end
+    end
   end
 end
diff --git a/app/views/vignettes/info_slides/_form.html.erb b/app/views/vignettes/info_slides/_form.html.erb
index a4cba47fc..87e0ae27e 100644
--- a/app/views/vignettes/info_slides/_form.html.erb
+++ b/app/views/vignettes/info_slides/_form.html.erb
@@ -1,8 +1,9 @@
 <%= form_with(
       model: @info_slide,
-      url: @info_slide.new_record? ? vignettes_questionnaire_slide_info_slide_path(@slide.questionnaire, @slide) : vignettes_questionnaire_slide_info_slide_path(@slide.questionnaire, @slide),
+            url: @info_slide.new_record? ? vignettes_questionnaire_info_slides_path(@questionnaire) : vignettes_questionnaire_info_slide_path(@questionnaire, @info_slide),
       local: true
     ) do |form| %>
+  <%= form.text_field :title %>
   <%= render partial: 'vignettes/slides/form_content', locals: { form: form } %>
 
   <div>
diff --git a/app/views/vignettes/info_slides/new.html.erb b/app/views/vignettes/info_slides/new.html.erb
index 8e7f42444..b75549b9a 100644
--- a/app/views/vignettes/info_slides/new.html.erb
+++ b/app/views/vignettes/info_slides/new.html.erb
@@ -1,2 +1,2 @@
 <h1>New Info Slide</h1>
-<%= render 'form', info_slide: @info_slide %>
\ No newline at end of file
+<%= render 'form'%>
\ No newline at end of file
diff --git a/app/views/vignettes/questionnaires/edit.html.erb b/app/views/vignettes/questionnaires/edit.html.erb
index 1075f68d2..c0467ad75 100644
--- a/app/views/vignettes/questionnaires/edit.html.erb
+++ b/app/views/vignettes/questionnaires/edit.html.erb
@@ -1,10 +1,18 @@
 <h1> Slides </h1>
 
 <ul>
-    <% @questionnaire.slides.each() do |slide| %>
+    <% @slides.each() do |slide| %>
         <li>
             <%= link_to slide.position, edit_vignettes_questionnaire_slide_path(@questionnaire, slide) %>
         </li>
     <%end%>
 </ul>
 <%= button_to 'Create new slide', new_vignettes_questionnaire_slide_path(@questionnaire), method: :get, class: 'btn btn-primary' %>
+<ul>
+    <% @questionnaire.info_slides.each() do |info_slide| %>
+        <li>
+            <%= link_to info_slide.title, edit_vignettes_questionnaire_info_slide_path(@questionnaire, info_slide) %>
+        </li>
+    <%end%>
+</ul>
+<%= button_to 'Create new info slide', new_vignettes_questionnaire_info_slide_path(@questionnaire), method: :get, class: 'btn btn-primary' %>
diff --git a/app/views/vignettes/questionnaires/show.html.erb b/app/views/vignettes/questionnaires/show.html.erb
index bd6f5f15e..fb4d2a810 100644
--- a/app/views/vignettes/questionnaires/show.html.erb
+++ b/app/views/vignettes/questionnaires/show.html.erb
@@ -1,9 +1,11 @@
 <h1> Slides for vignette <%= @questionnaire.title %> </h1>
 <ul>
-    <% @questionnaire.slides.each do |slide| %>
+    <% @slides.each do |slide| %>
     <li>
         <%= link_to slide.position, vignettes_questionnaire_slide_path(@questionnaire, slide) %>
     </li>
     <% end %>
 </ul>
-<%= button_to 'Edit vignette', edit_vignettes_questionnaire_path(@questionnaire), method: :get, class: 'btn btn-primary' %>
\ No newline at end of file
+<%= button_to 'Edit vignette', edit_vignettes_questionnaire_path(@questionnaire), method: :get, class: 'btn btn-primary' %>
+<br>
+<%= button_to "Export answers", export_answers_vignettes_questionnaire_path(@questionnaire), method: :get, class: 'btn btn-primary' %>
\ No newline at end of file
diff --git a/app/views/vignettes/questionnaires/take.html.erb b/app/views/vignettes/questionnaires/take.html.erb
index 6112381e0..7f14dcc49 100644
--- a/app/views/vignettes/questionnaires/take.html.erb
+++ b/app/views/vignettes/questionnaires/take.html.erb
@@ -1,20 +1,21 @@
 <%= javascript_include_tag 'vignettes/take_questionnaire' %>
 
-
-<% if @slide.info_slide %>
-<div id="info-slide-container" style="display: none;">
-    <h2> Info Slide </h2>
-    <button id="close-info-slide-button" class="btn btn-primary">Close Info Slide</button>
-    <%= @slide.info_slide.content %>
+<% @slide.info_slides.each_with_index do |info_slide, index| %>
+<div id="info-slide-container-<%= index %>" class="info-slide-container" style="display: none;">
+    <h2> Info Slide <%= index + 1 %> </h2>
+    <button class="close-info-slide-button btn btn-primary" data-index="<%= index %>">Close Info Slide</button>
+    <%= info_slide.content %>
 </div>
-<% end %>
+<%end%>
 
 <div id="current-slide-container" data-slide-id="<%= @slide.id %>" data-questionnaire-id="<%= @questionnaire.id %>" >
 
     <h2> Slide <%= @slide.position %> </h2>
-    <% if @slide.info_slide %>
-        <button id="info-slide-button" class="btn btn-primary">Show Info Slide</button>
+
+    <% @slide.info_slides.each_with_index do |info_slide, index| %>
+        <button class="info-slide-button btn btn-primary" data-index="<%= index %>">Show Info Slide <%= info_slide.title%></button>
     <% end %>
+
     <%= @slide.content %>
     <%= @slide.question.question_text %>
 
@@ -28,7 +29,8 @@
         <%= form.fields_for :slide_statistic do |stat_form| %>
             <%= stat_form.hidden_field :user_id, value: current_user.id %>
             <%= stat_form.hidden_field :time_on_slide, id: "time-on-slide-field" %>
-            <%= stat_form.hidden_field :time_on_info_slide, id: "time-on-info-slide-field" %>
+            <%= stat_form.hidden_field :time_on_info_slides, id: "time-on-info-slides-field" %>
+            <%= stat_form.hidden_field :info_slides_access_count, id:"info-slides-access-count-field" %>
         <% end %>
 
         <% case @slide.question.type %> 
@@ -49,6 +51,11 @@
                 <% end %>
         <% end %>
         <br>
-        <%= form.submit "Submit Answer!", class: "btn btn-primary" %>
+        <% if @slide.question.type == "" %>
+            <%= form.submit "Next Slide", class: "btn btn-primary" %>
+        <% else %>
+            <%= form.submit "Submit answer", class: "btn btn-primary" %>
+        <% end %>
+                
     <% end %>
 </div>
diff --git a/app/views/vignettes/slides/_form.html.erb b/app/views/vignettes/slides/_form.html.erb
index 98391285b..5759b418c 100644
--- a/app/views/vignettes/slides/_form.html.erb
+++ b/app/views/vignettes/slides/_form.html.erb
@@ -5,17 +5,18 @@
       id: "slide-form"
     ) do |form| %>
 
-  <%= hidden_field_tag :redirect_info_slide, 'false', id: 'redirect-info-slide-field' %>
-
-  <% if @slide.info_slide %>
-    <%= link_to "Edit Info Slide", edit_vignettes_questionnaire_slide_info_slide_path(@questionnaire, @slide), class: "btn btn-secondary" %>
-  <% elsif !@slide.new_record? %>
-    <%= link_to "Create Info Slide", new_vignettes_questionnaire_slide_info_slide_path(@questionnaire, @slide), class: "btn btn-primary" if @slide.info_slide.nil? %>
-  <% else %>
-    <button type="button" id="create-info-slide-button" class="btn btn-primary">
-      Create Info Slide and save Slide
-    </button>
-  <% end %>
+  <div>
+    <%= form.label :vignettes_info_slide_ids, "Select Info Slides" %><br>
+    <%= form.collection_select(
+          :info_slide_ids,
+          @questionnaire.info_slides,
+          :id,
+          :title,
+          {},
+          multiple: true, size: 5
+        ) 
+    %>
+  </div>
 
   <%= render partial: 'form_content', locals: { form: form } %>
   <%= render partial: 'form_question', locals: { form: form } %>
diff --git a/app/views/vignettes/slides/_form_question.html.erb b/app/views/vignettes/slides/_form_question.html.erb
index ac22ec1c9..609847e57 100644
--- a/app/views/vignettes/slides/_form_question.html.erb
+++ b/app/views/vignettes/slides/_form_question.html.erb
@@ -9,8 +9,10 @@
     ], question_form.object.type), {}, { id:  "question-type" } %>
   </div>
 
-  <%= question_form.label :question_text, "Question Text" %><br>
-  <%= question_form.text_area :question_text, placeholder: "Enter your question here" %>
+  <div id="question-text">
+    <%= question_form.label :question_text, "Question Text" %><br>
+    <%= question_form.text_area :question_text, placeholder: "Enter your question here" %>
+  </div>
 
   <!-- The id must be the name of the corresponding class -->
   <div id="Vignettes::TextQuestion" class="question-field" style="display: none;">
diff --git a/config/routes.rb b/config/routes.rb
index 682c17226..3b193843b 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -572,8 +572,8 @@
         get :export_answers
         post :submit_answer
       end
+      resources :info_slides, only: [:new, :create, :edit, :update]
       resources :slides do
-        resource :info_slide, only: [:new, :create, :edit, :update]
         resources :answers, only: [:new, :create]
       end
     end
diff --git a/db/migrate/20250118094255_add_title_to_vignettes_info_slides.rb b/db/migrate/20250118094255_add_title_to_vignettes_info_slides.rb
new file mode 100644
index 000000000..31a1f987a
--- /dev/null
+++ b/db/migrate/20250118094255_add_title_to_vignettes_info_slides.rb
@@ -0,0 +1,5 @@
+class AddTitleToVignettesInfoSlides < ActiveRecord::Migration[7.1]
+  def change
+    add_column :vignettes_info_slides, :title, :string
+  end
+end
diff --git a/db/migrate/20250118120051_remove_vignettes_slide_id_from_vignettes_info_slides.rb b/db/migrate/20250118120051_remove_vignettes_slide_id_from_vignettes_info_slides.rb
new file mode 100644
index 000000000..a0ba19a96
--- /dev/null
+++ b/db/migrate/20250118120051_remove_vignettes_slide_id_from_vignettes_info_slides.rb
@@ -0,0 +1,5 @@
+class RemoveVignettesSlideIdFromVignettesInfoSlides < ActiveRecord::Migration[7.1]
+  def change
+    remove_column :vignettes_info_slides, :vignettes_slide_id, :bigint
+  end
+end
diff --git a/db/migrate/20250118123124_add_vignettes_questionnaire_to_info_slide.rb b/db/migrate/20250118123124_add_vignettes_questionnaire_to_info_slide.rb
new file mode 100644
index 000000000..b63ef59fb
--- /dev/null
+++ b/db/migrate/20250118123124_add_vignettes_questionnaire_to_info_slide.rb
@@ -0,0 +1,5 @@
+class AddVignettesQuestionnaireToInfoSlide < ActiveRecord::Migration[7.1]
+  def change
+    add_reference :vignettes_info_slides, :vignettes_questionnaire, index: true
+  end
+end
diff --git a/db/migrate/20250118153311_change_time_on_vignettes_info_slides_type_in_slide_statistics.rb b/db/migrate/20250118153311_change_time_on_vignettes_info_slides_type_in_slide_statistics.rb
new file mode 100644
index 000000000..d6020b8bb
--- /dev/null
+++ b/db/migrate/20250118153311_change_time_on_vignettes_info_slides_type_in_slide_statistics.rb
@@ -0,0 +1,7 @@
+class ChangeTimeOnVignettesInfoSlidesTypeInSlideStatistics < ActiveRecord::Migration[7.1]
+  def change
+    rename_column :vignettes_slide_statistics, :time_on_info_slide, :time_on_info_slides
+    # To store data in json format
+    change_column :vignettes_slide_statistics, :time_on_info_slides, :text
+  end
+end
diff --git a/db/migrate/20250122142057_add_info_slide_access_count_to_vignettes_slide_statistics.rb b/db/migrate/20250122142057_add_info_slide_access_count_to_vignettes_slide_statistics.rb
new file mode 100644
index 000000000..b40a5f251
--- /dev/null
+++ b/db/migrate/20250122142057_add_info_slide_access_count_to_vignettes_slide_statistics.rb
@@ -0,0 +1,5 @@
+class AddInfoSlideAccessCountToVignettesSlideStatistics < ActiveRecord::Migration[7.1]
+  def change
+    add_column :vignettes_slide_statistics, :info_slides_access_count, :text
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 43e1bb08c..5f3df2d2b 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.1].define(version: 2025_01_17_225808) do
+ActiveRecord::Schema[7.1].define(version: 2025_01_22_142057) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pgcrypto"
   enable_extension "plpgsql"
@@ -971,10 +971,11 @@
   end
 
   create_table "vignettes_info_slides", force: :cascade do |t|
-    t.bigint "vignettes_slide_id", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.index ["vignettes_slide_id"], name: "index_vignettes_info_slides_on_vignettes_slide_id"
+    t.string "title"
+    t.bigint "vignettes_questionnaire_id"
+    t.index ["vignettes_questionnaire_id"], name: "index_vignettes_info_slides_on_vignettes_questionnaire_id"
   end
 
   create_table "vignettes_info_slides_slides", id: false, force: :cascade do |t|
@@ -1013,10 +1014,11 @@
   create_table "vignettes_slide_statistics", force: :cascade do |t|
     t.bigint "user_id", null: false
     t.integer "time_on_slide"
-    t.integer "time_on_info_slide"
+    t.text "time_on_info_slides"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.bigint "vignettes_answer_id"
+    t.text "info_slides_access_count"
     t.index ["user_id"], name: "index_vignettes_slide_statistics_on_user_id"
     t.index ["vignettes_answer_id"], name: "index_vignettes_slide_statistics_on_vignettes_answer_id"
   end
@@ -1146,7 +1148,6 @@
   add_foreign_key "vignettes_answers", "vignettes_questions"
   add_foreign_key "vignettes_answers", "vignettes_slides"
   add_foreign_key "vignettes_answers", "vignettes_user_answers"
-  add_foreign_key "vignettes_info_slides", "vignettes_slides"
   add_foreign_key "vignettes_options", "vignettes_questions"
   add_foreign_key "vignettes_questions", "vignettes_slides"
   add_foreign_key "vignettes_slide_statistics", "users"
diff --git a/spec/factories/vignettes/slide_statistics.rb b/spec/factories/vignettes/slide_statistics.rb
index e4ff732ed..d5a4f1051 100644
--- a/spec/factories/vignettes/slide_statistics.rb
+++ b/spec/factories/vignettes/slide_statistics.rb
@@ -1,8 +1,8 @@
 FactoryBot.define do
-  factory :vignettes_slide_statistic, class: 'Vignettes::SlideStatistic' do
+  factory :vignettes_slide_statistic, class: "Vignettes::SlideStatistic" do
     user { nil }
     slide { nil }
     time_on_slide { 1 }
-    time_on_info_slide { 1 }
+    time_on_info_slides { 1 }
   end
 end

From 9762e3eeab4cffe516d79618cc584bcd7b4a91a2 Mon Sep 17 00:00:00 2001
From: Florian <florianbuerckel@gmail.com>
Date: Fri, 24 Jan 2025 09:23:09 +0100
Subject: [PATCH 024/103] -Add validations for title and question text;

-display error message if form submitting is unsuccessful
---
 app/assets/javascripts/vignettes/take_questionnaire.js |  1 -
 app/controllers/vignettes/slides_controller.rb         | 10 ++++------
 app/models/vignettes/info_slide.rb                     |  2 ++
 app/models/vignettes/question.rb                       |  6 ++++++
 app/models/vignettes/slide_statistic.rb                |  3 +++
 app/views/vignettes/slides/_form.html.erb              |  1 +
 config/locales/de.yml                                  |  5 +++++
 config/locales/en.yml                                  |  4 ++++
 8 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/vignettes/take_questionnaire.js b/app/assets/javascripts/vignettes/take_questionnaire.js
index 0593ad182..4830a3e0d 100644
--- a/app/assets/javascripts/vignettes/take_questionnaire.js
+++ b/app/assets/javascripts/vignettes/take_questionnaire.js
@@ -34,7 +34,6 @@ document.addEventListener("turbolinks:load", () => {
 
       // Increase access count on selected info slide
       infoSlidesAccessCount[index] = (infoSlidesAccessCount[index] || 0) + 1;
-      console.log("infoSlidesAccessCount", infoSlidesAccessCount);
 
       totalSlideTime += (Date.now() - SlideStartTime);
       SlideStartTime = null;
diff --git a/app/controllers/vignettes/slides_controller.rb b/app/controllers/vignettes/slides_controller.rb
index a8ef424d6..80cad7cb6 100644
--- a/app/controllers/vignettes/slides_controller.rb
+++ b/app/controllers/vignettes/slides_controller.rb
@@ -26,11 +26,8 @@ def create
       @slide = @questionnaire.slides.new(slide_params)
       @slide.position = @questionnaire.slides.maximum(:position).to_i + 1
       if @slide.save
-        if redirect_params[:redirect_info_slide] == "true"
-          redirect_to new_vignettes_questionnaire_slide_info_slide_path(@questionnaire, @slide)
-          return
-        end
-        redirect_to @questionnaire, notice: "Slide was successfully created"
+        redirect_to edit_vignettes_questionnaire_path(@questionnaire),
+                    notice: "Slide was successfully created"
       else
         flash[:alert] = "Failed to create slide: #{@slide.errors.full_messages.join(", ")}"
         render :new, status: :unprocessable_entity
@@ -40,7 +37,8 @@ def create
     def update
       @slide = @questionnaire.slides.find(params[:id])
       if @slide.update(slide_params)
-        redirect_to @questionnaire, notice: "Slide was successfully updated"
+        redirect_to edit_vignettes_questionnaire_path(@questionnaire),
+                    notice: "Slide was successfully updated"
       else
         render :edit, status: :unprocessable_entity
       end
diff --git a/app/models/vignettes/info_slide.rb b/app/models/vignettes/info_slide.rb
index bb76522fa..fa6f13686 100644
--- a/app/models/vignettes/info_slide.rb
+++ b/app/models/vignettes/info_slide.rb
@@ -1,5 +1,7 @@
 module Vignettes
   class InfoSlide < ApplicationRecord
+    validates :title, presence: true
+
     has_and_belongs_to_many :slides,
                             class_name: "Vignettes::Slide",
                             join_table: "vignettes_info_slides_slides",
diff --git a/app/models/vignettes/question.rb b/app/models/vignettes/question.rb
index 1c385124e..33c195f97 100644
--- a/app/models/vignettes/question.rb
+++ b/app/models/vignettes/question.rb
@@ -1,5 +1,7 @@
 module Vignettes
   class Question < ApplicationRecord
+    validates :question_text, presence: true, if: :question_text_required?
+
     # Uses single table inheritance to store different types of answers
     belongs_to :slide, inverse_of: :question, foreign_key: "vignettes_slide_id"
     has_many :options, dependent: :destroy, inverse_of: :question
@@ -8,5 +10,9 @@ class Question < ApplicationRecord
     accepts_nested_attributes_for :options, allow_destroy: true, reject_if: :all_blank
 
     self.abstract_class = false
+
+    def question_text_required?
+      type.present? && type != ""
+    end
   end
 end
diff --git a/app/models/vignettes/slide_statistic.rb b/app/models/vignettes/slide_statistic.rb
index ef75f3526..fdf54aba1 100644
--- a/app/models/vignettes/slide_statistic.rb
+++ b/app/models/vignettes/slide_statistic.rb
@@ -1,5 +1,8 @@
 module Vignettes
   class SlideStatistic < ApplicationRecord
+    validate :user_id, presence: true
+    validate :vignettes_answer_id, presence: true
+
     belongs_to :user
     belongs_to :answer, class_name: "Vignettes::Answer", foreign_key: "vignettes_answer_id",
                         inverse_of: :slide_statistic
diff --git a/app/views/vignettes/slides/_form.html.erb b/app/views/vignettes/slides/_form.html.erb
index 5759b418c..df5db9e9f 100644
--- a/app/views/vignettes/slides/_form.html.erb
+++ b/app/views/vignettes/slides/_form.html.erb
@@ -1,6 +1,7 @@
 <%= javascript_include_tag 'vignettes/question_type' %>
 <%= form_with(
       model: [@questionnaire, @slide],
+      local: true,
       url: @slide.new_record? ? vignettes_questionnaire_slides_path(@questionnaire) : vignettes_questionnaire_slide_path(@questionnaire, @slide),
       id: "slide-form"
     ) do |form| %>
diff --git a/config/locales/de.yml b/config/locales/de.yml
index c4a46ad83..9663ae3ea 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -4118,6 +4118,11 @@ de:
           team_size: >
             Du kannst nicht beitreten, da das Abgabeteam sonst mehr Mitglieder
             hätte als erlaubt.
+                vignettes/question:
+        vignettes/question:
+          attributes:
+            question:
+              blank: 'Frage kann nicht leer sein'
         vote:
           attributes:
             clicker:
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 21583753e..90afa60ce 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -3902,6 +3902,10 @@ en:
           team_size: >
             You are not allowed to join as otherwise the submission team would
             have more members than allowed.
+        vignettes/question:
+          attributes:
+            question_text:
+              blank: 'cannot be empty'
         vote:
           attributes:
             clicker:

From 2d37ed723bcfb3c8541e508797c93cdfd4af4623 Mon Sep 17 00:00:00 2001
From: Florian <florianbuerckel@gmail.com>
Date: Sat, 25 Jan 2025 13:14:23 +0100
Subject: [PATCH 025/103] -Add icon support to info slides

-validate content type

-fix weird bug with migration date

-change config to format error messages differently
---
 Gemfile                                           |  1 +
 Gemfile.lock                                      | 10 +++++++---
 app/assets/stylesheets/application.scss           |  1 +
 app/assets/stylesheets/vignettes.scss             | 15 +++++++++++++++
 .../vignettes/info_slides_controller.rb           |  7 ++++++-
 app/models/vignettes/info_slide.rb                |  8 ++++++++
 app/models/vignettes/slide_statistic.rb           |  3 +--
 app/views/vignettes/info_slides/_form.html.erb    |  7 ++++++-
 app/views/vignettes/questionnaires/take.html.erb  | 10 +++++++++-
 app/views/vignettes/slides/_form.html.erb         |  2 +-
 config/application.rb                             |  1 +
 config/environments/docker_development.rb         |  1 +
 config/locales/de.yml                             |  5 +++--
 config/locales/en.yml                             |  5 +++--
 ...100000_change_slide_statistics_associations.rb |  7 -------
 ...125095933_add_icon_to_vignettes_info_slides.rb |  5 +++++
 db/schema.rb                                      |  3 ++-
 17 files changed, 70 insertions(+), 21 deletions(-)
 create mode 100644 app/assets/stylesheets/vignettes.scss
 delete mode 100644 db/migrate/20231010100000_change_slide_statistics_associations.rb
 create mode 100644 db/migrate/20250125095933_add_icon_to_vignettes_info_slides.rb

diff --git a/Gemfile b/Gemfile
index 645764650..795c9de4a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,6 +7,7 @@ ruby "3.1.4"
 gem "active_model_serializers", "~> 0.10"
 gem "activerecord-import", "~>1.7"
 gem "activerecord-nulldb-adapter", "~> 1.0" # for assets precompilation in production
+gem "active_storage_validations"
 gem "acts_as_list", "~> 1.2"
 gem "acts_as_tree", "~> 2.9"
 gem "acts_as_votable", "~> 0.14"
diff --git a/Gemfile.lock b/Gemfile.lock
index 3d5d7bf80..a8fda450e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -97,6 +97,12 @@ GEM
       jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
     active_record_union (1.3.0)
       activerecord (>= 4.0)
+    active_storage_validations (2.0.0)
+      activejob (>= 6.1.4)
+      activemodel (>= 6.1.4)
+      activestorage (>= 6.1.4)
+      activesupport (>= 6.1.4)
+      marcel (>= 1.0.3)
     activejob (7.1.5)
       activesupport (= 7.1.5)
       globalid (>= 0.3.6)
@@ -602,8 +608,6 @@ GEM
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       sprockets (>= 3.0.0)
-    stimulus-rails (1.3.4)
-      railties (>= 6.0.0)
     stream (0.5.5)
     streamio-ffmpeg (3.0.2)
       multi_json (~> 1.8)
@@ -670,6 +674,7 @@ PLATFORMS
 
 DEPENDENCIES
   active_model_serializers (~> 0.10)
+  active_storage_validations
   activerecord-import (~> 1.7)
   activerecord-nulldb-adapter (~> 1.0)
   acts_as_list (~> 1.2)
@@ -741,7 +746,6 @@ DEPENDENCIES
   spring (~> 2.1)
   spring-watcher-listen (~> 2.0)
   sprockets-rails (~> 3.5)
-  stimulus-rails
   streamio-ffmpeg (~> 3.0)
   sunspot_rails (~> 2.7)
   sunspot_solr (~> 2.7)
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 6d1d6c9ab..0f0ad6eaa 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -63,6 +63,7 @@ $container-max-widths: (
 @import "submissions";
 @import "vertices";
 @import "trix";
+@import "vignettes";
 
 trix-toolbar .trix-button-row {
   flex-wrap: wrap;
diff --git a/app/assets/stylesheets/vignettes.scss b/app/assets/stylesheets/vignettes.scss
new file mode 100644
index 000000000..c45efb400
--- /dev/null
+++ b/app/assets/stylesheets/vignettes.scss
@@ -0,0 +1,15 @@
+.info-slide-icon-button {
+  background: none;
+  border: none;
+  padding: 0;
+  margin: 5px;
+  cursor: pointer;
+  
+  &:hover {
+    opacity: 0.8;
+  }
+  
+  &:focus {
+    outline: none;
+  }
+}
\ No newline at end of file
diff --git a/app/controllers/vignettes/info_slides_controller.rb b/app/controllers/vignettes/info_slides_controller.rb
index a4cfac9de..aca6225cf 100644
--- a/app/controllers/vignettes/info_slides_controller.rb
+++ b/app/controllers/vignettes/info_slides_controller.rb
@@ -2,6 +2,7 @@ module Vignettes
   class InfoSlidesController < ApplicationController
     before_action :set_questionnaire
     before_action :set_info_slide, only: [:edit, :update]
+    before_action :set_accepted_content_types, only: [:new, :edit]
 
     def new
       @info_slide = InfoSlide.new
@@ -37,8 +38,12 @@ def set_info_slide
         @info_slide = @questionnaire.info_slides.find(params[:id])
       end
 
+      def set_accepted_content_types
+        @accepted_content_types = InfoSlide::ACCEPTED_CONTENT_TYPES
+      end
+
       def info_slide_params
-        params.require(:vignettes_info_slide).permit(:title, :content)
+        params.require(:vignettes_info_slide).permit(:title, :content, :icon)
       end
   end
 end
diff --git a/app/models/vignettes/info_slide.rb b/app/models/vignettes/info_slide.rb
index fa6f13686..9d930d522 100644
--- a/app/models/vignettes/info_slide.rb
+++ b/app/models/vignettes/info_slide.rb
@@ -1,6 +1,10 @@
 module Vignettes
   class InfoSlide < ApplicationRecord
+    ACCEPTED_CONTENT_TYPES = ["image/png", "image/jpeg"].freeze
+
     validates :title, presence: true
+    validates :icon, content_type: ACCEPTED_CONTENT_TYPES,
+                     size: { less_than: 2.megabytes }
 
     has_and_belongs_to_many :slides,
                             class_name: "Vignettes::Slide",
@@ -9,6 +13,10 @@ class InfoSlide < ApplicationRecord
                             association_foreign_key: "vignettes_slide_id"
 
     has_rich_text :content
+    has_one_attached :icon do |attachable|
+      attachable.variant(:thumb, resize_to_limit: [200, 200])
+    end
+
     belongs_to :questionnaire, foreign_key: "vignettes_questionnaire_id", inverse_of: :info_slides
   end
 end
diff --git a/app/models/vignettes/slide_statistic.rb b/app/models/vignettes/slide_statistic.rb
index fdf54aba1..323b015d8 100644
--- a/app/models/vignettes/slide_statistic.rb
+++ b/app/models/vignettes/slide_statistic.rb
@@ -1,7 +1,6 @@
 module Vignettes
   class SlideStatistic < ApplicationRecord
-    validate :user_id, presence: true
-    validate :vignettes_answer_id, presence: true
+    validates :user_id, presence: true
 
     belongs_to :user
     belongs_to :answer, class_name: "Vignettes::Answer", foreign_key: "vignettes_answer_id",
diff --git a/app/views/vignettes/info_slides/_form.html.erb b/app/views/vignettes/info_slides/_form.html.erb
index 87e0ae27e..0204f09ff 100644
--- a/app/views/vignettes/info_slides/_form.html.erb
+++ b/app/views/vignettes/info_slides/_form.html.erb
@@ -3,7 +3,12 @@
             url: @info_slide.new_record? ? vignettes_questionnaire_info_slides_path(@questionnaire) : vignettes_questionnaire_info_slide_path(@questionnaire, @info_slide),
       local: true
     ) do |form| %>
-  <%= form.text_field :title %>
+  <%= form.text_field :title, placeholder: "Enter a title" %>
+  <br>
+  <%= form.label(:icon, "Select an Icon as display button", class:"form-label") %>
+  <br>
+  <%= form.file_field :icon, accept: @accepted_content_types.join(',') %>
+
   <%= render partial: 'vignettes/slides/form_content', locals: { form: form } %>
 
   <div>
diff --git a/app/views/vignettes/questionnaires/take.html.erb b/app/views/vignettes/questionnaires/take.html.erb
index 7f14dcc49..088dd4196 100644
--- a/app/views/vignettes/questionnaires/take.html.erb
+++ b/app/views/vignettes/questionnaires/take.html.erb
@@ -13,7 +13,15 @@
     <h2> Slide <%= @slide.position %> </h2>
 
     <% @slide.info_slides.each_with_index do |info_slide, index| %>
-        <button class="info-slide-button btn btn-primary" data-index="<%= index %>">Show Info Slide <%= info_slide.title%></button>
+        <% if info_slide.icon.attached? %>
+        <button class="info-slide-button info-slide-icon-button" data-index="<%= index %>">
+                <%= image_tag info_slide.icon.variant(:thumb), alt: info_slide.title, class: 'info-slide-icon' %>
+            </button>
+        <% else %>
+            <button class="info-slide-button btn btn-primary" data-index="<%= index %>">
+            <%= info_slide.title %>
+            </button>
+        <% end %>
     <% end %>
 
     <%= @slide.content %>
diff --git a/app/views/vignettes/slides/_form.html.erb b/app/views/vignettes/slides/_form.html.erb
index df5db9e9f..3b264502d 100644
--- a/app/views/vignettes/slides/_form.html.erb
+++ b/app/views/vignettes/slides/_form.html.erb
@@ -14,7 +14,7 @@
           :id,
           :title,
           {},
-          multiple: true, size: 5
+          multiple: true
         ) 
     %>
   </div>
diff --git a/config/application.rb b/config/application.rb
index 45e82a3fd..e742a12e6 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -28,6 +28,7 @@ class Application < Rails::Application
     config.i18n.fallbacks = [:en]
     config.i18n.available_locales = [:de, :en]
     config.i18n.raise_on_missing_translations = false
+    config.active_model.i18n_customize_full_message = true
     config.time_zone = "Berlin"
 
     # Message serializing. Starting with Rails 7.2, the default is :json.
diff --git a/config/environments/docker_development.rb b/config/environments/docker_development.rb
index f2be5f19d..e3d506338 100644
--- a/config/environments/docker_development.rb
+++ b/config/environments/docker_development.rb
@@ -33,6 +33,7 @@
   config.active_storage.service = :local
 
   config.i18n.default_locale = :de
+  config.i18n.raise_on_missing_translations = false
 
   # Don't care if the mailer can't send.
   config.action_mailer.perform_deliveries = true
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 9663ae3ea..e64003a26 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -4121,8 +4121,9 @@ de:
                 vignettes/question:
         vignettes/question:
           attributes:
-            question:
-              blank: 'Frage kann nicht leer sein'
+            question_text:
+              blank: 'Question Text cannot be empty'
+              format: '%{message}'
         vote:
           attributes:
             clicker:
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 90afa60ce..c193bc0c9 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -3905,7 +3905,8 @@ en:
         vignettes/question:
           attributes:
             question_text:
-              blank: 'cannot be empty'
+              format: '%{message}'
+              blank: 'Question Text cannot be empty'
         vote:
           attributes:
             clicker:
@@ -3956,4 +3957,4 @@ en:
       Error while sending feedback
     error: >
       We're sorry, something went wrong while submitting your feedback.
-      Please save your feedback by copying it manually and try again later.
+      Please save your feedback by copying it manually and try again later.
\ No newline at end of file
diff --git a/db/migrate/20231010100000_change_slide_statistics_associations.rb b/db/migrate/20231010100000_change_slide_statistics_associations.rb
deleted file mode 100644
index 4d76c8fc4..000000000
--- a/db/migrate/20231010100000_change_slide_statistics_associations.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class ChangeSlideStatisticsAssociations < ActiveRecord::Migration[7.0]
-  def change
-    remove_reference :vignettes_slide_statistics, :vignettes_slide, foreign_key: true
-    add_reference :vignettes_slide_statistics, :vignettes_answer,
-                  foreign_key: { to_table: :vignettes_answers }
-  end
-end
diff --git a/db/migrate/20250125095933_add_icon_to_vignettes_info_slides.rb b/db/migrate/20250125095933_add_icon_to_vignettes_info_slides.rb
new file mode 100644
index 000000000..8fa2aa4ca
--- /dev/null
+++ b/db/migrate/20250125095933_add_icon_to_vignettes_info_slides.rb
@@ -0,0 +1,5 @@
+class AddIconToVignettesInfoSlides < ActiveRecord::Migration[7.1]
+  def change
+    add_column :vignettes_info_slides, :icon, :string
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 5f3df2d2b..cd3fc65a6 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.1].define(version: 2025_01_22_142057) do
+ActiveRecord::Schema[7.1].define(version: 2025_01_25_095933) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pgcrypto"
   enable_extension "plpgsql"
@@ -975,6 +975,7 @@
     t.datetime "updated_at", null: false
     t.string "title"
     t.bigint "vignettes_questionnaire_id"
+    t.string "icon"
     t.index ["vignettes_questionnaire_id"], name: "index_vignettes_info_slides_on_vignettes_questionnaire_id"
   end
 

From 6e383ebeaf508ce498ab6adc504fc41296a81477 Mon Sep 17 00:00:00 2001
From: Florian <florianbuerckel@gmail.com>
Date: Sat, 25 Jan 2025 14:39:52 +0100
Subject: [PATCH 026/103] correct date on migration

---
 .../20250117222000_change_slide_statistics_associations.rb | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 db/migrate/20250117222000_change_slide_statistics_associations.rb

diff --git a/db/migrate/20250117222000_change_slide_statistics_associations.rb b/db/migrate/20250117222000_change_slide_statistics_associations.rb
new file mode 100644
index 000000000..4d76c8fc4
--- /dev/null
+++ b/db/migrate/20250117222000_change_slide_statistics_associations.rb
@@ -0,0 +1,7 @@
+class ChangeSlideStatisticsAssociations < ActiveRecord::Migration[7.0]
+  def change
+    remove_reference :vignettes_slide_statistics, :vignettes_slide, foreign_key: true
+    add_reference :vignettes_slide_statistics, :vignettes_answer,
+                  foreign_key: { to_table: :vignettes_answers }
+  end
+end

From afa88916928ad1b136307399430f2f2f4e2f2f5c Mon Sep 17 00:00:00 2001
From: Florian <florianbuerckel@gmail.com>
Date: Sat, 25 Jan 2025 15:40:05 +0100
Subject: [PATCH 027/103] removed unused views and routes

Signed-off-by: Florian <florianbuerckel@gmail.com>
---
 .../javascripts/vignettes/question_type.js     | 13 -------------
 .../vignettes/questionnaires_controller.rb     |  5 -----
 .../questionnaires/_take_slide.html.erb        | 18 ------------------
 .../vignettes/questionnaires/create.html.erb   |  2 --
 .../vignettes/questionnaires/destroy.html.erb  |  2 --
 .../vignettes/questionnaires/edit.html.erb     |  5 +++++
 .../vignettes/questionnaires/show.html.erb     | 11 -----------
 .../vignettes/questionnaires/update.html.erb   |  2 --
 app/views/vignettes/slides/destroy.html.erb    |  2 --
 app/views/vignettes/slides/index.html.erb      |  2 --
 .../questions/_text_question_field.html.erb    |  4 ----
 app/views/vignettes/slides/show.html.erb       | 17 -----------------
 app/views/vignettes/slides/update.html.erb     |  2 --
 config/application.rb                          |  1 -
 config/initializers/active_model.rb            |  1 +
 config/locales/en.yml                          |  4 ++--
 config/routes.rb                               |  9 +++------
 17 files changed, 11 insertions(+), 89 deletions(-)
 delete mode 100644 app/views/vignettes/questionnaires/_take_slide.html.erb
 delete mode 100644 app/views/vignettes/questionnaires/create.html.erb
 delete mode 100644 app/views/vignettes/questionnaires/destroy.html.erb
 delete mode 100644 app/views/vignettes/questionnaires/show.html.erb
 delete mode 100644 app/views/vignettes/questionnaires/update.html.erb
 delete mode 100644 app/views/vignettes/slides/destroy.html.erb
 delete mode 100644 app/views/vignettes/slides/index.html.erb
 delete mode 100644 app/views/vignettes/slides/questions/_text_question_field.html.erb
 delete mode 100644 app/views/vignettes/slides/show.html.erb
 delete mode 100644 app/views/vignettes/slides/update.html.erb
 create mode 100644 config/initializers/active_model.rb

diff --git a/app/assets/javascripts/vignettes/question_type.js b/app/assets/javascripts/vignettes/question_type.js
index 4784c2f14..bbfe51d15 100644
--- a/app/assets/javascripts/vignettes/question_type.js
+++ b/app/assets/javascripts/vignettes/question_type.js
@@ -59,17 +59,4 @@ document.addEventListener("turbolinks:load", () => {
       }
     });
   }
-
-  // Handle creation of info slide when slide has not yet been saved.
-  // const createInfoSlideButton = document.getElementById("create-info-slide-button");
-  // const redirectInfoSlideField = document.getElementById("redirect-info-slide-field");
-  // const form = document.getElementById("slide-form");
-
-  // if (createInfoSlideButton && redirectInfoSlideField) {
-  //   createInfoSlideButton.addEventListener("click", (e) => {
-  //     event.preventDefault();
-  //     redirectInfoSlideField.value = true;
-  //     form.submit();
-  //   });
-  // }
 });
diff --git a/app/controllers/vignettes/questionnaires_controller.rb b/app/controllers/vignettes/questionnaires_controller.rb
index f93207c8d..4854f880b 100644
--- a/app/controllers/vignettes/questionnaires_controller.rb
+++ b/app/controllers/vignettes/questionnaires_controller.rb
@@ -9,11 +9,6 @@ def index
       @questionnaire = Questionnaire.new
     end
 
-    def show
-      @questionnaire = Questionnaire.find(params[:id])
-      @slides = @questionnaire.slides.order(:position)
-    end
-
     def take
       user_answer = current_user.vignettes_user_answers.find_or_create_by(user: current_user,
                                                                           questionnaire: @questionnaire)
diff --git a/app/views/vignettes/questionnaires/_take_slide.html.erb b/app/views/vignettes/questionnaires/_take_slide.html.erb
deleted file mode 100644
index 17e2d4e2b..000000000
--- a/app/views/vignettes/questionnaires/_take_slide.html.erb
+++ /dev/null
@@ -1,18 +0,0 @@
-<h2> Slide <%= slide.position %> </h2>
-<%= slide.content %>
-<%= slide.question.question_text %>
-
-<br>
-
-<%= form_with(model: answer, url: vignettes_questionnaire_slide_answers_path(@questionnaire, @slide), local: true) do |form| %>
-  <% case slide.question.type %> 
-    <% when "Vignettes::TextQuestion" %>
-      <%= form.label :text, "Your Answer" %>
-      <%= form.text_area :text%>
-    <% when "Vignettes::MultipleChoiceQuestion" %>
-      <% slide.question.options.each do |option| %>
-        <%= option.text %> <br>
-        <%= form.check_box :option_ids, {multiple: true}, option.id, nil %>
-    <% end %>
-  <% end %>
-<% end %>
\ No newline at end of file
diff --git a/app/views/vignettes/questionnaires/create.html.erb b/app/views/vignettes/questionnaires/create.html.erb
deleted file mode 100644
index 99c8ff6d1..000000000
--- a/app/views/vignettes/questionnaires/create.html.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-<h1>Vignettes::Questionnaires#create</h1>
-<p>Find me in app/views/vignettes/questionnaires/create.html.erb</p>
diff --git a/app/views/vignettes/questionnaires/destroy.html.erb b/app/views/vignettes/questionnaires/destroy.html.erb
deleted file mode 100644
index 6d04570ad..000000000
--- a/app/views/vignettes/questionnaires/destroy.html.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-<h1>Vignettes::Questionnaires#destroy</h1>
-<p>Find me in app/views/vignettes/questionnaires/destroy.html.erb</p>
diff --git a/app/views/vignettes/questionnaires/edit.html.erb b/app/views/vignettes/questionnaires/edit.html.erb
index c0467ad75..2d119c3de 100644
--- a/app/views/vignettes/questionnaires/edit.html.erb
+++ b/app/views/vignettes/questionnaires/edit.html.erb
@@ -8,6 +8,7 @@
     <%end%>
 </ul>
 <%= button_to 'Create new slide', new_vignettes_questionnaire_slide_path(@questionnaire), method: :get, class: 'btn btn-primary' %>
+<h1> Info slides </h1>
 <ul>
     <% @questionnaire.info_slides.each() do |info_slide| %>
         <li>
@@ -16,3 +17,7 @@
     <%end%>
 </ul>
 <%= button_to 'Create new info slide', new_vignettes_questionnaire_info_slide_path(@questionnaire), method: :get, class: 'btn btn-primary' %>
+
+<br>
+
+<%= button_to "Export answers", export_answers_vignettes_questionnaire_path(@questionnaire), method: :get, class: 'btn btn-primary' %>
diff --git a/app/views/vignettes/questionnaires/show.html.erb b/app/views/vignettes/questionnaires/show.html.erb
deleted file mode 100644
index fb4d2a810..000000000
--- a/app/views/vignettes/questionnaires/show.html.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<h1> Slides for vignette <%= @questionnaire.title %> </h1>
-<ul>
-    <% @slides.each do |slide| %>
-    <li>
-        <%= link_to slide.position, vignettes_questionnaire_slide_path(@questionnaire, slide) %>
-    </li>
-    <% end %>
-</ul>
-<%= button_to 'Edit vignette', edit_vignettes_questionnaire_path(@questionnaire), method: :get, class: 'btn btn-primary' %>
-<br>
-<%= button_to "Export answers", export_answers_vignettes_questionnaire_path(@questionnaire), method: :get, class: 'btn btn-primary' %>
\ No newline at end of file
diff --git a/app/views/vignettes/questionnaires/update.html.erb b/app/views/vignettes/questionnaires/update.html.erb
deleted file mode 100644
index 4b2ab2794..000000000
--- a/app/views/vignettes/questionnaires/update.html.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-<h1>Vignettes::Questionnaires#update</h1>
-<p>Find me in app/views/vignettes/questionnaires/update.html.erb</p>
diff --git a/app/views/vignettes/slides/destroy.html.erb b/app/views/vignettes/slides/destroy.html.erb
deleted file mode 100644
index 85a83ef18..000000000
--- a/app/views/vignettes/slides/destroy.html.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-<h1>Vignettes::Slides#destroy</h1>
-<p>Find me in app/views/vignettes/slides/destroy.html.erb</p>
diff --git a/app/views/vignettes/slides/index.html.erb b/app/views/vignettes/slides/index.html.erb
deleted file mode 100644
index b63293821..000000000
--- a/app/views/vignettes/slides/index.html.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-<h1>Vignettes::Slides#index</h1>
-<p>Find me in app/views/vignettes/slides/index.html.erb</p>
diff --git a/app/views/vignettes/slides/questions/_text_question_field.html.erb b/app/views/vignettes/slides/questions/_text_question_field.html.erb
deleted file mode 100644
index cccddf583..000000000
--- a/app/views/vignettes/slides/questions/_text_question_field.html.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-<div id="TextQuestion_field" class="question-type-field">
-    <%= form.label :question_text, "Question Text" %><br>
-    <%= form.text_area :question_text, placeholder: "Enter your question here" %>
-</div>
\ No newline at end of file
diff --git a/app/views/vignettes/slides/show.html.erb b/app/views/vignettes/slides/show.html.erb
deleted file mode 100644
index 800822225..000000000
--- a/app/views/vignettes/slides/show.html.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-<%= @slide.content %>
-<%= @slide.question.question_text %>
-
-<br>
-
-<%= form_with(model: @answer, url: vignettes_questionnaire_slide_answers_path(@questionnaire, @slide), local: true) do |form| %>
-  <% case @slide.question.type %> 
-    <% when "Vignettes::TextQuestion" %>
-      <%= form.label :text, "Your Answer" %>
-      <%= form.text_area :text%>
-    <% when "Vignettes::MultipleChoiceQuestion" %>
-      <% @slide.question.options.each do |option| %>
-        <%= option.text %> <br>
-        <%= form.check_box :option_ids, {multiple: true}, option.id, nil %>
-    <% end %>
-  <% end %>
-<% end %>
\ No newline at end of file
diff --git a/app/views/vignettes/slides/update.html.erb b/app/views/vignettes/slides/update.html.erb
deleted file mode 100644
index 7fb2828e4..000000000
--- a/app/views/vignettes/slides/update.html.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-<h1>Vignettes::Slides#update</h1>
-<p>Find me in app/views/vignettes/slides/update.html.erb</p>
diff --git a/config/application.rb b/config/application.rb
index e742a12e6..45e82a3fd 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -28,7 +28,6 @@ class Application < Rails::Application
     config.i18n.fallbacks = [:en]
     config.i18n.available_locales = [:de, :en]
     config.i18n.raise_on_missing_translations = false
-    config.active_model.i18n_customize_full_message = true
     config.time_zone = "Berlin"
 
     # Message serializing. Starting with Rails 7.2, the default is :json.
diff --git a/config/initializers/active_model.rb b/config/initializers/active_model.rb
new file mode 100644
index 000000000..0d6395714
--- /dev/null
+++ b/config/initializers/active_model.rb
@@ -0,0 +1 @@
+Rails.application.config.active_model.i18n_customize_full_message = true
diff --git a/config/locales/en.yml b/config/locales/en.yml
index c193bc0c9..a57c703c4 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -3903,10 +3903,10 @@ en:
             You are not allowed to join as otherwise the submission team would
             have more members than allowed.
         vignettes/question:
+          format: '%{message}'
           attributes:
             question_text:
-              format: '%{message}'
-              blank: 'Question Text cannot be empty'
+              blank: 'cannot be empty'
         vote:
           attributes:
             clicker:
diff --git a/config/routes.rb b/config/routes.rb
index 3b193843b..902445a48 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -563,17 +563,14 @@
 
   # vignettes routes
   namespace :vignettes do
-    get "questionnaires/:id/take",
-        to: "questionnaires#take",
-        as: "take_questionnaire"
-
-    resources :questionnaires do
+    resources :questionnaires, only: [:index, :new, :create, :edit, :update] do
       member do
         get :export_answers
+        get :take, to: "questionnaires#take", as: "take_questionnaire"
         post :submit_answer
       end
       resources :info_slides, only: [:new, :create, :edit, :update]
-      resources :slides do
+      resources :slides, only: [:new, :create, :edit, :update] do
         resources :answers, only: [:new, :create]
       end
     end

From d82047264b6eb24e055f7575c182217d83a5f338 Mon Sep 17 00:00:00 2001
From: Florian <florianbuerckel@gmail.com>
Date: Sat, 25 Jan 2025 16:20:57 +0100
Subject: [PATCH 028/103] -minor bug fixes

-remove git accidents
---
 .../javascripts/vignettes/question_type.js    |   2 +-
 .../vignettes/questionnaires_controller.rb    |   7 +-
 config/environments/docker_development.rb     |   1 -
 config/routes.rb                              |   7 +-
 package.json                                  |   1 -
 spec/models/user_cleaner_spec.rb              |  93 +----
 .../models/user_cleaner_spec_BACKUP_140121.rb | 352 ------------------
 spec/models/user_cleaner_spec_BASE_140121.rb  | 282 --------------
 spec/models/user_cleaner_spec_LOCAL_140121.rb | 336 -----------------
 .../models/user_cleaner_spec_REMOTE_140121.rb | 329 ----------------
 yarn.lock                                     |   5 -
 11 files changed, 16 insertions(+), 1399 deletions(-)
 delete mode 100644 spec/models/user_cleaner_spec_BACKUP_140121.rb
 delete mode 100644 spec/models/user_cleaner_spec_BASE_140121.rb
 delete mode 100644 spec/models/user_cleaner_spec_LOCAL_140121.rb
 delete mode 100644 spec/models/user_cleaner_spec_REMOTE_140121.rb

diff --git a/app/assets/javascripts/vignettes/question_type.js b/app/assets/javascripts/vignettes/question_type.js
index bbfe51d15..9e706bf3a 100644
--- a/app/assets/javascripts/vignettes/question_type.js
+++ b/app/assets/javascripts/vignettes/question_type.js
@@ -32,7 +32,7 @@ document.addEventListener("turbolinks:load", () => {
   const addOptionButton = document.getElementById("add-option");
   const optionTemplate = document.getElementById("new-option-template");
   if (addOptionButton) {
-    addOptionButton.addEventListener("click", (e) => {
+    addOptionButton.addEventListener("click", () => {
       const optionTemplateHTML = optionTemplate.innerHTML;
       const uniqueId = new Date().getTime().toString();
       const newBlockHTML = optionTemplateHTML.replace(/NEW_RECORD/g, uniqueId);
diff --git a/app/controllers/vignettes/questionnaires_controller.rb b/app/controllers/vignettes/questionnaires_controller.rb
index 4854f880b..d5ccdcd9c 100644
--- a/app/controllers/vignettes/questionnaires_controller.rb
+++ b/app/controllers/vignettes/questionnaires_controller.rb
@@ -9,6 +9,10 @@ def index
       @questionnaire = Questionnaire.new
     end
 
+    def show
+      redirect_to edit_vignettes_questionnaire_path
+    end
+
     def take
       user_answer = current_user.vignettes_user_answers.find_or_create_by(user: current_user,
                                                                           questionnaire: @questionnaire)
@@ -22,7 +26,7 @@ def take
 
       # Vignettes was already fully answered by user
       if user_answer.last_slide_answered?
-        redirect_to vignettes_questionnaire_path, notice: "Vignette was already answered"
+        redirect_to vignettes_questionnaire_path, notice: "Vignette was successfully answered"
         return
       end
 
@@ -37,7 +41,6 @@ def take
 
       # If there is no position given or the requested position is invalid
       if requested_position.zero? || requested_position != first_unanswered_slide.position
-        Rails.logger.debug { "Invalid position: #{requested_position}" }
         redirect_to vignettes_take_questionnaire_path(@questionnaire,
                                                       position: first_unanswered_slide.position)
         return
diff --git a/config/environments/docker_development.rb b/config/environments/docker_development.rb
index e3d506338..f2be5f19d 100644
--- a/config/environments/docker_development.rb
+++ b/config/environments/docker_development.rb
@@ -33,7 +33,6 @@
   config.active_storage.service = :local
 
   config.i18n.default_locale = :de
-  config.i18n.raise_on_missing_translations = false
 
   # Don't care if the mailer can't send.
   config.action_mailer.perform_deliveries = true
diff --git a/config/routes.rb b/config/routes.rb
index 902445a48..9798c4a0d 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -563,10 +563,13 @@
 
   # vignettes routes
   namespace :vignettes do
-    resources :questionnaires, only: [:index, :new, :create, :edit, :update] do
+    get "questionnaires/:id/take",
+        to: "questionnaires#take",
+        as: "take_questionnaire"
+
+    resources :questionnaires, only: [:index, :show, :new, :create, :edit, :update] do
       member do
         get :export_answers
-        get :take, to: "questionnaires#take", as: "take_questionnaire"
         post :submit_answer
       end
       resources :info_slides, only: [:new, :create, :edit, :update]
diff --git a/package.json b/package.json
index 063cc1af0..60f7c0edf 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,6 @@
   "name": "mampf",
   "private": true,
   "dependencies": {
-    "@hotwired/stimulus": "^3.2.2",
     "@rails/actiontext": "^8.0.0",
     "@rails/webpacker": "5.4.4",
     "@webpack-cli/serve": "^1.7.0",
diff --git a/spec/models/user_cleaner_spec.rb b/spec/models/user_cleaner_spec.rb
index 3b2b01178..eb00e07ad 100644
--- a/spec/models/user_cleaner_spec.rb
+++ b/spec/models/user_cleaner_spec.rb
@@ -4,18 +4,15 @@
   # Non-generic users are either admins, teachers or editors
   let(:user_admin) do
     return FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day, admin: true)
-    return FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day, admin: true)
   end
 
   let(:user_teacher) do
-    user_teacher = FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day)
     user_teacher = FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day)
     FactoryBot.create(:lecture, teacher: user_teacher)
     return user_teacher
   end
 
   let(:user_editor) do
-    user_editor = FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day)
     user_editor = FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day)
     FactoryBot.create(:lecture, editors: [user_editor])
     return user_editor
@@ -26,15 +23,6 @@
   end
 
   describe("#inactive_users") do
-    context "when user is confirmed" do
-      it "counts users without current_sign_in_at date as inactive" do
-        # but only if also the confirmation date is older than the threshold
-        FactoryBot.create(:confirmed_user, :with_confirmation_sent_date,
-                          confirmation_sent_date: 5.months.ago, current_sign_in_at: nil)
-        FactoryBot.create(:confirmed_user, :with_confirmation_sent_date,
-                          confirmation_sent_date: 7.months.ago, current_sign_in_at: nil)
-        expect(UserCleaner.new.inactive_users.count).to eq(1)
-      end
     context "when user is confirmed" do
       it "counts users without current_sign_in_at date as inactive" do
         # but only if also the confirmation date is older than the threshold
@@ -49,46 +37,7 @@
         FactoryBot.create(:confirmed_user, current_sign_in_at: 7.months.ago)
         expect(UserCleaner.new.inactive_users.count).to eq(1)
       end
-      it("counts users with current_sign_in_at date older than threshold as inactive") do
-        FactoryBot.create(:confirmed_user, current_sign_in_at: 7.months.ago)
-        expect(UserCleaner.new.inactive_users.count).to eq(1)
-      end
-
-      it "does not count users with current_sign_in_at date younger than threshold as inactive" do
-        FactoryBot.create(:confirmed_user, current_sign_in_at: 5.months.ago)
-        expect(UserCleaner.new.inactive_users.count).to eq(0)
-      end
-    end
-
-    context "when user is not confirmed yet" do
-      def test_non_confirmed_user(confirmation_sent_date, expected_inactive_users_count)
-        user = FactoryBot.create(:user, :with_confirmation_sent_date,
-                                 confirmation_sent_date: confirmation_sent_date,
-                                 current_sign_in_at: nil)
-        FactoryBot.create(:user, :with_confirmation_sent_date,
-                          confirmation_sent_date: confirmation_sent_date,
-                          current_sign_in_at: 5.months.ago)
-        FactoryBot.create(:user, :with_confirmation_sent_date,
-                          confirmation_sent_date: confirmation_sent_date,
-                          current_sign_in_at: 7.months.ago)
-
-        expect(user.confirmed_at).to be_nil
-        expect(user.confirmation_sent_at).to eq(confirmation_sent_date)
-
-        expect(UserCleaner.new.inactive_users.count).to eq(expected_inactive_users_count)
-      end
-
-      context "when registration was recently" do
-        it "does not count user as inactive regardless of value of last_sign_in_date" do
-          test_non_confirmed_user(5.days.ago, 0)
-        end
-      end
 
-      context "when registration was long ago" do
-        it "counts users as inactive regardless of value of last_sign_in_date" do
-          test_non_confirmed_user(7.months.ago, 3)
-        end
-      end
       it "does not count users with current_sign_in_at date younger than threshold as inactive" do
         FactoryBot.create(:confirmed_user, current_sign_in_at: 5.months.ago)
         expect(UserCleaner.new.inactive_users.count).to eq(0)
@@ -134,20 +83,14 @@ def test_non_confirmed_user(confirmation_sent_date, expected_inactive_users_coun
         inactive_user2 = FactoryBot.create(:user, :with_confirmation_sent_date,
                                            confirmation_sent_date: 7.months.ago)
         active_user = FactoryBot.create(:confirmed_user, current_sign_in_at: 5.months.ago)
-        inactive_user = FactoryBot.create(:confirmed_user, current_sign_in_at: 7.months.ago)
-        inactive_user2 = FactoryBot.create(:user, :with_confirmation_sent_date,
-                                           confirmation_sent_date: 7.months.ago)
-        active_user = FactoryBot.create(:confirmed_user, current_sign_in_at: 5.months.ago)
 
         UserCleaner.new.set_deletion_date_for_inactive_users
         inactive_user.reload
         inactive_user2.reload
-        inactive_user2.reload
         active_user.reload
 
         expect(inactive_user.deletion_date).to eq(Date.current + 40.days)
         expect(inactive_user2.deletion_date).to eq(Date.current + 40.days)
-        expect(inactive_user2.deletion_date).to eq(Date.current + 40.days)
         expect(active_user.deletion_date).to be_nil
       end
 
@@ -155,8 +98,6 @@ def test_non_confirmed_user(confirmation_sent_date, expected_inactive_users_coun
         max_deletions = 3
         UserCleaner::MAX_DELETIONS_PER_RUN = max_deletions
 
-        FactoryBot.create_list(:confirmed_user, max_deletions + 2,
-                               current_sign_in_at: 7.months.ago)
         FactoryBot.create_list(:confirmed_user, max_deletions + 2,
                                current_sign_in_at: 7.months.ago)
 
@@ -174,20 +115,13 @@ def test_non_confirmed_user(confirmation_sent_date, expected_inactive_users_coun
         user2 = FactoryBot.create(:user, :with_confirmation_sent_date,
                                   confirmation_sent_date: 7.months.ago,
                                   deletion_date: Date.current + 44.days)
-        user = FactoryBot.create(:confirmed_user, current_sign_in_at: 7.months.ago,
-                                                  deletion_date: Date.current + 42.days)
-        user2 = FactoryBot.create(:user, :with_confirmation_sent_date,
-                                  confirmation_sent_date: 7.months.ago,
-                                  deletion_date: Date.current + 44.days)
 
         UserCleaner.new.set_deletion_date_for_inactive_users
         user.reload
         user2.reload
-        user2.reload
 
         expect(user.deletion_date).to eq(Date.current + 42.days)
         expect(user2.deletion_date).to eq(Date.current + 44.days)
-        expect(user2.deletion_date).to eq(Date.current + 44.days)
       end
     end
 
@@ -199,12 +133,6 @@ def test_non_confirmed_user(confirmation_sent_date, expected_inactive_users_coun
                                                           current_sign_in_at: 6.months.ago - 1.day)
       user_active = FactoryBot.create(:confirmed_user, deletion_date: deletion_date,
                                                        current_sign_in_at: 2.days.ago)
-      user_inactive = FactoryBot.create(:confirmed_user, deletion_date: deletion_date,
-                                                         current_sign_in_at: 7.months.ago)
-      user_inactive2 = FactoryBot.create(:confirmed_user, deletion_date: deletion_date,
-                                                          current_sign_in_at: 6.months.ago - 1.day)
-      user_active = FactoryBot.create(:confirmed_user, deletion_date: deletion_date,
-                                                       current_sign_in_at: 2.days.ago)
 
       UserCleaner.new.unset_deletion_date_for_recently_active_users
       user_inactive.reload
@@ -222,9 +150,6 @@ def test_non_confirmed_user(confirmation_sent_date, expected_inactive_users_coun
       user_past1 = FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day)
       user_past2 = FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.year)
       user_present = FactoryBot.create(:confirmed_user, deletion_date: Date.current)
-      user_past1 = FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day)
-      user_past2 = FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.year)
-      user_present = FactoryBot.create(:confirmed_user, deletion_date: Date.current)
 
       UserCleaner.new.delete_users_according_to_deletion_date!
 
@@ -236,8 +161,6 @@ def test_non_confirmed_user(confirmation_sent_date, expected_inactive_users_coun
     it "does not delete users with a deletion date in the future" do
       user_future1 = FactoryBot.create(:confirmed_user, deletion_date: Date.current + 1.day)
       user_future2 = FactoryBot.create(:confirmed_user, deletion_date: Date.current + 1.year)
-      user_future1 = FactoryBot.create(:confirmed_user, deletion_date: Date.current + 1.day)
-      user_future2 = FactoryBot.create(:confirmed_user, deletion_date: Date.current + 1.year)
 
       UserCleaner.new.delete_users_according_to_deletion_date!
 
@@ -246,14 +169,12 @@ def test_non_confirmed_user(confirmation_sent_date, expected_inactive_users_coun
     end
 
     it "does not delete users without a deletion date" do
-      user = FactoryBot.create(:confirmed_user, deletion_date: nil)
       user = FactoryBot.create(:confirmed_user, deletion_date: nil)
       UserCleaner.new.delete_users_according_to_deletion_date!
       expect(User.where(id: user.id)).to exist
     end
 
     it "deletes only generic users" do
-      user_generic = FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day)
       user_generic = FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day)
       user_admin
       user_teacher
@@ -271,7 +192,7 @@ def test_non_confirmed_user(confirmation_sent_date, expected_inactive_users_coun
   describe("mails") do
     context "when setting a deletion date" do
       it "enqueues a deletion warning mail (40 days)" do
-        FactoryBot.create(:confirmed_user, current_sign_in_at: 7.months.ago)
+        user = FactoryBot.create(:confirmed_user, current_sign_in_at: 7.months.ago)
 
         expect do
           UserCleaner.new.set_deletion_date_for_inactive_users
@@ -292,7 +213,7 @@ def test_non_confirmed_user(confirmation_sent_date, expected_inactive_users_coun
 
     context "when a deletion date is assigned" do
       def test_enqueues_additional_deletion_warning_mails(num_days)
-        FactoryBot.create(:confirmed_user, deletion_date: Date.current + num_days.days)
+        user = FactoryBot.create(:confirmed_user, deletion_date: Date.current + num_days.days)
 
         expect do
           UserCleaner.new.send_additional_warning_mails
@@ -308,7 +229,6 @@ def test_enqueues_additional_deletion_warning_mails(num_days)
 
       it "does not enqueue an additional deletion warning mail for 40 days" do
         FactoryBot.create(:confirmed_user, deletion_date: Date.current + 40.days)
-        FactoryBot.create(:confirmed_user, deletion_date: Date.current + 40.days)
 
         expect do
           UserCleaner.new.send_additional_warning_mails
@@ -328,7 +248,7 @@ def test_enqueues_additional_deletion_warning_mails(num_days)
 
     context "when a user is finally deleted" do
       it "enqueues a deletion mail" do
-        FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day)
+        user = FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day)
 
         expect do
           UserCleaner.new.delete_users_according_to_deletion_date!
@@ -341,12 +261,11 @@ def test_enqueues_additional_deletion_warning_mails(num_days)
   describe("#pending_deletion_mail") do
     let(:user_de) { FactoryBot.create(:confirmed_user, locale: "de") }
     let(:user_en) { FactoryBot.create(:confirmed_user, locale: "en") }
-    let(:user_de) { FactoryBot.create(:confirmed_user, locale: "de") }
-    let(:user_en) { FactoryBot.create(:confirmed_user, locale: "en") }
 
     def test_subject_line(num_days)
       user = FactoryBot.create(:confirmed_user)
-      mailer = UserCleanerMailer.with(user: user).pending_deletion_email(num_days)
+      mailer = UserCleanerMailer
+               .pending_deletion_email(user.email, user.locale, num_days)
       expect(mailer.subject).to include(num_days.to_s)
     end
 
@@ -388,8 +307,6 @@ def test_subject_line(num_days)
   describe("#deletion_mail") do
     let(:user_de) { FactoryBot.create(:confirmed_user, locale: "de") }
     let(:user_en) { FactoryBot.create(:confirmed_user, locale: "en") }
-    let(:user_de) { FactoryBot.create(:confirmed_user, locale: "de") }
-    let(:user_en) { FactoryBot.create(:confirmed_user, locale: "en") }
 
     it "has mail subject localized to the user's locale" do
       mailer = UserCleanerMailer.deletion_email(user_de.email, user_de.locale)
diff --git a/spec/models/user_cleaner_spec_BACKUP_140121.rb b/spec/models/user_cleaner_spec_BACKUP_140121.rb
deleted file mode 100644
index d53b20697..000000000
--- a/spec/models/user_cleaner_spec_BACKUP_140121.rb
+++ /dev/null
@@ -1,352 +0,0 @@
-require "rails_helper"
-
-RSpec.describe(UserCleaner, type: :model) do
-  # Non-generic users are either admins, teachers or editors
-  let(:user_admin) do
-    return FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day, admin: true)
-  end
-
-  let(:user_teacher) do
-    user_teacher = FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day)
-    FactoryBot.create(:lecture, teacher: user_teacher)
-    return user_teacher
-  end
-
-  let(:user_editor) do
-    user_editor = FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day)
-    FactoryBot.create(:lecture, editors: [user_editor])
-    return user_editor
-  end
-
-  before(:each) do
-    UserCleaner::INACTIVE_USER_THRESHOLD = 6.months
-  end
-
-  describe("#inactive_users") do
-    context "when user is confirmed" do
-      it "counts users without current_sign_in_at date as inactive" do
-        # but only if also the confirmation date is older than the threshold
-        FactoryBot.create(:confirmed_user, :with_confirmation_sent_date,
-                          confirmation_sent_date: 5.months.ago, current_sign_in_at: nil)
-        FactoryBot.create(:confirmed_user, :with_confirmation_sent_date,
-                          confirmation_sent_date: 7.months.ago, current_sign_in_at: nil)
-        expect(UserCleaner.new.inactive_users.count).to eq(1)
-      end
-
-      it("counts users with current_sign_in_at date older than threshold as inactive") do
-        FactoryBot.create(:confirmed_user, current_sign_in_at: 7.months.ago)
-        expect(UserCleaner.new.inactive_users.count).to eq(1)
-      end
-
-      it "does not count users with current_sign_in_at date younger than threshold as inactive" do
-        FactoryBot.create(:confirmed_user, current_sign_in_at: 5.months.ago)
-        expect(UserCleaner.new.inactive_users.count).to eq(0)
-      end
-    end
-
-    context "when user is not confirmed yet" do
-      def test_non_confirmed_user(confirmation_sent_date, expected_inactive_users_count)
-        user = FactoryBot.create(:user, :with_confirmation_sent_date,
-                                 confirmation_sent_date: confirmation_sent_date,
-                                 current_sign_in_at: nil)
-        FactoryBot.create(:user, :with_confirmation_sent_date,
-                          confirmation_sent_date: confirmation_sent_date,
-                          current_sign_in_at: 5.months.ago)
-        FactoryBot.create(:user, :with_confirmation_sent_date,
-                          confirmation_sent_date: confirmation_sent_date,
-                          current_sign_in_at: 7.months.ago)
-
-        expect(user.confirmed_at).to be_nil
-        expect(user.confirmation_sent_at).to eq(confirmation_sent_date)
-
-        expect(UserCleaner.new.inactive_users.count).to eq(expected_inactive_users_count)
-      end
-
-      context "when registration was recently" do
-        it "does not count user as inactive regardless of value of last_sign_in_date" do
-          test_non_confirmed_user(5.days.ago, 0)
-        end
-      end
-
-      context "when registration was long ago" do
-        it "counts users as inactive regardless of value of last_sign_in_date" do
-          test_non_confirmed_user(7.months.ago, 3)
-        end
-      end
-    end
-  end
-
-  describe("#set/unset_deletion_date") do
-    context "when deletion date is nil" do
-      it "assigns a deletion date to inactive users" do
-        inactive_user = FactoryBot.create(:confirmed_user, current_sign_in_at: 7.months.ago)
-        inactive_user2 = FactoryBot.create(:user, :with_confirmation_sent_date,
-                                           confirmation_sent_date: 7.months.ago)
-        active_user = FactoryBot.create(:confirmed_user, current_sign_in_at: 5.months.ago)
-
-        UserCleaner.new.set_deletion_date_for_inactive_users
-        inactive_user.reload
-        inactive_user2.reload
-        active_user.reload
-
-        expect(inactive_user.deletion_date).to eq(Date.current + 40.days)
-        expect(inactive_user2.deletion_date).to eq(Date.current + 40.days)
-        expect(active_user.deletion_date).to be_nil
-      end
-
-      it "only assigns a deletion date to a limited number of users" do
-        max_deletions = 3
-        UserCleaner::MAX_DELETIONS_PER_RUN = max_deletions
-
-        FactoryBot.create_list(:confirmed_user, max_deletions + 2,
-                               current_sign_in_at: 7.months.ago)
-
-        UserCleaner.new.set_deletion_date_for_inactive_users
-
-        users_flagged = User.where(deletion_date: Date.current + 40.days)
-        expect(users_flagged.count).to eq(max_deletions)
-      end
-    end
-
-    context "when a deletion date is assigned" do
-      it "does not overwrite the deletion date" do
-        user = FactoryBot.create(:confirmed_user, current_sign_in_at: 7.months.ago,
-                                                  deletion_date: Date.current + 42.days)
-        user2 = FactoryBot.create(:user, :with_confirmation_sent_date,
-                                  confirmation_sent_date: 7.months.ago,
-                                  deletion_date: Date.current + 44.days)
-
-        UserCleaner.new.set_deletion_date_for_inactive_users
-        user.reload
-        user2.reload
-
-        expect(user.deletion_date).to eq(Date.current + 42.days)
-        expect(user2.deletion_date).to eq(Date.current + 44.days)
-      end
-    end
-
-    it "unassigns a deletion date from recently active users" do
-      deletion_date = Date.current + 5.days
-      user_inactive = FactoryBot.create(:confirmed_user, deletion_date: deletion_date,
-                                                         current_sign_in_at: 7.months.ago)
-      user_inactive2 = FactoryBot.create(:confirmed_user, deletion_date: deletion_date,
-                                                          current_sign_in_at: 6.months.ago - 1.day)
-      user_active = FactoryBot.create(:confirmed_user, deletion_date: deletion_date,
-                                                       current_sign_in_at: 2.days.ago)
-
-      UserCleaner.new.unset_deletion_date_for_recently_active_users
-      user_inactive.reload
-      user_inactive2.reload
-      user_active.reload
-
-      expect(user_inactive.deletion_date).to eq(deletion_date)
-      expect(user_inactive2.deletion_date).to eq(deletion_date)
-      expect(user_active.deletion_date).to be_nil
-    end
-  end
-
-  describe("#delete_users") do
-    it "deletes users with a deletion date in the past or present" do
-      user_past1 = FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day)
-      user_past2 = FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.year)
-      user_present = FactoryBot.create(:confirmed_user, deletion_date: Date.current)
-
-      UserCleaner.new.delete_users_according_to_deletion_date!
-
-      expect(User.where(id: user_past1.id)).not_to exist
-      expect(User.where(id: user_past2.id)).not_to exist
-      expect(User.where(id: user_present.id)).not_to exist
-    end
-
-    it "does not delete users with a deletion date in the future" do
-      user_future1 = FactoryBot.create(:confirmed_user, deletion_date: Date.current + 1.day)
-      user_future2 = FactoryBot.create(:confirmed_user, deletion_date: Date.current + 1.year)
-
-      UserCleaner.new.delete_users_according_to_deletion_date!
-
-      expect(User.where(id: user_future1.id)).to exist
-      expect(User.where(id: user_future2.id)).to exist
-    end
-
-    it "does not delete users without a deletion date" do
-      user = FactoryBot.create(:confirmed_user, deletion_date: nil)
-      UserCleaner.new.delete_users_according_to_deletion_date!
-      expect(User.where(id: user.id)).to exist
-    end
-
-    it "deletes only generic users" do
-      user_generic = FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day)
-      user_admin
-      user_teacher
-      user_editor
-
-      UserCleaner.new.delete_users_according_to_deletion_date!
-
-      expect(User.where(id: user_generic.id)).not_to exist
-      expect(User.where(id: user_admin.id)).to exist
-      expect(User.where(id: user_teacher.id)).to exist
-      expect(User.where(id: user_editor.id)).to exist
-    end
-  end
-
-  describe("mails") do
-    context "when setting a deletion date" do
-      it "enqueues a deletion warning mail (40 days)" do
-<<<<<<< HEAD
-        user = FactoryBot.create(:confirmed_user, current_sign_in_at: 7.months.ago)
-=======
-        FactoryBot.create(:confirmed_user, current_sign_in_at: 7.months.ago)
->>>>>>> 2dc4bd6b (Deal with registration edge cases in UserCleaner (#693) (#716))
-
-        expect do
-          UserCleaner.new.set_deletion_date_for_inactive_users
-        end.to(have_enqueued_mail(UserCleanerMailer, :pending_deletion_email)
-          .with(user.email, user.locale, 40))
-      end
-
-      it "does not enqueue a deletion warning mail (40 days) for non-generic users" do
-        user_admin
-        user_teacher
-        user_editor
-
-        expect do
-          UserCleaner.new.set_deletion_date_for_inactive_users
-        end.not_to have_enqueued_mail(UserCleanerMailer, :pending_deletion_email)
-      end
-    end
-
-    context "when a deletion date is assigned" do
-      def test_enqueues_additional_deletion_warning_mails(num_days)
-<<<<<<< HEAD
-        user = FactoryBot.create(:confirmed_user, deletion_date: Date.current + num_days.days)
-=======
-        FactoryBot.create(:confirmed_user, deletion_date: Date.current + num_days.days)
->>>>>>> 2dc4bd6b (Deal with registration edge cases in UserCleaner (#693) (#716))
-
-        expect do
-          UserCleaner.new.send_additional_warning_mails
-        end.to(have_enqueued_mail(UserCleanerMailer, :pending_deletion_email)
-        .with(user.email, user.locale, num_days))
-      end
-
-      it "enqueues additional deletion warning mails" do
-        test_enqueues_additional_deletion_warning_mails(14)
-        test_enqueues_additional_deletion_warning_mails(7)
-        test_enqueues_additional_deletion_warning_mails(2)
-      end
-
-      it "does not enqueue an additional deletion warning mail for 40 days" do
-        FactoryBot.create(:confirmed_user, deletion_date: Date.current + 40.days)
-
-        expect do
-          UserCleaner.new.send_additional_warning_mails
-        end.not_to have_enqueued_mail(UserCleanerMailer, :pending_deletion_email)
-      end
-
-      it "does not enqueue additional deletion warning mails for non-generic users" do
-        user_admin.update(deletion_date: Date.current + 14.days)
-        user_teacher.update(deletion_date: Date.current + 7.days)
-        user_editor.update(deletion_date: Date.current + 2.days)
-
-        expect do
-          UserCleaner.new.send_additional_warning_mails
-        end.not_to have_enqueued_mail(UserCleanerMailer, :pending_deletion_email)
-      end
-    end
-
-    context "when a user is finally deleted" do
-      it "enqueues a deletion mail" do
-<<<<<<< HEAD
-        user = FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day)
-=======
-        FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day)
->>>>>>> 2dc4bd6b (Deal with registration edge cases in UserCleaner (#693) (#716))
-
-        expect do
-          UserCleaner.new.delete_users_according_to_deletion_date!
-        end.to(have_enqueued_mail(UserCleanerMailer, :deletion_email)
-          .with(user.email, user.locale))
-      end
-    end
-  end
-
-  describe("#pending_deletion_mail") do
-    let(:user_de) { FactoryBot.create(:confirmed_user, locale: "de") }
-    let(:user_en) { FactoryBot.create(:confirmed_user, locale: "en") }
-
-    def test_subject_line(num_days)
-      user = FactoryBot.create(:confirmed_user)
-<<<<<<< HEAD
-      mailer = UserCleanerMailer
-               .pending_deletion_email(user.email, user.locale, num_days)
-=======
-      mailer = UserCleanerMailer.with(user: user).pending_deletion_email(num_days)
->>>>>>> 2dc4bd6b (Deal with registration edge cases in UserCleaner (#693) (#716))
-      expect(mailer.subject).to include(num_days.to_s)
-    end
-
-    it "has mail subject containing the number of days until deletion" do
-      test_subject_line(40)
-      test_subject_line(14)
-      test_subject_line(7)
-      test_subject_line(2)
-    end
-
-    it "has mail subject localized to the user's locale" do
-      mailer = UserCleanerMailer
-               .pending_deletion_email(user_de.email, user_de.locale, 40)
-      expect(mailer.subject).to include("Tage")
-      expect(mailer.subject).not_to include("days")
-
-      mailer = UserCleanerMailer
-               .pending_deletion_email(user_en.email, user_en.locale, 40)
-      expect(mailer.subject).to include("days")
-      expect(mailer.subject).not_to include("Tage")
-    end
-
-    it "has mail body localized to the user's locale" do
-      expected_de = "verloren"
-      expected_en = "lost"
-
-      mailer = UserCleanerMailer
-               .pending_deletion_email(user_de.email, user_de.locale, 40)
-      expect(mailer.html_part.body).to include(expected_de)
-      expect(mailer.html_part.body).not_to include(expected_en)
-
-      mailer = UserCleanerMailer
-               .pending_deletion_email(user_en.email, user_en.locale, 40)
-      expect(mailer.html_part.body).to include(expected_en)
-      expect(mailer.html_part.body).not_to include(expected_de)
-    end
-  end
-
-  describe("#deletion_mail") do
-    let(:user_de) { FactoryBot.create(:confirmed_user, locale: "de") }
-    let(:user_en) { FactoryBot.create(:confirmed_user, locale: "en") }
-
-    it "has mail subject localized to the user's locale" do
-      mailer = UserCleanerMailer.deletion_email(user_de.email, user_de.locale)
-      expect(mailer.subject).to include("gelöscht")
-      expect(mailer.subject).not_to include("deleted")
-
-      mailer = UserCleanerMailer.deletion_email(user_en.email, user_en.locale)
-      expect(mailer.subject).to include("deleted")
-      expect(mailer.subject).not_to include("gelöscht")
-    end
-
-    it "has mail body localized to the user's locale" do
-      expected_de = "vollständig gelöscht"
-      expected_en = "deleted entirely"
-
-      mailer = UserCleanerMailer.deletion_email(user_de.email, user_de.locale)
-
-      expect(mailer.html_part.body).to include(expected_de)
-      expect(mailer.html_part.body).not_to include(expected_en)
-
-      mailer = UserCleanerMailer.deletion_email(user_en.email, user_en.locale)
-
-      expect(mailer.html_part.body).to include(expected_en)
-      expect(mailer.html_part.body).not_to include(expected_de)
-    end
-  end
-end
diff --git a/spec/models/user_cleaner_spec_BASE_140121.rb b/spec/models/user_cleaner_spec_BASE_140121.rb
deleted file mode 100644
index 689962e3e..000000000
--- a/spec/models/user_cleaner_spec_BASE_140121.rb
+++ /dev/null
@@ -1,282 +0,0 @@
-require "rails_helper"
-
-RSpec.describe(UserCleaner, type: :model) do
-  # Non-generic users are either admins, teachers or editors
-  let(:user_admin) do
-    return FactoryBot.create(:user, deletion_date: Date.current - 1.day, admin: true)
-  end
-
-  let(:user_teacher) do
-    user_teacher = FactoryBot.create(:user, deletion_date: Date.current - 1.day)
-    FactoryBot.create(:lecture, teacher: user_teacher)
-    return user_teacher
-  end
-
-  let(:user_editor) do
-    user_editor = FactoryBot.create(:user, deletion_date: Date.current - 1.day)
-    FactoryBot.create(:lecture, editors: [user_editor])
-    return user_editor
-  end
-
-  before(:each) do
-    UserCleaner::INACTIVE_USER_THRESHOLD = 6.months
-  end
-
-  describe("#inactive_users") do
-    it "counts users without last_sign_in_at date as inactive" do
-      FactoryBot.create(:user, last_sign_in_at: nil)
-      expect(UserCleaner.new.inactive_users.count).to eq(1)
-    end
-
-    it("counts users with last_sign_in_at date older than threshold as inactive") do
-      FactoryBot.create(:user, last_sign_in_at: 7.months.ago)
-      expect(UserCleaner.new.inactive_users.count).to eq(1)
-    end
-
-    it "does not count users with last_sign_in_at date younger than threshold as inactive" do
-      FactoryBot.create(:user, last_sign_in_at: 5.months.ago)
-      expect(UserCleaner.new.inactive_users.count).to eq(0)
-    end
-  end
-
-  describe("#set/unset_deletion_date") do
-    context "when deletion date is nil" do
-      it "assigns a deletion date to inactive users" do
-        inactive_user = FactoryBot.create(:user, last_sign_in_at: 7.months.ago)
-        active_user = FactoryBot.create(:user, last_sign_in_at: 5.months.ago)
-
-        UserCleaner.new.set_deletion_date_for_inactive_users
-        inactive_user.reload
-        active_user.reload
-
-        expect(inactive_user.deletion_date).to eq(Date.current + 40.days)
-        expect(active_user.deletion_date).to be_nil
-      end
-
-      it "only assigns a deletion date to a limited number of users" do
-        max_deletions = 3
-        UserCleaner::MAX_DELETIONS_PER_RUN = max_deletions
-
-        FactoryBot.create_list(:user, max_deletions + 2, last_sign_in_at: 7.months.ago)
-
-        UserCleaner.new.set_deletion_date_for_inactive_users
-
-        users_flagged = User.where(deletion_date: Date.current + 40.days)
-        expect(users_flagged.count).to eq(max_deletions)
-      end
-    end
-
-    context "when a deletion date is assigned" do
-      it "does not overwrite the deletion date" do
-        user = FactoryBot.create(:user, last_sign_in_at: 7.months.ago,
-                                        deletion_date: Date.current + 42.days)
-
-        UserCleaner.new.set_deletion_date_for_inactive_users
-        user.reload
-
-        expect(user.deletion_date).to eq(Date.current + 42.days)
-      end
-    end
-
-    it "unassigns a deletion date from recently active users" do
-      deletion_date = Date.current + 5.days
-      user_inactive = FactoryBot.create(:user, deletion_date: deletion_date,
-                                               last_sign_in_at: 7.months.ago)
-      user_inactive2 = FactoryBot.create(:user, deletion_date: deletion_date,
-                                                last_sign_in_at: 6.months.ago - 1.day)
-      user_active = FactoryBot.create(:user, deletion_date: deletion_date,
-                                             last_sign_in_at: 2.days.ago)
-
-      UserCleaner.new.unset_deletion_date_for_recently_active_users
-      user_inactive.reload
-      user_inactive2.reload
-      user_active.reload
-
-      expect(user_inactive.deletion_date).to eq(deletion_date)
-      expect(user_inactive2.deletion_date).to eq(deletion_date)
-      expect(user_active.deletion_date).to be_nil
-    end
-  end
-
-  describe("#delete_users") do
-    it "deletes users with a deletion date in the past or present" do
-      user_past1 = FactoryBot.create(:user, deletion_date: Date.current - 1.day)
-      user_past2 = FactoryBot.create(:user, deletion_date: Date.current - 1.year)
-      user_present = FactoryBot.create(:user, deletion_date: Date.current)
-
-      UserCleaner.new.delete_users_according_to_deletion_date!
-
-      expect(User.where(id: user_past1.id)).not_to exist
-      expect(User.where(id: user_past2.id)).not_to exist
-      expect(User.where(id: user_present.id)).not_to exist
-    end
-
-    it "does not delete users with a deletion date in the future" do
-      user_future1 = FactoryBot.create(:user, deletion_date: Date.current + 1.day)
-      user_future2 = FactoryBot.create(:user, deletion_date: Date.current + 1.year)
-
-      UserCleaner.new.delete_users_according_to_deletion_date!
-
-      expect(User.where(id: user_future1.id)).to exist
-      expect(User.where(id: user_future2.id)).to exist
-    end
-
-    it "does not delete users without a deletion date" do
-      user = FactoryBot.create(:user, deletion_date: nil)
-      UserCleaner.new.delete_users_according_to_deletion_date!
-      expect(User.where(id: user.id)).to exist
-    end
-
-    it "deletes only generic users" do
-      user_generic = FactoryBot.create(:user, deletion_date: Date.current - 1.day)
-      user_admin
-      user_teacher
-      user_editor
-
-      UserCleaner.new.delete_users_according_to_deletion_date!
-
-      expect(User.where(id: user_generic.id)).not_to exist
-      expect(User.where(id: user_admin.id)).to exist
-      expect(User.where(id: user_teacher.id)).to exist
-      expect(User.where(id: user_editor.id)).to exist
-    end
-  end
-
-  describe("mails") do
-    context "when setting a deletion date" do
-      it "enqueues a deletion warning mail (40 days)" do
-        FactoryBot.create(:user, last_sign_in_at: 7.months.ago)
-
-        expect do
-          UserCleaner.new.set_deletion_date_for_inactive_users
-        end.to have_enqueued_mail(UserCleanerMailer, :pending_deletion_email)
-          .with(a_hash_including(args: [40]))
-      end
-
-      it "does not enqueue a deletion warning mail (40 days) for non-generic users" do
-        user_admin
-        user_teacher
-        user_editor
-
-        expect do
-          UserCleaner.new.set_deletion_date_for_inactive_users
-        end.not_to have_enqueued_mail(UserCleanerMailer, :pending_deletion_email)
-      end
-    end
-
-    context "when a deletion date is assigned" do
-      def test_enqueues_additional_deletion_warning_mails(num_days)
-        FactoryBot.create(:user, deletion_date: Date.current + num_days.days)
-
-        expect do
-          UserCleaner.new.send_additional_warning_mails
-        end.to have_enqueued_mail(UserCleanerMailer, :pending_deletion_email)
-          .with(a_hash_including(args: [num_days]))
-      end
-
-      it "enqueues additional deletion warning mails" do
-        test_enqueues_additional_deletion_warning_mails(14)
-        test_enqueues_additional_deletion_warning_mails(7)
-        test_enqueues_additional_deletion_warning_mails(2)
-      end
-
-      it "does not enqueue an additional deletion warning mail for 40 days" do
-        FactoryBot.create(:user, deletion_date: Date.current + 40.days)
-
-        expect do
-          UserCleaner.new.send_additional_warning_mails
-        end.not_to have_enqueued_mail(UserCleanerMailer, :pending_deletion_email)
-      end
-
-      it "does not enqueue additional deletion warning mails for non-generic users" do
-        user_admin.update(deletion_date: Date.current + 14.days)
-        user_teacher.update(deletion_date: Date.current + 7.days)
-        user_editor.update(deletion_date: Date.current + 2.days)
-
-        expect do
-          UserCleaner.new.send_additional_warning_mails
-        end.not_to have_enqueued_mail(UserCleanerMailer, :pending_deletion_email)
-      end
-    end
-
-    context "when a user is finally deleted" do
-      it "enqueues a deletion mail" do
-        FactoryBot.create(:user, deletion_date: Date.current - 1.day)
-
-        expect do
-          UserCleaner.new.delete_users_according_to_deletion_date!
-        end.to have_enqueued_mail(UserCleanerMailer, :deletion_email)
-      end
-    end
-  end
-
-  describe("#pending_deletion_mail") do
-    let(:user_de) { FactoryBot.create(:user, locale: "de") }
-    let(:user_en) { FactoryBot.create(:user, locale: "en") }
-
-    def test_subject_line(num_days)
-      user = FactoryBot.create(:user)
-      mailer = UserCleanerMailer.with(user: user).pending_deletion_email(num_days)
-      expect(mailer.subject).to include(num_days.to_s)
-    end
-
-    it "has mail subject containing the number of days until deletion" do
-      test_subject_line(40)
-      test_subject_line(14)
-      test_subject_line(7)
-      test_subject_line(2)
-    end
-
-    it "has mail subject localized to the user's locale" do
-      mailer = UserCleanerMailer.with(user: user_de).pending_deletion_email(40)
-      expect(mailer.subject).to include("Tage")
-      expect(mailer.subject).not_to include("days")
-
-      mailer = UserCleanerMailer.with(user: user_en).pending_deletion_email(40)
-      expect(mailer.subject).to include("days")
-      expect(mailer.subject).not_to include("Tage")
-    end
-
-    it "has mail body localized to the user's locale" do
-      expected_de = "verloren"
-      expected_en = "lost"
-
-      mailer = UserCleanerMailer.with(user: user_de).pending_deletion_email(40)
-      expect(mailer.html_part.body).to include(expected_de)
-      expect(mailer.html_part.body).not_to include(expected_en)
-
-      mailer = UserCleanerMailer.with(user: user_en).pending_deletion_email(40)
-      expect(mailer.html_part.body).to include(expected_en)
-      expect(mailer.html_part.body).not_to include(expected_de)
-    end
-  end
-
-  describe("#deletion_mail") do
-    let(:user_de) { FactoryBot.create(:user, locale: "de") }
-    let(:user_en) { FactoryBot.create(:user, locale: "en") }
-
-    it "has mail subject localized to the user's locale" do
-      mailer = UserCleanerMailer.with(user: user_de).deletion_email
-      expect(mailer.subject).to include("gelöscht")
-      expect(mailer.subject).not_to include("deleted")
-
-      mailer = UserCleanerMailer.with(user: user_en).deletion_email
-      expect(mailer.subject).to include("deleted")
-      expect(mailer.subject).not_to include("gelöscht")
-    end
-
-    it "has mail body localized to the user's locale" do
-      expected_de = "vollständig gelöscht"
-      expected_en = "deleted entirely"
-
-      mailer = UserCleanerMailer.with(user: user_de).deletion_email
-
-      expect(mailer.html_part.body).to include(expected_de)
-      expect(mailer.html_part.body).not_to include(expected_en)
-
-      mailer = UserCleanerMailer.with(user: user_en).deletion_email
-      expect(mailer.html_part.body).to include(expected_en)
-      expect(mailer.html_part.body).not_to include(expected_de)
-    end
-  end
-end
diff --git a/spec/models/user_cleaner_spec_LOCAL_140121.rb b/spec/models/user_cleaner_spec_LOCAL_140121.rb
deleted file mode 100644
index eb00e07ad..000000000
--- a/spec/models/user_cleaner_spec_LOCAL_140121.rb
+++ /dev/null
@@ -1,336 +0,0 @@
-require "rails_helper"
-
-RSpec.describe(UserCleaner, type: :model) do
-  # Non-generic users are either admins, teachers or editors
-  let(:user_admin) do
-    return FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day, admin: true)
-  end
-
-  let(:user_teacher) do
-    user_teacher = FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day)
-    FactoryBot.create(:lecture, teacher: user_teacher)
-    return user_teacher
-  end
-
-  let(:user_editor) do
-    user_editor = FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day)
-    FactoryBot.create(:lecture, editors: [user_editor])
-    return user_editor
-  end
-
-  before(:each) do
-    UserCleaner::INACTIVE_USER_THRESHOLD = 6.months
-  end
-
-  describe("#inactive_users") do
-    context "when user is confirmed" do
-      it "counts users without current_sign_in_at date as inactive" do
-        # but only if also the confirmation date is older than the threshold
-        FactoryBot.create(:confirmed_user, :with_confirmation_sent_date,
-                          confirmation_sent_date: 5.months.ago, current_sign_in_at: nil)
-        FactoryBot.create(:confirmed_user, :with_confirmation_sent_date,
-                          confirmation_sent_date: 7.months.ago, current_sign_in_at: nil)
-        expect(UserCleaner.new.inactive_users.count).to eq(1)
-      end
-
-      it("counts users with current_sign_in_at date older than threshold as inactive") do
-        FactoryBot.create(:confirmed_user, current_sign_in_at: 7.months.ago)
-        expect(UserCleaner.new.inactive_users.count).to eq(1)
-      end
-
-      it "does not count users with current_sign_in_at date younger than threshold as inactive" do
-        FactoryBot.create(:confirmed_user, current_sign_in_at: 5.months.ago)
-        expect(UserCleaner.new.inactive_users.count).to eq(0)
-      end
-    end
-
-    context "when user is not confirmed yet" do
-      def test_non_confirmed_user(confirmation_sent_date, expected_inactive_users_count)
-        user = FactoryBot.create(:user, :with_confirmation_sent_date,
-                                 confirmation_sent_date: confirmation_sent_date,
-                                 current_sign_in_at: nil)
-        FactoryBot.create(:user, :with_confirmation_sent_date,
-                          confirmation_sent_date: confirmation_sent_date,
-                          current_sign_in_at: 5.months.ago)
-        FactoryBot.create(:user, :with_confirmation_sent_date,
-                          confirmation_sent_date: confirmation_sent_date,
-                          current_sign_in_at: 7.months.ago)
-
-        expect(user.confirmed_at).to be_nil
-        expect(user.confirmation_sent_at).to eq(confirmation_sent_date)
-
-        expect(UserCleaner.new.inactive_users.count).to eq(expected_inactive_users_count)
-      end
-
-      context "when registration was recently" do
-        it "does not count user as inactive regardless of value of last_sign_in_date" do
-          test_non_confirmed_user(5.days.ago, 0)
-        end
-      end
-
-      context "when registration was long ago" do
-        it "counts users as inactive regardless of value of last_sign_in_date" do
-          test_non_confirmed_user(7.months.ago, 3)
-        end
-      end
-    end
-  end
-
-  describe("#set/unset_deletion_date") do
-    context "when deletion date is nil" do
-      it "assigns a deletion date to inactive users" do
-        inactive_user = FactoryBot.create(:confirmed_user, current_sign_in_at: 7.months.ago)
-        inactive_user2 = FactoryBot.create(:user, :with_confirmation_sent_date,
-                                           confirmation_sent_date: 7.months.ago)
-        active_user = FactoryBot.create(:confirmed_user, current_sign_in_at: 5.months.ago)
-
-        UserCleaner.new.set_deletion_date_for_inactive_users
-        inactive_user.reload
-        inactive_user2.reload
-        active_user.reload
-
-        expect(inactive_user.deletion_date).to eq(Date.current + 40.days)
-        expect(inactive_user2.deletion_date).to eq(Date.current + 40.days)
-        expect(active_user.deletion_date).to be_nil
-      end
-
-      it "only assigns a deletion date to a limited number of users" do
-        max_deletions = 3
-        UserCleaner::MAX_DELETIONS_PER_RUN = max_deletions
-
-        FactoryBot.create_list(:confirmed_user, max_deletions + 2,
-                               current_sign_in_at: 7.months.ago)
-
-        UserCleaner.new.set_deletion_date_for_inactive_users
-
-        users_flagged = User.where(deletion_date: Date.current + 40.days)
-        expect(users_flagged.count).to eq(max_deletions)
-      end
-    end
-
-    context "when a deletion date is assigned" do
-      it "does not overwrite the deletion date" do
-        user = FactoryBot.create(:confirmed_user, current_sign_in_at: 7.months.ago,
-                                                  deletion_date: Date.current + 42.days)
-        user2 = FactoryBot.create(:user, :with_confirmation_sent_date,
-                                  confirmation_sent_date: 7.months.ago,
-                                  deletion_date: Date.current + 44.days)
-
-        UserCleaner.new.set_deletion_date_for_inactive_users
-        user.reload
-        user2.reload
-
-        expect(user.deletion_date).to eq(Date.current + 42.days)
-        expect(user2.deletion_date).to eq(Date.current + 44.days)
-      end
-    end
-
-    it "unassigns a deletion date from recently active users" do
-      deletion_date = Date.current + 5.days
-      user_inactive = FactoryBot.create(:confirmed_user, deletion_date: deletion_date,
-                                                         current_sign_in_at: 7.months.ago)
-      user_inactive2 = FactoryBot.create(:confirmed_user, deletion_date: deletion_date,
-                                                          current_sign_in_at: 6.months.ago - 1.day)
-      user_active = FactoryBot.create(:confirmed_user, deletion_date: deletion_date,
-                                                       current_sign_in_at: 2.days.ago)
-
-      UserCleaner.new.unset_deletion_date_for_recently_active_users
-      user_inactive.reload
-      user_inactive2.reload
-      user_active.reload
-
-      expect(user_inactive.deletion_date).to eq(deletion_date)
-      expect(user_inactive2.deletion_date).to eq(deletion_date)
-      expect(user_active.deletion_date).to be_nil
-    end
-  end
-
-  describe("#delete_users") do
-    it "deletes users with a deletion date in the past or present" do
-      user_past1 = FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day)
-      user_past2 = FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.year)
-      user_present = FactoryBot.create(:confirmed_user, deletion_date: Date.current)
-
-      UserCleaner.new.delete_users_according_to_deletion_date!
-
-      expect(User.where(id: user_past1.id)).not_to exist
-      expect(User.where(id: user_past2.id)).not_to exist
-      expect(User.where(id: user_present.id)).not_to exist
-    end
-
-    it "does not delete users with a deletion date in the future" do
-      user_future1 = FactoryBot.create(:confirmed_user, deletion_date: Date.current + 1.day)
-      user_future2 = FactoryBot.create(:confirmed_user, deletion_date: Date.current + 1.year)
-
-      UserCleaner.new.delete_users_according_to_deletion_date!
-
-      expect(User.where(id: user_future1.id)).to exist
-      expect(User.where(id: user_future2.id)).to exist
-    end
-
-    it "does not delete users without a deletion date" do
-      user = FactoryBot.create(:confirmed_user, deletion_date: nil)
-      UserCleaner.new.delete_users_according_to_deletion_date!
-      expect(User.where(id: user.id)).to exist
-    end
-
-    it "deletes only generic users" do
-      user_generic = FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day)
-      user_admin
-      user_teacher
-      user_editor
-
-      UserCleaner.new.delete_users_according_to_deletion_date!
-
-      expect(User.where(id: user_generic.id)).not_to exist
-      expect(User.where(id: user_admin.id)).to exist
-      expect(User.where(id: user_teacher.id)).to exist
-      expect(User.where(id: user_editor.id)).to exist
-    end
-  end
-
-  describe("mails") do
-    context "when setting a deletion date" do
-      it "enqueues a deletion warning mail (40 days)" do
-        user = FactoryBot.create(:confirmed_user, current_sign_in_at: 7.months.ago)
-
-        expect do
-          UserCleaner.new.set_deletion_date_for_inactive_users
-        end.to(have_enqueued_mail(UserCleanerMailer, :pending_deletion_email)
-          .with(user.email, user.locale, 40))
-      end
-
-      it "does not enqueue a deletion warning mail (40 days) for non-generic users" do
-        user_admin
-        user_teacher
-        user_editor
-
-        expect do
-          UserCleaner.new.set_deletion_date_for_inactive_users
-        end.not_to have_enqueued_mail(UserCleanerMailer, :pending_deletion_email)
-      end
-    end
-
-    context "when a deletion date is assigned" do
-      def test_enqueues_additional_deletion_warning_mails(num_days)
-        user = FactoryBot.create(:confirmed_user, deletion_date: Date.current + num_days.days)
-
-        expect do
-          UserCleaner.new.send_additional_warning_mails
-        end.to(have_enqueued_mail(UserCleanerMailer, :pending_deletion_email)
-        .with(user.email, user.locale, num_days))
-      end
-
-      it "enqueues additional deletion warning mails" do
-        test_enqueues_additional_deletion_warning_mails(14)
-        test_enqueues_additional_deletion_warning_mails(7)
-        test_enqueues_additional_deletion_warning_mails(2)
-      end
-
-      it "does not enqueue an additional deletion warning mail for 40 days" do
-        FactoryBot.create(:confirmed_user, deletion_date: Date.current + 40.days)
-
-        expect do
-          UserCleaner.new.send_additional_warning_mails
-        end.not_to have_enqueued_mail(UserCleanerMailer, :pending_deletion_email)
-      end
-
-      it "does not enqueue additional deletion warning mails for non-generic users" do
-        user_admin.update(deletion_date: Date.current + 14.days)
-        user_teacher.update(deletion_date: Date.current + 7.days)
-        user_editor.update(deletion_date: Date.current + 2.days)
-
-        expect do
-          UserCleaner.new.send_additional_warning_mails
-        end.not_to have_enqueued_mail(UserCleanerMailer, :pending_deletion_email)
-      end
-    end
-
-    context "when a user is finally deleted" do
-      it "enqueues a deletion mail" do
-        user = FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day)
-
-        expect do
-          UserCleaner.new.delete_users_according_to_deletion_date!
-        end.to(have_enqueued_mail(UserCleanerMailer, :deletion_email)
-          .with(user.email, user.locale))
-      end
-    end
-  end
-
-  describe("#pending_deletion_mail") do
-    let(:user_de) { FactoryBot.create(:confirmed_user, locale: "de") }
-    let(:user_en) { FactoryBot.create(:confirmed_user, locale: "en") }
-
-    def test_subject_line(num_days)
-      user = FactoryBot.create(:confirmed_user)
-      mailer = UserCleanerMailer
-               .pending_deletion_email(user.email, user.locale, num_days)
-      expect(mailer.subject).to include(num_days.to_s)
-    end
-
-    it "has mail subject containing the number of days until deletion" do
-      test_subject_line(40)
-      test_subject_line(14)
-      test_subject_line(7)
-      test_subject_line(2)
-    end
-
-    it "has mail subject localized to the user's locale" do
-      mailer = UserCleanerMailer
-               .pending_deletion_email(user_de.email, user_de.locale, 40)
-      expect(mailer.subject).to include("Tage")
-      expect(mailer.subject).not_to include("days")
-
-      mailer = UserCleanerMailer
-               .pending_deletion_email(user_en.email, user_en.locale, 40)
-      expect(mailer.subject).to include("days")
-      expect(mailer.subject).not_to include("Tage")
-    end
-
-    it "has mail body localized to the user's locale" do
-      expected_de = "verloren"
-      expected_en = "lost"
-
-      mailer = UserCleanerMailer
-               .pending_deletion_email(user_de.email, user_de.locale, 40)
-      expect(mailer.html_part.body).to include(expected_de)
-      expect(mailer.html_part.body).not_to include(expected_en)
-
-      mailer = UserCleanerMailer
-               .pending_deletion_email(user_en.email, user_en.locale, 40)
-      expect(mailer.html_part.body).to include(expected_en)
-      expect(mailer.html_part.body).not_to include(expected_de)
-    end
-  end
-
-  describe("#deletion_mail") do
-    let(:user_de) { FactoryBot.create(:confirmed_user, locale: "de") }
-    let(:user_en) { FactoryBot.create(:confirmed_user, locale: "en") }
-
-    it "has mail subject localized to the user's locale" do
-      mailer = UserCleanerMailer.deletion_email(user_de.email, user_de.locale)
-      expect(mailer.subject).to include("gelöscht")
-      expect(mailer.subject).not_to include("deleted")
-
-      mailer = UserCleanerMailer.deletion_email(user_en.email, user_en.locale)
-      expect(mailer.subject).to include("deleted")
-      expect(mailer.subject).not_to include("gelöscht")
-    end
-
-    it "has mail body localized to the user's locale" do
-      expected_de = "vollständig gelöscht"
-      expected_en = "deleted entirely"
-
-      mailer = UserCleanerMailer.deletion_email(user_de.email, user_de.locale)
-
-      expect(mailer.html_part.body).to include(expected_de)
-      expect(mailer.html_part.body).not_to include(expected_en)
-
-      mailer = UserCleanerMailer.deletion_email(user_en.email, user_en.locale)
-
-      expect(mailer.html_part.body).to include(expected_en)
-      expect(mailer.html_part.body).not_to include(expected_de)
-    end
-  end
-end
diff --git a/spec/models/user_cleaner_spec_REMOTE_140121.rb b/spec/models/user_cleaner_spec_REMOTE_140121.rb
deleted file mode 100644
index 1223a9048..000000000
--- a/spec/models/user_cleaner_spec_REMOTE_140121.rb
+++ /dev/null
@@ -1,329 +0,0 @@
-require "rails_helper"
-
-RSpec.describe(UserCleaner, type: :model) do
-  # Non-generic users are either admins, teachers or editors
-  let(:user_admin) do
-    return FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day, admin: true)
-  end
-
-  let(:user_teacher) do
-    user_teacher = FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day)
-    FactoryBot.create(:lecture, teacher: user_teacher)
-    return user_teacher
-  end
-
-  let(:user_editor) do
-    user_editor = FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day)
-    FactoryBot.create(:lecture, editors: [user_editor])
-    return user_editor
-  end
-
-  before(:each) do
-    UserCleaner::INACTIVE_USER_THRESHOLD = 6.months
-  end
-
-  describe("#inactive_users") do
-    context "when user is confirmed" do
-      it "counts users without current_sign_in_at date as inactive" do
-        # but only if also the confirmation date is older than the threshold
-        FactoryBot.create(:confirmed_user, :with_confirmation_sent_date,
-                          confirmation_sent_date: 5.months.ago, current_sign_in_at: nil)
-        FactoryBot.create(:confirmed_user, :with_confirmation_sent_date,
-                          confirmation_sent_date: 7.months.ago, current_sign_in_at: nil)
-        expect(UserCleaner.new.inactive_users.count).to eq(1)
-      end
-
-      it("counts users with current_sign_in_at date older than threshold as inactive") do
-        FactoryBot.create(:confirmed_user, current_sign_in_at: 7.months.ago)
-        expect(UserCleaner.new.inactive_users.count).to eq(1)
-      end
-
-      it "does not count users with current_sign_in_at date younger than threshold as inactive" do
-        FactoryBot.create(:confirmed_user, current_sign_in_at: 5.months.ago)
-        expect(UserCleaner.new.inactive_users.count).to eq(0)
-      end
-    end
-
-    context "when user is not confirmed yet" do
-      def test_non_confirmed_user(confirmation_sent_date, expected_inactive_users_count)
-        user = FactoryBot.create(:user, :with_confirmation_sent_date,
-                                 confirmation_sent_date: confirmation_sent_date,
-                                 current_sign_in_at: nil)
-        FactoryBot.create(:user, :with_confirmation_sent_date,
-                          confirmation_sent_date: confirmation_sent_date,
-                          current_sign_in_at: 5.months.ago)
-        FactoryBot.create(:user, :with_confirmation_sent_date,
-                          confirmation_sent_date: confirmation_sent_date,
-                          current_sign_in_at: 7.months.ago)
-
-        expect(user.confirmed_at).to be_nil
-        expect(user.confirmation_sent_at).to eq(confirmation_sent_date)
-
-        expect(UserCleaner.new.inactive_users.count).to eq(expected_inactive_users_count)
-      end
-
-      context "when registration was recently" do
-        it "does not count user as inactive regardless of value of last_sign_in_date" do
-          test_non_confirmed_user(5.days.ago, 0)
-        end
-      end
-
-      context "when registration was long ago" do
-        it "counts users as inactive regardless of value of last_sign_in_date" do
-          test_non_confirmed_user(7.months.ago, 3)
-        end
-      end
-    end
-  end
-
-  describe("#set/unset_deletion_date") do
-    context "when deletion date is nil" do
-      it "assigns a deletion date to inactive users" do
-        inactive_user = FactoryBot.create(:confirmed_user, current_sign_in_at: 7.months.ago)
-        inactive_user2 = FactoryBot.create(:user, :with_confirmation_sent_date,
-                                           confirmation_sent_date: 7.months.ago)
-        active_user = FactoryBot.create(:confirmed_user, current_sign_in_at: 5.months.ago)
-
-        UserCleaner.new.set_deletion_date_for_inactive_users
-        inactive_user.reload
-        inactive_user2.reload
-        active_user.reload
-
-        expect(inactive_user.deletion_date).to eq(Date.current + 40.days)
-        expect(inactive_user2.deletion_date).to eq(Date.current + 40.days)
-        expect(active_user.deletion_date).to be_nil
-      end
-
-      it "only assigns a deletion date to a limited number of users" do
-        max_deletions = 3
-        UserCleaner::MAX_DELETIONS_PER_RUN = max_deletions
-
-        FactoryBot.create_list(:confirmed_user, max_deletions + 2,
-                               current_sign_in_at: 7.months.ago)
-
-        UserCleaner.new.set_deletion_date_for_inactive_users
-
-        users_flagged = User.where(deletion_date: Date.current + 40.days)
-        expect(users_flagged.count).to eq(max_deletions)
-      end
-    end
-
-    context "when a deletion date is assigned" do
-      it "does not overwrite the deletion date" do
-        user = FactoryBot.create(:confirmed_user, current_sign_in_at: 7.months.ago,
-                                                  deletion_date: Date.current + 42.days)
-        user2 = FactoryBot.create(:user, :with_confirmation_sent_date,
-                                  confirmation_sent_date: 7.months.ago,
-                                  deletion_date: Date.current + 44.days)
-
-        UserCleaner.new.set_deletion_date_for_inactive_users
-        user.reload
-        user2.reload
-
-        expect(user.deletion_date).to eq(Date.current + 42.days)
-        expect(user2.deletion_date).to eq(Date.current + 44.days)
-      end
-    end
-
-    it "unassigns a deletion date from recently active users" do
-      deletion_date = Date.current + 5.days
-      user_inactive = FactoryBot.create(:confirmed_user, deletion_date: deletion_date,
-                                                         current_sign_in_at: 7.months.ago)
-      user_inactive2 = FactoryBot.create(:confirmed_user, deletion_date: deletion_date,
-                                                          current_sign_in_at: 6.months.ago - 1.day)
-      user_active = FactoryBot.create(:confirmed_user, deletion_date: deletion_date,
-                                                       current_sign_in_at: 2.days.ago)
-
-      UserCleaner.new.unset_deletion_date_for_recently_active_users
-      user_inactive.reload
-      user_inactive2.reload
-      user_active.reload
-
-      expect(user_inactive.deletion_date).to eq(deletion_date)
-      expect(user_inactive2.deletion_date).to eq(deletion_date)
-      expect(user_active.deletion_date).to be_nil
-    end
-  end
-
-  describe("#delete_users") do
-    it "deletes users with a deletion date in the past or present" do
-      user_past1 = FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day)
-      user_past2 = FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.year)
-      user_present = FactoryBot.create(:confirmed_user, deletion_date: Date.current)
-
-      UserCleaner.new.delete_users_according_to_deletion_date!
-
-      expect(User.where(id: user_past1.id)).not_to exist
-      expect(User.where(id: user_past2.id)).not_to exist
-      expect(User.where(id: user_present.id)).not_to exist
-    end
-
-    it "does not delete users with a deletion date in the future" do
-      user_future1 = FactoryBot.create(:confirmed_user, deletion_date: Date.current + 1.day)
-      user_future2 = FactoryBot.create(:confirmed_user, deletion_date: Date.current + 1.year)
-
-      UserCleaner.new.delete_users_according_to_deletion_date!
-
-      expect(User.where(id: user_future1.id)).to exist
-      expect(User.where(id: user_future2.id)).to exist
-    end
-
-    it "does not delete users without a deletion date" do
-      user = FactoryBot.create(:confirmed_user, deletion_date: nil)
-      UserCleaner.new.delete_users_according_to_deletion_date!
-      expect(User.where(id: user.id)).to exist
-    end
-
-    it "deletes only generic users" do
-      user_generic = FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day)
-      user_admin
-      user_teacher
-      user_editor
-
-      UserCleaner.new.delete_users_according_to_deletion_date!
-
-      expect(User.where(id: user_generic.id)).not_to exist
-      expect(User.where(id: user_admin.id)).to exist
-      expect(User.where(id: user_teacher.id)).to exist
-      expect(User.where(id: user_editor.id)).to exist
-    end
-  end
-
-  describe("mails") do
-    context "when setting a deletion date" do
-      it "enqueues a deletion warning mail (40 days)" do
-        FactoryBot.create(:confirmed_user, current_sign_in_at: 7.months.ago)
-
-        expect do
-          UserCleaner.new.set_deletion_date_for_inactive_users
-        end.to have_enqueued_mail(UserCleanerMailer, :pending_deletion_email)
-          .with(a_hash_including(args: [40]))
-      end
-
-      it "does not enqueue a deletion warning mail (40 days) for non-generic users" do
-        user_admin
-        user_teacher
-        user_editor
-
-        expect do
-          UserCleaner.new.set_deletion_date_for_inactive_users
-        end.not_to have_enqueued_mail(UserCleanerMailer, :pending_deletion_email)
-      end
-    end
-
-    context "when a deletion date is assigned" do
-      def test_enqueues_additional_deletion_warning_mails(num_days)
-        FactoryBot.create(:confirmed_user, deletion_date: Date.current + num_days.days)
-
-        expect do
-          UserCleaner.new.send_additional_warning_mails
-        end.to have_enqueued_mail(UserCleanerMailer, :pending_deletion_email)
-          .with(a_hash_including(args: [num_days]))
-      end
-
-      it "enqueues additional deletion warning mails" do
-        test_enqueues_additional_deletion_warning_mails(14)
-        test_enqueues_additional_deletion_warning_mails(7)
-        test_enqueues_additional_deletion_warning_mails(2)
-      end
-
-      it "does not enqueue an additional deletion warning mail for 40 days" do
-        FactoryBot.create(:confirmed_user, deletion_date: Date.current + 40.days)
-
-        expect do
-          UserCleaner.new.send_additional_warning_mails
-        end.not_to have_enqueued_mail(UserCleanerMailer, :pending_deletion_email)
-      end
-
-      it "does not enqueue additional deletion warning mails for non-generic users" do
-        user_admin.update(deletion_date: Date.current + 14.days)
-        user_teacher.update(deletion_date: Date.current + 7.days)
-        user_editor.update(deletion_date: Date.current + 2.days)
-
-        expect do
-          UserCleaner.new.send_additional_warning_mails
-        end.not_to have_enqueued_mail(UserCleanerMailer, :pending_deletion_email)
-      end
-    end
-
-    context "when a user is finally deleted" do
-      it "enqueues a deletion mail" do
-        FactoryBot.create(:confirmed_user, deletion_date: Date.current - 1.day)
-
-        expect do
-          UserCleaner.new.delete_users_according_to_deletion_date!
-        end.to have_enqueued_mail(UserCleanerMailer, :deletion_email)
-      end
-    end
-  end
-
-  describe("#pending_deletion_mail") do
-    let(:user_de) { FactoryBot.create(:confirmed_user, locale: "de") }
-    let(:user_en) { FactoryBot.create(:confirmed_user, locale: "en") }
-
-    def test_subject_line(num_days)
-      user = FactoryBot.create(:confirmed_user)
-      mailer = UserCleanerMailer.with(user: user).pending_deletion_email(num_days)
-      expect(mailer.subject).to include(num_days.to_s)
-    end
-
-    it "has mail subject containing the number of days until deletion" do
-      test_subject_line(40)
-      test_subject_line(14)
-      test_subject_line(7)
-      test_subject_line(2)
-    end
-
-    it "has mail subject localized to the user's locale" do
-      mailer = UserCleanerMailer.with(user: user_de).pending_deletion_email(40)
-      expect(mailer.subject).to include("Tage")
-      expect(mailer.subject).not_to include("days")
-
-      mailer = UserCleanerMailer.with(user: user_en).pending_deletion_email(40)
-      expect(mailer.subject).to include("days")
-      expect(mailer.subject).not_to include("Tage")
-    end
-
-    it "has mail body localized to the user's locale" do
-      expected_de = "verloren"
-      expected_en = "lost"
-
-      mailer = UserCleanerMailer.with(user: user_de).pending_deletion_email(40)
-      expect(mailer.html_part.body).to include(expected_de)
-      expect(mailer.html_part.body).not_to include(expected_en)
-
-      mailer = UserCleanerMailer.with(user: user_en).pending_deletion_email(40)
-      expect(mailer.html_part.body).to include(expected_en)
-      expect(mailer.html_part.body).not_to include(expected_de)
-    end
-  end
-
-  describe("#deletion_mail") do
-    let(:user_de) { FactoryBot.create(:confirmed_user, locale: "de") }
-    let(:user_en) { FactoryBot.create(:confirmed_user, locale: "en") }
-
-    it "has mail subject localized to the user's locale" do
-      mailer = UserCleanerMailer.with(user: user_de).deletion_email
-      expect(mailer.subject).to include("gelöscht")
-      expect(mailer.subject).not_to include("deleted")
-
-      mailer = UserCleanerMailer.with(user: user_en).deletion_email
-      expect(mailer.subject).to include("deleted")
-      expect(mailer.subject).not_to include("gelöscht")
-    end
-
-    it "has mail body localized to the user's locale" do
-      expected_de = "vollständig gelöscht"
-      expected_en = "deleted entirely"
-
-      mailer = UserCleanerMailer.with(user: user_de).deletion_email
-
-      expect(mailer.html_part.body).to include(expected_de)
-      expect(mailer.html_part.body).not_to include(expected_en)
-
-      mailer = UserCleanerMailer.with(user: user_en).deletion_email
-      expect(mailer.html_part.body).to include(expected_en)
-      expect(mailer.html_part.body).not_to include(expected_de)
-    end
-  end
-end
diff --git a/yarn.lock b/yarn.lock
index 563252a47..7fcd78eec 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -927,11 +927,6 @@
   resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
   integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
 
-"@hotwired/stimulus@^3.2.2":
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/@hotwired/stimulus/-/stimulus-3.2.2.tgz#071aab59c600fed95b97939e605ff261a4251608"
-  integrity sha512-eGeIqNOQpXoPAIP7tC1+1Yc1yl1xnwYqg+3mzqxyrbE5pg5YFBZcA6YoTiByJB6DKAEsiWtl6tjTJS4IYtbB7A==
-
 "@humanfs/core@^0.19.1":
   version "0.19.1"
   resolved "https://registry.yarnpkg.com/@humanfs/core/-/core-0.19.1.tgz#17c55ca7d426733fe3c561906b8173c336b40a77"

From e871872f32fc06565670784b75e097eb2ac5692f Mon Sep 17 00:00:00 2001
From: Florian <florianbuerckel@gmail.com>
Date: Sat, 25 Jan 2025 16:34:50 +0100
Subject: [PATCH 029/103] remove leftovers from stimulus

Signed-off-by: Florian <florianbuerckel@gmail.com>
---
 app/javascript/controllers/application.js      | 9 ---------
 app/javascript/controllers/hello_controller.js | 7 -------
 app/javascript/controllers/index.js            | 8 --------
 3 files changed, 24 deletions(-)
 delete mode 100644 app/javascript/controllers/application.js
 delete mode 100644 app/javascript/controllers/hello_controller.js
 delete mode 100644 app/javascript/controllers/index.js

diff --git a/app/javascript/controllers/application.js b/app/javascript/controllers/application.js
deleted file mode 100644
index 1213e85c7..000000000
--- a/app/javascript/controllers/application.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Application } from "@hotwired/stimulus"
-
-const application = Application.start()
-
-// Configure Stimulus development experience
-application.debug = false
-window.Stimulus   = application
-
-export { application }
diff --git a/app/javascript/controllers/hello_controller.js b/app/javascript/controllers/hello_controller.js
deleted file mode 100644
index 5975c0789..000000000
--- a/app/javascript/controllers/hello_controller.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import { Controller } from "@hotwired/stimulus"
-
-export default class extends Controller {
-  connect() {
-    this.element.textContent = "Hello World!"
-  }
-}
diff --git a/app/javascript/controllers/index.js b/app/javascript/controllers/index.js
deleted file mode 100644
index d0685d3b7..000000000
--- a/app/javascript/controllers/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// This file is auto-generated by ./bin/rails stimulus:manifest:update
-// Run that command whenever you add a new controller or create them with
-// ./bin/rails generate stimulus controllerName
-
-import { application } from "./application"
-
-import HelloController from "./hello_controller"
-application.register("hello", HelloController)

From 9cf7638ec1c2eb9f39356ed4ddd38691a5259628 Mon Sep 17 00:00:00 2001
From: Florian <florianbuerckel@gmail.com>
Date: Mon, 27 Jan 2025 17:24:10 +0100
Subject: [PATCH 030/103] fixed some rubocop errors

---
 .../vignettes/take_questionnaire.js           |  8 ++++----
 .../vignettes/info_slides_controller.rb       |  6 ++++--
 .../vignettes/questionnaires_controller.rb    | 20 +++++++++++--------
 .../vignettes/slides_controller.rb            |  4 ++--
 app/models/vignettes/answer.rb                | 11 ++++++----
 app/models/vignettes/info_slide.rb            |  3 ++-
 app/models/vignettes/option.rb                |  7 +++++--
 app/models/vignettes/slide_statistic.rb       |  5 +++--
 app/models/vignettes/user_answer.rb           |  3 ++-
 config/locales/en.yml                         | 11 ++++++++++
 10 files changed, 52 insertions(+), 26 deletions(-)

diff --git a/app/assets/javascripts/vignettes/take_questionnaire.js b/app/assets/javascripts/vignettes/take_questionnaire.js
index 4830a3e0d..f0f866271 100644
--- a/app/assets/javascripts/vignettes/take_questionnaire.js
+++ b/app/assets/javascripts/vignettes/take_questionnaire.js
@@ -22,7 +22,7 @@ document.addEventListener("turbolinks:load", () => {
   let infoSlidesAccessCount = {};
 
   infoSlideButtons.forEach((button) => {
-    button.addEventListener("click", (e) => {
+    button.addEventListener("click", () => {
       const index = button.getAttribute("data-index");
       activeInfoSlideIndex = index;
 
@@ -43,7 +43,7 @@ document.addEventListener("turbolinks:load", () => {
   });
 
   closeInfoSlideButtons.forEach((button) => {
-    button.addEventListener("click", (e) => {
+    button.addEventListener("click", () => {
       activeInfoSlideIndex = null;
       const index = button.getAttribute("data-index");
       document.getElementById(`info-slide-container-${index}`).style.display = "none";
@@ -57,11 +57,11 @@ document.addEventListener("turbolinks:load", () => {
     });
   });
 
-  form.addEventListener("submit", (e) => {
+  form.addEventListener("submit", () => {
     event.preventDefault();
   });
 
-  $(document).on("submit", "#answer_form", (e) => {
+  $(document).on("submit", "#answer_form", () => {
     if (SlideStartTime) {
       totalSlideTime += (Date.now() - SlideStartTime);
     }
diff --git a/app/controllers/vignettes/info_slides_controller.rb b/app/controllers/vignettes/info_slides_controller.rb
index aca6225cf..9bc13019f 100644
--- a/app/controllers/vignettes/info_slides_controller.rb
+++ b/app/controllers/vignettes/info_slides_controller.rb
@@ -11,7 +11,8 @@ def new
     def create
       @info_slide = @questionnaire.info_slides.new(info_slide_params)
       if @info_slide.save
-        redirect_to edit_vignettes_questionnaire_path(@questionnaire), notice: "Info slide created."
+        redirect_to edit_vignettes_questionnaire_path(@questionnaire),
+                    notice: t("vignettes.info_slide_created")
       else
         render :new
       end
@@ -22,7 +23,8 @@ def edit
 
     def update
       if @info_slide.update(info_slide_params)
-        redirect_to edit_vignettes_questionnaire_path(@questionnaire), notice: "Info slide updated."
+        redirect_to edit_vignettes_questionnaire_path(@questionnaire),
+                    t("vignettes.info_slide_updated")
       else
         render :edit
       end
diff --git a/app/controllers/vignettes/questionnaires_controller.rb b/app/controllers/vignettes/questionnaires_controller.rb
index d5ccdcd9c..a561acb66 100644
--- a/app/controllers/vignettes/questionnaires_controller.rb
+++ b/app/controllers/vignettes/questionnaires_controller.rb
@@ -14,26 +14,27 @@ def show
     end
 
     def take
-      user_answer = current_user.vignettes_user_answers.find_or_create_by(user: current_user,
-                                                                          questionnaire: @questionnaire)
+      user_answer = current_user.vignettes_user_answers
+                                .find_or_create_by(user: current_user,
+                                                   questionnaire: @questionnaire)
 
       if params[:position].to_i == -1
         # ONLY FOR DEBUG
         user_answer.destroy
-        redirect_to vignettes_questionnaire_path, notice: "user answer was destroyed"
+        redirect_to vignettes_questionnaire_path, notice: t("vignettes.destroy_answer")
         return
       end
 
       # Vignettes was already fully answered by user
       if user_answer.last_slide_answered?
-        redirect_to vignettes_questionnaire_path, notice: "Vignette was successfully answered"
+        redirect_to vignettes_questionnaire_path, notice: t("vignettes.answered")
         return
       end
 
       first_unanswered_slide = user_answer.first_unanswered_slide
       # This case should never happen
       if first_unanswered_slide.nil?
-        redirect_to vignettes_questionnaire_path, notice: "No slides to answer"
+        redirect_to vignettes_questionnaire_path, notice: t("vignettes.no_slides")
         return
       end
 
@@ -124,9 +125,12 @@ def questionnaire_params
       end
 
       def answer_params
-        params.require(:vignettes_answer).permit(:slide_id, :text, :likert_scale_value,
-                                                 option_ids: [],
-                                                 slide_statistic_attributes: [:user_id, :time_on_slide, :time_on_info_slides, :info_slides_access_count])
+        params.require(:vignettes_answer)
+              .permit(:slide_id, :text, :likert_scale_value,
+                      option_ids: [],
+                      slide_statistic_attributes:
+                      [:user_id, :time_on_slide,
+                       :time_on_info_slides, :info_slides_access_count])
       end
   end
 end
diff --git a/app/controllers/vignettes/slides_controller.rb b/app/controllers/vignettes/slides_controller.rb
index 80cad7cb6..14c57089b 100644
--- a/app/controllers/vignettes/slides_controller.rb
+++ b/app/controllers/vignettes/slides_controller.rb
@@ -27,7 +27,7 @@ def create
       @slide.position = @questionnaire.slides.maximum(:position).to_i + 1
       if @slide.save
         redirect_to edit_vignettes_questionnaire_path(@questionnaire),
-                    notice: "Slide was successfully created"
+                    notice: t("vignettes.slide_created")
       else
         flash[:alert] = "Failed to create slide: #{@slide.errors.full_messages.join(", ")}"
         render :new, status: :unprocessable_entity
@@ -38,7 +38,7 @@ def update
       @slide = @questionnaire.slides.find(params[:id])
       if @slide.update(slide_params)
         redirect_to edit_vignettes_questionnaire_path(@questionnaire),
-                    notice: "Slide was successfully updated"
+                    notice: t("vignettes.slide_updated")
       else
         render :edit, status: :unprocessable_entity
       end
diff --git a/app/models/vignettes/answer.rb b/app/models/vignettes/answer.rb
index 820543206..fbbd8699d 100644
--- a/app/models/vignettes/answer.rb
+++ b/app/models/vignettes/answer.rb
@@ -4,15 +4,18 @@ class Answer < ApplicationRecord
     belongs_to :slide, class_name: "Vignettes::Slide", foreign_key: "vignettes_slide_id"
 
     has_one :slide_statistic, class_name: "Vignettes::SlideStatistic",
-                              foreign_key: "vignettes_answer_id", inverse_of: :answer, dependent: :destroy
+                              foreign_key: "vignettes_answer_id",
+                              inverse_of: :answer, dependent: :destroy
 
     accepts_nested_attributes_for :slide_statistic, allow_destroy: true
 
     belongs_to :user_answer, class_name: "Vignettes::UserAnswer",
                              foreign_key: "vignettes_user_answer_id"
 
-    has_and_belongs_to_many :options, class_name: "Vignettes::Option",
-                                      join_table: :vignettes_answers_options, association_foreign_key: "vignettes_option_id",
-                                      foreign_key: "vignettes_answer_id"
+    has_and_belongs_to_many :options,
+                            class_name: "Vignettes::Option",
+                            join_table: :vignettes_answers_options,
+                            association_foreign_key: "vignettes_option_id",
+                            foreign_key: "vignettes_answer_id"
   end
 end
diff --git a/app/models/vignettes/info_slide.rb b/app/models/vignettes/info_slide.rb
index 9d930d522..d263dd165 100644
--- a/app/models/vignettes/info_slide.rb
+++ b/app/models/vignettes/info_slide.rb
@@ -17,6 +17,7 @@ class InfoSlide < ApplicationRecord
       attachable.variant(:thumb, resize_to_limit: [200, 200])
     end
 
-    belongs_to :questionnaire, foreign_key: "vignettes_questionnaire_id", inverse_of: :info_slides
+    belongs_to :questionnaire, foreign_key: "vignettes_questionnaire_id",
+                               inverse_of: :info_slides
   end
 end
diff --git a/app/models/vignettes/option.rb b/app/models/vignettes/option.rb
index f1551e7e7..6f1cc98c0 100644
--- a/app/models/vignettes/option.rb
+++ b/app/models/vignettes/option.rb
@@ -1,8 +1,11 @@
 module Vignettes
   class Option < ApplicationRecord
     belongs_to :question, inverse_of: :options, foreign_key: "vignettes_question_id"
-    has_and_belongs_to_many :answers, class_name: "Vignettes::Answer",
-                                      join_table: :vignettes_answers_options, association_foreign_key: "vignettes_answer_id", foreign_key: "vignettes_option_id"
+    has_and_belongs_to_many :answers,
+                            class_name: "Vignettes::Answer",
+                            join_table: :vignettes_answers_options,
+                            association_foreign_key: "vignettes_answer_id",
+                            foreign_key: "vignettes_option_id"
     validates :text, presence: true
   end
 end
diff --git a/app/models/vignettes/slide_statistic.rb b/app/models/vignettes/slide_statistic.rb
index 323b015d8..76bd2aee3 100644
--- a/app/models/vignettes/slide_statistic.rb
+++ b/app/models/vignettes/slide_statistic.rb
@@ -1,9 +1,10 @@
 module Vignettes
   class SlideStatistic < ApplicationRecord
-    validates :user_id, presence: true
+    validates :user_id
 
     belongs_to :user
-    belongs_to :answer, class_name: "Vignettes::Answer", foreign_key: "vignettes_answer_id",
+    belongs_to :answer, class_name: "Vignettes::Answer",
+                        foreign_key: "vignettes_answer_id",
                         inverse_of: :slide_statistic
   end
 end
diff --git a/app/models/vignettes/user_answer.rb b/app/models/vignettes/user_answer.rb
index bd351e16f..dd1a7a6de 100644
--- a/app/models/vignettes/user_answer.rb
+++ b/app/models/vignettes/user_answer.rb
@@ -2,7 +2,8 @@ module Vignettes
   class UserAnswer < ApplicationRecord
     belongs_to :user
     belongs_to :questionnaire, foreign_key: "vignettes_questionnaire_id"
-    has_many :answers, class_name: "Vignettes::Answer", foreign_key: "vignettes_user_answer_id",
+    has_many :answers, class_name: "Vignettes::Answer",
+                       foreign_key: "vignettes_user_answer_id",
                        dependent: :destroy
 
     def answered_slide_ids
diff --git a/config/locales/en.yml b/config/locales/en.yml
index a57c703c4..6b5952ab8 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2507,6 +2507,17 @@ en:
       reduced_questions: >
         The number of questions will be reduced accordingly if there are
         fewer questions availabale for your specified content than you selected.
+  
+  vignettes:
+    destroy_answer: 'Answer was destroyed'  
+    answered: 'Vignette was successfully answered'
+    no_slides: 'No slides to answer'
+    info_slide_created: 'Info slide created.'
+    info_slide_updated: 'Info slide updated.'
+    slide_updated: 'Slide was successfully updated.'
+    slide_created: 'Slide was successfully created.'
+
+
   external_link_lc: 'external link'
   no_announcements: 'There are no announcements.'
   click_here: 'Click here'

From c37d9b14f5c7fee9e227a1bd8615bb564800c523 Mon Sep 17 00:00:00 2001
From: Florian <florianbuerckel@gmail.com>
Date: Mon, 27 Jan 2025 17:36:50 +0100
Subject: [PATCH 031/103] fix more rubocop violations

Signed-off-by: Florian <florianbuerckel@gmail.com>
---
 app/helpers/vignettes/questionnaires_helper.rb    |  4 +++-
 app/helpers/vignettes/slides_helper.rb            |  4 +++-
 config/initializers/html_sanitization.rb          | 15 +++++++++------
 ...create_active_storage_tables.active_storage.rb |  9 ++++++---
 4 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/app/helpers/vignettes/questionnaires_helper.rb b/app/helpers/vignettes/questionnaires_helper.rb
index 1dc3753e9..614205254 100644
--- a/app/helpers/vignettes/questionnaires_helper.rb
+++ b/app/helpers/vignettes/questionnaires_helper.rb
@@ -1,2 +1,4 @@
-module Vignettes::QuestionnairesHelper
+module Vignettes
+  module QuestionnairesHelper
+  end
 end
diff --git a/app/helpers/vignettes/slides_helper.rb b/app/helpers/vignettes/slides_helper.rb
index 9d82aa8d2..91541bb2f 100644
--- a/app/helpers/vignettes/slides_helper.rb
+++ b/app/helpers/vignettes/slides_helper.rb
@@ -1,2 +1,4 @@
-module Vignettes::SlidesHelper
+module Vignettes
+  module SlidesHelper
+  end
 end
diff --git a/config/initializers/html_sanitization.rb b/config/initializers/html_sanitization.rb
index d4d087e66..b8234d1b7 100644
--- a/config/initializers/html_sanitization.rb
+++ b/config/initializers/html_sanitization.rb
@@ -1,12 +1,15 @@
 Rails.application.config.after_initialize do
-  default_allowed_attributes = Rails::HTML5::Sanitizer.safe_list_sanitizer.allowed_attributes + ActionText::Attachment::ATTRIBUTES.to_set
+  default_allowed_attributes =
+    Rails::HTML5::Sanitizer.safe_list_sanitizer.allowed_attributes + \
+    ActionText::Attachment::ATTRIBUTES.to_set
   custom_allowed_attributes = Set.new(["controls"])
-  ActionText::ContentHelper.allowed_attributes = (default_allowed_attributes + custom_allowed_attributes).freeze
+  ActionText::ContentHelper.allowed_attributes = (default_allowed_attributes +
+  custom_allowed_attributes).freeze
 
   default_allowed_tags = Rails::HTML5::Sanitizer.safe_list_sanitizer.allowed_tags +
-                         Set.new([
-                                   ActionText::Attachment.tag_name, "figure", "figcaption"
-                                 ])
+                         Set.new([ActionText::Attachment.tag_name,
+                                  "figure", "figcaption"])
   custom_allowed_tags = Set.new(["audio", "video", "source"])
-  ActionText::ContentHelper.allowed_tags = (default_allowed_tags + custom_allowed_tags).freeze
+  ActionText::ContentHelper.allowed_tags =
+    (default_allowed_tags + custom_allowed_tags).freeze
 end
diff --git a/db/migrate/20241204132029_create_active_storage_tables.active_storage.rb b/db/migrate/20241204132029_create_active_storage_tables.active_storage.rb
index e4706aa21..31df1f0fe 100644
--- a/db/migrate/20241204132029_create_active_storage_tables.active_storage.rb
+++ b/db/migrate/20241204132029_create_active_storage_tables.active_storage.rb
@@ -19,7 +19,7 @@ def change
         t.datetime :created_at, null: false
       end
 
-      t.index [ :key ], unique: true
+      t.index [:key], unique: true
     end
 
     create_table :active_storage_attachments, id: primary_key_type do |t|
@@ -33,7 +33,8 @@ def change
         t.datetime :created_at, null: false
       end
 
-      t.index [ :record_type, :record_id, :name, :blob_id ], name: :index_active_storage_attachments_uniqueness, unique: true
+      t.index [:record_type, :record_id, :name, :blob_id],
+              name: :index_active_storage_attachments_uniqueness, unique: true
       t.foreign_key :active_storage_blobs, column: :blob_id
     end
 
@@ -41,12 +42,14 @@ def change
       t.belongs_to :blob, null: false, index: false, type: foreign_key_type
       t.string :variation_digest, null: false
 
-      t.index [ :blob_id, :variation_digest ], name: :index_active_storage_variant_records_uniqueness, unique: true
+      t.index [:blob_id, :variation_digest],
+              name: :index_active_storage_variant_records_uniqueness, unique: true
       t.foreign_key :active_storage_blobs, column: :blob_id
     end
   end
 
   private
+
     def primary_and_foreign_key_types
       config = Rails.configuration.generators
       setting = config.options[config.orm][:primary_key_type]

From 674a7817ddaaa070cbae9998c224fc65494bba3b Mon Sep 17 00:00:00 2001
From: Florian <florianbuerckel@gmail.com>
Date: Mon, 27 Jan 2025 18:00:59 +0100
Subject: [PATCH 032/103] fix all spec rubocop violations

Signed-off-by: Florian <florianbuerckel@gmail.com>
---
 Gemfile.lock                                                  | 2 +-
 .../20241204132030_create_action_text_tables.action_text.rb   | 4 +++-
 spec/factories/vignettes/answers.rb                           | 2 +-
 spec/factories/vignettes/info_slides.rb                       | 2 +-
 spec/factories/vignettes/questionnaires.rb                    | 2 +-
 spec/factories/vignettes/questions.rb                         | 2 +-
 spec/factories/vignettes/slides.rb                            | 2 +-
 spec/factories/vignettes/text_answers.rb                      | 4 ++--
 spec/factories/vignettes/user_answers.rb                      | 2 +-
 spec/views/vignettes/questionnaires/create.html.erb_spec.rb   | 4 ++--
 spec/views/vignettes/questionnaires/destroy.html.erb_spec.rb  | 4 ++--
 spec/views/vignettes/questionnaires/edit.html.erb_spec.rb     | 4 ++--
 spec/views/vignettes/questionnaires/index.html.erb_spec.rb    | 4 ++--
 spec/views/vignettes/questionnaires/new.html.erb_spec.rb      | 4 ++--
 spec/views/vignettes/questionnaires/show.html.erb_spec.rb     | 4 ++--
 spec/views/vignettes/questionnaires/update.html.erb_spec.rb   | 4 ++--
 spec/views/vignettes/slides/create.html.erb_spec.rb           | 4 ++--
 spec/views/vignettes/slides/destroy.html.erb_spec.rb          | 4 ++--
 spec/views/vignettes/slides/edit.html.erb_spec.rb             | 4 ++--
 spec/views/vignettes/slides/index.html.erb_spec.rb            | 4 ++--
 spec/views/vignettes/slides/new.html.erb_spec.rb              | 4 ++--
 spec/views/vignettes/slides/show.html.erb_spec.rb             | 4 ++--
 spec/views/vignettes/slides/update.html.erb_spec.rb           | 4 ++--
 23 files changed, 40 insertions(+), 38 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index a8fda450e..6effeb93f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -763,4 +763,4 @@ RUBY VERSION
    ruby 3.1.4p223
 
 BUNDLED WITH
-   2.5.17
+   2.6.3
diff --git a/db/migrate/20241204132030_create_action_text_tables.action_text.rb b/db/migrate/20241204132030_create_action_text_tables.action_text.rb
index 1be48d70b..4466571ee 100644
--- a/db/migrate/20241204132030_create_action_text_tables.action_text.rb
+++ b/db/migrate/20241204132030_create_action_text_tables.action_text.rb
@@ -11,11 +11,13 @@ def change
 
       t.timestamps
 
-      t.index [ :record_type, :record_id, :name ], name: "index_action_text_rich_texts_uniqueness", unique: true
+      t.index [:record_type, :record_id, :name], name: "index_action_text_rich_texts_uniqueness",
+                                                 unique: true
     end
   end
 
   private
+
     def primary_and_foreign_key_types
       config = Rails.configuration.generators
       setting = config.options[config.orm][:primary_key_type]
diff --git a/spec/factories/vignettes/answers.rb b/spec/factories/vignettes/answers.rb
index 9478a986e..0a3906380 100644
--- a/spec/factories/vignettes/answers.rb
+++ b/spec/factories/vignettes/answers.rb
@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :vignettes_answer, class: 'Vignettes::Answer' do
+  factory :vignettes_answer, class: "Vignettes::Answer" do
     type { "" }
     question { nil }
     slide { nil }
diff --git a/spec/factories/vignettes/info_slides.rb b/spec/factories/vignettes/info_slides.rb
index e51b44752..eb7ad1a36 100644
--- a/spec/factories/vignettes/info_slides.rb
+++ b/spec/factories/vignettes/info_slides.rb
@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :vignettes_info_slide, class: 'Vignettes::InfoSlide' do
+  factory :vignettes_info_slide, class: "Vignettes::InfoSlide" do
     vignettes_slide { nil }
   end
 end
diff --git a/spec/factories/vignettes/questionnaires.rb b/spec/factories/vignettes/questionnaires.rb
index 7ae3ba864..d33e471c4 100644
--- a/spec/factories/vignettes/questionnaires.rb
+++ b/spec/factories/vignettes/questionnaires.rb
@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :vignettes_questionnaire, class: 'Vignettes::Questionnaire' do
+  factory :vignettes_questionnaire, class: "Vignettes::Questionnaire" do
     title { "MyString" }
   end
 end
diff --git a/spec/factories/vignettes/questions.rb b/spec/factories/vignettes/questions.rb
index 4beaf73cd..60e4fa6d7 100644
--- a/spec/factories/vignettes/questions.rb
+++ b/spec/factories/vignettes/questions.rb
@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :vignettes_question, class: 'Vignettes::Question' do
+  factory :vignettes_question, class: "Vignettes::Question" do
     type { "" }
     question_text { "MyText" }
     slide { nil }
diff --git a/spec/factories/vignettes/slides.rb b/spec/factories/vignettes/slides.rb
index eabab927b..a4d87c9b0 100644
--- a/spec/factories/vignettes/slides.rb
+++ b/spec/factories/vignettes/slides.rb
@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :vignettes_slide, class: 'Vignettes::Slide' do
+  factory :vignettes_slide, class: "Vignettes::Slide" do
     questionnaire { nil }
     content { nil }
   end
diff --git a/spec/factories/vignettes/text_answers.rb b/spec/factories/vignettes/text_answers.rb
index cc43c443a..f81078d94 100644
--- a/spec/factories/vignettes/text_answers.rb
+++ b/spec/factories/vignettes/text_answers.rb
@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :vignettes_text_answer, class: 'Vignettes::TextAnswer' do
-    
+  factory :vignettes_text_answer, class: "Vignettes::TextAnswer" do
+    return
   end
 end
diff --git a/spec/factories/vignettes/user_answers.rb b/spec/factories/vignettes/user_answers.rb
index ab76ed02b..0187314f0 100644
--- a/spec/factories/vignettes/user_answers.rb
+++ b/spec/factories/vignettes/user_answers.rb
@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :vignettes_user_answer, class: 'Vignettes::UserAnswer' do
+  factory :vignettes_user_answer, class: "Vignettes::UserAnswer" do
     user { nil }
     questionnaire { nil }
   end
diff --git a/spec/views/vignettes/questionnaires/create.html.erb_spec.rb b/spec/views/vignettes/questionnaires/create.html.erb_spec.rb
index f1a74e4ed..fc92a9702 100644
--- a/spec/views/vignettes/questionnaires/create.html.erb_spec.rb
+++ b/spec/views/vignettes/questionnaires/create.html.erb_spec.rb
@@ -1,5 +1,5 @@
-require 'rails_helper'
+require "rails_helper"
 
-RSpec.describe "questionnaires/create.html.erb", type: :view do
+RSpec.describe("questionnaires/create.html.erb", type: :view) do
   pending "add some examples to (or delete) #{__FILE__}"
 end
diff --git a/spec/views/vignettes/questionnaires/destroy.html.erb_spec.rb b/spec/views/vignettes/questionnaires/destroy.html.erb_spec.rb
index b0a776f71..eb5aa2fc1 100644
--- a/spec/views/vignettes/questionnaires/destroy.html.erb_spec.rb
+++ b/spec/views/vignettes/questionnaires/destroy.html.erb_spec.rb
@@ -1,5 +1,5 @@
-require 'rails_helper'
+require "rails_helper"
 
-RSpec.describe "questionnaires/destroy.html.erb", type: :view do
+RSpec.describe("questionnaires/destroy.html.erb", type: :view) do
   pending "add some examples to (or delete) #{__FILE__}"
 end
diff --git a/spec/views/vignettes/questionnaires/edit.html.erb_spec.rb b/spec/views/vignettes/questionnaires/edit.html.erb_spec.rb
index cdd07dc2d..7f08d444e 100644
--- a/spec/views/vignettes/questionnaires/edit.html.erb_spec.rb
+++ b/spec/views/vignettes/questionnaires/edit.html.erb_spec.rb
@@ -1,5 +1,5 @@
-require 'rails_helper'
+require "rails_helper"
 
-RSpec.describe "questionnaires/edit.html.erb", type: :view do
+RSpec.describe("questionnaires/edit.html.erb", type: :view) do
   pending "add some examples to (or delete) #{__FILE__}"
 end
diff --git a/spec/views/vignettes/questionnaires/index.html.erb_spec.rb b/spec/views/vignettes/questionnaires/index.html.erb_spec.rb
index 0f8ab3c4b..a58604821 100644
--- a/spec/views/vignettes/questionnaires/index.html.erb_spec.rb
+++ b/spec/views/vignettes/questionnaires/index.html.erb_spec.rb
@@ -1,5 +1,5 @@
-require 'rails_helper'
+require "rails_helper"
 
-RSpec.describe "questionnaires/index.html.erb", type: :view do
+RSpec.describe("questionnaires/index.html.erb", type: :view) do
   pending "add some examples to (or delete) #{__FILE__}"
 end
diff --git a/spec/views/vignettes/questionnaires/new.html.erb_spec.rb b/spec/views/vignettes/questionnaires/new.html.erb_spec.rb
index 0f7656fce..15574abd8 100644
--- a/spec/views/vignettes/questionnaires/new.html.erb_spec.rb
+++ b/spec/views/vignettes/questionnaires/new.html.erb_spec.rb
@@ -1,5 +1,5 @@
-require 'rails_helper'
+require "rails_helper"
 
-RSpec.describe "questionnaires/new.html.erb", type: :view do
+RSpec.describe("questionnaires/new.html.erb", type: :view) do
   pending "add some examples to (or delete) #{__FILE__}"
 end
diff --git a/spec/views/vignettes/questionnaires/show.html.erb_spec.rb b/spec/views/vignettes/questionnaires/show.html.erb_spec.rb
index dd8f2f440..ea88684a1 100644
--- a/spec/views/vignettes/questionnaires/show.html.erb_spec.rb
+++ b/spec/views/vignettes/questionnaires/show.html.erb_spec.rb
@@ -1,5 +1,5 @@
-require 'rails_helper'
+require "rails_helper"
 
-RSpec.describe "questionnaires/show.html.erb", type: :view do
+RSpec.describe("questionnaires/show.html.erb", type: :view) do
   pending "add some examples to (or delete) #{__FILE__}"
 end
diff --git a/spec/views/vignettes/questionnaires/update.html.erb_spec.rb b/spec/views/vignettes/questionnaires/update.html.erb_spec.rb
index 86f285c7b..8e5929a65 100644
--- a/spec/views/vignettes/questionnaires/update.html.erb_spec.rb
+++ b/spec/views/vignettes/questionnaires/update.html.erb_spec.rb
@@ -1,5 +1,5 @@
-require 'rails_helper'
+require "rails_helper"
 
-RSpec.describe "questionnaires/update.html.erb", type: :view do
+RSpec.describe("questionnaires/update.html.erb", type: :view) do
   pending "add some examples to (or delete) #{__FILE__}"
 end
diff --git a/spec/views/vignettes/slides/create.html.erb_spec.rb b/spec/views/vignettes/slides/create.html.erb_spec.rb
index fada1b1e1..a17dcc19a 100644
--- a/spec/views/vignettes/slides/create.html.erb_spec.rb
+++ b/spec/views/vignettes/slides/create.html.erb_spec.rb
@@ -1,5 +1,5 @@
-require 'rails_helper'
+require "rails_helper"
 
-RSpec.describe "slides/create.html.erb", type: :view do
+RSpec.describe("slides/create.html.erb", type: :view) do
   pending "add some examples to (or delete) #{__FILE__}"
 end
diff --git a/spec/views/vignettes/slides/destroy.html.erb_spec.rb b/spec/views/vignettes/slides/destroy.html.erb_spec.rb
index 77e93ad3c..b8501412a 100644
--- a/spec/views/vignettes/slides/destroy.html.erb_spec.rb
+++ b/spec/views/vignettes/slides/destroy.html.erb_spec.rb
@@ -1,5 +1,5 @@
-require 'rails_helper'
+require "rails_helper"
 
-RSpec.describe "slides/destroy.html.erb", type: :view do
+RSpec.describe("slides/destroy.html.erb", type: :view) do
   pending "add some examples to (or delete) #{__FILE__}"
 end
diff --git a/spec/views/vignettes/slides/edit.html.erb_spec.rb b/spec/views/vignettes/slides/edit.html.erb_spec.rb
index 0b3cd04d6..dd746f75f 100644
--- a/spec/views/vignettes/slides/edit.html.erb_spec.rb
+++ b/spec/views/vignettes/slides/edit.html.erb_spec.rb
@@ -1,5 +1,5 @@
-require 'rails_helper'
+require "rails_helper"
 
-RSpec.describe "slides/edit.html.erb", type: :view do
+RSpec.describe("slides/edit.html.erb", type: :view) do
   pending "add some examples to (or delete) #{__FILE__}"
 end
diff --git a/spec/views/vignettes/slides/index.html.erb_spec.rb b/spec/views/vignettes/slides/index.html.erb_spec.rb
index d40718a37..60a3c72f6 100644
--- a/spec/views/vignettes/slides/index.html.erb_spec.rb
+++ b/spec/views/vignettes/slides/index.html.erb_spec.rb
@@ -1,5 +1,5 @@
-require 'rails_helper'
+require "rails_helper"
 
-RSpec.describe "slides/index.html.erb", type: :view do
+RSpec.describe("slides/index.html.erb", type: :view) do
   pending "add some examples to (or delete) #{__FILE__}"
 end
diff --git a/spec/views/vignettes/slides/new.html.erb_spec.rb b/spec/views/vignettes/slides/new.html.erb_spec.rb
index 72ac17646..bc92330e6 100644
--- a/spec/views/vignettes/slides/new.html.erb_spec.rb
+++ b/spec/views/vignettes/slides/new.html.erb_spec.rb
@@ -1,5 +1,5 @@
-require 'rails_helper'
+require "rails_helper"
 
-RSpec.describe "slides/new.html.erb", type: :view do
+RSpec.describe("slides/new.html.erb", type: :view) do
   pending "add some examples to (or delete) #{__FILE__}"
 end
diff --git a/spec/views/vignettes/slides/show.html.erb_spec.rb b/spec/views/vignettes/slides/show.html.erb_spec.rb
index a2abbc42c..011afa549 100644
--- a/spec/views/vignettes/slides/show.html.erb_spec.rb
+++ b/spec/views/vignettes/slides/show.html.erb_spec.rb
@@ -1,5 +1,5 @@
-require 'rails_helper'
+require "rails_helper"
 
-RSpec.describe "slides/show.html.erb", type: :view do
+RSpec.describe("slides/show.html.erb", type: :view) do
   pending "add some examples to (or delete) #{__FILE__}"
 end
diff --git a/spec/views/vignettes/slides/update.html.erb_spec.rb b/spec/views/vignettes/slides/update.html.erb_spec.rb
index 8342a8929..aa2e6d494 100644
--- a/spec/views/vignettes/slides/update.html.erb_spec.rb
+++ b/spec/views/vignettes/slides/update.html.erb_spec.rb
@@ -1,5 +1,5 @@
-require 'rails_helper'
+require "rails_helper"
 
-RSpec.describe "slides/update.html.erb", type: :view do
+RSpec.describe("slides/update.html.erb", type: :view) do
   pending "add some examples to (or delete) #{__FILE__}"
 end

From e829f57ca54b396c52e7fa574f3fb0b6edcfec74 Mon Sep 17 00:00:00 2001
From: Florian <florianbuerckel@gmail.com>
Date: Mon, 27 Jan 2025 18:12:50 +0100
Subject: [PATCH 033/103] fix more spec rubocop violations

Signed-off-by: Florian <florianbuerckel@gmail.com>
---
 spec/factories/multiple_choice_answers.rb     | 2 +-
 spec/models/multiple_choice_answer_spec.rb    | 4 ++--
 spec/models/option_spec.rb                    | 4 ++--
 spec/models/vignettes/answer_spec.rb          | 4 ++--
 spec/models/vignettes/info_slide_spec.rb      | 4 ++--
 spec/models/vignettes/question_spec.rb        | 4 ++--
 spec/models/vignettes/questionnaire_spec.rb   | 4 ++--
 spec/models/vignettes/slide_spec.rb           | 4 ++--
 spec/models/vignettes/slide_statistic_spec.rb | 4 ++--
 spec/models/vignettes/text_answer_spec.rb     | 4 ++--
 spec/models/vignettes/user_answer_spec.rb     | 4 ++--
 11 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/spec/factories/multiple_choice_answers.rb b/spec/factories/multiple_choice_answers.rb
index bbc530c69..e3162a59c 100644
--- a/spec/factories/multiple_choice_answers.rb
+++ b/spec/factories/multiple_choice_answers.rb
@@ -1,5 +1,5 @@
 FactoryBot.define do
   factory :multiple_choice_answer do
-    
+    return
   end
 end
diff --git a/spec/models/multiple_choice_answer_spec.rb b/spec/models/multiple_choice_answer_spec.rb
index b7623d79a..e665c0891 100644
--- a/spec/models/multiple_choice_answer_spec.rb
+++ b/spec/models/multiple_choice_answer_spec.rb
@@ -1,5 +1,5 @@
-require 'rails_helper'
+require "rails_helper"
 
-RSpec.describe MultipleChoiceAnswer, type: :model do
+RSpec.describe(MultipleChoiceAnswer, type: :model) do
   pending "add some examples to (or delete) #{__FILE__}"
 end
diff --git a/spec/models/option_spec.rb b/spec/models/option_spec.rb
index eeda255a3..59aefda73 100644
--- a/spec/models/option_spec.rb
+++ b/spec/models/option_spec.rb
@@ -1,5 +1,5 @@
-require 'rails_helper'
+require "rails_helper"
 
-RSpec.describe Option, type: :model do
+RSpec.describe(Option, type: :model) do
   pending "add some examples to (or delete) #{__FILE__}"
 end
diff --git a/spec/models/vignettes/answer_spec.rb b/spec/models/vignettes/answer_spec.rb
index b1779b174..d195d2ddb 100644
--- a/spec/models/vignettes/answer_spec.rb
+++ b/spec/models/vignettes/answer_spec.rb
@@ -1,5 +1,5 @@
-require 'rails_helper'
+require "rails_helper"
 
-RSpec.describe Vignettes::Answer, type: :model do
+RSpec.describe(Vignettes::Answer, type: :model) do
   pending "add some examples to (or delete) #{__FILE__}"
 end
diff --git a/spec/models/vignettes/info_slide_spec.rb b/spec/models/vignettes/info_slide_spec.rb
index 1f8a0991c..b5f507e7d 100644
--- a/spec/models/vignettes/info_slide_spec.rb
+++ b/spec/models/vignettes/info_slide_spec.rb
@@ -1,5 +1,5 @@
-require 'rails_helper'
+require "rails_helper"
 
-RSpec.describe Vignettes::InfoSlide, type: :model do
+RSpec.describe(Vignettes::InfoSlide, type: :model) do
   pending "add some examples to (or delete) #{__FILE__}"
 end
diff --git a/spec/models/vignettes/question_spec.rb b/spec/models/vignettes/question_spec.rb
index b5d837b21..63d8128ca 100644
--- a/spec/models/vignettes/question_spec.rb
+++ b/spec/models/vignettes/question_spec.rb
@@ -1,5 +1,5 @@
-require 'rails_helper'
+require "rails_helper"
 
-RSpec.describe Vignettes::Question, type: :model do
+RSpec.describe(Vignettes::Question, type: :model) do
   pending "add some examples to (or delete) #{__FILE__}"
 end
diff --git a/spec/models/vignettes/questionnaire_spec.rb b/spec/models/vignettes/questionnaire_spec.rb
index 8fc5b7c72..f346e8669 100644
--- a/spec/models/vignettes/questionnaire_spec.rb
+++ b/spec/models/vignettes/questionnaire_spec.rb
@@ -1,5 +1,5 @@
-require 'rails_helper'
+require "rails_helper"
 
-RSpec.describe Vignettes::Questionnaire, type: :model do
+RSpec.describe(Vignettes::Questionnaire, type: :model) do
   pending "add some examples to (or delete) #{__FILE__}"
 end
diff --git a/spec/models/vignettes/slide_spec.rb b/spec/models/vignettes/slide_spec.rb
index fe0d7f6b3..e9d7ac8ed 100644
--- a/spec/models/vignettes/slide_spec.rb
+++ b/spec/models/vignettes/slide_spec.rb
@@ -1,5 +1,5 @@
-require 'rails_helper'
+require "rails_helper"
 
-RSpec.describe Vignettes::Slide, type: :model do
+RSpec.describe(Vignettes::Slide, type: :model) do
   pending "add some examples to (or delete) #{__FILE__}"
 end
diff --git a/spec/models/vignettes/slide_statistic_spec.rb b/spec/models/vignettes/slide_statistic_spec.rb
index 76a72211b..573d4eb00 100644
--- a/spec/models/vignettes/slide_statistic_spec.rb
+++ b/spec/models/vignettes/slide_statistic_spec.rb
@@ -1,5 +1,5 @@
-require 'rails_helper'
+require "rails_helper"
 
-RSpec.describe Vignettes::SlideStatistic, type: :model do
+RSpec.describe(Vignettes::SlideStatistic, type: :model) do
   pending "add some examples to (or delete) #{__FILE__}"
 end
diff --git a/spec/models/vignettes/text_answer_spec.rb b/spec/models/vignettes/text_answer_spec.rb
index 780386da6..03d2cbf53 100644
--- a/spec/models/vignettes/text_answer_spec.rb
+++ b/spec/models/vignettes/text_answer_spec.rb
@@ -1,5 +1,5 @@
-require 'rails_helper'
+require "rails_helper"
 
-RSpec.describe Vignettes::TextAnswer, type: :model do
+RSpec.describe(Vignettes::TextAnswer, type: :model) do
   pending "add some examples to (or delete) #{__FILE__}"
 end
diff --git a/spec/models/vignettes/user_answer_spec.rb b/spec/models/vignettes/user_answer_spec.rb
index c2faf9e9c..f8704233b 100644
--- a/spec/models/vignettes/user_answer_spec.rb
+++ b/spec/models/vignettes/user_answer_spec.rb
@@ -1,5 +1,5 @@
-require 'rails_helper'
+require "rails_helper"
 
-RSpec.describe Vignettes::UserAnswer, type: :model do
+RSpec.describe(Vignettes::UserAnswer, type: :model) do
   pending "add some examples to (or delete) #{__FILE__}"
 end

From 9bf7b6d91a832c9206b028a822b3c3304474fce8 Mon Sep 17 00:00:00 2001
From: Florian <florianbuerckel@gmail.com>
Date: Mon, 27 Jan 2025 18:16:28 +0100
Subject: [PATCH 034/103] fix more spec rubocop violations

Signed-off-by: Florian <florianbuerckel@gmail.com>
---
 spec/helpers/vignettes/questionnaires_helper_spec.rb | 4 ++--
 spec/helpers/vignettes/slides_helper_spec.rb         | 4 ++--
 spec/requests/vignettes/questionnaires_spec.rb       | 5 ++---
 spec/requests/vignettes/slides_spec.rb               | 5 ++---
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/spec/helpers/vignettes/questionnaires_helper_spec.rb b/spec/helpers/vignettes/questionnaires_helper_spec.rb
index 009a4f672..340d92130 100644
--- a/spec/helpers/vignettes/questionnaires_helper_spec.rb
+++ b/spec/helpers/vignettes/questionnaires_helper_spec.rb
@@ -1,4 +1,4 @@
-require 'rails_helper'
+require "rails_helper"
 
 # Specs in this file have access to a helper object that includes
 # the Vignettes::QuestionnairesHelper. For example:
@@ -10,6 +10,6 @@
 #     end
 #   end
 # end
-RSpec.describe Vignettes::QuestionnairesHelper, type: :helper do
+RSpec.describe(Vignettes::QuestionnairesHelper, type: :helper) do
   pending "add some examples to (or delete) #{__FILE__}"
 end
diff --git a/spec/helpers/vignettes/slides_helper_spec.rb b/spec/helpers/vignettes/slides_helper_spec.rb
index 85ae90fbb..45c88c0a9 100644
--- a/spec/helpers/vignettes/slides_helper_spec.rb
+++ b/spec/helpers/vignettes/slides_helper_spec.rb
@@ -1,4 +1,4 @@
-require 'rails_helper'
+require "rails_helper"
 
 # Specs in this file have access to a helper object that includes
 # the Vignettes::SlidesHelper. For example:
@@ -10,6 +10,6 @@
 #     end
 #   end
 # end
-RSpec.describe Vignettes::SlidesHelper, type: :helper do
+RSpec.describe(Vignettes::SlidesHelper, type: :helper) do
   pending "add some examples to (or delete) #{__FILE__}"
 end
diff --git a/spec/requests/vignettes/questionnaires_spec.rb b/spec/requests/vignettes/questionnaires_spec.rb
index ac5d63b76..662e3a0b7 100644
--- a/spec/requests/vignettes/questionnaires_spec.rb
+++ b/spec/requests/vignettes/questionnaires_spec.rb
@@ -1,6 +1,6 @@
-require 'rails_helper'
+require "rails_helper"
 
-RSpec.describe "Vignettes::Questionnaires", type: :request do
+RSpec.describe("Vignettes::Questionnaires", type: :request) do
   describe "GET /index" do
     it "returns http success" do
       get "/vignettes/questionnaires/index"
@@ -49,5 +49,4 @@
       expect(response).to have_http_status(:success)
     end
   end
-
 end
diff --git a/spec/requests/vignettes/slides_spec.rb b/spec/requests/vignettes/slides_spec.rb
index 968b1f14f..da1215716 100644
--- a/spec/requests/vignettes/slides_spec.rb
+++ b/spec/requests/vignettes/slides_spec.rb
@@ -1,6 +1,6 @@
-require 'rails_helper'
+require "rails_helper"
 
-RSpec.describe "Vignettes::Slides", type: :request do
+RSpec.describe("Vignettes::Slides", type: :request) do
   describe "GET /index" do
     it "returns http success" do
       get "/vignettes/slides/index"
@@ -49,5 +49,4 @@
       expect(response).to have_http_status(:success)
     end
   end
-
 end

From a9726f13caaad0fe51914f28bc9100b0c0c7b62e Mon Sep 17 00:00:00 2001
From: Florian <florianbuerckel@gmail.com>
Date: Tue, 28 Jan 2025 12:24:01 +0100
Subject: [PATCH 035/103] condense db migrations files

Signed-off-by: Florian <florianbuerckel@gmail.com>
---
 app/models/vignettes/slide_statistic.rb       |  2 +-
 .../20241204132407_create_vignettes_slides.rb |  2 ++
 ...move_questionable_from_vignettes_slides.rb |  7 ----
 ...20250105171326_create_vignettes_answers.rb |  3 +-
 .../20250110151936_add_position_to_slides.rb  |  6 ----
 .../20250111200240_add_text_to_answers.rb     |  5 ---
 ...0112122902_create_vignettes_info_slides.rb |  4 ++-
 ...61035_create_vignettes_slide_statistics.rb |  5 +--
 ...52_add_scale_value_to_vignettes_answers.rb |  5 ---
 ...021_rename_vignettes_answer_scale_value.rb |  5 ---
 ...00_change_slide_statistics_associations.rb |  7 ----
 ...4255_add_title_to_vignettes_info_slides.rb |  5 ---
 ...tes_slide_id_from_vignettes_info_slides.rb |  5 ---
 ...d_vignettes_questionnaire_to_info_slide.rb |  5 ---
 ...es_info_slides_type_in_slide_statistics.rb |  7 ----
 ...ess_count_to_vignettes_slide_statistics.rb |  5 ---
 ...95933_add_icon_to_vignettes_info_slides.rb |  5 ---
 db/schema.rb                                  | 33 +++++++------------
 18 files changed, 23 insertions(+), 93 deletions(-)
 delete mode 100644 db/migrate/20241228184829_remove_questionable_from_vignettes_slides.rb
 delete mode 100644 db/migrate/20250110151936_add_position_to_slides.rb
 delete mode 100644 db/migrate/20250111200240_add_text_to_answers.rb
 delete mode 100644 db/migrate/20250116192352_add_scale_value_to_vignettes_answers.rb
 delete mode 100644 db/migrate/20250116194021_rename_vignettes_answer_scale_value.rb
 delete mode 100644 db/migrate/20250117222000_change_slide_statistics_associations.rb
 delete mode 100644 db/migrate/20250118094255_add_title_to_vignettes_info_slides.rb
 delete mode 100644 db/migrate/20250118120051_remove_vignettes_slide_id_from_vignettes_info_slides.rb
 delete mode 100644 db/migrate/20250118123124_add_vignettes_questionnaire_to_info_slide.rb
 delete mode 100644 db/migrate/20250118153311_change_time_on_vignettes_info_slides_type_in_slide_statistics.rb
 delete mode 100644 db/migrate/20250122142057_add_info_slide_access_count_to_vignettes_slide_statistics.rb
 delete mode 100644 db/migrate/20250125095933_add_icon_to_vignettes_info_slides.rb

diff --git a/app/models/vignettes/slide_statistic.rb b/app/models/vignettes/slide_statistic.rb
index 76bd2aee3..672897847 100644
--- a/app/models/vignettes/slide_statistic.rb
+++ b/app/models/vignettes/slide_statistic.rb
@@ -1,6 +1,6 @@
 module Vignettes
   class SlideStatistic < ApplicationRecord
-    validates :user_id
+    validate :user_id
 
     belongs_to :user
     belongs_to :answer, class_name: "Vignettes::Answer",
diff --git a/db/migrate/20241204132407_create_vignettes_slides.rb b/db/migrate/20241204132407_create_vignettes_slides.rb
index d1ccc77ed..abd0b904a 100644
--- a/db/migrate/20241204132407_create_vignettes_slides.rb
+++ b/db/migrate/20241204132407_create_vignettes_slides.rb
@@ -2,6 +2,8 @@ class CreateVignettesSlides < ActiveRecord::Migration[7.1]
   def change
     create_table :vignettes_slides do |t|
       t.references :vignettes_questionnaire, null: false, foreign_key: true
+      t.integer :position
+      t.index :position
 
       t.timestamps
     end
diff --git a/db/migrate/20241228184829_remove_questionable_from_vignettes_slides.rb b/db/migrate/20241228184829_remove_questionable_from_vignettes_slides.rb
deleted file mode 100644
index 779d81381..000000000
--- a/db/migrate/20241228184829_remove_questionable_from_vignettes_slides.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class RemoveQuestionableFromVignettesSlides < ActiveRecord::Migration[7.1]
-  def change
-    remove_index :vignettes_slides, name: "index_vignettes_slides_on_questionable"
-    remove_column :vignettes_slides, :questionable_type, :string
-    remove_column :vignettes_slides, :questionable_id, :bigint
-  end
-end
diff --git a/db/migrate/20250105171326_create_vignettes_answers.rb b/db/migrate/20250105171326_create_vignettes_answers.rb
index 1f097648b..3766f96fd 100644
--- a/db/migrate/20250105171326_create_vignettes_answers.rb
+++ b/db/migrate/20250105171326_create_vignettes_answers.rb
@@ -4,7 +4,8 @@ def change
       t.string :type
       t.references :vignettes_question, null: false, foreign_key: true
       t.references :vignettes_slide, null: false, foreign_key: true
-
+      t.text :text
+      t.integer :likert_scale_value
       t.timestamps
     end
   end
diff --git a/db/migrate/20250110151936_add_position_to_slides.rb b/db/migrate/20250110151936_add_position_to_slides.rb
deleted file mode 100644
index 5cb015579..000000000
--- a/db/migrate/20250110151936_add_position_to_slides.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-class AddPositionToSlides < ActiveRecord::Migration[7.1]
-  def change
-    add_column :vignettes_slides, :position, :integer
-    add_index :vignettes_slides, :position
-  end
-end
diff --git a/db/migrate/20250111200240_add_text_to_answers.rb b/db/migrate/20250111200240_add_text_to_answers.rb
deleted file mode 100644
index 6375cdf72..000000000
--- a/db/migrate/20250111200240_add_text_to_answers.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddTextToAnswers < ActiveRecord::Migration[7.1]
-  def change
-    add_column :vignettes_answers, :text, :text
-  end
-end
diff --git a/db/migrate/20250112122902_create_vignettes_info_slides.rb b/db/migrate/20250112122902_create_vignettes_info_slides.rb
index 6180138d5..e2062a8b3 100644
--- a/db/migrate/20250112122902_create_vignettes_info_slides.rb
+++ b/db/migrate/20250112122902_create_vignettes_info_slides.rb
@@ -1,7 +1,9 @@
 class CreateVignettesInfoSlides < ActiveRecord::Migration[7.1]
   def change
     create_table :vignettes_info_slides do |t|
-      t.references :vignettes_slide, null: false, foreign_key: true
+      t.string :title
+      t.references :vignettes_questionnaire, index: true
+      t.string :icon
 
       t.timestamps
     end
diff --git a/db/migrate/20250112161035_create_vignettes_slide_statistics.rb b/db/migrate/20250112161035_create_vignettes_slide_statistics.rb
index 28119040f..cb1c24eb0 100644
--- a/db/migrate/20250112161035_create_vignettes_slide_statistics.rb
+++ b/db/migrate/20250112161035_create_vignettes_slide_statistics.rb
@@ -2,9 +2,10 @@ class CreateVignettesSlideStatistics < ActiveRecord::Migration[7.1]
   def change
     create_table :vignettes_slide_statistics do |t|
       t.references :user, null: false, foreign_key: true
-      t.references :vignettes_slide, null: false, foreign_key: true
+      t.references :vignettes_answer, foreign_key: { to_table: :vignettes_answers }
       t.integer :time_on_slide
-      t.integer :time_on_info_slide
+      t.text :time_on_info_slides
+      t.text :info_slides_access_count
 
       t.timestamps
     end
diff --git a/db/migrate/20250116192352_add_scale_value_to_vignettes_answers.rb b/db/migrate/20250116192352_add_scale_value_to_vignettes_answers.rb
deleted file mode 100644
index 65e265cab..000000000
--- a/db/migrate/20250116192352_add_scale_value_to_vignettes_answers.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddScaleValueToVignettesAnswers < ActiveRecord::Migration[7.1]
-  def change
-    add_column :vignettes_answers, :scale_value, :integer
-  end
-end
diff --git a/db/migrate/20250116194021_rename_vignettes_answer_scale_value.rb b/db/migrate/20250116194021_rename_vignettes_answer_scale_value.rb
deleted file mode 100644
index 9d5a636b1..000000000
--- a/db/migrate/20250116194021_rename_vignettes_answer_scale_value.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class RenameVignettesAnswerScaleValue < ActiveRecord::Migration[7.1]
-  def change
-    rename_column :vignettes_answers, :scale_value, :likert_scale_value
-  end
-end
diff --git a/db/migrate/20250117222000_change_slide_statistics_associations.rb b/db/migrate/20250117222000_change_slide_statistics_associations.rb
deleted file mode 100644
index 4d76c8fc4..000000000
--- a/db/migrate/20250117222000_change_slide_statistics_associations.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class ChangeSlideStatisticsAssociations < ActiveRecord::Migration[7.0]
-  def change
-    remove_reference :vignettes_slide_statistics, :vignettes_slide, foreign_key: true
-    add_reference :vignettes_slide_statistics, :vignettes_answer,
-                  foreign_key: { to_table: :vignettes_answers }
-  end
-end
diff --git a/db/migrate/20250118094255_add_title_to_vignettes_info_slides.rb b/db/migrate/20250118094255_add_title_to_vignettes_info_slides.rb
deleted file mode 100644
index 31a1f987a..000000000
--- a/db/migrate/20250118094255_add_title_to_vignettes_info_slides.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddTitleToVignettesInfoSlides < ActiveRecord::Migration[7.1]
-  def change
-    add_column :vignettes_info_slides, :title, :string
-  end
-end
diff --git a/db/migrate/20250118120051_remove_vignettes_slide_id_from_vignettes_info_slides.rb b/db/migrate/20250118120051_remove_vignettes_slide_id_from_vignettes_info_slides.rb
deleted file mode 100644
index a0ba19a96..000000000
--- a/db/migrate/20250118120051_remove_vignettes_slide_id_from_vignettes_info_slides.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class RemoveVignettesSlideIdFromVignettesInfoSlides < ActiveRecord::Migration[7.1]
-  def change
-    remove_column :vignettes_info_slides, :vignettes_slide_id, :bigint
-  end
-end
diff --git a/db/migrate/20250118123124_add_vignettes_questionnaire_to_info_slide.rb b/db/migrate/20250118123124_add_vignettes_questionnaire_to_info_slide.rb
deleted file mode 100644
index b63ef59fb..000000000
--- a/db/migrate/20250118123124_add_vignettes_questionnaire_to_info_slide.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddVignettesQuestionnaireToInfoSlide < ActiveRecord::Migration[7.1]
-  def change
-    add_reference :vignettes_info_slides, :vignettes_questionnaire, index: true
-  end
-end
diff --git a/db/migrate/20250118153311_change_time_on_vignettes_info_slides_type_in_slide_statistics.rb b/db/migrate/20250118153311_change_time_on_vignettes_info_slides_type_in_slide_statistics.rb
deleted file mode 100644
index d6020b8bb..000000000
--- a/db/migrate/20250118153311_change_time_on_vignettes_info_slides_type_in_slide_statistics.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class ChangeTimeOnVignettesInfoSlidesTypeInSlideStatistics < ActiveRecord::Migration[7.1]
-  def change
-    rename_column :vignettes_slide_statistics, :time_on_info_slide, :time_on_info_slides
-    # To store data in json format
-    change_column :vignettes_slide_statistics, :time_on_info_slides, :text
-  end
-end
diff --git a/db/migrate/20250122142057_add_info_slide_access_count_to_vignettes_slide_statistics.rb b/db/migrate/20250122142057_add_info_slide_access_count_to_vignettes_slide_statistics.rb
deleted file mode 100644
index b40a5f251..000000000
--- a/db/migrate/20250122142057_add_info_slide_access_count_to_vignettes_slide_statistics.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddInfoSlideAccessCountToVignettesSlideStatistics < ActiveRecord::Migration[7.1]
-  def change
-    add_column :vignettes_slide_statistics, :info_slides_access_count, :text
-  end
-end
diff --git a/db/migrate/20250125095933_add_icon_to_vignettes_info_slides.rb b/db/migrate/20250125095933_add_icon_to_vignettes_info_slides.rb
deleted file mode 100644
index 8fa2aa4ca..000000000
--- a/db/migrate/20250125095933_add_icon_to_vignettes_info_slides.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddIconToVignettesInfoSlides < ActiveRecord::Migration[7.1]
-  def change
-    add_column :vignettes_info_slides, :icon, :string
-  end
-end
diff --git a/db/schema.rb b/db/schema.rb
index cd3fc65a6..dfb7e8617 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.1].define(version: 2025_01_25_095933) do
+ActiveRecord::Schema[7.1].define(version: 2025_01_17_225808) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pgcrypto"
   enable_extension "plpgsql"
@@ -103,12 +103,6 @@
     t.index ["medium_id"], name: "index_assignments_on_medium_id"
   end
 
-  create_table "blogs", force: :cascade do |t|
-    t.string "title"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-  end
-
   create_table "chapters", force: :cascade do |t|
     t.integer "lecture_id"
     t.string "title"
@@ -953,11 +947,11 @@
     t.string "type"
     t.bigint "vignettes_question_id", null: false
     t.bigint "vignettes_slide_id", null: false
+    t.text "text"
+    t.integer "likert_scale_value"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.bigint "vignettes_user_answer_id", null: false
-    t.text "text"
-    t.integer "likert_scale_value"
     t.index ["vignettes_question_id"], name: "index_vignettes_answers_on_vignettes_question_id"
     t.index ["vignettes_slide_id"], name: "index_vignettes_answers_on_vignettes_slide_id"
     t.index ["vignettes_user_answer_id"], name: "index_vignettes_answers_on_vignettes_user_answer_id"
@@ -966,27 +960,24 @@
   create_table "vignettes_answers_options", id: false, force: :cascade do |t|
     t.bigint "vignettes_answer_id", null: false
     t.bigint "vignettes_option_id", null: false
-    t.index ["vignettes_answer_id", "vignettes_option_id"], name: "idx_on_vignettes_answer_id_vignettes_option_id_95dc8573a3"
-    t.index ["vignettes_option_id", "vignettes_answer_id"], name: "idx_on_vignettes_option_id_vignettes_answer_id_239ee34098"
+    t.index ["vignettes_answer_id", "vignettes_option_id"], name: "index_answers_options_on_answer_id_and_option_id"
+    t.index ["vignettes_option_id", "vignettes_answer_id"], name: "index_answers_options_on_option_id_and_answer_id"
   end
 
   create_table "vignettes_info_slides", force: :cascade do |t|
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
     t.string "title"
     t.bigint "vignettes_questionnaire_id"
     t.string "icon"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["vignettes_questionnaire_id"], name: "index_vignettes_info_slides_on_vignettes_questionnaire_id"
   end
 
   create_table "vignettes_info_slides_slides", id: false, force: :cascade do |t|
     t.bigint "vignettes_info_slide_id", null: false
     t.bigint "vignettes_slide_id", null: false
-  end
-
-  create_table "vignettes_multiple_choice_answers_options", id: false, force: :cascade do |t|
-    t.bigint "vignettes_multiple_choice_answer_id", null: false
-    t.bigint "vignettes_option_id", null: false
+    t.index ["vignettes_info_slide_id", "vignettes_slide_id"], name: "idx_on_vignettes_info_slide_id_vignettes_slide_id_2bdc65ab76"
+    t.index ["vignettes_slide_id", "vignettes_info_slide_id"], name: "idx_on_vignettes_slide_id_vignettes_info_slide_id_c74f04e951"
   end
 
   create_table "vignettes_options", force: :cascade do |t|
@@ -1014,21 +1005,21 @@
 
   create_table "vignettes_slide_statistics", force: :cascade do |t|
     t.bigint "user_id", null: false
+    t.bigint "vignettes_answer_id"
     t.integer "time_on_slide"
     t.text "time_on_info_slides"
+    t.text "info_slides_access_count"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.bigint "vignettes_answer_id"
-    t.text "info_slides_access_count"
     t.index ["user_id"], name: "index_vignettes_slide_statistics_on_user_id"
     t.index ["vignettes_answer_id"], name: "index_vignettes_slide_statistics_on_vignettes_answer_id"
   end
 
   create_table "vignettes_slides", force: :cascade do |t|
     t.bigint "vignettes_questionnaire_id", null: false
+    t.integer "position"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.integer "position"
     t.index ["position"], name: "index_vignettes_slides_on_position"
     t.index ["vignettes_questionnaire_id"], name: "index_vignettes_slides_on_vignettes_questionnaire_id"
   end

From c5a385b8f941b2835b25aeab912f50457a8e63cd Mon Sep 17 00:00:00 2001
From: Florian <florianbuerckel@gmail.com>
Date: Tue, 4 Feb 2025 12:04:38 +0100
Subject: [PATCH 036/103] add ERD-diagram for vignettes

---
 .config/commands/utils.justfile | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.config/commands/utils.justfile b/.config/commands/utils.justfile
index 01b6fdfa4..b24f80005 100644
--- a/.config/commands/utils.justfile
+++ b/.config/commands/utils.justfile
@@ -66,5 +66,12 @@ erd:
         exclude="${exclude_default},Claimable,Editable,Teachable" \
         only="Lecture,Lesson,Chapter,Section,Item,LessonSectionJoin,Term"
 
+    # 🌟 Vignettes
+    docker compose exec -it mampf rake erd warn=false \
+        title="Vignettes" filename=/usr/src/app/tmp/erd/mampf-erd-vignettes \
+        inheritance=true polymorphism=true indirect=true attributes=content \
+        exclude="${exclude_default},Claimable,Editable,Teachable,Notifiable,Record" \
+        only="Vignettes::Questionnaire, Vignettes::Slide, Vignettes::InfoSlide, Vignettes::Answer, Vignettes::UserAnswer, Vignettes::Question, Vignettes::SlideStatistic, Vignettes::LikertScaleAnswer, Vignettes::LikertScaleQuestion, Vignettes::MultipleChoiceAnswer, Vignettes::MultipleChoiceQuestion, Vignettes::TextQuestion, Vignettes::TextAnswe, Vignettes::LikertScaleAnswer, Vignettes::LikertScaleQuestion, Vignettes::MultipleChoiceAnswer, Vignettes::MultipleChoiceQuestion, Vignettes::TextQuestion, Vignettes::TextAnswer, Vignettes::Option"
+
     echo "📂 Diagrams are ready for you in the folder {{justfile_directory()}}/tmp/erd/"
     echo "🔀 For the meanings of the arrows, refer to https://voormedia.github.io/rails-erd/gallery.html#notations"

From c8cb9f4c106378f9a15491096e23fe4dff77368c Mon Sep 17 00:00:00 2001
From: Florian <florianbuerckel@gmail.com>
Date: Sun, 9 Feb 2025 18:42:09 +0100
Subject: [PATCH 037/103] add version to active_storage_validations gem

Signed-off-by: Florian <florianbuerckel@gmail.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 795c9de4a..f41987dae 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,7 +7,7 @@ ruby "3.1.4"
 gem "active_model_serializers", "~> 0.10"
 gem "activerecord-import", "~>1.7"
 gem "activerecord-nulldb-adapter", "~> 1.0" # for assets precompilation in production
-gem "active_storage_validations"
+gem "active_storage_validations", "~> 2.0.2"
 gem "acts_as_list", "~> 1.2"
 gem "acts_as_tree", "~> 2.9"
 gem "acts_as_votable", "~> 0.14"
diff --git a/Gemfile.lock b/Gemfile.lock
index 6effeb93f..b1c3abb47 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -97,7 +97,7 @@ GEM
       jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
     active_record_union (1.3.0)
       activerecord (>= 4.0)
-    active_storage_validations (2.0.0)
+    active_storage_validations (2.0.2)
       activejob (>= 6.1.4)
       activemodel (>= 6.1.4)
       activestorage (>= 6.1.4)
@@ -674,7 +674,7 @@ PLATFORMS
 
 DEPENDENCIES
   active_model_serializers (~> 0.10)
-  active_storage_validations
+  active_storage_validations (~> 2.0.2)
   activerecord-import (~> 1.7)
   activerecord-nulldb-adapter (~> 1.0)
   acts_as_list (~> 1.2)

From 11f03759aff1f554947b2a13994c8799d7a087d6 Mon Sep 17 00:00:00 2001
From: Florian <florianbuerckel@gmail.com>
Date: Sun, 9 Feb 2025 18:49:39 +0100
Subject: [PATCH 038/103] fix merge conflict of gemfile

Signed-off-by: Florian <florianbuerckel@gmail.com>
---
 Gemfile      |  4 ----
 Gemfile.lock | 17 -----------------
 2 files changed, 21 deletions(-)

diff --git a/Gemfile b/Gemfile
index f41987dae..2993559b8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -52,7 +52,6 @@ gem "rails-i18n", "~> 7.0"
 gem "responders", "~> 3.1"
 gem "rgl", "~> 0.6"
 gem "rqrcode", "~> 2.2"
-# gem "ruby-vips", "~> 2.2", ">= 2.2.2"
 gem "rubyzip", "~> 2.3"
 gem "sass-rails", "~> 6.0" # SCSS for stylesheets
 gem "shrine", "~> 3.6"
@@ -88,11 +87,8 @@ end
 group :test do
   gem "database_cleaner-active_record", "~> 2.2" # clean up database between tests
   gem "faker", "~> 3.4"
-  gem "launchy", "~> 3.0"
-  gem "selenium-webdriver", "~> 4.10.0" # support for Capybara system testing and selenium driver
   gem "simplecov", "~> 0.22", require: false
   gem "timecop", "~> 0.9.10"
-  gem "webdrivers", "~> 5.3"
 end
 
 group :test, :development, :docker_development do
diff --git a/Gemfile.lock b/Gemfile.lock
index b1c3abb47..ce81e513f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -170,8 +170,6 @@ GEM
     cancancan (3.6.1)
     case_transform (0.2)
       activesupport
-    childprocess (5.1.0)
-      logger (~> 1.5)
     choice (0.2.0)
     chunky_png (1.4.0)
     clipboard-rails (1.7.1)
@@ -331,9 +329,6 @@ GEM
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     language_server-protocol (3.17.0.3)
-    launchy (3.0.1)
-      addressable (~> 2.8)
-      childprocess (~> 5.0)
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
@@ -567,10 +562,6 @@ GEM
       sprockets-rails
       tilt
     securerandom (0.3.2)
-    selenium-webdriver (4.10.0)
-      rexml (~> 3.2, >= 3.2.5)
-      rubyzip (>= 1.2.2, < 3.0)
-      websocket (~> 1.0)
     semantic_range (3.1.0)
     shrine (3.6.0)
       content_disposition (~> 1.0)
@@ -652,17 +643,12 @@ GEM
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    webdrivers (5.3.1)
-      nokogiri (~> 1.6)
-      rubyzip (>= 1.3.0)
-      selenium-webdriver (~> 4.0, < 4.11)
     webpacker (5.4.4)
       activesupport (>= 5.2)
       rack-proxy (>= 0.6.1)
       railties (>= 5.2)
       semantic_range (>= 2.3.0)
     webrick (1.9.0)
-    websocket (1.2.11)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -710,7 +696,6 @@ DEPENDENCIES
   kaminari (~> 1.2)
   kaminari-i18n (~> 0.5)
   kramdown-parser-gfm (~> 1.1)
-  launchy (~> 3.0)
   listen (~> 3.9)
   marcel (~> 1.0)
   mini_magick (~> 4.13)
@@ -737,7 +722,6 @@ DEPENDENCIES
   rubocop-rails (~> 2.24)
   rubyzip (~> 2.3)
   sass-rails (~> 6.0)
-  selenium-webdriver (~> 4.10.0)
   shrine (~> 3.6)
   sidekiq (~> 7.3)
   sidekiq-cron (~> 1.12)
@@ -756,7 +740,6 @@ DEPENDENCIES
   trix-rails (~> 2.4)
   turbolinks (~> 5.2)
   web-console (~> 4.2)
-  webdrivers (~> 5.3)
   webpacker (~> 5.4)
 
 RUBY VERSION

From b971ce4fdcb5b0ae6257eb6088854fca857e859d Mon Sep 17 00:00:00 2001
From: Florian <florianbuerckel@gmail.com>
Date: Sun, 9 Feb 2025 18:53:41 +0100
Subject: [PATCH 039/103] bundle install for gemfile

Signed-off-by: Florian <florianbuerckel@gmail.com>
---
 Gemfile.lock | 267 +++++++++++++++++++++++++++++----------------------
 1 file changed, 151 insertions(+), 116 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index ce81e513f..0dec16a1f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -41,35 +41,35 @@ GEM
     RubyInline (3.14.1)
       ZenTest (~> 4.3)
     ZenTest (4.12.2)
-    actioncable (7.1.5)
-      actionpack (= 7.1.5)
-      activesupport (= 7.1.5)
+    actioncable (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.1.5)
-      actionpack (= 7.1.5)
-      activejob (= 7.1.5)
-      activerecord (= 7.1.5)
-      activestorage (= 7.1.5)
-      activesupport (= 7.1.5)
+    actionmailbox (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      activejob (= 7.1.5.1)
+      activerecord (= 7.1.5.1)
+      activestorage (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.1.5)
-      actionpack (= 7.1.5)
-      actionview (= 7.1.5)
-      activejob (= 7.1.5)
-      activesupport (= 7.1.5)
+    actionmailer (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      actionview (= 7.1.5.1)
+      activejob (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.2)
-    actionpack (7.1.5)
-      actionview (= 7.1.5)
-      activesupport (= 7.1.5)
+    actionpack (7.1.5.1)
+      actionview (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       nokogiri (>= 1.8.5)
       racc
       rack (>= 2.2.4)
@@ -77,15 +77,15 @@ GEM
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    actiontext (7.1.5)
-      actionpack (= 7.1.5)
-      activerecord (= 7.1.5)
-      activestorage (= 7.1.5)
-      activesupport (= 7.1.5)
+    actiontext (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      activerecord (= 7.1.5.1)
+      activestorage (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.1.5)
-      activesupport (= 7.1.5)
+    actionview (7.1.5.1)
+      activesupport (= 7.1.5.1)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
@@ -103,26 +103,26 @@ GEM
       activestorage (>= 6.1.4)
       activesupport (>= 6.1.4)
       marcel (>= 1.0.3)
-    activejob (7.1.5)
-      activesupport (= 7.1.5)
+    activejob (7.1.5.1)
+      activesupport (= 7.1.5.1)
       globalid (>= 0.3.6)
-    activemodel (7.1.5)
-      activesupport (= 7.1.5)
-    activerecord (7.1.5)
-      activemodel (= 7.1.5)
-      activesupport (= 7.1.5)
+    activemodel (7.1.5.1)
+      activesupport (= 7.1.5.1)
+    activerecord (7.1.5.1)
+      activemodel (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       timeout (>= 0.4.0)
     activerecord-import (1.8.1)
       activerecord (>= 4.2)
     activerecord-nulldb-adapter (1.1.1)
       activerecord (>= 6.0, < 8.1)
-    activestorage (7.1.5)
-      actionpack (= 7.1.5)
-      activejob (= 7.1.5)
-      activerecord (= 7.1.5)
-      activesupport (= 7.1.5)
+    activestorage (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      activejob (= 7.1.5.1)
+      activerecord (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       marcel (~> 1.0)
-    activesupport (7.1.5)
+    activesupport (7.1.5.1)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -155,7 +155,7 @@ GEM
     base64 (0.2.0)
     bcrypt (3.1.20)
     benchmark (0.4.0)
-    bigdecimal (3.1.8)
+    bigdecimal (3.1.9)
     bindex (0.8.1)
     bootsnap (1.18.4)
       msgpack (~> 1.2)
@@ -184,8 +184,8 @@ GEM
       rails (>= 6.0)
       sprockets-rails
       will_paginate
-    concurrent-ruby (1.3.4)
-    connection_pool (2.4.1)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.0)
     content_disposition (1.0.0)
     coveralls (0.7.1)
       multi_json (~> 1.3)
@@ -194,14 +194,14 @@ GEM
       term-ansicolor
       thor
     crass (1.0.6)
-    css_parser (1.19.1)
+    css_parser (1.21.0)
       addressable
     dalli (3.2.8)
     database_cleaner-active_record (2.2.0)
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
-    date (3.4.0)
+    date (3.4.1)
     db_text_search (1.0.0)
       activerecord (>= 4.1.15)
     devise (4.9.4)
@@ -217,7 +217,7 @@ GEM
     down (5.4.2)
       addressable (~> 2.8)
     drb (2.2.1)
-    erubi (1.13.0)
+    erubi (1.13.1)
     erubis (2.7.0)
     et-orbi (1.2.11)
       tzinfo
@@ -226,8 +226,8 @@ GEM
       rails (>= 4.2.0)
       responders
     execjs (2.10.0)
-    factory_bot (6.5.0)
-      activesupport (>= 5.0.0)
+    factory_bot (6.5.1)
+      activesupport (>= 6.1.0)
     factory_bot_rails (6.4.4)
       factory_bot (~> 6.5)
       railties (>= 5.0.0)
@@ -249,15 +249,22 @@ GEM
     faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
     faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.4)
-      multipart-post (~> 2)
+    faraday-multipart (1.1.0)
+      multipart-post (~> 2.0)
     faraday-net_http (1.0.2)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
-    fastimage (2.3.1)
-    ffi (1.17.0-x86_64-linux-gnu)
+    fastimage (2.4.0)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-musl)
+    ffi (1.17.1-arm-linux-gnu)
+    ffi (1.17.1-arm-linux-musl)
+    ffi (1.17.1-arm64-darwin)
+    ffi (1.17.1-x86_64-darwin)
+    ffi (1.17.1-x86_64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-musl)
     filesize (0.2.0)
     friendly_id (5.5.1)
       activerecord (>= 4.0.0)
@@ -269,16 +276,16 @@ GEM
     globalid (1.2.1)
       activesupport (>= 6.1)
     hashery (2.1.2)
-    highline (3.1.1)
+    highline (3.1.2)
       reline
     html-pipeline (2.14.3)
       activesupport (>= 2)
       nokogiri (>= 1.4)
     htmlentities (4.3.4)
     http-accept (1.7.0)
-    http-cookie (1.0.7)
+    http-cookie (1.0.8)
       domain_name (~> 0.5)
-    i18n (1.14.6)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
     image_processing (1.13.0)
       mini_magick (>= 4.9.5, < 5)
@@ -286,8 +293,9 @@ GEM
     inline_svg (1.10.0)
       activesupport (>= 3.0)
       nokogiri (>= 1.6)
-    io-console (0.7.2)
-    irb (1.14.1)
+    io-console (0.8.0)
+    irb (1.15.1)
+      pp (>= 0.6.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jbuilder (2.13.0)
@@ -302,7 +310,7 @@ GEM
     js-routes (1.4.9)
       railties (>= 4)
       sprockets-rails
-    json (2.8.2)
+    json (2.9.1)
     jsonapi-renderer (0.2.2)
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
@@ -328,12 +336,12 @@ GEM
       kramdown (~> 2.0)
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    language_server-protocol (3.17.0.3)
+    language_server-protocol (3.17.0.4)
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    logger (1.6.1)
-    loofah (2.23.1)
+    logger (1.6.5)
+    loofah (2.24.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -345,30 +353,44 @@ GEM
     mime-types (3.6.0)
       logger
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2024.1105)
+    mime-types-data (3.2025.0204)
     mini_magick (4.13.2)
     mini_mime (1.1.5)
-    minitest (5.25.2)
-    mobility (1.3.1)
+    minitest (5.25.4)
+    mobility (1.3.2)
       i18n (>= 0.6.10, < 2)
       request_store (~> 1.0)
-    msgpack (1.7.5)
+    msgpack (1.8.0)
     multi_json (1.15.0)
     multipart-post (2.4.1)
     mustache (1.1.1)
     mutex_m (0.3.0)
-    net-imap (0.5.1)
+    net-imap (0.5.6)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.5.0)
+    net-smtp (0.5.1)
       net-protocol
     netrc (0.11.0)
     nio4r (2.7.4)
-    nokogiri (1.16.7-x86_64-linux)
+    nokogiri (1.18.2-aarch64-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.18.2-aarch64-linux-musl)
+      racc (~> 1.4)
+    nokogiri (1.18.2-arm-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.18.2-arm-linux-musl)
+      racc (~> 1.4)
+    nokogiri (1.18.2-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.18.2-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.18.2-x86_64-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.18.2-x86_64-linux-musl)
       racc (~> 1.4)
     onebox (2.2.19)
       addressable (~> 2.8.0)
@@ -381,10 +403,10 @@ GEM
     orm_adapter (0.5.0)
     pairing_heap (3.1.0)
     parallel (1.26.3)
-    parser (3.3.6.0)
+    parser (3.3.7.1)
       ast (~> 2.4.1)
       racc
-    pdf-reader (2.13.0)
+    pdf-reader (2.14.1)
       Ascii85 (>= 1.0, < 3.0, != 2.0.0)
       afm (~> 0.2.1)
       hashery (~> 2.0)
@@ -393,6 +415,8 @@ GEM
     pg (1.5.9)
     pgreset (0.4)
     popper_js (2.11.8)
+    pp (0.6.2)
+      prettyprint
     pr_geohash (1.0.0)
     premailer (1.27.0)
       addressable
@@ -402,15 +426,17 @@ GEM
       actionmailer (>= 3)
       net-smtp
       premailer (~> 1.7, >= 1.7.9)
+    prettyprint (0.2.0)
     progress_bar (1.3.4)
       highline (>= 1.6)
       options (~> 2.3.0)
-    prometheus_exporter (2.1.1)
+    prometheus_exporter (2.2.0)
       webrick
-    psych (5.2.0)
+    psych (5.2.3)
+      date
       stringio
     public_suffix (6.0.1)
-    puma (6.5.0)
+    puma (6.6.0)
       nio4r (~> 2.0)
     pundit (2.4.0)
       activesupport (>= 3.0.0)
@@ -421,25 +447,25 @@ GEM
       rack
     rack-session (1.0.2)
       rack (< 3)
-    rack-test (2.1.0)
+    rack-test (2.2.0)
       rack (>= 1.3)
     rackup (1.0.1)
       rack (< 3)
       webrick
-    rails (7.1.5)
-      actioncable (= 7.1.5)
-      actionmailbox (= 7.1.5)
-      actionmailer (= 7.1.5)
-      actionpack (= 7.1.5)
-      actiontext (= 7.1.5)
-      actionview (= 7.1.5)
-      activejob (= 7.1.5)
-      activemodel (= 7.1.5)
-      activerecord (= 7.1.5)
-      activestorage (= 7.1.5)
-      activesupport (= 7.1.5)
+    rails (7.1.5.1)
+      actioncable (= 7.1.5.1)
+      actionmailbox (= 7.1.5.1)
+      actionmailer (= 7.1.5.1)
+      actionpack (= 7.1.5.1)
+      actiontext (= 7.1.5.1)
+      actionview (= 7.1.5.1)
+      activejob (= 7.1.5.1)
+      activemodel (= 7.1.5.1)
+      activerecord (= 7.1.5.1)
+      activestorage (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       bundler (>= 1.15.0)
-      railties (= 7.1.5)
+      railties (= 7.1.5.1)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
@@ -449,17 +475,17 @@ GEM
       activesupport (>= 4.2)
       choice (~> 0.2.0)
       ruby-graphviz (~> 1.2)
-    rails-html-sanitizer (1.6.0)
+    rails-html-sanitizer (1.6.2)
       loofah (~> 2.21)
-      nokogiri (~> 1.14)
+      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
     rails-i18n (7.0.10)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
     rails_gravatar (1.0.4)
       actionview
-    railties (7.1.5)
-      actionpack (= 7.1.5)
-      activesupport (= 7.1.5)
+    railties (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       irb
       rackup (>= 1.0.0)
       rake (>= 12.2)
@@ -470,12 +496,12 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rdoc (6.8.1)
+    rdoc (6.12.0)
       psych (>= 4.0.0)
-    redis-client (0.22.2)
+    redis-client (0.23.2)
       connection_pool
-    regexp_parser (2.9.3)
-    reline (0.5.12)
+    regexp_parser (2.10.0)
+    reline (0.6.0)
       io-console (~> 0.5)
     request_store (1.7.0)
       rack (>= 1.4)
@@ -487,7 +513,7 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rexml (3.3.9)
+    rexml (3.4.0)
     rgl (0.6.6)
       pairing_heap (>= 0.3, < 4.0)
       rexml (~> 3.2, >= 3.2.4)
@@ -500,7 +526,7 @@ GEM
     rsolr (2.6.0)
       builder (>= 2.1.2)
       faraday (>= 0.9, < 3, != 2.0.0)
-    rspec-core (3.13.2)
+    rspec-core (3.13.3)
       rspec-support (~> 3.13.0)
     rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -518,23 +544,23 @@ GEM
       rspec-expectations (~> 3.13)
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
-    rspec-support (3.13.1)
-    rubocop (1.69.0)
+    rspec-support (3.13.2)
+    rubocop (1.71.2)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 2.4, < 3.0)
-      rubocop-ast (>= 1.36.1, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.36.2)
+    rubocop-ast (1.38.0)
       parser (>= 3.3.1.0)
-    rubocop-performance (1.23.0)
+    rubocop-performance (1.23.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rails (2.27.0)
+    rubocop-rails (2.29.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.52.0, < 2.0)
@@ -543,14 +569,14 @@ GEM
       rexml
     ruby-progressbar (1.13.0)
     ruby-rc4 (0.1.5)
-    ruby-vips (2.2.2)
+    ruby-vips (2.2.3)
       ffi (~> 1.12)
       logger
     ruby2_keywords (0.0.5)
-    rubyzip (2.3.2)
-    sanitize (6.1.3)
+    rubyzip (2.4.1)
+    sanitize (7.0.0)
       crass (~> 1.0.2)
-      nokogiri (>= 1.12.0)
+      nokogiri (>= 1.16.8)
     sass-rails (6.0.0)
       sassc-rails (~> 2.1, >= 2.1.1)
     sassc (2.4.0)
@@ -561,12 +587,13 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    securerandom (0.3.2)
+    securerandom (0.4.1)
     semantic_range (3.1.0)
     shrine (3.6.0)
       content_disposition (~> 1.0)
       down (~> 5.1)
-    sidekiq (7.3.6)
+    sidekiq (7.3.8)
+      base64
       connection_pool (>= 2.3.0)
       logger
       rack (>= 2.2.4)
@@ -614,14 +641,14 @@ GEM
     sync (0.5.0)
     term-ansicolor (1.11.2)
       tins (~> 1.0)
-    terser (1.2.4)
+    terser (1.2.5)
       execjs (>= 0.3.0, < 3)
     thor (1.3.2)
-    tilt (2.4.0)
+    tilt (2.6.0)
     timeago_js (3.0.2.2)
     timecop (0.9.10)
-    timeout (0.4.2)
-    tins (1.37.0)
+    timeout (0.4.3)
+    tins (1.38.0)
       bigdecimal
       sync
     trix-rails (2.4.0)
@@ -633,7 +660,7 @@ GEM
     turbolinks-source (5.2.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (3.1.2)
+    unicode-display_width (3.1.4)
       unicode-emoji (~> 4.0, >= 4.0.4)
     unicode-emoji (4.0.4)
     warden (1.2.9)
@@ -648,15 +675,23 @@ GEM
       rack-proxy (>= 0.6.1)
       railties (>= 5.2)
       semantic_range (>= 2.3.0)
-    webrick (1.9.0)
-    websocket-driver (0.7.6)
+    webrick (1.9.1)
+    websocket-driver (0.7.7)
+      base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     will_paginate (4.0.1)
     zeitwerk (2.6.18)
 
 PLATFORMS
-  x86_64-linux
+  aarch64-linux-gnu
+  aarch64-linux-musl
+  arm-linux-gnu
+  arm-linux-musl
+  arm64-darwin
+  x86_64-darwin
+  x86_64-linux-gnu
+  x86_64-linux-musl
 
 DEPENDENCIES
   active_model_serializers (~> 0.10)

From 9636aa25a78ed5deb87c1b5b9810db9eec51255b Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Sat, 22 Feb 2025 20:01:19 +0100
Subject: [PATCH 040/103] Merge vignette answer migrations together

---
 ...s.rb => 20241228200302_create_vignettes_options.rb} |  2 +-
 db/migrate/20250105171326_create_vignettes_answers.rb  |  7 +++++++
 .../20250111144808_create_vignettes_user_answers.rb    | 10 ----------
 .../20250111144832_add_user_answer_to_answers.rb       |  5 -----
 db/schema.rb                                           |  2 +-
 5 files changed, 9 insertions(+), 17 deletions(-)
 rename db/migrate/{20241228200302_create_options.rb => 20241228200302_create_vignettes_options.rb} (75%)
 delete mode 100644 db/migrate/20250111144808_create_vignettes_user_answers.rb
 delete mode 100644 db/migrate/20250111144832_add_user_answer_to_answers.rb

diff --git a/db/migrate/20241228200302_create_options.rb b/db/migrate/20241228200302_create_vignettes_options.rb
similarity index 75%
rename from db/migrate/20241228200302_create_options.rb
rename to db/migrate/20241228200302_create_vignettes_options.rb
index 47a4cb59a..24dab349f 100644
--- a/db/migrate/20241228200302_create_options.rb
+++ b/db/migrate/20241228200302_create_vignettes_options.rb
@@ -1,4 +1,4 @@
-class CreateOptions < ActiveRecord::Migration[7.1]
+class CreateVignettesOptions < ActiveRecord::Migration[7.1]
   def change
     create_table :vignettes_options do |t|
       t.string :text
diff --git a/db/migrate/20250105171326_create_vignettes_answers.rb b/db/migrate/20250105171326_create_vignettes_answers.rb
index 3766f96fd..8c1dc93e9 100644
--- a/db/migrate/20250105171326_create_vignettes_answers.rb
+++ b/db/migrate/20250105171326_create_vignettes_answers.rb
@@ -1,9 +1,16 @@
 class CreateVignettesAnswers < ActiveRecord::Migration[7.1]
   def change
+    create_table :vignettes_user_answers do |t|
+      t.references :user, null: false, foreign_key: true
+      t.references :vignettes_questionnaire, null: false, foreign_key: true
+      t.timestamps
+    end
+
     create_table :vignettes_answers do |t|
       t.string :type
       t.references :vignettes_question, null: false, foreign_key: true
       t.references :vignettes_slide, null: false, foreign_key: true
+      t.references :vignettes_user_answer, null: false, foreign_key: true
       t.text :text
       t.integer :likert_scale_value
       t.timestamps
diff --git a/db/migrate/20250111144808_create_vignettes_user_answers.rb b/db/migrate/20250111144808_create_vignettes_user_answers.rb
deleted file mode 100644
index ec44f7b0e..000000000
--- a/db/migrate/20250111144808_create_vignettes_user_answers.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-class CreateVignettesUserAnswers < ActiveRecord::Migration[7.1]
-  def change
-    create_table :vignettes_user_answers do |t|
-      t.references :user, null: false, foreign_key: true
-      t.references :vignettes_questionnaire, null: false, foreign_key: true
-
-      t.timestamps
-    end
-  end
-end
diff --git a/db/migrate/20250111144832_add_user_answer_to_answers.rb b/db/migrate/20250111144832_add_user_answer_to_answers.rb
deleted file mode 100644
index a1942cd38..000000000
--- a/db/migrate/20250111144832_add_user_answer_to_answers.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddUserAnswerToAnswers < ActiveRecord::Migration[7.1]
-  def change
-    add_reference :vignettes_answers, :vignettes_user_answer, null: false, foreign_key: true
-  end
-end
diff --git a/db/schema.rb b/db/schema.rb
index dfb7e8617..0ec20a010 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -947,11 +947,11 @@
     t.string "type"
     t.bigint "vignettes_question_id", null: false
     t.bigint "vignettes_slide_id", null: false
+    t.bigint "vignettes_user_answer_id", null: false
     t.text "text"
     t.integer "likert_scale_value"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.bigint "vignettes_user_answer_id", null: false
     t.index ["vignettes_question_id"], name: "index_vignettes_answers_on_vignettes_question_id"
     t.index ["vignettes_slide_id"], name: "index_vignettes_answers_on_vignettes_slide_id"
     t.index ["vignettes_user_answer_id"], name: "index_vignettes_answers_on_vignettes_user_answer_id"

From d6cd90b4767e8f88da4fe0f3f37b3af354a51fd6 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Sun, 23 Feb 2025 13:35:49 +0100
Subject: [PATCH 041/103] Init card design for slides

---
 app/assets/stylesheets/_branding.scss         |   1 +
 app/assets/stylesheets/vignettes-take.scss    |  30 +++++
 .../vignettes/questionnaires_controller.rb    |   2 +
 .../vignettes/questionnaires/take.html.erb    | 121 ++++++++++--------
 4 files changed, 103 insertions(+), 51 deletions(-)
 create mode 100644 app/assets/stylesheets/_branding.scss
 create mode 100644 app/assets/stylesheets/vignettes-take.scss

diff --git a/app/assets/stylesheets/_branding.scss b/app/assets/stylesheets/_branding.scss
new file mode 100644
index 000000000..a05952089
--- /dev/null
+++ b/app/assets/stylesheets/_branding.scss
@@ -0,0 +1 @@
+$mampf-blue: #223e62;
diff --git a/app/assets/stylesheets/vignettes-take.scss b/app/assets/stylesheets/vignettes-take.scss
new file mode 100644
index 000000000..61c4cec33
--- /dev/null
+++ b/app/assets/stylesheets/vignettes-take.scss
@@ -0,0 +1,30 @@
+@import "branding";
+
+#vignette-take-card {
+    padding: 0em;
+    margin-top: 1em;
+    margin-bottom: 1em;
+    border: $mampf-blue 2px solid;
+    // border-radius: 0.4em;
+    box-shadow: 0px 2px 7px 0rem rgba(34, 62, 98, 0.2);
+}
+
+.slide-header {
+    padding: 0.75rem 1.25rem;
+    background-color: $mampf-blue;
+}
+
+.slide-footer-btn {
+    background-color: $mampf-blue;
+    color: white;
+    border: none;
+    padding: 0.5rem 1rem;
+    margin: 0.5rem;
+    cursor: pointer;
+    border-radius: 0.4em;
+
+    transition: 200ms;
+    &:hover {
+        box-shadow: 0px 2px 7px 0rem rgba(34, 62, 98, 0.2);
+    }
+}
diff --git a/app/controllers/vignettes/questionnaires_controller.rb b/app/controllers/vignettes/questionnaires_controller.rb
index a561acb66..328bc85e1 100644
--- a/app/controllers/vignettes/questionnaires_controller.rb
+++ b/app/controllers/vignettes/questionnaires_controller.rb
@@ -50,6 +50,8 @@ def take
       @slide = @questionnaire.slides.find_by(position: requested_position)
       @answer = @slide.answers.build
       @answer.build_slide_statistic
+
+      render layout: "application_no_sidebar"
     end
 
     def submit_answer
diff --git a/app/views/vignettes/questionnaires/take.html.erb b/app/views/vignettes/questionnaires/take.html.erb
index 088dd4196..8f6aae1c6 100644
--- a/app/views/vignettes/questionnaires/take.html.erb
+++ b/app/views/vignettes/questionnaires/take.html.erb
@@ -1,69 +1,88 @@
+<%= stylesheet_link_tag 'vignettes-take' %>
 <%= javascript_include_tag 'vignettes/take_questionnaire' %>
 
-<% @slide.info_slides.each_with_index do |info_slide, index| %>
-<div id="info-slide-container-<%= index %>" class="info-slide-container" style="display: none;">
-    <h2> Info Slide <%= index + 1 %> </h2>
-    <button class="close-info-slide-button btn btn-primary" data-index="<%= index %>">Close Info Slide</button>
-    <%= info_slide.content %>
-</div>
-<%end%>
+<%= form_with(model: @answer, id: "answer_form",
+              url: submit_answer_vignettes_questionnaire_url(@questionnaire),
+              local: true) do |form| %>
 
-<div id="current-slide-container" data-slide-id="<%= @slide.id %>" data-questionnaire-id="<%= @questionnaire.id %>" >
+<div id="vignette-take-card" class="container-md small-width card">
 
-    <h2> Slide <%= @slide.position %> </h2>
+    <div class="slide-header text-light">
+        <!-- TODO: add a slide title -->
+        <h4> Slide <%= @slide.position %></h4>
+    </div>
 
-    <% @slide.info_slides.each_with_index do |info_slide, index| %>
-        <% if info_slide.icon.attached? %>
-        <button class="info-slide-button info-slide-icon-button" data-index="<%= index %>">
-                <%= image_tag info_slide.icon.variant(:thumb), alt: info_slide.title, class: 'info-slide-icon' %>
-            </button>
-        <% else %>
-            <button class="info-slide-button btn btn-primary" data-index="<%= index %>">
-            <%= info_slide.title %>
-            </button>
+    <div class="card-body">
+
+        <% @slide.info_slides.each_with_index do |info_slide, index| %>
+        <div id="info-slide-container-<%= index %>" class="info-slide-container" style="display: none;">
+            <h2> Info Slide <%= index + 1 %> </h2>
+            <button class="close-info-slide-button btn btn-primary" data-index="<%= index %>">Close Info Slide</button>
+            <%= info_slide.content %>
+        </div>
         <% end %>
-    <% end %>
 
-    <%= @slide.content %>
-    <%= @slide.question.question_text %>
+        <div id="current-slide-container" data-slide-id="<%= @slide.id %>" data-questionnaire-id="<%= @questionnaire.id %>" >
 
-    <br>
+            <h2> Slide <%= @slide.position %> </h2>
 
-    <%= form_with(model: @answer, id: "answer_form", url: submit_answer_vignettes_questionnaire_url(@questionnaire), local: true) do |form| %>
+            <% @slide.info_slides.each_with_index do |info_slide, index| %>
+                <% if info_slide.icon.attached? %>
+                <button class="info-slide-button info-slide-icon-button" data-index="<%= index %>">
+                        <%= image_tag info_slide.icon.variant(:thumb), alt: info_slide.title, class: 'info-slide-icon' %>
+                    </button>
+                <% else %>
+                    <button class="info-slide-button btn btn-primary" data-index="<%= index %>">
+                    <%= info_slide.title %>
+                    </button>
+                <% end %>
+            <% end %>
 
+            <%= @slide.content %>
+            <%= @slide.question.question_text %>
 
-        <%= form.hidden_field :slide_id, value: @slide.id %>
+            <br>
 
-        <%= form.fields_for :slide_statistic do |stat_form| %>
-            <%= stat_form.hidden_field :user_id, value: current_user.id %>
-            <%= stat_form.hidden_field :time_on_slide, id: "time-on-slide-field" %>
-            <%= stat_form.hidden_field :time_on_info_slides, id: "time-on-info-slides-field" %>
-            <%= stat_form.hidden_field :info_slides_access_count, id:"info-slides-access-count-field" %>
-        <% end %>
+                <%= form.hidden_field :slide_id, value: @slide.id %>
 
-        <% case @slide.question.type %> 
-            <% when "Vignettes::TextQuestion" %>
-                <%= form.label :text, "Your Answer" %>
-                <%= form.text_area :text %>
-            <% when "Vignettes::MultipleChoiceQuestion" %>
-                <% @slide.question.options.each do |option| %>
-                    <%= option.text %>
-                    <%= check_box_tag "vignettes_answer[option_ids][]", option.id, @answer.option_ids.include?(option.id) %>
-                <% end %>
-            <% when "Vignettes::LikertScaleQuestion" %>
-                <% Vignettes::LikertScaleQuestion::LIKERT_LABELS.each do |value, label| %>
-                <div>
-                    <%= form.radio_button :likert_scale_value, value %>
-                    <%= form.label :likert_scale_value, label %>
-                </div>
+                <%= form.fields_for :slide_statistic do |stat_form| %>
+                    <%= stat_form.hidden_field :user_id, value: current_user.id %>
+                    <%= stat_form.hidden_field :time_on_slide, id: "time-on-slide-field" %>
+                    <%= stat_form.hidden_field :time_on_info_slides, id: "time-on-info-slides-field" %>
+                    <%= stat_form.hidden_field :info_slides_access_count, id:"info-slides-access-count-field" %>
                 <% end %>
-        <% end %>
-        <br>
+
+                <% case @slide.question.type %> 
+                    <% when "Vignettes::TextQuestion" %>
+                        <%= form.label :text, "Your Answer" %>
+                        <%= form.text_area :text %>
+                    <% when "Vignettes::MultipleChoiceQuestion" %>
+                        <% @slide.question.options.each do |option| %>
+                            <%= option.text %>
+                            <%= check_box_tag "vignettes_answer[option_ids][]", option.id, @answer.option_ids.include?(option.id) %>
+                        <% end %>
+                    <% when "Vignettes::LikertScaleQuestion" %>
+                        <% Vignettes::LikertScaleQuestion::LIKERT_LABELS.each do |value, label| %>
+                        <div>
+                            <%= form.radio_button :likert_scale_value, value %>
+                            <%= form.label :likert_scale_value, label %>
+                        </div>
+                        <% end %>
+                <br>
+                        
+            <% end %>
+        </div>
+
+    </div>
+
+    <div class="card-footer d-flex justify-content-end">
         <% if @slide.question.type == "" %>
-            <%= form.submit "Next Slide", class: "btn btn-primary" %>
+            <%= form.submit "Next Slide", class: "slide-footer-btn" %>
         <% else %>
-            <%= form.submit "Submit answer", class: "btn btn-primary" %>
+            <%= form.submit "Submit answer", class: "slide-footer-btn" %>
         <% end %>
-                
-    <% end %>
+    </div>
+
 </div>
+
+<% end %>

From b71cf8a6ee9d567774ad17ed2b6f7958fe645ff2 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Sun, 23 Feb 2025 13:51:50 +0100
Subject: [PATCH 042/103] Style "Next slide" button & add slide shadow

---
 app/assets/stylesheets/_branding.scss      |  4 ++++
 app/assets/stylesheets/vignettes-take.scss | 13 +++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/app/assets/stylesheets/_branding.scss b/app/assets/stylesheets/_branding.scss
index a05952089..2fe9c655b 100644
--- a/app/assets/stylesheets/_branding.scss
+++ b/app/assets/stylesheets/_branding.scss
@@ -1 +1,5 @@
 $mampf-blue: #223e62;
+
+@function mampf-blue($alpha) {
+    @return rgba($mampf-blue, $alpha);
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/vignettes-take.scss b/app/assets/stylesheets/vignettes-take.scss
index 61c4cec33..4545fd1f0 100644
--- a/app/assets/stylesheets/vignettes-take.scss
+++ b/app/assets/stylesheets/vignettes-take.scss
@@ -5,8 +5,13 @@
     margin-top: 1em;
     margin-bottom: 1em;
     border: $mampf-blue 2px solid;
-    // border-radius: 0.4em;
-    box-shadow: 0px 2px 7px 0rem rgba(34, 62, 98, 0.2);
+    box-shadow: rgba(0, 0, 0, 0.1) 0px 1px 3px;
+
+    transition: box-shadow 120ms ease-in-out;
+    &:hover {
+        box-shadow: rgba(50, 50, 93, 0.1) -1px 8px 50px -20px,
+            rgba(0, 0, 0, 0.15) 0px 10px 50px -25px;
+    }
 }
 
 .slide-header {
@@ -23,8 +28,8 @@
     cursor: pointer;
     border-radius: 0.4em;
 
-    transition: 200ms;
+    transition: box-shadow 200ms ease-in-out;
     &:hover {
-        box-shadow: 0px 2px 7px 0rem rgba(34, 62, 98, 0.2);
+        box-shadow: 0px 2px 7px 0rem mampf-blue(0.2);
     }
 }

From 0cd77ada96a7533160e82227a03db14507a2465b Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Sun, 23 Feb 2025 14:40:44 +0100
Subject: [PATCH 043/103] Render info slides as modals

---
 app/assets/stylesheets/vignettes.scss         | 15 ------
 .../info_slides/_take_modal.html.erb          | 10 ++++
 .../info_slides/_take_modal_content.html.erb  | 10 ++++
 .../vignettes/questionnaires/take.html.erb    | 47 ++++++++++---------
 4 files changed, 45 insertions(+), 37 deletions(-)
 create mode 100644 app/views/vignettes/info_slides/_take_modal.html.erb
 create mode 100644 app/views/vignettes/info_slides/_take_modal_content.html.erb

diff --git a/app/assets/stylesheets/vignettes.scss b/app/assets/stylesheets/vignettes.scss
index c45efb400..e69de29bb 100644
--- a/app/assets/stylesheets/vignettes.scss
+++ b/app/assets/stylesheets/vignettes.scss
@@ -1,15 +0,0 @@
-.info-slide-icon-button {
-  background: none;
-  border: none;
-  padding: 0;
-  margin: 5px;
-  cursor: pointer;
-  
-  &:hover {
-    opacity: 0.8;
-  }
-  
-  &:focus {
-    outline: none;
-  }
-}
\ No newline at end of file
diff --git a/app/views/vignettes/info_slides/_take_modal.html.erb b/app/views/vignettes/info_slides/_take_modal.html.erb
new file mode 100644
index 000000000..b06136875
--- /dev/null
+++ b/app/views/vignettes/info_slides/_take_modal.html.erb
@@ -0,0 +1,10 @@
+<div id="vignette-info-slide-modal-<%= index %>" class="modal fade"
+    tabindex="-1" role="dialog"
+    aria-labelledby="Submit feedback" aria-hidden="true">
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content p-4">
+            <%= render partial: 'vignettes/info_slides/take_modal_content',
+                                locals: { info_slide: info_slide } %>
+        </div>
+    </div>
+</div>
diff --git a/app/views/vignettes/info_slides/_take_modal_content.html.erb b/app/views/vignettes/info_slides/_take_modal_content.html.erb
new file mode 100644
index 000000000..6e972156c
--- /dev/null
+++ b/app/views/vignettes/info_slides/_take_modal_content.html.erb
@@ -0,0 +1,10 @@
+<div class="modal-header">
+  <i class="bi bi-info-circle-fill me-3"></i>
+  <h1 class="modal-title fs-5"><%= info_slide.title %></h1>
+  <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close">
+  </button>
+</div>
+
+<div class="modal-body">
+    <%= info_slide.content %>
+</div>
diff --git a/app/views/vignettes/questionnaires/take.html.erb b/app/views/vignettes/questionnaires/take.html.erb
index 8f6aae1c6..0d740bfd7 100644
--- a/app/views/vignettes/questionnaires/take.html.erb
+++ b/app/views/vignettes/questionnaires/take.html.erb
@@ -1,6 +1,13 @@
 <%= stylesheet_link_tag 'vignettes-take' %>
 <%= javascript_include_tag 'vignettes/take_questionnaire' %>
 
+<!-- Info Slide Modals -->
+<% @slide.info_slides.each_with_index do |info_slide, index| %>
+    <%= render partial: 'vignettes/info_slides/take_modal',
+                        locals: { index: index, info_slide: info_slide } %>
+<% end %>
+
+<!-- Slide -->
 <%= form_with(model: @answer, id: "answer_form",
               url: submit_answer_vignettes_questionnaire_url(@questionnaire),
               local: true) do |form| %>
@@ -8,42 +15,37 @@
 <div id="vignette-take-card" class="container-md small-width card">
 
     <div class="slide-header text-light">
-        <!-- TODO: add a slide title -->
-        <h4> Slide <%= @slide.position %></h4>
+        <!-- TODO: add a proper user-defined slide title -->
+        <!-- TODO: add a marker where the user currently is, e.g. (1/5) -->
+        <h4 class="mb-0"> Slide <%= @slide.position %></h4>
     </div>
 
+    <!-- Info Slides -->
     <div class="card-body">
+        Additional information:
 
         <% @slide.info_slides.each_with_index do |info_slide, index| %>
-        <div id="info-slide-container-<%= index %>" class="info-slide-container" style="display: none;">
-            <h2> Info Slide <%= index + 1 %> </h2>
-            <button class="close-info-slide-button btn btn-primary" data-index="<%= index %>">Close Info Slide</button>
-            <%= info_slide.content %>
-        </div>
+            <!-- TODO: if really needed, add back the possibility for an "image" button -->
+            <!-- via the class info-slide-icon-button -->
+            <button type="button" class="btn" title="Find information about: <%= info_slide.title %>"
+                    data-bs-toggle="modal" data-bs-target="#vignette-info-slide-modal-<%= index %>">
+                <i class="bi bi-info-circle-fill"></i>
+                <%= info_slide.title %>
+            </button>
         <% end %>
 
-        <div id="current-slide-container" data-slide-id="<%= @slide.id %>" data-questionnaire-id="<%= @questionnaire.id %>" >
+    </div>
 
-            <h2> Slide <%= @slide.position %> </h2>
-
-            <% @slide.info_slides.each_with_index do |info_slide, index| %>
-                <% if info_slide.icon.attached? %>
-                <button class="info-slide-button info-slide-icon-button" data-index="<%= index %>">
-                        <%= image_tag info_slide.icon.variant(:thumb), alt: info_slide.title, class: 'info-slide-icon' %>
-                    </button>
-                <% else %>
-                    <button class="info-slide-button btn btn-primary" data-index="<%= index %>">
-                    <%= info_slide.title %>
-                    </button>
-                <% end %>
-            <% end %>
+    <div class="card-body">
 
+        <!-- Main Slide Content -->
+        <div id="current-slide-container" data-slide-id="<%= @slide.id %>" data-questionnaire-id="<%= @questionnaire.id %>" >
             <%= @slide.content %>
             <%= @slide.question.question_text %>
 
             <br>
 
-                <%= form.hidden_field :slide_id, value: @slide.id %>
+            <%= form.hidden_field :slide_id, value: @slide.id %>
 
                 <%= form.fields_for :slide_statistic do |stat_form| %>
                     <%= stat_form.hidden_field :user_id, value: current_user.id %>
@@ -75,6 +77,7 @@
 
     </div>
 
+    <!-- Navigation Controls for Slide -->
     <div class="card-footer d-flex justify-content-end">
         <% if @slide.question.type == "" %>
             <%= form.submit "Next Slide", class: "slide-footer-btn" %>

From 5dd66a0a5b4094907922dce419f5e9889c7f6b0d Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Sun, 23 Feb 2025 14:53:19 +0100
Subject: [PATCH 044/103] Only show info slide section if there is any

---
 app/views/vignettes/questionnaires/take.html.erb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/views/vignettes/questionnaires/take.html.erb b/app/views/vignettes/questionnaires/take.html.erb
index 0d740bfd7..e404a5fea 100644
--- a/app/views/vignettes/questionnaires/take.html.erb
+++ b/app/views/vignettes/questionnaires/take.html.erb
@@ -21,8 +21,11 @@
     </div>
 
     <!-- Info Slides -->
+    <% if @slide.info_slides.any? %>
     <div class="card-body">
-        Additional information:
+        <p class="mb-0">
+            <i>Additional information</i>
+        </p>
 
         <% @slide.info_slides.each_with_index do |info_slide, index| %>
             <!-- TODO: if really needed, add back the possibility for an "image" button -->
@@ -33,8 +36,8 @@
                 <%= info_slide.title %>
             </button>
         <% end %>
-
     </div>
+    <% end %>
 
     <div class="card-body">
 

From 3ca04e34705e186db946b9d59adcf1be992c2296 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Sun, 23 Feb 2025 15:42:26 +0100
Subject: [PATCH 045/103] Redesign text area & add validation

---
 .../vignettes/take_questionnaire.js           | 51 +++++++++++-
 app/models/vignettes/text_answer.rb           |  7 +-
 .../vignettes/answer_types/_text.html.erb     | 15 ++++
 .../vignettes/questionnaires/take.html.erb    | 79 +++++++++----------
 4 files changed, 109 insertions(+), 43 deletions(-)
 create mode 100644 app/views/vignettes/answer_types/_text.html.erb

diff --git a/app/assets/javascripts/vignettes/take_questionnaire.js b/app/assets/javascripts/vignettes/take_questionnaire.js
index f0f866271..3c8f90e0b 100644
--- a/app/assets/javascripts/vignettes/take_questionnaire.js
+++ b/app/assets/javascripts/vignettes/take_questionnaire.js
@@ -1,3 +1,52 @@
+$(document).on("turbolinks:load", () => {
+  if (!shouldRegisterVignette()) {
+    return;
+  }
+  registerTextAnswerValidator();
+});
+
+var VIGNETTE_FORM_ID = "#vignettes-answer-form";
+
+function shouldRegisterVignette() {
+  return $(VIGNETTE_FORM_ID).length > 0;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// Text Answer Fields
+////////////////////////////////////////////////////////////////////////////////
+var TEXT_ANSWER_ID = "vignettes_answer_text";
+
+function registerTextAnswerValidator() {
+  const textBody = document.getElementById(TEXT_ANSWER_ID);
+  textBody.addEventListener("input", () => {
+    validateTextAnswer();
+  });
+}
+
+function validateTextAnswer() {
+  const textBody = document.getElementById(TEXT_ANSWER_ID);
+
+  const validityState = textBody.validity;
+  if (validityState.tooShort) {
+    const tooShortMessage = textBody.dataset.tooShortMessage;
+    textBody.setCustomValidity(tooShortMessage);
+  }
+  else if (validityState.valueMissing) {
+    const valueMissingMessage = textBody.dataset.valueMissingMessage;
+    textBody.setCustomValidity(valueMissingMessage);
+  }
+  else {
+    // render input valid, so that form will submit
+    textBody.setCustomValidity("");
+  }
+
+  textBody.reportValidity();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// TODO
+////////////////////////////////////////////////////////////////////////////////
+
 document.addEventListener("turbolinks:load", () => {
   const infoSlideButtons = document.querySelectorAll(".info-slide-button");
   const closeInfoSlideButtons = document.querySelectorAll(".close-info-slide-button");
@@ -61,7 +110,7 @@ document.addEventListener("turbolinks:load", () => {
     event.preventDefault();
   });
 
-  $(document).on("submit", "#answer_form", () => {
+  $(document).on("submit", VIGNETTE_FORM_ID, () => {
     if (SlideStartTime) {
       totalSlideTime += (Date.now() - SlideStartTime);
     }
diff --git a/app/models/vignettes/text_answer.rb b/app/models/vignettes/text_answer.rb
index 18aa689f5..08eb02b24 100644
--- a/app/models/vignettes/text_answer.rb
+++ b/app/models/vignettes/text_answer.rb
@@ -1,5 +1,10 @@
 module Vignettes
   class TextAnswer < Answer
-    validates :text, presence: true
+    TEXT_MIN_LENGTH = 10
+    TEXT_MAX_LENGTH = 5_000
+
+    validates :text, length: { minimum: TEXT_MIN_LENGTH,
+                               maximum: TEXT_MAX_LENGTH },
+                     allow_blank: false
   end
 end
diff --git a/app/views/vignettes/answer_types/_text.html.erb b/app/views/vignettes/answer_types/_text.html.erb
new file mode 100644
index 000000000..e3e2cdbd8
--- /dev/null
+++ b/app/views/vignettes/answer_types/_text.html.erb
@@ -0,0 +1,15 @@
+<div class="form-floating mt-3">
+    <%= f.text_area :text,
+        placeholder: '_',
+        class: 'form-control',
+        style: 'height: 150px',
+        minlength: Vignettes::TextAnswer::TEXT_MIN_LENGTH,
+        maxlength: Vignettes::TextAnswer::TEXT_MAX_LENGTH,
+        'data-too-short-message':
+            t('feedback.body_too_short_error',
+              min_length: Vignettes::TextAnswer::TEXT_MIN_LENGTH),
+        'data-value-missing-message':
+            t('feedback.body_missing_error')
+    %>
+    <%= f.label :text, 'Your answer' %>
+</div>
diff --git a/app/views/vignettes/questionnaires/take.html.erb b/app/views/vignettes/questionnaires/take.html.erb
index e404a5fea..e2ad10dba 100644
--- a/app/views/vignettes/questionnaires/take.html.erb
+++ b/app/views/vignettes/questionnaires/take.html.erb
@@ -8,26 +8,26 @@
 <% end %>
 
 <!-- Slide -->
-<%= form_with(model: @answer, id: "answer_form",
+<%= form_with(model: @answer, id: "vignettes-answer-form",
               url: submit_answer_vignettes_questionnaire_url(@questionnaire),
               local: true) do |form| %>
 
 <div id="vignette-take-card" class="container-md small-width card">
 
+    <!-- Header -->
     <div class="slide-header text-light">
         <!-- TODO: add a proper user-defined slide title -->
         <!-- TODO: add a marker where the user currently is, e.g. (1/5) -->
         <h4 class="mb-0"> Slide <%= @slide.position %></h4>
     </div>
 
-    <!-- Info Slides -->
+    <!-- Additional information (Info Slides) -->
     <% if @slide.info_slides.any? %>
     <div class="card-body">
         <p class="mb-0">
             <i>Additional information</i>
-        </p>
 
-        <% @slide.info_slides.each_with_index do |info_slide, index| %>
+            <% @slide.info_slides.each_with_index do |info_slide, index| %>
             <!-- TODO: if really needed, add back the possibility for an "image" button -->
             <!-- via the class info-slide-icon-button -->
             <button type="button" class="btn" title="Find information about: <%= info_slide.title %>"
@@ -35,52 +35,49 @@
                 <i class="bi bi-info-circle-fill"></i>
                 <%= info_slide.title %>
             </button>
-        <% end %>
+            <% end %>
+        </p>
     </div>
     <% end %>
 
+    <!-- Main Content -->
     <div class="card-body">
+        <%= @slide.content %>
+    </div>
 
-        <!-- Main Slide Content -->
-        <div id="current-slide-container" data-slide-id="<%= @slide.id %>" data-questionnaire-id="<%= @questionnaire.id %>" >
-            <%= @slide.content %>
-            <%= @slide.question.question_text %>
-
-            <br>
-
-            <%= form.hidden_field :slide_id, value: @slide.id %>
-
-                <%= form.fields_for :slide_statistic do |stat_form| %>
-                    <%= stat_form.hidden_field :user_id, value: current_user.id %>
-                    <%= stat_form.hidden_field :time_on_slide, id: "time-on-slide-field" %>
-                    <%= stat_form.hidden_field :time_on_info_slides, id: "time-on-info-slides-field" %>
-                    <%= stat_form.hidden_field :info_slides_access_count, id:"info-slides-access-count-field" %>
-                <% end %>
-
-                <% case @slide.question.type %> 
-                    <% when "Vignettes::TextQuestion" %>
-                        <%= form.label :text, "Your Answer" %>
-                        <%= form.text_area :text %>
-                    <% when "Vignettes::MultipleChoiceQuestion" %>
-                        <% @slide.question.options.each do |option| %>
-                            <%= option.text %>
-                            <%= check_box_tag "vignettes_answer[option_ids][]", option.id, @answer.option_ids.include?(option.id) %>
-                        <% end %>
-                    <% when "Vignettes::LikertScaleQuestion" %>
-                        <% Vignettes::LikertScaleQuestion::LIKERT_LABELS.each do |value, label| %>
-                        <div>
-                            <%= form.radio_button :likert_scale_value, value %>
-                            <%= form.label :likert_scale_value, label %>
-                        </div>
-                        <% end %>
-                <br>
-                        
+    <!-- Answer Section -->
+    <div class="card-body">
+        <%= @slide.question.question_text %>
+
+        <%= form.hidden_field :slide_id, value: @slide.id %>
+            <%= form.fields_for :slide_statistic do |stat_form| %>
+                <%= stat_form.hidden_field :user_id, value: current_user.id %>
+                <%= stat_form.hidden_field :time_on_slide, id: "time-on-slide-field" %>
+                <%= stat_form.hidden_field :time_on_info_slides, id: "time-on-info-slides-field" %>
+                <%= stat_form.hidden_field :info_slides_access_count, id:"info-slides-access-count-field" %>
             <% end %>
-        </div>
 
+            <% case @slide.question.type %>
+                <% when "Vignettes::TextQuestion" %>
+                    <%= render partial: 'vignettes/answer_types/text', locals: { f: form } %>
+                <% when "Vignettes::MultipleChoiceQuestion" %>
+                    <% @slide.question.options.each do |option| %>
+                        <%= option.text %>
+                        <%= check_box_tag "vignettes_answer[option_ids][]", option.id, @answer.option_ids.include?(option.id) %>
+                    <% end %>
+                <% when "Vignettes::LikertScaleQuestion" %>
+                    <% Vignettes::LikertScaleQuestion::LIKERT_LABELS.each do |value, label| %>
+                    <div>
+                        <%= form.radio_button :likert_scale_value, value %>
+                        <%= form.label :likert_scale_value, label %>
+                    </div>
+                    <% end %>
+            <br>
+                    
+        <% end %>
     </div>
 
-    <!-- Navigation Controls for Slide -->
+    <!-- Navigation Controls -->
     <div class="card-footer d-flex justify-content-end">
         <% if @slide.question.type == "" %>
             <%= form.submit "Next Slide", class: "slide-footer-btn" %>

From a3bb4e0c40dbbf9ce53fea944c1354ac14feb41b Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Sun, 23 Feb 2025 16:03:23 +0100
Subject: [PATCH 046/103] Check validations on form submit

---
 .../vignettes/take_questionnaire.js           | 20 +++++++++++++++++++
 .../vignettes/answer_types/_text.html.erb     |  1 +
 2 files changed, 21 insertions(+)

diff --git a/app/assets/javascripts/vignettes/take_questionnaire.js b/app/assets/javascripts/vignettes/take_questionnaire.js
index 3c8f90e0b..528dd81f4 100644
--- a/app/assets/javascripts/vignettes/take_questionnaire.js
+++ b/app/assets/javascripts/vignettes/take_questionnaire.js
@@ -2,6 +2,7 @@ $(document).on("turbolinks:load", () => {
   if (!shouldRegisterVignette()) {
     return;
   }
+  registerSubmitHandler();
   registerTextAnswerValidator();
 });
 
@@ -11,6 +12,18 @@ function shouldRegisterVignette() {
   return $(VIGNETTE_FORM_ID).length > 0;
 }
 
+function registerSubmitHandler() {
+  $(VIGNETTE_FORM_ID).submit((event) => {
+    let isValid = false;
+    isValid = validateTextAnswer();
+
+    if (!isValid) {
+      event.preventDefault();
+      return false;
+    }
+  });
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // Text Answer Fields
 ////////////////////////////////////////////////////////////////////////////////
@@ -25,6 +38,11 @@ function registerTextAnswerValidator() {
 
 function validateTextAnswer() {
   const textBody = document.getElementById(TEXT_ANSWER_ID);
+  if (!textBody) {
+    return true;
+  }
+
+  let isValid = false;
 
   const validityState = textBody.validity;
   if (validityState.tooShort) {
@@ -38,9 +56,11 @@ function validateTextAnswer() {
   else {
     // render input valid, so that form will submit
     textBody.setCustomValidity("");
+    isValid = true;
   }
 
   textBody.reportValidity();
+  return isValid;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/app/views/vignettes/answer_types/_text.html.erb b/app/views/vignettes/answer_types/_text.html.erb
index e3e2cdbd8..0abc1f6a7 100644
--- a/app/views/vignettes/answer_types/_text.html.erb
+++ b/app/views/vignettes/answer_types/_text.html.erb
@@ -3,6 +3,7 @@
         placeholder: '_',
         class: 'form-control',
         style: 'height: 150px',
+        required: true,
         minlength: Vignettes::TextAnswer::TEXT_MIN_LENGTH,
         maxlength: Vignettes::TextAnswer::TEXT_MAX_LENGTH,
         'data-too-short-message':

From b23bfe781f0712cff4a6a60b2df0c5c71d57ac8e Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Sun, 23 Feb 2025 16:19:46 +0100
Subject: [PATCH 047/103] Move answer section to card footer & restyle submit
 button

---
 app/assets/stylesheets/_branding.scss         |  1 +
 app/assets/stylesheets/vignettes-take.scss    | 19 ++++++---------
 .../vignettes/questionnaires/take.html.erb    | 23 +++++++++----------
 3 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/app/assets/stylesheets/_branding.scss b/app/assets/stylesheets/_branding.scss
index 2fe9c655b..568a60dbd 100644
--- a/app/assets/stylesheets/_branding.scss
+++ b/app/assets/stylesheets/_branding.scss
@@ -1,4 +1,5 @@
 $mampf-blue: #223e62;
+$mampf-blue-focus: #3d5e8a;
 
 @function mampf-blue($alpha) {
     @return rgba($mampf-blue, $alpha);
diff --git a/app/assets/stylesheets/vignettes-take.scss b/app/assets/stylesheets/vignettes-take.scss
index 4545fd1f0..0482cabbd 100644
--- a/app/assets/stylesheets/vignettes-take.scss
+++ b/app/assets/stylesheets/vignettes-take.scss
@@ -6,12 +6,6 @@
     margin-bottom: 1em;
     border: $mampf-blue 2px solid;
     box-shadow: rgba(0, 0, 0, 0.1) 0px 1px 3px;
-
-    transition: box-shadow 120ms ease-in-out;
-    &:hover {
-        box-shadow: rgba(50, 50, 93, 0.1) -1px 8px 50px -20px,
-            rgba(0, 0, 0, 0.15) 0px 10px 50px -25px;
-    }
 }
 
 .slide-header {
@@ -22,14 +16,15 @@
 .slide-footer-btn {
     background-color: $mampf-blue;
     color: white;
-    border: none;
-    padding: 0.5rem 1rem;
-    margin: 0.5rem;
-    cursor: pointer;
-    border-radius: 0.4em;
 
-    transition: box-shadow 200ms ease-in-out;
+    transition: 150ms ease-in-out;
     &:hover {
+        background-color: $mampf-blue-focus;
+        color: white;
         box-shadow: 0px 2px 7px 0rem mampf-blue(0.2);
     }
 }
+
+.vignette-answer {
+    padding: var(--bs-card-spacer-y) var(--bs-card-spacer-x);
+}
\ No newline at end of file
diff --git a/app/views/vignettes/questionnaires/take.html.erb b/app/views/vignettes/questionnaires/take.html.erb
index e2ad10dba..3a5557636 100644
--- a/app/views/vignettes/questionnaires/take.html.erb
+++ b/app/views/vignettes/questionnaires/take.html.erb
@@ -46,7 +46,7 @@
     </div>
 
     <!-- Answer Section -->
-    <div class="card-body">
+    <div class="card-footer vignette-answer">
         <%= @slide.question.question_text %>
 
         <%= form.hidden_field :slide_id, value: @slide.id %>
@@ -71,19 +71,18 @@
                         <%= form.radio_button :likert_scale_value, value %>
                         <%= form.label :likert_scale_value, label %>
                     </div>
-                    <% end %>
-            <br>
-                    
+            <% end %>
+    
         <% end %>
-    </div>
 
-    <!-- Navigation Controls -->
-    <div class="card-footer d-flex justify-content-end">
-        <% if @slide.question.type == "" %>
-            <%= form.submit "Next Slide", class: "slide-footer-btn" %>
-        <% else %>
-            <%= form.submit "Submit answer", class: "slide-footer-btn" %>
-        <% end %>
+        <!-- Navigation -->
+        <div class="d-flex justify-content-end mt-3">
+            <% if @slide.question.type == "" %>
+                <%= form.submit "Next Slide", class: "btn slide-footer-btn" %>
+            <% else %>
+                <%= form.submit "Submit answer", class: "btn slide-footer-btn" %>
+            <% end %>
+        </div>
     </div>
 
 </div>

From debbb4a9f8c82523f32ae3117ab038abc204268a Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Sun, 23 Feb 2025 17:27:09 +0100
Subject: [PATCH 048/103] Use object-oriented model for slide statistics

---
 .../vignettes/take_questionnaire.js           | 164 ++++++++++--------
 app/assets/stylesheets/vignettes-take.scss    |   2 +-
 .../info_slides/_take_modal.html.erb          |   4 +-
 .../vignettes/questionnaires/take.html.erb    |  27 +--
 4 files changed, 114 insertions(+), 83 deletions(-)

diff --git a/app/assets/javascripts/vignettes/take_questionnaire.js b/app/assets/javascripts/vignettes/take_questionnaire.js
index 528dd81f4..f0099c16b 100644
--- a/app/assets/javascripts/vignettes/take_questionnaire.js
+++ b/app/assets/javascripts/vignettes/take_questionnaire.js
@@ -1,16 +1,19 @@
+var VIGNETTE_FORM_ID = "#vignettes-answer-form";
+function shouldRegisterVignette() {
+  return $(VIGNETTE_FORM_ID).length > 0;
+}
+
 $(document).on("turbolinks:load", () => {
   if (!shouldRegisterVignette()) {
     return;
   }
+
   registerSubmitHandler();
   registerTextAnswerValidator();
-});
-
-var VIGNETTE_FORM_ID = "#vignettes-answer-form";
 
-function shouldRegisterVignette() {
-  return $(VIGNETTE_FORM_ID).length > 0;
-}
+  const stats = new VignetteSlideStatistics();
+  registerStatisticsHandler(stats);
+});
 
 function registerSubmitHandler() {
   $(VIGNETTE_FORM_ID).submit((event) => {
@@ -64,84 +67,107 @@ function validateTextAnswer() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// TODO
+// Statistics
 ////////////////////////////////////////////////////////////////////////////////
 
-document.addEventListener("turbolinks:load", () => {
-  const infoSlideButtons = document.querySelectorAll(".info-slide-button");
-  const closeInfoSlideButtons = document.querySelectorAll(".close-info-slide-button");
-  const infoSlideContainers = document.querySelectorAll(".info-slide-container");
-  const slideContainer = document.getElementById("current-slide-container");
-
-  const timeOnSlideField = document.getElementById("time-on-slide-field");
-  const timeOnInfoSlidesField = document.getElementById("time-on-info-slides-field");
-  const infoSlidesAccessCountField = document.getElementById("info-slides-access-count-field");
-
-  const form = document.querySelector("form");
-
-  let SlideStartTime = new Date();
-  let InfoSlideStartTime = null;
+class VignetteSlideStatistics {
+  slideStartTime = new Date();
+  totalSlideTime = 0;
 
-  var activeInfoSlideIndex = null;
+  infoSlideAccessCounts = {};
+  infoSlideStartTime = null;
+  infoSlideTimes = {};
 
-  // Time in seconds
-  let totalSlideTime = 0;
-  let infoSlideTimes = {};
+  increaseInfoSlideAccessCount(index) {
+    this.infoSlideAccessCounts[index] ??= 0;
+    this.infoSlideAccessCounts[index]++;
+  }
 
-  let infoSlidesAccessCount = {};
+  freezeSlideTime() {
+    if (this.slideStartTime === null) {
+      console.error("Attempted to freeze slide time when it was already frozen");
+      return;
+    }
+    this.totalSlideTime += (Date.now() - this.slideStartTime);
+    this.slideStartTime = null;
+  }
 
-  infoSlideButtons.forEach((button) => {
-    button.addEventListener("click", () => {
-      const index = button.getAttribute("data-index");
-      activeInfoSlideIndex = index;
+  unfreezeSlideTime() {
+    this.slideStartTime = Date.now();
+  }
 
-      // Hide all info slides and the slide
-      infoSlideContainers.forEach(container => container.style.display = "none");
-      slideContainer.style.display = "none";
-      // Make selected info slide visible
-      document.getElementById(`info-slide-container-${index}`).style.display = "block";
+  startInfoSlideTimer() {
+    this.infoSlideStartTime = Date.now();
+  }
 
-      // Increase access count on selected info slide
-      infoSlidesAccessCount[index] = (infoSlidesAccessCount[index] || 0) + 1;
+  stopInfoSlideTimer(index) {
+    if (this.infoSlideStartTime === null) {
+      console.error("Attempted to stop info slide timer when it was already stopped");
+      return;
+    }
+    const timeOnInfoSlide = (Date.now() - this.infoSlideStartTime);
+    this.infoSlideTimes[index] = (this.infoSlideTimes[index] || 0.0) + timeOnInfoSlide;
+    this.infoSlideStartTime = null;
+  }
 
-      totalSlideTime += (Date.now() - SlideStartTime);
-      SlideStartTime = null;
+  postProcessTimes() {
+    for (let key in this.infoSlideTimes) {
+      this.infoSlideTimes[key] = Math.floor(this.infoSlideTimes[key] / 1000);
+    }
+    this.totalSlideTime = Math.floor(this.totalSlideTime / 1000);
+  }
+}
 
-      InfoSlideStartTime = Date.now();
+function registerStatisticsHandler(stats) {
+  // Info Slide - Opening
+  const openInfoSlideButtons = $(".open-info-slide-btn");
+  if (!openInfoSlideButtons) {
+    return;
+  }
+  openInfoSlideButtons.each(function () {
+    const index = $(this).attr("data-info-slide-index");
+    $(this).click(() => {
+      stats.freezeSlideTime();
+      stats.increaseInfoSlideAccessCount(index);
+      stats.startInfoSlideTimer();
     });
   });
 
-  closeInfoSlideButtons.forEach((button) => {
-    button.addEventListener("click", () => {
-      activeInfoSlideIndex = null;
-      const index = button.getAttribute("data-index");
-      document.getElementById(`info-slide-container-${index}`).style.display = "none";
-      slideContainer.style.display = "block";
-
-      const timeSpentOnInfoSlide = (Date.now() - InfoSlideStartTime);
-      infoSlideTimes[index] = (timeSpentOnInfoSlide[index] || 0) + timeSpentOnInfoSlide;
-      InfoSlideStartTime = null;
-
-      SlideStartTime = Date.now();
+  // Info Slide - Closing
+  const infoSlideModals = $(".vignette-info-slide-modal");
+  if (!infoSlideModals) {
+    console.error("No info slide modals found");
+    return;
+  }
+  infoSlideModals.each(function () {
+    $(this).on("hidden.bs.modal", function () {
+      const index = $(this).attr("data-info-slide-index");
+      console.log(`Modal with index ${index} closed`);
+      stats.stopInfoSlideTimer(index);
+      stats.unfreezeSlideTime();
     });
   });
 
-  form.addEventListener("submit", () => {
-    event.preventDefault();
-  });
-
-  $(document).on("submit", VIGNETTE_FORM_ID, () => {
-    if (SlideStartTime) {
-      totalSlideTime += (Date.now() - SlideStartTime);
-    }
-    else if (activeInfoSlideIndex) {
-      infoSlideTimes[activeInfoSlideIndex] += (Date.now() - InfoSlideStartTime);
-    }
-    for (let key in infoSlideTimes) {
-      infoSlideTimes[key] = Math.floor(infoSlideTimes[key] / 1000);
+  // Form Submission
+  $(VIGNETTE_FORM_ID).submit(() => {
+    // Take rest of time into account
+    if (stats.slideStartTime) {
+      stats.freezeSlideTime();
     }
-    timeOnSlideField.value = Math.floor(totalSlideTime / 1000);
-    timeOnInfoSlidesField.value = JSON.stringify(infoSlideTimes);
-    infoSlidesAccessCountField.value = JSON.stringify(infoSlidesAccessCount);
+
+    stats.postProcessTimes();
+
+    console.log("Vignette statistics:");
+    console.log("Total slide time: " + stats.totalSlideTime);
+    console.log("Info slide times: " + JSON.stringify(stats.infoSlideTimes));
+    console.log("Info slide access counts: " + JSON.stringify(stats.infoSlideAccessCounts));
+
+    // Transfer results to hidden form-fields
+    const timeOnSlideField = $("#time-on-slide-field");
+    const timeOnInfoSlidesField = $("#time-on-info-slides-field");
+    const infoSlidesAccessCountField = $("#info-slides-access-count-field");
+    timeOnSlideField.value = stats.totalSlideTime;
+    timeOnInfoSlidesField.value = JSON.stringify(stats.infoSlideTimes);
+    infoSlidesAccessCountField.value = JSON.stringify(stats.infoSlideAccessCounts);
   });
-});
+}
diff --git a/app/assets/stylesheets/vignettes-take.scss b/app/assets/stylesheets/vignettes-take.scss
index 0482cabbd..1e212e258 100644
--- a/app/assets/stylesheets/vignettes-take.scss
+++ b/app/assets/stylesheets/vignettes-take.scss
@@ -16,8 +16,8 @@
 .slide-footer-btn {
     background-color: $mampf-blue;
     color: white;
-
     transition: 150ms ease-in-out;
+
     &:hover {
         background-color: $mampf-blue-focus;
         color: white;
diff --git a/app/views/vignettes/info_slides/_take_modal.html.erb b/app/views/vignettes/info_slides/_take_modal.html.erb
index b06136875..adebac5a5 100644
--- a/app/views/vignettes/info_slides/_take_modal.html.erb
+++ b/app/views/vignettes/info_slides/_take_modal.html.erb
@@ -1,5 +1,7 @@
-<div id="vignette-info-slide-modal-<%= index %>" class="modal fade"
+<div id="vignette-info-slide-modal-<%= index %>"
+    class="modal fade vignette-info-slide-modal"
     tabindex="-1" role="dialog"
+    data-info-slide-index="<%= index %>"
     aria-labelledby="Submit feedback" aria-hidden="true">
     <div class="modal-dialog modal-lg">
         <div class="modal-content p-4">
diff --git a/app/views/vignettes/questionnaires/take.html.erb b/app/views/vignettes/questionnaires/take.html.erb
index 3a5557636..b04a092bd 100644
--- a/app/views/vignettes/questionnaires/take.html.erb
+++ b/app/views/vignettes/questionnaires/take.html.erb
@@ -18,25 +18,28 @@
     <div class="slide-header text-light">
         <!-- TODO: add a proper user-defined slide title -->
         <!-- TODO: add a marker where the user currently is, e.g. (1/5) -->
-        <h4 class="mb-0"> Slide <%= @slide.position %></h4>
+        <p class="mb-0 fs-5 fw-bold"> Slide <%= @slide.position %></p>
     </div>
 
-    <!-- Additional information (Info Slides) -->
+    <!-- Additional information Buttons -->
     <% if @slide.info_slides.any? %>
     <div class="card-body">
         <p class="mb-0">
             <i>Additional information</i>
-
-            <% @slide.info_slides.each_with_index do |info_slide, index| %>
-            <!-- TODO: if really needed, add back the possibility for an "image" button -->
-            <!-- via the class info-slide-icon-button -->
-            <button type="button" class="btn" title="Find information about: <%= info_slide.title %>"
-                    data-bs-toggle="modal" data-bs-target="#vignette-info-slide-modal-<%= index %>">
-                <i class="bi bi-info-circle-fill"></i>
-                <%= info_slide.title %>
-            </button>
-            <% end %>
         </p>
+
+        <!-- TODO: ensure that sorting here is consistent from the backend -->
+        <% @slide.info_slides.each_with_index do |info_slide, index| %>
+        <!-- TODO: if really needed, add back the possibility for an "image" button -->
+        <!-- via the class info-slide-icon-button -->
+        <button type="button" class="btn open-info-slide-btn"
+                title="Find information about: <%= info_slide.title %>"
+                data-bs-toggle="modal" data-bs-target="#vignette-info-slide-modal-<%= index %>"
+                data-info-slide-index="<%= index %>">
+            <i class="bi bi-info-circle-fill me-1"></i>
+            <%= info_slide.title %>
+        </button>
+        <% end %>
     </div>
     <% end %>
 

From 553c035729c29d823c83714bd1e2c0c3dfeca024 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Sun, 23 Feb 2025 17:28:06 +0100
Subject: [PATCH 049/103] Remove console errors

---
 app/assets/javascripts/vignettes/take_questionnaire.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/app/assets/javascripts/vignettes/take_questionnaire.js b/app/assets/javascripts/vignettes/take_questionnaire.js
index f0099c16b..abc28f443 100644
--- a/app/assets/javascripts/vignettes/take_questionnaire.js
+++ b/app/assets/javascripts/vignettes/take_questionnaire.js
@@ -142,7 +142,6 @@ function registerStatisticsHandler(stats) {
   infoSlideModals.each(function () {
     $(this).on("hidden.bs.modal", function () {
       const index = $(this).attr("data-info-slide-index");
-      console.log(`Modal with index ${index} closed`);
       stats.stopInfoSlideTimer(index);
       stats.unfreezeSlideTime();
     });
@@ -157,11 +156,6 @@ function registerStatisticsHandler(stats) {
 
     stats.postProcessTimes();
 
-    console.log("Vignette statistics:");
-    console.log("Total slide time: " + stats.totalSlideTime);
-    console.log("Info slide times: " + JSON.stringify(stats.infoSlideTimes));
-    console.log("Info slide access counts: " + JSON.stringify(stats.infoSlideAccessCounts));
-
     // Transfer results to hidden form-fields
     const timeOnSlideField = $("#time-on-slide-field");
     const timeOnInfoSlidesField = $("#time-on-info-slides-field");

From 288fc00656bf8beda89d3cc556f7eca0933ee4e3 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Sun, 23 Feb 2025 19:34:01 +0100
Subject: [PATCH 050/103] Early return if not text question

---
 app/assets/javascripts/vignettes/take_questionnaire.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/vignettes/take_questionnaire.js b/app/assets/javascripts/vignettes/take_questionnaire.js
index abc28f443..c473b51f4 100644
--- a/app/assets/javascripts/vignettes/take_questionnaire.js
+++ b/app/assets/javascripts/vignettes/take_questionnaire.js
@@ -34,7 +34,10 @@ var TEXT_ANSWER_ID = "vignettes_answer_text";
 
 function registerTextAnswerValidator() {
   const textBody = document.getElementById(TEXT_ANSWER_ID);
-  textBody.addEventListener("input", () => {
+  if (!textBody) {
+    return;
+  }
+  $(textBody).on("input", () => {
     validateTextAnswer();
   });
 }

From 47f857edef9bd8bbba9cbcae799f10073ae30e8f Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Sun, 23 Feb 2025 20:15:50 +0100
Subject: [PATCH 051/103] Add design for likert scale

---
 .vscode/settings.json                         |  1 +
 app/assets/stylesheets/likert.scss            | 54 +++++++++++++++++++
 .../answer_types/_likert_scale.html.erb       | 15 ++++++
 .../vignettes/questionnaires/take.html.erb    | 12 ++---
 4 files changed, 74 insertions(+), 8 deletions(-)
 create mode 100644 app/assets/stylesheets/likert.scss
 create mode 100644 app/views/vignettes/answer_types/_likert_scale.html.erb

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 078e921ec..57de8d2fb 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -123,6 +123,7 @@
         "justfile",
         "katex",
         "lightgray",
+        "likert",
         "localroot",
         "mailcatcher",
         "mampf",
diff --git a/app/assets/stylesheets/likert.scss b/app/assets/stylesheets/likert.scss
new file mode 100644
index 000000000..7453b662b
--- /dev/null
+++ b/app/assets/stylesheets/likert.scss
@@ -0,0 +1,54 @@
+// adapted from
+// https://jamesalvarez.co.uk/blog/how-to-make-responsive-likert-scales-in-css-(like-qualtrics)/
+
+.likert {
+    --likert-rows: 5;
+    display: inline-grid;
+    max-width: 900px;
+    grid-auto-rows: 1fr;
+    gap: 1em;
+    grid-template-columns: repeat(var(--likert-rows), minmax(0, 1fr));
+}
+
+@media only screen and (max-width: 620px) {
+    .likert {
+        grid-template-columns: minmax(0, 400px);
+        justify-content: center;
+    }
+}
+
+.likert input {
+    max-width: 250px;
+    position: fixed;
+    opacity: 0;
+    pointer-events: none;
+}
+
+.likert span {
+    border-radius: 5px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    text-align: center;
+    box-sizing: border-box;
+    width: 100%;
+    height: 100%;
+    padding: 20px;
+    cursor: pointer;
+    background: #dcdcdc;
+    transition: background 180ms ease-in-out;
+}
+
+.likert input:checked+span {
+    outline: black auto 1px;
+    background: transparent;
+}
+
+.likert input:focus+span {
+    outline: -webkit-focus-ring-color auto 1px;
+}
+
+.likert span:hover {
+    background: #f1f1f1;
+    outline: lightgrey auto 0.5px;
+}
\ No newline at end of file
diff --git a/app/views/vignettes/answer_types/_likert_scale.html.erb b/app/views/vignettes/answer_types/_likert_scale.html.erb
new file mode 100644
index 000000000..cc45955b1
--- /dev/null
+++ b/app/views/vignettes/answer_types/_likert_scale.html.erb
@@ -0,0 +1,15 @@
+<%= stylesheet_link_tag 'likert' %>
+
+<!-- Adapted from this great blog post -->
+<!-- https://jamesalvarez.co.uk/blog/how-to-make-responsive-likert-scales-in-css-(like-qualtrics)/ -->
+<div class="likert w-100">
+    <% Vignettes::LikertScaleQuestion::LIKERT_LABELS.each do |value, label| %>
+        <label>
+            <input name="l" type="radio" value="<%= value %>">
+            <span>
+                <%= label %>
+            </span>
+            </input>
+        </label>
+        <% end %>
+</div>
diff --git a/app/views/vignettes/questionnaires/take.html.erb b/app/views/vignettes/questionnaires/take.html.erb
index b04a092bd..d4d17cda4 100644
--- a/app/views/vignettes/questionnaires/take.html.erb
+++ b/app/views/vignettes/questionnaires/take.html.erb
@@ -50,7 +50,9 @@
 
     <!-- Answer Section -->
     <div class="card-footer vignette-answer">
-        <%= @slide.question.question_text %>
+        <p>
+            <%= @slide.question.question_text %>
+        </p>
 
         <%= form.hidden_field :slide_id, value: @slide.id %>
             <%= form.fields_for :slide_statistic do |stat_form| %>
@@ -69,13 +71,7 @@
                         <%= check_box_tag "vignettes_answer[option_ids][]", option.id, @answer.option_ids.include?(option.id) %>
                     <% end %>
                 <% when "Vignettes::LikertScaleQuestion" %>
-                    <% Vignettes::LikertScaleQuestion::LIKERT_LABELS.each do |value, label| %>
-                    <div>
-                        <%= form.radio_button :likert_scale_value, value %>
-                        <%= form.label :likert_scale_value, label %>
-                    </div>
-            <% end %>
-    
+                    <%= render partial: 'vignettes/answer_types/likert_scale', locals: { f: form } %>
         <% end %>
 
         <!-- Navigation -->

From cf767662a86746a0ad0a87b55c6f452a3b2a79a6 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Sun, 23 Feb 2025 20:20:23 +0100
Subject: [PATCH 052/103] Swap main content and additional information

---
 .../vignettes/questionnaires/take.html.erb    | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/app/views/vignettes/questionnaires/take.html.erb b/app/views/vignettes/questionnaires/take.html.erb
index d4d17cda4..f40fa07ed 100644
--- a/app/views/vignettes/questionnaires/take.html.erb
+++ b/app/views/vignettes/questionnaires/take.html.erb
@@ -21,33 +21,33 @@
         <p class="mb-0 fs-5 fw-bold"> Slide <%= @slide.position %></p>
     </div>
 
+    <!-- Main Content -->
+    <div class="card-body">
+        <%= @slide.content %>
+    </div>
+
     <!-- Additional information Buttons -->
     <% if @slide.info_slides.any? %>
     <div class="card-body">
-        <p class="mb-0">
-            <i>Additional information</i>
-        </p>
+        <p class="mb-0 d-flex align-items-center">
+            <i class="me-1">Additional information</i>
 
-        <!-- TODO: ensure that sorting here is consistent from the backend -->
-        <% @slide.info_slides.each_with_index do |info_slide, index| %>
-        <!-- TODO: if really needed, add back the possibility for an "image" button -->
-        <!-- via the class info-slide-icon-button -->
-        <button type="button" class="btn open-info-slide-btn"
-                title="Find information about: <%= info_slide.title %>"
-                data-bs-toggle="modal" data-bs-target="#vignette-info-slide-modal-<%= index %>"
-                data-info-slide-index="<%= index %>">
-            <i class="bi bi-info-circle-fill me-1"></i>
-            <%= info_slide.title %>
-        </button>
-        <% end %>
+            <!-- TODO: ensure that sorting here is consistent from the backend -->
+            <% @slide.info_slides.each_with_index do |info_slide, index| %>
+            <!-- TODO: if really needed, add back the possibility for an "image" button -->
+            <!-- via the class info-slide-icon-button -->
+            <button type="button" class="btn open-info-slide-btn"
+                    title="Find information about: <%= info_slide.title %>"
+                    data-bs-toggle="modal" data-bs-target="#vignette-info-slide-modal-<%= index %>"
+                    data-info-slide-index="<%= index %>">
+                <i class="bi bi-info-circle-fill me-1"></i>
+                <%= info_slide.title %>
+            </button>
+            <% end %>
+        </p>
     </div>
     <% end %>
 
-    <!-- Main Content -->
-    <div class="card-body">
-        <%= @slide.content %>
-    </div>
-
     <!-- Answer Section -->
     <div class="card-footer vignette-answer">
         <p>

From bbc6782e2819fa126f0f113d611c1a9d6fad639c Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Sun, 23 Feb 2025 20:38:45 +0100
Subject: [PATCH 053/103] Fix alignment of additional information on small
 screens

---
 app/views/vignettes/questionnaires/take.html.erb | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/views/vignettes/questionnaires/take.html.erb b/app/views/vignettes/questionnaires/take.html.erb
index f40fa07ed..1bd4cb175 100644
--- a/app/views/vignettes/questionnaires/take.html.erb
+++ b/app/views/vignettes/questionnaires/take.html.erb
@@ -29,22 +29,26 @@
     <!-- Additional information Buttons -->
     <% if @slide.info_slides.any? %>
     <div class="card-body">
-        <p class="mb-0 d-flex align-items-center">
-            <i class="me-1">Additional information</i>
+        <div class="d-flex flex-wrap align-items-center w-100">
+            <p class="mb-0"><i class="me-1">Additional information</i></p>
 
             <!-- TODO: ensure that sorting here is consistent from the backend -->
             <% @slide.info_slides.each_with_index do |info_slide, index| %>
             <!-- TODO: if really needed, add back the possibility for an "image" button -->
             <!-- via the class info-slide-icon-button -->
-            <button type="button" class="btn open-info-slide-btn"
+            <button type="button"
+                    class="btn open-info-slide-btn d-flex justify-content-start"
                     title="Find information about: <%= info_slide.title %>"
-                    data-bs-toggle="modal" data-bs-target="#vignette-info-slide-modal-<%= index %>"
+                    data-bs-toggle="modal"
+                    data-bs-target="#vignette-info-slide-modal-<%= index %>"
                     data-info-slide-index="<%= index %>">
                 <i class="bi bi-info-circle-fill me-1"></i>
-                <%= info_slide.title %>
+                <p class="mb-0 text-start">
+                    <%= info_slide.title %>
+                </p>
             </button>
             <% end %>
-        </p>
+        </div>
     </div>
     <% end %>
 

From bc2003bb4c39f9f9e0b67c597ba0ddd9c6064f60 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Sun, 23 Feb 2025 20:46:40 +0100
Subject: [PATCH 054/103] Improve accessibility for open info slide & submit
 button

---
 app/assets/stylesheets/vignettes-take.scss | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/vignettes-take.scss b/app/assets/stylesheets/vignettes-take.scss
index 1e212e258..e715d7bf1 100644
--- a/app/assets/stylesheets/vignettes-take.scss
+++ b/app/assets/stylesheets/vignettes-take.scss
@@ -18,13 +18,25 @@
     color: white;
     transition: 150ms ease-in-out;
 
-    &:hover {
-        background-color: $mampf-blue-focus;
-        color: white;
+    &:hover,
+    &:focus,
+    &:active {
+        background-color: $mampf-blue-focus !important;
+        color: white !important;
         box-shadow: 0px 2px 7px 0rem mampf-blue(0.2);
     }
+
+    &:focus {
+        outline: $mampf-blue auto 0.7px;
+    }
 }
 
 .vignette-answer {
     padding: var(--bs-card-spacer-y) var(--bs-card-spacer-x);
+}
+
+.open-info-slide-btn {
+    &:focus {
+        outline: lightgrey auto 0.5px;
+    }
 }
\ No newline at end of file

From 8889949146787588ff2d9b353635728e2cdf6ca2 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Sun, 23 Feb 2025 20:49:43 +0100
Subject: [PATCH 055/103] Make likert scale input required

---
 app/views/vignettes/answer_types/_likert_scale.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/vignettes/answer_types/_likert_scale.html.erb b/app/views/vignettes/answer_types/_likert_scale.html.erb
index cc45955b1..54b56daee 100644
--- a/app/views/vignettes/answer_types/_likert_scale.html.erb
+++ b/app/views/vignettes/answer_types/_likert_scale.html.erb
@@ -5,7 +5,7 @@
 <div class="likert w-100">
     <% Vignettes::LikertScaleQuestion::LIKERT_LABELS.each do |value, label| %>
         <label>
-            <input name="l" type="radio" value="<%= value %>">
+            <input name="l" type="radio" value="<%= value %>" required>
             <span>
                 <%= label %>
             </span>

From 1c48ebee85d0aa1c22e0f147faa514f08ca19826 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Sun, 23 Feb 2025 23:03:32 +0100
Subject: [PATCH 056/103] Redesign multiple choice questions

---
 .../vignettes/answer_types/_likert_scale.html.erb  |  3 ++-
 .../answer_types/_multiple_choice.html.erb         | 14 ++++++++++++++
 app/views/vignettes/questionnaires/take.html.erb   |  7 +++----
 3 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 app/views/vignettes/answer_types/_multiple_choice.html.erb

diff --git a/app/views/vignettes/answer_types/_likert_scale.html.erb b/app/views/vignettes/answer_types/_likert_scale.html.erb
index 54b56daee..56259aab1 100644
--- a/app/views/vignettes/answer_types/_likert_scale.html.erb
+++ b/app/views/vignettes/answer_types/_likert_scale.html.erb
@@ -5,7 +5,8 @@
 <div class="likert w-100">
     <% Vignettes::LikertScaleQuestion::LIKERT_LABELS.each do |value, label| %>
         <label>
-            <input name="l" type="radio" value="<%= value %>" required>
+            <input name="vignette-likert-scale"
+                   type="radio" value="<%= value %>" required>
             <span>
                 <%= label %>
             </span>
diff --git a/app/views/vignettes/answer_types/_multiple_choice.html.erb b/app/views/vignettes/answer_types/_multiple_choice.html.erb
new file mode 100644
index 000000000..417fa59ed
--- /dev/null
+++ b/app/views/vignettes/answer_types/_multiple_choice.html.erb
@@ -0,0 +1,14 @@
+<% @slide.question.options.each do |option| %>
+<div class="form-check">
+    <input name="vignette-multiple-choice"
+            id="vignette-multiple-choice-<%= option.id %>"
+            class="form-check-input"
+            type="radio"
+            value="<%= option.id %>"
+            required>
+    <label class="form-check-label"
+            for="vignette-multiple-choice-<%= option.id %>">
+        <%= option.text %>
+    </label>
+</div>
+<% end %>
diff --git a/app/views/vignettes/questionnaires/take.html.erb b/app/views/vignettes/questionnaires/take.html.erb
index 1bd4cb175..c48cbb892 100644
--- a/app/views/vignettes/questionnaires/take.html.erb
+++ b/app/views/vignettes/questionnaires/take.html.erb
@@ -70,16 +70,15 @@
                 <% when "Vignettes::TextQuestion" %>
                     <%= render partial: 'vignettes/answer_types/text', locals: { f: form } %>
                 <% when "Vignettes::MultipleChoiceQuestion" %>
-                    <% @slide.question.options.each do |option| %>
-                        <%= option.text %>
-                        <%= check_box_tag "vignettes_answer[option_ids][]", option.id, @answer.option_ids.include?(option.id) %>
-                    <% end %>
+                    <%= render partial: 'vignettes/answer_types/multiple_choice',
+                                        locals: { f: form } %>
                 <% when "Vignettes::LikertScaleQuestion" %>
                     <%= render partial: 'vignettes/answer_types/likert_scale', locals: { f: form } %>
         <% end %>
 
         <!-- Navigation -->
         <div class="d-flex justify-content-end mt-3">
+            <!-- TODO: Do a better differentiation here -->
             <% if @slide.question.type == "" %>
                 <%= form.submit "Next Slide", class: "btn slide-footer-btn" %>
             <% else %>

From 7375014ba42e3be121593c5af48b4c46fac89286 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Sun, 23 Feb 2025 23:41:11 +0100
Subject: [PATCH 057/103] Fix indentation of ERB syntax

---
 .../vignettes/questionnaires/take.html.erb    | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/views/vignettes/questionnaires/take.html.erb b/app/views/vignettes/questionnaires/take.html.erb
index c48cbb892..751dc4add 100644
--- a/app/views/vignettes/questionnaires/take.html.erb
+++ b/app/views/vignettes/questionnaires/take.html.erb
@@ -59,21 +59,21 @@
         </p>
 
         <%= form.hidden_field :slide_id, value: @slide.id %>
-            <%= form.fields_for :slide_statistic do |stat_form| %>
-                <%= stat_form.hidden_field :user_id, value: current_user.id %>
-                <%= stat_form.hidden_field :time_on_slide, id: "time-on-slide-field" %>
-                <%= stat_form.hidden_field :time_on_info_slides, id: "time-on-info-slides-field" %>
-                <%= stat_form.hidden_field :info_slides_access_count, id:"info-slides-access-count-field" %>
-            <% end %>
+        <%= form.fields_for :slide_statistic do |stat_form| %>
+            <%= stat_form.hidden_field :user_id, value: current_user.id %>
+            <%= stat_form.hidden_field :time_on_slide, id: "time-on-slide-field" %>
+            <%= stat_form.hidden_field :time_on_info_slides, id: "time-on-info-slides-field" %>
+            <%= stat_form.hidden_field :info_slides_access_count, id:"info-slides-access-count-field" %>
+        <% end %>
 
-            <% case @slide.question.type %>
-                <% when "Vignettes::TextQuestion" %>
-                    <%= render partial: 'vignettes/answer_types/text', locals: { f: form } %>
-                <% when "Vignettes::MultipleChoiceQuestion" %>
-                    <%= render partial: 'vignettes/answer_types/multiple_choice',
-                                        locals: { f: form } %>
-                <% when "Vignettes::LikertScaleQuestion" %>
-                    <%= render partial: 'vignettes/answer_types/likert_scale', locals: { f: form } %>
+        <% case @slide.question.type %>
+            <% when "Vignettes::TextQuestion" %>
+                <%= render partial: 'vignettes/answer_types/text', locals: { f: form } %>
+            <% when "Vignettes::MultipleChoiceQuestion" %>
+                <%= render partial: 'vignettes/answer_types/multiple_choice',
+                                    locals: { f: form } %>
+            <% when "Vignettes::LikertScaleQuestion" %>
+                <%= render partial: 'vignettes/answer_types/likert_scale', locals: { f: form } %>
         <% end %>
 
         <!-- Navigation -->

From f9436dea91c324941af976df4186676a848fb0b8 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Mon, 24 Feb 2025 00:23:00 +0100
Subject: [PATCH 058/103] Init UI support for sortable slides

---
 .config/eslint.mjs                            |  2 +
 app/assets/javascripts/vignettes/edit.js      | 14 ++++++
 app/assets/stylesheets/vignettes-edit.scss    | 11 +++++
 .../vignettes/questionnaires_controller.rb    |  2 +
 .../vignettes/questionnaires/edit.html.erb    | 48 +++++++++++--------
 5 files changed, 57 insertions(+), 20 deletions(-)
 create mode 100644 app/assets/javascripts/vignettes/edit.js
 create mode 100644 app/assets/stylesheets/vignettes-edit.scss

diff --git a/.config/eslint.mjs b/.config/eslint.mjs
index 0cf5ab6de..04fc3ba05 100644
--- a/.config/eslint.mjs
+++ b/.config/eslint.mjs
@@ -101,6 +101,8 @@ const customGlobals = {
   renderMathInElement: "readable",
 
   openAnnotationIfSpecifiedInUrl: "readable",
+
+  Sortable: "readable",
 };
 
 export default [
diff --git a/app/assets/javascripts/vignettes/edit.js b/app/assets/javascripts/vignettes/edit.js
new file mode 100644
index 000000000..abd121b45
--- /dev/null
+++ b/app/assets/javascripts/vignettes/edit.js
@@ -0,0 +1,14 @@
+$(document).on("turbolinks:load", function () {
+  const vignetteSlideList = document.getElementById("vignettes-slides-list");
+
+  Sortable.create(vignetteSlideList, {
+    animation: 150,
+    ghostClass: "vignette-sortable-ghost",
+    onEnd: function (evt) {
+      console.log(`Moved element from ${evt.oldIndex} to ${evt.newIndex}`);
+      // TODO: send a request to update the order of the slides in the database
+      // TODO: see more options here:
+      // https://github.com/SortableJS/Sortable?tab=readme-ov-file#options
+    },
+  });
+});
diff --git a/app/assets/stylesheets/vignettes-edit.scss b/app/assets/stylesheets/vignettes-edit.scss
new file mode 100644
index 000000000..bb67d34d8
--- /dev/null
+++ b/app/assets/stylesheets/vignettes-edit.scss
@@ -0,0 +1,11 @@
+@import "branding";
+
+.vignette-edit-header {
+    font-size: 1.5em;
+}
+
+.vignette-sortable-ghost {
+    background-color: $mampf-blue;
+    color: white;
+    border: 1px solid $mampf-blue;
+}
diff --git a/app/controllers/vignettes/questionnaires_controller.rb b/app/controllers/vignettes/questionnaires_controller.rb
index 328bc85e1..f5927ffd5 100644
--- a/app/controllers/vignettes/questionnaires_controller.rb
+++ b/app/controllers/vignettes/questionnaires_controller.rb
@@ -114,6 +114,8 @@ def create
     def edit
       @questionnaire = Questionnaire.find(params[:id])
       @slides = @questionnaire.slides.order(:position)
+
+      render layout: "application_no_sidebar"
     end
 
     private
diff --git a/app/views/vignettes/questionnaires/edit.html.erb b/app/views/vignettes/questionnaires/edit.html.erb
index 2d119c3de..83972a186 100644
--- a/app/views/vignettes/questionnaires/edit.html.erb
+++ b/app/views/vignettes/questionnaires/edit.html.erb
@@ -1,23 +1,31 @@
-<h1> Slides </h1>
+<%= stylesheet_link_tag 'vignettes-edit' %>
+<script src="https://cdn.jsdelivr.net/npm/sortablejs@1.15/Sortable.min.js"></script>
+<%= javascript_include_tag 'vignettes/edit' %>
 
-<ul>
-    <% @slides.each() do |slide| %>
-        <li>
-            <%= link_to slide.position, edit_vignettes_questionnaire_slide_path(@questionnaire, slide) %>
-        </li>
-    <%end%>
-</ul>
-<%= button_to 'Create new slide', new_vignettes_questionnaire_slide_path(@questionnaire), method: :get, class: 'btn btn-primary' %>
-<h1> Info slides </h1>
-<ul>
-    <% @questionnaire.info_slides.each() do |info_slide| %>
-        <li>
-            <%= link_to info_slide.title, edit_vignettes_questionnaire_info_slide_path(@questionnaire, info_slide) %>
-        </li>
-    <%end%>
-</ul>
-<%= button_to 'Create new info slide', new_vignettes_questionnaire_info_slide_path(@questionnaire), method: :get, class: 'btn btn-primary' %>
+<div class="container-md small-width">
+    <!-- Slides -->
+    <h1 class="vignette-edit-header"> Slides </h1>
 
-<br>
+    <ul id="vignettes-slides-list" class="list-group">
+        <% @slides.each() do |slide| %>
+            <li class="list-group-item">
+                <%= link_to slide.position, edit_vignettes_questionnaire_slide_path(@questionnaire, slide) %>
+            </li>
+        <% end %>
+    </ul>
+    <%= button_to 'Create new slide', new_vignettes_questionnaire_slide_path(@questionnaire), method: :get, class: 'btn btn-primary' %>
 
-<%= button_to "Export answers", export_answers_vignettes_questionnaire_path(@questionnaire), method: :get, class: 'btn btn-primary' %>
+    <!-- Info Slides -->
+    <h1 class="vignette-edit-header">Info slides</h1>
+    <ul>
+        <% @questionnaire.info_slides.each() do |info_slide| %>
+            <li>
+                <%= link_to info_slide.title, edit_vignettes_questionnaire_info_slide_path(@questionnaire, info_slide) %>
+            </li>
+        <%end%>
+    </ul>
+    <%= button_to 'Create new info slide', new_vignettes_questionnaire_info_slide_path(@questionnaire), method: :get, class: 'btn btn-primary' %>
+
+    <!-- Export -->
+    <%= button_to "Export answers", export_answers_vignettes_questionnaire_path(@questionnaire), method: :get, class: 'btn btn-primary' %>
+</div>

From 4e5ba228ee0a22c37685bf449bcdcb7cba721e36 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Mon, 24 Feb 2025 15:53:52 +0100
Subject: [PATCH 059/103] Add TODO where slide was not moved at all

---
 app/assets/javascripts/vignettes/edit.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/assets/javascripts/vignettes/edit.js b/app/assets/javascripts/vignettes/edit.js
index abd121b45..289589c68 100644
--- a/app/assets/javascripts/vignettes/edit.js
+++ b/app/assets/javascripts/vignettes/edit.js
@@ -9,6 +9,9 @@ $(document).on("turbolinks:load", function () {
       // TODO: send a request to update the order of the slides in the database
       // TODO: see more options here:
       // https://github.com/SortableJS/Sortable?tab=readme-ov-file#options
+      // TODO: Watch out (!) We also get this event when oldIndex === newIndex
+      // in this case we should not send a request to the server as nothing
+      // changed. And the server should of course check for bounds.
     },
   });
 });

From dc60ef2af55f570a73ca57b419c36aabd55279f7 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Tue, 25 Feb 2025 09:59:39 +0100
Subject: [PATCH 060/103] Edit slide view: get basic dynamic loading of edit
 form to work

---
 app/assets/javascripts/vignettes/edit.js      | 17 -----
 app/assets/javascripts/vignettes/edit.js.erb  | 67 +++++++++++++++++++
 .../vignettes/slides_controller.rb            |  2 +
 .../vignettes/questionnaires/edit.html.erb    | 12 +++-
 4 files changed, 78 insertions(+), 20 deletions(-)
 delete mode 100644 app/assets/javascripts/vignettes/edit.js
 create mode 100644 app/assets/javascripts/vignettes/edit.js.erb

diff --git a/app/assets/javascripts/vignettes/edit.js b/app/assets/javascripts/vignettes/edit.js
deleted file mode 100644
index 289589c68..000000000
--- a/app/assets/javascripts/vignettes/edit.js
+++ /dev/null
@@ -1,17 +0,0 @@
-$(document).on("turbolinks:load", function () {
-  const vignetteSlideList = document.getElementById("vignettes-slides-list");
-
-  Sortable.create(vignetteSlideList, {
-    animation: 150,
-    ghostClass: "vignette-sortable-ghost",
-    onEnd: function (evt) {
-      console.log(`Moved element from ${evt.oldIndex} to ${evt.newIndex}`);
-      // TODO: send a request to update the order of the slides in the database
-      // TODO: see more options here:
-      // https://github.com/SortableJS/Sortable?tab=readme-ov-file#options
-      // TODO: Watch out (!) We also get this event when oldIndex === newIndex
-      // in this case we should not send a request to the server as nothing
-      // changed. And the server should of course check for bounds.
-    },
-  });
-});
diff --git a/app/assets/javascripts/vignettes/edit.js.erb b/app/assets/javascripts/vignettes/edit.js.erb
new file mode 100644
index 000000000..6eb2fbc8e
--- /dev/null
+++ b/app/assets/javascripts/vignettes/edit.js.erb
@@ -0,0 +1,67 @@
+$(document).on("turbolinks:load", function () {
+  const vignetteSlideList = $("#vignettes-slides-list");
+  createSortableVignetteSlides(vignetteSlideList);
+  registerVignetteSlideListeners(vignetteSlideList);
+});
+
+function createSortableVignetteSlides(vignetteSlideList) {
+  Sortable.create(vignetteSlideList.get(0), {
+    animation: 150,
+    ghostClass: "vignette-sortable-ghost",
+    onEnd: function (_evt) {
+      // console.log(`Moved element from ${evt.oldIndex} to ${evt.newIndex}`);
+      // TODO: send a request to update the order of the slides in the database
+      // TODO: see more options here:
+      // https://github.com/SortableJS/Sortable?tab=readme-ov-file#options
+      // TODO: Watch out (!) We also get this event when oldIndex === newIndex
+      // in this case we should not send a request to the server as nothing
+      // changed. And the server should of course check for bounds.
+      //
+      // Something like that should work:
+      // $.ajax({
+      //   url: `/vignettes/slides/${slideId}/update_position`,
+      //   method: "PATCH",
+      //   data: {
+      //     slide: {
+      //       position: newPosition,
+      //     },
+      //   },
+      //   success: function (response) {
+      //     console.log(`Slide ${slideId} moved to position ${newPosition}`);
+      //   },
+      //   error: function (xhr, status, error) {
+      //     console.error(`Failed to update position: ${error}`);
+      //   },
+      // });
+    },
+  });
+}
+
+function registerVignetteSlideListeners(vignetteSlideList) {
+  $(vignetteSlideList).on("click", "li", function (evt) {
+    const slideId = evt.target.dataset.slideId;
+    if (slideId === undefined) {
+      console.error("Slide id is missing");
+      return;
+    }
+    console.log(`Clicked on slide with id ${slideId}`);
+    const questionnaireId = vignetteSlideList.attr("data-questionnaire-id");
+    if (questionnaireId === undefined) {
+      console.error("Questionnaire id is missing");
+      return;
+    }
+    console.log(`Questionnaire id is ${questionnaireId}`);
+
+    $.ajax({
+      url: Routes.edit_vignettes_questionnaire_slide_path(questionnaireId, slideId),
+      method: "GET",
+      dataType: "html",
+      success: function (response) {
+        $("#vignette-slide-edit-form-container").html(response);
+      },
+      error: function (xhr, status, error) {
+        console.error(`Failed to load slide edit form: ${error}`);
+      },
+    });
+  });
+}
diff --git a/app/controllers/vignettes/slides_controller.rb b/app/controllers/vignettes/slides_controller.rb
index 14c57089b..ba908ac5a 100644
--- a/app/controllers/vignettes/slides_controller.rb
+++ b/app/controllers/vignettes/slides_controller.rb
@@ -20,6 +20,8 @@ def edit
       @slide = @questionnaire.slides.find(params[:id])
       @slide.build_question unless @slide.question
       @slide.question.options.build unless @slide.question.options.any?
+
+      render partial: "vignettes/slides/form" if request.xhr?
     end
 
     def create
diff --git a/app/views/vignettes/questionnaires/edit.html.erb b/app/views/vignettes/questionnaires/edit.html.erb
index 83972a186..7e60a79e5 100644
--- a/app/views/vignettes/questionnaires/edit.html.erb
+++ b/app/views/vignettes/questionnaires/edit.html.erb
@@ -6,10 +6,11 @@
     <!-- Slides -->
     <h1 class="vignette-edit-header"> Slides </h1>
 
-    <ul id="vignettes-slides-list" class="list-group">
+    <ul id="vignettes-slides-list" class="list-group"
+        data-questionnaire-id="<%= @questionnaire.id %>">
         <% @slides.each() do |slide| %>
-            <li class="list-group-item">
-                <%= link_to slide.position, edit_vignettes_questionnaire_slide_path(@questionnaire, slide) %>
+            <li class="list-group-item" data-slide-id="<%= slide.id %>">
+                This is my slide with ID <%= slide.id %>
             </li>
         <% end %>
     </ul>
@@ -28,4 +29,9 @@
 
     <!-- Export -->
     <%= button_to "Export answers", export_answers_vignettes_questionnaire_path(@questionnaire), method: :get, class: 'btn btn-primary' %>
+
+    <div id="vignette-slide-edit-form-container">
+        <!-- The slide edit form will be dynamically loaded here -->
+    </div>
+
 </div>

From f4f2aba31ad9c3ebe05d0fa458c35f36dd3c3e97 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Tue, 25 Feb 2025 10:13:29 +0100
Subject: [PATCH 061/103] Render slide edit form dynamically into accordion

---
 app/assets/javascripts/vignettes/edit.js.erb  |  7 ++--
 .../vignettes/questionnaires/edit.html.erb    | 41 ++++++++++++++-----
 2 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/app/assets/javascripts/vignettes/edit.js.erb b/app/assets/javascripts/vignettes/edit.js.erb
index 6eb2fbc8e..48f5516de 100644
--- a/app/assets/javascripts/vignettes/edit.js.erb
+++ b/app/assets/javascripts/vignettes/edit.js.erb
@@ -1,5 +1,5 @@
 $(document).on("turbolinks:load", function () {
-  const vignetteSlideList = $("#vignettes-slides-list");
+  const vignetteSlideList = $("#vignettes-slides-accordion");
   createSortableVignetteSlides(vignetteSlideList);
   registerVignetteSlideListeners(vignetteSlideList);
 });
@@ -38,7 +38,7 @@ function createSortableVignetteSlides(vignetteSlideList) {
 }
 
 function registerVignetteSlideListeners(vignetteSlideList) {
-  $(vignetteSlideList).on("click", "li", function (evt) {
+  $(vignetteSlideList).on("click", ".accordion-button", function (evt) {
     const slideId = evt.target.dataset.slideId;
     if (slideId === undefined) {
       console.error("Slide id is missing");
@@ -57,7 +57,8 @@ function registerVignetteSlideListeners(vignetteSlideList) {
       method: "GET",
       dataType: "html",
       success: function (response) {
-        $("#vignette-slide-edit-form-container").html(response);
+        $(".slides-edit-form-container").html(""); // remove old forms
+        $(`#slide-edit-form-container-${slideId}`).html(response);
       },
       error: function (xhr, status, error) {
         console.error(`Failed to load slide edit form: ${error}`);
diff --git a/app/views/vignettes/questionnaires/edit.html.erb b/app/views/vignettes/questionnaires/edit.html.erb
index 7e60a79e5..2917e3ec7 100644
--- a/app/views/vignettes/questionnaires/edit.html.erb
+++ b/app/views/vignettes/questionnaires/edit.html.erb
@@ -6,14 +6,38 @@
     <!-- Slides -->
     <h1 class="vignette-edit-header"> Slides </h1>
 
-    <ul id="vignettes-slides-list" class="list-group"
-        data-questionnaire-id="<%= @questionnaire.id %>">
+    <div class="accordion" id="vignettes-slides-accordion"
+         data-questionnaire-id="<%= @questionnaire.id %>">
         <% @slides.each() do |slide| %>
-            <li class="list-group-item" data-slide-id="<%= slide.id %>">
-                This is my slide with ID <%= slide.id %>
-            </li>
+        <div class="accordion-item">
+
+            <h2 class="accordion-header">
+                <button class="accordion-button collapsed" type="button"
+                    data-slide-id="<%= slide.id %>"
+                    data-bs-toggle="collapse" data-bs-target="#slides-collapse-<%= slide.id %>"
+                    aria-expanded="false" aria-controls="slides-collapse-<%= slide.id %>">
+                    <!-- TODO: show useful information here, e.g. answer type -->
+                    Slide with id <%= slide.id %>
+                </button>
+            </h2>
+
+            <div id="slides-collapse-<%= slide.id %>"
+                 class="accordion-collapse collapse collapse"
+                 data-bs-parent="#vignettes-slides-accordion">
+
+                <div class="accordion-body slides-edit-form-container"
+                     id="slide-edit-form-container-<%= slide.id %>">
+                    <!-- The slide edit form will be dynamically loaded here -->
+                </div>
+
+            </div>
+        </div>
         <% end %>
-    </ul>
+    </div>
+
+    <br>
+    <br>
+
     <%= button_to 'Create new slide', new_vignettes_questionnaire_slide_path(@questionnaire), method: :get, class: 'btn btn-primary' %>
 
     <!-- Info Slides -->
@@ -29,9 +53,4 @@
 
     <!-- Export -->
     <%= button_to "Export answers", export_answers_vignettes_questionnaire_path(@questionnaire), method: :get, class: 'btn btn-primary' %>
-
-    <div id="vignette-slide-edit-form-container">
-        <!-- The slide edit form will be dynamically loaded here -->
-    </div>
-
 </div>

From 0974a689fd9d840d8446a3dc40e54f7b1fab7fcf Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Tue, 25 Feb 2025 10:14:17 +0100
Subject: [PATCH 062/103] Remove unnecessary console logs

---
 app/assets/javascripts/vignettes/edit.js.erb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/assets/javascripts/vignettes/edit.js.erb b/app/assets/javascripts/vignettes/edit.js.erb
index 48f5516de..6398aecab 100644
--- a/app/assets/javascripts/vignettes/edit.js.erb
+++ b/app/assets/javascripts/vignettes/edit.js.erb
@@ -44,13 +44,12 @@ function registerVignetteSlideListeners(vignetteSlideList) {
       console.error("Slide id is missing");
       return;
     }
-    console.log(`Clicked on slide with id ${slideId}`);
+
     const questionnaireId = vignetteSlideList.attr("data-questionnaire-id");
     if (questionnaireId === undefined) {
       console.error("Questionnaire id is missing");
       return;
     }
-    console.log(`Questionnaire id is ${questionnaireId}`);
 
     $.ajax({
       url: Routes.edit_vignettes_questionnaire_slide_path(questionnaireId, slideId),

From 6fa43c50633982d9b793b7ba5fd5a56248eac11f Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Tue, 25 Feb 2025 10:30:56 +0100
Subject: [PATCH 063/103] Redesign add new slide button

---
 app/assets/stylesheets/vignettes-edit.scss       |  4 ----
 app/views/vignettes/questionnaires/edit.html.erb | 13 ++++++++++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/assets/stylesheets/vignettes-edit.scss b/app/assets/stylesheets/vignettes-edit.scss
index bb67d34d8..f3c831cf8 100644
--- a/app/assets/stylesheets/vignettes-edit.scss
+++ b/app/assets/stylesheets/vignettes-edit.scss
@@ -1,9 +1,5 @@
 @import "branding";
 
-.vignette-edit-header {
-    font-size: 1.5em;
-}
-
 .vignette-sortable-ghost {
     background-color: $mampf-blue;
     color: white;
diff --git a/app/views/vignettes/questionnaires/edit.html.erb b/app/views/vignettes/questionnaires/edit.html.erb
index 2917e3ec7..5765b6acf 100644
--- a/app/views/vignettes/questionnaires/edit.html.erb
+++ b/app/views/vignettes/questionnaires/edit.html.erb
@@ -4,7 +4,7 @@
 
 <div class="container-md small-width">
     <!-- Slides -->
-    <h1 class="vignette-edit-header"> Slides </h1>
+    <h1 class="fs-4 fw-bold"> Slides </h1>
 
     <div class="accordion" id="vignettes-slides-accordion"
          data-questionnaire-id="<%= @questionnaire.id %>">
@@ -35,10 +35,17 @@
         <% end %>
     </div>
 
+    <!-- Add new slide (at the end of the list) -->
+    <%= link_to new_vignettes_questionnaire_slide_path(@questionnaire),
+                class: "btn btn-outline-primary mt-2" do %>
+        <i class="bi bi-plus-circle"></i>
+        Add new slide
+    <% end %>
+
+    <br>
+    <br>
     <br>
     <br>
-
-    <%= button_to 'Create new slide', new_vignettes_questionnaire_slide_path(@questionnaire), method: :get, class: 'btn btn-primary' %>
 
     <!-- Info Slides -->
     <h1 class="vignette-edit-header">Info slides</h1>

From 1270ab6fe423f2aa41003dfbf2f9255d80db516d Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Tue, 25 Feb 2025 12:48:37 +0100
Subject: [PATCH 064/103] Add option to add new slide (at least to display the
 new slide creation form)

---
 app/assets/javascripts/vignettes/edit.js.erb  | 33 +++++++++++++++++++
 .../vignettes/slides_controller.rb            |  5 +++
 .../_slide_accordion_item.html.erb            | 29 ++++++++++++++++
 .../vignettes/questionnaires/edit.html.erb    | 29 ++--------------
 .../slides/{new.html.erb => _new.html.erb}    |  0
 5 files changed, 70 insertions(+), 26 deletions(-)
 create mode 100644 app/views/vignettes/questionnaires/_slide_accordion_item.html.erb
 rename app/views/vignettes/slides/{new.html.erb => _new.html.erb} (100%)

diff --git a/app/assets/javascripts/vignettes/edit.js.erb b/app/assets/javascripts/vignettes/edit.js.erb
index 6398aecab..a49929834 100644
--- a/app/assets/javascripts/vignettes/edit.js.erb
+++ b/app/assets/javascripts/vignettes/edit.js.erb
@@ -2,6 +2,7 @@ $(document).on("turbolinks:load", function () {
   const vignetteSlideList = $("#vignettes-slides-accordion");
   createSortableVignetteSlides(vignetteSlideList);
   registerVignetteSlideListeners(vignetteSlideList);
+  registerNewSlideButtonListener(vignetteSlideList);
 });
 
 function createSortableVignetteSlides(vignetteSlideList) {
@@ -65,3 +66,35 @@ function registerVignetteSlideListeners(vignetteSlideList) {
     });
   });
 }
+
+function registerNewSlideButtonListener(vignetteSlideList) {
+  $("#vignettes-new-slide-btn").click(function () {
+    $(this).prop("disabled", true);
+
+    const questionnaireId = vignetteSlideList.attr("data-questionnaire-id");
+    if (questionnaireId === undefined) {
+      console.error("Questionnaire id is missing");
+      return;
+    }
+
+    $.ajax({
+      url: Routes.new_vignettes_questionnaire_slide_path(questionnaireId),
+      method: "GET",
+      dataType: "html",
+      success: function (response) {
+        $(vignetteSlideList).append(response);
+        const newSlide = $(vignetteSlideList).children().last();
+        openAccordionItem(newSlide);
+      },
+      error: function (xhr, status, error) {
+        console.error(`Failed to load new slide form: ${error}`);
+      },
+    });
+  });
+}
+
+function openAccordionItem($item) {
+  new bootstrap.Collapse($item.find(".collapse"), {
+    toggle: true,
+  });
+}
diff --git a/app/controllers/vignettes/slides_controller.rb b/app/controllers/vignettes/slides_controller.rb
index ba908ac5a..f4c79960d 100644
--- a/app/controllers/vignettes/slides_controller.rb
+++ b/app/controllers/vignettes/slides_controller.rb
@@ -14,6 +14,11 @@ def new
       @slide = @questionnaire.slides.new
       @slide.build_question
       @slide.question.options.build
+
+      return unless request.xhr?
+
+      render partial: "vignettes/questionnaires/slide_accordion_item",
+             locals: { slide: @slide }
     end
 
     def edit
diff --git a/app/views/vignettes/questionnaires/_slide_accordion_item.html.erb b/app/views/vignettes/questionnaires/_slide_accordion_item.html.erb
new file mode 100644
index 000000000..10b6740f7
--- /dev/null
+++ b/app/views/vignettes/questionnaires/_slide_accordion_item.html.erb
@@ -0,0 +1,29 @@
+<div class="accordion-item">
+
+    <h2 class="accordion-header">
+        <button class="accordion-button collapsed" type="button"
+                data-slide-id="<%= slide.id %>"
+                data-bs-toggle="collapse" data-bs-target="#slides-collapse-<%= slide.id %>"
+                aria-expanded="false" aria-controls="slides-collapse-<%= slide.id %>">
+            <!-- TODO: show useful information here, e.g. answer type -->
+            Slide with id <%= slide.id %>
+        </button>
+    </h2>
+
+    <div id="slides-collapse-<%= slide.id %>" class="accordion-collapse collapse collapse"
+        data-bs-parent="#vignettes-slides-accordion">
+
+        <% if slide.id %>
+        <div class="accordion-body slides-edit-form-container"
+             id="slide-edit-form-container-<%= slide.id %>">
+            <!-- The slide edit form will be dynamically loaded here -->
+        </div>
+        <% else %>
+        <div class="accordion-body">
+            <%= render partial: 'vignettes/slides/new' %>
+        </div>
+        <% end %>
+
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/app/views/vignettes/questionnaires/edit.html.erb b/app/views/vignettes/questionnaires/edit.html.erb
index 5765b6acf..88e5a72d5 100644
--- a/app/views/vignettes/questionnaires/edit.html.erb
+++ b/app/views/vignettes/questionnaires/edit.html.erb
@@ -9,38 +9,15 @@
     <div class="accordion" id="vignettes-slides-accordion"
          data-questionnaire-id="<%= @questionnaire.id %>">
         <% @slides.each() do |slide| %>
-        <div class="accordion-item">
-
-            <h2 class="accordion-header">
-                <button class="accordion-button collapsed" type="button"
-                    data-slide-id="<%= slide.id %>"
-                    data-bs-toggle="collapse" data-bs-target="#slides-collapse-<%= slide.id %>"
-                    aria-expanded="false" aria-controls="slides-collapse-<%= slide.id %>">
-                    <!-- TODO: show useful information here, e.g. answer type -->
-                    Slide with id <%= slide.id %>
-                </button>
-            </h2>
-
-            <div id="slides-collapse-<%= slide.id %>"
-                 class="accordion-collapse collapse collapse"
-                 data-bs-parent="#vignettes-slides-accordion">
-
-                <div class="accordion-body slides-edit-form-container"
-                     id="slide-edit-form-container-<%= slide.id %>">
-                    <!-- The slide edit form will be dynamically loaded here -->
-                </div>
-
-            </div>
-        </div>
+            <%= render partial: "slide_accordion_item", locals: { slide: slide } %>
         <% end %>
     </div>
 
     <!-- Add new slide (at the end of the list) -->
-    <%= link_to new_vignettes_questionnaire_slide_path(@questionnaire),
-                class: "btn btn-outline-primary mt-2" do %>
+    <button type="button" id="vignettes-new-slide-btn" class="btn btn-outline-primary mt-2">
         <i class="bi bi-plus-circle"></i>
         Add new slide
-    <% end %>
+    </button>
 
     <br>
     <br>
diff --git a/app/views/vignettes/slides/new.html.erb b/app/views/vignettes/slides/_new.html.erb
similarity index 100%
rename from app/views/vignettes/slides/new.html.erb
rename to app/views/vignettes/slides/_new.html.erb

From 61d49d5880011990ef80b62a35fcf3b6dcf4ade1 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Tue, 25 Feb 2025 13:07:35 +0100
Subject: [PATCH 065/103] Design text field (for edit slide)

---
 app/views/vignettes/slides/_form.html.erb          |  8 ++++----
 app/views/vignettes/slides/_form_question.html.erb | 11 +++++++++--
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/app/views/vignettes/slides/_form.html.erb b/app/views/vignettes/slides/_form.html.erb
index 3b264502d..22ce358ea 100644
--- a/app/views/vignettes/slides/_form.html.erb
+++ b/app/views/vignettes/slides/_form.html.erb
@@ -22,7 +22,7 @@
   <%= render partial: 'form_content', locals: { form: form } %>
   <%= render partial: 'form_question', locals: { form: form } %>
 
-  <div>
-    <%= form.submit @slide.new_record? ? 'Create Slide' : 'Update Slide' %>
-  </div>
-<% end %>
\ No newline at end of file
+  <%= form.submit @slide.new_record? ? 'Create Slide' : 'Update Slide',
+        class: "btn btn-primary mt-2"
+  %>
+<% end %>
diff --git a/app/views/vignettes/slides/_form_question.html.erb b/app/views/vignettes/slides/_form_question.html.erb
index 609847e57..be23f7bce 100644
--- a/app/views/vignettes/slides/_form_question.html.erb
+++ b/app/views/vignettes/slides/_form_question.html.erb
@@ -10,8 +10,15 @@
   </div>
 
   <div id="question-text">
-    <%= question_form.label :question_text, "Question Text" %><br>
-    <%= question_form.text_area :question_text, placeholder: "Enter your question here" %>
+    <div class="form-floating mt-3">
+        <%= question_form.text_area :question_text,
+            placeholder: '_',
+            class: 'form-control',
+            style: 'height: 120px',
+            required: true
+        %>
+        <%= question_form.label :question_text, "Your question" %>
+    </div>
   </div>
 
   <!-- The id must be the name of the corresponding class -->

From ff6c395dc4450bda276945d299f2c1566b7233f5 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Tue, 25 Feb 2025 15:48:29 +0100
Subject: [PATCH 066/103] Start rewriting question types logic

---
 .../javascripts/vignettes/question_type.js    | 112 +++++++++---------
 app/views/vignettes/slides/_form.html.erb     |   3 +-
 .../vignettes/slides/_form_question.html.erb  | 100 ++++++++--------
 3 files changed, 109 insertions(+), 106 deletions(-)

diff --git a/app/assets/javascripts/vignettes/question_type.js b/app/assets/javascripts/vignettes/question_type.js
index 9e706bf3a..319f2b2ba 100644
--- a/app/assets/javascripts/vignettes/question_type.js
+++ b/app/assets/javascripts/vignettes/question_type.js
@@ -1,62 +1,58 @@
-document.addEventListener("turbolinks:load", () => {
-  const questionTypeDropdown = document.getElementById("question-type");
-  if (questionTypeDropdown) {
-    questionTypeDropdown.addEventListener("change", function (event) {
-      // Disable all fields by default
-      const allQuestionFields = document.getElementsByClassName("question-field");
-      const questionTextField = document.getElementById("question-text");
-      for (let field of allQuestionFields) {
-        field.style.display = "none";
-        if (questionTextField) {
-          questionTextField.style.display = "none";
-        }
-      }
-      // make selected field visible
-      const selectedType = event.target.value;
-      if (selectedType) {
-        const selectedField = document.getElementById(selectedType);
-        if (questionTextField && selectedType != "") {
-          questionTextField.style.display = "block";
-        }
-        if (selectedField) {
-          selectedField.style.display = "block";
-        }
-      }
+function handleQuestionTypes() {
+  const questionTypeDropdown = $("#vignettes-question-type");
+
+  questionTypeDropdown.on("change", function (event) {
+    const questionFields = $(".vignette-question-field");
+    questionFields.each(function () {
+      $(this).hide();
     });
 
-    questionTypeDropdown.dispatchEvent(new Event("change"));
-  };
-  const optionsContainer = document.getElementById("options-container");
+    if (event.target.value === "") {
+      // No question type selected
+      return;
+    }
 
-  // Handle dynamic addition of options
-  const addOptionButton = document.getElementById("add-option");
-  const optionTemplate = document.getElementById("new-option-template");
-  if (addOptionButton) {
-    addOptionButton.addEventListener("click", () => {
-      const optionTemplateHTML = optionTemplate.innerHTML;
-      const uniqueId = new Date().getTime().toString();
-      const newBlockHTML = optionTemplateHTML.replace(/NEW_RECORD/g, uniqueId);
+    const selectedField = $("#" + event.target.value);
+    if (selectedField) {
+      selectedField.show();
+    }
+  });
+}
 
-      optionsContainer.insertAdjacentHTML("beforeend", newBlockHTML);
-    });
-  }
-
-  // Handle removal of options
-  if (optionsContainer) {
-    optionsContainer.addEventListener("click", (e) => {
-      console.log(e.target);
-      if (e.target.className == "remove-option") {
-        e.preventDefault();
-        const optionBlock = e.target.parentElement;
-        if (optionBlock.className == "option-field") {
-          const destroyField = optionBlock.querySelector("input[type='hidden'][name*='_destroy']");
-          console.log(destroyField);
-          if (destroyField) {
-            destroyField.value = "1";
-            optionBlock.style.display = "none";
-          }
-        }
-      }
-    });
-  }
-});
+handleQuestionTypes();
+
+// document.addEventListener("turbolinks:load", () => {
+//   const optionsContainer = document.getElementById("options-container");
+
+//   // Handle dynamic addition of options
+//   const addOptionButton = document.getElementById("add-option");
+//   const optionTemplate = document.getElementById("new-option-template");
+//   if (addOptionButton) {
+//     addOptionButton.addEventListener("click", () => {
+//       const optionTemplateHTML = optionTemplate.innerHTML;
+//       const uniqueId = new Date().getTime().toString();
+//       const newBlockHTML = optionTemplateHTML.replace(/NEW_RECORD/g, uniqueId);
+
+//       optionsContainer.insertAdjacentHTML("beforeend", newBlockHTML);
+//     });
+//   }
+
+//   // Handle removal of options
+//   if (optionsContainer) {
+//     optionsContainer.addEventListener("click", (e) => {
+//       console.log(e.target);
+//       if (e.target.className == "remove-option") {
+//         e.preventDefault();
+//         const optionBlock = e.target.parentElement;
+//         if (optionBlock.className == "option-field") {
+//           const destroyField = optionBlock.querySelector("input[type='hidden'][name*='_destroy']");
+//           console.log(destroyField);
+//           if (destroyField) {
+//             destroyField.value = "1";
+//             optionBlock.style.display = "none";
+//           }
+//         }
+//       }
+//     });
+//   }
+// });
diff --git a/app/views/vignettes/slides/_form.html.erb b/app/views/vignettes/slides/_form.html.erb
index 22ce358ea..749e36a21 100644
--- a/app/views/vignettes/slides/_form.html.erb
+++ b/app/views/vignettes/slides/_form.html.erb
@@ -1,4 +1,3 @@
-<%= javascript_include_tag 'vignettes/question_type' %>
 <%= form_with(
       model: [@questionnaire, @slide],
       local: true,
@@ -26,3 +25,5 @@
         class: "btn btn-primary mt-2"
   %>
 <% end %>
+
+<%= javascript_include_tag 'vignettes/question_type' %>
diff --git a/app/views/vignettes/slides/_form_question.html.erb b/app/views/vignettes/slides/_form_question.html.erb
index be23f7bce..b8bf77b21 100644
--- a/app/views/vignettes/slides/_form_question.html.erb
+++ b/app/views/vignettes/slides/_form_question.html.erb
@@ -1,59 +1,65 @@
 <%= form.fields_for :question do |question_form| %>
-  <div>
-    <%= question_form.label :type, "Question Type" %>
-    <%= question_form.select :type, options_for_select([
-        ['No Question', ''],
-        ['Text Field', 'Vignettes::TextQuestion'],
-        ['Multiple Choice', 'Vignettes::MultipleChoiceQuestion'],
-        ['Likert Scale', 'Vignettes::LikertScaleQuestion']
-    ], question_form.object.type), {}, { id:  "question-type" } %>
-  </div>
+    <div>
+        <%= question_form.label :type, "Question Type" %>
+        <%= question_form.select :type, options_for_select([
+            ['No Question', ''],
+            ['Text Field', 'Vignettes-TextQuestion'],
+            ['Multiple Choice', 'Vignettes-MultipleChoiceQuestion'],
+            ['Likert Scale', 'Vignettes-LikertScaleQuestion']
+        ], question_form.object.type), {}, { id:  "vignettes-question-type" } %>
+    </div>
 
-  <div id="question-text">
-    <div class="form-floating mt-3">
-        <%= question_form.text_area :question_text,
-            placeholder: '_',
-            class: 'form-control',
-            style: 'height: 120px',
-            required: true
-        %>
-        <%= question_form.label :question_text, "Your question" %>
+    <div id="question-text">
+        <div class="form-floating mt-3">
+            <%= question_form.text_area :question_text,
+                placeholder: '_',
+                class: 'form-control',
+                style: 'height: 120px',
+                required: true
+            %>
+            <%= question_form.label :question_text, "Your question" %>
+        </div>
     </div>
-  </div>
 
-  <!-- The id must be the name of the corresponding class -->
-  <div id="Vignettes::TextQuestion" class="question-field" style="display: none;">
-  </div>
+    <!-- The id must be the name of the corresponding class -->
+    <div id="Vignettes-TextQuestion"
+         class="vignette-question-field"
+         style="display: none;">
+    </div>
 
-  <div id="Vignettes::LikertScaleQuestion", class="question-field" style="display: none;">
-  </div>
+    <div id="Vignettes-LikertScaleQuestion" 
+         class="vignette-question-field"
+         style="display: none;">
+    </div>
 
-  <div id="Vignettes::MultipleChoiceQuestion" class="question-field" style="display: none;">
-    <div>
-      <%= question_form.label :options, "Options" %>
-      <div id="options-container">
-        <% question_form.object.options.each do |option| %>
-          <div class="option-block">
-            <%= question_form.fields_for :options, option do |option_form| %>
-              <div class="option-field">
-                <%= option_form.text_field :text, placeholder: "Option Text" %>
+    <div id="Vignettes-MultipleChoiceQuestion"
+         class="vignette-question-field"
+         style="display: none;">
+        <div>
+        <%= question_form.label :options, "Options" %>
+        <div id="vignette-options-container">
+            <% question_form.object.options.each do |option| %>
+            <div class="option-block">
+                <%= question_form.fields_for :options, option do |option_form| %>
+                <div class="option-field">
+                    <%= option_form.text_field :text, placeholder: "Option Text" %>
+                    <%= option_form.hidden_field :_destroy %>
+                    <button type="button" class="remove-option">Remove</button>
+                </div>
+                <% end %>
+            </div>
+            <% end %>
+            <div id="new-option-template" style="display: none;">
+            <%= question_form.fields_for :options, question_form.object.options.build, child_index: "NEW_RECORD" do |option_form|%>
+                <div class="option-field">
+                <%= option_form.text_field :text %>
                 <%= option_form.hidden_field :_destroy %>
                 <button type="button" class="remove-option">Remove</button>
-              </div>
+                </div>
             <% end %>
-          </div>
-        <% end %>
-        <div id="new-option-template" style="display: none;">
-          <%= question_form.fields_for :options, question_form.object.options.build, child_index: "NEW_RECORD" do |option_form|%>
-            <div class="option-field">
-              <%= option_form.text_field :text %>
-              <%= option_form.hidden_field :_destroy %>
-              <button type="button" class="remove-option">Remove</button>
             </div>
-          <% end %>
         </div>
-      </div>
-      <button type="button" id="add-option">Add Option</button>
+        <button type="button" id="add-option">Add Option</button>
+        </div>
     </div>
-  </div>
-<% end %>
\ No newline at end of file
+<% end %>

From eb90a01d05dc4b802f9c892e70a915ecb950a049 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Tue, 25 Feb 2025 16:21:52 +0100
Subject: [PATCH 067/103] Redesign question type selection & use Bootstrap
 collapse

---
 .../javascripts/vignettes/question_type.js    |  9 ++-
 app/views/vignettes/slides/_form.html.erb     |  1 +
 .../vignettes/slides/_form_question.html.erb  | 55 ++++++++++---------
 3 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/app/assets/javascripts/vignettes/question_type.js b/app/assets/javascripts/vignettes/question_type.js
index 319f2b2ba..70eaa1fa1 100644
--- a/app/assets/javascripts/vignettes/question_type.js
+++ b/app/assets/javascripts/vignettes/question_type.js
@@ -1,20 +1,19 @@
 function handleQuestionTypes() {
-  const questionTypeDropdown = $("#vignettes-question-type");
+  const questionTypeDropdown = $("#vignettes-question-type-select");
 
   questionTypeDropdown.on("change", function (event) {
     const questionFields = $(".vignette-question-field");
     questionFields.each(function () {
-      $(this).hide();
+      $(this).collapse("hide");
     });
 
-    if (event.target.value === "") {
-      // No question type selected
+    if (event.target.value === "vignettes-edit-no-question") {
       return;
     }
 
     const selectedField = $("#" + event.target.value);
     if (selectedField) {
-      selectedField.show();
+      selectedField.collapse("show");
     }
   });
 }
diff --git a/app/views/vignettes/slides/_form.html.erb b/app/views/vignettes/slides/_form.html.erb
index 749e36a21..122141e61 100644
--- a/app/views/vignettes/slides/_form.html.erb
+++ b/app/views/vignettes/slides/_form.html.erb
@@ -19,6 +19,7 @@
   </div>
 
   <%= render partial: 'form_content', locals: { form: form } %>
+  <br>
   <%= render partial: 'form_question', locals: { form: form } %>
 
   <%= form.submit @slide.new_record? ? 'Create Slide' : 'Update Slide',
diff --git a/app/views/vignettes/slides/_form_question.html.erb b/app/views/vignettes/slides/_form_question.html.erb
index b8bf77b21..56805ac9e 100644
--- a/app/views/vignettes/slides/_form_question.html.erb
+++ b/app/views/vignettes/slides/_form_question.html.erb
@@ -1,40 +1,40 @@
 <%= form.fields_for :question do |question_form| %>
-    <div>
+
+    <!-- Question Type Selection -->
+    <div class="form-floating">
+        <%= question_form.select :type,
+            options_for_select([
+                ["No Question", "vignettes-edit-no-question"],
+                ["Text Area", 'vignettes-edit-text-question'],
+                ["Multiple Choice", "vignettes-edit-multiple-choice"],
+                ["Likert Scale", "vignettes-edit-likert"]
+            ], question_form.object.type),
+            {},
+            {
+                class: "form-select",
+                id: "vignettes-question-type-select",
+                "aria-label": "Selection for question type"
+            } %>
         <%= question_form.label :type, "Question Type" %>
-        <%= question_form.select :type, options_for_select([
-            ['No Question', ''],
-            ['Text Field', 'Vignettes-TextQuestion'],
-            ['Multiple Choice', 'Vignettes-MultipleChoiceQuestion'],
-            ['Likert Scale', 'Vignettes-LikertScaleQuestion']
-        ], question_form.object.type), {}, { id:  "vignettes-question-type" } %>
     </div>
 
-    <div id="question-text">
-        <div class="form-floating mt-3">
-            <%= question_form.text_area :question_text,
-                placeholder: '_',
-                class: 'form-control',
-                style: 'height: 120px',
-                required: true
-            %>
-            <%= question_form.label :question_text, "Your question" %>
-        </div>
+    <div id="question-text" class="form-floating mt-3">
+        <%= question_form.text_area :question_text,
+            placeholder: '_',
+            class: 'form-control',
+            style: 'height: 120px',
+            required: true
+        %>
+        <%= question_form.label :question_text, "Your question" %>
     </div>
 
-    <!-- The id must be the name of the corresponding class -->
-    <div id="Vignettes-TextQuestion"
-         class="vignette-question-field"
-         style="display: none;">
+    <div id="vignettes-edit-text-question" class="vignette-question-field collapse">
     </div>
 
-    <div id="Vignettes-LikertScaleQuestion" 
-         class="vignette-question-field"
-         style="display: none;">
+    <div id="vignettes-edit-likert collapse" class="vignette-question-field">
     </div>
 
-    <div id="Vignettes-MultipleChoiceQuestion"
-         class="vignette-question-field"
-         style="display: none;">
+    <div id="vignettes-edit-multiple-choice" class="vignette-question-field collapse">
         <div>
         <%= question_form.label :options, "Options" %>
         <div id="vignette-options-container">
@@ -62,4 +62,5 @@
         <button type="button" id="add-option">Add Option</button>
         </div>
     </div>
+
 <% end %>

From 34975679dd3fc605a7bb1cd28067674d48842547 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Tue, 25 Feb 2025 16:45:32 +0100
Subject: [PATCH 068/103] Let backend populate select field & handle question
 field state

---
 .../javascripts/vignettes/question_type.js    | 40 +++++++++++++------
 app/views/vignettes/slides/_form.html.erb     |  2 +-
 .../vignettes/slides/_form_question.html.erb  | 20 ++++------
 3 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/app/assets/javascripts/vignettes/question_type.js b/app/assets/javascripts/vignettes/question_type.js
index 70eaa1fa1..7cfd22bd8 100644
--- a/app/assets/javascripts/vignettes/question_type.js
+++ b/app/assets/javascripts/vignettes/question_type.js
@@ -1,24 +1,38 @@
+var QUESTION_TYPE_SELECT_ID = "#vignettes-question-type-select";
+
 function handleQuestionTypes() {
-  const questionTypeDropdown = $("#vignettes-question-type-select");
+  const questionTypeDropdown = $(QUESTION_TYPE_SELECT_ID);
 
   questionTypeDropdown.on("change", function (event) {
-    const questionFields = $(".vignette-question-field");
-    questionFields.each(function () {
-      $(this).collapse("hide");
-    });
+    updateQuestionFieldState(event.target.value);
+  });
+}
 
-    if (event.target.value === "vignettes-edit-no-question") {
-      return;
-    }
+function updateQuestionFieldState(selectedName) {
+  const questionFields = $(".vignette-question-field");
+  questionFields.each(function () {
+    $(this).collapse("hide");
+  });
+
+  const questionField = $("#vignette-question-text");
 
-    const selectedField = $("#" + event.target.value);
-    if (selectedField) {
-      selectedField.collapse("show");
+  // Type "No question" selected
+  if (selectedName === "") {
+    questionField.find("textarea").val("");
+    questionField.collapse("hide");
+  }
+  else {
+    questionField.collapse("show");
+    if (selectedName === "Vignettes::MultipleChoiceQuestion") {
+      $("#vignette-edit-multiple-choice").collapse("show");
     }
-  });
+  }
 }
 
-handleQuestionTypes();
+$(document).ready(function () {
+  handleQuestionTypes();
+  updateQuestionFieldState($(QUESTION_TYPE_SELECT_ID).val());
+});
 
 // document.addEventListener("turbolinks:load", () => {
 //   const optionsContainer = document.getElementById("options-container");
diff --git a/app/views/vignettes/slides/_form.html.erb b/app/views/vignettes/slides/_form.html.erb
index 122141e61..f0fd89ff4 100644
--- a/app/views/vignettes/slides/_form.html.erb
+++ b/app/views/vignettes/slides/_form.html.erb
@@ -23,7 +23,7 @@
   <%= render partial: 'form_question', locals: { form: form } %>
 
   <%= form.submit @slide.new_record? ? 'Create Slide' : 'Update Slide',
-        class: "btn btn-primary mt-2"
+        class: "btn btn-primary mt-3"
   %>
 <% end %>
 
diff --git a/app/views/vignettes/slides/_form_question.html.erb b/app/views/vignettes/slides/_form_question.html.erb
index 56805ac9e..063531f71 100644
--- a/app/views/vignettes/slides/_form_question.html.erb
+++ b/app/views/vignettes/slides/_form_question.html.erb
@@ -4,10 +4,10 @@
     <div class="form-floating">
         <%= question_form.select :type,
             options_for_select([
-                ["No Question", "vignettes-edit-no-question"],
-                ["Text Area", 'vignettes-edit-text-question'],
-                ["Multiple Choice", "vignettes-edit-multiple-choice"],
-                ["Likert Scale", "vignettes-edit-likert"]
+                ['No Question', ''],
+                ['Text Area', 'Vignettes::TextQuestion'],
+                ['Multiple Choice', 'Vignettes::MultipleChoiceQuestion'],
+                ['Likert Scale', 'Vignettes::LikertScaleQuestion']
             ], question_form.object.type),
             {},
             {
@@ -18,23 +18,17 @@
         <%= question_form.label :type, "Question Type" %>
     </div>
 
-    <div id="question-text" class="form-floating mt-3">
+    <div id="vignette-question-text" class="form-floating mt-3 show">
         <%= question_form.text_area :question_text,
             placeholder: '_',
             class: 'form-control',
             style: 'height: 120px',
-            required: true
+            required: false
         %>
         <%= question_form.label :question_text, "Your question" %>
     </div>
 
-    <div id="vignettes-edit-text-question" class="vignette-question-field collapse">
-    </div>
-
-    <div id="vignettes-edit-likert collapse" class="vignette-question-field">
-    </div>
-
-    <div id="vignettes-edit-multiple-choice" class="vignette-question-field collapse">
+    <div id="vignette-edit-multiple-choice" class="vignette-question-field collapse">
         <div>
         <%= question_form.label :options, "Options" %>
         <div id="vignette-options-container">

From 2edf6ac27eed674c75d16d7b2a13e2ab07a2bdde Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Wed, 26 Feb 2025 19:00:47 +0100
Subject: [PATCH 069/103] Make question field state update more explicit

---
 .../javascripts/vignettes/question_type.js    | 26 +++++++++----------
 .../vignettes/slides/_form_question.html.erb  |  4 +--
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/app/assets/javascripts/vignettes/question_type.js b/app/assets/javascripts/vignettes/question_type.js
index 7cfd22bd8..afd779a52 100644
--- a/app/assets/javascripts/vignettes/question_type.js
+++ b/app/assets/javascripts/vignettes/question_type.js
@@ -9,23 +9,23 @@ function handleQuestionTypes() {
 }
 
 function updateQuestionFieldState(selectedName) {
-  const questionFields = $(".vignette-question-field");
-  questionFields.each(function () {
-    $(this).collapse("hide");
-  });
-
-  const questionField = $("#vignette-question-text");
+  const multipleChoiceField = $("#vignette-edit-multiple-choice");
+  const questionTextField = $("#vignette-question-text");
 
-  // Type "No question" selected
+  // Type "No question"
   if (selectedName === "") {
-    questionField.find("textarea").val("");
-    questionField.collapse("hide");
+    questionTextField.find("textarea").val("");
+    questionTextField.collapse("hide");
+  }
+  else {
+    questionTextField.collapse("show");
+  }
+
+  if (selectedName === "Vignettes::MultipleChoiceQuestion") {
+    multipleChoiceField.collapse("show");
   }
   else {
-    questionField.collapse("show");
-    if (selectedName === "Vignettes::MultipleChoiceQuestion") {
-      $("#vignette-edit-multiple-choice").collapse("show");
-    }
+    multipleChoiceField.collapse("hide");
   }
 }
 
diff --git a/app/views/vignettes/slides/_form_question.html.erb b/app/views/vignettes/slides/_form_question.html.erb
index 063531f71..0729d69fd 100644
--- a/app/views/vignettes/slides/_form_question.html.erb
+++ b/app/views/vignettes/slides/_form_question.html.erb
@@ -28,8 +28,7 @@
         <%= question_form.label :question_text, "Your question" %>
     </div>
 
-    <div id="vignette-edit-multiple-choice" class="vignette-question-field collapse">
-        <div>
+    <div id="vignette-edit-multiple-choice" class="collapse">
         <%= question_form.label :options, "Options" %>
         <div id="vignette-options-container">
             <% question_form.object.options.each do |option| %>
@@ -54,7 +53,6 @@
             </div>
         </div>
         <button type="button" id="add-option">Add Option</button>
-        </div>
     </div>
 
 <% end %>

From 32d8c811c9c223998919aef716a416b516afe182 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Wed, 26 Feb 2025 20:04:00 +0100
Subject: [PATCH 070/103] Start simplifying multiple choice options view

---
 .../javascripts/vignettes/question_type.js    | 52 +++--------
 .../vignettes/slides/_form_question.html.erb  | 92 +++++++++----------
 2 files changed, 56 insertions(+), 88 deletions(-)

diff --git a/app/assets/javascripts/vignettes/question_type.js b/app/assets/javascripts/vignettes/question_type.js
index afd779a52..46687656e 100644
--- a/app/assets/javascripts/vignettes/question_type.js
+++ b/app/assets/javascripts/vignettes/question_type.js
@@ -1,5 +1,11 @@
 var QUESTION_TYPE_SELECT_ID = "#vignettes-question-type-select";
 
+$(document).ready(function () {
+  handleQuestionTypes();
+  updateQuestionFieldState($(QUESTION_TYPE_SELECT_ID).val());
+  handleMultipleChoiceEditor();
+});
+
 function handleQuestionTypes() {
   const questionTypeDropdown = $(QUESTION_TYPE_SELECT_ID);
 
@@ -29,43 +35,13 @@ function updateQuestionFieldState(selectedName) {
   }
 }
 
-$(document).ready(function () {
-  handleQuestionTypes();
-  updateQuestionFieldState($(QUESTION_TYPE_SELECT_ID).val());
-});
-
-// document.addEventListener("turbolinks:load", () => {
-//   const optionsContainer = document.getElementById("options-container");
+function handleMultipleChoiceEditor() {
+  console.log("Handling multiple choice editor");
 
-//   // Handle dynamic addition of options
-//   const addOptionButton = document.getElementById("add-option");
-//   const optionTemplate = document.getElementById("new-option-template");
-//   if (addOptionButton) {
-//     addOptionButton.addEventListener("click", () => {
-//       const optionTemplateHTML = optionTemplate.innerHTML;
-//       const uniqueId = new Date().getTime().toString();
-//       const newBlockHTML = optionTemplateHTML.replace(/NEW_RECORD/g, uniqueId);
+  const multipleChoiceOptionList = $("#vignette-multiple-choice-options");
+  const addOptionButton = $("#vignette-multiple-choice-add");
 
-//       optionsContainer.insertAdjacentHTML("beforeend", newBlockHTML);
-//     });
-//   }
-
-//   // Handle removal of options
-//   if (optionsContainer) {
-//     optionsContainer.addEventListener("click", (e) => {
-//       console.log(e.target);
-//       if (e.target.className == "remove-option") {
-//         e.preventDefault();
-//         const optionBlock = e.target.parentElement;
-//         if (optionBlock.className == "option-field") {
-//           const destroyField = optionBlock.querySelector("input[type='hidden'][name*='_destroy']");
-//           console.log(destroyField);
-//           if (destroyField) {
-//             destroyField.value = "1";
-//             optionBlock.style.display = "none";
-//           }
-//         }
-//       }
-//     });
-//   }
-// });
+  addOptionButton.click(function (event) {
+    // TODO
+  });
+}
diff --git a/app/views/vignettes/slides/_form_question.html.erb b/app/views/vignettes/slides/_form_question.html.erb
index 0729d69fd..b792cd0fd 100644
--- a/app/views/vignettes/slides/_form_question.html.erb
+++ b/app/views/vignettes/slides/_form_question.html.erb
@@ -1,58 +1,50 @@
 <%= form.fields_for :question do |question_form| %>
 
-    <!-- Question Type Selection -->
-    <div class="form-floating">
-        <%= question_form.select :type,
-            options_for_select([
-                ['No Question', ''],
-                ['Text Area', 'Vignettes::TextQuestion'],
-                ['Multiple Choice', 'Vignettes::MultipleChoiceQuestion'],
-                ['Likert Scale', 'Vignettes::LikertScaleQuestion']
-            ], question_form.object.type),
-            {},
-            {
-                class: "form-select",
-                id: "vignettes-question-type-select",
-                "aria-label": "Selection for question type"
-            } %>
-        <%= question_form.label :type, "Question Type" %>
-    </div>
+<!-- Question Type Selection -->
+<div class="form-floating">
+    <%= question_form.select :type,
+        options_for_select([
+            ['No Question', ''],
+            ['Text Area', 'Vignettes::TextQuestion'],
+            ['Multiple Choice', 'Vignettes::MultipleChoiceQuestion'],
+            ['Likert Scale', 'Vignettes::LikertScaleQuestion']
+        ], question_form.object.type),
+        {},
+        {
+            class: "form-select",
+            id: "vignettes-question-type-select",
+            "aria-label": "Selection for question type"
+        } %>
+    <%= question_form.label :type, "Question Type" %>
+</div>
 
-    <div id="vignette-question-text" class="form-floating mt-3 show">
-        <%= question_form.text_area :question_text,
-            placeholder: '_',
-            class: 'form-control',
-            style: 'height: 120px',
-            required: false
-        %>
-        <%= question_form.label :question_text, "Your question" %>
-    </div>
+<div id="vignette-question-text" class="form-floating mt-3 show">
+    <%= question_form.text_area :question_text,
+        placeholder: '_',
+        class: 'form-control',
+        style: 'height: 120px',
+        required: false
+    %>
+    <%= question_form.label :question_text, "Your question" %>
+</div>
 
-    <div id="vignette-edit-multiple-choice" class="collapse">
-        <%= question_form.label :options, "Options" %>
-        <div id="vignette-options-container">
-            <% question_form.object.options.each do |option| %>
-            <div class="option-block">
-                <%= question_form.fields_for :options, option do |option_form| %>
-                <div class="option-field">
-                    <%= option_form.text_field :text, placeholder: "Option Text" %>
-                    <%= option_form.hidden_field :_destroy %>
-                    <button type="button" class="remove-option">Remove</button>
-                </div>
-                <% end %>
-            </div>
-            <% end %>
-            <div id="new-option-template" style="display: none;">
-            <%= question_form.fields_for :options, question_form.object.options.build, child_index: "NEW_RECORD" do |option_form|%>
-                <div class="option-field">
-                <%= option_form.text_field :text %>
-                <%= option_form.hidden_field :_destroy %>
-                <button type="button" class="remove-option">Remove</button>
-                </div>
-            <% end %>
-            </div>
+<div id="vignette-edit-multiple-choice" class="collapse mt-3">
+    <div id="vignette-multiple-choice-options">
+        <%= question_form.fields_for :options do |option_form|%>
+        <div class="d-flex justify-content-between align-items-center mb-2">
+            <%= option_form.text_field :text, class: "form-control me-2" %>
+            <button class="btn btn-outline-danger" type="button">
+                <i class="bi bi-trash3-fill"></i>
+            </button>
         </div>
-        <button type="button" id="add-option">Add Option</button>
+        <% end %>
     </div>
+    
+    <button type="button" id="vignette-multiple-choice-add"
+            class="btn btn-outline-secondary">
+        <i class="bi bi-plus-circle"></i>
+        Add Multiple Choice Option
+    </button>
+</div>
 
 <% end %>

From ff50fc0219d9e4cc7aaa803b068f880b82e7e105 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Wed, 26 Feb 2025 20:37:44 +0100
Subject: [PATCH 071/103] Reimplement adding new multiple choice option

---
 .../javascripts/vignettes/question_type.js    | 13 ++++----
 .../vignettes/slides/_form_question.html.erb  | 31 +++++++++++--------
 .../slides/_multiple_choice_fields.html.erb   |  6 ++++
 3 files changed, 30 insertions(+), 20 deletions(-)
 create mode 100644 app/views/vignettes/slides/_multiple_choice_fields.html.erb

diff --git a/app/assets/javascripts/vignettes/question_type.js b/app/assets/javascripts/vignettes/question_type.js
index 46687656e..797cc87f9 100644
--- a/app/assets/javascripts/vignettes/question_type.js
+++ b/app/assets/javascripts/vignettes/question_type.js
@@ -36,12 +36,11 @@ function updateQuestionFieldState(selectedName) {
 }
 
 function handleMultipleChoiceEditor() {
-  console.log("Handling multiple choice editor");
-
-  const multipleChoiceOptionList = $("#vignette-multiple-choice-options");
-  const addOptionButton = $("#vignette-multiple-choice-add");
-
-  addOptionButton.click(function (event) {
-    // TODO
+  $("#vignette-multiple-choice-add").click(function (_evt) {
+    const template = $("#vignette-multiple-choice-options-template");
+    const newOptionHtml = template.html();
+    const uniqueId = new Date().getTime();
+    const newBlockHtml = newOptionHtml.replace(/NEW_RECORD/g, uniqueId);
+    $("#vignette-multiple-choice-options").append(newBlockHtml);
   });
 }
diff --git a/app/views/vignettes/slides/_form_question.html.erb b/app/views/vignettes/slides/_form_question.html.erb
index b792cd0fd..2aeb4d0c8 100644
--- a/app/views/vignettes/slides/_form_question.html.erb
+++ b/app/views/vignettes/slides/_form_question.html.erb
@@ -1,44 +1,49 @@
-<%= form.fields_for :question do |question_form| %>
+<%= form.fields_for :question do |f| %>
 
 <!-- Question Type Selection -->
 <div class="form-floating">
-    <%= question_form.select :type,
+    <%= f.select :type,
         options_for_select([
             ['No Question', ''],
             ['Text Area', 'Vignettes::TextQuestion'],
             ['Multiple Choice', 'Vignettes::MultipleChoiceQuestion'],
             ['Likert Scale', 'Vignettes::LikertScaleQuestion']
-        ], question_form.object.type),
+        ], f.object.type),
         {},
         {
             class: "form-select",
             id: "vignettes-question-type-select",
             "aria-label": "Selection for question type"
         } %>
-    <%= question_form.label :type, "Question Type" %>
+    <%= f.label :type, "Question Type" %>
 </div>
 
 <div id="vignette-question-text" class="form-floating mt-3 show">
-    <%= question_form.text_area :question_text,
+    <%= f.text_area :question_text,
         placeholder: '_',
         class: 'form-control',
         style: 'height: 120px',
         required: false
     %>
-    <%= question_form.label :question_text, "Your question" %>
+    <%= f.label :question_text, "Your question" %>
 </div>
 
 <div id="vignette-edit-multiple-choice" class="collapse mt-3">
+
     <div id="vignette-multiple-choice-options">
-        <%= question_form.fields_for :options do |option_form|%>
-        <div class="d-flex justify-content-between align-items-center mb-2">
-            <%= option_form.text_field :text, class: "form-control me-2" %>
-            <button class="btn btn-outline-danger" type="button">
-                <i class="bi bi-trash3-fill"></i>
-            </button>
-        </div>
+        <%= f.fields_for :options do |option_form| %>
+            <%= render partial: "multiple_choice_fields", locals: { f: option_form } %>
         <% end %>
     </div>
+
+    <!-- later with Stimulus: -->
+    <!-- https://jonathanyeong.com/rails-stimulus-dynamic-nested-form/ -->
+    <template id="vignette-multiple-choice-options-template" class="d-none">
+        <%= f.fields_for :options, f.object.options.build,
+                         child_index: 'NEW_RECORD' do |option_form| %>
+            <%= render partial: "multiple_choice_fields", locals: { f: option_form } %>
+        <% end %>
+    </template>
     
     <button type="button" id="vignette-multiple-choice-add"
             class="btn btn-outline-secondary">
diff --git a/app/views/vignettes/slides/_multiple_choice_fields.html.erb b/app/views/vignettes/slides/_multiple_choice_fields.html.erb
new file mode 100644
index 000000000..1f73ed8d3
--- /dev/null
+++ b/app/views/vignettes/slides/_multiple_choice_fields.html.erb
@@ -0,0 +1,6 @@
+<div class="d-flex justify-content-between align-items-center mb-2">
+    <%= f.text_field :text, class: "form-control me-2" %>
+    <button class="btn btn-outline-danger" type="button">
+        <i class="bi bi-trash3-fill"></i>
+    </button>
+</div>

From 584b34920476a3867c1bf77751452fcfa7a4f7c7 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Wed, 26 Feb 2025 20:57:51 +0100
Subject: [PATCH 072/103] Implement removing a multiple choice option

---
 app/assets/javascripts/vignettes/question_type.js         | 8 ++++++++
 app/views/vignettes/slides/_form.html.erb                 | 2 --
 app/views/vignettes/slides/_form_question.html.erb        | 2 ++
 .../vignettes/slides/_multiple_choice_fields.html.erb     | 3 ++-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/vignettes/question_type.js b/app/assets/javascripts/vignettes/question_type.js
index 797cc87f9..f29da466c 100644
--- a/app/assets/javascripts/vignettes/question_type.js
+++ b/app/assets/javascripts/vignettes/question_type.js
@@ -36,6 +36,7 @@ function updateQuestionFieldState(selectedName) {
 }
 
 function handleMultipleChoiceEditor() {
+  // Adding an option
   $("#vignette-multiple-choice-add").click(function (_evt) {
     const template = $("#vignette-multiple-choice-options-template");
     const newOptionHtml = template.html();
@@ -43,4 +44,11 @@ function handleMultipleChoiceEditor() {
     const newBlockHtml = newOptionHtml.replace(/NEW_RECORD/g, uniqueId);
     $("#vignette-multiple-choice-options").append(newBlockHtml);
   });
+
+  // Removing an option
+  $(".remove-vignette-mc-option").click(function (evt) {
+    const parentDiv = $(evt.target).closest("div");
+    parentDiv.find(".vignette-mc-hidden-destroy").val("1");
+    parentDiv.removeClass("d-flex").hide();
+  });
 }
diff --git a/app/views/vignettes/slides/_form.html.erb b/app/views/vignettes/slides/_form.html.erb
index f0fd89ff4..fb3ca3f2a 100644
--- a/app/views/vignettes/slides/_form.html.erb
+++ b/app/views/vignettes/slides/_form.html.erb
@@ -26,5 +26,3 @@
         class: "btn btn-primary mt-3"
   %>
 <% end %>
-
-<%= javascript_include_tag 'vignettes/question_type' %>
diff --git a/app/views/vignettes/slides/_form_question.html.erb b/app/views/vignettes/slides/_form_question.html.erb
index 2aeb4d0c8..f4417065b 100644
--- a/app/views/vignettes/slides/_form_question.html.erb
+++ b/app/views/vignettes/slides/_form_question.html.erb
@@ -53,3 +53,5 @@
 </div>
 
 <% end %>
+
+<%= javascript_include_tag 'vignettes/question_type' %>
diff --git a/app/views/vignettes/slides/_multiple_choice_fields.html.erb b/app/views/vignettes/slides/_multiple_choice_fields.html.erb
index 1f73ed8d3..9cb1cae6b 100644
--- a/app/views/vignettes/slides/_multiple_choice_fields.html.erb
+++ b/app/views/vignettes/slides/_multiple_choice_fields.html.erb
@@ -1,6 +1,7 @@
 <div class="d-flex justify-content-between align-items-center mb-2">
     <%= f.text_field :text, class: "form-control me-2" %>
-    <button class="btn btn-outline-danger" type="button">
+    <%= f.hidden_field :_destroy, class: "vignette-mc-hidden-destroy" %>
+    <button class="btn btn-outline-danger remove-vignette-mc-option" type="button">
         <i class="bi bi-trash3-fill"></i>
     </button>
 </div>

From 3903f642adb34647e957a00ea54d383e8ce42287 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Wed, 26 Feb 2025 21:02:00 +0100
Subject: [PATCH 073/103] Make sure remove button also works for dynamically
 added items

---
 app/assets/javascripts/vignettes/question_type.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/vignettes/question_type.js b/app/assets/javascripts/vignettes/question_type.js
index f29da466c..e816913f5 100644
--- a/app/assets/javascripts/vignettes/question_type.js
+++ b/app/assets/javascripts/vignettes/question_type.js
@@ -46,7 +46,7 @@ function handleMultipleChoiceEditor() {
   });
 
   // Removing an option
-  $(".remove-vignette-mc-option").click(function (evt) {
+  $(document).on("click", ".remove-vignette-mc-option", function (evt) {
     const parentDiv = $(evt.target).closest("div");
     parentDiv.find(".vignette-mc-hidden-destroy").val("1");
     parentDiv.removeClass("d-flex").hide();

From 363888e929ac746e303635516b3199c8c5fa3189 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Thu, 27 Feb 2025 16:31:52 +0100
Subject: [PATCH 074/103] Pin Tom Select & use bootstrap 5 CSS styles

---
 app/views/layouts/_head.html.erb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb
index c67acb869..53a47a92f 100644
--- a/app/views/layouts/_head.html.erb
+++ b/app/views/layouts/_head.html.erb
@@ -52,8 +52,10 @@
         integrity="sha384-vZTG03m+2yp6N6BNi5iM4rW4oIwk5DfcNdFfxkk9ZWpDriOkXX8voJBFrAO7MpVl"
         crossorigin="anonymous">
 </script>
-<link href="https://cdn.jsdelivr.net/npm/tom-select/dist/css/tom-select.default.min.css" rel="stylesheet">
-<script src="https://cdn.jsdelivr.net/npm/tom-select/dist/js/tom-select.complete.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/tom-select@2.4.3/dist/js/tom-select.complete.min.js">
+</script>
+<link href="https://cdn.jsdelivr.net/npm/tom-select@2.4.3/dist/css/tom-select.bootstrap5.min.css"
+      rel="stylesheet">
 
 <%# Masonry: https://masonry.desandro.com/ %>
 <script src="https://cdn.jsdelivr.net/npm/masonry-layout@4.2.2/dist/masonry.pkgd.min.js"

From 2638982b8f87ab59b8fa1b9f92800d6e94018b26 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Thu, 27 Feb 2025 16:33:29 +0100
Subject: [PATCH 075/103] Use Tom Select for info slide selection & add
 form-floating

Also see https://github.com/orchidjs/tom-select/pull/891/
---
 .../javascripts/vignettes/edit_slide.js.erb   |  5 +++
 app/assets/stylesheets/application.scss       | 39 +++++++++++++++++++
 app/views/vignettes/slides/_form.html.erb     | 22 +++++------
 3 files changed, 55 insertions(+), 11 deletions(-)
 create mode 100644 app/assets/javascripts/vignettes/edit_slide.js.erb

diff --git a/app/assets/javascripts/vignettes/edit_slide.js.erb b/app/assets/javascripts/vignettes/edit_slide.js.erb
new file mode 100644
index 000000000..7ebb45d44
--- /dev/null
+++ b/app/assets/javascripts/vignettes/edit_slide.js.erb
@@ -0,0 +1,5 @@
+$(document).ready(function () {
+  new TomSelect("#vignettes-linked-info-slides", {
+    plugins: ["remove_button"],
+  });
+});
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 0f0ad6eaa..b1ffb457f 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -301,4 +301,43 @@ a {
   background: radial-gradient(circle at top right, transparent 10%, #fafdff 10%, #fafdff 20%, transparent 21%), radial-gradient(circle at left bottom, transparent 10%, #fafdff 10%, #fafdff 20%, transparent 21%), radial-gradient(circle at top left, transparent 10%, #fafdff 10%, #fafdff 20%, transparent 21%), radial-gradient(circle at right bottom, transparent 10%, #fafdff 10%, #fafdff 20%, transparent 21%), radial-gradient(circle at center, #fafdff 30%, transparent 31%);
   background-size: 6em 6em;
   background-color: #ffffff;
+}
+
+// Tom Select Floating Label with Boostrap until this PR is merged:
+// https://github.com/orchidjs/tom-select/pull/891/
+.form-floating {
+
+  /* move ts-control input element below the floating label */
+  .ts-wrapper.form-control,
+  .ts-wrapper.form-select {
+    height: 0 !important;
+  }
+
+  .ts-wrapper.form-control .ts-control,
+  .ts-wrapper.form-select .ts-control {
+    padding-top: 1.625rem !important;
+    padding-bottom: 0.625rem !important;
+  }
+
+  /* if field is styled as a text field (.form-control instead of .form-select)
+  	 * make sure we apply the same animation as Bootstrap 5 */
+  .ts-wrapper.form-control~label,
+  .ts-wrapper.form-select~label {
+    transform: scale(1) translateY(0) translateX(0);
+    color: rgba(var(--bs-body-color-rgb), 1);
+  }
+
+  .ts-wrapper.form-control.focus~label,
+  .ts-wrapper.form-control.full~label,
+  .ts-wrapper.form-select.focus~label,
+  .ts-wrapper.form-select.full~label,
+  .ts-wrapper.form-select.has-items~label {
+    transform: scale(0.85) translateY(-0.5rem) translateX(0.15rem);
+    color: rgba(var(--bs-body-color-rgb), 0.65);
+  }
+
+  /* hides empty value which tomselect uses as placeholder */
+  .ts-wrapper.form-select:not(.focus) .ts-control ::placeholder {
+    opacity: 0;
+  }
 }
\ No newline at end of file
diff --git a/app/views/vignettes/slides/_form.html.erb b/app/views/vignettes/slides/_form.html.erb
index fb3ca3f2a..41397a960 100644
--- a/app/views/vignettes/slides/_form.html.erb
+++ b/app/views/vignettes/slides/_form.html.erb
@@ -5,17 +5,15 @@
       id: "slide-form"
     ) do |form| %>
 
-  <div>
-    <%= form.label :vignettes_info_slide_ids, "Select Info Slides" %><br>
-    <%= form.collection_select(
-          :info_slide_ids,
-          @questionnaire.info_slides,
-          :id,
-          :title,
-          {},
-          multiple: true
-        ) 
-    %>
+  <div class="form-floating mb-3">
+    <%= form.select :info_slide_ids,
+        options_for_select(
+          @questionnaire.info_slides.map { |s| [s.title, s.id] },
+          @slide.info_slides.map(&:id)
+        ),
+      { include_blank: true, multiple: true },
+      { id: "vignettes-linked-info-slides", class: "form-select" } %>
+    <%= form.label :info_slides, "Linked Info Slides" %>
   </div>
 
   <%= render partial: 'form_content', locals: { form: form } %>
@@ -26,3 +24,5 @@
         class: "btn btn-primary mt-3"
   %>
 <% end %>
+
+<%= javascript_include_tag 'vignettes/edit_slide' %>

From f248fc268b65b43e43e22d4e1d8458b34a082f9c Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Thu, 27 Feb 2025 16:48:05 +0100
Subject: [PATCH 076/103] Disable sortable dragging on accordion body

---
 app/assets/javascripts/vignettes/edit.js.erb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/javascripts/vignettes/edit.js.erb b/app/assets/javascripts/vignettes/edit.js.erb
index a49929834..78cabea19 100644
--- a/app/assets/javascripts/vignettes/edit.js.erb
+++ b/app/assets/javascripts/vignettes/edit.js.erb
@@ -7,6 +7,7 @@ $(document).on("turbolinks:load", function () {
 
 function createSortableVignetteSlides(vignetteSlideList) {
   Sortable.create(vignetteSlideList.get(0), {
+    filter: ".accordion-collapse",
     animation: 150,
     ghostClass: "vignette-sortable-ghost",
     onEnd: function (_evt) {

From ae20f2af46a6f5fa6f91ff28263b64cbd836d5ec Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Thu, 27 Feb 2025 16:49:07 +0100
Subject: [PATCH 077/103] Remove unused ghost class on sortable

---
 app/assets/javascripts/vignettes/edit.js.erb     | 1 -
 app/assets/stylesheets/vignettes-edit.scss       | 7 -------
 app/views/vignettes/questionnaires/edit.html.erb | 1 -
 3 files changed, 9 deletions(-)
 delete mode 100644 app/assets/stylesheets/vignettes-edit.scss

diff --git a/app/assets/javascripts/vignettes/edit.js.erb b/app/assets/javascripts/vignettes/edit.js.erb
index 78cabea19..1d05648ee 100644
--- a/app/assets/javascripts/vignettes/edit.js.erb
+++ b/app/assets/javascripts/vignettes/edit.js.erb
@@ -9,7 +9,6 @@ function createSortableVignetteSlides(vignetteSlideList) {
   Sortable.create(vignetteSlideList.get(0), {
     filter: ".accordion-collapse",
     animation: 150,
-    ghostClass: "vignette-sortable-ghost",
     onEnd: function (_evt) {
       // console.log(`Moved element from ${evt.oldIndex} to ${evt.newIndex}`);
       // TODO: send a request to update the order of the slides in the database
diff --git a/app/assets/stylesheets/vignettes-edit.scss b/app/assets/stylesheets/vignettes-edit.scss
deleted file mode 100644
index f3c831cf8..000000000
--- a/app/assets/stylesheets/vignettes-edit.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-@import "branding";
-
-.vignette-sortable-ghost {
-    background-color: $mampf-blue;
-    color: white;
-    border: 1px solid $mampf-blue;
-}
diff --git a/app/views/vignettes/questionnaires/edit.html.erb b/app/views/vignettes/questionnaires/edit.html.erb
index 88e5a72d5..743b046a0 100644
--- a/app/views/vignettes/questionnaires/edit.html.erb
+++ b/app/views/vignettes/questionnaires/edit.html.erb
@@ -1,4 +1,3 @@
-<%= stylesheet_link_tag 'vignettes-edit' %>
 <script src="https://cdn.jsdelivr.net/npm/sortablejs@1.15/Sortable.min.js"></script>
 <%= javascript_include_tag 'vignettes/edit' %>
 

From 6f1539351d3c26f08d1ca3222d7624e0f5a41242 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Thu, 27 Feb 2025 16:55:09 +0100
Subject: [PATCH 078/103] Use tom select for question type selection

---
 app/assets/javascripts/vignettes/question_type.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/javascripts/vignettes/question_type.js b/app/assets/javascripts/vignettes/question_type.js
index e816913f5..64f76bb55 100644
--- a/app/assets/javascripts/vignettes/question_type.js
+++ b/app/assets/javascripts/vignettes/question_type.js
@@ -3,6 +3,7 @@ var QUESTION_TYPE_SELECT_ID = "#vignettes-question-type-select";
 $(document).ready(function () {
   handleQuestionTypes();
   updateQuestionFieldState($(QUESTION_TYPE_SELECT_ID).val());
+  new TomSelect(QUESTION_TYPE_SELECT_ID, { allowEmptyOption: true });
   handleMultipleChoiceEditor();
 });
 

From 09f4daf31c8148c26ad97984f0db84e24f700dee Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Thu, 27 Feb 2025 16:58:32 +0100
Subject: [PATCH 079/103] Don't prevent mouse clicks for filtered sortable
 items

---
 app/assets/javascripts/vignettes/edit.js.erb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/vignettes/edit.js.erb b/app/assets/javascripts/vignettes/edit.js.erb
index 1d05648ee..0e0c20cfe 100644
--- a/app/assets/javascripts/vignettes/edit.js.erb
+++ b/app/assets/javascripts/vignettes/edit.js.erb
@@ -7,8 +7,9 @@ $(document).on("turbolinks:load", function () {
 
 function createSortableVignetteSlides(vignetteSlideList) {
   Sortable.create(vignetteSlideList.get(0), {
-    filter: ".accordion-collapse",
     animation: 150,
+    filter: ".accordion-collapse",
+    preventOnFilter: false,
     onEnd: function (_evt) {
       // console.log(`Moved element from ${evt.oldIndex} to ${evt.newIndex}`);
       // TODO: send a request to update the order of the slides in the database

From f29367a3af875bc11c43ec21c260de9dbc7b0d0e Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Thu, 27 Feb 2025 17:54:58 +0100
Subject: [PATCH 080/103] Improve accordion slide opening (spinner &
 flickering)

---
 app/assets/javascripts/vignettes/edit.js.erb   | 18 +++++++++++++++---
 app/assets/stylesheets/application.scss        |  8 ++++++++
 .../_slide_accordion_item.html.erb             | 14 +++++++++++---
 3 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/vignettes/edit.js.erb b/app/assets/javascripts/vignettes/edit.js.erb
index 0e0c20cfe..ea35a8a24 100644
--- a/app/assets/javascripts/vignettes/edit.js.erb
+++ b/app/assets/javascripts/vignettes/edit.js.erb
@@ -40,7 +40,7 @@ function createSortableVignetteSlides(vignetteSlideList) {
 }
 
 function registerVignetteSlideListeners(vignetteSlideList) {
-  $(vignetteSlideList).on("click", ".accordion-button", function (evt) {
+  $(".vignette-accordion-collapse").on("shown.bs.collapse", function (evt) {
     const slideId = evt.target.dataset.slideId;
     if (slideId === undefined) {
       console.error("Slide id is missing");
@@ -53,15 +53,27 @@ function registerVignetteSlideListeners(vignetteSlideList) {
       return;
     }
 
+    const loadingSpinner = $(`#vignette-slide-loading-${slideId}`);
+    let spinnerTimeout = setTimeout(function () {
+      loadingSpinner.show();
+    }, 100); // avoid flickering when loading is fast
+
     $.ajax({
       url: Routes.edit_vignettes_questionnaire_slide_path(questionnaireId, slideId),
       method: "GET",
       dataType: "html",
       success: function (response) {
-        $(".slides-edit-form-container").html(""); // remove old forms
-        $(`#slide-edit-form-container-${slideId}`).html(response);
+        clearTimeout(spinnerTimeout);
+
+        $(vignetteSlideList).find(".slides-edit-form-container").html("");
+        const editFormContainer = $(`#slide-edit-form-container-${slideId}`);
+        editFormContainer.hide().html(response).ready(function () {
+          loadingSpinner.hide();
+          editFormContainer.show();
+        });
       },
       error: function (xhr, status, error) {
+        clearTimeout(spinnerTimeout);
         console.error(`Failed to load slide edit form: ${error}`);
       },
     });
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index b1ffb457f..217fbef28 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -340,4 +340,12 @@ a {
   .ts-wrapper.form-select:not(.focus) .ts-control ::placeholder {
     opacity: 0;
   }
+}
+
+// Make sure that d-flex elements with display: none are hidden
+// https://stackoverflow.com/a/56073779/
+// https://github.com/twbs/bootstrap/issues/22076
+.d-flex[style*="display:none"],
+.d-flex[style*="display: none"] {
+  display: none !important;
 }
\ No newline at end of file
diff --git a/app/views/vignettes/questionnaires/_slide_accordion_item.html.erb b/app/views/vignettes/questionnaires/_slide_accordion_item.html.erb
index 10b6740f7..332905392 100644
--- a/app/views/vignettes/questionnaires/_slide_accordion_item.html.erb
+++ b/app/views/vignettes/questionnaires/_slide_accordion_item.html.erb
@@ -2,7 +2,6 @@
 
     <h2 class="accordion-header">
         <button class="accordion-button collapsed" type="button"
-                data-slide-id="<%= slide.id %>"
                 data-bs-toggle="collapse" data-bs-target="#slides-collapse-<%= slide.id %>"
                 aria-expanded="false" aria-controls="slides-collapse-<%= slide.id %>">
             <!-- TODO: show useful information here, e.g. answer type -->
@@ -10,8 +9,17 @@
         </button>
     </h2>
 
-    <div id="slides-collapse-<%= slide.id %>" class="accordion-collapse collapse collapse"
-        data-bs-parent="#vignettes-slides-accordion">
+    <div id="slides-collapse-<%= slide.id %>"
+         data-slide-id="<%= slide.id %>"
+         class="accordion-collapse collapse vignette-accordion-collapse"
+         data-bs-parent="#vignettes-slides-accordion">
+
+        <div id="vignette-slide-loading-<%= slide.id %>" 
+             class="d-flex justify-content-center mt-3">
+            <div class="spinner-border text-secondary" role="status">
+                <span class="visually-hidden">Loading...</span>
+            </div>
+        </div>
 
         <% if slide.id %>
         <div class="accordion-body slides-edit-form-container"

From 4169992b202108356747e8cda63f936e4d60884b Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Thu, 27 Feb 2025 18:01:54 +0100
Subject: [PATCH 081/103] Ignore shown.bs.collapse for multiple choice options

---
 app/assets/javascripts/vignettes/edit.js.erb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/vignettes/edit.js.erb b/app/assets/javascripts/vignettes/edit.js.erb
index ea35a8a24..1fd4b40bd 100644
--- a/app/assets/javascripts/vignettes/edit.js.erb
+++ b/app/assets/javascripts/vignettes/edit.js.erb
@@ -43,7 +43,8 @@ function registerVignetteSlideListeners(vignetteSlideList) {
   $(".vignette-accordion-collapse").on("shown.bs.collapse", function (evt) {
     const slideId = evt.target.dataset.slideId;
     if (slideId === undefined) {
-      console.error("Slide id is missing");
+      // multiple choice options are also collapsible
+      // and trigger shown.bs.collapse
       return;
     }
 

From 95fc4ef41a117f624e90e625819fc21cd613c565 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Thu, 27 Feb 2025 18:32:23 +0100
Subject: [PATCH 082/103] Improve rendering of loading spinner

---
 app/assets/javascripts/vignettes/edit.js.erb                  | 3 +--
 .../vignettes/questionnaires/_slide_accordion_item.html.erb   | 2 +-
 app/views/vignettes/slides/_form_question.html.erb            | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/vignettes/edit.js.erb b/app/assets/javascripts/vignettes/edit.js.erb
index 1fd4b40bd..9e87a1153 100644
--- a/app/assets/javascripts/vignettes/edit.js.erb
+++ b/app/assets/javascripts/vignettes/edit.js.erb
@@ -64,11 +64,10 @@ function registerVignetteSlideListeners(vignetteSlideList) {
       method: "GET",
       dataType: "html",
       success: function (response) {
-        clearTimeout(spinnerTimeout);
-
         $(vignetteSlideList).find(".slides-edit-form-container").html("");
         const editFormContainer = $(`#slide-edit-form-container-${slideId}`);
         editFormContainer.hide().html(response).ready(function () {
+          clearTimeout(spinnerTimeout);
           loadingSpinner.hide();
           editFormContainer.show();
         });
diff --git a/app/views/vignettes/questionnaires/_slide_accordion_item.html.erb b/app/views/vignettes/questionnaires/_slide_accordion_item.html.erb
index 332905392..45703174f 100644
--- a/app/views/vignettes/questionnaires/_slide_accordion_item.html.erb
+++ b/app/views/vignettes/questionnaires/_slide_accordion_item.html.erb
@@ -15,7 +15,7 @@
          data-bs-parent="#vignettes-slides-accordion">
 
         <div id="vignette-slide-loading-<%= slide.id %>" 
-             class="d-flex justify-content-center mt-3">
+             class="d-flex justify-content-center mt-3 mb-3">
             <div class="spinner-border text-secondary" role="status">
                 <span class="visually-hidden">Loading...</span>
             </div>
diff --git a/app/views/vignettes/slides/_form_question.html.erb b/app/views/vignettes/slides/_form_question.html.erb
index f4417065b..7e10ffaf5 100644
--- a/app/views/vignettes/slides/_form_question.html.erb
+++ b/app/views/vignettes/slides/_form_question.html.erb
@@ -1,3 +1,5 @@
+<%= javascript_include_tag 'vignettes/question_type' %>
+
 <%= form.fields_for :question do |f| %>
 
 <!-- Question Type Selection -->
@@ -53,5 +55,3 @@
 </div>
 
 <% end %>
-
-<%= javascript_include_tag 'vignettes/question_type' %>

From f7651c8603e8bea3ac6d64a6c553418343da9182 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Thu, 27 Feb 2025 18:34:01 +0100
Subject: [PATCH 083/103] Add hint for dragging slides

---
 app/views/vignettes/questionnaires/edit.html.erb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views/vignettes/questionnaires/edit.html.erb b/app/views/vignettes/questionnaires/edit.html.erb
index 743b046a0..d31996545 100644
--- a/app/views/vignettes/questionnaires/edit.html.erb
+++ b/app/views/vignettes/questionnaires/edit.html.erb
@@ -3,7 +3,9 @@
 
 <div class="container-md small-width">
     <!-- Slides -->
-    <h1 class="fs-4 fw-bold"> Slides </h1>
+    <h1 class="fs-4 fw-bold">Slides</h1>
+
+    <p>Drag the slides to change their order.</p>
 
     <div class="accordion" id="vignettes-slides-accordion"
          data-questionnaire-id="<%= @questionnaire.id %>">

From 255b5c4b29a916612d860c41fda311283aa4c081 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Fri, 28 Feb 2025 08:50:16 +0100
Subject: [PATCH 084/103] Fix redundant line continuation

---
 config/initializers/html_sanitization.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/initializers/html_sanitization.rb b/config/initializers/html_sanitization.rb
index b8234d1b7..50564a8ff 100644
--- a/config/initializers/html_sanitization.rb
+++ b/config/initializers/html_sanitization.rb
@@ -1,7 +1,7 @@
 Rails.application.config.after_initialize do
   default_allowed_attributes =
-    Rails::HTML5::Sanitizer.safe_list_sanitizer.allowed_attributes + \
-    ActionText::Attachment::ATTRIBUTES.to_set
+    Rails::HTML5::Sanitizer.safe_list_sanitizer.allowed_attributes \
+    + ActionText::Attachment::ATTRIBUTES.to_set
   custom_allowed_attributes = Set.new(["controls"])
   ActionText::ContentHelper.allowed_attributes = (default_allowed_attributes +
   custom_allowed_attributes).freeze

From d5b60ac928b969ce279645b3ff2c2df11edba1a4 Mon Sep 17 00:00:00 2001
From: Florian <florianbuerckel@gmail.com>
Date: Fri, 28 Feb 2025 15:27:23 +0100
Subject: [PATCH 085/103] make questionnnaires part of course

Signed-off-by: Florian <florianbuerckel@gmail.com>
---
 .../vignettes/questionnaires_controller.rb    |  9 +++-
 app/models/course.rb                          |  5 +++
 app/models/lecture.rb                         |  7 ++++
 app/models/vignettes/questionnaire.rb         |  1 +
 app/views/courses/_data.html.erb              |  5 +++
 app/views/courses/edit.html.erb               |  1 +
 app/views/shared/_sidebar.html.erb            | 11 +++++
 .../_questionnaire_accordion.html.erb         | 42 +++++++++++++++++++
 .../questionnaires/_vignette_form.html.erb    | 12 ++++--
 .../questionnaires/_vignette_modal.html.erb   |  2 +-
 config/routes.rb                              |  8 ++++
 ...4132354_create_vignettes_questionnaires.rb |  1 +
 db/schema.rb                                  |  3 ++
 13 files changed, 100 insertions(+), 7 deletions(-)
 create mode 100644 app/views/vignettes/questionnaires/_questionnaire_accordion.html.erb

diff --git a/app/controllers/vignettes/questionnaires_controller.rb b/app/controllers/vignettes/questionnaires_controller.rb
index a561acb66..b8da9df42 100644
--- a/app/controllers/vignettes/questionnaires_controller.rb
+++ b/app/controllers/vignettes/questionnaires_controller.rb
@@ -3,8 +3,9 @@
 module Vignettes
   class QuestionnairesController < ApplicationController
     before_action :set_questionnaire, only: [:show, :take, :submit_answer]
+    before_action :set_course, only: [:index, :new, :create]
     def index
-      @questionnaires = Questionnaire.all
+      @questionnaires = @course.questionnaires
       # Because the create model form works on the index page.
       @questionnaire = Questionnaire.new
     end
@@ -120,8 +121,12 @@ def set_questionnaire
         @questionnaire = Questionnaire.find(params[:id])
       end
 
+      def set_course
+        @course = Course.find(params[:vignettes_questionnaire][:course_id])
+      end
+
       def questionnaire_params
-        params.require(:vignettes_questionnaire).permit(:title)
+        params.require(:vignettes_questionnaire).permit(:title, :course_id)
       end
 
       def answer_params
diff --git a/app/models/course.rb b/app/models/course.rb
index 574e1f4e6..b5d1e6d98 100644
--- a/app/models/course.rb
+++ b/app/models/course.rb
@@ -18,6 +18,11 @@ class Course < ApplicationRecord
            as: :teachable,
            inverse_of: :teachable
 
+  has_many :vignettes_questionnaires, -> { order(id: :asc) },
+           class_name: "Vignettes::Questionnaire",
+           dependent: :destroy,
+           inverse_of: :course
+
   # in a course, you can import other media
   has_many :imports, as: :teachable, dependent: :destroy
   has_many :imported_media, through: :imports, source: :medium
diff --git a/app/models/lecture.rb b/app/models/lecture.rb
index c42267298..61a032532 100644
--- a/app/models/lecture.rb
+++ b/app/models/lecture.rb
@@ -382,6 +382,13 @@ def reste?(user)
     project?("reste", user) || imported_any?("reste")
   end
 
+  def questionnaire?
+    return false
+    Rails.cache.fetch("#{cache_key_with_version}/has_questionnaire") do
+      Vignettes::Questionnaire.exists?(lecture_id: id)
+    end
+  end
+
   # the next methods put together some information on the lecture (teacher,
   # term, title) in various combinations
 
diff --git a/app/models/vignettes/questionnaire.rb b/app/models/vignettes/questionnaire.rb
index 725011762..d85c079a7 100644
--- a/app/models/vignettes/questionnaire.rb
+++ b/app/models/vignettes/questionnaire.rb
@@ -1,5 +1,6 @@
 module Vignettes
   class Questionnaire < ApplicationRecord
+    belongs_to :course
     has_many :slides,
              foreign_key: "vignettes_questionnaire_id",
              dependent: :destroy,
diff --git a/app/views/courses/_data.html.erb b/app/views/courses/_data.html.erb
index c5ce7ba0b..2fcb880b4 100644
--- a/app/views/courses/_data.html.erb
+++ b/app/views/courses/_data.html.erb
@@ -28,6 +28,11 @@
         <%= render partial: 'courses/image',
                    locals: { course: course, f: f } %>
       </div>
+      <div class="col-12 mb-3">
+        <%= render partial: 'vignettes/questionnaires/questionnaire_accordion',
+                    locals: { course: course }
+        %>
+      </div>
       <div class="col-12">
         <div class="card bg-light">
           <div class="card-header">
diff --git a/app/views/courses/edit.html.erb b/app/views/courses/edit.html.erb
index 0fbcff5c3..2f86978cb 100644
--- a/app/views/courses/edit.html.erb
+++ b/app/views/courses/edit.html.erb
@@ -3,5 +3,6 @@
              locals: { course: @course } %>
 </div>
 <%= render partial: 'media/modal' %>
+<%= render 'vignettes/questionnaires/vignette_modal', course: @course %>
 <%= render partial: 'tags/modal' %>
 <%= render partial: 'lectures/modal' %>
diff --git a/app/views/shared/_sidebar.html.erb b/app/views/shared/_sidebar.html.erb
index 3b2b0bfdf..b4bfd4aa9 100644
--- a/app/views/shared/_sidebar.html.erb
+++ b/app/views/shared/_sidebar.html.erb
@@ -151,6 +151,17 @@
     </a>
   </li>
 
+  <!--
+  <% fullpath = get_lecture_questionnaires %>
+  <% active_class = get_class_for_project(project_name) %>
+  <li class="sidebar-item nav-link <%= active_class %>
+          <%= !lecture || !lecture.questionnaire? ? "disabled" : ""%>">
+    <a href="<%= url_for(fullpath)%>">
+      <i class="bi bi-layers<%= active_class.present? ? "-fill" : "" %>"> Vignettes </i>
+    </a>
+  </li>
+  -->
+
   <%# Diverse (Rest) %>
   <% project_name = 'reste' %>
   <% fullpath = lecture_food_path(lecture, params: { project: project_name })%>
diff --git a/app/views/vignettes/questionnaires/_questionnaire_accordion.html.erb b/app/views/vignettes/questionnaires/_questionnaire_accordion.html.erb
new file mode 100644
index 000000000..60402d957
--- /dev/null
+++ b/app/views/vignettes/questionnaires/_questionnaire_accordion.html.erb
@@ -0,0 +1,42 @@
+<div id="questionnaire_accordion" role="tablist">
+  <div class="card bg-light">
+    <div class="card-header" role="tab" id="questionnaire_heading">
+      <div class="row">
+        <div class="col-6">
+          <h5>
+            Vignettes
+          </h5>
+        </div>
+        <div class="col-6 text-end">
+            <%= link_to '',
+                        '#',
+                        class:"fas fa-plus-circle fa-lg new-questionnaire text-dark",
+                        style:"text-decoration: none; margin-right: 0.5rem;",
+                        data: { 
+                          bs_toggle: "modal",
+                          bs_target: "#vignetteModal",
+                          bs_tooltip: "tooltip"
+                        },
+                        title: t('buttons.create_questionnaire', default: 'Create Questionnaire')
+                        %>
+        </div>
+      </div>
+    </div>
+    <div class="card-body">
+      <ul class="list-group"> 
+        <% questionnaires = course.vignettes_questionnaires %>
+        <% if questionnaires.present? %>
+          <% questionnaires.each do |questionnaire| %>
+            <li class="list-group-item">
+              <%= link_to questionnaire.title, edit_vignettes_questionnaire_path(questionnaire) %>
+            </li>
+          <% end %>
+        <% else %>
+          <li class="list-group-item">
+            <%= t('admin.course.no_questionnaires', default: 'No questionnaires available') %>
+          </li>
+        <% end %>
+      </ul>
+    </div>
+  </div>
+</div>
diff --git a/app/views/vignettes/questionnaires/_vignette_form.html.erb b/app/views/vignettes/questionnaires/_vignette_form.html.erb
index e9fce2e21..4feed1e33 100644
--- a/app/views/vignettes/questionnaires/_vignette_form.html.erb
+++ b/app/views/vignettes/questionnaires/_vignette_form.html.erb
@@ -1,9 +1,13 @@
-<%= form_with(model: @questionnaire, local: true) do |form| %>
+<%= form_with(url: vignettes_questionnaires_path, scope: :vignettes_questionnaire) do |form| %>
+  <%= form.hidden_field :course_id, value: course.id %>
+  
   <div class="mb-3">
-    <%= form.label :title %>
-    <%= form.text_field :title, class: 'form-control', placeholder: 'Enter title' %>
+    <%= form.label :title, class: 'form-label' %>
+    <%= form.text_field :title, class: 'form-control', placeholder: 'Enter title', required: true %>
   </div>
-  <div class="mb-3">
+  
+  <div class="d-flex justify-content-between">
+    <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
     <%= form.submit 'Create Vignette', class: 'btn btn-primary' %>
   </div>
 <% end %>
\ No newline at end of file
diff --git a/app/views/vignettes/questionnaires/_vignette_modal.html.erb b/app/views/vignettes/questionnaires/_vignette_modal.html.erb
index dc8393783..2ae9af9b3 100644
--- a/app/views/vignettes/questionnaires/_vignette_modal.html.erb
+++ b/app/views/vignettes/questionnaires/_vignette_modal.html.erb
@@ -6,7 +6,7 @@
         <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
       </div>
       <div class="modal-body">
-        <%= render 'vignettes/questionnaires/vignette_form' %>
+        <%= render 'vignettes/questionnaires/vignette_form', course: course %>
       </div>
     </div>
   </div>
diff --git a/config/routes.rb b/config/routes.rb
index 9798c4a0d..21abe77b5 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -149,6 +149,10 @@
        to: "courses#take_random_quiz",
        as: "random_quiz"
 
+  get "courses/:id/questionnaire",
+      to: "vignettes/questionnaires#index",
+      as: "courses_questionnaire"
+
   get "courses/:id/render_question_counter",
       to: "courses#render_question_counter",
       as: "render_question_counter"
@@ -190,6 +194,10 @@
       to: "media#index",
       as: "lecture_food"
 
+  get "lectures/:id/questionnaire",
+      to: "vignettes/questionnaires#index",
+      as: "lecture_questionnaires"
+
   get "lectures/:id/update_teacher",
       to: "lectures#update_teacher",
       as: "update_teacher"
diff --git a/db/migrate/20241204132354_create_vignettes_questionnaires.rb b/db/migrate/20241204132354_create_vignettes_questionnaires.rb
index 37e074575..a303616fd 100644
--- a/db/migrate/20241204132354_create_vignettes_questionnaires.rb
+++ b/db/migrate/20241204132354_create_vignettes_questionnaires.rb
@@ -2,6 +2,7 @@ class CreateVignettesQuestionnaires < ActiveRecord::Migration[7.1]
   def change
     create_table :vignettes_questionnaires do |t|
       t.string :title
+      t.references :course, null: false, foreign_key: true
 
       t.timestamps
     end
diff --git a/db/schema.rb b/db/schema.rb
index dfb7e8617..30248786c 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -990,8 +990,10 @@
 
   create_table "vignettes_questionnaires", force: :cascade do |t|
     t.string "title"
+    t.bigint "course_id", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.index ["course_id"], name: "index_vignettes_questionnaires_on_course_id"
   end
 
   create_table "vignettes_questions", force: :cascade do |t|
@@ -1141,6 +1143,7 @@
   add_foreign_key "vignettes_answers", "vignettes_slides"
   add_foreign_key "vignettes_answers", "vignettes_user_answers"
   add_foreign_key "vignettes_options", "vignettes_questions"
+  add_foreign_key "vignettes_questionnaires", "courses"
   add_foreign_key "vignettes_questions", "vignettes_slides"
   add_foreign_key "vignettes_slide_statistics", "users"
   add_foreign_key "vignettes_slide_statistics", "vignettes_answers"

From de97b7bb35f36a6ccb2cdea3cfd17190e4506cdf Mon Sep 17 00:00:00 2001
From: Florian <florianbuerckel@gmail.com>
Date: Fri, 28 Feb 2025 18:52:51 +0100
Subject: [PATCH 086/103] fix docker compose command in just docker-reseed

---
 .config/commands/docker.justfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.config/commands/docker.justfile b/.config/commands/docker.justfile
index 8d9c383e0..acdb26c86 100644
--- a/.config/commands/docker.justfile
+++ b/.config/commands/docker.justfile
@@ -118,7 +118,7 @@ db-tear-down:
     echo -e "\033[33mIgnore the error 'Resource is still in use' for the development_default network\033[0m"
     cd {{justfile_directory()}}/docker/development/
     docker compose down db --volumes
-    docker-compose up -d --force-recreate db
+    docker compose up -d --force-recreate db
     just docker wait-for-postgres
 
 # Removes the development docker containers

From 15369ef33ce968a96fca327d16e84ef8fbace42d Mon Sep 17 00:00:00 2001
From: Florian <florianbuerckel@gmail.com>
Date: Fri, 28 Feb 2025 21:04:08 +0100
Subject: [PATCH 087/103] add locking mechanism to vignettes

Signed-off-by: Florian <florianbuerckel@gmail.com>
---
 .../vignettes/questionnaires_controller.rb     |  9 +++++++++
 app/controllers/vignettes/slides_controller.rb |  6 ++++--
 .../vignettes/questionnaires/edit.html.erb     | 18 ++++++++++++++++--
 .../vignettes/slides/_form_question.html.erb   |  5 +++--
 config/locales/de.yml                          |  3 +++
 config/locales/en.yml                          |  2 ++
 config/routes.rb                               |  5 +----
 ...04132354_create_vignettes_questionnaires.rb |  1 +
 db/schema.rb                                   |  1 +
 9 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/app/controllers/vignettes/questionnaires_controller.rb b/app/controllers/vignettes/questionnaires_controller.rb
index f2e995eb1..b472eb1e4 100644
--- a/app/controllers/vignettes/questionnaires_controller.rb
+++ b/app/controllers/vignettes/questionnaires_controller.rb
@@ -72,6 +72,15 @@ def submit_answer
       end
     end
 
+    def publish
+      questionnaire = Questionnaire.find(params[:id])
+      if questionnaire.update(published: !questionnaire.published)
+        redirect_to vignettes_questionnaire_path(questionnaire), notice: t("vignettes.published")
+      else
+        redirect_to vignettes_questionnaire_path(questionnaire), alert: t("vignettes.not_published")
+      end
+    end
+
     def export_answers
       questionnaire = Questionnaire.find(params[:id])
       answers = questionnaire.slides.includes(:answers).flat_map(&:answers)
diff --git a/app/controllers/vignettes/slides_controller.rb b/app/controllers/vignettes/slides_controller.rb
index f4c79960d..c79822f5b 100644
--- a/app/controllers/vignettes/slides_controller.rb
+++ b/app/controllers/vignettes/slides_controller.rb
@@ -11,6 +11,8 @@ def show
     end
 
     def new
+      return if @questionnaire.published
+
       @slide = @questionnaire.slides.new
       @slide.build_question
       @slide.question.options.build
@@ -46,8 +48,8 @@ def update
       if @slide.update(slide_params)
         redirect_to edit_vignettes_questionnaire_path(@questionnaire),
                     notice: t("vignettes.slide_updated")
-      else
-        render :edit, status: :unprocessable_entity
+      elsif request.xhr?
+        render partial: "vignettes/slides/form"
       end
     end
 
diff --git a/app/views/vignettes/questionnaires/edit.html.erb b/app/views/vignettes/questionnaires/edit.html.erb
index d31996545..2f4b62038 100644
--- a/app/views/vignettes/questionnaires/edit.html.erb
+++ b/app/views/vignettes/questionnaires/edit.html.erb
@@ -3,7 +3,18 @@
 
 <div class="container-md small-width">
     <!-- Slides -->
-    <h1 class="fs-4 fw-bold">Slides</h1>
+    <div class="d-flex justify-content-between align-items-center mb-3">
+        <h1 class="fs-4 fw-bold mb-0">Slides</h1>
+        
+        <!-- Publish Questionnaire -->
+        <%= button_to @questionnaire.published ? 'Published' : 'Publish', 
+                      publish_vignettes_questionnaire_path(@questionnaire),
+                      method: :patch,
+                      class: "btn #{@questionnaire.published ? 'btn-success' : 'btn-danger'}",
+                      disabled: @questionnaire.published,
+                      form_class: 'd-inline-block',
+                      id: "vignettes-publish-btn" %>
+    </div>
 
     <p>Drag the slides to change their order.</p>
 
@@ -15,7 +26,10 @@
     </div>
 
     <!-- Add new slide (at the end of the list) -->
-    <button type="button" id="vignettes-new-slide-btn" class="btn btn-outline-primary mt-2">
+    <button type="button" id="vignettes-new-slide-btn" 
+            class="btn btn-outline-primary mt-2" 
+            <%= 'disabled' if @questionnaire.published %>
+            >
         <i class="bi bi-plus-circle"></i>
         Add new slide
     </button>
diff --git a/app/views/vignettes/slides/_form_question.html.erb b/app/views/vignettes/slides/_form_question.html.erb
index 7e10ffaf5..45632b127 100644
--- a/app/views/vignettes/slides/_form_question.html.erb
+++ b/app/views/vignettes/slides/_form_question.html.erb
@@ -15,7 +15,8 @@
         {
             class: "form-select",
             id: "vignettes-question-type-select",
-            "aria-label": "Selection for question type"
+            "aria-label": "Selection for question type",
+            disabled: form.object.questionnaire.published
         } %>
     <%= f.label :type, "Question Type" %>
 </div>
@@ -25,7 +26,7 @@
         placeholder: '_',
         class: 'form-control',
         style: 'height: 120px',
-        required: false
+        required: true
     %>
     <%= f.label :question_text, "Your question" %>
 </div>
diff --git a/config/locales/de.yml b/config/locales/de.yml
index e64003a26..049766806 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -322,6 +322,9 @@ de:
       title: 'Titel'
       teacher: 'DozentIn'
       editors: 'EditorInnen'
+    vignettes:
+      published: 'Vignette wurde erfolgreich veröffentlicht.'
+      not_published: 'Vignette konnte nicht veröffentlicht werden.'
     annotation:
       your_annotations: 'Deine Annotationen'
       students_annotations: 'Annotationen der Studierenden'
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6b5952ab8..fb3ad5f26 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2516,6 +2516,8 @@ en:
     info_slide_updated: 'Info slide updated.'
     slide_updated: 'Slide was successfully updated.'
     slide_created: 'Slide was successfully created.'
+    published: 'Vignette was successfully published.'
+    not_published: 'Vignette could not be published.'
 
 
   external_link_lc: 'external link'
diff --git a/config/routes.rb b/config/routes.rb
index 21abe77b5..0d3ddbc03 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -194,10 +194,6 @@
       to: "media#index",
       as: "lecture_food"
 
-  get "lectures/:id/questionnaire",
-      to: "vignettes/questionnaires#index",
-      as: "lecture_questionnaires"
-
   get "lectures/:id/update_teacher",
       to: "lectures#update_teacher",
       as: "update_teacher"
@@ -579,6 +575,7 @@
       member do
         get :export_answers
         post :submit_answer
+        patch :publish
       end
       resources :info_slides, only: [:new, :create, :edit, :update]
       resources :slides, only: [:new, :create, :edit, :update] do
diff --git a/db/migrate/20241204132354_create_vignettes_questionnaires.rb b/db/migrate/20241204132354_create_vignettes_questionnaires.rb
index a303616fd..8f2dd38af 100644
--- a/db/migrate/20241204132354_create_vignettes_questionnaires.rb
+++ b/db/migrate/20241204132354_create_vignettes_questionnaires.rb
@@ -3,6 +3,7 @@ def change
     create_table :vignettes_questionnaires do |t|
       t.string :title
       t.references :course, null: false, foreign_key: true
+      t.boolean :published
 
       t.timestamps
     end
diff --git a/db/schema.rb b/db/schema.rb
index 38004b468..ad97706b4 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -991,6 +991,7 @@
   create_table "vignettes_questionnaires", force: :cascade do |t|
     t.string "title"
     t.bigint "course_id", null: false
+    t.boolean "published"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.index ["course_id"], name: "index_vignettes_questionnaires_on_course_id"

From c3b02f06bc3746f09fa10b583d6b6f53d3b2b877 Mon Sep 17 00:00:00 2001
From: Florian <florianbuerckel@gmail.com>
Date: Fri, 28 Feb 2025 23:02:59 +0100
Subject: [PATCH 088/103] Make questionnaire part of lecture

---
 app/assets/javascripts/vignettes/edit.js.erb  |  3 ++-
 .../vignettes/questionnaires_controller.rb    | 10 ++++-----
 app/models/course.rb                          |  5 -----
 app/models/lecture.rb                         |  9 ++++++++
 app/models/vignettes/questionnaire.rb         |  2 +-
 app/views/courses/_data.html.erb              |  5 -----
 app/views/courses/edit.html.erb               |  1 -
 app/views/lectures/edit/_form.html.erb        | 17 ++++++++++++++
 app/views/shared/_sidebar.html.erb            | 22 ++++++++++---------
 .../_questionnaire_accordion.html.erb         |  4 ++--
 .../questionnaires/_vignette_form.html.erb    |  2 +-
 .../questionnaires/_vignette_modal.html.erb   |  2 +-
 config/locales/en.yml                         |  1 +
 ...4132354_create_vignettes_questionnaires.rb |  2 +-
 db/schema.rb                                  |  6 ++---
 15 files changed, 55 insertions(+), 36 deletions(-)

diff --git a/app/assets/javascripts/vignettes/edit.js.erb b/app/assets/javascripts/vignettes/edit.js.erb
index 9e87a1153..59cb0efac 100644
--- a/app/assets/javascripts/vignettes/edit.js.erb
+++ b/app/assets/javascripts/vignettes/edit.js.erb
@@ -1,4 +1,5 @@
-$(document).on("turbolinks:load", function () {
+// When using turbolinks, the event is not fired on redirect
+$(document).ready(function () {
   const vignetteSlideList = $("#vignettes-slides-accordion");
   createSortableVignetteSlides(vignetteSlideList);
   registerVignetteSlideListeners(vignetteSlideList);
diff --git a/app/controllers/vignettes/questionnaires_controller.rb b/app/controllers/vignettes/questionnaires_controller.rb
index b472eb1e4..3bd334d34 100644
--- a/app/controllers/vignettes/questionnaires_controller.rb
+++ b/app/controllers/vignettes/questionnaires_controller.rb
@@ -3,9 +3,9 @@
 module Vignettes
   class QuestionnairesController < ApplicationController
     before_action :set_questionnaire, only: [:show, :take, :submit_answer]
-    before_action :set_course, only: [:index, :new, :create]
+    before_action :set_lecture, only: [:index, :new, :create]
     def index
-      @questionnaires = @course.questionnaires
+      @questionnaires = @lecture.questionnaires
       # Because the create model form works on the index page.
       @questionnaire = Questionnaire.new
     end
@@ -134,12 +134,12 @@ def set_questionnaire
         @questionnaire = Questionnaire.find(params[:id])
       end
 
-      def set_course
-        @course = Course.find(params[:vignettes_questionnaire][:course_id])
+      def set_lecture
+        @lecture = Lecture.find(params[:vignettes_questionnaire][:lecture_id])
       end
 
       def questionnaire_params
-        params.require(:vignettes_questionnaire).permit(:title, :course_id)
+        params.require(:vignettes_questionnaire).permit(:title, :lecture_id)
       end
 
       def answer_params
diff --git a/app/models/course.rb b/app/models/course.rb
index b5d1e6d98..574e1f4e6 100644
--- a/app/models/course.rb
+++ b/app/models/course.rb
@@ -18,11 +18,6 @@ class Course < ApplicationRecord
            as: :teachable,
            inverse_of: :teachable
 
-  has_many :vignettes_questionnaires, -> { order(id: :asc) },
-           class_name: "Vignettes::Questionnaire",
-           dependent: :destroy,
-           inverse_of: :course
-
   # in a course, you can import other media
   has_many :imports, as: :teachable, dependent: :destroy
   has_many :imported_media, through: :imports, source: :medium
diff --git a/app/models/lecture.rb b/app/models/lecture.rb
index 61a032532..5a84da99b 100644
--- a/app/models/lecture.rb
+++ b/app/models/lecture.rb
@@ -35,6 +35,11 @@ class Lecture < ApplicationRecord
            as: :teachable,
            inverse_of: :teachable
 
+  has_many :vignettes_questionnaires, -> { order(id: :asc) },
+           class_name: "Vignettes::Questionnaire",
+           dependent: :destroy,
+           inverse_of: :lecture
+
   # in a lecture, you can import other media
   has_many :imports, as: :teachable, dependent: :destroy
   has_many :imported_media, through: :imports, source: :medium
@@ -1055,4 +1060,8 @@ def tutorial_ids_for_tutor(tutor)
     def talk_ids_for_speaker(speaker)
       SpeakerTalkJoin.where(speaker: speaker).select(:talk_id)
     end
+
+    def vignettes?
+      vignettes_questionnaires.any?
+    end
 end
diff --git a/app/models/vignettes/questionnaire.rb b/app/models/vignettes/questionnaire.rb
index d85c079a7..fa569b232 100644
--- a/app/models/vignettes/questionnaire.rb
+++ b/app/models/vignettes/questionnaire.rb
@@ -1,6 +1,6 @@
 module Vignettes
   class Questionnaire < ApplicationRecord
-    belongs_to :course
+    belongs_to :lecture
     has_many :slides,
              foreign_key: "vignettes_questionnaire_id",
              dependent: :destroy,
diff --git a/app/views/courses/_data.html.erb b/app/views/courses/_data.html.erb
index 2fcb880b4..c5ce7ba0b 100644
--- a/app/views/courses/_data.html.erb
+++ b/app/views/courses/_data.html.erb
@@ -28,11 +28,6 @@
         <%= render partial: 'courses/image',
                    locals: { course: course, f: f } %>
       </div>
-      <div class="col-12 mb-3">
-        <%= render partial: 'vignettes/questionnaires/questionnaire_accordion',
-                    locals: { course: course }
-        %>
-      </div>
       <div class="col-12">
         <div class="card bg-light">
           <div class="card-header">
diff --git a/app/views/courses/edit.html.erb b/app/views/courses/edit.html.erb
index 2f86978cb..0fbcff5c3 100644
--- a/app/views/courses/edit.html.erb
+++ b/app/views/courses/edit.html.erb
@@ -3,6 +3,5 @@
              locals: { course: @course } %>
 </div>
 <%= render partial: 'media/modal' %>
-<%= render 'vignettes/questionnaires/vignette_modal', course: @course %>
 <%= render partial: 'tags/modal' %>
 <%= render partial: 'lectures/modal' %>
diff --git a/app/views/lectures/edit/_form.html.erb b/app/views/lectures/edit/_form.html.erb
index 5aee9c997..533169805 100644
--- a/app/views/lectures/edit/_form.html.erb
+++ b/app/views/lectures/edit/_form.html.erb
@@ -62,6 +62,13 @@
           aria-controls="lecture-pane-info" aria-selected="false">
           <%= t('info') %>
         </button>
+        <button class="nav-link lecture-nav-pill-button"
+          id="lecture-nav-vignettes" type="button" role="tab"
+          href="#vignettes"
+          data-bs-toggle="pill" data-bs-target="#lecture-pane-vignettes"
+          aria-controls="lecture-pane-vignettes" aria-selected="false">
+          <%= t('vignettes.vignettes') %>
+        </button>
       </div>
     </nav>
 
@@ -174,12 +181,22 @@
               locals: { lecture: lecture } %>
         </div>
       </div>
+
+      <!-- Vignettes -->
+      <div class="tab-pane fade" id="lecture-pane-vignettes"
+          role="tabpanel" aria-labelledby="lecture-nav-vignettes" tabindex="0">
+        <div class="container small-width lecture-pane">
+          <%= render partial: 'vignettes/questionnaires/questionnaire_accordion',
+              locals: { lecture: lecture } %>
+        </div>
+      </div>
     </div>
   </div>
 
 
   <!-- Modals -->
   <%= render partial: 'media/modal' %>
+  <%= render 'vignettes/questionnaires/vignette_modal', lecture: @lecture %>
   <%= render partial: 'sections/content_modal' %>
   <%= render partial: 'announcements/modal' %>
   <%= render partial: 'lectures/publish/publish',
diff --git a/app/views/shared/_sidebar.html.erb b/app/views/shared/_sidebar.html.erb
index b4bfd4aa9..e5e930234 100644
--- a/app/views/shared/_sidebar.html.erb
+++ b/app/views/shared/_sidebar.html.erb
@@ -105,6 +105,18 @@
     </a>
   </li>
 
+  <%# Vignetten %>
+  <% project_name = 'keks' %>
+  <% fullpath = lecture_food_path(lecture, params: { project: project_name })%>
+  <% active_class = get_class_for_project(project_name) %>
+  <li class="sidebar-item nav-link <%= active_class %>
+          <%= !lecture || !lecture.vignettes? ? "disabled" : ""%>">
+    <a href="<%= url_for(fullpath)%>">
+      <i class="bi bi-question-square<%= active_class.present? ? "-fill" : "" %>"></i>
+      <%= t('vignettes.vignettes') %>
+    </a>
+  </li>
+
   <%# Self test %>
   <% path = show_random_quizzes_path(lecture) %>
   <% active_class = get_class_for_path(path) %>
@@ -151,16 +163,6 @@
     </a>
   </li>
 
-  <!--
-  <% fullpath = get_lecture_questionnaires %>
-  <% active_class = get_class_for_project(project_name) %>
-  <li class="sidebar-item nav-link <%= active_class %>
-          <%= !lecture || !lecture.questionnaire? ? "disabled" : ""%>">
-    <a href="<%= url_for(fullpath)%>">
-      <i class="bi bi-layers<%= active_class.present? ? "-fill" : "" %>"> Vignettes </i>
-    </a>
-  </li>
-  -->
 
   <%# Diverse (Rest) %>
   <% project_name = 'reste' %>
diff --git a/app/views/vignettes/questionnaires/_questionnaire_accordion.html.erb b/app/views/vignettes/questionnaires/_questionnaire_accordion.html.erb
index 60402d957..4473cc20f 100644
--- a/app/views/vignettes/questionnaires/_questionnaire_accordion.html.erb
+++ b/app/views/vignettes/questionnaires/_questionnaire_accordion.html.erb
@@ -24,7 +24,7 @@
     </div>
     <div class="card-body">
       <ul class="list-group"> 
-        <% questionnaires = course.vignettes_questionnaires %>
+        <% questionnaires = lecture.vignettes_questionnaires %>
         <% if questionnaires.present? %>
           <% questionnaires.each do |questionnaire| %>
             <li class="list-group-item">
@@ -33,7 +33,7 @@
           <% end %>
         <% else %>
           <li class="list-group-item">
-            <%= t('admin.course.no_questionnaires', default: 'No questionnaires available') %>
+            <%= t('admin.lecture.no_questionnaires', default: 'No questionnaires available') %>
           </li>
         <% end %>
       </ul>
diff --git a/app/views/vignettes/questionnaires/_vignette_form.html.erb b/app/views/vignettes/questionnaires/_vignette_form.html.erb
index 4feed1e33..314ddb6d5 100644
--- a/app/views/vignettes/questionnaires/_vignette_form.html.erb
+++ b/app/views/vignettes/questionnaires/_vignette_form.html.erb
@@ -1,5 +1,5 @@
 <%= form_with(url: vignettes_questionnaires_path, scope: :vignettes_questionnaire) do |form| %>
-  <%= form.hidden_field :course_id, value: course.id %>
+  <%= form.hidden_field :lecture_id, value: lecture.id %>
   
   <div class="mb-3">
     <%= form.label :title, class: 'form-label' %>
diff --git a/app/views/vignettes/questionnaires/_vignette_modal.html.erb b/app/views/vignettes/questionnaires/_vignette_modal.html.erb
index 2ae9af9b3..3bc0d6a0c 100644
--- a/app/views/vignettes/questionnaires/_vignette_modal.html.erb
+++ b/app/views/vignettes/questionnaires/_vignette_modal.html.erb
@@ -6,7 +6,7 @@
         <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
       </div>
       <div class="modal-body">
-        <%= render 'vignettes/questionnaires/vignette_form', course: course %>
+        <%= render 'vignettes/questionnaires/vignette_form', lecture: lecture %>
       </div>
     </div>
   </div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index fb3ad5f26..b78713b72 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2509,6 +2509,7 @@ en:
         fewer questions availabale for your specified content than you selected.
   
   vignettes:
+    vignettes: 'Vignettes'
     destroy_answer: 'Answer was destroyed'  
     answered: 'Vignette was successfully answered'
     no_slides: 'No slides to answer'
diff --git a/db/migrate/20241204132354_create_vignettes_questionnaires.rb b/db/migrate/20241204132354_create_vignettes_questionnaires.rb
index 8f2dd38af..1d49b01ca 100644
--- a/db/migrate/20241204132354_create_vignettes_questionnaires.rb
+++ b/db/migrate/20241204132354_create_vignettes_questionnaires.rb
@@ -2,7 +2,7 @@ class CreateVignettesQuestionnaires < ActiveRecord::Migration[7.1]
   def change
     create_table :vignettes_questionnaires do |t|
       t.string :title
-      t.references :course, null: false, foreign_key: true
+      t.references :lecture, null: false, foreign_key: true
       t.boolean :published
 
       t.timestamps
diff --git a/db/schema.rb b/db/schema.rb
index ad97706b4..f8acc2da9 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -990,11 +990,11 @@
 
   create_table "vignettes_questionnaires", force: :cascade do |t|
     t.string "title"
-    t.bigint "course_id", null: false
+    t.bigint "lecture_id", null: false
     t.boolean "published"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.index ["course_id"], name: "index_vignettes_questionnaires_on_course_id"
+    t.index ["lecture_id"], name: "index_vignettes_questionnaires_on_lecture_id"
   end
 
   create_table "vignettes_questions", force: :cascade do |t|
@@ -1144,7 +1144,7 @@
   add_foreign_key "vignettes_answers", "vignettes_slides"
   add_foreign_key "vignettes_answers", "vignettes_user_answers"
   add_foreign_key "vignettes_options", "vignettes_questions"
-  add_foreign_key "vignettes_questionnaires", "courses"
+  add_foreign_key "vignettes_questionnaires", "lectures"
   add_foreign_key "vignettes_questions", "vignettes_slides"
   add_foreign_key "vignettes_slide_statistics", "users"
   add_foreign_key "vignettes_slide_statistics", "vignettes_answers"

From d6a8b23fd476a8134a80c1a4b8c580ff27b4a5a8 Mon Sep 17 00:00:00 2001
From: Florian <florianbuerckel@gmail.com>
Date: Sat, 1 Mar 2025 10:07:14 +0100
Subject: [PATCH 089/103] make vignettes accessible from lecture

---
 app/controllers/vignettes/questionnaires_controller.rb    | 6 +++---
 app/models/lecture.rb                                     | 8 ++++----
 app/views/shared/_sidebar.html.erb                        | 7 +++----
 .../vignettes/questionnaires/_vignette_form.html.erb      | 2 +-
 .../vignettes/questionnaires/_vignette_modal.html.erb     | 2 +-
 config/routes.rb                                          | 8 ++++----
 6 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/app/controllers/vignettes/questionnaires_controller.rb b/app/controllers/vignettes/questionnaires_controller.rb
index 3bd334d34..63579af43 100644
--- a/app/controllers/vignettes/questionnaires_controller.rb
+++ b/app/controllers/vignettes/questionnaires_controller.rb
@@ -5,7 +5,7 @@ class QuestionnairesController < ApplicationController
     before_action :set_questionnaire, only: [:show, :take, :submit_answer]
     before_action :set_lecture, only: [:index, :new, :create]
     def index
-      @questionnaires = @lecture.questionnaires
+      @questionnaires = @lecture.vignettes_questionnaires
       # Because the create model form works on the index page.
       @questionnaire = Questionnaire.new
     end
@@ -135,11 +135,11 @@ def set_questionnaire
       end
 
       def set_lecture
-        @lecture = Lecture.find(params[:vignettes_questionnaire][:lecture_id])
+        @lecture = Lecture.find(params[:lecture_id])
       end
 
       def questionnaire_params
-        params.require(:vignettes_questionnaire).permit(:title, :lecture_id)
+        params.permit(:title, :lecture_id)
       end
 
       def answer_params
diff --git a/app/models/lecture.rb b/app/models/lecture.rb
index 5a84da99b..1e245c791 100644
--- a/app/models/lecture.rb
+++ b/app/models/lecture.rb
@@ -942,6 +942,10 @@ def talks_without_speaker(speaker)
     talks.where.not(id: talk_ids_for_speaker(speaker))
   end
 
+  def vignettes?
+    vignettes_questionnaires.any?
+  end
+
   private
 
     # used for after save callback
@@ -1060,8 +1064,4 @@ def tutorial_ids_for_tutor(tutor)
     def talk_ids_for_speaker(speaker)
       SpeakerTalkJoin.where(speaker: speaker).select(:talk_id)
     end
-
-    def vignettes?
-      vignettes_questionnaires.any?
-    end
 end
diff --git a/app/views/shared/_sidebar.html.erb b/app/views/shared/_sidebar.html.erb
index e5e930234..781faf4f1 100644
--- a/app/views/shared/_sidebar.html.erb
+++ b/app/views/shared/_sidebar.html.erb
@@ -106,12 +106,11 @@
   </li>
 
   <%# Vignetten %>
-  <% project_name = 'keks' %>
-  <% fullpath = lecture_food_path(lecture, params: { project: project_name })%>
-  <% active_class = get_class_for_project(project_name) %>
+  <% path = lecture_vignettes_path(lecture)%>
+  <% active_class = get_class_for_path_startswith(path) %>
   <li class="sidebar-item nav-link <%= active_class %>
           <%= !lecture || !lecture.vignettes? ? "disabled" : ""%>">
-    <a href="<%= url_for(fullpath)%>">
+    <a href="<%= url_for(path)%>">
       <i class="bi bi-question-square<%= active_class.present? ? "-fill" : "" %>"></i>
       <%= t('vignettes.vignettes') %>
     </a>
diff --git a/app/views/vignettes/questionnaires/_vignette_form.html.erb b/app/views/vignettes/questionnaires/_vignette_form.html.erb
index 314ddb6d5..cd5f1a724 100644
--- a/app/views/vignettes/questionnaires/_vignette_form.html.erb
+++ b/app/views/vignettes/questionnaires/_vignette_form.html.erb
@@ -1,4 +1,4 @@
-<%= form_with(url: vignettes_questionnaires_path, scope: :vignettes_questionnaire) do |form| %>
+<%= form_with(url: vignettes_questionnaires_path) do |form| %>
   <%= form.hidden_field :lecture_id, value: lecture.id %>
   
   <div class="mb-3">
diff --git a/app/views/vignettes/questionnaires/_vignette_modal.html.erb b/app/views/vignettes/questionnaires/_vignette_modal.html.erb
index 3bc0d6a0c..9f1a5b8bb 100644
--- a/app/views/vignettes/questionnaires/_vignette_modal.html.erb
+++ b/app/views/vignettes/questionnaires/_vignette_modal.html.erb
@@ -6,7 +6,7 @@
         <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
       </div>
       <div class="modal-body">
-        <%= render 'vignettes/questionnaires/vignette_form', lecture: lecture %>
+        <%= render 'vignettes/questionnaires/vignette_form', lecture: @lecture %>
       </div>
     </div>
   </div>
diff --git a/config/routes.rb b/config/routes.rb
index 0d3ddbc03..8a01ebe5e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -149,10 +149,6 @@
        to: "courses#take_random_quiz",
        as: "random_quiz"
 
-  get "courses/:id/questionnaire",
-      to: "vignettes/questionnaires#index",
-      as: "courses_questionnaire"
-
   get "courses/:id/render_question_counter",
       to: "courses#render_question_counter",
       as: "render_question_counter"
@@ -194,6 +190,10 @@
       to: "media#index",
       as: "lecture_food"
 
+  get "lectures/:lecture_id/vignettes",
+      to: "vignettes/questionnaires#index",
+      as: "lecture_vignettes"
+
   get "lectures/:id/update_teacher",
       to: "lectures#update_teacher",
       as: "update_teacher"

From aa8d4e4323a45fb19fb19bdfb32795420936fa85 Mon Sep 17 00:00:00 2001
From: Florian <florianbuerckel@gmail.com>
Date: Sat, 1 Mar 2025 19:14:26 +0100
Subject: [PATCH 090/103] reworked routes to not use vignettes prefix

---
 app/assets/javascripts/vignettes/edit.js.erb  |  4 ++--
 .../vignettes/info_slides_controller.rb       |  4 ++--
 .../vignettes/questionnaires_controller.rb    | 22 +++++++++----------
 .../vignettes/slides_controller.rb            |  4 ++--
 app/models/vignettes/user_answer.rb           |  2 ++
 app/views/shared/_sidebar.html.erb            |  2 +-
 .../vignettes/info_slides/_form.html.erb      |  2 +-
 .../_questionnaire_accordion.html.erb         |  2 +-
 .../questionnaires/_vignette_form.html.erb    |  2 +-
 .../vignettes/questionnaires/edit.html.erb    |  8 +++----
 .../vignettes/questionnaires/index.html.erb   |  9 ++------
 .../vignettes/questionnaires/take.html.erb    |  2 +-
 app/views/vignettes/slides/_form.html.erb     |  2 +-
 config/routes.rb                              | 10 ++++-----
 14 files changed, 36 insertions(+), 39 deletions(-)

diff --git a/app/assets/javascripts/vignettes/edit.js.erb b/app/assets/javascripts/vignettes/edit.js.erb
index 59cb0efac..b4aa20996 100644
--- a/app/assets/javascripts/vignettes/edit.js.erb
+++ b/app/assets/javascripts/vignettes/edit.js.erb
@@ -61,7 +61,7 @@ function registerVignetteSlideListeners(vignetteSlideList) {
     }, 100); // avoid flickering when loading is fast
 
     $.ajax({
-      url: Routes.edit_vignettes_questionnaire_slide_path(questionnaireId, slideId),
+      url: Routes.edit_questionnaire_slide_path(questionnaireId, slideId),
       method: "GET",
       dataType: "html",
       success: function (response) {
@@ -92,7 +92,7 @@ function registerNewSlideButtonListener(vignetteSlideList) {
     }
 
     $.ajax({
-      url: Routes.new_vignettes_questionnaire_slide_path(questionnaireId),
+      url: Routes.new_questionnaire_slide_path(questionnaireId),
       method: "GET",
       dataType: "html",
       success: function (response) {
diff --git a/app/controllers/vignettes/info_slides_controller.rb b/app/controllers/vignettes/info_slides_controller.rb
index 9bc13019f..74cf45e85 100644
--- a/app/controllers/vignettes/info_slides_controller.rb
+++ b/app/controllers/vignettes/info_slides_controller.rb
@@ -11,7 +11,7 @@ def new
     def create
       @info_slide = @questionnaire.info_slides.new(info_slide_params)
       if @info_slide.save
-        redirect_to edit_vignettes_questionnaire_path(@questionnaire),
+        redirect_to edit_questionnaire_path(@questionnaire),
                     notice: t("vignettes.info_slide_created")
       else
         render :new
@@ -23,7 +23,7 @@ def edit
 
     def update
       if @info_slide.update(info_slide_params)
-        redirect_to edit_vignettes_questionnaire_path(@questionnaire),
+        redirect_to edit_questionnaire_path(@questionnaire),
                     t("vignettes.info_slide_updated")
       else
         render :edit
diff --git a/app/controllers/vignettes/questionnaires_controller.rb b/app/controllers/vignettes/questionnaires_controller.rb
index 63579af43..ff26ba001 100644
--- a/app/controllers/vignettes/questionnaires_controller.rb
+++ b/app/controllers/vignettes/questionnaires_controller.rb
@@ -5,13 +5,13 @@ class QuestionnairesController < ApplicationController
     before_action :set_questionnaire, only: [:show, :take, :submit_answer]
     before_action :set_lecture, only: [:index, :new, :create]
     def index
-      @questionnaires = @lecture.vignettes_questionnaires
+      @questionnaires = @lecture.vignettes_questionnaires.reject { |q| q.slides.empty? }
       # Because the create model form works on the index page.
       @questionnaire = Questionnaire.new
     end
 
     def show
-      redirect_to edit_vignettes_questionnaire_path
+      redirect_to edit_questionnaire_path
     end
 
     def take
@@ -22,20 +22,20 @@ def take
       if params[:position].to_i == -1
         # ONLY FOR DEBUG
         user_answer.destroy
-        redirect_to vignettes_questionnaire_path, notice: t("vignettes.destroy_answer")
+        redirect_to questionnaire_path, notice: t("vignettes.destroy_answer")
         return
       end
 
       # Vignettes was already fully answered by user
       if user_answer.last_slide_answered?
-        redirect_to vignettes_questionnaire_path, notice: t("vignettes.answered")
+        redirect_to questionnaire_path, notice: t("vignettes.answered")
         return
       end
 
       first_unanswered_slide = user_answer.first_unanswered_slide
       # This case should never happen
       if first_unanswered_slide.nil?
-        redirect_to vignettes_questionnaire_path, notice: t("vignettes.no_slides")
+        redirect_to questionnaire_path, notice: t("vignettes.no_slides")
         return
       end
 
@@ -43,8 +43,8 @@ def take
 
       # If there is no position given or the requested position is invalid
       if requested_position.zero? || requested_position != first_unanswered_slide.position
-        redirect_to vignettes_take_questionnaire_path(@questionnaire,
-                                                      position: first_unanswered_slide.position)
+        redirect_to take_questionnaire_path(@questionnaire,
+                                            position: first_unanswered_slide.position)
         return
       end
 
@@ -65,7 +65,7 @@ def submit_answer
       @answer.user_answer = @user_answer
 
       if @answer.save
-        redirect_to vignettes_take_questionnaire_path(@questionnaire, position: @slide.position + 1)
+        redirect_to take_questionnaire_path(@questionnaire, position: @slide.position + 1)
       else
         Rails.logger.debug { "Answer save failed: #{@answer.errors.full_messages.join(", ")}" }
         render :take, status: :unprocessable_entity
@@ -75,9 +75,9 @@ def submit_answer
     def publish
       questionnaire = Questionnaire.find(params[:id])
       if questionnaire.update(published: !questionnaire.published)
-        redirect_to vignettes_questionnaire_path(questionnaire), notice: t("vignettes.published")
+        redirect_to questionnaire_path(questionnaire), notice: t("vignettes.published")
       else
-        redirect_to vignettes_questionnaire_path(questionnaire), alert: t("vignettes.not_published")
+        redirect_to questionnaire_path(questionnaire), alert: t("vignettes.not_published")
       end
     end
 
@@ -115,7 +115,7 @@ def new
     def create
       @questionnaire = Questionnaire.new(questionnaire_params)
       if @questionnaire.save
-        redirect_to @questionnaire
+        redirect_to edit_questionnaire_path(@questionnaire)
       else
         render :new, status: :unprocessable_entity
       end
diff --git a/app/controllers/vignettes/slides_controller.rb b/app/controllers/vignettes/slides_controller.rb
index c79822f5b..99f98ee87 100644
--- a/app/controllers/vignettes/slides_controller.rb
+++ b/app/controllers/vignettes/slides_controller.rb
@@ -35,7 +35,7 @@ def create
       @slide = @questionnaire.slides.new(slide_params)
       @slide.position = @questionnaire.slides.maximum(:position).to_i + 1
       if @slide.save
-        redirect_to edit_vignettes_questionnaire_path(@questionnaire),
+        redirect_to edit_questionnaire_path(@questionnaire),
                     notice: t("vignettes.slide_created")
       else
         flash[:alert] = "Failed to create slide: #{@slide.errors.full_messages.join(", ")}"
@@ -46,7 +46,7 @@ def create
     def update
       @slide = @questionnaire.slides.find(params[:id])
       if @slide.update(slide_params)
-        redirect_to edit_vignettes_questionnaire_path(@questionnaire),
+        redirect_to edit_questionnaire_path(@questionnaire),
                     notice: t("vignettes.slide_updated")
       elsif request.xhr?
         render partial: "vignettes/slides/form"
diff --git a/app/models/vignettes/user_answer.rb b/app/models/vignettes/user_answer.rb
index dd1a7a6de..fce7fa41f 100644
--- a/app/models/vignettes/user_answer.rb
+++ b/app/models/vignettes/user_answer.rb
@@ -11,6 +11,8 @@ def answered_slide_ids
     end
 
     def last_slide_answered?
+      return true if questionnaire.slides.empty?
+
       answered_slide_ids.include?(questionnaire.slides.order(:position).last.id)
     end
 
diff --git a/app/views/shared/_sidebar.html.erb b/app/views/shared/_sidebar.html.erb
index 781faf4f1..4d363484b 100644
--- a/app/views/shared/_sidebar.html.erb
+++ b/app/views/shared/_sidebar.html.erb
@@ -106,7 +106,7 @@
   </li>
 
   <%# Vignetten %>
-  <% path = lecture_vignettes_path(lecture)%>
+  <% path = lecture_questionnaires_path(lecture)%>
   <% active_class = get_class_for_path_startswith(path) %>
   <li class="sidebar-item nav-link <%= active_class %>
           <%= !lecture || !lecture.vignettes? ? "disabled" : ""%>">
diff --git a/app/views/vignettes/info_slides/_form.html.erb b/app/views/vignettes/info_slides/_form.html.erb
index 0204f09ff..a7bf2c658 100644
--- a/app/views/vignettes/info_slides/_form.html.erb
+++ b/app/views/vignettes/info_slides/_form.html.erb
@@ -1,6 +1,6 @@
 <%= form_with(
       model: @info_slide,
-            url: @info_slide.new_record? ? vignettes_questionnaire_info_slides_path(@questionnaire) : vignettes_questionnaire_info_slide_path(@questionnaire, @info_slide),
+            url: @info_slide.new_record? ? questionnaire_info_slides_path(@questionnaire) : questionnaire_info_slide_path(@questionnaire, @info_slide),
       local: true
     ) do |form| %>
   <%= form.text_field :title, placeholder: "Enter a title" %>
diff --git a/app/views/vignettes/questionnaires/_questionnaire_accordion.html.erb b/app/views/vignettes/questionnaires/_questionnaire_accordion.html.erb
index 4473cc20f..1e7545430 100644
--- a/app/views/vignettes/questionnaires/_questionnaire_accordion.html.erb
+++ b/app/views/vignettes/questionnaires/_questionnaire_accordion.html.erb
@@ -28,7 +28,7 @@
         <% if questionnaires.present? %>
           <% questionnaires.each do |questionnaire| %>
             <li class="list-group-item">
-              <%= link_to questionnaire.title, edit_vignettes_questionnaire_path(questionnaire) %>
+              <%= link_to questionnaire.title, edit_questionnaire_path(questionnaire) %>
             </li>
           <% end %>
         <% else %>
diff --git a/app/views/vignettes/questionnaires/_vignette_form.html.erb b/app/views/vignettes/questionnaires/_vignette_form.html.erb
index cd5f1a724..540574572 100644
--- a/app/views/vignettes/questionnaires/_vignette_form.html.erb
+++ b/app/views/vignettes/questionnaires/_vignette_form.html.erb
@@ -1,4 +1,4 @@
-<%= form_with(url: vignettes_questionnaires_path) do |form| %>
+<%= form_with(url: questionnaires_url) do |form| %>
   <%= form.hidden_field :lecture_id, value: lecture.id %>
   
   <div class="mb-3">
diff --git a/app/views/vignettes/questionnaires/edit.html.erb b/app/views/vignettes/questionnaires/edit.html.erb
index 2f4b62038..a0ab71243 100644
--- a/app/views/vignettes/questionnaires/edit.html.erb
+++ b/app/views/vignettes/questionnaires/edit.html.erb
@@ -8,7 +8,7 @@
         
         <!-- Publish Questionnaire -->
         <%= button_to @questionnaire.published ? 'Published' : 'Publish', 
-                      publish_vignettes_questionnaire_path(@questionnaire),
+                      publish_questionnaire_path(@questionnaire),
                       method: :patch,
                       class: "btn #{@questionnaire.published ? 'btn-success' : 'btn-danger'}",
                       disabled: @questionnaire.published,
@@ -44,12 +44,12 @@
     <ul>
         <% @questionnaire.info_slides.each() do |info_slide| %>
             <li>
-                <%= link_to info_slide.title, edit_vignettes_questionnaire_info_slide_path(@questionnaire, info_slide) %>
+                <%= link_to info_slide.title, edit_questionnaire_info_slide_path(@questionnaire, info_slide) %>
             </li>
         <%end%>
     </ul>
-    <%= button_to 'Create new info slide', new_vignettes_questionnaire_info_slide_path(@questionnaire), method: :get, class: 'btn btn-primary' %>
+    <%= button_to 'Create new info slide', new_questionnaire_info_slide_path(@questionnaire), method: :get, class: 'btn btn-primary' %>
 
     <!-- Export -->
-    <%= button_to "Export answers", export_answers_vignettes_questionnaire_path(@questionnaire), method: :get, class: 'btn btn-primary' %>
+    <%= button_to "Export answers", export_answers_questionnaire_path(@questionnaire), method: :get, class: 'btn btn-primary' %>
 </div>
diff --git a/app/views/vignettes/questionnaires/index.html.erb b/app/views/vignettes/questionnaires/index.html.erb
index 6c99a8367..28fdb7f5d 100644
--- a/app/views/vignettes/questionnaires/index.html.erb
+++ b/app/views/vignettes/questionnaires/index.html.erb
@@ -3,12 +3,7 @@
 <ul>
     <% @questionnaires.each do |questionnaire| %>
         <li>
-            <%= link_to questionnaire.title, edit_vignettes_questionnaire_path(questionnaire) %>
+            <%= link_to questionnaire.title, take_questionnaire_path(questionnaire) %>
         </li>
     <%end%>
-</ul>
-<button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#vignetteModal">
-  Create new Vignette
-</button>
-
-<%= render 'vignettes/questionnaires/vignette_modal' %>
\ No newline at end of file
+</ul>
\ No newline at end of file
diff --git a/app/views/vignettes/questionnaires/take.html.erb b/app/views/vignettes/questionnaires/take.html.erb
index 751dc4add..30f9182ef 100644
--- a/app/views/vignettes/questionnaires/take.html.erb
+++ b/app/views/vignettes/questionnaires/take.html.erb
@@ -9,7 +9,7 @@
 
 <!-- Slide -->
 <%= form_with(model: @answer, id: "vignettes-answer-form",
-              url: submit_answer_vignettes_questionnaire_url(@questionnaire),
+              url: submit_answer_questionnaire_url(@questionnaire),
               local: true) do |form| %>
 
 <div id="vignette-take-card" class="container-md small-width card">
diff --git a/app/views/vignettes/slides/_form.html.erb b/app/views/vignettes/slides/_form.html.erb
index 41397a960..35955f054 100644
--- a/app/views/vignettes/slides/_form.html.erb
+++ b/app/views/vignettes/slides/_form.html.erb
@@ -1,7 +1,7 @@
 <%= form_with(
       model: [@questionnaire, @slide],
       local: true,
-      url: @slide.new_record? ? vignettes_questionnaire_slides_path(@questionnaire) : vignettes_questionnaire_slide_path(@questionnaire, @slide),
+      url: @slide.new_record? ? questionnaire_slides_path(@questionnaire) : questionnaire_slide_path(@questionnaire, @slide),
       id: "slide-form"
     ) do |form| %>
 
diff --git a/config/routes.rb b/config/routes.rb
index 8a01ebe5e..d3e2ee8aa 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -192,7 +192,7 @@
 
   get "lectures/:lecture_id/vignettes",
       to: "vignettes/questionnaires#index",
-      as: "lecture_vignettes"
+      as: "lecture_questionnaires"
 
   get "lectures/:id/update_teacher",
       to: "lectures#update_teacher",
@@ -566,11 +566,11 @@
   end
 
   # vignettes routes
-  namespace :vignettes do
-    get "questionnaires/:id/take",
-        to: "questionnaires#take",
-        as: "take_questionnaire"
+  get "questionnaires/:id/take",
+      to: "vignettes/questionnaires#take",
+      as: "take_questionnaire"
 
+  scope module: "vignettes", path: "" do
     resources :questionnaires, only: [:index, :show, :new, :create, :edit, :update] do
       member do
         get :export_answers

From 24ebaae80ec65f99b2b21c8d3042ecc38b34e78f Mon Sep 17 00:00:00 2001
From: Florian <florianbuerckel@gmail.com>
Date: Sat, 1 Mar 2025 21:19:23 +0100
Subject: [PATCH 091/103] Add authentication for vignette controller actions

---
 .../vignettes/questionnaires_controller.rb    | 41 +++++++++++++------
 .../vignettes/slides_controller.rb            |  9 ++++
 config/locales/en.yml                         |  1 +
 3 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/app/controllers/vignettes/questionnaires_controller.rb b/app/controllers/vignettes/questionnaires_controller.rb
index ff26ba001..bfdb82350 100644
--- a/app/controllers/vignettes/questionnaires_controller.rb
+++ b/app/controllers/vignettes/questionnaires_controller.rb
@@ -2,18 +2,16 @@
 
 module Vignettes
   class QuestionnairesController < ApplicationController
-    before_action :set_questionnaire, only: [:show, :take, :submit_answer]
+    before_action :set_questionnaire, only: [:show, :take, :submit_answer, :edit, :publish]
     before_action :set_lecture, only: [:index, :new, :create]
+    before_action :check_take_accessibility, only: [:take, :submit_answer]
+    before_action :check_edit_accessibility, only: [:edit, :destroy, :publish]
     def index
       @questionnaires = @lecture.vignettes_questionnaires.reject { |q| q.slides.empty? }
       # Because the create model form works on the index page.
       @questionnaire = Questionnaire.new
     end
 
-    def show
-      redirect_to edit_questionnaire_path
-    end
-
     def take
       user_answer = current_user.vignettes_user_answers
                                 .find_or_create_by(user: current_user,
@@ -22,20 +20,23 @@ def take
       if params[:position].to_i == -1
         # ONLY FOR DEBUG
         user_answer.destroy
-        redirect_to questionnaire_path, notice: t("vignettes.destroy_answer")
+        redirect_to lecture_questionnaires_path(@questionnaire.lecture),
+                    notice: t("vignettes.destroy_answer")
         return
       end
 
       # Vignettes was already fully answered by user
       if user_answer.last_slide_answered?
-        redirect_to questionnaire_path, notice: t("vignettes.answered")
+        redirect_to lecture_questionnaires_path(@questionnaire.lecture),
+                    notice: t("vignettes.answered")
         return
       end
 
       first_unanswered_slide = user_answer.first_unanswered_slide
       # This case should never happen
       if first_unanswered_slide.nil?
-        redirect_to questionnaire_path, notice: t("vignettes.no_slides")
+        redirect_to lecture_questionnaires_path(@questionnaire.lecture),
+                    notice: t("vignettes.no_slides")
         return
       end
 
@@ -73,11 +74,10 @@ def submit_answer
     end
 
     def publish
-      questionnaire = Questionnaire.find(params[:id])
-      if questionnaire.update(published: !questionnaire.published)
-        redirect_to questionnaire_path(questionnaire), notice: t("vignettes.published")
+      if @questionnaire.update(published: !@questionnaire.published)
+        redirect_to edit_questionnaire_path(@questionnaire), notice: t("vignettes.published")
       else
-        redirect_to questionnaire_path(questionnaire), alert: t("vignettes.not_published")
+        redirect_to edit_questionnaire_path(@questionnaire), alert: t("vignettes.not_published")
       end
     end
 
@@ -122,7 +122,6 @@ def create
     end
 
     def edit
-      @questionnaire = Questionnaire.find(params[:id])
       @slides = @questionnaire.slides.order(:position)
 
       render layout: "application_no_sidebar"
@@ -138,6 +137,22 @@ def set_lecture
         @lecture = Lecture.find(params[:lecture_id])
       end
 
+      def check_take_accessibility
+        return if @questionnaire.published &&
+                  (current_user.admin || current_user.in?(@questionnaire.lecture.users))
+
+        redirect_to lecture_questionnaires_path(@questionnaire.lecture),
+                    alert: t("vignettes.not_accessible")
+      end
+
+      def check_edit_accessibility
+        return if current_user.admin
+        return if current_user.in?(@questionnaire.lecture.editors_with_inheritance)
+
+        redirect_to lecture_questionnaires_path(@questionnaire.lecture),
+                    alert: t("vignettes.not_accessible")
+      end
+
       def questionnaire_params
         params.permit(:title, :lecture_id)
       end
diff --git a/app/controllers/vignettes/slides_controller.rb b/app/controllers/vignettes/slides_controller.rb
index 99f98ee87..2451d1467 100644
--- a/app/controllers/vignettes/slides_controller.rb
+++ b/app/controllers/vignettes/slides_controller.rb
@@ -1,6 +1,7 @@
 module Vignettes
   class SlidesController < ApplicationController
     before_action :set_questionnaire
+    before_action :check_edit_accessibility, only: [:new, :create, :edit, :update]
 
     def index
     end
@@ -59,6 +60,14 @@ def set_questionnaire
         @questionnaire = Questionnaire.find(params[:questionnaire_id])
       end
 
+      def check_edit_accessibility
+        return if current_user.admin
+        return if current_user.in?(@questionnaire.lecture.editors_with_inheritance)
+
+        redirect_to lecture_questionnaires_path(@questionnaire.lecture),
+                    alert: t("vignettes.not_accessible")
+      end
+
       def redirect_params
         params.permit(:redirect_info_slide)
       end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index b78713b72..9d5c98a6d 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2519,6 +2519,7 @@ en:
     slide_created: 'Slide was successfully created.'
     published: 'Vignette was successfully published.'
     not_published: 'Vignette could not be published.'
+    not_accessible: 'Vignette is not accessible.'
 
 
   external_link_lc: 'external link'

From c17e83f593e948257a05042c7c1d26f329aeda4b Mon Sep 17 00:00:00 2001
From: Florian <florianbuerckel@gmail.com>
Date: Sun, 2 Mar 2025 20:20:26 +0100
Subject: [PATCH 092/103] fix bug where vignette answer not stored correctly

add csv handler for vignettes
---
 .../vignettes/take_questionnaire.js           |  6 +--
 .../vignettes/questionnaires_controller.rb    | 43 ++++++------------
 app/models/vignettes/csv_handler.rb           | 45 +++++++++++++++++++
 app/models/vignettes/likert_scale_answer.rb   |  1 -
 app/models/vignettes/questionnaire.rb         |  9 ++++
 .../answer_types/_likert_scale.html.erb       |  3 +-
 .../answer_types/_multiple_choice.html.erb    | 18 ++++----
 .../vignettes/slides/_form_question.html.erb  |  2 +-
 config/locales/en.yml                         |  1 +
 ...20250105171326_create_vignettes_answers.rb |  2 +-
 db/schema.rb                                  |  2 +-
 11 files changed, 84 insertions(+), 48 deletions(-)
 create mode 100644 app/models/vignettes/csv_handler.rb

diff --git a/app/assets/javascripts/vignettes/take_questionnaire.js b/app/assets/javascripts/vignettes/take_questionnaire.js
index c473b51f4..4e602935a 100644
--- a/app/assets/javascripts/vignettes/take_questionnaire.js
+++ b/app/assets/javascripts/vignettes/take_questionnaire.js
@@ -163,8 +163,8 @@ function registerStatisticsHandler(stats) {
     const timeOnSlideField = $("#time-on-slide-field");
     const timeOnInfoSlidesField = $("#time-on-info-slides-field");
     const infoSlidesAccessCountField = $("#info-slides-access-count-field");
-    timeOnSlideField.value = stats.totalSlideTime;
-    timeOnInfoSlidesField.value = JSON.stringify(stats.infoSlideTimes);
-    infoSlidesAccessCountField.value = JSON.stringify(stats.infoSlideAccessCounts);
+    timeOnSlideField.val(stats.totalSlideTime);
+    timeOnInfoSlidesField.val(JSON.stringify(stats.infoSlideTimes));
+    infoSlidesAccessCountField.val(JSON.stringify(stats.infoSlideAccessCounts));
   });
 }
diff --git a/app/controllers/vignettes/questionnaires_controller.rb b/app/controllers/vignettes/questionnaires_controller.rb
index bfdb82350..579e2bbb6 100644
--- a/app/controllers/vignettes/questionnaires_controller.rb
+++ b/app/controllers/vignettes/questionnaires_controller.rb
@@ -1,13 +1,13 @@
-require "csv"
-
 module Vignettes
   class QuestionnairesController < ApplicationController
-    before_action :set_questionnaire, only: [:show, :take, :submit_answer, :edit, :publish]
+    before_action :set_questionnaire,
+                  only: [:show, :take, :submit_answer, :edit, :publish, :export_answers]
     before_action :set_lecture, only: [:index, :new, :create]
     before_action :check_take_accessibility, only: [:take, :submit_answer]
     before_action :check_edit_accessibility, only: [:edit, :destroy, :publish]
+    before_action :check_empty, only: [:publish, :take, :submit_answer]
     def index
-      @questionnaires = @lecture.vignettes_questionnaires.reject { |q| q.slides.empty? }
+      @questionnaires = @lecture.vignettes_questionnaires
       # Because the create model form works on the index page.
       @questionnaire = Questionnaire.new
     end
@@ -58,12 +58,13 @@ def take
 
     def submit_answer
       @slide = @questionnaire.slides.find(answer_params[:slide_id])
-      @answer = @slide.answers.build(answer_params.except(:slide_id))
+      @answer = @slide.answers.build
       @answer.question = @slide.question
       @answer.type = @slide.question.type.gsub("Question", "Answer")
       @user_answer = current_user.vignettes_user_answers.find_by(user: current_user,
                                                                  questionnaire: @questionnaire)
       @answer.user_answer = @user_answer
+      @answer.assign_attributes(answer_params.except(:slide_id))
 
       if @answer.save
         redirect_to take_questionnaire_path(@questionnaire, position: @slide.position + 1)
@@ -82,30 +83,8 @@ def publish
     end
 
     def export_answers
-      questionnaire = Questionnaire.find(params[:id])
-      answers = questionnaire.slides.includes(:answers).flat_map(&:answers)
-
-      csv_data = CSV.generate(headers: true) do |csv|
-        csv << ["Answer ID", "User", "Question Slide", "Time on slide", "Time on info slide",
-                "Info slide accessed", "Question Text", "Answer", "Selected Options"]
-        answers.each do |answer|
-          row = [answer.id, answer.user_answer.user.name_or_email, answer.slide.position,
-                 answer.slide_statistic.time_on_slide, answer.slide_statistic.time_on_info_slides,
-                 answer.slide_statistic.info_slides_access_count,
-                 answer.slide.question.question_text]
-          case answer.type
-          when "Vignettes::TextAnswer"
-            row << answer.text
-          when "Vignettes::MultipleChoiceAnswer"
-            selected_options = answer.options.map(&:text).join(", ")
-            row << ""
-            row << selected_options
-          end
-          csv << row
-        end
-      end
-
-      send_data(csv_data, filename: "questionnaire-#{questionnaire.id}-answers.csv")
+      csv_data = @questionnaire.answer_data_csv
+      send_data(csv_data, filename: "questionnaire-#{@questionnaire.id}-answers.csv")
     end
 
     def new
@@ -153,6 +132,12 @@ def check_edit_accessibility
                     alert: t("vignettes.not_accessible")
       end
 
+      def check_empty
+        return unless @questionnaire.slides.empty?
+
+        redirect_to edit_questionnaire_path(@questionnaire), alert: t("vignettes.no_slides")
+      end
+
       def questionnaire_params
         params.permit(:title, :lecture_id)
       end
diff --git a/app/models/vignettes/csv_handler.rb b/app/models/vignettes/csv_handler.rb
new file mode 100644
index 000000000..b0c660cbc
--- /dev/null
+++ b/app/models/vignettes/csv_handler.rb
@@ -0,0 +1,45 @@
+require "csv"
+
+module Vignettes
+  class CsvHandler
+    HEADERS = ["Answer ID", "User", "Slide position", "Time on slide", "Time on info slide",
+               "Info slide access count", "Question Text", "Answer", "Selected Options", "Likert Scale Option"]
+
+    def self.answer_data(answer)
+      data = [
+        answer.id,
+        answer.user_answer.user.name_or_email,
+        answer.slide.position,
+        answer.slide_statistic.time_on_slide,
+        answer.slide_statistic.time_on_info_slides,
+        answer.slide_statistic.info_slides_access_count,
+        answer.slide.question.question_text
+      ]
+
+      case answer.type
+      when "Vignettes::TextAnswer"
+        data << answer.text
+      when "Vignettes::MultipleChoiceAnswer"
+        selected_options = answer.options.map(&:text).join(", ")
+        data << ""
+        data << selected_options
+      when "Vignettes::LikertScaleAnswer"
+        data << ""
+        data << ""
+        data << answer.likert_scale_value
+      end
+
+      data
+    end
+
+    def self.generate_questionnaire_csv(questionnaire)
+      answer_data = questionnaire.answers_data
+      CSV.generate do |csv|
+        csv << HEADERS
+        answer_data.each do |answer|
+          csv << answer_data(answer)
+        end
+      end
+    end
+  end
+end
diff --git a/app/models/vignettes/likert_scale_answer.rb b/app/models/vignettes/likert_scale_answer.rb
index 6ed4c4734..7697d741e 100644
--- a/app/models/vignettes/likert_scale_answer.rb
+++ b/app/models/vignettes/likert_scale_answer.rb
@@ -1,5 +1,4 @@
 module Vignettes
   class LikertScaleAnswer < Answer
-    enum likert_scale_value: Vignettes::LikertScaleQuestion::LIKERT_ENUM
   end
 end
diff --git a/app/models/vignettes/questionnaire.rb b/app/models/vignettes/questionnaire.rb
index fa569b232..a48fbc9d2 100644
--- a/app/models/vignettes/questionnaire.rb
+++ b/app/models/vignettes/questionnaire.rb
@@ -13,5 +13,14 @@ class Questionnaire < ApplicationRecord
              foreign_key: "vignettes_questionnaire_id",
              dependent: :destroy,
              inverse_of: :questionnaire
+
+    def answers_data
+      slides.includes(answers: [:options, :slide_statistic,
+                                { user_answer: :user }]).flat_map(&:answers)
+    end
+
+    def answer_data_csv
+      Vignettes::CsvHandler.generate_questionnaire_csv(self)
+    end
   end
 end
diff --git a/app/views/vignettes/answer_types/_likert_scale.html.erb b/app/views/vignettes/answer_types/_likert_scale.html.erb
index 56259aab1..05d115afc 100644
--- a/app/views/vignettes/answer_types/_likert_scale.html.erb
+++ b/app/views/vignettes/answer_types/_likert_scale.html.erb
@@ -5,8 +5,7 @@
 <div class="likert w-100">
     <% Vignettes::LikertScaleQuestion::LIKERT_LABELS.each do |value, label| %>
         <label>
-            <input name="vignette-likert-scale"
-                   type="radio" value="<%= value %>" required>
+            <%= f.radio_button :likert_scale_value, label, required: true %>
             <span>
                 <%= label %>
             </span>
diff --git a/app/views/vignettes/answer_types/_multiple_choice.html.erb b/app/views/vignettes/answer_types/_multiple_choice.html.erb
index 417fa59ed..3e4b1f433 100644
--- a/app/views/vignettes/answer_types/_multiple_choice.html.erb
+++ b/app/views/vignettes/answer_types/_multiple_choice.html.erb
@@ -1,14 +1,12 @@
 <% @slide.question.options.each do |option| %>
 <div class="form-check">
-    <input name="vignette-multiple-choice"
-            id="vignette-multiple-choice-<%= option.id %>"
-            class="form-check-input"
-            type="radio"
-            value="<%= option.id %>"
-            required>
-    <label class="form-check-label"
-            for="vignette-multiple-choice-<%= option.id %>">
-        <%= option.text %>
-    </label>
+    <%= check_box_tag "vignettes_answer[option_ids][]", 
+                       option.id,
+                       false, 
+                       id: "vignette-multiple-choice-#{option.id}",
+                       class: "form-check-input" %>
+    <%= label_tag "vignette-multiple-choice-#{option.id}", 
+                 option.text, 
+                 class: "form-check-label" %>
 </div>
 <% end %>
diff --git a/app/views/vignettes/slides/_form_question.html.erb b/app/views/vignettes/slides/_form_question.html.erb
index 45632b127..e518ced50 100644
--- a/app/views/vignettes/slides/_form_question.html.erb
+++ b/app/views/vignettes/slides/_form_question.html.erb
@@ -26,7 +26,7 @@
         placeholder: '_',
         class: 'form-control',
         style: 'height: 120px',
-        required: true
+        required: f.object.question_text_required?
     %>
     <%= f.label :question_text, "Your question" %>
 </div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 9d5c98a6d..bab54dc86 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2520,6 +2520,7 @@ en:
     published: 'Vignette was successfully published.'
     not_published: 'Vignette could not be published.'
     not_accessible: 'Vignette is not accessible.'
+    no_slides: "Vignette is empty"
 
 
   external_link_lc: 'external link'
diff --git a/db/migrate/20250105171326_create_vignettes_answers.rb b/db/migrate/20250105171326_create_vignettes_answers.rb
index 8c1dc93e9..977c999fa 100644
--- a/db/migrate/20250105171326_create_vignettes_answers.rb
+++ b/db/migrate/20250105171326_create_vignettes_answers.rb
@@ -12,7 +12,7 @@ def change
       t.references :vignettes_slide, null: false, foreign_key: true
       t.references :vignettes_user_answer, null: false, foreign_key: true
       t.text :text
-      t.integer :likert_scale_value
+      t.string :likert_scale_value
       t.timestamps
     end
   end
diff --git a/db/schema.rb b/db/schema.rb
index f8acc2da9..cfd87def3 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -949,7 +949,7 @@
     t.bigint "vignettes_slide_id", null: false
     t.bigint "vignettes_user_answer_id", null: false
     t.text "text"
-    t.integer "likert_scale_value"
+    t.string "likert_scale_value"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.index ["vignettes_question_id"], name: "index_vignettes_answers_on_vignettes_question_id"

From 56bfe4d682d30ee18ff07180c8d013f937c6188d Mon Sep 17 00:00:00 2001
From: Florian <florianbuerckel@gmail.com>
Date: Mon, 3 Mar 2025 11:48:30 +0100
Subject: [PATCH 093/103] Remove unreachable code for questionnaire function

---
 app/models/lecture.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/models/lecture.rb b/app/models/lecture.rb
index 1e245c791..79a6055e2 100644
--- a/app/models/lecture.rb
+++ b/app/models/lecture.rb
@@ -388,7 +388,6 @@ def reste?(user)
   end
 
   def questionnaire?
-    return false
     Rails.cache.fetch("#{cache_key_with_version}/has_questionnaire") do
       Vignettes::Questionnaire.exists?(lecture_id: id)
     end

From ecd1d09e14daf4a6ddcb3e6470acc63cfcde4adb Mon Sep 17 00:00:00 2001
From: Florian <florianbuerckel@gmail.com>
Date: Mon, 3 Mar 2025 12:05:27 +0100
Subject: [PATCH 094/103] fix rubocop warnings

---
 app/models/vignettes/csv_handler.rb | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/models/vignettes/csv_handler.rb b/app/models/vignettes/csv_handler.rb
index b0c660cbc..6db1cb087 100644
--- a/app/models/vignettes/csv_handler.rb
+++ b/app/models/vignettes/csv_handler.rb
@@ -2,8 +2,16 @@
 
 module Vignettes
   class CsvHandler
-    HEADERS = ["Answer ID", "User", "Slide position", "Time on slide", "Time on info slide",
-               "Info slide access count", "Question Text", "Answer", "Selected Options", "Likert Scale Option"]
+    HEADERS = ["Answer ID",
+               "User",
+               "Slide position",
+               "Time on slide",
+               "Time on info slide",
+               "Info slide access count",
+               "Question Text",
+               "Answer",
+               "Selected Options",
+               "Likert Scale Option"].freeze
 
     def self.answer_data(answer)
       data = [

From 65238e799a09c5557b9733e6e72a1f49679f1708 Mon Sep 17 00:00:00 2001
From: Florian <florianbuerckel@gmail.com>
Date: Mon, 3 Mar 2025 14:31:18 +0100
Subject: [PATCH 095/103] Add update slide function for questionnaire

---
 app/assets/javascripts/vignettes/edit.js.erb  | 41 ++++++++-----------
 .../vignettes/questionnaires_controller.rb    | 37 ++++++++++++++++-
 config/routes.rb                              |  1 +
 3 files changed, 53 insertions(+), 26 deletions(-)

diff --git a/app/assets/javascripts/vignettes/edit.js.erb b/app/assets/javascripts/vignettes/edit.js.erb
index b4aa20996..e6ad0e683 100644
--- a/app/assets/javascripts/vignettes/edit.js.erb
+++ b/app/assets/javascripts/vignettes/edit.js.erb
@@ -12,30 +12,23 @@ function createSortableVignetteSlides(vignetteSlideList) {
     filter: ".accordion-collapse",
     preventOnFilter: false,
     onEnd: function (_evt) {
-      // console.log(`Moved element from ${evt.oldIndex} to ${evt.newIndex}`);
-      // TODO: send a request to update the order of the slides in the database
-      // TODO: see more options here:
-      // https://github.com/SortableJS/Sortable?tab=readme-ov-file#options
-      // TODO: Watch out (!) We also get this event when oldIndex === newIndex
-      // in this case we should not send a request to the server as nothing
-      // changed. And the server should of course check for bounds.
-      //
-      // Something like that should work:
-      // $.ajax({
-      //   url: `/vignettes/slides/${slideId}/update_position`,
-      //   method: "PATCH",
-      //   data: {
-      //     slide: {
-      //       position: newPosition,
-      //     },
-      //   },
-      //   success: function (response) {
-      //     console.log(`Slide ${slideId} moved to position ${newPosition}`);
-      //   },
-      //   error: function (xhr, status, error) {
-      //     console.error(`Failed to update position: ${error}`);
-      //   },
-      // });
+      if (_evt.oldIndex == _evt.newIndex) return;
+
+      let questionnaire_id = _evt.target.dataset.questionnaireId;
+      $.ajax({
+        url: `/questionnaires/${questionnaire_id}/update_slide_position`,
+        method: "PATCH",
+        data: {
+          old_position: _evt.oldIndex,
+          new_position: _evt.newIndex,
+        },
+        success: function (response) {
+          console.log(`Slide was moved from position ${_evt.oldIndex} to ${_evt.newIndex}`);
+        },
+        error: function (xhr, status, error) {
+          console.error(`Failed to update position: ${error}`);
+        },
+      });
     },
   });
 }
diff --git a/app/controllers/vignettes/questionnaires_controller.rb b/app/controllers/vignettes/questionnaires_controller.rb
index 579e2bbb6..7901df91a 100644
--- a/app/controllers/vignettes/questionnaires_controller.rb
+++ b/app/controllers/vignettes/questionnaires_controller.rb
@@ -1,10 +1,12 @@
 module Vignettes
   class QuestionnairesController < ApplicationController
     before_action :set_questionnaire,
-                  only: [:show, :take, :submit_answer, :edit, :publish, :export_answers]
+                  only: [:show, :take, :submit_answer, :edit, :publish, :export_answers,
+                         :update_slide_position]
     before_action :set_lecture, only: [:index, :new, :create]
     before_action :check_take_accessibility, only: [:take, :submit_answer]
-    before_action :check_edit_accessibility, only: [:edit, :destroy, :publish]
+    before_action :check_edit_accessibility,
+                  only: [:edit, :destroy, :publish, :update_slide_position]
     before_action :check_empty, only: [:publish, :take, :submit_answer]
     def index
       @questionnaires = @lecture.vignettes_questionnaires
@@ -82,6 +84,37 @@ def publish
       end
     end
 
+    def update_slide_position
+      old_position = params[:old_position].to_i + 1
+      new_position = params[:new_position].to_i + 1
+
+      @slide = @questionnaire.slides.find_by(position: old_position)
+
+      if new_position < 1 || new_position > @questionnaire.slides.maximum(:position)
+        render json: { error: "Invalid position" }, status: :unprocessable_entity
+        return
+      end
+
+      ActiveRecord::Base.transaction do
+        # Move slide with update_column to invalid position to not violate uniqueness constraint
+        @slide.update_column(:position, -1)
+        if new_position > old_position
+          @questionnaire.slides.where("position > ? AND position <= ?", old_position, new_position)
+                        .update_all("position = position - 1")
+        else
+          @questionnaire.slides.where("position < ? AND position >= ?", old_position, new_position)
+                        .update_all("position = position + 1")
+        end
+
+        @slide.update_column(:position, new_position)
+      end
+
+      render json: { success: true }
+    rescue StandardError => e
+      Rails.logger.error("Slide position update failed: #{e.message}")
+      render json: { error: e.message }, status: :unprocessable_entity
+    end
+
     def export_answers
       csv_data = @questionnaire.answer_data_csv
       send_data(csv_data, filename: "questionnaire-#{@questionnaire.id}-answers.csv")
diff --git a/config/routes.rb b/config/routes.rb
index d3e2ee8aa..a7927c5ec 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -576,6 +576,7 @@
         get :export_answers
         post :submit_answer
         patch :publish
+        patch :update_slide_position
       end
       resources :info_slides, only: [:new, :create, :edit, :update]
       resources :slides, only: [:new, :create, :edit, :update] do

From 3f942977f499cf34b69691928a2ce678d998a576 Mon Sep 17 00:00:00 2001
From: Florian <florianbuerckel@gmail.com>
Date: Mon, 3 Mar 2025 15:03:38 +0100
Subject: [PATCH 096/103] Remove unused routes and views

---
 app/controllers/vignettes/questionnaires_controller.rb |  2 +-
 app/controllers/vignettes/slides_controller.rb         |  8 --------
 app/views/vignettes/questionnaires/new.html.erb        | 10 ----------
 config/routes.rb                                       |  2 +-
 4 files changed, 2 insertions(+), 20 deletions(-)
 delete mode 100644 app/views/vignettes/questionnaires/new.html.erb

diff --git a/app/controllers/vignettes/questionnaires_controller.rb b/app/controllers/vignettes/questionnaires_controller.rb
index 7901df91a..f14cb1db4 100644
--- a/app/controllers/vignettes/questionnaires_controller.rb
+++ b/app/controllers/vignettes/questionnaires_controller.rb
@@ -1,7 +1,7 @@
 module Vignettes
   class QuestionnairesController < ApplicationController
     before_action :set_questionnaire,
-                  only: [:show, :take, :submit_answer, :edit, :publish, :export_answers,
+                  only: [:take, :submit_answer, :edit, :publish, :export_answers,
                          :update_slide_position]
     before_action :set_lecture, only: [:index, :new, :create]
     before_action :check_take_accessibility, only: [:take, :submit_answer]
diff --git a/app/controllers/vignettes/slides_controller.rb b/app/controllers/vignettes/slides_controller.rb
index 2451d1467..c48284288 100644
--- a/app/controllers/vignettes/slides_controller.rb
+++ b/app/controllers/vignettes/slides_controller.rb
@@ -3,14 +3,6 @@ class SlidesController < ApplicationController
     before_action :set_questionnaire
     before_action :check_edit_accessibility, only: [:new, :create, :edit, :update]
 
-    def index
-    end
-
-    def show
-      @slide = @questionnaire.slides.find(params[:id])
-      @answer = Answer.build(slide: @slide, type: @slide.question.type.gsub("Question", "Answer"))
-    end
-
     def new
       return if @questionnaire.published
 
diff --git a/app/views/vignettes/questionnaires/new.html.erb b/app/views/vignettes/questionnaires/new.html.erb
deleted file mode 100644
index 0496a7c16..000000000
--- a/app/views/vignettes/questionnaires/new.html.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<%= form_with local: true, scope: :questionnaire, model: @questionnaire do |form| %>
-    <div>
-        <%= form.label :title %> <br>
-        <%= form.text_field :title %>
-    </div>
-    <br>
-    <div>
-        <%= form.submit 'Create Questionnaire', class: 'btn btn-primary'%>
-    </div>
-<%end%>
diff --git a/config/routes.rb b/config/routes.rb
index a7927c5ec..97a7cbfd0 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -571,7 +571,7 @@
       as: "take_questionnaire"
 
   scope module: "vignettes", path: "" do
-    resources :questionnaires, only: [:index, :show, :new, :create, :edit, :update] do
+    resources :questionnaires, only: [:create, :edit, :update] do
       member do
         get :export_answers
         post :submit_answer

From 3b206d3e19b8a36e12c1f7ef6b29e7a270058d51 Mon Sep 17 00:00:00 2001
From: Florian <florianbuerckel@gmail.com>
Date: Mon, 3 Mar 2025 18:52:24 +0100
Subject: [PATCH 097/103] Add delete button for questionnaire and slides

---
 .../vignettes/questionnaires_controller.rb    | 13 +++-
 .../vignettes/slides_controller.rb            | 23 +++++-
 .../vignettes/questionnaires/edit.html.erb    | 73 +++++++++++++++++--
 app/views/vignettes/slides/_form.html.erb     | 44 ++++++++++-
 config/locales/en.yml                         |  8 ++
 config/routes.rb                              |  4 +-
 6 files changed, 150 insertions(+), 15 deletions(-)

diff --git a/app/controllers/vignettes/questionnaires_controller.rb b/app/controllers/vignettes/questionnaires_controller.rb
index f14cb1db4..3dee01423 100644
--- a/app/controllers/vignettes/questionnaires_controller.rb
+++ b/app/controllers/vignettes/questionnaires_controller.rb
@@ -2,7 +2,7 @@ module Vignettes
   class QuestionnairesController < ApplicationController
     before_action :set_questionnaire,
                   only: [:take, :submit_answer, :edit, :publish, :export_answers,
-                         :update_slide_position]
+                         :update_slide_position, :destroy]
     before_action :set_lecture, only: [:index, :new, :create]
     before_action :check_take_accessibility, only: [:take, :submit_answer]
     before_action :check_edit_accessibility,
@@ -139,6 +139,17 @@ def edit
       render layout: "application_no_sidebar"
     end
 
+    def destroy
+      @lecture = @questionnaire.lecture
+      if @questionnaire.destroy
+        redirect_to edit_lecture_path(@lecture),
+                    notice: t("vignettes.questionnaire_deleted")
+      else
+        redirect_to edit_lecture_path(@lecture),
+                    alert: t("vignettes.questionnaire_not_deleted")
+      end
+    end
+
     private
 
       def set_questionnaire
diff --git a/app/controllers/vignettes/slides_controller.rb b/app/controllers/vignettes/slides_controller.rb
index c48284288..7bdf6b33f 100644
--- a/app/controllers/vignettes/slides_controller.rb
+++ b/app/controllers/vignettes/slides_controller.rb
@@ -1,7 +1,7 @@
 module Vignettes
   class SlidesController < ApplicationController
     before_action :set_questionnaire
-    before_action :check_edit_accessibility, only: [:new, :create, :edit, :update]
+    before_action :check_edit_accessibility, only: [:new, :create, :edit, :update, :destroy]
 
     def new
       return if @questionnaire.published
@@ -46,6 +46,27 @@ def update
       end
     end
 
+    def destroy
+      @slide = @questionnaire.slides.find(params[:id])
+      position = @slide.position
+
+      begin
+        ActiveRecord::Base.transaction do
+          @slide.destroy
+
+          @questionnaire.slides.where("position > ?",
+                                      position).update_all("position = position - 1")
+        end
+
+        redirect_to edit_questionnaire_path(@questionnaire),
+                    notice: t("vignettes.slide_deleted")
+      rescue StandardError => e
+        Rails.logger.error("Slide deletion failed: #{e.message}")
+        redirect_to edit_questionnaire_path(@questionnaire),
+                    alert: t("vignettes.slide_not_deleted")
+      end
+    end
+
     private
 
       def set_questionnaire
diff --git a/app/views/vignettes/questionnaires/edit.html.erb b/app/views/vignettes/questionnaires/edit.html.erb
index a0ab71243..869b8c410 100644
--- a/app/views/vignettes/questionnaires/edit.html.erb
+++ b/app/views/vignettes/questionnaires/edit.html.erb
@@ -6,14 +6,16 @@
     <div class="d-flex justify-content-between align-items-center mb-3">
         <h1 class="fs-4 fw-bold mb-0">Slides</h1>
         
-        <!-- Publish Questionnaire -->
-        <%= button_to @questionnaire.published ? 'Published' : 'Publish', 
-                      publish_questionnaire_path(@questionnaire),
-                      method: :patch,
-                      class: "btn #{@questionnaire.published ? 'btn-success' : 'btn-danger'}",
-                      disabled: @questionnaire.published,
-                      form_class: 'd-inline-block',
-                      id: "vignettes-publish-btn" %>
+        <% unless @questionnaire.published %>
+            <button type="button" 
+                    class="btn btn-primary"
+                    data-bs-toggle="modal" 
+                    data-bs-target="#publishModal">
+                Publish
+            </button>
+        <% else %>
+            <span class="btn btn-success disabled">Published</span>
+        <% end %>
     </div>
 
     <p>Drag the slides to change their order.</p>
@@ -53,3 +55,58 @@
     <!-- Export -->
     <%= button_to "Export answers", export_answers_questionnaire_path(@questionnaire), method: :get, class: 'btn btn-primary' %>
 </div>
+
+<div class="mt-5 border-top pt-4">
+  <div class="d-flex justify-content-between align-items-center">
+    <button type="button" class="btn btn-outline-danger" data-bs-toggle="modal" data-bs-target="#deleteQuestionnaireModal">
+      Delete Questionnaire
+    </button>
+  </div>
+</div>
+
+<!-- Delete Confirmation Modal -->
+<div class="modal fade" id="deleteQuestionnaireModal" tabindex="-1" aria-labelledby="deleteQuestionnaireModalLabel" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title" id="deleteQuestionnaireModalLabel">Confirm Deletion</h5>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+      </div>
+      <div class="modal-body">
+        <p><%= t("vignettes.questionnaire_confirm_delete") %></p>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
+        <%= button_to "Delete Questionnaire", 
+              questionnaire_path(@questionnaire),
+              method: :delete,
+              class: "btn btn-danger"
+        %>
+      </div>
+    </div>
+  </div>
+</div>
+
+<!-- Publish Confirmation Modal -->
+<div class="modal fade" id="publishModal" tabindex="-1" aria-labelledby="publishModalLabel" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title" id="publishModalLabel">Confirm Publication</h5>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+      </div>
+      <div class="modal-body">
+        <!-- TO DO: Write better message -->
+        <p>After publishing, you can only change typos and nothing else</p>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
+        <%= button_to "Publish", 
+              publish_questionnaire_path(@questionnaire),
+              method: :patch,
+              class: "btn btn-primary"
+        %>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/app/views/vignettes/slides/_form.html.erb b/app/views/vignettes/slides/_form.html.erb
index 35955f054..f2069f537 100644
--- a/app/views/vignettes/slides/_form.html.erb
+++ b/app/views/vignettes/slides/_form.html.erb
@@ -20,9 +20,47 @@
   <br>
   <%= render partial: 'form_question', locals: { form: form } %>
 
-  <%= form.submit @slide.new_record? ? 'Create Slide' : 'Update Slide',
-        class: "btn btn-primary mt-3"
-  %>
+  <div class="d-flex justify-content-between align-items-center mt-3">
+    <%= form.submit @slide.new_record? ? 'Create Slide' : 'Update Slide',
+          class: "btn btn-primary"
+    %>
+    
+    <% unless @slide.new_record? %>
+    <button type="button" 
+            class="btn btn-danger" 
+            data-bs-toggle="<%= @slide.questionnaire.published ? '' : 'modal' %>" 
+            data-bs-target="#deleteModal<%= @slide.id %>"
+            <%= 'disabled' if @slide.questionnaire.published %>>
+      Delete Slide
+    </button>
+ 
+    <% end %>
+  </div>
+<% end %>
+
+<!-- Delete Confirmation Modal -->
+<% unless @slide.new_record? %>
+  <div class="modal fade" id="deleteModal<%= @slide.id %>" tabindex="-1" aria-labelledby="deleteModalLabel" aria-hidden="true">
+    <div class="modal-dialog">
+      <div class="modal-content">
+        <div class="modal-header">
+          <h5 class="modal-title" id="deleteModalLabel">Confirm Deletion</h5>
+          <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+        </div>
+        <div class="modal-body">
+          <p><%= t("vignettes.slide_confirm_delete") %></p>
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
+          <%= button_to "Delete Slide", 
+                questionnaire_slide_path(@questionnaire, @slide),
+                method: :delete,
+                class: "btn btn-danger"
+          %>
+        </div>
+      </div>
+    </div>
+  </div>
 <% end %>
 
 <%= javascript_include_tag 'vignettes/edit_slide' %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index bab54dc86..ecd848e4b 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2521,6 +2521,14 @@ en:
     not_published: 'Vignette could not be published.'
     not_accessible: 'Vignette is not accessible.'
     no_slides: "Vignette is empty"
+    questionnaire_deleted: 'Questionnaire was successfully deleted'
+    questionnaire_not_deleted: 'Questionnaire could not be deleted'
+    slide_deleted: 'Slide was successfully deleted.'
+    slide_not_deleted: 'Slide could not be deleted.'
+    slide_confirm_delete: 'Are you sure you want to delete this slide? 
+      This action cannot be undone.'
+    questionnaire_confirm_delete: 'Are you sure you want to delete this questionnaire?
+      This will also delete all associated slides, answers and statistics'
 
 
   external_link_lc: 'external link'
diff --git a/config/routes.rb b/config/routes.rb
index 97a7cbfd0..9f4d91151 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -571,7 +571,7 @@
       as: "take_questionnaire"
 
   scope module: "vignettes", path: "" do
-    resources :questionnaires, only: [:create, :edit, :update] do
+    resources :questionnaires, only: [:create, :edit, :update, :destroy] do
       member do
         get :export_answers
         post :submit_answer
@@ -579,7 +579,7 @@
         patch :update_slide_position
       end
       resources :info_slides, only: [:new, :create, :edit, :update]
-      resources :slides, only: [:new, :create, :edit, :update] do
+      resources :slides, only: [:new, :create, :edit, :update, :destroy] do
         resources :answers, only: [:new, :create]
       end
     end

From 59d78866dc489b598677b0f3745baa7600fce25b Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Tue, 4 Mar 2025 11:42:03 +0100
Subject: [PATCH 098/103] Use a floating form for create new vignette title

---
 app/views/vignettes/questionnaires/_vignette_form.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/vignettes/questionnaires/_vignette_form.html.erb b/app/views/vignettes/questionnaires/_vignette_form.html.erb
index 540574572..0d0494424 100644
--- a/app/views/vignettes/questionnaires/_vignette_form.html.erb
+++ b/app/views/vignettes/questionnaires/_vignette_form.html.erb
@@ -1,9 +1,9 @@
 <%= form_with(url: questionnaires_url) do |form| %>
   <%= form.hidden_field :lecture_id, value: lecture.id %>
   
-  <div class="mb-3">
-    <%= form.label :title, class: 'form-label' %>
+  <div class="form-floating mb-3">
     <%= form.text_field :title, class: 'form-control', placeholder: 'Enter title', required: true %>
+    <%= form.label :title, class: 'form-label' %>
   </div>
   
   <div class="d-flex justify-content-between">

From 2af894c5f6fb9692fbc8537cedfcec21e432f1dc Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Tue, 4 Mar 2025 11:48:58 +0100
Subject: [PATCH 099/103] Use modal-footer & respect MaMpf "Cancel vs. Submit"
 button ordering

---
 .../vignettes/questionnaires/_vignette_form.html.erb | 12 +++++++-----
 .../questionnaires/_vignette_modal.html.erb          |  9 +++++----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/views/vignettes/questionnaires/_vignette_form.html.erb b/app/views/vignettes/questionnaires/_vignette_form.html.erb
index 0d0494424..7573bad9c 100644
--- a/app/views/vignettes/questionnaires/_vignette_form.html.erb
+++ b/app/views/vignettes/questionnaires/_vignette_form.html.erb
@@ -1,13 +1,15 @@
 <%= form_with(url: questionnaires_url) do |form| %>
   <%= form.hidden_field :lecture_id, value: lecture.id %>
   
-  <div class="form-floating mb-3">
-    <%= form.text_field :title, class: 'form-control', placeholder: 'Enter title', required: true %>
-    <%= form.label :title, class: 'form-label' %>
+  <div class="modal-body">
+    <div class="form-floating">
+      <%= form.text_field :title, class: 'form-control', required: true %>
+      <%= form.label :title, class: 'form-label' %>
+    </div>
   </div>
   
-  <div class="d-flex justify-content-between">
-    <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
+  <div class="modal-footer">
     <%= form.submit 'Create Vignette', class: 'btn btn-primary' %>
+    <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
   </div>
 <% end %>
\ No newline at end of file
diff --git a/app/views/vignettes/questionnaires/_vignette_modal.html.erb b/app/views/vignettes/questionnaires/_vignette_modal.html.erb
index 9f1a5b8bb..69a1d1cb3 100644
--- a/app/views/vignettes/questionnaires/_vignette_modal.html.erb
+++ b/app/views/vignettes/questionnaires/_vignette_modal.html.erb
@@ -1,13 +1,14 @@
-<div class="modal fade" id="vignetteModal" tabindex="-1" role="dialog" aria-labelledby="vignetteModalLabel" aria-hidden="true">
+<div class="modal fade" id="vignetteModal" tabindex="-1" role="dialog"
+     aria-labelledby="vignetteModalLabel" aria-hidden="true">
   <div class="modal-dialog" role="document">
     <div class="modal-content">
+
       <div class="modal-header">
         <h5 class="modal-title" id="vignetteModalLabel">Create New Vignette</h5>
         <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
       </div>
-      <div class="modal-body">
-        <%= render 'vignettes/questionnaires/vignette_form', lecture: @lecture %>
-      </div>
+      
+      <%= render 'vignettes/questionnaires/vignette_form', lecture: @lecture %>
     </div>
   </div>
 </div>
\ No newline at end of file

From caa37b92c851149b8092e4aa312321284eca3964 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Tue, 4 Mar 2025 11:57:34 +0100
Subject: [PATCH 100/103] Only show "drag slides" tip if there are at least 2
 slides

---
 app/views/vignettes/questionnaires/edit.html.erb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views/vignettes/questionnaires/edit.html.erb b/app/views/vignettes/questionnaires/edit.html.erb
index 869b8c410..6fd99e9bb 100644
--- a/app/views/vignettes/questionnaires/edit.html.erb
+++ b/app/views/vignettes/questionnaires/edit.html.erb
@@ -18,7 +18,9 @@
         <% end %>
     </div>
 
-    <p>Drag the slides to change their order.</p>
+	<% if @slides.size > 1 %>
+		<p>Drag the slides to change their order.</p>
+	<% end %>
 
     <div class="accordion" id="vignettes-slides-accordion"
          data-questionnaire-id="<%= @questionnaire.id %>">

From 9691e6a05d16fd74b398406f2295e267cbbe8070 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Tue, 4 Mar 2025 11:57:45 +0100
Subject: [PATCH 101/103] Remove "New Slide" title

---
 app/views/vignettes/slides/_new.html.erb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/views/vignettes/slides/_new.html.erb b/app/views/vignettes/slides/_new.html.erb
index aaa474add..2d3436368 100644
--- a/app/views/vignettes/slides/_new.html.erb
+++ b/app/views/vignettes/slides/_new.html.erb
@@ -1,3 +1 @@
-<h1>New Slide</h1>
-
 <%= render 'form' %>

From 7b32faaac00edec63740b68551639e8c37cb6b7c Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Tue, 4 Mar 2025 11:58:21 +0100
Subject: [PATCH 102/103] Don't show spinner when creating a new slide

---
 .../vignettes/questionnaires/_slide_accordion_item.html.erb     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/views/vignettes/questionnaires/_slide_accordion_item.html.erb b/app/views/vignettes/questionnaires/_slide_accordion_item.html.erb
index 45703174f..0b3f837e5 100644
--- a/app/views/vignettes/questionnaires/_slide_accordion_item.html.erb
+++ b/app/views/vignettes/questionnaires/_slide_accordion_item.html.erb
@@ -14,12 +14,14 @@
          class="accordion-collapse collapse vignette-accordion-collapse"
          data-bs-parent="#vignettes-slides-accordion">
 
+        <% unless slide.new_record? %>
         <div id="vignette-slide-loading-<%= slide.id %>" 
              class="d-flex justify-content-center mt-3 mb-3">
             <div class="spinner-border text-secondary" role="status">
                 <span class="visually-hidden">Loading...</span>
             </div>
         </div>
+        <% end %>
 
         <% if slide.id %>
         <div class="accordion-body slides-edit-form-container"

From 4ca39d919dfa24839a5df374dcf50cd7a5d3c7b4 Mon Sep 17 00:00:00 2001
From: Florian <florianbuerckel@gmail.com>
Date: Tue, 4 Mar 2025 12:50:34 +0100
Subject: [PATCH 103/103] Add backend validations for actions after publish

---
 app/assets/javascripts/vignettes/edit.js.erb  | 14 ++++-----
 .../vignettes/questionnaires_controller.rb    |  2 +-
 .../vignettes/slides_controller.rb            | 31 ++++++++++++++++---
 .../vignettes/slides/_form_question.html.erb  |  4 +--
 .../slides/_multiple_choice_fields.html.erb   |  3 +-
 config/locales/en.yml                         |  2 ++
 6 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/app/assets/javascripts/vignettes/edit.js.erb b/app/assets/javascripts/vignettes/edit.js.erb
index e6ad0e683..f825be170 100644
--- a/app/assets/javascripts/vignettes/edit.js.erb
+++ b/app/assets/javascripts/vignettes/edit.js.erb
@@ -11,19 +11,19 @@ function createSortableVignetteSlides(vignetteSlideList) {
     animation: 150,
     filter: ".accordion-collapse",
     preventOnFilter: false,
-    onEnd: function (_evt) {
-      if (_evt.oldIndex == _evt.newIndex) return;
+    onEnd: function (evt) {
+      if (evt.oldIndex == evt.newIndex) return;
 
-      let questionnaire_id = _evt.target.dataset.questionnaireId;
+      let questionnaire_id = evt.target.dataset.questionnaireId;
       $.ajax({
         url: `/questionnaires/${questionnaire_id}/update_slide_position`,
         method: "PATCH",
         data: {
-          old_position: _evt.oldIndex,
-          new_position: _evt.newIndex,
+          old_position: evt.oldIndex,
+          new_position: evt.newIndex,
         },
-        success: function (response) {
-          console.log(`Slide was moved from position ${_evt.oldIndex} to ${_evt.newIndex}`);
+        success: function (_response) {
+          console.log(`Slide was moved from position ${evt.oldIndex} to ${evt.newIndex}`);
         },
         error: function (xhr, status, error) {
           console.error(`Failed to update position: ${error}`);
diff --git a/app/controllers/vignettes/questionnaires_controller.rb b/app/controllers/vignettes/questionnaires_controller.rb
index 3dee01423..042bfd00c 100644
--- a/app/controllers/vignettes/questionnaires_controller.rb
+++ b/app/controllers/vignettes/questionnaires_controller.rb
@@ -77,7 +77,7 @@ def submit_answer
     end
 
     def publish
-      if @questionnaire.update(published: !@questionnaire.published)
+      if @questionnaire.update(published: true)
         redirect_to edit_questionnaire_path(@questionnaire), notice: t("vignettes.published")
       else
         redirect_to edit_questionnaire_path(@questionnaire), alert: t("vignettes.not_published")
diff --git a/app/controllers/vignettes/slides_controller.rb b/app/controllers/vignettes/slides_controller.rb
index 7bdf6b33f..781dd153c 100644
--- a/app/controllers/vignettes/slides_controller.rb
+++ b/app/controllers/vignettes/slides_controller.rb
@@ -31,13 +31,21 @@ def create
         redirect_to edit_questionnaire_path(@questionnaire),
                     notice: t("vignettes.slide_created")
       else
-        flash[:alert] = "Failed to create slide: #{@slide.errors.full_messages.join(", ")}"
-        render :new, status: :unprocessable_entity
+        redirect_to edit_questionnaire_path(@questionnaire),
+                    notice: t("vignettes.slide_not_created")
       end
     end
 
     def update
       @slide = @questionnaire.slides.find(params[:id])
+
+      if @questionnaire.published &&
+         (slide_params[:question_attributes][:type] != (@slide.question.type) ||
+          any_option_deleted?)
+        return redirect_to edit_questionnaire_path(@questionnaire),
+                           alert: t("vignettes.not_editable")
+      end
+
       if @slide.update(slide_params)
         redirect_to edit_questionnaire_path(@questionnaire),
                     notice: t("vignettes.slide_updated")
@@ -47,6 +55,10 @@ def update
     end
 
     def destroy
+      if @questionnaire.published
+        redirect_to edit_questionnaire_path(@questionnaire),
+                    alert: t("vignettes.slide_not_deleted")
+      end
       @slide = @questionnaire.slides.find(params[:id])
       position = @slide.position
 
@@ -60,8 +72,7 @@ def destroy
 
         redirect_to edit_questionnaire_path(@questionnaire),
                     notice: t("vignettes.slide_deleted")
-      rescue StandardError => e
-        Rails.logger.error("Slide deletion failed: #{e.message}")
+      rescue StandardError => _e
         redirect_to edit_questionnaire_path(@questionnaire),
                     alert: t("vignettes.slide_not_deleted")
       end
@@ -69,6 +80,18 @@ def destroy
 
     private
 
+      def any_option_deleted?
+        options = slide_params.dig(:question_attributes, :options_attributes)
+        return false unless options
+
+        option_destroyed = false
+        options.each_value do |v|
+          option_destroyed = true if v[:_destroy] == "1"
+        end
+
+        option_destroyed
+      end
+
       def set_questionnaire
         @questionnaire = Questionnaire.find(params[:questionnaire_id])
       end
diff --git a/app/views/vignettes/slides/_form_question.html.erb b/app/views/vignettes/slides/_form_question.html.erb
index e518ced50..05fe419c3 100644
--- a/app/views/vignettes/slides/_form_question.html.erb
+++ b/app/views/vignettes/slides/_form_question.html.erb
@@ -35,7 +35,7 @@
 
     <div id="vignette-multiple-choice-options">
         <%= f.fields_for :options do |option_form| %>
-            <%= render partial: "multiple_choice_fields", locals: { f: option_form } %>
+            <%= render partial: "multiple_choice_fields", locals: { f: option_form, published: form.object.questionnaire.published } %>
         <% end %>
     </div>
 
@@ -44,7 +44,7 @@
     <template id="vignette-multiple-choice-options-template" class="d-none">
         <%= f.fields_for :options, f.object.options.build,
                          child_index: 'NEW_RECORD' do |option_form| %>
-            <%= render partial: "multiple_choice_fields", locals: { f: option_form } %>
+            <%= render partial: "multiple_choice_fields", locals: { f: option_form, published: form.object.questionnaire.published } %>
         <% end %>
     </template>
     
diff --git a/app/views/vignettes/slides/_multiple_choice_fields.html.erb b/app/views/vignettes/slides/_multiple_choice_fields.html.erb
index 9cb1cae6b..95f6714e1 100644
--- a/app/views/vignettes/slides/_multiple_choice_fields.html.erb
+++ b/app/views/vignettes/slides/_multiple_choice_fields.html.erb
@@ -1,7 +1,8 @@
 <div class="d-flex justify-content-between align-items-center mb-2">
     <%= f.text_field :text, class: "form-control me-2" %>
     <%= f.hidden_field :_destroy, class: "vignette-mc-hidden-destroy" %>
-    <button class="btn btn-outline-danger remove-vignette-mc-option" type="button">
+    <button class="btn btn-outline-danger remove-vignette-mc-option" type="button"
+            <%= published ? 'disabled' : '' %>>
         <i class="bi bi-trash3-fill"></i>
     </button>
 </div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index ecd848e4b..1842dfe47 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2517,9 +2517,11 @@ en:
     info_slide_updated: 'Info slide updated.'
     slide_updated: 'Slide was successfully updated.'
     slide_created: 'Slide was successfully created.'
+    slide_not_created: 'Slide could not be created.'
     published: 'Vignette was successfully published.'
     not_published: 'Vignette could not be published.'
     not_accessible: 'Vignette is not accessible.'
+    not_editable: 'Vignette is not editable, because it was already published.'
     no_slides: "Vignette is empty"
     questionnaire_deleted: 'Questionnaire was successfully deleted'
     questionnaire_not_deleted: 'Questionnaire could not be deleted'