Merge branch 'master' into 4161_StopPoints_RouteEdit

14 files changed, 179 insertions, 68 deletions

diff --git a/app/assets/javascripts/cleanup.coffee b/app/assets/javascripts/cleanup.coffee
index 7e291aa9e..41aa1ff15 100644
--- a/app/assets/javascripts/cleanup.coffee
+++ b/app/assets/javascripts/cleanup.coffee
@@ -4,11 +4,16 @@ $(document).on("change", 'input[name="clean_up[date_type]"]', (e) ->
 
   if type == 'before'
     end_date.hide()
-    $("label[for='clean_up_begin_date_3i']").html("Date de fin de la purge");
+    $('label.begin_date').addClass 'hidden'
+    $('label.end_date').removeClass 'hidden'
+
   else if type == 'after'
     end_date.hide()
-    $("label[for='clean_up_begin_date_3i']").html("Date de début de la purge");
+    $('label.begin_date').removeClass 'hidden'
+    $('label.end_date').addClass 'hidden'
+
   else
-    $("label[for='clean_up_begin_date_3i']").html("Date de début de la purge");
+    $('label.begin_date').removeClass 'hidden'
+    $('label.end_date').addClass 'hidden'
     end_date.show()
 )
diff --git a/app/controllers/time_tables_controller.rb b/app/controllers/time_tables_controller.rb
index 6849b1592..0054963c9 100644
--- a/app/controllers/time_tables_controller.rb
+++ b/app/controllers/time_tables_controller.rb
@@ -35,7 +35,7 @@ class TimeTablesController < ChouetteController
 
   def create
     tt_params = time_table_params
-    if tt_params[:calendar_id]
+    if tt_params[:calendar_id] && tt_params[:calendar_id] != ""
       %i(monday tuesday wednesday thursday friday saturday sunday).map { |d| tt_params[d] = true }
       calendar = Calendar.find(tt_params[:calendar_id])
       tt_params[:calendar_id] = nil if tt_params.has_key?(:dates_attributes) || tt_params.has_key?(:periods_attributes)
diff --git a/app/helpers/breadcrumb_helper.rb b/app/helpers/breadcrumb_helper.rb
index 1f8690f38..55031d4f3 100644
--- a/app/helpers/breadcrumb_helper.rb
+++ b/app/helpers/breadcrumb_helper.rb
@@ -73,13 +73,13 @@ module BreadcrumbHelper
   end
 
   def calendar_breadcrumb(action)
-    add_breadcrumb I18n.t('breadcrumbs.referentials'), referentials_path
+    add_breadcrumb I18n.t('breadcrumbs.referentials'), workbenches_path
     add_breadcrumb I18n.t('calendars.index.title'), calendars_path
     add_breadcrumb @calendar.name if %i(show edit).include? action
   end
 
   def workbench_breadcrumb(action)
-    add_breadcrumb I18n.t("breadcrumbs.referentials"), referentials_path
+    add_breadcrumb I18n.t("breadcrumbs.referentials"), workbenches_path
     add_breadcrumb breadcrumb_label(@workbench), workbench_path(@workbench), :title => breadcrumb_tooltip(@workbench)
   end
 
@@ -215,7 +215,7 @@ module BreadcrumbHelper
   end
 
   def import_breadcrumb (action)
-    add_breadcrumb I18n.t("breadcrumbs.referentials"), referentials_path
+    add_breadcrumb I18n.t("breadcrumbs.referentials"), workbenches_path
     add_breadcrumb breadcrumb_label(@workbench), workbench_path(@workbench), :title => breadcrumb_tooltip(@workbench)
     add_breadcrumb I18n.t("breadcrumbs.imports"), workbench_imports_path(@workbench)
 
@@ -257,7 +257,7 @@ module BreadcrumbHelper
   end
 
   def organisation_breadcrumb (action = :index)
