瀏覽代碼

Tweaks to digital forms; getting rid of QA form

Kenric Nugteren 3 天之前
父節點
當前提交
c834e7ec68

+ 2 - 0
InABox.Core/DigitalForms/Forms/DigitalFormVariable.cs

@@ -217,7 +217,9 @@ namespace InABox.Core
 
         public void SaveProperties(Type variableType, DFLayoutFieldProperties properties)
         {
+            var before = VariableType;
             _variableType = variableType;
+            OnPropertyChanged(nameof(VariableType), before, VariableType);
             SaveProperties(properties);
         }
 

+ 3 - 0
InABox.Core/DigitalForms/Obsolete/QAQuestion.cs

@@ -39,6 +39,9 @@ namespace InABox.Core
         [MemoEditor]
         public string Parameters { get; set; }
 
+        [NullEditor]
+        public bool Converted { get; set; }
+
         //[NullEditor]
         //public String Value { get; set; }
 

+ 8 - 0
InABox.Core/Query/Filter.cs

@@ -809,6 +809,14 @@ namespace InABox.Core
             Ands.Add(and);
             return new FilterBuilder<T, TProp>(and);
         }
+        
+        public FilterBuilder<T, TProp> And<TProp>(Column<T> column)
+        {
+            var and = new Filter<T>(column);
+            and.Parent = this;
+            Ands.Add(and);
+            return new FilterBuilder<T, TProp>(and);
+        }
 
         IFilter IFilter.And<T1>(Expression<Func<T1, object>> expression)
         {

+ 1 - 0
inabox.wpf/DigitalForms/Designer/DynamicFormControlGrid.cs

@@ -18,6 +18,7 @@ namespace InABox.DynamicGrid
         {
             base.DoReconfigure(options);
             options.RecordCount = true;
+            options.EditRows = true;
         }
 
         public List<T> Items { get; set; }