diff options
| author | Zakaria BOUZIANE | 2014-11-24 09:25:59 +0100 | 
|---|---|---|
| committer | Zakaria BOUZIANE | 2014-11-24 09:25:59 +0100 | 
| commit | 05e441cf7841a61e40a01a783d1b4f2fb0cd1a68 (patch) | |
| tree | d0bd95d1278e9fbacb033af218695409fb0bfeb3 /app | |
| parent | 3d61c788b87c8a4017dc86c4f2bc211fc784af14 (diff) | |
| download | chouette-core-05e441cf7841a61e40a01a783d1b4f2fb0cd1a68.tar.bz2 | |
HUB Export only if less than 50000 VehicleJourneyAtStops and start_date and end_date are provided
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/exports_controller.rb | 13 | ||||
| -rw-r--r-- | app/exporters/chouette/hub/exporter.rb | 11 | ||||
| -rw-r--r-- | app/views/exports/_fields_hub_export.erb | 1 | 
3 files changed, 20 insertions, 5 deletions
| diff --git a/app/controllers/exports_controller.rb b/app/controllers/exports_controller.rb index cb555a3dd..6ce5295e1 100644 --- a/app/controllers/exports_controller.rb +++ b/app/controllers/exports_controller.rb @@ -14,9 +14,16 @@ class ExportsController < ChouetteController    end    def create -    create! do |success, failure| -      available_exports -      success.html { flash[:notice] = I18n.t('exports.new.flash')+"<br/>"+I18n.t('exports.new.flash2'); redirect_to referential_exports_path(@referential) } +    if (params[:export][:type] == "HubExport") && Chouette::VehicleJourneyAtStop.all.count > 50000 +      flash[:notice] = I18n.t("formtastic.titles.export.vjas.size", size: Chouette::VehicleJourneyAtStop.all.count) +      redirect_to new_referential_export_path(@referential) +    elsif (params[:export][:type] == "HubExport") && (params[:export][:start_date].empty? || params[:export][:end_date].empty?) +      flash[:notice] = I18n.t("formtastic.titles.export.dates.not_nul", size: Chouette::VehicleJourneyAtStop.all.count) +      redirect_to new_referential_export_path(@referential) +    else +      create! do |success, failure| +        success.html { flash[:notice] = I18n.t('exports.new.flash')+"<br/>"+I18n.t('exports.new.flash2'); redirect_to referential_exports_path(@referential) } +      end      end    end diff --git a/app/exporters/chouette/hub/exporter.rb b/app/exporters/chouette/hub/exporter.rb index 58454a0cb..27ac4e7ee 100644 --- a/app/exporters/chouette/hub/exporter.rb +++ b/app/exporters/chouette/hub/exporter.rb @@ -42,6 +42,10 @@ class Chouette::Hub::Exporter      end    end +  def referential_exportable? +    Chouette::VehicleJourneyAtStop.all.count < 50000 +  end +    def time_tables_exportable?      time_tables    end @@ -71,10 +75,12 @@ class Chouette::Hub::Exporter    def export(zip_file_path, options = {})      begin        referential.switch + +      if referential_exportable? && options[:start_date] && options[:end_date] -      FileUtils.rm(zip_file_path) if File.exists? zip_file_path +        FileUtils.rm(zip_file_path) if File.exists? zip_file_path -      hub_export.log_messages.create( :severity => "ok", :key => "EXPORT", :arguments => {"0" => "HUB"}) +        hub_export.log_messages.create( :severity => "ok", :key => "EXPORT", :arguments => {"0" => "HUB"})        Dir.mktmpdir(nil, "/tmp"){ |temp_dir| @@ -239,6 +245,7 @@ class Chouette::Hub::Exporter            end          end        } +      end      ensure        # Always cleanup files        #FileUtils.remove_entry(temp_directory) diff --git a/app/views/exports/_fields_hub_export.erb b/app/views/exports/_fields_hub_export.erb index fc7cf7112..8f51c104b 100644 --- a/app/views/exports/_fields_hub_export.erb +++ b/app/views/exports/_fields_hub_export.erb @@ -1,2 +1,3 @@ +<%= I18n.t("formtastic.titles.export.vjas.size", size: Chouette::VehicleJourneyAtStop.all.count) if Chouette::VehicleJourneyAtStop.all.count > 50000 %>  <%= form.input :start_date, :as => :date_picker, :input_html => { :title => t("formtastic.titles.export.start_date")} %>  <%= form.input :end_date, :as => :date_picker, :input_html => { :title => t("formtastic.titles.export.end_date")} %> | 
