From bd61b6cd386ebeb9f8b375fff7ad430a2e4c39b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Debauche=20St=C3=A9phane?= Date: Tue, 12 Nov 2019 09:12:45 +0000 Subject: [PATCH] [IMP] website_event_track: improve `event.track` 1. the color of a track is now based on the color of the stage 2. the default date of a track is the ``date_begin`` of its event Task #2088538 --- .../website_event_track/data/event_demo.xml | 69 ++++++++----------- .../data/event_track_data.xml | 3 + .../website_event_track/models/event_track.py | 3 +- .../views/event_track_views.xml | 5 +- .../website_event_track/views/event_views.xml | 3 +- 5 files changed, 41 insertions(+), 42 deletions(-) diff --git a/addons/website_event_track/data/event_demo.xml b/addons/website_event_track/data/event_demo.xml index 80c236e1194..6ea81d627d9 100644 --- a/addons/website_event_track/data/event_demo.xml +++ b/addons/website_event_track/data/event_demo.xml @@ -90,11 +90,10 @@ How to design a new piece of furniture - + - 3 blocked @@ -103,7 +102,7 @@ How to integrate hardware materials in your pieces of furniture - + @@ -115,7 +114,7 @@ Portfolio presentation - + @@ -126,7 +125,7 @@ How to develop automated processes - + @@ -137,7 +136,7 @@ The new way to promote your creations - + @@ -148,7 +147,7 @@ Detailed roadmap of our new products - + @@ -159,7 +158,7 @@ A technical explanation of how to use computer design apps - + @@ -170,10 +169,9 @@ How to optimize your sales, from leads to sales orders - + - 2 blocked @@ -184,10 +182,9 @@ - + - 2 @@ -196,10 +193,9 @@ Raising qualitive insights from your customers - + - 5 @@ -207,7 +203,7 @@ Discover our new design team - + @@ -218,7 +214,7 @@ Latest trends - + @@ -229,7 +225,7 @@ Advanced reporting - + @@ -240,7 +236,7 @@ Partnership programs - + @@ -251,7 +247,7 @@ How to communicate with your community - + @@ -262,7 +258,7 @@ How to follow us on the social media - + @@ -273,7 +269,7 @@ The new marketing strategy - + @@ -284,10 +280,9 @@ How to build your marketing strategy within a competitive environment - + - 5 @@ -296,10 +291,9 @@ Advanced lead management : tips and tricks from the fields - + - 5 @@ -308,7 +302,7 @@ New Certification Program - + @@ -319,10 +313,9 @@ House of World Cultures - + - 7 @@ -330,7 +323,7 @@ Minimal but efficient design - + @@ -341,7 +334,7 @@ Key Success factors selling our furniture - + @@ -352,7 +345,7 @@ Design contest (entire day) - + @@ -363,7 +356,7 @@ Design contest (entire afternoon) - + @@ -374,18 +367,17 @@ My Company global presentation - + - 3 Status & Strategy - + @@ -395,18 +387,17 @@ The new marketing strategy - + - 6 Morning break - + @@ -415,7 +406,7 @@ Lunch - + diff --git a/addons/website_event_track/data/event_track_data.xml b/addons/website_event_track/data/event_track_data.xml index 3fb12b614b3..ed5ae45edb1 100644 --- a/addons/website_event_track/data/event_track_data.xml +++ b/addons/website_event_track/data/event_track_data.xml @@ -44,15 +44,18 @@ Proposal 1 + 1 Confirmed 2 + 2 Announced 3 + 3 Published diff --git a/addons/website_event_track/models/event_track.py b/addons/website_event_track/models/event_track.py index 15d64657657..bbfdb93d369 100644 --- a/addons/website_event_track/models/event_track.py +++ b/addons/website_event_track/models/event_track.py @@ -44,6 +44,7 @@ class TrackStage(models.Model): help='This stage is folded in the kanban view when there are no records in that stage to display.') is_done = fields.Boolean(string='Accepted Stage') is_cancel = fields.Boolean(string='Canceled Stage') + color = fields.Integer(string='Color') class Track(models.Model): @@ -86,7 +87,7 @@ class Track(models.Model): duration = fields.Float('Duration', default=1.5, help="Track duration in hours.") location_id = fields.Many2one('event.track.location', 'Room') event_id = fields.Many2one('event.event', 'Event', required=True) - color = fields.Integer('Color Index') + color = fields.Integer('Color', related="stage_id.color") priority = fields.Selection([ ('0', 'Low'), ('1', 'Medium'), ('2', 'High'), ('3', 'Highest')], diff --git a/addons/website_event_track/views/event_track_views.xml b/addons/website_event_track/views/event_track_views.xml index a5e3f43c408..f673017d089 100644 --- a/addons/website_event_track/views/event_track_views.xml +++ b/addons/website_event_track/views/event_track_views.xml @@ -99,6 +99,7 @@ + @@ -195,6 +196,7 @@ Event Tracks event.track kanban,tree,form,calendar,graph,activity + {'search_default_location': 1}

Add a new track @@ -208,7 +210,7 @@ event.track Event Tracks kanban,tree,form,calendar,graph,activity - {'search_default_event_id': active_id, 'default_event_id': active_id, 'group_by': 'stage_id'} + {'search_default_event_id': active_id, 'default_event_id': active_id, 'search_default_location': 1}

Add a new track @@ -393,6 +395,7 @@ + diff --git a/addons/website_event_track/views/event_views.xml b/addons/website_event_track/views/event_views.xml index 0ae83b9400f..1fa4543a456 100644 --- a/addons/website_event_track/views/event_views.xml +++ b/addons/website_event_track/views/event_views.xml @@ -27,7 +27,8 @@