add deteils and create in bus stop

Administrator
1 parent 44582203
Showing 24 changed files with 323 additions and 51 deletions Show diff stats
src/Maps/Controllers/BusStopController.cs
src/Maps/Startup.cs
src/MapsDb/DataService/BusStopDs.cs
src/MapsDb/DataService/RegionDc.cs
src/MapsDb/DataService/RoadDs.cs
src/MapsDb/DataService/SettlementDs.cs
src/MapsDb/DataService/StateCommonDs.cs
src/MapsDb/DataService/SurfaceTypeDs.cs
src/MapsDb/Interfaces/IBusStopDs.cs
src/MapsDb/Interfaces/IRegionDc.cs
src/MapsDb/Interfaces/IRoadDs.cs
src/MapsDb/Interfaces/ISettlementDs.cs
src/MapsDb/Interfaces/IStateCommonDs.cs
src/MapsDb/Interfaces/ISurfaceTypeDs.cs
src/MapsModels/DsModels/BusStopDetailsDs.cs → src/MapsModels/DsModels/BusStopDetailsDsM.cs
src/MapsModels/DsModels/BusStopListDs.cs → src/MapsModels/DsModels/BusStopListDsM.cs
src/MapsModels/DsModels/RegionSelectListDsM.cs
src/MapsModels/DsModels/RoadSelectListDsM.cs
src/MapsModels/DsModels/SettlementSelectListDsM.cs
src/MapsModels/DsModels/StateCommonSelectListDsM.cs
@@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.EntityFrameworkCore;
 using MapsDb;
-using MapsDb.Interfeces;
+using MapsDb.Interfaces;
 using MapsDb.DataService;
 using MapsModels.ViewModels;
 namespace Maps.Controllers