-    add_breadcrumb I18n.t("breadcrumbs.referentials"), referentials_path
+    add_breadcrumb I18n.t("breadcrumbs.referentials"), workbenches_path
     add_breadcrumb breadcrumb_label(@organisation), organisation_path,:title => breadcrumb_tooltip(@organisation) unless action == :index
   end
 
diff --git a/app/models/chouette/line.rb b/app/models/chouette/line.rb
index 33a2fbb00..63d2d1606 100644
--- a/app/models/chouette/line.rb
+++ b/app/models/chouette/line.rb
@@ -1,5 +1,5 @@
 class Chouette::Line < Chouette::ActiveRecord
-  include DefaultNetexAttributesSupport
+  include StifCodifligneAttributesSupport
   include LineRestrictions
   include LineReferentialSupport
   include StifTransportModeEnumerations
diff --git a/app/models/chouette/stif_codifligne_objectid.rb b/app/models/chouette/stif_codifligne_objectid.rb
new file mode 100644
index 000000000..46109e24f
--- /dev/null
+++ b/app/models/chouette/stif_codifligne_objectid.rb
@@ -0,0 +1,18 @@
+class Chouette::StifCodifligneObjectid < String
+
+  @@format = /^([A-Za-z_]+):([A-Za-z]+):([A-Za-z]+):([0-9A-Za-z_-]+)$/
+  cattr_reader :format
+
+  def parts
+    match(format).try(:captures)
+  end
+
+  def object_type
+    parts.try(:third)
+  end
+
+  def local_id
+    parts.try(:fourth)
+  end
+
+end
diff --git a/app/models/chouette/stif_reflex_objectid.rb b/app/models/chouette/stif_reflex_objectid.rb
new file mode 100644
index 000000000..c41a9325a
--- /dev/null
+++ b/app/models/chouette/stif_reflex_objectid.rb
@@ -0,0 +1,18 @@
+class Chouette::StifReflexObjectid < String
+
+  @@format = /^([A-Za-z_]+):([0-9A-Za-z_-]+):([A-Za-z]+):([0-9A-Za-z_-]+):([A-Za-z]+)$/
+  cattr_reader :format
+
+  def parts
+    match(format).try(:captures)
+  end
+
+  def object_type
+    parts.try(:third)
+  end
+
+  def local_id
+    parts.try(:fourth)
+  end
+
+end
diff --git a/app/models/chouette/stop_area.rb b/app/models/chouette/stop_area.rb
index 4d98027d6..43bc82f7f 100644
--- a/app/models/chouette/stop_area.rb
+++ b/app/models/chouette/stop_area.rb
@@ -4,20 +4,16 @@ require 'geo_ruby'
 class Chouette::StopArea < Chouette::ActiveRecord
   # FIXME http://jira.codehaus.org/browse/JRUBY-6358
   self.primary_key = "id"
+
   include Geokit::Mappable
+  include StifReflexAttributesSupport
   include ProjectionFields
   include StopAreaRestrictions
+  include StopAreaReferentialSupport
 
   extend Enumerize
   enumerize :area_type, in: %i(zdep zder zdlp zdlr lda)
 
-  def self.model_name
-    ActiveModel::Name.new self, Chouette, self.name.demodulize
-  end
-  # Refs #1627
-  # include DefaultAttributesSupport
-  include StopAreaReferentialSupport
-
   with_options dependent: :destroy do |assoc|
     assoc.has_many :stop_points
     assoc.has_many :access_points
@@ -57,13 +53,6 @@ class Chouette::StopArea < Chouette::ActiveRecord
   after_update :clean_invalid_access_links
   before_save :coordinates_to_lat_lng
 
-  # Refs #1627
-  before_validation :prepare_auto_columns
-  def prepare_auto_columns
-    self.object_version = 1
-    self.creator_id = 'chouette'
-  end
-
   def combine_lat_lng
     if self.latitude.nil? || self.longitude.nil?
       ""
