Refs #2609: updating stop_areas#show (from sync)

2 files changed, 48 insertions, 70 deletions

diff --git a/app/helpers/stop_areas_helper.rb b/app/helpers/stop_areas_helper.rb
index 65e82e6f0..2188a272d 100644
--- a/app/helpers/stop_areas_helper.rb
+++ b/app/helpers/stop_areas_helper.rb
@@ -62,17 +62,13 @@ module StopAreasHelper
 
   def geo_data(sa, sar)
     if sa.long_lat_type.nil?
-      content_tag :span, I18n.t('stop_areas.show.no_geographic_data')
+      content_tag :span, '-'
     else
       if !sa.projection.nil?
-        p = content_tag :span, "#{sa.human_attribute_name(:projection)} : #{sar.projection_type_label}"
-        px = content_tag :span, "#{sa.human_attribute_name(:projection_x)} : #{sa.projection_x}"
-        py = content_tag :span, "#{sa.human_attribute_name(:projection_y)} : #{sa.projection_y}"
+        content_tag :span, "#{sa.projection_x}, #{sa.projection_y}"
 
       elsif !sa.long_lat_type.nil?
-        lonlat = content_tag :span, "#{sa.human_attribute_name(:long_lat_type)} : #{sa.long_lat_type}"
-        lon = content_tag :span, "#{sa.human_attribute_name(:longitude)} : #{sa.longitude}"
-        lat = content_tag :span, "#{sa.human_attribute_name(:latitude)} : #{sa.latitude}"
+        content_tag :span, "#{sa.long_lat_type} : #{sa.longitude}, #{sa.latitude}"
       end
     end
   end
diff --git a/app/views/stop_areas/show.html.slim b/app/views/stop_areas/show.html.slim
index 10cfe836c..fdb06e084 100644
--- a/app/views/stop_areas/show.html.slim
+++ b/app/views/stop_areas/show.html.slim
@@ -20,69 +20,51 @@
     .row
       .col-lg-6.col-md-6.col-sm-12.col-xs-12
         = definition_list t('metadatas'),
-          { 'Supprimé' => (@stop_area.deleted_at ? t('true') : t('false')),
-            @stop_area.human_attribute_name(:comment) => @stop_area.comment,
-            @stop_area.human_attribute_name(:nearest_topic_name) => @stop_area.nearest_topic_name,
-            @stop_area.human_attribute_name(:street_name) => @stop_area.street_name,
-            @stop_area.human_attribute_name(:country_code) => @stop_area.country_code,
+          { @stop_area.human_attribute_name(:stop_area_type) => t("area_types.label.#{@stop_area.stop_area_type}"),
+            @stop_area.human_attribute_name(:registration_number) => @stop_area.registration_number,
+            'Code Reflex' => @stop_area.try(:objectid),
+            'Coordonnées' => geo_data(@stop_area, @stop_area_referential),
             @stop_area.human_attribute_name(:zip_code) => @stop_area.zip_code,
             @stop_area.human_attribute_name(:city_name) => @stop_area.city_name,
-            @stop_area.human_attribute_name(:fare_code) => @stop_area.fare_code,
-            @stop_area.human_attribute_name(:time_zone) => @stop_area.time_zone,
-            @stop_area.human_attribute_name(:url) => @stop_area.url,
-            @stop_area.human_attribute_name(:registration_number) => @stop_area.registration_number,
-            @stop_area.human_attribute_name(:stop_area_type) => t("area_types.label.#{@stop_area.stop_area_type}") }
-
-      - if !manage_itl
-        .col-lg-6.col-md-6.col-sm-12.col-xs-12
-          = definition_list t('metadatas'),
-            { @stop_area.human_attribute_name(:mobility_restricted_suitability) => (@stop_area.mobility_restricted_suitability.nil? ? t('unknown') : t((@stop_area.mobility_restricted_suitability == true).to_s)),
-              @stop_area.human_attribute_name(:stairs_availability) => (@stop_area.stairs_availability.nil? ? t('unknown') : t((@stop_area.stairs_availability == true).to_s)),
-              @stop_area.human_attribute_name(:lift_availability) => (@stop_area.lift_availability.nil? ? t('unknown') : t((@stop_area.lift_availability == true).to_s)),
-              t('stop_areas.show.geographic_data') => geo_data(@stop_area, @stop_area_referential)}
-
-          / - if !manage_itl
-          /   p
-          /     label = t('stop_areas.show.geographic_data')
-          / 
-          /   - if @stop_area.long_lat_type == nil
-          /     span.geo_data = t('stop_areas.show.no_geographic_data')
-          /   - else
-          /     - if !@stop_area.projection.nil?
-          /       p
-          /         span.geo_data = "#{@stop_area.human_attribute_name('projection')} : "
-          /         = @stop_area_referential.projection_type_label
-          / 
-          /       p
-          /         span.geo_data = "#{@stop_area.human_attribute_name('projection_x')} : "
-          /         = @stop_area.projection_x
-          / 
-          /       p
-          /         span.geo_data = "#{@stop_area.human_attribute_name('projection_y')} : "
-          /         = @stop_area.projection_y
-          / 
-          /     - if !@stop_area.long_lat_type.nil?
-          /       p
-          /         span.geo_data = "#{@stop_area.human_attribute_name('long_lat_type')} : "
-          /         = @stop_area.long_lat_type
-          / 
-          /       p
-          /         span.geo_data = "#{@stop_area.human_attribute_name('longitude')} : "
-          /         = @stop_area.longitude
-          / 
-          /       p
-          /         span.geo_data = "#{@stop_area.human_attribute_name('latitude')} : "
-          /         = @stop_area.latitude
-
-    .row
-      .col-lg-12
-        .genealogical.clearfix
-          == render 'stop_areas/genealogical'
-
-    - if manage_access_points
-      .row
-        .col-lg-12
-          h3 = t('.access_points')
+            'Etat' => (@stop_area.deleted_at ? 'Supprimé' : 'Actif') }
 
