From 93a16893a92c442d5f8a39bcdc7fb80e314fc47a Mon Sep 17 00:00:00 2001 From: root Date: Sun, 25 Sep 2022 16:59:48 +0200 Subject: [PATCH] event media records --- models/booking_event.py | 3 +- models/event.py | 7 +- models/event_media_link.py | 41 ++++++---- security/ir.model.access.csv | 12 +-- views/booking_event.xml | 2 + views/event.xml | 6 +- views/event_templates_list.xml | 10 ++- views/event_templates_page_registration.xml | 87 +++++++++++++++------ views/media.xml | 43 ++++++---- 9 files changed, 145 insertions(+), 66 deletions(-) diff --git a/models/booking_event.py b/models/booking_event.py index 20cca73..bc6516a 100755 --- a/models/booking_event.py +++ b/models/booking_event.py @@ -8,7 +8,7 @@ from werkzeug import utils class EventType(models.Model): _inherit = "event.type" _description = 'Event Template' - + booking_event = fields.Boolean(string="Booking event", tracking=True) booking_option_ids=fields.One2many('booking.option','event_type_id','booking options') booking_questionnaire_id=fields.Many2one( @@ -77,6 +77,7 @@ class EventBookingOptions(models.Model): class BookingEvent(models.Model): _inherit = "event.event" _description = 'Event' + individual_booking_event=fields.Boolean(string="individual booking event", tracking=True) questionnaire_id=fields.Many2one('booking.questionnaire','questionnaire') question_ids=fields.One2many( 'event.question', diff --git a/models/event.py b/models/event.py index 8dbce0c..375b1f2 100755 --- a/models/event.py +++ b/models/event.py @@ -395,12 +395,13 @@ class KalachakraEvent(models.Model): ondelete='restrict', default=_default_currency ) - media_session_ids=fields.One2many( - 'event.media.session', + teaching_day_ids=fields.One2many( + 'event.teaching.day', 'event_id', - string='Media sessions' + string='teaching days' ) + teaching_html_content_records=fields.Html('teaching content records') def add_event_to_google_agenda(self): diff --git a/models/event_media_link.py b/models/event_media_link.py index 5ebcda9..cf0a507 100755 --- a/models/event_media_link.py +++ b/models/event_media_link.py @@ -2,17 +2,19 @@ from odoo import models, fields, api from odoo.exceptions import UserError, ValidationError,Warning -class event_media_session(models.Model): - _name = 'event.media.session' - _description = 'event media session' +class event_teaching_day(models.Model): + _name = 'event.teaching.day' + _description = 'event teaching day' - sequence = fields.Integer(string='Session') + sequence = fields.Integer(string='order') + day_teaching = fields.Date('Teaching Day') description=fields.Char('Description') event_id=fields.Many2one('event.event') - media_link_ids=fields.One2many( - 'event.media.link', - 'media_session_id', - string='Media link' + + teaching_session_ids=fields.One2many( + 'event.teaching.session', + 'teaching_day_id', + string='Teaching session' ) @@ -20,15 +22,22 @@ class event_media_link(models.Model): _name = 'event.media.link' _description = 'event media link' - session_id=fields.Many2one('media.session') - date_recording = fields.Date('Recording date') - start_time_recording = fields.Float('Recording start time') - link_fr = fields.Char('FR Link') - link_en = fields.Char('EN Link') - format_recording =fields.Selection(string='Format',selection=[('audio','audio'),('video','video')],required=True, default='video') +class event_teaching_session(models.Model): + _name = 'event.teaching.session' + _description = 'event teaching session' + + #teaching_session_id=fields.Many2one('event.teaching.day') + #date_recording = fields.Date('Recording date') + #start_time_recording = fields.Float('Recording start time') + description_fr=fields.Char('Description FR') + description_en=fields.Char('Description EN') duration=fields.Float('Duration') - description=fields.Char('Description') - media_session_id=fields.Many2one('event.media.session') + link_audio_fr = fields.Char('FR audio link') + link_audio_en = fields.Char('EN audio link') + link_video_fr = fields.Char('FR video link') + link_video_en = fields.Char('EN video link') + # format_recording =fields.Selection(string='Format',selection=[('audio','audio'),('video','video')],required=True, default='video') + teaching_day_id=fields.Many2one('event.teaching.day') #language=fields.Selection(string='Language',selection=[('fr','fr'),('en','en')]) \ No newline at end of file diff --git a/security/ir.model.access.csv b/security/ir.model.access.csv index e5244f4..5f6ac2f 100755 --- a/security/ir.model.access.csv +++ b/security/ir.model.access.csv @@ -20,10 +20,10 @@ access_event_partner_category,event.partner_category,model_event_partner_categor access_event_membership_product,event.membership_product,model_event_membership_product,base.group_user,1,1,1,1 -access_event_media_link,event_media_link,model_event_media_link,base.group_user,1,1,1,1 -access_event_media_link_public,event_media_link_public,model_event_media_link,base.group_public,1,0,0,0 -access_event_media_link_portal,event_media_link_portal,model_event_media_link,base.group_portal,1,0,0,0 +access_event_teaching_session,event_teaching_session,model_event_teaching_session,base.group_user,1,1,1,1 +access_event_teaching_session_public,event_teaching_session_public,model_event_teaching_session,base.group_public,1,0,0,0 +access_event_teaching_session_portal,event_teaching_session_portal,model_event_teaching_session,base.group_portal,1,0,0,0 -access_event_media_session,event_media_dession,model_event_media_session,base.group_user,1,1,1,1 -access_event_media_session_public,event_media_session_public,model_event_media_session,base.group_public,1,0,0,0 -access_event_media_session_portal,event_media_session_portal,model_event_media_session,base.group_portal,1,0,0,0 +access_event_teaching_day,event_media_dession,model_event_teaching_day,base.group_user,1,1,1,1 +access_event_teaching_day_public,event_teaching_day_public,model_event_teaching_day,base.group_public,1,0,0,0 +access_event_teaching_day_portal,event_teaching_day_portal,model_event_teaching_day,base.group_portal,1,0,0,0 diff --git a/views/booking_event.xml b/views/booking_event.xml index 0c6eb73..7c86da7 100755 --- a/views/booking_event.xml +++ b/views/booking_event.xml @@ -78,9 +78,11 @@
+
diff --git a/views/event.xml b/views/event.xml index 8f4db13..53189e9 100755 --- a/views/event.xml +++ b/views/event.xml @@ -171,11 +171,13 @@ - + - + + + diff --git a/views/event_templates_list.xml b/views/event_templates_list.xml index b02e8eb..9a588b4 100755 --- a/views/event_templates_list.xml +++ b/views/event_templates_list.xml @@ -110,6 +110,14 @@