diff --git a/app/models/chouette/time_table.rb b/app/models/chouette/time_table.rb
index d907d797e..713ce0b21 100644
--- a/app/models/chouette/time_table.rb
+++ b/app/models/chouette/time_table.rb
@@ -38,26 +38,26 @@ class Chouette::TimeTable < Chouette::TridentActiveRecord
   validates_associated :periods
 
   def continuous_dates
+    in_days = self.dates.where(in_out: true).sort_by(&:date)
     chunk = {}
     group = nil
-    self.dates.where(in_out: true).each_with_index do |date, index|
+    in_days.each_with_index do |date, index|
       group ||= index
-      group = (date.date == dates[index - 1].date + 1.day) ? group : group + 1
+      group = (date.date == in_days[index - 1].date + 1.day) ? group : group + 1
       chunk[group] ||= []
       chunk[group] << date
     end
-    chunk.values
+    # Remove less than 2 continuous day chunk
+    chunk.values.delete_if {|dates| dates.count < 2}
   end
 
   def convert_continuous_dates_to_periods
     chunks = self.continuous_dates
-    # Remove less than 3 continuous day chunk
-    chunks.delete_if {|chunk| chunk.count < 3}
 
     transaction do
       chunks.each do |chunk|
         self.periods.create!(period_start: chunk.first.date, period_end: chunk.last.date)
-        chunk.map(&:destroy)
+        self.dates.delete(chunk)
       end
     end
   end
@@ -415,7 +415,7 @@ class Chouette::TimeTable < Chouette::TridentActiveRecord
   def clone_periods
     periods = []
     self.periods.each { |p| periods << p.copy}
-    periods
+    periods.sort_by(&:period_start)
   end
 
   def included_days
@@ -436,7 +436,7 @@ class Chouette::TimeTable < Chouette::TridentActiveRecord
 
 
   # produce a copy of periods without anyone overlapping or including another
-  def optimize_periods
+  def optimize_overlapping_periods
     periods = self.clone_periods
     optimized = []
     i=0
@@ -461,6 +461,59 @@ class Chouette::TimeTable < Chouette::TridentActiveRecord
     optimized.sort { |a,b| a.period_start <=> b.period_start}
   end
 
+  def continuous_periods
+    periods = self.periods.sort_by(&:period_start)
+    chunk = {}
+    group = nil
+    periods.each_with_index do |period, index|
+      group ||= index
+      group = (period.period_start - 1.day == periods[index - 1].period_end) ? group : group + 1
+      chunk[group] ||= []
+      chunk[group] << period
+    end
+    chunk.values.delete_if {|periods| periods.count < 2}
+  end
+
+  def convert_continuous_periods_into_one
+    chunks = self.continuous_periods
+
+    transaction do
+      chunks.each do |chunk|
+        self.periods.create!(period_start: chunk.first.period_start, period_end: chunk.last.period_end)
+        self.periods.delete chunk
+      end
+    end
+  end
+
+  #update a period if a in_day is just before or after
+  def optimize_continuous_dates_and_periods
+    return self.periods if self.included_days.empty? || periods.empty?
+
+    periods = self.clone_periods
+    optimized = []
+
+    i = 0
+    while i < periods.length
+      period = periods[i]
+      j = 0
+      in_days = self.reload.dates.where(in_out: true).sort_by(&:date)
+      while j < in_days.length
+        day = in_days[j]
+        if period.period_start - 1.day === day.date
+          period.period_start = day.date
+          self.dates.delete day
+        elsif period.period_end + 1.day === day.date
+          period.period_end = day.date
+          self.dates.delete day
+        end
+        j += 1
+      end
+      i += 1
+      optimized << period
+    end
+    optimized
+  end
+
   # add a peculiar day or switch it from excluded to included
   def add_included_day(d)
     if self.excluded_date?(d)
