From 10b71eb44f13e12c542ad553a85d7bd6ac27abb3 Mon Sep 17 00:00:00 2001
From: clementthomas <clement@cotyl.net>
Date: Wed, 17 Jul 2024 12:20:25 +0200
Subject: [PATCH] [IMP] studies_base: Studies vue + progress status and state
 and status fields, views, and values

---
 studies_base/__manifest__.py                  |   6 +-
 studies_base/data/studies_base_data.xml       | 180 +++++++++++++++
 studies_base/models/__init__.py               |   1 +
 .../study_participant_progress_status.py      |   1 +
 .../models/study_participant_state.py         |   1 +
 studies_base/models/study_progress_status.py  |  12 +-
 .../study_questionnaire_progress_status.py    |  13 ++
 ..._questionnaire_response_progress_status.py |   1 +
 .../study_questionnaire_response_state.py     |   1 +
 .../models/study_questionnaire_status.py      |   1 +
 studies_base/models/study_status.py           |   1 +
 studies_base/models/study_study.py            |   4 +-
 studies_base/security/ir.model.access.csv     |   3 +-
 studies_base/views/study_config_views.xml     | 214 ++++++++++++------
 studies_base/views/study_menu.xml             |   7 +-
 studies_base/views/study_study_views.xml      |  89 +++++++-
 16 files changed, 454 insertions(+), 81 deletions(-)
 create mode 100644 studies_base/data/studies_base_data.xml
 create mode 100644 studies_base/models/study_questionnaire_progress_status.py

diff --git a/studies_base/__manifest__.py b/studies_base/__manifest__.py
index b5c28e2..7e1852c 100644
--- a/studies_base/__manifest__.py
+++ b/studies_base/__manifest__.py
@@ -21,10 +21,12 @@
     },
     # always loaded
     "data": [        
-        # "security/security.xml",
-        "views/study_menu.xml",
+        # "security/security.xml",        
+        "data/studies_base_data.xml",       
+        "security/ir.model.access.csv",       
         "views/study_config_views.xml",
         "views/study_study_views.xml",
+        "views/study_menu.xml",
     ],
     # only loaded in demonstration mode
     "demo": [],
