From 68770f239955f117fb7828a6c7f26ae634ba2d56 Mon Sep 17 00:00:00 2001
From: benjamin <benjamin@le-filament.com>
Date: Tue, 22 Mar 2022 12:31:10 +0100
Subject: [PATCH] [clean] add pre-commit files and changes
---
.editorconfig | 20 ++++
.eslintrc.yml | 187 +++++++++++++++++++++++++++++++
.flake8 | 12 ++
.isort.cfg | 13 +++
.pre-commit-config.yaml | 127 +++++++++++++++++++++
.prettierrc.yml | 8 ++
.pylintrc | 87 ++++++++++++++
.pylintrc-mandatory | 64 +++++++++++
models/acc_operation.py | 148 +++++++++++++++---------
static/src/js/operation_graph.js | 17 ++-
10 files changed, 622 insertions(+), 61 deletions(-)
create mode 100644 .editorconfig
create mode 100644 .eslintrc.yml
create mode 100644 .flake8
create mode 100644 .isort.cfg
create mode 100644 .pre-commit-config.yaml
create mode 100644 .prettierrc.yml
create mode 100644 .pylintrc
create mode 100644 .pylintrc-mandatory
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..bfd7ac5
--- /dev/null
+++ b/.editorconfig
@@ -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
diff --git a/.eslintrc.yml b/.eslintrc.yml
new file mode 100644
index 0000000..d4cc423
--- /dev/null
+++ b/.eslintrc.yml
@@ -0,0 +1,187 @@
+env:
+ browser: true
+ es6: true
+
+# See https://github.com/OCA/odoo-community.org/issues/37#issuecomment-470686449
+parserOptions:
+ ecmaVersion: 2017
+
+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
+
+# 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
diff --git a/.flake8 b/.flake8
new file mode 100644
index 0000000..e397e8e
--- /dev/null
+++ b/.flake8
@@ -0,0 +1,12 @@
+[flake8]
+max-line-length = 88
+max-complexity = 16
+# B = bugbear
+# B9 = bugbear opinionated (incl line length)
+select = C,E,F,W,B,B9
+# E203: whitespace before ':' (black behaviour)
+# E501: flake8 line length (covered by bugbear B950)
+# W503: line break before binary operator (black behaviour)
+ignore = E203,E501,W503
+per-file-ignores=
+ __init__.py:F401
diff --git a/.isort.cfg b/.isort.cfg
new file mode 100644
index 0000000..0ec187e
--- /dev/null
+++ b/.isort.cfg
@@ -0,0 +1,13 @@
+[settings]
+; see https://github.com/psf/black
+multi_line_output=3
+include_trailing_comma=True
+force_grid_wrap=0
+combine_as_imports=True
+use_parentheses=True
+line_length=88
+known_odoo=odoo
+known_odoo_addons=odoo.addons
+sections=FUTURE,STDLIB,THIRDPARTY,ODOO,ODOO_ADDONS,FIRSTPARTY,LOCALFOLDER
+default_section=THIRDPARTY
+ensure_newline_before_comments = True
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 0000000..8a5999a
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,127 @@
+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/|
+ # 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$|
+ # You don't usually want a bot to modify your legal texts
+ (LICENSE.*|COPYING.*)
+default_language_version:
+ python: python3
+ node: "14.13.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$"
+ - repo: https://github.com/oca/maintainer-tools
+ rev: ab1d7f6
+ hooks:
+ # update the NOT INSTALLABLE ADDONS section above
+ - id: oca-update-pre-commit-excluded-addons
+ - id: oca-fix-manifest-website
+ args: ["https://le-filament.com"]
+ - repo: https://github.com/myint/autoflake
+ rev: v1.4
+ hooks:
+ - id: autoflake
+ args:
+ - --expand-star-imports
+ - --ignore-init-module-imports
+ - --in-place
+ - --remove-all-unused-imports
+ - --remove-duplicate-keys
+ - --remove-unused-variables
+ - repo: https://github.com/psf/black
+ rev: 20.8b1
+ hooks:
+ - id: black
+ - repo: https://github.com/pre-commit/mirrors-prettier
+ rev: v2.1.2
+ hooks:
+ - id: prettier
+ name: prettier (with plugin-xml)
+ additional_dependencies:
+ - "prettier@2.1.2"
+ - "@prettier/plugin-xml@0.12.0"
+ args:
+ - --plugin=@prettier/plugin-xml
+ files: \.(css|htm|html|js|json|jsx|less|md|scss|toml|ts|xml|yaml|yml)$
+ - repo: https://github.com/pre-commit/mirrors-eslint
+ rev: v7.8.1
+ hooks:
+ - id: eslint
+ verbose: true
+ args:
+ - --color
+ - --fix
+ - repo: https://github.com/pre-commit/pre-commit-hooks
+ rev: v3.2.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/asottile/pyupgrade
+ rev: v2.7.2
+ hooks:
+ - id: pyupgrade
+ args: ["--keep-percent-format"]
+ - repo: https://github.com/PyCQA/isort
+ rev: 5.5.1
+ hooks:
+ - id: isort
+ name: isort except __init__.py
+ args:
+ - --settings=.
+ exclude: /__init__\.py$
+ - repo: https://gitlab.com/PyCQA/flake8
+ rev: 3.8.3
+ hooks:
+ - id: flake8
+ name: flake8
+ additional_dependencies: ["flake8-bugbear==20.1.4"]
+ - repo: https://github.com/PyCQA/pylint
+ rev: pylint-2.5.3
+ hooks:
+ - id: pylint
+ name: pylint with optional checks
+ args:
+ - --rcfile=.pylintrc
+ - --exit-zero
+ verbose: true
+ additional_dependencies: &pylint_deps
+ - pylint-odoo==3.5.0
+ - id: pylint
+ name: pylint with mandatory checks
+ args:
+ - --rcfile=.pylintrc-mandatory
+ additional_dependencies: *pylint_deps
diff --git a/.prettierrc.yml b/.prettierrc.yml
new file mode 100644
index 0000000..5b6d4b3
--- /dev/null
+++ b/.prettierrc.yml
@@ -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"
diff --git a/.pylintrc b/.pylintrc
new file mode 100644
index 0000000..dc6270e
--- /dev/null
+++ b/.pylintrc
@@ -0,0 +1,87 @@
+[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=Le Filament
+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=14.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,
+ # 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,
+ 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
diff --git a/.pylintrc-mandatory b/.pylintrc-mandatory
new file mode 100644
index 0000000..43ea239
--- /dev/null
+++ b/.pylintrc-mandatory
@@ -0,0 +1,64 @@
+[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=Le Filament
+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=14.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
+
+[REPORTS]
+msg-template={path}:{line}: [{msg_id}({symbol}), {obj}] {msg}
+output-format=colorized
+reports=no
diff --git a/models/acc_operation.py b/models/acc_operation.py
index 5f3ef69..45f374a 100644
--- a/models/acc_operation.py
+++ b/models/acc_operation.py
@@ -156,7 +156,7 @@ class AccOperation(models.Model):
if scale == "semestre":
date_end = end_month
- date_start = (end_month - relativedelta(months=6))
+ date_start = end_month - relativedelta(months=6)
elif scale == "week":
date_start = last_day_end - relativedelta(days=7)
date_end = last_day_end
@@ -230,8 +230,6 @@ class AccOperation(models.Model):
(labels et data pour les charts à afficher)
"""
- # TODO: Décalage horaire de 1h sur toutes les data affichées
-
label = []
data_autocons = []
data_allocons = []
@@ -242,9 +240,15 @@ class AccOperation(models.Model):
query = """
SELECT
date_trunc(%s, A.date_slot) AS date_slot,
- (SUM( (CASE WHEN comp_data_type = 'autocons' THEN A.power ELSE 0 END) )/2) / 1000 as autocons,
- (SUM( (CASE WHEN comp_data_type = 'prod' THEN A.power ELSE 0 END) )/2) / 1000 as prod,
- (SUM( (CASE WHEN comp_data_type = 'complement' THEN A.power ELSE 0 END) )/2) / 1000 as allocons
+ (SUM( (CASE WHEN
+ comp_data_type = 'autocons' THEN A.power
+ ELSE 0 END) )/2) / 1000 as autocons,
+ (SUM( (CASE
+ WHEN comp_data_type = 'prod'
+ THEN A.power ELSE 0 END) )/2) / 1000 as prod,
+ (SUM( (CASE
+ WHEN comp_data_type = 'complement' THEN A.power
+ ELSE 0 END) )/2) / 1000 as allocons
FROM
acc_enedis_cdc A
JOIN
@@ -309,17 +313,21 @@ class AccOperation(models.Model):
query = """
SELECT
date_trunc(%s, A.date_slot) AS date_slot,
- (SUM( (CASE WHEN comp_data_type = 'autocons' THEN A.power ELSE 0 END) )/2) / 1000 as autocons,
- (SUM( (CASE WHEN comp_data_type = 'complement' THEN A.power ELSE 0 END) )/2) / 1000 as allocons
- FROM acc_enedis_cdc A
- JOIN acc_operation E ON E.id = A.acc_operation_id
- WHERE A.acc_operation_id IS NOT NULL
- AND A.acc_operation_id IN %s
- AND A.acc_counter_id IN %s
- AND A.date_slot >= %s
- AND A.date_slot < %s
- GROUP BY date_trunc(%s, A.date_slot)
- ORDER BY date_slot ASC;
+ (SUM( (CASE
+ WHEN comp_data_type = 'autocons'
+ THEN A.power ELSE 0 END) )/2) / 1000 as autocons,
+ (SUM( (CASE
+ WHEN comp_data_type = 'complement'
+ THEN A.power ELSE 0 END) )/2) / 1000 as allocons
+ FROM acc_enedis_cdc A
+ JOIN acc_operation E ON E.id = A.acc_operation_id
+ WHERE A.acc_operation_id IS NOT NULL
+ AND A.acc_operation_id IN %s
+ AND A.acc_counter_id IN %s
+ AND A.date_slot >= %s
+ AND A.date_slot < %s
+ GROUP BY date_trunc(%s, A.date_slot)
+ ORDER BY date_slot ASC;
"""
query_params = (
slot_type,
@@ -363,9 +371,15 @@ class AccOperation(models.Model):
query = """
SELECT
date_trunc(%s, A.date_slot) AS date_slot,
- ((SUM((CASE WHEN comp_data_type = 'prod' THEN A.power ELSE 0 END)) - SUM(CASE
- WHEN comp_data_type = 'surplus' THEN A.power ELSE 0 END)) / 2) / 1000 as autocons,
- (SUM( (CASE WHEN comp_data_type = 'surplus' THEN A.power ELSE 0 END) )/2) / 1000 as surplus
+ ((SUM((CASE
+ WHEN comp_data_type = 'prod' THEN A.power
+ ELSE 0 END))
+ - SUM(CASE
+ WHEN comp_data_type = 'surplus' THEN A.power
+ ELSE 0 END)) / 2) / 1000 as autocons,
+ (SUM( (CASE
+ WHEN comp_data_type = 'surplus' THEN A.power
+ ELSE 0 END) )/2) / 1000 as surplus
FROM acc_enedis_cdc A
JOIN acc_operation E ON E.id = A.acc_operation_id
WHERE A.acc_operation_id IS NOT NULL
@@ -375,7 +389,7 @@ class AccOperation(models.Model):
AND A.date_slot < %s
GROUP BY date_trunc(%s, A.date_slot)
ORDER BY date_slot ASC;
- """
+ """
query_params = (
slot_type,
tuple(prm_ids.ids),
@@ -429,9 +443,15 @@ class AccOperation(models.Model):
query = """
SELECT
date_trunc(%s, A.date_slot) AS date_slot,
- ((SUM((CASE WHEN comp_data_type = 'prod' THEN A.power ELSE 0 END)) - SUM(CASE
- WHEN comp_data_type = 'surplus' THEN A.power ELSE 0 END)) / 2) / 1000 as autocons,
- (SUM( (CASE WHEN comp_data_type = 'surplus' THEN A.power ELSE 0 END) )/2) / 1000 as surplus
+ ((SUM((CASE
+ WHEN comp_data_type = 'prod' THEN A.power
+ ELSE 0 END))
+ - SUM(CASE
+ WHEN comp_data_type = 'surplus' THEN A.power
+ ELSE 0 END)) / 2) / 1000 as autocons,
+ (SUM( (CASE
+ WHEN comp_data_type = 'surplus' THEN A.power
+ ELSE 0 END) )/2) / 1000 as surplus
FROM acc_enedis_cdc A
JOIN acc_operation E ON E.id = A.acc_operation_id
WHERE A.acc_operation_id IS NOT NULL
@@ -486,21 +506,35 @@ class AccOperation(models.Model):
query = """
SELECT
date_trunc(%s, A.date_slot) AS date_slot,
- (SUM((CASE WHEN comp_data_type = 'cons' THEN A.power ELSE 0 END)) / 2) / 1000 as cons,
- (SUM((CASE WHEN comp_data_type = 'autocons' THEN A.power ELSE 0 END)) / 2) / 1000 as autocons,
- (SUM((CASE WHEN comp_data_type = 'prod' THEN A.power ELSE 0 END)) / 2) / 1000 as prod_s,
- (SUM( (CASE WHEN comp_data_type = 'surplus' THEN A.power ELSE 0 END) )/2) / 1000 as surplus,
- (SUM( (CASE WHEN comp_data_type = 'complement' THEN A.power ELSE 0 END) )/2) / 1000 as allocons,
- ((SUM((CASE WHEN comp_data_type = 'prod' THEN A.power ELSE 0 END)) - SUM(CASE
- WHEN comp_data_type = 'surplus' THEN A.power ELSE 0 END)) / 2) / 1000 as autocons_prod
- FROM acc_enedis_cdc A
- JOIN acc_operation E ON E.id = A.acc_operation_id
- WHERE A.acc_operation_id IS NOT NULL
- AND A.acc_operation_id IN %s
- AND A.date_slot >= %s
- AND A.date_slot < %s
- GROUP BY date_trunc(%s, A.date_slot)
- ORDER BY date_slot ASC;
+ (SUM((CASE
+ WHEN comp_data_type = 'cons' THEN A.power
+ ELSE 0 END)) / 2) / 1000 as cons,
+ (SUM((CASE
+ WHEN comp_data_type = 'autocons' THEN A.power
+ ELSE 0 END)) / 2) / 1000 as autocons,
+ (SUM((CASE
+ WHEN comp_data_type = 'prod' THEN A.power
+ ELSE 0 END)) / 2) / 1000 as prod_s,
+ (SUM( (CASE
+ WHEN comp_data_type = 'surplus' THEN A.power
+ ELSE 0 END) )/2) / 1000 as surplus,
+ (SUM( (CASE
+ WHEN comp_data_type = 'complement' THEN A.power
+ ELSE 0 END) )/2) / 1000 as allocons,
+ ((SUM((CASE
+ WHEN comp_data_type = 'prod' THEN A.power
+ ELSE 0 END))
+ - SUM(CASE
+ WHEN comp_data_type = 'surplus' THEN A.power
+ ELSE 0 END)) / 2) / 1000 as autocons_prod
+ FROM acc_enedis_cdc A
+ JOIN acc_operation E ON E.id = A.acc_operation_id
+ WHERE A.acc_operation_id IS NOT NULL
+ AND A.acc_operation_id IN %s
+ AND A.date_slot >= %s
+ AND A.date_slot < %s
+ GROUP BY date_trunc(%s, A.date_slot)
+ ORDER BY date_slot ASC;
"""
query_params = (slot_type, tuple(self.ids), date_start, date_end, slot_type)
self.env.cr.execute(query, query_params)
@@ -553,19 +587,29 @@ class AccOperation(models.Model):
query = """
SELECT
date_trunc(%s, A.date_slot) AS date_slot,
- (SUM((CASE WHEN comp_data_type = 'autocons' THEN A.power ELSE 0 END)) / 2) / 1000 as autocons,
- (SUM( (CASE WHEN comp_data_type = 'surplus' THEN A.power ELSE 0 END) )/2) / 1000 as surplus,
- (SUM( (CASE WHEN comp_data_type = 'complement' THEN A.power ELSE 0 END) )/2) / 1000 as allocons,
- ((SUM((CASE WHEN comp_data_type = 'prod' THEN A.power ELSE 0 END)) - SUM(CASE
- WHEN comp_data_type = 'surplus' THEN A.power ELSE 0 END)) / 2) / 1000 as autocons_prod
- FROM acc_enedis_cdc A
- JOIN acc_operation E ON E.id = A.acc_operation_id
- WHERE A.acc_operation_id IS NOT NULL
- AND A.acc_operation_id IN %s
- AND A.date_slot >= %s
- AND A.date_slot < %s
- GROUP BY date_trunc(%s, A.date_slot)
- ORDER BY date_slot ASC;
+ (SUM((CASE
+ WHEN comp_data_type = 'autocons' THEN A.power
+ ELSE 0 END)) / 2) / 1000 as autocons,
+ (SUM( (CASE
+ WHEN comp_data_type = 'surplus' THEN A.power
+ ELSE 0 END) )/2) / 1000 as surplus,
+ (SUM( (CASE
+ WHEN comp_data_type = 'complement' THEN A.power
+ ELSE 0 END) )/2) / 1000 as allocons,
+ ((SUM((CASE
+ WHEN comp_data_type = 'prod' THEN A.power
+ ELSE 0 END))
+ - SUM(CASE
+ WHEN comp_data_type = 'surplus' THEN A.power
+ ELSE 0 END)) / 2) / 1000 as autocons_prod
+ FROM acc_enedis_cdc A
+ JOIN acc_operation E ON E.id = A.acc_operation_id
+ WHERE A.acc_operation_id IS NOT NULL
+ AND A.acc_operation_id IN %s
+ AND A.date_slot >= %s
+ AND A.date_slot < %s
+ GROUP BY date_trunc(%s, A.date_slot)
+ ORDER BY date_slot ASC;
"""
query_params = (slot_type, tuple(self.ids), date_start, date_end, slot_type)
self.env.cr.execute(query, query_params)
diff --git a/static/src/js/operation_graph.js b/static/src/js/operation_graph.js
index 6cc7e90..fe40f3a 100644
--- a/static/src/js/operation_graph.js
+++ b/static/src/js/operation_graph.js
@@ -3,7 +3,6 @@ odoo.define("acc_cdc.operation_graph", function (require) {
var qweb = require("web.qweb");
var viewRegistry = require("web.view_registry");
- var core = require("web.core");
let chartValues;
const Renderer = qweb.Renderer.extend({
@@ -20,22 +19,22 @@ odoo.define("acc_cdc.operation_graph", function (require) {
var chart_histo_conso;
var chart_histo_prod;
- if (chart_line_conso != undefined) {
+ if (chart_line_conso !== undefined) {
chart_line_conso.destroy();
}
- if (chart_line_prod != undefined) {
+ if (chart_line_prod !== undefined) {
chart_line_prod.destroy();
}
- if (chart_donuts_conso != undefined) {
+ if (chart_donuts_conso !== undefined) {
chart_donuts_conso.destroy();
}
- if (chart_donuts_prod != undefined) {
+ if (chart_donuts_prod !== undefined) {
chart_donuts_prod.destroy();
}
- if (chart_histo_conso != undefined) {
+ if (chart_histo_conso !== undefined) {
chart_histo_conso.destroy();
}
- if (chart_histo_prod != undefined) {
+ if (chart_histo_prod !== undefined) {
chart_histo_prod.destroy();
}
await this._super(...arguments);
@@ -54,7 +53,7 @@ odoo.define("acc_cdc.operation_graph", function (require) {
line_prod.hide();
}
- if (result.scale == "week" || result.scale == "day") {
+ if (result.scale === "week" || result.scale === "day") {
chart_line_conso = new Chart(
line_conso,
Object.assign({}, result.line_chart_conso_line)
@@ -83,7 +82,7 @@ odoo.define("acc_cdc.operation_graph", function (require) {
Object.assign({}, result.histo_chart_conso)
);
- if (result.scale == "week" || result.scale == "day") {
+ if (result.scale === "week" || result.scale === "day") {
chart_line_prod = new Chart(
line_prod,
Object.assign({}, result.line_chart_prod_line)
--
GitLab