@@ -478,22 +531,27 @@ class Chouette::TimeTable < Chouette::TridentActiveRecord
   def merge!(another_tt)
     transaction do
       self.periods = another_tt.clone_periods + self.periods
-      self.periods = self.optimize_periods
 
       # For included dates
       another_tt.included_days.map{ |d| add_included_day(d) }
 
       # For excluded dates
-      existing_out_date = self.dates.where(in_out: false).map(&:date)
-      another_tt.dates.where(in_out: false).each do |d|
-        unless existing_out_date.include?(d.date)
-          self.dates << Chouette::TimeTableDate.new(:date => d.date, :in_out => false)
+      self.dates.where(in_out: false).each do |d|
+        self.dates.delete d if another_tt.include_in_periods?(d.date) && !another_tt.excluded_date?(d.date)
+      end
+
+      another_tt.excluded_days.each do |d|
+        unless self.reload.excluded_date?(d)
+          self.dates << Chouette::TimeTableDate.new(date: d, in_out: false)
         end
+        self.save!
       end
-      self.save!
-    end
 
-    self.convert_continuous_dates_to_periods
+      self.convert_continuous_dates_to_periods
+      self.periods = self.optimize_continuous_dates_and_periods
+      self.convert_continuous_periods_into_one
+      self.periods = self.optimize_overlapping_periods
+    end
   end
 
   def included_days_in_dates_and_periods
diff --git a/app/models/concerns/stif_codifligne_attributes_support.rb b/app/models/concerns/stif_codifligne_attributes_support.rb
new file mode 100644
index 000000000..d4370e505
--- /dev/null
+++ b/app/models/concerns/stif_codifligne_attributes_support.rb
@@ -0,0 +1,21 @@
+module StifCodifligneAttributesSupport
+  extend ActiveSupport::Concern
+
+  included do
+    validates_presence_of :objectid
+  end
+
+  module ClassMethods
+    def object_id_key
+      model_name
+    end
+
+    def model_name
+      ActiveModel::Name.new self, Chouette, self.name.demodulize
+    end
+  end
+
+  def objectid
+    Chouette::StifCodifligneObjectid.new read_attribute(:objectid).to_s
+  end
+end
diff --git a/app/models/concerns/stif_reflex_attributes_support.rb b/app/models/concerns/stif_reflex_attributes_support.rb
new file mode 100644
index 000000000..e6236a146
--- /dev/null
+++ b/app/models/concerns/stif_reflex_attributes_support.rb
@@ -0,0 +1,21 @@
+module StifReflexAttributesSupport
+  extend ActiveSupport::Concern
+
+  included do
+    validates_presence_of :objectid
+  end
+
+  module ClassMethods
+    def object_id_key
+      model_name
+    end
+
+    def model_name
+      ActiveModel::Name.new self, Chouette, self.name.demodulize
+    end
+  end
+
+  def objectid
+    Chouette::StifReflexObjectid.new read_attribute(:objectid).to_s
+  end
+end
diff --git a/app/models/user.rb b/app/models/user.rb
index 64d66883f..c2aa14bda 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -29,29 +29,6 @@ class User < ActiveRecord::Base
 
   scope :with_organisation, -> { where.not(organisation_id: nil) }
 
-  def self.destructive_permissions_for(models)
-    models.product( %w{create destroy update} ).map{ |model_action| model_action.join('.') }
-  end
-
-  @@edit_offer_permissions =
-    destructive_permissions_for( %w[
-                                access_points
-                                connection_links
-                                calendars
-      footnotes
-      journey_patterns
-      referentials
-      routes
-      routing_constraint_zones
-      time_tables
-      vehicle_journeys
-    ]) << 'boiv:edit-offer'
-
-  mattr_reader :edit_offer_permissions
-
-  def self.all_permissions
-    edit_offer_permissions
-  end
 
   # Callback invoked by DeviseCasAuthenticable::Model#authernticate_with_cas_ticket
   def cas_extra_attributes=(extra_attributes)
