6 Commits

Author SHA1 Message Date
Boris Gallet
8cb35a4640 [FIX] studies_base: handle get_name for recordsets 2025-07-28 15:24:56 +02:00
Boris Gallet
7e3946588d [FIX] studies_base: handle create and write date 2025-07-23 15:52:31 +02:00
Stéphan Sainléger
7b7031bb15 [FIX] studies_base: transforms progess status period dates in datetime fields 2025-07-21 09:51:43 +02:00
Stéphan Sainléger
202490a52e [FIX] studies_base: #OPP308 transforms study period dates in datetime fields 2025-07-21 09:51:31 +02:00
Boris Gallet
3b1800a6bf [FIX] studies_base: change correct date and name for questionnaire 2025-07-08 16:14:12 +02:00
Boris Gallet
99e3a22877 [FIX] studies_base: #OPP315 clean study name 2025-07-08 15:34:24 +02:00
9 changed files with 15 additions and 103 deletions

View File

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

View File

@@ -24,7 +24,6 @@
# "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",

View File

@@ -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")

View File

@@ -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,11 +96,7 @@ 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")
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
active = fields.Boolean("Actif", default=True)
def copy(self, default=None):
default = dict(default or {}, identifier_primary_id=None)

View File

@@ -23,4 +23,3 @@ access_study_participant_progress_status_admin,study.participant.progress.status
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_create_progress_status_wizard,create_progress_status_wizard.access,model_create_progress_status,base.group_user,1,1,1,0
1 id name model_id/id group_id/id perm_read perm_write perm_create perm_unlink
23 access_study_participant_state_admin study.participant.state.admin model_study_participant_state base.group_user 1 1 1 1
24 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
25 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

View File

@@ -22,12 +22,7 @@
<field name="arch" type="xml">
<form string="Étude">
<header>
<!-- action buttons -->
<button name="%(action_create_progress_status_wizard)d"
string="Update Status"
class="oe_highlight"
type="action"
/>
<!-- action buttons -->
</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>

View File

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

View File

@@ -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()})

View File

@@ -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>