New Release

shpsyte · Feb 4, 2018 · 3fd9abd · 3fd9abd
1 parent 885535d
commit 3fd9abd
Show file tree

Hide file tree

Showing 35 changed files with 792 additions and 5 deletions.
diff --git a/Smart.Data/Repository/Repository.cs b/Smart.Data/Repository/Repository.cs
@@ -78,9 +78,6 @@ public void Add(T entity)
 
                 _entity.Add(entity);
                 this._context.SaveChanges();
-
-
-
 
         }
 
@@ -124,8 +121,6 @@ public async Task<T> UpdateAsync(T entity)
             _context. Entry(entity).CurrentValues.SetValues(entity);
             await _context.SaveChangesAsync();
             return entity;
-
-
         }
 
         public async Task<int> DeleteAsync(T entity)

diff --git a/SmartAdmin/Controllers/CitiesController.cs b/SmartAdmin/Controllers/CitiesController.cs
@@ -0,0 +1,146 @@
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.EntityFrameworkCore;
+using Smart.Services.Interfaces;
+using Smart.Core.Domain.Identity;
+using SmartAdmin.Services;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Authorization;
+using System.Reflection;
+using System.IO;
+
+
+using Smart.Core.Domain.Addresss;
+using SmartAdmin.Data;
+
+namespace SmartAdmin.Controllers
+{
+
+    public class CitiesController : BaseController
+    {
+
+        #region vars
+        private readonly  IServices<City> _cityServices;
+               private readonly  IServices<StateProvince>  _stateProvinceServices;
+        #endregion
+
+
+        #region ctor
+         public CitiesController(
+                                    IServices<StateProvince>  stateProvinceServices,
+                                    IServices<City> cityServices, 
+                                    IUser currentUser, 
+                                    IServices<UserSetting> currentSetting, 
+                                    IEmailSender emailSender, 
+                                    ISmsSender smsSender, 
+                                    IHttpContextAccessor accessor
+                                    ) : base(currentUser, currentSetting, emailSender, smsSender, accessor)
+         {
+           this._cityServices = cityServices;
+               this._stateProvinceServices = stateProvinceServices;
+         }
+        #endregion
+
+       #region methods
+
+        // GET: Cities
+        [Route("city-management/city-list")]
+        public IActionResult List(string search)
+        {
+            ViewData["search"] = search;
+            var data = _cityServices.Query();
+            if (!string.IsNullOrEmpty(search)) 
+            {
+               data = data.Where(p =>  
+                           p.Name.Contains(search)
+                   || p.MiddleName.Contains(search)
+                   || p.SpecialCodeRegion.Contains(search)
+                );
+            }
+               return View(data.ToList());
+        }
+
+        [Route("city-management/city-add")]
+        public IActionResult Add()
+        {
+                ViewData["StateProvinceId"] = new SelectList(_stateProvinceServices.GetAll(), "StateProvinceId", "CountryRegionCode");
+          var data = new City();
+          return View(data);
+        }
+
+        [HttpPost, ValidateAntiForgeryToken]
+        [Route("city-management/city-add")]
+        public IActionResult Add([Bind("CityId,Name,MiddleName,SpecialCodeRegion,StateProvinceId,CreateDate,ModifiedDate,Rowguid,BusinessEntityId")] City city, bool continueAdd)
+        {
+                ViewData["StateProvinceId"] = new SelectList(_stateProvinceServices.GetAll(), "StateProvinceId", "CountryRegionCode");
+           if (!ModelState.IsValid) return View(city);
+           _cityServices.Add(city);
+           return continueAdd ? RedirectToAction("Add") : RedirectToAction("List");
+        }
+
+
+        [Route("city-management/city-edit/{id?}")]
+        public IActionResult Edit(int? id)
+        {
+            if (id == null)
+            {
+               return NotFound();
+            }
+            var city = _cityServices.Find(id);
+                if (city == null)
+                {
+                    return NotFound();
+                }
+                            ViewData["StateProvinceId"] = new SelectList(_stateProvinceServices.GetAll(), "StateProvinceId", "CountryRegionCode");
+            return View(city);
+        }
+
+
+        [HttpPost, ValidateAntiForgeryToken]
+        [Route("city-management/city-edit/{id?}")]
+        public IActionResult Edit([Bind("CityId,Name,MiddleName,SpecialCodeRegion,StateProvinceId,CreateDate,ModifiedDate,Rowguid,BusinessEntityId")] City city, bool continueAdd, bool addTrash)
+        {
+                ViewData["StateProvinceId"] = new SelectList(_stateProvinceServices.GetAll(), "StateProvinceId", "CountryRegionCode");
+                          if (!ModelState.IsValid) return View(city);
+
+
+
+
+
+            _cityServices.Update(city);
+            return continueAdd ? RedirectToAction("Edit", new { id = city.CityId }) : RedirectToAction("List");
+        }
+
+
+        [Route("city-management/city-delete/{id?}")]
+         public IActionResult Delete(int? id)
+         {
+             if (id == null)
+             {
+                 return NotFound();
+             }
+                var city = _cityServices.Find(id);
+                if (city == null)
+                {
+                    return NotFound();
+                }
+                     return View(city);
+          }  
+         [HttpPost, ValidateAntiForgeryToken]
+         [Route("city-management/city-delete/{id?}")]
+         public IActionResult Delete(City city)
+         {
+            _cityServices.Delete(city);
+             return RedirectToAction("List");
+         }
+
+     #endregion
+    }
+
+}
+
diff --git a/SmartAdmin/Data/ContextOnlyGClasse.cs b/SmartAdmin/Data/ContextOnlyGClasse.cs
@@ -1,6 +1,8 @@
 using System;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata;
