Compare commits
22 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
fb8206ff13
|
|||
|
dceb0ef461
|
|||
|
88bc1982ca
|
|||
|
e741a9d7e7
|
|||
|
65f1d22205
|
|||
|
d867c08aba
|
|||
| 6193eff38e | |||
|
f1929e7cf9
|
|||
|
373484c242
|
|||
|
f77460bb0c
|
|||
|
574e0dcb05
|
|||
|
7b19a0aa08
|
|||
| 08642d7618 | |||
|
c3e9c27cd3
|
|||
|
29a2854671
|
|||
|
8e6786e722
|
|||
|
6ad40564e3
|
|||
|
776973bfe9
|
|||
|
6025e43baa
|
|||
|
d9a47f882c
|
|||
|
4235758a6d
|
|||
|
59fe2dfabb
|
101
.drone.yml
101
.drone.yml
|
|
@ -1,101 +0,0 @@
|
|||
---
|
||||
kind: secret
|
||||
name: docker_username
|
||||
get:
|
||||
path: odit-registry-builder
|
||||
name: username
|
||||
|
||||
---
|
||||
kind: secret
|
||||
name: docker_password
|
||||
get:
|
||||
path: odit-registry-builder
|
||||
name: password
|
||||
|
||||
---
|
||||
kind: secret
|
||||
name: git_ssh
|
||||
get:
|
||||
path: odit-git-bot
|
||||
name: sshkey
|
||||
|
||||
---
|
||||
kind: secret
|
||||
name: npm_url
|
||||
get:
|
||||
path: odit-npm-cache
|
||||
name: url
|
||||
|
||||
---
|
||||
kind: pipeline
|
||||
type: kubernetes
|
||||
name: build:dev
|
||||
|
||||
steps:
|
||||
- name: run full license export
|
||||
depends_on: ["clone"]
|
||||
image: registry.odit.services/hub/library/node:19.7.0-alpine3.16
|
||||
commands:
|
||||
- npm config set registry $NPM_REGISTRY_URL && npm i -g pnpm@8
|
||||
- pnpm i
|
||||
- pnpm licenses:export
|
||||
environment:
|
||||
NPM_REGISTRY_URL:
|
||||
from_secret: npm_url
|
||||
- name: push new licenses file to repo
|
||||
depends_on: ["run full license export"]
|
||||
image: appleboy/drone-git-push
|
||||
settings:
|
||||
branch: dev
|
||||
commit: true
|
||||
commit_message: new license file version [CI SKIP]
|
||||
author_email: bot@odit.services
|
||||
remote: git@git.odit.services:lfk/frontend.git
|
||||
ssh_key:
|
||||
from_secret: git_ssh
|
||||
- name: build dev
|
||||
depends_on: ["clone"]
|
||||
image: registry.odit.services/library/drone-kaniko
|
||||
settings:
|
||||
username:
|
||||
from_secret: docker_username
|
||||
password:
|
||||
from_secret: docker_password
|
||||
build_args:
|
||||
- NPM_REGISTRY_URL:
|
||||
from_secret: npm_url
|
||||
repo: lfk/frontend
|
||||
tags:
|
||||
- dev
|
||||
cache: true
|
||||
registry: registry.odit.services
|
||||
trigger:
|
||||
branch:
|
||||
- dev
|
||||
event:
|
||||
- push
|
||||
|
||||
---
|
||||
kind: pipeline
|
||||
type: kubernetes
|
||||
name: build:tags
|
||||
steps:
|
||||
- name: build $DRONE_TAG
|
||||
depends_on: ["clone"]
|
||||
image: registry.odit.services/library/drone-kaniko
|
||||
settings:
|
||||
username:
|
||||
from_secret: docker_username
|
||||
password:
|
||||
from_secret: docker_password
|
||||
build_args:
|
||||
- NPM_REGISTRY_URL:
|
||||
from_secret: npm_url
|
||||
repo: lfk/frontend
|
||||
tags:
|
||||
- "${DRONE_TAG}"
|
||||
cache: true
|
||||
registry: registry.odit.services
|
||||
trigger:
|
||||
event:
|
||||
- tag
|
||||
42
.woodpecker/build.yml
Normal file
42
.woodpecker/build.yml
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
steps:
|
||||
- name: run full license export
|
||||
image: registry.odit.services/hub/library/node:19.7.0-alpine3.16
|
||||
commands:
|
||||
- npm config set registry $NPM_REGISTRY_URL && npm i -g pnpm@8
|
||||
- pnpm i
|
||||
- pnpm licenses:export
|
||||
secrets:
|
||||
- source: odit-npm-cache-url
|
||||
target: NPM_REGISTRY_URL
|
||||
- name: push new licenses file to repo
|
||||
image: appleboy/drone-git-push
|
||||
settings:
|
||||
branch: dev
|
||||
commit: true
|
||||
commit_message: new license file version [CI SKIP]
|
||||
author_email: bot@odit.services
|
||||
remote: git@git.odit.services:lfk/frontend.git
|
||||
ssh_key:
|
||||
from_secret: odit-git-bot-sshkey
|
||||
- name: build edge
|
||||
image: woodpeckerci/plugin-docker-buildx
|
||||
settings:
|
||||
repo: registry.odit.services/odit/website
|
||||
tags:
|
||||
- edge
|
||||
registry: registry.odit.services
|
||||
platforms: linux/amd64,linux/arm64
|
||||
cache_from: registry.odit.services/odit/website:edge
|
||||
username:
|
||||
from_secret: odit-registry-builder-username
|
||||
password:
|
||||
from_secret: odit-registry-builder-password
|
||||
secrets:
|
||||
- source: odit-npm-cache-url
|
||||
target: NPM_REGISTRY_URL
|
||||
|
||||
when:
|
||||
event:
|
||||
- push
|
||||
branch:
|
||||
- dev
|
||||
20
.woodpecker/release.yml
Normal file
20
.woodpecker/release.yml
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
steps:
|
||||
- name: build tag
|
||||
image: woodpeckerci/plugin-docker-buildx
|
||||
settings:
|
||||
repo: registry.odit.services/lfk/frontend
|
||||
tags:
|
||||
- "${CI_COMMIT_TAG}"
|
||||
registry: registry.odit.services
|
||||
platforms: linux/amd64,linux/arm64
|
||||
cache_from: registry.odit.services/lfk/frontend:latest
|
||||
username:
|
||||
from_secret: odit-registry-builder-username
|
||||
password:
|
||||
from_secret: odit-registry-builder-password
|
||||
secrets:
|
||||
- source: odit-npm-cache-url
|
||||
target: NPM_REGISTRY_URL
|
||||
when:
|
||||
event:
|
||||
- tag
|
||||
49
CHANGELOG.md
49
CHANGELOG.md
|
|
@ -2,10 +2,59 @@
|
|||
|
||||
All notable changes to this project will be documented in this file. Dates are displayed in UTC.
|
||||
|
||||
#### [1.4.13](https://git.odit.services/lfk/frontend/compare/1.4.12...1.4.13)
|
||||
|
||||
- Show donations as euro in export [`88bc198`](https://git.odit.services/lfk/frontend/commit/88bc1982cab4481e2e9245f81eff27e095b66a0f)
|
||||
- new license file version [CI SKIP] [`6193eff`](https://git.odit.services/lfk/frontend/commit/6193eff38e1a9d5726bc7d572ab36b921de843d0)
|
||||
|
||||
#### [1.4.12](https://git.odit.services/lfk/frontend/compare/1.4.11...1.4.12)
|
||||
|
||||
> 18 May 2023
|
||||
|
||||
- 🚀RELEASE v1.4.12 [`65f1d22`](https://git.odit.services/lfk/frontend/commit/65f1d222050b0dec81fc847c1921b6135a55ce50)
|
||||
- fix(donation/payment): Funny javascript number to float conversion where integers were needed [`d867c08`](https://git.odit.services/lfk/frontend/commit/d867c08aba234d3a7fe9e2311d37dc5e96fc2afc)
|
||||
- new license file version [CI SKIP] [`08642d7`](https://git.odit.services/lfk/frontend/commit/08642d7618faeae31f0acfe776642c9fa156e5ff)
|
||||
|
||||
#### [1.4.11](https://git.odit.services/lfk/frontend/compare/1.4.10...1.4.11)
|
||||
|
||||
> 10 May 2023
|
||||
|
||||
- chore(deps): Lockfile [`f77460b`](https://git.odit.services/lfk/frontend/commit/f77460bb0c8ce6d0f3d83a077017d5fc7bf55af7)
|
||||
- 🚀RELEASE v1.4.11 [`373484c`](https://git.odit.services/lfk/frontend/commit/373484c2424bea7ae0d70d342e0ae2076aab1b6a)
|
||||
- feat(orgs): Show total distance [`574e0dc`](https://git.odit.services/lfk/frontend/commit/574e0dcb051305bde2fc76d8456a35baec0cf309)
|
||||
- chore(deps): More bumps [`7b19a0a`](https://git.odit.services/lfk/frontend/commit/7b19a0aa08bb6c89c51d27c0d05777e8fcfdad17)
|
||||
|
||||
#### [1.4.10](https://git.odit.services/lfk/frontend/compare/1.4.9...1.4.10)
|
||||
|
||||
> 10 May 2023
|
||||
|
||||
- chore(deps): Bumped svelte-table [`29a2854`](https://git.odit.services/lfk/frontend/commit/29a2854671b3af5b85ea96d050a9076f47b6575d)
|
||||
- 🚀RELEASE v1.4.10 [`c3e9c27`](https://git.odit.services/lfk/frontend/commit/c3e9c27cd3d4b916f1661d4958cabab038918587)
|
||||
- chore(deps): Pin and bump [`8e6786e`](https://git.odit.services/lfk/frontend/commit/8e6786e72227b3f07cc805f0957d5b7fd123ec13)
|
||||
- chore(deps): Bumped scanclientjs [`6ad4056`](https://git.odit.services/lfk/frontend/commit/6ad40564e3e342046f6ee19fab9e455ec3bbff9b)
|
||||
|
||||
#### [1.4.9](https://git.odit.services/lfk/frontend/compare/1.4.8...1.4.9)
|
||||
|
||||
> 9 May 2023
|
||||
|
||||
- 🚀RELEASE v1.4.9 [`776973b`](https://git.odit.services/lfk/frontend/commit/776973bfe9b34c26a1c80d5e458cc2644dd9036b)
|
||||
- Changed the in table replacement method [`d9a47f8`](https://git.odit.services/lfk/frontend/commit/d9a47f882c1c6bcf98ef85d50d70c010d54b326e)
|
||||
- Fixed empty return [`6025e43`](https://git.odit.services/lfk/frontend/commit/6025e43baa8516657a60a1de9a82c2189221c6ac)
|
||||
|
||||
#### [1.4.8](https://git.odit.services/lfk/frontend/compare/1.4.7...1.4.8)
|
||||
|
||||
> 9 May 2023
|
||||
|
||||
- Switched donor loading to non-paginated [`59fe2df`](https://git.odit.services/lfk/frontend/commit/59fe2dfabb224863876c4db31a965c34a51a9369)
|
||||
- 🚀RELEASE v1.4.8 [`4235758`](https://git.odit.services/lfk/frontend/commit/4235758a6d1499715287d6ab193cc87c68d5742e)
|
||||
|
||||
#### [1.4.7](https://git.odit.services/lfk/frontend/compare/1.4.6...1.4.7)
|
||||
|
||||
> 4 May 2023
|
||||
|
||||
- Paginated modal data loading [`a8a7711`](https://git.odit.services/lfk/frontend/commit/a8a771114df6eb57d5b1d5497a5be49e619d4102)
|
||||
- Moved loading to onmount [`4e0a2c8`](https://git.odit.services/lfk/frontend/commit/4e0a2c83015bde5e360c5fb2c0babbeaa03dc2b5)
|
||||
- 🚀RELEASE v1.4.7 [`6364536`](https://git.odit.services/lfk/frontend/commit/6364536dcd840c71f7cb6afb31bbc4f160ac4f73)
|
||||
|
||||
#### [1.4.6](https://git.odit.services/lfk/frontend/compare/1.4.5...1.4.6)
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
<body>
|
||||
<span style="display: none; visibility: hidden" id="buildinfo"
|
||||
>RELEASE_INFO-1.4.7-RELEASE_INFO</span
|
||||
>RELEASE_INFO-1.4.13-RELEASE_INFO</span
|
||||
>
|
||||
<noscript>You need to enable JavaScript to run this app.</noscript>
|
||||
<script src="/env.js"></script>
|
||||
|
|
|
|||
18
package.json
18
package.json
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@odit/lfk-frontend",
|
||||
"version": "1.4.7",
|
||||
"version": "1.4.13",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"i18n-order": "node order.js",
|
||||
|
|
@ -12,14 +12,14 @@
|
|||
},
|
||||
"license": "CC-BY-NC-SA-4.0",
|
||||
"devDependencies": {
|
||||
"@odit/license-exporter": "0.0.12",
|
||||
"@odit/license-exporter": "0.2.0",
|
||||
"@sveltejs/vite-plugin-svelte": "2.1.1",
|
||||
"auto-changelog": "2.4.0",
|
||||
"autoprefixer": "10.4.14",
|
||||
"postcss": "8.4.23",
|
||||
"prettier": "^2.8.8",
|
||||
"prettier-plugin-svelte": "^2.10.0",
|
||||
"release-it": "15.10.1",
|
||||
"prettier": "2.8.8",
|
||||
"prettier-plugin-svelte": "2.10.0",
|
||||
"release-it": "15.10.3",
|
||||
"svelte-select": "3.17.0",
|
||||
"tailwindcss": "3.3.2",
|
||||
"vite": "4.3.3"
|
||||
|
|
@ -42,10 +42,10 @@
|
|||
}
|
||||
},
|
||||
"dependencies": {
|
||||
"@odit/lfk-client-js": "1.1.1",
|
||||
"@paralleldrive/cuid2": "^2.2.0",
|
||||
"@tanstack/svelte-table": "^8.8.6",
|
||||
"bwip-js": "^3.4.0",
|
||||
"@odit/lfk-client-js": "1.1.2",
|
||||
"@paralleldrive/cuid2": "2.2.0",
|
||||
"@tanstack/svelte-table": "8.9.1",
|
||||
"bwip-js": "3.4.0",
|
||||
"check-password-strength": "2.0.7",
|
||||
"csvtojson": "2.0.10",
|
||||
"localforage": "1.10.0",
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@ lockfileVersion: '6.0'
|
|||
|
||||
dependencies:
|
||||
'@odit/lfk-client-js':
|
||||
specifier: 1.1.1
|
||||
version: 1.1.1
|
||||
specifier: 1.1.2
|
||||
version: 1.1.2
|
||||
'@paralleldrive/cuid2':
|
||||
specifier: ^2.2.0
|
||||
specifier: 2.2.0
|
||||
version: 2.2.0
|
||||
'@tanstack/svelte-table':
|
||||
specifier: ^8.8.6
|
||||
version: 8.8.6(svelte@3.58.0)
|
||||
specifier: 8.9.1
|
||||
version: 8.9.1(svelte@3.58.0)
|
||||
bwip-js:
|
||||
specifier: ^3.4.0
|
||||
specifier: 3.4.0
|
||||
version: 3.4.0
|
||||
check-password-strength:
|
||||
specifier: 2.0.7
|
||||
|
|
@ -46,8 +46,8 @@ dependencies:
|
|||
|
||||
devDependencies:
|
||||
'@odit/license-exporter':
|
||||
specifier: 0.0.12
|
||||
version: 0.0.12
|
||||
specifier: 0.2.0
|
||||
version: 0.2.0
|
||||
'@sveltejs/vite-plugin-svelte':
|
||||
specifier: 2.1.1
|
||||
version: 2.1.1(svelte@3.58.0)(vite@4.3.3)
|
||||
|
|
@ -61,14 +61,14 @@ devDependencies:
|
|||
specifier: 8.4.23
|
||||
version: 8.4.23
|
||||
prettier:
|
||||
specifier: ^2.8.8
|
||||
specifier: 2.8.8
|
||||
version: 2.8.8
|
||||
prettier-plugin-svelte:
|
||||
specifier: ^2.10.0
|
||||
specifier: 2.10.0
|
||||
version: 2.10.0(prettier@2.8.8)(svelte@3.58.0)
|
||||
release-it:
|
||||
specifier: 15.10.1
|
||||
version: 15.10.1
|
||||
specifier: 15.10.3
|
||||
version: 15.10.3
|
||||
svelte-select:
|
||||
specifier: 3.17.0
|
||||
version: 3.17.0
|
||||
|
|
@ -518,12 +518,12 @@ packages:
|
|||
'@octokit/openapi-types': 16.0.0
|
||||
dev: true
|
||||
|
||||
/@odit/lfk-client-js@1.1.1:
|
||||
resolution: {integrity: sha512-EVwK/kT8VBs0vLk64KgCsHCl2heWHJMWAmZAghEDZWPCPQWX9xL6UzRuKewLXl36/T9YKqZLfDyM5e3WfgLyOg==}
|
||||
/@odit/lfk-client-js@1.1.2:
|
||||
resolution: {integrity: sha512-+RAvLfCYmuCbOLYPUoMV0rvpG9J3CJ9FoJDBfDboseyE3f7296rdAp7JCUhNtM7mmbXqgGosvz51DZQ5vm2v6Q==}
|
||||
dev: false
|
||||
|
||||
/@odit/license-exporter@0.0.12:
|
||||
resolution: {integrity: sha512-k5KxyTOk3Qz/OzId5VNXKjYOz1C4cMVfRHbq3X0VS4BM2rRuIgabrg/lbmZXDM1ExJkdBXi9sqiQ4h7N5bVbLQ==}
|
||||
/@odit/license-exporter@0.2.0:
|
||||
resolution: {integrity: sha512-RRyfQzDLoyLQlGSd8ThJQ3h0fiCe4tkmm935AUvSVQWP+p88FcnI4iaktKBJJVBnIpDhkv/7sDSA5dFc/QMM5w==}
|
||||
hasBin: true
|
||||
dependencies:
|
||||
yargs: 17.7.1
|
||||
|
|
@ -587,18 +587,18 @@ packages:
|
|||
defer-to-connect: 2.0.1
|
||||
dev: true
|
||||
|
||||
/@tanstack/svelte-table@8.8.6(svelte@3.58.0):
|
||||
resolution: {integrity: sha512-/5cJ9w4rhq6iqts8dR31JSOqavV6Ug6KZPFXpQaj3hs2JWQiNPw24tOOrFkXVaD4AQ6D2EEH/R0XoX9moQRY5A==}
|
||||
/@tanstack/svelte-table@8.9.1(svelte@3.58.0):
|
||||
resolution: {integrity: sha512-c84SBP2rRbloBcA3/WFsfm0a4vJCeztbRxox4MHAPCwfLW955tmCYbIF6ihcDUZg5fsDvu992qdDEhKKLLxmEg==}
|
||||
engines: {node: '>=12'}
|
||||
peerDependencies:
|
||||
svelte: ^3.49.0
|
||||
dependencies:
|
||||
'@tanstack/table-core': 8.8.5
|
||||
'@tanstack/table-core': 8.9.1
|
||||
svelte: 3.58.0
|
||||
dev: false
|
||||
|
||||
/@tanstack/table-core@8.8.5:
|
||||
resolution: {integrity: sha512-Xnwa1qxpgvSW7ozLiexmKp2PIYcLBiY/IizbdGriYCL6OOHuZ9baRhrrH51zjyz+61ly6K59rmt6AI/3RR+97Q==}
|
||||
/@tanstack/table-core@8.9.1:
|
||||
resolution: {integrity: sha512-2+R83n8vMZND0q3W1lSiF7co9nFbeWbjAErFf27xwbeA9E0wtUu5ZDfgj+TZ6JzdAEQAgfxkk/QNFAKiS8E4MA==}
|
||||
engines: {node: '>=12'}
|
||||
dev: false
|
||||
|
||||
|
|
@ -1748,8 +1748,8 @@ packages:
|
|||
resolution: {integrity: sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q==}
|
||||
dev: false
|
||||
|
||||
/globby@13.1.3:
|
||||
resolution: {integrity: sha512-8krCNHXvlCgHDpegPzleMq07yMYTO2sXKASmZmquEYWEmCx6J5UTRbp5RwMJkTJGtcQ44YpiUYUiN0b9mzy8Bw==}
|
||||
/globby@13.1.4:
|
||||
resolution: {integrity: sha512-iui/IiiW+QrJ1X1hKH5qwlMQyv34wJAYwH1vrf8b9kBA4sNiif3gKsMHa+BrdnOpEudWjpotfa7LrTzB1ERS/g==}
|
||||
engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
|
||||
dependencies:
|
||||
dir-glob: 3.0.1
|
||||
|
|
@ -1963,8 +1963,8 @@ packages:
|
|||
engines: {node: '>=10'}
|
||||
dev: true
|
||||
|
||||
/inquirer@9.1.5:
|
||||
resolution: {integrity: sha512-3ygAIh8gcZavV9bj6MTdYddG2zPSYswP808fKS46NOwlF0zZljVpnLCHODDqItWJDbDpLb3aouAxGaJbkxoppA==}
|
||||
/inquirer@9.2.0:
|
||||
resolution: {integrity: sha512-WWERbVqjsTXjXub1ZW0ZHDit1dyHqy0T9XIkky9TnmKAPrjU9Jkd59nZPK0dUuM3s73GZAZu2Jo4iFU3XSPVLA==}
|
||||
engines: {node: '>=14.18.0'}
|
||||
dependencies:
|
||||
ansi-escapes: 6.1.0
|
||||
|
|
@ -2766,7 +2766,7 @@ packages:
|
|||
got: 12.6.0
|
||||
registry-auth-token: 5.0.2
|
||||
registry-url: 6.0.1
|
||||
semver: 7.3.8
|
||||
semver: 7.5.0
|
||||
dev: true
|
||||
|
||||
/parent-module@1.0.1:
|
||||
|
|
@ -3075,8 +3075,8 @@ packages:
|
|||
rc: 1.2.8
|
||||
dev: true
|
||||
|
||||
/release-it@15.10.1:
|
||||
resolution: {integrity: sha512-Wkk4aFHSo27vQwHIlcEy77lJwnQlh4UDQckc53gh5tKo7F22mAUEAe8SYQZJcFh7icdkf0OV70onhB1dDmeClA==}
|
||||
/release-it@15.10.3:
|
||||
resolution: {integrity: sha512-OSdHOg76gwkpLbSLBK09GZQj5XWXwBP+S6v//rSoQKkjqklaCLK04Gl5NkTwNrQOHHiihs4ToesDNh2+w55k3w==}
|
||||
engines: {node: '>=14.9'}
|
||||
hasBin: true
|
||||
dependencies:
|
||||
|
|
@ -3087,9 +3087,9 @@ packages:
|
|||
cosmiconfig: 8.1.3
|
||||
execa: 7.1.1
|
||||
git-url-parse: 13.1.0
|
||||
globby: 13.1.3
|
||||
globby: 13.1.4
|
||||
got: 12.6.0
|
||||
inquirer: 9.1.5
|
||||
inquirer: 9.2.0
|
||||
is-ci: 3.0.1
|
||||
issue-parser: 6.0.0
|
||||
lodash: 4.17.21
|
||||
|
|
@ -3101,7 +3101,7 @@ packages:
|
|||
os-name: 5.1.0
|
||||
promise.allsettled: 1.0.6
|
||||
proxy-agent: 5.0.0
|
||||
semver: 7.3.8
|
||||
semver: 7.5.0
|
||||
shelljs: 0.8.5
|
||||
update-notifier: 6.0.2
|
||||
url-join: 5.0.0
|
||||
|
|
@ -3219,19 +3219,19 @@ packages:
|
|||
resolution: {integrity: sha512-0Ju4+6A8iOnpL/Thra7dZsSlOHYAHIeMxfhWQRI1/VLcT3WDBZKKtQt/QkBOsiIN9ZpuvHE6cGZ0x4glCMmfiA==}
|
||||
engines: {node: '>=12'}
|
||||
dependencies:
|
||||
semver: 7.3.8
|
||||
semver: 7.5.0
|
||||
dev: true
|
||||
|
||||
/semver@7.3.8:
|
||||
resolution: {integrity: sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==}
|
||||
/semver@7.4.0:
|
||||
resolution: {integrity: sha512-RgOxM8Mw+7Zus0+zcLEUn8+JfoLpj/huFTItQy2hsM4khuC1HYRDp0cU482Ewn/Fcy6bCjufD8vAj7voC66KQw==}
|
||||
engines: {node: '>=10'}
|
||||
hasBin: true
|
||||
dependencies:
|
||||
lru-cache: 6.0.0
|
||||
dev: true
|
||||
|
||||
/semver@7.4.0:
|
||||
resolution: {integrity: sha512-RgOxM8Mw+7Zus0+zcLEUn8+JfoLpj/huFTItQy2hsM4khuC1HYRDp0cU482Ewn/Fcy6bCjufD8vAj7voC66KQw==}
|
||||
/semver@7.5.0:
|
||||
resolution: {integrity: sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==}
|
||||
engines: {node: '>=10'}
|
||||
hasBin: true
|
||||
dependencies:
|
||||
|
|
@ -3721,7 +3721,7 @@ packages:
|
|||
is-yarn-global: 0.4.1
|
||||
latest-version: 7.0.0
|
||||
pupa: 3.1.0
|
||||
semver: 7.3.8
|
||||
semver: 7.5.0
|
||||
semver-diff: 4.0.0
|
||||
xdg-basedir: 5.1.0
|
||||
dev: true
|
||||
|
|
@ -3932,7 +3932,7 @@ packages:
|
|||
dev: false
|
||||
|
||||
/xregexp@2.0.0:
|
||||
resolution: {integrity: sha512-xl/50/Cf32VsGq/1R8jJE5ajH1yMCQkpmoS10QbFZWl2Oor4H0Me64Pu2yxvsRWK3m6soJbmGfzSR7BYmDcWAA==}
|
||||
resolution: {integrity: sha1-UqY+VsoLhKfzpfPWGHLxJq16WUM=}
|
||||
dev: true
|
||||
|
||||
/y18n@5.0.8:
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -98,35 +98,22 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
onMount(()=>{
|
||||
loadDonorsAndRunnersPaginated();
|
||||
})
|
||||
|
||||
async function loadDonorsAndRunnersPaginated() {
|
||||
let page = 0;
|
||||
let pagesize = 500;
|
||||
while (page >= 0) {
|
||||
const don = await DonorService.donorControllerGetAll(page, pagesize);
|
||||
const run = await RunnerService.runnerControllerGetAll(page, pagesize);
|
||||
if (don.length == 0 && run.length == 0) {
|
||||
page = -2;
|
||||
onMount(async () => {
|
||||
toast.loading($_("loading-donors"));
|
||||
donors = (await DonorService.donorControllerGetAll()).map(
|
||||
(r) => {
|
||||
return { label: getDonorLabel(r), value: r };
|
||||
}
|
||||
|
||||
donors = donors.concat(
|
||||
...run.map((r) => {
|
||||
return { label: getDonorLabel(r), value: r };
|
||||
})
|
||||
);
|
||||
runners = runners.concat(
|
||||
...run.map((r) => {
|
||||
return { label: getDonorLabel(r), value: r };
|
||||
})
|
||||
);
|
||||
|
||||
dataLoaded = true;
|
||||
page++;
|
||||
}
|
||||
}
|
||||
);
|
||||
runners = (await RunnerService.runnerControllerGetAll()).map(
|
||||
(r) => {
|
||||
return { label: getDonorLabel(r), value: r };
|
||||
}
|
||||
);
|
||||
toast.dismiss();
|
||||
toast.success($_("all-donors-loaded"));
|
||||
});
|
||||
</script>
|
||||
|
||||
{#if modal_open}
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
toast.loading($_("updating-donation"));
|
||||
const editable = Object.assign({}, original_data);
|
||||
editable.donor = editable.donor.id;
|
||||
editable.paidAmount = paid_amount_input * 100;
|
||||
editable.paidAmount = Math.round(paid_amount_input * 100);
|
||||
if (editable.responseType == "DISTANCEDONATION" || editable.runner) {
|
||||
editable.runner = editable.runner.id;
|
||||
DonationService.donationControllerPutDistance(
|
||||
|
|
@ -46,7 +46,7 @@
|
|||
toast.dismiss();
|
||||
|
||||
toast.success($_("donation-updated"));
|
||||
dispatch("created", { donation: response });
|
||||
dispatch("created", { donation: result });
|
||||
})
|
||||
.catch((err) => {
|
||||
//
|
||||
|
|
@ -61,7 +61,7 @@
|
|||
//
|
||||
toast.dismiss();
|
||||
toast.success($_("donation-updated"));
|
||||
dispatch("created", { donation: response });
|
||||
dispatch("created", { donation: result });
|
||||
})
|
||||
.catch((err) => {
|
||||
//
|
||||
|
|
|
|||
|
|
@ -195,9 +195,12 @@
|
|||
payment_modal_open={active_edits.length > 0}
|
||||
paid_amount_input={(active_edits[0]?.paidAmount || 0) / 100}
|
||||
on:created={(event) => {
|
||||
current_donations[
|
||||
current_donations.findIndex((d) => d.id === event.detail.donation.id)
|
||||
].paidAmount = event.detail.donation.paidAmount;
|
||||
current_donations = current_donations.map((d)=>{
|
||||
if(d.id === event.detail.donation.id){
|
||||
d.paidAmount = event.detail.donation.paidAmount;
|
||||
}
|
||||
return d;
|
||||
})
|
||||
options.update((options) => ({
|
||||
...options,
|
||||
data: current_donations,
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
d.firstname,
|
||||
d.middlename,
|
||||
d.lastname,
|
||||
d.paidDonationAmount,
|
||||
(d.paidDonationAmount/100).toFixed(2),
|
||||
address,
|
||||
];
|
||||
});
|
||||
|
|
|
|||
|
|
@ -470,6 +470,11 @@
|
|||
{/if}
|
||||
</div>
|
||||
{/if}
|
||||
<div class="text-sm w-full">
|
||||
<span class="font-medium text-gray-700">{$_("distance")}</span>
|
||||
<br />
|
||||
<span class="text-gray-700">{(original_object.total_distance / 1000).toFixed(2)} km</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
|
|
|||
|
|
@ -290,6 +290,13 @@
|
|||
on:clear={() => (teamdata.parentGroup = null)}
|
||||
/>
|
||||
</div>
|
||||
<div class="text-sm w-full">
|
||||
<span class="font-medium text-gray-700">{$_("distance")}</span>
|
||||
<br />
|
||||
<span class="text-gray-700"
|
||||
>{(original.total_distance / 1000).toFixed(2)} km</span
|
||||
>
|
||||
</div>
|
||||
</section>
|
||||
{:else}
|
||||
{#await promise}
|
||||
|
|
|
|||
|
|
@ -37,6 +37,7 @@
|
|||
"all-associated-scans-will-get-deleted-as-well": "Alle Scans dieser Station werden ebenfalls gelöscht",
|
||||
"all-associated-teams-and-runners-will-be-deleted-too": "Alle assoziierten Teams und Läufer werden auch gelöscht!",
|
||||
"all-cards-loaded": "Alle Karten geladen",
|
||||
"all-donors-loaded": "Alle Sponsoren geladen",
|
||||
"already-paid": "Bereits bezahlt",
|
||||
"amount": "Anzahl",
|
||||
"amount-per-kilometer": "Betrag pro Kilometer",
|
||||
|
|
@ -270,6 +271,7 @@
|
|||
"loading-contact-details": "Kontaktdaten werden geladen ...",
|
||||
"loading-donation-details": "Lade Sponsoringdetails",
|
||||
"loading-donor-details": "Lade Details",
|
||||
"loading-donors": "Sponsoren werden geladen",
|
||||
"loading-group-detail": "Lade Gruppendetails...",
|
||||
"loading-profile-data": "Lade Profildaten",
|
||||
"loading-runners": "Läufer werden geladen...",
|
||||
|
|
|
|||
|
|
@ -37,6 +37,7 @@
|
|||
"all-associated-scans-will-get-deleted-as-well": "All associated scans will get deleted as well",
|
||||
"all-associated-teams-and-runners-will-be-deleted-too": "All associated teams and runners will be deleted too!",
|
||||
"all-cards-loaded": "All cards loaded",
|
||||
"all-donors-loaded": "All donors loaded",
|
||||
"already-paid": "Already paid",
|
||||
"amount": "Amount",
|
||||
"amount-per-kilometer": "Amount per kilometer",
|
||||
|
|
@ -270,6 +271,7 @@
|
|||
"loading-contact-details": "Loading contact details...",
|
||||
"loading-donation-details": "Loading donation details",
|
||||
"loading-donor-details": "Loading donor details",
|
||||
"loading-donors": "Loading donors",
|
||||
"loading-group-detail": "Loading group detail...",
|
||||
"loading-profile-data": "Loading profile data",
|
||||
"loading-runners": "loading runners...",
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user