[FIX] studies_base: handle get_name for recordsets

studies_base/__init__.py

@@ -1,2 +1 @@
-from . import models
+from . import models
-from . import wizards

studies_base/__manifest__.py

@@ -12,19 +12,18 @@
     "summary": "Module containing base fields and views for studies",
     # any module necessary for this one to work correctly
     "depends": [
-        "base",
+        "base",       
-        "partner_firstname"
+        "partner_firstname"       
     ],
     "qweb": [],
     "external_dependencies": {
         "python": [],
     },
     # always loaded
-    "data": [
+    "data": [        
-        # "security/security.xml",
+        # "security/security.xml",        
-        "data/studies_base_data.xml",
+        "data/studies_base_data.xml",       
-        "security/ir.model.access.csv",
+        "security/ir.model.access.csv",       
-        "wizards/create_progress_status.xml",
         "views/study_config_views.xml",
         "views/study_study_views.xml",
         "views/study_progress_status_views.xml",
@@ -42,4 +41,4 @@
     # and independently installed.  Used for synergetic or glue modules.
     "auto_install": False,
     "application": False,
-}
+}

studies_base/data/studies_base_data.xml

@@ -172,7 +172,7 @@
         </record>
 
         <record id="study_questionnaire_subject_type_PRACTITIONER" model="study.questionnaire.subject.type">
-            <field name="name">Praticien</field>
+            <field name="name">Praticient</field>
             <field name="value">PRACTITIONER</field>
         </record>
 

studies_base/models/study_participant.py

@@ -34,17 +34,3 @@ class StudyParticipant(models.Model):
     updated = fields.Datetime("Date mise à jour")
 
     active = fields.Boolean("Actif", default=True)
-
-    @api.depends("write_date")
-    def _compute_updated(self):
-        for record in self:
-            ## XXXb0g : the following two lines are to be removed when all records will have been updated during migration
-            # if record.updated:
-            #    continue
-            record.updated = record.write_date
-
-    @api.depends("create_date")
-    def _compute_created(self):
-        for record in self:
-            if not record.created:
-                record.created = record.create_date

studies_base/models/study_progress_status.py

@@ -17,11 +17,6 @@ class StudyProgressStatus(models.Model):
         ('ACTIVE-BUT-NOT-RECRUITING', 'Active mais ne recrute plus'), 
         ('COMPLETED', 'Terminée'), 
         ('WITHDRAWN', 'Annulé')], string="Avancement de l'étude")
-    actual = fields.Boolean("Statut actuel", compute="_compute_actual")
+    actual = fields.Boolean("Statut actuel")
     date_begin = fields.Datetime("Date de début de l'état")
     date_end = fields.Datetime("Date de fin de l'état")
-
-    @api.depends("date_end")
-    def _compute_actual(self):
-        for record in self:
-            record.actual = (record.date_end is False) or (record.state == "COMPLETED")

studies_base/models/study_questionnaire_response.py

@@ -34,17 +34,3 @@ class StudyQuestionnaireResponse(models.Model):
     updated = fields.Datetime("Date mise à jour")
 
     active = fields.Boolean("Actif", default=True)
-
-    @api.depends("write_date")
-    def _compute_updated(self):
-        for record in self:
-            ## XXXb0g : the following two lines are to be removed when all records will have been updated during migration
-            # if record.updated:
-            #    continue
-            record.updated = record.write_date
-
-    @api.depends("create_date")
-    def _compute_created(self):
-        for record in self:
-            if not record.created:
-                record.created = record.create_date

studies_base/models/study_study.py

@@ -19,8 +19,7 @@ class StudyStudy(models.Model):
         "study.progress.status",
         string="Avancement de l'étude",
         domain="[('study_id', '=', id)]",
-        compute="_compute_progress_status_id",
+    )  # should be computed to actual progress status
-    )
     progress_status = fields.One2many(
         "study.progress.status", "study_id", "All progress status"
     )
@@ -84,7 +83,6 @@ class StudyStudy(models.Model):
     updated = fields.Datetime(
         "Updated", readonly=True, compute="_compute_updated", store=True
     )
-    active = fields.Boolean("Actif", default=True)
 
     @api.depends("create_date")
     def _compute_created(self):
@@ -98,28 +96,19 @@ class StudyStudy(models.Model):
             _logger.info(f"Record ID: {record.id}, write_date: {record.write_date}")
             record.updated = record.write_date
 
