diff options
| author | Thomas Haddad | 2017-04-18 17:08:29 +0200 |
|---|---|---|
| committer | Thomas Haddad | 2017-04-18 17:08:58 +0200 |
| commit | 209c74945a77550b3c005a8dc4d28663630b1df6 (patch) | |
| tree | a79f9c9599438d6d0877fc87aab9fa9a0c2b58a4 /app/assets/javascripts | |
| parent | b19b531e4bb2d7de9423b581297191e2638618c7 (diff) | |
| download | chouette-core-209c74945a77550b3c005a8dc4d28663630b1df6.tar.bz2 | |
Refs #2913: Display calendar in metas for tt
Signed-off-by: Thomas Shawarma Haddad <thomas.haddad@af83.com>
Diffstat (limited to 'app/assets/javascripts')
3 files changed, 12 insertions, 2 deletions
diff --git a/app/assets/javascripts/es6_browserified/time_tables/components/Metas.js b/app/assets/javascripts/es6_browserified/time_tables/components/Metas.js index 63e6387ea..943b781f5 100644 --- a/app/assets/javascripts/es6_browserified/time_tables/components/Metas.js +++ b/app/assets/javascripts/es6_browserified/time_tables/components/Metas.js @@ -84,6 +84,14 @@ const Metas = ({metas, onUpdateDayTypes, onUpdateComment, onUpdateColor, onSelec </div> </div> */} + + {/* calendar */} + <div className="form-group"> + <label htmlFor="" className="control-label col-sm-4">Modèle de calendrier associé</label> + <div className="col-sm-8"> + <span>{metas.calendar.name}</span> + </div> + </div> {/* day_types */} <div className="form-group"> <label htmlFor="" className="control-label col-sm-4"> diff --git a/app/assets/javascripts/es6_browserified/time_tables/index.js b/app/assets/javascripts/es6_browserified/time_tables/index.js index c221889da..7b279d9f9 100644 --- a/app/assets/javascripts/es6_browserified/time_tables/index.js +++ b/app/assets/javascripts/es6_browserified/time_tables/index.js @@ -27,7 +27,8 @@ var initialState = { comment: '', day_types: [], tags: [], - color: '' + color: '', + calendar: {} }, pagination: { stateChanged: false, diff --git a/app/assets/javascripts/es6_browserified/time_tables/reducers/metas.js b/app/assets/javascripts/es6_browserified/time_tables/reducers/metas.js index 9bec92f17..555730908 100644 --- a/app/assets/javascripts/es6_browserified/time_tables/reducers/metas.js +++ b/app/assets/javascripts/es6_browserified/time_tables/reducers/metas.js @@ -8,7 +8,8 @@ const metas = (state = {}, action) => { comment: action.json.comment, day_types: actions.strToArrayDayTypes(action.json.day_types), tags: action.json.tags, - color: action.json.color + color: action.json.color, + calendar: action.json.calendar ? action.json.calendar : {name : 'Aucun'} }) case 'UPDATE_DAY_TYPES': let dayTypes = state.day_types.slice(0) |