From 2043b7962e890fcb70566be9c745e5aa688281c6 Mon Sep 17 00:00:00 2001
From: Tonb73 <Tonby73@yandex.ru>
Date: Fri, 8 Nov 2024 23:41:15 +0400
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=D0=B8=20=D0=B2=D1=8B=D0=B1=D0=BE=D1=80=20=D1=81=D0=BA?=
 =?UTF-8?q?=D0=B8=D0=B4=D0=BA=D0=B8=20=D0=B2=20Client?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Forms/FormClient.Designer.cs              |  25 ++--
 project/ProjectTourAgency/Forms/FormClient.cs |   7 +-
 .../Forms/FormTour.Designer.cs                |  39 ++++++
 project/ProjectTourAgency/Forms/FormTour.cs   |  20 +++
 project/ProjectTourAgency/Forms/FormTour.resx | 120 ++++++++++++++++++
 5 files changed, 195 insertions(+), 16 deletions(-)
 create mode 100644 project/ProjectTourAgency/Forms/FormTour.Designer.cs
 create mode 100644 project/ProjectTourAgency/Forms/FormTour.cs
 create mode 100644 project/ProjectTourAgency/Forms/FormTour.resx

diff --git a/project/ProjectTourAgency/Forms/FormClient.Designer.cs b/project/ProjectTourAgency/Forms/FormClient.Designer.cs
index 627f561..39c5a91 100644
--- a/project/ProjectTourAgency/Forms/FormClient.Designer.cs
+++ b/project/ProjectTourAgency/Forms/FormClient.Designer.cs
@@ -37,8 +37,7 @@
             labelSocialStatus = new Label();
             buttonSave = new Button();
             buttonCancel = new Button();
-            numericUpDownSocialStatus = new NumericUpDown();
-            ((System.ComponentModel.ISupportInitialize)numericUpDownSocialStatus).BeginInit();
+            comboBoxSocialStatus = new ComboBox();
             SuspendLayout();
             // 
             // labelName
@@ -119,20 +118,21 @@
             buttonCancel.UseVisualStyleBackColor = true;
             buttonCancel.Click += buttonCancel_Click;
             // 
-            // numericUpDownSocialStatus
+            // comboBoxSocialStatus
             // 
-            numericUpDownSocialStatus.Location = new Point(156, 187);
-            numericUpDownSocialStatus.Maximum = new decimal(new int[] { 3, 0, 0, 0 });
-            numericUpDownSocialStatus.Name = "numericUpDownSocialStatus";
-            numericUpDownSocialStatus.Size = new Size(120, 23);
-            numericUpDownSocialStatus.TabIndex = 11;
+            comboBoxSocialStatus.DropDownStyle = ComboBoxStyle.DropDownList;
+            comboBoxSocialStatus.FormattingEnabled = true;
+            comboBoxSocialStatus.Location = new Point(156, 179);
+            comboBoxSocialStatus.Name = "comboBoxSocialStatus";
+            comboBoxSocialStatus.Size = new Size(121, 23);
+            comboBoxSocialStatus.TabIndex = 11;
             // 
-            // FormClients
+            // FormClient
             // 
             AutoScaleDimensions = new SizeF(7F, 15F);
             AutoScaleMode = AutoScaleMode.Font;
             ClientSize = new Size(369, 314);
-            Controls.Add(numericUpDownSocialStatus);
+            Controls.Add(comboBoxSocialStatus);
             Controls.Add(buttonCancel);
             Controls.Add(buttonSave);
             Controls.Add(labelSocialStatus);
@@ -142,10 +142,9 @@
             Controls.Add(labelBirthDate);
             Controls.Add(textBoxName);
             Controls.Add(labelName);
-            Name = "FormClients";
+            Name = "FormClient";
             StartPosition = FormStartPosition.CenterScreen;
             Text = "Клиенты";
-            ((System.ComponentModel.ISupportInitialize)numericUpDownSocialStatus).EndInit();
             ResumeLayout(false);
             PerformLayout();
         }
@@ -161,6 +160,6 @@
         private Label labelSocialStatus;
         private Button buttonSave;
         private Button buttonCancel;
-        private NumericUpDown numericUpDownSocialStatus;
+        private ComboBox comboBoxSocialStatus;
     }
 }
\ No newline at end of file
diff --git a/project/ProjectTourAgency/Forms/FormClient.cs b/project/ProjectTourAgency/Forms/FormClient.cs
index e64657d..225fce4 100644
--- a/project/ProjectTourAgency/Forms/FormClient.cs
+++ b/project/ProjectTourAgency/Forms/FormClient.cs
@@ -1,4 +1,5 @@
 using ProjectTourAgency.Enities;
+using ProjectTourAgency.Enities.Enums;
 using ProjectTourAgency.Repositories;
 using System;
 using System.Collections.Generic;
@@ -31,7 +32,7 @@ public partial class FormClient : Form
                 }
                 textBoxName.Text = client.FullName;
                 textBoxNumber.Text = client.PhoneNumber;
-                numericUpDownSocialStatus.Value = (decimal)client.ClientSocialStatus;
+                comboBoxSocialStatus.SelectedItem = client.ClientSocialStatus;
                 dateTimePickerBirth.Value = client.BirthDate;
 
             }
@@ -48,6 +49,7 @@ public partial class FormClient : Form
         InitializeComponent();
         _clientRepository = clientRepository ??
             throw new ArgumentNullException(nameof(clientRepository));
+        comboBoxSocialStatus.DataSource = Enum.GetValues(typeof(ClientSocialStatus));
     }
 
     private void buttonSave_Click(object sender, EventArgs e)
@@ -79,6 +81,5 @@ public partial class FormClient : Form
     private void buttonCancel_Click(object sender, EventArgs e) => Close();
 
     private Client CreateClient(int id) => Client.CreateEntity(id, textBoxName.Text, 
-        dateTimePickerBirth.Value, textBoxNumber.Text, 
-        (Enities.Enums.ClientSocialStatus)numericUpDownSocialStatus.Value);
+        dateTimePickerBirth.Value, textBoxNumber.Text, (ClientSocialStatus)comboBoxSocialStatus.SelectedItem!);
 }
diff --git a/project/ProjectTourAgency/Forms/FormTour.Designer.cs b/project/ProjectTourAgency/Forms/FormTour.Designer.cs
new file mode 100644
index 0000000..a21485e
--- /dev/null
+++ b/project/ProjectTourAgency/Forms/FormTour.Designer.cs
@@ -0,0 +1,39 @@
+namespace ProjectTourAgency.Forms
+{
+    partial class FormTour
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(800, 450);
+            this.Text = "FormTour";
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/project/ProjectTourAgency/Forms/FormTour.cs b/project/ProjectTourAgency/Forms/FormTour.cs
new file mode 100644
index 0000000..7d1fbc9
--- /dev/null
+++ b/project/ProjectTourAgency/Forms/FormTour.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace ProjectTourAgency.Forms
+{
+    public partial class FormTour : Form
+    {
+        public FormTour()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/project/ProjectTourAgency/Forms/FormTour.resx b/project/ProjectTourAgency/Forms/FormTour.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/project/ProjectTourAgency/Forms/FormTour.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file