diff --git a/studies_base/data/studies_base_data.xml b/studies_base/data/studies_base_data.xml
new file mode 100644
index 0000000..bd2119b
--- /dev/null
+++ b/studies_base/data/studies_base_data.xml
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo noupdate="1">
+
+
+        <!-- study.status -->
+    	<record id="study_status_DRAFT" model="study.status">
+            <field name="name">Brouillon</field>
+            <field name="value">DRAFT</field>
+        </record>
+
+        <record id="study_status_ACTIVE" model="study.status">
+            <field name="name">Publiée</field>
+            <field name="value">ACTIVE</field>
+        </record>
+
+        <record id="study_status_RETIRED" model="study.status">
+            <field name="name">Retirée</field>
+            <field name="value">RETIRED</field>
+        </record>
+
+        <record id="study_status_UNKNOWN" model="study.status">
+            <field name="name">Inconnu</field>
+            <field name="value">UNKNOWN</field>
+        </record>
+
+        <!-- study.participant.progress.status -->
+        <record id="study_participant_progress_status_REGISTRED" model="study.participant.progress.status">
+            <field name="name">Inscrit</field>
+            <field name="value">REGISTRED</field>
+        </record>
+
+        <record id="study_participant_progress_status_ACTIVE" model="study.participant.progress.status">
+            <field name="name">En cours</field>
+            <field name="value">ACTIVE</field>
+        </record>
+
+        <record id="study_participant_progress_status_COMPLETED" model="study.participant.progress.status">
+            <field name="name">Terminé</field>
+            <field name="value">COMPLETED</field>
+        </record>
+
+
+        <!-- study.participant.state -->
+        <record id="study_participant_state_INCLUDED" model="study.participant.state">
+            <field name="name">Inclu</field>
+            <field name="value">INCLUDED</field>
+        </record>
+
+        <record id="study_participant_state_EXCLUDED" model="study.participant.state">
+            <field name="name">Exclu</field>
+            <field name="value">EXCLUDED</field>
+        </record>
+
+        <record id="study_participant_state_UNKNOWN" model="study.participant.state">
+            <field name="name">Indéterminé</field>
+            <field name="value">UNKNOWN</field>
+        </record>
+
+        <record id="study_participant_state_WITHDRAWN" model="study.participant.state">
+            <field name="name">Retiré</field>
+            <field name="value">WITHDRAWN</field>
+        </record>
+
+
+        <!-- study.questionnaire.progress.status -->
+        <record id="study_questionnaire_progress_status_DRAFT" model="study.questionnaire.progress.status">
+            <field name="name">Brouillon</field>
+            <field name="value">DRAFT</field>
+        </record>
+
+        <record id="study_questionnaire_progress_status_VALIDATED" model="study.questionnaire.progress.status">
+            <field name="name">Validé</field>
+            <field name="value">VALIDATED</field>
+        </record>
+
+        <record id="study_questionnaire_progress_status_ACTIVE" model="study.questionnaire.progress.status">
+            <field name="name">Collecte en cours</field>
+            <field name="value">ACTIVE</field>
+        </record>
+
+        <record id="study_questionnaire_progress_status_COMPLETED" model="study.questionnaire.progress.status">
+            <field name="name">Terminée</field>
+            <field name="value">COMPLETED</field>
+        </record>
+
+        <record id="study_questionnaire_progress_status_WITHDRAWN" model="study.questionnaire.progress.status">
+            <field name="name">Annulé</field>
+            <field name="value">WITHDRAWN</field>
+        </record>
+
+
+
+
+        <!-- study.questionnaire.status -->
+        <record id="study_questionnaire_status_DRAFT" model="study.questionnaire.status">
+            <field name="name">Brouillon</field>
+            <field name="value">DRAFT</field>
+        </record>
+
+        <record id="study_questionnaire_status_ACTIVE" model="study.questionnaire.status">
+            <field name="name">Publiée</field>
+            <field name="value">ACTIVE</field>
+        </record>
+
+        <record id="study_questionnaire_status_RETIRED" model="study.questionnaire.status">
+            <field name="name">Retirée</field>
+            <field name="value">RETIRED</field>
+        </record>
+
+        <record id="study_questionnaire_status_UNKNOWN" model="study.questionnaire.status">
+            <field name="name">Inconnu</field>
+            <field name="value">UNKNOWN</field>
+        </record>
+
+
+
+
+        <!-- study.questionnaire.response.progress.status -->
+        <record id="study_questionnaire_response_progress_status_NOT-STARTED" model="study.questionnaire.response.progress.status">
+            <field name="name">Non commencé</field>
+            <field name="value">NOT-STARTED</field>
+        </record>
+
+        <record id="study_questionnaire_response_progress_status_IN-PROGRESS" model="study.questionnaire.response.progress.status">
+            <field name="name">Partiellement rempli</field>
+            <field name="value">IN-PROGRESS</field>
+        </record>
+
+        <record id="study_questionnaire_response_progress_status_COMPLETED" model="study.questionnaire.response.progress.status">
+            <field name="name">Complété</field>
+            <field name="value">COMPLETED</field>
+        </record>
+
+        <record id="study_questionnaire_response_progress_status_AMENDED" model="study.questionnaire.response.progress.status">
+            <field name="name">Modifié</field>
+            <field name="value">AMENDED</field>
+        </record>
+
+        <record id="study_questionnaire_response_progress_status_ENTERED-IN-ERROR" model="study.questionnaire.response.progress.status">
+            <field name="name">Rempli pas erreur ou annulé</field>
+            <field name="value">ENTERED-IN-ERROR</field>
+        </record>
+
+        <record id="study_questionnaire_response_progress_status_STOPPED" model="study.questionnaire.response.progress.status">
+            <field name="name">Abandonné</field>
+            <field name="value">STOPPED</field>
+        </record>
+
+        <record id="study_questionnaire_response_progress_status_CANCELED" model="study.questionnaire.response.progress.status">
+            <field name="name">Annulée</field>
+            <field name="value">CANCELED</field>
+        </record>
+
+
+
+
+
+        <!-- study.questionnaire.response.state -->
+
+        <record id="study_questionnaire_response_state_INCLUDED" model="study.questionnaire.response.state">
+            <field name="name">Inclu</field>
+            <field name="value">INCLUDED</field>
+        </record>
+
+        <record id="study_questionnaire_response_state_EXCLUDED" model="study.questionnaire.response.state">
+            <field name="name">Exclu</field>
+            <field name="value">EXCLUDED</field>
+        </record>
+
+        <record id="study_questionnaire_response_state_UNKNOWN" model="study.questionnaire.response.state">
+            <field name="name">Indéterminé</field>
+            <field name="value">UNKNOWN</field>
+        </record>
+
+        <record id="study_questionnaire_response_state_WITHDRAWN" model="study.questionnaire.response.state">
+            <field name="name">Retiré</field>
+            <field name="value">WITHDRAWN</field>
+        </record>
+
+</odoo>
diff --git a/studies_base/models/__init__.py b/studies_base/models/__init__.py
index c57f4b0..60dce30 100644
--- a/studies_base/models/__init__.py
+++ b/studies_base/models/__init__.py
@@ -14,6 +14,7 @@ from . import study_type
 from . import study_questionnaire_category
 from . import study_questionnaire_response
 from . import study_questionnaire_status
