diff --git a/attendance/templates/attendance_form.html b/attendance/templates/attendance_form.html index 6a9b12d78..795aa3df5 100644 --- a/attendance/templates/attendance_form.html +++ b/attendance/templates/attendance_form.html @@ -44,10 +44,10 @@ -
+
diff --git a/base/forms.py b/base/forms.py index 550162954..7d726aca8 100644 --- a/base/forms.py +++ b/base/forms.py @@ -512,8 +512,96 @@ class RotatingWorkTypeForm(ModelForm): exclude = ["employee_id", "is_active"] widgets = { "start_date": DateInput(attrs={"type": "date"}), + "additional_data": forms.HiddenInput(), } + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + work_type_counts = 0 + + def create_work_type_field(work_type_key, required, initial=None): + self.fields[work_type_key] = forms.ModelChoiceField( + queryset=WorkType.objects.all(), + widget=forms.Select( + attrs={ + "class": "oh-select oh-select-2 mb-3", + "name": work_type_key, + "id": f"id_{work_type_key}", + } + ), + required=required, + empty_label=_("---Choose Work Type---"), + initial=initial, + ) + + for key in self.data.keys(): + if key.startswith("work_type"): + work_type_counts += 1 + create_work_type_field(key, work_type_counts <= 2) + + additional_data = self.initial.get("additional_data") + additional_work_types = ( + additional_data.get("additional_work_types") if additional_data else None + ) + if additional_work_types: + work_type_counts = 3 + for work_type_id in additional_work_types: + create_work_type_field( + f"work_type{work_type_counts}", + work_type_counts <= 2, + initial=work_type_id, + ) + work_type_counts += 1 + + self.work_type_counts = work_type_counts + + def as_p(self, *args, **kwargs): + context = {"form": self} + return render_to_string( + "base/rotating_work_type/htmx/rotating_work_type_as_p.html", context + ) + + def clean(self): + cleaned_data = super().clean() + additional_work_types = [] + model_fields = list(self.instance.__dict__.keys()) + + for key, value in self.data.items(): + if ( + f"{key}_id" not in model_fields + and key.startswith("work_type") + and value + ): + additional_work_types.append(value) + + if additional_work_types: + if ( + "additional_data" not in cleaned_data + or cleaned_data["additional_data"] is None + ): + cleaned_data["additional_data"] = {} + cleaned_data["additional_data"][ + "additional_work_types" + ] = additional_work_types + + return cleaned_data + + def save(self, commit=True): + instance = super().save(commit=False) + if self.cleaned_data.get("additional_data"): + if instance.additional_data is None: + instance.additional_data = {} + instance.additional_data["additional_work_types"] = self.cleaned_data[ + "additional_data" + ].get("additional_work_types") + else: + instance.additional_data = None + + if commit: + instance.save() + self.save_m2m() + return instance + class RotatingWorkTypeAssignForm(ModelForm): """ @@ -956,6 +1044,88 @@ class RotatingShiftForm(ModelForm): model = RotatingShift fields = "__all__" exclude = ["employee_id", "is_active"] + widgets = {"additional_data": forms.HiddenInput()} + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + shift_counts = 0 + + def create_shift_field(shift_key, required, initial=None): + self.fields[shift_key] = forms.ModelChoiceField( + queryset=EmployeeShift.objects.all(), + widget=forms.Select( + attrs={ + "class": "oh-select oh-select-2 mb-3", + "name": shift_key, + "id": f"id_{shift_key}", + } + ), + required=required, + empty_label=_("---Choose Shift---"), + initial=initial, + ) + + for key in self.data.keys(): + if key.startswith("shift") and self.data[key]: + shift_counts += 1 + create_shift_field(key, shift_counts <= 2) + + additional_data = self.initial.get("additional_data") + additional_shifts = ( + additional_data.get("additional_shifts") if additional_data else None + ) + if additional_shifts: + shift_counts = 3 + for shift_id in additional_shifts: + if shift_id: + create_shift_field( + f"shift{shift_counts}", shift_counts <= 2, initial=shift_id + ) + shift_counts += 1 + + self.shift_counts = shift_counts + + def as_p(self, *args, **kwargs): + context = {"form": self} + return render_to_string( + "base/rotating_shift/htmx/rotating_shift_as_p.html", context + ) + + def clean(self): + cleaned_data = super().clean() + additional_shifts = [] + model_fields = list(self.instance.__dict__.keys()) + + for key, value in self.data.items(): + if f"{key}_id" not in model_fields and key.startswith("shift") and value: + additional_shifts.append(value) + + if additional_shifts: + if ( + "additional_data" not in cleaned_data + or cleaned_data["additional_data"] is None + ): + cleaned_data["additional_data"] = {} + cleaned_data["additional_data"]["additional_shifts"] = additional_shifts + + return cleaned_data + + def save(self, commit=True): + instance = super().save(commit=False) + if self.cleaned_data.get("additional_data"): + if instance.additional_data is None: + instance.additional_data = {} + instance.additional_data["additional_shifts"] = self.cleaned_data[ + "additional_data" + ].get("additional_shifts") + else: + instance.additional_data = None + + if commit: + instance.save() + self.save_m2m() + return instance class RotatingShiftAssignForm(forms.ModelForm): diff --git a/base/models.py b/base/models.py index 9cb156a79..5d729200b 100644 --- a/base/models.py +++ b/base/models.py @@ -231,6 +231,11 @@ class RotatingWorkType(HorillaModel): through="RotatingWorkTypeAssign", verbose_name=_("Employee"), ) + additional_data = models.JSONField( + default=dict, + blank=True, + null=True, + ) objects = HorillaCompanyManager("employee_id__employee_work_info__company_id") class Meta: @@ -246,7 +251,45 @@ class RotatingWorkType(HorillaModel): def clean(self): if self.work_type1 == self.work_type2: - raise ValidationError(_("Choose different work type")) + raise ValidationError(_("Select different work type continuously")) + + additional_work_types = ( + self.additional_data.get("additional_work_types", []) + if self.additional_data + else [] + ) + + if ( + additional_work_types + and str(self.work_type2.id) == additional_work_types[0] + ): + raise ValidationError(_("Select different work type continuously")) + + if ( + additional_work_types + and str(self.work_type1.id) == additional_work_types[-1] + ): + raise ValidationError(_("Select different work type continuously")) + + for i in range(len(additional_work_types) - 1): + if additional_work_types[i] and additional_work_types[i + 1]: + if additional_work_types[i] == additional_work_types[i + 1]: + raise ValidationError(_("Select different work type continuously")) + + def additional_work_types(self): + rotating_work_type = RotatingWorkType.objects.get(id=self.pk) + additional_data = rotating_work_type.additional_data + if additional_data: + additional_work_type_ids = additional_data.get("additional_work_types") + if additional_work_type_ids: + additional_work_types = WorkType.objects.filter( + id__in=additional_work_type_ids + ) + else: + additional_work_types = None + else: + additional_work_types = None + return additional_work_types DAY_DATE = [(str(i), str(i)) for i in range(1, 32)] @@ -548,6 +591,11 @@ class RotatingShift(HorillaModel): on_delete=models.PROTECT, verbose_name=_("Shift 2"), ) + additional_data = models.JSONField( + default=dict, + blank=True, + null=True, + ) objects = HorillaCompanyManager("employee_id__employee_work_info__company_id") class Meta: @@ -563,7 +611,39 @@ class RotatingShift(HorillaModel): def clean(self): if self.shift1 == self.shift2: - raise ValidationError(_("Choose different shifts")) + raise ValidationError(_("Select different shift continuously")) + + additional_shifts = ( + self.additional_data.get("additional_shifts", []) + if self.additional_data + else [] + ) + + if additional_shifts and str(self.shift2.id) == additional_shifts[0]: + raise ValidationError(_("Select different shift continuously")) + + if additional_shifts and str(self.shift1.id) == additional_shifts[-1]: + raise ValidationError(_("Select different shift continuously")) + + for i in range(len(additional_shifts) - 1): + if additional_shifts[i] and additional_shifts[i + 1]: + if additional_shifts[i] == additional_shifts[i + 1]: + raise ValidationError(_("Select different shift continuously")) + + def additional_shifts(self): + rotating_shift = RotatingShift.objects.get(id=self.pk) + additional_data = rotating_shift.additional_data + if additional_data: + additional_shift_ids = additional_data.get("additional_shifts") + if additional_shift_ids: + additional_shifts = EmployeeShift.objects.filter( + id__in=additional_shift_ids + ) + else: + additional_shifts = None + else: + additional_shifts = None + return additional_shifts class RotatingShiftAssign(HorillaModel): diff --git a/base/templates/base/rotating_shift/htmx/add_more_shift_fields.html b/base/templates/base/rotating_shift/htmx/add_more_shift_fields.html new file mode 100644 index 000000000..ef110aeaa --- /dev/null +++ b/base/templates/base/rotating_shift/htmx/add_more_shift_fields.html @@ -0,0 +1,27 @@ +{% load i18n %} +
+ {{field_html}} + + + +
+ \ No newline at end of file diff --git a/base/templates/base/rotating_shift/htmx/rotating_shift_as_p.html b/base/templates/base/rotating_shift/htmx/rotating_shift_as_p.html new file mode 100644 index 000000000..4d93f0d98 --- /dev/null +++ b/base/templates/base/rotating_shift/htmx/rotating_shift_as_p.html @@ -0,0 +1,43 @@ +{% load i18n %} {% load basefilters %} {{ form.non_field_errors }} +{% for field in form.visible_fields %} +{% if field.name|startswith:"shift" and not field.field.required %} +
+ {{ field }} + + + +
+{% else %} +
+ + {{field}} +
+ +{% endif %} {% endfor %} + diff --git a/base/templates/base/rotating_shift/htmx/rotating_shift_form.html b/base/templates/base/rotating_shift/htmx/rotating_shift_form.html index 168b33135..0a72aa52e 100644 --- a/base/templates/base/rotating_shift/htmx/rotating_shift_form.html +++ b/base/templates/base/rotating_shift/htmx/rotating_shift_form.html @@ -22,7 +22,9 @@ {% endif %} class="oh-profile-section" > - {% csrf_token %} {{form.as_p}} + {% csrf_token %} + {{form.as_p}} +
- - {% endif %} -
-
- {% endif %} -
- {% endfor %} - - +
+
+
+
{% trans "Title" %}
+
{% trans "Shift 1" %}
+
{% trans "Shift 2" %}
+
{% trans "Additional Shifts" %}
+
{% trans "Actions" %}
+
+
+
+ {% for rshift in rshifts %} +
+
{{rshift.name}}
+
{{rshift.shift1}}
+
{{rshift.shift2}}
+
+ {% if rshift.additional_shifts %} + {% for shift in rshift.additional_shifts %} + {{shift}}
+ {% endfor %} + {% else %} + {{rshift.additional_shifts}} + {% endif %} +
+ {% if perms.base.change_rotatingshift or perms.base.delete_rotatingshift %} +
+
+ {% if perms.base.change_rotatingshift %} + + + {% endif %} {% if perms.base.delete_rotatingshift %} +
+ {% csrf_token %} + +
+ {% endif %} +
+
+ {% endif %} +
+ {% endfor %} +
+
diff --git a/base/templates/base/rotating_work_type/htmx/add_more_work_type_fields.html b/base/templates/base/rotating_work_type/htmx/add_more_work_type_fields.html new file mode 100644 index 000000000..2ea28ea75 --- /dev/null +++ b/base/templates/base/rotating_work_type/htmx/add_more_work_type_fields.html @@ -0,0 +1,27 @@ +{% load i18n %} +
+ {{field_html}} + + + +
+
+ {% trans "Add more work types.." %} +
diff --git a/base/templates/base/rotating_work_type/htmx/rotating_work_type_as_p.html b/base/templates/base/rotating_work_type/htmx/rotating_work_type_as_p.html new file mode 100644 index 000000000..2dd8bb62f --- /dev/null +++ b/base/templates/base/rotating_work_type/htmx/rotating_work_type_as_p.html @@ -0,0 +1,42 @@ +{% load i18n %} {% load basefilters %} {{ form.non_field_errors }} +{% for field in form.visible_fields %} +{% if field.name|startswith:"work_type" and not field.field.required %} +
+ {{ field }} + + + +
+{% else %} +
+ + {{field}} +
+{% endif %} {% endfor %} +
+ + {% trans "Add more work types.." %} + +
diff --git a/base/templates/base/shift/schedule_view.html b/base/templates/base/shift/schedule_view.html index 00bfe501c..2cba6367c 100644 --- a/base/templates/base/shift/schedule_view.html +++ b/base/templates/base/shift/schedule_view.html @@ -8,7 +8,7 @@
{% trans "Shift" %}
-
{% trans "Days" %}
+
{% trans "Days" %}
diff --git a/base/urls.py b/base/urls.py index 75e65b764..f5e8032ad 100644 --- a/base/urls.py +++ b/base/urls.py @@ -1,10 +1,12 @@ from django.contrib.auth.models import Group from django.contrib.auth.views import PasswordResetConfirmView from django.urls import path +from django.utils.translation import gettext_lazy as _ from base import announcement, request_and_approve, views from base.forms import ( RotatingShiftAssignForm, + RotatingShiftForm, RotatingWorkTypeAssignForm, RotatingWorkTypeForm, ShiftRequestForm, @@ -192,6 +194,18 @@ urlpatterns = [ name="work-type-delete", kwargs={"model": WorkType, "redirect": "/settings/work-type-view"}, ), + path( + "add-remove-work-type-fields", + views.add_remove_dynamic_fields, + name="add-remove-work-type-fields", + kwargs={ + "model": WorkType, + "form_class": RotatingWorkTypeForm, + "template": "base/rotating_work_type/htmx/add_more_work_type_fields.html", + "empty_label": _("---Choose Work Type---"), + "field_name_pre": "work_type", + }, + ), path( "settings/rotating-work-type-create/", views.rotating_work_type_create, @@ -352,6 +366,18 @@ urlpatterns = [ views.rotating_shift_create, name="rotating-shift-create", ), + path( + "add-remove-shift-fields", + views.add_remove_dynamic_fields, + name="add-remove-shift-fields", + kwargs={ + "model": EmployeeShift, + "form_class": RotatingShiftForm, + "template": "base/rotating_shift/htmx/add_more_shift_fields.html", + "empty_label": _("---Choose Shift---"), + "field_name_pre": "shift", + }, + ), path( "settings/rotating-shift-view/", views.rotating_shift_view, diff --git a/base/views.py b/base/views.py index e5e0b6cd6..38a3719c1 100644 --- a/base/views.py +++ b/base/views.py @@ -919,6 +919,45 @@ def object_duplicate(request, obj_id, **kwargs): return render(request, template, context) +@login_required +@hx_request_required +@duplicate_permission() +def add_remove_dynamic_fields(request, **kwargs): + if request.method == "POST": + model = kwargs["model"] + form_class = kwargs["form_class"] + template = kwargs["template"] + empty_label = kwargs["empty_label"] + field_name_pre = kwargs["field_name_pre"] + hx_target = request.META.get("HTTP_HX_TARGET") + if hx_target: + field_counts = int(hx_target.split("_")[-1]) + 1 + next_hx_target = f"{hx_target.rsplit('_', 1)[0]}_{field_counts}" + form = form_class() + field_name = f"{field_name_pre}{field_counts}" + form.fields[field_name] = forms.ModelChoiceField( + queryset=model.objects.all(), + widget=forms.Select( + attrs={ + "class": "oh-select oh-select-2 mb-3", + "name": field_name, + "id": f"id_{field_name}", + } + ), + required=False, + empty_label=empty_label, + ) + context = { + "field_counts": field_counts, + "field_html": form[field_name].as_widget(), + "current_hx_target": hx_target, + "next_hx_target": next_hx_target, + } + field_html = render_to_string(template, context) + return HttpResponse(field_html) + return HttpResponse() + + @login_required @permission_required("base.view_dynamicemailconfiguration") def mail_server_conf(request): @@ -2023,7 +2062,8 @@ def rotating_shift_create(request): form = RotatingShiftForm() messages.success(request, _("Rotating shift created.")) return HttpResponse("") - + else: + form = RotatingShiftForm() return render( request, "base/rotating_shift/htmx/rotating_shift_form.html", diff --git a/recruitment/templates/candidate/candidate_nav.html b/recruitment/templates/candidate/candidate_nav.html index 8b7a2cafc..73997817c 100644 --- a/recruitment/templates/candidate/candidate_nav.html +++ b/recruitment/templates/candidate/candidate_nav.html @@ -60,7 +60,7 @@ x-data="{searchShow: false}" id="filterForm" hx-target="#section" class="d-flex" - onsubmit="event.preventDefault(); + onsubmit="event.preventDefault();" >