add road width

Administrator
1 parent bb8e8397
Showing 9 changed files with 261 additions and 4 deletions Show diff stats
src/Maps/Controllers/RoadWidthController.cs
src/Maps/Startup.cs
src/MapsDb/DataService/RoadSurfaceDs.cs
src/MapsDb/DataService/RoadWidthDs.cs
src/MapsDb/Interfaces/IRoadWidthDs.cs
src/MapsDb/Models/RoadWidth.cs
src/MapsDb/PostgresDbContext.cs
src/MapsModels/DsModels/RoadWidthEditDsM.cs
src/MapsModels/ViewModels/RoadWidthListVm.cs
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.EntityFrameworkCore;
+using MapsDb;
+using MapsDb.Interfaces;
+using MapsDb.DataService;
+using MapsModels.ViewModels;
+using MapsModels.DsModels;
+using System;
+
+namespace Maps.Controllers
+{
+    public class RoadWidthController : Controller
+    {
+        private readonly IRoadDs _roadDs;
+        private readonly IRegionDs _regionDs;
+        private readonly IRoadWidthDs _roadWidthDs;
+        public RoadWidthController(
+            IRoadWidthDs RoadWidthDs,
+            IRoadDs RoadDs, 
+            IRegionDs RegionDs
+            )
+        {
+            _roadDs = RoadDs;     
+            _regionDs = RegionDs;       
+            _roadWidthDs = RoadWidthDs;     
+        }
+
+        // GET: BusStop
+        [HttpGet]
+        public async Task<IActionResult> Index([FromQuery] PaginationDsM data)
+        {
+
+            try
+            {
+                var Data = await _roadWidthDs.GetIndexListAsync(data);
+
+                RoadWidthListVm vm = new RoadWidthListVm
+                {
+                    RoadWidthEditDsM = Data.ToList()
+                };
+
+                return Json(vm);
+            }
+            catch (NullReferenceException)
+            {
+                Response.StatusCode = 400;
+                return Json("There is no field with name " + data.sort);
+            }
+            catch (Exception)
+            {
+                return NotFound();
+            }
+        }
+
+        [HttpGet]
+        public async Task<IActionResult> Directory(){
+            var Road = await _roadDs.GetSelectListAsync();
+            var Region = await _regionDs.GetSelectListAsync();
+
+            CatalogListVm vm = new CatalogListVm
+            {
+                RoadSelectListDsM = Road.ToList(),
+                RegionSelectListDsM = Region.ToList()
+            };
+            return Json(vm);
+        }
+
+
+        [HttpPost]
+        public async Task<IActionResult> Create([FromBody] RoadWidthEditDsM data)
+        {
+            var result = await _roadWidthDs.CreateAsync(data);
+            return Json(result);
+        }
+
+        [HttpPost]
+        public async Task<IActionResult> Update(int id, [FromBody] RoadWidthEditDsM data){
+                await _roadWidthDs.UpdateAsync(data,id);
+                return Json(String.Empty);
+        }
+
+     
+        [HttpDelete]
+        public async Task<IActionResult> Delete(int id)
+        {   
+            try
+            {
+                 int data = await _roadWidthDs.DeleteAsync(id);
+                 return Json(data);
+            }
+            catch (ArgumentNullException )
+            {
+                return NotFound();
+            }
+        }
+    }
+}
@@ -56,6 +56,7 @@ namespace Maps
             services.AddScoped<ISurfaceTreatmentDs, SurfaceTreatmentDs>();
             services.AddScoped<IRoadDirectionDs, RoadDirectionDs>();
             services.AddScoped<IRoadSurfaceDs, RoadSurfaceDs>();
+            services.AddScoped<IRoadWidthDs, RoadWidthDs>();
             // Add framework services.
             services.AddApplicationInsightsTelemetry(Configuration);
