diff --git a/src/Maps/Controllers/RoadSurfaceController.cs b/src/Maps/Controllers/RoadSurfaceController.cs index 95796a4..c2441e0 100755 --- a/src/Maps/Controllers/RoadSurfaceController.cs +++ b/src/Maps/Controllers/RoadSurfaceController.cs @@ -1,91 +1,92 @@ -// 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; +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 RoadSurfaceController : Controller -// { -// private readonly IRoadDs _roadDs; -// private readonly IRegionDs _regionDs; -// private readonly ISurfaceTypeDs _surfaceTypeDs; -// private readonly IStateCommonDs _stateCommonDs; -// public RoadSurfaceController(IStateCommonDs StateCommonDs, IRoadDs RoadDs, IRegionDs RegionDs, ISurfaceTypeDs SurfaceTypeDs) -// { - -// _roadDs = RoadDs; -// _surfaceTypeDs = SurfaceTypeDs; -// _regionDs = RegionDs; -// _stateCommonDs = StateCommonDs; -// } +namespace Maps.Controllers +{ + public class RoadSurfaceController : Controller + { + private readonly IRoadDs _roadDs; + private readonly IRegionDs _regionDs; + private readonly ISurfaceTypeDs _surfaceTypeDs; + private readonly IStateCommonDs _stateCommonDs; + private readonly IRoadSurfaceDs _roadSurfaceDs; + public RoadSurfaceController(IRoadSurfaceDs RoadSurfaceDs, IStateCommonDs StateCommonDs, IRoadDs RoadDs, IRegionDs RegionDs, ISurfaceTypeDs SurfaceTypeDs) + { + _roadDs = RoadDs; + _surfaceTypeDs = SurfaceTypeDs; + _regionDs = RegionDs; + _stateCommonDs = StateCommonDs; + _roadSurfaceDs = RoadSurfaceDs; + } -// // GET: BusStop -// [HttpGet] -// public async Task Index([FromQuery] PaginationDsM data) -// { -// var Data = await _serviceObjectDs.GetIndexListAsync(data); + // GET: BusStop + [HttpGet] + public async Task Index([FromQuery] PaginationDsM data) + { + var Data = await _roadSurfaceDs.GetIndexListAsync(data); -// ServiceObjectListVm vm = new ServiceObjectListVm -// { -// ServiceObjectEditDsM = Data.ToList() -// }; + RoadSurfaceListVm vm = new RoadSurfaceListVm + { + RoadSurfaceEditDsM = Data.ToList() + }; -// return Json(vm); -// } + return Json(vm); + } -// [HttpGet] -// public async Task Directory(){ -// var DepartmentAffiliation = await _departmentAffiliationDs.GetSelectListAsync(); -// var Settlement = await _settlementDs.GetSelectListAsync(); -// var Road = await _roadDs.GetSelectListAsync(); -// var Region = await _regionDs.GetSelectListAsync(); -// var ServiceObjectType = await _serviceObjectTypeDs.GetSelectListAsync(); -// CatalogListVm vm = new CatalogListVm -// { -// DepartmentAffiliationSelectListDsM = DepartmentAffiliation.ToList(), -// SettlementSelectListDsM = Settlement.ToList(), -// ServiceObjectTypeSelectListDsM = ServiceObjectType.ToList(), -// RoadSelectListDsM = Road.ToList(), -// RegionSelectListDsM = Region.ToList() -// }; -// return Json(vm); -// } + //[HttpGet] + // public async Task Directory(){ + // var DepartmentAffiliation = await _departmentAffiliationDs.GetSelectListAsync(); + // var Settlement = await _settlementDs.GetSelectListAsync(); + // var Road = await _roadDs.GetSelectListAsync(); + // var Region = await _regionDs.GetSelectListAsync(); + // var ServiceObjectType = await _serviceObjectTypeDs.GetSelectListAsync(); + // CatalogListVm vm = new CatalogListVm + // { + // DepartmentAffiliationSelectListDsM = DepartmentAffiliation.ToList(), + // SettlementSelectListDsM = Settlement.ToList(), + // ServiceObjectTypeSelectListDsM = ServiceObjectType.ToList(), + // RoadSelectListDsM = Road.ToList(), + // RegionSelectListDsM = Region.ToList() + // }; + // return Json(vm); + // } -// [HttpPost] -// public async Task Create([FromBody] ServiceObjectEditDsM data) -// { -// var result = await _serviceObjectDs.CreateAsync(data); -// return Json(result); -// } + // [HttpPost] + // public async Task Create([FromBody] ServiceObjectEditDsM data) + // { + // var result = await _serviceObjectDs.CreateAsync(data); + // return Json(result); + // } -// [HttpPost] -// public async Task Update(int id, [FromBody] ServiceObjectEditDsM data){ -// await _serviceObjectDs.UpdateAsync(data,id); -// return Json(String.Empty); -// } + // [HttpPost] + // public async Task Update(int id, [FromBody] ServiceObjectEditDsM data){ + // await _serviceObjectDs.UpdateAsync(data,id); + // return Json(String.Empty); + // } -// [HttpDelete] -// public async Task Delete(int id) -// { -// try -// { -// int data = await _serviceObjectDs.DeleteAsync(id); -// return Json(data); -// } -// catch (ArgumentNullException ) -// { -// return NotFound(); -// } -// } -// } -// } + // [HttpDelete] + // public async Task Delete(int id) + // { + // try + // { + // int data = await _serviceObjectDs.DeleteAsync(id); + // return Json(data); + // } + // catch (ArgumentNullException ) + // { + // return NotFound(); + // } + // } + } +} diff --git a/src/MapsModels/DsModels/PaginationDsM.cs b/src/MapsModels/DsModels/PaginationDsM.cs index 5dd9957..894db43 100644 --- a/src/MapsModels/DsModels/PaginationDsM.cs +++ b/src/MapsModels/DsModels/PaginationDsM.cs @@ -19,14 +19,19 @@ namespace MapsModels.DsModels } } public string orderType(){ - if(sort == null){ - return null; - } - if(sort.StartsWith("-")){ - sort = sort.Substring(1); - return DESC; + string orderType = null; + if(sort != null){ + if(sort.StartsWith("-")){ + sort = sort.Substring(1); + orderType = DESC; + } else { + orderType = ASC; + } + + sort = char.ToUpper(sort[0]) + sort.Substring(1); } - return ASC; + + return orderType; } } } \ No newline at end of file diff --git a/src/MapsModels/DsModels/RoadSurfaceEditDsM.cs b/src/MapsModels/DsModels/RoadSurfaceEditDsM.cs index 6faf982..e357db9 100644 --- a/src/MapsModels/DsModels/RoadSurfaceEditDsM.cs +++ b/src/MapsModels/DsModels/RoadSurfaceEditDsM.cs @@ -3,7 +3,13 @@ namespace MapsModels.DsModels public class RoadSurfaceEditDsM { public int Id { get; set; } - - + public int? RoadId { get; set; } + public int? RegionId { get; set; } + public int? RoadDirectionId { get; set; } + public double? Begin { get; set; } + public double? End { get; set; } + public int? SurfaceTypeId { get; set; } + public int? SurfaceTreatmentId { get; set; } + public int? StateCommonId { get; set; } } } \ No newline at end of file diff --git a/src/MapsModels/ViewModels/RoadSurfaceListVm.cs b/src/MapsModels/ViewModels/RoadSurfaceListVm.cs new file mode 100644 index 0000000..eb5fd61 --- /dev/null +++ b/src/MapsModels/ViewModels/RoadSurfaceListVm.cs @@ -0,0 +1,10 @@ +using System.Collections.Generic; +using MapsModels.DsModels; + +namespace MapsModels.ViewModels +{ + public class RoadSurfaceListVm + { + public List RoadSurfaceEditDsM { get; set; } + } +} -- libgit2 0.21.4