-    @api.depends("progress_status")
+    active = fields.Boolean("Actif", default=True)
-    def _compute_progress_status_id(self):
-        for record in self:
-            unfinished_progress_status = record.progress_status.filtered(
-                lambda x: x.actual == True
-            )
-            record.progress_status_id = (
-                unfinished_progress_status.id
-                if len(unfinished_progress_status) == 1
-                else None
-            )
 
     def copy(self, default=None):
         default = dict(default or {}, identifier_primary_id=None)
         return super().copy(default)
 
-    @api.depends("title", "name")
+
-    def name_get(self):
+@api.depends("title", "name")
-        result = []
+def name_get(self):
-        for study in self:
+    result = []
-            if not study.name:
+    for study in self:
-                result.append((study.id, study.title))
+        if not study.name:
-            else:
+            result.append((study.id, study.title))
-                result.append((study.id, f"[{study.name}] {study.title}"))
+        else:
-        return result
+            result.append((study.id, f"[{study.name}] {study.title}"))
+    return result

studies_base/security/ir.model.access.csv

@@ -22,5 +22,4 @@ access_study_questionnaire_status_admin,study.questionnaire.status.admin,model_s
 access_study_participant_progress_status_admin,study.participant.progress.status.admin,model_study_participant_progress_status,base.group_user,1,1,1,1
 access_study_participant_state_admin,study.participant.state.admin,model_study_participant_state,base.group_user,1,1,1,1
 access_study_questionnaire_response_progress_status_admin,study.questionnaire.response.progress.status.admin,model_study_questionnaire_response_progress_status,base.group_user,1,1,1,1
-access_study_author_admin,study.author.admin,model_study_author,base.group_user,1,1,1,1
+access_study_author_admin,study.author.admin,model_study_author,base.group_user,1,1,1,1
-access_create_progress_status_wizard,create_progress_status_wizard.access,model_create_progress_status,base.group_user,1,1,1,0

studies_base/views/study_participant_views.xml

@@ -3,13 +3,13 @@
     <!-- TREE VIEW -->
     <record id="view_study_participant_tree" model="ir.ui.view">
         <field name="name">study.participant.tree</field>
-        <field name="model">study.participant</field>
+        <field name="model">study.participant</field>        
         <field name="arch" type="xml">
-            <tree string="Participants">
+            <tree string="Participants">                
-                <field name="part_of"/>
+                <field name="part_of"/>            
-                <field name="subject"/>
+                <field name="subject"/>            
-                <field name="firstname"/>
+                <field name="firstname"/>            
-                <field name="lastname"/>
+                <field name="lastname"/>            
             </tree>
         </field>
     </record>
@@ -17,7 +17,7 @@
     <!-- FORM VIEW -->
     <record id="view_study_participant_form" model="ir.ui.view">
         <field name="name">study.participant.form</field>
-        <field name="model">study.participant</field>
+        <field name="model">study.participant</field>        
         <field name="arch" type="xml">
             <form string="Participant">
                 <header>
@@ -27,7 +27,7 @@
                     <div class="oe_button_box" name="button_box">
                         <!-- big buttons -->
                     </div>
-
+                
                     <div class="oe_title">
                         <h1>
                             <label for="identifier_primary_id" string="Idientifiant Seintinelles" /><field name="identifier_primary_id" />
@@ -43,7 +43,7 @@
                             <field name="firstname" />
                         </group>
                         <group name="participant_right">
-
+                            
                         </group>
                     </group>
                     <group name="participation" string="Participation">
@@ -51,30 +51,30 @@
                             <field name="progress_status" />
                             <field name="state" />
                         </group>
-                        <group name="participation_right">
+                        <group name="participation_right">                            
                             <field name="identifier" />
                         </group>
-                    </group>
+                    </group>                    
                     <group name="technique" string="Technique">
                         <group name="technique_left">
-                            <field name="created" />
+                            <field name="create_date" />
-                            <field name="updated" />
+                            <field name="write_date" />
                         </group>
                         <group name="technique_right">
                         </group>
                     </group>
-
+                    
                 </sheet>
             </form>
         </field>
     </record>
-
+       
-
+        
     <!-- ACTIONS -->
     <record id="action_study_participant" model="ir.actions.act_window">
         <field name="name">Participants</field>
         <field name="type">ir.actions.act_window</field>
-        <field name="res_model">study.participant</field>
+        <field name="res_model">study.participant</field>        
     </record>
-
+        
 </odoo>

studies_base/views/study_questionnaire_response_views.xml

@@ -61,8 +61,8 @@
                     </group>
                     <group name="technique" string="Technique">
                         <group name="technique_left">
-                            <field name="created" />
+                            <field name="create_date" />
-                            <field name="updated" />
+                            <field name="write_date" />
                         </group>
                         <group name="technique_right">
                         </group>