+from . import study_questionnaire_progress_status
 from . import study_questionnaire_subject_type
 from . import study_questionnaire_type
 from . import study_participant_progress_status
diff --git a/studies_base/models/study_participant_progress_status.py b/studies_base/models/study_participant_progress_status.py
index dbbcf70..e113dcb 100644
--- a/studies_base/models/study_participant_progress_status.py
+++ b/studies_base/models/study_participant_progress_status.py
@@ -8,5 +8,6 @@ class StudyParticipantProgressStatus(models.Model):
     _name = "study.participant.progress.status"
 
     name = fields.Char("Name")
+    value = fields.Char("Value")
     sequence = fields.Integer("Sequence")
 
diff --git a/studies_base/models/study_participant_state.py b/studies_base/models/study_participant_state.py
index 32814f9..1067192 100644
--- a/studies_base/models/study_participant_state.py
+++ b/studies_base/models/study_participant_state.py
@@ -9,4 +9,5 @@ class StudyParticipantState(models.Model):
 
     name = fields.Char("Name")
     sequence = fields.Integer("Sequence")
+    value = fields.Char("Value")
 
diff --git a/studies_base/models/study_progress_status.py b/studies_base/models/study_progress_status.py
index ef64609..f4de451 100644
--- a/studies_base/models/study_progress_status.py
+++ b/studies_base/models/study_progress_status.py
@@ -7,4 +7,14 @@ from odoo.exceptions import UserError
 class StudyProgressStatus(models.Model):
     _name = "study.progress.status"
 
-    
\ No newline at end of file
+    study_id = fields.Many2one("study.study", string="Étude")
+    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")
+    actual = fields.Boolean("Statut actuel")
+    date_begin = fields.Date("Date de début de l'état")
+    date_end = fields.Date("Date de fin de l'état")
\ No newline at end of file
diff --git a/studies_base/models/study_questionnaire_progress_status.py b/studies_base/models/study_questionnaire_progress_status.py
new file mode 100644
index 0000000..e01c102
--- /dev/null
+++ b/studies_base/models/study_questionnaire_progress_status.py
@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+from odoo import api, fields, models, _
+from odoo import osv
+from odoo.exceptions import UserError
+
+
+class StudyQuestionnaireProgressStatus(models.Model):
+    _name = "study.questionnaire.progress.status"
+
+    name = fields.Char("Name")
+    value = fields.Char("Value")
+    sequence = fields.Integer("Sequence")
+
diff --git a/studies_base/models/study_questionnaire_response_progress_status.py b/studies_base/models/study_questionnaire_response_progress_status.py
index c5d5818..a03f3e6 100644
--- a/studies_base/models/study_questionnaire_response_progress_status.py
+++ b/studies_base/models/study_questionnaire_response_progress_status.py
@@ -8,5 +8,6 @@ class StudyQuestionnaireResponseProgressStatus(models.Model):
     _name = "study.questionnaire.response.progress.status"
 
     name = fields.Char("Name")
+    value = fields.Char("Value")
     sequence = fields.Integer("Sequence")
 
