Initialize import show with iev api

1 files changed, 36 insertions, 11 deletions

diff --git a/app/models/import.rb b/app/models/import.rb
index 6a6b78c9e..7b2405db2 100644
--- a/app/models/import.rb
+++ b/app/models/import.rb
@@ -3,21 +3,30 @@ class Import
   extend ActiveModel::Naming
   include ActiveModel::Model  
   
-  enumerize :import_status, in: %w{created scheduled terminated canceled aborted}, default: "created", predicates: true
-  enumerize :import_format, in: %w{neptune netex gtfs}, default: "neptune", predicates: true
+  enumerize :status, in: %w{created scheduled terminated canceled aborted}, default: "created", predicates: true
+  enumerize :format, in: %w{neptune netex gtfs}, default: "neptune", predicates: true
 
-  attr_reader :datas
+  attr_reader :datas, :report
   
-  def initialize(options=Hashie::Mash.new)
+  def initialize( options = Hashie::Mash.new )
+    puts "options #{options.inspect}"
     @datas = options
-    @import_status = @datas.status.downcase if @datas.status
-    @import_format = @datas.type.downcase if @datas.type
+    @status = @datas.status.downcase if @datas.status?
+    @format = @datas.type.downcase if @datas.type?
+  end
+
+  def report
+    ImportReport.new( IevApi.job(referential_name, id,{ :action => "importer" }) )
+  end
+
+  def id
+    @datas.id
   end
 
   def percentage_progress
-    if %w{created}.include? import_status
+    if %w{created}.include? status
       0
-    elsif %w{ terminated canceled aborted }.include? import_status
+    elsif %w{ terminated canceled aborted }.include? status
       100
     else
       20
@@ -28,12 +37,20 @@ class Import
     @datas.links
   end
 
+  def referential_name
+    @datas.parameters.referential
+  end
+  
   def name
     @datas.parameters.name
   end
 
+  def user_name?
+    @datas.parameters? && @datas.parameters.user_name?
+  end
+  
   def user_name
-    @datas.parameters.user_name
+    @datas.parameters.user_name if user_name?
   end
 
   def no_save
@@ -44,12 +61,20 @@ class Import
     @datas.filename
   end
 
+  def created_at?
+    @datas.created?
+  end
+  
   def created_at
-    Time.at(@datas.created.to_i / 1000)
+    Time.at(@datas.created.to_i / 1000) if created_at?
+  end
+
+  def updated_at?
+    @datas.updated?
   end
 
   def updated_at
-    Time.at(@datas.updated.to_i / 1000)
+    Time.at(@datas.updated.to_i / 1000) if updated_at?
   end
 
 end