adding adresse qi_s, adding link_to_remove_fields

app/models/price_line.rb

@@ -12,7 +12,7 @@ class PriceLine < ApplicationRecord
   #has_many :price_line_demands, through: :price_line_resp_selects
   has_many :price_line_p_articles
   has_many :p_articles, through: :price_line_p_articles
-  accepts_nested_attributes_for :p_articles
+  accepts_nested_attributes_for :p_articles, allow_destroy: true
   accepts_nested_attributes_for :price_line_p_articles
 
   default_scope { order('position ASC') }

app/views/admin/p_articles/_form.html.haml

@@ -16,21 +16,23 @@
       =render :partial => "qi/actions", :locals => {:f => f}
   /.actions=f.submit "sauvegarder", :class => "btn btn-primary"
 - elsif params[:controller] == "admin/price_lines"
-  = form.inputs do
+  .field
+    = form.inputs do
 
-    =@price_line.price_line_block.price_lineable.tva_type_id
-    -if params[:p_product_ref_id]
-      = form.input :p_product_ref_id, as: :select, collection: PProductRef.all.distinct.pluck(:cc_name, :id), :label => form.object.label_for(:p_product_ref), input_html: {disabled: true}
-      = form.hidden_field :p_product_ref_id, value: form.object.p_product_ref_id
-      = form.hidden_field :tva_type_id, value: @price_line.price_line_block.price_lineable.tva_type_id
+      =@price_line.price_line_block.price_lineable.tva_type_id
+      -if params[:p_product_ref_id]
+        = form.input :p_product_ref_id, as: :select, collection: PProductRef.all.distinct.pluck(:cc_name, :id), :label => form.object.label_for(:p_product_ref), input_html: {disabled: true}
+        = form.hidden_field :p_product_ref_id, value: form.object.p_product_ref_id
+        = form.hidden_field :tva_type_id, value: @price_line.price_line_block.price_lineable.tva_type_id
 
-    -else
-      = form.input :p_product_ref_id, as: :select, collection: PProductRef.all.distinct.pluck(:cc_name, :id), :label => form.object.label_for(:p_product_ref), input_html: {disabled: true}
-      = form.hidden_field :p_product_ref_id, value: form.object.p_product_ref_id
-    -if PGrade::ACTIVATED
-      = form.input :p_grade, as: :select, collection: PGrade.pluck(:grade, :id), :label => "Grade"
-    %h4 Numero de série :
-    .p_article_serial_nums_form
-      = form.semantic_fields_for :p_article_serial_nums do |form|
-        =render :partial => "admin/p_article_serial_nums/form", :locals => {:form => form}
-    %p= link_to_add_fields "Ajouter un numéro de série", form, :p_article_serial_nums, {:class => "btn btn-primary"}
+      -else
+        = form.input :p_product_ref_id, as: :select, collection: PProductRef.all.distinct.pluck(:cc_name, :id), :label => form.object.label_for(:p_product_ref), input_html: {disabled: true}
+        = form.hidden_field :p_product_ref_id, value: form.object.p_product_ref_id
+      -if PGrade::ACTIVATED
+        = form.input :p_grade, as: :select, collection: PGrade.pluck(:grade, :id), :label => "Grade"
+      %h4 Numero de série :
+      .p_article_serial_nums_form
+        = form.semantic_fields_for :p_article_serial_nums do |form|
+          =render :partial => "admin/p_article_serial_nums/form", :locals => {:form => form}
+      %p= link_to_add_fields "Ajouter un numéro de série", form, :p_article_serial_nums, {:class => "btn btn-primary"}
+    %p.destroy{class: "btn btn-danger"}=link_to_remove_fields "Supprimer l'article", form

app/views/admin/particulars/_particular.html.haml

@@ -1,26 +1,16 @@
-.particular_apercu
-  -if particular.organisation?
-    =particular.organisation
+%tr#particular_row{:id => particular.id}
+  -tr = {}
   
-  -if particular.firstname? or particular.name?
-    %strong
-      =particular.firstname
+  -tr[:actions] = capture do
+    %td.actions
+      = link_to i(:"trash-o"), [:admin, particular], method: :delete, data: { confirm: 'Voulez-vous vraiment supprimer cet enregistrement ? ' } , :remote => true
+      = link_to i(:pencil), edit_admin_particular_path(particular), :remote => true
+      = link_to i(:eye), admin_particular_path(particular), :remote => true
 
-      =particular.name
-    %br
+
+
+  =render :partial => "qi/qi_ordered_table_object", :locals => {:tr => tr, :object => particular}
+    
   
-  =particular.address_2
-
-  -if particular.address_3?
-    %br
-    =particular.address_3
-  %br
-  =particular.cp
-
-  =particular.city
-  %br
-  =particular.country
-  %br
-  =particular.tel
-  %br
-  =particular.email
+  
+  

app/views/admin/price_lines/_add_p_article_form.html.haml

@@ -5,6 +5,6 @@
         .p_articles_form
           = f.semantic_fields_for :p_articles do |form|
             =render :partial => "admin/p_articles/form", :locals => {:form => form, @price_line => f.object}
+              
         %p= link_to_add_fields "Ajouter un article", f, :p_articles, {:class => "btn btn-primary"}  if f.object.p_articles.count < f.object.qte
-        -# %span.destroy{style: "font-size: 2rem;"}=link_to_remove_fields ic(:"trash-o"), f
       =render :partial => "qi/actions", :locals => {:f => f}