diff --git a/DiscImageChef.Server/Areas/Admin/Controllers/ReportsController.cs b/DiscImageChef.Server/Areas/Admin/Controllers/ReportsController.cs index 012e2267..b0db3acc 100644 --- a/DiscImageChef.Server/Areas/Admin/Controllers/ReportsController.cs +++ b/DiscImageChef.Server/Areas/Admin/Controllers/ReportsController.cs @@ -73,12 +73,17 @@ namespace DiscImageChef.Server.Areas.Admin.Controllers int atapiId = model.Report.ATAPI?.Id ?? 0; int scsiId = model.Report.SCSI?.Id ?? 0; int mmcId = model.Report.SCSI?.MultiMediaDevice?.Id ?? 0; + int sscId = model.Report.SCSI?.SequentialDevice?.Id ?? 0; model.TestedMedias = _context.TestedMedia. Where(t => t.AtaId == ataId || t.AtaId == atapiId || t.ScsiId == scsiId || t.MmcId == mmcId).OrderBy(t => t.Manufacturer). ThenBy(t => t.Model).ThenBy(t => t.MediumTypeName).ToList(); + model.TestedSequentialMedias = _context.TestedSequentialMedia.Where(t => t.SscId == sscId). + OrderBy(t => t.Manufacturer).ThenBy(t => t.Model). + ThenBy(t => t.MediumTypeName).ToList(); + return View(model); } diff --git a/DiscImageChef.Server/Areas/Admin/Views/Reports/Details.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Reports/Details.cshtml index f6c03808..8fb535ff 100644 --- a/DiscImageChef.Server/Areas/Admin/Views/Reports/Details.cshtml +++ b/DiscImageChef.Server/Areas/Admin/Views/Reports/Details.cshtml @@ -265,4 +265,45 @@ +} +@if (Model.TestedSequentialMedias.Count > 0) +{ +
+

Tested media:

+ + + + + + + + + + + @foreach (var item in Model.TestedSequentialMedias) + { + + + + + + + } + +
+ @Html.DisplayNameFor(model => model.TestedSequentialMedias[0].Manufacturer) + + @Html.DisplayNameFor(model => model.TestedSequentialMedias[0].Model) + + @Html.DisplayNameFor(model => model.TestedSequentialMedias[0].MediumTypeName) +
+ @Html.DisplayFor(modelItem => item.Manufacturer) + + @Html.DisplayFor(modelItem => item.Model) + + @Html.DisplayFor(modelItem => item.MediumTypeName) + + Delete +
+
} \ No newline at end of file diff --git a/DiscImageChef.Server/Models/UploadedReportDetails.cs b/DiscImageChef.Server/Models/UploadedReportDetails.cs index 2c7be5d1..c7872e08 100644 --- a/DiscImageChef.Server/Models/UploadedReportDetails.cs +++ b/DiscImageChef.Server/Models/UploadedReportDetails.cs @@ -5,12 +5,13 @@ namespace DiscImageChef.Server.Models { public class UploadedReportDetails { - public UploadedReport Report { get; set; } - public List SameAll { get; set; } - public List SameButManufacturer { get; set; } - public List ReportAll { get; set; } - public List ReportButManufacturer { get; set; } - public int ReadCapabilitiesId { get; set; } - public List TestedMedias { get; set; } + public UploadedReport Report { get; set; } + public List SameAll { get; set; } + public List SameButManufacturer { get; set; } + public List ReportAll { get; set; } + public List ReportButManufacturer { get; set; } + public int ReadCapabilitiesId { get; set; } + public List TestedMedias { get; set; } + public List TestedSequentialMedias { get; set; } } } \ No newline at end of file