Merge branch '@Upstream/develop' into @Upstream/release

BlythMeister · May 14, 2020 · 2ef6a81 · 2ef6a81
2 parents 97e2a23 + ba1617b
commit 2ef6a81
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/src/Gallifrey.UI.Modern/ChangeLog.xml b/src/Gallifrey.UI.Modern/ChangeLog.xml
@@ -671,6 +671,13 @@
     </Bugs>
     <Others />
   </Version>
+  <Version Number="0.0.0.0" Name="Pre-Release">
+    <Features />
+    <Bugs>
+      <Bug>Fix issues reported to Exceptionless</Bug>
+    </Bugs>
+    <Others />
+  </Version>
   <!--
   Template for VNext if not present above
   <Version Number="0.0.0.0" Name="Pre-Release">

diff --git a/src/Gallifrey.UI.Modern/Flyouts/BulkExport.xaml.cs b/src/Gallifrey.UI.Modern/Flyouts/BulkExport.xaml.cs
@@ -273,7 +273,7 @@ private List<BulkExportModel> GetTimers(List<JiraTimer> timers)
                 modelHelpers.Gallifrey.JiraTimerCollection.RefreshFromJira(timerToShow.UniqueId, jiraIssue, time);
 
                 var updatedTimer = modelHelpers.Gallifrey.JiraTimerCollection.GetTimer(timerToShow.UniqueId);
-                if (!timerToShow.FullyExported)
+                if (!updatedTimer.FullyExported)
                 {
                     var model = new BulkExportModel(updatedTimer, jiraIssue, modelHelpers.Gallifrey.Settings.ExportSettings);
                     timersToShow.Add(model);

diff --git a/src/Gallifrey.UI.Modern/Models/MainViewModel.cs b/src/Gallifrey.UI.Modern/Models/MainViewModel.cs
@@ -270,7 +270,7 @@ private void RefreshModel()
                     PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(TimerDates)));
                 }
 
-                var dateTimers = ModelHelpers.Gallifrey.JiraTimerCollection.GetTimersForADate(timerDate).ToList();
+                var dateTimers = ModelHelpers.Gallifrey.JiraTimerCollection.GetTimersForADate(timerDate.Date).ToList();
 
                 foreach (var timer in dateTimers)
                 {
@@ -291,7 +291,7 @@ private void RefreshModel()
                     var defaultTimers = (ModelHelpers.Gallifrey.Settings.AppSettings.DefaultTimers ?? new List<string>()).Select(x => x.ToUpper().Trim()).Distinct();
                     foreach (var defaultJira in defaultTimers)
                     {
-                        if (!dateModel.Timers.Any(x => string.Equals(x.JiraTimer.JiraReference, defaultJira, StringComparison.InvariantCultureIgnoreCase)))
+                        if (!dateModel.Timers.Any(x => string.Equals(x.JiraTimer.JiraReference, defaultJira, StringComparison.InvariantCultureIgnoreCase) && x.JiraTimer.DateStarted.Date == dateModel.TimerDate.Date))
                         {
                             try
                             {
@@ -309,8 +309,11 @@ private void RefreshModel()
                                 {
                                     var timerId = ModelHelpers.Gallifrey.JiraTimerCollection.AddTimer(jira, dateModel.TimerDate.Date, TimeSpan.Zero, false);
                                     var timer = ModelHelpers.Gallifrey.JiraTimerCollection.GetTimer(timerId);
-                                    timer.PropertyChanged += (sender, args) => TimerChanged();
-                                    dateModel.AddTimerModel(new TimerModel(timer));
+                                    if (timer != null)
+                                    {
+                                        timer.PropertyChanged += (sender, args) => TimerChanged();
+                                        dateModel.AddTimerModel(new TimerModel(timer));
+                                    }
                                 }
                             }
                             catch (Exception ex)