diff --git a/.vs/Demka_Snova_1/DesignTimeBuild/.dtbcache.v2 b/.vs/Demka_Snova_1/DesignTimeBuild/.dtbcache.v2
index 633e9d0..8b5aaac 100644
Binary files a/.vs/Demka_Snova_1/DesignTimeBuild/.dtbcache.v2 and b/.vs/Demka_Snova_1/DesignTimeBuild/.dtbcache.v2 differ
diff --git a/.vs/Demka_Snova_1/FileContentIndex/5b834114-99b4-4058-a011-24f1254ceb97.vsidx b/.vs/Demka_Snova_1/FileContentIndex/5b834114-99b4-4058-a011-24f1254ceb97.vsidx
new file mode 100644
index 0000000..93365a2
Binary files /dev/null and b/.vs/Demka_Snova_1/FileContentIndex/5b834114-99b4-4058-a011-24f1254ceb97.vsidx differ
diff --git a/.vs/Demka_Snova_1/FileContentIndex/7ae3f2de-76db-4377-aad2-f86c1afa0ef7.vsidx b/.vs/Demka_Snova_1/FileContentIndex/7ae3f2de-76db-4377-aad2-f86c1afa0ef7.vsidx
deleted file mode 100644
index f8f5ab2..0000000
Binary files a/.vs/Demka_Snova_1/FileContentIndex/7ae3f2de-76db-4377-aad2-f86c1afa0ef7.vsidx and /dev/null differ
diff --git a/.vs/Demka_Snova_1/v17/.suo b/.vs/Demka_Snova_1/v17/.suo
index c10d7d4..3804315 100644
Binary files a/.vs/Demka_Snova_1/v17/.suo and b/.vs/Demka_Snova_1/v17/.suo differ
diff --git a/.vs/Demka_Snova_1/v17/DocumentLayout.backup.json b/.vs/Demka_Snova_1/v17/DocumentLayout.backup.json
index 7aa6c73..5497d5c 100644
--- a/.vs/Demka_Snova_1/v17/DocumentLayout.backup.json
+++ b/.vs/Demka_Snova_1/v17/DocumentLayout.backup.json
@@ -2,14 +2,6 @@
"Version": 1,
"WorkspaceRootPath": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\",
"Documents": [
- {
- "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\oknafunciy\\sotrudnikiwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}",
- "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:oknafunciy\\sotrudnikiwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\hardik\\conect\\dao\\otchotdao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:hardik\\conect\\dao\\otchotdao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
{
"AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\oknafunciy\\sotrudnikiwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:oknafunciy\\sotrudnikiwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
@@ -17,6 +9,10 @@
{
"AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\hardik\\conect\\connectorv2.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:hardik\\conect\\connectorv2.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\oknafunciy\\sotrudnikiwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}",
+ "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:oknafunciy\\sotrudnikiwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}"
}
],
"DocumentGroupContainers": [
@@ -30,13 +26,13 @@
"Children": [
{
"$type": "Document",
- "DocumentIndex": 3,
+ "DocumentIndex": 1,
"Title": "ConnectorV2.cs",
"DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\ConnectorV2.cs",
"RelativeDocumentMoniker": "Hardik\\Conect\\ConnectorV2.cs",
"ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\ConnectorV2.cs",
"RelativeToolTip": "Hardik\\Conect\\ConnectorV2.cs",
- "ViewState": "AgIAAGMAAAAAAAAAAAAawHEAAAAgAAAAAAAAAA==",
+ "ViewState": "AgIAAJsAAAAAAAAAAAAhwKsAAAAJAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-04-21T07:34:41.229Z",
"IsPinned": true,
@@ -60,20 +56,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 1,
- "Title": "OtchotDao.cs",
- "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\Dao\\OtchotDao.cs",
- "RelativeDocumentMoniker": "Hardik\\Conect\\Dao\\OtchotDao.cs",
- "ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\Dao\\OtchotDao.cs",
- "RelativeToolTip": "Hardik\\Conect\\Dao\\OtchotDao.cs",
- "ViewState": "AgIAAAAAAAAAAAAAAAAAAAcAAAABAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-04-25T06:54:08.975Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 0,
+ "DocumentIndex": 2,
"Title": "SotrudnikiWindow.axaml",
"DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\SotrudnikiWindow.axaml",
"RelativeDocumentMoniker": "OknaFunciy\\SotrudnikiWindow.axaml",
@@ -85,13 +68,13 @@
},
{
"$type": "Document",
- "DocumentIndex": 2,
+ "DocumentIndex": 0,
"Title": "SotrudnikiWindow.axaml.cs",
"DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\SotrudnikiWindow.axaml.cs",
"RelativeDocumentMoniker": "OknaFunciy\\SotrudnikiWindow.axaml.cs",
"ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\SotrudnikiWindow.axaml.cs",
"RelativeToolTip": "OknaFunciy\\SotrudnikiWindow.axaml.cs",
- "ViewState": "AgIAAAAAAAAAAAAAAAAAAA8AAAArAAAAAAAAAA==",
+ "ViewState": "AgIAADQAAAAAAAAAAAAAAEkAAAAmAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-02-26T10:37:20.724Z",
"EditorCaption": ""
diff --git a/.vs/Demka_Snova_1/v17/DocumentLayout.json b/.vs/Demka_Snova_1/v17/DocumentLayout.json
index d665339..5497d5c 100644
--- a/.vs/Demka_Snova_1/v17/DocumentLayout.json
+++ b/.vs/Demka_Snova_1/v17/DocumentLayout.json
@@ -2,10 +2,6 @@
"Version": 1,
"WorkspaceRootPath": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\",
"Documents": [
- {
- "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\oknafunciy\\sotrudnikiwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}",
- "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:oknafunciy\\sotrudnikiwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}"
- },
{
"AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\oknafunciy\\sotrudnikiwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:oknafunciy\\sotrudnikiwindow.axaml.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
@@ -13,6 +9,10 @@
{
"AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\hardik\\conect\\connectorv2.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:hardik\\conect\\connectorv2.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|c:\\users\\pc\\source\\repos\\demka_snova\\oknafunciy\\sotrudnikiwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}",
+ "RelativeMoniker": "D:0:0:{DBCADAE1-5DB2-4BCF-ABC7-D80BB8249B56}|Demka_Snova_1.csproj|solutionrelative:oknafunciy\\sotrudnikiwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}"
}
],
"DocumentGroupContainers": [
@@ -22,17 +22,17 @@
"DocumentGroups": [
{
"DockedWidth": 200,
- "SelectedChildIndex": 5,
+ "SelectedChildIndex": 6,
"Children": [
{
"$type": "Document",
- "DocumentIndex": 2,
+ "DocumentIndex": 1,
"Title": "ConnectorV2.cs",
"DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\ConnectorV2.cs",
"RelativeDocumentMoniker": "Hardik\\Conect\\ConnectorV2.cs",
"ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\ConnectorV2.cs",
"RelativeToolTip": "Hardik\\Conect\\ConnectorV2.cs",
- "ViewState": "AgIAAGMAAAAAAAAAAAAawHEAAAAgAAAAAAAAAA==",
+ "ViewState": "AgIAAJsAAAAAAAAAAAAhwKsAAAAJAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-04-21T07:34:41.229Z",
"IsPinned": true,
@@ -56,7 +56,7 @@
},
{
"$type": "Document",
- "DocumentIndex": 0,
+ "DocumentIndex": 2,
"Title": "SotrudnikiWindow.axaml",
"DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\SotrudnikiWindow.axaml",
"RelativeDocumentMoniker": "OknaFunciy\\SotrudnikiWindow.axaml",
@@ -68,13 +68,13 @@
},
{
"$type": "Document",
- "DocumentIndex": 1,
+ "DocumentIndex": 0,
"Title": "SotrudnikiWindow.axaml.cs",
"DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\SotrudnikiWindow.axaml.cs",
"RelativeDocumentMoniker": "OknaFunciy\\SotrudnikiWindow.axaml.cs",
"ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\SotrudnikiWindow.axaml.cs",
"RelativeToolTip": "OknaFunciy\\SotrudnikiWindow.axaml.cs",
- "ViewState": "AgIAAAAAAAAAAAAAAAAAAA8AAAArAAAAAAAAAA==",
+ "ViewState": "AgIAADQAAAAAAAAAAAAAAEkAAAAmAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-02-26T10:37:20.724Z",
"EditorCaption": ""
diff --git a/.vs/ProjectEvaluation/demka_snova_1.metadata.v9.bin b/.vs/ProjectEvaluation/demka_snova_1.metadata.v9.bin
index 003cebe..2288279 100644
Binary files a/.vs/ProjectEvaluation/demka_snova_1.metadata.v9.bin and b/.vs/ProjectEvaluation/demka_snova_1.metadata.v9.bin differ
diff --git a/.vs/ProjectEvaluation/demka_snova_1.projects.v9.bin b/.vs/ProjectEvaluation/demka_snova_1.projects.v9.bin
index bfaceba..ec2e4da 100644
Binary files a/.vs/ProjectEvaluation/demka_snova_1.projects.v9.bin and b/.vs/ProjectEvaluation/demka_snova_1.projects.v9.bin differ
diff --git a/OknaFunciy/SotrudnikiWindow.axaml b/OknaFunciy/SotrudnikiWindow.axaml
index 793b0bb..b3fa87e 100644
--- a/OknaFunciy/SotrudnikiWindow.axaml
+++ b/OknaFunciy/SotrudnikiWindow.axaml
@@ -20,7 +20,6 @@
diff --git a/OknaFunciy/SotrudnikiWindow.axaml.cs b/OknaFunciy/SotrudnikiWindow.axaml.cs
index 7402f22..6eee2ad 100644
--- a/OknaFunciy/SotrudnikiWindow.axaml.cs
+++ b/OknaFunciy/SotrudnikiWindow.axaml.cs
@@ -18,7 +18,6 @@ public partial class SotrudnikiWindow : Window
public SotrudnikiWindow()
{
InitializeComponent();
- this.DataContext = new SotrudnikDao();
this.FindControl("SotrudnikiDataGrid").ItemsSource = _sotrudnikiList;
}
diff --git a/obj/Debug/.AssemblyReference.cache b/obj/Debug/.AssemblyReference.cache
new file mode 100644
index 0000000..98c1572
Binary files /dev/null and b/obj/Debug/.AssemblyReference.cache differ
diff --git a/obj/Debug/net8.0/Avalonia/resources b/obj/Debug/net8.0/Avalonia/resources
index 30edfd9..baaa131 100644
Binary files a/obj/Debug/net8.0/Avalonia/resources and b/obj/Debug/net8.0/Avalonia/resources differ
diff --git a/obj/Debug/net8.0/Demka_Snova_1.AssemblyInfo.cs b/obj/Debug/net8.0/Demka_Snova_1.AssemblyInfo.cs
index 2aa5bf9..e742af6 100644
--- a/obj/Debug/net8.0/Demka_Snova_1.AssemblyInfo.cs
+++ b/obj/Debug/net8.0/Demka_Snova_1.AssemblyInfo.cs
@@ -1,9 +1,10 @@
//------------------------------------------------------------------------------
//
-// This code was generated by a tool.
+// Этот код создан программой.
+// Исполняемая версия:4.0.30319.42000
//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
+// Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
+// повторной генерации кода.
//
//------------------------------------------------------------------------------
@@ -13,10 +14,10 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Demka_Snova_1")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+cd91acd1a80e108e2e780790df928d74a4795440")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+0d41d910bdb402352bdea3f5e14320fc584b1405")]
[assembly: System.Reflection.AssemblyProductAttribute("Demka_Snova_1")]
[assembly: System.Reflection.AssemblyTitleAttribute("Demka_Snova_1")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
-// Generated by the MSBuild WriteCodeFragment class.
+// Создано классом WriteCodeFragment MSBuild.
diff --git a/obj/Debug/net8.0/Demka_Snova_1.AssemblyInfoInputs.cache b/obj/Debug/net8.0/Demka_Snova_1.AssemblyInfoInputs.cache
index 180943a..274c373 100644
--- a/obj/Debug/net8.0/Demka_Snova_1.AssemblyInfoInputs.cache
+++ b/obj/Debug/net8.0/Demka_Snova_1.AssemblyInfoInputs.cache
@@ -1 +1 @@
-c956316d1f3336107a73249bbe97774e073d56eb57918f22c5b98b8317785679
+5fda25391b8fd5e9552bd4a5de0bab425d1c10721507fd7207fa4c02a9430a53