DTL (Test > Levelbuilder): 65d55a86

bin/cron/csf_workshop_attendance_to_gdrive

@@ -30,7 +30,8 @@ def get_rows
       "Total Hours",
       "Num Registered",
       "Number Scholarship Teachers Attending All Sessions",
-      "Attendance Day 1+"
+      "Attendance Day 1+",
+      "Workshop End Date"
     ]
   ]
 
@@ -54,7 +55,8 @@ def get_rows
         workshop.effective_num_hours,
         workshop.enrollments.count,
         workshop.teachers_attending_all_sessions(true).count,
-        workshop.teachers_attending_all_sessions.count
+        workshop.teachers_attending_all_sessions.count,
+        workshop.sessions.last&.formatted_date
       ]
     end
 

dashboard/app/models/levels/level.rb

@@ -685,6 +685,7 @@ def clone_with_name(new_name, editor_experiment: nil)
     # specify :published to make should_write_custom_level_file? return true
     level_params = {name: new_name, parent_level_id: id, published: true}
     level_params[:editor_experiment] = editor_experiment if editor_experiment
+    level_params[:audit_log] = [{changed_at: Time.now, changed: ["cloned from #{name.dump}"], cloned_from: name}].to_json
     level.update!(level_params)
     level
   end

dashboard/lib/services/script_seed.rb

@@ -48,9 +48,11 @@ def self.serialize_seeding_json(script)
       resources = script.lessons.map(&:resources).flatten.concat(script.resources).concat(script.student_resources).uniq.sort_by(&:key)
 
       # Use the existing seeding_key code to efficiently sort LessonsResource
-      # objects in a manner that will be stable across environments.
+      # and ScriptsResource objects in a manner that will be stable across environments.
       lr_seed_context = SeedContext.new(lessons: script.lessons, resources: resources)
       lessons_resources = script.lessons.map(&:lessons_resources).flatten.sort_by {|lr| lr.seeding_key(lr_seed_context).to_json}
+      sr_seed_context = SeedContext.new(script: script, resources: resources)
+      scripts_resources = script.scripts_resources.sort_by {|sr| sr.seeding_key(sr_seed_context).to_json}
 
       vocabularies = script.lessons.map(&:vocabularies).flatten
       lessons_vocabularies = script.lessons.map(&:lessons_vocabularies).flatten
@@ -70,7 +72,7 @@ def self.serialize_seeding_json(script)
         levels: my_levels,
         resources: resources,
         lessons_resources: lessons_resources,
-        scripts_resources: script.scripts_resources,
+        scripts_resources: scripts_resources,
         scripts_student_resources: script.scripts_student_resources,
         vocabularies: vocabularies,
         lessons_vocabularies: lessons_vocabularies,
@@ -95,7 +97,7 @@ def self.serialize_seeding_json(script)
         levels_script_levels: script.levels_script_levels.map {|lsl| ScriptSeed::LevelsScriptLevelSerializer.new(lsl, scope: scope).as_json},
         resources: resources.map {|r| ScriptSeed::ResourceSerializer.new(r, scope: scope).as_json},
         lessons_resources: lessons_resources.map {|lr| ScriptSeed::LessonsResourceSerializer.new(lr, scope: scope).as_json},
-        scripts_resources: script.scripts_resources.map {|sr| ScriptSeed::ScriptsResourceSerializer.new(sr, scope: scope).as_json},
+        scripts_resources: scripts_resources.map {|sr| ScriptSeed::ScriptsResourceSerializer.new(sr, scope: scope).as_json},
         scripts_student_resources: script.scripts_student_resources.map {|sr| ScriptSeed::ScriptsResourceSerializer.new(sr, scope: scope).as_json},
         vocabularies: vocabularies.map {|v| ScriptSeed::VocabularySerializer.new(v, scope: scope).as_json},
         lessons_vocabularies: lessons_vocabularies.map {|lv| ScriptSeed::LessonsVocabularySerializer.new(lv, scope: scope).as_json},