Выполненно задание №1

TotKtoSmog · Dec 13, 2023 · 9663e27 · 9663e27
1 parent dfae1be
commit 9663e27
Show file tree

Hide file tree

Showing 9 changed files with 102 additions and 18 deletions.
diff --git a/JsonClass/Content.cs b/JsonClass/Content.cs
@@ -0,0 +1,13 @@
+using System.Runtime.Serialization;
+
+namespace laba4.JsonClass
+{
+    [DataContract]
+    public class Content
+    {
+        [DataMember]
+        public string orderNumber {  get; set; }
+        [DataMember]
+        public Section4 section4 { get; set; }
+    }
+}
diff --git a/JsonProfStandart.cs → JsonClass/JsonProfStandart.cs b/JsonProfStandart.cs → JsonClass/JsonProfStandart.cs
@@ -1,6 +1,6 @@
 using System.Runtime.Serialization;
 
-namespace laba4
+namespace laba4.JsonClass
 {
     [DataContract]
     public class JsonProfStandart
@@ -21,5 +21,7 @@ public class JsonProfStandart
         public string title { get; set; }
         [DataMember]
         public string fgosOrderDate { get; set; }
+        [DataMember]
+        public Content content { get; set; }
     }
 }
diff --git a/JsonClass/ProfessionalCompetenceTaskTable.cs b/JsonClass/ProfessionalCompetenceTaskTable.cs
@@ -0,0 +1,9 @@
+using System.Runtime.Serialization;
+
+namespace laba4.JsonClass
+{
+    [DataContract]
+    public class ProfessionalCompetenceTaskTable
+    {
+    }
+}
diff --git a/JsonClass/ProfessionalStandards.cs b/JsonClass/ProfessionalStandards.cs
@@ -0,0 +1,13 @@
+using System.Runtime.Serialization;
+
+namespace laba4.JsonClass
+{
+    [DataContract]
+    public class ProfessionalStandards
+    {
+        [DataMember]
+        public string id {  get; set; }
+        [DataMember]
+        public string content { get; set; }
+    }
+}
diff --git a/JsonClass/Section4.cs b/JsonClass/Section4.cs
@@ -0,0 +1,12 @@
+using System.Runtime.Serialization;
+
+namespace laba4.JsonClass
+{
+    [DataContract]
+    public class Section4
+    {
+        [DataMember]
+        public ProfessionalStandards[] professionalStandards { get; set; }
+        public ProfessionalCompetenceTaskTable[] professionalCompetenceTaskTable { get; set; }
+    }
+}
diff --git a/MainWindow.xaml b/MainWindow.xaml
@@ -31,8 +31,15 @@
                 </GroupBox>
             </StackPanel>
         </TabItem>
-        <TabItem Header="TabItem">
-            <Grid Background="#FFE5E5E5"/>
+        <TabItem Header="Задание №1">
+            <StackPanel>
+                <DataGrid ItemsSource="{Binding standart}" x:Name="EmployeesTable" AutoGenerateColumns="False" IsReadOnly="True" Margin="0,5,0,0">
+                    <DataGrid.Columns >
+                        <DataGridTextColumn Header="Код" Binding="{Binding Id}"/>
+                        <DataGridTextColumn Header="Назваание" Binding="{Binding Name}"/>
+                    </DataGrid.Columns>
+                </DataGrid>
+            </StackPanel>
         </TabItem>
     </TabControl>
 

diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
@@ -1,19 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
+using System.Windows;
 using System.IO;
 using System.Runtime.Serialization.Json;
+using System.Collections.Generic;
+using System.Linq;
+using laba4.JsonClass;
 
 namespace laba4
 {
@@ -22,11 +12,13 @@ public partial class MainWindow : Window
     {
         public string PathJsonFile = @"C:\Users\Totkt\source\repos\laba4\data\file.json";
         public JsonProfStandart jsonProfStandart { get; set; }
+        public List<Standart> standart { get; set; }
 
         public MainWindow()
         {
             InitializeComponent();
             jsonProfStandart = LoadJsonFile(PathJsonFile);
+            standart = getStandartInData(jsonProfStandart);
             this.DataContext = this;
         }
         public JsonProfStandart LoadJsonFile(string PathJsonFile)
@@ -39,5 +31,22 @@ public JsonProfStandart LoadJsonFile(string PathJsonFile)
             }
             return returnResult;
         }
+
+        private List<Standart> getStandartInData(JsonProfStandart jsonProfStandart)
+        {
+            List<Standart> returnResult = new List<Standart>();
+            foreach(ProfessionalStandards PS in jsonProfStandart.content.section4.professionalStandards)
+            {
+                string id = PS.content.Split(' ').First();
+                string name = PS.content.Replace(id + " ", "");
+                if (!id.Contains("06."))
+                {
+                    id = "";
+                    name = PS.content;
+                }
+                returnResult.Add(new Standart(id, name));
+            }
+            return returnResult;
+        }
     }
 }
diff --git a/Standart.cs b/Standart.cs
@@ -0,0 +1,14 @@
+namespace laba4
+{
+    public class Standart
+    {
+        public string Id { get; set; }
+        public string Name { get; set; }
+        public Standart() { }
+        public Standart(string Id, string Name)
+        {
+            this.Id = Id;
+            this.Name = Name;
+        }
+    }
+}
diff --git a/laba4.csproj b/laba4.csproj
@@ -56,6 +56,9 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Compile Include="JsonClass\ProfessionalCompetenceTaskTable.cs" />
+    <Compile Include="JsonClass\Section4.cs" />
+    <Compile Include="Standart.cs" />
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -64,13 +67,15 @@
       <DependentUpon>App.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="JsonProfStandart.cs" />
+    <Compile Include="JsonClass\Content.cs" />
+    <Compile Include="JsonClass\JsonProfStandart.cs" />
     <Compile Include="MainWindow.xaml.cs">
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="JsonClass\ProfessionalStandards.cs" />
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>