pull on code first

Administrator
2 parents cf566d89 94ffda14
Showing 3 changed files with 52 additions and 0 deletions Show diff stats
src/Maps/Controllers/BusStopController.cs
src/MapsDb/DataService/BusStopDs.cs
src/MapsDb/Interfaces/IBusStopDs.cs
@@ -7,6 +7,8 @@ using MapsDb;
 using MapsDb.Interfaces;
 using MapsDb.DataService;
 using MapsModels.ViewModels;
+using System;
+
 namespace Maps.Controllers
 {
     public class BusStopController : Controller
@@ -83,6 +85,7 @@ namespace Maps.Controllers
             return Json(vm);
         }
+<<<<<<< HEAD
         // 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.
@@ -103,6 +106,47 @@ namespace Maps.Controllers
             ViewData["SurfaceTypeId"] = new SelectList(_context.SurfaceType, "SurfaceTypeId", "SurfaceTypeId", busStop.SurfaceTypeId);
             return View(busStop);
         }
+=======
+        [HttpDelete]
+        public async Task<IActionResult> Delete(int? id)
+        {
+            if (id == null)
+            {
+                return NotFound();
+            }
+            int busStop;
+            try
+            {
+                busStop = await _busStopDs.DeleteAsync(id);
+            }
+            catch (ArgumentNullException e)
+            {
+                return NotFound();
+            }
+            return Json(busStop);
+        }
+
+        // // 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<IActionResult> 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);
+        // }
+>>>>>>> 94ffda14065b6ab5d25c52ed714e112165a70cae
         // // GET: BusStop/Edit/5
         // public async Task<IActionResult> Edit(int? id)
@@ -4,6 +4,7 @@ using System.Threading.Tasks;
 using MapsDb.Interfaces;
 using MapsDb.Models;
 using MapsModels.DsModels;
+using Microsoft.EntityFrameworkCore;
 namespace MapsDb.DataService
 {
@@ -64,5 +65,11 @@ namespace MapsDb.DataService
                 YearRepair = x.YearRepair
            }).Single();
         }
+        public async Task<int> DeleteAsync(int? Id)
+        {
+            var busStop = await _context.BusStop.SingleOrDefaultAsync(x => x.BusStopId == Id);
+            _context.BusStop.Remove(busStop);
+            return await _context.SaveChangesAsync();
+        }
     }
 }
 \ No newline at end of file
@@ -9,5 +9,6 @@ namespace MapsDb.Interfaces
         Task<IList<BusStopListDsM>> GetIndexListAsync();
         Task SaveAsync(BusStop busStop);
         Task<BusStopDetailsDsM> FindOneDetailsAsync(int Id);
+        Task<int> DeleteAsync(int? Id);
     }
 }
 \ No newline at end of file