diff --git a/studies_base/models/study_questionnaire_response_state.py b/studies_base/models/study_questionnaire_response_state.py
index f93ffc6..54e1fb8 100644
--- a/studies_base/models/study_questionnaire_response_state.py
+++ b/studies_base/models/study_questionnaire_response_state.py
@@ -8,5 +8,6 @@ class StudyQuestionnaireResponseState(models.Model):
     _name = "study.questionnaire.response.state"
 
     name = fields.Char("Name")
+    value = fields.Char("Value")
     sequence = fields.Integer("Sequence")
 
diff --git a/studies_base/models/study_questionnaire_status.py b/studies_base/models/study_questionnaire_status.py
index f71fda2..45d507a 100644
--- a/studies_base/models/study_questionnaire_status.py
+++ b/studies_base/models/study_questionnaire_status.py
@@ -8,5 +8,6 @@ class StudyQuestionnaireStatus(models.Model):
     _name = "study.questionnaire.status"
 
     name = fields.Char("Name")
+    value = fields.Char("Value")
     sequence = fields.Integer("Sequence")
 
diff --git a/studies_base/models/study_status.py b/studies_base/models/study_status.py
index 849e39f..c7aa565 100644
--- a/studies_base/models/study_status.py
+++ b/studies_base/models/study_status.py
@@ -8,5 +8,6 @@ class StudStatus(models.Model):
     _name = "study.status"
 
     name = fields.Char("Name")
+    value = fields.Char("Value")
     sequence = fields.Integer("Sequence")
 
diff --git a/studies_base/models/study_study.py b/studies_base/models/study_study.py
index c4d85e9..e9e42df 100644
--- a/studies_base/models/study_study.py
+++ b/studies_base/models/study_study.py
@@ -7,6 +7,8 @@ from odoo.exceptions import UserError
 class StudyStudy(models.Model):
     _name = "study.study"
 
+    _inherit = ['mail.thread']
+
     title = fields.Char("Nom de l'étude")
     name = fields.Char("Acronyme")
 
@@ -24,7 +26,7 @@ class StudyStudy(models.Model):
     ppc_reference = fields.Char("Référence Comité de Protection des Personnes")
     version = fields.Char("Version")
     phase = fields.Many2one("study.phase", string="Phase")
-    status = fields.Many2one("study.status", string="Status")
+    status = fields.Many2one("study.status", string="Status de la publication")
 
     site = fields.Many2one("res.partner", string="Lieu de l'étude")
     author = fields.Many2one("study.author", string="Platforme technique d'étude")
diff --git a/studies_base/security/ir.model.access.csv b/studies_base/security/ir.model.access.csv
index 719321a..a9c9b02 100644
--- a/studies_base/security/ir.model.access.csv
+++ b/studies_base/security/ir.model.access.csv
@@ -1,7 +1,5 @@
 id,name,model_id/id,group_id/id,perm_read,perm_write,perm_create,perm_unlink
 access_study_author_admin,study.author.admin,model_study_author,base.group_user,1,1,1,1
-access_study_eligibility_study_excl_admin,study.eligibility.study.excl.admin,model_study_eligibility_study_excl,base.group_user,1,1,1,1
-access_study_eligibility_study_incl_admin,study.eligibility.study.incl.admin,model_study_eligibility_study_incl,base.group_user,1,1,1,1
 access_study_eligibility_topic_admin,study.eligibility.topic.admin,model_study_eligibility_topic,base.group_user,1,1,1,1
 access_study_eligibility_condition_body_site_admin,study.eligibility.condition.body.site.admin,model_study_eligibility_condition_body_site,base.group_user,1,1,1,1
 access_study_eligibility_condition_clinical_status_admin,study.eligibility.condition.clinical.status.admin,model_study_eligibility_condition_clinical_status,base.group_user,1,1,1,1
@@ -23,5 +21,6 @@ access_study_questionnaire_subject_type_admin,study.questionnaire.subject.type.a
 access_study_questionnaire_status_admin,study.questionnaire.status.admin,model_study_questionnaire_status,base.group_user,1,1,1,1
 access_study_participant_progress_status_admin,study.participant.progress.status.admin,model_study_participant_progress_status,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_progress_status_admin,study.questionnaire.progress.status.admin,model_study_questionnaire_progress_status,base.group_user,1,1,1,1
 access_study_questionnaire_response_state_admin,study.questionnaire.response.state.admin,model_study_questionnaire_response_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