@@ -59,7 +36,7 @@ class User < ActiveRecord::Base
     self.name         = extra[:full_name]
     self.email        = extra[:email]
     self.organisation = Organisation.sync_update extra[:organisation_code], extra[:organisation_name], extra[:functional_scope]
-    self.permissions  = extra[:permissions].include?('boiv:edit-offer') ? @@edit_offer_permissions : []
+    self.permissions  = Stif::PermissionTranslator.translate(extra[:permissions])
   end
 
   def self.portail_api_request
@@ -87,7 +64,7 @@ class User < ActiveRecord::Base
       user.locked_at    = el['locked_at']
       user.organisation = Organisation.sync_update el['organization_code'], el['organization_name'], el['functional_scope']
       user.synced_at    = Time.now
-      user.permissions  = el['permissions'].include?('boiv:edit-offer') ? @@edit_offer_permissions : []
+      user.permissions  = Stif::PermissionTranslator.translate(el['permissions'])
       user.save
     end
   end
diff --git a/app/policies/login_policy.rb b/app/policies/login_policy.rb
index 3364c37ac..5b07b97f3 100644
--- a/app/policies/login_policy.rb
+++ b/app/policies/login_policy.rb
@@ -7,7 +7,7 @@ class LoginPolicy
   end
 
   def boiv?
-    !(user.permissions || []).grep(%r{\Aboiv:.}).empty?
+    (user.permissions || []).include?('sessions:create')
   end
 
 end
diff --git a/app/views/referentials/show.html.slim b/app/views/referentials/show.html.slim
index d3687c3a7..425f8014a 100644
--- a/app/views/referentials/show.html.slim
+++ b/app/views/referentials/show.html.slim
@@ -91,9 +91,13 @@
         .row
           .col-lg-8.col-ld-offset-2.col-md-8.col-md-offset-2.col-sm-8.col-sm-offset-2.col-xs-12
             = f.input :date_type, as: :radio_buttons, label: false
-            = f.input :begin_date, as: :date, label: t('titles.clean_up.begin_date'),:wrapper_html => { class: 'date smart_date', title: t('titles.clean_up.begin_date') }
 
-            = f.input :end_date, as: :date, label: t('titles.clean_up.end_date'), :wrapper_html => { class: 'date cleanup_end_date_wrapper smart_date', title: t('titles.clean_up.end_date'), id: "end_date" }
+          .col-lg-8.col-ld-offset-2.col-md-8.col-md-offset-2.col-sm-8.col-sm-offset-2.col-xs-12
+            label.control-label.begin_date = t('titles.clean_up.begin_date')
+            label.control-label.end_date.hidden = t('titles.clean_up.end_date')
+            = f.input :begin_date, as: :date, label: false, wrapper_html: { class: 'date smart_date' }
+
+            = f.input :end_date, as: :date, label: t('titles.clean_up.end_date'), wrapper_html: { class: 'date cleanup_end_date_wrapper smart_date', id: "end_date" }
 
     .modal-footer
       button.btn.btn-link type='button' data-dismiss='modal' Annuler
diff --git a/app/views/workbenches/show.html.slim b/app/views/workbenches/show.html.slim
index bb8b71ab2..a9ce2f704 100644
--- a/app/views/workbenches/show.html.slim
+++ b/app/views/workbenches/show.html.slim
@@ -7,8 +7,8 @@
   / Below is secundary actions & optional contents (filters, ...)
   .row.mb-sm
     .col-lg-12.text-right
-      = link_to t('actions.import'), workbench_imports_path(@workbench), class: 'btn btn-primary'
       - if policy(Referential).create?
+        = link_to t('actions.import'), workbench_imports_path(@workbench), class: 'btn btn-primary'
         = link_to t('actions.add'), new_referential_path(workbench_id: @workbench), class: 'btn btn-primary'
 
 / PageContent