Refs #3183 #3185: starting init for create/duplicate, adding actionType to state

4 files changed, 11 insertions, 106 deletions

diff --git a/app/assets/javascripts/es6_browserified/time_tables/index.js b/app/assets/javascripts/es6_browserified/time_tables/index.js
index 132b1dd95..174cede5c 100644
--- a/app/assets/javascripts/es6_browserified/time_tables/index.js
+++ b/app/assets/javascripts/es6_browserified/time_tables/index.js
@@ -13,6 +13,7 @@ var promise = require('redux-promise')
 
 var initialState = {
   status: {
+    actionType: window.actionType,
     policy: window.perms,
     fetchSuccess: true,
     isFetching: false
diff --git a/app/views/time_tables/_form.html.slim b/app/views/time_tables/_form.html.slim
deleted file mode 100644
index 97df72fd3..000000000
--- a/app/views/time_tables/_form.html.slim
+++ /dev/null
@@ -1,102 +0,0 @@
-= simple_form_for [@referential, @time_table], html: {class: 'form-horizontal', id: 'timetable_form'}, wrapper: :horizontal_form do |form|
-
-  .row
-    .col-lg-12
-      = form.input :comment, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.time_table.comment")}
-      
-      .form-group
-        = form.label @time_table.human_attribute_name(:color), required: false, class: 'control-label col-sm-4'
-      
-        .col-sm-8
-          .dropdown.color_selector
-            button.btn.btn-default.dropdown-toggle type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"
-              span.fa.fa-circle.mr-xs style="color:#{@time_table.color.nil? ? 'transparent' : @time_table.color}"
-              span.caret
-
-            = form.input :color, as: :radio_buttons, label: false, collection: ["", "#9B9B9B", "#FFA070", "#C67300", "#7F551B", "#41CCE3", "#09B09C", "#3655D7",   "#6321A0", "#E796C6", "#DD2DAA"], input_html: {class: 'color_selector'}, label_method: lambda{|c| ("<span class='fa fa-circle' style='color:" + (c.empty? ? 'transparent' : c) + "'></span>").html_safe}, wrapper_html: { class: 'dropdown-menu', 'aria-labelledby': "dropdownMenu1"}, include_blank: true
-
-      / = form.input :tag_list, as: :tags
-
-      .form-group
-        label.control-label.col-sm-4
-          = "Journées d'applications pour les périodes ci-dessous"
-
-        .col-sm-8
-          .form-group.labelled-checkbox-group
-            = form.input :monday, as: :boolean, label: ("<span class='lcbx-group-item-label'>L</span>").html_safe, wrapper_html: { class: 'lcbx-group-item' }
-            = form.input :tuesday, as: :boolean, label: ("<span class='lcbx-group-item-label'>Ma</span>").html_safe, wrapper_html: { class: 'lcbx-group-item' }
-            = form.input :wednesday, as: :boolean, label: ("<span class='lcbx-group-item-label'>Me</span>").html_safe, wrapper_html: { class: 'lcbx-group-item' }
-            = form.input :thursday, as: :boolean, label: ("<span class='lcbx-group-item-label'>J</span>").html_safe, wrapper_html: { class: 'lcbx-group-item' }
-            = form.input :friday, as: :boolean, label: ("<span class='lcbx-group-item-label'>V</span>").html_safe, wrapper_html: { class: 'lcbx-group-item' }
-            = form.input :saturday, as: :boolean, label: ("<span class='lcbx-group-item-label'>S</span>").html_safe, wrapper_html: { class: 'lcbx-group-item' }
-            = form.input :sunday, as: :boolean, label: ("<span class='lcbx-group-item-label'>D</span>").html_safe, wrapper_html: { class: 'lcbx-group-item' }
-
-      - if @time_table.new_record?
-        = form.input :calendar, as: :select, collection: current_organisation.calendars
-
-  .separator
-
-  .row
-    .col-lg-8.col-lg-offset-4
-      .subform
-        .nested-head
-          .wrapper
-            div
-              .form-group
-                label.control-label.required
-                  = t('simple_form.labels.referential.metadatas.periods.begin')
-                  abbr title='requis' *
-            div
-              .form-group
-                label.control-label.required
-                  = t('simple_form.labels.referential.metadatas.periods.end')
-                  abbr title='requis' *
-            div
-
-        = form.simple_fields_for :periods do |p|
-          = render "period_fields", f: p
-
-        .links.nested-linker
-          = link_to_add_association t("time_tables.actions.add_period"), form, :periods, class: 'btn btn-outline-primary'
-
-  .row
-    .col-lg-12.mb-sm.mt-md
-      #time_tables
-      .alert.alert-warning
-        |Les éléments ci-dessous sont à supprimer.
-
-  .row
-    .col-lg-6.col-md-6.col-sm-12.col-xs-12
-      .subform
-        .nested-head
-          .wrapper
-            div
-              .form-group
-                label.control-label
-                  = @time_table.human_attribute_name("dates")
-            div
-          
-        = form.simple_fields_for :dates, @time_table.dates.to_a.select {|d| d.in_out == true}  do |p|
-          = render "date_fields",  f: p
-
-        .links.nested-linker
-          = link_to_add_association t("time_tables.actions.add_date"), form, :dates, partial: 'date_fields', class: 'btn btn-outline-primary'
-
-    .col-lg-6.col-md-6.col-sm-12.col-xs-12
-      .subform
-        .nested-head
-          .wrapper
-            div
-              .form-group
-                label.control-label
-                  = @time_table.human_attribute_name("excluded_dates")
-            div
-
-        = form.simple_fields_for :dates, @time_table.dates.to_a.select {|d| d.in_out == false}  do |q|
-          = render "excluded_date_fields",  f: q
-
-        .links.nested-linker
-          = link_to_add_association t("time_tables.actions.add_excluded_date"), form, :dates, partial: 'excluded_date_fields', class: 'btn btn-outline-primary'
-
-
-  = form.button :submit, t('actions.submit'), class: 'btn btn-default formSubmitr', form: 'timetable_form'
diff --git a/app/views/time_tables/edit.html.slim b/app/views/time_tables/edit.html.slim
index 7f4cd18df..f129cd63a 100644
--- a/app/views/time_tables/edit.html.slim
+++ b/app/views/time_tables/edit.html.slim
@@ -9,4 +9,7 @@
   .container-fluid
     #periods
 
+= javascript_tag do
+  | window.actionType = "#{raw params[:action]}"
+
 = javascript_include_tag 'es6_browserified/time_tables/index.js'
diff --git a/app/views/time_tables/new.html.slim b/app/views/time_tables/new.html.slim
index 8770a59b2..6a0faade8 100644
--- a/app/views/time_tables/new.html.slim
+++ b/app/views/time_tables/new.html.slim
@@ -1,12 +1,15 @@
 / PageHeader
 = pageheader 'map-marker',
-             t('time_tables.new.title'),
+             t("time_tables.#{params[:action]}.title"),
              '',
              ''
 
 / PageContent
 .page_content
   .container-fluid
-    .row
-      .col-lg-8.col-lg-offset-2.col-md-8.col-md-offset-2.col-sm-10.col-sm-offset-1
-        == render 'form'
+    #periods
+
+= javascript_tag do
+  | window.actionType = "#{params[:action]}"
+
+= javascript_include_tag 'es6_browserified/time_tables/index.js'