From 8041cb3da63d6b5162858a1b94eb28abeb839f0d Mon Sep 17 00:00:00 2001
From: gaazzopa <gabriella.azzopardi@cern.ch>
Date: Thu, 26 Nov 2020 16:04:26 +0100
Subject: [PATCH] Remove finish time error when not required

---
 cara/apps/calculator/static/js/form.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/cara/apps/calculator/static/js/form.js b/cara/apps/calculator/static/js/form.js
index 16e77256..a48ae32d 100644
--- a/cara/apps/calculator/static/js/form.js
+++ b/cara/apps/calculator/static/js/form.js
@@ -381,6 +381,9 @@ function validateFinishTime(obj) {
   if ($(obj).hasClass("finish_time_error")) {
     $(obj).removeClass("red_border");
     $(obj).removeClass("finish_time_error");
+    if (!$(obj).hasClass("lunch_break_error")) {
+      $(obj).next('span').remove();
+    }
   }
 
   var startTime = parseValToNumber($(obj).prev().val());
@@ -413,6 +416,7 @@ function validateLunchBreak(obj) {
   }
 
   $(obj).removeClass("red_border");
+  $(obj).removeClass("lunch_break_error");
   if (!$(otherObj).hasClass("red_border") && !$(spanObj).hasClass("finish_time_error")) {
     $(spanObj).next('span').remove();
   }
@@ -429,6 +433,7 @@ function validateLunchBreak(obj) {
 
   if ((time < globalStart) || (time > globalFinish)) {
     $(obj).addClass("red_border");
+    $(obj).addClass("lunch_break_error");
     if (!$(otherObj).hasClass("red_border") && !$(spanObj).hasClass("finish_time_error")) {
       insertSpanAfter(spanObj, "Lunch break must be within activity times");
     }