+using Smart.Core.Domain.Addresss;
+using Smart.Core.Domain.Goals;
 
 namespace SmartAdmin.Data
 {
@@ -17,5 +19,10 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
 
         }
+
+        public DbSet<Smart.Core.Domain.Addresss.City> City { get; set; }
+
+        public DbSet<Smart.Core.Domain.Goals.Goal> Goal { get; set; }
+
     }
 }
diff --git a/...Generator/ApiControllerWIthActions.cshtml → ...Generator/ApiControllerWIthActions.cshtml b/...Generator/ApiControllerWIthActions.cshtml → ...Generator/ApiControllerWIthActions.cshtml
diff --git a/...Generator/ApiControllerWithContext.cshtml → ...Generator/ApiControllerWithContext.cshtml b/...Generator/ApiControllerWithContext.cshtml → ...Generator/ApiControllerWithContext.cshtml
diff --git a/...rollerGenerator/ApiEmptyController.cshtml → ...rollerGenerator/ApiEmptyController.cshtml b/...rollerGenerator/ApiEmptyController.cshtml → ...rollerGenerator/ApiEmptyController.cshtml
diff --git a/...lerGenerator/ControllerWithActions.cshtml → ...lerGenerator/ControllerWithActions.cshtml b/...lerGenerator/ControllerWithActions.cshtml → ...lerGenerator/ControllerWithActions.cshtml
diff --git a/...ontrollerGenerator/EmptyController.cshtml → ...ontrollerGenerator/EmptyController.cshtml b/...ontrollerGenerator/EmptyController.cshtml → ...ontrollerGenerator/EmptyController.cshtml
diff --git a/...Generator/MvcControllerWithContext.cshtml → ...Generator/MvcControllerWithContext.cshtml b/...Generator/MvcControllerWithContext.cshtml → ...Generator/MvcControllerWithContext.cshtml
diff --git a/SmartAdmin/Templates/MvcLayout/Error.cshtml → ...Admin/TemplatesRef/MvcLayout/Error.cshtml b/SmartAdmin/Templates/MvcLayout/Error.cshtml → ...Admin/TemplatesRef/MvcLayout/Error.cshtml
diff --git a/...tAdmin/Templates/MvcLayout/_Layout.cshtml → ...min/TemplatesRef/MvcLayout/_Layout.cshtml b/...tAdmin/Templates/MvcLayout/_Layout.cshtml → ...min/TemplatesRef/MvcLayout/_Layout.cshtml
diff --git a/SmartAdmin/Templates/Startup/ReadMe.cshtml → ...tAdmin/TemplatesRef/Startup/ReadMe.cshtml b/SmartAdmin/Templates/Startup/ReadMe.cshtml → ...tAdmin/TemplatesRef/Startup/ReadMe.cshtml
diff --git a/SmartAdmin/Templates/Startup/Startup.cshtml → ...Admin/TemplatesRef/Startup/Startup.cshtml b/SmartAdmin/Templates/Startup/Startup.cshtml → ...Admin/TemplatesRef/Startup/Startup.cshtml
diff --git a/...in/Templates/StaticFiles/Content/Site.css → ...TemplatesRef/StaticFiles/Content/Site.css b/...in/Templates/StaticFiles/Content/Site.css → ...TemplatesRef/StaticFiles/Content/Site.css
diff --git a/...mplates/StaticFiles/Content/bootstrap.css → ...atesRef/StaticFiles/Content/bootstrap.css b/...mplates/StaticFiles/Content/bootstrap.css → ...atesRef/StaticFiles/Content/bootstrap.css
diff --git a/...tes/StaticFiles/Content/bootstrap.min.css → ...Ref/StaticFiles/Content/bootstrap.min.css b/...tes/StaticFiles/Content/bootstrap.min.css → ...Ref/StaticFiles/Content/bootstrap.min.css
diff --git a/...StaticFiles/Scripts/jquery-1.10.2.min.map → ...StaticFiles/Scripts/jquery-1.10.2.min.map b/...StaticFiles/Scripts/jquery-1.10.2.min.map → ...StaticFiles/Scripts/jquery-1.10.2.min.map
diff --git a/...tAdmin/Templates/ViewGenerator/Add.cshtml → ...min/TemplatesRef/ViewGenerator/Add.cshtml b/...tAdmin/Templates/ViewGenerator/Add.cshtml → ...min/TemplatesRef/ViewGenerator/Add.cshtml
diff --git a/...min/Templates/ViewGenerator/Create.cshtml → .../TemplatesRef/ViewGenerator/Create.cshtml b/...min/Templates/ViewGenerator/Create.cshtml → .../TemplatesRef/ViewGenerator/Create.cshtml
diff --git a/...min/Templates/ViewGenerator/Delete.cshtml → .../TemplatesRef/ViewGenerator/Delete.cshtml b/...min/Templates/ViewGenerator/Delete.cshtml → .../TemplatesRef/ViewGenerator/Delete.cshtml
diff --git a/...in/Templates/ViewGenerator/Details.cshtml → ...TemplatesRef/ViewGenerator/Details.cshtml b/...in/Templates/ViewGenerator/Details.cshtml → ...TemplatesRef/ViewGenerator/Details.cshtml
diff --git a/...Admin/Templates/ViewGenerator/Edit.cshtml → ...in/TemplatesRef/ViewGenerator/Edit.cshtml b/...Admin/Templates/ViewGenerator/Edit.cshtml → ...in/TemplatesRef/ViewGenerator/Edit.cshtml
diff --git a/...dmin/Templates/ViewGenerator/Empty.cshtml → ...n/TemplatesRef/ViewGenerator/Empty.cshtml b/...dmin/Templates/ViewGenerator/Empty.cshtml → ...n/TemplatesRef/ViewGenerator/Empty.cshtml
diff --git a/...Admin/Templates/ViewGenerator/List.cshtml → ...in/TemplatesRef/ViewGenerator/List.cshtml b/...Admin/Templates/ViewGenerator/List.cshtml → ...in/TemplatesRef/ViewGenerator/List.cshtml
diff --git a/...ates/ViewGenerator/_CreateOrUpdate.cshtml → ...sRef/ViewGenerator/_CreateOrUpdate.cshtml b/...ates/ViewGenerator/_CreateOrUpdate.cshtml → ...sRef/ViewGenerator/_CreateOrUpdate.cshtml
diff --git a/...enerator/_ValidationScriptsPartial.cshtml → ...enerator/_ValidationScriptsPartial.cshtml b/...enerator/_ValidationScriptsPartial.cshtml → ...enerator/_ValidationScriptsPartial.cshtml
diff --git a/SmartAdmin/Views/Cities/Add.cshtml b/SmartAdmin/Views/Cities/Add.cshtml
@@ -0,0 +1,90 @@
+@model Smart.Core.Domain.Addresss.City
+
+@{
+    Layout = null;
+}
+
+<!DOCTYPE html>
+
+<html>
+<head>
+    <meta name="viewport" content="width=device-width" />
+    <title>Add</title>
+</head>
+<body>
+
+<form asp-action="Add">
+    <div class="form-horizontal">
+        <h4>City</h4>
+        <hr />
+        <div asp-validation-summary="ModelOnly" class="text-danger"></div>
+		<div> teste </div>
+        <div class="form-group">
+            <label asp-for="Name" class="col-md-2 control-label"></label>
+            <div class="col-md-10">
+                <input asp-for="Name" class="form-control" />
+                <span asp-validation-for="Name" class="text-danger"></span>
+            </div>
+        </div>
+        <div class="form-group">
+            <label asp-for="MiddleName" class="col-md-2 control-label"></label>
+            <div class="col-md-10">
+                <input asp-for="MiddleName" class="form-control" />
+                <span asp-validation-for="MiddleName" class="text-danger"></span>
+            </div>
+        </div>
+        <div class="form-group">
+            <label asp-for="SpecialCodeRegion" class="col-md-2 control-label"></label>
+            <div class="col-md-10">
+                <input asp-for="SpecialCodeRegion" class="form-control" />
+                <span asp-validation-for="SpecialCodeRegion" class="text-danger"></span>
+            </div>
+        </div>
+        <div class="form-group">
+            <label asp-for="StateProvinceId" class="col-md-2 control-label"></label>
+            <div class="col-md-10">
+                <select asp-for="StateProvinceId" class ="form-control" asp-items="ViewBag.StateProvinceId"></select>
+            </div>
+        </div>
+        <div class="form-group">
+            <label asp-for="CreateDate" class="col-md-2 control-label"></label>
+            <div class="col-md-10">
+                <input asp-for="CreateDate" class="form-control" />
+                <span asp-validation-for="CreateDate" class="text-danger"></span>
+            </div>
+        </div>
+        <div class="form-group">
+            <label asp-for="ModifiedDate" class="col-md-2 control-label"></label>
+            <div class="col-md-10">
+                <input asp-for="ModifiedDate" class="form-control" />
+                <span asp-validation-for="ModifiedDate" class="text-danger"></span>
+            </div>
+        </div>
+        <div class="form-group">
+            <label asp-for="Rowguid" class="col-md-2 control-label"></label>
+            <div class="col-md-10">
+                <input asp-for="Rowguid" class="form-control" />
+                <span asp-validation-for="Rowguid" class="text-danger"></span>
+            </div>
+        </div>
+        <div class="form-group">
+            <label asp-for="BusinessEntityId" class="col-md-2 control-label"></label>
+            <div class="col-md-10">
+                <input asp-for="BusinessEntityId" class="form-control" />
+                <span asp-validation-for="BusinessEntityId" class="text-danger"></span>
+            </div>
+        </div>
+        <div class="form-group">
+            <div class="col-md-offset-2 col-md-10">
+                <input type="submit" value="Create" class="btn btn-default" />
+            </div>
+        </div>
+    </div>
+</form>
+
+<div>
+    <a asp-action="Index">Back to List</a>
+</div>
+
+</body>
+</html>
diff --git a/SmartAdmin/Views/Cities/Create.cshtml b/SmartAdmin/Views/Cities/Create.cshtml
@@ -0,0 +1,90 @@
+@model Smart.Core.Domain.Addresss.City
+
+@{
+    Layout = null;
+}
+
+<!DOCTYPE html>
+
+<html>
+<head>
+    <meta name="viewport" content="width=device-width" />
+    <title>Create</title>
+</head>
+<body>
+
+<form asp-action="Create">
+    <div class="form-horizontal">
+        <h4>City</h4>
+        <hr />
+        <div asp-validation-summary="ModelOnly" class="text-danger"></div>
+		<div> teste </div>
+        <div class="form-group">
+            <label asp-for="Name" class="col-md-2 control-label"></label>
+            <div class="col-md-10">
+                <input asp-for="Name" class="form-control" />
+                <span asp-validation-for="Name" class="text-danger"></span>
+            </div>
+        </div>
+        <div class="form-group">
+            <label asp-for="MiddleName" class="col-md-2 control-label"></label>
+            <div class="col-md-10">
+                <input asp-for="MiddleName" class="form-control" />
+                <span asp-validation-for="MiddleName" class="text-danger"></span>
+            </div>
+        </div>
+        <div class="form-group">
+            <label asp-for="SpecialCodeRegion" class="col-md-2 control-label"></label>
+            <div class="col-md-10">
+                <input asp-for="SpecialCodeRegion" class="form-control" />
+                <span asp-validation-for="SpecialCodeRegion" class="text-danger"></span>
+            </div>
+        </div>
+        <div class="form-group">
+            <label asp-for="StateProvinceId" class="col-md-2 control-label"></label>
+            <div class="col-md-10">
+                <select asp-for="StateProvinceId" class ="form-control" asp-items="ViewBag.StateProvinceId"></select>
+            </div>
+        </div>
+        <div class="form-group">
+            <label asp-for="CreateDate" class="col-md-2 control-label"></label>
+            <div class="col-md-10">
+                <input asp-for="CreateDate" class="form-control" />
+                <span asp-validation-for="CreateDate" class="text-danger"></span>
+            </div>
+        </div>
+        <div class="form-group">
+            <label asp-for="ModifiedDate" class="col-md-2 control-label"></label>
+            <div class="col-md-10">
+                <input asp-for="ModifiedDate" class="form-control" />
+                <span asp-validation-for="ModifiedDate" class="text-danger"></span>
+            </div>
+        </div>
+        <div class="form-group">
+            <label asp-for="Rowguid" class="col-md-2 control-label"></label>
+            <div class="col-md-10">
+                <input asp-for="Rowguid" class="form-control" />
+                <span asp-validation-for="Rowguid" class="text-danger"></span>
+            </div>
+        </div>
+        <div class="form-group">
+            <label asp-for="BusinessEntityId" class="col-md-2 control-label"></label>
+            <div class="col-md-10">
+                <input asp-for="BusinessEntityId" class="form-control" />
+                <span asp-validation-for="BusinessEntityId" class="text-danger"></span>
+            </div>
+        </div>
+        <div class="form-group">
+            <div class="col-md-offset-2 col-md-10">
+                <input type="submit" value="Create" class="btn btn-default" />
+            </div>
+        </div>
+    </div>
+</form>
+
+<div>
+    <a asp-action="Index">Back to List</a>
+</div>
+
+</body>
+</html>