decidim-elections 0.24.3 → 0.25.0.rc1

data/app/{assets/javascripts/decidim/votings/admin/monitoring_committee_members_form.js.es6 → packs/src/decidim/votings/admin/monitoring_committee_members_form.js}

@@ -1,6 +1,6 @@
-((exports) => {
-  const { createFieldDependentInputs } = exports.DecidimAdmin;
+import createFieldDependentInputs from "src/decidim/admin/field_dependent_inputs.component"
 
+$(() => {
   const $participantType = $("#monitoring_committee_member_existing_user");
 
   createFieldDependentInputs({
@@ -32,4 +32,4 @@
       return $field.val() === "true"
     }
   });
-})(window);
+})

data/app/{assets/javascripts/decidim/votings/admin/polling_officers_form.js.es6 → packs/src/decidim/votings/admin/polling_officers_form.js}

@@ -1,6 +1,6 @@
-((exports) => {
-  const { createFieldDependentInputs } = exports.DecidimAdmin;
+import createFieldDependentInputs from "src/decidim/admin/field_dependent_inputs.component"
 
+$(() => {
   const $participantType = $("#polling_officer_existing_user");
 
   createFieldDependentInputs({
@@ -32,4 +32,4 @@
       return $field.val() === "true"
     }
   });
-})(window);
+})

data/app/{assets/javascripts/decidim/votings/admin/polling_stations_form.js.es6 → packs/src/decidim/votings/admin/polling_stations_form.js}

@@ -1,5 +1,6 @@
-(() => {
-  const { attachGeocoding } = window.Decidim;
+import attachGeocoding from "src/decidim/geocoding/attach_input"
+
+$(() => {
   const $form = $(".edit_polling_station, .new_polling_station");
   attachGeocoding($form.find("#polling_station_address"));
-})(window);
+})

data/app/packs/src/decidim/votings/admin/update_census_dataset_status.js

@@ -0,0 +1,13 @@
+$(() => {
+  const updateCensusDatasetStatus = () => {
+    const $wrapper = $("#census-creating-data-wrapper");
+    const updateStatusUrl = $wrapper.data("updateStatusUrl")
+
+    if ($wrapper.length > 0) {
+      $.get(updateStatusUrl);
+    }
+  }
+
+  // 1 minute
+  setInterval(updateCensusDatasetStatus, 60000);
+});

data/app/packs/src/decidim/votings/in-person-vote.js

@@ -0,0 +1,20 @@
+import { Client } from "@codegram/decidim-bulletin_board";
+
+$(async () => {
+  const $inPersonVoteWrapper = $(".in-person-vote-wrapper");
+  if ($inPersonVoteWrapper.length > 0) {
+    const bulletinBoardClient = new Client({
+      apiEndpointUrl: $inPersonVoteWrapper.data("apiEndpointUrl")
+    });
+    const messageId = $inPersonVoteWrapper.data("messageId");
+
+    await bulletinBoardClient.waitForPendingMessageToBeProcessed(messageId);
+
+    $("form.update_vote_status").trigger("submit");
+  }
+
+  $(".js-verify-document").on("click", () => {
+    $("#verify-document").hide();
+    $("#complete-voting").removeClass("hide");
+  });
+});

data/app/packs/src/decidim/votings/polling_officer_zone/edit-closure.js

@@ -0,0 +1,26 @@
+$(() => {
+  const $validBallotsInput = $("#closure_result__ballot_results__valid_ballots_count");
+  const $blankBallotsInput = $("#closure_result__ballot_results__blank_ballots_count");
+  const $nullBallotsInput = $("#closure_result__ballot_results__null_ballots_count");
+
+  const checkTotals = () => {
+    const totalBallots = $("#closure_result-total-ballots").data("total-ballots");
+    const validBallotsCount = parseInt($validBallotsInput.val(), 10);
+    const blankBallotsCount = parseInt($blankBallotsInput.val(), 10);
+    const nullBallotsCount = parseInt($nullBallotsInput.val(), 10);
+
+    let recount = validBallotsCount + blankBallotsCount + nullBallotsCount
+
+    if (recount === totalBallots) {
+      $("#submit-ballot-recount").removeClass("hide");
+      $("#btn-modal-closure-results-count-error").addClass("hide");
+    } else {
+      $("#submit-ballot-recount").addClass("hide");
+      $("#btn-modal-closure-results-count-error").removeClass("hide");
+    }
+  };
+
+  $validBallotsInput.on("blur", checkTotals);
+  $blankBallotsInput.on("blur", checkTotals);
+  $nullBallotsInput.on("blur", checkTotals);
+});

