From 27fb7e3d60e3a6950f49e8fc40f70c43ab841a3d Mon Sep 17 00:00:00 2001 From: Horilla Date: Mon, 24 Jun 2024 17:52:48 +0530 Subject: [PATCH] [UPDT] ATTENDANCE: Time format issue fixes --- attendance/static/attendance/actions.js | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/attendance/static/attendance/actions.js b/attendance/static/attendance/actions.js index 0e7c7aafa..520a5a852 100644 --- a/attendance/static/attendance/actions.js +++ b/attendance/static/attendance/actions.js @@ -1745,8 +1745,22 @@ var formattedDate = dateFormatter.getFormattedDate(currentDate); $(".timeformat_changer").each(function (index, element) { var currentTime = $(element).text().trim(); + if (currentTime === 'midnight'){ + if (timeFormatter.timeFormat === 'hh:mm A') { + formattedTime = '12:00 AM' + }else{ + formattedTime = '00:00' + } + } + else if (currentTime === 'noon'){ + if (timeFormatter.timeFormat === 'hh:mm A') { + formattedTime = '12:00 PM' + }else{ + formattedTime = '12:00' + } + } // Checking currentTime value is a valid time. - if (/[\.:]/.test(currentTime)) { + else if (/[\.:]/.test(currentTime)) { var formattedTime = timeFormatter.getFormattedTime(currentTime); } else if (currentTime) { var formattedTime = currentTime;