-          .access_points.paginated_content
-            = paginated_content @access_points, "access_points/access_point", {referential: @stop_area_referential}
+      / - if !manage_itl
+      /   .col-lg-6.col-md-6.col-sm-12.col-xs-12
+      /     = definition_list t('metadatas'),
+      /       { @stop_area.human_attribute_name(:mobility_restricted_suitability) => (@stop_area.mobility_restricted_suitability.nil? ? t('unknown') : t((@stop_area.mobility_restricted_suitability == true).to_s)),
+      /         @stop_area.human_attribute_name(:stairs_availability) => (@stop_area.stairs_availability.nil? ? t('unknown') : t((@stop_area.stairs_availability == true).to_s)),
+      /         @stop_area.human_attribute_name(:lift_availability) => (@stop_area.lift_availability.nil? ? t('unknown') : t((@stop_area.lift_availability == true).to_s)),
+      /         t('stop_areas.show.geographic_data') => geo_data(@stop_area, @stop_area_referential)}
+      / 
+      /     / - if !manage_itl
+      /     /   p
+      /     /     label = t('stop_areas.show.geographic_data')
+      /     / 
+      /     /   - if @stop_area.long_lat_type == nil
+      /     /     span.geo_data = t('stop_areas.show.no_geographic_data')
+      /     /   - else
+      /     /     - if !@stop_area.projection.nil?
+      /     /       p
+      /     /         span.geo_data = "#{@stop_area.human_attribute_name('projection')} : "
+      /     /         = @stop_area_referential.projection_type_label
+      /     / 
+      /     /       p
+      /     /         span.geo_data = "#{@stop_area.human_attribute_name('projection_x')} : "
+      /     /         = @stop_area.projection_x
+      /     / 
+      /     /       p
+      /     /         span.geo_data = "#{@stop_area.human_attribute_name('projection_y')} : "
+      /     /         = @stop_area.projection_y
+      /     / 
+      /     /     - if !@stop_area.long_lat_type.nil?
+      /     /       p
+      /     /         span.geo_data = "#{@stop_area.human_attribute_name('long_lat_type')} : "
+      /     /         = @stop_area.long_lat_type
+      /     / 
+      /     /       p
+      /     /         span.geo_data = "#{@stop_area.human_attribute_name('longitude')} : "
+      /     /         = @stop_area.longitude
+      /     / 
+      /     /       p
+      /     /         span.geo_data = "#{@stop_area.human_attribute_name('latitude')} : "
+      /     /         = @stop_area.latitude