data/app/packs/src/decidim/votings/polling_officer_zone/in-person-vote.js

@@ -0,0 +1,5 @@
+$(() => {
+  $("#person_voted_checkbox").on("change", (event) => {
+    $("#submit_complete_voting").toggleClass("disabled", !$(event.target).is(":checked"));
+  });
+});

data/app/packs/src/decidim/votings/polling_officer_zone/new-closure.js

@@ -0,0 +1,35 @@
+$(() => {
+  const $submitBtn = $("#submit-verify-votes");
+  const $modalBtn = $("#btn-modal-closure-count-error");
+  const $totalBallotsInput = $("#envelopes_result_total_ballots_count");
+  const $electionVotesInput = $("#envelopes_result_election_votes_count");
+
+  const checkValues = () => {
+    const totalBallotsInputValue = parseInt($totalBallotsInput.val(), 10);
+    const electionVotesInputValue = parseInt($electionVotesInput.val(), 10);
+
+
+    if (totalBallotsInputValue === electionVotesInputValue) {
+      $submitBtn.removeClass("disabled hide");
+      $modalBtn.addClass("hide");
+    } else {
+      $submitBtn.addClass("hide");
+      $modalBtn.removeClass("hide");
+    }
+  };
+
+  $totalBallotsInput.on("blur", checkValues);
+
+  $("#submit-verify-votes").addClass("disabled");
+
+  $totalBallotsInput.on("keyup", function() {
+    $("#modal-total-ballots-value").html(parseInt($totalBallotsInput.val(), 10));
+    $("#envelopes_result_polling_officer_notes").val("")
+  });
+
+  $("#envelopes_result_polling_officer_notes").on("keyup", function() {
+    let modalPollingOfficerNotes = $("#envelopes_result_polling_officer_notes").val()
+
+    $("#btn-submit-from-modal").toggleClass("disabled", !modalPollingOfficerNotes.trim());
+  });
+});

data/app/packs/src/decidim/votings/polling_officer_zone/sign-closure.js

@@ -0,0 +1,13 @@
+$(() => {
+  const $submitBtn = $("#btn-submit-from-modal");
+  const $modalBtn = $("#btn-modal-closure-sign");
+  const $signCheckbox = $("#closure_sign_signed");
+
+  const changeButtonProps = (event) => {
+    const notSigned = !$(event.target).is(":checked");
+    $modalBtn.prop("disabled", notSigned);
+    $submitBtn.prop("disabled", notSigned);
+  };
+
+  $signCheckbox.on("change", changeButtonProps);
+});

data/app/packs/src/decidim/votings/voting-description-cell.js

@@ -0,0 +1,41 @@
+$(() => {
+  const isShowMoreButton = ($button) => $button.hasClass("show-more-content");
+
+  const remToPx = (count) => {
+    const unit = $("html").css("font-size");
+
+    if (typeof count !== "undefined" && count > 0) {
+      return (parseInt(unit, 10) || 0) * count;
+    }
+    return parseInt(unit, 10) || 0;
+  };
+
+  const $button = $(".voting-description-cell .content-height-toggler .button");
+  const $content = $button.closest(".voting-description-cell").find(".content");
+  const contentHeight = $content.height();
+
+  let contentMaxHeight = remToPx(7.8);
+  if ($("#introductory-image").length) {
+    contentMaxHeight = $("#introductory-image").height();
+  }
+
+  if (contentHeight < contentMaxHeight) {
+    $button.hide();
+  } else {
+    $content.css("max-height", contentMaxHeight);
+  }
+
+  $button.on("click", (event) => {
+    const $buttonTextMore = $button.find(".button-text.show-more-content");
+    const $buttonTextLess = $button.find(".button-text.show-less-content");
+
+    let newHeight = contentMaxHeight;
+    if (isShowMoreButton($(event.target))) {
+      newHeight = contentHeight;
+    }
+
+    $content.css("max-height", newHeight);
+    $buttonTextLess.toggleClass("hide");
+    $buttonTextMore.toggleClass("hide");
+  });
+});

