8 Commits

Author SHA1 Message Date
1b649f72a3 Sync config from odoo-elabore-ci:16.0
Some checks failed
pre-commit / pre-commit (pull_request) Failing after 7m49s
2025-09-17 13:40:03 +00:00
Stéphan Sainléger
96a1762f43 [IMP] study_base: prevent opening of progress_status from a study 2025-09-05 14:04:42 +02:00
Boris Gallet
e6a9d83a8a [FIX] studies_base: Correct field name in views study_participant & questionnaire_resp. 2025-09-02 18:17:50 +02:00
Boris Gallet
6af8c3a866 [FIX] studies_base: handle created, date for study_questionnaire_response 2025-08-27 16:59:05 +02:00
Boris Gallet
84c22445bd [FIX] studies_base: correct date field study_participant 2025-08-27 16:59:05 +02:00
Boris Gallet
be1818654e [FIX] studies_base : #OPP306 - add missing field for search view and correct typo 2025-08-27 10:31:25 +02:00
Boris Gallet
b474f94211 [FIX] studies_base: fix indent error for study name_get 2025-08-25 16:49:36 +02:00
Stéphan Sainléger
34759aefdc [IMP] studies_base: add progres status management for studies 2025-08-14 17:56:50 +02:00
22 changed files with 838 additions and 49 deletions

20
.editorconfig Normal file
View File

@@ -0,0 +1,20 @@
# Configuration for known file extensions
[*.{css,js,json,less,md,py,rst,sass,scss,xml,yaml,yml}]
charset = utf-8
end_of_line = lf
indent_size = 4
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true
[*.{json,yml,yaml,rst,md}]
indent_size = 2
# Do not configure editor for libs and autogenerated content
[{*/static/{lib,src/lib}/**,*/static/description/index.html,*/readme/../README.rst}]
charset = unset
end_of_line = unset
indent_size = unset
indent_style = unset
insert_final_newline = false
trim_trailing_whitespace = false

188
.eslintrc.yml Normal file
View File

@@ -0,0 +1,188 @@
env:
browser: true
es6: true
# See https://github.com/OCA/odoo-community.org/issues/37#issuecomment-470686449
parserOptions:
ecmaVersion: 2019
overrides:
- files:
- "**/*.esm.js"
parserOptions:
sourceType: module
# Globals available in Odoo that shouldn't produce errorings
globals:
_: readonly
$: readonly
fuzzy: readonly
jQuery: readonly
moment: readonly
odoo: readonly
openerp: readonly
owl: readonly
luxon: readonly
# Styling is handled by Prettier, so we only need to enable AST rules;
# see https://github.com/OCA/maintainer-quality-tools/pull/618#issuecomment-558576890
rules:
accessor-pairs: warn
array-callback-return: warn
callback-return: warn
capitalized-comments:
- warn
- always
- ignoreConsecutiveComments: true
ignoreInlineComments: true
complexity:
- warn
- 15
constructor-super: warn
dot-notation: warn
eqeqeq: warn
global-require: warn
handle-callback-err: warn
id-blacklist: warn
id-match: warn
init-declarations: error
max-depth: warn
max-nested-callbacks: warn
max-statements-per-line: warn
no-alert: warn
no-array-constructor: warn
no-caller: warn
no-case-declarations: warn
no-class-assign: warn
no-cond-assign: error
no-const-assign: error
no-constant-condition: warn
no-control-regex: warn
no-debugger: error
no-delete-var: warn
no-div-regex: warn
no-dupe-args: error
no-dupe-class-members: error
no-dupe-keys: error
no-duplicate-case: error
no-duplicate-imports: error
no-else-return: warn
no-empty-character-class: warn
no-empty-function: error
no-empty-pattern: error
no-empty: warn
no-eq-null: error
no-eval: error
no-ex-assign: error
no-extend-native: warn
no-extra-bind: warn
no-extra-boolean-cast: warn
no-extra-label: warn
no-fallthrough: warn
no-func-assign: error
no-global-assign: error
no-implicit-coercion:
- warn
- allow: ["~"]
no-implicit-globals: warn
no-implied-eval: warn
no-inline-comments: warn
no-inner-declarations: warn
no-invalid-regexp: warn
no-irregular-whitespace: warn
no-iterator: warn
no-label-var: warn
no-labels: warn
no-lone-blocks: warn
no-lonely-if: error
no-mixed-requires: error
no-multi-str: warn
no-native-reassign: error
no-negated-condition: warn
no-negated-in-lhs: error
no-new-func: warn
no-new-object: warn
no-new-require: warn
no-new-symbol: warn
no-new-wrappers: warn
no-new: warn
no-obj-calls: warn
no-octal-escape: warn
no-octal: warn
no-param-reassign: warn
no-path-concat: warn
no-process-env: warn
no-process-exit: warn
no-proto: warn
no-prototype-builtins: warn
no-redeclare: warn
no-regex-spaces: warn
no-restricted-globals: warn
no-restricted-imports: warn
no-restricted-modules: warn
no-restricted-syntax: warn
no-return-assign: error
no-script-url: warn
no-self-assign: warn
no-self-compare: warn
no-sequences: warn
no-shadow-restricted-names: warn
no-shadow: warn
no-sparse-arrays: warn
no-sync: warn
no-this-before-super: warn
no-throw-literal: warn
no-undef-init: warn
no-undef: error
no-unmodified-loop-condition: warn
no-unneeded-ternary: error
no-unreachable: error
no-unsafe-finally: error
no-unused-expressions: error
no-unused-labels: error
no-unused-vars: error
no-use-before-define: error
no-useless-call: warn
no-useless-computed-key: warn
no-useless-concat: warn
no-useless-constructor: warn
no-useless-escape: warn
no-useless-rename: warn
no-void: warn
no-with: warn
operator-assignment: [error, always]
prefer-const: warn
radix: warn
require-yield: warn
sort-imports: warn
spaced-comment: [error, always]
strict: [error, function]
use-isnan: error
valid-jsdoc:
- warn
- prefer:
arg: param
argument: param
augments: extends
constructor: class
exception: throws
func: function
method: function
prop: property
return: returns
virtual: abstract
yield: yields
preferType:
array: Array
bool: Boolean
boolean: Boolean
number: Number
object: Object
str: String
string: String
requireParamDescription: false
requireReturn: false
requireReturnDescription: false
requireReturnType: false
valid-typeof: warn
yoda: warn

