diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml new file mode 100644 index 00000000..d597d856 --- /dev/null +++ b/.github/workflows/lint.yml @@ -0,0 +1,25 @@ +name: Lint Code with Black + +on: + push: + pull_request: + +jobs: + lint: + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Set up Python + uses: actions/setup-python@v4 + with: + python-version: "3.9" # Spécifie la version de Python que tu utilises + + - name: Install Black + run: | + python -m pip install --upgrade pip + pip install black==24.10.0 + + - name: Run Black + run: black --check --exclude "backend/custom_app.py" ./backend diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 00000000..9670df87 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,98 @@ +.kaniko_template: + stage: build + image: + name: gcr.io/kaniko-project/executor:debug + entrypoint: [""] + variables: + GODEBUG: "http2client=0" + DOCKER_CONFIG: /kaniko/.docker + DOCKER_CONFIG_TPL: '{"auths": {"harbor.naturaliens.cloud": {"auth": ""}}}' + script: + - mkdir -p /kaniko/.docker + - | + printf '%s\n' "$DOCKER_CONFIG_TPL" | sed "s||${NS_DOCKER_TOKEN}|g" > /kaniko/.docker/config.json + - > + /kaniko/executor + --context "${CONTEXT_DIR}" + --dockerfile "${DOCKERFILE_PATH}" + --build-arg APP_VERSION=$(cat VERSION) + --destination "harbor.naturaliens.cloud/geopaysages/${IMAGE_NAME}:$(cat VERSION)" + --destination "harbor.naturaliens.cloud/geopaysages/${IMAGE_NAME}:${CI_COMMIT_BRANCH}" + --cache=true + tags: + - NSCICDK8S + +build_db: + extends: .kaniko_template + variables: + CONTEXT_DIR: "${CI_PROJECT_DIR}/db" + DOCKERFILE_PATH: "${CI_PROJECT_DIR}/db/Dockerfile" + IMAGE_NAME: db + rules: + - if: '$CI_COMMIT_BRANCH == "preprod"' + changes: + - db/** + #- .gitlab-ci.yml + +build_admin: + extends: .kaniko_template + variables: + CONTEXT_DIR: "${CI_PROJECT_DIR}/admin" + DOCKERFILE_PATH: "${CI_PROJECT_DIR}/admin/Dockerfile" + IMAGE_NAME: admin + rules: + - if: '$CI_COMMIT_BRANCH == "preprod"' + changes: + - admin/**/* + - admin/* + #- .gitlab-ci.yml + +build_backend: + extends: .kaniko_template + variables: + CONTEXT_DIR: "${CI_PROJECT_DIR}/backend" + DOCKERFILE_PATH: "${CI_PROJECT_DIR}/backend/Dockerfile" + IMAGE_NAME: backend + rules: + - if: '$CI_COMMIT_BRANCH == "preprod"' + changes: + - backend/** + #- .gitlab-ci.yml + +deploy: + stage: deploy + image: registry.gitlab.com/natural-solutions/ns-ansible-infrastructure + id_tokens: + NATURALIENS_ID_TOKEN: + aud: https://vault.naturaliens.cloud + tags: + - NSCICDDOCKER + # needs: + # - job: build_db + # optional: true + # - job: build_keycloak + # optional: true + # - job: build_hasura + # optional: true + # - job: build_python + # optional: true + # - job: build_app + # optional: true + rules: + - if: '$CI_COMMIT_BRANCH == "preprod"' + changes: + # - .gitlab-ci.yml + - db/** + - keycloak/** + - hasura/** + - python/** + - app/** + script: + - export VAULT_TOKEN="$(vault write -field=token auth/jwt/login role=gitlab-runner-geopaysages jwt=$NATURALIENS_ID_TOKEN)" + - cd /home/ansible + - vault kv get -format=json -mount=devops inventories/ns/projects/geopaysages | jq -r '.data.data.hosts.dev.private_key' | base64 -d > private_key + - chmod 600 private_key + - ansible-playbook -i inventory.py playbooks/geopaysages.yml -t geopaysages + variables: + GIT_STRATEGY: none + INVENTORY_PATH: inventories/ns/projects/geopaysages diff --git a/VERSION b/VERSION index f0bb29e7..9075be49 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.3.0 +1.5.5 diff --git a/admin/package-lock.json b/admin/package-lock.json index 49253b01..21df8f6e 100644 --- a/admin/package-lock.json +++ b/admin/package-lock.json @@ -1004,6 +1004,11 @@ } } }, + "@bazel/runfiles": { + "version": "5.8.1", + "resolved": "https://registry.npmjs.org/@bazel/runfiles/-/runfiles-5.8.1.tgz", + "integrity": "sha512-NDdfpdQ6rZlylgv++iMn5FkObC/QlBQvipinGLSOguTYpRywmieOyJ29XHvUilspwTFSILWpoE9CqMGkHXug1g==" + }, "@ng-bootstrap/ng-bootstrap": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-4.2.2.tgz", @@ -1033,6 +1038,22 @@ "webpack-sources": "1.2.0" } }, + "@ngx-translate/core": { + "version": "11.0.1", + "resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-11.0.1.tgz", + "integrity": "sha512-nBCa1ZD9fAUY/3eskP3Lql2fNg8OMrYIej1/5GRsfcutx9tG/5fZLCv9m6UCw1aS+u4uK/vXjv1ctG/FdMvaWg==", + "requires": { + "tslib": "^1.9.0" + } + }, + "@ngx-translate/http-loader": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@ngx-translate/http-loader/-/http-loader-4.0.0.tgz", + "integrity": "sha512-x8LumqydWD7eX9yQTAVeoCM9gFUIGVTUjZqbxdAUavAA3qVnk9wCQux7iHLPXpydl8vyQmLoPQR+fFU+DUDOMA==", + "requires": { + "tslib": "^1.9.0" + } + }, "@schematics/angular": { "version": "7.0.7", "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-7.0.7.tgz", @@ -1079,6 +1100,279 @@ "resolved": "https://registry.npmjs.org/@swimlane/ngx-datatable/-/ngx-datatable-14.0.0.tgz", "integrity": "sha512-zgRY58MzTpg9Jb575cg0O87mLtXYi6fx7NLRPRHdQ/FqH9mKjZ3i7+OjqtR8/w3KRmFP2Hnkmx52VzldZIKspg==" }, + "@syncfusion/ej2-angular-base": { + "version": "18.4.49", + "resolved": "https://registry.npmjs.org/@syncfusion/ej2-angular-base/-/ej2-angular-base-18.4.49.tgz", + "integrity": "sha512-soee6pE7CT3OwuaEVY+diF6jGhdEiC8r7EWBtb0A3Sj02wsnurEKkf+PdfCoA72rHU7oQDl9p9GZLhoIZfVhwg==", + "requires": { + "@syncfusion/ej2-base": "~18.4.44", + "@syncfusion/ej2-icons": "~18.4.39", + "core-js": "^3.4.8", + "reflect-metadata": "^0.1.9", + "rxjs": "^6.5.4", + "rxjs-compat": "^6.5.4", + "zone.js": "^0.10.2" + }, + "dependencies": { + "core-js": { + "version": "3.38.1", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.38.1.tgz", + "integrity": "sha512-OP35aUorbU3Zvlx7pjsFdu1rGNnD4pgw/CWoYzRY3t2EzoVT7shKHY1dlAy3f41cGIO7ZDPQimhGFTlEYkG/Hw==" + }, + "rxjs": { + "version": "6.6.7", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", + "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", + "requires": { + "tslib": "^1.9.0" + } + }, + "zone.js": { + "version": "0.10.3", + "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.10.3.tgz", + "integrity": "sha512-LXVLVEq0NNOqK/fLJo3d0kfzd4sxwn2/h67/02pjCjfKDxgx1i9QqpvtHD8CrBnSSwMw5+dy11O7FRX5mkO7Cg==" + } + } + }, + "@syncfusion/ej2-angular-richtexteditor": { + "version": "18.4.49", + "resolved": "https://registry.npmjs.org/@syncfusion/ej2-angular-richtexteditor/-/ej2-angular-richtexteditor-18.4.49.tgz", + "integrity": "sha512-9OW6UGYYU7qbqdV/yZ5bGXXP4r7FVm88klVZcNoUPzdbYzI9o5n64p6AbfR4t9k3Rdgu906GDnTJMxP36Vv2Dg==", + "requires": { + "@syncfusion/ej2-angular-base": "~18.4.49", + "@syncfusion/ej2-base": "~18.4.44", + "@syncfusion/ej2-richtexteditor": "18.4.49", + "@types/lodash": "4.14.159", + "@types/node": "11.15.20" + }, + "dependencies": { + "@types/node": { + "version": "11.15.20", + "resolved": "https://registry.npmjs.org/@types/node/-/node-11.15.20.tgz", + "integrity": "sha512-DY2QwdrBqNlsxdMehwzUtSsWHgYYPLVCAuXvOcu3wkzYmchbRunQ7OEZFOrmFoBLfA1ysz2Ypr6vtNP9WQkUaQ==" + } + } + }, + "@syncfusion/ej2-base": { + "version": "18.4.44", + "resolved": "https://registry.npmjs.org/@syncfusion/ej2-base/-/ej2-base-18.4.44.tgz", + "integrity": "sha512-irv+We6ZxLAr8SctOB4hLP9otTq2yVT8yPfhB8ytQ2ZXWqDfddcLKfTC7NwFnMmD0mh+vAogHwpWuYbDl9yZew==", + "requires": { + "@syncfusion/ej2-icons": "~18.4.39" + } + }, + "@syncfusion/ej2-buttons": { + "version": "18.4.46", + "resolved": "https://registry.npmjs.org/@syncfusion/ej2-buttons/-/ej2-buttons-18.4.46.tgz", + "integrity": "sha512-bJAytPOKdHgMDuxXjS1vAOeG+kgd2on/kL5MuAMq/zYx6chz+W7MupLwviv0y16Em3drLV+ljI+PeKaQVI19dA==", + "requires": { + "@syncfusion/ej2-base": "~18.4.44" + } + }, + "@syncfusion/ej2-calendars": { + "version": "18.4.48", + "resolved": "https://registry.npmjs.org/@syncfusion/ej2-calendars/-/ej2-calendars-18.4.48.tgz", + "integrity": "sha512-jDic+kNuWn5yu0xSYd9QeE7Re6yhKJi7S200WJk9UUNGlo9vtLYFpPt2KCgYhBc6sBaErU99wb+OB4Ij4yK3TQ==", + "requires": { + "@syncfusion/ej2-base": "~18.4.44", + "@syncfusion/ej2-buttons": "~18.4.46", + "@syncfusion/ej2-inputs": "~18.4.47", + "@syncfusion/ej2-lists": "~18.4.39", + "@syncfusion/ej2-popups": "~18.4.44" + } + }, + "@syncfusion/ej2-compression": { + "version": "18.4.39", + "resolved": "https://registry.npmjs.org/@syncfusion/ej2-compression/-/ej2-compression-18.4.39.tgz", + "integrity": "sha512-8yfO8StEHo2vIBWs+8l1eubB9lFR8PurcKJkuuLUp5xGDXswsMaKpU/exVHIycJV/UDIsuuNEItXGC3K1lxsrQ==", + "requires": { + "@syncfusion/ej2-file-utils": "~18.4.39" + } + }, + "@syncfusion/ej2-data": { + "version": "18.4.46", + "resolved": "https://registry.npmjs.org/@syncfusion/ej2-data/-/ej2-data-18.4.46.tgz", + "integrity": "sha512-kVxkzBeR/Unv43C+nWbra4Onq/TdHkx68PZ0n9+sJ9ArIUw+XsV3/TGQ9IV6RfTuxlK0TXP8fmeWR8CHmmjfhg==", + "requires": { + "@syncfusion/ej2-base": "~18.4.44" + } + }, + "@syncfusion/ej2-dropdowns": { + "version": "18.4.49", + "resolved": "https://registry.npmjs.org/@syncfusion/ej2-dropdowns/-/ej2-dropdowns-18.4.49.tgz", + "integrity": "sha512-Sa0ugJBX8lnGV9SnCpIlnbH2rEx3laHBlVn6VAC4uUT4RnuDo/McKwROrLlbx3KGOmjqARtvRjc6tvHwKGpLMQ==", + "requires": { + "@syncfusion/ej2-base": "~18.4.44", + "@syncfusion/ej2-data": "~18.4.46", + "@syncfusion/ej2-inputs": "~18.4.47", + "@syncfusion/ej2-lists": "~18.4.39", + "@syncfusion/ej2-navigations": "~18.4.47", + "@syncfusion/ej2-popups": "~18.4.44" + } + }, + "@syncfusion/ej2-excel-export": { + "version": "18.4.41", + "resolved": "https://registry.npmjs.org/@syncfusion/ej2-excel-export/-/ej2-excel-export-18.4.41.tgz", + "integrity": "sha512-mtEB0bhcZB8t3R6KmCDY8RZhjvbtDpEgHZ/xPpYj3Vzp0CTN/tKzUEP1bF+vMJltYo1b3ji1szZh0pp1TAMiUQ==", + "requires": { + "@syncfusion/ej2-base": "~18.4.41", + "@syncfusion/ej2-compression": "~18.4.39" + } + }, + "@syncfusion/ej2-file-utils": { + "version": "18.4.39", + "resolved": "https://registry.npmjs.org/@syncfusion/ej2-file-utils/-/ej2-file-utils-18.4.39.tgz", + "integrity": "sha512-Gn0w6+2TSpuAgpFd+h8KSnZ8zj2hJcPOGAfWy+khLZ3JaLS59SHzPW2odY2yjZwlPBmAeHRj/Oo46vwxvKTeCw==" + }, + "@syncfusion/ej2-filemanager": { + "version": "18.4.41", + "resolved": "https://registry.npmjs.org/@syncfusion/ej2-filemanager/-/ej2-filemanager-18.4.41.tgz", + "integrity": "sha512-i7RarPrtv4VFj/nA24G5g4CCjv29DJC8pVgRGB1hfWz6FOX3tsSlmy8aS/pd3m84r6Ly+nQdCaDekKtId5+8/A==", + "requires": { + "@syncfusion/ej2-base": "~18.4.41", + "@syncfusion/ej2-buttons": "~18.4.41", + "@syncfusion/ej2-data": "~18.4.39", + "@syncfusion/ej2-grids": "~18.4.41", + "@syncfusion/ej2-inputs": "~18.4.41", + "@syncfusion/ej2-layouts": "~18.4.39", + "@syncfusion/ej2-lists": "~18.4.39", + "@syncfusion/ej2-navigations": "~18.4.41", + "@syncfusion/ej2-popups": "~18.4.41", + "@syncfusion/ej2-splitbuttons": "~18.4.41", + "selenium-webdriver": "^4.0.0-alpha.1" + }, + "dependencies": { + "selenium-webdriver": { + "version": "4.25.0", + "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.25.0.tgz", + "integrity": "sha512-zl9IX93caOT8wbcCpZzAkEtYa+hNgJ4C5GUN8uhpzggqRLvsg1asfKi0p1uNZC8buYVvsBZbx8S+9MjVAjs4oA==", + "requires": { + "@bazel/runfiles": "^5.8.1", + "jszip": "^3.10.1", + "tmp": "^0.2.3", + "ws": "^8.18.0" + } + }, + "tmp": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz", + "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==" + }, + "ws": { + "version": "8.18.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz", + "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==" + } + } + }, + "@syncfusion/ej2-grids": { + "version": "18.4.49", + "resolved": "https://registry.npmjs.org/@syncfusion/ej2-grids/-/ej2-grids-18.4.49.tgz", + "integrity": "sha512-p2V46aM+EVVCRMMTmszveSWwzZpeeqBkAT3UnH9cbxHK6Av3GK/+7PNicG7TdCmgvcWnVDTgxPj8bDjdrhW7tQ==", + "requires": { + "@syncfusion/ej2-base": "~18.4.44", + "@syncfusion/ej2-buttons": "~18.4.46", + "@syncfusion/ej2-calendars": "~18.4.48", + "@syncfusion/ej2-compression": "~18.4.39", + "@syncfusion/ej2-data": "~18.4.46", + "@syncfusion/ej2-dropdowns": "~18.4.49", + "@syncfusion/ej2-excel-export": "~18.4.41", + "@syncfusion/ej2-file-utils": "~18.4.39", + "@syncfusion/ej2-inputs": "~18.4.47", + "@syncfusion/ej2-lists": "~18.4.39", + "@syncfusion/ej2-navigations": "~18.4.47", + "@syncfusion/ej2-pdf-export": "~18.4.47", + "@syncfusion/ej2-popups": "~18.4.44", + "@syncfusion/ej2-splitbuttons": "~18.4.41" + } + }, + "@syncfusion/ej2-icons": { + "version": "18.4.39", + "resolved": "https://registry.npmjs.org/@syncfusion/ej2-icons/-/ej2-icons-18.4.39.tgz", + "integrity": "sha512-l/FT5H12SSV2IwWbL39nrh5NwB8BpRdHoVOpG9/H4Ezs3q7zVAPgEMq+fAn5Tp1PBhl3cWYpSct7M2tJMSG49w==" + }, + "@syncfusion/ej2-inputs": { + "version": "18.4.47", + "resolved": "https://registry.npmjs.org/@syncfusion/ej2-inputs/-/ej2-inputs-18.4.47.tgz", + "integrity": "sha512-ITxKNijcrEr2oO/u6RpFr5v7xHg81gDr2WIKq5oX1BXuCVLocMcjUzsOrvI/YG0xWgN6Jl8sh1+cfm8J3nu9FA==", + "requires": { + "@syncfusion/ej2-base": "~18.4.44", + "@syncfusion/ej2-buttons": "~18.4.46", + "@syncfusion/ej2-popups": "~18.4.44", + "@syncfusion/ej2-splitbuttons": "~18.4.41" + } + }, + "@syncfusion/ej2-layouts": { + "version": "18.4.49", + "resolved": "https://registry.npmjs.org/@syncfusion/ej2-layouts/-/ej2-layouts-18.4.49.tgz", + "integrity": "sha512-wKaXa7y0OX4VHNh6eUZu/6QPit9D1te3jwpg7nYbcizADvUFyrOAK2Tn91xNlfnnJuMOPNLqm185wEcsvI3mNA==", + "requires": { + "@syncfusion/ej2-base": "~18.4.44" + } + }, + "@syncfusion/ej2-lists": { + "version": "18.4.39", + "resolved": "https://registry.npmjs.org/@syncfusion/ej2-lists/-/ej2-lists-18.4.39.tgz", + "integrity": "sha512-bn6C5YU06FXC1LjSXDqAt3zreC2+0DNHSp2iK0yKyM0GoiHh7KU0gjbWEyvkMlTD6aIeOp84uoETaibVDZwwWQ==", + "requires": { + "@syncfusion/ej2-base": "~18.4.39", + "@syncfusion/ej2-buttons": "~18.4.39", + "@syncfusion/ej2-data": "~18.4.39" + } + }, + "@syncfusion/ej2-navigations": { + "version": "18.4.47", + "resolved": "https://registry.npmjs.org/@syncfusion/ej2-navigations/-/ej2-navigations-18.4.47.tgz", + "integrity": "sha512-W7X2kduo+bhGdmY/e29gd+EZqhZ0WFhJAISWW5PJ8o1eTyD3GWxj8UKjAGJwJ5S6cpUSSpYs7eksmS/nTzj1ig==", + "requires": { + "@syncfusion/ej2-base": "~18.4.44", + "@syncfusion/ej2-buttons": "~18.4.46", + "@syncfusion/ej2-data": "~18.4.46", + "@syncfusion/ej2-inputs": "~18.4.47", + "@syncfusion/ej2-lists": "~18.4.39", + "@syncfusion/ej2-popups": "~18.4.44" + } + }, + "@syncfusion/ej2-pdf-export": { + "version": "18.4.47", + "resolved": "https://registry.npmjs.org/@syncfusion/ej2-pdf-export/-/ej2-pdf-export-18.4.47.tgz", + "integrity": "sha512-gm6DAptM3jGfXkR3RJFvv+E4cDxYsWJ8yOhUd6Y5AQe95Q5Xx0YplzTCGfQZZGwlMVwAYis9NeYZ/5qa9PK6HA==", + "requires": { + "@syncfusion/ej2-compression": "~18.4.39" + } + }, + "@syncfusion/ej2-popups": { + "version": "18.4.44", + "resolved": "https://registry.npmjs.org/@syncfusion/ej2-popups/-/ej2-popups-18.4.44.tgz", + "integrity": "sha512-p/i1gKIfFPP9DCNfHss5v0ydvvRbrWIKxqBfjZ4xt2V81FQivvB9zuWcr0aEG0ySBZkOdwXze1Mt0+iSOeRE+g==", + "requires": { + "@syncfusion/ej2-base": "~18.4.44", + "@syncfusion/ej2-buttons": "~18.4.44" + } + }, + "@syncfusion/ej2-richtexteditor": { + "version": "18.4.49", + "resolved": "https://registry.npmjs.org/@syncfusion/ej2-richtexteditor/-/ej2-richtexteditor-18.4.49.tgz", + "integrity": "sha512-6y0Zb/GU8/cP6GjV5sYUvDQtmoUoPTlH4pQj/sgcztv8l8K6n1Qkku40zJ3xQsHwIZVzatgY6EF8NOAdNTIwlA==", + "requires": { + "@syncfusion/ej2-base": "~18.4.44", + "@syncfusion/ej2-buttons": "~18.4.46", + "@syncfusion/ej2-filemanager": "~18.4.41", + "@syncfusion/ej2-inputs": "~18.4.47", + "@syncfusion/ej2-navigations": "~18.4.47", + "@syncfusion/ej2-popups": "~18.4.44", + "@syncfusion/ej2-splitbuttons": "~18.4.41" + } + }, + "@syncfusion/ej2-splitbuttons": { + "version": "18.4.41", + "resolved": "https://registry.npmjs.org/@syncfusion/ej2-splitbuttons/-/ej2-splitbuttons-18.4.41.tgz", + "integrity": "sha512-QEAH3ml3x0FwfnkXE5+HGsQMOVWUkuVUqYRas3Ny3L8Loyg2oG4djeg11mxHVQ4ZBNSOOk2uKyswq0Qkyk5f7w==", + "requires": { + "@syncfusion/ej2-base": "~18.4.41", + "@syncfusion/ej2-popups": "~18.4.41" + } + }, "@types/geojson": { "version": "7946.0.7", "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.7.tgz", @@ -1127,9 +1421,9 @@ } }, "@types/lodash": { - "version": "4.14.149", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.149.tgz", - "integrity": "sha512-ijGqzZt/b7BfzcK9vTrS6MFljQRPn5BFWOx8oE0GYxribu6uV+aA9zZuXI1zc/etK9E8nrgdoF2+LgUw7+9tJQ==" + "version": "4.14.159", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.159.tgz", + "integrity": "sha512-gF7A72f7WQN33DpqOWw9geApQPh4M3PxluMtaHxWHXEGSN12/WbcEk/eNSqWNQcQhF66VSZ06vCF94CrHwXJDg==" }, "@types/moment": { "version": "2.13.0", @@ -5257,8 +5551,7 @@ "immediate": { "version": "3.0.6", "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz", - "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=", - "dev": true + "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=" }, "import-cwd": { "version": "2.1.0", @@ -6258,15 +6551,14 @@ "integrity": "sha512-QU9aQ+qZOSkMcX+ZZQevW0nswoKGAVoFfDycmAQeeHNYMnB4PoopiCXMKE2t93mEZeM82ikUA+eGdJjfJN5AkA==" }, "jszip": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.2.2.tgz", - "integrity": "sha512-NmKajvAFQpbg3taXQXr/ccS2wcucR1AZ+NtyWp2Nq7HHVsXhcJFR8p0Baf32C2yVvBylFWVeKf+WI2AnvlPhpA==", - "dev": true, + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz", + "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==", "requires": { "lie": "~3.3.0", "pako": "~1.0.2", "readable-stream": "~2.3.6", - "set-immediate-shim": "~1.0.1" + "setimmediate": "^1.0.5" } }, "karma": { @@ -6460,7 +6752,6 @@ "version": "3.3.0", "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz", "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==", - "dev": true, "requires": { "immediate": "~3.0.5" } @@ -7525,8 +7816,7 @@ "pako": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", - "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==", - "dev": true + "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==" }, "parallel-transform": { "version": "1.2.0", @@ -8277,8 +8567,7 @@ "reflect-metadata": { "version": "0.1.13", "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz", - "integrity": "sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==", - "dev": true + "integrity": "sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==" }, "regenerate": { "version": "1.4.0", @@ -8537,6 +8826,11 @@ "tslib": "^1.9.0" } }, + "rxjs-compat": { + "version": "6.6.7", + "resolved": "https://registry.npmjs.org/rxjs-compat/-/rxjs-compat-6.6.7.tgz", + "integrity": "sha512-szN4fK+TqBPOFBcBcsR0g2cmTTUF/vaFEOZNuSdfU8/pGFnNmmn2u8SystYXG1QMrjOPBc6XTKHMVfENDf6hHw==" + }, "safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", @@ -8778,12 +9072,6 @@ "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" }, - "set-immediate-shim": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz", - "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=", - "dev": true - }, "set-value": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", @@ -8810,8 +9098,7 @@ "setimmediate": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", - "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=", - "dev": true + "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=" }, "setprototypeof": { "version": "1.1.1", diff --git a/admin/package.json b/admin/package.json index 1cf6dff9..464949f3 100644 --- a/admin/package.json +++ b/admin/package.json @@ -26,8 +26,10 @@ "@asymmetrik/ngx-leaflet-draw": "^4.0.0", "@ng-bootstrap/ng-bootstrap": "^4.0.0", "@ng-select/ng-select": "^2.12.1", + "@ngx-translate/core": "^11.0.1", + "@ngx-translate/http-loader": "^4.0.0", "@swimlane/ngx-datatable": "^14.0.0", - "@syncfusion/ej2-angular-richtexteditor": "^18.1.54", + "@syncfusion/ej2-angular-richtexteditor": "^18.4.49", "@types/jsts": "^0.17.12", "@types/lodash": "^4.14.118", "@types/moment": "^2.13.0", diff --git a/admin/src/app/add-photo/add-photo.component.html b/admin/src/app/add-photo/add-photo.component.html index 1705a63d..2c7ee13c 100644 --- a/admin/src/app/add-photo/add-photo.component.html +++ b/admin/src/app/add-photo/add-photo.component.html @@ -7,16 +7,15 @@
-
{{title}}
+
{{ isEdition ? ('ACTIONS.MODIFY' | translate: { article: ('ARTICLES.LA' | translate), varname: ('COMMONS.PICTURE' | translate) }) : ('ACTIONS.ADD' | translate: { article: ('ARTICLES.UNE' | translate), varname: ('COMMONS.PICTURE' | translate) }) }}
+ {{ 'ACTIONS.DELETE' | translate: {article:('ARTICLES.LA' | translate), varname: ('COMMONS.PICTURE' | translate) } }}
-
Publier la photo :
+
{{ 'ACTIONS.PUBLISH' | translate: {article:('ARTICLES.LA' | translate), varname: ('COMMONS.PICTURE' | translate) } }} :
- +
- +
@@ -45,7 +44,7 @@
{{title}}
- + + class="icon-download">{{'ACTIONS.IMPORT' | translate: {article:('ARTICLES.UNE' | translate), varname: ('COMMONS.PICTURE' | translate) } }}
{{imageName}}
{{alert}}
- +
- - + +
@@ -84,13 +82,10 @@
{{title}}
-
- Êtes-vous sûr de vouloir supprimer cette photo ? -
- Sa suppression sera définitive +
- - + +
\ No newline at end of file diff --git a/admin/src/app/add-photo/add-photo.component.ts b/admin/src/app/add-photo/add-photo.component.ts index f82926ce..954a953a 100644 --- a/admin/src/app/add-photo/add-photo.component.ts +++ b/admin/src/app/add-photo/add-photo.component.ts @@ -23,6 +23,7 @@ import { ToastrService } from 'ngx-toastr'; import { forkJoin } from 'rxjs'; import { AuthService } from '../services/auth.service'; import { NgxSpinnerService } from 'ngx-spinner'; +import { TranslateService } from '@ngx-translate/core'; const I18N_VALUES = { fr: { @@ -88,8 +89,7 @@ export class AddPhotoComponent implements OnInit { imageLaoded = false; private modalRef: NgbModalRef; disableButton = false; - btn_text = 'Ajouter'; - title = 'Ajouter une photo'; + isEdition = false; alert: any; @Output() photoModal = new EventEmitter(); @Input() inputImage = null; @@ -104,7 +104,8 @@ export class AddPhotoComponent implements OnInit { public calendar: NgbCalendar, datePickerConfig: NgbDatepickerConfig, private authService: AuthService, - private spinner: NgxSpinnerService + private spinner: NgxSpinnerService, + private translate: TranslateService ) { datePickerConfig.minDate = { year: 1800, month: 1, day: 1 }; datePickerConfig.maxDate = { year: 2200, month: 12, day: 31 }; @@ -113,7 +114,6 @@ export class AddPhotoComponent implements OnInit { ngOnInit() { this.currentUser = this.authService.currentUser; - if (this.licences) { this.onInitData(); } else { @@ -126,8 +126,7 @@ export class AddPhotoComponent implements OnInit { onInitData() { if (this.inputImage) { - this.title = 'Modifier la photo'; - this.btn_text = 'Modifier'; + this.isEdition = true; this.updateForm(); } else { this.initForm(); @@ -233,7 +232,10 @@ export class AddPhotoComponent implements OnInit { console.log('invalid form'); this.disableButton = false; if (!this.imageName) { - this.alert = 'Veuillez importer une photo '; + this.translate.get('INFO_MESSAGE.NO_PICTURE').subscribe((message: string) => { + this.alert = message; + }) + } } } @@ -261,7 +263,7 @@ export class AddPhotoComponent implements OnInit { } deletePhoto() { - this.sitesService.deletePhotos([this.inputImage]).subscribe( + this.sitesService.deletePhotos([this.inputImage.id_photo]).subscribe( () => { this.photoModal.emit(this.inputImage.t_site); this.modalRef.close(); @@ -270,13 +272,17 @@ export class AddPhotoComponent implements OnInit { this.modalRef.close(); if (err.status === 403) { this.router.navigate(['']); - this.toastr.error('votre session est expirée', '', { - positionClass: 'toast-bottom-right', - }); + this.translate.get('ERRORS.EXPIRED_SESSION').subscribe((res: string) => { + this.toastr.error(res, '', { + positionClass: 'toast-bottom-right', + }); + }) } else - this.toastr.error('Une erreur est survenue sur le serveur.', '', { + this.translate.get('ERRORS.SERVER_ERROR').subscribe((res: string) => { + this.toastr.error(res, '', { positionClass: 'toast-bottom-right', }); + }) } ); } @@ -285,14 +291,12 @@ export class AddPhotoComponent implements OnInit { const photo: FormData = new FormData(); let photoJson: any = {}; photoJson = photoForm.value; - photoJson.id_site = Number(this.inputImage.t_site); - photoJson.id_photo = this.inputImage.id_photo; photoJson = _.omit(photoJson, ['photo_file']); if (this.selectedPhoto) { photo.append('image', this.selectedPhoto[0]); } photo.append('data', JSON.stringify(photoJson)); - this.sitesService.updatePhoto(photo).subscribe( + this.sitesService.updatePhoto(this.inputImage.id_photo, photo).subscribe( () => { this.modalRef.close(); this.disableButton = false; @@ -304,13 +308,17 @@ export class AddPhotoComponent implements OnInit { this.modalRef.close(); if (err.status === 403) { this.router.navigate(['']); - this.toastr.error('votre session est expirée', '', { - positionClass: 'toast-bottom-right', - }); + this.translate.get('ERRORS.EXPIRED_SESSION').subscribe((res: string) => { + this.toastr.error(res, '', { + positionClass: 'toast-bottom-right', + }); + }) } else - this.toastr.error('Une erreur est survenue sur le serveur.', '', { + this.translate.get('ERRORS.SERVER_ERROR').subscribe((res: string) => { + this.toastr.error(res, '', { positionClass: 'toast-bottom-right', }); + }) }, () => { this.photoModal.emit(this.inputImage.t_site); diff --git a/admin/src/app/add-site/add-site.component.html b/admin/src/app/add-site/add-site.component.html index 6d9ea34f..4f1614c8 100644 --- a/admin/src/app/add-site/add-site.component.html +++ b/admin/src/app/add-site/add-site.component.html @@ -5,128 +5,154 @@
-
-
Publier:
- -
-
-
- - - -
-
- - - -
-
-
-
- - - -
-
- - - -
-
-
-
- - - - - {{ item.name_theme }} - - - + + + +
+
+
+
{{ 'ACTIONS.PUBLISH_DEFAULT' | translate }}:
+ +
+ + +
+ + + +
+ +
+ +
+ + + +
+ +
+ +
+ + + +
+ +
+ +
+ + + +
+ +
+ +
+
+ + + + + + +
+
+ +

+ {{ this.site.observatory.ref }} +

+ + +
+
+ + + + +
-
- - - - - {{ item.name_stheme }} - - - + + +
+
+ + + + + {{ item | dynamicTranslate:defaultLang.id:'getTranslation':'name_theme' }} + + + {{ item | dynamicTranslate:defaultLang.id:'getTranslation':'name_theme' }} + + + +
+
+ + + + + {{ item | dynamicTranslate:defaultLang.id:'getTranslation':'name_stheme' }} + + + {{ item | dynamicTranslate:defaultLang.id:'getTranslation':'name_stheme' }} + + + +
-
-
-
- - - +
+
+ + + +
-
+
- + + placeholder="{{'SITE_MNGMT.LONGITUDE' | translate}}" />
- + + placeholder="{{'SITE_MNGMT.LATITUDE' | translate}}" />
-
- - - -
-
- -
- - - -
- -
-
- -
- - - -
- -
+
- Conseil : Utiliser des jpeg de même ratio, assez grand mais larg. < 5000px, poids < 5Mo + {{ 'COMMONS.ADVICE' | translate}} : {{'SITE_MNGMT.JPEG_INSTRUCTIONS' | translate}}
@@ -142,9 +168,9 @@ - +
{{ noticeName }} @@ -155,21 +181,25 @@
-
+
+

+
+
-
- Êtes-vous sûr de vouloir supprimer ce Site ? -
- Sa suppression sera définitive -
+
- +
- \ No newline at end of file + diff --git a/admin/src/app/add-site/add-site.component.scss b/admin/src/app/add-site/add-site.component.scss index 1ebbc74f..6527936a 100644 --- a/admin/src/app/add-site/add-site.component.scss +++ b/admin/src/app/add-site/add-site.component.scss @@ -130,4 +130,24 @@ } .alert{ margin-top: 8px -} \ No newline at end of file +} + +.custom-card { + padding: 20px; + border-top: none; /* Supprime la bordure supérieure */ + border-radius: 0.25rem; /* Pour les coins arrondis (optionnel) */ +} + +/* Si vous voulez un style particulier pour les éléments internes */ +.custom-card .form-item { + border-bottom: 1px solid #e9ecef; /* Bordure inférieure pour chaque champ (optionnel) */ + padding-bottom: 15px; /* Espacement interne */ +} + +.custom-card .form-item:last-child { + border-bottom: none; /* Supprime la bordure inférieure du dernier élément */ +} + +.e-rte-fontcolor-element { + display: none !important; +} diff --git a/admin/src/app/add-site/add-site.component.ts b/admin/src/app/add-site/add-site.component.ts index efe916b9..a0f009d7 100644 --- a/admin/src/app/add-site/add-site.component.ts +++ b/admin/src/app/add-site/add-site.component.ts @@ -2,7 +2,11 @@ import { Component, OnInit, OnDestroy } from '@angular/core'; import { SitesService } from '../services/sites.service'; import { HttpEventType } from '@angular/common/http'; import { Router, ActivatedRoute, NavigationEnd } from '@angular/router'; -import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; +import { + NgbModal, + NgbModalRef, + NgbTabChangeEvent, +} from '@ng-bootstrap/ng-bootstrap'; import { FormGroup } from '@angular/forms'; import { tileLayer, latLng, Map, Layer } from 'leaflet'; import { FormService } from '../services/form.service'; @@ -14,9 +18,19 @@ import { forkJoin } from 'rxjs'; import { AuthService } from '../services/auth.service'; import { NgxSpinnerService } from 'ngx-spinner'; import { ObservatoriesService } from '../services/observatories.service'; -import { ObservatoryType } from '../types'; +import { Language, ObservatoryType } from '../types'; import { DbConfService, IDBConf } from '../services/dbconf.service'; -import { ToolbarService, LinkService, ImageService, HtmlEditorService } from '@syncfusion/ej2-angular-richtexteditor'; +import { + ToolbarService, + LinkService, + ImageService, + HtmlEditorService, +} from '@syncfusion/ej2-angular-richtexteditor'; +import { TranslateService } from '@ngx-translate/core'; +import { switchMap, tap } from 'rxjs/operators'; +import { TranslationService } from '../services/translation.service'; +import { FormConstants, formLabels } from '../constants/app.constants'; +import { LanguageService } from '../services/language.service'; @Component({ selector: 'app-add-site', @@ -28,15 +42,36 @@ export class AddSiteComponent implements OnInit, OnDestroy { /* RichTextEditor toolbar configuration --> Hide image upload tool */ public tools: object = { type: 'Expand', - items: ['Bold', 'Italic', 'Underline', 'StrikeThrough', - 'FontName', 'FontSize', 'FontColor', 'BackgroundColor', - 'LowerCase', 'UpperCase', '|', - 'Formats', 'Alignments', 'OrderedList', 'UnorderedList', - 'Outdent', 'Indent', '|', + items: [ + 'Bold', + 'Italic', + 'Underline', + 'StrikeThrough', + 'FontName', + 'FontSize', + 'FontColor', + 'BackgroundColor', + 'LowerCase', + 'UpperCase', + '|', + 'Formats', + 'Alignments', + 'OrderedList', + 'UnorderedList', + 'Outdent', + 'Indent', + '|', 'CreateLink', /*'Image', */ - '|', 'ClearFormat', 'Print', - 'SourceCode', 'FullScreen', '|', 'Undo', 'Redo'] + '|', + 'ClearFormat', + 'Print', + 'SourceCode', + 'FullScreen', + '|', + 'Undo', + 'Redo', + ], }; selectedFile: File[]; modalRef: NgbModalRef; @@ -86,19 +121,27 @@ export class AddSiteComponent implements OnInit, OnDestroy { alert: { type: string; message: string }; site: any; edit_btn = false; - edit_btn_text = 'Éditer'; - submit_btn_text = 'Ajouter'; + edit_btn_text = 'BUTTONS.EDIT'; + submit_btn_text = 'BUTTONS.ADD'; initPhotos: any[] = []; deleted_photos = []; new_photos = []; marker: Layer[] = []; center: any; toast_msg: string; - communes: undefined; + communes: any; observatories: ObservatoryType[] = []; currentUser: any; zoom = 10; removed_notice: any = null; + + currentLang: Language; + activeTab: string; + availableLang: Language[]; + currentTabLangId: string; + errorMessage: string = ''; + defaultLang: Language; + constructor( private sitesService: SitesService, private observatoriesSrv: ObservatoriesService, @@ -109,28 +152,36 @@ export class AddSiteComponent implements OnInit, OnDestroy { private modalService: NgbModal, private authService: AuthService, private spinner: NgxSpinnerService, - private dbConfSrv: DbConfService + private dbConfSrv: DbConfService, + private translate: TranslateService, + private translationService: TranslationService, + private languageService: LanguageService ) {} ngOnInit() { + this.availableLang = this.languageService.getLanguagesDB(); + this.defaultLang = this.languageService.getDefaultLanguageDB(); + this.currentTabLangId = this.availableLang[0].id; this.currentUser = this.authService.currentUser; this.id_site = this.route.snapshot.params['id']; - this.siteForm = this.formService.initFormSite(); + this.siteForm = this.formService.initFormSite(this.availableLang); this.siteForm.controls['id_stheme'].disable(); + forkJoin([ this.sitesService.getThemes(), this.sitesService.getSubthemes(), this.sitesService.getCommunes(), - this.observatoriesSrv.getAll(), + this.observatoriesSrv.getAll({ filterPresets: ['is_contributor'] }), ]).subscribe((results) => { this.themes = results[0]; this.subthemes = results[1]; this.communes = results[2]; this.selectedSubthemes = this.subthemes; this.observatories = results[3]; + if (this.id_site) { this.getSite(this.id_site); - this.submit_btn_text = 'Enregistrer'; + this.submit_btn_text = 'BUTTONS.SUBMIT'; } else { this.edit_btn = true; this.loadForm = true; @@ -182,7 +233,11 @@ export class AddSiteComponent implements OnInit, OnDestroy { container.innerHTML = ' '; container.style.backgroundColor = 'white'; - container.title = 'Recentrer la carte'; + this.translate + .get('INFO_MESSAGE.RECENTER_MAP') + .subscribe((translatedMessage) => { + container.title = translatedMessage; + }); container.onclick = () => { this.center = latLng(this.site.geom); this.zoom = 10; @@ -293,6 +348,7 @@ export class AddSiteComponent implements OnInit, OnDestroy { 'lat', 'lng', 'id_stheme', + 'translations', ]); this.siteJson.geom = 'SRID=4326;POINT(' + @@ -301,18 +357,28 @@ export class AddSiteComponent implements OnInit, OnDestroy { siteForm.value.lat + ')'; this.siteJson.path_file_guide_site = path_file_guide_site; + + // Créer l'objet de traductions + this.siteJson.translations = this.formService.createTranslationsObject( + siteForm.value, + this.availableLang, + FormConstants.mandatoryFieldsSite + ); this.uploadNotice(); this.spinner.show(); if (!this.id_site) { this.sitesService.addSite(this.siteJson).subscribe( (site) => { // tslint:disable-next-line:quotemark - this.toast_msg = "Point d'observation ajouté avec succès"; + this.translate + .get('INFO_MESSAGE.SUCESS_ADDED_SITE') + .subscribe((translatedMessage: string) => { + this.toast_msg = translatedMessage; + }); this.addThemes( Number(site.id_site), siteForm.value.id_theme, - siteForm.value.id_stheme, - true + siteForm.value.id_stheme ); }, (err) => { @@ -320,14 +386,21 @@ export class AddSiteComponent implements OnInit, OnDestroy { this.edit_btn = true; if (err.status === 403) { this.router.navigate(['']); - this.toastr.error('votre session est expirée', '', { - positionClass: 'toast-bottom-right', - }); - } else { - this.toastr.error('Une erreur est survenue sur le serveur.', '', { - positionClass: 'toast-bottom-right', - }); - } + this.translate + .get('ERRORS.EXPIRED_SESSION') + .subscribe((translatedMessage: string) => { + this.toastr.error(translatedMessage, '', { + positionClass: 'toast-bottom-right', + }); + }); + } else + this.translate + .get('ERRORS.SERVER_ERROR') + .subscribe((translatedMessage: string) => { + this.toastr.error(translatedMessage, '', { + positionClass: 'toast-bottom-right', + }); + }); } ); } else { @@ -339,6 +412,7 @@ export class AddSiteComponent implements OnInit, OnDestroy { } } else { this.edit_btn = true; + this.errorMessage = this.generateErrorMessage(); } } @@ -355,7 +429,7 @@ export class AddSiteComponent implements OnInit, OnDestroy { this.photos.push(photo); } - addPhotos(id_site, new_site) { + addPhotos(id_site) { const photosData: FormData = new FormData(); let photoJson; let photos; @@ -366,13 +440,11 @@ export class AddSiteComponent implements OnInit, OnDestroy { } _.forEach(photos, (photo) => { photoJson = _.omit(photo, ['photo_file', 'imgUrl', 'filePhoto', 'name']); - photoJson.id_site = Number(id_site); photosData.append('image', photo.filePhoto); - photosData.append('new_site', new_site); photosData.append('data', JSON.stringify(photoJson)); }); if (photos.length > 0) { - this.sitesService.addPhotos(photosData).subscribe( + this.sitesService.addPhotos(id_site, photosData).subscribe( (res) => { if (res.type === HttpEventType.UploadProgress) { // console.log('resUplod', res.loaded); @@ -382,18 +454,26 @@ export class AddSiteComponent implements OnInit, OnDestroy { console.log('err upload photo', err); this.spinner.hide(); if (err.error.error === 'image_already_exist') { - this.edit_btn_text = 'Annuler'; + this.edit_btn_text = 'BUTTONS.CANCEL'; this.edit_btn = true; this.setAlert(err.error.image); } else if (err.status === 403) { - this.router.navigate(['']); - this.toastr.error('votre session est expirée', '', { - positionClass: 'toast-bottom-right', - }); + this.translate + .get('ERRORS.SESSION_EXPIRED') + .subscribe((translatedMessage: string) => { + this.router.navigate(['']); + this.toastr.error(translatedMessage, '', { + positionClass: 'toast-bottom-right', + }); + }); } else { - this.toastr.error('Une erreur est survenue sur le serveur.', '', { - positionClass: 'toast-bottom-right', - }); + this.translate + .get('ERRORS.SERVER_ERROR') + .subscribe((translatedMessage: string) => { + this.toastr.error(translatedMessage, '', { + positionClass: 'toast-bottom-right', + }); + }); } }, () => { @@ -433,7 +513,7 @@ export class AddSiteComponent implements OnInit, OnDestroy { this.router.navigate(['/sites/details/', id_site]); } } - addThemes(id_site, themes, sthemes, new_site) { + addThemes(id_site, themes, sthemes) { // tslint:disable-next-line:prefer-const let tab_stheme = []; _.forEach(sthemes, (sub) => { @@ -445,43 +525,56 @@ export class AddSiteComponent implements OnInit, OnDestroy { _.forEach(stheme.themes, (item) => { if (_.includes(themes, item)) { stheme_theme.push({ - id_site: id_site, id_theme: item, id_stheme: stheme.id_stheme, }); } }); }); - this.sitesService.addThemes({ data: stheme_theme }).subscribe( + this.sitesService.addThemes(id_site, stheme_theme).subscribe( (response) => { - this.addPhotos(id_site, new_site); + this.addPhotos(id_site); }, (err) => { this.spinner.hide(); if (err.status === 403) { - this.router.navigate(['']); - this.toastr.error('votre session est expirée', '', { - positionClass: 'toast-bottom-right', - }); - } else - this.toastr.error('Une erreur est survenue sur le serveur.', '', { - positionClass: 'toast-bottom-right', - }); + this.translate + .get('ERRORS.SESSION_EXPIRED') + .subscribe((message: string) => { + this.router.navigate(['']); + this.toastr.error(message, '', { + positionClass: 'toast-bottom-right', + }); + }); + } else { + this.translate + .get('ERRORS.SERVER_ERROR') + .subscribe((message: string) => { + this.toastr.error(message, '', { + positionClass: 'toast-bottom-right', + }); + }); + } } ); } - setAlert(message) { - this.alert = { - type: 'danger', - message: 'La ' + message + ' existe déjà', - }; + setAlert(message: string) { + this.translate + .get('ALERTS.ITEM_EXISTS') + .subscribe((translatedMessage: string) => { + // Concaténer le message traduit avec la variable non traduite + this.alert = { + type: 'danger', + message: `${translatedMessage.replace('{{ item }}', message)}`, + }; + }); } getSite(id_site) { this.sitesService.getsiteById(id_site).subscribe( (site) => { - this.site = site.site[0]; + console.log('site', site), (this.site = site.site[0]); _.forEach(site.photos, (photo) => { this.initPhotos.push({ id_photo: photo.id_photo, @@ -496,9 +589,10 @@ export class AddSiteComponent implements OnInit, OnDestroy { }); }, (err) => { - console.log('err', err); - this.toastr.error('Une erreur est survenue sur le serveur.', '', { - positionClass: 'toast-bottom-right', + this.translate.get('ERRORS.SERVER_ERROR').subscribe((res: string) => { + this.toastr.error(res, '', { + positionClass: 'toast-bottom-right', + }); }); }, () => { @@ -604,43 +698,65 @@ export class AddSiteComponent implements OnInit, OnDestroy { } patchSite(siteJson, themes, sthemes) { - siteJson.id_site = this.id_site; siteJson.main_theme_id = siteJson.main_theme_id || null; _.forEach(this.photos, (photo) => { if (_.has(photo, 'filePhoto')) { this.new_photos.push(photo); } }); - this.sitesService.updateSite(siteJson).subscribe( - (res) => { - // tslint:disable-next-line:quotemark - this.toast_msg = "Point d'observation mis à jour"; - this.edit_btn_text = 'Éditer'; - if (this.deleted_photos.length > 0) { - this.sitesService.deletePhotos(this.deleted_photos).subscribe(); + this.sitesService + .updateSite(this.id_site, siteJson) + .pipe( + switchMap((res) => { + return this.translate + .get(['INFO_MESSAGE.SUCCESS_UPDATED_SITE', 'BUTTONS.EDIT']) + .pipe( + tap((translations) => { + this.toast_msg = + translations['INFO_MESSAGE.SUCCESS_UPDATED_SITE']; + this.edit_btn_text = translations['BUTTONS.EDIT']; + + if (this.deleted_photos.length > 0) { + this.sitesService + .deletePhotos(this.deleted_photos.map((p) => p.id_photo)) + .subscribe(); + } + this.addThemes(Number(this.id_site), themes, sthemes); + }) + ); + }) + ) + .subscribe( + () => {}, // Success handler (déjà géré dans `tap`) + (err) => { + this.spinner.hide(); + if (err.status === 403) { + this.translate + .get('ERRORS.SESSION_EXPIRED') + .subscribe((message: string) => { + this.router.navigate(['']); + this.toastr.error(message, '', { + positionClass: 'toast-bottom-right', + }); + }); + } else { + this.translate + .get('ERRORS.SERVER_ERROR') + .subscribe((message: string) => { + this.toastr.error(message, '', { + positionClass: 'toast-bottom-right', + }); + }); + } } - this.addThemes(Number(this.id_site), themes, sthemes, false); - }, - (err) => { - this.spinner.hide(); - if (err.status === 403) { - this.router.navigate(['']); - this.toastr.error('votre session est expirée', '', { - positionClass: 'toast-bottom-right', - }); - } else - this.toastr.error('Une erreur est survenue sur le serveur.', '', { - positionClass: 'toast-bottom-right', - }); - } - ); + ); } editForm() { this.edit_btn = !this.edit_btn; if (!this.edit_btn) { this.map.removeControl(this.drawControl); - this.edit_btn_text = 'Éditer'; + this.edit_btn_text = 'BUTTONS.EDIT'; this.patchForm(); this.alert = null; this.photos = this.initPhotos; @@ -648,7 +764,7 @@ export class AddSiteComponent implements OnInit, OnDestroy { this.initMarker(this.site.geom[0], this.site.geom[1]); } else { this.map.addControl(this.drawControl); - this.edit_btn_text = 'Annuler'; + this.edit_btn_text = 'BUTTONS.CANCEL'; this.siteForm.enable(); } this.siteForm.controls['id_stheme'].setValue(this.site.subthemes); @@ -689,6 +805,7 @@ export class AddSiteComponent implements OnInit, OnDestroy { this.deleted_photos.push(photo); } + // TODO: Traduire les messages liés aux toasts deleteSite() { this.sitesService.deleteSite(this.id_site).subscribe( (res) => { @@ -696,14 +813,23 @@ export class AddSiteComponent implements OnInit, OnDestroy { }, (err) => { if (err.status === 403) { - this.router.navigate(['']); - this.toastr.error('votre session est expirée', '', { - positionClass: 'toast-bottom-right', - }); - } else - this.toastr.error('Une erreur est survenue sur le serveur.', '', { - positionClass: 'toast-bottom-right', - }); + this.translate + .get('ERRORS.SESSION_EXPIRED') + .subscribe((message: string) => { + this.router.navigate(['']); + this.toastr.error(message, '', { + positionClass: 'toast-bottom-right', + }); + }); + } else { + this.translate + .get('ERRORS.SERVER_ERROR') + .subscribe((message: string) => { + this.toastr.error(message, '', { + positionClass: 'toast-bottom-right', + }); + }); + } } ); this.modalRef.close(); @@ -711,29 +837,81 @@ export class AddSiteComponent implements OnInit, OnDestroy { onCancel() { this.siteForm.reset(); + this.errorMessage = ''; this.router.navigate(['sites']); } patchForm() { + // Initialisation d'un objet pour stocker les valeurs + const translatedValues = { + translations: {}, // Créer une structure pour stocker les traductions + }; + // Parcours de toutes les langues disponibles + for (const lang of this.availableLang) { + const langId = lang.id; // Utilisation de langId directement depuis l'objet lang + // Récupératio n des traductions pour chaque langue + translatedValues.translations[langId] = { + name_site: this.translationService.getTranslation( + langId, + this.site, + 'name_site' + ), + desc_site: this.translationService.getTranslation( + langId, + this.site, + 'desc_site' + ), + legend_site: this.translationService.getTranslation( + langId, + this.site, + 'legend_site' + ), + testim_site: + this.translationService.getTranslation( + langId, + this.site, + 'testim_site' + ) || null, + publish_site: + this.translationService.getTranslation( + langId, + this.site, + 'publish_site' + ) || false, + }; + } + // Mise à jour des valeurs du formulaire this.siteForm.patchValue({ - name_site: this.site.name_site, - desc_site: this.site.desc_site, ref_site: this.site.ref_site, - testim_site: this.site.testim_site, - publish_site: this.site.publish_site, lng: this.site.geom[1].toFixed(6), lat: this.site.geom[0].toFixed(6), id_theme: this.site.themes, id_stheme: this.site.subthemes, code_city_site: this.site.code_city_site, main_theme_id: this.site.main_theme_id, - legend_site: this.site.legend_site, id_observatory: this.site.id_observatory, }); + + for (const lang of this.availableLang) { + const langId = lang.id; + const { name_site, desc_site, legend_site, testim_site, publish_site } = + translatedValues.translations[langId]; + + // Mise à jour de chaque champ dans le formGroup correspondant à langId + this.siteForm.get(`translations.${langId}`).patchValue({ + name_site, + desc_site, + legend_site, + testim_site, + publish_site, + }); + } + if (this.site.path_file_guide_site) { this.noticeName = this.site.path_file_guide_site; } } + layerUrl(key, layer) { return ( 'http://wxs.ign.fr/' + @@ -752,4 +930,47 @@ export class AddSiteComponent implements OnInit, OnDestroy { this.mySubscription.unsubscribe(); } } + + // Méthode appelée lors du changement d'onglet + changeTab(event: NgbTabChangeEvent): void { + this.currentTabLangId = event.activeId; + } + + private generateErrorMessage(): string { + return this.formService.generateErrorMessage( + this.siteForm, + [], + formLabels.site + ); + } + + isObservatoryEditable(): boolean { + return ( + !this.site || + this.observatoriesSrv.isUserAdmin( + this.site.id_observatory, + this.currentUser + ) + ); + } + + canEditPublish(): boolean { + return ( + !this.site || + this.observatoriesSrv.isUserAdmin( + this.site.id_observatory, + this.currentUser + ) + ); + } + + canDelete(): boolean { + return ( + this.site && + this.observatoriesSrv.isUserAdmin( + this.site.id_observatory, + this.currentUser + ) + ); + } } diff --git a/admin/src/app/app-routing.module.ts b/admin/src/app/app-routing.module.ts index 9787aaaa..270955c9 100644 --- a/admin/src/app/app-routing.module.ts +++ b/admin/src/app/app-routing.module.ts @@ -8,6 +8,8 @@ import { GalleryComponent } from './gallery/gallery.component'; import { AuthGuard } from './services/auth.guard'; import { ObservatoriesComponent } from './observatories/observatories.component'; import { ObservatoryComponent } from './observatory/observatory.component'; +import { ListLanguagesComponent } from './list-languages/list-languages.component'; +import { FormLanguagesComponent } from './form-languages/form-languages.component'; const routes: Routes = [ { path: 'login', component: LoginPageComponent }, @@ -30,12 +32,24 @@ const routes: Routes = [ { path: 'sites', component: ManageSitesComponent, canActivate: [AuthGuard] }, { path: 'gallery', component: GalleryComponent, canActivate: [AuthGuard] }, { path: 'sites/form', component: AddSiteComponent, canActivate: [AuthGuard] }, + { path: 'languages', component: ListLanguagesComponent, canActivate: [AuthGuard] }, + { + path: 'languages/form', + component: FormLanguagesComponent, + canActivate: [AuthGuard], + }, { path: 'sites/details/:id', component: AddSiteComponent, canActivate: [AuthGuard], runGuardsAndResolvers: 'always', }, + { + path: 'languages/details/:id', + component: FormLanguagesComponent, + canActivate: [AuthGuard], + runGuardsAndResolvers: 'always', + }, { path: '', component: LoginPageComponent }, { path: '**', redirectTo: 'login' }, ]; diff --git a/admin/src/app/app.component.ts b/admin/src/app/app.component.ts index 120ff065..0d980d74 100644 --- a/admin/src/app/app.component.ts +++ b/admin/src/app/app.component.ts @@ -1,4 +1,5 @@ import { Component } from '@angular/core'; +import { LanguageService } from './services/language.service'; @Component({ @@ -8,6 +9,11 @@ import { Component } from '@angular/core'; }) export class AppComponent { + constructor(private languageService: LanguageService) { } title = 'admin'; + async ngOnInit() { + await this.languageService.loadLanguagesSorted(); + } + } diff --git a/admin/src/app/app.module.ts b/admin/src/app/app.module.ts index 4b3570fb..3fb436d1 100644 --- a/admin/src/app/app.module.ts +++ b/admin/src/app/app.module.ts @@ -1,6 +1,6 @@ import { BrowserModule } from '@angular/platform-browser'; import { NgModule } from '@angular/core'; -import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http'; +import { HTTP_INTERCEPTORS, HttpClientModule,HttpClient } from '@angular/common/http'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; @@ -31,6 +31,15 @@ import { ObservatoriesService } from './services/observatories.service'; import { ObservatoryComponent } from './observatory/observatory.component'; import { DbConfService } from './services/dbconf.service'; import { RichTextEditorAllModule } from '@syncfusion/ej2-angular-richtexteditor'; +import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; +import { TranslateHttpLoader } from '@ngx-translate/http-loader'; +import { DynamicTranslatePipe } from './pipes/translate-items.pipe'; +import { ListLanguagesComponent } from './list-languages/list-languages.component'; +import { FormLanguagesComponent } from './form-languages/form-languages.component'; + +export function HttpLoaderFactory(http: HttpClient) { + return new TranslateHttpLoader(http, './assets/i18n/', '.json'); +} @NgModule({ declarations: [ @@ -45,6 +54,9 @@ import { RichTextEditorAllModule } from '@syncfusion/ej2-angular-richtexteditor' GalleryComponent, ObservatoriesComponent, ObservatoryComponent, + ListLanguagesComponent, + FormLanguagesComponent, + DynamicTranslatePipe ], imports: [ BrowserModule, @@ -61,6 +73,13 @@ import { RichTextEditorAllModule } from '@syncfusion/ej2-angular-richtexteditor' ToastrModule.forRoot(), NgxSpinnerModule, RichTextEditorAllModule, + TranslateModule.forRoot({ + loader: { + provide: TranslateLoader, + useFactory: HttpLoaderFactory, + deps: [HttpClient] + } + }) ], providers: [ LoginService, diff --git a/admin/src/app/constants/app.constants.ts b/admin/src/app/constants/app.constants.ts new file mode 100644 index 00000000..edc0caa4 --- /dev/null +++ b/admin/src/app/constants/app.constants.ts @@ -0,0 +1,63 @@ + +export const AppConstants = { + DEFAULT_LANGUAGES: 'fr', + LANGUAGES: ['fr', 'en'], // Liste des langues disponibles + LANGUAGE_FILES: { + fr: './assets/i18n/fr.json', + en: './assets/i18n/en.json', + }, + }; + +export const availableLangDB = [{ + id: 'fr', + label: 'Français', + is_default: true, + is_published: false +}, +{ + id: 'en', + label: 'Anglais', + is_default: false, + is_published: true +} +] + +export const defaultLangDB = {langId: 'fr', langLabel: 'Français'} + +export const FormConstants = { + mandatoryFieldsSite: ['name_site', 'desc_site', 'testim_site', 'legend_site', 'publish_site'], + mandatoryFieldsObservatory: ['is_published', 'title'] +} + + +export const formLabels = { + site:{ + ref_site: 'Référence du site', + code_city_site: 'Code de la ville', + id_observatory: 'Observatoire', + lng: 'Longitude', + lat: 'Latitude', + id_theme: 'Thème', + id_stheme: 'Sous-thème', + notice: 'Notice', + main_theme_id: 'Thème principal', + translations: { + name_site: 'Nom du site', + desc_site: 'Description', + testim_site: 'Témoignages', + legend_site: 'Légende', + publish_site: 'Publication' + } + }, + observatory: { + geom: 'Zonage', + ref: 'Référence', + color: 'Couleur de theme', + logo: 'Logo', + thumbnail: 'Vignette', + translations: { + is_published: 'Publication', + title: 'Titre' + } + } +}; \ No newline at end of file diff --git a/admin/src/app/constants/fixtures.ts b/admin/src/app/constants/fixtures.ts new file mode 100644 index 00000000..ea4f2c10 --- /dev/null +++ b/admin/src/app/constants/fixtures.ts @@ -0,0 +1,539 @@ +import { ObservatoryType } from "../types"; + +export const fixture_theme = [ + { + "icon": null, + "id_theme": 1, + "translations": [ + { + "lang_id": "fr", + "name_theme": "Agriculture - Alpage" + }, + { + "lang_id": "en", + "name_theme": "Agriculture - Alpine Pastures" + } + ] + }, + { + "icon": null, + "id_theme": 2, + "translations": [ + { + "lang_id": "fr", + "name_theme": "Villages - Hameaux - Habitations" + }, + { + "lang_id": "en", + "name_theme": "Villages - Hamlets - Houses" + } + ] + }, + { + "icon": null, + "id_theme": 3, + "translations": [ + { + "lang_id": "fr", + "name_theme": "Stations - Domaines skiables" + }, + { + "lang_id": "en", + "name_theme": "Ski Resorts - Ski Areas" + } + ] + }, + { + "icon": null, + "id_theme": 4, + "translations": [ + { + "lang_id": "fr", + "name_theme": "Aménagements - Travaux - Infrastructures" + }, + { + "lang_id": "en", + "name_theme": "Developments - Works - Infrastructures" + } + ] + }, + { + "icon": null, + "id_theme": 5, + "translations": [ + { + "lang_id": "fr", + "name_theme": "Occupation des sols" + }, + { + "lang_id": "en", + "name_theme": "Land Use" + } + ] + }, + { + "icon": null, + "id_theme": 6, + "translations": [ + { + "lang_id": "fr", + "name_theme": "Milieux naturels" + }, + { + "lang_id": "en", + "name_theme": "Natural Environments" + } + ] + }, + { + "icon": null, + "id_theme": 7, + "translations": [ + { + "lang_id": "fr", + "name_theme": "Haute montagne" + }, + { + "lang_id": "en", + "name_theme": "High Mountain" + } + ] + } + ]; + + export const fixture_stheme = [ + { + "id_stheme": 38, + "translations": [ + { + "lang_id": "fr", + "name_stheme": "Prairies de fauche" + }, + { + "lang_id": "en", + "name_stheme": "Mowing Meadows" + } + ], + "themes": [1] + }, + { + "id_stheme": 40, + "translations": [ + { + "lang_id": "fr", + "name_stheme": "Vergers et jardins potager" + }, + { + "lang_id": "en", + "name_stheme": "Orchards and Vegetable Gardens" + } + ], + "themes": [3] + }, + { + "id_stheme": 37, + "translations": [ + { + "lang_id": "fr", + "name_stheme": "Agriculture et urbanisation" + }, + { + "lang_id": "en", + "name_stheme": "Agriculture and Urbanization" + } + ], + "themes": [4] + }, + { + "id_stheme": 4, + "translations": [ + { + "lang_id": "fr", + "name_stheme": "Village" + }, + { + "lang_id": "en", + "name_stheme": "Village" + } + ], + "themes": [9] + }, + { + "id_stheme": 42, + "translations": [ + { + "lang_id": "fr", + "name_stheme": "Urbanisation des villages" + }, + { + "lang_id": "en", + "name_stheme": "Village Urbanization" + } + ], + "themes": [] + }, + { + "id_stheme": 22, + "translations": [ + { + "lang_id": "fr", + "name_stheme": "Architecture" + }, + { + "lang_id": "en", + "name_stheme": "Architecture" + } + ], + "themes": [2] + }, + { + "id_stheme": 7, + "translations": [ + { + "lang_id": "fr", + "name_stheme": "Patrimoine religieux" + }, + { + "lang_id": "en", + "name_stheme": "Religious Heritage" + } + ], + "themes": [] + }, + { + "id_stheme": 8, + "translations": [ + { + "lang_id": "fr", + "name_stheme": "Stations - Villages" + }, + { + "lang_id": "en", + "name_stheme": "Resorts - Villages" + } + ], + "themes": [] + }, + { + "id_stheme": 9, + "translations": [ + { + "lang_id": "fr", + "name_stheme": "Aménagement des domaines skiables" + }, + { + "lang_id": "en", + "name_stheme": "Development of Ski Areas" + } + ], + "themes": [] + }, + { + "id_stheme": 10, + "translations": [ + { + "lang_id": "fr", + "name_stheme": "Activités estivales en stations" + }, + { + "lang_id": "en", + "name_stheme": "Summer Activities in Resorts" + } + ], + "themes": [] + } + ]; + + export const fixture_city = [ + { + "code_commune": "1001", + "translations": [ + { + "is_published": true, + "lang_id": "fr", + "nom_commune": "Londres" + }, + { + "is_published": true, + "lang_id": "en", + "nom_commune": "London" + } + ] + }, + { + "code_commune": "1002", + "translations": [ + { + "is_published": true, + "lang_id": "fr", + "nom_commune": "New York" + }, + { + "is_published": true, + "lang_id": "en", + "nom_commune": "New York" + } + ] + }, + { + "code_commune": "1003", + "translations": [ + { + "is_published": true, + "lang_id": "fr", + "nom_commune": "Rome" + }, + { + "is_published": true, + "lang_id": "en", + "nom_commune": "Rome" + } + ] + }, + { + "code_commune": "1004", + "translations": [ + { + "is_published": true, + "lang_id": "fr", + "nom_commune": "Moscou" + }, + { + "is_published": true, + "lang_id": "en", + "nom_commune": "Moscow" + } + ] + }, + { + "code_commune": "1005", + "translations": [ + { + "is_published": true, + "lang_id": "fr", + "nom_commune": "Berlin" + }, + { + "is_published": true, + "lang_id": "en", + "nom_commune": "Berlin" + } + ] + }, + { + "code_commune": "1006", + "translations": [ + { + "is_published": true, + "lang_id": "fr", + "nom_commune": "Tokyo" + }, + { + "is_published": true, + "lang_id": "en", + "nom_commune": "Tokyo" + } + ] + }, + { + "code_commune": "1007", + "translations": [ + { + "is_published": true, + "lang_id": "fr", + "nom_commune": "Pékin" + }, + { + "is_published": true, + "lang_id": "en", + "nom_commune": "Beijing" + } + ] + }, + { + "code_commune": "1008", + "translations": [ + { + "is_published": true, + "lang_id": "fr", + "nom_commune": "Munich" + }, + { + "is_published": true, + "lang_id": "en", + "nom_commune": "Munich" + } + ] + }, + { + "code_commune": "1009", + "translations": [ + { + "is_published": true, + "lang_id": "fr", + "nom_commune": "Vienne" + }, + { + "is_published": true, + "lang_id": "en", + "nom_commune": "Vienna" + } + ] + }, + { + "code_commune": "1010", + "translations": [ + { + "is_published": true, + "lang_id": "fr", + "nom_commune": "Genève" + }, + { + "is_published": true, + "lang_id": "en", + "nom_commune": "Geneva" + } + ] + } + ]; + + + export const fixture_observatories: ObservatoryType[] = [ + { + id: 1, + ref: 'PNV', + color: '#b50000', + logo: null, + thumbnail: null, + comparator: 'split', + geom: "POLYGON ((6.58681072 45.18200501, 6.73648285 45.23771352, 6.88615497 45.18200501, 6.8578211 45.29982259, 6.97951588 45.38304217, 6.81160717 45.40045984, 6.73648285 45.50764377, 6.66135852 45.40045984, 6.49344982 45.38304217, 6.61514459 45.29982259, 6.58681072 45.18200501))", // reste une chaîne pour l'exemple, sinon utilisez un objet + translations: [ + { + lang_id: 'fr', + is_published: true, + title: 'Parc national de la Vanoise', + }, + { + lang_id: 'en', + is_published: true, + title: 'National Park of Vanoise', + }, + ], + } + ]; + + + export const fixture_geom = [ + { + "color": "#b50000", + "comparator": "split", + "geom": "POLYGON ((6.58681072 45.18200501, 6.73648285 45.23771352, 6.88615497 45.18200501, 6.8578211 45.29982259, 6.97951588 45.38304217, 6.81160717 45.40045984, 6.73648285 45.50764377, 6.66135852 45.40045984, 6.49344982 45.38304217, 6.61514459 45.29982259, 6.58681072 45.18200501))", + "id": 1, + "is_published": true, + "logo": null, + "ref": "PNV", + "thumbnail": null, + "title": "Parc national de la Vanoise" + } + ] + + + export const fixture_site = { + "alti_site": 2060, + "code_city_site": "73071", + "cor_site_stheme_themes": [ + { + "id_site": 1, + "id_stheme_theme": 1 + }, + { + "id_site": 1, + "id_stheme_theme": 3 + }, + { + "id_site": 1, + "id_stheme_theme": 4 + }, + { + "id_site": 1, + "id_stheme_theme": 9 + }, + { + "id_site": 1, + "id_stheme_theme": 11 + }, + { + "id_site": 1, + "id_stheme_theme": 14 + }, + { + "id_site": 1, + "id_stheme_theme": 16 + } + ], + "geom": [ + 45.430611, + 6.815778 + ], + "id_observatory": 1, + "id_site": 1, + "main_photo": 1, + "main_theme": null, + "main_theme_id": null, + "observatory": { + "color": "#b50000", + "id": 1, + "logo": null, + "ref": "PNV", + "translations": [ + { + "is_published": true, + "lang_id": "fr", + "title": "Parc national de la Vanoise" + }, + { + "is_published": true, + "lang_id": "en", + "title": "national park of Vanois" + } + ] + }, + "path_file_guide_site": "oppv-005-notice.pdf", + "ref_site": "005", + "subthemes": [ + 38, + 40, + 37, + 42, + 22 + ], + "t_photos": [ + 2, + 1 + ], + "themes": [ + 1, + 2, + 3, + 6 + ], + "translations": [ + { + lang_id: 'fr', + "publish_site": true, + "legend_site": "Lac asséché de la Glière, avec de gauche à droite : l'Aiguille Noire et le Col de la Croix des Frettes ", + "desc_site": "Ce lac blanc, le lac de la Glière, n'est pas pris par les glaces, malgré les apparences. Il est en réalité asséché depuis le XIXe siècle. En 1818, les hommes vivent alors dans le « petit âge glaciaire », période climatique plus froide commencée à la fin du XVIe siècle en Europe occidentale et dont nous sommes en train de voir la fin : le glacier de Rosolin vient alors « lécher » le bord du lac. Des séracs, autrement dit des morceaux de glaciers détachés de la langue principale, sont alors tombés dans ses eaux, bloquant l'écoulement naturel à la sortie du lac. L'eau a fini par déborder, emportant dans sa course les séracs, la boue et les roches vers l'aval. Après cette catastrophe naturelle de 1818, le lac s'est asséché, prenant un nouvel aspect. \nAprès la vidange, les sédiments déposés au fond de la cuvette sont alors apparus à la lumière. L'alpage historique autour du lac n'en a pas été affecté, fréquenté qu'il est depuis le…XIIIe siècle.\n", + "testim_site": null, + "name_site": "Champagny-en-Vanoise" + }, + { + lang_id: 'en', + "publish_site": true, + "legend_site": "Dried lake of Glière, from left to right: the Aiguille Noire and the Col de la Croix des Frettes", + "desc_site": "This white lake, Lake Glière, is not frozen, despite appearances. It has actually been dried since the 19th century. In 1818, people lived during the 'little ice age,' a colder climatic period that began in the late 16th century in Western Europe and which we are now seeing the end of: the Rosolin glacier came to 'lick' the edge of the lake. Seracs, in other words, pieces of glaciers detached from the main tongue, then fell into its waters, blocking the natural flow out of the lake. The water eventually overflowed, carrying with it the seracs, mud, and rocks downstream. After this natural disaster of 1818, the lake dried up, taking on a new aspect. After the draining, the sediments deposited at the bottom of the basin then appeared in the light. The historical alpine pasture around the lake was not affected, as it has been frequented since the...13th century.", + "testim_site": null, + "name_site": "Champagny-en-Vanoise" + } + ] + }; + \ No newline at end of file diff --git a/admin/src/app/form-languages/form-languages.component.html b/admin/src/app/form-languages/form-languages.component.html new file mode 100644 index 00000000..26a4160e --- /dev/null +++ b/admin/src/app/form-languages/form-languages.component.html @@ -0,0 +1,133 @@ + + +
+
+
+
+
+
+
+ {{ 'ACTIONS.PUBLISH_DEFAULT' | translate }}: +
+ +
+
+
+ + + +
+
+ +
+
+ + + + +
+
+
+
+ {{ 'LANG_MNGMT.DEFAULT_LANGUAGE' | translate }} + ?: +
+ +
+
+
+ + {{ alert.message }} + +
+ + + +
+
+

+
+
+
+
+
+
diff --git a/admin/src/app/form-languages/form-languages.component.scss b/admin/src/app/form-languages/form-languages.component.scss new file mode 100644 index 00000000..f54d53b2 --- /dev/null +++ b/admin/src/app/form-languages/form-languages.component.scss @@ -0,0 +1,142 @@ +.language-block { + padding: 25px 40px; + background: #FFF; + box-shadow: 0 5px 5px -3px rgba(0, 0, 0, 0.2), 0 8px 10px 1px rgba(0, 0, 0, 0.14), 0 3px 14px 2px rgba(0, 0, 0, 0.12) +} + +.form-item { + margin-bottom: 30px; +} + +.label { + text-transform: uppercase; + font-weight: 600; + font-size: 12px; + margin: 0; + padding-right: 12px; +} + +.icon-download { + font-size: 12px; + padding-right: 6px +} + + +.remove-file { + color: #777777; + padding-left: 10px; + cursor: pointer; +} + +.inner-checkbox { + display: flex; + align-items: center; + justify-content: flex-end; +} + +.submit-btn-group { + display: flex; + justify-content: flex-end; + padding-top: 15px; + margin-top: 20PX; + border-top: 1px solid #d0cdcd; + margin-left: -40px; + margin-right: -40px; +} + +.btn-submit:disabled { + cursor: not-allowed; +} + +.photo-ref { + width: 120px; + font-size: 12px; +} + +.map { + min-height: calc(100vh - 98px); + width: 100%; + height: 100%; +} + +.col-map { + padding: 0; + background-color: #e8e8e8; +} + +.col-table { + padding: 15px; + background-color: #e8e8e8 +} + +.is-invalid { + border-radius: 4px; + border: 1px solid red; +} + +.preview-img { + margin-top: 10px; + margin-right: 20px; + background: no-repeat center; + background-size: cover; +} + +.preview { + display: flex; + align-items: flex-start; + -webkit-flex-wrap: wrap; + flex-wrap: wrap; +} + +.icon-pencil, +.delete-site { + padding-right: 6px; +} + + +.btn-delete, +.btn-edit, +.btn-submit, +.btn-cancel { + font-size: 14px; + font-weight: 600; + margin-left: 15px +} + +.btn-cancel { + margin-right: 15px +} + +.inner-photo { + position: relative; + display: block; +} + +.delete-photo { + position: absolute; + top: 2px; + color: #ff5252; + left: calc(100% - 28px); + cursor: pointer; +} + +.active_edit { + color: #212529 !important; + background-color: #ffc107 !important; + border-color: #ffc107 !important; +} + +.photo-required { + font-size: 80%; + color: #dc3545 +} + +.alert { + margin-top: 8px +} + +.ng-select.ng-select-disabled { + background-color: #f5f5f5; /* Couleur de fond grisée */ + pointer-events: none; /* Désactiver les événements */ + opacity: 0.6; /* Rendre le champ moins visible */ +} \ No newline at end of file diff --git a/admin/src/app/form-languages/form-languages.component.ts b/admin/src/app/form-languages/form-languages.component.ts new file mode 100644 index 00000000..cfcc39f1 --- /dev/null +++ b/admin/src/app/form-languages/form-languages.component.ts @@ -0,0 +1,372 @@ +import { Component, OnInit } from '@angular/core'; +import { Router, ActivatedRoute } from '@angular/router'; +import { + NgbModal, + NgbModalRef, + NgbTabChangeEvent, +} from '@ng-bootstrap/ng-bootstrap'; +import { FormGroup } from '@angular/forms'; +import { FormService } from '../services/form.service'; +import { Conf } from './../config'; +import * as _ from 'lodash'; +import { ToastrService } from 'ngx-toastr'; +import { AuthService } from '../services/auth.service'; +import { NgxSpinnerService } from 'ngx-spinner'; +import { Language, LanguagePatchType, LibLocales } from '../types'; +import { TranslateService } from '@ngx-translate/core'; +import { combineLatest, Observable } from 'rxjs'; +import { LanguageService } from '../services/language.service'; + +@Component({ + selector: 'app-form-languages', + templateUrl: './form-languages.component.html', + styleUrls: ['./form-languages.component.scss'], +}) +export class FormLanguagesComponent implements OnInit { + // @ViewChild('thumbnailInput') thumbnailInput; + // @ViewChild('logoInput') logoInput; + + selectedThumb: File; + selectedLogo: File; + selectedFile: File[]; + modalRef: NgbModalRef; + selectedSubthemes = []; + thumbs = []; + noticeName: any; + new_notice: any; + languageForm: FormGroup; + languageJson; + themes: any; + subthemes: any; + loadForm = false; + mySubscription; + id_language = null; + photoBaseUrl = Conf.img_srv; + previewImage: string | ArrayBuffer; + alert: { type: string; message: string }; + language: Language; + isEditing = false; + edit_btn_text = 'BUTTONS.EDIT'; + submit_btn_text = 'BUTTONS.ADD'; + initThumbs: any[] = []; + deleted_thumbs = []; + new_thumbs = []; + toast_msg: string; + communes: undefined; + currentUser: any; + removed_notice: any = null; + availableLang: Language[]; + currentTabLangId: string; + errorMessage: string = 'test'; + isInvalidForm: boolean = false; + defaultLang: Language; + libLocales: LibLocales[]; + + constructor( + public formService: FormService, + protected router: Router, + private route: ActivatedRoute, + private toastr: ToastrService, + private modalService: NgbModal, + private authService: AuthService, + private spinner: NgxSpinnerService, + private translate: TranslateService, + private languageService: LanguageService + ) {} + + async ngOnInit() { + await this.initializeLangDB(); + this.currentUser = this.authService.currentUser; + this.id_language = this.route.snapshot.params['id']; + this.languageService.loadLibLocales().subscribe((res) => { + this.libLocales = res.map((locale: any) => ({ + ...locale, + displayLabel: `${locale.id} - ${locale.language}`, + })); + }); + this.languageForm = this.formService.initFormlanguage(); + if (this.id_language) { + this.getlanguage(this.id_language); + this.submit_btn_text = 'BUTTONS.SUBMIT'; + } else { + this.isEditing = true; + this.loadForm = true; + } + } + + async submitlanguage(languageForm) { + languageForm.updateValueAndValidity(); + this.alert = null; + const isValidForm = this.formService.checkAllControlStatuses(languageForm); + const isValidPushlishedDefault = + this.isDefaultWhenPublishedValidator(languageForm); + if (!isValidForm || !isValidPushlishedDefault) { + this.isInvalidForm = true; + this.errorMessage = await this.validateLanguageForm(languageForm); + return; + } + this.isEditing = false; + this.spinner.show(); + try { + let res; + if (!this.id_language) { + res = await this.postlanguage(); + this.router.navigate(['languages']); + } else { + res = await this.patchlanguage(); + } + } catch (err) { + this.handleError(err); + } finally { + this.isInvalidForm = false; + this.edit_btn_text = 'BUTTONS.EDIT'; + this.spinner.hide(); + } + } + + setAlert(message: string) { + this.translate + .get('ALERTS.ITEM_EXISTS') + .subscribe((translatedMessage: string) => { + this.alert = { + type: 'danger', + message: `${translatedMessage.replace('{{ item }}', message)}`, + }; + }); + } + getlanguage(id_language) { + this.languageService.getById(id_language).subscribe( + (language) => { + this.language = language; + }, + (err) => { + this.translate + .get('ERRORS.SERVER_ERROR') + .subscribe((message: string) => { + this.toastr.error(message, '', { + positionClass: 'toast-bottom-right', + }); + }); + }, + () => { + this.patchForm(); + this.loadForm = true; + this.languageForm.disable(); + } + ); + } + + async postlanguage(): Promise { + try { + const formValue = this.languageForm.value; + const post: Language = this.createPostObject(formValue); + const res = await this.languageService.post(post).toPromise(); + + // Affichage du message de succès + await this.showSuccessMessage('INFO_MESSAGE.SUCCESS_ADDED_LANG'); + return res; + } catch (err) { + this.handleError(err); // Gestion des erreurs centralisée + throw err; // Relancer l'erreur pour que l'appelant puisse la traiter + } + } + + async patchlanguage(): Promise { + try { + const { id, ...patch } = this.languageForm.value; + const idLanguage = id ? id : this.languageForm.controls.id.value; + const typedPatch: LanguagePatchType = patch; + // Utilisation de toPromise() pour convertir l'observable en promesse + await this.languageService.patch(idLanguage, typedPatch).toPromise(); + + // Affichage du message de succès + await this.showSuccessMessage('INFO_MESSAGE.SUCCESS_UPDATED_LANG'); + } catch (err) { + // Gestion de l'erreur avec un message utilisateur et console log + let message = 'ERRORS.SERVER_ERROR'; + if ( + err.hasOwnProperty('error') && + err.error.hasOwnProperty('error_message') + ) { + message = err.error.error_message; + } + // this.toastr.error(message, '', { positionClass: 'toast-bottom-right' }); + + this.translate.get(message).subscribe((message: string) => { + this.toastr.error(message, '', { + positionClass: 'toast-bottom-right', + }); + }); + throw err; // Propagation de l'erreur pour que l'appelant puisse la gérer + } + } + + editForm() { + this.isInvalidForm = false; + this.isEditing = !this.isEditing; + if (!this.isEditing) { + this.edit_btn_text = 'BUTTONS.EDIT'; + this.patchForm(); + this.alert = null; + this.languageForm.disable(); + } else { + this.edit_btn_text = 'BUTTONS.CANCEL'; + this.languageForm.enable(); + this.languageForm.get('id').disable(); + } + } + + openDeleteModal(content) { + this.modalRef = this.modalService.open(content, { + windowClass: 'delete-modal', + centered: true, + }); + } + + cancelDelete() { + this.modalRef.close(); + } + + onCancel() { + this.languageForm.reset(); + this.router.navigate(['languages']); + } + + patchForm() { + this.languageForm.patchValue(this.language); + this.languageForm.patchValue({ + label: this.language.label, + id: this.language.id, + is_default: this.language.is_default, + is_published: this.language.is_published, + }); + } + + ngOnDestroy() { + this.spinner.hide(); + if (this.mySubscription) { + this.mySubscription.unsubscribe(); + } + } + + // Méthode appelée lors du changement d'onglet + changeTab(event: NgbTabChangeEvent): void { + this.currentTabLangId = event.activeId; + } + + getTranslatedMessages(keys: string[]): Observable { + return combineLatest(keys.map((key) => this.translate.get(key))); + } + + createPostObject(formValue): Language { + // Récupérez les propriétés de base + const post: Language = { + label: formValue.label, + id: formValue.id, + is_default: formValue.is_default, + is_published: formValue.is_published, + }; + return post; + } + + private handleError(err: any) { + let messageKey = 'ERRORS.SERVER_ERROR'; // Valeur par défaut + if (err.status === 403) { + messageKey = 'ERRORS.SESSION_EXPIRED'; + this.router.navigate(['']); + } + + this.translate.get(messageKey).subscribe((message: string) => { + this.toastr.error(message, '', { + positionClass: 'toast-bottom-right', + }); + }); + } + + private async showSuccessMessage(messageKey: string) { + const message = await this.translate.get(messageKey).toPromise(); + this.toastr.success(message, '', { + positionClass: 'toast-bottom-right', + }); + } + + async initializeLangDB() { + await this.languageService.loadLanguagesSorted(); + this.availableLang = this.languageService.getLanguagesDB(); + this.defaultLang = this.languageService.getDefaultLanguageDB(); + } + + isDefaultWhenPublishedValidator(group: FormGroup) { + const isDefault = group.get('is_default') + ? group.get('is_default').value + : null; + const isPublished = group.get('is_published') + ? group.get('is_published').value + : null; + + if (isDefault && !isPublished) { + return false; + } + return true; + } + + async validateLanguageForm(languageForm: FormGroup): Promise { + const errorMessages: string[] = []; + let errorMessageString: string = ''; + // Vérifier toutes les erreurs de champ + const isValidForm = this.formService.checkAllControlStatuses(languageForm); + const isValideDefaultPublished = + this.isDefaultWhenPublishedValidator(languageForm); + + if (!isValidForm) { + Object.keys(languageForm.controls).forEach((field) => { + const control = languageForm.get(field); + if (control && control.errors) { + if (control.errors['required']) { + errorMessages.push(`${field} est requis.`); + } + // Ajoutez d'autres cas d'erreurs de champ ici + } + }); + } + + // Vérifier l'erreur de la relation is_default et is_published + if (!isValideDefaultPublished) { + await this.translateItems( + 'ERRORS.FORMS.INVALID_DEFAULT', + 'LANG_MNGMT.DEFAULT_LANGUAGE', + 'ACTIONS.PUBLISH_DEFAULT' + ).then((message: string) => { + errorMessages.push(message); + }); + } + + if (errorMessages.length > 0) { + // Concaténer tous les messages avec un saut de ligne + errorMessageString = errorMessages.join('\n'); + return errorMessageString; + } else { + return null; + } + } + + async translateItems( + mainMessage: string, + firstVar: string, + secondVar: string + ) { + const currentLang = this.translate.currentLang; + console.log('Langue actuelle :', currentLang); + const [field_default, field_published] = await Promise.all([ + this.translate.get(firstVar).toPromise(), + this.translate.get(secondVar).toPromise(), + ]); + + const errorMessage = this.translate.instant(mainMessage, { + field_default, + field_published, + }); + + return errorMessage; + } +} diff --git a/admin/src/app/gallery/gallery.component.html b/admin/src/app/gallery/gallery.component.html index 01061f67..99b3bba3 100644 --- a/admin/src/app/gallery/gallery.component.html +++ b/admin/src/app/gallery/gallery.component.html @@ -1,11 +1,11 @@ -

Loading...

+

{{ 'COMMONS.LOADING' | translate}}...

-
diff --git a/admin/src/app/gallery/gallery.component.ts b/admin/src/app/gallery/gallery.component.ts index 99ff5788..53338c6c 100644 --- a/admin/src/app/gallery/gallery.component.ts +++ b/admin/src/app/gallery/gallery.component.ts @@ -6,6 +6,9 @@ import { Router } from '@angular/router'; import { ToastrService } from 'ngx-toastr'; import { NgxSpinnerService } from 'ngx-spinner'; import { forkJoin } from 'rxjs'; +import { TranslateService } from '@ngx-translate/core'; +import { LanguageService } from '../services/language.service'; +import { Language } from '../types'; @Component({ selector: 'app-gallery', @@ -19,28 +22,37 @@ export class GalleryComponent implements OnInit { selected_site; photos: any; licences: any; + defaultLangDB:Language; constructor( public sitesService: SitesService, protected router: Router, private toastr: ToastrService, - private spinner: NgxSpinnerService + private spinner: NgxSpinnerService, + private translate: TranslateService, + private languageService: LanguageService + ) {} - ngOnInit() { + async ngOnInit() { + await this.initializeLangDB(); this.spinner.show(); - this.sitesService.getAllSites().subscribe( + this.sitesService.getAllSites({ filterPresets: ["is_contributor"] }).subscribe( (sites) => { this.sites = sites; - this.selected_site = this.sites[0].id_site; - this.getPhotosSite(this.sites[0].id_site); + if (this.sites.length) { + this.selected_site = this.sites[0].id_site; + this.getPhotosSite(this.sites[0].id_site); + } this.spinner.hide(); }, (error) => { this.spinner.hide(); console.log('getGallery error', error); - this.toastr.error('Une erreur est survenue sur le serveur.', '', { - positionClass: 'toast-bottom-right', - }); + this.translate.get('ERRORS.SERVER_ERROR').subscribe((res: string) => { + this.toastr.error(res, '', { + positionClass: 'toast-bottom-right', + }); + }) } ); } @@ -70,9 +82,11 @@ export class GalleryComponent implements OnInit { }, (error) => { console.log('getPhotosSite error', error); - this.toastr.error('Une erreur est survenue sur le serveur.', '', { - positionClass: 'toast-bottom-right', - }); + this.translate.get('ERRORS.SERVER_ERROR').subscribe((res: string) => { + this.toastr.error(res, '', { + positionClass: 'toast-bottom-right', + }); + }) this.spinner.hide(); } ); @@ -90,20 +104,24 @@ export class GalleryComponent implements OnInit { id_photo: edit_photo.id_photo, }; photo.append('data', JSON.stringify(photoJson)); - this.sitesService.updatePhoto(photo).subscribe( + this.sitesService.updatePhoto(edit_photo.t_site, photo).subscribe( () => { this.getPhotosSite(edit_photo.t_site); }, (err) => { if (err.status === 403) { this.router.navigate(['']); - this.toastr.error('votre session est expirée', '', { - positionClass: 'toast-bottom-right', - }); + this.translate.get('ERRORS.EXPIRED_SESSION').subscribe((res: string) => { + this.toastr.error(res, '', { + positionClass: 'toast-bottom-right', + }); + }) } else - this.toastr.error('Une erreur est survenue sur le serveur.', '', { + this.translate.get('ERRORS.SERVER_ERROR').subscribe((res: string) => { + this.toastr.error(res, '', { positionClass: 'toast-bottom-right', }); + }) } ); } @@ -111,4 +129,9 @@ export class GalleryComponent implements OnInit { isActive(site) { return this.selected_site === site.id_site; } + async initializeLangDB() { + await this.languageService.loadLanguagesSorted(); + this.languageService.getLanguagesDB(); + this.defaultLangDB = this.languageService.getDefaultLanguageDB(); + } } diff --git a/admin/src/app/header/header.component.html b/admin/src/app/header/header.component.html index 4adea17a..fa597d51 100644 --- a/admin/src/app/header/header.component.html +++ b/admin/src/app/header/header.component.html @@ -22,19 +22,46 @@ class="nav-link" routerLink="/observatories" routerLinkActive="active" - >Gestion des observatoires{{ 'NAV.OBSERVATORIES' | translate }}
  • Gestion des sites d'observation{{ 'NAV.SITES' | translate }}
  • Gestion de la galerie photos{{ 'NAV.GALLERY' | translate }}
    • +
  • + {{ 'NAV.LANGUAGES_DB' | translate }} +
    • + +
  • + + + +
    +
    +
    + + +
    +
    +
    +
    + {{ 'LANGUAGES.'+selectedLanguage | translate }} +
    +
    • + + +
  • diff --git a/admin/src/app/header/header.component.scss b/admin/src/app/header/header.component.scss index ee628a70..5f57039d 100644 --- a/admin/src/app/header/header.component.scss +++ b/admin/src/app/header/header.component.scss @@ -72,4 +72,24 @@ li { .icon-exit{ font-size: 26px } +} +.language{ + padding-bottom: 3px; + padding-left: 0px; + padding-right: 30px; + .icon-earth{ + font-size: 26px + } +} +.selected-language { + text-align: center; + font-size: 14px; + margin-top: 5px; +} + +.icon-wrapper { + display: flex; + align-items: center; + cursor: pointer; + margin-right: 20px; } \ No newline at end of file diff --git a/admin/src/app/header/header.component.ts b/admin/src/app/header/header.component.ts index 1427203d..d14119ad 100644 --- a/admin/src/app/header/header.component.ts +++ b/admin/src/app/header/header.component.ts @@ -2,6 +2,8 @@ import { Component, OnInit } from '@angular/core'; import { LoginService } from '../services/lgoin.service'; import { Router } from '@angular/router'; import { Conf } from './../config'; +import { LanguageService } from '../services/language.service'; +import { AppConstants } from '../constants/app.constants'; @Component({ selector: 'app-header', @@ -11,10 +13,18 @@ import { Conf } from './../config'; export class HeaderComponent implements OnInit { isCollapsed = true; logoUrl: string; - constructor(private loginService: LoginService, protected router: Router) {} + defaultLanguage: string = AppConstants.DEFAULT_LANGUAGES + availableLanguages: string[] = []; + selectedLanguage: string = AppConstants.DEFAULT_LANGUAGES; // Langue par défaut + constructor(private loginService: LoginService, protected router: Router, private languageService: LanguageService) {} ngOnInit() { this.logoUrl = `${Conf.customFiles}images/logo_admin.png`; + this.languageService.getAvailableLanguages().subscribe(languages => { + this.availableLanguages = languages; + }); + + this.selectedLanguage = this.languageService.getCurrentLang(); } logout() { @@ -25,4 +35,8 @@ export class HeaderComponent implements OnInit { } ); } + changeLanguage(lang: string) { + this.languageService.changeLanguage(lang); + this.selectedLanguage = lang; + } } diff --git a/admin/src/app/list-languages/list-languages.component.html b/admin/src/app/list-languages/list-languages.component.html new file mode 100644 index 00000000..6549f0ea --- /dev/null +++ b/admin/src/app/list-languages/list-languages.component.html @@ -0,0 +1,66 @@ + +

    {{'COMMONS.LOADING' | translate}}...

    +     + +
    +
    +
    +
    + + + + + + + {{ row.id }} + + + + + {{ row.label}} + + + + +
    + +     +     + + +
    + +     +     +     +
    +
    +
    +
    + \ No newline at end of file diff --git a/admin/src/app/list-languages/list-languages.component.scss b/admin/src/app/list-languages/list-languages.component.scss new file mode 100644 index 00000000..a32abe0c --- /dev/null +++ b/admin/src/app/list-languages/list-languages.component.scss @@ -0,0 +1,28 @@ +.map { + min-height: calc(100vh - 98px); + height: 100%; + width: 100%; +} + +.col-map { + padding: 0; + background-color: #e8e8e8; +} + +.col-table { + padding: 20px; + background-color: #e8e8e8 +} + +.title { + margin-bottom: 16px; + font-size: 20px; +} + +.btn-add { + margin-bottom: 20px +} + +.main-photo { + margin-left: -14px +} \ No newline at end of file diff --git a/admin/src/app/list-languages/list-languages.component.ts b/admin/src/app/list-languages/list-languages.component.ts new file mode 100644 index 00000000..e8c10323 --- /dev/null +++ b/admin/src/app/list-languages/list-languages.component.ts @@ -0,0 +1,85 @@ +import { + Component, + OnInit, + ChangeDetectorRef, + OnDestroy, + } from '@angular/core'; + import * as _ from 'lodash'; + import { _appIdRandomProviderFactory } from '@angular/core/src/application_tokens'; + import { Router } from '@angular/router'; + import { NgxSpinnerService } from 'ngx-spinner'; + import { ToastrService } from 'ngx-toastr'; + import { Language } from '../types'; + import { TranslateService } from '@ngx-translate/core'; + import { LanguageService } from '../services/language.service'; + +// type languageRowType = { +// language: languageType; +// marker?: any; +// }; + + @Component({ + selector: 'app-list-languages', + templateUrl: './list-languages.component.html', + styleUrls: ['./list-languages.component.scss'], + }) + export class ListLanguagesComponent implements OnInit, OnDestroy { + rows: Language[]; + itemsLoaded = false; + defaultLangDB:Language + constructor( + protected router: Router, + private spinner: NgxSpinnerService, + private languageService: LanguageService, + private toastr: ToastrService, + private translate: TranslateService, + private changeDetector: ChangeDetectorRef + ) {} + + async ngOnInit() { + await this.initializeLangDB(); + this.getAll(); + } + + getAll() { + this.spinner.show(); + this.languageService.loadLanguagesSorted().then(() => { + this.rows = this.languageService.languagesDB;; + this.itemsLoaded = true; + this.spinner.hide(); + }) + .catch((err) => { + this.spinner.hide(); + this.translate.get('ERRORS.SERVER_ERROR').subscribe((message: string) => { + this.toastr.error(message, '', { + positionClass: 'toast-bottom-right', + }); + }) + console.log('get items error: ', err); + } + ); + } + + onSelect({ selected }: { selected: any }) { + this.router.navigate([ + '/languages/details/', + selected[0].id, + ]); + } + + onAddClick() { + this.router.navigate(['languages/form']); + } + + ngOnDestroy() { + this.changeDetector.detach(); + this.spinner.hide(); + } + + async initializeLangDB() { + await this.languageService.loadLanguagesSorted(); + this.languageService.getLanguagesDB(); + this.defaultLangDB = this.languageService.getDefaultLanguageDB(); + } + } + \ No newline at end of file diff --git a/admin/src/app/login-page/login-page.component.html b/admin/src/app/login-page/login-page.component.html index decd5975..403f127e 100644 --- a/admin/src/app/login-page/login-page.component.html +++ b/admin/src/app/login-page/login-page.component.html @@ -1,15 +1,39 @@