diff --git a/studies_base/views/study_config_views.xml b/studies_base/views/study_config_views.xml
index c120658..df81633 100644
--- a/studies_base/views/study_config_views.xml
+++ b/studies_base/views/study_config_views.xml
@@ -55,9 +55,21 @@
         <field name="name">study.participant.state.tree</field>
         <field name="model">study.participant.state</field>        
         <field name="arch" type="xml">
-            <tree string="États des participations" editable="bottom">
+            <tree string="États des participations (participants)" editable="bottom">
                 <field name="sequence" widget="handle"/>
                 <field name="name"/>                
+                <field name="value" />
+            </tree>
+        </field>
+    </record>
+    <record id="view_study_participant_progress_status_tree" model="ir.ui.view">
+        <field name="name">study.participant.progress.status.tree</field>
+        <field name="model">study.participant.progress.status</field>        
+        <field name="arch" type="xml">
+            <tree string="Statuts de participation (participants)" editable="bottom">
+                <field name="sequence" widget="handle"/>
+                <field name="name"/>                
+                <field name="value" />
             </tree>
         </field>
     </record>
@@ -96,8 +108,31 @@
         <field name="model">study.questionnaire.response.state</field>        
         <field name="arch" type="xml">
             <tree string="États des réponses" editable="bottom">
+                <field name="sequence" widget="handle"/>
+                <field name="name"/>    
+                <field name="value" />            
+            </tree>
+        </field>
+    </record>
+    <record id="view_study_questionnaire_response_progress_status_tree" model="ir.ui.view">
+        <field name="name">study.questionnaire.response.progress.status.tree</field>
+        <field name="model">study.questionnaire.response.progress.status</field>        
+        <field name="arch" type="xml">
+            <tree string="Statuts des réponses aux questionnaires" editable="bottom">
                 <field name="sequence" widget="handle"/>
                 <field name="name"/>                
+                <field name="value" />
+            </tree>
+        </field>
+    </record>
+    <record id="view_study_questionnaire_progress_status_tree" model="ir.ui.view">
+        <field name="name">study.questionnaire.progress.status.tree</field>
+        <field name="model">study.questionnaire.progress.status</field>        
+        <field name="arch" type="xml">
+            <tree string="Statuts des questionnaires" editable="bottom">
+                <field name="sequence" widget="handle"/>
+                <field name="name"/>                
+                <field name="value" />
             </tree>
         </field>
     </record>
@@ -105,9 +140,10 @@
         <field name="name">study.questionnaire.status.tree</field>
         <field name="model">study.questionnaire.status</field>        
         <field name="arch" type="xml">
-            <tree string="Statuts de publication" editable="bottom">
+            <tree string="Statuts de publication (questionnaire)" editable="bottom">
                 <field name="sequence" widget="handle"/>
-                <field name="name"/>                
+                <field name="name"/>
+                <field name="value" />     
             </tree>
         </field>
     </record>
@@ -145,9 +181,10 @@
         <field name="name">study.status.tree</field>
         <field name="model">study.status</field>        
         <field name="arch" type="xml">
-            <tree string="Status des études" editable="bottom">
+            <tree string="Statuts de publication des études" editable="bottom">
                 <field name="sequence" widget="handle"/>
                 <field name="name"/>                
+                <field name="value" />
             </tree>
         </field>
     </record>
@@ -174,57 +211,72 @@
 
     <!-- ACTIONS -->
     <record id="action_study_author" model="ir.actions.act_window">
-        <field name="name">Platformes techniques d'étuder</field>
+        <field name="name">Platformes techniques d'étude</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">study.author</field>        
     </record>
     <record id="action_study_eligibility_condition_body_site" model="ir.actions.act_window">
-        <field name="name">Localisations anatomiques des affectionsr</field>
+        <field name="name">Localisations anatomiques des affections</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">study.eligibility.condition.body.site</field>        
     </record>
     <record id="action_study_eligibility_condition_clinical_status" model="ir.actions.act_window">
