- change moving days details (#281)

* change calculations * bump * fix bump
blumilksoftware · Apr 21, 2023 · a5702da · a5702da
1 parent 6af058a
commit a5702da
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git 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"
                   >
                     <div class="inline-flex items-center py-2 px-4 mt-1 w-full max-w-lg text-gray-500 bg-gray-50 rounded-md border border-gray-300 sm:col-span-2 sm:mt-0 sm:text-sm">
-                      {{ item.remainingLastYear }}
+                      {{ item.remainingLastYear + item.fromPreviousYear }}
                     </div>
                   </RemainingFromPreviousYearPopup>
                 </td>

diff --git a/resources/js/Shared/RemainingFromPreviousYearPopup.vue b/resources/js/Shared/RemainingFromPreviousYearPopup.vue
@@ -25,7 +25,7 @@ defineProps({
               Pozostałe dni
             </dt>
             <dd class="text-sm text-gray-900">
-              {{ remaining ?? 0 }}
+              {{ (remaining ?? 0) + toNextYear }}
             </dd>
           </div>
           <div class="py-2 space-y-1">
@@ -36,6 +36,14 @@ defineProps({
               {{ toNextYear ?? 0 }}
             </dd>
           </div>
+          <div class="py-2 space-y-1">
+            <dt class="text-sm font-medium text-gray-500">
+              Pozostałe do wykorzystania
+            </dt>
+            <dd class="text-sm text-gray-900">
+              {{ remaining ?? 0 }}
+            </dd>
+          </div>
           <div class="py-2">
             <button
               type="button"