View File

@@ -0,0 +1,42 @@
name: pre-commit
on:
pull_request:
branches:
- "16.0*"
jobs:
pre-commit:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: "3.11"
- name: Get python version
run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
# - uses: actions/cache@v4
# with:
# path: ~/.cache/pre-commit
# key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }}
- name: Install pre-commit
run: pip install pre-commit
- name: Run pre-commit
run: pre-commit run --all-files --show-diff-on-failure --color=always
env:
# Consider valid a PR that changes README fragments but doesn't
# change the README.rst file itself. It's not really a problem
# because the bot will update it anyway after merge. This way, we
# lower the barrier for functional contributors that want to fix the
# readme fragments, while still letting developers get README
# auto-generated (which also helps functionals when using runboat).
# DOCS https://pre-commit.com/#temporarily-disabling-hooks
SKIP: oca-gen-addon-readme
- name: Check that all files generated by pre-commit are in git
run: |
newfiles="$(git ls-files --others --exclude-from=.gitignore)"
if [ "$newfiles" != "" ] ; then
echo "Please check-in the following files:"
echo "$newfiles"
exit 1
fi

150
.pre-commit-config.yaml Normal file
View File

@@ -0,0 +1,150 @@
exclude: |
(?x)
# NOT INSTALLABLE ADDONS
# END NOT INSTALLABLE ADDONS
# Files and folders generated by bots, to avoid loops
^setup/|/static/description/index\.html$|
# We don't want to mess with tool-generated files
.svg$|/tests/([^/]+/)?cassettes/|^.copier-answers.yml$|^.github/|^eslint.config.cjs|^prettier.config.cjs|
# Maybe reactivate this when all README files include prettier ignore tags?
^README\.md$|
# Library files can have extraneous formatting (even minimized)
/static/(src/)?lib/|
# Repos using Sphinx to generate docs don't need prettying
^docs/_templates/.*\.html$|
# Don't bother non-technical authors with formatting issues in docs
readme/.*\.(rst|md)$|
# Ignore build and dist directories in addons
/build/|/dist/|
# Ignore test files in addons
/tests/samples/.*|
# You don't usually want a bot to modify your legal texts
(LICENSE.*|COPYING.*)
default_language_version:
python: python3
node: "16.17.0"
repos:
- repo: local
hooks:
# These files are most likely copier diff rejection junks; if found,
# review them manually, fix the problem (if needed) and remove them
- id: forbidden-files
name: forbidden files
entry: found forbidden files; remove them
language: fail
files: "\\.rej$"
- id: en-po-files
name: en.po files cannot exist
entry: found a en.po file
language: fail
files: '[a-zA-Z0-9_]*/i18n/en\.po$'
- repo: https://github.com/oca/maintainer-tools
rev: f9b919b9868143135a9c9cb03021089cabba8223
hooks:
# update the NOT INSTALLABLE ADDONS section above
- id: oca-update-pre-commit-excluded-addons
- id: oca-fix-manifest-website
entry:
bash -c 'oca-fix-manifest-website "https://git.elabore.coop/elabore/$(basename
$(git rev-parse --show-toplevel))"'
- id: oca-gen-addon-readme
entry:
bash -c 'oca-gen-addon-readme
--addons-dir=.
--branch=$(git symbolic-ref
refs/remotes/origin/HEAD | sed "s@^refs/remotes/origin/@@")
--repo-name=$(basename $(git rev-parse --show-toplevel))
--org-name="Elabore"
--if-source-changed --keep-source-digest'
- repo: https://github.com/OCA/odoo-pre-commit-hooks
rev: v0.1.4
hooks:
- id: oca-checks-odoo-module
- id: oca-checks-po
args:
- --disable=po-pretty-format
- repo: local
hooks:
- id: prettier
name: prettier (with plugin-xml)
entry: prettier
args:
- --write
- --list-different
- --ignore-unknown
types: [text]
files: \.(css|htm|html|js|json|jsx|less|md|scss|toml|ts|xml|yaml|yml)$
language: node
additional_dependencies:
- "prettier@2.7.1"
- "@prettier/plugin-xml@2.2.0"
- repo: local
hooks:
- id: eslint
name: eslint
entry: eslint
args:
- --color
- --fix
verbose: true
types: [javascript]
language: node
additional_dependencies:
- "eslint@8.24.0"
- "eslint-plugin-jsdoc@"
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v5.0.0
hooks:
- id: trailing-whitespace
# exclude autogenerated files
exclude: /README\.rst$|\.pot?$
- id: end-of-file-fixer
# exclude autogenerated files
exclude: /README\.rst$|\.pot?$
- id: debug-statements
- id: fix-encoding-pragma
args: ["--remove"]
- id: check-case-conflict
- id: check-docstring-first
- id: check-executables-have-shebangs
- id: check-merge-conflict
# exclude files where underlines are not distinguishable from merge conflicts
exclude: /README\.rst$|^docs/.*\.rst$
- id: check-symlinks
- id: check-xml
- id: mixed-line-ending
args: ["--fix=lf"]
- repo: https://github.com/PyCQA/docformatter
rev: v1.7.7
hooks:
- id: docformatter
args: [
"--in-place", # modify the files
"--recursive", # run on all the files
"--wrap-summaries",
"88", # max length of 1st line
"--wrap-descriptions",
"88", # max length of other lines
"--pre-summary-newline", # new line before a long summary
"--make-summary-multi-line", # force summary on multilines
]
additional_dependencies: ["tomli"] # if Python <3.11
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.12.0
hooks:
- id: ruff
args: [--fix, --exit-non-zero-on-fix]
- id: ruff-format
- repo: https://github.com/OCA/pylint-odoo
rev: v9.1.3
hooks:
- id: pylint_odoo
name: pylint with optional checks
args:
- --rcfile=.pylintrc
- --exit-zero
verbose: true
- id: pylint_odoo
args:
- --rcfile=.pylintrc-mandatory

