From: Don Armstrong <don@donarmstrong.com>
Date: Tue, 14 Apr 2015 23:53:04 +0000 (-0700)
Subject: fix tally sheet generation for > 9 options (should be letters, not two digit numbers)
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c6b2ddbc1477d46aa94fbc0fb8c5eec206346380;p=debian-ctte.git

fix tally sheet generation for > 9 options (should be letters, not two digit numbers)
---

diff --git a/scripts/pocket-devotee b/scripts/pocket-devotee
index 0888fba..5fb9fdc 100755
--- a/scripts/pocket-devotee
+++ b/scripts/pocket-devotee
@@ -216,7 +216,7 @@ sub winner {
           }
           $vote = '';
           for my $opt (@options) {
-              $vote .= exists $option_rank{$opt->{key}} ? $option_rank{$opt->{key}} : '-';
+              $vote .= exists $option_rank{$opt->{key}} ? $number_to_option{$option_rank{$opt->{key}}} : '-';
           }
           print {$RESULTS} "V: $vote $voter\n";
 
@@ -305,12 +305,12 @@ EOM
       foreach my $i (0..($max_choices - 2)) {
           if ($K > $Beat_Matrix[$i][$max_choices - 1]) {
               $Drop{$i}++;
-              print {$RESULTS} "Dropping Option", $order_to_options{$i + 1}{key}, 
+              print {$RESULTS} "Dropping Option ", $order_to_options{$i + 1}{key}, 
                   " \"", $order_to_options{$i + 1}{name},
-                  "\" because of Quorum\n";
+                  "\" because of Quorum ($K > $Beat_Matrix[$i][$max_choices - 1])\n";
           } else {
               print {$RESULTS} "Option ", $order_to_options{$i + 1}{key},
-                  " Reached quorum: $Beat_Matrix[$i][$max_choices - 1] > $K\n";
+                  " Reached quorum: $Beat_Matrix[$i][$max_choices - 1] >= $K\n";
           }
       }
       print {$RESULTS} "\n\n";