-        <field name="name">Statuts des affectations (malade, ancien malade...)r</field>
+        <field name="name">Statuts des affectations (malade, ancien malade...)</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">study.eligibility.condition.clinical.status</field>        
     </record>
     <record id="action_study_eligibility_topic" model="ir.actions.act_window">
-        <field name="name">Thématiques de rechercher</field>
+        <field name="name">Thématiques de recherche</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">study.eligibility.topic</field>        
     </record>
     <record id="action_study_gender" model="ir.actions.act_window">
-        <field name="name">Genresr</field>
+        <field name="name">Genres</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">study.gender</field>        
     </record>
     <record id="action_study_participant_state" model="ir.actions.act_window">
-        <field name="name">États des participationsr</field>
+        <field name="name">États des participations (participants)</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">study.participant.state</field>        
     </record>
+    <record id="action_study_participant_progress_status" model="ir.actions.act_window">
+        <field name="name">Statuts de participation (participants)</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">study.participant.progress.status</field>        
+    </record>
     <record id="action_study_phase" model="ir.actions.act_window">
-        <field name="name">Phasesr</field>
+        <field name="name">Phases</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">study.phase</field>        
     </record>
     <record id="action_study_purpose_type" model="ir.actions.act_window">
-        <field name="name">Objectifsr</field>
+        <field name="name">Objectifs</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">study.purpose.type</field>        
     </record>
     <record id="action_study_questionnaire_category" model="ir.actions.act_window">
-        <field name="name">Catégories de questionnairer</field>
+        <field name="name">Catégories de questionnaire</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">study.questionnaire.category</field>        
     </record>
     <record id="action_study_questionnaire_response_state" model="ir.actions.act_window">
-        <field name="name">États des réponsesr</field>
+        <field name="name">États des réponses</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">study.questionnaire.response.state</field>        
     </record>
+    <record id="action_study_questionnaire_response_progress_status" model="ir.actions.act_window">
+        <field name="name">Statuts des réponses aux questionnaires</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">study.questionnaire.response.progress.status</field>        
+    </record>
+    <record id="action_study_questionnaire_progress_status" model="ir.actions.act_window">
+        <field name="name">Statuts des questionnaires</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">study.questionnaire.progress.status</field>        
+    </record>
     <record id="action_study_questionnaire_status" model="ir.actions.act_window">
-        <field name="name">Statuts de publicationr</field>
+        <field name="name">Statuts de publication (questionnaires)</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">study.questionnaire.status</field>        
     </record>
@@ -239,80 +291,98 @@
         <field name="res_model">study.questionnaire.type</field>        
     </record>
     <record id="action_study_region" model="ir.actions.act_window">
-        <field name="name">Zones géographiques étudiéesr</field>
+        <field name="name">Zones géographiques étudiées</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">study.region</field>        
     </record>
     <record id="action_study_status" model="ir.actions.act_window">
-        <field name="name">Status des étudesr</field>
+        <field name="name">Statuts de publication des études</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">study.status</field>        
     </record>
     <record id="action_study_tag" model="ir.actions.act_window">
-        <field name="name">Mots-clés des étudesr</field>
+        <field name="name">Mots-clés des études</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">study.tag</field>        
     </record>
     <record id="action_study_type" model="ir.actions.act_window">
-        <field name="name">Types d'étudesr</field>
+        <field name="name">Types d'études</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">study.type</field>        
     </record>
     
-
+    
     <!-- MENUS -->
