From e1e97a1a5778d8329b8035f9bf1e532ba7bbe12a Mon Sep 17 00:00:00 2001 From: Thomas Haddad Date: Wed, 22 Feb 2017 11:19:31 +0100 Subject: Refs #2524: Add duplicate button (w/o feature) Signed-off-by: Thomas Shawarma Haddad --- .../vehicle_journeys/actions/index.js | 7 +- .../vehicle_journeys/components/App.js | 10 +- .../components/tools/CreateModal.js | 2 +- .../components/tools/DeleteVehicleJourneys.js | 2 +- .../components/tools/DuplicateVehicleJourney.js | 114 +++++++++++++++++++++ .../components/tools/ShiftVehicleJourney.js | 2 +- .../containers/tools/DuplicateVehicleJourney.js | 29 ++++++ 7 files changed, 158 insertions(+), 8 deletions(-) create mode 100644 app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/DuplicateVehicleJourney.js create mode 100644 app/assets/javascripts/es6_browserified/vehicle_journeys/containers/tools/DuplicateVehicleJourney.js (limited to 'app/assets/javascripts') diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js index e5e3c6512..10f3bb152 100644 --- a/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js +++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js @@ -45,11 +45,14 @@ const actions = { }), addVehicleJourney : (data) => ({ type: 'ADD_VEHICLEJOURNEY', - data, + data }), shiftVehicleJourney : (data) => ({ type: 'SHIFT_VEHICLEJOURNEY', - data, + data + }), + duplicateVehicleJourneys : (data) => ({ + type: 'DUPLICATE_VEHICLEJOURNEY' }), deleteVehicleJourneys : () => ({ type: 'DELETE_VEHICLEJOURNEYS' diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/App.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/App.js index 62b1f8019..e0df0f843 100644 --- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/App.js +++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/App.js @@ -7,15 +7,19 @@ var ConfirmModal = require('../containers/ConfirmModal') var AddVehicleJourney = require('../containers/tools/AddVehicleJourney') var DeleteVehicleJourneys = require('../containers/tools/DeleteVehicleJourneys') var ShiftVehicleJourney = require('../containers/tools/ShiftVehicleJourney') +var DuplicateVehicleJourney = require('../containers/tools/DuplicateVehicleJourney') const App = () => (
- - - +
+ + + + +
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/CreateModal.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/CreateModal.js index 50660a2f3..c38c02d16 100644 --- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/CreateModal.js +++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/CreateModal.js @@ -21,7 +21,7 @@ class CreateModal extends Component { } if(this.props.status.fetchSuccess == true) { return ( -
+
+ +
+
+
+
+

Mettre à jour une course

+
+ + {(this.props.modal.type == 'shift') && ( +
+
+
+ + +
+
+
+
+ + actions.resetValidation(e.currentTarget)} + required + /> +
+
+
+
+
+ + +
+
+ )} +
+
+
+
+ ) + } else { + return false + } + } +} + +DuplicateVehicleJourney.propTypes = { + onOpenDuplicateModal: PropTypes.func.isRequired, + onModalClose: PropTypes.func.isRequired, +} + +module.exports = DuplicateVehicleJourney diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/ShiftVehicleJourney.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/ShiftVehicleJourney.js index 08c9a7e12..d9334e287 100644 --- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/ShiftVehicleJourney.js +++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/ShiftVehicleJourney.js @@ -21,7 +21,7 @@ class ShiftVehicleJourney extends Component { } if(this.props.status.fetchSuccess == true) { return ( -
+