paul/yavsc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

packaging+fs

Browse Source
This commit is contained in:
Paul Schneider
2019-08-21 17:23:58 +01:00
parent 9a17dcf017
commit 0a6bb634b9
21 changed files with 95 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Yavsc/Controllers/Contracting/EstimateController.cs
View File

@ -9,6 +9,7 @@ using Microsoft.AspNet.Http;
using Microsoft.AspNet.Mvc;
using Microsoft.Data.Entity;
using Microsoft.Extensions.OptionsModel;
using Yavsc.Helpers;
namespace Yavsc.Controllers
{
@ -16,7 +17,6 @@ namespace Yavsc.Controllers
using Models.Billing;
using Models.Workflow;
using ViewModels.Auth;
using Yavsc.Abstract.FileSystem;
[Authorize]
public class EstimateController : Controller
@ -163,7 +163,9 @@ namespace Yavsc.Controllers
return HttpNotFound();
}
ViewBag.Files = User.GetUserFiles(null);
ViewBag.Files = Yavsc.Helpers.FileSystemHelpers.GetFileName(null);
// Yavsc.Helpers.GetUserFiles(User, null);
return View(estimate);
}

2
src/Yavsc/Controllers/Contracting/FrontOfficeController.cs
View File

@ -99,7 +99,7 @@ namespace Yavsc.Controllers
public IActionResult EstimatePdf(long id)
{
ViewBag.TempDir = Startup.SiteSetup.TempDir;
ViewBag.BillsDir = AbstractFileSystemHelpers.UserBillsDirName;
ViewBag.BillsDir = AbstractFileSystemHelpers.UserBillsDirName;
var estimate = _context.Estimates.Include(x => x.Query)
.Include(x => x.Query.Client)
.Include(x => x.Query.PerformerProfile)