8
.prettierrc.yml Normal file
View File

@@ -0,0 +1,8 @@
# Defaults for all prettier-supported languages.
# Prettier will complete this with settings from .editorconfig file.
bracketSpacing: false
printWidth: 88
proseWrap: always
semi: true
trailingComma: "es5"
xmlWhitespaceSensitivity: "strict"

123
.pylintrc Normal file
View File

@@ -0,0 +1,123 @@
[MASTER]
load-plugins=pylint_odoo
score=n
[ODOOLINT]
readme-template-url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst"
manifest-required-authors=Elabore
manifest-required-keys=license
manifest-deprecated-keys=description,active
license-allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3
valid-odoo-versions=16.0
[MESSAGES CONTROL]
disable=all
# This .pylintrc contains optional AND mandatory checks and is meant to be
# loaded in an IDE to have it check everything, in the hope this will make
# optional checks more visible to contributors who otherwise never look at a
# green travis to see optional checks that failed.
# .pylintrc-mandatory containing only mandatory checks is used the pre-commit
# config as a blocking check.
enable=anomalous-backslash-in-string,
api-one-deprecated,
api-one-multi-together,
assignment-from-none,
attribute-deprecated,
class-camelcase,
dangerous-default-value,
dangerous-view-replace-wo-priority,
development-status-allowed,
duplicate-id-csv,
duplicate-key,
duplicate-xml-fields,
duplicate-xml-record-id,
eval-referenced,
eval-used,
incoherent-interpreter-exec-perm,
license-allowed,
manifest-author-string,
manifest-deprecated-key,
manifest-required-author,
manifest-required-key,
manifest-version-format,
method-compute,
method-inverse,
method-required-super,
method-search,
openerp-exception-warning,
pointless-statement,
pointless-string-statement,
print-used,
redundant-keyword-arg,
redundant-modulename-xml,
reimported,
relative-import,
return-in-init,
rst-syntax-error,
sql-injection,
too-few-format-args,
translation-field,
translation-required,
unreachable,
use-vim-comment,
wrong-tabs-instead-of-spaces,
xml-syntax-error,
attribute-string-redundant,
character-not-valid-in-resource-link,
consider-merging-classes-inherited,
context-overridden,
create-user-wo-reset-password,
dangerous-filter-wo-user,
dangerous-qweb-replace-wo-priority,
deprecated-data-xml-node,
deprecated-openerp-xml-node,
duplicate-po-message-definition,
except-pass,
file-not-used,
invalid-commit,
manifest-maintainers-list,
missing-newline-extrafiles,
missing-readme,
missing-return,
odoo-addons-relative-import,
old-api7-method-defined,
po-msgstr-variables,
po-syntax-error,
renamed-field-parameter,
resource-not-exist,
str-format-used,
test-folder-imported,
translation-contains-variable,
translation-positional-used,
unnecessary-utf8-coding-comment,
website-manifest-key-not-valid-uri,
xml-attribute-translatable,
xml-deprecated-qweb-directive,
xml-deprecated-tree-attribute,
external-request-timeout,
# messages that do not cause the lint step to fail
consider-merging-classes-inherited,
create-user-wo-reset-password,
dangerous-filter-wo-user,
deprecated-module,
file-not-used,
invalid-commit,
missing-manifest-dependency,
missing-newline-extrafiles,
missing-readme,
no-utf8-coding-comment,
odoo-addons-relative-import,
old-api7-method-defined,
redefined-builtin,
too-complex,
unnecessary-utf8-coding-comment
[REPORTS]
msg-template={path}:{line}: [{msg_id}({symbol}), {obj}] {msg}
output-format=colorized
reports=no

