This commit is contained in:
Userok 2025-04-25 10:33:17 +03:00
parent 0d41d910bd
commit fc52c99248
14 changed files with 26 additions and 44 deletions

Binary file not shown.

View File

@ -2,14 +2,6 @@
"Version": 1, "Version": 1,
"WorkspaceRootPath": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\", "WorkspaceRootPath": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\",
"Documents": [ "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}", "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}" "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}", "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}" "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": [ "DocumentGroupContainers": [
@ -30,13 +26,13 @@
"Children": [ "Children": [
{ {
"$type": "Document", "$type": "Document",
"DocumentIndex": 3, "DocumentIndex": 1,
"Title": "ConnectorV2.cs", "Title": "ConnectorV2.cs",
"DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\ConnectorV2.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\ConnectorV2.cs",
"RelativeDocumentMoniker": "Hardik\\Conect\\ConnectorV2.cs", "RelativeDocumentMoniker": "Hardik\\Conect\\ConnectorV2.cs",
"ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\ConnectorV2.cs", "ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\ConnectorV2.cs",
"RelativeToolTip": "Hardik\\Conect\\ConnectorV2.cs", "RelativeToolTip": "Hardik\\Conect\\ConnectorV2.cs",
"ViewState": "AgIAAGMAAAAAAAAAAAAawHEAAAAgAAAAAAAAAA==", "ViewState": "AgIAAJsAAAAAAAAAAAAhwKsAAAAJAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-04-21T07:34:41.229Z", "WhenOpened": "2025-04-21T07:34:41.229Z",
"IsPinned": true, "IsPinned": true,
@ -60,20 +56,7 @@
}, },
{ {
"$type": "Document", "$type": "Document",
"DocumentIndex": 1, "DocumentIndex": 2,
"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,
"Title": "SotrudnikiWindow.axaml", "Title": "SotrudnikiWindow.axaml",
"DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\SotrudnikiWindow.axaml", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\SotrudnikiWindow.axaml",
"RelativeDocumentMoniker": "OknaFunciy\\SotrudnikiWindow.axaml", "RelativeDocumentMoniker": "OknaFunciy\\SotrudnikiWindow.axaml",
@ -85,13 +68,13 @@
}, },
{ {
"$type": "Document", "$type": "Document",
"DocumentIndex": 2, "DocumentIndex": 0,
"Title": "SotrudnikiWindow.axaml.cs", "Title": "SotrudnikiWindow.axaml.cs",
"DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\SotrudnikiWindow.axaml.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\SotrudnikiWindow.axaml.cs",
"RelativeDocumentMoniker": "OknaFunciy\\SotrudnikiWindow.axaml.cs", "RelativeDocumentMoniker": "OknaFunciy\\SotrudnikiWindow.axaml.cs",
"ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\SotrudnikiWindow.axaml.cs", "ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\SotrudnikiWindow.axaml.cs",
"RelativeToolTip": "OknaFunciy\\SotrudnikiWindow.axaml.cs", "RelativeToolTip": "OknaFunciy\\SotrudnikiWindow.axaml.cs",
"ViewState": "AgIAAAAAAAAAAAAAAAAAAA8AAAArAAAAAAAAAA==", "ViewState": "AgIAADQAAAAAAAAAAAAAAEkAAAAmAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-02-26T10:37:20.724Z", "WhenOpened": "2025-02-26T10:37:20.724Z",
"EditorCaption": "" "EditorCaption": ""

View File

@ -2,10 +2,6 @@
"Version": 1, "Version": 1,
"WorkspaceRootPath": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\", "WorkspaceRootPath": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\",
"Documents": [ "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}", "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}" "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}", "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}" "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": [ "DocumentGroupContainers": [
@ -22,17 +22,17 @@
"DocumentGroups": [ "DocumentGroups": [
{ {
"DockedWidth": 200, "DockedWidth": 200,
"SelectedChildIndex": 5, "SelectedChildIndex": 6,
"Children": [ "Children": [
{ {
"$type": "Document", "$type": "Document",
"DocumentIndex": 2, "DocumentIndex": 1,
"Title": "ConnectorV2.cs", "Title": "ConnectorV2.cs",
"DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\ConnectorV2.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\ConnectorV2.cs",
"RelativeDocumentMoniker": "Hardik\\Conect\\ConnectorV2.cs", "RelativeDocumentMoniker": "Hardik\\Conect\\ConnectorV2.cs",
"ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\ConnectorV2.cs", "ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\Hardik\\Conect\\ConnectorV2.cs",
"RelativeToolTip": "Hardik\\Conect\\ConnectorV2.cs", "RelativeToolTip": "Hardik\\Conect\\ConnectorV2.cs",
"ViewState": "AgIAAGMAAAAAAAAAAAAawHEAAAAgAAAAAAAAAA==", "ViewState": "AgIAAJsAAAAAAAAAAAAhwKsAAAAJAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-04-21T07:34:41.229Z", "WhenOpened": "2025-04-21T07:34:41.229Z",
"IsPinned": true, "IsPinned": true,
@ -56,7 +56,7 @@
}, },
{ {
"$type": "Document", "$type": "Document",
"DocumentIndex": 0, "DocumentIndex": 2,
"Title": "SotrudnikiWindow.axaml", "Title": "SotrudnikiWindow.axaml",
"DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\SotrudnikiWindow.axaml", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\SotrudnikiWindow.axaml",
"RelativeDocumentMoniker": "OknaFunciy\\SotrudnikiWindow.axaml", "RelativeDocumentMoniker": "OknaFunciy\\SotrudnikiWindow.axaml",
@ -68,13 +68,13 @@
}, },
{ {
"$type": "Document", "$type": "Document",
"DocumentIndex": 1, "DocumentIndex": 0,
"Title": "SotrudnikiWindow.axaml.cs", "Title": "SotrudnikiWindow.axaml.cs",
"DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\SotrudnikiWindow.axaml.cs", "DocumentMoniker": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\SotrudnikiWindow.axaml.cs",
"RelativeDocumentMoniker": "OknaFunciy\\SotrudnikiWindow.axaml.cs", "RelativeDocumentMoniker": "OknaFunciy\\SotrudnikiWindow.axaml.cs",
"ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\SotrudnikiWindow.axaml.cs", "ToolTip": "C:\\Users\\PC\\source\\repos\\Demka_Snova\\OknaFunciy\\SotrudnikiWindow.axaml.cs",
"RelativeToolTip": "OknaFunciy\\SotrudnikiWindow.axaml.cs", "RelativeToolTip": "OknaFunciy\\SotrudnikiWindow.axaml.cs",
"ViewState": "AgIAAAAAAAAAAAAAAAAAAA8AAAArAAAAAAAAAA==", "ViewState": "AgIAADQAAAAAAAAAAAAAAEkAAAAmAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-02-26T10:37:20.724Z", "WhenOpened": "2025-02-26T10:37:20.724Z",
"EditorCaption": "" "EditorCaption": ""

View File

@ -20,7 +20,6 @@
<DataGrid x:Name="SotrudnikiDataGrid" <DataGrid x:Name="SotrudnikiDataGrid"
AutoGenerateColumns="True" AutoGenerateColumns="True"
Margin="0,0,0,10"
SelectionMode="Single" SelectionMode="Single"
Background="Salmon" Background="Salmon"
x:DataType="local:SotrudnikDao" /> x:DataType="local:SotrudnikDao" />

View File

@ -18,7 +18,6 @@ public partial class SotrudnikiWindow : Window
public SotrudnikiWindow() public SotrudnikiWindow()
{ {
InitializeComponent(); InitializeComponent();
this.DataContext = new SotrudnikDao();
this.FindControl<DataGrid>("SotrudnikiDataGrid").ItemsSource = _sotrudnikiList; this.FindControl<DataGrid>("SotrudnikiDataGrid").ItemsSource = _sotrudnikiList;
} }

Binary file not shown.

Binary file not shown.

View File

@ -1,9 +1,10 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 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. // повторной генерации кода.
// </auto-generated> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
@ -13,10 +14,10 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Demka_Snova_1")] [assembly: System.Reflection.AssemblyCompanyAttribute("Demka_Snova_1")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] [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.AssemblyProductAttribute("Demka_Snova_1")]
[assembly: System.Reflection.AssemblyTitleAttribute("Demka_Snova_1")] [assembly: System.Reflection.AssemblyTitleAttribute("Demka_Snova_1")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
// Generated by the MSBuild WriteCodeFragment class. // Создано классом WriteCodeFragment MSBuild.

View File

@ -1 +1 @@
c956316d1f3336107a73249bbe97774e073d56eb57918f22c5b98b8317785679 5fda25391b8fd5e9552bd4a5de0bab425d1c10721507fd7207fa4c02a9430a53