Add anniversary leave reset

.env.dist

@@ -39,4 +39,4 @@ DB_PORT=5432
 # Microsoft SQL Server: ``mssql://``
 # PyODBC: ``pyodbc://``
 # Amazon Redshift: ``redshift://``
-# LDAP: ``ldap://``
+# LDAP: ``ldap://``

docker-compose.yaml

@@ -36,4 +36,4 @@ services:
       retries: 5
 
 volumes:
-  horilla-data:
+  horilla-data:

employee/forms.py

@@ -285,6 +285,7 @@ class Meta:
             "email",
             "mobile",
             "date_joining",
+            "anniversary_date",
             "contract_end_date",
             "tags",
             "basic_salary",
@@ -295,6 +296,7 @@ class Meta:
         widgets = {
             "date_joining": DateInput(attrs={"type": "date"}),
             "contract_end_date": DateInput(attrs={"type": "date"}),
+            "anniversary_date": DateInput(attrs={"type": "date", "class": "oh-input w-100", "placeholder": _("Select Anniversary Date"),}),
         }
 
     def __init__(self, *args, disable=False, **kwargs):

employee/models.py

@@ -638,6 +638,12 @@ class EmployeeWorkInformation(models.Model):
     )
     additional_info = models.JSONField(null=True, blank=True)
     experience = models.FloatField(null=True, blank=True, default=0)
