diff options
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 @@ <field name="name">How to design a new piece of furniture</field> <field name="is_published" eval="True"/> <field name="event_id" ref="event.event_0"/> - <field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 06:00:00')"></field> + <field name="date" eval="(DateTime.now() + timedelta(days=1, hours=1, minutes=5)).strftime('%Y-%m-%d 08:00:00')"></field> <field name="location_id" ref="website_event_track.event_track_location5"/> <field name="duration" eval="1"/> <field name="partner_id" ref="base.res_partner_2"/> - <field name="color">3</field> <field name="stage_id" ref="event_track_stage0"/> <field name="kanban_state">blocked</field> <field name="user_id" ref="base.user_admin"/> @@ -103,7 +102,7 @@ <field name="name">How to integrate hardware materials in your pieces of furniture</field> <field name="is_published" eval="True"/> <field name="event_id" ref="event.event_0"/> - <field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 08:30:00')"></field> + <field name="date" eval="(DateTime.now() + timedelta(days=1, hours=2, minutes=5)).strftime('%Y-%m-%d 08:00:00')"></field> <field name="location_id" ref="website_event_track.event_track_location5"/> <field name="duration" eval="0.25"/> <field name="partner_id" ref="base.res_partner_3"/> @@ -115,7 +114,7 @@ <field name="name">Portfolio presentation</field> <field name="is_published" eval="True"/> <field name="event_id" ref="event.event_0"/> - <field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 10:30:00')"></field> + <field name="date" eval="(DateTime.now() + timedelta(days=1, hours=2, minutes=35)).strftime('%Y-%m-%d 08:00:00')"></field> <field name="location_id" ref="website_event_track.event_track_location5"/> <field name="duration" eval="0.3"/> <field name="partner_id" ref="base.res_partner_4"/> @@ -126,7 +125,7 @@ <field name="name">How to develop automated processes</field> <field name="is_published" eval="True"/> <field name="event_id" ref="event.event_0"/> - <field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 09:00:00')"></field> + <field name="date" eval="(DateTime.now() + timedelta(days=1, hours=3, minutes=5)).strftime('%Y-%m-%d 08:00:00')"></field> <field name="location_id" ref="website_event_track.event_track_location5"/> <field name="duration" eval="0.5"/> <field name="partner_id" ref="base.res_partner_2"/> @@ -137,7 +136,7 @@ <field name="name">The new way to promote your creations</field> <field name="is_published" eval="True"/> <field name="event_id" ref="event.event_0"/> - <field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 06:00:00')"></field> + <field name="date" eval="(DateTime.now() + timedelta(days=1, hours=4, minutes=5)).strftime('%Y-%m-%d 08:00:00')"></field> <field name="location_id" ref="website_event_track.event_track_location6"/> <field name="duration" eval="0.5"/> <field name="partner_id" ref="base.res_partner_4"/> @@ -148,7 +147,7 @@ <field name="name">Detailed roadmap of our new products</field> <field name="is_published" eval="True"/> <field name="event_id" ref="event.event_0"/> - <field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 06:30:00')"></field> + <field name="date" eval="(DateTime.now() + timedelta(days=1, hours=7, minutes=5)).strftime('%Y-%m-%d 08:00:00')"></field> <field name="location_id" ref="website_event_track.event_track_location6"/> <field name="duration" eval="0.5"/> <field name="partner_id" ref="base.res_partner_3"/> @@ -159,7 +158,7 @@ <field name="name">A technical explanation of how to use computer design apps</field> <field name="is_published" eval="True"/> <field name="event_id" ref="event.event_0"/> - <field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 08:30:00')"></field> + <field name="date" eval="(DateTime.now() + timedelta(days=1, hours=10, minutes=5)).strftime('%Y-%m-%d 08:00:00')"></field> <field name="location_id" ref="website_event_track.event_track_location6"/> <field name="duration" eval="1"/> <field name="partner_id" ref="base.res_partner_1"/> @@ -170,10 +169,9 @@ <field name="name">How to optimize your sales, from leads to sales orders</field> <field name="is_published" eval="True"/> <field name="event_id" ref="event.event_0"/> - <field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 06:00:00')"></field> + <field name="date" eval="(DateTime.now() + timedelta(days=1, hours=1, minutes=5)).strftime('%Y-%m-%d 08:00:00')"></field> <field name="location_id" ref="website_event_track.event_track_location7"/> <field name="duration" eval="0.5"/> - <field name="color">2</field> <field name="partner_id" ref="base.res_partner_4"/> <field name="stage_id" ref="event_track_stage3"/> <field name="kanban_state">blocked</field> @@ -184,10 +182,9 @@ <field name="is_published" eval="True"/> <field name="event_id" ref="event.event_0"/> <field name="user_id" ref="base.user_admin"/> - <field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 08:30:00')"></field> + <field name="date" eval="(DateTime.now() + timedelta(days=1, hours=3, minutes=5)).strftime('%Y-%m-%d 08:00:00')"></field> <field name="location_id" ref="website_event_track.event_track_location7"/> <field name="duration" eval="1"/> - <field name="color">2</field> <field name="partner_id" ref="base.res_partner_12"/> <field name="stage_id" ref="event_track_stage3"/> <field name="user_id" ref="base.user_admin"/> @@ -196,10 +193,9 @@ <field name="name">Raising qualitive insights from your customers</field> <field name="is_published" eval="True"/> <field name="event_id" ref="event.event_0"/> - <field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 06:30:00')"></field> + <field name="date" eval="(DateTime.now() + timedelta(days=1, hours=5, minutes=5)).strftime('%Y-%m-%d 08:00:00')"></field> <field name="location_id" ref="website_event_track.event_track_location7"/> <field name="duration" eval="0.5"/> - <field name="color">5</field> <field name="stage_id" ref="event_track_stage0"/> <field name="user_id" ref="base.user_admin"/> </record> @@ -207,7 +203,7 @@ <field name="name">Discover our new design team</field> <field name="is_published" eval="True"/> <field name="event_id" ref="event.event_0"/> - <field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 10:30:00')"></field> + <field name="date" eval="(DateTime.now() + timedelta(days=1, hours=10, minutes=5)).strftime('%Y-%m-%d 08:00:00')"></field> <field name="location_id" ref="website_event_track.event_track_location7"/> <field name="duration" eval="0.5"/> <field name="partner_id" ref="base.res_partner_4"/> @@ -218,7 +214,7 @@ <field name="name">Latest trends</field> <field name="is_published" eval="True"/> <field name="event_id" ref="event.event_0"/> - <field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 11:00:00')"></field> + <field name="date" eval="(DateTime.now() + timedelta(days=2, hours=1, minutes=5)).strftime('%Y-%m-%d 08:00:00')"></field> <field name="location_id" ref="website_event_track.event_track_location7"/> <field name="duration" eval="0.5"/> <field name="partner_id" ref="base.res_partner_2"/> @@ -229,7 +225,7 @@ <field name="name">Advanced reporting</field> <field name="is_published" eval="True"/> <field name="event_id" ref="event.event_0"/> - <field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 06:30:00')"></field> + <field name="date" eval="(DateTime.now() + timedelta(days=1, hours=2, minutes=5)).strftime('%Y-%m-%d 08:00:00')"></field> <field name="location_id" ref="website_event_track.event_track_location8"/> <field name="duration" eval="0.25"/> <field name="partner_id" ref="base.res_partner_12"/> @@ -240,7 +236,7 @@ <field name="name">Partnership programs</field> <field name="is_published" eval="True"/> <field name="event_id" ref="event.event_0"/> - <field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 07:00:00')"></field> + <field name="date" eval="(DateTime.now() + timedelta(days=2, hours=3, minutes=5)).strftime('%Y-%m-%d 08:00:00')"></field> <field name="location_id" ref="website_event_track.event_track_location8"/> <field name="duration" eval="0.5"/> <field name="partner_id" ref="base.res_partner_10"/> @@ -251,7 +247,7 @@ <field name="name">How to communicate with your community</field> <field name="is_published" eval="True"/> <field name="event_id" ref="event.event_0"/> - <field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 10:30:00')"></field> + <field name="date" eval="(DateTime.now() + timedelta(days=2, hours=8, minutes=5)).strftime('%Y-%m-%d 08:00:00')"></field> <field name="location_id" ref="website_event_track.event_track_location8"/> <field name="duration" eval="0.5"/> <field name="partner_id" ref="base.res_partner_3"/> @@ -262,7 +258,7 @@ <field name="name">How to follow us on the social media</field> <field name="is_published" eval="True"/> <field name="event_id" ref="event.event_0"/> - <field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 11:00:00')"></field> + <field name="date" eval="(DateTime.now() + timedelta(days=2, hours=12, minutes=5)).strftime('%Y-%m-%d 08:00:00')"></field> <field name="location_id" ref="website_event_track.event_track_location8"/> <field name="duration" eval="0.5"/> <field name="partner_id" ref="base.res_partner_12"/> @@ -273,7 +269,7 @@ <field name="name">The new marketing strategy</field> <field name="is_published" eval="True"/> <field name="event_id" ref="event.event_0"/> - <field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 06:00:00')"></field> + <field name="date" eval="(DateTime.now() + timedelta(days=1, hours=1, minutes=5)).strftime('%Y-%m-%d 08:00:00')"></field> <field name="location_id" ref="website_event_track.event_track_location9"/> <field name="duration" eval="0.5"/> <field name="partner_id" ref="base.res_partner_10"/> @@ -284,10 +280,9 @@ <field name="name">How to build your marketing strategy within a competitive environment</field> <field name="is_published" eval="True"/> <field name="event_id" ref="event.event_0"/> - <field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 08:30:00')"></field> + <field name="date" eval="(DateTime.now() + timedelta(days=2, hours=1, minutes=5)).strftime('%Y-%m-%d 08:00:00')"></field> <field name="location_id" ref="website_event_track.event_track_location9"/> <field name="duration" eval="0.5"/> - <field name="color">5</field> <field name="partner_id" ref="base.res_partner_2"/> <field name="stage_id" ref="event_track_stage1"/> <field name="user_id" ref="base.user_admin"/> @@ -296,10 +291,9 @@ <field name="name">Advanced lead management : tips and tricks from the fields</field> <field name="is_published" eval="True"/> <field name="event_id" ref="event.event_0"/> - <field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 09:00:00')"></field> + <field name="date" eval="(DateTime.now() + timedelta(days=3, hours=1, minutes=5)).strftime('%Y-%m-%d 08:00:00')"></field> <field name="location_id" ref="website_event_track.event_track_location9"/> <field name="duration" eval="0.5"/> - <field name="color">5</field> <field name="partner_id" ref="base.res_partner_4"/> <field name="stage_id" ref="event_track_stage1"/> <field name="user_id" ref="base.user_admin"/> @@ -308,7 +302,7 @@ <field name="name">New Certification Program</field> <field name="is_published" eval="True"/> <field name="event_id" ref="event.event_0"/> - <field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 10:00:00')"></field> + <field name="date" eval="(DateTime.now() + timedelta(days=3, hours=5, minutes=5)).strftime('%Y-%m-%d 08:00:00')"></field> <field name="location_id" ref="website_event_track.event_track_location9"/> <field name="duration" eval="0.5"/> <field name="partner_id" ref="base.res_partner_3"/> @@ -319,10 +313,9 @@ <field name="name">House of World Cultures</field> <field name="is_published" eval="True"/> <field name="event_id" ref="event.event_0"/> - <field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 10:30:00')"></field> + <field name="date" eval="(DateTime.now() + timedelta(days=4, hours=1, minutes=5)).strftime('%Y-%m-%d 08:00:00')"></field> <field name="location_id" ref="website_event_track.event_track_location9"/> <field name="duration" eval="0.5"/> - <field name="color">7</field> <field name="stage_id" ref="event_track_stage1"/> <field name="user_id" ref="base.user_admin"/> </record> @@ -330,7 +323,7 @@ <field name="name">Minimal but efficient design</field> <field name="is_published" eval="True"/> <field name="event_id" ref="event.event_0"/> - <field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 11:00:00')"></field> + <field name="date" eval="(DateTime.now() + timedelta(days=4, hours=4, minutes=5)).strftime('%Y-%m-%d 08:00:00')"></field> <field name="location_id" ref="website_event_track.event_track_location9"/> <field name="duration" eval="0.5"/> <field name="partner_id" ref="base.res_partner_3"/> @@ -341,7 +334,7 @@ <field name="name">Key Success factors selling our furniture</field> <field name="is_published" eval="True"/> <field name="event_id" ref="event.event_0"/> - <field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 07:00:00')"></field> + <field name="date" eval="(DateTime.now() + timedelta(days=4, hours=5, minutes=5)).strftime('%Y-%m-%d 08:00:00')"></field> <field name="location_id" ref="website_event_track.event_track_location9"/> <field name="duration" eval="0.5"/> <field name="partner_id" ref="base.res_partner_1"/> @@ -352,7 +345,7 @@ <field name="name">Design contest (entire day)</field> <field name="is_published" eval="True"/> <field name="event_id" ref="event.event_0"/> - <field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 06:00:00')"></field> + <field name="date" eval="(DateTime.now() + timedelta(days=1, hours=1, minutes=25)).strftime('%Y-%m-%d 08:00:00')"></field> <field name="location_id" ref="website_event_track.event_track_location10"/> <field name="duration" eval="1.5"/> <field name="partner_id" ref="base.res_partner_18"/> @@ -363,7 +356,7 @@ <field name="name">Design contest (entire afternoon)</field> <field name="is_published" eval="True"/> <field name="event_id" ref="event.event_0"/> - <field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 08:30:00')"></field> + <field name="date" eval="(DateTime.now() + timedelta(days=1, hours=1, minutes=55)).strftime('%Y-%m-%d 08:00:00')"></field> <field name="location_id" ref="website_event_track.event_track_location10"/> <field name="duration" eval="2.5"/> <field name="partner_id" ref="base.res_partner_18"/> @@ -374,18 +367,17 @@ <field name="name">My Company global presentation</field> <field name="is_published" eval="True"/> <field name="event_id" ref="event.event_0"/> - <field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 04:00:00')"></field> + <field name="date" eval="(DateTime.now() + timedelta(days=1, hours=3, minutes=5)).strftime('%Y-%m-%d 08:00:00')"></field> <field name="duration" eval="1"/> <field name="partner_id" ref="base.res_partner_1"/> <field name="stage_id" ref="event_track_stage3"/> - <field name="color">3</field> <field name="user_id" ref="base.user_admin"/> </record> <record id="event_track28" model="event.track"> <field name="name">Status & Strategy</field> <field name="is_published" eval="True"/> <field name="event_id" ref="event.event_0"/> - <field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 05:00:00')"></field> + <field name="date" eval="(DateTime.now() + timedelta(days=1, hours=4, minutes=5)).strftime('%Y-%m-%d 08:00:00')"></field> <field name="duration" eval="0.5"/> <field name="partner_id" ref="base.res_partner_2"/> <field name="stage_id" ref="event_track_stage2"/> @@ -395,18 +387,17 @@ <field name="name">The new marketing strategy</field> <field name="is_published" eval="True"/> <field name="event_id" ref="event.event_0"/> - <field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 05:30:00')"></field> + <field name="date" eval="(DateTime.now() + timedelta(days=2, hours=1, minutes=5)).strftime('%Y-%m-%d 08:00:00')"></field> <field name="duration" eval="0.25"/> <field name="partner_id" ref="base.res_partner_2"/> <field name="stage_id" ref="event_track_stage2"/> - <field name="color">6</field> <field name="user_id" ref="base.user_admin"/> </record> <record id="event_track30" model="event.track"> <field name="name">Morning break</field> <field name="is_published" eval="True"/> <field name="event_id" ref="event.event_0"/> - <field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 05:45:00')"></field> + <field name="date" eval="(DateTime.now() + timedelta(days=2, hours=4, minutes=5)).strftime('%Y-%m-%d 08:00:00')"></field> <field name="duration" eval="0.25"/> <field name="stage_id" ref="event_track_stage1"/> <field name="user_id" ref="base.user_admin"/> @@ -415,7 +406,7 @@ <field name="name">Lunch</field> <field name="is_published" eval="True"/> <field name="event_id" ref="event.event_0"/> - <field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 07:30:00')"></field> + <field name="date" eval="(DateTime.now() + timedelta(days=2, hours=16, minutes=5)).strftime('%Y-%m-%d 08:00:00')"></field> <field name="duration" eval="1"/> <field name="stage_id" ref="event_track_stage1"/> <field name="user_id" ref="base.user_admin"/> 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 @@ <record id="event_track_stage0" model="event.track.stage"> <field name="name">Proposal</field> <field name="sequence">1</field> + <field name="color">1</field> </record> <record id="event_track_stage1" model="event.track.stage"> <field name="name">Confirmed</field> <field name="sequence">2</field> <field name="mail_template_id" ref="mail_template_data_track_confirmation"/> + <field name="color">2</field> </record> <record id="event_track_stage2" model="event.track.stage"> <field name="name">Announced</field> <field name="sequence">3</field> + <field name="color">3</field> </record> <record id="event_track_stage3" model="event.track.stage"> <field name="name">Published</field> 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 @@ <filter string="Stage" name="stage" context="{'group_by': 'stage_id'}"/> <filter string="Date" name="date" context="{'group_by': 'date'}"/> <filter string="Event" name="event" context="{'group_by': 'event_id'}"/> + <filter string="Room" name="location" context="{'group_by': 'location_id'}"/> </group> </search> </field> @@ -195,6 +196,7 @@ <field name="name">Event Tracks</field> <field name="res_model">event.track</field> <field name="view_mode">kanban,tree,form,calendar,graph,activity</field> + <field name="context">{'search_default_location': 1}</field> <field name="help" type="html"> <p class="o_view_nocontent_smiling_face"> Add a new track @@ -208,7 +210,7 @@ <field name="res_model">event.track</field> <field name="name">Event Tracks</field> <field name="view_mode">kanban,tree,form,calendar,graph,activity</field> - <field name="context">{'search_default_event_id': active_id, 'default_event_id': active_id, 'group_by': 'stage_id'}</field> + <field name="context">{'search_default_event_id': active_id, 'default_event_id': active_id, 'search_default_location': 1}</field> <field name="help" type="html"> <p class="o_view_nocontent_smiling_face"> Add a new track @@ -393,6 +395,7 @@ <field name="fold"/> <field name="is_done"/> <field name="is_cancel"/> + <field name="color" widget="color_picker"/> </group> </group> </sheet> 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 @@ <button name="%(action_event_track_from_event)d" type="action" class="oe_stat_button" - icon="fa-inbox"> + icon="fa-inbox" + context="{'default_date': date_begin}"> <field name="track_count" string="Tracks" widget="statinfo"/> </button> <button name="%(action_event_sponsor_from_event)d" |