@@ -12,53 +12,76 @@ namespace Maps.Controllers
     public class BusStopController : Controller
     {
         private readonly IBusStopDs _busStopDs;
+        private readonly IRoadDs _roadDs;
+        private readonly ISettlementDs _settlementDs;
+        private readonly IStateCommonDs _stateCommonDs;
+        private readonly IRegionDc _regionDc;
+        private readonly ISurfaceTypeDs _surfaceTypeDs;
-        public BusStopController(IBusStopDs BusStopDs)
+        public BusStopController(IBusStopDs BusStopDs, IRoadDs RoadDs, ISettlementDs SettlementDs, IRegionDc RegionDs, IStateCommonDs StateCommonDs, ISurfaceTypeDs SurfaceTypeDs)
         {
-            _busStopDs = BusStopDs;    
+            _busStopDs = BusStopDs;
+            _roadDs = RoadDs;    
+            _settlementDs = SettlementDs;    
+            _stateCommonDs = StateCommonDs;    
+            _regionDc = RegionDs;    
+            _surfaceTypeDs = SurfaceTypeDs;        
         }
         // GET: BusStop
         [HttpGet]
         public async Task<IActionResult> Index()
         {
-            var busStops = await _busStopDs.GetAllBusStopAsync();
+            var busStops = await _busStopDs.GetIndexListAsync();
             ListBusStopVm vm = new ListBusStopVm
             {
-                busStopListDs = busStops.ToList()
+                busStopListDsM = busStops.ToList()
             };
             return Json(vm);
         }
-        // // GET: BusStop/Details/5
-        // public async Task<IActionResult> Details(int id)
-        // {
+        // GET: BusStop/Details/5
+        public async Task<IActionResult> Details(int id)
+        {
+            try{
+                var busStop = await _busStopDs.FindOneDetailsAsync(id);
+                if (busStop == null)
+                {
+                    return NotFound();
+                }
+                DetailsBusStopVm vm = new DetailsBusStopVm
+                {
+                    busStopDetailsDsM = busStop
+                };
+                return Json(vm);
+            } catch {
+                return Json(false);
+            }
+   
+        }
-        //     var busStop = await _busStopDs.FindOneDetailsAsync(id);
-        //     if (busStop == null)
-        //     {
-        //         return NotFound();
-        //     }
-        //     DetailsBusStopVm vm = new DetailsBusStopVm
-        //     {
-        //         BusStopDetailsDs = busStop
-        //     };
-        //     return Json(vm);
-        // }
+        // GET: BusStop/Create
+        public async Task<IActionResult> Create()
+        {
+            var SurfaceType = await _surfaceTypeDs.GetSelectListAsync();
+            var StateCommon = await _stateCommonDs.GetSelectListAsync();
+            var Settlement = await _settlementDs.GetSelectListAsync();
+            var Road = await _roadDs.GetSelectListAsync();
+            var Region = await _regionDc.GetSelectListAsync();
-        // // GET: BusStop/Create
-        // public IActionResult Create()
-        // {
-        //     ViewData["RegionId"] = new SelectList(_context.Region, "RegionId", "RegionId");
-        //     ViewData["RoadId"] = new SelectList(_context.Road, "RoadId", "Name");
-        //     ViewData["SettlementId"] = new SelectList(_context.Settlement, "SettlementId", "Name");
-        //     ViewData["StateCommonId"] = new SelectList(_context.StateCommon, "StateCommonId", "Value");
-        //     ViewData["SurfaceTypeId"] = new SelectList(_context.SurfaceType, "SurfaceTypeId", "Name");
-        //     return View();
-        // }
+            CreateBusStopVm vm = new CreateBusStopVm
+            {
+                SurfaceTypeSelectListDsM = SurfaceType.ToList(),
+                StateCommonSelectListDsM = StateCommon.ToList(),
+                SettlementSelectListDsM = Settlement.ToList(),
+                RoadSelectListDsM = Road.ToList(),
+                RegionSelectListDsM = Region.ToList()
+            };
+            return Json(vm);
+        }
         // // POST: BusStop/Create
         // // To protect from overposting attacks, please enable the specific properties you want to bind to, for 
@@ -9,7 +9,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.EntityFrameworkCore;
 using MapsDb;
-using MapsDb.Interfeces;
+using MapsDb.Interfaces;
 using MapsDb.DataService;
 using MapsModels;
 namespace Maps
@@ -40,6 +40,11 @@ namespace Maps
             services.AddScoped<PostgresDbContext>();
             services.AddScoped<IBusStopDs, BusStopDs>();
+            services.AddScoped<IRoadDs, RoadDc>();
+            services.AddScoped<IRegionDc, RegionDc>();
+            services.AddScoped<IStateCommonDs, StateCommonDc>();
+            services.AddScoped<ISurfaceTypeDs, SurfaceTypeDc>();
+            services.AddScoped<ISettlementDs, SettlementDc>();
             // Add framework services.
             services.AddApplicationInsightsTelemetry(Configuration);
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using MapsDb.Interfeces;
+using MapsDb.Interfaces;
 using MapsDb.Models;
 using MapsModels.DsModels;
@@ -13,17 +13,12 @@ namespace MapsDb.DataService
         public BusStopDs(){
             _context = new PostgresDbContext();
         }
-        public void Dispose()
-        {
-            _context.Dispose();
-        }
-
-        public Task<IList<BusStopListDs>> GetAllBusStopAsync(){
+        public Task<IList<BusStopListDsM>> GetIndexListAsync(){
             return Task.Factory.StartNew(GetAllBusStop);
         }
-        private IList<BusStopListDs> GetAllBusStop()
+        private IList<BusStopListDsM> GetAllBusStop()
         {
-           return _context.BusStop.Select(x => new BusStopListDs
+           return _context.BusStop.Select(x => new BusStopListDsM
             {
                 Road = x.Road.Name, 
                 Region = x.Region.Name,
@@ -34,7 +29,7 @@ namespace MapsDb.DataService
             }).ToList();
         }
-        public Task SaveBusStopAsync(BusStop busStop){
+        public Task SaveAsync(BusStop busStop){
               return Task.Factory.StartNew(()=> { Save(busStop); });
         }
         private void Save(BusStop busStop)
@@ -49,11 +44,11 @@ namespace MapsDb.DataService
                 _context.BusStop.Add(busStop);
             }
         }
-        public Task<BusStopDetailsDs> FindOneDetailsAsync(int Id){
+        public Task<BusStopDetailsDsM> FindOneDetailsAsync(int Id){
              return Task.Factory.StartNew(()=> { return FindOneDetails(Id); });
         }
-        private BusStopDetailsDs FindOneDetails(int Id){
-           return _context.BusStop.Where(x => x.BusStopId == Id).Select(x => new BusStopDetailsDs{
+        private BusStopDetailsDsM FindOneDetails(int Id){
+           return _context.BusStop.Where(x => x.BusStopId == Id).Select(x => new BusStopDetailsDsM{
                 BusStopId = x.BusStopId,
                 Road = x.Road.Name, 
                 Region = x.Region.Name,
+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
+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 RoadDc : IRoadDs
+    {
+        private PostgresDbContext _context;
+        public RoadDc(){
+            _context = new PostgresDbContext();
+        }
+        public Task<IList<RoadSelectListDsM>> GetSelectListAsync(){
+            return Task.Factory.StartNew(GetSelectList);
+        }
+        private IList<RoadSelectListDsM> GetSelectList()
+        {
+           return _context.Road.Select(x => new RoadSelectListDsM
+            {
+                RoadId = x.RoadId, 
+                Name = x.Name
+            }).ToList();
+        }
+
+    }
+}
 \ No newline at end of file
+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 SettlementDc : ISettlementDs
+    {
+        private PostgresDbContext _context;
+        public SettlementDc(){
+            _context = new PostgresDbContext();
+        }
+        public Task<IList<SettlementSelectListDsM>> GetSelectListAsync(){
+            return Task.Factory.StartNew(GetSelectList);
+        }
+        private IList<SettlementSelectListDsM> GetSelectList()
+        {
+           return _context.Settlement.Select(x => new SettlementSelectListDsM
+            {
+                SettlementId = x.SettlementId, 
+                Name = x.Name
+            }).ToList();
+        }
+
+    }
+}
 \ No newline at end of file
+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 StateCommonDc : IStateCommonDs
+    {
+        private PostgresDbContext _context;
+        public StateCommonDc(){
+            _context = new PostgresDbContext();
+        }
+        public Task<IList<StateCommonSelectListDsM>> GetSelectListAsync(){
+            return Task.Factory.StartNew(GetSelectList);
+        }
+        private IList<StateCommonSelectListDsM> GetSelectList()
+        {
+           return _context.StateCommon.Select(x => new StateCommonSelectListDsM
+            {
+                StateCommonId = x.StateCommonId, 
+                Value = x.Value
+            }).ToList();
+        }
+
+    }
+}
 \ No newline at end of file
+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 SurfaceTypeDc : ISurfaceTypeDs
+    {
+        private PostgresDbContext _context;
+        public SurfaceTypeDc(){
+            _context = new PostgresDbContext();
+        }
+        public Task<IList<SurfaceTypeSelectListDsM>> GetSelectListAsync(){
+            return Task.Factory.StartNew(GetSelectList);
+        }
+        private IList<SurfaceTypeSelectListDsM> GetSelectList()
+        {
+           return _context.SurfaceType.Select(x => new SurfaceTypeSelectListDsM
+            {
+                SurfaceTypeId = x.SurfaceTypeId, 
+                Name = x.Name
+            }).ToList();
+        }
+
+    }
+}
 \ No newline at end of file
@@ -2,12 +2,12 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using MapsModels.DsModels;
 using MapsDb.Models;
-namespace MapsDb.Interfeces
+namespace MapsDb.Interfaces
 {
     public interface IBusStopDs
     {
-        Task<IList<BusStopListDs>> GetAllBusStopAsync();
-        Task SaveBusStopAsync(BusStop busStop);
-        Task<BusStopDetailsDs> FindOneDetailsAsync(int Id);
+        Task<IList<BusStopListDsM>> GetIndexListAsync();
+        Task SaveAsync(BusStop busStop);
+        Task<BusStopDetailsDsM> FindOneDetailsAsync(int Id);
     }
 }
 \ No newline at end of file
+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
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using MapsModels.DsModels;
+using MapsDb.Models;
+namespace MapsDb.Interfaces
+{
+    public interface IRoadDs
+    {
+         Task<IList<RoadSelectListDsM>> GetSelectListAsync();
+    }
+}
 \ No newline at end of file
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using MapsModels.DsModels;
+using MapsDb.Models;
+namespace MapsDb.Interfaces
+{
+    public interface ISettlementDs
+    {
+         Task<IList<SettlementSelectListDsM>> GetSelectListAsync();        
+    }
+}
 \ No newline at end of file
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using MapsModels.DsModels;
+using MapsDb.Models;
+namespace MapsDb.Interfaces
+{
+    public interface IStateCommonDs
+    {
+         Task<IList<StateCommonSelectListDsM>> GetSelectListAsync();            
+    }
+}
 \ No newline at end of file
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using MapsModels.DsModels;
+using MapsDb.Models;
+namespace MapsDb.Interfaces
+{
+    public interface ISurfaceTypeDs
+    {
+         Task<IList<SurfaceTypeSelectListDsM>> GetSelectListAsync();            
+    }
+}
 \ No newline at end of file
 namespace MapsModels.DsModels
 {
-    public class BusStopDetailsDs
+    public class BusStopDetailsDsM
     {
         public int BusStopId { get; set; }
         public string Road { get; set; }
 namespace MapsModels.DsModels
 {
-    public class BusStopListDs
+    public class BusStopListDsM
     {
         public string Road { get; set; }
         public string Region { get; set; }
+namespace MapsModels.DsModels
+{
+    public class RegionSelectListDsM
+    {
+        public int RegionId { get; set; }
+        public string Name { get; set; }
+    }
+}
 \ No newline at end of file
+namespace MapsModels.DsModels
+{
+    public class RoadSelectListDsM
+    {
+        public int RoadId { get; set; }
+        public string Name { get; set; }
+    }
+}
 \ No newline at end of file
+namespace MapsModels.DsModels
+{
+    public class SettlementSelectListDsM
+    {
+        public int SettlementId { get; set; }
+        public string Name { get; set; }
+    }
+}
 \ No newline at end of file
+namespace MapsModels.DsModels
+{
+    public class StateCommonSelectListDsM
+    {
+        public int StateCommonId { get; set; }
+        public string Value { get; set; }
+    }
+}
 \ No newline at end of file
+namespace MapsModels.DsModels
+{
+    public class SurfaceTypeSelectListDsM
+    {
+        public int SurfaceTypeId { get; set; }
+        public string Name { get; set; }
+    }
+}
 \ No newline at end of file
+using System.Collections.Generic;
+using MapsModels.DsModels;
+
+namespace MapsModels.ViewModels
+{
+    public class CreateBusStopVm
+    {
+        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; }
+    }
+}
@@ -5,6 +5,6 @@ namespace MapsModels.ViewModels
 {
     public class DetailsBusStopVm
     {
-        public BusStopDetailsDs busStopDetailsDs { get; set; }
+        public BusStopDetailsDsM busStopDetailsDsM { get; set; }
     }
 }
@@ -5,6 +5,6 @@ namespace MapsModels.ViewModels
 {
     public class ListBusStopVm
     {
-        public List<BusStopListDs> busStopListDs { get; set; }
+        public List<BusStopListDsM> busStopListDsM { get; set; }
     }
 }