onFinishSubmitAndReturnToGame is now boolean and in assessment_configs

Author: JustATin555

lib/cadet/assessments/assessment.ex

@@ -36,7 +36,6 @@ defmodule Cadet.Assessments.Assessment do
     field(:max_team_size, :integer, default: 1)
     field(:has_token_counter, :boolean, default: false)
     field(:has_voting_features, :boolean, default: false)
-    field(:on_finish, :string, default: nil)
 
     belongs_to(:config, AssessmentConfig)
     belongs_to(:course, Course)
@@ -47,7 +46,7 @@ defmodule Cadet.Assessments.Assessment do
 
   @required_fields ~w(title open_at close_at number course_id config_id max_team_size)a
   @optional_fields ~w(reading summary_short summary_long
-    is_published story cover_picture access password has_token_counter has_voting_features on_finish)a
+    is_published story cover_picture access password has_token_counter has_voting_features)a
   @optional_file_fields ~w(mission_pdf)a
 
   def changeset(assessment, params) do

lib/cadet/courses/assessment_config.ex

@@ -18,6 +18,7 @@ defmodule Cadet.Courses.AssessmentConfig do
     field(:early_submission_xp, :integer, default: 0)
     field(:hours_before_early_xp_decay, :integer, default: 0)
     field(:is_grading_auto_published, :boolean, default: false)
+    field(:on_finish_submit_and_return_to_game, :boolean, default: false)
 
     belongs_to(:course, Course)
 
@@ -26,7 +27,7 @@ defmodule Cadet.Courses.AssessmentConfig do
 
   @required_fields ~w(course_id)a
   @optional_fields ~w(order type early_submission_xp
-    hours_before_early_xp_decay show_grading_summary is_manually_graded has_voting_features has_token_counter is_grading_auto_published)a
+    hours_before_early_xp_decay show_grading_summary is_manually_graded has_voting_features has_token_counter is_grading_auto_published, on_finish_submit_and_return_to_game)a
 
   def changeset(assessment_config, params) do
     assessment_config

lib/cadet/jobs/xml_parser.ex

@@ -98,8 +98,7 @@ defmodule Cadet.Updater.XMLParser do
         reading: ~x"//READING/text()" |> transform_by(&process_charlist/1),
         summary_short: ~x"//WEBSUMMARY/text()" |> transform_by(&process_charlist/1),
         summary_long: ~x"./TEXT/text()" |> transform_by(&process_charlist/1),
-        password: ~x"//PASSWORD/text()"so |> transform_by(&process_charlist/1),
-        on_finish: ~x"//ONFINISH/text()"so |> transform_by(&process_charlist/1)
+        password: ~x"//PASSWORD/text()"so |> transform_by(&process_charlist/1)
       )
       |> Map.put(:is_published, false)
       |> Map.put(:open_at, open_at)

lib/cadet_web/views/assessments_view.ex

@@ -53,7 +53,7 @@ defmodule CadetWeb.AssessmentsView do
         longSummary: :summary_long,
         hasTokenCounter: :has_token_counter,
         missionPDF: &Cadet.Assessments.Upload.url({&1.mission_pdf, &1}),
-        onFinish: :on_finish,
+        onFinishSubmitAndReturnToGame: & &1.config.on_finish_submit_and_return_to_game,
         questions:
           &Enum.map(&1.questions, fn question ->
             map =

priv/repo/migrations/20250327005443_add_on_finish_to_assessments.exs

@@ -0,0 +1,9 @@
+defmodule Cadet.Repo.Migrations.AddOnFinishToAssessmentConfig do
+  use Ecto.Migration
+
+  def change do
+    alter table(:assessment_configs) do
+      add(:on_finish_submit_and_return_to_game, :boolean, default: false)
+    end
+  end
+end

priv/repo/migrations/20250327140505_add_on_finish_to_assessment_config.exs

@@ -328,7 +328,7 @@ defmodule CadetWeb.AssessmentsControllerTest do
             "longSummary" => assessment.summary_long,
             "hasTokenCounter" => assessment.has_token_counter,
             "missionPDF" => Cadet.Assessments.Upload.url({assessment.mission_pdf, assessment}),
-            "onFinish" => nil
+            "onFinish" => false
           }
 
           resp_assessments =