From 220ad2fcdd0c4bc620e6eb8ff2b1e4ae0d8f6d7c Mon Sep 17 00:00:00 2001 From: Dauren777 Date: Fri, 19 Jun 2026 07:14:47 +0000 Subject: [PATCH] v11 --- index.html | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/index.html b/index.html index caac527..6562206 100644 --- a/index.html +++ b/index.html @@ -314,17 +314,15 @@ function calculateBonus() { recalculatedSalary = Math.round((worker.salary / daysInMonth) * daysAfterProbation * 100) / 100; } - // Generate detailed note only for workers with changes + // Generate detailed note only for workers with recalculation let note = ''; const probEndFormatted = formatDate(probationEndDate.toISOString().split('T')[0]); - if (isExcluded) { - note = `Исключен: Испытательный срок до ${probEndFormatted}`; - } else if (probationEndDate > reportStartDate) { + if (!isExcluded && probationEndDate > reportStartDate) { // Probation ends during the report month - recalculation happened note = `Пересчет с ${probEndFormatted}: факт.дни ${includedDays} из ${worker.workedDays}, оклад ${recalculatedSalary.toLocaleString('ru-RU')}₸ из ${worker.salary.toLocaleString('ru-RU')}₸`; } - // If probation ended before report month - no note needed + // If excluded or probation ended before report month - no note needed results.push({ ...worker,