Merge pull request #749 from AngelRodriguez8008/users/angel/fixSetDat…

…eTimeValue Fix Clear DateTime Field (Solve Issue #745)
microsoft · Feb 7, 2020 · f7cb7d7 · f7cb7d7
2 parents d31a2d8 + 89fd125
commit f7cb7d7
Show file tree

Hide file tree

Showing 8 changed files with 433 additions and 259 deletions.
diff --git a/Microsoft.Dynamics365.UIAutomation.Api.UCI/Controls/DateTimeControl.cs b/Microsoft.Dynamics365.UIAutomation.Api.UCI/Controls/DateTimeControl.cs
@@ -15,6 +15,21 @@ public DateTimeControl(string name)
             Name = name;
         }
         public string Name { get; set; }
-        public DateTime Value { get; set; }
+        public DateTime? Value { get; set; }
+
+        public string DateFormat { get; set; }
+        public string TimeFormat { get; set; }
+
+        private string _dateAsString;
+        public string DateAsString { 
+            get =>  _dateAsString ?? (_dateAsString = string.IsNullOrWhiteSpace(DateFormat) ? Value?.ToShortDateString() : Value?.ToString(DateFormat));
+            set => _dateAsString = value;
+        }
+
+        private string _timeAsString;
+        public string TimeAsString { 
+            get =>  _timeAsString ?? (_timeAsString = string.IsNullOrWhiteSpace(TimeFormat) ? Value?.ToShortTimeString() : Value?.ToString(TimeFormat));
+            set => _timeAsString = value;
+        }
     }
 }
diff --git a/Microsoft.Dynamics365.UIAutomation.Api.UCI/Elements/Entity.cs b/Microsoft.Dynamics365.UIAutomation.Api.UCI/Elements/Entity.cs
@@ -62,6 +62,25 @@ public void ClearValue(MultiValueOptionSet control)
         {
             _client.ClearValue(control);
         }
+
+
+        /// <summary>
+        /// Clears a value from the DateTimeControl provided
+        /// </summary>
+        /// <param name="control"></param>
+        public void ClearHeaderValue(DateTimeControl control)
+        {
+            _client.ClearHeaderValue(control);
+        }
+
+        /// <summary>
+        /// Clears a value from the DateTimeControl provided
+        /// </summary>
+        /// <param name="control"></param>
+        public void ClearValue(DateTimeControl control)
+        {
+            _client.ClearValue(control);
+        }
 
         /// <summary>
         /// Close Record Set Navigator
@@ -159,12 +178,11 @@ public MultiValueOptionSet GetHeaderValue(MultiValueOptionSet control)
         /// </summary>
         /// <param name="control">The date time field name of the lookup.</param>
         /// <example>xrmApp.Entity.GetValue(new DateTimeControl { Name = "estimatedclosedate" });</example>
-        public DateTime GetHeaderValue(DateTimeControl control)
+        public DateTime? GetHeaderValue(DateTimeControl control)
         {
             return _client.GetHeaderValue(control);
         }
-
-
+
         /// <summary>
         /// Get the object id of the current entity
         /// </summary>
@@ -214,7 +232,7 @@ public string GetValue(LookupItem control)
         /// Gets the value of a Lookup.
         /// </summary>
         /// <param name="control">The lookup field name of the lookup.</param>
-        public DateTime GetValue(DateTimeControl control)
+        public DateTime? GetValue(DateTimeControl control)
         {
             return _client.GetValue(control);
         }
@@ -393,6 +411,15 @@ public void SetHeaderValue(string field, DateTime date, string formatDate = null
             _client.SetHeaderValue(field, date, formatDate, formatTime);
         }
 
+        /// <summary>
+        /// Sets the value of a BooleanItem in the header
+        /// </summary>
+        /// <param name="control">The boolean field you want to set.</param>
+        public void SetHeaderValue(DateTimeControl control)
+        {
+            _client.SetHeaderValue(control);
+        }
+
         /// <summary>
         /// Sets the value of a field
         /// </summary>
@@ -453,6 +480,15 @@ public void SetValue(string field, DateTime date, string formatDate = null, stri
             _client.SetValue(field, date, formatDate, formatTime);
         }
 
+        /// <summary>
+        /// Sets the value of a Date Field.
+        /// </summary>
+        /// <param name="control">Date field control.</param>
+        public void SetValue(DateTimeControl control)
+        {
+            _client.SetValue(control);
+        }
+
         /// <summary>
         /// Sets/Removes the value from the multselect type control
         /// </summary>