98
.pylintrc-mandatory Normal file
View File

@@ -0,0 +1,98 @@
[MASTER]
load-plugins=pylint_odoo
score=n
[ODOOLINT]
readme-template-url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst"
manifest-required-authors=Elabore
manifest-required-keys=license
manifest-deprecated-keys=description,active
license-allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3
valid-odoo-versions=16.0
[MESSAGES CONTROL]
disable=all
enable=anomalous-backslash-in-string,
api-one-deprecated,
api-one-multi-together,
assignment-from-none,
attribute-deprecated,
class-camelcase,
dangerous-default-value,
dangerous-view-replace-wo-priority,
development-status-allowed,
duplicate-id-csv,
duplicate-key,
duplicate-xml-fields,
duplicate-xml-record-id,
eval-referenced,
eval-used,
incoherent-interpreter-exec-perm,
license-allowed,
manifest-author-string,
manifest-deprecated-key,
manifest-required-author,
manifest-required-key,
manifest-version-format,
method-compute,
method-inverse,
method-required-super,
method-search,
openerp-exception-warning,
pointless-statement,
pointless-string-statement,
print-used,
redundant-keyword-arg,
redundant-modulename-xml,
reimported,
relative-import,
return-in-init,
rst-syntax-error,
sql-injection,
too-few-format-args,
translation-field,
translation-required,
unreachable,
use-vim-comment,
wrong-tabs-instead-of-spaces,
xml-syntax-error,
attribute-string-redundant,
character-not-valid-in-resource-link,
consider-merging-classes-inherited,
context-overridden,
create-user-wo-reset-password,
dangerous-filter-wo-user,
dangerous-qweb-replace-wo-priority,
deprecated-data-xml-node,
deprecated-openerp-xml-node,
duplicate-po-message-definition,
except-pass,
file-not-used,
invalid-commit,
manifest-maintainers-list,
missing-newline-extrafiles,
missing-readme,
missing-return,
odoo-addons-relative-import,
old-api7-method-defined,
po-msgstr-variables,
po-syntax-error,
renamed-field-parameter,
resource-not-exist,
str-format-used,
test-folder-imported,
translation-contains-variable,
translation-positional-used,
unnecessary-utf8-coding-comment,
website-manifest-key-not-valid-uri,
xml-attribute-translatable,
xml-deprecated-qweb-directive,
xml-deprecated-tree-attribute,
external-request-timeout
[REPORTS]
msg-template={path}:{line}: [{msg_id}({symbol}), {obj}] {msg}
output-format=colorized
reports=no

