mirror of
https://gitlab.com/openstapps/openstapps.git
synced 2026-01-07 14:02:48 +00:00
Compare commits
21 Commits
@openstapp
...
143-add-we
| Author | SHA1 | Date | |
|---|---|---|---|
|
829350e6aa
|
|||
|
b5ddb323e6
|
|||
|
e9630ce95e
|
|||
|
a0415df09d
|
|||
|
3b73ec1298
|
|||
|
0477c3d69e
|
|||
|
879ccc5031
|
|||
|
38fb7a398d
|
|||
|
a99e08cd68
|
|||
| a5c9d22016 | |||
|
3c49c4cf6d
|
|||
|
f2c4ee308f
|
|||
| bd09b36620 | |||
|
ca146b7761
|
|||
|
|
001f978bf9 | ||
|
|
57a5b6061b | ||
|
|
4fb5941c56 | ||
|
|
314e6a6e86 | ||
|
|
e1cc33bba2 | ||
|
|
9abd397578 | ||
|
|
69fe8c6ac8 |
5
.changeset/chilly-goats-cough.md
Normal file
5
.changeset/chilly-goats-cough.md
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
'@openstapps/app': minor
|
||||||
|
---
|
||||||
|
|
||||||
|
Detail views now won't load data again if it is being navigated to from a list item
|
||||||
11
.changeset/cold-squids-remain.md
Normal file
11
.changeset/cold-squids-remain.md
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
---
|
||||||
|
'@openstapps/app': patch
|
||||||
|
---
|
||||||
|
|
||||||
|
Refactored Opening Hours
|
||||||
|
|
||||||
|
- Migrated Opening Hours to use OnPush change detection
|
||||||
|
- Fixed a bug where opening hours would not update correctly
|
||||||
|
- Lazy-load opening hours module to keep it out of the main bundle
|
||||||
|
- Added e2e tests to verify functionality
|
||||||
|
- Changed live update status to show exact minutes starting one hour before the next change
|
||||||
5
.changeset/fair-colts-explain.md
Normal file
5
.changeset/fair-colts-explain.md
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
'@openstapps/app': patch
|
||||||
|
---
|
||||||
|
|
||||||
|
Use observable chains instead of change detection in the rating component
|
||||||
5
.changeset/fluffy-lamps-count.md
Normal file
5
.changeset/fluffy-lamps-count.md
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
'@openstapps/app': minor
|
||||||
|
---
|
||||||
|
|
||||||
|
Added the ability to remove and add date series from their detail page
|
||||||
5
.changeset/forty-eagles-cough.md
Normal file
5
.changeset/forty-eagles-cough.md
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
'@openstapps/app': patch
|
||||||
|
---
|
||||||
|
|
||||||
|
Add a way to hide action chips on list items
|
||||||
5
.changeset/orange-knives-happen.md
Normal file
5
.changeset/orange-knives-happen.md
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
'@openstapps/app': minor
|
||||||
|
---
|
||||||
|
|
||||||
|
Add directions to inPlace and place list items
|
||||||
9
.changeset/pink-sheep-relax.md
Normal file
9
.changeset/pink-sheep-relax.md
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
---
|
||||||
|
'@openstapps/app': minor
|
||||||
|
---
|
||||||
|
|
||||||
|
Improved calendar descriptions
|
||||||
|
|
||||||
|
- The dashboard quick link now has a more intuitive icon
|
||||||
|
- "Recurring" has been renamed to "Week Overview"
|
||||||
|
- Long words in calendar tabs will now break instead of overflowing
|
||||||
@@ -14,7 +14,6 @@
|
|||||||
"@openstapps/minimal-deployment": "2.0.0",
|
"@openstapps/minimal-deployment": "2.0.0",
|
||||||
"@openstapps/minimal-plugin": "2.0.0",
|
"@openstapps/minimal-plugin": "2.0.0",
|
||||||
"@openstapps/app": "2.0.0",
|
"@openstapps/app": "2.0.0",
|
||||||
"@openstapps/app-release-template": "2.0.0",
|
|
||||||
"@openstapps/api": "2.0.0",
|
"@openstapps/api": "2.0.0",
|
||||||
"@openstapps/api-cli": "2.0.0",
|
"@openstapps/api-cli": "2.0.0",
|
||||||
"@openstapps/api-plugin": "2.0.0",
|
"@openstapps/api-plugin": "2.0.0",
|
||||||
@@ -24,9 +23,13 @@
|
|||||||
"@openstapps/easy-ast": "2.0.0",
|
"@openstapps/easy-ast": "2.0.0",
|
||||||
"@openstapps/es-mapping-generator": "2.0.0",
|
"@openstapps/es-mapping-generator": "2.0.0",
|
||||||
"@openstapps/gitlab-api": "2.0.0",
|
"@openstapps/gitlab-api": "2.0.0",
|
||||||
"@openstapps/logger": "2.0.0"
|
"@openstapps/logger": "2.0.0",
|
||||||
|
"@openstapps/app-builder-image": "3.0.0-next.3",
|
||||||
|
"@openstapps/node-base": "3.0.0-next.3",
|
||||||
|
"@openstapps/node-builder": "3.0.0-next.3"
|
||||||
},
|
},
|
||||||
"changesets": [
|
"changesets": [
|
||||||
|
"bright-dryers-act",
|
||||||
"cool-jars-kiss",
|
"cool-jars-kiss",
|
||||||
"cuddly-bobcats-roll",
|
"cuddly-bobcats-roll",
|
||||||
"dull-news-appear",
|
"dull-news-appear",
|
||||||
@@ -40,9 +43,14 @@
|
|||||||
"moody-parrots-develop",
|
"moody-parrots-develop",
|
||||||
"neat-hats-trade",
|
"neat-hats-trade",
|
||||||
"new-pianos-joke",
|
"new-pianos-joke",
|
||||||
|
"pretty-timers-complain",
|
||||||
"proud-wolves-end",
|
"proud-wolves-end",
|
||||||
"quick-houses-count",
|
"quick-houses-count",
|
||||||
"rare-squids-bake",
|
"rare-squids-bake",
|
||||||
|
"serious-meals-sin",
|
||||||
|
"silent-maps-float",
|
||||||
|
"silly-news-punch",
|
||||||
|
"smart-ghosts-shout",
|
||||||
"soft-donuts-fail",
|
"soft-donuts-fail",
|
||||||
"sour-coins-visit",
|
"sour-coins-visit",
|
||||||
"spicy-snails-sort",
|
"spicy-snails-sort",
|
||||||
@@ -51,6 +59,7 @@
|
|||||||
"tall-ducks-dream",
|
"tall-ducks-dream",
|
||||||
"tame-mayflies-hug",
|
"tame-mayflies-hug",
|
||||||
"tame-rings-dream",
|
"tame-rings-dream",
|
||||||
|
"tasty-islands-smell",
|
||||||
"thick-weeks-compete",
|
"thick-weeks-compete",
|
||||||
"thin-camels-give",
|
"thin-camels-give",
|
||||||
"tidy-buses-reflect",
|
"tidy-buses-reflect",
|
||||||
|
|||||||
13
.changeset/pretty-wombats-double.md
Normal file
13
.changeset/pretty-wombats-double.md
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
---
|
||||||
|
'@openstapps/app': minor
|
||||||
|
---
|
||||||
|
|
||||||
|
Revamp "My Courses" section on profile page
|
||||||
|
|
||||||
|
The "My Courses" section on the profile page has been improved
|
||||||
|
|
||||||
|
- It will now show the upcoming courses for the next five days
|
||||||
|
- The section header is now consistent with the other sections
|
||||||
|
- The section now uses standard list items instead of the custom solution
|
||||||
|
|
||||||
|
Additionally, the profile page component has been cleaned up.
|
||||||
8
.changeset/proud-cameras-fail.md
Normal file
8
.changeset/proud-cameras-fail.md
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
---
|
||||||
|
'@openstapps/app': minor
|
||||||
|
---
|
||||||
|
|
||||||
|
Adjust map button and item behavior on different screen sizes
|
||||||
|
|
||||||
|
- Small screens will show the item without margins below the map actions
|
||||||
|
- Large screens will show the list item on the left side
|
||||||
@@ -1,7 +1,6 @@
|
|||||||
---
|
---
|
||||||
'@openstapps/projectmanagement': patch
|
'@openstapps/projectmanagement': patch
|
||||||
'@openstapps/prettier-config': patch
|
'@openstapps/prettier-config': patch
|
||||||
'@openstapps/app-release-template': patch
|
|
||||||
'@openstapps/es-mapping-generator': patch
|
'@openstapps/es-mapping-generator': patch
|
||||||
'@openstapps/backend-config': patch
|
'@openstapps/backend-config': patch
|
||||||
'@openstapps/eslint-config': patch
|
'@openstapps/eslint-config': patch
|
||||||
|
|||||||
5
.changeset/sour-carpets-flash.md
Normal file
5
.changeset/sour-carpets-flash.md
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
'@openstapps/app': patch
|
||||||
|
---
|
||||||
|
|
||||||
|
Fixed an issue that caused double and triple loading of data detail items through the route stack service
|
||||||
5
.changeset/thick-mails-peel.md
Normal file
5
.changeset/thick-mails-peel.md
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
'@openstapps/app': minor
|
||||||
|
---
|
||||||
|
|
||||||
|
Map items are now native list items
|
||||||
5
.changeset/tricky-garlics-hope.md
Normal file
5
.changeset/tricky-garlics-hope.md
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
'@openstapps/app': minor
|
||||||
|
---
|
||||||
|
|
||||||
|
Replaced simple links with list items in date-series detail
|
||||||
5
.changeset/wet-houses-provide.md
Normal file
5
.changeset/wet-houses-provide.md
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
'@openstapps/app': minor
|
||||||
|
---
|
||||||
|
|
||||||
|
Use event title for date series instead of the generic date series title
|
||||||
@@ -7,14 +7,18 @@
|
|||||||
# ```
|
# ```
|
||||||
# To your pipeline.
|
# To your pipeline.
|
||||||
# https://docs.gitlab.com/ee/ci/pipelines/merge_request_pipelines.html#use-rules-to-add-jobs
|
# https://docs.gitlab.com/ee/ci/pipelines/merge_request_pipelines.html#use-rules-to-add-jobs
|
||||||
|
|
||||||
|
.limit_pipelines:
|
||||||
|
rules:
|
||||||
|
- if: $CI_PIPELINE_SOURCE == 'merge_request_event' || $CI_COMMIT_BRANCH == 'main' || $CI_COMMIT_BRANCH == 'develop'
|
||||||
|
when: on_success
|
||||||
|
- when: never
|
||||||
|
|
||||||
include:
|
include:
|
||||||
- local: /backend/backend/.gitlab-ci.yml
|
- local: /backend/backend/.gitlab-ci.yml
|
||||||
- local: /frontend/app/.gitlab-ci.yml
|
- local: /frontend/app/.gitlab-ci.yml
|
||||||
- local: /.gitlab/schedules.gitlab-ci.yml
|
- local: /.gitlab/schedules.gitlab-ci.yml
|
||||||
- local: /.gitlab/publishing.gitlab-ci.yml
|
- local: /.gitlab/publishing.gitlab-ci.yml
|
||||||
rules:
|
|
||||||
- if: '$CI_COMMIT_MESSAGE =~ /ci: publish release$/'
|
|
||||||
when: always
|
|
||||||
|
|
||||||
variables:
|
variables:
|
||||||
TURBO_CACHE_BYPASS:
|
TURBO_CACHE_BYPASS:
|
||||||
@@ -28,7 +32,7 @@ variables:
|
|||||||
default:
|
default:
|
||||||
image: registry.gitlab.com/openstapps/openstapps/node-builder
|
image: registry.gitlab.com/openstapps/openstapps/node-builder
|
||||||
tags:
|
tags:
|
||||||
- performance
|
- saas-linux-xlarge-amd64
|
||||||
interruptible: true
|
interruptible: true
|
||||||
before_script:
|
before_script:
|
||||||
- corepack enable
|
- corepack enable
|
||||||
@@ -76,13 +80,14 @@ build:
|
|||||||
rules: &deploy-rules
|
rules: &deploy-rules
|
||||||
- if: $CI_PIPELINE_SOURCE == 'merge_request_event'
|
- if: $CI_PIPELINE_SOURCE == 'merge_request_event'
|
||||||
variables:
|
variables:
|
||||||
DEPLOY_ID: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
|
DEPLOY_ID: $CI_MERGE_REQUEST_IID
|
||||||
- if: $CI_COMMIT_BRANCH == 'main'
|
- if: $CI_COMMIT_BRANCH == 'main'
|
||||||
variables:
|
variables:
|
||||||
DEPLOY_ID: production
|
DEPLOY_ID: production
|
||||||
- if: $CI_COMMIT_BRANCH == 'develop'
|
- if: $CI_COMMIT_BRANCH == 'develop'
|
||||||
variables:
|
variables:
|
||||||
DEPLOY_ID: staging
|
DEPLOY_ID: staging
|
||||||
|
- !reference [.limit_pipelines, rules]
|
||||||
|
|
||||||
stop review:
|
stop review:
|
||||||
stage: build
|
stage: build
|
||||||
@@ -121,15 +126,15 @@ unit:
|
|||||||
coverage_format: cobertura
|
coverage_format: cobertura
|
||||||
path: coverage.xml
|
path: coverage.xml
|
||||||
rules:
|
rules:
|
||||||
- if: $CI_PIPELINE_SOURCE == 'merge_request_event' || $CI_COMMIT_BRANCH == 'main' || $CI_COMMIT_BRANCH == 'develop'
|
- !reference [.limit_pipelines, rules]
|
||||||
|
|
||||||
audit:
|
audit:
|
||||||
stage: audit
|
stage: audit
|
||||||
|
allow_failure: true
|
||||||
needs: []
|
needs: []
|
||||||
script:
|
script:
|
||||||
- pnpm audit --prod
|
- pnpm audit --prod
|
||||||
rules:
|
rules:
|
||||||
- if: $CI_PIPELINE_SOURCE == 'merge_request_event' || $CI_COMMIT_BRANCH == 'develop'
|
|
||||||
allow_failure: true
|
|
||||||
- if: $CI_COMMIT_BRANCH == 'main'
|
- if: $CI_COMMIT_BRANCH == 'main'
|
||||||
allow_failure: false
|
allow_failure: false
|
||||||
|
- !reference [.limit_pipelines, rules]
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
.limit_publishing:
|
.limit_publish_pipelines:
|
||||||
- if: $CI_PIPELINE_SOURCE != "schedule"
|
rules:
|
||||||
when: on_success
|
- if: '($CI_COMMIT_BRANCH == "main" || $CI_COMMIT_BRANCH == "develop") && $CI_COMMIT_MESSAGE =~ /ci: publish release/ && $CI_PIPELINE_SOURCE != "schedule"'
|
||||||
|
|
||||||
deploy:
|
deploy:
|
||||||
stage: publish
|
stage: publish
|
||||||
@@ -12,7 +12,8 @@ deploy:
|
|||||||
paths:
|
paths:
|
||||||
- ./.deploy
|
- ./.deploy
|
||||||
- ./frontend/app/www
|
- ./frontend/app/www
|
||||||
rules: !reference [.limit_publishing]
|
rules:
|
||||||
|
- !reference [.limit_publish_pipelines, rules]
|
||||||
|
|
||||||
publish image:
|
publish image:
|
||||||
stage: publish
|
stage: publish
|
||||||
@@ -23,14 +24,15 @@ publish image:
|
|||||||
image:
|
image:
|
||||||
name: gcr.io/kaniko-project/executor:v1.12.1-debug
|
name: gcr.io/kaniko-project/executor:v1.12.1-debug
|
||||||
entrypoint: [""]
|
entrypoint: [""]
|
||||||
|
variables:
|
||||||
|
PUBLISH_TAG: next
|
||||||
script:
|
script:
|
||||||
- >
|
- >
|
||||||
/kaniko/executor
|
/kaniko/executor
|
||||||
--context "${CI_PROJECT_DIR}/${DEPLOY_DIR}"
|
--context "${CI_PROJECT_DIR}/${DEPLOY_DIR}"
|
||||||
--dockerfile "${CI_PROJECT_DIR}/${DEPLOY_DIR}/Dockerfile"
|
--dockerfile "${CI_PROJECT_DIR}/${DEPLOY_DIR}/Dockerfile"
|
||||||
--destination "${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:$(grep -o '"version": "[^"]*' "${DEPLOY_DIR}/package.json" | cut -d'"' -f4)"
|
--destination "${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:$(grep -o '"version": "[^"]*' "${DEPLOY_DIR}/package.json" | cut -d'"' -f4)"
|
||||||
--destination "${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:latest"
|
--destination "${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:${PUBLISH_TAG}"
|
||||||
rules: !reference [.limit_publishing]
|
|
||||||
parallel:
|
parallel:
|
||||||
matrix:
|
matrix:
|
||||||
- IMAGE_NAME: database
|
- IMAGE_NAME: database
|
||||||
@@ -47,6 +49,11 @@ publish image:
|
|||||||
DEPLOY_DIR: .deploy/minimal-plugin
|
DEPLOY_DIR: .deploy/minimal-plugin
|
||||||
- IMAGE_NAME: app
|
- IMAGE_NAME: app
|
||||||
DEPLOY_DIR: frontend/app
|
DEPLOY_DIR: frontend/app
|
||||||
|
rules:
|
||||||
|
- if: $CI_COMMIT_BRANCH == 'main'
|
||||||
|
variables:
|
||||||
|
PUBLISH_TAG: latest
|
||||||
|
- !reference [.limit_publish_pipelines, rules]
|
||||||
|
|
||||||
publish packages:
|
publish packages:
|
||||||
stage: publish
|
stage: publish
|
||||||
@@ -54,18 +61,17 @@ publish packages:
|
|||||||
variables:
|
variables:
|
||||||
GIT_STRATEGY: clone
|
GIT_STRATEGY: clone
|
||||||
GIT_DEPTH: 0
|
GIT_DEPTH: 0
|
||||||
|
PUBLISH_TAG: next
|
||||||
script:
|
script:
|
||||||
- pnpm install
|
- pnpm install
|
||||||
- pnpm build
|
- pnpm build
|
||||||
- pnpm publish -r --publish-branch ${PUBLISH_BRANCH} --tag ${PUBLISH_TAG} --no-git-checks # TODO: Git checks...
|
- pnpm config set '//registry.npmjs.org/:_authToken' "${NPM_AUTH_TOKEN}"
|
||||||
|
- pnpm publish -r --publish-branch ${CI_COMMIT_BRANCH} --tag ${PUBLISH_TAG} --no-git-checks # TODO: Git checks...
|
||||||
rules:
|
rules:
|
||||||
- if: $CI_COMMIT_BRANCH == 'main'
|
- if: $CI_COMMIT_BRANCH == 'main'
|
||||||
variables:
|
variables:
|
||||||
PUBLISH_BRANCH: main
|
|
||||||
PUBLISH_TAG: latest
|
PUBLISH_TAG: latest
|
||||||
- variables:
|
- !reference [.limit_publish_pipelines, rules]
|
||||||
PUBLISH_BRANCH: $CI_COMMIT_BRANCH
|
|
||||||
PUBLISH_TAG: next
|
|
||||||
|
|
||||||
publish docs:
|
publish docs:
|
||||||
stage: publish
|
stage: publish
|
||||||
@@ -77,3 +83,6 @@ publish docs:
|
|||||||
artifacts:
|
artifacts:
|
||||||
paths:
|
paths:
|
||||||
- public
|
- public
|
||||||
|
rules:
|
||||||
|
- if: $CI_COMMIT_BRANCH == 'main'
|
||||||
|
- !reference [.limit_publish_pipelines, rules]
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
.limit_base_image_publishing:
|
.limit_scheduled_pipelines:
|
||||||
- if: $CI_PIPELINE_SOURCE == "schedule" && $CI_COMMIT_BRANCH == 'main'
|
rules:
|
||||||
when: always
|
- if: $CI_COMMIT_BRANCH == 'main' && $CI_PIPELINE_SOURCE == "schedule"
|
||||||
|
|
||||||
base image:
|
base image:
|
||||||
image: docker
|
image: docker
|
||||||
@@ -18,10 +18,9 @@ base image:
|
|||||||
docker build
|
docker build
|
||||||
-t "${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:$(grep -o '"version": "[^"]*' "${DEPLOY_DIR}/package.json" | cut -d'"' -f4)"
|
-t "${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:$(grep -o '"version": "[^"]*' "${DEPLOY_DIR}/package.json" | cut -d'"' -f4)"
|
||||||
-t "${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:latest" "${CI_PROJECT_DIR}/${DEPLOY_DIR}" &&
|
-t "${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:latest" "${CI_PROJECT_DIR}/${DEPLOY_DIR}" &&
|
||||||
docker push "${CI_REGISTRY_IMAGE}/${IMAGE_NAME}"
|
docker push "${CI_REGISTRY_IMAGE}/${IMAGE_NAME}" --all-tags
|
||||||
cache: {} # disable irrelevant cache for this job
|
cache: {} # disable irrelevant cache for this job
|
||||||
before_script: [] # do not run irrelevant before script for this job
|
before_script: [] # do not run irrelevant before script for this job
|
||||||
rules: !reference [.limit_base_image_publishing]
|
|
||||||
parallel:
|
parallel:
|
||||||
matrix:
|
matrix:
|
||||||
- IMAGE_NAME: node-base
|
- IMAGE_NAME: node-base
|
||||||
@@ -30,4 +29,7 @@ base image:
|
|||||||
DEPLOY_DIR: images/node-builder
|
DEPLOY_DIR: images/node-builder
|
||||||
- IMAGE_NAME: app-builder
|
- IMAGE_NAME: app-builder
|
||||||
DEPLOY_DIR: images/app-builder
|
DEPLOY_DIR: images/app-builder
|
||||||
|
- IMAGE_NAME: app-cypress
|
||||||
|
DEPLOY_DIR: images/app-cypress
|
||||||
|
rules:
|
||||||
|
- !reference [.limit_scheduled_pipelines, rules]
|
||||||
@@ -19,4 +19,4 @@ integration:
|
|||||||
junit:
|
junit:
|
||||||
- backend/backend/coverage/integration-report-junit.xml
|
- backend/backend/coverage/integration-report-junit.xml
|
||||||
rules:
|
rules:
|
||||||
- if: $CI_PIPELINE_SOURCE == 'merge_request_event' || $CI_COMMIT_BRANCH == 'main' || $CI_COMMIT_BRANCH == 'develop'
|
- !reference [.limit_pipelines, rules]
|
||||||
|
|||||||
@@ -1,5 +1,15 @@
|
|||||||
# @openstapps/backend
|
# @openstapps/backend
|
||||||
|
|
||||||
|
## 3.0.0-next.4
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- 23481d0d: Update to TypeScript 5.1.6
|
||||||
|
- Updated dependencies [23481d0d]
|
||||||
|
- @openstapps/core-tools@3.0.0-next.4
|
||||||
|
- @openstapps/logger@3.0.0-next.4
|
||||||
|
- @openstapps/core@3.0.0-next.4
|
||||||
|
|
||||||
## 3.0.0-next.0
|
## 3.0.0-next.0
|
||||||
|
|
||||||
### Major Changes
|
### Major Changes
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@openstapps/backend",
|
"name": "@openstapps/backend",
|
||||||
"description": "A reference implementation for a StApps backend",
|
"description": "A reference implementation for a StApps backend",
|
||||||
"version": "3.0.0-next.0",
|
"version": "3.0.0-next.4",
|
||||||
"private": true,
|
"private": true,
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"license": "AGPL-3.0-only",
|
"license": "AGPL-3.0-only",
|
||||||
|
|||||||
7
backend/database/CHANGELOG.md
Normal file
7
backend/database/CHANGELOG.md
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
# @openstapps/database
|
||||||
|
|
||||||
|
## 3.0.0-next.4
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- 23481d0d: Update to TypeScript 5.1.6
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@openstapps/database",
|
"name": "@openstapps/database",
|
||||||
"version": "2.0.0",
|
"version": "3.0.0-next.4",
|
||||||
"private": true,
|
"private": true,
|
||||||
"files": [
|
"files": [
|
||||||
"config",
|
"config",
|
||||||
|
|||||||
@@ -1,5 +1,13 @@
|
|||||||
# @openstapps/proxy
|
# @openstapps/proxy
|
||||||
|
|
||||||
|
## 3.0.0-next.4
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- 23481d0d: Update to TypeScript 5.1.6
|
||||||
|
- Updated dependencies [23481d0d]
|
||||||
|
- @openstapps/logger@3.0.0-next.4
|
||||||
|
|
||||||
## 3.0.0-next.0
|
## 3.0.0-next.0
|
||||||
|
|
||||||
### Major Changes
|
### Major Changes
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@openstapps/proxy",
|
"name": "@openstapps/proxy",
|
||||||
"description": "NGINX proxy that is dynamically configured by a Node.js script",
|
"description": "NGINX proxy that is dynamically configured by a Node.js script",
|
||||||
"version": "3.0.0-next.0",
|
"version": "3.0.0-next.4",
|
||||||
"private": true,
|
"private": true,
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"license": "AGPL-3.0-only",
|
"license": "AGPL-3.0-only",
|
||||||
|
|||||||
@@ -1,5 +1,11 @@
|
|||||||
# @openstapps/backend-config
|
# @openstapps/backend-config
|
||||||
|
|
||||||
|
## 3.0.0-next.4
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- 23481d0d: Update to TypeScript 5.1.6
|
||||||
|
|
||||||
## 3.0.0-next.0
|
## 3.0.0-next.0
|
||||||
|
|
||||||
### Major Changes
|
### Major Changes
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@openstapps/backend-config",
|
"name": "@openstapps/backend-config",
|
||||||
"description": "Backend Configuration for OpenStApps",
|
"description": "Backend Configuration for OpenStApps",
|
||||||
"version": "3.0.0-next.0",
|
"version": "3.0.0-next.4",
|
||||||
"private": true,
|
"private": true,
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"license": "GPL-3.0-only",
|
"license": "GPL-3.0-only",
|
||||||
|
|||||||
@@ -1,5 +1,11 @@
|
|||||||
# @openstapps/eslint-config
|
# @openstapps/eslint-config
|
||||||
|
|
||||||
|
## 3.0.0-next.4
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- 23481d0d: Update to TypeScript 5.1.6
|
||||||
|
|
||||||
## 3.0.0-next.0
|
## 3.0.0-next.0
|
||||||
|
|
||||||
### Major Changes
|
### Major Changes
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@openstapps/eslint-config",
|
"name": "@openstapps/eslint-config",
|
||||||
"description": "A collection of configuration base files for StApps projects. Just an (unused) experiment for now.",
|
"description": "A collection of configuration base files for StApps projects. Just an (unused) experiment for now.",
|
||||||
"version": "3.0.0-next.0",
|
"version": "3.0.0-next.4",
|
||||||
"type": "commonjs",
|
"type": "commonjs",
|
||||||
"license": "GPL-3.0-only",
|
"license": "GPL-3.0-only",
|
||||||
"repository": "git@gitlab.com:openstapps/eslint-config.git",
|
"repository": "git@gitlab.com:openstapps/eslint-config.git",
|
||||||
|
|||||||
@@ -1,5 +1,11 @@
|
|||||||
# @openstapps/prettier-config
|
# @openstapps/prettier-config
|
||||||
|
|
||||||
|
## 3.0.0-next.4
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- 23481d0d: Update to TypeScript 5.1.6
|
||||||
|
|
||||||
## 3.0.0-next.0
|
## 3.0.0-next.0
|
||||||
|
|
||||||
### Major Changes
|
### Major Changes
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@openstapps/prettier-config",
|
"name": "@openstapps/prettier-config",
|
||||||
"description": "StApps Prettier Config",
|
"description": "StApps Prettier Config",
|
||||||
"version": "3.0.0-next.0",
|
"version": "3.0.0-next.4",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"license": "GPL-3.0-only",
|
"license": "GPL-3.0-only",
|
||||||
"repository": "git@gitlab.com:openstapps/prettier-config.git",
|
"repository": "git@gitlab.com:openstapps/prettier-config.git",
|
||||||
|
|||||||
@@ -1,5 +1,22 @@
|
|||||||
# @openstapps/projectmanagement
|
# @openstapps/projectmanagement
|
||||||
|
|
||||||
|
## 3.0.0-next.4
|
||||||
|
|
||||||
|
### Major Changes
|
||||||
|
|
||||||
|
- 11c9d742: Move images to separate packages
|
||||||
|
|
||||||
|
Removed builder image due to migration to Kaniko
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- 4e4c7b5c: Update release configs
|
||||||
|
- 23481d0d: Update to TypeScript 5.1.6
|
||||||
|
- Updated dependencies [23481d0d]
|
||||||
|
- @openstapps/collection-utils@3.0.0-next.4
|
||||||
|
- @openstapps/gitlab-api@3.0.0-next.4
|
||||||
|
- @openstapps/logger@3.0.0-next.4
|
||||||
|
|
||||||
## 3.0.0-next.3
|
## 3.0.0-next.3
|
||||||
|
|
||||||
### Patch Changes
|
### Patch Changes
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@openstapps/projectmanagement",
|
"name": "@openstapps/projectmanagement",
|
||||||
"description": "Main documentation and scripts for maintenance.",
|
"description": "Main documentation and scripts for maintenance.",
|
||||||
"version": "3.0.0-next.3",
|
"version": "3.0.0-next.4",
|
||||||
"private": true,
|
"private": true,
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"license": "GPL-3.0-only",
|
"license": "GPL-3.0-only",
|
||||||
|
|||||||
@@ -1,5 +1,11 @@
|
|||||||
# @openstapps/tsconfig
|
# @openstapps/tsconfig
|
||||||
|
|
||||||
|
## 3.0.0-next.4
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- 23481d0d: Update to TypeScript 5.1.6
|
||||||
|
|
||||||
## 3.0.0-next.0
|
## 3.0.0-next.0
|
||||||
|
|
||||||
### Major Changes
|
### Major Changes
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@openstapps/tsconfig",
|
"name": "@openstapps/tsconfig",
|
||||||
"description": "The tsconfig for the openstapps project",
|
"description": "The tsconfig for the openstapps project",
|
||||||
"version": "3.0.0-next.0",
|
"version": "3.0.0-next.4",
|
||||||
"type": "commonjs",
|
"type": "commonjs",
|
||||||
"license": "GPL-3.0-only",
|
"license": "GPL-3.0-only",
|
||||||
"repository": "git@gitlab.com:openstapps/eslint-config.git",
|
"repository": "git@gitlab.com:openstapps/eslint-config.git",
|
||||||
|
|||||||
@@ -1,5 +1,15 @@
|
|||||||
# @openstapps/minimal-connector
|
# @openstapps/minimal-connector
|
||||||
|
|
||||||
|
## 3.0.0-next.4
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- 23481d0d: Update to TypeScript 5.1.6
|
||||||
|
- Updated dependencies [23481d0d]
|
||||||
|
- @openstapps/logger@3.0.0-next.4
|
||||||
|
- @openstapps/core@3.0.0-next.4
|
||||||
|
- @openstapps/api@3.0.0-next.4
|
||||||
|
|
||||||
## 3.0.0-next.0
|
## 3.0.0-next.0
|
||||||
|
|
||||||
### Major Changes
|
### Major Changes
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@openstapps/minimal-connector",
|
"name": "@openstapps/minimal-connector",
|
||||||
"description": "This is a minimal connector which serves as an example",
|
"description": "This is a minimal connector which serves as an example",
|
||||||
"version": "3.0.0-next.0",
|
"version": "3.0.0-next.4",
|
||||||
"private": true,
|
"private": true,
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"license": "GPL-3.0-only",
|
"license": "GPL-3.0-only",
|
||||||
|
|||||||
7
examples/minimal-deployment/CHANGELOG.md
Normal file
7
examples/minimal-deployment/CHANGELOG.md
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
# @openstapps/minimal-deployment
|
||||||
|
|
||||||
|
## 3.0.0-next.4
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- 23481d0d: Update to TypeScript 5.1.6
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@openstapps/minimal-deployment",
|
"name": "@openstapps/minimal-deployment",
|
||||||
"version": "2.0.0",
|
"version": "3.0.0-next.4",
|
||||||
"private": true,
|
"private": true,
|
||||||
"files": [
|
"files": [
|
||||||
"database",
|
"database",
|
||||||
|
|||||||
@@ -1,5 +1,17 @@
|
|||||||
# @openstapps/minimal-plugin
|
# @openstapps/minimal-plugin
|
||||||
|
|
||||||
|
## 3.0.0-next.4
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- 23481d0d: Update to TypeScript 5.1.6
|
||||||
|
- Updated dependencies [23481d0d]
|
||||||
|
- @openstapps/api-plugin@3.0.0-next.4
|
||||||
|
- @openstapps/core-tools@3.0.0-next.4
|
||||||
|
- @openstapps/logger@3.0.0-next.4
|
||||||
|
- @openstapps/core@3.0.0-next.4
|
||||||
|
- @openstapps/api@3.0.0-next.4
|
||||||
|
|
||||||
## 3.0.0-next.0
|
## 3.0.0-next.0
|
||||||
|
|
||||||
### Major Changes
|
### Major Changes
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@openstapps/minimal-plugin",
|
"name": "@openstapps/minimal-plugin",
|
||||||
"description": "Minimal Plugin",
|
"description": "Minimal Plugin",
|
||||||
"version": "3.0.0-next.0",
|
"version": "3.0.0-next.4",
|
||||||
"private": true,
|
"private": true,
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"license": "GPL-3.0-only",
|
"license": "GPL-3.0-only",
|
||||||
|
|||||||
@@ -15,8 +15,12 @@
|
|||||||
buildToolsVersions = [ "${buildToolsVersion}" ];
|
buildToolsVersions = [ "${buildToolsVersion}" ];
|
||||||
platformVersions = [ "32" ];
|
platformVersions = [ "32" ];
|
||||||
};
|
};
|
||||||
cypress = prev.cypress.overrideAttrs(prev: {
|
cypress = prev.cypress.overrideAttrs(cyPrev: rec {
|
||||||
version = "12.17.1";
|
version = "13.2.0";
|
||||||
|
src = prev.fetchzip {
|
||||||
|
url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip";
|
||||||
|
hash = "sha256-9o0nprGcJhudS1LNm+T7Vf0Dwd1RBauYKI+w1FBQ3ZM=";
|
||||||
|
};
|
||||||
});
|
});
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
"parserOptions": {
|
"parserOptions": {
|
||||||
"ecmaVersion": 2020,
|
"ecmaVersion": 2020,
|
||||||
"sourceType": "module",
|
"sourceType": "module",
|
||||||
"project": ["tsconfig.json", "tsconfig.spec.json", "e2e/tsconfig.e2e.json"],
|
"project": ["tsconfig.json", "tsconfig.spec.json", "cypress/tsconfig.json"],
|
||||||
"createDefaultProgram": true
|
"createDefaultProgram": true
|
||||||
},
|
},
|
||||||
"extends": [
|
"extends": [
|
||||||
|
|||||||
@@ -1,9 +1,14 @@
|
|||||||
e2e:
|
e2e:
|
||||||
image: cypress/browsers:latest # https://hub.docker.com/r/cypress/browsers/tags/
|
image: registry.gitlab.com/openstapps/openstapps/app-cypress:node-18
|
||||||
stage: test
|
stage: test
|
||||||
script:
|
script:
|
||||||
- pnpm --filter=@openstapps/app install
|
- pnpm --filter=@openstapps/app install
|
||||||
- pnpm --filter=@openstapps/app exec cypress install
|
- pnpm --filter=@openstapps/app exec cypress install
|
||||||
|
- npx playwright install-deps webkit
|
||||||
|
- npx playwright install
|
||||||
|
- cd node_modules/.pnpm/re2*/node_modules/re2
|
||||||
|
- npm run install
|
||||||
|
- cd $CI_PROJECT_DIR
|
||||||
- pnpm test:integration:app
|
- pnpm test:integration:app
|
||||||
artifacts:
|
artifacts:
|
||||||
when: on_failure
|
when: on_failure
|
||||||
@@ -18,5 +23,6 @@ e2e:
|
|||||||
matrix:
|
matrix:
|
||||||
- BROWSER: chrome
|
- BROWSER: chrome
|
||||||
- BROWSER: firefox
|
- BROWSER: firefox
|
||||||
|
- BROWSER: webkit
|
||||||
rules:
|
rules:
|
||||||
- if: $CI_PIPELINE_SOURCE == 'merge_request_event' || $CI_COMMIT_BRANCH == 'main' || $CI_COMMIT_BRANCH == 'develop'
|
- !reference [.limit_pipelines, rules]
|
||||||
|
|||||||
@@ -1,5 +1,29 @@
|
|||||||
# @openstapps/app
|
# @openstapps/app
|
||||||
|
|
||||||
|
## 3.0.0-next.4
|
||||||
|
|
||||||
|
### Major Changes
|
||||||
|
|
||||||
|
- 23481d0d: Update to Angular 16.1
|
||||||
|
|
||||||
|
### Minor Changes
|
||||||
|
|
||||||
|
- 23481d0d: Migrate to Ionic 7
|
||||||
|
|
||||||
|
- Migrate uses of `<ion-label>` with inputs to new syntax
|
||||||
|
- Fix infinite loop in schedule date picker (`datetime.confirm()` to `datetime.cancel()`)
|
||||||
|
|
||||||
|
### Patch Changes
|
||||||
|
|
||||||
|
- 23481d0d: Update to TypeScript 5.1.6
|
||||||
|
- bebee6b4: Migrate collection helpers to use @openstapps/collection-utils
|
||||||
|
- 107a7c5e: Migrate unit tests to karma-coverage and junit reports.
|
||||||
|
Fixes an issue where coverage reports would not be generated.
|
||||||
|
- Updated dependencies [23481d0d]
|
||||||
|
- @openstapps/collection-utils@3.0.0-next.4
|
||||||
|
- @openstapps/core@3.0.0-next.4
|
||||||
|
- @openstapps/api@3.0.0-next.4
|
||||||
|
|
||||||
## 3.0.0-next.0
|
## 3.0.0-next.0
|
||||||
|
|
||||||
### Major Changes
|
### Major Changes
|
||||||
|
|||||||
@@ -42,3 +42,23 @@ The command `ionic cordova run ios` runs into the error `/platforms/ios/build/em
|
|||||||
|
|
||||||
- Either use the command: `ionic cordova emulate ios -- --buildFlag="-UseModernBuildSystem=0"`
|
- Either use the command: `ionic cordova emulate ios -- --buildFlag="-UseModernBuildSystem=0"`
|
||||||
- Or open the iOS project in Xcode and change build system in workspace settings to `Lagacy Build System`. Then the normal run command works also.
|
- Or open the iOS project in Xcode and change build system in workspace settings to `Lagacy Build System`. Then the normal run command works also.
|
||||||
|
|
||||||
|
## Cypress
|
||||||
|
|
||||||
|
#### Problem
|
||||||
|
|
||||||
|
The browser doesn't open or the tests don't connect to a browser
|
||||||
|
|
||||||
|
#### Cause
|
||||||
|
|
||||||
|
Cypress was installed to a read-only location, see
|
||||||
|
[this issue](https://github.com/cypress-io/cypress/issues/18893).
|
||||||
|
This can be the case if you use NixOS.
|
||||||
|
|
||||||
|
#### Solution
|
||||||
|
|
||||||
|
Make sure the cypress folder is writable before each launch
|
||||||
|
|
||||||
|
```shell
|
||||||
|
chmod -R +rw ~/.config/Cypress
|
||||||
|
```
|
||||||
|
|||||||
@@ -182,6 +182,7 @@
|
|||||||
"builder": "@cypress/schematic:cypress",
|
"builder": "@cypress/schematic:cypress",
|
||||||
"options": {
|
"options": {
|
||||||
"devServerTarget": "app:serve",
|
"devServerTarget": "app:serve",
|
||||||
|
"liveReload": false,
|
||||||
"watch": true,
|
"watch": true,
|
||||||
"headless": false
|
"headless": false
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ export default defineConfig({
|
|||||||
fixturesFolder: 'cypress/fixtures',
|
fixturesFolder: 'cypress/fixtures',
|
||||||
defaultCommandTimeout: 20_000,
|
defaultCommandTimeout: 20_000,
|
||||||
specPattern: 'cypress/integration/**/*.spec.ts',
|
specPattern: 'cypress/integration/**/*.spec.ts',
|
||||||
|
experimentalWebKitSupport: true,
|
||||||
/*setupNodeEvents(on, config) {
|
/*setupNodeEvents(on, config) {
|
||||||
on('task', {
|
on('task', {
|
||||||
log(message) {
|
log(message) {
|
||||||
|
|||||||
@@ -18,14 +18,18 @@
|
|||||||
|
|
||||||
describe('dashboard', async function () {
|
describe('dashboard', async function () {
|
||||||
describe('schedule section', function () {
|
describe('schedule section', function () {
|
||||||
it('should lead to the schedule', function () {
|
it('should lead to the week overview', function () {
|
||||||
cy.visit('/overview');
|
cy.visit('/overview');
|
||||||
cy.get('.schedule').contains('a', 'Stundenplan').click();
|
cy.get('.schedule')
|
||||||
cy.url().should('include', '/schedule/recurring');
|
.contains('a', /Wochen.*übersicht/)
|
||||||
|
.click();
|
||||||
|
cy.url().should('include', '/schedule/week-overview');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should lead to the calendar', function () {
|
||||||
cy.visit('/overview');
|
cy.visit('/overview');
|
||||||
cy.get('.schedule').contains('a', 'Kein Eintrag gefunden').click();
|
cy.get('.schedule').contains('a', 'Kein Eintrag gefunden').click();
|
||||||
cy.url().should('include', '/schedule/recurring');
|
cy.url().should('include', '/schedule/calendar');
|
||||||
});
|
});
|
||||||
|
|
||||||
// TODO: Reenable and stabilize tests
|
// TODO: Reenable and stabilize tests
|
||||||
@@ -172,7 +176,7 @@ describe('dashboard', async function () {
|
|||||||
cy.visit('/overview');
|
cy.visit('/overview');
|
||||||
|
|
||||||
cy.get('ion-searchbar').click({scrollBehavior: 'center'});
|
cy.get('ion-searchbar').click({scrollBehavior: 'center'});
|
||||||
cy.url().should('eq', Cypress.config().baseUrl + '/search');
|
cy.url().should('eq', `${Cypress.config().baseUrl?.replace(/\/$/, '')}/search`);
|
||||||
cy.get('ion-searchbar').should('not.have.value');
|
cy.get('ion-searchbar').should('not.have.value');
|
||||||
cy.get('ion-searchbar input.searchbar-input').should('have.focus');
|
cy.get('ion-searchbar input.searchbar-input').should('have.focus');
|
||||||
|
|
||||||
|
|||||||
141
frontend/app/cypress/integration/opening-hours.spec.ts
Normal file
141
frontend/app/cypress/integration/opening-hours.spec.ts
Normal file
@@ -0,0 +1,141 @@
|
|||||||
|
describe('opening hours', () => {
|
||||||
|
beforeEach(function () {
|
||||||
|
cy.intercept('POST', 'https://mobile.server.uni-frankfurt.de/search', {
|
||||||
|
fixture: 'search/types/canteen/canteen-search-result.json',
|
||||||
|
}).as('search');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should specify relative closing time', () => {
|
||||||
|
cy.clock(new Date(2023, 9, 16, 15, 29), ['Date']);
|
||||||
|
cy.visit('/canteen');
|
||||||
|
|
||||||
|
cy.get('stapps-opening-hours')
|
||||||
|
.first()
|
||||||
|
.should('contain', 'Geöffnet')
|
||||||
|
.should('contain', 'Schließt heute um 22:00');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should specify relative opening time', () => {
|
||||||
|
cy.clock(new Date(2023, 9, 16, 6, 29), ['Date']);
|
||||||
|
cy.visit('/canteen');
|
||||||
|
|
||||||
|
cy.get('stapps-opening-hours')
|
||||||
|
.first()
|
||||||
|
.should('contain', 'Geschlossen')
|
||||||
|
.should('contain', 'Öffnet heute um 08:30');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should specify soon opening time', () => {
|
||||||
|
cy.clock(new Date(2023, 9, 16, 8, 0), ['Date']);
|
||||||
|
cy.visit('/canteen');
|
||||||
|
|
||||||
|
cy.get('stapps-opening-hours')
|
||||||
|
.first()
|
||||||
|
.should('contain', 'Geschlossen')
|
||||||
|
.should('contain', 'Öffnet in 30 Minuten');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should specify soon closing time', () => {
|
||||||
|
cy.clock(new Date(2023, 9, 16, 21, 30), ['Date']);
|
||||||
|
cy.visit('/canteen');
|
||||||
|
|
||||||
|
cy.get('stapps-opening-hours')
|
||||||
|
.first()
|
||||||
|
.should('contain', 'Geöffnet')
|
||||||
|
.should('contain', 'Schließt in 30 Minuten');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should update the soon closing time every minute', () => {
|
||||||
|
cy.clock(new Date(2023, 9, 16, 21, 30));
|
||||||
|
cy.visit('/canteen');
|
||||||
|
cy.tick(500);
|
||||||
|
|
||||||
|
cy.get('stapps-opening-hours')
|
||||||
|
.first()
|
||||||
|
.should('contain', 'Geöffnet')
|
||||||
|
.should('contain', 'Schließt in 30 Minuten');
|
||||||
|
|
||||||
|
cy.tick(60_000);
|
||||||
|
cy.tick(50);
|
||||||
|
|
||||||
|
cy.get('stapps-opening-hours')
|
||||||
|
.first()
|
||||||
|
.should('contain', 'Geöffnet')
|
||||||
|
.should('contain', 'Schließt in 29 Minuten');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should update the status when it changes', () => {
|
||||||
|
cy.clock(new Date(2023, 9, 16, 21, 59));
|
||||||
|
cy.visit('/canteen');
|
||||||
|
cy.tick(500);
|
||||||
|
|
||||||
|
cy.get('stapps-opening-hours')
|
||||||
|
.first()
|
||||||
|
.should('contain', 'Geöffnet')
|
||||||
|
.should('contain', 'Schließt in 1 Minute');
|
||||||
|
|
||||||
|
cy.tick(60_000);
|
||||||
|
|
||||||
|
cy.get('stapps-opening-hours')
|
||||||
|
.first()
|
||||||
|
.should('contain', 'Geschlossen')
|
||||||
|
.should('contain', 'Öffnet morgen um 08:30');
|
||||||
|
});
|
||||||
|
|
||||||
|
// This one takes long to execute!
|
||||||
|
it('should update as expected', () => {
|
||||||
|
cy.clock(new Date(2023, 9, 16, 20, 59));
|
||||||
|
cy.visit('/canteen');
|
||||||
|
cy.tick(500);
|
||||||
|
|
||||||
|
cy.get('stapps-opening-hours')
|
||||||
|
.first()
|
||||||
|
.should('contain', 'Geöffnet')
|
||||||
|
.should('contain', 'Schließt heute um 22:00');
|
||||||
|
|
||||||
|
cy.tick(60_000);
|
||||||
|
|
||||||
|
cy.get('stapps-opening-hours')
|
||||||
|
.first()
|
||||||
|
.should('contain', 'Geöffnet')
|
||||||
|
.should('contain', 'Schließt in 60 Minuten');
|
||||||
|
|
||||||
|
cy.tick(30 * 60_000);
|
||||||
|
|
||||||
|
cy.get('stapps-opening-hours')
|
||||||
|
.first()
|
||||||
|
.should('contain', 'Geöffnet')
|
||||||
|
.should('contain', 'Schließt in 30 Minuten');
|
||||||
|
|
||||||
|
cy.tick(30 * 60_000);
|
||||||
|
|
||||||
|
cy.get('stapps-opening-hours')
|
||||||
|
.first()
|
||||||
|
.should('contain', 'Geschlossen')
|
||||||
|
.should('contain', 'Öffnet morgen um 08:30');
|
||||||
|
|
||||||
|
cy.tick(9.5 * 60 * 60_000);
|
||||||
|
|
||||||
|
cy.get('stapps-opening-hours')
|
||||||
|
.first()
|
||||||
|
.should('contain', 'Geschlossen')
|
||||||
|
.should('contain', 'Öffnet in 60 Minuten');
|
||||||
|
|
||||||
|
cy.tick(30 * 60_000);
|
||||||
|
|
||||||
|
cy.get('stapps-opening-hours')
|
||||||
|
.first()
|
||||||
|
.should('contain', 'Geschlossen')
|
||||||
|
.should('contain', 'Öffnet in 30 Minuten');
|
||||||
|
|
||||||
|
cy.tick(30 * 60_000);
|
||||||
|
|
||||||
|
cy.get('stapps-opening-hours')
|
||||||
|
.first()
|
||||||
|
.should('contain', 'Geöffnet')
|
||||||
|
.should('contain', 'Schließt heute um 22:00');
|
||||||
|
|
||||||
|
// Long tick warps will cause network requests to time out
|
||||||
|
cy.get('@consoleError').invoke('resetHistory');
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -31,36 +31,24 @@
|
|||||||
// When a command from ./commands is ready to use, import with `import './commands'` syntax
|
// When a command from ./commands is ready to use, import with `import './commands'` syntax
|
||||||
// import './commands';
|
// import './commands';
|
||||||
|
|
||||||
beforeEach(async function () {
|
beforeEach(function () {
|
||||||
let databases: string[];
|
cy.wrap(
|
||||||
if (window.indexedDB.databases) {
|
new Promise(resolve => {
|
||||||
databases = (await window.indexedDB.databases()).map(it => it.name);
|
window.indexedDB.deleteDatabase('_ionicstorage').onsuccess = resolve;
|
||||||
console.log('Trying to clear all databases');
|
}),
|
||||||
} else {
|
);
|
||||||
console.log("Browser doesn't support database enumeration, deleting just ionic storage");
|
|
||||||
databases = ['_ionicstorage'];
|
|
||||||
}
|
|
||||||
for (const database of databases) {
|
|
||||||
if (database) {
|
|
||||||
console.log(`Deleting database ${database}`);
|
|
||||||
await new Promise(resolve => (window.indexedDB.deleteDatabase(database).onsuccess = resolve));
|
|
||||||
console.log(`Deleted database ${database}`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
|
||||||
Cypress.on('window:before:load', window => {
|
Cypress.on('window:before:load', window => {
|
||||||
// Fake that user is using its browser in german language
|
// Fake that user is using its browser in German
|
||||||
Object.defineProperty(window.navigator, 'language', {value: 'de-DE'});
|
Object.defineProperty(window.navigator, 'language', {value: 'de-DE'});
|
||||||
Object.defineProperty(window.navigator, 'languages', [{value: 'de-DE'}]);
|
Object.defineProperty(window.navigator, 'languages', [{value: 'de-DE'}]);
|
||||||
|
|
||||||
// Fail tests on console error
|
cy.spy(window.console, 'error').as('consoleError');
|
||||||
cy.stub(window.console, 'error').callsFake(message => {
|
});
|
||||||
// log out to the terminal
|
|
||||||
cy.now('task', 'error', message);
|
afterEach(function () {
|
||||||
// log to Command Log and fail the test
|
cy.get('@consoleError').should('not.have.been.called');
|
||||||
throw new Error(message);
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|
||||||
Cypress.on('uncaught:exception', error => {
|
Cypress.on('uncaught:exception', error => {
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@openstapps/app",
|
"name": "@openstapps/app",
|
||||||
"description": "The generic app tailored to fulfill needs of German universities, written using Ionic Framework.",
|
"description": "The generic app tailored to fulfill needs of German universities, written using Ionic Framework.",
|
||||||
"version": "3.0.0-next.0",
|
"version": "3.0.0-next.4",
|
||||||
"private": true,
|
"private": true,
|
||||||
"license": "GPL-3.0-only",
|
"license": "GPL-3.0-only",
|
||||||
"author": "Karl-Philipp Wulfert <krlwlfrt@gmail.com>",
|
"author": "Karl-Philipp Wulfert <krlwlfrt@gmail.com>",
|
||||||
@@ -63,6 +63,7 @@
|
|||||||
"@awesome-cordova-plugins/core": "5.45.0",
|
"@awesome-cordova-plugins/core": "5.45.0",
|
||||||
"@capacitor/app": "4.1.1",
|
"@capacitor/app": "4.1.1",
|
||||||
"@capacitor/browser": "4.1.0",
|
"@capacitor/browser": "4.1.0",
|
||||||
|
"@capacitor/clipboard": "4.1.0",
|
||||||
"@capacitor/core": "4.6.1",
|
"@capacitor/core": "4.6.1",
|
||||||
"@capacitor/device": "4.1.0",
|
"@capacitor/device": "4.1.0",
|
||||||
"@capacitor/dialog": "4.1.0",
|
"@capacitor/dialog": "4.1.0",
|
||||||
@@ -84,11 +85,14 @@
|
|||||||
"@ngx-translate/http-loader": "8.0.0",
|
"@ngx-translate/http-loader": "8.0.0",
|
||||||
"@openid/appauth": "1.3.1",
|
"@openid/appauth": "1.3.1",
|
||||||
"@openstapps/api": "workspace:*",
|
"@openstapps/api": "workspace:*",
|
||||||
"@openstapps/core": "workspace:*",
|
|
||||||
"@openstapps/collection-utils": "workspace:*",
|
"@openstapps/collection-utils": "workspace:*",
|
||||||
|
"@openstapps/core": "workspace:*",
|
||||||
"@transistorsoft/capacitor-background-fetch": "1.0.2",
|
"@transistorsoft/capacitor-background-fetch": "1.0.2",
|
||||||
|
"@types/dom-view-transitions": "1.0.1",
|
||||||
"capacitor-secure-storage-plugin": "0.8.1",
|
"capacitor-secure-storage-plugin": "0.8.1",
|
||||||
"cordova-plugin-calendar": "5.1.6",
|
"cordova-plugin-calendar": "5.1.6",
|
||||||
|
"date-fns": "2.30.0",
|
||||||
|
"ngx-date-fns": "10.0.1",
|
||||||
"deepmerge": "4.3.1",
|
"deepmerge": "4.3.1",
|
||||||
"form-data": "4.0.0",
|
"form-data": "4.0.0",
|
||||||
"geojson": "0.5.0",
|
"geojson": "0.5.0",
|
||||||
@@ -126,7 +130,7 @@
|
|||||||
"@capacitor/cli": "4.6.1",
|
"@capacitor/cli": "4.6.1",
|
||||||
"@capacitor/ios": "4.6.1",
|
"@capacitor/ios": "4.6.1",
|
||||||
"@compodoc/compodoc": "1.1.19",
|
"@compodoc/compodoc": "1.1.19",
|
||||||
"@cypress/schematic": "1.7.0",
|
"@cypress/schematic": "2.5.1",
|
||||||
"@ionic/angular-toolkit": "10.0.0",
|
"@ionic/angular-toolkit": "10.0.0",
|
||||||
"@ionic/cli": "7.1.1",
|
"@ionic/cli": "7.1.1",
|
||||||
"@openstapps/prettier-config": "workspace:*",
|
"@openstapps/prettier-config": "workspace:*",
|
||||||
@@ -146,7 +150,7 @@
|
|||||||
"@typescript-eslint/eslint-plugin": "5.60.1",
|
"@typescript-eslint/eslint-plugin": "5.60.1",
|
||||||
"@typescript-eslint/parser": "5.60.1",
|
"@typescript-eslint/parser": "5.60.1",
|
||||||
"cordova-res": "0.15.4",
|
"cordova-res": "0.15.4",
|
||||||
"cypress": "12.17.1",
|
"cypress": "13.2.0",
|
||||||
"eslint": "8.43.0",
|
"eslint": "8.43.0",
|
||||||
"eslint-plugin-jsdoc": "46.4.2",
|
"eslint-plugin-jsdoc": "46.4.2",
|
||||||
"eslint-plugin-prettier": "4.2.1",
|
"eslint-plugin-prettier": "4.2.1",
|
||||||
@@ -166,6 +170,7 @@
|
|||||||
"karma-junit-reporter": "2.0.1",
|
"karma-junit-reporter": "2.0.1",
|
||||||
"karma-mocha-reporter": "2.2.5",
|
"karma-mocha-reporter": "2.2.5",
|
||||||
"license-checker": "25.0.1",
|
"license-checker": "25.0.1",
|
||||||
|
"playwright-webkit": "1.38.0",
|
||||||
"stylelint": "15.10.1",
|
"stylelint": "15.10.1",
|
||||||
"stylelint-config-clean-order": "5.0.1",
|
"stylelint-config-clean-order": "5.0.1",
|
||||||
"stylelint-config-prettier-scss": "1.0.0",
|
"stylelint-config-prettier-scss": "1.0.0",
|
||||||
|
|||||||
@@ -58,12 +58,15 @@ import {StorageProvider} from './modules/storage/storage.provider';
|
|||||||
import {AssessmentsModule} from './modules/assessments/assessments.module';
|
import {AssessmentsModule} from './modules/assessments/assessments.module';
|
||||||
import {ServiceHandlerInterceptor} from './_helpers/service-handler.interceptor';
|
import {ServiceHandlerInterceptor} from './_helpers/service-handler.interceptor';
|
||||||
import {RoutingStackService} from './util/routing-stack.service';
|
import {RoutingStackService} from './util/routing-stack.service';
|
||||||
import {SCSettingValue} from '@openstapps/core';
|
import {SCLanguageCode, SCSettingValue} from '@openstapps/core';
|
||||||
import {DefaultAuthService} from './modules/auth/default-auth.service';
|
import {DefaultAuthService} from './modules/auth/default-auth.service';
|
||||||
import {PAIAAuthService} from './modules/auth/paia/paia-auth.service';
|
import {PAIAAuthService} from './modules/auth/paia/paia-auth.service';
|
||||||
import {IonIconModule} from './util/ion-icon/ion-icon.module';
|
import {IonIconModule} from './util/ion-icon/ion-icon.module';
|
||||||
import {NavigationModule} from './modules/menu/navigation/navigation.module';
|
import {NavigationModule} from './modules/menu/navigation/navigation.module';
|
||||||
import {browserFactory, SimpleBrowser} from './util/browser.factory';
|
import {browserFactory, SimpleBrowser} from './util/browser.factory';
|
||||||
|
import {getDateFnsLocale} from './translation/dfns-locale';
|
||||||
|
import {setDefaultOptions} from 'date-fns';
|
||||||
|
import {DateFnsConfigurationService} from 'ngx-date-fns';
|
||||||
|
|
||||||
registerLocaleData(localeDe);
|
registerLocaleData(localeDe);
|
||||||
|
|
||||||
@@ -71,12 +74,6 @@ SwiperCore.use([FreeMode, Navigation]);
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Initializes data needed on startup
|
* Initializes data needed on startup
|
||||||
* @param storageProvider provider of the saved data (using framework's storage)
|
|
||||||
* @param logger TODO
|
|
||||||
* @param settingsProvider provider of settings (e.g. language that has been set)
|
|
||||||
* @param configProvider TODO
|
|
||||||
* @param translateService TODO
|
|
||||||
* @param _routingStackService Just for init and to track the stack from the get go
|
|
||||||
*/
|
*/
|
||||||
export function initializerFactory(
|
export function initializerFactory(
|
||||||
storageProvider: StorageProvider,
|
storageProvider: StorageProvider,
|
||||||
@@ -87,6 +84,7 @@ export function initializerFactory(
|
|||||||
_routingStackService: RoutingStackService,
|
_routingStackService: RoutingStackService,
|
||||||
defaultAuthService: DefaultAuthService,
|
defaultAuthService: DefaultAuthService,
|
||||||
paiaAuthService: PAIAAuthService,
|
paiaAuthService: PAIAAuthService,
|
||||||
|
dateFnsConfigurationService: DateFnsConfigurationService,
|
||||||
) {
|
) {
|
||||||
return async () => {
|
return async () => {
|
||||||
initLogger(logger);
|
initLogger(logger);
|
||||||
@@ -107,6 +105,10 @@ export function initializerFactory(
|
|||||||
translateService.setDefaultLang('en');
|
translateService.setDefaultLang('en');
|
||||||
translateService.use(languageCode);
|
translateService.use(languageCode);
|
||||||
moment.locale(languageCode);
|
moment.locale(languageCode);
|
||||||
|
const dateFnsLocale = await getDateFnsLocale(languageCode as SCLanguageCode);
|
||||||
|
setDefaultOptions({locale: dateFnsLocale});
|
||||||
|
dateFnsConfigurationService.setLocale(dateFnsLocale);
|
||||||
|
|
||||||
await defaultAuthService.init();
|
await defaultAuthService.init();
|
||||||
await paiaAuthService.init();
|
await paiaAuthService.init();
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
@@ -198,6 +200,7 @@ export function createTranslateLoader(http: HttpClient) {
|
|||||||
RoutingStackService,
|
RoutingStackService,
|
||||||
DefaultAuthService,
|
DefaultAuthService,
|
||||||
PAIAAuthService,
|
PAIAAuthService,
|
||||||
|
DateFnsConfigurationService,
|
||||||
],
|
],
|
||||||
useFactory: initializerFactory,
|
useFactory: initializerFactory,
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ import {Component, DestroyRef, inject, Input, OnInit, ViewChild} from '@angular/
|
|||||||
import {ActivatedRoute} from '@angular/router';
|
import {ActivatedRoute} from '@angular/router';
|
||||||
import {AssessmentsProvider} from '../assessments.provider';
|
import {AssessmentsProvider} from '../assessments.provider';
|
||||||
import {DataDetailComponent, ExternalDataLoadEvent} from '../../data/detail/data-detail.component';
|
import {DataDetailComponent, ExternalDataLoadEvent} from '../../data/detail/data-detail.component';
|
||||||
import {NavController, ViewWillEnter} from '@ionic/angular';
|
import {NavController} from '@ionic/angular';
|
||||||
import {DataRoutingService} from '../../data/data-routing.service';
|
import {DataRoutingService} from '../../data/data-routing.service';
|
||||||
import {SCAssessment} from '@openstapps/core';
|
import {SCAssessment} from '@openstapps/core';
|
||||||
import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
|
import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
|
||||||
@@ -27,7 +27,7 @@ import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
|
|||||||
templateUrl: 'assessments-detail.html',
|
templateUrl: 'assessments-detail.html',
|
||||||
styleUrls: ['assessments-detail.scss'],
|
styleUrls: ['assessments-detail.scss'],
|
||||||
})
|
})
|
||||||
export class AssessmentsDetailComponent implements ViewWillEnter, OnInit {
|
export class AssessmentsDetailComponent implements OnInit {
|
||||||
destroy$ = inject(DestroyRef);
|
destroy$ = inject(DestroyRef);
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
@@ -67,8 +67,4 @@ export class AssessmentsDetailComponent implements ViewWillEnter, OnInit {
|
|||||||
event.resolve(this.item);
|
event.resolve(this.item);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
async ionViewWillEnter() {
|
|
||||||
await this.detailComponent.ionViewWillEnter();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -61,6 +61,7 @@ export class AssessmentsSimpleDataListComponent implements OnInit {
|
|||||||
queryParams: {
|
queryParams: {
|
||||||
token: this.activatedRoute.snapshot.queryParamMap.get('token'),
|
token: this.activatedRoute.snapshot.queryParamMap.get('token'),
|
||||||
},
|
},
|
||||||
|
state: {item: thing},
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -71,6 +71,7 @@ export class AssessmentsPageComponent implements OnInit, AfterViewInit {
|
|||||||
queryParams: {
|
queryParams: {
|
||||||
token: this.activatedRoute.snapshot.queryParamMap.get('token'),
|
token: this.activatedRoute.snapshot.queryParamMap.get('token'),
|
||||||
},
|
},
|
||||||
|
state: {item: thing},
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ export class CatalogComponent implements OnInit {
|
|||||||
.itemSelectListener()
|
.itemSelectListener()
|
||||||
.pipe(takeUntilDestroyed())
|
.pipe(takeUntilDestroyed())
|
||||||
.subscribe(item => {
|
.subscribe(item => {
|
||||||
void this.router.navigate(['data-detail', item.uid]);
|
void this.router.navigate(['data-detail', item.uid], {state: {item}});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -19,19 +19,20 @@
|
|||||||
</ion-toolbar>
|
</ion-toolbar>
|
||||||
</ion-header>
|
</ion-header>
|
||||||
<div #schedule class="schedule">
|
<div #schedule class="schedule">
|
||||||
<a [routerLink]="['/schedule/recurring']">
|
<a [routerLink]="['/schedule/week-overview']">
|
||||||
<ion-icon size="40" weight="300" name="grid_view"></ion-icon>
|
<ion-icon size="36" weight="300" name="calendar_month"></ion-icon>
|
||||||
<ion-label>{{ 'schedule.recurring' | translate }}</ion-label>
|
<ion-label [innerHTML]="'schedule.recurring' | translate"></ion-label>
|
||||||
</a>
|
</a>
|
||||||
<!-- Avoid structural directives here, they might interfere with the collapse animation -->
|
<!-- Avoid structural directives here, they might interfere with the collapse animation -->
|
||||||
<a
|
<a
|
||||||
[routerLink]="nextEvent?.event ? ['/data-detail', nextEvent!.event.uid] : ['/schedule/recurring']"
|
[routerLink]="nextEvent ? ['/data-detail', nextEvent!.uid] : ['/schedule/calendar']"
|
||||||
|
[state]="{item: nextEvent}"
|
||||||
class="schedule-item-button"
|
class="schedule-item-button"
|
||||||
>
|
>
|
||||||
<ion-label>{{ 'dashboard.schedule.title' | translate }}</ion-label>
|
<ion-label>{{ 'dashboard.schedule.title' | translate }}</ion-label>
|
||||||
<ion-label>
|
<ion-label>
|
||||||
{{
|
{{
|
||||||
nextEvent?.event
|
nextEvent
|
||||||
? (nextEvent!.dates | nextDateInList | amDateFormat : 'll, HH:mm')
|
? (nextEvent!.dates | nextDateInList | amDateFormat : 'll, HH:mm')
|
||||||
: ('dashboard.schedule.noEvent' | translate)
|
: ('dashboard.schedule.noEvent' | translate)
|
||||||
}}
|
}}
|
||||||
|
|||||||
@@ -117,6 +117,7 @@ ion-content {
|
|||||||
ion-label {
|
ion-label {
|
||||||
font-size: var(--font-size-xxs);
|
font-size: var(--font-size-xxs);
|
||||||
font-weight: var(--font-weight-semi-bold);
|
font-weight: var(--font-weight-semi-bold);
|
||||||
|
word-break: break-word;
|
||||||
}
|
}
|
||||||
|
|
||||||
&:hover ::ng-deep stapps-icon {
|
&:hover ::ng-deep stapps-icon {
|
||||||
|
|||||||
@@ -76,7 +76,7 @@ export class DashboardComponent implements OnInit, OnDestroy {
|
|||||||
.itemSelectListener()
|
.itemSelectListener()
|
||||||
.pipe(takeUntilDestroyed())
|
.pipe(takeUntilDestroyed())
|
||||||
.subscribe(item => {
|
.subscribe(item => {
|
||||||
void this.router.navigate(['data-detail', item.uid]);
|
void this.router.navigate(['data-detail', item.uid], {state: {item}});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -18,7 +18,6 @@
|
|||||||
<stapps-data-list-item
|
<stapps-data-list-item
|
||||||
*ngFor="let dish of dishes"
|
*ngFor="let dish of dishes"
|
||||||
[hideThumbnail]="true"
|
[hideThumbnail]="true"
|
||||||
[favoriteButton]="false"
|
|
||||||
[item]="dish"
|
[item]="dish"
|
||||||
appearance="square"
|
appearance="square"
|
||||||
></stapps-data-list-item>
|
></stapps-data-list-item>
|
||||||
|
|||||||
@@ -42,6 +42,7 @@ export class ActionChipListComponent {
|
|||||||
event:
|
event:
|
||||||
item.type === SCThingType.AcademicEvent ||
|
item.type === SCThingType.AcademicEvent ||
|
||||||
(item.type === SCThingType.DateSeries && (item as SCDateSeries).dates.length > 0),
|
(item.type === SCThingType.DateSeries && (item as SCDateSeries).dates.length > 0),
|
||||||
|
navigate: ('inPlace' in item && item.inPlace && 'geo' in item.inPlace) || 'geo' in item,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -14,5 +14,6 @@
|
|||||||
-->
|
-->
|
||||||
|
|
||||||
<stapps-locate-action-chip *ngIf="applicable.locate" [item]="item"></stapps-locate-action-chip>
|
<stapps-locate-action-chip *ngIf="applicable.locate" [item]="item"></stapps-locate-action-chip>
|
||||||
|
<stapps-navigate-action-chip *ngIf="applicable.navigate" [item]="$any(item)"></stapps-navigate-action-chip>
|
||||||
<!-- Add Event Chip needs to load data and should be the last -->
|
<!-- Add Event Chip needs to load data and should be the last -->
|
||||||
<stapps-add-event-action-chip *ngIf="applicable.event" [item]="item"></stapps-add-event-action-chip>
|
<stapps-add-event-action-chip *ngIf="applicable.event" [item]="item"></stapps-add-event-action-chip>
|
||||||
|
|||||||
@@ -0,0 +1,35 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2023 StApps
|
||||||
|
* This program is free software: you can redistribute it and/or modify it
|
||||||
|
* under the terms of the GNU General Public License as published by the Free
|
||||||
|
* Software Foundation, version 3.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful, but WITHOUT
|
||||||
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
||||||
|
* more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License along with
|
||||||
|
* this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
import {Component, Input} from '@angular/core';
|
||||||
|
import {SCPlaceWithoutReferences, SCThings} from '@openstapps/core';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'stapps-navigate-action-chip',
|
||||||
|
templateUrl: 'navigate-action-chip.html',
|
||||||
|
styleUrls: ['navigate-action-chip.scss'],
|
||||||
|
})
|
||||||
|
export class NavigateActionChipComponent {
|
||||||
|
place: SCPlaceWithoutReferences;
|
||||||
|
|
||||||
|
@Input({required: true}) set item(value: SCThings) {
|
||||||
|
if ('geo' in value) {
|
||||||
|
this.place = value;
|
||||||
|
} else if ('inPlace' in value && value.inPlace && 'geo' in value.inPlace) {
|
||||||
|
this.place = value.inPlace;
|
||||||
|
} else {
|
||||||
|
console.error('Invalid place', value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
<!--
|
<!--
|
||||||
~ Copyright (C) 2022 StApps
|
~ Copyright (C) 2023 StApps
|
||||||
~ This program is free software: you can redistribute it and/or modify it
|
~ This program is free software: you can redistribute it and/or modify it
|
||||||
~ under the terms of the GNU General Public License as published by the Free
|
~ under the terms of the GNU General Public License as published by the Free
|
||||||
~ Software Foundation, version 3.
|
~ Software Foundation, version 3.
|
||||||
@@ -12,15 +12,7 @@
|
|||||||
~ You should have received a copy of the GNU General Public License along with
|
~ You should have received a copy of the GNU General Public License along with
|
||||||
~ this program. If not, see <https://www.gnu.org/licenses/>.
|
~ this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
-->
|
-->
|
||||||
|
<ion-chip [color]="'primary'" [outline]="true" [geoNavigation]="place">
|
||||||
<ion-header translucent>
|
<ion-icon name="directions"></ion-icon>
|
||||||
<ion-toolbar color="primary" mode="ios">
|
<ion-label>{{'map.directions.TITLE' | translate}}</ion-label>
|
||||||
<ion-title>{{ 'map.modals.single.TITLE' | translate }}</ion-title>
|
</ion-chip>
|
||||||
<ion-buttons slot="end">
|
|
||||||
<ion-button (click)="modalController.dismiss()">{{ 'app.ui.CLOSE' | translate }}</ion-button>
|
|
||||||
</ion-buttons>
|
|
||||||
</ion-toolbar>
|
|
||||||
</ion-header>
|
|
||||||
<ion-content>
|
|
||||||
<stapps-data-detail-content [item]="$any(item)" [openAsModal]="true"></stapps-data-detail-content>
|
|
||||||
</ion-content>
|
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*!
|
||||||
* Copyright (C) 2021 StApps
|
* Copyright (C) 2023 StApps
|
||||||
* This program is free software: you can redistribute it and/or modify it
|
* This program is free software: you can redistribute it and/or modify it
|
||||||
* under the terms of the GNU General Public License as published by the Free
|
* under the terms of the GNU General Public License as published by the Free
|
||||||
* Software Foundation, version 3.
|
* Software Foundation, version 3.
|
||||||
@@ -12,20 +12,3 @@
|
|||||||
* You should have received a copy of the GNU General Public License along with
|
* You should have received a copy of the GNU General Public License along with
|
||||||
* this program. If not, see <https://www.gnu.org/licenses/>.
|
* this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
import {Component, Input} from '@angular/core';
|
|
||||||
import {SCPlace} from '@openstapps/core';
|
|
||||||
import {ModalController} from '@ionic/angular';
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
selector: 'app-map-single-modal',
|
|
||||||
templateUrl: './map-single.html',
|
|
||||||
styleUrls: ['./map-single.scss'],
|
|
||||||
})
|
|
||||||
export class MapSingleModalComponent {
|
|
||||||
/**
|
|
||||||
* The item to be shown
|
|
||||||
*/
|
|
||||||
@Input() item: SCPlace;
|
|
||||||
|
|
||||||
constructor(readonly modalController: ModalController) {}
|
|
||||||
}
|
|
||||||
@@ -102,6 +102,8 @@ import {StappsRatingComponent} from './elements/rating.component';
|
|||||||
import {DishCharacteristicsComponent} from './types/dish/dish-characteristics.component';
|
import {DishCharacteristicsComponent} from './types/dish/dish-characteristics.component';
|
||||||
import {SkeletonListComponent} from './list/skeleton-list.component';
|
import {SkeletonListComponent} from './list/skeleton-list.component';
|
||||||
import {CertificationsInDetailComponent} from './elements/certifications-in-detail.component';
|
import {CertificationsInDetailComponent} from './elements/certifications-in-detail.component';
|
||||||
|
import {GeoNavigationDirective} from '../map/geo-navigation.directive';
|
||||||
|
import {NavigateActionChipComponent} from './chips/data/navigate-action-chip.component';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Module for handling data
|
* Module for handling data
|
||||||
@@ -110,6 +112,7 @@ import {CertificationsInDetailComponent} from './elements/certifications-in-deta
|
|||||||
declarations: [
|
declarations: [
|
||||||
ActionChipListComponent,
|
ActionChipListComponent,
|
||||||
AddEventActionChipComponent,
|
AddEventActionChipComponent,
|
||||||
|
NavigateActionChipComponent,
|
||||||
EditEventSelectionComponent,
|
EditEventSelectionComponent,
|
||||||
AddressDetailComponent,
|
AddressDetailComponent,
|
||||||
CatalogDetailContentComponent,
|
CatalogDetailContentComponent,
|
||||||
@@ -194,6 +197,7 @@ import {CertificationsInDetailComponent} from './elements/certifications-in-deta
|
|||||||
TranslateModule.forChild(),
|
TranslateModule.forChild(),
|
||||||
ThingTranslateModule.forChild(),
|
ThingTranslateModule.forChild(),
|
||||||
UtilModule,
|
UtilModule,
|
||||||
|
GeoNavigationDirective,
|
||||||
],
|
],
|
||||||
providers: [
|
providers: [
|
||||||
CoordinatedSearchProvider,
|
CoordinatedSearchProvider,
|
||||||
|
|||||||
@@ -111,8 +111,8 @@ describe('DataDetailComponent', () => {
|
|||||||
expect(DataDetailComponent.prototype.getItem).toHaveBeenCalledWith(sampleThing.uid, false);
|
expect(DataDetailComponent.prototype.getItem).toHaveBeenCalledWith(sampleThing.uid, false);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should get a data item when the view is entered', () => {
|
it('should get a data item when initialized', () => {
|
||||||
comp.ionViewWillEnter();
|
comp.ngOnInit();
|
||||||
expect(DataDetailComponent.prototype.getItem).toHaveBeenCalledWith(sampleThing.uid, false);
|
expect(DataDetailComponent.prototype.getItem).toHaveBeenCalledWith(sampleThing.uid, false);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -12,9 +12,9 @@
|
|||||||
* You should have received a copy of the GNU General Public License along with
|
* You should have received a copy of the GNU General Public License along with
|
||||||
* this program. If not, see <https://www.gnu.org/licenses/>.
|
* this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
import {Component, ContentChild, EventEmitter, Input, Output, TemplateRef} from '@angular/core';
|
import {Component, ContentChild, EventEmitter, Input, OnInit, Output, TemplateRef} from '@angular/core';
|
||||||
import {ActivatedRoute} from '@angular/router';
|
import {ActivatedRoute, Router} from '@angular/router';
|
||||||
import {ModalController, ViewWillEnter} from '@ionic/angular';
|
import {ModalController} from '@ionic/angular';
|
||||||
import {LangChangeEvent, TranslateService} from '@ngx-translate/core';
|
import {LangChangeEvent, TranslateService} from '@ngx-translate/core';
|
||||||
import {SCLanguageCode, SCSaveableThing, SCThings, SCUuid} from '@openstapps/core';
|
import {SCLanguageCode, SCSaveableThing, SCThings, SCUuid} from '@openstapps/core';
|
||||||
import {DataProvider, DataScope} from '../data.provider';
|
import {DataProvider, DataScope} from '../data.provider';
|
||||||
@@ -37,7 +37,7 @@ export interface ExternalDataLoadEvent {
|
|||||||
styleUrls: ['data-detail.scss'],
|
styleUrls: ['data-detail.scss'],
|
||||||
templateUrl: 'data-detail.html',
|
templateUrl: 'data-detail.html',
|
||||||
})
|
})
|
||||||
export class DataDetailComponent implements ViewWillEnter {
|
export class DataDetailComponent implements OnInit {
|
||||||
/**
|
/**
|
||||||
* The associated item
|
* The associated item
|
||||||
*
|
*
|
||||||
@@ -84,21 +84,15 @@ export class DataDetailComponent implements ViewWillEnter {
|
|||||||
return (thing as SCSaveableThing).data !== undefined;
|
return (thing as SCSaveableThing).data !== undefined;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
* @param route the route the page was accessed from
|
|
||||||
* @param dataProvider the data provider
|
|
||||||
* @param favoritesService the favorites provider
|
|
||||||
* @param modalController the modal controller
|
|
||||||
* @param translateService he translate provider
|
|
||||||
*/
|
|
||||||
constructor(
|
constructor(
|
||||||
protected readonly route: ActivatedRoute,
|
protected readonly route: ActivatedRoute,
|
||||||
|
router: Router,
|
||||||
private readonly dataProvider: DataProvider,
|
private readonly dataProvider: DataProvider,
|
||||||
private readonly favoritesService: FavoritesService,
|
private readonly favoritesService: FavoritesService,
|
||||||
readonly modalController: ModalController,
|
readonly modalController: ModalController,
|
||||||
translateService: TranslateService,
|
translateService: TranslateService,
|
||||||
) {
|
) {
|
||||||
|
this.inputItem = router.getCurrentNavigation()?.extras.state?.item;
|
||||||
this.language = translateService.currentLang as SCLanguageCode;
|
this.language = translateService.currentLang as SCLanguageCode;
|
||||||
translateService.onLangChange.subscribe((event: LangChangeEvent) => {
|
translateService.onLangChange.subscribe((event: LangChangeEvent) => {
|
||||||
this.language = event.lang as SCLanguageCode;
|
this.language = event.lang as SCLanguageCode;
|
||||||
@@ -138,10 +132,7 @@ export class DataDetailComponent implements ViewWillEnter {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
async ngOnInit() {
|
||||||
* Initialize
|
|
||||||
*/
|
|
||||||
async ionViewWillEnter() {
|
|
||||||
const uid = this.route.snapshot.paramMap.get('uid') || '';
|
const uid = this.route.snapshot.paramMap.get('uid') || '';
|
||||||
await this.getItem(uid ?? '', false);
|
await this.getItem(uid ?? '', false);
|
||||||
// fallback to the saved item (from favorites)
|
// fallback to the saved item (from favorites)
|
||||||
|
|||||||
@@ -37,32 +37,22 @@ export class DataPathComponent implements OnInit {
|
|||||||
@Input() maxItems = 2;
|
@Input() maxItems = 2;
|
||||||
|
|
||||||
@Input() set item(item: SCThings) {
|
@Input() set item(item: SCThings) {
|
||||||
// eslint-disable-next-line unicorn/prefer-ternary
|
|
||||||
if (item.type === SCThingType.Catalog && item.superCatalogs) {
|
if (item.type === SCThingType.Catalog && item.superCatalogs) {
|
||||||
this.path = new Promise(resolve =>
|
this.path = Promise.resolve([...item.superCatalogs!, item]);
|
||||||
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
||||||
resolve([...item.superCatalogs!, item]),
|
|
||||||
);
|
|
||||||
} else if (item.type === SCThingType.Assessment && item.superAssessments) {
|
} else if (item.type === SCThingType.Assessment && item.superAssessments) {
|
||||||
this.path = new Promise(resolve =>
|
this.path = Promise.resolve([...item.superAssessments!, item]);
|
||||||
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
||||||
resolve([...item.superAssessments!, item]),
|
|
||||||
);
|
|
||||||
} else if (
|
} else if (
|
||||||
item.type === SCThingType.AcademicEvent &&
|
item.type === SCThingType.AcademicEvent &&
|
||||||
item.catalogs &&
|
item.catalogs &&
|
||||||
(item.catalogs.length === 1 || this.routeStack.lastDataDetail)
|
(item.catalogs.length === 1 || this.routeStack.lastDataDetail)
|
||||||
) {
|
) {
|
||||||
const catalogWithoutReferences = item.catalogs[0];
|
|
||||||
const catalogPromise = (
|
|
||||||
item.catalogs.length === 1
|
|
||||||
? this.dataProvider.get(catalogWithoutReferences.uid, DataScope.Remote)
|
|
||||||
: this.routeStack.lastDataDetail
|
|
||||||
) as Promise<SCCatalog>;
|
|
||||||
|
|
||||||
this.path = new Promise(async resolve => {
|
this.path = new Promise(async resolve => {
|
||||||
const catalog = await catalogPromise;
|
const catalogWithoutReferences = item.catalogs![0];
|
||||||
const superCatalogs = catalog.superCatalogs;
|
const catalog =
|
||||||
|
item.catalogs!.length === 1
|
||||||
|
? await this.dataProvider.get(catalogWithoutReferences.uid, DataScope.Remote)
|
||||||
|
: this.routeStack.lastDataDetail;
|
||||||
|
const superCatalogs = (catalog as SCCatalog).superCatalogs;
|
||||||
|
|
||||||
resolve(
|
resolve(
|
||||||
superCatalogs
|
superCatalogs
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
/* eslint-disable unicorn/no-useless-undefined */
|
||||||
/*
|
/*
|
||||||
* Copyright (C) 2023 StApps
|
* Copyright (C) 2023 StApps
|
||||||
* This program is free software: you can redistribute it and/or modify it
|
* This program is free software: you can redistribute it and/or modify it
|
||||||
@@ -12,60 +13,51 @@
|
|||||||
* You should have received a copy of the GNU General Public License along with
|
* You should have received a copy of the GNU General Public License along with
|
||||||
* this program. If not, see <https://www.gnu.org/licenses/>.
|
* this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
import {Component, ElementRef, HostListener, Input} from '@angular/core';
|
import {ChangeDetectionStrategy, Component, ElementRef, HostListener, Input} from '@angular/core';
|
||||||
import {SCDish, SCRatingRequest, SCUuid} from '@openstapps/core';
|
import {SCDish, SCRatingRequest} from '@openstapps/core';
|
||||||
import {RatingProvider} from '../rating.provider';
|
import {RatingProvider} from '../rating.provider';
|
||||||
import {ratingAnimation} from './rating.animation';
|
import {ratingAnimation} from './rating.animation';
|
||||||
|
import {BehaviorSubject, filter, merge, mergeMap, of, ReplaySubject, withLatestFrom} from 'rxjs';
|
||||||
|
import {catchError, map} from 'rxjs/operators';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'stapps-rating',
|
selector: 'stapps-rating',
|
||||||
templateUrl: 'rating.html',
|
templateUrl: 'rating.html',
|
||||||
styleUrls: ['rating.scss'],
|
styleUrls: ['rating.scss'],
|
||||||
animations: [ratingAnimation],
|
animations: [ratingAnimation],
|
||||||
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||||
})
|
})
|
||||||
export class StappsRatingComponent {
|
export class StappsRatingComponent {
|
||||||
rate = false;
|
performRating = new BehaviorSubject(false);
|
||||||
|
|
||||||
rated = false;
|
userRating = new BehaviorSubject<number | undefined>(undefined);
|
||||||
|
|
||||||
canBeRated = false;
|
dish = new ReplaySubject<SCDish>(1);
|
||||||
|
|
||||||
uid: SCUuid;
|
wasAlreadyRated = merge(
|
||||||
|
this.dish.pipe(mergeMap(({uid}) => this.ratingProvider.hasRated(uid))),
|
||||||
|
this.userRating.pipe(
|
||||||
|
filter(it => it !== undefined),
|
||||||
|
withLatestFrom(this.dish),
|
||||||
|
mergeMap(([rating, {uid}]) => this.ratingProvider.rate(uid, rating as SCRatingRequest['rating'])),
|
||||||
|
map(() => true),
|
||||||
|
catchError(() => of(false)),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
rating?: number;
|
canBeRated = this.dish.pipe(mergeMap(dish => this.ratingProvider.canRate(dish)));
|
||||||
|
|
||||||
@Input() set item(value: SCDish) {
|
@Input({required: true}) set item(value: SCDish) {
|
||||||
this.uid = value.uid;
|
this.dish.next(value);
|
||||||
|
|
||||||
Promise.all([this.ratingProvider.canRate(value), this.ratingProvider.hasRated(this.uid)] as const).then(
|
|
||||||
([canRate, hasRated]) => {
|
|
||||||
this.canBeRated = canRate;
|
|
||||||
this.rated = hasRated;
|
|
||||||
},
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
constructor(readonly elementRef: ElementRef, readonly ratingProvider: RatingProvider) {}
|
constructor(readonly elementRef: ElementRef, readonly ratingProvider: RatingProvider) {}
|
||||||
|
|
||||||
async submitRating(rating: number) {
|
|
||||||
this.rating = rating;
|
|
||||||
try {
|
|
||||||
await this.ratingProvider.rate(this.uid, rating as SCRatingRequest['rating']);
|
|
||||||
this.rated = true;
|
|
||||||
} catch {
|
|
||||||
this.rating = undefined;
|
|
||||||
// allow change detection to catch up first
|
|
||||||
setTimeout(() => {
|
|
||||||
this.rate = false;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@HostListener('document:mousedown', ['$event'])
|
@HostListener('document:mousedown', ['$event'])
|
||||||
clickOutside(event: MouseEvent) {
|
clickOutside(event: MouseEvent) {
|
||||||
if (this.rating) return;
|
if (this.userRating.value) return;
|
||||||
if (!this.elementRef.nativeElement.contains(event.target)) {
|
if (!this.elementRef.nativeElement.contains(event.target)) {
|
||||||
this.rate = false;
|
this.performRating.next(false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,19 +14,23 @@
|
|||||||
-->
|
-->
|
||||||
|
|
||||||
<ion-button
|
<ion-button
|
||||||
*ngIf="canBeRated"
|
*ngIf="canBeRated | async"
|
||||||
fill="clear"
|
fill="clear"
|
||||||
(click)="$event.stopPropagation(); rate = true"
|
(click)="$event.stopPropagation(); performRating.next(true)"
|
||||||
[disabled]="rated"
|
[disabled]="wasAlreadyRated | async"
|
||||||
>
|
>
|
||||||
<ion-icon slot="icon-only" color="medium" name="thumbs_up_down"></ion-icon>
|
<ion-icon slot="icon-only" color="medium" name="thumbs_up_down"></ion-icon>
|
||||||
</ion-button>
|
</ion-button>
|
||||||
|
|
||||||
<div class="rating-stars" *ngIf="rate && !rated" [@rating]="rating ? 'rated' : 'abandoned'">
|
<div
|
||||||
|
class="rating-stars"
|
||||||
|
*ngIf="(performRating | async) && (wasAlreadyRated | async) !== true"
|
||||||
|
[@rating]="(userRating | async) === undefined ? 'abandoned' : 'rated'"
|
||||||
|
>
|
||||||
<ion-icon
|
<ion-icon
|
||||||
[class.rated-value]="rating === i"
|
[class.rated-value]="(userRating | async) === i"
|
||||||
*ngFor="let i of [5, 4, 3, 2, 1]"
|
*ngFor="let i of [5, 4, 3, 2, 1]"
|
||||||
(click)="$event.stopPropagation(); submitRating(i)"
|
(click)="$event.stopPropagation(); userRating.next(i)"
|
||||||
slot="icon-only"
|
slot="icon-only"
|
||||||
size="32"
|
size="32"
|
||||||
color="medium"
|
color="medium"
|
||||||
|
|||||||
@@ -38,6 +38,8 @@ export class DataListItemComponent {
|
|||||||
|
|
||||||
@Input() listItemEndInteraction = true;
|
@Input() listItemEndInteraction = true;
|
||||||
|
|
||||||
|
@Input() listItemChipInteraction = true;
|
||||||
|
|
||||||
@Input() lines = 'inset';
|
@Input() lines = 'inset';
|
||||||
|
|
||||||
@Input() forceHeight = false;
|
@Input() forceHeight = false;
|
||||||
|
|||||||
@@ -43,7 +43,7 @@
|
|||||||
<div>
|
<div>
|
||||||
<ng-template [dataListItemHost]="item"></ng-template>
|
<ng-template [dataListItemHost]="item"></ng-template>
|
||||||
<stapps-action-chip-list
|
<stapps-action-chip-list
|
||||||
*ngIf="appearance !== 'square'"
|
*ngIf="listItemChipInteraction && appearance !== 'square'"
|
||||||
slot="end"
|
slot="end"
|
||||||
[item]="item"
|
[item]="item"
|
||||||
></stapps-action-chip-list>
|
></stapps-action-chip-list>
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ import {MapPosition} from '../../map/position.service';
|
|||||||
import {SearchPageComponent} from './search-page.component';
|
import {SearchPageComponent} from './search-page.component';
|
||||||
import {Geolocation} from '@capacitor/geolocation';
|
import {Geolocation} from '@capacitor/geolocation';
|
||||||
import {BehaviorSubject} from 'rxjs';
|
import {BehaviorSubject} from 'rxjs';
|
||||||
import {pauseWhen} from '../../../util/pause-when';
|
import {pauseWhen} from '../../../util/rxjs/pause-when';
|
||||||
import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
|
import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -342,7 +342,7 @@ export class SearchPageComponent implements OnInit {
|
|||||||
.pipe(takeUntilDestroyed(this.destroy$))
|
.pipe(takeUntilDestroyed(this.destroy$))
|
||||||
.subscribe(item => {
|
.subscribe(item => {
|
||||||
if (this.itemRouting) {
|
if (this.itemRouting) {
|
||||||
void this.router.navigate(['/data-detail', item.uid]);
|
void this.router.navigate(['/data-detail', item.uid], {state: {item}});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -61,7 +61,7 @@ export class SimpleDataListComponent implements OnInit {
|
|||||||
.itemSelectListener()
|
.itemSelectListener()
|
||||||
.pipe(takeUntilDestroyed(this.destroy$))
|
.pipe(takeUntilDestroyed(this.destroy$))
|
||||||
.subscribe(item => {
|
.subscribe(item => {
|
||||||
void this.router.navigate(['/data-detail', item.uid]);
|
void this.router.navigate(['/data-detail', item.uid], {state: {item}});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,16 +13,16 @@
|
|||||||
~ this program. If not, see <https://www.gnu.org/licenses/>.
|
~ this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
-->
|
-->
|
||||||
|
|
||||||
<ng-container *ngIf="items as items; else loading">
|
<ng-container *ngIf="items | async as items; else loading">
|
||||||
<ion-list>
|
<ion-list>
|
||||||
<ng-container *ngIf="!listHeader; else header"></ng-container>
|
<ng-container *ngIf="!listHeader; else header"></ng-container>
|
||||||
<ng-container *ngFor="let item of items | async">
|
<ng-container *ngFor="let item of items">
|
||||||
<ng-container
|
<ng-container
|
||||||
*ngTemplateOutlet="listItemTemplateRef || defaultListItem; context: {$implicit: item}"
|
*ngTemplateOutlet="listItemTemplateRef || defaultListItem; context: {$implicit: item}"
|
||||||
></ng-container>
|
></ng-container>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
</ion-list>
|
</ion-list>
|
||||||
<ion-label class="empty-list-message" *ngIf="emptyListMessage && (items | async)?.length === 0"
|
<ion-label class="empty-list-message" *ngIf="emptyListMessage && items.length === 0"
|
||||||
>{{ emptyListMessage }}</ion-label
|
>{{ emptyListMessage }}</ion-label
|
||||||
>
|
>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
|
|||||||
@@ -13,94 +13,93 @@
|
|||||||
* this program. If not, see <https://www.gnu.org/licenses/>.
|
* this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
import {Component, Input, OnInit} from '@angular/core';
|
import {Component, Input, OnInit} from '@angular/core';
|
||||||
import {SCCatalog, SCSearchBooleanFilter, SCDucetSort} from '@openstapps/core';
|
import {SCCatalog, SCThings} from '@openstapps/core';
|
||||||
import {SearchPageComponent} from '../../list/search-page.component';
|
import {DataProvider} from '../../data.provider';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'stapps-catalog-detail-content',
|
selector: 'stapps-catalog-detail-content',
|
||||||
templateUrl: 'catalog-detail-content.html',
|
templateUrl: 'catalog-detail-content.html',
|
||||||
styleUrls: ['catalog-detail-content.scss'],
|
styleUrls: ['catalog-detail-content.scss'],
|
||||||
})
|
})
|
||||||
export class CatalogDetailContentComponent extends SearchPageComponent implements OnInit {
|
export class CatalogDetailContentComponent implements OnInit {
|
||||||
/**
|
/**
|
||||||
* SCCatalog to display
|
* SCCatalog to display
|
||||||
*/
|
*/
|
||||||
@Input() item: SCCatalog;
|
@Input() item: SCCatalog;
|
||||||
|
|
||||||
ngOnInit() {
|
items: Promise<SCThings[]>;
|
||||||
super.ngOnInit();
|
|
||||||
}
|
|
||||||
|
|
||||||
initialize() {
|
constructor(private dataProvider: DataProvider) {}
|
||||||
this.showDefaultData = true;
|
|
||||||
this.pageSize = 100;
|
|
||||||
|
|
||||||
const nameSort: SCDucetSort = {
|
async ngOnInit() {
|
||||||
arguments: {field: 'name'},
|
this.items = this.dataProvider
|
||||||
order: 'asc',
|
.search({
|
||||||
type: 'ducet',
|
size: 100,
|
||||||
};
|
sort: [
|
||||||
|
|
||||||
const typeSort: SCDucetSort = {
|
|
||||||
arguments: {field: 'type'},
|
|
||||||
order: 'desc',
|
|
||||||
type: 'ducet',
|
|
||||||
};
|
|
||||||
|
|
||||||
this.sortQuery = [typeSort, nameSort];
|
|
||||||
|
|
||||||
const subCatalogFilter: SCSearchBooleanFilter = {
|
|
||||||
arguments: {
|
|
||||||
operation: 'and',
|
|
||||||
filters: [
|
|
||||||
{
|
{
|
||||||
type: 'value',
|
arguments: {field: 'type'},
|
||||||
arguments: {
|
order: 'desc',
|
||||||
field: 'type',
|
type: 'ducet',
|
||||||
value: 'catalog',
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: 'value',
|
arguments: {field: 'name'},
|
||||||
arguments: {
|
order: 'asc',
|
||||||
field: 'superCatalog.uid',
|
type: 'ducet',
|
||||||
value: this.item.uid,
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
},
|
filter: {
|
||||||
type: 'boolean',
|
arguments: {
|
||||||
};
|
filters: [
|
||||||
|
{
|
||||||
const subEventsFilter: SCSearchBooleanFilter = {
|
arguments: {
|
||||||
arguments: {
|
operation: 'and',
|
||||||
operation: 'and',
|
filters: [
|
||||||
filters: [
|
{
|
||||||
{
|
type: 'value',
|
||||||
type: 'value',
|
arguments: {
|
||||||
arguments: {
|
field: 'type',
|
||||||
field: 'type',
|
value: 'catalog',
|
||||||
value: 'academic event',
|
},
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
type: 'value',
|
||||||
|
arguments: {
|
||||||
|
field: 'superCatalog.uid',
|
||||||
|
value: this.item.uid,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
type: 'boolean',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
arguments: {
|
||||||
|
operation: 'and',
|
||||||
|
filters: [
|
||||||
|
{
|
||||||
|
type: 'value',
|
||||||
|
arguments: {
|
||||||
|
field: 'type',
|
||||||
|
value: 'academic event',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
type: 'value',
|
||||||
|
arguments: {
|
||||||
|
field: 'catalogs.uid',
|
||||||
|
value: this.item.uid,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
type: 'boolean',
|
||||||
|
},
|
||||||
|
],
|
||||||
|
operation: 'or',
|
||||||
},
|
},
|
||||||
{
|
type: 'boolean',
|
||||||
type: 'value',
|
},
|
||||||
arguments: {
|
})
|
||||||
field: 'catalogs.uid',
|
.then(({data}) => data);
|
||||||
value: this.item.uid,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
],
|
|
||||||
},
|
|
||||||
type: 'boolean',
|
|
||||||
};
|
|
||||||
|
|
||||||
this.forcedFilter = {
|
|
||||||
arguments: {
|
|
||||||
filters: [subCatalogFilter, subEventsFilter],
|
|
||||||
operation: 'or',
|
|
||||||
},
|
|
||||||
type: 'boolean',
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,19 +12,49 @@
|
|||||||
* You should have received a copy of the GNU General Public License along with
|
* You should have received a copy of the GNU General Public License along with
|
||||||
* this program. If not, see <https://www.gnu.org/licenses/>.
|
* this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
import {Component, Input} from '@angular/core';
|
import {Component, Input, OnInit} from '@angular/core';
|
||||||
import {SCDateSeries} from '@openstapps/core';
|
import {SCDateSeries} from '@openstapps/core';
|
||||||
|
import {ScheduleProvider, toDateSeriesRelevantData} from '../../../calendar/schedule.provider';
|
||||||
|
import {Observable} from 'rxjs';
|
||||||
|
import {map} from 'rxjs/operators';
|
||||||
|
import {DataRoutingService} from '../../data-routing.service';
|
||||||
|
import {Router} from '@angular/router';
|
||||||
|
import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
|
||||||
|
|
||||||
/**
|
|
||||||
* TODO
|
|
||||||
*/
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'stapps-date-series-detail-content',
|
selector: 'stapps-date-series-detail-content',
|
||||||
templateUrl: 'date-series-detail-content.html',
|
templateUrl: 'date-series-detail-content.html',
|
||||||
|
styleUrls: ['date-series-detail-content.scss'],
|
||||||
})
|
})
|
||||||
export class DateSeriesDetailContentComponent {
|
export class DateSeriesDetailContentComponent implements OnInit {
|
||||||
/**
|
|
||||||
* TODO
|
|
||||||
*/
|
|
||||||
@Input() item: SCDateSeries;
|
@Input() item: SCDateSeries;
|
||||||
|
|
||||||
|
isInCalendar: Observable<boolean>;
|
||||||
|
|
||||||
|
constructor(
|
||||||
|
readonly scheduleProvider: ScheduleProvider,
|
||||||
|
dataRoutingService: DataRoutingService,
|
||||||
|
router: Router,
|
||||||
|
) {
|
||||||
|
dataRoutingService
|
||||||
|
.itemSelectListener()
|
||||||
|
.pipe(takeUntilDestroyed())
|
||||||
|
.subscribe(item => {
|
||||||
|
void router.navigate(['/data-detail', item.uid], {state: {item}});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
ngOnInit() {
|
||||||
|
this.isInCalendar = this.scheduleProvider.uuids$.pipe(map(it => it.includes(this.item.uid)));
|
||||||
|
}
|
||||||
|
|
||||||
|
addToCalendar() {
|
||||||
|
const current = this.scheduleProvider.partialEvents$.value;
|
||||||
|
this.scheduleProvider.partialEvents$.next([...current, toDateSeriesRelevantData(this.item)]);
|
||||||
|
}
|
||||||
|
|
||||||
|
removeFromCalendar() {
|
||||||
|
const filtered = this.scheduleProvider.partialEvents$.value.filter(it => it.uid !== this.item.uid);
|
||||||
|
this.scheduleProvider.partialEvents$.next(filtered);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,23 +12,18 @@
|
|||||||
~ You should have received a copy of the GNU General Public License along with
|
~ You should have received a copy of the GNU General Public License along with
|
||||||
~ this program. If not, see <https://www.gnu.org/licenses/>.
|
~ this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
-->
|
-->
|
||||||
<ion-card>
|
<ng-container *ngIf="isInCalendar | async; else add">
|
||||||
<ion-card-header> {{ 'event' | propertyNameTranslate : item | titlecase }} </ion-card-header>
|
<ion-chip outline="true" color="success" (click)="removeFromCalendar()">
|
||||||
<ion-card-content>
|
<ion-icon name="event_available" fill="true"></ion-icon>
|
||||||
<a [routerLink]="['/data-detail', item.event.uid]">{{ 'name' | thingTranslate : item.event }}</a>
|
<ion-label>{{'chips.addEvent.addedToEvents' | translate}}</ion-label>
|
||||||
</ion-card-content>
|
</ion-chip>
|
||||||
</ion-card>
|
</ng-container>
|
||||||
<ion-card *ngIf="item.inPlace">
|
<ng-template #add>
|
||||||
<ion-card-header> {{ 'inPlace' | propertyNameTranslate : item | titlecase }} </ion-card-header>
|
<ion-chip outline="true" color="primary" (click)="addToCalendar()">
|
||||||
<ion-card-content>
|
<ion-icon name="calendar_today"></ion-icon>
|
||||||
<ion-icon name="pin_drop"> </ion-icon>
|
<ion-label>{{'chips.addEvent.addEvent' | translate}}</ion-label>
|
||||||
<a [routerLink]="['/data-detail', item.inPlace.uid]">{{ 'name' | thingTranslate : item.inPlace }}</a>
|
</ion-chip>
|
||||||
<stapps-address-detail
|
</ng-template>
|
||||||
*ngIf="item.inPlace.address"
|
|
||||||
[address]="item.inPlace.address"
|
|
||||||
></stapps-address-detail>
|
|
||||||
</ion-card-content>
|
|
||||||
</ion-card>
|
|
||||||
<stapps-simple-card
|
<stapps-simple-card
|
||||||
title="{{ 'duration' | propertyNameTranslate : item | titlecase }}"
|
title="{{ 'duration' | propertyNameTranslate : item | titlecase }}"
|
||||||
[content]="[item.duration | amDuration : 'minutes']"
|
[content]="[item.duration | amDuration : 'minutes']"
|
||||||
@@ -56,3 +51,16 @@
|
|||||||
[content]="item.performers"
|
[content]="item.performers"
|
||||||
></stapps-simple-card>
|
></stapps-simple-card>
|
||||||
<stapps-offers-detail *ngIf="item.offers" [offers]="item.offers"></stapps-offers-detail>
|
<stapps-offers-detail *ngIf="item.offers" [offers]="item.offers"></stapps-offers-detail>
|
||||||
|
<ion-card>
|
||||||
|
<ion-card-header> {{ 'event' | propertyNameTranslate : item | titlecase }} </ion-card-header>
|
||||||
|
<ion-card-content>
|
||||||
|
<stapps-data-list-item [item]="$any(item.event)"></stapps-data-list-item>
|
||||||
|
</ion-card-content>
|
||||||
|
</ion-card>
|
||||||
|
<ion-card *ngIf="item.inPlace">
|
||||||
|
<ion-card-header> {{ 'inPlace' | propertyNameTranslate : item | titlecase }} </ion-card-header>
|
||||||
|
<ion-card-content>
|
||||||
|
<stapps-data-list-item [item]="$any(item.inPlace)"></stapps-data-list-item>
|
||||||
|
</ion-card-content>
|
||||||
|
</ion-card>
|
||||||
|
<stapps-map-widget *ngIf="item.inPlace?.geo" [place]="item.inPlace"></stapps-map-widget>
|
||||||
|
|||||||
@@ -0,0 +1,6 @@
|
|||||||
|
ion-chip {
|
||||||
|
position: absolute;
|
||||||
|
z-index: 1;
|
||||||
|
top: 0;
|
||||||
|
right: 0;
|
||||||
|
}
|
||||||
@@ -17,7 +17,7 @@
|
|||||||
<ion-row>
|
<ion-row>
|
||||||
<ion-col>
|
<ion-col>
|
||||||
<div class="ion-text-wrap">
|
<div class="ion-text-wrap">
|
||||||
<ion-label class="title">{{ 'name' | thingTranslate : item }}</ion-label>
|
<ion-label class="title">{{ 'event.name' | thingTranslate : item }}</ion-label>
|
||||||
<p>
|
<p>
|
||||||
<ion-icon name="calendar_today"></ion-icon>
|
<ion-icon name="calendar_today"></ion-icon>
|
||||||
<span *ngIf="item.dates[0] && item.dates[item.dates.length - 1]">
|
<span *ngIf="item.dates[0] && item.dates[item.dates.length - 1]">
|
||||||
|
|||||||
@@ -59,7 +59,7 @@ export class PlaceDetailContentComponent implements OnInit {
|
|||||||
.itemSelectListener()
|
.itemSelectListener()
|
||||||
.pipe(takeUntilDestroyed())
|
.pipe(takeUntilDestroyed())
|
||||||
.subscribe(item => {
|
.subscribe(item => {
|
||||||
void router.navigate(['/data-detail', item.uid]);
|
void router.navigate(['/data-detail', item.uid], {state: {item}});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -38,9 +38,5 @@
|
|||||||
</ion-card>
|
</ion-card>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
<ng-container *ngIf="hasValidLocation">
|
<ng-container *ngIf="hasValidLocation">
|
||||||
<stapps-map-widget
|
<stapps-map-widget [place]="item" expandable="true"></stapps-map-widget>
|
||||||
class="map-widget expand-when-space"
|
|
||||||
[place]="item"
|
|
||||||
expandable="true"
|
|
||||||
></stapps-map-widget>
|
|
||||||
</ng-container>
|
</ng-container>
|
||||||
|
|||||||
@@ -12,10 +12,3 @@
|
|||||||
* You should have received a copy of the GNU General Public License along with
|
* You should have received a copy of the GNU General Public License along with
|
||||||
* this program. If not, see <https://www.gnu.org/licenses/>.
|
* this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
.map-widget {
|
|
||||||
position: relative;
|
|
||||||
width: auto;
|
|
||||||
height: 300px;
|
|
||||||
min-height: 300px;
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -75,7 +75,7 @@ export class PlaceMensaDetailComponent implements AfterViewInit {
|
|||||||
.itemSelectListener()
|
.itemSelectListener()
|
||||||
.pipe(takeUntilDestroyed(this.destroy$))
|
.pipe(takeUntilDestroyed(this.destroy$))
|
||||||
.subscribe(item => {
|
.subscribe(item => {
|
||||||
void this.router.navigate(['/data-detail', item.uid]);
|
void this.router.navigate(['/data-detail', item.uid], {state: {item}});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -112,12 +112,15 @@ export class FavoritesPageComponent extends SearchPageComponent implements OnIni
|
|||||||
.subscribe(item => {
|
.subscribe(item => {
|
||||||
if (this.itemRouting) {
|
if (this.itemRouting) {
|
||||||
if ([SCThingType.Book, SCThingType.Periodical, SCThingType.Article].includes(item.type)) {
|
if ([SCThingType.Book, SCThingType.Periodical, SCThingType.Article].includes(item.type)) {
|
||||||
void this.router.navigate([
|
void this.router.navigate(
|
||||||
'hebis-detail',
|
[
|
||||||
(item.origin && 'originalId' in item.origin && item.origin['originalId']) || '',
|
'hebis-detail',
|
||||||
]);
|
(item.origin && 'originalId' in item.origin && item.origin['originalId']) || '',
|
||||||
|
],
|
||||||
|
{state: {item}},
|
||||||
|
);
|
||||||
} else {
|
} else {
|
||||||
void this.router.navigate(['data-detail', item.uid]);
|
void this.router.navigate(['data-detail', item.uid], {state: {item}});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -12,16 +12,11 @@
|
|||||||
* You should have received a copy of the GNU General Public License along with
|
* You should have received a copy of the GNU General Public License along with
|
||||||
* this program. If not, see <https://www.gnu.org/licenses/>.
|
* this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
import {Component, OnInit} from '@angular/core';
|
import {Component, inject, OnInit} from '@angular/core';
|
||||||
import {ActivatedRoute} from '@angular/router';
|
|
||||||
import {TranslateService} from '@ngx-translate/core';
|
|
||||||
import {SCUuid} from '@openstapps/core';
|
import {SCUuid} from '@openstapps/core';
|
||||||
import {FavoritesService} from '../../favorites/favorites.service';
|
|
||||||
import {DataProvider} from '../../data/data.provider';
|
|
||||||
import {DataDetailComponent} from '../../data/detail/data-detail.component';
|
import {DataDetailComponent} from '../../data/detail/data-detail.component';
|
||||||
import {DaiaDataProvider} from '../daia-data.provider';
|
import {DaiaDataProvider} from '../daia-data.provider';
|
||||||
import {DaiaHolding} from '../protocol/response';
|
import {DaiaHolding} from '../protocol/response';
|
||||||
import {ModalController} from '@ionic/angular';
|
|
||||||
import {groupByStable} from '@openstapps/collection-utils';
|
import {groupByStable} from '@openstapps/collection-utils';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -37,28 +32,10 @@ export class DaiaAvailabilityComponent extends DataDetailComponent implements On
|
|||||||
|
|
||||||
holdingsByDepartments?: Map<DaiaHolding['department']['id'], DaiaHolding[]>;
|
holdingsByDepartments?: Map<DaiaHolding['department']['id'], DaiaHolding[]>;
|
||||||
|
|
||||||
/**
|
private daiaDataProvider = inject(DaiaDataProvider);
|
||||||
*
|
|
||||||
* @param route the route the page was accessed from
|
|
||||||
* @param dataProvider the data provider
|
|
||||||
* @param favoritesService the favorites provider
|
|
||||||
* @param modalController the modal controller
|
|
||||||
* @param translateService he translate provider
|
|
||||||
* @param daiaDataProvider DaiaDataProvider
|
|
||||||
*/
|
|
||||||
constructor(
|
|
||||||
route: ActivatedRoute,
|
|
||||||
dataProvider: DataProvider,
|
|
||||||
favoritesService: FavoritesService,
|
|
||||||
modalController: ModalController,
|
|
||||||
translateService: TranslateService,
|
|
||||||
private daiaDataProvider: DaiaDataProvider,
|
|
||||||
) {
|
|
||||||
super(route, dataProvider, favoritesService, modalController, translateService);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Initialize
|
* @override
|
||||||
*/
|
*/
|
||||||
async ngOnInit() {
|
async ngOnInit() {
|
||||||
const uid = this.route.snapshot.paramMap.get('uid');
|
const uid = this.route.snapshot.paramMap.get('uid');
|
||||||
|
|||||||
@@ -107,8 +107,8 @@ describe('HebisDetailComponent', () => {
|
|||||||
expect(HebisDetailComponent.prototype.getItem).toHaveBeenCalledWith(sampleThing.uid, false);
|
expect(HebisDetailComponent.prototype.getItem).toHaveBeenCalledWith(sampleThing.uid, false);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should get a data item when the view is entered', () => {
|
it('should get a data item when initialized', () => {
|
||||||
comp.ionViewWillEnter();
|
comp.ngOnInit();
|
||||||
expect(HebisDetailComponent.prototype.getItem).toHaveBeenCalledWith(sampleThing.uid, false);
|
expect(HebisDetailComponent.prototype.getItem).toHaveBeenCalledWith(sampleThing.uid, false);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -12,16 +12,11 @@
|
|||||||
* You should have received a copy of the GNU General Public License along with
|
* You should have received a copy of the GNU General Public License along with
|
||||||
* this program. If not, see <https://www.gnu.org/licenses/>.
|
* this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
import {Component} from '@angular/core';
|
import {Component, inject, OnInit} from '@angular/core';
|
||||||
import {ActivatedRoute} from '@angular/router';
|
|
||||||
import {TranslateService} from '@ngx-translate/core';
|
|
||||||
import {SCUuid} from '@openstapps/core';
|
import {SCUuid} from '@openstapps/core';
|
||||||
import {HebisDataProvider} from '../hebis-data.provider';
|
import {HebisDataProvider} from '../hebis-data.provider';
|
||||||
import {FavoritesService} from '../../favorites/favorites.service';
|
|
||||||
import {DataProvider} from '../../data/data.provider';
|
|
||||||
import {DataDetailComponent} from '../../data/detail/data-detail.component';
|
import {DataDetailComponent} from '../../data/detail/data-detail.component';
|
||||||
import {DaiaHolding} from '../protocol/response';
|
import {DaiaHolding} from '../protocol/response';
|
||||||
import {ModalController} from '@ionic/angular';
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A Component to display an SCThing detailed
|
* A Component to display an SCThing detailed
|
||||||
@@ -31,33 +26,15 @@ import {ModalController} from '@ionic/angular';
|
|||||||
styleUrls: ['hebis-detail.scss'],
|
styleUrls: ['hebis-detail.scss'],
|
||||||
templateUrl: 'hebis-detail.html',
|
templateUrl: 'hebis-detail.html',
|
||||||
})
|
})
|
||||||
export class HebisDetailComponent extends DataDetailComponent {
|
export class HebisDetailComponent extends DataDetailComponent implements OnInit {
|
||||||
holdings: DaiaHolding[];
|
holdings: DaiaHolding[];
|
||||||
|
|
||||||
/**
|
private hebisDataProvider = inject(HebisDataProvider);
|
||||||
*
|
|
||||||
* @param route the route the page was accessed from
|
|
||||||
* @param dataProvider the data provider
|
|
||||||
* @param favoritesService the favorites provider
|
|
||||||
* @param modalController the modal controller
|
|
||||||
* @param translateService he translate provider
|
|
||||||
* @param hebisDataProvider HebisDataProvider
|
|
||||||
*/
|
|
||||||
constructor(
|
|
||||||
route: ActivatedRoute,
|
|
||||||
dataProvider: DataProvider,
|
|
||||||
favoritesService: FavoritesService,
|
|
||||||
modalController: ModalController,
|
|
||||||
translateService: TranslateService,
|
|
||||||
private hebisDataProvider: HebisDataProvider,
|
|
||||||
) {
|
|
||||||
super(route, dataProvider, favoritesService, modalController, translateService);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Initialize
|
* @override
|
||||||
*/
|
*/
|
||||||
async ionViewWillEnter() {
|
async ngOnInit() {
|
||||||
const uid = this.route.snapshot.paramMap.get('uid') || '';
|
const uid = this.route.snapshot.paramMap.get('uid') || '';
|
||||||
await this.getItem(uid ?? '', false);
|
await this.getItem(uid ?? '', false);
|
||||||
}
|
}
|
||||||
@@ -68,9 +45,11 @@ export class HebisDetailComponent extends DataDetailComponent {
|
|||||||
* @param _forceReload Ignore any cached data
|
* @param _forceReload Ignore any cached data
|
||||||
*/
|
*/
|
||||||
async getItem(uid: SCUuid, _forceReload: boolean) {
|
async getItem(uid: SCUuid, _forceReload: boolean) {
|
||||||
this.hebisDataProvider.hebisSearch({query: uid, page: 0}).then(result => {
|
this.item = await (this.inputItem ??
|
||||||
// eslint-disable-next-line unicorn/no-null
|
this.hebisDataProvider.hebisSearch({query: uid, page: 0}).then(
|
||||||
this.item = (result.data && result.data[0]) || null;
|
result =>
|
||||||
});
|
// eslint-disable-next-line unicorn/no-null
|
||||||
|
(result.data && result.data[0]) || null,
|
||||||
|
));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,19 +13,12 @@
|
|||||||
* this program. If not, see <https://www.gnu.org/licenses/>.
|
* this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
import {Component, Input, OnInit} from '@angular/core';
|
import {Component, Input, OnInit} from '@angular/core';
|
||||||
import {ActivatedRoute, Router} from '@angular/router';
|
|
||||||
import {AlertController, AnimationController} from '@ionic/angular';
|
|
||||||
import {NGXLogger} from 'ngx-logger';
|
|
||||||
import {combineLatest} from 'rxjs';
|
import {combineLatest} from 'rxjs';
|
||||||
import {debounceTime, distinctUntilChanged, startWith} from 'rxjs/operators';
|
import {debounceTime, distinctUntilChanged, startWith} from 'rxjs/operators';
|
||||||
import {ContextMenuService} from '../../menu/context/context-menu.service';
|
|
||||||
import {SettingsProvider} from '../../settings/settings.provider';
|
|
||||||
import {DataRoutingService} from '../../data/data-routing.service';
|
|
||||||
import {SearchPageComponent} from '../../data/list/search-page.component';
|
import {SearchPageComponent} from '../../data/list/search-page.component';
|
||||||
import {HebisDataProvider} from '../hebis-data.provider';
|
import {HebisDataProvider} from '../hebis-data.provider';
|
||||||
import {PositionService} from '../../map/position.service';
|
|
||||||
import {ConfigProvider} from '../../config/config.provider';
|
|
||||||
import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
|
import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
|
||||||
|
import {DataProvider} from '../../data/data.provider';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* HebisSearchPageComponent queries things and shows list of things as search results and filter as context menu
|
* HebisSearchPageComponent queries things and shows list of things as search results and filter as context menu
|
||||||
@@ -34,6 +27,7 @@ import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
|
|||||||
selector: 'stapps-hebissearch-page',
|
selector: 'stapps-hebissearch-page',
|
||||||
templateUrl: 'hebis-search-page.html',
|
templateUrl: 'hebis-search-page.html',
|
||||||
styleUrls: ['../../data/list/search-page.scss'],
|
styleUrls: ['../../data/list/search-page.scss'],
|
||||||
|
providers: [{provide: DataProvider, useClass: HebisDataProvider}],
|
||||||
})
|
})
|
||||||
export class HebisSearchPageComponent extends SearchPageComponent implements OnInit {
|
export class HebisSearchPageComponent extends SearchPageComponent implements OnInit {
|
||||||
/**
|
/**
|
||||||
@@ -46,47 +40,6 @@ export class HebisSearchPageComponent extends SearchPageComponent implements OnI
|
|||||||
*/
|
*/
|
||||||
page = 0;
|
page = 0;
|
||||||
|
|
||||||
/**
|
|
||||||
* Injects the providers and creates subscriptions
|
|
||||||
* @param alertController AlertController
|
|
||||||
* @param dataProvider HebisProvider
|
|
||||||
* @param contextMenuService ContextMenuService
|
|
||||||
* @param settingsProvider SettingsProvider
|
|
||||||
* @param logger An angular logger
|
|
||||||
* @param dataRoutingService DataRoutingService
|
|
||||||
* @param router Router
|
|
||||||
* @param route Active Route
|
|
||||||
* @param positionService PositionService
|
|
||||||
* @param configProvider ConfigProvider
|
|
||||||
*/
|
|
||||||
constructor(
|
|
||||||
protected readonly alertController: AlertController,
|
|
||||||
protected dataProvider: HebisDataProvider,
|
|
||||||
protected readonly contextMenuService: ContextMenuService,
|
|
||||||
protected readonly settingsProvider: SettingsProvider,
|
|
||||||
protected readonly logger: NGXLogger,
|
|
||||||
protected dataRoutingService: DataRoutingService,
|
|
||||||
protected router: Router,
|
|
||||||
route: ActivatedRoute,
|
|
||||||
protected positionService: PositionService,
|
|
||||||
configProvider: ConfigProvider,
|
|
||||||
animationController: AnimationController,
|
|
||||||
) {
|
|
||||||
super(
|
|
||||||
alertController,
|
|
||||||
dataProvider,
|
|
||||||
contextMenuService,
|
|
||||||
settingsProvider,
|
|
||||||
logger,
|
|
||||||
dataRoutingService,
|
|
||||||
router,
|
|
||||||
route,
|
|
||||||
positionService,
|
|
||||||
configProvider,
|
|
||||||
animationController,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Fetches items with set query configuration
|
* Fetches items with set query configuration
|
||||||
* @param append If true fetched data gets appended to existing, override otherwise (default false)
|
* @param append If true fetched data gets appended to existing, override otherwise (default false)
|
||||||
@@ -103,7 +56,7 @@ export class HebisSearchPageComponent extends SearchPageComponent implements OnI
|
|||||||
searchOptions.query = this.queryText;
|
searchOptions.query = this.queryText;
|
||||||
}
|
}
|
||||||
|
|
||||||
return this.dataProvider.hebisSearch(searchOptions).then(
|
return (this.dataProvider as HebisDataProvider).hebisSearch(searchOptions).then(
|
||||||
async result => {
|
async result => {
|
||||||
/*this.singleTypeResponse =
|
/*this.singleTypeResponse =
|
||||||
result.facets.find(facet => facet.field === 'type')?.buckets
|
result.facets.find(facet => facet.field === 'type')?.buckets
|
||||||
@@ -176,10 +129,10 @@ export class HebisSearchPageComponent extends SearchPageComponent implements OnI
|
|||||||
.pipe(takeUntilDestroyed(this.destroy$))
|
.pipe(takeUntilDestroyed(this.destroy$))
|
||||||
.subscribe(async item => {
|
.subscribe(async item => {
|
||||||
if (this.itemRouting) {
|
if (this.itemRouting) {
|
||||||
void this.router.navigate([
|
void this.router.navigate(
|
||||||
'hebis-detail',
|
['hebis-detail', (item.origin && 'originalId' in item.origin && item.origin['originalId']) || ''],
|
||||||
(item.origin && 'originalId' in item.origin && item.origin['originalId']) || '',
|
{state: {item}},
|
||||||
]);
|
);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
92
frontend/app/src/app/modules/map/geo-navigation.directive.ts
Normal file
92
frontend/app/src/app/modules/map/geo-navigation.directive.ts
Normal file
@@ -0,0 +1,92 @@
|
|||||||
|
import {Directive, HostListener, Input} from '@angular/core';
|
||||||
|
import {SCPlaceWithoutReferences, SCThings, SCThingWithoutReferences} from '@openstapps/core';
|
||||||
|
import {Device} from '@capacitor/device';
|
||||||
|
import {ActionSheetController, ActionSheetOptions, ToastController} from '@ionic/angular';
|
||||||
|
import {TranslateService} from '@ngx-translate/core';
|
||||||
|
import {ThingTranslateService} from '../../translation/thing-translate.service';
|
||||||
|
import {Clipboard} from '@capacitor/clipboard';
|
||||||
|
import {PositionService} from './position.service';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A button that provides navigation options to the user via an action sheet
|
||||||
|
* @example
|
||||||
|
* <ion-button shape="round" [geoNavigation]="place">
|
||||||
|
* <ion-icon name="directions" slot="start"></ion-icon>
|
||||||
|
* <ion-label>{{'map.directions.TITLE' | translate}}</ion-label>
|
||||||
|
* </ion-button>
|
||||||
|
*/
|
||||||
|
@Directive({
|
||||||
|
selector: '[geoNavigation]',
|
||||||
|
standalone: true,
|
||||||
|
})
|
||||||
|
export class GeoNavigationDirective {
|
||||||
|
@Input({required: true}) geoNavigation: SCThingWithoutReferences &
|
||||||
|
Pick<SCPlaceWithoutReferences, 'geo' | 'address'>;
|
||||||
|
|
||||||
|
constructor(
|
||||||
|
private actionSheetController: ActionSheetController,
|
||||||
|
private translateService: TranslateService,
|
||||||
|
private thingTranslate: ThingTranslateService,
|
||||||
|
private toastController: ToastController,
|
||||||
|
private positionService: PositionService,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
@HostListener('click', ['$event'])
|
||||||
|
async presentActionSheet(event: Event) {
|
||||||
|
event.stopPropagation();
|
||||||
|
const {operatingSystem} = await Device.getInfo();
|
||||||
|
const [lon, lat] = this.geoNavigation.geo.point.coordinates;
|
||||||
|
|
||||||
|
const supportedMapProviders =
|
||||||
|
operatingSystem === 'mac' || operatingSystem === 'ios'
|
||||||
|
? ['OSM_ROUTING', 'APPLE_MAPS', 'GOOGLE_MAPS']
|
||||||
|
: ['OSM_ROUTING', 'GOOGLE_MAPS'];
|
||||||
|
const address = this.geoNavigation.address
|
||||||
|
? this.translateService.instant(
|
||||||
|
'map.directions.ADDRESS',
|
||||||
|
this.thingTranslate.get(this.geoNavigation as SCThings, 'address'),
|
||||||
|
)
|
||||||
|
: `${lat}, ${lon}`;
|
||||||
|
|
||||||
|
const options: ActionSheetOptions = {
|
||||||
|
header: this.translateService.instant('map.directions.TITLE_LONG', {
|
||||||
|
name: this.thingTranslate.get(this.geoNavigation as SCThings, 'name'),
|
||||||
|
}),
|
||||||
|
subHeader: address,
|
||||||
|
buttons: [
|
||||||
|
{
|
||||||
|
text: this.translateService.instant('map.directions.COPY_ADDRESS'),
|
||||||
|
role: 'selected',
|
||||||
|
handler: async () => {
|
||||||
|
await Clipboard.write({string: address});
|
||||||
|
this.toastController
|
||||||
|
.create({
|
||||||
|
message: this.translateService.instant('map.directions.ADDRESS_COPIED'),
|
||||||
|
duration: 500,
|
||||||
|
})
|
||||||
|
.then(toast => toast.present());
|
||||||
|
},
|
||||||
|
},
|
||||||
|
...supportedMapProviders.map(provider => ({
|
||||||
|
text: this.translateService.instant(`map.directions.${provider}.TITLE`),
|
||||||
|
handler: () => {
|
||||||
|
const url: string = this.translateService.instant(`map.directions.${provider}.URL`, {
|
||||||
|
lat,
|
||||||
|
lon,
|
||||||
|
posLat: this.positionService.position?.latitude ?? 0,
|
||||||
|
posLon: this.positionService.position?.longitude ?? 0,
|
||||||
|
});
|
||||||
|
window.open(url.replace(/&?\w+=0,0/, ''), '_blank', 'noreferrer');
|
||||||
|
},
|
||||||
|
})),
|
||||||
|
{
|
||||||
|
text: this.translateService.instant('abort'),
|
||||||
|
role: 'cancel',
|
||||||
|
},
|
||||||
|
],
|
||||||
|
};
|
||||||
|
|
||||||
|
const actionSheet = await this.actionSheetController.create(options);
|
||||||
|
await actionSheet.present();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,36 +0,0 @@
|
|||||||
<!--
|
|
||||||
~ Copyright (C) 2022 StApps
|
|
||||||
~ This program is free software: you can redistribute it and/or modify it
|
|
||||||
~ under the terms of the GNU General Public License as published by the Free
|
|
||||||
~ Software Foundation, version 3.
|
|
||||||
~
|
|
||||||
~ This program is distributed in the hope that it will be useful, but WITHOUT
|
|
||||||
~ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
||||||
~ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
|
||||||
~ more details.
|
|
||||||
~
|
|
||||||
~ You should have received a copy of the GNU General Public License along with
|
|
||||||
~ this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
-->
|
|
||||||
|
|
||||||
<ion-card class="compact">
|
|
||||||
<ion-card-header>
|
|
||||||
<stapps-data-list-item [item]="$any(item)" id="show-more"></stapps-data-list-item>
|
|
||||||
<stapps-skeleton-list-item *ngIf="!item"></stapps-skeleton-list-item>
|
|
||||||
</ion-card-header>
|
|
||||||
<ion-card-content>
|
|
||||||
<ion-note>
|
|
||||||
<span *ngIf="item.address as address">
|
|
||||||
<span *ngIf="$any(item).inPlace">{{ $any(item).inPlace.name }},</span>
|
|
||||||
{{ address.streetAddress }}, {{ address.addressLocality }}
|
|
||||||
</span>
|
|
||||||
</ion-note>
|
|
||||||
<ion-button
|
|
||||||
size="small"
|
|
||||||
class="show-more-button"
|
|
||||||
fill="clear"
|
|
||||||
[routerLink]="['/data-detail', item.uid]"
|
|
||||||
>{{ 'map.page.buttons.MORE' | translate }}</ion-button
|
|
||||||
>
|
|
||||||
</ion-card-content>
|
|
||||||
</ion-card>
|
|
||||||
@@ -1,72 +0,0 @@
|
|||||||
/*!
|
|
||||||
* Copyright (C) 2022 StApps
|
|
||||||
* This program is free software: you can redistribute it and/or modify it
|
|
||||||
* under the terms of the GNU General Public License as published by the Free
|
|
||||||
* Software Foundation, version 3.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful, but WITHOUT
|
|
||||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
|
||||||
* more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License along with
|
|
||||||
* this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
@import '../../../../theme/util/mixins';
|
|
||||||
|
|
||||||
:host {
|
|
||||||
display: block;
|
|
||||||
max-width: 100%;
|
|
||||||
|
|
||||||
ion-card {
|
|
||||||
overflow: visible;
|
|
||||||
padding: 0;
|
|
||||||
|
|
||||||
ion-card-header {
|
|
||||||
padding: 0;
|
|
||||||
border-bottom: var(--border-width-default) solid var(--border-color-default);
|
|
||||||
|
|
||||||
stapps-data-list-item {
|
|
||||||
--ion-margin: 0;
|
|
||||||
|
|
||||||
&::ng-deep ion-item {
|
|
||||||
--padding-start: 0;
|
|
||||||
--padding-end: 0;
|
|
||||||
|
|
||||||
ion-label {
|
|
||||||
white-space: break-spaces;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.close {
|
|
||||||
--padding-top: 0;
|
|
||||||
--padding-bottom: 0;
|
|
||||||
--padding-start: 0;
|
|
||||||
--padding-end: 0;
|
|
||||||
|
|
||||||
position: absolute;
|
|
||||||
z-index: 1;
|
|
||||||
top: -15px;
|
|
||||||
right: -15px;
|
|
||||||
|
|
||||||
ion-icon {
|
|
||||||
width: 30px;
|
|
||||||
height: 30px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
ion-card-content {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: row;
|
|
||||||
padding: var(--spacing-md);
|
|
||||||
|
|
||||||
.show-more-button {
|
|
||||||
margin-left: auto;
|
|
||||||
text-transform: uppercase;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,41 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2021 StApps
|
|
||||||
* This program is free software: you can redistribute it and/or modify it
|
|
||||||
* under the terms of the GNU General Public License as published by the Free
|
|
||||||
* Software Foundation, version 3.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful, but WITHOUT
|
|
||||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
|
||||||
* more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License along with
|
|
||||||
* this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
import {Component, EventEmitter, Input, Output} from '@angular/core';
|
|
||||||
import {SCPlace} from '@openstapps/core';
|
|
||||||
import {IonRouterOutlet} from '@ionic/angular';
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
selector: 'stapps-map-item',
|
|
||||||
templateUrl: './map-item.component.html',
|
|
||||||
styleUrls: ['./map-item.component.scss'],
|
|
||||||
})
|
|
||||||
export class MapItemComponent {
|
|
||||||
/**
|
|
||||||
* An item to show
|
|
||||||
*/
|
|
||||||
@Input() item: SCPlace;
|
|
||||||
|
|
||||||
// eslint-disable-next-line @angular-eslint/no-output-on-prefix
|
|
||||||
@Output() onClose = new EventEmitter<void>();
|
|
||||||
|
|
||||||
constructor(readonly routerOutlet: IonRouterOutlet) {}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Action when edit is clicked
|
|
||||||
*/
|
|
||||||
onCloseClick() {
|
|
||||||
this.onClose.emit();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -29,12 +29,11 @@ import {StAppsWebHttpClient} from '../data/stapps-web-http-client.provider';
|
|||||||
import {MenuModule} from '../menu/menu.module';
|
import {MenuModule} from '../menu/menu.module';
|
||||||
import {MapProvider} from './map.provider';
|
import {MapProvider} from './map.provider';
|
||||||
import {MapPageComponent} from './page/map-page.component';
|
import {MapPageComponent} from './page/map-page.component';
|
||||||
import {MapListModalComponent} from './page/modals/map-list-modal.component';
|
import {MapListModalComponent} from './page/map-list-modal.component';
|
||||||
import {MapSingleModalComponent} from './page/modals/map-single-modal.component';
|
|
||||||
import {MapItemComponent} from './item/map-item.component';
|
|
||||||
import {NgModule} from '@angular/core';
|
import {NgModule} from '@angular/core';
|
||||||
import {UtilModule} from '../../util/util.module';
|
import {UtilModule} from '../../util/util.module';
|
||||||
import {IonIconModule} from '../../util/ion-icon/ion-icon.module';
|
import {IonIconModule} from '../../util/ion-icon/ion-icon.module';
|
||||||
|
import {GeoNavigationDirective} from './geo-navigation.directive';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Initializes the default area to show in advance (before components are initialized)
|
* Initializes the default area to show in advance (before components are initialized)
|
||||||
@@ -56,7 +55,7 @@ const mapRoutes: Routes = [
|
|||||||
* Module containing map related stuff
|
* Module containing map related stuff
|
||||||
*/
|
*/
|
||||||
@NgModule({
|
@NgModule({
|
||||||
declarations: [MapPageComponent, MapListModalComponent, MapSingleModalComponent, MapItemComponent],
|
declarations: [MapPageComponent, MapListModalComponent],
|
||||||
exports: [],
|
exports: [],
|
||||||
imports: [
|
imports: [
|
||||||
CommonModule,
|
CommonModule,
|
||||||
@@ -71,6 +70,8 @@ const mapRoutes: Routes = [
|
|||||||
FormsModule,
|
FormsModule,
|
||||||
ThingTranslateModule,
|
ThingTranslateModule,
|
||||||
UtilModule,
|
UtilModule,
|
||||||
|
GeoNavigationDirective,
|
||||||
|
GeoNavigationDirective,
|
||||||
],
|
],
|
||||||
providers: [Geolocation, MapProvider, DataProvider, DataFacetsProvider, StAppsWebHttpClient],
|
providers: [Geolocation, MapProvider, DataProvider, DataFacetsProvider, StAppsWebHttpClient],
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
*/
|
*/
|
||||||
import {Component, Input, OnInit} from '@angular/core';
|
import {Component, Input, OnInit} from '@angular/core';
|
||||||
import {SCSearchBooleanFilter, SCPlace, SCSearchFilter} from '@openstapps/core';
|
import {SCSearchBooleanFilter, SCPlace, SCSearchFilter} from '@openstapps/core';
|
||||||
import {MapProvider} from '../../map.provider';
|
import {MapProvider} from '../map.provider';
|
||||||
import {ModalController} from '@ionic/angular';
|
import {ModalController} from '@ionic/angular';
|
||||||
import {LatLngBounds} from 'leaflet';
|
import {LatLngBounds} from 'leaflet';
|
||||||
|
|
||||||
@@ -23,8 +23,8 @@ import {LatLngBounds} from 'leaflet';
|
|||||||
*/
|
*/
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'map-list-modal',
|
selector: 'map-list-modal',
|
||||||
templateUrl: 'map-list.html',
|
templateUrl: 'map-list-modal.html',
|
||||||
styleUrls: ['map-list.scss'],
|
styleUrls: ['map-list-modal.scss'],
|
||||||
})
|
})
|
||||||
export class MapListModalComponent implements OnInit {
|
export class MapListModalComponent implements OnInit {
|
||||||
/**
|
/**
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user