From 87b67afd4192365aed14dc764ebde79a5d2599f9 Mon Sep 17 00:00:00 2001
From: Vitaliy <dockdep@gmail.com>
Date: Thu, 2 Feb 2017 13:45:32 +0200
Subject: [PATCH] fix dc

---
 src/MapsDb/DataService/RegionDc.cs       | 28 ----------------------------
 src/MapsDb/DataService/RegionDs.cs       | 28 ++++++++++++++++++++++++++++
 src/MapsDb/Interfaces/IRegionDc.cs       | 11 -----------
 src/MapsDb/Interfaces/IRegionDs.cs       | 11 +++++++++++
 src/MapsModels/ViewModels/DirectoryVm.cs | 14 ++++++++++++++
 5 files changed, 53 insertions(+), 39 deletions(-)
 delete mode 100644 src/MapsDb/DataService/RegionDc.cs
 create mode 100644 src/MapsDb/DataService/RegionDs.cs
 delete mode 100644 src/MapsDb/Interfaces/IRegionDc.cs
 create mode 100644 src/MapsDb/Interfaces/IRegionDs.cs
 create mode 100644 src/MapsModels/ViewModels/DirectoryVm.cs

diff --git a/src/MapsDb/DataService/RegionDc.cs b/src/MapsDb/DataService/RegionDc.cs
deleted file mode 100644
index 843f603..0000000
--- a/src/MapsDb/DataService/RegionDc.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using MapsDb.Interfaces;
-using MapsDb.Models;
-using MapsModels.DsModels;
-namespace MapsDb.DataService
-{
-    public class RegionDc : IRegionDc
-    {
-        private PostgresDbContext _context;
-        public RegionDc(){
-            _context = new PostgresDbContext();
-        }
-        public Task<IList<RegionSelectListDsM>> GetSelectListAsync(){
-            return Task.Factory.StartNew(GetSelectList);
-        }
-        private IList<RegionSelectListDsM> GetSelectList()
-        {
-           return _context.Region.Select(x => new RegionSelectListDsM
-            {
-                RegionId = x.RegionId, 
-                Name = x.Name
-            }).ToList();
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/src/MapsDb/DataService/RegionDs.cs b/src/MapsDb/DataService/RegionDs.cs
new file mode 100644
index 0000000..f21b45e
--- /dev/null
+++ b/src/MapsDb/DataService/RegionDs.cs
@@ -0,0 +1,28 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using MapsDb.Interfaces;
+using MapsDb.Models;
+using MapsModels.DsModels;
+namespace MapsDb.DataService
+{
+    public class RegionDs : IRegionDs
+    {
+        private PostgresDbContext _context;
+        public RegionDs(){
+            _context = new PostgresDbContext();
+        }
+        public Task<IList<RegionSelectListDsM>> GetSelectListAsync(){
+            return Task.Factory.StartNew(GetSelectList);
+        }
+        private IList<RegionSelectListDsM> GetSelectList()
+        {
+           return _context.Region.Select(x => new RegionSelectListDsM
+            {
+                RegionId = x.RegionId, 
+                Name = x.Name
+            }).ToList();
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/src/MapsDb/Interfaces/IRegionDc.cs b/src/MapsDb/Interfaces/IRegionDc.cs
deleted file mode 100644
index 1125c78..0000000
--- a/src/MapsDb/Interfaces/IRegionDc.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using MapsModels.DsModels;
-using MapsDb.Models;
-namespace MapsDb.Interfaces
-{
-    public interface IRegionDc
-    {
-        Task<IList<RegionSelectListDsM>> GetSelectListAsync();
-    }
-}
\ No newline at end of file
diff --git a/src/MapsDb/Interfaces/IRegionDs.cs b/src/MapsDb/Interfaces/IRegionDs.cs
new file mode 100644
index 0000000..185c7d9
--- /dev/null
+++ b/src/MapsDb/Interfaces/IRegionDs.cs
@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using MapsModels.DsModels;
+using MapsDb.Models;
+namespace MapsDb.Interfaces
+{
+    public interface IRegionDs
+    {
+        Task<IList<RegionSelectListDsM>> GetSelectListAsync();
+    }
+}
\ No newline at end of file
diff --git a/src/MapsModels/ViewModels/DirectoryVm.cs b/src/MapsModels/ViewModels/DirectoryVm.cs
new file mode 100644
index 0000000..8131bf2
--- /dev/null
+++ b/src/MapsModels/ViewModels/DirectoryVm.cs
@@ -0,0 +1,14 @@
+using System.Collections.Generic;
+using MapsModels.DsModels;
+
+namespace MapsModels.ViewModels
+{
+    public class DirectoryVm
+    {
+        public List<SurfaceTypeSelectListDsM> SurfaceTypeSelectListDsM { get; set; }
+        public List<StateCommonSelectListDsM> StateCommonSelectListDsM { get; set; }
+        public List<SettlementSelectListDsM> SettlementSelectListDsM { get; set; }
+        public List<RoadSelectListDsM> RoadSelectListDsM { get; set; }
+        public List<RegionSelectListDsM> RegionSelectListDsM { get; set; }
+    }
+}
--
libgit2 0.21.4