Compare commits
6 Commits
16.0-progr
...
16.0-migra
Author | SHA1 | Date | |
---|---|---|---|
|
d7218bb593 | ||
|
6032220af1 | ||
|
8d9b29c1e0 | ||
|
78ec33b942 | ||
|
b474f94211 | ||
|
34759aefdc |
@@ -1 +1,2 @@
|
|||||||
from . import models
|
from . import models
|
||||||
|
from . import wizards
|
||||||
|
@@ -24,6 +24,7 @@
|
|||||||
# "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_config_views.xml",
|
||||||
"views/study_study_views.xml",
|
"views/study_study_views.xml",
|
||||||
"views/study_progress_status_views.xml",
|
"views/study_progress_status_views.xml",
|
||||||
|
@@ -172,7 +172,7 @@
|
|||||||
</record>
|
</record>
|
||||||
|
|
||||||
<record id="study_questionnaire_subject_type_PRACTITIONER" model="study.questionnaire.subject.type">
|
<record id="study_questionnaire_subject_type_PRACTITIONER" model="study.questionnaire.subject.type">
|
||||||
<field name="name">Praticient</field>
|
<field name="name">Praticien</field>
|
||||||
<field name="value">PRACTITIONER</field>
|
<field name="value">PRACTITIONER</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
|
@@ -34,3 +34,17 @@ class StudyParticipant(models.Model):
|
|||||||
updated = fields.Datetime("Date mise à jour")
|
updated = fields.Datetime("Date mise à jour")
|
||||||
|
|
||||||
active = fields.Boolean("Actif", default=True)
|
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
|
||||||
|
@@ -17,6 +17,11 @@ class StudyProgressStatus(models.Model):
|
|||||||
('ACTIVE-BUT-NOT-RECRUITING', 'Active mais ne recrute plus'),
|
('ACTIVE-BUT-NOT-RECRUITING', 'Active mais ne recrute plus'),
|
||||||
('COMPLETED', 'Terminée'),
|
('COMPLETED', 'Terminée'),
|
||||||
('WITHDRAWN', 'Annulé')], string="Avancement de l'étude")
|
('WITHDRAWN', 'Annulé')], string="Avancement de l'étude")
|
||||||
actual = fields.Boolean("Statut actuel")
|
actual = fields.Boolean("Statut actuel", compute="_compute_actual")
|
||||||
date_begin = fields.Datetime("Date de début de l'état")
|
date_begin = fields.Datetime("Date de début de l'état")
|
||||||
date_end = fields.Datetime("Date de fin 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")
|
||||||
|
@@ -36,17 +36,20 @@ class StudyQuestionnaire(models.Model):
|
|||||||
created = fields.Datetime("Created", compute="_compute_created", readonly=True)
|
created = fields.Datetime("Created", compute="_compute_created", readonly=True)
|
||||||
date = fields.Datetime("Date", compute="_compute_updated", readonly=True)
|
date = fields.Datetime("Date", compute="_compute_updated", readonly=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")
|
@api.depends("create_date")
|
||||||
def _compute_created(self):
|
def _compute_created(self):
|
||||||
for record in self:
|
for record in self:
|
||||||
if not record.created:
|
if not record.created:
|
||||||
record.created = record.create_date
|
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)
|
active = fields.Boolean("Actif", default=True)
|
||||||
|
|
||||||
def copy(self, default=None):
|
def copy(self, default=None):
|
||||||
|
@@ -34,3 +34,17 @@ class StudyQuestionnaireResponse(models.Model):
|
|||||||
updated = fields.Datetime("Date mise à jour")
|
updated = fields.Datetime("Date mise à jour")
|
||||||
|
|
||||||
active = fields.Boolean("Actif", default=True)
|
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
|
||||||
|
@@ -19,7 +19,8 @@ class StudyStudy(models.Model):
|
|||||||
"study.progress.status",
|
"study.progress.status",
|
||||||
string="Avancement de l'étude",
|
string="Avancement de l'étude",
|
||||||
domain="[('study_id', '=', id)]",
|
domain="[('study_id', '=', id)]",
|
||||||
) # should be computed to actual progress status
|
compute="_compute_progress_status_id",
|
||||||
|
)
|
||||||
progress_status = fields.One2many(
|
progress_status = fields.One2many(
|
||||||
"study.progress.status", "study_id", "All progress status"
|
"study.progress.status", "study_id", "All progress status"
|
||||||
)
|
)
|
||||||
@@ -83,6 +84,7 @@ class StudyStudy(models.Model):
|
|||||||
updated = fields.Datetime(
|
updated = fields.Datetime(
|
||||||
"Updated", readonly=True, compute="_compute_updated", store=True
|
"Updated", readonly=True, compute="_compute_updated", store=True
|
||||||
)
|
)
|
||||||
|
active = fields.Boolean("Actif", default=True)
|
||||||
|
|
||||||
@api.depends("create_date")
|
@api.depends("create_date")
|
||||||
def _compute_created(self):
|
def _compute_created(self):
|
||||||
@@ -93,16 +95,28 @@ class StudyStudy(models.Model):
|
|||||||
@api.depends("write_date")
|
@api.depends("write_date")
|
||||||
def _compute_updated(self):
|
def _compute_updated(self):
|
||||||
for record in 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
|
||||||
_logger.info(f"Record ID: {record.id}, write_date: {record.write_date}")
|
_logger.info(f"Record ID: {record.id}, write_date: {record.write_date}")
|
||||||
record.updated = record.write_date
|
record.updated = record.write_date
|
||||||
|
|
||||||
active = fields.Boolean("Actif", default=True)
|
@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):
|
def copy(self, default=None):
|
||||||
default = dict(default or {}, identifier_primary_id=None)
|
default = dict(default or {}, identifier_primary_id=None)
|
||||||
return super().copy(default)
|
return super().copy(default)
|
||||||
|
|
||||||
|
|
||||||
@api.depends("title", "name")
|
@api.depends("title", "name")
|
||||||
def name_get(self):
|
def name_get(self):
|
||||||
result = []
|
result = []
|
||||||
|
@@ -23,3 +23,4 @@ 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_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_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
|
||||||
|
|
@@ -57,8 +57,8 @@
|
|||||||
</group>
|
</group>
|
||||||
<group name="technique" string="Technique">
|
<group name="technique" string="Technique">
|
||||||
<group name="technique_left">
|
<group name="technique_left">
|
||||||
<field name="create_date" />
|
<field name="created" />
|
||||||
<field name="write_date" />
|
<field name="date" />
|
||||||
</group>
|
</group>
|
||||||
<group name="technique_right">
|
<group name="technique_right">
|
||||||
</group>
|
</group>
|
||||||
|
@@ -61,8 +61,8 @@
|
|||||||
</group>
|
</group>
|
||||||
<group name="technique" string="Technique">
|
<group name="technique" string="Technique">
|
||||||
<group name="technique_left">
|
<group name="technique_left">
|
||||||
<field name="create_date" />
|
<field name="created" />
|
||||||
<field name="write_date" />
|
<field name="date" />
|
||||||
</group>
|
</group>
|
||||||
<group name="technique_right">
|
<group name="technique_right">
|
||||||
</group>
|
</group>
|
||||||
|
@@ -23,6 +23,11 @@
|
|||||||
<form string="Étude">
|
<form string="Étude">
|
||||||
<header>
|
<header>
|
||||||
<!-- action buttons -->
|
<!-- action buttons -->
|
||||||
|
<button name="%(action_create_progress_status_wizard)d"
|
||||||
|
string="Update Status"
|
||||||
|
class="oe_highlight"
|
||||||
|
type="action"
|
||||||
|
/>
|
||||||
</header>
|
</header>
|
||||||
<sheet>
|
<sheet>
|
||||||
<div class="oe_button_box" name="button_box">
|
<div class="oe_button_box" name="button_box">
|
||||||
@@ -96,6 +101,16 @@
|
|||||||
<page string="Notes" name="notes">
|
<page string="Notes" name="notes">
|
||||||
<field name="note" />
|
<field name="note" />
|
||||||
</page>
|
</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>
|
</notebook>
|
||||||
</sheet>
|
</sheet>
|
||||||
</form>
|
</form>
|
||||||
@@ -116,11 +131,19 @@
|
|||||||
<field name="model">study.study</field>
|
<field name="model">study.study</field>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<search string="Études">
|
<search string="Études">
|
||||||
<field name="title" string="Nom de l'étude" />
|
<field name="active" string="Actif" />
|
||||||
<field name="name" string="Acronyme" />
|
<field name="description" string="Description" />
|
||||||
|
<field name="identifier_author" string="ID Plateforme" />
|
||||||
<field name="identifier_primary_id" string="Seintinelles ID"/>
|
<field name="identifier_primary_id" string="Seintinelles ID"/>
|
||||||
<field name="period_start" string="Date de début" />
|
<field name="keywords" string="Mots-clés" />
|
||||||
|
<field name="name" string="Acronyme" />
|
||||||
<field name="period_end" string="Date de fin" />
|
<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" />
|
||||||
</search>
|
</search>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
1
studies_base/wizards/__init__.py
Normal file
1
studies_base/wizards/__init__.py
Normal file
@@ -0,0 +1 @@
|
|||||||
|
from . import create_progress_status
|
28
studies_base/wizards/create_progress_status.py
Normal file
28
studies_base/wizards/create_progress_status.py
Normal file
@@ -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()})
|
30
studies_base/wizards/create_progress_status.xml
Normal file
30
studies_base/wizards/create_progress_status.xml
Normal file
@@ -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>
|
Reference in New Issue
Block a user