Re-fabrication

This commit is contained in:
Paul Schneider 2018-03-26 19:27:29 +02:00
commit cb6309abdb
499 changed files with 7574 additions and 12530 deletions

View file

@ -17,6 +17,8 @@ namespace Yavsc.Controllers
using Models.Billing;
using Models.Workflow;
using ViewModels.Auth;
using Yavsc.Abstract.FileSystem;
[Authorize]
public class EstimateController : Controller
{

View file

@ -13,6 +13,8 @@ namespace Yavsc.Controllers
using Microsoft.Extensions.Localization;
using Models;
using ViewModels.FrontOffice;
using Yavsc.Abstract.FileSystem;
using Yavsc.Services;
public class FrontOfficeController : Controller
{
@ -93,7 +95,7 @@ namespace Yavsc.Controllers
public IActionResult EstimatePdf(long id)
{
ViewBag.TempDir = Startup.SiteSetup.TempDir;
ViewBag.BillsDir = Startup.UserBillsDirName;
ViewBag.BillsDir = AbstractFileSystemHelpers.UserBillsDirName;
var estimate = _context.Estimates.Include(x => x.Query)
.Include(x => x.Query.Client)
.Include(x => x.Query.PerformerProfile)

View file

@ -8,6 +8,7 @@ namespace Yavsc.Controllers.Generic
{
using System.Linq;
using Models;
using Yavsc.Services;
[Authorize]
public abstract class SettingsController<TSettings> : Controller where TSettings : class, ISpecializationSettings, new()
@ -19,7 +20,7 @@ namespace Yavsc.Controllers.Generic
protected DbSet<TSettings> Settings { get {
if (dbSet == null) {
dbSet = (DbSet<TSettings>) Startup.UserSettings.Single(s=>s.Name == typeof(TSettings).Name).GetValue(_context);
dbSet = (DbSet<TSettings>) BillingService.UserSettings.Single(s=>s.Name == typeof(TSettings).Name).GetValue(_context);
}