diff --git a/__manifest__.py b/__manifest__.py index 43a82b4..ecbe989 100644 --- a/__manifest__.py +++ b/__manifest__.py @@ -64,6 +64,7 @@ 'views/webclient_templates.xml', 'views/auth_signup_login_templates.xml', 'views/website_templates.xml', + 'views/media.xml', #'views/payment_views.xml' diff --git a/models/event.py b/models/event.py index b1f84e5..3b23cf4 100644 --- a/models/event.py +++ b/models/event.py @@ -389,10 +389,10 @@ class KalachakraEvent(models.Model): ondelete='restrict', default=_default_currency ) - media_link_ids=fields.One2many( - 'event.media.link', + media_session_ids=fields.One2many( + 'event.media.session', 'event_id', - string='Media links' + string='Media sessions' ) diff --git a/models/event_media_link.py b/models/event_media_link.py index c0f2fa1..5ebcda9 100644 --- a/models/event_media_link.py +++ b/models/event_media_link.py @@ -2,16 +2,33 @@ 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' + + sequence = fields.Integer(string='Session') + description=fields.Char('Description') + event_id=fields.Many2one('event.event') + media_link_ids=fields.One2many( + 'event.media.link', + 'media_session_id', + string='Media link' + + ) + 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 = fields.Char('Link') + 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') duration=fields.Float('Duration') description=fields.Char('Description') - event_id=fields.Many2one('event.event') + media_session_id=fields.Many2one('event.media.session') + #language=fields.Selection(string='Language',selection=[('fr','fr'),('en','en')]) \ No newline at end of file diff --git a/models/membership.py b/models/membership.py index 3e7fbaf..77b4880 100644 --- a/models/membership.py +++ b/models/membership.py @@ -146,14 +146,19 @@ class kalachakra_membership(models.Model): return transaction def update_membership(self): - if self.end_date>=datetime.now().date() and self.payment_state=='paid': - member_status='member' - else: - member_status='not member' + member=self.env['kalachakra.membership'].search([('partner_id','=', int(self.partner_id)),('end_date','>=',datetime.now()),('payment_state','=','paid')]) + if member : self.partner_id.member_status='member' + else :self.partner_id.member_status='not member' + if self.partner_id.super_member: rec.member_status='super member' + + # if self.end_date>=datetime.now().date() and self.payment_state=='paid': + # member_status='member' + # else: + # member_status='not member' - if self.partner_id.super_member==False: - self.partner_id.member_status=member_status + # if self.partner_id.super_member==False: + # self.partner_id.member_status=member_status return True diff --git a/security/ir.model.access.csv b/security/ir.model.access.csv index 67ebc52..e5244f4 100644 --- a/security/ir.model.access.csv +++ b/security/ir.model.access.csv @@ -23,3 +23,7 @@ access_event_membership_product,event.membership_product,model_event_membership_ 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_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 diff --git a/views/event.xml b/views/event.xml index 92cc647..71eaf75 100644 --- a/views/event.xml +++ b/views/event.xml @@ -114,17 +114,14 @@ - + - - - - - - - - + + + + + diff --git a/views/event_templates_page_registration.xml b/views/event_templates_page_registration.xml index 9e4fc29..dbd7cd4 100644 --- a/views/event_templates_page_registration.xml +++ b/views/event_templates_page_registration.xml @@ -49,32 +49,45 @@