|
@@ -1052,16 +1052,13 @@ namespace PRS.Mobile
|
|
|
|
|
|
// if we have a value, then show the image
|
|
|
// We need a clear button to be able to reset it
|
|
|
- if (loadData.TryGetValue(dFLayoutSignaturePad.Name, out value))
|
|
|
+ if (loadData.TryGetValue(dFLayoutSignaturePad.Name, out value) && !string.IsNullOrWhiteSpace(value))
|
|
|
{
|
|
|
- if (!string.IsNullOrWhiteSpace(value))
|
|
|
- {
|
|
|
- EmbeddedImageCapture embeddedImageCapture = new EmbeddedImageCapture();
|
|
|
- byte[] data = Convert.FromBase64String(value);
|
|
|
- embeddedImageCapture.DataToImage(data);
|
|
|
- view = embeddedImageCapture;
|
|
|
- view.IsEnabled = false;
|
|
|
- }
|
|
|
+ EmbeddedImageCapture embeddedImageCapture = new EmbeddedImageCapture();
|
|
|
+ byte[] data = Convert.FromBase64String(value);
|
|
|
+ embeddedImageCapture.DataToImage(data);
|
|
|
+ view = embeddedImageCapture;
|
|
|
+ view.IsEnabled = false;
|
|
|
}
|
|
|
else
|
|
|
{
|
|
@@ -1440,13 +1437,16 @@ namespace PRS.Mobile
|
|
|
foreach (DFLayoutField field in pairs.Keys)
|
|
|
{
|
|
|
View view = pairs[field];
|
|
|
- String userInput = AddResultsToDictionary(field, view);
|
|
|
- if (isRequiredEmpty)
|
|
|
+ if (view != null)
|
|
|
{
|
|
|
- if (!saveForLater)
|
|
|
- return;
|
|
|
+ String userInput = AddResultsToDictionary(field, view);
|
|
|
+ if (isRequiredEmpty)
|
|
|
+ {
|
|
|
+ if (!saveForLater)
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ AddPropertyToDictionary(field, userInput);
|
|
|
}
|
|
|
- AddPropertyToDictionary(field, userInput);
|
|
|
}
|
|
|
UpdateInstanceAndModel(saveForLater);
|
|
|
}
|