claunia/marechai
1
0
Fork 0
mirror of https://github.com/claunia/marechai.git synced 2025-12-16 19:14:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement create admin page for screens by machine.

Browse Source
This commit is contained in:
Natalia Portillo
2019-06-02 02:40:17 +01:00
parent 39adb7c702
commit 535aeff6c7
3 changed files with 55 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
cicm_web/Areas/Admin/Controllers/ScreensByMachineController.cs
View File

@@ -52,8 +52,14 @@ namespace cicm_web.Areas.Admin.Controllers
// GET: ScreensByMachine/Create
public IActionResult Create()
{
ViewData["MachineId"] = new SelectList(_context.Machines, "Id", "Name");
ViewData["ScreenId"] = new SelectList(_context.Screens, "Id", "Type");
ViewData["MachineId"] =
new
SelectList(_context.Machines.OrderBy(m => m.Company.Name).ThenBy(m => m.Name).Select(m => new {m.Id, Name = $"{m.Company.Name} {m.Name}"}),
"Id", "Name");
ViewData["ScreenId"] =
new
SelectList(_context.Screens.Select(s => new {s.Id, Name = s.NativeResolution != null ? $"{s.Diagonal}\" {s.Type} with {s.NativeResolution}" : $"{s.Diagonal}\" {s.Type}"}).OrderBy(s => s.Name),
"Id", "Name");
return View();
}
@@ -71,8 +77,14 @@ namespace cicm_web.Areas.Admin.Controllers
return RedirectToAction(nameof(Index));
}
ViewData["MachineId"] = new SelectList(_context.Machines, "Id", "Name", screensByMachine.MachineId);
ViewData["ScreenId"] = new SelectList(_context.Screens, "Id", "Type", screensByMachine.ScreenId);
ViewData["MachineId"] =
new
SelectList(_context.Machines.OrderBy(m => m.Company.Name).ThenBy(m => m.Name).Select(m => new {m.Id, Name = $"{m.Company.Name} {m.Name}"}),
"Id", "Name", screensByMachine.MachineId);
ViewData["ScreenId"] =
new
SelectList(_context.Screens.Select(s => new {s.Id, Name = s.NativeResolution != null ? $"{s.Diagonal}\" {s.Type} with {s.NativeResolution}" : $"{s.Diagonal}\" {s.Type}"}).OrderBy(s => s.Name),
"Id", "Name", screensByMachine.ScreenId);
return View(screensByMachine);
}
@@ -84,8 +96,14 @@ namespace cicm_web.Areas.Admin.Controllers
ScreensByMachine screensByMachine = await _context.ScreensByMachine.FindAsync(id);
if(screensByMachine == null) return NotFound();
ViewData["MachineId"] = new SelectList(_context.Machines, "Id", "Name", screensByMachine.MachineId);
ViewData["ScreenId"] = new SelectList(_context.Screens, "Id", "Type", screensByMachine.ScreenId);
ViewData["MachineId"] =
new
SelectList(_context.Machines.OrderBy(m => m.Company.Name).ThenBy(m => m.Name).Select(m => new {m.Id, Name = $"{m.Company.Name} {m.Name}"}),
"Id", "Name", screensByMachine.MachineId);
ViewData["ScreenId"] =
new
SelectList(_context.Screens.Select(s => new {s.Id, Name = s.NativeResolution != null ? $"{s.Diagonal}\" {s.Type} with {s.NativeResolution}" : $"{s.Diagonal}\" {s.Type}"}).OrderBy(s => s.Name),
"Id", "Name", screensByMachine.ScreenId);
return View(screensByMachine);
}
@@ -116,8 +134,14 @@ namespace cicm_web.Areas.Admin.Controllers
return RedirectToAction(nameof(Index));
}
ViewData["MachineId"] = new SelectList(_context.Machines, "Id", "Name", screensByMachine.MachineId);
ViewData["ScreenId"] = new SelectList(_context.Screens, "Id", "Type", screensByMachine.ScreenId);
ViewData["MachineId"] =
new
SelectList(_context.Machines.OrderBy(m => m.Company.Name).ThenBy(m => m.Name).Select(m => new {m.Id, Name = $"{m.Company.Name} {m.Name}"}),
"Id", "Name", screensByMachine.MachineId);
ViewData["ScreenId"] =
new
SelectList(_context.Screens.Select(s => new {s.Id, Name = s.NativeResolution != null ? $"{s.Diagonal}\" {s.Type} with {s.NativeResolution}" : $"{s.Diagonal}\" {s.Type}"}).OrderBy(s => s.Name),
"Id", "Name", screensByMachine.ScreenId);
return View(screensByMachine);
}
@@ -150,5 +174,14 @@ namespace cicm_web.Areas.Admin.Controllers
{
return _context.ScreensByMachine.Any(e => e.Id == id);
}
[AcceptVerbs("Get", "Post")]
public async Task<IActionResult> VerifyUnique(int screenId, int machineId)
{
return await _context.ScreensByMachine.FirstOrDefaultAsync(i => i.ScreenId == screenId &&
i.MachineId == machineId) is null
? Json(true)
: Json("The selected machine already has the selected screen.");
}
}
}