From f18561f0c733f29b7702e3a8a722a5fb859234a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=95=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=91=D0=B0=D0=BA=D0=B0?=
 =?UTF-8?q?=D0=BB=D1=8C=D1=81=D0=BA=D0=B0=D1=8F?= <elina_kallin@mail.ru>
Date: Fri, 18 Oct 2024 09:27:41 +0400
Subject: [PATCH] =?UTF-8?q?4=20=D0=BB=D0=B0=D0=B1=D0=B0=20=D0=B3=D0=BE?=
 =?UTF-8?q?=D1=82=D0=BE=D0=B2=D0=B0=20=D0=B8=203=20=D1=81=D0=B4=D0=B0?=
 =?UTF-8?q?=D0=BB=D0=B0,=20=D0=B2=D1=81=D0=B5=20=D0=BF=D0=BE=D0=B4=D0=BF?=
 =?UTF-8?q?=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lab4/Form1.cs     |  18 ++++--
 miakd/animals.xsd | 149 ++++++++++++++++++++++++++++++++++------------
 2 files changed, 123 insertions(+), 44 deletions(-)

diff --git a/lab4/Form1.cs b/lab4/Form1.cs
index 7cc0899..ad70947 100644
--- a/lab4/Form1.cs
+++ b/lab4/Form1.cs
@@ -6,7 +6,14 @@ namespace lab4
         {
             InitializeComponent();
             //comboBoxFormats.Items.AddRange(new string[] { "������ ���� � �����", "�������� ����", "������� ����", "������ �����", "��� � �����" });
-            comboBoxFormats.Items.AddRange(new string[] { "F", "d", "D", "T", "Y" });
+            comboBoxFormats.Items.AddRange(new string[] { "F", "d", "D", "T", "Y", "t" });
+
+            // F - ������ ���� � �����
+            // d - ���� � �������, ������� ��� ��������
+            // D - ���� �������
+            // T - ��������� �����, � ���������
+            // Y - ����� � ���
+            // t - ����� � ��������� ��� �������� ����
         }
 
         private void dateTimePicker_ValueChanged(object sender, EventArgs e)
@@ -78,18 +85,17 @@ namespace lab4
 
         private void btnToDate_Click(object sender, EventArgs e)
         {
-            if(textBox1.Text != null)
+            if (textBox1.Text != null)
             {
-               string dateStr = textBox1.Text;
+                string dateStr = textBox1.Text;
                 try
                 {
                     DateTime date = DateTime.Parse(dateStr);
                     dateTimePicker4.Value = date;
                 }
-                catch (Exception)
+                catch (Exception ex)
                 {
-
-                    throw;
+                    MessageBox.Show($"�� �����-�� ������������ ���� �����... ��� ������: {ex.Message}");
                 }
             }
         }
diff --git a/miakd/animals.xsd b/miakd/animals.xsd
index 8cd229a..91ff929 100644
--- a/miakd/animals.xsd
+++ b/miakd/animals.xsd
@@ -1,44 +1,117 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-  <!-- Элемент animals, содержащий один или более animal -->
-  <xs:element name="animals">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="animal" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
+	<!-- Элемент animals, содержащий один или более animal -->
+	<xs:element name="animals">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="animal" maxOccurs="unbounded"/>
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
 
-  <!-- Элемент animal с атрибутом id и набором подэлементов -->
-  <xs:element name="animal">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="name" type="xs:string"/>
-        <xs:element name="size">
-          <xs:complexType>
-            <xs:sequence>
-              <xs:element name="width" type="xs:float" minOccurs="0"/>
-              <xs:element name="height" type="xs:float" minOccurs="0"/>
-            </xs:sequence>
-          </xs:complexType>
-        </xs:element>
-        <xs:element name="weight" type="xs:int" minOccurs="0"/>
-        <xs:element name="color" type="xs:string"/>
-        <xs:element name="diet">
-          <xs:complexType>
-            <xs:sequence>
-              <xs:element name="food" type="xs:string"/>
-              <xs:element name="averageIntake" type="xs:int"/>
-            </xs:sequence>
-          </xs:complexType>
-        </xs:element>
-        <xs:element name="habitat" type="xs:string"/>
-        <xs:element name="interestingFact" type="xs:string"/>
-      </xs:sequence>
-      <!-- Атрибут id, который является уникальным идентификатором -->
-      <xs:attribute name="id" type="xs:ID" use="required"/>
-    </xs:complexType>
-  </xs:element>
+	<!-- Элемент animal с атрибутом id и набором подэлементов -->
+	<xs:element name="animal">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="name">
+					<xs:simpleType>
+						<xs:restriction base="xs:string">
+							<xs:minLength value="2"/>
+							<xs:maxLength value="255"/>
+						</xs:restriction>
+					</xs:simpleType>
+				</xs:element>
+
+				<xs:element name="size">
+					<xs:complexType>
+						<xs:sequence>
+
+							<xs:element name="width">
+								<xs:simpleType>
+									<xs:restriction base="xs:float">
+										<xs:minInclusive value="0.00001"/>
+									</xs:restriction>
+								</xs:simpleType>
+							</xs:element>
+
+							<xs:element name="height">
+								<xs:simpleType>
+									<xs:restriction base="xs:float">
+										<xs:minInclusive value="0.00001"/>
+									</xs:restriction>
+								</xs:simpleType>
+							</xs:element>
+							
+						</xs:sequence>
+					</xs:complexType>
+				</xs:element>
+
+				<xs:element name="weight">
+					<xs:simpleType>
+						<xs:restriction base="xs:integer">
+							<xs:minInclusive value="1"/>
+						</xs:restriction>
+					</xs:simpleType>
+				</xs:element>
+
+
+				<xs:element name="color">
+					<xs:simpleType>
+						<xs:restriction base="xs:string">
+							<xs:minLength value="2"/>
+							<xs:maxLength value="255"/>
+						</xs:restriction>
+					</xs:simpleType>
+				</xs:element>
+
+				<xs:element name="diet">
+					<xs:complexType>
+						<xs:sequence>
+
+							<xs:element name="food">
+								<xs:simpleType>
+									<xs:restriction base="xs:string">
+										<xs:minLength value="2"/>
+										<xs:maxLength value="255"/>
+									</xs:restriction>
+								</xs:simpleType>
+							</xs:element>
+
+							<xs:element name="averageIntake">
+								<xs:simpleType>
+									<xs:restriction base="xs:integer">
+										<xs:minInclusive value="1"/>
+									</xs:restriction>
+								</xs:simpleType>
+							</xs:element>
+							
+						</xs:sequence>
+					</xs:complexType>
+				</xs:element>
+
+				<xs:element name="habitat">
+					<xs:simpleType>
+						<xs:restriction base="xs:string">
+							<xs:minLength value="2"/>
+							<xs:maxLength value="255"/>
+						</xs:restriction>
+					</xs:simpleType>
+				</xs:element>
+
+				<xs:element name="interestingFact">
+					<xs:simpleType>
+						<xs:restriction base="xs:string">
+							<xs:minLength value="2"/>
+							<xs:maxLength value="255"/>
+						</xs:restriction>
+					</xs:simpleType>
+				</xs:element>
+
+			</xs:sequence>
+			<!-- Атрибут id, который является уникальным идентификатором -->
+			<xs:attribute name="id" type="xs:ID" use="required"/>
+		</xs:complexType>
+	</xs:element>
 
 </xs:schema>