Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
6364536dcd
|
|||
|
a8a771114d
|
|||
|
4e0a2c8301
|
|||
|
b6fed92a17
|
|||
|
97b57aeb0c
|
|||
|
e25ed1fff9
|
|||
|
a2ff5b8a14
|
17
CHANGELOG.md
17
CHANGELOG.md
@@ -2,10 +2,27 @@
|
|||||||
|
|
||||||
All notable changes to this project will be documented in this file. Dates are displayed in UTC.
|
All notable changes to this project will be documented in this file. Dates are displayed in UTC.
|
||||||
|
|
||||||
|
#### [1.4.7](https://git.odit.services/lfk/frontend/compare/1.4.6...1.4.7)
|
||||||
|
|
||||||
|
- 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)
|
||||||
|
|
||||||
|
#### [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)
|
#### [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)
|
- 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)
|
- 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)
|
#### [1.4.4](https://git.odit.services/lfk/frontend/compare/1.4.3...1.4.4)
|
||||||
|
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
<body>
|
<body>
|
||||||
<span style="display: none; visibility: hidden" id="buildinfo"
|
<span style="display: none; visibility: hidden" id="buildinfo"
|
||||||
>RELEASE_INFO-1.4.5-RELEASE_INFO</span
|
>RELEASE_INFO-1.4.7-RELEASE_INFO</span
|
||||||
>
|
>
|
||||||
<noscript>You need to enable JavaScript to run this app.</noscript>
|
<noscript>You need to enable JavaScript to run this app.</noscript>
|
||||||
<script src="/env.js"></script>
|
<script src="/env.js"></script>
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@odit/lfk-frontend",
|
"name": "@odit/lfk-frontend",
|
||||||
"version": "1.4.5",
|
"version": "1.4.7",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"i18n-order": "node order.js",
|
"i18n-order": "node order.js",
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
RunnerService,
|
RunnerService,
|
||||||
} from "@odit/lfk-client-js";
|
} from "@odit/lfk-client-js";
|
||||||
import Select from "svelte-select";
|
import Select from "svelte-select";
|
||||||
import { createEventDispatcher } from "svelte";
|
import { createEventDispatcher, onMount } from "svelte";
|
||||||
import toast from "svelte-french-toast";
|
import toast from "svelte-french-toast";
|
||||||
export let modal_open;
|
export let modal_open;
|
||||||
const dispatch = createEventDispatcher();
|
const dispatch = createEventDispatcher();
|
||||||
@@ -23,16 +23,6 @@
|
|||||||
$: runners = [];
|
$: runners = [];
|
||||||
$: is_fixed = false;
|
$: is_fixed = false;
|
||||||
$: is_paid = 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;
|
$: amount_input = 0;
|
||||||
$: processed_last_submit = true;
|
$: processed_last_submit = true;
|
||||||
$: is_amount_valid = amount_input > 0;
|
$: is_amount_valid = amount_input > 0;
|
||||||
@@ -108,6 +98,35 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
|
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++;
|
||||||
|
}
|
||||||
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
{#if modal_open}
|
{#if modal_open}
|
||||||
|
|||||||
@@ -12,7 +12,6 @@
|
|||||||
$: delete_triggered = false;
|
$: delete_triggered = false;
|
||||||
$: original_data = {};
|
$: original_data = {};
|
||||||
$: editable = {};
|
$: editable = {};
|
||||||
$: current_donations = [];
|
|
||||||
$: changes_performed = !(
|
$: changes_performed = !(
|
||||||
JSON.stringify(original_data) === JSON.stringify(editable)
|
JSON.stringify(original_data) === JSON.stringify(editable)
|
||||||
);
|
);
|
||||||
@@ -29,11 +28,6 @@
|
|||||||
isPhoneValidOrEmpty &&
|
isPhoneValidOrEmpty &&
|
||||||
((isAddress1Valid && iszipcodevalid && iscityvalid) ||
|
((isAddress1Valid && iszipcodevalid && iscityvalid) ||
|
||||||
editable.address_checked === false);
|
editable.address_checked === false);
|
||||||
const donation_promise = DonationService.donationControllerGetAll().then(
|
|
||||||
(val) => {
|
|
||||||
current_donations = val;
|
|
||||||
}
|
|
||||||
);
|
|
||||||
const promise = DonorService.donorControllerGetOne(params.donorid).then(
|
const promise = DonorService.donorControllerGetOne(params.donorid).then(
|
||||||
(data) => {
|
(data) => {
|
||||||
data_loaded = true;
|
data_loaded = true;
|
||||||
@@ -69,7 +63,9 @@
|
|||||||
editable.address = null;
|
editable.address = null;
|
||||||
}
|
}
|
||||||
if (editable.email) editable.email = editable.email;
|
if (editable.email) editable.email = editable.email;
|
||||||
|
else editable.email = null;
|
||||||
if (editable.phone) editable.phone = editable.phone;
|
if (editable.phone) editable.phone = editable.phone;
|
||||||
|
else editable.phone = null;
|
||||||
if (editable.middlename) editable.middlename = editable.middlename;
|
if (editable.middlename) editable.middlename = editable.middlename;
|
||||||
editable.receiptNeeded = editable.address_checked;
|
editable.receiptNeeded = editable.address_checked;
|
||||||
DonorService.donorControllerPut(original_data.id, editable)
|
DonorService.donorControllerPut(original_data.id, editable)
|
||||||
@@ -96,7 +92,7 @@
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<ConfirmDonorDeletion bind:modal_open bind:delete_donor />
|
<ConfirmDonorDeletion bind:modal_open bind:delete_donor />
|
||||||
{#await promise && donation_promise}
|
{#await promise}
|
||||||
{$_("loading-donor-details")}
|
{$_("loading-donor-details")}
|
||||||
{:then}
|
{:then}
|
||||||
<section class="container p-5 select-none">
|
<section class="container p-5 select-none">
|
||||||
@@ -206,8 +202,8 @@
|
|||||||
>
|
>
|
||||||
<br />
|
<br />
|
||||||
<span class="font-medium text-gray-700">{$_("donations")}:</span>
|
<span class="font-medium text-gray-700">{$_("donations")}:</span>
|
||||||
{#if current_donations.filter((d) => d.donor.id == editable.id).length > 0}
|
{#if original_data.donations.length > 0}
|
||||||
{#each current_donations.filter((o) => o.donor.id == editable.id) as d}
|
{#each original_data.donations as d}
|
||||||
{#if d.responseType === "DISTANCEDONATION"}
|
{#if d.responseType === "DISTANCEDONATION"}
|
||||||
<a
|
<a
|
||||||
href="../donations/{d.id}"
|
href="../donations/{d.id}"
|
||||||
|
|||||||
Reference in New Issue
Block a user