瀏覽代碼

Fixed Issue with resaving digital forms that contain signature data

Frank van den Bos 1 年之前
父節點
當前提交
1bbc0ac9c7

+ 1 - 1
prs.mobile.new/PRS.Mobile.Droid/Properties/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="730000" android:versionName="7.30.0" package="comal.timesheets.Android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="730100" android:versionName="7.30.1" package="comal.timesheets.Android">
 	<uses-sdk android:minSdkVersion="29" android:targetSdkVersion="33" />
 	<queries>
 		<intent>

+ 1 - 1
prs.mobile.new/PRS.Mobile.iOS/Info.plist

@@ -27,7 +27,7 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.prsdigital.prssiteapp</string>
 	<key>CFBundleVersion</key>
-	<string>7.30</string>
+	<string>7.30.1</string>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>CFBundleName</key>

+ 14 - 14
prs.mobile.new/PRS.Mobile/Components/DigitalForms/Editor/QAFormViewer.cs

@@ -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);
             }