ソースを参照

Digital Form Viewer now takes default value
Disabled "Select Time" prompt in Digital Form Time Editor

Frank van den Bos 9 ヶ月 前
コミット
b76882f6c0

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

@@ -4,10 +4,7 @@ using System.Threading.Tasks;
 using System.Linq;
 using Xamarin.Forms;
 using InABox.Core;
-using InABox.Clients;
-using System.IO;
 using InABox.Mobile;
-using Comal.Classes;
 using PRSClasses;
 
 namespace PRS.Mobile
@@ -126,8 +123,10 @@ namespace PRS.Mobile
                 {
                     if (RetainedData.HasValue(field.Name))
                         Bindings[field].Deserialize(RetainedData.GetEntry(field.Name));
-                    else //if (Storage.HasValue(field.Name))
+                    else if (Storage.HasValue(field.Name))
                         Bindings[field].Deserialize(Storage.GetEntry(field.Name));
+                    else
+                        Bindings[field].Value = CoreUtils.GetPropertyValue(field.GetProperties(), "Default");
                     _layout.ChangeField(field.Name);
                 }
                 catch (Exception ex)

+ 2 - 0
prs.mobile.new/PRS.Mobile/Components/DigitalForms/Editor/Views/DigitalFormTimeEntry.cs

@@ -63,6 +63,8 @@ namespace PRS.Mobile
 
         public DigitalFormTimeEntry()
         {
+            Prompt = "";
+            OnPropertyChanged(nameof(Time));
             HeightRequest = 40;
             Changed += (sender, args) =>
             {

+ 8 - 0
prs.mobile.new/PRS.Mobile/Components/DigitalForms/Editor/Views/IDigitalFormField.cs

@@ -21,6 +21,8 @@ namespace PRS.Mobile
 
     public interface IDigitalFormField
     {
+        
+        object Value { get; set; }
         event DigitalFormViewChangedHandler? ValueChanged;
         
         void Deserialize(DFLoadStorageEntry entry);
@@ -40,5 +42,11 @@ namespace PRS.Mobile
         where TProperties : DFLayoutFieldProperties<TValue, TSerialized>, new()
     {
         TValue Value { get; set; }
+        
+        object IDigitalFormField.Value
+        {
+            get => Value;
+            set => Value = (TValue)value;
+        }
     }
 }