Dirty hack: INGYO/NYC abstentions

CatoTH · Nov 24, 2024 · 1f4c54e · 1f4c54e
1 parent 3d345ba
commit 1f4c54e
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 4 deletions.
diff --git a/models/db/VotingBlock.php b/models/db/VotingBlock.php
@@ -5,6 +5,7 @@
 use app\components\UrlHelper;
 use app\models\exceptions\Internal;
 use app\models\majorityType\IMajorityType;
+use app\plugins\european_youth_forum\VotingHelper;
 use app\models\policies\{IPolicy, LoggedIn};
 use app\models\quorumType\{IQuorumType, NoQuorum};
 use app\models\settings\{AntragsgruenApp, VotingBlock as VotingBlockSettings};
@@ -661,13 +662,15 @@ public function getVotingItemBlocks(bool $includeUngrouped, ?IMotion $adhocFilte
     }
 
     /**
-     * @return array{votes: int, users: int, abstentions: int}
+     * @return array{votes: int, users: int, abstentions: int, abstentions_ingyo: int, abstentions_nyc: int}
      */
     public function getVoteStatistics(): array
     {
         $total = 0;
         $voteUserIds = [];
         $abstainedUserIds = [];
+        $abstainedUserIdsNyc = [];
+        $abstainedUserIdsIngyo = [];
 
         $groupsMyMotionIds = [];
         $groupsMyAmendmentIds = [];
@@ -694,6 +697,12 @@ public function getVoteStatistics(): array
         foreach ($this->votes as $vote) {
             if ($vote->questionId !== null && $vote->questionId === $abstentionId) {
                 $abstainedUserIds[] = $vote->userId;
+                if ($vote->getUser() && VotingHelper::userIsNyc($this->consultation, $vote->getUser())) {
+                    $abstainedUserIdsNyc[] = $vote->userId;
+                }
+                if ($vote->getUser() && VotingHelper::userIsIngyo($this->consultation, $vote->getUser())) {
+                    $abstainedUserIdsIngyo[] = $vote->userId;
+                }
                 if ($vote->userId && !in_array($vote->userId, $voteUserIds)) {
                     $voteUserIds[] = $vote->userId;
                 }
@@ -724,7 +733,13 @@ public function getVoteStatistics(): array
             }
         }
 
-        return ['votes' => $total, 'users' => count($voteUserIds), 'abstentions' => count($abstainedUserIds)];
+        return [
+            'votes' => $total,
+            'users' => count($voteUserIds),
+            'abstentions' => count($abstainedUserIds),
+            'abstentions_nyc' => count($abstainedUserIdsNyc),
+            'abstentions_ingyo' => count($abstainedUserIdsIngyo),
+        ];
     }
 
     /**

diff --git a/models/proposedProcedure/AgendaVoting.php b/models/proposedProcedure/AgendaVoting.php
@@ -163,6 +163,8 @@ private function getApiObject(?string $title, ?User $user, string $context): arr
             $votingBlockJson['votes_total'] = $stats['votes'];
             $votingBlockJson['votes_users'] = $stats['users'];
             $votingBlockJson['abstentions_total'] = $stats['abstentions'];
+            $votingBlockJson['abstentions_nyc'] = $stats['abstentions_nyc'];
+            $votingBlockJson['abstentions_ingyo'] = $stats['abstentions_ingyo'];
             $votingBlockJson['vote_policy'] = $this->voting->getVotingPolicy()->getApiObject();
 
             $quorumType = $this->voting->getQuorumType();

diff --git a/views/voting/admin-votings.vue.php b/views/voting/admin-votings.vue.php
@@ -680,11 +680,15 @@ class="glyphicon glyphicon-new-window" aria-label="<?= Html::encode(Yii::t('voti
                 }
             },
             abstentionsStr: function () {
+                let str = '';
                 if (this.voting.abstentions_total === 1) {
-                    return abstentions1;
+                    str = abstentions1;
                 } else {
-                    return abstentionsx.replace(/%NUM%/, this.voting.abstentions_total);
+                    str = abstentionsx.replace(/%NUM%/, this.voting.abstentions_total);
                 }
+                str += " (" + this.voting.abstentions_nyc + " NYC / " + this.voting.abstentions_ingyo + " INGYO)";
+
+                return str;
             }
         },
         methods: {