diff options
11 files changed, 93 insertions, 34 deletions
diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPatterns.js b/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPatterns.js index b82b4eb36..dc55038c3 100644 --- a/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPatterns.js +++ b/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPatterns.js @@ -79,7 +79,7 @@ class JourneyPatterns extends Component{ <div>Nb arrêts</div> </div> {this.props.stopPointsList.map((sp, i) => - <div key={i} className='td'>{sp}</div> + <div key={i} className='td'>{sp.name}</div> )} </div> diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/index.js b/app/assets/javascripts/es6_browserified/journey_patterns/index.js index 6db78445f..884c15d7c 100644 --- a/app/assets/javascripts/es6_browserified/journey_patterns/index.js +++ b/app/assets/javascripts/es6_browserified/journey_patterns/index.js @@ -6,10 +6,10 @@ var journeyPatternsApp = require('./reducers') var App = require('./components/App') // logger, DO NOT REMOVE -// var applyMiddleware = require('redux').applyMiddleware -// var createLogger = require('redux-logger') -// var thunkMiddleware = require('redux-thunk').default -// var promise = require('redux-promise') +var applyMiddleware = require('redux').applyMiddleware +var createLogger = require('redux-logger') +var thunkMiddleware = require('redux-thunk').default +var promise = require('redux-promise') var initialState = { status: { @@ -17,7 +17,7 @@ var initialState = { isFetching: false }, journeyPatterns: [], - stopPointsList: [], + stopPointsList: window.stopPoints, pagination: { page : 1, totalCount: window.journeyPatternLength, @@ -30,12 +30,12 @@ var initialState = { confirmModal: {} } } -// const loggerMiddleware = createLogger() +const loggerMiddleware = createLogger() let store = createStore( journeyPatternsApp, - initialState - // applyMiddleware(thunkMiddleware, promise, loggerMiddleware) + initialState, + applyMiddleware(thunkMiddleware, promise, loggerMiddleware) ) render( diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/reducers/index.js b/app/assets/javascripts/es6_browserified/journey_patterns/reducers/index.js index 85817616a..aa35adf0e 100644 --- a/app/assets/javascripts/es6_browserified/journey_patterns/reducers/index.js +++ b/app/assets/javascripts/es6_browserified/journey_patterns/reducers/index.js @@ -8,8 +8,8 @@ var stopPointsList = require('./stopPointsList') const journeyPatternsApp = combineReducers({ status, journeyPatterns, - stopPointsList, pagination, + stopPointsList, modal }) diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/reducers/journeyPatterns.js b/app/assets/javascripts/es6_browserified/journey_patterns/reducers/journeyPatterns.js index 8c84500c0..92381f018 100644 --- a/app/assets/javascripts/es6_browserified/journey_patterns/reducers/journeyPatterns.js +++ b/app/assets/javascripts/es6_browserified/journey_patterns/reducers/journeyPatterns.js @@ -3,11 +3,14 @@ var actions = require("../actions") const journeyPattern = (state = {}, action) => { switch (action.type) { case 'ADD_JOURNEYPATTERN': - let stopPoints = JSON.parse(JSON.stringify(state[0].stop_points)) - stopPoints.map((s)=>{ - s.checked = false - return s - }) + let stopPoints = window.stopPoints + + if(stopPoints != undefined) { + stopPoints.map((s)=>{ + s.checked = false + return s + }) + } return { name: action.data.name.value, published_name: action.data.published_name.value, diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/reducers/stopPointsList.js b/app/assets/javascripts/es6_browserified/journey_patterns/reducers/stopPointsList.js index 904f3cdc4..9abacc8c8 100644 --- a/app/assets/javascripts/es6_browserified/journey_patterns/reducers/stopPointsList.js +++ b/app/assets/javascripts/es6_browserified/journey_patterns/reducers/stopPointsList.js @@ -1,16 +1,5 @@ const stopPointsList = (state = [], action) => { switch (action.type) { - case 'RECEIVE_JOURNEY_PATTERNS': - if(action.json.length != 0){ - let sp = action.json[0].stop_points - let spArray = [] - sp.map((s) => { - spArray.push(s.name) - }) - return [...spArray] - }else{ - return state - } default: return state } diff --git a/app/controllers/journey_patterns_collections_controller.rb b/app/controllers/journey_patterns_collections_controller.rb index d00fd6799..d96d7f9c7 100644 --- a/app/controllers/journey_patterns_collections_controller.rb +++ b/app/controllers/journey_patterns_collections_controller.rb @@ -13,6 +13,31 @@ class JourneyPatternsCollectionsController < ChouetteController @q = route.journey_patterns.includes(:stop_points) @ppage = 10 @journey_patterns ||= @q.paginate(page: params[:page], per_page: @ppage).order(:name) + + @stop_points_list = [] + route.stop_points.each do |sp| + @stop_points_list << { + :id => sp.stop_area.id, + :route_id => sp.try(:route_id), + :object_id => sp.try(:objectid), + :position => sp.try(:position), + :for_boarding => sp.try(:for_boarding), + :for_alighting => sp.try(:for_alighting), + :name => sp.stop_area.try(:name), + :zip_code => sp.stop_area.try(:zip_code), + :city_name => sp.stop_area.try(:city_name), + :comment => sp.stop_area.try(:comment), + :area_type => sp.stop_area.try(:area_type), + :registration_number => sp.stop_area.try(:registration_number), + :nearest_topic_name => sp.stop_area.try(:nearest_topic_name), + :fare_code => sp.stop_area.try(:fare_code), + :longitude => sp.stop_area.try(:longitude), + :latitude => sp.stop_area.try(:latitude), + :long_lat_type => sp.stop_area.try(:long_lat_type), + :country_code => sp.stop_area.try(:country_code), + :street_name => sp.stop_area.try(:street_name) + } + end end def update diff --git a/app/views/api/v1/stop_areas/short_description.rabl b/app/views/api/v1/stop_areas/short_description.rabl index fb0213510..7d571b0a2 100644 --- a/app/views/api/v1/stop_areas/short_description.rabl +++ b/app/views/api/v1/stop_areas/short_description.rabl @@ -1,10 +1,9 @@ object @stop_area extends "api/v1/trident_objects/short_description" -[ :id, :name, :area_type, :longitude, :latitude, :long_lat_type].each do |attr| +[:id, :name, :city_name, :zip_code, :area_type, :longitude, :latitude, :long_lat_type].each do |attr| attributes attr, :unless => lambda { |m| m.send( attr).nil?} end node(:parent_object_id) do |stop_area| stop_area.parent.objectid end unless root_object.parent.nil? - diff --git a/app/views/api/v1/stop_areas/show.rabl b/app/views/api/v1/stop_areas/show.rabl index 1a0acecc5..3d4e5ba55 100644 --- a/app/views/api/v1/stop_areas/show.rabl +++ b/app/views/api/v1/stop_areas/show.rabl @@ -1,7 +1,7 @@ object @stop_area extends "api/v1/trident_objects/show" -[ :name, :area_type,:nearest_topic_name, :fare_code, :registration_number, +[:name, :area_type, :nearest_topic_name, :fare_code, :registration_number, :longitude, :latitude, :long_lat_type, :country_code, :street_name, :projection_x, :projection_y, :projection, :comment ].each do |attr| @@ -10,7 +10,7 @@ end node(:routing_stop_area_object_ids) do |stop_area| stop_area.routing_stops.map(&:objectid) -end unless root_object.routing_stops.empty? +end unless root_object.routing_stops.empty? node(:routing_line_object_ids) do |stop_area| stop_area.routing_lines.map(&:objectid) diff --git a/app/views/journey_patterns_collections/show.html.slim b/app/views/journey_patterns_collections/show.html.slim index bfcc963cc..a2058fa64 100644 --- a/app/views/journey_patterns_collections/show.html.slim +++ b/app/views/journey_patterns_collections/show.html.slim @@ -11,8 +11,9 @@ .col-lg-12 #journey_patterns + = javascript_tag do - | window.stopPoints = #{(@route.stop_points.to_json).html_safe}; + | window.stopPoints = #{(@stop_points_list.to_json).html_safe}; | window.journeyPatternLength = #{@journey_patterns.total_entries()}; | window.journeyPatternsPerPage = #{@ppage} = javascript_include_tag 'es6_browserified/journey_patterns/index.js' diff --git a/db/schema.rb b/db/schema.rb index a05e7b305..eb966ba00 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,11 @@ # # It's strongly recommended that you check this file into your version control system. +<<<<<<< Updated upstream ActiveRecord::Schema.define(version: 20170228135627) do +======= +ActiveRecord::Schema.define(version: 20170218111254) do +>>>>>>> Stashed changes # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -165,6 +169,22 @@ ActiveRecord::Schema.define(version: 20170228135627) do add_index "connection_links", ["objectid"], :name => "connection_links_objectid_key", :unique => true + create_table "delayed_jobs", force: true do |t| + t.integer "priority", default: 0 + t.integer "attempts", default: 0 + t.text "handler" + t.text "last_error" + t.datetime "run_at" + t.datetime "locked_at" + t.datetime "failed_at" + t.string "locked_by" + t.string "queue" + t.datetime "created_at" + t.datetime "updated_at" + end + + add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority" + create_table "exports", force: true do |t| t.integer "referential_id", limit: 8 t.string "status" @@ -828,6 +848,8 @@ ActiveRecord::Schema.define(version: 20170228135627) do add_index "workbenches", ["stop_area_referential_id"], :name => "index_workbenches_on_stop_area_referential_id" Foreigner.load + add_foreign_key "access_links", "access_points", name: "aclk_acpt_fkey", dependent: :delete + add_foreign_key "group_of_lines_lines", "group_of_lines", name: "groupofline_group_fkey", dependent: :delete add_foreign_key "journey_frequencies", "timebands", name: "journey_frequencies_timeband_id_fk", dependent: :nullify diff --git a/spec/javascripts/journey_patterns/reducers/journey_patterns_spec.js b/spec/javascripts/journey_patterns/reducers/journey_patterns_spec.js index 9fcabf439..df288e530 100644 --- a/spec/javascripts/journey_patterns/reducers/journey_patterns_spec.js +++ b/spec/javascripts/journey_patterns/reducers/journey_patterns_spec.js @@ -6,7 +6,6 @@ let fakeStopPoints = [{ id : 45289, name : "Clichy Levallois", object_id : "FR:92044:LDA:72073:STIF", - object_version : 1, position : 0, },{ area_type : "lda", @@ -14,9 +13,29 @@ let fakeStopPoints = [{ id : 40534, name : "Thomas Lemaître", object_id : "FR:92050:LDA:70915:STIF", - object_version : 1, position : 1, }] +let stopPoints = [{ + area_type : 'zdep', + city_name : 'Plaisir', + for_alighting : 'normal', + for_boarding : 'normal', + id : 14892, + name : 'test1', + object_id : 'test:StopPoint:1', + position : 0, + zip_code : '78490' +},{ + area_type : 'zdep', + city_name : 'Plaisir', + for_alighting : 'normal', + for_boarding : 'normal', + id : 14893, + name : 'test2', + object_id : 'test:StopPoint:2', + position : 1, + zip_code : '78490' +}] describe('journeyPatterns reducer', () => { beforeEach(()=>{ @@ -52,6 +71,7 @@ describe('journeyPatterns reducer', () => { published_name: {value: 'M3'}, registration_number: {value: ''} } + let stopPoints = stopPoints expect( jpReducer(state, { type: 'ADD_JOURNEYPATTERN', @@ -62,7 +82,7 @@ describe('journeyPatterns reducer', () => { published_name: 'M3', registration_number: '', deletable: false, - stop_points: fakeStopPoints + stop_points: stopPoints }, ...state]) }) |