[FIX] BASE: Shift request update validation error for date field and end date toggle issue

This commit is contained in:
Horilla
2024-02-08 12:52:13 +05:30
parent acdb562ed9
commit f70704ed3c
2 changed files with 7 additions and 9 deletions

View File

@@ -882,7 +882,7 @@ class ShiftRequest(models.Model):
]
def clean(self):
if self.requested_date < django.utils.timezone.now().date():
if not self.pk and self.requested_date < django.utils.timezone.now().date():
raise ValidationError(_("Date must be greater than or equal to today"))
if self.requested_till and self.requested_till < self.requested_date:
raise ValidationError(

View File

@@ -7,21 +7,19 @@
{% comment %} </div> {% endcomment %}
</form>
<script>
function toggleFunctionShiftRequestForm(){
if ($('#id_is_permanent_shift').is(":checked")){
$("[for=id_requested_till]").hide();
$("#id_requested_till").hide();
function toggleFunctionShiftRequestForm(element){
if (element.is(":checked")){
$("[id=id_requested_till]").parent().hide();
} else {
$("[for=id_requested_till]").show();
$("#id_requested_till").show();
$("[id=id_requested_till]").parent().show();
}
}
$(document).ready(function(){
$("[type=checkbox]").change(function (e) {
e.preventDefault();
toggleFunctionShiftRequestForm();
toggleFunctionShiftRequestForm($(this));
});
})
toggleFunctionShiftRequestForm();
toggleFunctionShiftRequestForm($("#shiftRequestModalUpdateBody #id_is_permanent_shift"));
</script>