add file delete feature for ownership table

Author: LIN251

app/assets/javascripts/exercise_uploader.js

@@ -1,4 +1,13 @@
-var allfiles = [];
+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])
+  }
+
+  createTextAndButton(oldfiles)
+}
 
 function removeEle(arr,ele){
   for( var i = 0; i < arr.length; i++){ 
@@ -17,8 +26,9 @@ function addButtonListener(allfiles){
     text.nextSibling.remove()
     text.remove()
     button.remove()
-    document.getElementById("exercise_name").value = allfiles.toString()   
+    document.getElementById("exercise_fileList").value = allfiles.toString()  
   });
+
 }
 
 // update file name and delete button
@@ -40,14 +50,17 @@ function createTextAndButton(allfiles){
 // listener for upload button
 $("#exercise_files").bind("change", function (e)
 {
-  allfiles = [];
+  allfiles = []
+  for (var i of oldfiles) {
+    allfiles.push(i);
+  } 
   var file = document.getElementById("exercise_files")
   for (var i = 0; i < file.files.length; i++) {
     filename = file.files[i].name
     if(allfiles.indexOf(filename) === -1) {
       allfiles.push(filename.trim()); 
     }
   } 
-  document.getElementById("exercise_name").value = allfiles.toString()     
+  document.getElementById("exercise_fileList").value = allfiles.toString()     
   createTextAndButton(allfiles)
 });

app/controllers/exercises_controller.rb

@@ -137,6 +137,11 @@ def new
   # GET /exercises/1/edit
   def edit
     @exercise_version = @exercise.current_version
+    @ownerships_all = Array.new
+    @exercise_version.ownerships.each do |e|
+      @ownerships_all.push e.filename
+    end
+
     @text_representation = @exercise_version.text_representation ||
       ExerciseRepresenter.new(@exercise).to_hash.to_yaml
     @user_groups = current_user.user_groups
@@ -332,8 +337,10 @@ def upload_create
       edit_rights = 0 # Personal exercise
     end
     files = exercise_params[:files]
-    fileList = exercise_params[:name]
-    files = cleanFile(files,fileList)
+    fileList = exercise_params[:fileList] 
+    if fileList != "" && !files.nil?
+      files = cleanFile(files,fileList)
+    end
     if !hash.kind_of?(Array)
       hash = [hash]
     end
@@ -383,9 +390,15 @@ def upload_create
         if !e.exercise_versions.offset(1).first.nil?
           oldversion = e.exercise_versions.offset(1).first
           oldversion.ownerships.each do |ownerentry|
-            ownertable = ex_ver.ownerships.create(filename: ownerentry.filename, resource_file_id: ownerentry.resource_file_id)
+            if fileList != "" 
+              if fileList.include? ownerentry.filename
+                ownertable = ex_ver.ownerships.create(filename: ownerentry.filename, resource_file_id: ownerentry.resource_file_id)
+              end
+            end
           end
         end
+        # p "&&&&&&&&&&&&&"
+        # p ex_ver.ownerships
         # add new ownertable
         unless files.nil? 
           files.each do |file|
@@ -401,6 +414,8 @@ def upload_create
             end
           end
         end
+        # 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

@@ -17,12 +17,12 @@
           input_html: { class: 'code', autofocus: true, data: { lang: 'text/x-yaml' },
           value: @text_representation.present? ? @text_representation : '' }, 
           label: 'YAML Representation of the Exercise:'
-
+  %p
   %p 
   .inputWrapper   
     = f.file_field :files, multiple: true,:class => "fileInput"
-  = f.text_field :name, value: nil, :type => "hidden"
-  
+  = f.text_field :fileList, value: nil, :type => "hidden"
+  = f.text_field :oldfileList, value: @ownerships_all, :type => "hidden"
   #fileName
   = stylesheet_link_tag "exercise_uploader.scss"
   = javascript_include_tag 'exercise_uploader.js'
@@ -31,3 +31,5 @@
   .row
     .col-md-9
       = f.submit class: 'btn btn-primary', value: 'Submit'
+
+