Update Excuse Leave (#550)

* feat: restricted excuse to be of 2 hours only

Co-authored-by: Copilot <copilot@github.com>

* feat: changed excuses default balance to 12

* feat: added migration to update old users balance

* feat: restricted excuse to be 1 per day

Co-authored-by: Copilot <copilot@github.com>

* test: added unit tests to server

Co-authored-by: Copilot <copilot@github.com>

* fix: fixed ci build error

* fix: changed migration to update only the current year balance

* feat: restricted non excuse leaves not to be 0.25 day

Co-authored-by: Copilot <copilot@github.com>

---------

Co-authored-by: Copilot <copilot@github.com>

Author: fatmaebrahim

client/src/components/cards/vacationCard.vue

@@ -88,7 +88,7 @@
               </v-autocomplete>
             </v-col>
             <v-col cols="6">
-              <v-text-field color="info" item-color="info" base-color="info" variant="outlined" hide-details="auto"
+              <v-text-field v-if ="leaveReason.reason !== 'excuse'" color="info" item-color="info" base-color="info" variant="outlined" hide-details="auto"
                 label="Requested Days" v-model="actualDays" readonly>
               </v-text-field>
             </v-col>

client/src/components/requests/leaveRequest.vue

@@ -5,6 +5,8 @@
         The actual number of vacation days requested is zero. Please note that the selected days may include weekends or
         public holidays.
       </p>
+      <p v-else-if="leaveReason?.reason == 'excuse'">
+        The vacation request submitted is for a total of 1 excuse. </p>
       <p v-else>
         The vacation request submitted is for a total of {{ vacationDays.state.value }}
         {{ vacationDays.state.value <= 1 ? 'day' : 'days' }}. </p>
@@ -47,15 +49,15 @@
 
     <div class="mt-3">
       <v-text-field ref="excuseStartField" item-color="info" base-color="info" color="info" variant="outlined"
-        label="Vacation Start Time" v-model="excuseStart" hide-details="auto" type="time" :rules="[validateTimes]"
-        :readonly="startDate !== endDate">
+        label="Vacation Start Time" v-model="excuseStart" hide-details="auto" type="time"
+        :rules="[validateTimes, validateLeave,]" :readonly="startDate !== endDate">
       </v-text-field>
     </div>
 
     <div class="mt-3">
       <v-text-field ref="excuseEndField" item-color="info" base-color="info" color="info" variant="outlined"
-        label="Vacation End Time" v-model="excuseEnd" hide-details="auto" type="time" :rules="[validateTimes]"
-        :readonly="startDate !== endDate">
+        label="Vacation End Time" v-model="excuseEnd" hide-details="auto" type="time"
+        :rules="[validateTimes, validateLeave,]" :readonly="startDate !== endDate">
       </v-text-field>
     </div>
     <v-row class="mt-3 pa-4 d-flex justify-end">
@@ -222,6 +224,27 @@ export default {
       return true
     }
 
+    watch(leaveReason, () => {
+      excuseStartField.value?.validate()
+      excuseEndField.value?.validate()
+    })
+    const validateLeave = (): string | boolean => {
+      let endHour = Number(excuseEnd.value.split(':')[0])
+      let startHour = Number(excuseStart.value.split(':')[0])
+
+      let endMinute = Number(excuseEnd.value.split(':')[1])
+      let startMinute = Number(excuseStart.value.split(':')[1])
+
+      let diff = (endHour - startHour) * 60 + (endMinute - startMinute)
+ 
+      if (leaveReason.value && leaveReason.value.reason === 'excuse') {
+        if (diff > 120) return 'Excuse time cannot exceed 2 hours in a day.'
+      } else {
+        if (diff < 180) return 'Vacation duration cannot be less than 0.5 days.'
+      }
+      return true
+    }
+
 
     onMounted(async () => {
       startDateField.value.validate()
@@ -301,6 +324,7 @@ export default {
       createLeave,
       validateDates,
       validateTimes,
+      validateLeave,
       useOldBalance,
       balance,
       couldApplyUsingOldBalance,

client/src/views/RequestsView.vue

@@ -86,7 +86,7 @@
                     Reason: <v-chip size="x-small" variant="tonal" class="text-capitalize">{{
                       formatVacationReason(request.reason) }}</v-chip>
                   </p>
-                  <p>
+                  <p v-if="request.reason!='excuse'" >
                     Actual Days: <strong>{{ request.actual_days || 'N/A' }}</strong>
                   </p>
                   <p v-if="request.status === 'approved' || request.status === 'cancel_rejected'">

server/cshr/migrations/0036_update_excuse_balance.py

@@ -0,0 +1,44 @@
+from django.db import migrations, models
+from django.utils import timezone
+
+
+def update_excuse_balance(apps, schema_editor):
+    UserVacationBalance = apps.get_model("cshr", "UserVacationBalance")
+    current_year = timezone.now().year
+
+    for user_balance in UserVacationBalance.objects.filter(year=current_year).select_related("total_days", "remaining_days"):
+        if user_balance.total_days:
+            user_balance.total_days.excuse = 12
+            user_balance.total_days.save(update_fields=["excuse"])
+        if user_balance.remaining_days:
+            user_balance.remaining_days.excuse = min(user_balance.remaining_days.excuse * 4, 12)
+            user_balance.remaining_days.save(update_fields=["excuse"])
+
+
+def reverse_excuse_balance(apps, schema_editor):
+    UserVacationBalance = apps.get_model("cshr", "UserVacationBalance")
+    current_year = timezone.now().year
+
+    for user_balance in UserVacationBalance.objects.filter(year=current_year).select_related("total_days", "remaining_days"):
+        if user_balance.total_days:
+            user_balance.total_days.excuse = 6
+            user_balance.total_days.save(update_fields=["excuse"])
+        if user_balance.remaining_days:
+            user_balance.remaining_days.excuse = user_balance.remaining_days.excuse / 4
+            user_balance.remaining_days.save(update_fields=["excuse"])
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("cshr", "0035_alter_uservacationbalance_year"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="vacationbalancemodel",
+            name="excuse",
+            field=models.FloatField(default=12),
+        ),
+        migrations.RunPython(update_excuse_balance, reverse_excuse_balance),
+    ]

server/cshr/models/vacations.py

@@ -71,7 +71,7 @@ class VacationBalanceModel(TimeStamp):
     unpaid = models.FloatField(default=365)
     annual = models.FloatField(default=15)
     emergency = models.FloatField(default=6)
-    excuse = models.FloatField(default=6)
+    excuse = models.FloatField(default=12)
     is_locked = models.BooleanField(default=False)
 
     def __str__(self):