worker-field-nested_has_many 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15098b415d70ab23fe17257daf1fcf7dd9539c356899fcee522e960d435c3a8c
-  data.tar.gz: 56fdb9468b552e1b788ecd85c2aa4279b3669a53ca13e433cdc53605058c5d1d
+  metadata.gz: 1392e45a0136c91988b442f216d40e14834e47c98135e2c6d2ae864c5cad45b6
+  data.tar.gz: f9078c36ae08e09e4eeccd52f2859b2310950158372b9a37b94bb7d31a68a3b8
 SHA512:
-  metadata.gz: 6ee721323c1d225438cb2edd29569534ba3090ddec05f8b05d7b6cab54271fdff00da40369791124f3f3d8567b925ddfaa7f5558ee19d9a4806db35b6ddfddf3
-  data.tar.gz: 9064fa5fadee7cc04ad14cb888248e9d66f55a77f2532c3338ba1333b50c3c99da76b3ca2fcd0e0167424c89ca075ae61388fe48f859708830cd3803f55b6fb8
+  metadata.gz: b53fbdba4c255ecee777572dd51e079e465efc28e5d5ab1deebec807a24a1bf7d9a68890cffe5a6ba9376609cc9c8b0dfb82d1c1a9d0cb8da647ef8da3fdf0f8
+  data.tar.gz: 358a12e90eaa78ccbf55f6b4eaba782c561d2a0ed98994fd066ddf680731e01f6c3118c85c2a5397ac03b850e85c95b903f2fa4422cd45b16f5235ad801a063d

data/app/assets/stylesheets/administrate-field-nested_has_many/base.scss

@@ -35,7 +35,7 @@
     width: 43%;
     border: 1px solid #a8a8a83d;
     margin: 1rem;
-    padding: 1rem 1rem 4rem 1rem;
+    padding: 1rem 1rem 1rem 1rem;
     display: flex;
     flex-direction: column;
     justify-content: space-between;

data/app/views/fields/nested_has_many/_fields.html.erb

@@ -1,6 +1,6 @@
 
 
-  <% if request.env["PATH_INFO"] == "/admin/quotations/new" ||  "/admin/quotations/edit"%>
+  <% if request.env["PATH_INFO"] == "/admin/quotations/new" ||  "/admin/quotations"  %>
     <div class="nested-fields <%= field.attribute %>"><%# #todo %>
       <div class="<%= field.attribute.to_s.singularize %>_container <%= field.attribute %>"><%# #todo %>
         <% field.nested_fields_for_builder(f).each do |attribute| -%>
@@ -44,7 +44,7 @@
           </div>
           <% end %>
           <!-- <a href='#' id='executer-button' class='btn btn-default'>Executer</a> -->
-          <div class="button remove-field">
+          <div class="button remove-field remove_field_<%= field.attribute %>">
             <%= link_to_remove_association I18n.t("administrate.fields.nested_has_many.remove", resource: field.associated_class_name.titleize), f %>
 
           </div>

data/app/views/fields/nested_has_many/_form.html.erb

@@ -2,7 +2,7 @@
 <% if request.env["PATH_INFO"] == "/admin/quotations/new"  ||  "/admin/quotations/edit"%>
 
   <fieldset class="field-unit--nested fieldset_<%= field.attribute %>">
-    <div class="container-flex">
+    <div class="container-flex_<%= field.attribute %>">
       <!-- <legend><%= f.label field.attribute %></legend> -->
       <%= f.fields_for field.association_name do |nested_form| %>
           <%= render(
@@ -13,9 +13,10 @@
             },
           ) %>
       <% end %>
-      <div class = "add_has_many">
-        <%= link_to_add_association(
-          I18n.t("administrate.fields.nested_has_many.add", resource: field.associated_class_name.titleize),
+      <div class = "add_has_many div_button_add_<%= field.attribute %>">
+        <% if field.attribute.to_s ==  "line_items"%>
+          <%= link_to_add_association(
+          ('<i class="fab fa-slack-hash"></i>').html_safe,
           f,
           field.association_name,
           class: "button toto button_add_associated_#{field.associated_class_name}",
@@ -24,7 +25,21 @@
           # id: "button_add_associated_#{field.associated_class_name}",
           partial: "fields/nested_has_many/fields",
           render_options: { locals: { field: field } },
-        ) %>
+          ) %>
+        <% end %>
+        <% if field.attribute.to_s ==  "working_zones"%>
+          <%= link_to_add_association(
+          ('<i class="fas fa-home"></i>').html_safe,
+          f,
+          field.association_name,
+          class: "button toto button_add_associated_#{field.associated_class_name}",
+          # class: "button toto button_add_associated_#{field.associated_class_name}",
+          # # id usefull for the JS inside New quotation
+          # id: "button_add_associated_#{field.associated_class_name}",
+          partial: "fields/nested_has_many/fields",
+          render_options: { locals: { field: field } },
+          ) %>
+        <% end %>
       </div>
     </div>
   </fieldset>

data/worker-field-nested_has_many.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 Gem::Specification.new do |gem|
   gem.name          = "worker-field-nested_has_many"
   # gem.version       = Worker::Field::NestedHasMany::VERSION
-  gem.version       = "0.4.0"
+  gem.version       = "0.5.0"
   gem.authors       = ["v baxter"]
   gem.email         = ["vincent.viricel@gmail.com"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: worker-field-nested_has_many
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - v baxter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-08 00:00:00.000000000 Z
+date: 2019-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: administrate