Ensure ranked votes use the user-specified task ordering, where appli…

…cable.
Kinematics · Jun 22, 2017 · 0b956d3 · 0b956d3
1 parent 0a82b01
commit 0b956d3
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/NetTally.Core/Output/TallyOutput.cs b/NetTally.Core/Output/TallyOutput.cs
@@ -6,6 +6,7 @@
 using System.Threading.Tasks;
 using NetTally.Extensions;
 using NetTally.Utility;
+using NetTally.ViewModels;
 using NetTally.VoteCounting;
 using NetTally.Votes;
 using NetTally.VoteCounting.RankVoteCounting.Utility;
@@ -166,8 +167,16 @@ private void ConstructRankedOutput(CancellationToken token)
                 IRankVoteCounter counter = VoteCounterLocator.GetRankVoteCounter(AdvancedOptions.Instance.RankVoteCounterMethod);
                 RankResultsByTask results = counter.CountVotes(VoteCounter.GetVotesCollection(VoteType.Rank));
 
-                //var orderedRes = results.OrderBy(a => a.Key);
-                var orderedRes = results;
+                IOrderedEnumerable<KeyValuePair<string, RankResults>> orderedRes;
+
+                if (ViewModelService.MainViewModel.VoteCounter.OrderedTaskList != null)
+                {
+                    orderedRes = results.OrderBy(v => ViewModelService.MainViewModel.VoteCounter.OrderedTaskList.IndexOf(v.Key));
+                }
+                else
+                {
+                    orderedRes = results.OrderBy(a => a.Key);
+                }
 
                 // Output the ranking results for each task
                 foreach (var task in orderedRes)