From aaacc8dba319babab54e2c8ed7a2defab546c606 Mon Sep 17 00:00:00 2001
From: clementthomas <clement@cotyl.net>
Date: Wed, 18 Sep 2024 09:48:01 +0200
Subject: [PATCH] [IMP] add created/updated fields in study + change progress
 status relation

---
 studies_base/models/study_study.py       | 11 +++++++----
 studies_base/views/study_study_views.xml |  6 +++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/studies_base/models/study_study.py b/studies_base/models/study_study.py
index cf4fdbd..18f1efd 100644
--- a/studies_base/models/study_study.py
+++ b/studies_base/models/study_study.py
@@ -13,12 +13,12 @@ class StudyStudy(models.Model):
 
     period_start = fields.Date("Début de l'étude")
     period_end = fields.Date("Fin de l'étude")
-    progress_status = fields.Many2one("study.progress.status", string="Avancement de l'étude")
-
+    progress_status_id = fields.Many2one("study.progress.status", string="Avancement de l'étude") #should be computed to actual progress status
+    progress_status = fields.One2many("study.progress.status", "study_id", "All progress status")
 
     description_summary = fields.Char("Brève description de l'étude")
     description = fields.Text("Description de l'étude")
-    keyword = fields.Many2one("study.keyword", string="Mots-clés")
+    keywords = fields.Many2many("study.keyword", string="Mots-clés")
     primary_purpose_type = fields.Many2one("study.purpose.type", string="Objectif principal")
     part_of = fields.Many2one("study.study", string="Fait partie de")
     version = fields.Char("Version")
@@ -52,4 +52,7 @@ class StudyStudy(models.Model):
     region = fields.Many2many("study.region", string="Zones géographiques étudiées")
     
 
-    note = fields.Text("Annotations")
\ No newline at end of file
+    note = fields.Text("Annotations")
+
+    created = fields.Datetime('Created')
+    updated = fields.Datetime('Updated')
\ No newline at end of file
diff --git a/studies_base/views/study_study_views.xml b/studies_base/views/study_study_views.xml
index 4475573..ea547b9 100644
--- a/studies_base/views/study_study_views.xml
+++ b/studies_base/views/study_study_views.xml
@@ -10,7 +10,7 @@
                 <field name="name"/>            
                 <field name="period_start"/>            
                 <field name="period_end"/>            
-                <field name="progress_status"/>                
+                <field name="progress_status_id"/>                
             </tree>
         </field>
     </record>
@@ -41,7 +41,7 @@
                         <group name="study_status_left">
                             <field name="period_start" />
                             <field name="period_end" />
-                            <field name="progress_status" />
+                            <field name="progress_status_id" />
                         </group>
                         <group name="study_status_right">
                             
@@ -51,7 +51,7 @@
                         <group name="description_left">  
                             <field name="description_summary" />                          
                             <field name="description" />
-                            <field name="keyword" />
+                            <field name="keywords" widget="many2many_tags" />
                         </group>
                         <group name="description_right">
                             <field name="primary_purpose_type" />