diff --git a/.gitignore b/.gitignore
index 26128d2..faa25a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
/SubCabinetSolution/obj/
/SubCabinetSolution/bin/
/packages/
+/SubCabinetSolution/bin/Debug/
+/.vs/
diff --git a/.gitignore b/.gitignore
index 26128d2..faa25a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
/SubCabinetSolution/obj/
/SubCabinetSolution/bin/
/packages/
+/SubCabinetSolution/bin/Debug/
+/.vs/
diff --git a/.vs/SubCabinetSolution/FileContentIndex/044d5d4c-a2c9-403e-8736-30e6948f897c.vsidx b/.vs/SubCabinetSolution/FileContentIndex/044d5d4c-a2c9-403e-8736-30e6948f897c.vsidx
deleted file mode 100644
index 621afc0..0000000
--- a/.vs/SubCabinetSolution/FileContentIndex/044d5d4c-a2c9-403e-8736-30e6948f897c.vsidx
+++ /dev/null
Binary files differ
diff --git a/.gitignore b/.gitignore
index 26128d2..faa25a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
/SubCabinetSolution/obj/
/SubCabinetSolution/bin/
/packages/
+/SubCabinetSolution/bin/Debug/
+/.vs/
diff --git a/.vs/SubCabinetSolution/FileContentIndex/044d5d4c-a2c9-403e-8736-30e6948f897c.vsidx b/.vs/SubCabinetSolution/FileContentIndex/044d5d4c-a2c9-403e-8736-30e6948f897c.vsidx
deleted file mode 100644
index 621afc0..0000000
--- a/.vs/SubCabinetSolution/FileContentIndex/044d5d4c-a2c9-403e-8736-30e6948f897c.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/SubCabinetSolution/FileContentIndex/6b6b4a8c-08a2-4c9d-9b03-578f9c67ea51.vsidx b/.vs/SubCabinetSolution/FileContentIndex/6b6b4a8c-08a2-4c9d-9b03-578f9c67ea51.vsidx
deleted file mode 100644
index 7adf0c6..0000000
--- a/.vs/SubCabinetSolution/FileContentIndex/6b6b4a8c-08a2-4c9d-9b03-578f9c67ea51.vsidx
+++ /dev/null
Binary files differ
diff --git a/.gitignore b/.gitignore
index 26128d2..faa25a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
/SubCabinetSolution/obj/
/SubCabinetSolution/bin/
/packages/
+/SubCabinetSolution/bin/Debug/
+/.vs/
diff --git a/.vs/SubCabinetSolution/FileContentIndex/044d5d4c-a2c9-403e-8736-30e6948f897c.vsidx b/.vs/SubCabinetSolution/FileContentIndex/044d5d4c-a2c9-403e-8736-30e6948f897c.vsidx
deleted file mode 100644
index 621afc0..0000000
--- a/.vs/SubCabinetSolution/FileContentIndex/044d5d4c-a2c9-403e-8736-30e6948f897c.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/SubCabinetSolution/FileContentIndex/6b6b4a8c-08a2-4c9d-9b03-578f9c67ea51.vsidx b/.vs/SubCabinetSolution/FileContentIndex/6b6b4a8c-08a2-4c9d-9b03-578f9c67ea51.vsidx
deleted file mode 100644
index 7adf0c6..0000000
--- a/.vs/SubCabinetSolution/FileContentIndex/6b6b4a8c-08a2-4c9d-9b03-578f9c67ea51.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/SubCabinetSolution/FileContentIndex/8a33b672-1934-4548-858b-e9e447dad88d.vsidx b/.vs/SubCabinetSolution/FileContentIndex/8a33b672-1934-4548-858b-e9e447dad88d.vsidx
new file mode 100644
index 0000000..210e33e
--- /dev/null
+++ b/.vs/SubCabinetSolution/FileContentIndex/8a33b672-1934-4548-858b-e9e447dad88d.vsidx
Binary files differ
diff --git a/.gitignore b/.gitignore
index 26128d2..faa25a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
/SubCabinetSolution/obj/
/SubCabinetSolution/bin/
/packages/
+/SubCabinetSolution/bin/Debug/
+/.vs/
diff --git a/.vs/SubCabinetSolution/FileContentIndex/044d5d4c-a2c9-403e-8736-30e6948f897c.vsidx b/.vs/SubCabinetSolution/FileContentIndex/044d5d4c-a2c9-403e-8736-30e6948f897c.vsidx
deleted file mode 100644
index 621afc0..0000000
--- a/.vs/SubCabinetSolution/FileContentIndex/044d5d4c-a2c9-403e-8736-30e6948f897c.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/SubCabinetSolution/FileContentIndex/6b6b4a8c-08a2-4c9d-9b03-578f9c67ea51.vsidx b/.vs/SubCabinetSolution/FileContentIndex/6b6b4a8c-08a2-4c9d-9b03-578f9c67ea51.vsidx
deleted file mode 100644
index 7adf0c6..0000000
--- a/.vs/SubCabinetSolution/FileContentIndex/6b6b4a8c-08a2-4c9d-9b03-578f9c67ea51.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/SubCabinetSolution/FileContentIndex/8a33b672-1934-4548-858b-e9e447dad88d.vsidx b/.vs/SubCabinetSolution/FileContentIndex/8a33b672-1934-4548-858b-e9e447dad88d.vsidx
new file mode 100644
index 0000000..210e33e
--- /dev/null
+++ b/.vs/SubCabinetSolution/FileContentIndex/8a33b672-1934-4548-858b-e9e447dad88d.vsidx
Binary files differ
diff --git a/.vs/SubCabinetSolution/FileContentIndex/c0655fb6-89f1-4aac-a9cb-b763798730d5.vsidx b/.vs/SubCabinetSolution/FileContentIndex/c0655fb6-89f1-4aac-a9cb-b763798730d5.vsidx
deleted file mode 100644
index f3bf078..0000000
--- a/.vs/SubCabinetSolution/FileContentIndex/c0655fb6-89f1-4aac-a9cb-b763798730d5.vsidx
+++ /dev/null
Binary files differ
diff --git a/.gitignore b/.gitignore
index 26128d2..faa25a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
/SubCabinetSolution/obj/
/SubCabinetSolution/bin/
/packages/
+/SubCabinetSolution/bin/Debug/
+/.vs/
diff --git a/.vs/SubCabinetSolution/FileContentIndex/044d5d4c-a2c9-403e-8736-30e6948f897c.vsidx b/.vs/SubCabinetSolution/FileContentIndex/044d5d4c-a2c9-403e-8736-30e6948f897c.vsidx
deleted file mode 100644
index 621afc0..0000000
--- a/.vs/SubCabinetSolution/FileContentIndex/044d5d4c-a2c9-403e-8736-30e6948f897c.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/SubCabinetSolution/FileContentIndex/6b6b4a8c-08a2-4c9d-9b03-578f9c67ea51.vsidx b/.vs/SubCabinetSolution/FileContentIndex/6b6b4a8c-08a2-4c9d-9b03-578f9c67ea51.vsidx
deleted file mode 100644
index 7adf0c6..0000000
--- a/.vs/SubCabinetSolution/FileContentIndex/6b6b4a8c-08a2-4c9d-9b03-578f9c67ea51.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/SubCabinetSolution/FileContentIndex/8a33b672-1934-4548-858b-e9e447dad88d.vsidx b/.vs/SubCabinetSolution/FileContentIndex/8a33b672-1934-4548-858b-e9e447dad88d.vsidx
new file mode 100644
index 0000000..210e33e
--- /dev/null
+++ b/.vs/SubCabinetSolution/FileContentIndex/8a33b672-1934-4548-858b-e9e447dad88d.vsidx
Binary files differ
diff --git a/.vs/SubCabinetSolution/FileContentIndex/c0655fb6-89f1-4aac-a9cb-b763798730d5.vsidx b/.vs/SubCabinetSolution/FileContentIndex/c0655fb6-89f1-4aac-a9cb-b763798730d5.vsidx
deleted file mode 100644
index f3bf078..0000000
--- a/.vs/SubCabinetSolution/FileContentIndex/c0655fb6-89f1-4aac-a9cb-b763798730d5.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/SubCabinetSolution/FileContentIndex/c3ba9f72-5f11-46e8-a897-0dbceab1fafd.vsidx b/.vs/SubCabinetSolution/FileContentIndex/c3ba9f72-5f11-46e8-a897-0dbceab1fafd.vsidx
new file mode 100644
index 0000000..a2156c1
--- /dev/null
+++ b/.vs/SubCabinetSolution/FileContentIndex/c3ba9f72-5f11-46e8-a897-0dbceab1fafd.vsidx
Binary files differ
diff --git a/.gitignore b/.gitignore
index 26128d2..faa25a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
/SubCabinetSolution/obj/
/SubCabinetSolution/bin/
/packages/
+/SubCabinetSolution/bin/Debug/
+/.vs/
diff --git a/.vs/SubCabinetSolution/FileContentIndex/044d5d4c-a2c9-403e-8736-30e6948f897c.vsidx b/.vs/SubCabinetSolution/FileContentIndex/044d5d4c-a2c9-403e-8736-30e6948f897c.vsidx
deleted file mode 100644
index 621afc0..0000000
--- a/.vs/SubCabinetSolution/FileContentIndex/044d5d4c-a2c9-403e-8736-30e6948f897c.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/SubCabinetSolution/FileContentIndex/6b6b4a8c-08a2-4c9d-9b03-578f9c67ea51.vsidx b/.vs/SubCabinetSolution/FileContentIndex/6b6b4a8c-08a2-4c9d-9b03-578f9c67ea51.vsidx
deleted file mode 100644
index 7adf0c6..0000000
--- a/.vs/SubCabinetSolution/FileContentIndex/6b6b4a8c-08a2-4c9d-9b03-578f9c67ea51.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/SubCabinetSolution/FileContentIndex/8a33b672-1934-4548-858b-e9e447dad88d.vsidx b/.vs/SubCabinetSolution/FileContentIndex/8a33b672-1934-4548-858b-e9e447dad88d.vsidx
new file mode 100644
index 0000000..210e33e
--- /dev/null
+++ b/.vs/SubCabinetSolution/FileContentIndex/8a33b672-1934-4548-858b-e9e447dad88d.vsidx
Binary files differ
diff --git a/.vs/SubCabinetSolution/FileContentIndex/c0655fb6-89f1-4aac-a9cb-b763798730d5.vsidx b/.vs/SubCabinetSolution/FileContentIndex/c0655fb6-89f1-4aac-a9cb-b763798730d5.vsidx
deleted file mode 100644
index f3bf078..0000000
--- a/.vs/SubCabinetSolution/FileContentIndex/c0655fb6-89f1-4aac-a9cb-b763798730d5.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/SubCabinetSolution/FileContentIndex/c3ba9f72-5f11-46e8-a897-0dbceab1fafd.vsidx b/.vs/SubCabinetSolution/FileContentIndex/c3ba9f72-5f11-46e8-a897-0dbceab1fafd.vsidx
new file mode 100644
index 0000000..a2156c1
--- /dev/null
+++ b/.vs/SubCabinetSolution/FileContentIndex/c3ba9f72-5f11-46e8-a897-0dbceab1fafd.vsidx
Binary files differ
diff --git a/.vs/SubCabinetSolution/FileContentIndex/ff93a27f-d3c0-4c15-87c6-faf6c0ec21ff.vsidx b/.vs/SubCabinetSolution/FileContentIndex/ff93a27f-d3c0-4c15-87c6-faf6c0ec21ff.vsidx
deleted file mode 100644
index ba26b59..0000000
--- a/.vs/SubCabinetSolution/FileContentIndex/ff93a27f-d3c0-4c15-87c6-faf6c0ec21ff.vsidx
+++ /dev/null
Binary files differ
diff --git a/.gitignore b/.gitignore
index 26128d2..faa25a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
/SubCabinetSolution/obj/
/SubCabinetSolution/bin/
/packages/
+/SubCabinetSolution/bin/Debug/
+/.vs/
diff --git a/.vs/SubCabinetSolution/FileContentIndex/044d5d4c-a2c9-403e-8736-30e6948f897c.vsidx b/.vs/SubCabinetSolution/FileContentIndex/044d5d4c-a2c9-403e-8736-30e6948f897c.vsidx
deleted file mode 100644
index 621afc0..0000000
--- a/.vs/SubCabinetSolution/FileContentIndex/044d5d4c-a2c9-403e-8736-30e6948f897c.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/SubCabinetSolution/FileContentIndex/6b6b4a8c-08a2-4c9d-9b03-578f9c67ea51.vsidx b/.vs/SubCabinetSolution/FileContentIndex/6b6b4a8c-08a2-4c9d-9b03-578f9c67ea51.vsidx
deleted file mode 100644
index 7adf0c6..0000000
--- a/.vs/SubCabinetSolution/FileContentIndex/6b6b4a8c-08a2-4c9d-9b03-578f9c67ea51.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/SubCabinetSolution/FileContentIndex/8a33b672-1934-4548-858b-e9e447dad88d.vsidx b/.vs/SubCabinetSolution/FileContentIndex/8a33b672-1934-4548-858b-e9e447dad88d.vsidx
new file mode 100644
index 0000000..210e33e
--- /dev/null
+++ b/.vs/SubCabinetSolution/FileContentIndex/8a33b672-1934-4548-858b-e9e447dad88d.vsidx
Binary files differ
diff --git a/.vs/SubCabinetSolution/FileContentIndex/c0655fb6-89f1-4aac-a9cb-b763798730d5.vsidx b/.vs/SubCabinetSolution/FileContentIndex/c0655fb6-89f1-4aac-a9cb-b763798730d5.vsidx
deleted file mode 100644
index f3bf078..0000000
--- a/.vs/SubCabinetSolution/FileContentIndex/c0655fb6-89f1-4aac-a9cb-b763798730d5.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/SubCabinetSolution/FileContentIndex/c3ba9f72-5f11-46e8-a897-0dbceab1fafd.vsidx b/.vs/SubCabinetSolution/FileContentIndex/c3ba9f72-5f11-46e8-a897-0dbceab1fafd.vsidx
new file mode 100644
index 0000000..a2156c1
--- /dev/null
+++ b/.vs/SubCabinetSolution/FileContentIndex/c3ba9f72-5f11-46e8-a897-0dbceab1fafd.vsidx
Binary files differ
diff --git a/.vs/SubCabinetSolution/FileContentIndex/ff93a27f-d3c0-4c15-87c6-faf6c0ec21ff.vsidx b/.vs/SubCabinetSolution/FileContentIndex/ff93a27f-d3c0-4c15-87c6-faf6c0ec21ff.vsidx
deleted file mode 100644
index ba26b59..0000000
--- a/.vs/SubCabinetSolution/FileContentIndex/ff93a27f-d3c0-4c15-87c6-faf6c0ec21ff.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index eff0918..2761683 100644
--- a/.vs/SubCabinetSolution/v17/.suo
+++ b/.vs/SubCabinetSolution/v17/.suo
Binary files differ
diff --git a/.gitignore b/.gitignore
index 26128d2..faa25a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
/SubCabinetSolution/obj/
/SubCabinetSolution/bin/
/packages/
+/SubCabinetSolution/bin/Debug/
+/.vs/
diff --git a/.vs/SubCabinetSolution/FileContentIndex/044d5d4c-a2c9-403e-8736-30e6948f897c.vsidx b/.vs/SubCabinetSolution/FileContentIndex/044d5d4c-a2c9-403e-8736-30e6948f897c.vsidx
deleted file mode 100644
index 621afc0..0000000
--- a/.vs/SubCabinetSolution/FileContentIndex/044d5d4c-a2c9-403e-8736-30e6948f897c.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/SubCabinetSolution/FileContentIndex/6b6b4a8c-08a2-4c9d-9b03-578f9c67ea51.vsidx b/.vs/SubCabinetSolution/FileContentIndex/6b6b4a8c-08a2-4c9d-9b03-578f9c67ea51.vsidx
deleted file mode 100644
index 7adf0c6..0000000
--- a/.vs/SubCabinetSolution/FileContentIndex/6b6b4a8c-08a2-4c9d-9b03-578f9c67ea51.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/SubCabinetSolution/FileContentIndex/8a33b672-1934-4548-858b-e9e447dad88d.vsidx b/.vs/SubCabinetSolution/FileContentIndex/8a33b672-1934-4548-858b-e9e447dad88d.vsidx
new file mode 100644
index 0000000..210e33e
--- /dev/null
+++ b/.vs/SubCabinetSolution/FileContentIndex/8a33b672-1934-4548-858b-e9e447dad88d.vsidx
Binary files differ
diff --git a/.vs/SubCabinetSolution/FileContentIndex/c0655fb6-89f1-4aac-a9cb-b763798730d5.vsidx b/.vs/SubCabinetSolution/FileContentIndex/c0655fb6-89f1-4aac-a9cb-b763798730d5.vsidx
deleted file mode 100644
index f3bf078..0000000
--- a/.vs/SubCabinetSolution/FileContentIndex/c0655fb6-89f1-4aac-a9cb-b763798730d5.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/SubCabinetSolution/FileContentIndex/c3ba9f72-5f11-46e8-a897-0dbceab1fafd.vsidx b/.vs/SubCabinetSolution/FileContentIndex/c3ba9f72-5f11-46e8-a897-0dbceab1fafd.vsidx
new file mode 100644
index 0000000..a2156c1
--- /dev/null
+++ b/.vs/SubCabinetSolution/FileContentIndex/c3ba9f72-5f11-46e8-a897-0dbceab1fafd.vsidx
Binary files differ
diff --git a/.vs/SubCabinetSolution/FileContentIndex/ff93a27f-d3c0-4c15-87c6-faf6c0ec21ff.vsidx b/.vs/SubCabinetSolution/FileContentIndex/ff93a27f-d3c0-4c15-87c6-faf6c0ec21ff.vsidx
deleted file mode 100644
index ba26b59..0000000
--- a/.vs/SubCabinetSolution/FileContentIndex/ff93a27f-d3c0-4c15-87c6-faf6c0ec21ff.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index eff0918..2761683 100644
--- a/.vs/SubCabinetSolution/v17/.suo
+++ b/.vs/SubCabinetSolution/v17/.suo
Binary files differ
diff --git a/SubCabinetSolution/SubCabinetSolution.csproj b/SubCabinetSolution/SubCabinetSolution.csproj
index 531c59d..9064e33 100644
--- a/SubCabinetSolution/SubCabinetSolution.csproj
+++ b/SubCabinetSolution/SubCabinetSolution.csproj
@@ -172,6 +172,7 @@
+
diff --git a/.gitignore b/.gitignore
index 26128d2..faa25a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
/SubCabinetSolution/obj/
/SubCabinetSolution/bin/
/packages/
+/SubCabinetSolution/bin/Debug/
+/.vs/
diff --git a/.vs/SubCabinetSolution/FileContentIndex/044d5d4c-a2c9-403e-8736-30e6948f897c.vsidx b/.vs/SubCabinetSolution/FileContentIndex/044d5d4c-a2c9-403e-8736-30e6948f897c.vsidx
deleted file mode 100644
index 621afc0..0000000
--- a/.vs/SubCabinetSolution/FileContentIndex/044d5d4c-a2c9-403e-8736-30e6948f897c.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/SubCabinetSolution/FileContentIndex/6b6b4a8c-08a2-4c9d-9b03-578f9c67ea51.vsidx b/.vs/SubCabinetSolution/FileContentIndex/6b6b4a8c-08a2-4c9d-9b03-578f9c67ea51.vsidx
deleted file mode 100644
index 7adf0c6..0000000
--- a/.vs/SubCabinetSolution/FileContentIndex/6b6b4a8c-08a2-4c9d-9b03-578f9c67ea51.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/SubCabinetSolution/FileContentIndex/8a33b672-1934-4548-858b-e9e447dad88d.vsidx b/.vs/SubCabinetSolution/FileContentIndex/8a33b672-1934-4548-858b-e9e447dad88d.vsidx
new file mode 100644
index 0000000..210e33e
--- /dev/null
+++ b/.vs/SubCabinetSolution/FileContentIndex/8a33b672-1934-4548-858b-e9e447dad88d.vsidx
Binary files differ
diff --git a/.vs/SubCabinetSolution/FileContentIndex/c0655fb6-89f1-4aac-a9cb-b763798730d5.vsidx b/.vs/SubCabinetSolution/FileContentIndex/c0655fb6-89f1-4aac-a9cb-b763798730d5.vsidx
deleted file mode 100644
index f3bf078..0000000
--- a/.vs/SubCabinetSolution/FileContentIndex/c0655fb6-89f1-4aac-a9cb-b763798730d5.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/SubCabinetSolution/FileContentIndex/c3ba9f72-5f11-46e8-a897-0dbceab1fafd.vsidx b/.vs/SubCabinetSolution/FileContentIndex/c3ba9f72-5f11-46e8-a897-0dbceab1fafd.vsidx
new file mode 100644
index 0000000..a2156c1
--- /dev/null
+++ b/.vs/SubCabinetSolution/FileContentIndex/c3ba9f72-5f11-46e8-a897-0dbceab1fafd.vsidx
Binary files differ
diff --git a/.vs/SubCabinetSolution/FileContentIndex/ff93a27f-d3c0-4c15-87c6-faf6c0ec21ff.vsidx b/.vs/SubCabinetSolution/FileContentIndex/ff93a27f-d3c0-4c15-87c6-faf6c0ec21ff.vsidx
deleted file mode 100644
index ba26b59..0000000
--- a/.vs/SubCabinetSolution/FileContentIndex/ff93a27f-d3c0-4c15-87c6-faf6c0ec21ff.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index eff0918..2761683 100644
--- a/.vs/SubCabinetSolution/v17/.suo
+++ b/.vs/SubCabinetSolution/v17/.suo
Binary files differ
diff --git a/SubCabinetSolution/SubCabinetSolution.csproj b/SubCabinetSolution/SubCabinetSolution.csproj
index 531c59d..9064e33 100644
--- a/SubCabinetSolution/SubCabinetSolution.csproj
+++ b/SubCabinetSolution/SubCabinetSolution.csproj
@@ -172,6 +172,7 @@
+
diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
new file mode 100644
index 0000000..8ed9410
--- /dev/null
+++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
@@ -0,0 +1,55 @@
+using System;
+using System.Windows;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using SubCabinetSolution.Views;
+
+namespace SubCabinetSolution.ViewModel
+{
+ public class CabinetViewModel : ViewModelBase
+ {
+ public string _currentTime;
+
+ public string CurrentTime
+ {
+ get { return _currentTime; }
+ set
+ {
+ _currentTime = value;
+ RaisePropertyChanged();
+ }
+ }
+
+ public RelayCommand LoginOutCommand { get; set; }
+
+ public CabinetViewModel()
+ {
+ // DispatcherTimer showTimer = new DispatcherTimer();
+ // showTimer.Tick += ShowCurTimer; //起个Timer一直获取当前时间
+ // showTimer.Interval = new TimeSpan(0, 0, 0, 1, 0);
+ // showTimer.Start();
+ _currentTime = "2022/8/25 23:25:50";
+ this.LoginOutCommand = new RelayCommand(LoginOut);
+ }
+
+ private void ShowCurTimer(object sender, EventArgs e)
+ {
+ //获得年月日
+ string date = DateTime.Now.ToString("yyyy/MM/dd");
+ //获得时分秒
+ string time = DateTime.Now.ToString("HH:mm:ss");
+ this._currentTime = date + " " + time;
+ }
+
+ private void LoginOut(CabinetWindow window)
+ {
+ MessageBoxResult result =
+ MessageBox.Show("确定退出吗?", "提示", MessageBoxButton.OKCancel, MessageBoxImage.Question);
+ if (result != MessageBoxResult.OK) return;
+ //退出
+ MainWindow mainWindow = new MainWindow();
+ mainWindow.Show();
+ window.Close();
+ }
+ }
+}
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 26128d2..faa25a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
/SubCabinetSolution/obj/
/SubCabinetSolution/bin/
/packages/
+/SubCabinetSolution/bin/Debug/
+/.vs/
diff --git a/.vs/SubCabinetSolution/FileContentIndex/044d5d4c-a2c9-403e-8736-30e6948f897c.vsidx b/.vs/SubCabinetSolution/FileContentIndex/044d5d4c-a2c9-403e-8736-30e6948f897c.vsidx
deleted file mode 100644
index 621afc0..0000000
--- a/.vs/SubCabinetSolution/FileContentIndex/044d5d4c-a2c9-403e-8736-30e6948f897c.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/SubCabinetSolution/FileContentIndex/6b6b4a8c-08a2-4c9d-9b03-578f9c67ea51.vsidx b/.vs/SubCabinetSolution/FileContentIndex/6b6b4a8c-08a2-4c9d-9b03-578f9c67ea51.vsidx
deleted file mode 100644
index 7adf0c6..0000000
--- a/.vs/SubCabinetSolution/FileContentIndex/6b6b4a8c-08a2-4c9d-9b03-578f9c67ea51.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/SubCabinetSolution/FileContentIndex/8a33b672-1934-4548-858b-e9e447dad88d.vsidx b/.vs/SubCabinetSolution/FileContentIndex/8a33b672-1934-4548-858b-e9e447dad88d.vsidx
new file mode 100644
index 0000000..210e33e
--- /dev/null
+++ b/.vs/SubCabinetSolution/FileContentIndex/8a33b672-1934-4548-858b-e9e447dad88d.vsidx
Binary files differ
diff --git a/.vs/SubCabinetSolution/FileContentIndex/c0655fb6-89f1-4aac-a9cb-b763798730d5.vsidx b/.vs/SubCabinetSolution/FileContentIndex/c0655fb6-89f1-4aac-a9cb-b763798730d5.vsidx
deleted file mode 100644
index f3bf078..0000000
--- a/.vs/SubCabinetSolution/FileContentIndex/c0655fb6-89f1-4aac-a9cb-b763798730d5.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/SubCabinetSolution/FileContentIndex/c3ba9f72-5f11-46e8-a897-0dbceab1fafd.vsidx b/.vs/SubCabinetSolution/FileContentIndex/c3ba9f72-5f11-46e8-a897-0dbceab1fafd.vsidx
new file mode 100644
index 0000000..a2156c1
--- /dev/null
+++ b/.vs/SubCabinetSolution/FileContentIndex/c3ba9f72-5f11-46e8-a897-0dbceab1fafd.vsidx
Binary files differ
diff --git a/.vs/SubCabinetSolution/FileContentIndex/ff93a27f-d3c0-4c15-87c6-faf6c0ec21ff.vsidx b/.vs/SubCabinetSolution/FileContentIndex/ff93a27f-d3c0-4c15-87c6-faf6c0ec21ff.vsidx
deleted file mode 100644
index ba26b59..0000000
--- a/.vs/SubCabinetSolution/FileContentIndex/ff93a27f-d3c0-4c15-87c6-faf6c0ec21ff.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index eff0918..2761683 100644
--- a/.vs/SubCabinetSolution/v17/.suo
+++ b/.vs/SubCabinetSolution/v17/.suo
Binary files differ
diff --git a/SubCabinetSolution/SubCabinetSolution.csproj b/SubCabinetSolution/SubCabinetSolution.csproj
index 531c59d..9064e33 100644
--- a/SubCabinetSolution/SubCabinetSolution.csproj
+++ b/SubCabinetSolution/SubCabinetSolution.csproj
@@ -172,6 +172,7 @@
+
diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
new file mode 100644
index 0000000..8ed9410
--- /dev/null
+++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
@@ -0,0 +1,55 @@
+using System;
+using System.Windows;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using SubCabinetSolution.Views;
+
+namespace SubCabinetSolution.ViewModel
+{
+ public class CabinetViewModel : ViewModelBase
+ {
+ public string _currentTime;
+
+ public string CurrentTime
+ {
+ get { return _currentTime; }
+ set
+ {
+ _currentTime = value;
+ RaisePropertyChanged();
+ }
+ }
+
+ public RelayCommand LoginOutCommand { get; set; }
+
+ public CabinetViewModel()
+ {
+ // DispatcherTimer showTimer = new DispatcherTimer();
+ // showTimer.Tick += ShowCurTimer; //起个Timer一直获取当前时间
+ // showTimer.Interval = new TimeSpan(0, 0, 0, 1, 0);
+ // showTimer.Start();
+ _currentTime = "2022/8/25 23:25:50";
+ this.LoginOutCommand = new RelayCommand(LoginOut);
+ }
+
+ private void ShowCurTimer(object sender, EventArgs e)
+ {
+ //获得年月日
+ string date = DateTime.Now.ToString("yyyy/MM/dd");
+ //获得时分秒
+ string time = DateTime.Now.ToString("HH:mm:ss");
+ this._currentTime = date + " " + time;
+ }
+
+ private void LoginOut(CabinetWindow window)
+ {
+ MessageBoxResult result =
+ MessageBox.Show("确定退出吗?", "提示", MessageBoxButton.OKCancel, MessageBoxImage.Question);
+ if (result != MessageBoxResult.OK) return;
+ //退出
+ MainWindow mainWindow = new MainWindow();
+ mainWindow.Show();
+ window.Close();
+ }
+ }
+}
\ No newline at end of file
diff --git a/SubCabinetSolution/ViewModel/MainViewModel.cs b/SubCabinetSolution/ViewModel/MainViewModel.cs
index a6f82e4..fd3b7f9 100644
--- a/SubCabinetSolution/ViewModel/MainViewModel.cs
+++ b/SubCabinetSolution/ViewModel/MainViewModel.cs
@@ -55,7 +55,7 @@
this.VersionName = "版本号 Ver " + Application.ResourceAssembly.GetName().Version;
}
- private void Login(Window window)
+ private void Login(MainWindow window)
{
if (string.IsNullOrWhiteSpace(userName))
{
diff --git a/.gitignore b/.gitignore
index 26128d2..faa25a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
/SubCabinetSolution/obj/
/SubCabinetSolution/bin/
/packages/
+/SubCabinetSolution/bin/Debug/
+/.vs/
diff --git a/.vs/SubCabinetSolution/FileContentIndex/044d5d4c-a2c9-403e-8736-30e6948f897c.vsidx b/.vs/SubCabinetSolution/FileContentIndex/044d5d4c-a2c9-403e-8736-30e6948f897c.vsidx
deleted file mode 100644
index 621afc0..0000000
--- a/.vs/SubCabinetSolution/FileContentIndex/044d5d4c-a2c9-403e-8736-30e6948f897c.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/SubCabinetSolution/FileContentIndex/6b6b4a8c-08a2-4c9d-9b03-578f9c67ea51.vsidx b/.vs/SubCabinetSolution/FileContentIndex/6b6b4a8c-08a2-4c9d-9b03-578f9c67ea51.vsidx
deleted file mode 100644
index 7adf0c6..0000000
--- a/.vs/SubCabinetSolution/FileContentIndex/6b6b4a8c-08a2-4c9d-9b03-578f9c67ea51.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/SubCabinetSolution/FileContentIndex/8a33b672-1934-4548-858b-e9e447dad88d.vsidx b/.vs/SubCabinetSolution/FileContentIndex/8a33b672-1934-4548-858b-e9e447dad88d.vsidx
new file mode 100644
index 0000000..210e33e
--- /dev/null
+++ b/.vs/SubCabinetSolution/FileContentIndex/8a33b672-1934-4548-858b-e9e447dad88d.vsidx
Binary files differ
diff --git a/.vs/SubCabinetSolution/FileContentIndex/c0655fb6-89f1-4aac-a9cb-b763798730d5.vsidx b/.vs/SubCabinetSolution/FileContentIndex/c0655fb6-89f1-4aac-a9cb-b763798730d5.vsidx
deleted file mode 100644
index f3bf078..0000000
--- a/.vs/SubCabinetSolution/FileContentIndex/c0655fb6-89f1-4aac-a9cb-b763798730d5.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/SubCabinetSolution/FileContentIndex/c3ba9f72-5f11-46e8-a897-0dbceab1fafd.vsidx b/.vs/SubCabinetSolution/FileContentIndex/c3ba9f72-5f11-46e8-a897-0dbceab1fafd.vsidx
new file mode 100644
index 0000000..a2156c1
--- /dev/null
+++ b/.vs/SubCabinetSolution/FileContentIndex/c3ba9f72-5f11-46e8-a897-0dbceab1fafd.vsidx
Binary files differ
diff --git a/.vs/SubCabinetSolution/FileContentIndex/ff93a27f-d3c0-4c15-87c6-faf6c0ec21ff.vsidx b/.vs/SubCabinetSolution/FileContentIndex/ff93a27f-d3c0-4c15-87c6-faf6c0ec21ff.vsidx
deleted file mode 100644
index ba26b59..0000000
--- a/.vs/SubCabinetSolution/FileContentIndex/ff93a27f-d3c0-4c15-87c6-faf6c0ec21ff.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index eff0918..2761683 100644
--- a/.vs/SubCabinetSolution/v17/.suo
+++ b/.vs/SubCabinetSolution/v17/.suo
Binary files differ
diff --git a/SubCabinetSolution/SubCabinetSolution.csproj b/SubCabinetSolution/SubCabinetSolution.csproj
index 531c59d..9064e33 100644
--- a/SubCabinetSolution/SubCabinetSolution.csproj
+++ b/SubCabinetSolution/SubCabinetSolution.csproj
@@ -172,6 +172,7 @@
+
diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
new file mode 100644
index 0000000..8ed9410
--- /dev/null
+++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
@@ -0,0 +1,55 @@
+using System;
+using System.Windows;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using SubCabinetSolution.Views;
+
+namespace SubCabinetSolution.ViewModel
+{
+ public class CabinetViewModel : ViewModelBase
+ {
+ public string _currentTime;
+
+ public string CurrentTime
+ {
+ get { return _currentTime; }
+ set
+ {
+ _currentTime = value;
+ RaisePropertyChanged();
+ }
+ }
+
+ public RelayCommand LoginOutCommand { get; set; }
+
+ public CabinetViewModel()
+ {
+ // DispatcherTimer showTimer = new DispatcherTimer();
+ // showTimer.Tick += ShowCurTimer; //起个Timer一直获取当前时间
+ // showTimer.Interval = new TimeSpan(0, 0, 0, 1, 0);
+ // showTimer.Start();
+ _currentTime = "2022/8/25 23:25:50";
+ this.LoginOutCommand = new RelayCommand(LoginOut);
+ }
+
+ private void ShowCurTimer(object sender, EventArgs e)
+ {
+ //获得年月日
+ string date = DateTime.Now.ToString("yyyy/MM/dd");
+ //获得时分秒
+ string time = DateTime.Now.ToString("HH:mm:ss");
+ this._currentTime = date + " " + time;
+ }
+
+ private void LoginOut(CabinetWindow window)
+ {
+ MessageBoxResult result =
+ MessageBox.Show("确定退出吗?", "提示", MessageBoxButton.OKCancel, MessageBoxImage.Question);
+ if (result != MessageBoxResult.OK) return;
+ //退出
+ MainWindow mainWindow = new MainWindow();
+ mainWindow.Show();
+ window.Close();
+ }
+ }
+}
\ No newline at end of file
diff --git a/SubCabinetSolution/ViewModel/MainViewModel.cs b/SubCabinetSolution/ViewModel/MainViewModel.cs
index a6f82e4..fd3b7f9 100644
--- a/SubCabinetSolution/ViewModel/MainViewModel.cs
+++ b/SubCabinetSolution/ViewModel/MainViewModel.cs
@@ -55,7 +55,7 @@
this.VersionName = "版本号 Ver " + Application.ResourceAssembly.GetName().Version;
}
- private void Login(Window window)
+ private void Login(MainWindow window)
{
if (string.IsNullOrWhiteSpace(userName))
{
diff --git a/SubCabinetSolution/ViewModel/ViewModelLocator.cs b/SubCabinetSolution/ViewModel/ViewModelLocator.cs
index cbe9797..153abfc 100644
--- a/SubCabinetSolution/ViewModel/ViewModelLocator.cs
+++ b/SubCabinetSolution/ViewModel/ViewModelLocator.cs
@@ -42,6 +42,7 @@
////}
SimpleIoc.Default.Register();
+ SimpleIoc.Default.Register();
}
public MainViewModel Main
@@ -49,6 +50,11 @@
get { return ServiceLocator.Current.GetInstance(); }
}
+ public CabinetViewModel Cabinet
+ {
+ get { return ServiceLocator.Current.GetInstance(); }
+ }
+
public static void Cleanup()
{
// TODO Clear the ViewModels
diff --git a/.gitignore b/.gitignore
index 26128d2..faa25a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
/SubCabinetSolution/obj/
/SubCabinetSolution/bin/
/packages/
+/SubCabinetSolution/bin/Debug/
+/.vs/
diff --git a/.vs/SubCabinetSolution/FileContentIndex/044d5d4c-a2c9-403e-8736-30e6948f897c.vsidx b/.vs/SubCabinetSolution/FileContentIndex/044d5d4c-a2c9-403e-8736-30e6948f897c.vsidx
deleted file mode 100644
index 621afc0..0000000
--- a/.vs/SubCabinetSolution/FileContentIndex/044d5d4c-a2c9-403e-8736-30e6948f897c.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/SubCabinetSolution/FileContentIndex/6b6b4a8c-08a2-4c9d-9b03-578f9c67ea51.vsidx b/.vs/SubCabinetSolution/FileContentIndex/6b6b4a8c-08a2-4c9d-9b03-578f9c67ea51.vsidx
deleted file mode 100644
index 7adf0c6..0000000
--- a/.vs/SubCabinetSolution/FileContentIndex/6b6b4a8c-08a2-4c9d-9b03-578f9c67ea51.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/SubCabinetSolution/FileContentIndex/8a33b672-1934-4548-858b-e9e447dad88d.vsidx b/.vs/SubCabinetSolution/FileContentIndex/8a33b672-1934-4548-858b-e9e447dad88d.vsidx
new file mode 100644
index 0000000..210e33e
--- /dev/null
+++ b/.vs/SubCabinetSolution/FileContentIndex/8a33b672-1934-4548-858b-e9e447dad88d.vsidx
Binary files differ
diff --git a/.vs/SubCabinetSolution/FileContentIndex/c0655fb6-89f1-4aac-a9cb-b763798730d5.vsidx b/.vs/SubCabinetSolution/FileContentIndex/c0655fb6-89f1-4aac-a9cb-b763798730d5.vsidx
deleted file mode 100644
index f3bf078..0000000
--- a/.vs/SubCabinetSolution/FileContentIndex/c0655fb6-89f1-4aac-a9cb-b763798730d5.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/SubCabinetSolution/FileContentIndex/c3ba9f72-5f11-46e8-a897-0dbceab1fafd.vsidx b/.vs/SubCabinetSolution/FileContentIndex/c3ba9f72-5f11-46e8-a897-0dbceab1fafd.vsidx
new file mode 100644
index 0000000..a2156c1
--- /dev/null
+++ b/.vs/SubCabinetSolution/FileContentIndex/c3ba9f72-5f11-46e8-a897-0dbceab1fafd.vsidx
Binary files differ
diff --git a/.vs/SubCabinetSolution/FileContentIndex/ff93a27f-d3c0-4c15-87c6-faf6c0ec21ff.vsidx b/.vs/SubCabinetSolution/FileContentIndex/ff93a27f-d3c0-4c15-87c6-faf6c0ec21ff.vsidx
deleted file mode 100644
index ba26b59..0000000
--- a/.vs/SubCabinetSolution/FileContentIndex/ff93a27f-d3c0-4c15-87c6-faf6c0ec21ff.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index eff0918..2761683 100644
--- a/.vs/SubCabinetSolution/v17/.suo
+++ b/.vs/SubCabinetSolution/v17/.suo
Binary files differ
diff --git a/SubCabinetSolution/SubCabinetSolution.csproj b/SubCabinetSolution/SubCabinetSolution.csproj
index 531c59d..9064e33 100644
--- a/SubCabinetSolution/SubCabinetSolution.csproj
+++ b/SubCabinetSolution/SubCabinetSolution.csproj
@@ -172,6 +172,7 @@
+
diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
new file mode 100644
index 0000000..8ed9410
--- /dev/null
+++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
@@ -0,0 +1,55 @@
+using System;
+using System.Windows;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using SubCabinetSolution.Views;
+
+namespace SubCabinetSolution.ViewModel
+{
+ public class CabinetViewModel : ViewModelBase
+ {
+ public string _currentTime;
+
+ public string CurrentTime
+ {
+ get { return _currentTime; }
+ set
+ {
+ _currentTime = value;
+ RaisePropertyChanged();
+ }
+ }
+
+ public RelayCommand LoginOutCommand { get; set; }
+
+ public CabinetViewModel()
+ {
+ // DispatcherTimer showTimer = new DispatcherTimer();
+ // showTimer.Tick += ShowCurTimer; //起个Timer一直获取当前时间
+ // showTimer.Interval = new TimeSpan(0, 0, 0, 1, 0);
+ // showTimer.Start();
+ _currentTime = "2022/8/25 23:25:50";
+ this.LoginOutCommand = new RelayCommand(LoginOut);
+ }
+
+ private void ShowCurTimer(object sender, EventArgs e)
+ {
+ //获得年月日
+ string date = DateTime.Now.ToString("yyyy/MM/dd");
+ //获得时分秒
+ string time = DateTime.Now.ToString("HH:mm:ss");
+ this._currentTime = date + " " + time;
+ }
+
+ private void LoginOut(CabinetWindow window)
+ {
+ MessageBoxResult result =
+ MessageBox.Show("确定退出吗?", "提示", MessageBoxButton.OKCancel, MessageBoxImage.Question);
+ if (result != MessageBoxResult.OK) return;
+ //退出
+ MainWindow mainWindow = new MainWindow();
+ mainWindow.Show();
+ window.Close();
+ }
+ }
+}
\ No newline at end of file
diff --git a/SubCabinetSolution/ViewModel/MainViewModel.cs b/SubCabinetSolution/ViewModel/MainViewModel.cs
index a6f82e4..fd3b7f9 100644
--- a/SubCabinetSolution/ViewModel/MainViewModel.cs
+++ b/SubCabinetSolution/ViewModel/MainViewModel.cs
@@ -55,7 +55,7 @@
this.VersionName = "版本号 Ver " + Application.ResourceAssembly.GetName().Version;
}
- private void Login(Window window)
+ private void Login(MainWindow window)
{
if (string.IsNullOrWhiteSpace(userName))
{
diff --git a/SubCabinetSolution/ViewModel/ViewModelLocator.cs b/SubCabinetSolution/ViewModel/ViewModelLocator.cs
index cbe9797..153abfc 100644
--- a/SubCabinetSolution/ViewModel/ViewModelLocator.cs
+++ b/SubCabinetSolution/ViewModel/ViewModelLocator.cs
@@ -42,6 +42,7 @@
////}
SimpleIoc.Default.Register();
+ SimpleIoc.Default.Register();
}
public MainViewModel Main
@@ -49,6 +50,11 @@
get { return ServiceLocator.Current.GetInstance(); }
}
+ public CabinetViewModel Cabinet
+ {
+ get { return ServiceLocator.Current.GetInstance(); }
+ }
+
public static void Cleanup()
{
// TODO Clear the ViewModels
diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml b/SubCabinetSolution/Views/CabinetWindow.xaml
index 1523101..5f57b85 100644
--- a/SubCabinetSolution/Views/CabinetWindow.xaml
+++ b/SubCabinetSolution/Views/CabinetWindow.xaml
@@ -3,7 +3,6 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
- xmlns:local="clr-namespace:SubCabinetSolution.Views"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
Title="高值耗材柜(科室)"
MinWidth="600"
@@ -108,15 +107,12 @@
-
-
-
+
+
+
-
+
-
+
@@ -186,14 +179,28 @@
+ Text="{Binding CurrentTime}" />
diff --git a/.gitignore b/.gitignore
index 26128d2..faa25a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
/SubCabinetSolution/obj/
/SubCabinetSolution/bin/
/packages/
+/SubCabinetSolution/bin/Debug/
+/.vs/
diff --git a/.vs/SubCabinetSolution/FileContentIndex/044d5d4c-a2c9-403e-8736-30e6948f897c.vsidx b/.vs/SubCabinetSolution/FileContentIndex/044d5d4c-a2c9-403e-8736-30e6948f897c.vsidx
deleted file mode 100644
index 621afc0..0000000
--- a/.vs/SubCabinetSolution/FileContentIndex/044d5d4c-a2c9-403e-8736-30e6948f897c.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/SubCabinetSolution/FileContentIndex/6b6b4a8c-08a2-4c9d-9b03-578f9c67ea51.vsidx b/.vs/SubCabinetSolution/FileContentIndex/6b6b4a8c-08a2-4c9d-9b03-578f9c67ea51.vsidx
deleted file mode 100644
index 7adf0c6..0000000
--- a/.vs/SubCabinetSolution/FileContentIndex/6b6b4a8c-08a2-4c9d-9b03-578f9c67ea51.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/SubCabinetSolution/FileContentIndex/8a33b672-1934-4548-858b-e9e447dad88d.vsidx b/.vs/SubCabinetSolution/FileContentIndex/8a33b672-1934-4548-858b-e9e447dad88d.vsidx
new file mode 100644
index 0000000..210e33e
--- /dev/null
+++ b/.vs/SubCabinetSolution/FileContentIndex/8a33b672-1934-4548-858b-e9e447dad88d.vsidx
Binary files differ
diff --git a/.vs/SubCabinetSolution/FileContentIndex/c0655fb6-89f1-4aac-a9cb-b763798730d5.vsidx b/.vs/SubCabinetSolution/FileContentIndex/c0655fb6-89f1-4aac-a9cb-b763798730d5.vsidx
deleted file mode 100644
index f3bf078..0000000
--- a/.vs/SubCabinetSolution/FileContentIndex/c0655fb6-89f1-4aac-a9cb-b763798730d5.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/SubCabinetSolution/FileContentIndex/c3ba9f72-5f11-46e8-a897-0dbceab1fafd.vsidx b/.vs/SubCabinetSolution/FileContentIndex/c3ba9f72-5f11-46e8-a897-0dbceab1fafd.vsidx
new file mode 100644
index 0000000..a2156c1
--- /dev/null
+++ b/.vs/SubCabinetSolution/FileContentIndex/c3ba9f72-5f11-46e8-a897-0dbceab1fafd.vsidx
Binary files differ
diff --git a/.vs/SubCabinetSolution/FileContentIndex/ff93a27f-d3c0-4c15-87c6-faf6c0ec21ff.vsidx b/.vs/SubCabinetSolution/FileContentIndex/ff93a27f-d3c0-4c15-87c6-faf6c0ec21ff.vsidx
deleted file mode 100644
index ba26b59..0000000
--- a/.vs/SubCabinetSolution/FileContentIndex/ff93a27f-d3c0-4c15-87c6-faf6c0ec21ff.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo
index eff0918..2761683 100644
--- a/.vs/SubCabinetSolution/v17/.suo
+++ b/.vs/SubCabinetSolution/v17/.suo
Binary files differ
diff --git a/SubCabinetSolution/SubCabinetSolution.csproj b/SubCabinetSolution/SubCabinetSolution.csproj
index 531c59d..9064e33 100644
--- a/SubCabinetSolution/SubCabinetSolution.csproj
+++ b/SubCabinetSolution/SubCabinetSolution.csproj
@@ -172,6 +172,7 @@
+
diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
new file mode 100644
index 0000000..8ed9410
--- /dev/null
+++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs
@@ -0,0 +1,55 @@
+using System;
+using System.Windows;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using SubCabinetSolution.Views;
+
+namespace SubCabinetSolution.ViewModel
+{
+ public class CabinetViewModel : ViewModelBase
+ {
+ public string _currentTime;
+
+ public string CurrentTime
+ {
+ get { return _currentTime; }
+ set
+ {
+ _currentTime = value;
+ RaisePropertyChanged();
+ }
+ }
+
+ public RelayCommand LoginOutCommand { get; set; }
+
+ public CabinetViewModel()
+ {
+ // DispatcherTimer showTimer = new DispatcherTimer();
+ // showTimer.Tick += ShowCurTimer; //起个Timer一直获取当前时间
+ // showTimer.Interval = new TimeSpan(0, 0, 0, 1, 0);
+ // showTimer.Start();
+ _currentTime = "2022/8/25 23:25:50";
+ this.LoginOutCommand = new RelayCommand(LoginOut);
+ }
+
+ private void ShowCurTimer(object sender, EventArgs e)
+ {
+ //获得年月日
+ string date = DateTime.Now.ToString("yyyy/MM/dd");
+ //获得时分秒
+ string time = DateTime.Now.ToString("HH:mm:ss");
+ this._currentTime = date + " " + time;
+ }
+
+ private void LoginOut(CabinetWindow window)
+ {
+ MessageBoxResult result =
+ MessageBox.Show("确定退出吗?", "提示", MessageBoxButton.OKCancel, MessageBoxImage.Question);
+ if (result != MessageBoxResult.OK) return;
+ //退出
+ MainWindow mainWindow = new MainWindow();
+ mainWindow.Show();
+ window.Close();
+ }
+ }
+}
\ No newline at end of file
diff --git a/SubCabinetSolution/ViewModel/MainViewModel.cs b/SubCabinetSolution/ViewModel/MainViewModel.cs
index a6f82e4..fd3b7f9 100644
--- a/SubCabinetSolution/ViewModel/MainViewModel.cs
+++ b/SubCabinetSolution/ViewModel/MainViewModel.cs
@@ -55,7 +55,7 @@
this.VersionName = "版本号 Ver " + Application.ResourceAssembly.GetName().Version;
}
- private void Login(Window window)
+ private void Login(MainWindow window)
{
if (string.IsNullOrWhiteSpace(userName))
{
diff --git a/SubCabinetSolution/ViewModel/ViewModelLocator.cs b/SubCabinetSolution/ViewModel/ViewModelLocator.cs
index cbe9797..153abfc 100644
--- a/SubCabinetSolution/ViewModel/ViewModelLocator.cs
+++ b/SubCabinetSolution/ViewModel/ViewModelLocator.cs
@@ -42,6 +42,7 @@
////}
SimpleIoc.Default.Register();
+ SimpleIoc.Default.Register();
}
public MainViewModel Main
@@ -49,6 +50,11 @@
get { return ServiceLocator.Current.GetInstance(); }
}
+ public CabinetViewModel Cabinet
+ {
+ get { return ServiceLocator.Current.GetInstance(); }
+ }
+
public static void Cleanup()
{
// TODO Clear the ViewModels
diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml b/SubCabinetSolution/Views/CabinetWindow.xaml
index 1523101..5f57b85 100644
--- a/SubCabinetSolution/Views/CabinetWindow.xaml
+++ b/SubCabinetSolution/Views/CabinetWindow.xaml
@@ -3,7 +3,6 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
- xmlns:local="clr-namespace:SubCabinetSolution.Views"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
Title="高值耗材柜(科室)"
MinWidth="600"
@@ -108,15 +107,12 @@
-
-
-
+
+
+
-
+
-
+
@@ -186,14 +179,28 @@
+ Text="{Binding CurrentTime}" />
diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml.cs b/SubCabinetSolution/Views/CabinetWindow.xaml.cs
index 15b5fa4..b92920d 100644
--- a/SubCabinetSolution/Views/CabinetWindow.xaml.cs
+++ b/SubCabinetSolution/Views/CabinetWindow.xaml.cs
@@ -1,12 +1,13 @@
-using System.Windows;
+using SubCabinetSolution.ViewModel;
namespace SubCabinetSolution.Views
{
- public partial class CabinetWindow : Window
+ public partial class CabinetWindow
{
public CabinetWindow()
{
InitializeComponent();
+ this.DataContext = new CabinetViewModel();
}
}
}
\ No newline at end of file