Add button delete for TypeDeChamps and TypeDePieceJustificative on Procedure form

+ refactor procedure.js

app/controllers/admin/procedures_controller.rb

@@ -31,8 +31,8 @@ class Admin::ProceduresController < ApplicationController
       return render 'new'
     end
 
-    save_types_de_champs_params
-    save_types_de_piece_justificative_params
+    process_types_de_champs_params
+    process_types_de_piece_justificative_params
 
     flash.notice = 'Procédure enregistrée'
 
@@ -42,65 +42,85 @@ class Admin::ProceduresController < ApplicationController
   def update
     @procedure = Procedure.find(params[:id])
 
-    unless @procedure.update_attributes(create_params)
+    unless @procedure.update_attributes(create_procedure_params)
       flash.now.alert = @procedure.errors.full_messages.join('<br />').html_safe
       return render 'show'
     end
 
-    save_types_de_champs_params
-    save_types_de_piece_justificative_params
+    process_types_de_champs_params
+    process_types_de_piece_justificative_params
 
     flash.notice = 'Préocédure modifiée'
     redirect_to admin_procedures_path
 
-  rescue ActiveRecord::RecordNotFound
-    flash.alert = 'Procédure inéxistante'
-    redirect_to admin_procedures_path
+  # rescue ActiveRecord::RecordNotFound
+  #   flash.alert = 'Procédure inéxistante'
+  #   redirect_to admin_procedures_path
   end
 
   private
 
-  def save_types_de_champs_params
+  def process_types_de_champs_params
     unless params[:type_de_champs].nil? || params[:type_de_champs].size == 0
       params[:type_de_champs].each do |index, type_de_champs|
-        
-        if type_de_champs[:id_type_de_champs].nil? || type_de_champs[:id_type_de_champs] == ''
-          type_de_champs_tmp = TypeDeChamps.new
+
+        if type_de_champs[:delete] == 'true'
+          unless type_de_champs[:id_type_de_champs].nil? || type_de_champs[:id_type_de_champs] == ''
+            TypeDeChamps.destroy(type_de_champs[:id_type_de_champs])
+          end
         else
-          type_de_champs_tmp = TypeDeChamps.find(type_de_champs[:id_type_de_champs])
+          if type_de_champs[:id_type_de_champs].nil? || type_de_champs[:id_type_de_champs] == ''
+            bdd_object = TypeDeChamps.new
+          else
+            bdd_object = TypeDeChamps.find(type_de_champs[:id_type_de_champs])
+          end
+
+          save_type_de_champs bdd_object, type_de_champs
         end
-
-        type_de_champs_tmp.libelle = type_de_champs[:libelle]
-        type_de_champs_tmp.type_champs = type_de_champs[:type]
-        type_de_champs_tmp.description = type_de_champs[:description]
-        type_de_champs_tmp.order_place = type_de_champs[:order_place]
-        type_de_champs_tmp.procedure = @procedure
-
-        type_de_champs_tmp.save
       end
     end
   end
 
-  def save_types_de_piece_justificative_params
+  def process_types_de_piece_justificative_params
     unless params[:type_de_piece_justificative].nil? || params[:type_de_piece_justificative].size == 0
       params[:type_de_piece_justificative].each do |index, type_de_piece_justificative|
 
-        if type_de_piece_justificative[:id_type_de_piece_justificative].nil? || type_de_piece_justificative[:id_type_de_piece_justificative] == ''
-          type_de_piece_justificative_tmp = TypeDePieceJustificative.new
+        if type_de_piece_justificative[:delete] == 'true'
+          unless type_de_piece_justificative[:id_type_de_piece_justificative].nil? || type_de_piece_justificative[:id_type_de_piece_justificative] == ''
+            TypeDePieceJustificative.destroy(type_de_piece_justificative[:id_type_de_piece_justificative])
+          end
         else
-          type_de_piece_justificative_tmp = TypeDePieceJustificative.find(type_de_piece_justificative[:id_type_de_piece_justificative])
+          if type_de_piece_justificative[:id_type_de_piece_justificative].nil? || type_de_piece_justificative[:id_type_de_piece_justificative] == ''
+            bdd_object = TypeDePieceJustificative.new
+          else
+            bdd_object = TypeDePieceJustificative.find(type_de_piece_justificative[:id_type_de_piece_justificative])
+          end
+
+          save_type_de_piece_justificative bdd_object, type_de_piece_justificative
         end
-
-        type_de_piece_justificative_tmp.libelle = type_de_piece_justificative[:libelle]
-        type_de_piece_justificative_tmp.description = type_de_piece_justificative[:description]
-        type_de_piece_justificative_tmp.procedure = @procedure
-
-        type_de_piece_justificative_tmp.save
       end
     end
   end
 
-  def create_params
+  def save_type_de_champs database_object, source
+    database_object.libelle = source[:libelle]
+    database_object.type_champs = source[:type]
+    database_object.description = source[:description]
+    database_object.order_place = source[:order_place]
+    database_object.procedure = @procedure
+
+    database_object.save
+  end
+
+  def save_type_de_piece_justificative database_object, source
+    database_object.libelle = source[:libelle]
+    database_object.description = source[:description]
+    database_object.procedure = @procedure
+
+    database_object.save
+  end
+
+  def create_procedure_params
     params.require(:procedure).permit(:libelle, :description, :organisation, :direction, :lien_demarche, :use_api_carto)
   end
 end