include verification and DQ in xlsx export

diff --git a/resources/js/helpers/Tournament.js b/resources/js/helpers/Tournament.js
index 605b9473ff5aa2a14da298ac9649f5607a87a6c7..935aabd9c649e86bff2269f86be55226384e1963 100644 (file)
--- a/resources/js/helpers/Tournament.js
+++ b/resources/js/helpers/Tournament.js
@@ -125,8 +125,9 @@ export const exportXlsx = async (tnmt) => {
                });
                worksheet.columns = [
                        { header: i18n.t('results.runner'), width: 15 },
-                       { header: i18n.t('results.forfeit'), width: 12 },
                        { header: i18n.t('results.reportTime'), width: 10 },
+                       { header: i18n.t('results.forfeitShort'), width: 5 },
+                       { header: i18n.t('results.disqualifiedShort'), width: 5 },
                        { header: i18n.t('results.placement'), width: 12 },
                        { header: i18n.t('results.score'), width: 8 },
                        { header: i18n.t('results.comment'), width: 20 },
@@ -134,12 +135,15 @@ export const exportXlsx = async (tnmt) => {
                        { header: i18n.t('general.created_at'), width: 18 },
                        { header: i18n.t('results.gotSeedAt'), width: 18 },
                        { header: i18n.t('general.difference'), width: 10 },
+                       { header: i18n.t('results.verified_at'), width: 18 },
+                       { header: i18n.t('results.verified_by'), width: 15 },
                ];
                round.results.forEach((result) => {
                        worksheet.addRow([
                                User.getUserName(result.user),
-                               result.forfeit ? 'x' : '-',
                                Result.formatTime(result),
+                               result.forfeit ? 'x' : '-',
+                               result.disqualified ? 'x' : '-',
                                result.placement,
                                result.score,
                                result.comment || '',
@@ -149,6 +153,8 @@ export const exportXlsx = async (tnmt) => {
                                result.got_seed_at
                                        ? Result.formatTime({ time: moment(result.created_at).diff(result.got_seed_at, 'seconds') })
                                        : '—',
+                               result.verified_at ? moment(result.verified_at).format('L LT') : '—',
+                               result.verified_by ? User.getUserName(result.verified_by) : '—',
                        ]);
                });
        });

diff --git a/resources/js/i18n/de.js b/resources/js/i18n/de.js
index 7eeecf5b47c46a1a695a52bcdf89321da5125cbc..13b5cf9ff2ba3fc08f549a4e1bf6d8c9a98d9e33 100644 (file)
--- a/resources/js/i18n/de.js
+++ b/resources/js/i18n/de.js
@@ -658,6 +658,8 @@ export default {
                        unverifySuccess: 'Verifikation entzogen',
                        verification: 'Verifikation',
                        verificationPending: 'Noch nicht verifiziert',
+                       verified_at: 'Verifiziert am',
+                       verified_by: 'Verifiziert durch',
                        verifiedAt: 'Verifiziert am {{ date, L }}',
                        verifiedAtBy: 'Verifiziert am {{ date, L }} durch <1 />',
                        verifyButton: 'Ergebnis verifizieren',

diff --git a/resources/js/i18n/en.js b/resources/js/i18n/en.js
index d0226471ea817e3025129b2a191d55bd1b884c94..19ecf16683537985e152f430ecb1144e9fb224c5 100644 (file)
--- a/resources/js/i18n/en.js
+++ b/resources/js/i18n/en.js
@@ -658,6 +658,8 @@ export default {
                        unverifySuccess: 'Verification revoked',
                        verification: 'Verification',
                        verificationPending: 'Pending verification',
+                       verified_at: 'Verified on',
+                       verified_by: 'Verified by',
                        verifiedAt: 'Verified on {{ date, L }}',
                        verifiedAtBy: 'Verified on {{ date, L }} by <1 />',
                        verifyButton: 'Verify result',