Compare commits
21 Commits
Author | SHA1 | Date | |
---|---|---|---|
c3e9c27cd3
|
|||
29a2854671
|
|||
8e6786e722
|
|||
6ad40564e3
|
|||
776973bfe9
|
|||
6025e43baa
|
|||
d9a47f882c
|
|||
4235758a6d
|
|||
59fe2dfabb
|
|||
6364536dcd
|
|||
a8a771114d
|
|||
4e0a2c8301
|
|||
b6fed92a17
|
|||
97b57aeb0c
|
|||
e25ed1fff9
|
|||
a2ff5b8a14
|
|||
0284f18beb
|
|||
803d64c78c
|
|||
dacb2f8ace
|
|||
b7a53960e5
|
|||
66f1e6b4fe
|
56
CHANGELOG.md
56
CHANGELOG.md
@@ -2,9 +2,65 @@
|
||||
|
||||
All notable changes to this project will be documented in this file. Dates are displayed in UTC.
|
||||
|
||||
#### [1.4.10](https://git.odit.services/lfk/frontend/compare/1.4.9...1.4.10)
|
||||
|
||||
- chore(deps): Bumped svelte-table [`29a2854`](https://git.odit.services/lfk/frontend/commit/29a2854671b3af5b85ea96d050a9076f47b6575d)
|
||||
- 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)
|
||||
|
||||
> 4 May 2023
|
||||
|
||||
- 🚀RELEASE v1.4.6 [`b6fed92`](https://git.odit.services/lfk/frontend/commit/b6fed92a176af1c975484d9146ee5634e0031401)
|
||||
- fix(donor/details): don't load donations [`a2ff5b8`](https://git.odit.services/lfk/frontend/commit/a2ff5b8a142ce4e6b8876f64935f9787ec44a51e)
|
||||
- fix(donor/detail): Set email to null to avoid vaidation errors [`97b57ae`](https://git.odit.services/lfk/frontend/commit/97b57aeb0cc9058542a36dea9c8b2852169c250f)
|
||||
- fix(donor/detail): Set phone to null to avoid vaidation errors [`e25ed1f`](https://git.odit.services/lfk/frontend/commit/e25ed1fff9b200605d5d2b78238b774ec7289aaa)
|
||||
|
||||
#### [1.4.5](https://git.odit.services/lfk/frontend/compare/1.4.4...1.4.5)
|
||||
|
||||
> 4 May 2023
|
||||
|
||||
- Revert "revert: buggy pagination" [`dacb2f8`](https://git.odit.services/lfk/frontend/commit/dacb2f8ace373f6594fc64af133971af053f00c0)
|
||||
- fix: Removed dynamic pagesize adjustments [`803d64c`](https://git.odit.services/lfk/frontend/commit/803d64c78caa570d31d6055e70e2d2af6834f04b)
|
||||
- 🚀RELEASE v1.4.5 [`0284f18`](https://git.odit.services/lfk/frontend/commit/0284f18beb8b24d4d4d071eca13bc5868666232c)
|
||||
|
||||
#### [1.4.4](https://git.odit.services/lfk/frontend/compare/1.4.3...1.4.4)
|
||||
|
||||
> 4 May 2023
|
||||
|
||||
- 🚀RELEASE v1.4.4 [`b7a5396`](https://git.odit.services/lfk/frontend/commit/b7a53960e5f37ae089d77bc11668d917145e2abb)
|
||||
- fix(AddDonationModal): missing toast dismiss on success distance donation [`66f1e6b`](https://git.odit.services/lfk/frontend/commit/66f1e6b4fe1350ee79673a0aff97e36f44179c92)
|
||||
|
||||
#### [1.4.3](https://git.odit.services/lfk/frontend/compare/1.4.2...1.4.3)
|
||||
|
||||
> 4 May 2023
|
||||
|
||||
- revert: buggy pagination [`b264864`](https://git.odit.services/lfk/frontend/commit/b2648645e8fc05f8742ecfc592557f954261671b)
|
||||
- 🚀RELEASE v1.4.3 [`33166bf`](https://git.odit.services/lfk/frontend/commit/33166bfafcffb9d86dfc7dfcd2cb8ba5c85da7e7)
|
||||
|
||||
#### [1.4.2](https://git.odit.services/lfk/frontend/compare/1.4.1...1.4.2)
|
||||
|
||||
|
@@ -13,7 +13,7 @@
|
||||
|
||||
<body>
|
||||
<span style="display: none; visibility: hidden" id="buildinfo"
|
||||
>RELEASE_INFO-1.4.3-RELEASE_INFO</span
|
||||
>RELEASE_INFO-1.4.10-RELEASE_INFO</span
|
||||
>
|
||||
<noscript>You need to enable JavaScript to run this app.</noscript>
|
||||
<script src="/env.js"></script>
|
||||
|
10
package.json
10
package.json
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@odit/lfk-frontend",
|
||||
"version": "1.4.3",
|
||||
"version": "1.4.10",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"i18n-order": "node order.js",
|
||||
@@ -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",
|
||||
|
26
pnpm-lock.yaml
generated
26
pnpm-lock.yaml
generated
@@ -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
|
||||
@@ -518,8 +518,8 @@ 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:
|
||||
@@ -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
|
||||
|
||||
|
@@ -153,7 +153,7 @@
|
||||
onMount(async () => {
|
||||
toast.loading($_("loading-cards"));
|
||||
let page = 0;
|
||||
let pagesize = 100;
|
||||
let pagesize = 500;
|
||||
while (page >= 0) {
|
||||
const cards = await RunnerCardService.runnerCardControllerGetAll(
|
||||
page,
|
||||
@@ -171,7 +171,6 @@
|
||||
|
||||
dataLoaded = true;
|
||||
page++;
|
||||
pagesize += 100;
|
||||
}
|
||||
toast.dismiss();
|
||||
toast.success($_("all-cards-loaded"));
|
||||
|
@@ -8,7 +8,7 @@
|
||||
RunnerService,
|
||||
} from "@odit/lfk-client-js";
|
||||
import Select from "svelte-select";
|
||||
import { createEventDispatcher } from "svelte";
|
||||
import { createEventDispatcher, onMount } from "svelte";
|
||||
import toast from "svelte-french-toast";
|
||||
export let modal_open;
|
||||
const dispatch = createEventDispatcher();
|
||||
@@ -23,16 +23,6 @@
|
||||
$: runners = [];
|
||||
$: is_fixed = false;
|
||||
$: is_paid = false;
|
||||
DonorService.donorControllerGetAll().then((val) => {
|
||||
donors = val.map((r) => {
|
||||
return { label: getDonorLabel(r), value: r };
|
||||
});
|
||||
});
|
||||
RunnerService.runnerControllerGetAll().then((val) => {
|
||||
runners = val.map((r) => {
|
||||
return { label: getDonorLabel(r), value: r };
|
||||
});
|
||||
});
|
||||
$: amount_input = 0;
|
||||
$: processed_last_submit = true;
|
||||
$: is_amount_valid = amount_input > 0;
|
||||
@@ -95,6 +85,7 @@
|
||||
amount_input = 0;
|
||||
modal_open = false;
|
||||
//
|
||||
toast.dismiss();
|
||||
toast.success($_("donation_added"));
|
||||
dispatch("created", { donations: [result] });
|
||||
})
|
||||
@@ -107,6 +98,22 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
onMount(async () => {
|
||||
toast.loading($_("loading-donors"));
|
||||
donors = (await DonorService.donorControllerGetAll()).map(
|
||||
(r) => {
|
||||
return { label: getDonorLabel(r), value: r };
|
||||
}
|
||||
);
|
||||
runners = (await RunnerService.runnerControllerGetAll()).map(
|
||||
(r) => {
|
||||
return { label: getDonorLabel(r), value: r };
|
||||
}
|
||||
);
|
||||
toast.dismiss();
|
||||
toast.success($_("all-donors-loaded"));
|
||||
});
|
||||
</script>
|
||||
|
||||
{#if modal_open}
|
||||
|
@@ -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) => {
|
||||
//
|
||||
|
@@ -167,13 +167,26 @@
|
||||
}
|
||||
|
||||
onMount(async () => {
|
||||
const donations = await DonationService.donationControllerGetAll();
|
||||
current_donations = donations;
|
||||
options.update((options) => ({
|
||||
...options,
|
||||
data: current_donations,
|
||||
}));
|
||||
dataLoaded = true;
|
||||
let page = 0;
|
||||
let pagesize = 300;
|
||||
while (page >= 0) {
|
||||
const donations = await DonationService.donationControllerGetAll(
|
||||
page,
|
||||
pagesize
|
||||
);
|
||||
if (donations.length == 0) {
|
||||
page = -2;
|
||||
}
|
||||
|
||||
current_donations = current_donations.concat(...donations);
|
||||
options.update((options) => ({
|
||||
...options,
|
||||
data: current_donations,
|
||||
}));
|
||||
|
||||
dataLoaded = true;
|
||||
page++;
|
||||
}
|
||||
});
|
||||
</script>
|
||||
|
||||
@@ -182,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,
|
||||
|
@@ -12,7 +12,6 @@
|
||||
$: delete_triggered = false;
|
||||
$: original_data = {};
|
||||
$: editable = {};
|
||||
$: current_donations = [];
|
||||
$: changes_performed = !(
|
||||
JSON.stringify(original_data) === JSON.stringify(editable)
|
||||
);
|
||||
@@ -29,11 +28,6 @@
|
||||
isPhoneValidOrEmpty &&
|
||||
((isAddress1Valid && iszipcodevalid && iscityvalid) ||
|
||||
editable.address_checked === false);
|
||||
const donation_promise = DonationService.donationControllerGetAll().then(
|
||||
(val) => {
|
||||
current_donations = val;
|
||||
}
|
||||
);
|
||||
const promise = DonorService.donorControllerGetOne(params.donorid).then(
|
||||
(data) => {
|
||||
data_loaded = true;
|
||||
@@ -69,7 +63,9 @@
|
||||
editable.address = null;
|
||||
}
|
||||
if (editable.email) editable.email = editable.email;
|
||||
else editable.email = null;
|
||||
if (editable.phone) editable.phone = editable.phone;
|
||||
else editable.phone = null;
|
||||
if (editable.middlename) editable.middlename = editable.middlename;
|
||||
editable.receiptNeeded = editable.address_checked;
|
||||
DonorService.donorControllerPut(original_data.id, editable)
|
||||
@@ -96,7 +92,7 @@
|
||||
</script>
|
||||
|
||||
<ConfirmDonorDeletion bind:modal_open bind:delete_donor />
|
||||
{#await promise && donation_promise}
|
||||
{#await promise}
|
||||
{$_("loading-donor-details")}
|
||||
{:then}
|
||||
<section class="container p-5 select-none">
|
||||
@@ -206,8 +202,8 @@
|
||||
>
|
||||
<br />
|
||||
<span class="font-medium text-gray-700">{$_("donations")}:</span>
|
||||
{#if current_donations.filter((d) => d.donor.id == editable.id).length > 0}
|
||||
{#each current_donations.filter((o) => o.donor.id == editable.id) as d}
|
||||
{#if original_data.donations.length > 0}
|
||||
{#each original_data.donations as d}
|
||||
{#if d.responseType === "DISTANCEDONATION"}
|
||||
<a
|
||||
href="../donations/{d.id}"
|
||||
|
@@ -146,13 +146,23 @@
|
||||
}
|
||||
|
||||
onMount(async () => {
|
||||
const donors = await DonorService.donorControllerGetAll();
|
||||
current_donors = donors;
|
||||
options.update((options) => ({
|
||||
...options,
|
||||
data: donors,
|
||||
}));
|
||||
dataLoaded = true;
|
||||
let page = 0;
|
||||
let pagesize = 300;
|
||||
while (page >= 0) {
|
||||
const donors = await DonorService.donorControllerGetAll(page, pagesize);
|
||||
if (donors.length == 0) {
|
||||
page = -2;
|
||||
}
|
||||
|
||||
current_donors = current_donors.concat(...donors);
|
||||
options.update((options) => ({
|
||||
...options,
|
||||
data: current_donors,
|
||||
}));
|
||||
|
||||
dataLoaded = true;
|
||||
page++;
|
||||
}
|
||||
});
|
||||
</script>
|
||||
|
||||
|
@@ -161,13 +161,22 @@
|
||||
}
|
||||
);
|
||||
|
||||
const runners = await RunnerService.runnerControllerGetAll();
|
||||
current_runners = runners;
|
||||
options.update((options) => ({
|
||||
...options,
|
||||
data: current_runners,
|
||||
}));
|
||||
dataLoaded = true;
|
||||
let page = 0;
|
||||
while (page >= 0) {
|
||||
const runners = await RunnerService.runnerControllerGetAll(page, 500);
|
||||
if (runners.length == 0) {
|
||||
page = -2;
|
||||
}
|
||||
|
||||
current_runners = current_runners.concat(...runners);
|
||||
options.update((options) => ({
|
||||
...options,
|
||||
data: current_runners,
|
||||
}));
|
||||
|
||||
dataLoaded = true;
|
||||
page++;
|
||||
}
|
||||
});
|
||||
</script>
|
||||
|
||||
|
@@ -178,13 +178,23 @@
|
||||
}
|
||||
|
||||
onMount(async () => {
|
||||
const scans = await ScanService.scanControllerGetAll();
|
||||
current_scans = scans;
|
||||
options.update((options) => ({
|
||||
...options,
|
||||
data: current_scans,
|
||||
}));
|
||||
dataLoaded = true;
|
||||
let page = 0;
|
||||
let pagesize = 500;
|
||||
while (page >= 0) {
|
||||
const scans = await ScanService.scanControllerGetAll(page, pagesize);
|
||||
if (scans.length == 0) {
|
||||
page = -2;
|
||||
}
|
||||
|
||||
current_scans = current_scans.concat(...scans);
|
||||
options.update((options) => ({
|
||||
...options,
|
||||
data: current_scans,
|
||||
}));
|
||||
|
||||
dataLoaded = true;
|
||||
page++;
|
||||
}
|
||||
});
|
||||
</script>
|
||||
|
||||
|
@@ -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...",
|
||||
|
Reference in New Issue
Block a user