+    anniversary_date = models.DateField(
+        null=True, 
+        blank=True,
+        verbose_name=_("Anniversary Date"),
+        help_text=_("Date used for anniversary-based leave resets")
+    )
     history = HorillaAuditLog(
         related_name="history_set",
         bases=[
@@ -684,6 +690,25 @@ def experience_calculator(self):
         self.save()
         return self
 
+    def clean(self):
+        super().clean()
+        if self.anniversary_date:
+            # Ensure anniversary date isn't in the future
+            if self.anniversary_date > timezone.now().date():
+                raise ValidationError({
+                    'anniversary_date': _('Anniversary date cannot be in the future')
+                })
+
+            # Check if employee has anniversary-based leave types
+            has_anniversary_leaves = self.employee_id.available_leave.filter(
+                leave_type_id__reset_based='anniversary'
+            ).exists()
+
+            if has_anniversary_leaves and not self.anniversary_date:
+                raise ValidationError({
+                    'anniversary_date': _('Anniversary date is required for employees with anniversary-based leave types')
+                })
+
 
 class EmployeeBankDetails(HorillaModel):
     """

employee/templates/employee/profile/work_info.html

@@ -99,7 +99,13 @@
             </div>
             </div>
         </div>
-
+        <div class="row">
+            <div class="col-12 col-sm-12 col-md-12 col-lg-6">
+            <div class="oh-input-group">
+                <label class="oh-label" for="endDate">{% trans "Contract End Date" %}</label>
+                {{work_form.anniversary_date}}
+            </div>
+        </div>
 
         </form>
     </div>

employee/templates/tabs/personal_tab.html

@@ -264,6 +264,20 @@
 												class="oh-profile__info-value dateformat_changer">{{employee.employee_work_info.date_joining|default:_("None")}}</span>
 										</li>
 
+										<li class="oh-profile__card-info-item">
+											<span class="oh-profile__info-label mb-1">
+												<ion-icon name="calendar-outline"></ion-icon>
+												<span>{% trans "Anniversary Date" %}</span>
+											</span>
+											{% if employee.employee_work_info.anniversary_date %}
+											<span
+												class="oh-profile__info-value dateformat_changer">{{ employee.employee_work_info.anniversary_date }}</span>
+											{% else %}
+											<span class="oh-profile__info-value">{% trans "None" %}</span>
+											{% endif %}
+
+										</li>
+
 										<li class="oh-profile__card-info-item">
 											<span class="oh-profile__info-label mb-1">
 												<ion-icon name="business-outline"></ion-icon>
@@ -273,9 +287,13 @@
 												{% if employee.employee_work_info.tags.all %}
 													{% for i in employee.employee_work_info.tags.all %}
 														{% with tag_width=i.title|length %}
-														<span class="oh-profile__info-value mt-1 mb-1 mr-1"
-															style="background-color: {{ i.color }};
-																		font-size: .8rem; padding: 4px 10px; border-radius: 18px; font-weight: 600; width: {{ tag_width }}em;">{{ i.title }}</span>
+														<span
+														id="dynamicSpan"
+														class="oh-profile__info-value mt-1 mb-1 mr-1"
+														style="font-size: .8rem; padding: 4px 10px; border-radius: 18px; font-weight: 600;"
+														>
+														{{ i.title }}
+														</span>
 														{% endwith %}
 													{% endfor %}
 												{% else %}

entrypoint.sh

@@ -5,4 +5,4 @@ python3 manage.py makemigrations
 python3 manage.py migrate
 python3 manage.py collectstatic --noinput
 python3 manage.py createhorillauser --first_name admin --last_name admin --username admin --password admin --email [email protected] --phone 1234567890
-gunicorn --bind 0.0.0.0:8000 horilla.wsgi:application
+gunicorn --bind 0.0.0.0:8000 horilla.wsgi:application

horilla/settings.py

@@ -222,14 +222,14 @@
 
 LANGUAGE_CODE = "en-us"
 
+# Timezone settings
 TIME_ZONE = env("TIME_ZONE", default="Asia/Kolkata")
+USE_TZ = True
 
 USE_I18N = True
 
 USE_L10N = True
 
-USE_TZ = True
-
 # Production settings
 if not DEBUG:
     SECURE_BROWSER_XSS_FILTER = True

leave/forms.py

@@ -201,6 +201,17 @@ def clean(self):
             cleaned_data["reset_month"] = "1"
             cleaned_data["reset_day"] = "1"
 
+        reset = cleaned_data.get('reset')
+        reset_based = cleaned_data.get('reset_based')
+        reset_month = cleaned_data.get('reset_month')
+        reset_day = cleaned_data.get('reset_day')
+
+        if reset and reset_based != 'anniversary':
+            if not reset_month:
+                raise ValidationError(_('Reset month is required when reset is enabled'))
+            if not reset_day:
+                raise ValidationError(_('Reset day is required when reset is enabled'))
+
         return cleaned_data
 
     def save(self, *args, **kwargs):
@@ -388,7 +399,7 @@ def clean(self):
         if f"{today.month}-{today.year}" in unique_dates:
             unique_dates.remove(f"{today.strftime('%m')}-{today.year}")
 
-        forcated_days = available_leave.forcasted_leaves(start_date)
+        forcasted_days = available_leave.forcasted_leaves(start_date)
         total_leave_days = (
             available_leave.leave_type_id.carryforward_max
             if available_leave.leave_type_id.carryforward_type
@@ -401,7 +412,7 @@ def clean(self):
             and available_leave.carryforward_days
         ):
             total_leave_days = total_leave_days - available_leave.carryforward_days
-        total_leave_days += forcated_days
+        total_leave_days += forcasted_days
 
         if not effective_requested_days <= total_leave_days:
             raise forms.ValidationError(_("Employee doesn't have enough leave days.."))
@@ -516,7 +527,7 @@ def clean(self):
         if f"{today.month}-{today.year}" in unique_dates:
             unique_dates.remove(f"{today.strftime('%m')}-{today.year}")
 
-        forcated_days = available_leave.forcasted_leaves(start_date)
+        forcasted_days = available_leave.forcasted_leaves(start_date)
         total_leave_days = (
             available_leave.leave_type_id.carryforward_max
             if available_leave.leave_type_id.carryforward_type
@@ -529,7 +540,7 @@ def clean(self):
             and available_leave.carryforward_days
         ):
             total_leave_days = total_leave_days - available_leave.carryforward_days
-        total_leave_days += forcated_days
+        total_leave_days += forcasted_days
 
         if not effective_requested_days <= total_leave_days:
             raise forms.ValidationError(_("Employee doesn't have enough leave days.."))