Refs #2728: adding t2e table cells adjustments

5 files changed, 31 insertions, 5 deletions

diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourney.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourney.js
index 8fda42dc1..5d149338e 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourney.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourney.js
@@ -5,6 +5,16 @@ var PropTypes = require('react').PropTypes
 class VehicleJourney extends Component {
   constructor(props) {
     super(props)
+    this.previousCity = undefined
+  }
+
+  cityNameChecker(sp) {
+    let bool = false
+    if(sp.stop_area_cityname != this.previousCity){
+      bool = true
+      this.previousCity = sp.stop_area_cityname
+    }
+    return bool
   }
 
   columnHasDelta() {
@@ -20,6 +30,8 @@ class VehicleJourney extends Component {
   }
 
   render() {
+    this.previousCity = undefined
+
     return (
       <div className={'t2e-item' + (this.props.value.deletable ? ' disabled' : '')}>
         <div className='th'>
@@ -46,7 +58,7 @@ class VehicleJourney extends Component {
 
         {this.props.value.vehicle_journey_at_stops.map((vj, i) =>
           <div key={i} className='td text-center'>
-            <div className='cellwrap'>
+            <div className={'cellwrap' + (this.cityNameChecker(vj) ? ' headlined' : '')}>
               {this.props.filters.toggleArrivals &&
                 <div>
                   <span className='input-group time'>
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourneys.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourneys.js
index 9371a6c63..ddf40b88d 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourneys.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourneys.js
@@ -67,7 +67,7 @@ class VehicleJourneys extends Component{
         data-headline={(bool) ? sp.city_name : ''}
         title={sp.city_name + ' (' + sp.zip_code +')'}
       >
-        <span>{sp.name}</span>
+        <span><span>{sp.name}</span></span>
       </div>
     )
   }
diff --git a/app/assets/stylesheets/components/_tables.sass b/app/assets/stylesheets/components/_tables.sass
index fb93b0593..cebb107b4 100644
--- a/app/assets/stylesheets/components/_tables.sass
+++ b/app/assets/stylesheets/components/_tables.sass
@@ -169,7 +169,7 @@
 
     > div
       position: relative
-      height: 100%
+      height: calc(100% + 6px)
 
       &.headlined:before
         content: ''
diff --git a/app/assets/stylesheets/modules/_vj_collection.sass b/app/assets/stylesheets/modules/_vj_collection.sass
index 955d59065..97ef0765f 100644
--- a/app/assets/stylesheets/modules/_vj_collection.sass
+++ b/app/assets/stylesheets/modules/_vj_collection.sass
@@ -16,6 +16,15 @@
 
         > div > span
           position: relative
+          display: block
+          height: 100%
+
+          > span
+            position: absolute
+            display: block
+            line-height: 1em
+            top: 50%
+            transform: translateY(-50%)
 
           &:before
             content: ''
@@ -41,9 +50,11 @@
             z-index: 3
             top: -6px
             left: -20px
-            bottom: -6px
+            bottom: 0
 
         > .headlined > span
+          height: calc(100% - (1.4em + 12px))
+
           &:after
             top: calc((1.4em + 18px) * -1)
 
diff --git a/app/views/vehicle_journeys/show.rabl b/app/views/vehicle_journeys/show.rabl
index 620b6430e..f973ccbaa 100644
--- a/app/views/vehicle_journeys/show.rabl
+++ b/app/views/vehicle_journeys/show.rabl
@@ -1,6 +1,6 @@
 object @vehicle_journey
 
-[ :objectid, :published_journey_name, :published_journey_identifier, :company_id].each do |attr|
+[:objectid, :published_journey_name, :published_journey_identifier, :company_id].each do |attr|
   attributes attr, :unless => lambda { |m| m.send( attr).nil?}
 end
 
@@ -28,6 +28,9 @@ child(:vehicle_journey_at_stops_matrix, :object_root => false) do |vehicle_stops
     node(:stop_area_name) do
       vehicle_stop.stop_point ? vehicle_stop.stop_point.stop_area.name : nil
     end
+    node(:stop_area_cityname) do
+      vehicle_stop.stop_point ? vehicle_stop.stop_point.stop_area.city_name : nil
+    end
 
     [:id, :connecting_service_id, :boarding_alighting_possibility].map do |att|
       node(att) { vehicle_stop.send(att) ? vehicle_stop.send(att) : nil  }