[IMP] study_base: prevent opening of progress_status from a study

studies_base/__init__.py

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

studies_base/__manifest__.py

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

studies_base/models/study_progress_status.py

@@ -17,6 +17,11 @@ 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")
-    date_begin = fields.Date("Date de début de l'état")
-    date_end = fields.Date("Date de fin de l'état")
+    actual = fields.Boolean("Statut actuel", compute="_compute_actual")
+    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.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
-from odoo import api, fields, models, _
-from odoo import osv
-from odoo.exceptions import UserError
+from odoo import api, fields, models
 
 
 class StudyQuestionnaire(models.Model):
@@ -35,11 +33,34 @@ class StudyQuestionnaire(models.Model):
     copyright = fields.Text("Copyright")
     copyright_label = fields.Char("Propriétaire et année du copyright")
 
-    created = fields.Datetime("Created")
-    date = fields.Datetime("Date")
+    created = fields.Datetime("Created", compute="_compute_created", readonly=True)
+    date = fields.Datetime("Date", compute="_compute_updated", readonly=True)
+
+    @api.depends("create_date")
+    def _compute_created(self):
+        for record in self:
+            if not record.created:
+                record.created = record.create_date
+
+    @api.depends("write_date")
+    def _compute_updated(self):
+        for record in self:
+            record.date = record.write_date
 
     active = fields.Boolean("Actif", default=True)
 
     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):
+        result = []
+        for questionnaire in self:
+            if not questionnaire.name:
+                result.append((questionnaire.id, questionnaire.title))
+            else:
+                result.append(
+                    (questionnaire.id, f"[{questionnaire.name}] {questionnaire.title}")
+                )
+        return result

studies_base/models/study_study.py

@@ -2,6 +2,9 @@
 from odoo import api, fields, models, _
 from odoo import osv
 from odoo.exceptions import UserError
+import logging
+
+_logger = logging.getLogger(__name__)
 
 
 class StudyStudy(models.Model):
@@ -10,11 +13,14 @@ class StudyStudy(models.Model):
     title = fields.Char("Nom de l'étude")
     name = fields.Char("Acronyme")
 
-    period_start = fields.Date("Début de l'étude")
-    period_end = fields.Date("Fin de l'étude")
+    period_start = fields.Datetime("Début de l'étude")
+    period_end = fields.Datetime("Fin de l'étude")
     progress_status_id = fields.Many2one(
-        "study.progress.status", string="Avancement de l'étude"
-    )  # should be computed to actual progress status
+        "study.progress.status",
+        string="Avancement de l'étude",
+        domain="[('study_id', '=', id)]",
+        compute="_compute_progress_status_id"
+    )
     progress_status = fields.One2many(
         "study.progress.status", "study_id", "All progress status"
     )
@@ -72,15 +78,43 @@ class StudyStudy(models.Model):
 
     note = fields.Text("Annotations")
 
-    created = fields.Datetime("Created")
-    updated = fields.Datetime("Updated")
-
+    created = fields.Datetime(
+        "Created", readonly=True, compute="_compute_created", store=True
+    )
+    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):
+        for record in self:
+            if not record.created:
+                record.created = record.create_date
+
+    @api.depends("write_date")
+    def _compute_updated(self):
+        for record in self:
+            _logger.info(f"Record ID: {record.id}, write_date: {record.write_date}")
+            record.updated = record.write_date
+
+    @api.depends("progress_status")
+    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):
-        return [(study.id, f"[{study.name}] {study.title}") for study in self]
+
+@api.depends("title", "name")
+def name_get(self):
+    result = []
+    for study in self:
+        if not study.name:
+            result.append((study.id, study.title))
+        else:
+            result.append((study.id, f"[{study.name}] {study.title}"))
+    return result

studies_base/security/ir.model.access.csv

@@ -22,4 +22,5 @@ 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_questionnaire_views.xml

@@ -3,13 +3,13 @@
     <!-- TREE VIEW -->
     <record id="view_study_questionnaire_tree" model="ir.ui.view">
         <field name="name">study.questionnaire.tree</field>
-        <field name="model">study.questionnaire</field>        
+        <field name="model">study.questionnaire</field>
         <field name="arch" type="xml">
-            <tree string="Questionnaires">                
-                <field name="title"/>            
-                <field name="name"/>            
-                <field name="effective_period_start"/>            
-                <field name="effective_period_end"/>                            
+            <tree string="Questionnaires">
+                <field name="title"/>
+                <field name="name"/>
+                <field name="effective_period_start"/>
+                <field name="effective_period_end"/>
             </tree>
         </field>
     </record>
@@ -17,7 +17,7 @@
     <!-- FORM VIEW -->
     <record id="view_study_questionnaire_form" model="ir.ui.view">
         <field name="name">study.questionnaire.form</field>
-        <field name="model">study.questionnaire</field>        
+        <field name="model">study.questionnaire</field>
         <field name="arch" type="xml">
             <form string="Questionnaire">
                 <header>
@@ -27,7 +27,7 @@
                     <div class="oe_button_box" name="button_box">
                         <!-- big buttons -->
                     </div>
-                
+
                     <div class="oe_title">
                         <h1>
                             <label for="title" string="Nom du questionnaire" /><field name="title" />
@@ -49,7 +49,7 @@
                     <group name="description" string="Description">
                         <group name="description_left">
                             <field name="purpose" />
