From 44582203488667fabf9d1f1e463613685a5d902b Mon Sep 17 00:00:00 2001 From: Vitaliy Date: Wed, 25 Jan 2017 19:47:44 +0200 Subject: [PATCH] bag fix --- src/Maps/Controllers/BusStopController.cs | 279 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------------ src/MapsDb/DataService/BusStopDs.cs | 4 ++-- 2 files changed, 143 insertions(+), 140 deletions(-) diff --git a/src/Maps/Controllers/BusStopController.cs b/src/Maps/Controllers/BusStopController.cs index 9f0cc0e..bb3e236 100755 --- a/src/Maps/Controllers/BusStopController.cs +++ b/src/Maps/Controllers/BusStopController.cs @@ -33,143 +33,146 @@ namespace Maps.Controllers } - // GET: BusStop/Details/5 - public async Task Details(int id) - { - - var busStop = await _busStopDs.FindOneDetailsAsync(id); - if (busStop == null) - { - return NotFound(); - } - - return View(busStop); - } - - // 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(); - } - - // POST: BusStop/Create - // To protect from overposting attacks, please enable the specific properties you want to bind to, for - // more details see http://go.microsoft.com/fwlink/?LinkId=317598. - [HttpPost] - [ValidateAntiForgeryToken] - public async Task Create([Bind("BusStopId,AreaLandAvailability,AreaStopAvailability,BalanceCost,BusStationCardId,CrossSectionNumber,DateActual,LocationLeft,LocationRight,PocketAvailability,Position,RegionId,RepairCertificate,RoadId,SettlementId,StateCommonId,SurfaceTypeId,ToiletAvailability,YearBuild,YearRepair")] BusStop busStop) - { - if (ModelState.IsValid) - { - _context.Add(busStop); - await _context.SaveChangesAsync(); - return RedirectToAction("Index"); - } - ViewData["RegionId"] = new SelectList(_context.Region, "RegionId", "RegionId", busStop.RegionId); - ViewData["RoadId"] = new SelectList(_context.Road, "RoadId", "RoadId", busStop.RoadId); - ViewData["SettlementId"] = new SelectList(_context.Settlement, "SettlementId", "Name", busStop.SettlementId); - ViewData["StateCommonId"] = new SelectList(_context.StateCommon, "StateCommonId", "StateCommonId", busStop.StateCommonId); - ViewData["SurfaceTypeId"] = new SelectList(_context.SurfaceType, "SurfaceTypeId", "SurfaceTypeId", busStop.SurfaceTypeId); - return View(busStop); - } - - // GET: BusStop/Edit/5 - public async Task Edit(int? id) - { - if (id == null) - { - return NotFound(); - } - - var busStop = await _context.BusStop.SingleOrDefaultAsync(m => m.BusStopId == id); - if (busStop == null) - { - return NotFound(); - } - ViewData["RegionId"] = new SelectList(_context.Region, "RegionId", "RegionId", busStop.RegionId); - ViewData["RoadId"] = new SelectList(_context.Road, "RoadId", "RoadId", busStop.RoadId); - ViewData["SettlementId"] = new SelectList(_context.Settlement, "SettlementId", "Name", busStop.SettlementId); - ViewData["StateCommonId"] = new SelectList(_context.StateCommon, "StateCommonId", "StateCommonId", busStop.StateCommonId); - ViewData["SurfaceTypeId"] = new SelectList(_context.SurfaceType, "SurfaceTypeId", "SurfaceTypeId", busStop.SurfaceTypeId); - return View(busStop); - } - - // POST: BusStop/Edit/5 - // To protect from overposting attacks, please enable the specific properties you want to bind to, for - // more details see http://go.microsoft.com/fwlink/?LinkId=317598. - [HttpPost] - [ValidateAntiForgeryToken] - public async Task Edit(int id, [Bind("BusStopId,AreaLandAvailability,AreaStopAvailability,BalanceCost,BusStationCardId,CrossSectionNumber,DateActual,LocationLeft,LocationRight,PocketAvailability,Position,RegionId,RepairCertificate,RoadId,SettlementId,StateCommonId,SurfaceTypeId,ToiletAvailability,YearBuild,YearRepair")] BusStop busStop) - { - if (id != busStop.BusStopId) - { - return NotFound(); - } - - if (ModelState.IsValid) - { - try - { - _context.Update(busStop); - await _context.SaveChangesAsync(); - } - catch (DbUpdateConcurrencyException) - { - if (!BusStopExists(busStop.BusStopId)) - { - return NotFound(); - } - else - { - throw; - } - } - return RedirectToAction("Index"); - } - ViewData["RegionId"] = new SelectList(_context.Region, "RegionId", "RegionId", busStop.RegionId); - ViewData["RoadId"] = new SelectList(_context.Road, "RoadId", "RoadId", busStop.RoadId); - ViewData["SettlementId"] = new SelectList(_context.Settlement, "SettlementId", "Name", busStop.SettlementId); - ViewData["StateCommonId"] = new SelectList(_context.StateCommon, "StateCommonId", "StateCommonId", busStop.StateCommonId); - ViewData["SurfaceTypeId"] = new SelectList(_context.SurfaceType, "SurfaceTypeId", "SurfaceTypeId", busStop.SurfaceTypeId); - return View(busStop); - } - - // GET: BusStop/Delete/5 - public async Task Delete(int? id) - { - if (id == null) - { - return NotFound(); - } - - var busStop = await _context.BusStop.SingleOrDefaultAsync(m => m.BusStopId == id); - if (busStop == null) - { - return NotFound(); - } - - return View(busStop); - } - - // POST: BusStop/Delete/5 - [HttpPost, ActionName("Delete")] - [ValidateAntiForgeryToken] - public async Task DeleteConfirmed(int id) - { - var busStop = await _context.BusStop.SingleOrDefaultAsync(m => m.BusStopId == id); - _context.BusStop.Remove(busStop); - await _context.SaveChangesAsync(); - return RedirectToAction("Index"); - } - - private bool BusStopExists(int id) - { - return _context.BusStop.Any(e => e.BusStopId == id); - } + // // GET: BusStop/Details/5 + // public async Task Details(int id) + // { + + // var busStop = await _busStopDs.FindOneDetailsAsync(id); + // if (busStop == null) + // { + // return NotFound(); + // } + // DetailsBusStopVm vm = new DetailsBusStopVm + // { + // BusStopDetailsDs = busStop + // }; + // return Json(vm); + // } + + // // 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(); + // } + + // // POST: BusStop/Create + // // To protect from overposting attacks, please enable the specific properties you want to bind to, for + // // more details see http://go.microsoft.com/fwlink/?LinkId=317598. + // [HttpPost] + // [ValidateAntiForgeryToken] + // public async Task Create([Bind("BusStopId,AreaLandAvailability,AreaStopAvailability,BalanceCost,BusStationCardId,CrossSectionNumber,DateActual,LocationLeft,LocationRight,PocketAvailability,Position,RegionId,RepairCertificate,RoadId,SettlementId,StateCommonId,SurfaceTypeId,ToiletAvailability,YearBuild,YearRepair")] BusStop busStop) + // { + // if (ModelState.IsValid) + // { + // _context.Add(busStop); + // await _context.SaveChangesAsync(); + // return RedirectToAction("Index"); + // } + // ViewData["RegionId"] = new SelectList(_context.Region, "RegionId", "RegionId", busStop.RegionId); + // ViewData["RoadId"] = new SelectList(_context.Road, "RoadId", "RoadId", busStop.RoadId); + // ViewData["SettlementId"] = new SelectList(_context.Settlement, "SettlementId", "Name", busStop.SettlementId); + // ViewData["StateCommonId"] = new SelectList(_context.StateCommon, "StateCommonId", "StateCommonId", busStop.StateCommonId); + // ViewData["SurfaceTypeId"] = new SelectList(_context.SurfaceType, "SurfaceTypeId", "SurfaceTypeId", busStop.SurfaceTypeId); + // return View(busStop); + // } + + // // GET: BusStop/Edit/5 + // public async Task Edit(int? id) + // { + // if (id == null) + // { + // return NotFound(); + // } + + // var busStop = await _context.BusStop.SingleOrDefaultAsync(m => m.BusStopId == id); + // if (busStop == null) + // { + // return NotFound(); + // } + // ViewData["RegionId"] = new SelectList(_context.Region, "RegionId", "RegionId", busStop.RegionId); + // ViewData["RoadId"] = new SelectList(_context.Road, "RoadId", "RoadId", busStop.RoadId); + // ViewData["SettlementId"] = new SelectList(_context.Settlement, "SettlementId", "Name", busStop.SettlementId); + // ViewData["StateCommonId"] = new SelectList(_context.StateCommon, "StateCommonId", "StateCommonId", busStop.StateCommonId); + // ViewData["SurfaceTypeId"] = new SelectList(_context.SurfaceType, "SurfaceTypeId", "SurfaceTypeId", busStop.SurfaceTypeId); + // return View(busStop); + // } + + // // POST: BusStop/Edit/5 + // // To protect from overposting attacks, please enable the specific properties you want to bind to, for + // // more details see http://go.microsoft.com/fwlink/?LinkId=317598. + // [HttpPost] + // [ValidateAntiForgeryToken] + // public async Task Edit(int id, [Bind("BusStopId,AreaLandAvailability,AreaStopAvailability,BalanceCost,BusStationCardId,CrossSectionNumber,DateActual,LocationLeft,LocationRight,PocketAvailability,Position,RegionId,RepairCertificate,RoadId,SettlementId,StateCommonId,SurfaceTypeId,ToiletAvailability,YearBuild,YearRepair")] BusStop busStop) + // { + // if (id != busStop.BusStopId) + // { + // return NotFound(); + // } + + // if (ModelState.IsValid) + // { + // try + // { + // _context.Update(busStop); + // await _context.SaveChangesAsync(); + // } + // catch (DbUpdateConcurrencyException) + // { + // if (!BusStopExists(busStop.BusStopId)) + // { + // return NotFound(); + // } + // else + // { + // throw; + // } + // } + // return RedirectToAction("Index"); + // } + // ViewData["RegionId"] = new SelectList(_context.Region, "RegionId", "RegionId", busStop.RegionId); + // ViewData["RoadId"] = new SelectList(_context.Road, "RoadId", "RoadId", busStop.RoadId); + // ViewData["SettlementId"] = new SelectList(_context.Settlement, "SettlementId", "Name", busStop.SettlementId); + // ViewData["StateCommonId"] = new SelectList(_context.StateCommon, "StateCommonId", "StateCommonId", busStop.StateCommonId); + // ViewData["SurfaceTypeId"] = new SelectList(_context.SurfaceType, "SurfaceTypeId", "SurfaceTypeId", busStop.SurfaceTypeId); + // return View(busStop); + // } + + // // GET: BusStop/Delete/5 + // public async Task Delete(int? id) + // { + // if (id == null) + // { + // return NotFound(); + // } + + // var busStop = await _context.BusStop.SingleOrDefaultAsync(m => m.BusStopId == id); + // if (busStop == null) + // { + // return NotFound(); + // } + + // return View(busStop); + // } + + // // POST: BusStop/Delete/5 + // [HttpPost, ActionName("Delete")] + // [ValidateAntiForgeryToken] + // public async Task DeleteConfirmed(int id) + // { + // var busStop = await _context.BusStop.SingleOrDefaultAsync(m => m.BusStopId == id); + // _context.BusStop.Remove(busStop); + // await _context.SaveChangesAsync(); + // return RedirectToAction("Index"); + // } + + // private bool BusStopExists(int id) + // { + // return _context.BusStop.Any(e => e.BusStopId == id); + // } } } diff --git a/src/MapsDb/DataService/BusStopDs.cs b/src/MapsDb/DataService/BusStopDs.cs index 9ce69f2..396b215 100644 --- a/src/MapsDb/DataService/BusStopDs.cs +++ b/src/MapsDb/DataService/BusStopDs.cs @@ -50,7 +50,7 @@ namespace MapsDb.DataService } } public Task FindOneDetailsAsync(int Id){ - return Task.Factory.StartNew(()=> { FindOneDetails(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{ @@ -67,7 +67,7 @@ namespace MapsDb.DataService ToiletAvailability = x.ToiletAvailability, YearBuild = x.YearBuild, YearRepair = x.YearRepair - }); + }).Single(); } } } \ No newline at end of file -- libgit2 0.21.4