Merge pull request 'Donation list feature/39-donation_list' (#40) from feature/39-donation_list into dev
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
Reviewed-on: #40
This commit is contained in:
commit
4c83e2e738
|
@ -1,12 +1,14 @@
|
|||
{
|
||||
"access_is_only_provided_via_your_email_link": "Der Zugang erfolgt nur über den Link, den Sie bei der Registrierung erhalten haben.",
|
||||
"already_have_an_account": "Sie haben bereits einen Account?",
|
||||
"amount_per_kilometer_in_eur": "Betrag pro Kilometer (in €)",
|
||||
"apartment_suite_etc": "Addresszeile 2",
|
||||
"cancel_keep_my_data": "Abbrechen, meine Daten behalten",
|
||||
"configuration_error": "Konfigurationsfehler",
|
||||
"confirm_delete_all_of_my_data": "Bestätigung, meine gesamten Daten löschen",
|
||||
"confirm_personal_data": "Hiermit bestätige ich die Vollständigkeit und Richtigkeit der oben genannten Angaben",
|
||||
"delete-all-of-my-data": "Meine gesamten Daten löschen",
|
||||
"current_total_amount_in_eur": "Aktueller Gesamtbetrag (in €)",
|
||||
"delete_all_of_my_data": "Meine gesamten Daten löschen",
|
||||
"delete_my_data": "Meine Daten löschen",
|
||||
"deletion_in_progress": "Daten werden gelöscht...",
|
||||
"distance": "Distanz",
|
||||
|
@ -24,6 +26,7 @@
|
|||
"mittelname": "Mittelname",
|
||||
"nachname": "Nachname",
|
||||
"no_laps_scans_were_recorded_yet": "Es wurden noch keine Runden / Scans aufgezeichnet ...",
|
||||
"no_sponsorings_for_you_were_recorded_yet": "Es gibt noch keine Sponsorings für dich",
|
||||
"not_registered_yet": "Noch nicht registriert?",
|
||||
"organization": "Organisation",
|
||||
"ort": "Ort",
|
||||
|
@ -47,6 +50,7 @@
|
|||
"the_system_is_not_properly_configured_please_contact_the_system_administrator_for_help": "Das System ist nicht richtig konfiguriert. Bitte wenden Sie sich an den Systemadministrator, um Hilfe zu erhalten.",
|
||||
"this_is_not_a_valid_international_phone_number": "Dies ist keine gültige internationale Telefonnummer",
|
||||
"tos": "AGBs",
|
||||
"total": "Gesamt",
|
||||
"view_my_data": "Meine Läuferdaten einsehen",
|
||||
"vorname": "Vorname",
|
||||
"you_have_been_registered": "Sie wurden registriert!",
|
||||
|
|
|
@ -2,11 +2,13 @@
|
|||
"access_is_only_provided_via_your_email_link": "Access is only provided via the link you received upon registration.",
|
||||
"all_data_deleted": "All Data deleted!",
|
||||
"already_have_an_account": "Already have an account?",
|
||||
"amount_per_kilometer_in_eur": "Amount per kilometer (in €)",
|
||||
"apartment_suite_etc": "Apartment, suite, etc.",
|
||||
"cancel_keep_my_data": "Cancel, keep my data",
|
||||
"configuration_error": "Configuration error",
|
||||
"confirm_delete_all_of_my_data": "Confirm, delete all of my data",
|
||||
"confirm_personal_data": "I hereby confirm that the above information is complete and correct",
|
||||
"current_total_amount_in_eur": "Current total amount (in €)",
|
||||
"delete_my_data": "Delete my data",
|
||||
"deletion_in_progress": "Deletion in progress...",
|
||||
"distance": "Distance",
|
||||
|
@ -24,6 +26,7 @@
|
|||
"mittelname": "Middlename",
|
||||
"nachname": "Lastname",
|
||||
"no_laps_scans_were_recorded_yet": "No laps/ scans were recorded yet...",
|
||||
"no_sponsorings_for_you_were_recorded_yet": "No sponsorings for you were recorded yet...",
|
||||
"not_registered_yet": "Not registered yet?",
|
||||
"organization": "Organization",
|
||||
"ort": "City",
|
||||
|
@ -47,6 +50,7 @@
|
|||
"the_system_is_not_properly_configured_please_contact_the_system_administrator_for_help": "The system is not properly configured. Please contact the system administrator for help.",
|
||||
"this_is_not_a_valid_international_phone_number": "This is not a valid international phone number",
|
||||
"tos": "Terms of Service",
|
||||
"total": "Total",
|
||||
"view_my_data": "View my data",
|
||||
"vorname": "Firstname",
|
||||
"you_have_been_registered": "You have been registered!",
|
||||
|
|
|
@ -216,7 +216,7 @@
|
|||
<tbody class="text-gray-900 dark:text-gray-50">
|
||||
<tr v-for="s in state.scans" :key="s.id">
|
||||
<td class="px-4 py-3">
|
||||
<span v-text="s.distance"></span>m
|
||||
<span v-text="s.distance"></span>
|
||||
</td>
|
||||
<td class="px-4 py-3" v-text="s.lapTime"></td>
|
||||
</tr>
|
||||
|
@ -236,7 +236,88 @@
|
|||
</div>
|
||||
</div>
|
||||
<div v-if="(state.activetab === 'sponsorings')" class="tab-content block">
|
||||
<div class="py-4 w-full">coming soon...</div>
|
||||
<div class="py-4 w-full">
|
||||
<section class="text-gray-400 dark:bg-gray-900 body-font">
|
||||
<div class="container mx-auto">
|
||||
<div class="lg:w-2/3 w-full mx-auto overflow-auto">
|
||||
<table
|
||||
v-if="state.sponsorings.length > 0"
|
||||
class="table-auto w-full text-left whitespace-no-wrap"
|
||||
>
|
||||
<thead
|
||||
class="text-black bg-gray-300 dark:text-white text-sm dark:bg-gray-800"
|
||||
>
|
||||
<tr>
|
||||
<th class="px-4 py-3 title-font tracking-wider font-medium">Name</th>
|
||||
<th
|
||||
class="px-4 py-3 title-font tracking-wider font-medium"
|
||||
>{{ $t('amount_per_kilometer_in_eur') }}</th>
|
||||
<th
|
||||
class="px-4 py-3 title-font tracking-wider font-medium"
|
||||
>{{ $t('current_total_amount_in_eur') }}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody class="text-gray-900 dark:text-gray-50">
|
||||
<tr v-for="s in state.sponsorings" :key="s.id">
|
||||
<td class="px-4 py-3">
|
||||
<span v-text="s.donor.firstname"></span>
|
||||
<span v-if="s.donor.middlename">
|
||||
<span v-text="s.donor.middlename"></span>
|
||||
</span>
|
||||
<span v-text="s.donor.lastname"></span>
|
||||
</td>
|
||||
<td class="px-4 py-3">
|
||||
<span
|
||||
v-text="(s.amountPerDistance / 100)
|
||||
.toFixed(2)
|
||||
.toLocaleString('de-DE', { valute: 'EUR' })"
|
||||
></span>€
|
||||
</td>
|
||||
<td class="px-4 py-3">
|
||||
<span
|
||||
v-text="(s.amount / 100)
|
||||
.toFixed(2)
|
||||
.toLocaleString('de-DE', { valute: 'EUR' })"
|
||||
></span>€
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
<tfoot class="text-gray-900 dark:text-gray-50">
|
||||
<tr>
|
||||
<td class="px-4 py-3">{{ $t('total') }}</td>
|
||||
<td class="px-4 py-3">
|
||||
<span
|
||||
v-text="(state.sponsorings.reduce(function(sum, current) {
|
||||
return sum + current.amountPerDistance;
|
||||
}, 0) / 100)
|
||||
.toFixed(2)
|
||||
.toLocaleString('de-DE', { valute: 'EUR' })"
|
||||
></span>€
|
||||
</td>
|
||||
<td class="px-4 py-3">
|
||||
<span
|
||||
v-text="(state.sponsorings.reduce(function(sum, current) {
|
||||
return sum + current.amount;
|
||||
}, 0) / 100)
|
||||
.toFixed(2)
|
||||
.toLocaleString('de-DE', { valute: 'EUR' })"
|
||||
></span>€
|
||||
</td>
|
||||
</tr>
|
||||
</tfoot>
|
||||
</table>
|
||||
<div v-else class="text-center font-bold text-black dark:text-white text-2xl">
|
||||
<img
|
||||
src="../assets/empty_laps.svg"
|
||||
style="height:25rem; margin:0 auto;"
|
||||
:alt="[[$t('no_sponsorings_for_you_were_recorded_yet')]]"
|
||||
/>
|
||||
{{ $t('no_sponsorings_for_you_were_recorded_yet') }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -256,6 +337,7 @@ const state = reactive({
|
|||
middlename: "",
|
||||
lastname: "",
|
||||
scans: [],
|
||||
sponsorings: [],
|
||||
group: "",
|
||||
activetab: "profile",
|
||||
delete_active: false,
|
||||
|
@ -274,6 +356,7 @@ axios.get(`${config.baseurl}api/runners/me/${accesstoken}`)
|
|||
state.middlename = data.middlename;
|
||||
state.lastname = data.lastname;
|
||||
state.group = data.group;
|
||||
state.sponsorings = data.distanceDonations;
|
||||
state.fullobject = data;
|
||||
}).catch((error) => {
|
||||
toast.error("An error occured while loading your profile data");
|
||||
|
@ -282,6 +365,7 @@ axios.get(`${config.baseurl}api/runners/me/${accesstoken}/scans`)
|
|||
.then(({ data }) => {
|
||||
data.map(function(s) {
|
||||
s.lapTime = Math.floor(s.lapTime / 60) + 'min ' + (Math.floor(s.lapTime % 60) + "").padStart(2, "0") + "s"
|
||||
s.distance = Math.floor(s.distance / 1000) + 'km ' + (Math.floor(s.distance % 1000) + "").padStart(3, "0") + "m"
|
||||
return s;
|
||||
})
|
||||
data.filter(s => s.valid === true);
|
||||
|
|
Loading…
Reference in New Issue