31
.ruff.toml Normal file
View File

@@ -0,0 +1,31 @@
target-version = "py310"
fix = true
[lint]
extend-select = [
"B",
"C90",
"E501", # line too long (default 88)
"I", # isort
"UP", # pyupgrade
]
extend-safe-fixes = ["UP008"]
exclude = ["setup/*"]
[format]
exclude = ["setup/*"]
[lint.per-file-ignores]
"__init__.py" = ["F401", "I001"] # ignore unused and unsorted imports in __init__.py
"__manifest__.py" = ["B018"] # useless expression
[lint.isort]
section-order = ["future", "standard-library", "third-party", "odoo", "odoo-addons", "first-party", "local-folder"]
[lint.isort.sections]
"odoo" = ["odoo"]
"odoo-addons" = ["odoo.addons"]
[lint.mccabe]
max-complexity = 16

View File

@@ -1 +1,2 @@
from . import models from . import models
from . import wizards

View File

@@ -24,6 +24,7 @@
# "security/security.xml", # "security/security.xml",
"data/studies_base_data.xml", "data/studies_base_data.xml",
"security/ir.model.access.csv", "security/ir.model.access.csv",
"wizards/create_progress_status.xml",
"views/study_config_views.xml", "views/study_config_views.xml",
"views/study_study_views.xml", "views/study_study_views.xml",
"views/study_progress_status_views.xml", "views/study_progress_status_views.xml",

View File

@@ -172,7 +172,7 @@
</record> </record>
<record id="study_questionnaire_subject_type_PRACTITIONER" model="study.questionnaire.subject.type"> <record id="study_questionnaire_subject_type_PRACTITIONER" model="study.questionnaire.subject.type">
<field name="name">Praticient</field> <field name="name">Praticien</field>
<field name="value">PRACTITIONER</field> <field name="value">PRACTITIONER</field>
</record> </record>

View File

@@ -34,3 +34,17 @@ class StudyParticipant(models.Model):
updated = fields.Datetime("Date mise à jour") updated = fields.Datetime("Date mise à jour")
active = fields.Boolean("Actif", default=True) active = fields.Boolean("Actif", default=True)
@api.depends("write_date")
def _compute_updated(self):
for record in self:
## XXXb0g : the following two lines are to be removed when all records will have been updated during migration
# if record.updated:
# continue
record.updated = record.write_date
@api.depends("create_date")
def _compute_created(self):
for record in self:
if not record.created:
record.created = record.create_date

View File

