From 4dddde72ded9495b08dc1b5697c715efd510bcb2 Mon Sep 17 00:00:00 2001 From: Adrian Hopek Date: Mon, 2 Jan 2023 11:56:02 +0100 Subject: [PATCH 1/3] change calculations --- resources/js/Pages/VacationLimits.vue | 2 +- resources/js/Shared/RemainingFromPreviousYearPopup.vue | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/resources/js/Pages/VacationLimits.vue b/resources/js/Pages/VacationLimits.vue index b4f31c5c..176efc56 100644 --- a/resources/js/Pages/VacationLimits.vue +++ b/resources/js/Pages/VacationLimits.vue @@ -140,7 +140,7 @@ watch(() => form.items, () => { @change-previous-year="limitToChange = item; takingDaysFromPreviousYear = true" >
- {{ item.remainingLastYear }} + {{ item.remainingLastYear + item.fromPreviousYear }}
diff --git a/resources/js/Shared/RemainingFromPreviousYearPopup.vue b/resources/js/Shared/RemainingFromPreviousYearPopup.vue index 846a54f8..2fe6f8e5 100644 --- a/resources/js/Shared/RemainingFromPreviousYearPopup.vue +++ b/resources/js/Shared/RemainingFromPreviousYearPopup.vue @@ -25,7 +25,7 @@ defineProps({ Pozostałe dni
- {{ remaining ?? 0 }} + {{ (remaining ?? 0) + toNextYear }}
@@ -36,6 +36,14 @@ defineProps({ {{ toNextYear ?? 0 }}
+
+
+ Pozostałe do wykorzystania +
+
+ {{ remaining ?? 0 }} +
+