When merging ranked votes of different ranks, instead of merging the …

…votes, the text of the 'from' vote is changed to be the text of the destination vote. Track vote list before and after the merge, to allow re-adding the newly changed vote to the display list.
Kinematics · Sep 4, 2015 · c139c79 · c139c79
1 parent e1f4cf6
commit c139c79
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 0 deletions.
diff --git a/NetTally/MergeVotesWindow.xaml.cs b/NetTally/MergeVotesWindow.xaml.cs
@@ -225,9 +225,20 @@ private void merge_Click(object sender, RoutedEventArgs e)
 
             try
             {
+                var votesPrior = VoteCounter.GetVotesCollection(CurrentVoteType).Keys.ToList();
+
                 if (VoteCounter.Merge(fromVote, toVote, CurrentVoteType))
                 {
+                    var votesAfter = VoteCounter.GetVotesCollection(CurrentVoteType).Keys.ToList();
+                    var votesDiff = votesAfter.Except(votesPrior);
+
                     VoteCollection.Remove(fromVote);
+                    if (votesDiff.Count() == 1)
+                    {
+                        VoteCollection.Add(votesDiff.First());
+                    }
+
+
                     VoterView1.Refresh();
                     VoterView2.Refresh();
                 }

diff --git a/TallyCore/VoteCounter.cs b/TallyCore/VoteCounter.cs
@@ -192,6 +192,22 @@ public bool Merge(string fromVote, string toVote, VoteType voteType)
             if (!votesSet.TryGetValue(toVote, out toVoters))
                 throw new ArgumentException(nameof(toVote) + " does not exist.");
 
+            if (voteType == VoteType.Rank)
+            {
+                string markFrom = VoteString.GetVoteMarker(fromVote);
+                string markTo = VoteString.GetVoteMarker(toVote);
+
+                // If ranked votes are being merged, but of different ranks, the "to" vote will simply be a text change
+                if (markFrom != markTo)
+                {
+                    string toContent = VoteString.GetVoteContent(toVote);
+                    string revisedFrom = VoteString.ModifyVoteLine(fromVote, content: toContent);
+                    Rename(fromVote, revisedFrom, voteType);
+                    return true;
+                }
+            }
+
+
             toVoters.UnionWith(fromVoters);
 
             votesSet.Remove(fromVote);