From 250275beff00f3984c1ea2681046ad07d3109bcc Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Mon, 4 Jun 2018 13:01:53 +0200
Subject: [PATCH] addapt error messages on validating manufacturer report
---
.../ViewModel/UserControl/ManufacturerReportXMLFile.cs | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/HashingTool/ViewModel/UserControl/ManufacturerReportXMLFile.cs b/HashingTool/ViewModel/UserControl/ManufacturerReportXMLFile.cs
index 8587b484e0..eba02fac30 100644
--- a/HashingTool/ViewModel/UserControl/ManufacturerReportXMLFile.cs
+++ b/HashingTool/ViewModel/UserControl/ManufacturerReportXMLFile.cs
@@ -79,9 +79,13 @@ namespace HashingTool.ViewModel.UserControl
}
var components = XMLManufacturerReportReader.GetContainingComponents(_xmlFile.Document).GroupBy(s => s)
.Select(g => new { Entry = g.Key, Count = g.Count() });
- var jobComponents = _jobData == null ? new ViewModel.ComponentEntry[] { } : _jobData.Components.ToArray();
+ var jobComponents = _jobData?.JobDataValid == null || !_jobData.JobDataValid.Value ? new ViewModel.ComponentEntry[] { } : _jobData.Components.ToArray();
_validationErrors.Clear();
+ if (_jobData != null && _jobData.JobDataValid != null && !_jobData.JobDataValid.Value) {
+ _validationErrors.Add("Verifying Manufacturer Report: Job data is not valid - no validation checks against job data.");
+ }
+
var hasComponentsFromJob = _jobData != null && _jobData.JobDataValid != null && _jobData.JobDataValid.Value &&
jobComponents.Any();
--
GitLab