From 0e8e71c80056f984e189988a57c1b8a4133e50c0 Mon Sep 17 00:00:00 2001
From: NikolaySuhih <nikolay.suhih@nutnet.ru>
Date: Wed, 30 Jun 2021 17:24:04 +0400
Subject: [PATCH] =?UTF-8?q?fix=20#10:=20=D0=9D=D0=B5=20=D0=BF=D0=BE=D0=BA?=
 =?UTF-8?q?=D0=B0=D0=B7=D1=8B=D0=B2=D0=B0=D1=82=D1=8C=20=D0=BF=D1=83=D1=81?=
 =?UTF-8?q?=D1=82=D0=BE=D0=B5=20=D0=B7=D0=BD=D0=B0=D1=87=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5=20=D0=BE=D0=B1=D1=8F=D0=B7=D0=B0=D1=82=D0=B5=D0=BB=D1=8C?=
 =?UTF-8?q?=D0=BD=D1=8B=D0=BC=20=D0=BF=D0=BE=D0=BB=D1=8F=D0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/WeekDayType.php | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/main/WeekDayType.php b/src/main/WeekDayType.php
index 2f6b409..e81b8dc 100644
--- a/src/main/WeekDayType.php
+++ b/src/main/WeekDayType.php
@@ -118,7 +118,7 @@ public static function getFilterHTML($userField, $htmlControl)
      * @return string
      *
      */
-    protected static function getSelectHTML($name, $current = null, $multiple = false)
+    protected static function getSelectHTML($name, $current = null, $multiple = false, $mandatory = false)
     {
         if (empty(static::$days)) {
             for ($i = WeekDayISO8601::MONDAY; $i <= WeekDayISO8601::SUNDAY; $i++) {
@@ -126,7 +126,11 @@ protected static function getSelectHTML($name, $current = null, $multiple = fals
             }
         }
         $return = '<select name="' . $name . '" ' . ($multiple ? 'multiple' : '') . '>';
-        $return .= '<option></option>';
+
+        if (!$multiple && !$mandatory) {
+            $return .= '<option>(Не выбрано)</option>';
+        }
+
         foreach (static::$days as $i => $day) {
             $selected = false;
             if (null !== $current) {
@@ -188,7 +192,8 @@ public static function getEditFormHTML($userField, $htmlControl)
             if ($userField['VALUE_ID'] < 1 && !empty($userField['SETTINGS']['DEFAULT_VALUE'])) {
                 $htmlControl['VALUE'] = $userField['SETTINGS']['DEFAULT_VALUE'];
             }
-            $return = self::getSelectHTML($userField['FIELD_NAME'], $htmlControl['VALUE']);
+            $return = self::getSelectHTML($userField['FIELD_NAME'], $htmlControl['VALUE'], false,
+                'Y' === $userField['MANDATORY']);
         } elseif (!empty($htmlControl['VALUE'])) {
             $return = static::getAdminListViewHTML($userField, $htmlControl);
         }
@@ -239,7 +244,9 @@ public static function getEditFormHTMLMulty($userField, $htmlControl)
         $return = '&nbsp;';
         if ($userField['EDIT_IN_LIST'] === 'Y') {
             $return = '<table id="table_' . $userField['FIELD_NAME'] . '">
-                <tr><td>' . self::getSelectHTML($htmlControl['NAME'], $htmlControl['VALUE'], true) . '</td></tr>
+                <tr><td>' .
+                    self::getSelectHTML($htmlControl['NAME'], $htmlControl['VALUE'], true, 'Y' === $userField['MANDATORY']) .
+                '</td></tr>
             </table>';
         } elseif (!empty($htmlControl['VALUE'])) {
             $return = static::getAdminListViewHTMLMulty($userField, $htmlControl);