data/app/packs/stylesheets/decidim/elections/elections.scss

@@ -0,0 +1,8 @@
+@import "stylesheets/decidim/elections/focus/accordion";
+@import "stylesheets/decidim/elections/focus/evote";
+@import "stylesheets/decidim/elections/focus/focus";
+
+.card__icondata ul li:not(:first-child) strong,
+.card__block ul li:not(:first-child) strong{
+  font-size: 100%;
+}

data/app/{assets → packs}/stylesheets/decidim/elections/focus/_evote.scss

@@ -22,6 +22,11 @@
     text-align: center;
   }
 
+  &__grid .row{
+    display: block;
+    text-align: left;
+  }
+
   &__content{
     margin: 1rem auto;
 
@@ -223,7 +228,9 @@
     letter-spacing: normal;
   }
 
-  &__encrypting{
+  &__encrypting,
+  &__casting,
+  &__confirming{
     width: 200px;
     height: 40px;
     display: flex;

data/app/packs/stylesheets/decidim/votings/admin/votings.scss

@@ -0,0 +1,3 @@
+@import "stylesheets/decidim/votings/admin/votings/ballot-styles";
+@import "stylesheets/decidim/votings/admin/votings/monitoring-committee-polling-station-closures";
+@import "stylesheets/decidim/votings/admin/votings/results";

data/app/packs/stylesheets/decidim/votings/admin/votings/_ballot-styles.scss

@@ -0,0 +1,16 @@
+.ballot-style__question--checked{
+  color: green;
+}
+
+.ballot-style__question--unchecked{
+  color: red;
+}
+
+.ballot-style__question-header{
+  max-width: 100px;
+  display: table-cell;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  text-align: center;
+}

data/app/packs/stylesheets/decidim/votings/admin/votings/_monitoring-committee-polling-station-closures.scss

@@ -0,0 +1,9 @@
+.polling_station_closure_certificate_results{
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  align-items: center;
+
+  @media only screen and (max-width: 900px){
+    grid-template-columns: 1fr;
+  }
+}

data/app/packs/stylesheets/decidim/votings/admin/votings/_results.scss

@@ -0,0 +1,3 @@
+.result.not_answer td:first-child{
+  font-style: italic;
+}

data/app/packs/stylesheets/decidim/votings/votings.scss

@@ -0,0 +1,2 @@
+@import "stylesheets/decidim/votings/votings/polling-stations-cell";
+@import "stylesheets/decidim/votings/votings/voting-description-cell";

data/app/packs/stylesheets/decidim/votings/votings/_polling-stations-cell.scss

@@ -0,0 +1,6 @@
+.polling-stations-cell{
+  .polling-stations-list{
+    max-height: 450px;
+    overflow-x: hidden;
+  }
+}

data/app/packs/stylesheets/decidim/votings/votings/_voting-description-cell.scss

@@ -0,0 +1,29 @@
+.voting-description-cell{
+  .content{
+    height: auto;
+    margin-bottom: 1rem;
+    position: relative;
+    overflow: hidden;
+    transition: max-height .1s linear;
+
+    &::before{
+      background: linear-gradient(transparent, $body-background);
+      bottom: 0;
+      content: " ";
+      display: block;
+      height: 2rem;
+      position: absolute;
+      width: 100%;
+      z-index: 1;
+    }
+
+    &.content__expanded{
+      max-height: 100%;
+      transition: max-height .3s linear;
+    }
+
+    &.content__unexpandable::before{
+      display: none;
+    }
+  }
+}

data/app/permissions/decidim/elections/admin/permissions.rb

@@ -29,6 +29,11 @@ module Decidim
             when :publish
               allow_if_valid_and_not_blocked
             end
+          when :trustees
+            case permission_action.action
+            when :manage
+              toggle_allow(user.admin?)
+            end
           when :trustee_participatory_space
             case permission_action.action
             when :create, :update

data/app/permissions/decidim/elections/permissions.rb

@@ -4,9 +4,18 @@ module Decidim
   module Elections
     class Permissions < Decidim::DefaultPermissions
       def permissions
-        check_view_election_permissions
-
-        toggle_allow(can_answer_feedback?) if permission_action.scope == :public && permission_action.subject == :questionnaire && permission_action.action == :answer
+        if permission_action.scope == :public && permission_action.subject == :election
+          case permission_action.action
+          when :preview
+            toggle_allow(can_preview?)
+          when :view
+            toggle_allow(can_view?)
+          when :vote
+            toggle_allow(can_vote?)
+          when :user_vote
+            toggle_allow(can_vote_with_user?)
+          end
+        end
 
         return permission_action unless user
 
@@ -16,49 +25,25 @@ module Decidim
         # Delegate the trustee_zone permission checks to the trustee zone permissions class
         return Decidim::Elections::TrusteeZone::Permissions.new(user, permission_action, context).permissions if permission_action.scope == :trustee_zone
 
-        return permission_action if permission_action.scope != :public
-        return permission_action if permission_action.subject != :election
-
-        case permission_action.action
-        when :vote
-          toggle_allow(can_vote?)
-        when :preview
-          toggle_allow(can_preview?)
-        end
-
         permission_action
       end
 
       private
 
-      def check_view_election_permissions
-        return unless permission_action.scope == :public &&
-                      permission_action.action == :view &&
-                      permission_action.subject == :election
-
-        toggle_allow(can_view?)
-      end
-
       def can_view?
-        election.published? || user&.admin?
+        election.published? || can_preview?
       end
 
       def can_vote?
-        election.published? && election.ongoing? && authorized_to_vote?
-      end
-
-      def can_preview?
-        user.admin? && !can_vote?
+        election.published? && election.ongoing?
       end
 
-      def authorized_to_vote?
-        authorized?(:vote, resource: election)
+      def can_vote_with_user?
+        can_vote? && user && authorized?(:vote, resource: election)
       end
 
-      def can_answer_feedback?
-        return unless user && election
-
-        authorized_to_vote? && !election.questionnaire.answered_by?(user)
+      def can_preview?
+        user&.admin?
       end
 
       def election

data/app/permissions/decidim/votings/admin/permissions.rb

@@ -6,24 +6,17 @@ module Decidim
       class Permissions < Decidim::DefaultPermissions
         def permissions
           return permission_action unless user
+          return user_allowed_to_read_admin_dashboard? if read_admin_dashboard_action?
           return permission_action unless permission_action.scope == :admin
-
           return permission_action if voting && !voting.is_a?(Decidim::Votings::Voting)
 
-          unless user.admin?
+          unless user_can_read_votings_admin_dashboard?
             disallow!
             return permission_action
           end
 
           user_can_enter_space_area?
-
-          if read_admin_dashboard_action?
-            allow!
-            return permission_action
-          end
-
           allowed_read_participatory_space?
-          allowed_action_on_component?
           allowed_voting_action?
 
           permission_action
@@ -51,61 +44,116 @@ module Decidim
           allow!
         end
 
-        def allowed_action_on_component?
-          return unless permission_action.subject == :component
-
-          allow!
-        end
-
         def allowed_voting_action?
           return unless
           [
             :votings, :voting,
+            :landing_page,
+            :components,
             :polling_station, :polling_stations,
             :polling_officer, :polling_officers,
-            :monitoring_committee_member, :monitoring_committee_members
+            :monitoring_committee_menu, :monitoring_committee_member, :monitoring_committee_members,
+            :monitoring_committee_polling_station_closure, :monitoring_committee_polling_station_closures,
+            :monitoring_committee_verify_elections,
+            :monitoring_committee_election_result, :monitoring_committee_election_results,
+            :census,
+            :ballot_style, :ballot_styles
           ].member? permission_action.subject
 
           case permission_action.subject
           when :votings
-            toggle_allow(user.admin?) if permission_action.action == :read
+            toggle_allow(user_can_read_votings_admin_dashboard?) if permission_action.action == :read
           when :voting
             case permission_action.action
-            when :read, :create, :publish, :unpublish
-              allow!
-            when :update, :preview, :manage_landing_page
-              toggle_allow(voting.present?)
+            when :read, :list, :edit
+              toggle_allow(user_can_read_voting?)
+            when :create, :publish, :unpublish, :update
+              toggle_allow(user.admin?)
+            when :preview
+              toggle_allow(user_can_read_voting? && voting.present?)
+            when :manage_landing_page
+              toggle_allow(user.admin? && voting.present?)
             end
+          when :landing_page
+            toggle_allow(user.admin?) if permission_action.action == :update
+          when :components
+            toggle_allow(user.admin?) if permission_action.action == :read
           when :polling_station
             case permission_action.action
             when :create
-              allow!
+              toggle_allow(user.admin?)
             when :update, :delete
-              toggle_allow(polling_station.present?)
+              toggle_allow(user.admin? && polling_station.present?)
             end
           when :polling_stations
             toggle_allow(user.admin?) if permission_action.action == :read
           when :polling_officer
             case permission_action.action
             when :create
-              allow!
+              toggle_allow(user.admin?)
             when :delete
-              toggle_allow(polling_officer.present?)
+              toggle_allow(user.admin? && polling_officer.present?)
             end
           when :polling_officers
             toggle_allow(user.admin?) if permission_action.action == :read
           when :monitoring_committee_member
             case permission_action.action
             when :create
-              allow!
+              toggle_allow(user.admin?)
             when :delete
-              toggle_allow(monitoring_committee_member.present?)
+              toggle_allow(user.admin? && monitoring_committee_member.present?)
             end
+          when :monitoring_committee_menu
+            toggle_allow(user_can_read_voting?) if permission_action.action == :read
           when :monitoring_committee_members
             toggle_allow(user.admin?) if permission_action.action == :read
+          when :monitoring_committee_polling_station_closure
+            toggle_allow(user_monitoring_committee_for_voting? && closure.present?) if [:read, :validate].member?(permission_action.action)
+          when :monitoring_committee_polling_station_closures
+            toggle_allow(user_monitoring_committee_for_voting?) if permission_action.action == :read
+          when :monitoring_committee_verify_elections
+            toggle_allow(user_monitoring_committee_for_voting?) if permission_action.action == :read
+          when :monitoring_committee_election_result
+            toggle_allow(user_monitoring_committee_for_voting? && election.present?) if [:read, :validate].member?(permission_action.action)
+          when :monitoring_committee_election_results
+            toggle_allow(user_monitoring_committee_for_voting?) if permission_action.action == :read
+          when :census
+            toggle_allow(user.admin?) if permission_action.action == :manage
+          when :ballot_style
+            case permission_action.action
+            when :create
+              toggle_allow(user.admin? && (voting.dataset.blank? || voting.dataset.init_data?))
+            when :update, :delete
+              toggle_allow(user.admin? && (voting.dataset.blank? || voting.dataset.init_data?) && ballot_style.present?)
+            end
+          when :ballot_styles
+            toggle_allow(user.admin?) if permission_action.action == :read
           end
         end
 
+        # Monitoring committee members can access the admin dashboard to manage their votings.
+        def user_allowed_to_read_admin_dashboard?
+          toggle_allow(user_can_read_votings_admin_dashboard?)
+
+          permission_action
+        end
+
+        def user_can_read_votings_admin_dashboard?
+          user.admin? || user_monitoring_committee?
+        end
+
+        def user_can_read_voting?
+          user.admin? || user_monitoring_committee_for_voting?
+        end
+
+        def user_monitoring_committee?
+          Decidim::Votings::MonitoringCommitteeMember.exists?(user: user)
+        end
+
+        def user_monitoring_committee_for_voting?
+          Decidim::Votings::MonitoringCommitteeMember.exists?(user: user, voting: voting)
+        end
+
         def voting
           @voting ||= context.fetch(:voting, nil) || context.fetch(:participatory_space, nil)
         end
@@ -121,6 +169,18 @@ module Decidim
         def monitoring_committee_member
           @monitoring_committee_member ||= context.fetch(:monitoring_committee_member, nil)
         end
+
+        def ballot_style
+          @ballot_style ||= context.fetch(:ballot_style, nil)
+        end
+
+        def closure
+          @closure ||= context.fetch(:closure, nil)
+        end
+
+        def election
+          @election ||= context.fetch(:election, nil)
+        end
       end
     end
   end