@@ -17,6 +17,11 @@ class StudyProgressStatus(models.Model):
('ACTIVE-BUT-NOT-RECRUITING', 'Active mais ne recrute plus'), ('ACTIVE-BUT-NOT-RECRUITING', 'Active mais ne recrute plus'),
('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", compute="_compute_actual")
date_begin = fields.Datetime("Date de début de l'état") date_begin = fields.Datetime("Date de début de l'état")
date_end = fields.Datetime("Date de fin de l'état") date_end = fields.Datetime("Date de fin de l'état")
@api.depends("date_end")
def _compute_actual(self):
for record in self:
record.actual = (record.date_end is False) or (record.state == "COMPLETED")

View File

@@ -34,3 +34,17 @@ class StudyQuestionnaireResponse(models.Model):
updated = fields.Datetime("Date mise à jour") updated = fields.Datetime("Date mise à jour")
active = fields.Boolean("Actif", default=True) active = fields.Boolean("Actif", default=True)
@api.depends("write_date")
def _compute_updated(self):
for record in self:
## XXXb0g : the following two lines are to be removed when all records will have been updated during migration
# if record.updated:
# continue
record.updated = record.write_date
@api.depends("create_date")
def _compute_created(self):
for record in self:
if not record.created:
record.created = record.create_date

View File

@@ -19,7 +19,8 @@ class StudyStudy(models.Model):
"study.progress.status", "study.progress.status",
string="Avancement de l'étude", string="Avancement de l'étude",
domain="[('study_id', '=', id)]", domain="[('study_id', '=', id)]",
) # should be computed to actual progress status compute="_compute_progress_status_id",
)
progress_status = fields.One2many( progress_status = fields.One2many(
"study.progress.status", "study_id", "All progress status" "study.progress.status", "study_id", "All progress status"
) )
@@ -83,6 +84,7 @@ class StudyStudy(models.Model):
updated = fields.Datetime( updated = fields.Datetime(
"Updated", readonly=True, compute="_compute_updated", store=True "Updated", readonly=True, compute="_compute_updated", store=True
) )
active = fields.Boolean("Actif", default=True)
@api.depends("create_date") @api.depends("create_date")
def _compute_created(self): def _compute_created(self):
@@ -96,15 +98,24 @@ class StudyStudy(models.Model):
_logger.info(f"Record ID: {record.id}, write_date: {record.write_date}") _logger.info(f"Record ID: {record.id}, write_date: {record.write_date}")
record.updated = record.write_date record.updated = record.write_date
active = fields.Boolean("Actif", default=True) @api.depends("progress_status")
def _compute_progress_status_id(self):
for record in self:
unfinished_progress_status = record.progress_status.filtered(
lambda x: x.actual == True
)
record.progress_status_id = (
unfinished_progress_status.id
if len(unfinished_progress_status) == 1
else None
)
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")
@api.depends("title", "name") def name_get(self):
def name_get(self):
result = [] result = []
for study in self: for study in self:
if not study.name: if not study.name:

View File

@@ -23,3 +23,4 @@ access_study_participant_progress_status_admin,study.participant.progress.status
access_study_participant_state_admin,study.participant.state.admin,model_study_participant_state,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_response_progress_status_admin,study.questionnaire.response.progress.status.admin,model_study_questionnaire_response_progress_status,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
access_study_author_admin,study.author.admin,model_study_author,base.group_user,1,1,1,1 access_study_author_admin,study.author.admin,model_study_author,base.group_user,1,1,1,1
access_create_progress_status_wizard,create_progress_status_wizard.access,model_create_progress_status,base.group_user,1,1,1,0
1 id name model_id/id group_id/id perm_read perm_write perm_create perm_unlink
23 access_study_participant_state_admin study.participant.state.admin model_study_participant_state base.group_user 1 1 1 1
24 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
25 access_study_author_admin study.author.admin model_study_author base.group_user 1 1 1 1
26 access_create_progress_status_wizard create_progress_status_wizard.access model_create_progress_status base.group_user 1 1 1 0

View File

@@ -57,8 +57,8 @@
</group> </group>
<group name="technique" string="Technique"> <group name="technique" string="Technique">
<group name="technique_left"> <group name="technique_left">
<field name="create_date" /> <field name="created" />
<field name="write_date" /> <field name="updated" />
</group> </group>
<group name="technique_right"> <group name="technique_right">
</group> </group>