-                            <field name="subject_type" widget="many2many_tags" />                            
+                            <field name="subject_type" widget="many2many_tags" />
                         </group>
                         <group name="description_right">
                             <field name="description" />
@@ -66,29 +66,43 @@
                         </group>
                         <group name="technique_right">
                             <field name="identifier_primary_id" />
-                            <field name="create_date" />
-                            <field name="write_date" />
+                            <field name="created" />
+                            <field name="date" />
                         </group>
                     </group>
-                    <notebook>                        
+                    <notebook>
                         <page string="Copyright" name="copyright">
                             <group name="copyright">
                                 <field name="copyright" />
                                 <field name="copyright_label" />
                             </group>
-                        </page>                        
+                        </page>
                     </notebook>
                 </sheet>
             </form>
         </field>
     </record>
-       
-        
+
+
     <!-- ACTIONS -->
     <record id="action_study_questionnaire" model="ir.actions.act_window">
         <field name="name">Questionnaires</field>
         <field name="type">ir.actions.act_window</field>
-        <field name="res_model">study.questionnaire</field>        
+        <field name="res_model">study.questionnaire</field>
+    </record>
+
+    <!-- SEARCH VIEW -->
+    <record id="view_study_questionnaire_search" model="ir.ui.view">
+        <field name="name">study.questionnaire.search</field>
+        <field name="model">study.questionnaire</field>
+        <field name="arch" type="xml">
+            <search string="Questionnaires">
+                <field name="title" string="Nom"/>
+                <field name="name" string="Acronyme"/>
+                <field name="identifier_primary_id" string="Seintinelles ID"/>
+                <field name="effective_period_start" string="Effective Start"/>
+                <field name="effective_period_end" string="Effective End"/>
+            </search>
+        </field>
     </record>
-        
 </odoo>

studies_base/views/study_study_views.xml

@@ -3,14 +3,14 @@
     <!-- TREE VIEW -->
     <record id="view_study_study_tree" model="ir.ui.view">
         <field name="name">study.study.tree</field>
-        <field name="model">study.study</field>        
+        <field name="model">study.study</field>
         <field name="arch" type="xml">
-            <tree string="Études">                
-                <field name="title"/>            
-                <field name="name"/>            
-                <field name="period_start"/>            
-                <field name="period_end"/>            
-                <field name="progress_status_id"/>                
+            <tree string="Études">
+                <field name="title"/>
+                <field name="name"/>
+                <field name="period_start"/>
+                <field name="period_end"/>
+                <field name="progress_status_id"/>
             </tree>
         </field>
     </record>
@@ -18,17 +18,22 @@
     <!-- FORM VIEW -->
     <record id="view_study_study_form" model="ir.ui.view">
         <field name="name">study.study.form</field>
-        <field name="model">study.study</field>        
+        <field name="model">study.study</field>
         <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">
                         <!-- big buttons -->
                     </div>
-                
+
                     <div class="oe_title">
                         <h1>
                             <label for="title" string="Nom de l'étude" /><field name="title" />
@@ -41,21 +46,21 @@
                         <group name="study_status_left">
                             <field name="period_start" />
                             <field name="period_end" />
-                            <field name="progress_status_id" />
+                            <field name="progress_status_id" options="{'no_open': True}" />
                         </group>
                         <group name="study_status_right">
-                            
+
                         </group>
                     </group>
                     <group name="description" string="Description">
-                        <group name="description_left">  
-                            <field name="description_summary" />                          
+                        <group name="description_left">
+                            <field name="description_summary" />
                             <field name="description" />
                             <field name="keywords" widget="many2many_tags" />
                         </group>
                         <group name="description_right">
-                            <field name="primary_purpose_type" />     
-                            <field name="part_of" />                            
+                            <field name="primary_purpose_type" />
+                            <field name="part_of" />
                             <field name="version" />
                             <field name="phase" />
                             <field name="status" />
@@ -63,13 +68,13 @@
                     </group>
                     <group name="technique" string="Technique">
                         <group name="technique_left">
-                            <field name="site" />                            
+                            <field name="site" />
                             <field name="identifier_author" />
                         </group>
                         <group name="technique_right">
                             <field name="identifier_primary_id" />
-                            <field name="create_date" />
-                            <field name="write_date" />
+                            <field name="created" />
+                            <field name="updated" />
                         </group>
                     </group>
                     <notebook>
@@ -92,22 +97,47 @@
                                     <field name="region" widget="many2many_tags" />
                                 </group>
                             </group>
-                        </page>                                                
+                        </page>
                         <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>
         </field>
     </record>
-       
-        
+
+
     <!-- ACTIONS -->
     <record id="action_study_study" model="ir.actions.act_window">
         <field name="name">Études</field>
         <field name="type">ir.actions.act_window</field>
-        <field name="res_model">study.study</field>        
+        <field name="res_model">study.study</field>
     </record>
-        
-</odoo>
+
+    <!-- SEARCH -->
+    <record id="view_study_study_search" model="ir.ui.view">
+        <field name="name">study.study.search</field>
+        <field name="model">study.study</field>
+        <field name="arch" type="xml">
+            <search string="Études">
+                <field name="title" string="Nom de l'étude" />
+                <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>

studies_base/wizards/__init__.py

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

studies_base/wizards/create_progress_status.py

@@ -0,0 +1,28 @@
+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

@@ -0,0 +1,30 @@
+<?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>