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 machine photo delete admin page.

Browse Source
This commit is contained in:
Natalia Portillo
2019-05-29 00:07:16 +01:00
parent 794dc6b188
commit cab4723e6f
3 changed files with 66 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
cicm_web/Areas/Admin/Controllers/MachinePhotosController.cs
View File

@@ -422,7 +422,22 @@ namespace cicm_web.Areas.Admin.Controllers
{
if(id == null) return NotFound();
MachinePhoto machinePhoto = await _context.MachinePhotos.FirstOrDefaultAsync(m => m.Id == id);
MachinePhotoViewModel machinePhoto = await _context
.MachinePhotos.Include(m => m.Machine)
.Include(m => m.Machine.Company).Include(m => m.User)
.Select(p => new MachinePhotoViewModel
{
Id = p.Id,
Author = p.Author,
License = p.License.Name,
Machine =
$"{p.Machine.Company.Name} {p.Machine.Name}",
UploadDate = p.UploadDate,
UploadUser = p.User.UserName,
LicenseId = p.License.Id
}).OrderBy(p => p.Machine).ThenBy(p => p.UploadUser)
.ThenBy(p => p.UploadDate).FirstOrDefaultAsync(m => m.Id == id);
if(machinePhoto == null) return NotFound();
return View(machinePhoto);

192
cicm_web/Areas/Admin/Views/MachinePhotos/Delete.cshtml
View File

@@ -1,4 +1,4 @@
@model Cicm.Database.Models.MachinePhoto
@model cicm_web.Areas.Admin.Models.MachinePhotoViewModel
@{
ViewData["Title"] = "Delete";
@@ -8,7 +8,7 @@
<h3>Are you sure you want to delete this?</h3>
<div>
<h4>MachinePhoto</h4>
<h4>Machine photo</h4>
<hr />
<dl class="row">
<dt class="col-sm-2">
@@ -17,114 +17,6 @@
<dd class="col-sm-10">
@Html.DisplayFor(model => model.Author)
</dd>
<dt class="col-sm-2">
@Html.DisplayNameFor(model => model.CameraManufacturer)
</dt>
<dd class="col-sm-10">
@Html.DisplayFor(model => model.CameraManufacturer)
</dd>
<dt class="col-sm-2">
@Html.DisplayNameFor(model => model.CameraModel)
</dt>
<dd class="col-sm-10">
@Html.DisplayFor(model => model.CameraModel)
</dd>
<dt class="col-sm-2">
@Html.DisplayNameFor(model => model.ColorSpace)
</dt>
<dd class="col-sm-10">
@Html.DisplayFor(model => model.ColorSpace)
</dd>
<dt class="col-sm-2">
@Html.DisplayNameFor(model => model.Comments)
</dt>
<dd class="col-sm-10">
@Html.DisplayFor(model => model.Comments)
</dd>
<dt class="col-sm-2">
@Html.DisplayNameFor(model => model.Contrast)
</dt>
<dd class="col-sm-10">
@Html.DisplayFor(model => model.Contrast)
</dd>
<dt class="col-sm-2">
@Html.DisplayNameFor(model => model.CreationDate)
</dt>
<dd class="col-sm-10">
@Html.DisplayFor(model => model.CreationDate)
</dd>
<dt class="col-sm-2">
@Html.DisplayNameFor(model => model.DigitalZoomRatio)
</dt>
<dd class="col-sm-10">
@Html.DisplayFor(model => model.DigitalZoomRatio)
</dd>
<dt class="col-sm-2">
@Html.DisplayNameFor(model => model.ExifVersion)
</dt>
<dd class="col-sm-10">
@Html.DisplayFor(model => model.ExifVersion)
</dd>
<dt class="col-sm-2">
@Html.DisplayNameFor(model => model.Exposure)
</dt>
<dd class="col-sm-10">
@Html.DisplayFor(model => model.Exposure)
</dd>
<dt class="col-sm-2">
@Html.DisplayNameFor(model => model.ExposureMethod)
</dt>
<dd class="col-sm-10">
@Html.DisplayFor(model => model.ExposureMethod)
</dd>
<dt class="col-sm-2">
@Html.DisplayNameFor(model => model.ExposureProgram)
</dt>
<dd class="col-sm-10">
@Html.DisplayFor(model => model.ExposureProgram)
</dd>
<dt class="col-sm-2">
@Html.DisplayNameFor(model => model.Flash)
</dt>
<dd class="col-sm-10">
@Html.DisplayFor(model => model.Flash)
</dd>
<dt class="col-sm-2">
@Html.DisplayNameFor(model => model.Focal)
</dt>
<dd class="col-sm-10">
@Html.DisplayFor(model => model.Focal)
</dd>
<dt class="col-sm-2">
@Html.DisplayNameFor(model => model.FocalLength)
</dt>
<dd class="col-sm-10">
@Html.DisplayFor(model => model.FocalLength)
</dd>
<dt class="col-sm-2">
@Html.DisplayNameFor(model => model.FocalLengthEquivalent)
</dt>
<dd class="col-sm-10">
@Html.DisplayFor(model => model.FocalLengthEquivalent)
</dd>
<dt class="col-sm-2">
@Html.DisplayNameFor(model => model.HorizontalResolution)
</dt>
<dd class="col-sm-10">
@Html.DisplayFor(model => model.HorizontalResolution)
</dd>
<dt class="col-sm-2">
@Html.DisplayNameFor(model => model.IsoRating)
</dt>
<dd class="col-sm-10">
@Html.DisplayFor(model => model.IsoRating)
</dd>
<dt class="col-sm-2">
@Html.DisplayNameFor(model => model.Lens)
</dt>
<dd class="col-sm-10">
@Html.DisplayFor(model => model.Lens)
</dd>
<dt class="col-sm-2">
@Html.DisplayNameFor(model => model.License)
</dt>
@@ -132,70 +24,10 @@
@Html.DisplayFor(model => model.License)
</dd>
<dt class="col-sm-2">
@Html.DisplayNameFor(model => model.LightSource)
@Html.DisplayNameFor(model => model.Machine)
</dt>
<dd class="col-sm-10">
@Html.DisplayFor(model => model.LightSource)
</dd>
<dt class="col-sm-2">
@Html.DisplayNameFor(model => model.MeteringMode)
</dt>
<dd class="col-sm-10">
@Html.DisplayFor(model => model.MeteringMode)
</dd>
<dt class="col-sm-2">
@Html.DisplayNameFor(model => model.Orientation)
</dt>
<dd class="col-sm-10">
@Html.DisplayFor(model => model.Orientation)
</dd>
<dt class="col-sm-2">
@Html.DisplayNameFor(model => model.PixelComposition)
</dt>
<dd class="col-sm-10">
@Html.DisplayFor(model => model.PixelComposition)
</dd>
<dt class="col-sm-2">
@Html.DisplayNameFor(model => model.Saturation)
</dt>
<dd class="col-sm-10">
@Html.DisplayFor(model => model.Saturation)
</dd>
<dt class="col-sm-2">
@Html.DisplayNameFor(model => model.SceneCaptureType)
</dt>
<dd class="col-sm-10">
@Html.DisplayFor(model => model.SceneCaptureType)
</dd>
<dt class="col-sm-2">
@Html.DisplayNameFor(model => model.SceneControl)
</dt>
<dd class="col-sm-10">
@Html.DisplayFor(model => model.SceneControl)
</dd>
<dt class="col-sm-2">
@Html.DisplayNameFor(model => model.SensingMethod)
</dt>
<dd class="col-sm-10">
@Html.DisplayFor(model => model.SensingMethod)
</dd>
<dt class="col-sm-2">
@Html.DisplayNameFor(model => model.Sharpness)
</dt>
<dd class="col-sm-10">
@Html.DisplayFor(model => model.Sharpness)
</dd>
<dt class="col-sm-2">
@Html.DisplayNameFor(model => model.SoftwareUsed)
</dt>
<dd class="col-sm-10">
@Html.DisplayFor(model => model.SoftwareUsed)
</dd>
<dt class="col-sm-2">
@Html.DisplayNameFor(model => model.SubjectDistanceRange)
</dt>
<dd class="col-sm-10">
@Html.DisplayFor(model => model.SubjectDistanceRange)
@Html.DisplayFor(model => model.Machine)
</dd>
<dt class="col-sm-2">
@Html.DisplayNameFor(model => model.UploadDate)
@@ -204,16 +36,13 @@
@Html.DisplayFor(model => model.UploadDate)
</dd>
<dt class="col-sm-2">
@Html.DisplayNameFor(model => model.VerticalResolution)
@Html.DisplayNameFor(model => model.UploadUser)
</dt>
<dd class="col-sm-10">
@Html.DisplayFor(model => model.VerticalResolution)
@Html.DisplayFor(model => model.UploadUser)
</dd>
<dt class="col-sm-2">
@Html.DisplayNameFor(model => model.WhiteBalance)
</dt>
<dd class="col-sm-10">
@Html.DisplayFor(model => model.WhiteBalance)
<img src="/assets/photos/machines/@(Model.Id).jpg" />
</dd>
</dl>
@@ -222,7 +51,10 @@
asp-for="Id" />
<input class="btn btn-danger"
type="submit"
value="Delete" /> |
<a asp-action="Index">Back to List</a>
value="Delete" />
<a asp-action="Index"
class="btn btn-secondary">
Back to List
</a>
</form>
</div>

2
cicm_web/cicm_web.csproj
View File

@@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework>
<Version>3.0.99.644</Version>
<Version>3.0.99.646</Version>
<Company>Canary Islands Computer Museum</Company>
<Copyright>Copyright © 2003-2018 Natalia Portillo</Copyright>
<Product>Canary Islands Computer Museum Website</Product>