Старый факт-смена до 2024-07-01 в планах, новая факт-смена после

diff --git a/erp24/views/timetable/plan.php b/erp24/views/timetable/plan.php
index 9fe4af28ece4e42b6e14c52cf50491b56a5aff60..1972339cfda9e6f27afeac9c2493266ba11d5647 100755 (executable)
--- a/erp24/views/timetable/plan.php
+++ b/erp24/views/timetable/plan.php
@@ -239,13 +239,21 @@ $rowNumber = 0;
             <div>
             <?php if ($recordPlan) { ?>
                 <?= $slotTypeLetters[$recordPlan->slot_type_id]?? '#'; ?>
-<?php if ($recordPlan->isWorkSlot()) { ?><span class="color-success">+<?= $recordPlan->work_time; ?></span>
-                <?php } ?>
-                <?php if ($recordFactModels  && $recordPlan->isWorkSlot()) { ?>
-                <?php $rfm_work_time = 0; foreach ($recordFactModels as $rfm) { $rfm_work_time += $rfm->work_time ?? 0; } ?>
-                <div class="hours" <?= count($recordFactModels) > 1 ? 'style="background: yellow"' : '' ?>>Ф+<?= $rfm_work_time ?></div>
+                <?php if ($recordPlan->isWorkSlot()) { ?>
+                    <span class="color-success">+<?= $recordPlan->work_time; ?></span>
                 <?php } ?>
+                <?php if ($date->format("Y-m-d") < '2024-07-01'): ?>
+                    <?php if ($recordFact && $recordPlan->isWorkSlot()) { ?>
+                    <div class="hours">Ф+<?= $recordFact->work_time ?></div>
+                    <?php } ?>
+                <?php endif; ?>
             <?php } ?>
+            <?php if ($date->format("Y-m-d") >= '2024-07-01'): ?>
+                <?php if ($recordFactModels) { ?>
+                    <?php $rfm_work_time = 0; foreach ($recordFactModels as $rfm) { $rfm_work_time += $rfm->work_time ?? 0; } ?>
+                    <div class="hours" <?= count($recordFactModels) > 1 ? 'style="background: yellow"' : '' ?>>Ф+<?= $rfm_work_time ?></div>
+                <?php } ?>
+            <?php endif; ?>
             </div>
         </td>
 <?php } ?>