From e24f6bfc080d4536ce2be502706196aa5675dbee Mon Sep 17 00:00:00 2001
From: Alexander Smirnov <fredeom@mail.ru>
Date: Thu, 4 Jul 2024 11:52:53 +0300
Subject: [PATCH] =?utf8?q?=D0=A1=D1=82=D0=B0=D1=80=D1=8B=D0=B9=20=D1=84?=
 =?utf8?q?=D0=B0=D0=BA=D1=82-=D1=81=D0=BC=D0=B5=D0=BD=D0=B0=20=D0=B4=D0=BE?=
 =?utf8?q?=202024-07-01=20=D0=B2=20=D0=BF=D0=BB=D0=B0=D0=BD=D0=B0=D1=85,?=
 =?utf8?q?=20=D0=BD=D0=BE=D0=B2=D0=B0=D1=8F=20=D1=84=D0=B0=D0=BA=D1=82-?=
 =?utf8?q?=D1=81=D0=BC=D0=B5=D0=BD=D0=B0=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/views/timetable/plan.php | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/erp24/views/timetable/plan.php b/erp24/views/timetable/plan.php
index 9fe4af28..1972339c 100755
--- 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 } ?>
-- 
2.39.5