media+ bug membership

__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'
 
         

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'
         
     )
 

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')])
 
     

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
     

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

views/event.xml

@@ -114,17 +114,14 @@
                 </group>
                 </page>
 
-                <page string="Media links" name="Media links">
+                <page string="Media sessions" name="Media sessions">
                 <group style="width:100%%">
-                
-                <field name="media_link_ids">
-                <tree editable="bottom">
-                <field name="date_recording"/>
-                <field name="start_time_recording" widget="float_time"/>
-                <field name="link"/>
-                <field name="duration" widget="float_time"/>
-                <field name="format_recording"/>
+                <field name="media_session_ids">
+                <tree>
+                <field name="sequence" widget="handle"/>
                 <field name="description"/>
+                    
+                
                 </tree>
                 </field>
                 

views/event_templates_page_registration.xml

@@ -49,32 +49,45 @@
 <template id="kalachakra.event_description_full" inherit_id="website_event.event_description_full">
 
     <xpath expr="//span[@itemprop='description']" position="before">
-        <t t-if="event.media_link_ids">
-        <h6>Media links :</h6>
-        <table class="table" style="font-size: smaller;">
-        <tr>
-        <th>date</th>
-        <th>time start</th>
-        <th style="width: 10%;">link</th>
-        <th>format</th>
-        <th>duration</th>
-        <th>format</th>
-        <th>description</th>
-        </tr>
-            <t t-foreach="event.media_link_ids" t-as="media">
-            <tr>
-            <td ><span t-esc="media.date_recording" /></td>
-            <td><span t-esc="media.start_time_recording" /></td>
-            <td><a t-attf-href="#{media.link}"><span t-esc="media.link" /></a></td>
-            <td><span t-esc="media.format_recording" /></td>
-            <td><span t-esc="media.duration" /></td>
-            <td><span t-esc="media.description" /></td>
-            
-                
-            </tr>
-            </t>
-        </table>
+        <t t-if="event.media_session_ids">
+            <h6>Media sessions recording  :</h6>
+            <t t-foreach="event.media_session_ids.sorted(key=lambda r: r.sequence)" t-as="media_session">
+                <h6 t-esc="media_session.description"></h6>
+                    <t t-if="media_session.media_link_ids">
+                        <table class="table" style="font-size: smaller;">
+                        <tr>
+                        <th>date</th>
+                        <th>description</th>
+                        <th>start time</th>
+                        <th style="width: 10%;"> FR link</th>
+                        <th style="width: 10%;"> EN link</th>
+                        <th>format</th>
+                        <th>duration</th>
+                        
+                        </tr>
+                            <t t-foreach="media_session.media_link_ids.sorted(key=lambda r: r.date_recording)" t-as="media">
+                            <tr>
+                            <td ><span t-esc="media.date_recording" /></td>
+                            <td><span t-esc="media.description" /></td>
+                            <td><span t-esc="media.start_time_recording" /></td>
+                            <td><a t-attf-href="#{media.link_fr}"><span>FR</span></a></td>
+                            <td><a t-attf-href="#{media.link_fr}"><span>EN</span></a></td>
+                            <td><span t-esc="media.format_recording" /></td>
+                            <td><span t-esc="media.duration" /></td>
+                            
+                            
+                                
+                            </tr>
+                            </t>
+                        </table>
+                    </t>
+                    <br></br>
+                    
+                </t>
         </t>
+        
+        
+        
     </xpath>
     <xpath expr="//span[@itemprop='description']" position="after">
         <t t-if="event.find_out_more_link">

views/media.xml

@@ -0,0 +1,35 @@
+<odoo>
+<record model="ir.ui.view" id="media_link_list">
+      <field name="name">media_link list</field>
+      <field name="model">event.media.link</field>
+      <field name="arch" type="xml"> 
+        <tree editable="bottom">
+            <field name="date_recording"/>
+            <field name="start_time_recording" widget="float_time"/>
+            <!-- <field name="language"/> -->
+            <field name="description"/>
+            <field name="link_fr"/>
+            <field name="link_en"/>
+            <field name="duration" widget="float_time"/>
+            <field name="format_recording"/>
+            
+          
+        </tree>
+      </field>
+    </record>
+
+    <record model="ir.ui.view" id="media_session_form">
+      <field name="name">media_session form</field>
+      <field name="model">event.media.session</field>
+      <field name="arch" type="xml">
+        <form>
+        <sheet>
+          <group>
+          <field name="description"/>
+          <field name="media_link_ids"/>
+          </group>
+        </sheet>
+        </form>
+      </field>
+    </record>
+</odoo>