Show an export

5 files changed, 26 insertions, 46 deletions

diff --git a/app/models/export.rb b/app/models/export.rb
index 6b60f3df1..6cb52fb6e 100644
--- a/app/models/export.rb
+++ b/app/models/export.rb
@@ -10,40 +10,40 @@ class Export
   end
 
   def report
-    report_path = datas.links[:report]
+    report_path = "http://localhost:8080/chouette_iev" + datas.links.select{ |link| link["rel"] == "action_report"}.first.href
     if report_path
-      response = IevApi.request(:get, compliance_check_path, params)
+      response = Ievkit.get(report_path)
       ExportReport.new(response)
     else
-      raise IevApi::IevError("Impossible to access report path link for import")
+      raise Ievkit::Error("Impossible to access report path link for export")
     end
   end 
 
   def compliance_check
-    compliance_check_path = datas.links[:validation]
+    compliance_check_path = "http://localhost:8080/chouette_iev" + datas.links.select{ |link| link["rel"] == "validation_report"}.first.href
     if compliance_check_path
-      response = IevApi.request(:get, compliance_check_path, params)
+      response = Ievkit.get(compliance_check_path)
       ComplianceCheck.new(response)
     else
-      raise IevApi::IevError("Impossible to access compliance check path link for import")
+      raise Ievkit::Error("Impossible to access compliance check path link for export")
     end
   end
 
   def delete
-    delete_path =  datas.links[:delete]
+    delete_path =  "http://localhost:8080/chouette_iev" + datas.links.select{ |link| link["rel"] == "delete"}.first.href
     if delete_path
-      IevApi.request(:delete, delete_path, params)
+      Ievkit.delete(delete_path)
     else
-      raise IevApi::IevError("Impossible to access delete path link for import")
+      raise Ievkit::Error("Impossible to access delete path link for export")
     end
   end
 
   def cancel
-    cancel_path =  datas.links[:cancel]
+    cancel_path = datas.links.select{ |link| link["rel"] == "cancel"}.first.href
     if cancel_path
-      IevApi.request(:delete, cancel_path, params)
+      Ievkit.delete(cancel_path)
     else
-      raise IevApi::IevError("Impossible to access cancel path link for import")
+      raise Ievkit::Error("Impossible to access cancel path link for export")
     end
   end
   
@@ -60,7 +60,7 @@ class Export
   end
 
   def filename
-    datas.filename
+    datas.links.select{ |link| link["rel"] == "data"}.first.href.gsub( /\/.*\//, "" )
   end
   
   def filename_extension
@@ -89,14 +89,6 @@ class Export
     datas.action_parameters.user_name
   end
 
-  def no_save
-    datas.action_parameters.no_save
-  end
-
-  def filename
-    datas.filename
-  end
-
   def created_at?
     datas.created?
   end
diff --git a/app/models/export_report.rb b/app/models/export_report.rb
index 1bbf1bd6a..f739bf1a9 100644
--- a/app/models/export_report.rb
+++ b/app/models/export_report.rb
@@ -4,16 +4,12 @@ class ExportReport
   
   attr_reader :datas, :errors, :metadatas
   
-  def initialize( response )
-    @datas = response.datas
+  def initialize(response)
+    @datas = response.action_report
     @errors = response.errors
     @metadatas = response.metadatas
   end
 
-  def zip_file
-    datas.zip_file
-  end
-
   def error_files
     datas.files.select{ |file| file[:status] == "ERROR"}
   end
@@ -39,35 +35,35 @@ class ExportReport
   end
   
   def lines
-    datas.stats.line_count if datas.stats_.line_count?
+    datas.stats.line_count if datas.stats.line_count?
   end
   
   def routes
-    datas.stats.route_count if datas.stats_.route_count?
+    datas.stats.route_count if datas.stats.route_count?
   end
   
   def connection_links
-    datas.stats.connection_link_count if datas.stats_.connection_link_count?
+    datas.stats.connection_link_count if datas.stats.connection_link_count?
   end
   
   def time_tables
-    datas.stats.time_table_count if datas.stats_.time_table_count?
+    datas.stats.time_table_count if datas.stats.time_table_count?
   end
   
   def stop_areas
-    datas.stats.stop_area_count if datas.stats_.stop_area_count?
+    datas.stats.stop_area_count if datas.stats.stop_area_count?
   end
   
   def access_points
-    datas.stats.access_point_count if datas.stats_.access_point_count?
+    datas.stats.access_point_count if datas.stats.access_point_count?
   end
   
   def vehicle_journeys
-    datas.stats.vehicle_journey_count if datas.stats_.vehicle_journey_count?
+    datas.stats.vehicle_journey_count if datas.stats.vehicle_journey_count?
   end
   
   def journey_patterns
-    datas.stats.journey_pattern_count if datas.stats_.journey_pattern_count?
+    datas.stats.journey_pattern_count if datas.stats.journey_pattern_count?
   end
   
   class LineItem
diff --git a/app/models/export_service.rb b/app/models/export_service.rb
index 307ec34cd..d41c045d1 100644
--- a/app/models/export_service.rb
+++ b/app/models/export_service.rb
@@ -8,7 +8,7 @@ class ExportService
 
   # Find an export whith his id
   def find(id)
-    Export.new(IevApi.scheduled_job(referential.slug, id, { :action => "exporter" }))
+    Export.new(Ievkit.scheduled_job(referential.slug, id, { :action => "exporter" }))
   end
 
   # Find all exports
diff --git a/app/models/export_task.rb b/app/models/export_task.rb
index 09c0aeef4..4d439b58a 100644
--- a/app/models/export_task.rb
+++ b/app/models/export_task.rb
@@ -53,19 +53,13 @@ class ExportTask < ActiveRecord::Base
     delay.export
   end
 
-  def save_requested?
-    !parameter_set["no_save"]
-  end
-
   protected
 
-  option :no_save, :boolean
   option :format
   option :file_path
   option :references_type
 
-  validates_inclusion_of :no_save, :in => [ true, false]
-  validates_inclusion_of :format, :in => self.formats
+   validates_inclusion_of :format, :in => self.formats
 
   def chouette_command
     Chouette::Command.new(:schema => referential.slug)
@@ -139,8 +133,7 @@ class ExportTask < ActiveRecord::Base
   end
 
   def full_name
-    return name unless no_save
-    "#{name} - #{I18n.t('activerecord.attributes.export_task.no_save')}"
+    return name
   end
 
   # Create ExportTask and ComplianceCheckTask associated and give export id to Chouette Loader
diff --git a/app/models/import.rb b/app/models/import.rb
index 905544a1e..b159b1688 100644
--- a/app/models/import.rb
+++ b/app/models/import.rb
@@ -113,5 +113,4 @@ class Import
   def updated_at
     Time.at(datas.updated.to_i / 1000) if updated_at?
   end
-
 end