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

[reorg]

Browse Source
This commit is contained in:
Paul Schneider
2019-05-07 14:01:23 +01:00
parent 042c3c873a
commit d3e57ba2d1
26 changed files with 128 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Yavsc/Controllers/Contracting/CoWorkingController.cs
View File

@ -21,7 +21,7 @@ namespace Yavsc.Controllers
// GET: CoWorking
public async Task<IActionResult> Index()
{
var applicationDbContext = _context.WorkflowProviders.Include(c => c.Performer).Include(c => c.WorkingFor);
var applicationDbContext = _context.CoWorking.Include(c => c.Performer).Include(c => c.WorkingFor);
return View(await applicationDbContext.ToListAsync());
}
@ -33,7 +33,7 @@ namespace Yavsc.Controllers
return HttpNotFound();
}
CoWorking coWorking = await _context.WorkflowProviders.SingleAsync(m => m.Id == id);
CoWorking coWorking = await _context.CoWorking.SingleAsync(m => m.Id == id);
if (coWorking == null)
{
return HttpNotFound();
@ -57,7 +57,7 @@ namespace Yavsc.Controllers
{
if (ModelState.IsValid)
{
_context.WorkflowProviders.Add(coWorking);
_context.CoWorking.Add(coWorking);
await _context.SaveChangesAsync(User.GetUserId());
return RedirectToAction("Index");
}
@ -74,7 +74,7 @@ namespace Yavsc.Controllers
return HttpNotFound();
}
CoWorking coWorking = await _context.WorkflowProviders.SingleAsync(m => m.Id == id);
CoWorking coWorking = await _context.CoWorking.SingleAsync(m => m.Id == id);
if (coWorking == null)
{
return HttpNotFound();
@ -109,7 +109,7 @@ namespace Yavsc.Controllers
return HttpNotFound();
}
CoWorking coWorking = await _context.WorkflowProviders.SingleAsync(m => m.Id == id);
CoWorking coWorking = await _context.CoWorking.SingleAsync(m => m.Id == id);
if (coWorking == null)
{
return HttpNotFound();
@ -123,8 +123,8 @@ namespace Yavsc.Controllers
[ValidateAntiForgeryToken]
public async Task<IActionResult> DeleteConfirmed(long id)
{
CoWorking coWorking = await _context.WorkflowProviders.SingleAsync(m => m.Id == id);
_context.WorkflowProviders.Remove(coWorking);
CoWorking coWorking = await _context.CoWorking.SingleAsync(m => m.Id == id);
_context.CoWorking.Remove(coWorking);
await _context.SaveChangesAsync(User.GetUserId());
return RedirectToAction("Index");
}

14
src/Yavsc/Controllers/HyperLinkController.cs
View File

@ -18,7 +18,7 @@ namespace Yavsc.Controllers
// GET: HyperLink
public async Task<IActionResult> Index()
{
return View(await _context.Links.ToListAsync());
return View(await _context.HyperLink.ToListAsync());
}
// GET: HyperLink/Details/5
@ -29,7 +29,7 @@ namespace Yavsc.Controllers
return HttpNotFound();
}
HyperLink hyperLink = await _context.Links.SingleAsync(m => m.HRef == id);
HyperLink hyperLink = await _context.HyperLink.SingleAsync(m => m.HRef == id);
if (hyperLink == null)
{
return HttpNotFound();
@ -51,7 +51,7 @@ namespace Yavsc.Controllers
{
if (ModelState.IsValid)
{
_context.Links.Add(hyperLink);
_context.HyperLink.Add(hyperLink);
await _context.SaveChangesAsync();
return RedirectToAction("Index");
}
@ -66,7 +66,7 @@ namespace Yavsc.Controllers
return HttpNotFound();
}
HyperLink hyperLink = await _context.Links.SingleAsync(m => m.HRef == id);
HyperLink hyperLink = await _context.HyperLink.SingleAsync(m => m.HRef == id);
if (hyperLink == null)
{
return HttpNotFound();
@ -97,7 +97,7 @@ namespace Yavsc.Controllers
return HttpNotFound();
}
HyperLink hyperLink = await _context.Links.SingleAsync(m => m.HRef == id);
HyperLink hyperLink = await _context.HyperLink.SingleAsync(m => m.HRef == id);
if (hyperLink == null)
{
return HttpNotFound();
@ -111,8 +111,8 @@ namespace Yavsc.Controllers
[ValidateAntiForgeryToken]
public async Task<IActionResult> DeleteConfirmed(string id)
{
HyperLink hyperLink = await _context.Links.SingleAsync(m => m.HRef == id);
_context.Links.Remove(hyperLink);
HyperLink hyperLink = await _context.HyperLink.SingleAsync(m => m.HRef == id);
_context.HyperLink.Remove(hyperLink);
await _context.SaveChangesAsync();
return RedirectToAction("Index");
}

18
src/Yavsc/Controllers/IT/ProjectController.cs
View File

@ -35,7 +35,7 @@ namespace Yavsc.Controllers
// GET: Project
public async Task<IActionResult> Index()
{
var applicationDbContext = _context.Projects.Include(p => p.Client).Include(p => p.Context).Include(p => p.PerformerProfile).Include(p => p.Regularisation).Include(p => p.Repository);
var applicationDbContext = _context.Project.Include(p => p.Client).Include(p => p.Context).Include(p => p.PerformerProfile).Include(p => p.Regularisation).Include(p => p.Repository);
return View(await applicationDbContext.ToListAsync());
}
@ -47,7 +47,7 @@ namespace Yavsc.Controllers
return HttpNotFound();
}
Project project = await _context.Projects.SingleAsync(m => m.Id == id);
Project project = await _context.Project.SingleAsync(m => m.Id == id);
if (project == null)
{
return HttpNotFound();
@ -66,7 +66,7 @@ namespace Yavsc.Controllers
ViewBag.ActivityCodeItems = _context.Activities.CreateSelectListItems<Activity>(
a => a.Code, a => a.Name);
ViewBag.PerformerIdItems = _context.Performers.Include(p=>p.Performer).CreateSelectListItems<PerformerProfile>(p => p.PerformerId, p => p.Performer.UserName);
ViewBag.PaymentIdItems = _context.PayPalPayments.CreateSelectListItems<PayPalPayment>
ViewBag.PaymentIdItems = _context.PayPalPayment.CreateSelectListItems<PayPalPayment>
(p => p.OrderReference, p => $"{p.Executor.UserName} {p.PaypalPayerId} {p.OrderReference}");
ViewBag.Status = typeof(Yavsc.QueryStatus).CreateSelectListItems(null);
@ -83,7 +83,7 @@ namespace Yavsc.Controllers
{
if (ModelState.IsValid)
{
_context.Projects.Add(project);
_context.Project.Add(project);
await _context.SaveChangesAsync();
return RedirectToAction("Index");
}
@ -94,7 +94,7 @@ namespace Yavsc.Controllers
ViewBag.ActivityCodeItems = _context.Activities.CreateSelectListItems<Activity>(
a => a.Code, a => a.Name, project.ActivityCode);
ViewBag.PerformerIdItems = _context.Performers.Include(p=>p.Performer).CreateSelectListItems<PerformerProfile>(p => p.PerformerId, p => p.Performer.UserName, project.PerformerId);
ViewBag.PaymentIdItems = _context.PayPalPayments.CreateSelectListItems<PayPalPayment>
ViewBag.PaymentIdItems = _context.PayPalPayment.CreateSelectListItems<PayPalPayment>
(p => p.OrderReference, p => $"{p.Executor.UserName} {p.PaypalPayerId} {p.OrderReference}", project.PaymentId);
return View(project);
}
@ -107,7 +107,7 @@ namespace Yavsc.Controllers
return HttpNotFound();
}
Project project = await _context.Projects.SingleAsync(m => m.Id == id);
Project project = await _context.Project.SingleAsync(m => m.Id == id);
if (project == null)
{
return HttpNotFound();
@ -146,7 +146,7 @@ namespace Yavsc.Controllers
return HttpNotFound();
}
Project project = await _context.Projects.SingleAsync(m => m.Id == id);
Project project = await _context.Project.SingleAsync(m => m.Id == id);
if (project == null)
{
return HttpNotFound();
@ -160,8 +160,8 @@ namespace Yavsc.Controllers
[ValidateAntiForgeryToken]
public async Task<IActionResult> DeleteConfirmed(long id)
{
Project project = await _context.Projects.SingleAsync(m => m.Id == id);
_context.Projects.Remove(project);
Project project = await _context.Project.SingleAsync(m => m.Id == id);
_context.Project.Remove(project);
await _context.SaveChangesAsync();
return RedirectToAction("Index");
}