View File

@@ -61,8 +61,8 @@
</group> </group>
<group name="technique" string="Technique"> <group name="technique" string="Technique">
<group name="technique_left"> <group name="technique_left">
<field name="create_date" /> <field name="created" />
<field name="write_date" /> <field name="updated" />
</group> </group>
<group name="technique_right"> <group name="technique_right">
</group> </group>

View File

@@ -23,6 +23,11 @@
<form string="Étude"> <form string="Étude">
<header> <header>
<!-- action buttons --> <!-- action buttons -->
<button name="%(action_create_progress_status_wizard)d"
string="Update Status"
class="oe_highlight"
type="action"
/>
</header> </header>
<sheet> <sheet>
<div class="oe_button_box" name="button_box"> <div class="oe_button_box" name="button_box">
@@ -41,7 +46,7 @@
<group name="study_status_left"> <group name="study_status_left">
<field name="period_start" /> <field name="period_start" />
<field name="period_end" /> <field name="period_end" />
<field name="progress_status_id" /> <field name="progress_status_id" options="{'no_open': True}" />
</group> </group>
<group name="study_status_right"> <group name="study_status_right">
@@ -96,6 +101,16 @@
<page string="Notes" name="notes"> <page string="Notes" name="notes">
<field name="note" /> <field name="note" />
</page> </page>
<page string="Progress status" name="progress_status" groups="base.group_no_one">
<field name="progress_status" nolabel="1">
<tree create="false" delete="false" default_order="date_begin DESC" >
<field name="state" />
<field name="date_begin" />
<field name="date_end" />
<field name="actual" />
</tree>
</field>
</page>
</notebook> </notebook>
</sheet> </sheet>
</form> </form>
@@ -116,11 +131,19 @@
<field name="model">study.study</field> <field name="model">study.study</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Études"> <search string="Études">
<field name="title" string="Nom de l'étude" /> <field name="active" string="Actif" />
<field name="name" string="Acronyme" /> <field name="description" string="Description" />
<field name="identifier_author" string="ID Plateforme" />
<field name="identifier_primary_id" string="Seintinelles ID"/> <field name="identifier_primary_id" string="Seintinelles ID"/>
<field name="period_start" string="Date de début" /> <field name="keywords" string="Mots-clés" />
<field name="name" string="Acronyme" />
<field name="period_end" string="Date de fin" /> <field name="period_end" string="Date de fin" />
<field name="period_start" string="Date de début" />
<field name="phase" string="Phase" />
<field name="progress_status_id" string="Statut" />
<field name="region" string="Région" />
<field name="title" string="Nom de l'étude" />
<field name="version" string="Version" />
</search> </search>
</field> </field>
</record> </record>

View File

@@ -0,0 +1 @@
from . import create_progress_status

View File

@@ -0,0 +1,28 @@
from datetime import datetime
from odoo import fields, models
class CreateProgressStatus(models.TransientModel):
_name = "create.progress.status"
_description = "create Progress Status"
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")
def create_progress_status(self):
study = self.env["study.study"].browse(self._context.get("active_ids"))
study.progress_status_id.date_end = datetime.now()
values = {
"study_id": study.id,
"state": self.state,
"date_begin": datetime.now(),
"date_end": None,
}
self.env["study.progress.status"].create(values)
study.write({"updated": datetime.now()})

View File

@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<record id="create_progress_status_wizard_view_form" model="ir.ui.view">
<field name="name">create.progress.status.wizard.view.form</field>
<field name="model">create.progress.status</field>
<field name="arch" type="xml">
<form string="Update study progress status">
<sheet>
<group>
<field name="state" />
</group>
</sheet>
<footer>
<button string="Update" name="create_progress_status" type="object"
class="btn-primary" />
<button string="Cancel" class="btn-secondary" special="cancel" />
</footer>
</form>
</field>
</record>
<record
id="action_create_progress_status_wizard" model="ir.actions.act_window">
<field name="name">Create Progress Status</field>
<field name="res_model">create.progress.status</field>
<field name="view_mode">form</field>
<field name="view_id" ref="create_progress_status_wizard_view_form" />
<field name="target">new</field>
</record>
</odoo>