add missing migration file and fix bugs

Author: LIN251

app/assets/javascripts/exercise_uploader.js

@@ -1,32 +1,44 @@
 var allfiles = []
 var oldfiles = []
-oldfileList =  document.getElementById("exercise_oldfileList").value.split(' ')
-for( var i = 0; i < oldfileList.length; i++){ 
-  if(oldfileList[i].replace(/\s/g, '').length){
-    oldfiles.push(oldfileList[i])
-  }
+var oldfileList
+var oldfiles
+checkoudFile()
 
-  createTextAndButton(oldfiles)
+function checkoudFile(){
+  oldfiles = []
+  oldfileList =  document.getElementById("exercise_oldfileList").value.split(' ')
+  for( var i = 0; i < oldfileList.length; i++){ 
+    if(oldfileList[i].replace(/\s/g, '').length){
+      oldfiles.push(oldfileList[i])
+    }
+    createTextAndButton(oldfiles)
+  }
 }
 
+
 function removeEle(arr,ele){
+	arr = arr.split(",")
   for( var i = 0; i < arr.length; i++){ 
-    if ( arr[i].trim() == ele.trim()) { 
+    if ( arr[i] == ele.trim()) { 
         arr.splice(i, 1); 
     }
   }
   return arr
 }
 
 function addButtonListener(allfiles){
+
   document.querySelector('#fileName').addEventListener('click', function(event) {
-    var text= document.getElementById(event.target.id.match(/\d*/g)[0])
-    allfiles = removeEle(allfiles, text.innerHTML.toString())
-    var button = document.getElementById(event.target.id)
-    text.nextSibling.remove()
-    text.remove()
-    button.remove()
-    document.getElementById("exercise_fileList").value = allfiles.toString()  
+      allfiles = document.getElementById("exercise_fileList").value
+      allfiles += oldfileList 
+      var text= document.getElementById(event.target.id.match(/\d*/g)[0])
+      allfiles = removeEle(allfiles, text.innerHTML.toString().trim())
+      var button = document.getElementById(event.target.id)
+      text.nextSibling.remove()
+      text.remove()
+      button.remove()
+      document.getElementById("exercise_fileList").value = allfiles.toString()  
+      document.getElementById("exercise_oldfileList").value = allfiles.toString()  
   });
 
 }
@@ -51,6 +63,7 @@ function createTextAndButton(allfiles){
 $("#exercise_files").bind("change", function (e)
 {
   allfiles = []
+  checkoudFile()
   for (var i of oldfiles) {
     allfiles.push(i);
   } 

app/controllers/exercises_controller.rb

@@ -137,9 +137,9 @@ def new
   # GET /exercises/1/edit
   def edit
     @exercise_version = @exercise.current_version
-    @ownerships_all = Array.new
+    @ownerships_all = []
     @exercise_version.ownerships.each do |e|
-      @ownerships_all.push e.filename
+      @ownerships_all.push(e.filename)
     end
 
     @text_representation = @exercise_version.text_representation ||
@@ -414,8 +414,8 @@ def upload_create
             end
           end
         end
-        # p "current added akll ownership"
-        # p ex_ver.ownerships
+        p "current added akll ownership"
+        p ex_ver.ownerships
         exercise_collection.andand.add(e, override: true)
         e.current_version.update(text_representation: text_representation)
         success_msgs <<

app/views/exercises/_oneblockform.html.haml

@@ -21,7 +21,7 @@
   %p 
   .inputWrapper   
     = f.file_field :files, multiple: true,:class => "fileInput"
-  = f.text_field :fileList, value: nil, :type => "hidden"
+  = f.text_field :fileList, value: "", :type => "hidden"
   = f.text_field :oldfileList, value: @ownerships_all, :type => "hidden"
   #fileName
   = stylesheet_link_tag "exercise_uploader.scss"

db/migrate/20210201051224_add_hashval_to_resource_file.rb

@@ -0,0 +1,5 @@
+class AddHashvalToResourceFile < ActiveRecord::Migration
+  def change
+    add_column :resource_files, :hashval, :string
+  end
+end

db/migrate/20210201051643_create_ownerships.rb

@@ -0,0 +1,11 @@
+class CreateOwnerships < ActiveRecord::Migration
+  def change
+    create_table :ownerships do |t|
+      t.string :filename
+      t.references :resource_file, index: true, foreign_key: true
+      t.references :exercise_version, index: true, foreign_key: true
+
+      t.timestamps null: false
+    end
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20201216191207) do
+ActiveRecord::Schema.define(version: 20210201051643) do
 
   create_table "active_admin_comments", force: :cascade do |t|
     t.string   "namespace",     limit: 255
@@ -402,6 +402,17 @@
 
   add_index "organizations", ["slug"], name: "index_organizations_on_slug", unique: true, using: :btree
 
+  create_table "ownerships", force: :cascade do |t|
+    t.string   "filename",            limit: 255
+    t.integer  "resource_file_id",    limit: 4
+    t.integer  "exercise_version_id", limit: 4
+    t.datetime "created_at",                      null: false
+    t.datetime "updated_at",                      null: false
+  end
+
+  add_index "ownerships", ["exercise_version_id"], name: "index_ownerships_on_exercise_version_id", using: :btree
+  add_index "ownerships", ["resource_file_id"], name: "index_ownerships_on_resource_file_id", using: :btree
+
   create_table "prompt_answers", force: :cascade do |t|
     t.integer "attempt_id",   limit: 4
     t.integer "prompt_id",    limit: 4
@@ -437,6 +448,7 @@
     t.boolean  "public",                 default: true
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.string   "hashval",    limit: 255
   end
 
   add_index "resource_files", ["token"], name: "index_resource_files_on_token", using: :btree
@@ -736,6 +748,8 @@
   add_foreign_key "identities", "users", name: "identities_user_id_fk"
   add_foreign_key "lms_instances", "lms_types", name: "lms_instances_lms_type_id_fk"
   add_foreign_key "lti_workouts", "lms_instances"
+  add_foreign_key "ownerships", "exercise_versions"
+  add_foreign_key "ownerships", "resource_files"
   add_foreign_key "prompt_answers", "attempts", name: "prompt_answers_attempt_id_fk"
   add_foreign_key "prompt_answers", "prompts", name: "prompt_answers_prompt_id_fk"
   add_foreign_key "prompts", "exercise_versions", name: "prompts_exercise_version_id_fk"