diff --git a/pms/forms.py b/pms/forms.py index a4ffb4c53..23c5dc315 100644 --- a/pms/forms.py +++ b/pms/forms.py @@ -672,7 +672,7 @@ class FeedbackForm(ModelForm): widget=forms.Select( attrs={ "class": " oh-select--period-change ", - "style": "width:100%; display:none;", + "style": "width:100%;", } ), required=False, @@ -706,41 +706,42 @@ class FeedbackForm(ModelForm): "manager_id": forms.Select( attrs={ "class": "oh-select oh-select-2 ", - "style": "width:100%; display:none;", - "required": "false", + "style": "width:100%;", + "required": "true", }, ), "colleague_id": forms.SelectMultiple( attrs={ "class": "oh-select oh-select-2 w-100", "multiple": "multiple", - "style": "width:100%; display:none;", + "style": "width:100%;", } ), "subordinate_id": forms.SelectMultiple( attrs={ "class": "oh-select oh-select-2 w-100", "multiple": "multiple", - "style": "width:100%; display:none;", + "style": "width:100%;", "required": "false", } ), "question_template_id": forms.Select( attrs={ "class": "oh-select oh-select--lg oh-select-no-search", - "style": "width:100%; display:none;", - "required": "false", + "style": "width:100%;", + "required": "true", } ), "cyclic_feedback": forms.CheckboxInput( attrs={ "class": "oh-switch__checkbox", + "onchange": "changeCyclicFeedback(this)", } ), "cyclic_feedback_period": forms.Select( attrs={ "class": "oh-select oh-select--lg oh-select-no-search", - "style": "width:100%; display:none;", + "style": "width:100%;", } ), "cyclic_feedback_days_count": forms.NumberInput( @@ -765,8 +766,10 @@ class FeedbackForm(ModelForm): else: employee = request.user.employee_get - if instance: - kwargs["initial"] = set_date_field_initial(instance) + if not instance: + today = datetime.datetime.today().date() + kwargs["initial"] = {"start_date": today, "end_date": today} + super().__init__(*args, **kwargs) # Horilla multi select filter for employee diff --git a/pms/static/src/feedback/feedback_creation.js b/pms/static/src/feedback/feedback_creation.js index b71e73435..1f7273f12 100644 --- a/pms/static/src/feedback/feedback_creation.js +++ b/pms/static/src/feedback/feedback_creation.js @@ -1,5 +1,5 @@ $(document).ready(function () { - + $('#id_cyclic_feedback').change() $("#id_period").on("change", function () { period_id = $(this).val(); if (period_id === "create_new_period") { @@ -13,39 +13,16 @@ $(document).ready(function () { }); } }); - $("#id_cyclic_feedback").on("change", function () { - if (this.checked) { - $("#cyclic_feedback_period").show(); - $("#id_cyclic_feedback_days_count").attr("required", true); - $("#id_cyclic_feedback_period").attr("required", true); - } else { - $("#cyclic_feedback_period").hide(); - $("#id_cyclic_feedback_days_count").attr("required", false); - $("#id_cyclic_feedback_period").attr("required", false); - } - }); }); -function validateFeedBack(event) { - var button = $(event.srcElement); - var employeElement = $("#id_employee_id"); - var managerElement = $("#id_manager_id"); - var questionTemplateElement = $("#id_question_template_id"); - if (employeElement.val() == "") { - $(employeElement).siblings(".errorlist").first().show(); +function changeCyclicFeedback(element) { + if (element.checked) { + $("#cyclic_feedback_period").show(); + $("#id_cyclic_feedback_days_count").attr("required", true); + $("#id_cyclic_feedback_period").attr("required", true); } else { - $(employeElement).siblings(".errorlist").first().hide(); - } - - if (managerElement.val() == "") { - $(managerElement).siblings(".errorlist").first().show(); - } else { - $(managerElement).siblings(".errorlist").first().hide(); - } - - if (questionTemplateElement.val() == "") { - $(questionTemplateElement).siblings(".errorlist").first().show(); - } else { - $(questionTemplateElement).siblings(".errorlist").first().hide(); + $("#cyclic_feedback_period").hide(); + $("#id_cyclic_feedback_days_count").attr("required", false); + $("#id_cyclic_feedback_period").attr("required", false); } } diff --git a/pms/templates/feedback/feedback_creation.html b/pms/templates/feedback/feedback_creation.html index 6ea07e75d..e1c1d890b 100644 --- a/pms/templates/feedback/feedback_creation.html +++ b/pms/templates/feedback/feedback_creation.html @@ -29,6 +29,7 @@
+ {{feedback_form.non_field_errors}} {% csrf_token %}

{% trans "Feedback" %}

@@ -158,7 +159,6 @@