-    <menuitem id="menu_study_config" name="Configuration" parent="studies_base.menu_study_main">
-        <menuitem id="menu_study_author"
-            action="action_study_author"
-            sequence="1"/>
-        <menuitem id="menu_study_eligibility_condition_body_site"
-            action="action_study_eligibility_condition_body_site"
-            sequence="2"/>
-        <menuitem id="menu_study_eligibility_condition_clinical_status"
-            action="action_study_eligibility_condition_clinical_status"
-            sequence="3"/>
-        <menuitem id="menu_study_eligibility_topic"
-            action="action_study_eligibility_topic"
-            sequence="4"/>
-        <menuitem id="menu_study_gender"
-            action="action_study_gender"
-            sequence="5"/>
-        <menuitem id="menu_study_participant_state"
-            action="action_study_participant_state"
-            sequence="6"/>
-        <menuitem id="menu_study_phase"
-            action="action_study_phase"
-            sequence="7"/>
-        <menuitem id="menu_study_purpose_type"
-            action="action_study_purpose_type"
-            sequence="8"/>
-        <menuitem id="menu_study_questionnaire_category"
-            action="action_study_questionnaire_category"
-            sequence="9"/>
-        <menuitem id="menu_study_questionnaire_response_state"
-            action="action_study_questionnaire_response_state"
-            sequence="10"/>
-        <menuitem id="menu_study_questionnaire_status"
-            action="action_study_questionnaire_status"
-            sequence="11"/>
-        <menuitem id="menu_study_questionnaire_subject_type"
-            action="action_study_questionnaire_subject_type"
-            sequence="12"/>
-        <menuitem id="menu_study_questionnaire_type"
-            action="action_study_questionnaire_type"
-            sequence="13"/>
-        <menuitem id="menu_study_region"
-            action="action_study_region"
-            sequence="14"/>
-        <menuitem id="menu_study_status"
-            action="action_study_status"
-            sequence="15"/>
-        <menuitem id="menu_study_tag"
-            action="action_study_tag"
-            sequence="16"/>
-        <menuitem id="menu_study_type"
-            action="action_study_type"
-            sequence="17"/>
+    <menuitem id="menu_study_config" name="Configuration" parent="menu_study_main" sequence="2">
+        <menuitem id="menu_study_study_config" name="Études">
+            <menuitem id="menu_study_author"
+                action="action_study_author"
+                sequence="1" />
+            <menuitem id="menu_study_eligibility_condition_body_site"
+                action="action_study_eligibility_condition_body_site"
+                sequence="2"/>
+            <menuitem id="menu_study_eligibility_condition_clinical_status"
+                action="action_study_eligibility_condition_clinical_status"
+                sequence="3"/>
+            <menuitem id="menu_study_eligibility_topic"
+                action="action_study_eligibility_topic"
+                sequence="4"/>
+            <menuitem id="menu_study_gender"
+                action="action_study_gender"
+                sequence="5"/>
+            <menuitem id="menu_study_phase"
+                action="action_study_phase"
+                sequence="7"/>
+            <menuitem id="menu_study_purpose_type"
+                action="action_study_purpose_type"
+                sequence="8"/>
+            <menuitem id="menu_study_region"
+                action="action_study_region"
+                sequence="14"/>
+            <menuitem id="menu_study_status"
+                action="action_study_status"
+                sequence="15"/>
+            <menuitem id="menu_study_tag"
+                action="action_study_tag"
+                sequence="16"/>
+            <menuitem id="menu_study_type"
+                action="action_study_type"
+                sequence="17"/>
+        </menuitem>
+        <menuitem id="menu_study_participant_config" name="Participants">
+            <menuitem id="menu_study_participant_state"
+                action="action_study_participant_state"
+                sequence="6"/>
+            <menuitem id="menu_study_participant_progress_status"
+                action="action_study_participant_progress_status"
+                sequence="6"/>
+        </menuitem>
+        <menuitem id="menu_study_questionnaire_config" name="Questionnaires">
+            <menuitem id="menu_study_questionnaire_category"
+                action="action_study_questionnaire_category"
+                sequence="9"/>
+            <menuitem id="menu_study_questionnaire_progress_status"
+                action="action_study_questionnaire_progress_status"
+                sequence="10"/>
+            <menuitem id="menu_study_questionnaire_status"
+                action="action_study_questionnaire_status"
+                sequence="11"/>
+            <menuitem id="menu_study_questionnaire_subject_type"
+                action="action_study_questionnaire_subject_type"
+                sequence="12"/>
+            <menuitem id="menu_study_questionnaire_type"
+                action="action_study_questionnaire_type"
+                sequence="13"/>
+        </menuitem>
+        <menuitem id="menu_study_questionnaire_response_config" name="Réponses aux questionnaires">
+            <menuitem id="menu_study_questionnaire_response_state"
+                action="action_study_questionnaire_response_state"
+                sequence="10"/>
+            <menuitem id="menu_study_questionnaire_response_progress_status"
+                action="action_study_questionnaire_response_progress_status"
+                sequence="10"/>
+        </menuitem>
+        
     
     </menuitem>
 
