Merge branch 'master' of gitlab.artweb.com.ua:root/FirstFullmaps

Administrator
2 parents 9035cd53 107227b2
Showing 8 changed files with 291 additions and 2 deletions Show diff stats
src/Maps/Controllers/FlowIntensityController.cs
src/Maps/Startup.cs
src/MapsDb/DataService/FlowIntensityDs.cs
src/MapsDb/Interfaces/IFlowIntensityDs.cs
src/MapsDb/Models/FlowIntensity.cs
src/MapsDb/PostgresDbContext.cs
src/MapsModels/DsModels/FlowIntensityEditDsM.cs
src/MapsModels/ViewModels/FlowIntensityListVm.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 FlowIntensityController : Controller
+    {
+        private readonly IFlowIntensityDs _flowIntensityDs;
+        private readonly IRoadDs _roadDs;
+        private readonly IRegionDs _regionDs;
+        private readonly IRoadDirectionDs _roadDirectionDs;
+        private readonly ISettlementDs _settlementDs;
+
+        public FlowIntensityController(IFlowIntensityDs FlowIntensityDs, IRoadDs RoadDs, ISettlementDs SettlementDs, IRegionDs RegionDs, IRoadDirectionDs RoadDirectionDs)
+        {
+            _flowIntensityDs = FlowIntensityDs;
+            _roadDs = RoadDs;    
+            _settlementDs = SettlementDs;    
+            _regionDs = RegionDs;    
+            _roadDirectionDs = RoadDirectionDs;
+        }
+
+        // GET: FlowIntensity
+        [HttpGet]
+        public async Task<IActionResult> Index([FromQuery] PaginationDsM data)
+        {
+            try
+            {
+                var flowIntensitys = await _flowIntensityDs.GetIndexListAsync(data);
+
+                FlowIntensityListVm vm = new FlowIntensityListVm
+                {
+                    FlowIntensityEditDsM = flowIntensitys.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 Settlement = await _settlementDs.GetSelectListAsync();
+            var Road = await _roadDs.GetSelectListAsync();
+            var Region = await _regionDs.GetSelectListAsync();
+            var RoadDirection = await _roadDirectionDs.GetSelectListAsync();
+
+            CatalogListVm vm = new CatalogListVm
+            {
+                SettlementSelectListDsM = Settlement.ToList(),
+                RoadSelectListDsM = Road.ToList(),
+                RegionSelectListDsM = Region.ToList(),
+                RoadDirectionSelectListDsM = RoadDirection.ToList(),
+            };
+            return Json(vm);
+        }
+
+
+        [HttpPost]
+        public async Task<IActionResult> Create([FromBody] FlowIntensityEditDsM data)
+        {
+            var result = await _flowIntensityDs.CreateAsync(data);
+            return Json(result);
+        }
+
+        [HttpPost]
+        public async Task<IActionResult> Update(int id, [FromBody] FlowIntensityEditDsM data){
+                await _flowIntensityDs.UpdateAsync(data,id);
+                return Json(String.Empty);
+        }
+
+     
+        [HttpDelete]
+        public async Task<IActionResult> Delete(int id)
+        {   
+            try
+            {
+                int flowIntensity = await _flowIntensityDs.DeleteAsync(id);
+                 return Json(flowIntensity);
+            }
+            catch (ArgumentNullException )
+            {
+                return NotFound();
+            }
+        }
+    }
+}
@@ -57,6 +57,7 @@ namespace Maps
             services.AddScoped<IRoadDirectionDs, RoadDirectionDs>();
             services.AddScoped<IRoadSurfaceDs, RoadSurfaceDs>();
             services.AddScoped<IRoadWidthDs, RoadWidthDs>();
+            services.AddScoped<IFlowIntensityDs, FlowIntensityDs>();
             services.AddScoped<ICrossSectionDs, CrossSectionDs>();
             // Add framework services.
             services.AddApplicationInsightsTelemetry(Configuration);
+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 FlowIntensityDs : IFlowIntensityDs
+    {
+        private PostgresDbContext _context;
+        public FlowIntensityDs(){
+            _context = new PostgresDbContext();
+        }
+        public Task<IList<FlowIntensityEditDsM>> GetIndexListAsync(PaginationDsM pagination){
+            return Task.Factory.StartNew(()=> { return GetAllFlowIntensity(pagination); });
+        }
+        private IList<FlowIntensityEditDsM> GetAllFlowIntensity(PaginationDsM pagination)
+        {
+            var data =  _context.FlowIntensity.Select(FlowIntensity => new FlowIntensityEditDsM
+            {
+                Id = FlowIntensity.Id,
+                RoadId = FlowIntensity.RoadId,
+                RegionId = FlowIntensity.RegionId,
+                Location = FlowIntensity.Location,
+                Begin = FlowIntensity.Begin,
+                End = FlowIntensity.End,
+                RoadDirectionId = FlowIntensity.RoadDirectionId,
+                SettlementId = FlowIntensity.SettlementId,
+                IntensityTotal = FlowIntensity.IntensityTotal,
+                IntensityIncrease = FlowIntensity.IntensityIncrease,
+                IntensityMoto = FlowIntensity.IntensityMoto,
+                IntensityMotoSidecar = FlowIntensity.IntensityMotoSidecar,
+                IntensityCar = FlowIntensity.IntensityCar,
+                IntensityTruckTwo = FlowIntensity.IntensityTruckTwo,
+                IntensityTruckTwoSix = FlowIntensity.IntensityTruckTwoSix,
+                IntensityTruckSixEight = FlowIntensity.IntensityTruckSixEight,
+                IntensityTruckEightFourteen = FlowIntensity.IntensityTruckEightFourteen,
+                IntensityTruckFourteen = FlowIntensity.IntensityTruckFourteen,
+                IntensityLorryTwelve = FlowIntensity.IntensityLorryTwelve,
+                IntensityLorryTwelveTwenty = FlowIntensity.IntensityLorryTwelveTwenty,
+                IntensityLorryTwentyThirty = FlowIntensity.IntensityLorryTwentyThirty,
+                IntensityLorryThirty = FlowIntensity.IntensityLorryThirty,
+                IntensityTractorUnderTen = FlowIntensity.IntensityTractorUnderTen,
+                IntensityTractorOverTen = FlowIntensity.IntensityTractorOverTen,
+                IntensityBus = FlowIntensity.IntensityBus,
+                IntensityBusCoupled = FlowIntensity.IntensityBusCoupled,
+                DateAdd = FlowIntensity.DateAdd,
+            }).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<FlowIntensity> CreateAsync(FlowIntensityEditDsM data){
+              return Task.Factory.StartNew(()=> { return Create(data); });
+        }
+        private FlowIntensity Create(FlowIntensityEditDsM data)
+        {   
+            
+            FlowIntensity Model = InsertModel(data);
+            _context.FlowIntensity.Add(Model);
+            _context.SaveChanges();
+            return Model;
+        }
+        public Task<FlowIntensity> UpdateAsync(FlowIntensityEditDsM data, int id){
+            return Task.Factory.StartNew(()=> { return Update(data, id); });
+        }
+        private FlowIntensity Update(FlowIntensityEditDsM data, int id)
+        {   
+            FlowIntensity Model = InsertModel(data);
+            Model.Id = id;
+            _context.FlowIntensity.Update(Model);
+            _context.SaveChanges();
+            return Model;
+        }
+        public FlowIntensity InsertModel(FlowIntensityEditDsM data){
+            FlowIntensity Model = new FlowIntensity{
+                RoadId = data.RoadId,
+                RegionId = data.RegionId,
+                Location = data.Location,
+                Begin = data.Begin,
+                End = data.End,
+                RoadDirectionId = data.RoadDirectionId,
+                SettlementId = data.SettlementId,
+                IntensityTotal = data.IntensityTotal,
+                IntensityIncrease = data.IntensityIncrease,
+                IntensityMoto = data.IntensityMoto,
+                IntensityMotoSidecar = data.IntensityMotoSidecar,
+                IntensityCar = data.IntensityCar,
+                IntensityTruckTwo = data.IntensityTruckTwo,
+                IntensityTruckTwoSix = data.IntensityTruckTwoSix,
+                IntensityTruckSixEight = data.IntensityTruckSixEight,
+                IntensityTruckEightFourteen = data.IntensityTruckEightFourteen,
+                IntensityTruckFourteen = data.IntensityTruckFourteen,
+                IntensityLorryTwelve = data.IntensityLorryTwelve,
+                IntensityLorryTwelveTwenty = data.IntensityLorryTwelveTwenty,
+                IntensityLorryTwentyThirty = data.IntensityLorryTwentyThirty,
+                IntensityLorryThirty = data.IntensityLorryThirty,
+                IntensityTractorUnderTen = data.IntensityTractorUnderTen,
+                IntensityTractorOverTen = data.IntensityTractorOverTen,
+                IntensityBus = data.IntensityBus,
+                IntensityBusCoupled = data.IntensityBusCoupled,
+                DateAdd = data.DateAdd,
+            };
+            return Model;
+        }
+        public async Task<int> DeleteAsync(int Id)
+        {
+            var flowIntensity = await _context.FlowIntensity.SingleOrDefaultAsync(x => x.Id == Id);
+            _context.FlowIntensity.Remove(flowIntensity);
+            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 IFlowIntensityDs
+    {
+        Task<IList<FlowIntensityEditDsM>> GetIndexListAsync(PaginationDsM pagination);
+        Task<FlowIntensity> CreateAsync(FlowIntensityEditDsM flowIntensity);
+        Task<FlowIntensity> UpdateAsync(FlowIntensityEditDsM flowIntensity, int id);
+        Task<int> DeleteAsync(int Id);
+    }
+}
 \ No newline at end of file
@@ -5,7 +5,7 @@ namespace MapsDb.Models
 {
     public partial class FlowIntensity
     {
-        public int FlowIntensityId { get; set; }
+        public int Id { get; set; }
         public int? RoadId { get; set; }
         public int? RegionId { get; set; }
         public double? Location { get; set; }
@@ -205,7 +205,7 @@ namespace MapsDb
             {
                 entity.ToTable("flow_intensity");
-                entity.Property(e => e.FlowIntensityId).HasColumnName("flow_intensity_id");
+                entity.Property(e => e.Id).HasColumnName("flow_intensity_id");
                 entity.Property(e => e.Begin).HasColumnName("begin");
+namespace MapsModels.DsModels
+{
+    public class FlowIntensityEditDsM
+    {
+        public int Id { get; set; }
+        public int? RoadId { get; set; }
+        public int? RegionId { get; set; }
+        public double? Location { get; set; }
+        public double? Begin { get; set; }
+        public double? End { get; set; }
+        public int? RoadDirectionId { get; set; }
+        public int? SettlementId { get; set; }
+        public int? IntensityTotal { get; set; }
+        public int? IntensityIncrease { get; set; }
+        public int? IntensityMoto { get; set; }
+        public int? IntensityMotoSidecar { get; set; }
+        public int? IntensityCar { get; set; }
+        public int? IntensityTruckTwo { get; set; }
+        public int? IntensityTruckTwoSix { get; set; }
+        public int? IntensityTruckSixEight { get; set; }
+        public int? IntensityTruckEightFourteen { get; set; }
+        public int? IntensityTruckFourteen { get; set; }
+        public int? IntensityLorryTwelve { get; set; }
+        public int? IntensityLorryTwelveTwenty { get; set; }
+        public int? IntensityLorryTwentyThirty { get; set; }
+        public int? IntensityLorryThirty { get; set; }
+        public int? IntensityTractorUnderTen { get; set; }
+        public int? IntensityTractorOverTen { get; set; }
+        public int? IntensityBus { get; set; }
+        public int? IntensityBusCoupled { get; set; }
+        public int? DateAdd { get; set; }
+
+    }
+}
 \ No newline at end of file
+using System.Collections.Generic;
+using MapsModels.DsModels;
+
+namespace MapsModels.ViewModels
+{
+    public class FlowIntensityListVm
+    {
+        public List<FlowIntensityEditDsM> FlowIntensityEditDsM { get; set; }
+    }
+}