Elabore/study-tools
8
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

FIX get_name for study #3

Closed
b0g wants to merge 6 commits from 16.0-pre-release-fix into 16.0
pull from: 16.0-pre-release-fix
merge into: Elabore:16.0
Conversation 0 Commits 6 Files Changed 5 +61 -25
2 changed files with 61 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7e3946588d - Show all commits

27
studies_base/models/study_study.py
View File

@@ -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):
@@ -13,7 +16,9 @@ class StudyStudy(models.Model):
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"
"study.progress.status",
string="Avancement de l'étude",
domain="[('study_id', '=', id)]",
) # should be computed to actual progress status
progress_status = fields.One2many(
"study.progress.status", "study_id", "All progress status"
@@ -72,8 +77,24 @@ 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
)
@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)

59
studies_base/views/study_study_views.xml
View File

@@ -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,7 +18,7 @@
<!-- 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>
@@ -28,7 +28,7 @@
<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" />
@@ -44,18 +44,18 @@
<field name="progress_status_id" />
</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 +63,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,7 +92,7 @@
<field name="region" widget="many2many_tags" />
</group>
</group>
</page>
</page>
<page string="Notes" name="notes">
<field name="note" />
</page>
@@ -101,13 +101,28 @@
</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>
<!-- 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>