diff --git a/studies_base/data/studies_base_data.xml b/studies_base/data/studies_base_data.xml index bd2119b..11645b9 100644 --- a/studies_base/data/studies_base_data.xml +++ b/studies_base/data/studies_base_data.xml @@ -62,34 +62,6 @@ - - - Brouillon - DRAFT - - - - Validé - VALIDATED - - - - Collecte en cours - ACTIVE - - - - Terminée - COMPLETED - - - - Annulé - WITHDRAWN - - - - @@ -112,9 +84,6 @@ UNKNOWN - - - Non commencé @@ -152,29 +121,81 @@ + - - - - - Inclu - INCLUDED + + + Patient + PATIENT - - Exclu - EXCLUDED + + Praticient + PRACTITIONER - - Indéterminé - UNKNOWN + + + + Le traitement + TREATMENT + + + La prévention + PREVENTION + + + Diagnostic + DIAGNOSTIC + + + Soins de soutien + SUPPORTIVE CARE + + + Dépistage + SCREENING + + + Recherche sur les services de santé + HEALTH SERVICES RESEARCH + + + Science fondamentale + BASIC SCIENCE + + + Faisabilité des dispositifs + DEVICE FEASIBILITY - - Retiré - WITHDRAWN + + + Femme + FEMALE + + + Homme + MALE + + + Indiférent + ALL + + + + + Malade + ACTIVE + + + Ancien malade + INACTIVE + + + Non malade + UNKNOW diff --git a/studies_base/models/__init__.py b/studies_base/models/__init__.py index 60dce30..22e925c 100644 --- a/studies_base/models/__init__.py +++ b/studies_base/models/__init__.py @@ -1,25 +1,20 @@ -from . import study_author from . import study_eligibility_topic from . import study_gender from . import study_participant from . import study_phase from . import study_purpose_type -from . import study_progress_status from . import study_questionnaire from . import study_region from . import study_status from . import study_study -from . import study_tag -from . import study_type -from . import study_questionnaire_category +from . import study_keyword 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_questionnaire_progress_status from . import study_participant_progress_status from . import study_participant_state -from . import study_questionnaire_response_state from . import study_questionnaire_response_progress_status from . import study_eligibility_condition_clinical_status -from . import study_eligibility_condition_body_site \ No newline at end of file +from . import study_eligibility_condition_body_site +from . import study_progress_status \ No newline at end of file diff --git a/studies_base/models/study_author.py b/studies_base/models/study_author.py deleted file mode 100644 index 4b87d91..0000000 --- a/studies_base/models/study_author.py +++ /dev/null @@ -1,12 +0,0 @@ -# -*- coding: utf-8 -*- -from odoo import api, fields, models, _ -from odoo import osv -from odoo.exceptions import UserError - - -class StudyAuthor(models.Model): - _name = "study.author" - - name = fields.Char("Name") - sequence = fields.Integer("Sequence") - diff --git a/studies_base/models/study_eligibility_condition_body_site.py b/studies_base/models/study_eligibility_condition_body_site.py index 86713eb..b62b406 100644 --- a/studies_base/models/study_eligibility_condition_body_site.py +++ b/studies_base/models/study_eligibility_condition_body_site.py @@ -9,4 +9,5 @@ class StudyEligibilityConditionBodySite(models.Model): name = fields.Char("Name") sequence = fields.Integer("Sequence") + value = fields.Char("Value") diff --git a/studies_base/models/study_eligibility_condition_clinical_status.py b/studies_base/models/study_eligibility_condition_clinical_status.py index 99c0b84..71b6d87 100644 --- a/studies_base/models/study_eligibility_condition_clinical_status.py +++ b/studies_base/models/study_eligibility_condition_clinical_status.py @@ -9,4 +9,5 @@ class StudyEligibilityConditionClinicalStatus(models.Model): name = fields.Char("Name") sequence = fields.Integer("Sequence") + value = fields.Char("Value") diff --git a/studies_base/models/study_eligibility_topic.py b/studies_base/models/study_eligibility_topic.py index 274b3a6..316e88a 100644 --- a/studies_base/models/study_eligibility_topic.py +++ b/studies_base/models/study_eligibility_topic.py @@ -9,4 +9,5 @@ class StudyEligibilityTopic(models.Model): name = fields.Char("Name") sequence = fields.Integer("Sequence") + value = fields.Char("Value") diff --git a/studies_base/models/study_gender.py b/studies_base/models/study_gender.py index 9b9adc8..e04d79f 100644 --- a/studies_base/models/study_gender.py +++ b/studies_base/models/study_gender.py @@ -9,4 +9,4 @@ class StudyGender(models.Model): name = fields.Char("Name") sequence = fields.Integer("Sequence") - + value = fields.Char("Value") diff --git a/studies_base/models/study_tag.py b/studies_base/models/study_keyword.py similarity index 71% rename from studies_base/models/study_tag.py rename to studies_base/models/study_keyword.py index f9e77f3..0f18d9f 100644 --- a/studies_base/models/study_tag.py +++ b/studies_base/models/study_keyword.py @@ -4,7 +4,7 @@ from odoo import osv from odoo.exceptions import UserError -class StudyTag(models.Model): - _name = "study.tag" +class StudyKeyword(models.Model): + _name = "study.keyword" name = fields.Char("Name") diff --git a/studies_base/models/study_participant.py b/studies_base/models/study_participant.py index 172e4eb..0b9a675 100644 --- a/studies_base/models/study_participant.py +++ b/studies_base/models/study_participant.py @@ -15,9 +15,7 @@ class StudyParticipant(models.Model): lastname = fields.Char("Nom", related="subject.lastname") progress_status = fields.Many2one("study.participant.progress.status", string="Statut de la participation", readonly=True) state = fields.Many2one("study.participant.state", string="État de la participation", readonly=True) - - part_of_author = fields.Many2one("study.author", string="Platforme d'étude", related="part_of.author") - author = fields.Char("ID plateforme", readonly=True) + identifier = fields.Char("Idientifiants de l'enrôlement", readonly=True) - questionnaire_responses = fields.One2many("study.questionnaire.response", "study_participant_id", string="Réponses") + diff --git a/studies_base/models/study_phase.py b/studies_base/models/study_phase.py index 0841cd3..a55ded6 100644 --- a/studies_base/models/study_phase.py +++ b/studies_base/models/study_phase.py @@ -9,4 +9,4 @@ class StudyPhase(models.Model): name = fields.Char("Name") sequence = fields.Integer("Sequence") - + value = fields.Char("Value") diff --git a/studies_base/models/study_purpose_type.py b/studies_base/models/study_purpose_type.py index 4b91c40..f1f46f0 100644 --- a/studies_base/models/study_purpose_type.py +++ b/studies_base/models/study_purpose_type.py @@ -9,4 +9,5 @@ class StudyPurposeType(models.Model): name = fields.Char("Name") sequence = fields.Integer("Sequence") + value = fields.Char("Value") diff --git a/studies_base/models/study_questionnaire.py b/studies_base/models/study_questionnaire.py index 644a6d3..b52321e 100644 --- a/studies_base/models/study_questionnaire.py +++ b/studies_base/models/study_questionnaire.py @@ -10,15 +10,11 @@ class StudyQuestionnaire(models.Model): title = fields.Char("Nom du questionnaire") name = fields.Char("Acronyme") - progress_status = fields.Many2one("study.questionnaire.progress.status", string="Statut du questionnaire") approval_date = fields.Datetime("Date d'approbation") last_review_date = fields.Datetime("Dernière relecture") effective_period_start = fields.Datetime("Début de la collecte") effective_period_end = fields.Datetime("Fin de la collecte") - study_id = fields.Many2one("study.study", string="Étude") - category = fields.Many2one("study.questionnaire.category", string="Catégorie de questionnaire") - type = fields.Many2one("study.questionnaire.type", string="Type de questionnaire") purpose = fields.Text("Objectif") subject_type = fields.Many2one("study.questionnaire.subject.type", string="Sujets") description = fields.Text("Description du questionnaire") @@ -29,22 +25,8 @@ class StudyQuestionnaire(models.Model): status = fields.Many2one("study.questionnaire.status", string="Statut de publication") experimental = fields.Boolean("Questionnaire de test") - author = fields.Many2one("study.author", string="Platforme d'étude") identifier_author = fields.Char("ID plateforme") identifier_primary_id = fields.Char("Identifiant Seintinelles", readonly=True) - rank_in_study = fields.Integer("Rang dans l'étude") - fixed_start_date = fields.Datetime("Date de début de collecte") - fixed_end_date = fields.Datetime("Date limite de collecte") - repeated = fields.Integer("Nombre de répétition") - repeat_delay = fields.Integer("Délai de répétition") - repeat_delay_type = fields.Selection([("d", "Jour"), ("m", "Mois"), ("y", "Année")], string="Type de délai de répétition") - following = fields.Many2one("study.questionnaire", string="Questionnaire précédent") - following_delay = fields.Integer("Délai avec le questionnaire précédent") - following_delay_type = fields.Selection([("d", "Jour"), ("m", "Mois"), ("y", "Année")], string="Type de délai avec le questionnaire précédent") - preceding = fields.Many2one("study.questionnaire", string="Questionnaire suivant") - preceding_delay = fields.Integer("Délai avec le questionnaire suivant") - preceding_delay_type = fields.Selection([("d", "Jour"), ("m", "Mois"), ("y", "Année")], string="Type de délai avec le questionnaire suivant") - copyright = fields.Text("Copyright") copyright_label = fields.Char("Propriétaire et année du copyright") \ No newline at end of file diff --git a/studies_base/models/study_questionnaire_category.py b/studies_base/models/study_questionnaire_category.py deleted file mode 100644 index bd6e1e9..0000000 --- a/studies_base/models/study_questionnaire_category.py +++ /dev/null @@ -1,12 +0,0 @@ -# -*- coding: utf-8 -*- -from odoo import api, fields, models, _ -from odoo import osv -from odoo.exceptions import UserError - - -class StudyQuestionnaireCategory(models.Model): - _name = "study.questionnaire.category" - - name = fields.Char("Name") - sequence = fields.Integer("Sequence") - diff --git a/studies_base/models/study_questionnaire_response.py b/studies_base/models/study_questionnaire_response.py index b741c65..e481793 100644 --- a/studies_base/models/study_questionnaire_response.py +++ b/studies_base/models/study_questionnaire_response.py @@ -8,19 +8,13 @@ class StudyQuestionnaireResponse(models.Model): _name = "study.questionnaire.response" identifier_primary_id = fields.Char("Idientifiant Seintinelles", readonly=True) - start_date = fields.Datetime("Date de début de collecte", readonly=True) - end_date = fields.Datetime("Date limite de collecte", readonly=True) - state = fields.Many2one("study.questionnaire.response.state", string="État de la réponse") progress_status = fields.Many2one("study.questionnaire.response.progress.status", string="État d'avancement") authored = fields.Datetime("Date de saisie des réponses", readonly=True) - - author = fields.Many2one("study.author", string="Platform d'étude", readonly=True) + identifier_author = fields.Char("ID plateforme", readonly=True) - redirect_url = fields.Char("Lien personnel de redirection vers le questionnaire", readonly=True) study_id = fields.Many2one("study.study", "Étude", readonly=True) study_questionnaire_id = fields.Many2one("study.questionnaire", string="Questionnaire", readonly=True) - study_participant_id = fields.Many2one("study.participant", string="Participation", readonly=True) source = fields.Many2one("res.partner", string="Contact", domain=[("category_patient",'=',1)], readonly=True) firstname = fields.Char("Prénom", related="source.firstname") diff --git a/studies_base/models/study_questionnaire_response_state.py b/studies_base/models/study_questionnaire_response_state.py deleted file mode 100644 index 54e1fb8..0000000 --- a/studies_base/models/study_questionnaire_response_state.py +++ /dev/null @@ -1,13 +0,0 @@ -# -*- coding: utf-8 -*- -from odoo import api, fields, models, _ -from odoo import osv -from odoo.exceptions import UserError - - -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_subject_type.py b/studies_base/models/study_questionnaire_subject_type.py index 6e147fd..d19ffb0 100644 --- a/studies_base/models/study_questionnaire_subject_type.py +++ b/studies_base/models/study_questionnaire_subject_type.py @@ -9,4 +9,5 @@ class StudyQuestionnaireSubjectType(models.Model): name = fields.Char("Name") sequence = fields.Integer("Sequence") + value = fields.Char("Value") diff --git a/studies_base/models/study_questionnaire_type.py b/studies_base/models/study_questionnaire_type.py deleted file mode 100644 index f0d0369..0000000 --- a/studies_base/models/study_questionnaire_type.py +++ /dev/null @@ -1,12 +0,0 @@ -# -*- coding: utf-8 -*- -from odoo import api, fields, models, _ -from odoo import osv -from odoo.exceptions import UserError - - -class StudyQuestionnaireType(models.Model): - _name = "study.questionnaire.type" - - name = fields.Char("Name") - sequence = fields.Integer("Sequence") - diff --git a/studies_base/models/study_region.py b/studies_base/models/study_region.py index b4c4dbf..ca1b7c6 100644 --- a/studies_base/models/study_region.py +++ b/studies_base/models/study_region.py @@ -9,4 +9,5 @@ class StudyRegion(models.Model): name = fields.Char("Name") sequence = fields.Integer("Sequence") + value = fields.Char("Value") diff --git a/studies_base/models/study_status.py b/studies_base/models/study_status.py index c7aa565..7720bac 100644 --- a/studies_base/models/study_status.py +++ b/studies_base/models/study_status.py @@ -4,7 +4,7 @@ from odoo import osv from odoo.exceptions import UserError -class StudStatus(models.Model): +class StudyStatus(models.Model): _name = "study.status" name = fields.Char("Name") diff --git a/studies_base/models/study_study.py b/studies_base/models/study_study.py index e9e42df..cf4fdbd 100644 --- a/studies_base/models/study_study.py +++ b/studies_base/models/study_study.py @@ -5,9 +5,8 @@ from odoo.exceptions import UserError class StudyStudy(models.Model): - _name = "study.study" - _inherit = ['mail.thread'] + _name = "study.study" title = fields.Char("Nom de l'étude") name = fields.Char("Acronyme") @@ -17,19 +16,16 @@ class StudyStudy(models.Model): progress_status = fields.Many2one("study.progress.status", string="Avancement de l'étude") - type = fields.Many2one("study.type", string="Type") description_summary = fields.Char("Brève description de l'étude") description = fields.Text("Description de l'étude") - keyword = fields.Many2one("study.tag", string="Mots-clés") + keyword = fields.Many2one("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") - 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 de la publication") site = fields.Many2one("res.partner", string="Lieu de l'étude") - author = fields.Many2one("study.author", string="Platforme technique d'étude") identitifer_author = fields.Char("ID plateforme") identifier_primary_id = fields.Char("Idientifiant Seintinelles", readonly=True) @@ -54,8 +50,6 @@ class StudyStudy(models.Model): recruitment_eligibility_description = fields.Text("Description de la cible") recruitment_eligibility_topic = fields.Many2many("study.eligibility.topic", string="Thématique de recherche") region = fields.Many2many("study.region", string="Zones géographiques étudiées") - - questionnaires = fields.One2many("study.questionnaire", "study_id", string="Questionnaires") - contacts = fields.Many2many("res.partner", string="Contacts") + note = fields.Text("Annotations") \ No newline at end of file diff --git a/studies_base/models/study_type.py b/studies_base/models/study_type.py deleted file mode 100644 index 9d424a6..0000000 --- a/studies_base/models/study_type.py +++ /dev/null @@ -1,12 +0,0 @@ -# -*- coding: utf-8 -*- -from odoo import api, fields, models, _ -from odoo import osv -from odoo.exceptions import UserError - - -class StudyType(models.Model): - _name = "study.type" - - name = fields.Char("Name") - sequence = fields.Integer("Sequence") - diff --git a/studies_base/security/ir.model.access.csv b/studies_base/security/ir.model.access.csv index a9c9b02..aa986a5 100644 --- a/studies_base/security/ir.model.access.csv +++ b/studies_base/security/ir.model.access.csv @@ -1,5 +1,4 @@ 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_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 @@ -13,14 +12,9 @@ access_study_questionnaire_admin,study.questionnaire.admin,model_study_questionn access_study_region_admin,study.region.admin,model_study_region,base.group_user,1,1,1,1 access_study_status_admin,study.status.admin,model_study_status,base.group_user,1,1,1,1 access_study_study_admin,study.study.admin,model_study_study,base.group_user,1,1,1,1 -access_study_tag_admin,study.tag.admin,model_study_tag,base.group_user,1,1,1,1 -access_study_type_admin,study.type.admin,model_study_type,base.group_user,1,1,1,1 -access_study_questionnaire_category_admin,study.questionnaire.category.admin,model_study_questionnaire_category,base.group_user,1,1,1,1 -access_study_questionnaire_type_admin,study.questionnaire.type.admin,model_study_questionnaire_type,base.group_user,1,1,1,1 +access_study_keyword_admin,study.keyword.admin,model_study_keyword,base.group_user,1,1,1,1 access_study_questionnaire_subject_type_admin,study.questionnaire.subject.type.admin,model_study_questionnaire_subject_type,base.group_user,1,1,1,1 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 5f9b300..e4ca472 100644 --- a/studies_base/views/study_config_views.xml +++ b/studies_base/views/study_config_views.xml @@ -1,16 +1,7 @@ - - study.author.tree - study.author - - - - - - - + study.eligibility.condition.body.site.tree study.eligibility.condition.body.site @@ -18,6 +9,7 @@ + @@ -27,7 +19,8 @@ - + + @@ -37,7 +30,8 @@ - + + @@ -47,7 +41,8 @@ - + + @@ -79,7 +74,8 @@ - + + @@ -89,28 +85,8 @@ - - - - - - study.questionnaire.category.tree - study.questionnaire.category - - - - - - - - - study.questionnaire.response.state.tree - study.questionnaire.response.state - - - - - + + @@ -125,17 +101,6 @@ - - study.questionnaire.progress.status.tree - study.questionnaire.progress.status - - - - - - - - study.questionnaire.status.tree study.questionnaire.status @@ -153,20 +118,11 @@ - + + - - - study.questionnaire.type.tree - study.questionnaire.type - - - - - - - + study.region.tree study.region @@ -188,33 +144,19 @@ - - study.tag.tree - study.tag + + study.keyword.tree + study.keyword - - study.type.tree - study.type - - - - - - - - - Platformes techniques d'étude - ir.actions.act_window - study.author - + Localisations anatomiques des affections ir.actions.act_window @@ -254,27 +196,12 @@ Objectifs ir.actions.act_window study.purpose.type - - - Catégories de questionnaire - ir.actions.act_window - study.questionnaire.category - - - États des réponses - ir.actions.act_window - study.questionnaire.response.state - + Statuts des réponses aux questionnaires ir.actions.act_window study.questionnaire.response.progress.status - - - Statuts des questionnaires - ir.actions.act_window - study.questionnaire.progress.status - + Statuts de publication (questionnaires) ir.actions.act_window @@ -285,11 +212,6 @@ ir.actions.act_window study.questionnaire.subject.type - - Types de questionnaires - ir.actions.act_window - study.questionnaire.type - Zones géographiques étudiées ir.actions.act_window @@ -300,16 +222,9 @@ ir.actions.act_window study.status - + Mots-clés des études ir.actions.act_window - study.tag + study.keyword - - Types d'études - ir.actions.act_window - study.type - - - \ No newline at end of file diff --git a/studies_base/views/study_menu.xml b/studies_base/views/study_menu.xml index 9e2a4fc..d532058 100644 --- a/studies_base/views/study_menu.xml +++ b/studies_base/views/study_menu.xml @@ -20,10 +20,7 @@ - - + @@ -48,12 +45,9 @@ - - - - - + - - - + diff --git a/studies_base/views/study_participant_views.xml b/studies_base/views/study_participant_views.xml index 4116cd7..b51f2b6 100644 --- a/studies_base/views/study_participant_views.xml +++ b/studies_base/views/study_participant_views.xml @@ -19,7 +19,7 @@ study.participant.form study.participant -
+
@@ -51,12 +51,10 @@ - - - + - + @@ -65,11 +63,7 @@ - - - - - + diff --git a/studies_base/views/study_questionnaire_response_views.xml b/studies_base/views/study_questionnaire_response_views.xml index 09eb33f..6856391 100644 --- a/studies_base/views/study_questionnaire_response_views.xml +++ b/studies_base/views/study_questionnaire_response_views.xml @@ -6,8 +6,6 @@ study.questionnaire.response - - @@ -21,7 +19,7 @@ study.questionnaire.response.response.form study.questionnaire.response -
+
@@ -37,23 +35,17 @@ - - - - - + - - diff --git a/studies_base/views/study_questionnaire_views.xml b/studies_base/views/study_questionnaire_views.xml index 9fad061..eeda6cb 100644 --- a/studies_base/views/study_questionnaire_views.xml +++ b/studies_base/views/study_questionnaire_views.xml @@ -9,8 +9,7 @@ - - + @@ -20,7 +19,7 @@ study.questionnaire.form study.questionnaire - +
@@ -39,7 +38,6 @@ - @@ -50,9 +48,6 @@ - - - @@ -67,7 +62,6 @@ - @@ -76,27 +70,7 @@ - - - - - - - - - - - - - - - - - - - - - + diff --git a/studies_base/views/study_study_views.xml b/studies_base/views/study_study_views.xml index 20eeb5f..4475573 100644 --- a/studies_base/views/study_study_views.xml +++ b/studies_base/views/study_study_views.xml @@ -48,16 +48,14 @@ - - - + + - - - + + @@ -65,8 +63,7 @@ - - + @@ -95,13 +92,7 @@ - - - - - - - +