Compare commits
6 Commits
16.0
...
16.0-pre-r
Author | SHA1 | Date | |
---|---|---|---|
|
8cb35a4640 | ||
|
7e3946588d | ||
|
7b7031bb15 | ||
|
202490a52e | ||
|
3b1800a6bf | ||
|
99e3a22877 |
@@ -18,5 +18,5 @@ class StudyProgressStatus(models.Model):
|
|||||||
('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")
|
||||||
date_begin = fields.Date("Date de début de l'état")
|
date_begin = fields.Datetime("Date de début de l'état")
|
||||||
date_end = fields.Date("Date de fin de l'état")
|
date_end = fields.Datetime("Date de fin de l'état")
|
||||||
|
@@ -1,7 +1,5 @@
|
|||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
from odoo import api, fields, models, _
|
from odoo import api, fields, models
|
||||||
from odoo import osv
|
|
||||||
from odoo.exceptions import UserError
|
|
||||||
|
|
||||||
|
|
||||||
class StudyQuestionnaire(models.Model):
|
class StudyQuestionnaire(models.Model):
|
||||||
@@ -35,11 +33,34 @@ class StudyQuestionnaire(models.Model):
|
|||||||
copyright = fields.Text("Copyright")
|
copyright = fields.Text("Copyright")
|
||||||
copyright_label = fields.Char("Propriétaire et année du copyright")
|
copyright_label = fields.Char("Propriétaire et année du copyright")
|
||||||
|
|
||||||
created = fields.Datetime("Created")
|
created = fields.Datetime("Created", compute="_compute_created", readonly=True)
|
||||||
date = fields.Datetime("Date")
|
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)
|
active = fields.Boolean("Actif", default=True)
|
||||||
|
|
||||||
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")
|
||||||
|
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
|
||||||
|
@@ -2,6 +2,9 @@
|
|||||||
from odoo import api, fields, models, _
|
from odoo import api, fields, models, _
|
||||||
from odoo import osv
|
from odoo import osv
|
||||||
from odoo.exceptions import UserError
|
from odoo.exceptions import UserError
|
||||||
|
import logging
|
||||||
|
|
||||||
|
_logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
class StudyStudy(models.Model):
|
class StudyStudy(models.Model):
|
||||||
@@ -10,10 +13,12 @@ class StudyStudy(models.Model):
|
|||||||
title = fields.Char("Nom de l'étude")
|
title = fields.Char("Nom de l'étude")
|
||||||
name = fields.Char("Acronyme")
|
name = fields.Char("Acronyme")
|
||||||
|
|
||||||
period_start = fields.Date("Début de l'étude")
|
period_start = fields.Datetime("Début de l'étude")
|
||||||
period_end = fields.Date("Fin de l'étude")
|
period_end = fields.Datetime("Fin de l'étude")
|
||||||
progress_status_id = fields.Many2one(
|
progress_status_id = fields.Many2one(
|
||||||
"study.progress.status", string="Avancement de l'étude"
|
"study.progress.status",
|
||||||
|
string="Avancement de l'étude",
|
||||||
|
domain="[('study_id', '=', id)]",
|
||||||
) # should be computed to actual progress status
|
) # should be computed to actual progress status
|
||||||
progress_status = fields.One2many(
|
progress_status = fields.One2many(
|
||||||
"study.progress.status", "study_id", "All progress status"
|
"study.progress.status", "study_id", "All progress status"
|
||||||
@@ -72,8 +77,24 @@ class StudyStudy(models.Model):
|
|||||||
|
|
||||||
note = fields.Text("Annotations")
|
note = fields.Text("Annotations")
|
||||||
|
|
||||||
created = fields.Datetime("Created")
|
created = fields.Datetime(
|
||||||
updated = fields.Datetime("Updated")
|
"Created", readonly=True, compute="_compute_created", store=True
|
||||||
|
)
|
||||||
|
updated = fields.Datetime(
|
||||||
|
"Updated", readonly=True, compute="_compute_updated", store=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
|
||||||
|
|
||||||
active = fields.Boolean("Actif", default=True)
|
active = fields.Boolean("Actif", default=True)
|
||||||
|
|
||||||
@@ -81,6 +102,13 @@ class StudyStudy(models.Model):
|
|||||||
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")
|
|
||||||
def name_get(self):
|
@api.depends("title", "name")
|
||||||
return [(study.id, f"[{study.name}] {study.title}") for study in self]
|
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
|
||||||
|
@@ -66,8 +66,8 @@
|
|||||||
</group>
|
</group>
|
||||||
<group name="technique_right">
|
<group name="technique_right">
|
||||||
<field name="identifier_primary_id" />
|
<field name="identifier_primary_id" />
|
||||||
<field name="create_date" />
|
<field name="created" />
|
||||||
<field name="write_date" />
|
<field name="date" />
|
||||||
</group>
|
</group>
|
||||||
</group>
|
</group>
|
||||||
<notebook>
|
<notebook>
|
||||||
@@ -91,4 +91,18 @@
|
|||||||
<field name="res_model">study.questionnaire</field>
|
<field name="res_model">study.questionnaire</field>
|
||||||
</record>
|
</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>
|
</odoo>
|
@@ -68,8 +68,8 @@
|
|||||||
</group>
|
</group>
|
||||||
<group name="technique_right">
|
<group name="technique_right">
|
||||||
<field name="identifier_primary_id" />
|
<field name="identifier_primary_id" />
|
||||||
<field name="create_date" />
|
<field name="created" />
|
||||||
<field name="write_date" />
|
<field name="updated" />
|
||||||
</group>
|
</group>
|
||||||
</group>
|
</group>
|
||||||
<notebook>
|
<notebook>
|
||||||
@@ -110,4 +110,19 @@
|
|||||||
<field name="res_model">study.study</field>
|
<field name="res_model">study.study</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
|
<!-- 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>
|
</odoo>
|
Reference in New Issue
Block a user