studies_base/views/study_study_views.xml

@@ -22,12 +22,7 @@
         <field name="arch" type="xml">
             <form string="Étude">
                 <header>
-                  <!-- action buttons -->
+                    <!-- action buttons -->
-		  <button name="%(action_create_progress_status_wizard)d"
-                          string="Update Status"
-			  class="oe_highlight"
-			  type="action"
-			  />
                 </header>
                 <sheet>
                     <div class="oe_button_box" name="button_box">
@@ -46,7 +41,7 @@
                         <group name="study_status_left">
                             <field name="period_start" />
                             <field name="period_end" />
-                            <field name="progress_status_id" options="{'no_open': True}" />
+                            <field name="progress_status_id" />
                         </group>
                         <group name="study_status_right">
 
@@ -101,16 +96,6 @@
                         <page string="Notes" name="notes">
                             <field name="note" />
                         </page>
-			<page string="Progress status" name="progress_status" groups="base.group_no_one">
-			  <field name="progress_status" nolabel="1">
-                            <tree create="false" delete="false" default_order="date_begin DESC" >
-                              <field name="state" />
-                              <field name="date_begin" />
-                              <field name="date_end" />
-                              <field name="actual" />
-                            </tree>
-			  </field>
-                        </page>
                     </notebook>
                 </sheet>
             </form>
@@ -131,21 +116,13 @@
         <field name="model">study.study</field>
         <field name="arch" type="xml">
             <search string="Études">
-                <field name="active" string="Actif" />
-                <field name="description" string="Description" />
-                <field name="identifier_author" string="ID Plateforme" />
-                <field name="identifier_primary_id" string="Seintinelles ID"/>
-                <field name="keywords" string="Mots-clés" />
-                <field name="name" string="Acronyme" />
-                <field name="period_end" string="Date de fin" />
-                <field name="period_start" string="Date de début" />
-                <field name="phase" string="Phase" />
-                <field name="progress_status_id" string="Statut" />
-                <field name="region" string="Région" />
                 <field name="title" string="Nom de l'étude" />
-                <field name="version" string="Version" />
+                <field name="name" string="Acronyme" />
+                <field name="identifier_primary_id" string="Seintinelles ID"/>
+                <field name="period_start" string="Date de début" />
+                <field name="period_end" string="Date de fin" />
             </search>
         </field>
     </record>
 
-</odoo>
+</odoo>

studies_base/wizards/__init__.py

@@ -1 +0,0 @@
-from . import create_progress_status

studies_base/wizards/create_progress_status.py

@@ -1,28 +0,0 @@
-from datetime import datetime
-from odoo import fields, models
-
-
-class CreateProgressStatus(models.TransientModel):
-    _name = "create.progress.status"
-    _description = "create Progress Status"
-
-    state = fields.Selection([
-        ('DRAFT', 'Brouillon'),
-        ('NOT-YET-RECRUITING', 'À venir'),
-        ('RECRUITING', 'En cours de recrutement'),
-        ('ACTIVE-BUT-NOT-RECRUITING', 'Active mais ne recrute plus'),
-        ('COMPLETED', 'Terminée'),
-        ('WITHDRAWN', 'Annulé')], string="Avancement de l'étude")
-
-
-    def create_progress_status(self):
-        study = self.env["study.study"].browse(self._context.get("active_ids"))
-        study.progress_status_id.date_end = datetime.now()
-        values = {
-            "study_id": study.id,
-            "state": self.state,
-            "date_begin": datetime.now(),
-            "date_end": None,
-        }
-        self.env["study.progress.status"].create(values)
-        study.write({"updated": datetime.now()})

studies_base/wizards/create_progress_status.xml

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <record id="create_progress_status_wizard_view_form" model="ir.ui.view">
-        <field name="name">create.progress.status.wizard.view.form</field>
-        <field name="model">create.progress.status</field>
-        <field name="arch" type="xml">
-            <form string="Update study progress status">
-                <sheet>
-                    <group>
-                        <field name="state" />
-                    </group>
-                </sheet>
-                <footer>
-                    <button string="Update" name="create_progress_status" type="object"
-                        class="btn-primary" />
-                    <button string="Cancel" class="btn-secondary" special="cancel" />
-                </footer>
-            </form>
-        </field>
-    </record>
-
-    <record
-        id="action_create_progress_status_wizard" model="ir.actions.act_window">
-        <field name="name">Create Progress Status</field>
-        <field name="res_model">create.progress.status</field>
-        <field name="view_mode">form</field>
-        <field name="view_id" ref="create_progress_status_wizard_view_form" />
-        <field name="target">new</field>
-    </record>
-</odoo>