diff --git a/studies_base/views/study_menu.xml b/studies_base/views/study_menu.xml
index 2ff08df..0bccf7b 100644
--- a/studies_base/views/study_menu.xml
+++ b/studies_base/views/study_menu.xml
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <menuitem id="menu_study_main" name="Études" />        
+    <menuitem id="menu_study_main" name="Études"
+        groups="base.group_user">        
+        <menuitem id="menu_study_study" name="Études"
+            action="action_study_study" 
+            sequence="1" />
+    </menuitem>
 </odoo>
diff --git a/studies_base/views/study_study_views.xml b/studies_base/views/study_study_views.xml
index 184080c..d29d04c 100644
--- a/studies_base/views/study_study_views.xml
+++ b/studies_base/views/study_study_views.xml
@@ -17,14 +17,99 @@
         <field name="model">study.study</field>        
         <field name="arch" type="xml">
             <form string="Étude">
-                <field name="name"/>                
+                <header>
+                    <!-- action buttons -->
+                </header>
+                <sheet>
+                    <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" />
+                        </h1>
+                        <h2>
+                            <label for="name" string="Acronyme" /><field name="name" />
+                        </h2>
+                    </div>
+                    <group name="study_status" string="Statut">
+                        <group name="study_status_left">
+                            <field name="period_start" />
+                            <field name="period_end" />
+                            <field name="progress_status" />
+                        </group>
+                        <group name="study_status_right">
+                            
+                        </group>
+                    </group>
+                    <group name="description" string="Description">
+                        <group name="description_left">
+                            <field name="type" />
+                            <field name="description_summary" />
+                            <field name="description" />
+                            <field name="keyword" />
+                            <field name="primary_purpose_type" />                            
+                        </group>
+                        <group name="description_right">
+                            <field name="part_of" />
+                            <field name="ppc_reference" />
+                            <field name="version" />
+                            <field name="phase" />
+                            <field name="status" />
+                        </group>
+                    </group>
+                    <group name="technique" string="Technique">
+                        <group name="technique_left">
+                            <field name="site" />
+                            <field name="author" />
+                            <field name="identitifer_author" />
+                        </group>
+                        <group name="technique_right">
+                            <field name="identifier_primary_id" />
+                            <field name="create_date" />
+                            <field name="write_date" />
+                        </group>
+                    </group>
+                    <notebook>
+                        <page string="Recrutement" name="recruitment">
+                            <group name="recruitment">
+                                <group name="recruitment_left">
+                                    <field name="recruitment_target_number" />
+                                    <field name="recruitment_max_number" />
+                                    <field name="recruitment_eligibility_gender" widget="many2many_tags" />
+                                    <field name="recruitment_eligibility_age_min" />
+                                    <field name="recruitment_eligibility_age_max" />
+                                    <field name="recruitment_eligibility_condition_clinical_status" widget="many2many_tags" />
+                                </group>
+                                <group name="recruitment_right">
+                                    <field name="recruitment_eligibility_condition_body_site" widget="many2many_tags" />
+                                    <field name="recruitment_eligibility_study_incl" widget="many2many_tags" />
+                                    <field name="recruitment_eligibility_study_excl" widget="many2many_tags" />
+                                    <field name="recruitment_eligibility_description" />
+                                    <field name="recruitment_eligibility_topic" widget="many2many_tags" />
+                                    <field name="region" widget="many2many_tags" />
+                                </group>
+                            </group>
+                        </page>
+                        <page string="Questionnaires" name="questionnaires">
+                            <field name="questionnaires" />
+                        </page>
+                        <page string="Contacts / Chercheurs" name="contacts">
+                            <field name="contacts" />
+                        </page>
+                        <page string="Notes" name="notes">
+                            <field name="note" />
+                        </page>
+                    </notebook>
+                </sheet>
             </form>
         </field>
     </record>
        
         
     <!-- ACTIONS -->
-    <record id="action_study_study_tree" model="ir.actions.act_window">
+    <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>