@@ -21,7 +21,15 @@ namespace MapsDb.DataService
         {
             var data =  _context.RoadSurface.Select(RoadSurface => new RoadSurfaceEditDsM
             {
-         
+                Id = RoadSurface.Id,
+                RoadId = RoadSurface.RoadId,
+                RegionId = RoadSurface.RegionId,
+                RoadDirectionId = RoadSurface.RoadDirectionId,
+                Begin = RoadSurface.Begin,
+                End = RoadSurface.End,
+                SurfaceTypeId = RoadSurface.SurfaceTypeId,
+                SurfaceTreatmentId = RoadSurface.SurfaceTreatmentId,
+                StateCommonId = RoadSurface.StateCommonId,
               }).Skip(pagination.from).Take(pagination.perPage);
             switch (pagination.orderType())
             {
@@ -59,7 +67,15 @@ namespace MapsDb.DataService
         }
         public RoadSurface InsertModel(RoadSurfaceEditDsM data){
          RoadSurface Model = new RoadSurface{
-       
+                Id = data.Id,
+                RoadId = data.RoadId,
+                RegionId = data.RegionId,
+                RoadDirectionId = data.RoadDirectionId,
+                Begin = data.Begin,
+                End = data.End,
+                SurfaceTypeId = data.SurfaceTypeId,
+                SurfaceTreatmentId = data.SurfaceTreatmentId,
+                StateCommonId = data.StateCommonId,
             };
             return Model;
         }
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Threading.Tasks;
+using MapsDb.Interfaces;
+using MapsDb.Models;
+using MapsModels.DsModels;
+using Microsoft.EntityFrameworkCore;
+namespace MapsDb.DataService
+{
+    public class RoadWidthDs : IRoadWidthDs
+    {
+        private PostgresDbContext _context;
+        public RoadWidthDs(){
+            _context = new PostgresDbContext();
+        }
+        public Task<IList<RoadWidthEditDsM>> GetIndexListAsync(PaginationDsM pagination){
+            return Task.Factory.StartNew(()=> { return GetAllRoadWidth(pagination); });
+        }
+        private IList<RoadWidthEditDsM> GetAllRoadWidth(PaginationDsM pagination)
+        {
+            var data =  _context.RoadWidth.Select(RoadWidth => new RoadWidthEditDsM
+            {
+                Id = RoadWidth.Id,
+                RoadId = RoadWidth.RoadId,
+                RegionId = RoadWidth.RegionId,
+                Begin = RoadWidth.Begin,
+                End = RoadWidth.End,
+                WidthRoadsideLeft = RoadWidth.WidthRoadsideLeft,
+                WidthReverseRoad = RoadWidth.WidthReverseRoad,
+                WidthStrip = RoadWidth.WidthStrip,
+                WidthRoadwayForward = RoadWidth.WidthRoadwayForward,
+                WidthRoadsideRight = RoadWidth.WidthRoadsideRight,
+                CountLaneLeft = RoadWidth.CountLaneLeft,
+                CountLaneRight = RoadWidth.CountLaneRight,
+            }).Skip(pagination.from).Take(pagination.perPage);
+            switch (pagination.orderType())
+            {
+                case "ASC":
+                    return data.OrderBy(i => i.GetType().GetProperty(pagination.sort).GetValue(i, null)).ToList();
+          
+                case "DESC":
+                    return data.OrderByDescending(i => i.GetType().GetProperty(pagination.sort).GetValue(i, null)).ToList();
+            
+                default:
+                    return data.OrderByDescending(i => i.Id).ToList();
+            }     
+            
+        }
+
+        public Task<RoadWidth> CreateAsync(RoadWidthEditDsM data){
+              return Task.Factory.StartNew(()=> { return Create(data); });
+        }
+        private RoadWidth Create(RoadWidthEditDsM data)
+        {   
+            
+            RoadWidth Model = InsertModel(data);
+            _context.RoadWidth.Add(Model);
+            _context.SaveChanges();
+            return Model;
+        }
+        public Task<RoadWidth> UpdateAsync(RoadWidthEditDsM data, int id){
+            return Task.Factory.StartNew(()=> { return Update(data, id); });
+        }
+        private RoadWidth Update(RoadWidthEditDsM data, int id)
+        {   
+            RoadWidth Model = InsertModel(data);
+            Model.Id = id;
+            _context.RoadWidth.Update(Model);
+            _context.SaveChanges();
+            return Model;
+        }
+        public RoadWidth InsertModel(RoadWidthEditDsM data){
+            RoadWidth Model = new RoadWidth{
+                RoadId = data.RoadId,
+                RegionId = data.RegionId,
+                Begin = data.Begin,
+                End = data.End,
+                WidthRoadsideLeft = data.WidthRoadsideLeft,
+                WidthReverseRoad = data.WidthReverseRoad,
+                WidthStrip = data.WidthStrip,
+                WidthRoadwayForward = data.WidthRoadwayForward,
+                WidthRoadsideRight = data.WidthRoadsideRight,
+                CountLaneLeft = data.CountLaneLeft,
+                CountLaneRight = data.CountLaneRight,
+            };
+            return Model;
+        }
+        public async Task<int> DeleteAsync(int Id)
+        {
+            var RoadWidth = await _context.RoadWidth.SingleOrDefaultAsync(x => x.Id == Id);
+            _context.RoadWidth.Remove(RoadWidth);
+            return await _context.SaveChangesAsync();
+        }
+    }
+}
 \ 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 IRoadWidthDs
+    {
+        Task<IList<RoadWidthEditDsM>> GetIndexListAsync(PaginationDsM pagination);
+        Task<RoadWidth> CreateAsync(RoadWidthEditDsM data);
+        Task<RoadWidth> UpdateAsync(RoadWidthEditDsM data, int id);
+        Task<int> DeleteAsync(int Id);
+    }
+}
 \ No newline at end of file
@@ -5,7 +5,7 @@ namespace MapsDb.Models
 {
     public partial class RoadWidth
     {
-        public int RoadWidthId { get; set; }
+        public int Id { get; set; }
         public int? RegionId { get; set; }
         public int? RoadId { get; set; }
         public double? Begin { get; set; }
@@ -525,7 +525,7 @@ namespace MapsDb
             {
                 entity.ToTable("road_width");
-                entity.Property(e => e.RoadWidthId).HasColumnName("road_width_id");
+                entity.Property(e => e.Id).HasColumnName("id");
                 entity.Property(e => e.Begin).HasColumnName("begin");
+namespace MapsModels.DsModels
+{
+    public class RoadWidthEditDsM
+    {
+
+        public int Id { get; set; }
+        public int? RegionId { get; set; }
+        public int? RoadId { get; set; }
+        public double? Begin { get; set; }
+        public double? End { get; set; }
+        public double? WidthRoadsideLeft { get; set; }
+        public double? WidthReverseRoad { get; set; }
+        public double? WidthStrip { get; set; }
+        public double? WidthRoadwayForward { get; set; }
+        public double? WidthRoadsideRight { get; set; }
+        public double? CountLaneLeft { get; set; }
+        public double? CountLaneRight { get; set; }
+
+    }
+}
 \ No newline at end of file
+using System.Collections.Generic;
+using MapsModels.DsModels;
+
+namespace MapsModels.ViewModels
+{
+    public class RoadWidthListVm
+    {
+        public List<RoadWidthEditDsM> RoadWidthEditDsM { get; set; }
+    }
+}