Merge pull request #3 from bdumitrua/1.x

Добавление поля "isProject" в сущность Day

Author: shahruslan

README.md

@@ -50,6 +50,7 @@ $calendarForDay = $calendar->getPeriodForDay(new DateTime('2024-01-01'));
 - `type` - тип дня(праздничный, рабочий, выходной и тд);
 - `weekDay` - день недели;
 - `workingHours` - количество рабочих часов.
+- `isProject` - находится ли этот день в проекте закона и еще не утвержден.
 
 Свойство `statistic` отображает ряд статистических данных для задаваемого периода:
 - `calendarDays` – количество календарных дней в периоде;
@@ -117,6 +118,7 @@ Shahruslan\ProductionCalendar\Entity\Period Object
                             [value] => вс
                         )
                     [workingHours] => 0
+                    [isProject] => 0
                 )
             [1] => Shahruslan\ProductionCalendar\Entity\Day Object
                 (
@@ -137,6 +139,7 @@ Shahruslan\ProductionCalendar\Entity\Period Object
                             [value] => пн
                         )
                     [workingHours] => 0
+                    [isProject] => 0
                 )
             [2] => Shahruslan\ProductionCalendar\Entity\Day Object
                 (
@@ -157,6 +160,7 @@ Shahruslan\ProductionCalendar\Entity\Period Object
                             [value] => вт
                         )
                     [workingHours] => 8
+                    [isProject] => 0
                 )
         )
     [statistic] => Shahruslan\ProductionCalendar\Entity\Statistic Object

src/Entity/Day.php

@@ -18,5 +18,6 @@ public function __construct(
         public readonly DayType $type,
         public readonly WeekDay $weekDay,
         public readonly int $workingHours,
+        public readonly bool $isProject,
     ) {}
 }

src/Factory/Factory.php

@@ -23,10 +23,11 @@ public static function createPeriod(object $data): Period
         $dateEnd = new DateTimeImmutable($data->dt_end);
 
         $days = array_map(static function ($day) {
-            $data = new DateTimeImmutable($day->date);
+            $date = new DateTimeImmutable($day->date);
             $type = DayType::from($day->type_text);
             $week = WeekDay::from($day->week_day);
-            return new Day($data, $type, $week, $day->working_hours);
+            $isProject =  (bool) ($day->is_project ?? false);
+            return new Day($date, $type, $week, $day->working_hours, $isProject);
         }, $data->days);
 
         $statistic = new Statistic(