diff --git a/.vs/COP3_/DesignTimeBuild/.dtbcache.v2 b/.vs/COP3_/DesignTimeBuild/.dtbcache.v2 index 659e05d..100c7c6 100644 Binary files a/.vs/COP3_/DesignTimeBuild/.dtbcache.v2 and b/.vs/COP3_/DesignTimeBuild/.dtbcache.v2 differ diff --git a/.vs/COP3_/v17/.futdcache.v2 b/.vs/COP3_/v17/.futdcache.v2 index 7039371..36d6bbd 100644 Binary files a/.vs/COP3_/v17/.futdcache.v2 and b/.vs/COP3_/v17/.futdcache.v2 differ diff --git a/.vs/COP3_/v17/.suo b/.vs/COP3_/v17/.suo index 0feb3fb..6a3b583 100644 Binary files a/.vs/COP3_/v17/.suo and b/.vs/COP3_/v17/.suo differ diff --git a/.vs/COP3_/v17/DocumentLayout.backup.json b/.vs/COP3_/v17/DocumentLayout.backup.json index 9dd25a5..2fde0ee 100644 --- a/.vs/COP3_/v17/DocumentLayout.backup.json +++ b/.vs/COP3_/v17/DocumentLayout.backup.json @@ -2,22 +2,38 @@ "Version": 1, "WorkspaceRootPath": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\", "Documents": [ - { - "AbsoluteMoniker": "D:0:0:{2A5FA4D6-DB5C-4407-9D47-66BB61DDE865}|WinFormsLibrary1\\WinFormsLibrary1.csproj|c:\\users\\pyata\\source\\repos\\pibd-31_pyatakov_kirill_cop\\winformslibrary1\\winformslibrary1.csproj||{FA3CD31E-987B-443A-9B81-186104E8DAC1}|", - "RelativeMoniker": "D:0:0:{2A5FA4D6-DB5C-4407-9D47-66BB61DDE865}|WinFormsLibrary1\\WinFormsLibrary1.csproj|solutionrelative:winformslibrary1\\winformslibrary1.csproj||{FA3CD31E-987B-443A-9B81-186104E8DAC1}|" - }, { "AbsoluteMoniker": "D:0:0:{5F873328-EE2D-43AA-8CA4-D20618AB7E39}|COP3_\\COP3_.csproj|c:\\users\\pyata\\source\\repos\\pibd-31_pyatakov_kirill_cop\\cop3_\\formedit.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{5F873328-EE2D-43AA-8CA4-D20618AB7E39}|COP3_\\COP3_.csproj|solutionrelative:cop3_\\formedit.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, - { - "AbsoluteMoniker": "D:0:0:{5F873328-EE2D-43AA-8CA4-D20618AB7E39}|COP3_\\COP3_.csproj|C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\cop3_\\formedit.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form", - "RelativeMoniker": "D:0:0:{5F873328-EE2D-43AA-8CA4-D20618AB7E39}|COP3_\\COP3_.csproj|solutionrelative:cop3_\\formedit.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form" - }, { "AbsoluteMoniker": "D:0:0:{5F873328-EE2D-43AA-8CA4-D20618AB7E39}|COP3_\\COP3_.csproj|c:\\users\\pyata\\source\\repos\\pibd-31_pyatakov_kirill_cop\\cop3_\\formmain.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{5F873328-EE2D-43AA-8CA4-D20618AB7E39}|COP3_\\COP3_.csproj|solutionrelative:cop3_\\formmain.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, + { + "AbsoluteMoniker": "D:0:0:{1AD68ED7-C48E-460B-AA6B-3A4BDC456480}|Contarcs\\Contracs.csproj|c:\\users\\pyata\\source\\repos\\pibd-31_pyatakov_kirill_cop\\contarcs\\viewmodels\\orderviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{1AD68ED7-C48E-460B-AA6B-3A4BDC456480}|Contarcs\\Contracs.csproj|solutionrelative:contarcs\\viewmodels\\orderviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{665C4846-99D6-4732-A9AC-EC02072308C1}|DataBaseImplement\\DataBaseImplement.csproj|c:\\users\\pyata\\source\\repos\\pibd-31_pyatakov_kirill_cop\\databaseimplement\\migrations\\20241212213847_init.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{665C4846-99D6-4732-A9AC-EC02072308C1}|DataBaseImplement\\DataBaseImplement.csproj|solutionrelative:databaseimplement\\migrations\\20241212213847_init.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{665C4846-99D6-4732-A9AC-EC02072308C1}|DataBaseImplement\\DataBaseImplement.csproj|c:\\users\\pyata\\source\\repos\\pibd-31_pyatakov_kirill_cop\\databaseimplement\\database.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{665C4846-99D6-4732-A9AC-EC02072308C1}|DataBaseImplement\\DataBaseImplement.csproj|solutionrelative:databaseimplement\\database.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{46BBA540-7DAB-4548-B486-E4A6E4C2C95E}|BusinessLogic\\BusinessLogic.csproj|c:\\users\\pyata\\source\\repos\\pibd-31_pyatakov_kirill_cop\\businesslogic\\orderlogic.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{46BBA540-7DAB-4548-B486-E4A6E4C2C95E}|BusinessLogic\\BusinessLogic.csproj|solutionrelative:businesslogic\\orderlogic.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{2A5FA4D6-DB5C-4407-9D47-66BB61DDE865}|WinFormsLibrary1\\WinFormsLibrary1.csproj|c:\\users\\pyata\\source\\repos\\pibd-31_pyatakov_kirill_cop\\winformslibrary1\\winformslibrary1.csproj||{FA3CD31E-987B-443A-9B81-186104E8DAC1}|", + "RelativeMoniker": "D:0:0:{2A5FA4D6-DB5C-4407-9D47-66BB61DDE865}|WinFormsLibrary1\\WinFormsLibrary1.csproj|solutionrelative:winformslibrary1\\winformslibrary1.csproj||{FA3CD31E-987B-443A-9B81-186104E8DAC1}|" + }, + { + "AbsoluteMoniker": "D:0:0:{5F873328-EE2D-43AA-8CA4-D20618AB7E39}|COP3_\\COP3_.csproj|C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\cop3_\\formedit.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form", + "RelativeMoniker": "D:0:0:{5F873328-EE2D-43AA-8CA4-D20618AB7E39}|COP3_\\COP3_.csproj|solutionrelative:cop3_\\formedit.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form" + }, { "AbsoluteMoniker": "D:0:0:{CC4BA75E-0706-40EA-BE5B-B43F34FB0919}|DataModels\\DataModels.csproj|c:\\users\\pyata\\source\\repos\\pibd-31_pyatakov_kirill_cop\\datamodels\\iordermodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{CC4BA75E-0706-40EA-BE5B-B43F34FB0919}|DataModels\\DataModels.csproj|solutionrelative:datamodels\\iordermodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" @@ -26,10 +42,6 @@ "AbsoluteMoniker": "D:0:0:{665C4846-99D6-4732-A9AC-EC02072308C1}|DataBaseImplement\\DataBaseImplement.csproj|c:\\users\\pyata\\source\\repos\\pibd-31_pyatakov_kirill_cop\\databaseimplement\\models\\order.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{665C4846-99D6-4732-A9AC-EC02072308C1}|DataBaseImplement\\DataBaseImplement.csproj|solutionrelative:databaseimplement\\models\\order.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, - { - "AbsoluteMoniker": "D:0:0:{1AD68ED7-C48E-460B-AA6B-3A4BDC456480}|Contarcs\\Contracs.csproj|c:\\users\\pyata\\source\\repos\\pibd-31_pyatakov_kirill_cop\\contarcs\\viewmodels\\orderviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{1AD68ED7-C48E-460B-AA6B-3A4BDC456480}|Contarcs\\Contracs.csproj|solutionrelative:contarcs\\viewmodels\\orderviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, { "AbsoluteMoniker": "D:0:0:{5F873328-EE2D-43AA-8CA4-D20618AB7E39}|COP3_\\COP3_.csproj|c:\\users\\pyata\\source\\repos\\pibd-31_pyatakov_kirill_cop\\cop3_\\formguide.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{5F873328-EE2D-43AA-8CA4-D20618AB7E39}|COP3_\\COP3_.csproj|solutionrelative:cop3_\\formguide.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" @@ -50,14 +62,6 @@ "AbsoluteMoniker": "D:0:0:{665C4846-99D6-4732-A9AC-EC02072308C1}|DataBaseImplement\\DataBaseImplement.csproj|c:\\users\\pyata\\source\\repos\\pibd-31_pyatakov_kirill_cop\\databaseimplement\\implements\\citystorage.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{665C4846-99D6-4732-A9AC-EC02072308C1}|DataBaseImplement\\DataBaseImplement.csproj|solutionrelative:databaseimplement\\implements\\citystorage.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, - { - "AbsoluteMoniker": "D:0:0:{665C4846-99D6-4732-A9AC-EC02072308C1}|DataBaseImplement\\DataBaseImplement.csproj|c:\\users\\pyata\\source\\repos\\pibd-31_pyatakov_kirill_cop\\databaseimplement\\database.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{665C4846-99D6-4732-A9AC-EC02072308C1}|DataBaseImplement\\DataBaseImplement.csproj|solutionrelative:databaseimplement\\database.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{46BBA540-7DAB-4548-B486-E4A6E4C2C95E}|BusinessLogic\\BusinessLogic.csproj|c:\\users\\pyata\\source\\repos\\pibd-31_pyatakov_kirill_cop\\businesslogic\\orderlogic.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{46BBA540-7DAB-4548-B486-E4A6E4C2C95E}|BusinessLogic\\BusinessLogic.csproj|solutionrelative:businesslogic\\orderlogic.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, { "AbsoluteMoniker": "D:0:0:{1AD68ED7-C48E-460B-AA6B-3A4BDC456480}|Contarcs\\Contracs.csproj|c:\\users\\pyata\\source\\repos\\pibd-31_pyatakov_kirill_cop\\contarcs\\storagecontracts\\icitystorage.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{1AD68ED7-C48E-460B-AA6B-3A4BDC456480}|Contarcs\\Contracs.csproj|solutionrelative:contarcs\\storagecontracts\\icitystorage.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" @@ -102,40 +106,19 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 1, + "SelectedChildIndex": 7, "Children": [ { "$type": "Bookmark", "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}" }, { - "$type": "Document", - "DocumentIndex": 0, - "Title": "WinFormsLibrary1.csproj", - "DocumentMoniker": "C:\\Users\\pyata\\Source\\Repos\\PIbd-31_Pyatakov_Kirill_COP\\WinFormsLibrary1\\WinFormsLibrary1.csproj", - "RelativeDocumentMoniker": "WinFormsLibrary1\\WinFormsLibrary1.csproj", - "ToolTip": "C:\\Users\\pyata\\Source\\Repos\\PIbd-31_Pyatakov_Kirill_COP\\WinFormsLibrary1\\WinFormsLibrary1.csproj", - "RelativeToolTip": "WinFormsLibrary1\\WinFormsLibrary1.csproj", - "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000758|", - "WhenOpened": "2024-12-12T21:12:21.236Z", - "EditorCaption": "" + "$type": "Bookmark", + "Name": "ST:0:0:{cce594b6-0c39-4442-ba28-10c64ac7e89f}" }, { "$type": "Document", - "DocumentIndex": 14, - "Title": "ICityStorage.cs", - "DocumentMoniker": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\Contarcs\\StorageContracts\\ICityStorage.cs", - "RelativeDocumentMoniker": "Contarcs\\StorageContracts\\ICityStorage.cs", - "ToolTip": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\Contarcs\\StorageContracts\\ICityStorage.cs", - "RelativeToolTip": "Contarcs\\StorageContracts\\ICityStorage.cs", - "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-11-27T12:32:54.45Z" - }, - { - "$type": "Document", - "DocumentIndex": 6, + "DocumentIndex": 2, "Title": "OrderViewModel.cs", "DocumentMoniker": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\Contarcs\\ViewModels\\OrderViewModel.cs", "RelativeDocumentMoniker": "Contarcs\\ViewModels\\OrderViewModel.cs", @@ -143,11 +126,12 @@ "RelativeToolTip": "Contarcs\\ViewModels\\OrderViewModel.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAQAAAARAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-11-27T12:29:09.243Z" + "WhenOpened": "2024-11-27T12:29:09.243Z", + "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 17, + "DocumentIndex": 18, "Title": "FormGuide.Designer.cs", "DocumentMoniker": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\COP3_\\FormGuide.Designer.cs", "RelativeDocumentMoniker": "COP3_\\FormGuide.Designer.cs", @@ -159,7 +143,7 @@ }, { "$type": "Document", - "DocumentIndex": 7, + "DocumentIndex": 10, "Title": "FormGuide.cs", "DocumentMoniker": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\COP3_\\FormGuide.cs", "RelativeDocumentMoniker": "COP3_\\FormGuide.cs", @@ -171,7 +155,7 @@ }, { "$type": "Document", - "DocumentIndex": 21, + "DocumentIndex": 22, "Title": "FormEdit.Designer.cs", "DocumentMoniker": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\COP3_\\FormEdit.Designer.cs", "RelativeDocumentMoniker": "COP3_\\FormEdit.Designer.cs", @@ -183,44 +167,7 @@ }, { "$type": "Document", - "DocumentIndex": 1, - "Title": "FormEdit.cs", - "DocumentMoniker": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\COP3_\\FormEdit.cs", - "RelativeDocumentMoniker": "COP3_\\FormEdit.cs", - "ToolTip": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\COP3_\\FormEdit.cs", - "RelativeToolTip": "COP3_\\FormEdit.cs", - "ViewState": "AgIAAAcAAAAAAAAAAAAqwCUAAAAJAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-11-27T11:31:51.212Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 18, - "Title": "CityLogic.cs", - "DocumentMoniker": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\BusinessLogic\\CityLogic.cs", - "RelativeDocumentMoniker": "BusinessLogic\\CityLogic.cs", - "ToolTip": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\BusinessLogic\\CityLogic.cs", - "RelativeToolTip": "BusinessLogic\\CityLogic.cs", - "ViewState": "AgIAAAAAAAAAAAAAAAAAAAYAAAAKAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-11-27T10:58:22.804Z" - }, - { - "$type": "Document", - "DocumentIndex": 16, - "Title": "Program.cs", - "DocumentMoniker": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\COP3_\\Program.cs", - "RelativeDocumentMoniker": "COP3_\\Program.cs", - "ToolTip": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\COP3_\\Program.cs", - "RelativeToolTip": "COP3_\\Program.cs", - "ViewState": "AgIAAAUAAAAAAAAAAAAYwCkAAAA0AAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-11-27T10:55:48.526Z" - }, - { - "$type": "Document", - "DocumentIndex": 12, + "DocumentIndex": 4, "Title": "DataBase.cs", "DocumentMoniker": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\DataBaseImplement\\DataBase.cs", "RelativeDocumentMoniker": "DataBaseImplement\\DataBase.cs", @@ -230,9 +177,107 @@ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2024-11-27T10:54:12.544Z" }, + { + "$type": "Document", + "DocumentIndex": 0, + "Title": "FormEdit.cs", + "DocumentMoniker": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\COP3_\\FormEdit.cs", + "RelativeDocumentMoniker": "COP3_\\FormEdit.cs", + "ToolTip": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\COP3_\\FormEdit.cs", + "RelativeToolTip": "COP3_\\FormEdit.cs", + "ViewState": "AgIAAA8AAAAAAAAAAAAnwB4AAABFAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-11-27T11:31:51.212Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 1, + "Title": "FormMain.cs", + "DocumentMoniker": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\COP3_\\FormMain.cs", + "RelativeDocumentMoniker": "COP3_\\FormMain.cs", + "ToolTip": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\COP3_\\FormMain.cs", + "RelativeToolTip": "COP3_\\FormMain.cs", + "ViewState": "AgIAAAUAAAAAAAAAAAAMwOgAAAA4AAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-11-27T10:05:34.264Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 3, + "Title": "20241212213847_Init.cs", + "DocumentMoniker": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\DataBaseImplement\\Migrations\\20241212213847_Init.cs", + "RelativeDocumentMoniker": "DataBaseImplement\\Migrations\\20241212213847_Init.cs", + "ToolTip": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\DataBaseImplement\\Migrations\\20241212213847_Init.cs", + "RelativeToolTip": "DataBaseImplement\\Migrations\\20241212213847_Init.cs", + "ViewState": "AgIAABYAAAAAAAAAAAAQwAAAAAAAAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-12-12T21:38:47.659Z" + }, + { + "$type": "Document", + "DocumentIndex": 15, + "Title": "ICityStorage.cs", + "DocumentMoniker": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\Contarcs\\StorageContracts\\ICityStorage.cs", + "RelativeDocumentMoniker": "Contarcs\\StorageContracts\\ICityStorage.cs", + "ToolTip": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\Contarcs\\StorageContracts\\ICityStorage.cs", + "RelativeToolTip": "Contarcs\\StorageContracts\\ICityStorage.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-11-27T12:32:54.45Z" + }, { "$type": "Document", "DocumentIndex": 19, + "Title": "CityLogic.cs", + "DocumentMoniker": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\BusinessLogic\\CityLogic.cs", + "RelativeDocumentMoniker": "BusinessLogic\\CityLogic.cs", + "ToolTip": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\BusinessLogic\\CityLogic.cs", + "RelativeToolTip": "BusinessLogic\\CityLogic.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAYAAAAKAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-11-27T10:58:22.804Z" + }, + { + "$type": "Document", + "DocumentIndex": 5, + "Title": "OrderLogic.cs", + "DocumentMoniker": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\BusinessLogic\\OrderLogic.cs", + "RelativeDocumentMoniker": "BusinessLogic\\OrderLogic.cs", + "ToolTip": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\BusinessLogic\\OrderLogic.cs", + "RelativeToolTip": "BusinessLogic\\OrderLogic.cs", + "ViewState": "AgIAAAQAAAAAAAAAAIAwwBYAAAAMAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-11-27T10:42:06.648Z" + }, + { + "$type": "Document", + "DocumentIndex": 6, + "Title": "WinFormsLibrary1.csproj", + "DocumentMoniker": "C:\\Users\\pyata\\Source\\Repos\\PIbd-31_Pyatakov_Kirill_COP\\WinFormsLibrary1\\WinFormsLibrary1.csproj", + "RelativeDocumentMoniker": "WinFormsLibrary1\\WinFormsLibrary1.csproj", + "ToolTip": "C:\\Users\\pyata\\Source\\Repos\\PIbd-31_Pyatakov_Kirill_COP\\WinFormsLibrary1\\WinFormsLibrary1.csproj", + "RelativeToolTip": "WinFormsLibrary1\\WinFormsLibrary1.csproj", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000758|", + "WhenOpened": "2024-12-12T21:12:21.236Z" + }, + { + "$type": "Document", + "DocumentIndex": 17, + "Title": "Program.cs", + "DocumentMoniker": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\COP3_\\Program.cs", + "RelativeDocumentMoniker": "COP3_\\Program.cs", + "ToolTip": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\COP3_\\Program.cs", + "RelativeToolTip": "COP3_\\Program.cs", + "ViewState": "AgIAAAUAAAAAAAAAAAAYwCkAAAA0AAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-11-27T10:55:48.526Z" + }, + { + "$type": "Document", + "DocumentIndex": 20, "Title": "City.cs", "DocumentMoniker": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\DataBaseImplement\\Models\\City.cs", "RelativeDocumentMoniker": "DataBaseImplement\\Models\\City.cs", @@ -244,7 +289,7 @@ }, { "$type": "Document", - "DocumentIndex": 5, + "DocumentIndex": 9, "Title": "Order.cs", "DocumentMoniker": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\DataBaseImplement\\Models\\Order.cs", "RelativeDocumentMoniker": "DataBaseImplement\\Models\\Order.cs", @@ -256,7 +301,7 @@ }, { "$type": "Document", - "DocumentIndex": 20, + "DocumentIndex": 21, "Title": "DataBaseImplement.csproj", "DocumentMoniker": "C:\\Users\\pyata\\Source\\Repos\\PIbd-31_Pyatakov_Kirill_COP\\DataBaseImplement\\DataBaseImplement.csproj", "RelativeDocumentMoniker": "DataBaseImplement\\DataBaseImplement.csproj", @@ -264,12 +309,11 @@ "RelativeToolTip": "DataBaseImplement\\DataBaseImplement.csproj", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000758|", - "WhenOpened": "2024-11-27T10:43:55.615Z", - "EditorCaption": "" + "WhenOpened": "2024-11-27T10:43:55.615Z" }, { "$type": "Document", - "DocumentIndex": 11, + "DocumentIndex": 14, "Title": "CityStorage.cs", "DocumentMoniker": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\DataBaseImplement\\Implements\\CityStorage.cs", "RelativeDocumentMoniker": "DataBaseImplement\\Implements\\CityStorage.cs", @@ -281,19 +325,7 @@ }, { "$type": "Document", - "DocumentIndex": 13, - "Title": "OrderLogic.cs", - "DocumentMoniker": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\BusinessLogic\\OrderLogic.cs", - "RelativeDocumentMoniker": "BusinessLogic\\OrderLogic.cs", - "ToolTip": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\BusinessLogic\\OrderLogic.cs", - "RelativeToolTip": "BusinessLogic\\OrderLogic.cs", - "ViewState": "AgIAAD0AAAAAAAAAAAAYwFoAAABdAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-11-27T10:42:06.648Z" - }, - { - "$type": "Document", - "DocumentIndex": 22, + "DocumentIndex": 23, "Title": "Contracs.csproj", "DocumentMoniker": "C:\\Users\\pyata\\Source\\Repos\\PIbd-31_Pyatakov_Kirill_COP\\Contarcs\\Contracs.csproj", "RelativeDocumentMoniker": "Contarcs\\Contracs.csproj", @@ -301,12 +333,11 @@ "RelativeToolTip": "Contarcs\\Contracs.csproj", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000758|", - "WhenOpened": "2024-11-27T10:40:16.103Z", - "EditorCaption": "" + "WhenOpened": "2024-11-27T10:40:16.103Z" }, { "$type": "Document", - "DocumentIndex": 15, + "DocumentIndex": 16, "Title": "CityBindingModel.cs", "DocumentMoniker": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\Contarcs\\BindingModels\\CityBindingModel.cs", "RelativeDocumentMoniker": "Contarcs\\BindingModels\\CityBindingModel.cs", @@ -318,7 +349,7 @@ }, { "$type": "Document", - "DocumentIndex": 8, + "DocumentIndex": 11, "Title": "OrderBindingModel.cs", "DocumentMoniker": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\Contarcs\\BindingModels\\OrderBindingModel.cs", "RelativeDocumentMoniker": "Contarcs\\BindingModels\\OrderBindingModel.cs", @@ -330,7 +361,7 @@ }, { "$type": "Document", - "DocumentIndex": 9, + "DocumentIndex": 12, "Title": "ICityModel.cs", "DocumentMoniker": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\DataModels\\ICityModel.cs", "RelativeDocumentMoniker": "DataModels\\ICityModel.cs", @@ -342,7 +373,7 @@ }, { "$type": "Document", - "DocumentIndex": 4, + "DocumentIndex": 8, "Title": "IOrderModel.cs", "DocumentMoniker": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\DataModels\\IOrderModel.cs", "RelativeDocumentMoniker": "DataModels\\IOrderModel.cs", @@ -354,44 +385,25 @@ }, { "$type": "Document", - "DocumentIndex": 3, - "Title": "FormMain.cs", - "DocumentMoniker": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\COP3_\\FormMain.cs", - "RelativeDocumentMoniker": "COP3_\\FormMain.cs", - "ToolTip": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\COP3_\\FormMain.cs", - "RelativeToolTip": "COP3_\\FormMain.cs", - "ViewState": "AgIAAAAAAAAAAAAAAAAAABgAAAANAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-11-27T10:05:34.264Z", - "EditorCaption": "" - }, - { - "$type": "Bookmark", - "Name": "ST:0:0:{cce594b6-0c39-4442-ba28-10c64ac7e89f}" - }, - { - "$type": "Document", - "DocumentIndex": 2, + "DocumentIndex": 7, "Title": "FormEdit.cs [Design]", "DocumentMoniker": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\COP3_\\FormEdit.cs", "RelativeDocumentMoniker": "COP3_\\FormEdit.cs", "ToolTip": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\COP3_\\FormEdit.cs [Design]", "RelativeToolTip": "COP3_\\FormEdit.cs [Design]", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-11-27T11:36:14.385Z", - "EditorCaption": " [Design]" + "WhenOpened": "2024-11-27T11:36:14.385Z" }, { "$type": "Document", - "DocumentIndex": 10, + "DocumentIndex": 13, "Title": "FormMain.cs [Design]", "DocumentMoniker": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\COP3_\\FormMain.cs", "RelativeDocumentMoniker": "COP3_\\FormMain.cs", "ToolTip": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\COP3_\\FormMain.cs [Design]", "RelativeToolTip": "COP3_\\FormMain.cs [Design]", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-11-27T09:27:02.569Z", - "EditorCaption": " [Design]" + "WhenOpened": "2024-11-27T09:27:02.569Z" } ] } diff --git a/.vs/COP3_/v17/DocumentLayout.json b/.vs/COP3_/v17/DocumentLayout.json index 6b17b69..6ae17bd 100644 --- a/.vs/COP3_/v17/DocumentLayout.json +++ b/.vs/COP3_/v17/DocumentLayout.json @@ -3,20 +3,36 @@ "WorkspaceRootPath": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\", "Documents": [ { - "AbsoluteMoniker": "D:0:0:{2A5FA4D6-DB5C-4407-9D47-66BB61DDE865}|WinFormsLibrary1\\WinFormsLibrary1.csproj|c:\\users\\pyata\\source\\repos\\pibd-31_pyatakov_kirill_cop\\winformslibrary1\\winformslibrary1.csproj||{FA3CD31E-987B-443A-9B81-186104E8DAC1}|", - "RelativeMoniker": "D:0:0:{2A5FA4D6-DB5C-4407-9D47-66BB61DDE865}|WinFormsLibrary1\\WinFormsLibrary1.csproj|solutionrelative:winformslibrary1\\winformslibrary1.csproj||{FA3CD31E-987B-443A-9B81-186104E8DAC1}|" + "AbsoluteMoniker": "D:0:0:{5F873328-EE2D-43AA-8CA4-D20618AB7E39}|COP3_\\COP3_.csproj|c:\\users\\pyata\\source\\repos\\pibd-31_pyatakov_kirill_cop\\cop3_\\formmain.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{5F873328-EE2D-43AA-8CA4-D20618AB7E39}|COP3_\\COP3_.csproj|solutionrelative:cop3_\\formmain.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { "AbsoluteMoniker": "D:0:0:{5F873328-EE2D-43AA-8CA4-D20618AB7E39}|COP3_\\COP3_.csproj|c:\\users\\pyata\\source\\repos\\pibd-31_pyatakov_kirill_cop\\cop3_\\formedit.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{5F873328-EE2D-43AA-8CA4-D20618AB7E39}|COP3_\\COP3_.csproj|solutionrelative:cop3_\\formedit.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{5F873328-EE2D-43AA-8CA4-D20618AB7E39}|COP3_\\COP3_.csproj|C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\cop3_\\formedit.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form", - "RelativeMoniker": "D:0:0:{5F873328-EE2D-43AA-8CA4-D20618AB7E39}|COP3_\\COP3_.csproj|solutionrelative:cop3_\\formedit.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form" + "AbsoluteMoniker": "D:0:0:{1AD68ED7-C48E-460B-AA6B-3A4BDC456480}|Contarcs\\Contracs.csproj|c:\\users\\pyata\\source\\repos\\pibd-31_pyatakov_kirill_cop\\contarcs\\viewmodels\\orderviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{1AD68ED7-C48E-460B-AA6B-3A4BDC456480}|Contarcs\\Contracs.csproj|solutionrelative:contarcs\\viewmodels\\orderviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{5F873328-EE2D-43AA-8CA4-D20618AB7E39}|COP3_\\COP3_.csproj|c:\\users\\pyata\\source\\repos\\pibd-31_pyatakov_kirill_cop\\cop3_\\formmain.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{5F873328-EE2D-43AA-8CA4-D20618AB7E39}|COP3_\\COP3_.csproj|solutionrelative:cop3_\\formmain.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{665C4846-99D6-4732-A9AC-EC02072308C1}|DataBaseImplement\\DataBaseImplement.csproj|c:\\users\\pyata\\source\\repos\\pibd-31_pyatakov_kirill_cop\\databaseimplement\\migrations\\20241212213847_init.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{665C4846-99D6-4732-A9AC-EC02072308C1}|DataBaseImplement\\DataBaseImplement.csproj|solutionrelative:databaseimplement\\migrations\\20241212213847_init.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{665C4846-99D6-4732-A9AC-EC02072308C1}|DataBaseImplement\\DataBaseImplement.csproj|c:\\users\\pyata\\source\\repos\\pibd-31_pyatakov_kirill_cop\\databaseimplement\\database.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{665C4846-99D6-4732-A9AC-EC02072308C1}|DataBaseImplement\\DataBaseImplement.csproj|solutionrelative:databaseimplement\\database.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{46BBA540-7DAB-4548-B486-E4A6E4C2C95E}|BusinessLogic\\BusinessLogic.csproj|c:\\users\\pyata\\source\\repos\\pibd-31_pyatakov_kirill_cop\\businesslogic\\orderlogic.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{46BBA540-7DAB-4548-B486-E4A6E4C2C95E}|BusinessLogic\\BusinessLogic.csproj|solutionrelative:businesslogic\\orderlogic.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{2A5FA4D6-DB5C-4407-9D47-66BB61DDE865}|WinFormsLibrary1\\WinFormsLibrary1.csproj|c:\\users\\pyata\\source\\repos\\pibd-31_pyatakov_kirill_cop\\winformslibrary1\\winformslibrary1.csproj||{FA3CD31E-987B-443A-9B81-186104E8DAC1}|", + "RelativeMoniker": "D:0:0:{2A5FA4D6-DB5C-4407-9D47-66BB61DDE865}|WinFormsLibrary1\\WinFormsLibrary1.csproj|solutionrelative:winformslibrary1\\winformslibrary1.csproj||{FA3CD31E-987B-443A-9B81-186104E8DAC1}|" + }, + { + "AbsoluteMoniker": "D:0:0:{5F873328-EE2D-43AA-8CA4-D20618AB7E39}|COP3_\\COP3_.csproj|C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\cop3_\\formedit.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form", + "RelativeMoniker": "D:0:0:{5F873328-EE2D-43AA-8CA4-D20618AB7E39}|COP3_\\COP3_.csproj|solutionrelative:cop3_\\formedit.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form" }, { "AbsoluteMoniker": "D:0:0:{CC4BA75E-0706-40EA-BE5B-B43F34FB0919}|DataModels\\DataModels.csproj|c:\\users\\pyata\\source\\repos\\pibd-31_pyatakov_kirill_cop\\datamodels\\iordermodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", @@ -26,10 +42,6 @@ "AbsoluteMoniker": "D:0:0:{665C4846-99D6-4732-A9AC-EC02072308C1}|DataBaseImplement\\DataBaseImplement.csproj|c:\\users\\pyata\\source\\repos\\pibd-31_pyatakov_kirill_cop\\databaseimplement\\models\\order.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{665C4846-99D6-4732-A9AC-EC02072308C1}|DataBaseImplement\\DataBaseImplement.csproj|solutionrelative:databaseimplement\\models\\order.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, - { - "AbsoluteMoniker": "D:0:0:{1AD68ED7-C48E-460B-AA6B-3A4BDC456480}|Contarcs\\Contracs.csproj|c:\\users\\pyata\\source\\repos\\pibd-31_pyatakov_kirill_cop\\contarcs\\viewmodels\\orderviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{1AD68ED7-C48E-460B-AA6B-3A4BDC456480}|Contarcs\\Contracs.csproj|solutionrelative:contarcs\\viewmodels\\orderviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, { "AbsoluteMoniker": "D:0:0:{5F873328-EE2D-43AA-8CA4-D20618AB7E39}|COP3_\\COP3_.csproj|c:\\users\\pyata\\source\\repos\\pibd-31_pyatakov_kirill_cop\\cop3_\\formguide.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{5F873328-EE2D-43AA-8CA4-D20618AB7E39}|COP3_\\COP3_.csproj|solutionrelative:cop3_\\formguide.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" @@ -50,14 +62,6 @@ "AbsoluteMoniker": "D:0:0:{665C4846-99D6-4732-A9AC-EC02072308C1}|DataBaseImplement\\DataBaseImplement.csproj|c:\\users\\pyata\\source\\repos\\pibd-31_pyatakov_kirill_cop\\databaseimplement\\implements\\citystorage.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{665C4846-99D6-4732-A9AC-EC02072308C1}|DataBaseImplement\\DataBaseImplement.csproj|solutionrelative:databaseimplement\\implements\\citystorage.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, - { - "AbsoluteMoniker": "D:0:0:{665C4846-99D6-4732-A9AC-EC02072308C1}|DataBaseImplement\\DataBaseImplement.csproj|c:\\users\\pyata\\source\\repos\\pibd-31_pyatakov_kirill_cop\\databaseimplement\\database.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{665C4846-99D6-4732-A9AC-EC02072308C1}|DataBaseImplement\\DataBaseImplement.csproj|solutionrelative:databaseimplement\\database.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{46BBA540-7DAB-4548-B486-E4A6E4C2C95E}|BusinessLogic\\BusinessLogic.csproj|c:\\users\\pyata\\source\\repos\\pibd-31_pyatakov_kirill_cop\\businesslogic\\orderlogic.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{46BBA540-7DAB-4548-B486-E4A6E4C2C95E}|BusinessLogic\\BusinessLogic.csproj|solutionrelative:businesslogic\\orderlogic.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, { "AbsoluteMoniker": "D:0:0:{1AD68ED7-C48E-460B-AA6B-3A4BDC456480}|Contarcs\\Contracs.csproj|c:\\users\\pyata\\source\\repos\\pibd-31_pyatakov_kirill_cop\\contarcs\\storagecontracts\\icitystorage.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{1AD68ED7-C48E-460B-AA6B-3A4BDC456480}|Contarcs\\Contracs.csproj|solutionrelative:contarcs\\storagecontracts\\icitystorage.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" @@ -102,7 +106,7 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 2, + "SelectedChildIndex": 8, "Children": [ { "$type": "Bookmark", @@ -114,32 +118,7 @@ }, { "$type": "Document", - "DocumentIndex": 0, - "Title": "WinFormsLibrary1.csproj", - "DocumentMoniker": "C:\\Users\\pyata\\Source\\Repos\\PIbd-31_Pyatakov_Kirill_COP\\WinFormsLibrary1\\WinFormsLibrary1.csproj", - "RelativeDocumentMoniker": "WinFormsLibrary1\\WinFormsLibrary1.csproj", - "ToolTip": "C:\\Users\\pyata\\Source\\Repos\\PIbd-31_Pyatakov_Kirill_COP\\WinFormsLibrary1\\WinFormsLibrary1.csproj", - "RelativeToolTip": "WinFormsLibrary1\\WinFormsLibrary1.csproj", - "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000758|", - "WhenOpened": "2024-12-12T21:12:21.236Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 14, - "Title": "ICityStorage.cs", - "DocumentMoniker": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\Contarcs\\StorageContracts\\ICityStorage.cs", - "RelativeDocumentMoniker": "Contarcs\\StorageContracts\\ICityStorage.cs", - "ToolTip": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\Contarcs\\StorageContracts\\ICityStorage.cs", - "RelativeToolTip": "Contarcs\\StorageContracts\\ICityStorage.cs", - "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-11-27T12:32:54.45Z" - }, - { - "$type": "Document", - "DocumentIndex": 6, + "DocumentIndex": 2, "Title": "OrderViewModel.cs", "DocumentMoniker": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\Contarcs\\ViewModels\\OrderViewModel.cs", "RelativeDocumentMoniker": "Contarcs\\ViewModels\\OrderViewModel.cs", @@ -147,11 +126,12 @@ "RelativeToolTip": "Contarcs\\ViewModels\\OrderViewModel.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAQAAAARAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-11-27T12:29:09.243Z" + "WhenOpened": "2024-11-27T12:29:09.243Z", + "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 17, + "DocumentIndex": 18, "Title": "FormGuide.Designer.cs", "DocumentMoniker": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\COP3_\\FormGuide.Designer.cs", "RelativeDocumentMoniker": "COP3_\\FormGuide.Designer.cs", @@ -163,7 +143,7 @@ }, { "$type": "Document", - "DocumentIndex": 7, + "DocumentIndex": 10, "Title": "FormGuide.cs", "DocumentMoniker": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\COP3_\\FormGuide.cs", "RelativeDocumentMoniker": "COP3_\\FormGuide.cs", @@ -175,7 +155,7 @@ }, { "$type": "Document", - "DocumentIndex": 21, + "DocumentIndex": 22, "Title": "FormEdit.Designer.cs", "DocumentMoniker": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\COP3_\\FormEdit.Designer.cs", "RelativeDocumentMoniker": "COP3_\\FormEdit.Designer.cs", @@ -187,44 +167,7 @@ }, { "$type": "Document", - "DocumentIndex": 1, - "Title": "FormEdit.cs", - "DocumentMoniker": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\COP3_\\FormEdit.cs", - "RelativeDocumentMoniker": "COP3_\\FormEdit.cs", - "ToolTip": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\COP3_\\FormEdit.cs", - "RelativeToolTip": "COP3_\\FormEdit.cs", - "ViewState": "AgIAAAcAAAAAAAAAAAAqwCUAAAAJAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-11-27T11:31:51.212Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 18, - "Title": "CityLogic.cs", - "DocumentMoniker": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\BusinessLogic\\CityLogic.cs", - "RelativeDocumentMoniker": "BusinessLogic\\CityLogic.cs", - "ToolTip": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\BusinessLogic\\CityLogic.cs", - "RelativeToolTip": "BusinessLogic\\CityLogic.cs", - "ViewState": "AgIAAAAAAAAAAAAAAAAAAAYAAAAKAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-11-27T10:58:22.804Z" - }, - { - "$type": "Document", - "DocumentIndex": 16, - "Title": "Program.cs", - "DocumentMoniker": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\COP3_\\Program.cs", - "RelativeDocumentMoniker": "COP3_\\Program.cs", - "ToolTip": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\COP3_\\Program.cs", - "RelativeToolTip": "COP3_\\Program.cs", - "ViewState": "AgIAAAUAAAAAAAAAAAAYwCkAAAA0AAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-11-27T10:55:48.526Z" - }, - { - "$type": "Document", - "DocumentIndex": 12, + "DocumentIndex": 4, "Title": "DataBase.cs", "DocumentMoniker": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\DataBaseImplement\\DataBase.cs", "RelativeDocumentMoniker": "DataBaseImplement\\DataBase.cs", @@ -234,9 +177,107 @@ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2024-11-27T10:54:12.544Z" }, + { + "$type": "Document", + "DocumentIndex": 1, + "Title": "FormEdit.cs", + "DocumentMoniker": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\COP3_\\FormEdit.cs", + "RelativeDocumentMoniker": "COP3_\\FormEdit.cs", + "ToolTip": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\COP3_\\FormEdit.cs", + "RelativeToolTip": "COP3_\\FormEdit.cs", + "ViewState": "AgIAAA8AAAAAAAAAAAAnwB4AAABFAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-11-27T11:31:51.212Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 0, + "Title": "FormMain.cs", + "DocumentMoniker": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\COP3_\\FormMain.cs", + "RelativeDocumentMoniker": "COP3_\\FormMain.cs", + "ToolTip": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\COP3_\\FormMain.cs", + "RelativeToolTip": "COP3_\\FormMain.cs", + "ViewState": "AgIAAOwAAAAAAAAAAAAawPwAAABLAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-11-27T10:05:34.264Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 3, + "Title": "20241212213847_Init.cs", + "DocumentMoniker": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\DataBaseImplement\\Migrations\\20241212213847_Init.cs", + "RelativeDocumentMoniker": "DataBaseImplement\\Migrations\\20241212213847_Init.cs", + "ToolTip": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\DataBaseImplement\\Migrations\\20241212213847_Init.cs", + "RelativeToolTip": "DataBaseImplement\\Migrations\\20241212213847_Init.cs", + "ViewState": "AgIAABYAAAAAAAAAAAAQwAAAAAAAAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-12-12T21:38:47.659Z" + }, + { + "$type": "Document", + "DocumentIndex": 15, + "Title": "ICityStorage.cs", + "DocumentMoniker": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\Contarcs\\StorageContracts\\ICityStorage.cs", + "RelativeDocumentMoniker": "Contarcs\\StorageContracts\\ICityStorage.cs", + "ToolTip": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\Contarcs\\StorageContracts\\ICityStorage.cs", + "RelativeToolTip": "Contarcs\\StorageContracts\\ICityStorage.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-11-27T12:32:54.45Z" + }, { "$type": "Document", "DocumentIndex": 19, + "Title": "CityLogic.cs", + "DocumentMoniker": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\BusinessLogic\\CityLogic.cs", + "RelativeDocumentMoniker": "BusinessLogic\\CityLogic.cs", + "ToolTip": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\BusinessLogic\\CityLogic.cs", + "RelativeToolTip": "BusinessLogic\\CityLogic.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAYAAAAKAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-11-27T10:58:22.804Z" + }, + { + "$type": "Document", + "DocumentIndex": 5, + "Title": "OrderLogic.cs", + "DocumentMoniker": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\BusinessLogic\\OrderLogic.cs", + "RelativeDocumentMoniker": "BusinessLogic\\OrderLogic.cs", + "ToolTip": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\BusinessLogic\\OrderLogic.cs", + "RelativeToolTip": "BusinessLogic\\OrderLogic.cs", + "ViewState": "AgIAAAQAAAAAAAAAAIAwwBYAAAAMAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-11-27T10:42:06.648Z" + }, + { + "$type": "Document", + "DocumentIndex": 6, + "Title": "WinFormsLibrary1.csproj", + "DocumentMoniker": "C:\\Users\\pyata\\Source\\Repos\\PIbd-31_Pyatakov_Kirill_COP\\WinFormsLibrary1\\WinFormsLibrary1.csproj", + "RelativeDocumentMoniker": "WinFormsLibrary1\\WinFormsLibrary1.csproj", + "ToolTip": "C:\\Users\\pyata\\Source\\Repos\\PIbd-31_Pyatakov_Kirill_COP\\WinFormsLibrary1\\WinFormsLibrary1.csproj", + "RelativeToolTip": "WinFormsLibrary1\\WinFormsLibrary1.csproj", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000758|", + "WhenOpened": "2024-12-12T21:12:21.236Z" + }, + { + "$type": "Document", + "DocumentIndex": 17, + "Title": "Program.cs", + "DocumentMoniker": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\COP3_\\Program.cs", + "RelativeDocumentMoniker": "COP3_\\Program.cs", + "ToolTip": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\COP3_\\Program.cs", + "RelativeToolTip": "COP3_\\Program.cs", + "ViewState": "AgIAAAUAAAAAAAAAAAAYwCkAAAA0AAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-11-27T10:55:48.526Z" + }, + { + "$type": "Document", + "DocumentIndex": 20, "Title": "City.cs", "DocumentMoniker": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\DataBaseImplement\\Models\\City.cs", "RelativeDocumentMoniker": "DataBaseImplement\\Models\\City.cs", @@ -248,7 +289,7 @@ }, { "$type": "Document", - "DocumentIndex": 5, + "DocumentIndex": 9, "Title": "Order.cs", "DocumentMoniker": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\DataBaseImplement\\Models\\Order.cs", "RelativeDocumentMoniker": "DataBaseImplement\\Models\\Order.cs", @@ -260,7 +301,7 @@ }, { "$type": "Document", - "DocumentIndex": 20, + "DocumentIndex": 21, "Title": "DataBaseImplement.csproj", "DocumentMoniker": "C:\\Users\\pyata\\Source\\Repos\\PIbd-31_Pyatakov_Kirill_COP\\DataBaseImplement\\DataBaseImplement.csproj", "RelativeDocumentMoniker": "DataBaseImplement\\DataBaseImplement.csproj", @@ -268,12 +309,11 @@ "RelativeToolTip": "DataBaseImplement\\DataBaseImplement.csproj", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000758|", - "WhenOpened": "2024-11-27T10:43:55.615Z", - "EditorCaption": "" + "WhenOpened": "2024-11-27T10:43:55.615Z" }, { "$type": "Document", - "DocumentIndex": 11, + "DocumentIndex": 14, "Title": "CityStorage.cs", "DocumentMoniker": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\DataBaseImplement\\Implements\\CityStorage.cs", "RelativeDocumentMoniker": "DataBaseImplement\\Implements\\CityStorage.cs", @@ -285,19 +325,7 @@ }, { "$type": "Document", - "DocumentIndex": 13, - "Title": "OrderLogic.cs", - "DocumentMoniker": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\BusinessLogic\\OrderLogic.cs", - "RelativeDocumentMoniker": "BusinessLogic\\OrderLogic.cs", - "ToolTip": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\BusinessLogic\\OrderLogic.cs", - "RelativeToolTip": "BusinessLogic\\OrderLogic.cs", - "ViewState": "AgIAAD0AAAAAAAAAAAAYwFoAAABdAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-11-27T10:42:06.648Z" - }, - { - "$type": "Document", - "DocumentIndex": 22, + "DocumentIndex": 23, "Title": "Contracs.csproj", "DocumentMoniker": "C:\\Users\\pyata\\Source\\Repos\\PIbd-31_Pyatakov_Kirill_COP\\Contarcs\\Contracs.csproj", "RelativeDocumentMoniker": "Contarcs\\Contracs.csproj", @@ -305,12 +333,11 @@ "RelativeToolTip": "Contarcs\\Contracs.csproj", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000758|", - "WhenOpened": "2024-11-27T10:40:16.103Z", - "EditorCaption": "" + "WhenOpened": "2024-11-27T10:40:16.103Z" }, { "$type": "Document", - "DocumentIndex": 15, + "DocumentIndex": 16, "Title": "CityBindingModel.cs", "DocumentMoniker": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\Contarcs\\BindingModels\\CityBindingModel.cs", "RelativeDocumentMoniker": "Contarcs\\BindingModels\\CityBindingModel.cs", @@ -322,7 +349,7 @@ }, { "$type": "Document", - "DocumentIndex": 8, + "DocumentIndex": 11, "Title": "OrderBindingModel.cs", "DocumentMoniker": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\Contarcs\\BindingModels\\OrderBindingModel.cs", "RelativeDocumentMoniker": "Contarcs\\BindingModels\\OrderBindingModel.cs", @@ -334,7 +361,7 @@ }, { "$type": "Document", - "DocumentIndex": 9, + "DocumentIndex": 12, "Title": "ICityModel.cs", "DocumentMoniker": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\DataModels\\ICityModel.cs", "RelativeDocumentMoniker": "DataModels\\ICityModel.cs", @@ -346,7 +373,7 @@ }, { "$type": "Document", - "DocumentIndex": 4, + "DocumentIndex": 8, "Title": "IOrderModel.cs", "DocumentMoniker": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\DataModels\\IOrderModel.cs", "RelativeDocumentMoniker": "DataModels\\IOrderModel.cs", @@ -358,40 +385,25 @@ }, { "$type": "Document", - "DocumentIndex": 3, - "Title": "FormMain.cs", - "DocumentMoniker": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\COP3_\\FormMain.cs", - "RelativeDocumentMoniker": "COP3_\\FormMain.cs", - "ToolTip": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\COP3_\\FormMain.cs", - "RelativeToolTip": "COP3_\\FormMain.cs", - "ViewState": "AgIAAAAAAAAAAAAAAAAAABgAAAANAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-11-27T10:05:34.264Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 2, + "DocumentIndex": 7, "Title": "FormEdit.cs [Design]", "DocumentMoniker": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\COP3_\\FormEdit.cs", "RelativeDocumentMoniker": "COP3_\\FormEdit.cs", "ToolTip": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\COP3_\\FormEdit.cs [Design]", "RelativeToolTip": "COP3_\\FormEdit.cs [Design]", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-11-27T11:36:14.385Z", - "EditorCaption": " [Design]" + "WhenOpened": "2024-11-27T11:36:14.385Z" }, { "$type": "Document", - "DocumentIndex": 10, + "DocumentIndex": 13, "Title": "FormMain.cs [Design]", "DocumentMoniker": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\COP3_\\FormMain.cs", "RelativeDocumentMoniker": "COP3_\\FormMain.cs", "ToolTip": "C:\\Users\\pyata\\source\\repos\\PIbd-31_Pyatakov_Kirill_COP\\COP3_\\FormMain.cs [Design]", "RelativeToolTip": "COP3_\\FormMain.cs [Design]", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-11-27T09:27:02.569Z", - "EditorCaption": " [Design]" + "WhenOpened": "2024-11-27T09:27:02.569Z" } ] } diff --git a/.vs/ProjectEvaluation/cop3_.metadata.v9.bin b/.vs/ProjectEvaluation/cop3_.metadata.v9.bin index c32d04b..e9f651a 100644 Binary files a/.vs/ProjectEvaluation/cop3_.metadata.v9.bin and b/.vs/ProjectEvaluation/cop3_.metadata.v9.bin differ diff --git a/.vs/ProjectEvaluation/cop3_.projects.v9.bin b/.vs/ProjectEvaluation/cop3_.projects.v9.bin index 4790320..5195bd5 100644 Binary files a/.vs/ProjectEvaluation/cop3_.projects.v9.bin and b/.vs/ProjectEvaluation/cop3_.projects.v9.bin differ diff --git a/.vs/ProjectEvaluation/cop3_.strings.v9.bin b/.vs/ProjectEvaluation/cop3_.strings.v9.bin index 4071711..2e8270d 100644 Binary files a/.vs/ProjectEvaluation/cop3_.strings.v9.bin and b/.vs/ProjectEvaluation/cop3_.strings.v9.bin differ diff --git a/COP3_/FormEdit.cs b/COP3_/FormEdit.cs index 42e80f2..eabea47 100644 --- a/COP3_/FormEdit.cs +++ b/COP3_/FormEdit.cs @@ -28,7 +28,7 @@ namespace COP3_ userControlCheckedList1.ChangeTypeOfMaxChecked(Components.Types.Exception); userControlCheckedList1.MaxCheckedItemsCount = 6; userControlDatePicker1.MinDate = DateTime.Today.AddDays(1); - userControlDatePicker1.MaxDate = DateTime.Today.AddDays(3); + userControlDatePicker1.MaxDate = DateTime.Today.AddDays(4); selectComponentOrderStatus.FillList(list); textBoxFIO.TextChanged += valueChanged; selectComponentOrderStatus.SelectComponentChanged += valueChanged; diff --git a/COP3_/FormMain.cs b/COP3_/FormMain.cs index 532078c..2376db0 100644 --- a/COP3_/FormMain.cs +++ b/COP3_/FormMain.cs @@ -217,25 +217,26 @@ namespace COP3_ } List tables = new List(); - List destinations = (from order in orders select order.OrderDestination).ToList() ; - var tab = (from order in orders group order.OrderDestination by order.OrderDeliveryTime).ToList(); - foreach (var dest in destinations) { - var tebes = (from t in tab where t.All(element => element == dest) select t); - foreach(var k in tebes) + //var destinations = (from order in orders group order.OrderDeliveryTime by order.OrderDestination).Distinct().ToList() ; + var deliveryTime = (from order in orders select order.OrderDeliveryTime).Distinct().ToArray(); + var destinations = (from order in orders select order.OrderDestination).Distinct().ToList(); + foreach(var item in destinations) + { + double[] ints = new double[deliveryTime.Length]; + for (int i = 0; i < deliveryTime.Length; i++) { - + ints[i] = (from order in orders where order.OrderDeliveryTime == deliveryTime[i] && order.OrderDestination == item select order).Count(); } + tables.Add( + new DiagramWordNoVisibleComponent.ChartSeries + { + Name = item, + Data = ints.ToList(), + } + ); } - //new DiagramWordNoVisibleComponent.ChartSeries - //{ - // Name = "Åì ïåëüìåíè äåíü 1", - // Data = new List { 10, 5, 30, 4, 500 } - //}, - - string[,] tableData = new string[orders.Count + 1, 5]; - - diagramWordNoVisibleComponent1.CreateDocumentWithChart(filePath, fileTitle, "Äåíü", UserComponentsOption19.DiagramWordNoVisibleComponent.LegendPosition.Bottom, tables); + diagramWordNoVisibleComponent1.CreateDocumentWithChart(filePath, fileTitle, "Çàêàçû", UserComponentsOption19.DiagramWordNoVisibleComponent.LegendPosition.Bottom, tables); MessageBox.Show("Ôàéë óñïåøíî ñîçäàí.", "Èíôîðìàöèÿ", MessageBoxButtons.OK, MessageBoxIcon.Information); } diff --git a/COP3_/bin/Debug/net8.0-windows/COP3_.dll b/COP3_/bin/Debug/net8.0-windows/COP3_.dll index 73ac589..9ac34d9 100644 Binary files a/COP3_/bin/Debug/net8.0-windows/COP3_.dll and b/COP3_/bin/Debug/net8.0-windows/COP3_.dll differ diff --git a/COP3_/bin/Debug/net8.0-windows/COP3_.exe b/COP3_/bin/Debug/net8.0-windows/COP3_.exe index 85f80c3..6cc2f3b 100644 Binary files a/COP3_/bin/Debug/net8.0-windows/COP3_.exe and b/COP3_/bin/Debug/net8.0-windows/COP3_.exe differ diff --git a/COP3_/bin/Debug/net8.0-windows/COP3_.pdb b/COP3_/bin/Debug/net8.0-windows/COP3_.pdb index 236aed0..c278747 100644 Binary files a/COP3_/bin/Debug/net8.0-windows/COP3_.pdb and b/COP3_/bin/Debug/net8.0-windows/COP3_.pdb differ diff --git a/COP3_/bin/Debug/net8.0-windows/DataBaseImplement.dll b/COP3_/bin/Debug/net8.0-windows/DataBaseImplement.dll index 7131087..3c8f91e 100644 Binary files a/COP3_/bin/Debug/net8.0-windows/DataBaseImplement.dll and b/COP3_/bin/Debug/net8.0-windows/DataBaseImplement.dll differ diff --git a/COP3_/bin/Debug/net8.0-windows/DataBaseImplement.pdb b/COP3_/bin/Debug/net8.0-windows/DataBaseImplement.pdb index d7ffb3d..b1cb3ff 100644 Binary files a/COP3_/bin/Debug/net8.0-windows/DataBaseImplement.pdb and b/COP3_/bin/Debug/net8.0-windows/DataBaseImplement.pdb differ diff --git a/COP3_/obj/Debug/net8.0-windows/COP3_.AssemblyInfo.cs b/COP3_/obj/Debug/net8.0-windows/COP3_.AssemblyInfo.cs index 34b1e2a..61f9a9c 100644 --- a/COP3_/obj/Debug/net8.0-windows/COP3_.AssemblyInfo.cs +++ b/COP3_/obj/Debug/net8.0-windows/COP3_.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("COP3_")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+9e29bd9aa9ebfc03b7291e7ab3eab2d83503eae8")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+eb3103940488fd3571625b290c3f12a8ec81891c")] [assembly: System.Reflection.AssemblyProductAttribute("COP3_")] [assembly: System.Reflection.AssemblyTitleAttribute("COP3_")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/COP3_/obj/Debug/net8.0-windows/COP3_.AssemblyInfoInputs.cache b/COP3_/obj/Debug/net8.0-windows/COP3_.AssemblyInfoInputs.cache index da140e8..bec2dfc 100644 --- a/COP3_/obj/Debug/net8.0-windows/COP3_.AssemblyInfoInputs.cache +++ b/COP3_/obj/Debug/net8.0-windows/COP3_.AssemblyInfoInputs.cache @@ -1 +1 @@ -c58d4f4f83c65ba2101b263452fef35e58c12f8234adaf5771fb655a6f8e3a9b +ed8e11d0db5ba7b67b78b0fc71ebcaaaa7ae24a0825f4c24cad903253759066d diff --git a/COP3_/obj/Debug/net8.0-windows/COP3_.csproj.AssemblyReference.cache b/COP3_/obj/Debug/net8.0-windows/COP3_.csproj.AssemblyReference.cache index b09d35a..1266d00 100644 Binary files a/COP3_/obj/Debug/net8.0-windows/COP3_.csproj.AssemblyReference.cache and b/COP3_/obj/Debug/net8.0-windows/COP3_.csproj.AssemblyReference.cache differ diff --git a/COP3_/obj/Debug/net8.0-windows/COP3_.dll b/COP3_/obj/Debug/net8.0-windows/COP3_.dll index 73ac589..9ac34d9 100644 Binary files a/COP3_/obj/Debug/net8.0-windows/COP3_.dll and b/COP3_/obj/Debug/net8.0-windows/COP3_.dll differ diff --git a/COP3_/obj/Debug/net8.0-windows/COP3_.pdb b/COP3_/obj/Debug/net8.0-windows/COP3_.pdb index 236aed0..c278747 100644 Binary files a/COP3_/obj/Debug/net8.0-windows/COP3_.pdb and b/COP3_/obj/Debug/net8.0-windows/COP3_.pdb differ diff --git a/COP3_/obj/Debug/net8.0-windows/apphost.exe b/COP3_/obj/Debug/net8.0-windows/apphost.exe index 85f80c3..6cc2f3b 100644 Binary files a/COP3_/obj/Debug/net8.0-windows/apphost.exe and b/COP3_/obj/Debug/net8.0-windows/apphost.exe differ diff --git a/COP3_/obj/Debug/net8.0-windows/ref/COP3_.dll b/COP3_/obj/Debug/net8.0-windows/ref/COP3_.dll index ac41438..2e8ab35 100644 Binary files a/COP3_/obj/Debug/net8.0-windows/ref/COP3_.dll and b/COP3_/obj/Debug/net8.0-windows/ref/COP3_.dll differ diff --git a/COP3_/obj/Debug/net8.0-windows/refint/COP3_.dll b/COP3_/obj/Debug/net8.0-windows/refint/COP3_.dll index ac41438..2e8ab35 100644 Binary files a/COP3_/obj/Debug/net8.0-windows/refint/COP3_.dll and b/COP3_/obj/Debug/net8.0-windows/refint/COP3_.dll differ diff --git a/DataBaseImplement/Migrations/20241127160330_Init.Designer.cs b/DataBaseImplement/Migrations/20241212213847_Init.Designer.cs similarity index 93% rename from DataBaseImplement/Migrations/20241127160330_Init.Designer.cs rename to DataBaseImplement/Migrations/20241212213847_Init.Designer.cs index 74d648a..b9f7a9e 100644 --- a/DataBaseImplement/Migrations/20241127160330_Init.Designer.cs +++ b/DataBaseImplement/Migrations/20241212213847_Init.Designer.cs @@ -1,4 +1,5 @@ // +using System; using DataBaseImplements; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; @@ -11,7 +12,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; namespace DataBaseImplement.Migrations { [DbContext(typeof(DataBase))] - [Migration("20241127160330_Init")] + [Migration("20241212213847_Init")] partial class Init { /// @@ -53,8 +54,8 @@ namespace DataBaseImplement.Migrations .IsRequired() .HasColumnType("text"); - b.Property("OrderDeliveryTime") - .HasColumnType("integer"); + b.Property("OrderDeliveryTime") + .HasColumnType("date"); b.Property("OrderDestination") .IsRequired() diff --git a/DataBaseImplement/Migrations/20241127160330_Init.cs b/DataBaseImplement/Migrations/20241212213847_Init.cs similarity index 92% rename from DataBaseImplement/Migrations/20241127160330_Init.cs rename to DataBaseImplement/Migrations/20241212213847_Init.cs index 5235360..12fb1dd 100644 --- a/DataBaseImplement/Migrations/20241127160330_Init.cs +++ b/DataBaseImplement/Migrations/20241212213847_Init.cs @@ -1,4 +1,5 @@ -using Microsoft.EntityFrameworkCore.Migrations; +using System; +using Microsoft.EntityFrameworkCore.Migrations; using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; #nullable disable @@ -33,7 +34,7 @@ namespace DataBaseImplement.Migrations FIO = table.Column(type: "text", nullable: false), OrderPath = table.Column(type: "text[]", nullable: false), OrderDestination = table.Column(type: "text", nullable: false), - OrderDeliveryTime = table.Column(type: "integer", nullable: false) + OrderDeliveryTime = table.Column(type: "date", nullable: false) }, constraints: table => { diff --git a/DataBaseImplement/bin/Debug/net8.0-windows/DataBaseImplement.dll b/DataBaseImplement/bin/Debug/net8.0-windows/DataBaseImplement.dll index 7131087..3c8f91e 100644 Binary files a/DataBaseImplement/bin/Debug/net8.0-windows/DataBaseImplement.dll and b/DataBaseImplement/bin/Debug/net8.0-windows/DataBaseImplement.dll differ diff --git a/DataBaseImplement/bin/Debug/net8.0-windows/DataBaseImplement.pdb b/DataBaseImplement/bin/Debug/net8.0-windows/DataBaseImplement.pdb index d7ffb3d..b1cb3ff 100644 Binary files a/DataBaseImplement/bin/Debug/net8.0-windows/DataBaseImplement.pdb and b/DataBaseImplement/bin/Debug/net8.0-windows/DataBaseImplement.pdb differ diff --git a/DataBaseImplement/obj/Debug/net8.0-windows/DataBaseImplement.AssemblyInfo.cs b/DataBaseImplement/obj/Debug/net8.0-windows/DataBaseImplement.AssemblyInfo.cs index a794460..408dcad 100644 --- a/DataBaseImplement/obj/Debug/net8.0-windows/DataBaseImplement.AssemblyInfo.cs +++ b/DataBaseImplement/obj/Debug/net8.0-windows/DataBaseImplement.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("DataBaseImplement")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+9e29bd9aa9ebfc03b7291e7ab3eab2d83503eae8")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+eb3103940488fd3571625b290c3f12a8ec81891c")] [assembly: System.Reflection.AssemblyProductAttribute("DataBaseImplement")] [assembly: System.Reflection.AssemblyTitleAttribute("DataBaseImplement")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/DataBaseImplement/obj/Debug/net8.0-windows/DataBaseImplement.AssemblyInfoInputs.cache b/DataBaseImplement/obj/Debug/net8.0-windows/DataBaseImplement.AssemblyInfoInputs.cache index acc4620..159c51f 100644 --- a/DataBaseImplement/obj/Debug/net8.0-windows/DataBaseImplement.AssemblyInfoInputs.cache +++ b/DataBaseImplement/obj/Debug/net8.0-windows/DataBaseImplement.AssemblyInfoInputs.cache @@ -1 +1 @@ -66c5cc51aa9b99dbc2da9781d5e7b2e9210b99c06e1f61a85d3a1561ed6f6ad5 +48acfb89b30a4c8d49354844937513225b554223f623b953e1bb78f40024ded6 diff --git a/DataBaseImplement/obj/Debug/net8.0-windows/DataBaseImplement.csproj.CoreCompileInputs.cache b/DataBaseImplement/obj/Debug/net8.0-windows/DataBaseImplement.csproj.CoreCompileInputs.cache index 06ecd46..bf6ea21 100644 --- a/DataBaseImplement/obj/Debug/net8.0-windows/DataBaseImplement.csproj.CoreCompileInputs.cache +++ b/DataBaseImplement/obj/Debug/net8.0-windows/DataBaseImplement.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -7497b08e5317bfe6a0a7cfba548d884e3885beb98e7c5262f7ce999b66685768 +a9110f422b10f3b376a6c5e48b8836e176b3fb001623d0d8ff74417ec0013461 diff --git a/DataBaseImplement/obj/Debug/net8.0-windows/DataBaseImplement.dll b/DataBaseImplement/obj/Debug/net8.0-windows/DataBaseImplement.dll index 7131087..3c8f91e 100644 Binary files a/DataBaseImplement/obj/Debug/net8.0-windows/DataBaseImplement.dll and b/DataBaseImplement/obj/Debug/net8.0-windows/DataBaseImplement.dll differ diff --git a/DataBaseImplement/obj/Debug/net8.0-windows/DataBaseImplement.pdb b/DataBaseImplement/obj/Debug/net8.0-windows/DataBaseImplement.pdb index d7ffb3d..b1cb3ff 100644 Binary files a/DataBaseImplement/obj/Debug/net8.0-windows/DataBaseImplement.pdb and b/DataBaseImplement/obj/Debug/net8.0-windows/DataBaseImplement.pdb differ diff --git a/DataBaseImplement/obj/Debug/net8.0-windows/ref/DataBaseImplement.dll b/DataBaseImplement/obj/Debug/net8.0-windows/ref/DataBaseImplement.dll index 4d8e5fa..2337445 100644 Binary files a/DataBaseImplement/obj/Debug/net8.0-windows/ref/DataBaseImplement.dll and b/DataBaseImplement/obj/Debug/net8.0-windows/ref/DataBaseImplement.dll differ diff --git a/DataBaseImplement/obj/Debug/net8.0-windows/refint/DataBaseImplement.dll b/DataBaseImplement/obj/Debug/net8.0-windows/refint/DataBaseImplement.dll index 4d8e5fa..2337445 100644 Binary files a/DataBaseImplement/obj/Debug/net8.0-windows/refint/DataBaseImplement.dll and b/DataBaseImplement/obj/Debug/net8.0-windows/refint/DataBaseImplement.dll differ diff --git a/WinFormsLibrary1/obj/Debug/net8.0-windows7.0/WinFormsLibrary1.AssemblyInfo.cs b/WinFormsLibrary1/obj/Debug/net8.0-windows7.0/WinFormsLibrary1.AssemblyInfo.cs index d16fc11..b467907 100644 --- a/WinFormsLibrary1/obj/Debug/net8.0-windows7.0/WinFormsLibrary1.AssemblyInfo.cs +++ b/WinFormsLibrary1/obj/Debug/net8.0-windows7.0/WinFormsLibrary1.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("WinFormsLibrary1")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.1")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.2+9e29bd9aa9ebfc03b7291e7ab3eab2d83503eae8")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.2+eb3103940488fd3571625b290c3f12a8ec81891c")] [assembly: System.Reflection.AssemblyProductAttribute("WinFormsLibrary1")] [assembly: System.Reflection.AssemblyTitleAttribute("WinFormsLibrary1")] [assembly: System.Reflection.AssemblyVersionAttribute("1.1")] diff --git a/WinFormsLibrary1/obj/Debug/net8.0-windows7.0/WinFormsLibrary1.AssemblyInfoInputs.cache b/WinFormsLibrary1/obj/Debug/net8.0-windows7.0/WinFormsLibrary1.AssemblyInfoInputs.cache index 48ee1e3..03f0f9e 100644 --- a/WinFormsLibrary1/obj/Debug/net8.0-windows7.0/WinFormsLibrary1.AssemblyInfoInputs.cache +++ b/WinFormsLibrary1/obj/Debug/net8.0-windows7.0/WinFormsLibrary1.AssemblyInfoInputs.cache @@ -1 +1 @@ -4c7cb55c035a0dbf454ca7cc94a700566c92604635b5df32f15dc47dbc579b2f +62507dafa007ae01aaf5855dafffeee1f95df44359b658cd8e9490eda0de76da