decidim-initiatives 0.16.1 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f01f615000b85986bdf06848b2df6a3c1aeea86df4122cdbfc82e5e8c7170cb
-  data.tar.gz: efab1dcf180b9d247bd833c85914d124433c546818ef59fc369546018c8bfbac
+  metadata.gz: f4c9012119c5a0b6e11fccdc1f9677fc52d978be5f851e0f3964a98dafacd791
+  data.tar.gz: 838154148f64d7e43f874cd63cc08202c5c53ca076dcaaf8cf15f8a4303ad7b8
 SHA512:
-  metadata.gz: ebec16964d605c5329438460d314910c2002a1b009c1c9d72626425b320608c8b3bc3540ad9e516ad2c086be6282461a87afb9484267e742ac3742b0cba0ce7d
-  data.tar.gz: fd991f7c6d349b2f6d712dfc165c6134c12e30f36be6c1a2321c085685dc8c19fb5debabc9b9dac397e4658222e498d179f514cc76ea26238437700e8fbd3d65
+  metadata.gz: 03d2fbf7e6d4926257938862c341968508c2dfaf61d05fba34f01c077027b4c724340692f536f76f90d766e61dc08f43ca2014dc201166039eb826c91683d02d
+  data.tar.gz: 5582c16363e8e6ba7c9e298eb01705095990268af934baa5ac6cf77eb56400b0e2a2ee22a5c8dde8ac3745b35408b53902264a7a573fb0db76a596b436d6cdc2

data/app/assets/javascripts/decidim/initiatives/scoped_type.js

@@ -1,12 +1,9 @@
 /* eslint-disable camelcase */
-
-$(document).ready(function () {
-  let typeSelector = $("[data-scope-selector]");
-
-  if (typeSelector.length) {
-    let currentValue = typeSelector.data("scope-id"),
-        searchUrl = typeSelector.data("scope-search-url"),
-        targetElement = $(`#${typeSelector.data("scope-selector")}`);
+let controlSelector = function(source, prefix, currentValueKey) {
+  if (source.length) {
+    let currentValue = source.data(currentValueKey),
+        searchUrl = source.data(`${prefix}-search-url`),
+        targetElement = $(`#${source.data(`${prefix}-selector`)}`);
 
     if (targetElement.length) {
       let refresh = function () {
@@ -15,7 +12,7 @@ $(document).ready(function () {
           cache: false,
           dataType: "html",
           data: {
-            type_id: typeSelector.val(),
+            type_id: source.val(),
             selected: currentValue
           },
           success: function (data) {
@@ -24,8 +21,14 @@ $(document).ready(function () {
         });
       };
 
-      typeSelector.change(refresh);
+      source.change(refresh);
       refresh();
     }
   }
+};
+
+$(document).ready(function () {
+  let typeSelector = $("[data-scope-selector]");
+  controlSelector(typeSelector, "scope", "scope-id");
+  controlSelector(typeSelector, "signature-types", "signature-type");
 });

data/app/assets/stylesheet/decidim/initiatives/initiatives-votes.css.scss

@@ -0,0 +1,97 @@
+@media all{
+  .initiative-title{
+    border: 1pt solid black;
+    margin: 15pt 0;
+    font-size: 12pt;
+    font-weight: bold;
+    text-transform: uppercase;
+    text-align: center;
+  }
+
+  .initiatives-votes-table{
+    width: 100%;
+    display: block;
+    border: 1pt solid black;
+
+    .initiatives-votes-table-header{
+      background-color: lightgray;
+      display: inline-block;
+      width: 100%;
+      font-size: 12pt;
+      font-weight: bold;
+      border-bottom: 1pt solid black;
+    }
+
+    .initiatives-votes-table-row{
+      width: 100%;
+      display: inline-block;
+      min-height: 33pt;
+    }
+
+    .initiatives-votes-table-row::after{
+      content: '';
+      display: inline-block;
+      clear: both;
+    }
+
+    .initiatives-votes-table-row:last-child{
+      border-bottom: 0;
+    }
+
+    .initiatives-votes-table-cell{
+      padding-left: 5pt;
+      word-wrap: break-word;
+      display: inline-block;
+      float: left;
+      min-height: 36pt;
+
+      .cell-content{
+        font-size: 10pt;
+        word-wrap: break-word;
+      }
+    }
+
+    .checkbox-cell{
+      width: 36pt;
+    }
+
+    .initiatives-votes-table-cell:last-child{
+      border-right: 0;
+    }
+
+    .w11{
+      width: 10.8%;
+    }
+
+    .w20{
+      width: 19%;
+    }
+  }
+
+  .no-border{
+    border: none !important;
+  }
+}
+
+@page{
+  size: A4;
+  margin: 17mm 17mm 11mm 11mm;
+}
+
+@media print{
+  .title-bar{
+    display: none;
+  }
+
+  .layout-nav{
+    display: none;
+  }
+
+  .button.expanded{
+    display: none;
+  }
+
+  .page-break{
+    page-break-before: auto;
+  }
+}

data/app/cells/decidim/initiatives/initiative_m_cell.rb

@@ -38,7 +38,7 @@ module Decidim
 
       def authors
         [present(model).author] +
-          model.committee_members.approved.non_deleted.map { |member| present(member.user) }
+          model.committee_members.approved.non_deleted.excluding_author.map { |member| present(member.user) }
       end
     end
   end

data/app/cells/decidim/initiatives_votes/vote/show.erb

@@ -0,0 +1,29 @@
+<div class="initiatives-votes-table-row">
+  <div class="initiatives-votes-table-cell w11">
+    <%= initiative_id %>
+  </div>
+  <div class="initiatives-votes-table-cell w11">
+    <%= initiative_title %>
+  </div>
+  <div class="initiatives-votes-table-cell w11">
+    <%= name_and_surname %>
+  </div>
+  <div class="initiatives-votes-table-cell w11">
+    <%= document_number %>
+  </div>
+  <div class="initiatives-votes-table-cell w11">
+    <%= date_of_birth %>
+  </div>
+  <div class="initiatives-votes-table-cell w11">
+    <%= postal_code %>
+  </div>
+  <div class="initiatives-votes-table-cell w11">
+    <%= time_and_date %>
+  </div>
+  <div class="initiatives-votes-table-cell w11">
+    <%= timestamp %>
+  </div>
+  <div class="initiatives-votes-table-cell w11">
+    <%= hash_id %>
+  </div>
+</div>

data/app/cells/decidim/initiatives_votes/vote_cell.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module Decidim
+  module InitiativesVotes
+    class VoteCell < Decidim::ViewModel
+      delegate :timestamp, :hash_id, to: :model
+
+      def show
+        render
+      end
+
+      def initiative_id
+        model.initiative.reference
+      end
+
+      def initiative_title
+        translated_attribute(model.initiative.title)
+      end
+
+      def name_and_surname
+        metadata[:name_and_surname]
+      end
+
+      def document_number
+        metadata[:document_number]
+      end
+
+      def date_of_birth
+        metadata[:date_of_birth]
+      end
+
+      def postal_code
+        metadata[:postal_code]
+      end
+
+      def time_and_date
+        model.created_at
+      end
+
+      protected
+
+      def encryptor
+        @encryptor ||= Decidim::Initiatives::DataEncryptor.new(secret: "personal user metadata")
+      end
+
+      def metadata
+        @metadata ||= model.encrypted_metadata ? encryptor.decrypt(model.encrypted_metadata) : {}
+      end
+    end
+  end
+end

data/app/commands/decidim/initiatives/admin/create_initiative_type.rb

@@ -39,7 +39,14 @@ module Decidim
             organization: form.current_organization,
             title: form.title,
             description: form.description,
-            banner_image: form.banner_image
+            online_signature_enabled: form.online_signature_enabled,
+            undo_online_signatures_enabled: form.undo_online_signatures_enabled,
+            minimum_committee_members: form.minimum_committee_members,
+            banner_image: form.banner_image,
+            collect_user_extra_fields: form.collect_user_extra_fields,
+            extra_fields_legal_information: form.extra_fields_legal_information,
+            validate_sms_code_on_votes: form.validate_sms_code_on_votes,
+            document_number_authorization_handler: form.document_number_authorization_handler
           )
 
           return initiative_type unless initiative_type.valid?

data/app/commands/decidim/initiatives/admin/update_initiative.rb

@@ -44,18 +44,19 @@ module Decidim
           attrs = {
             title: form.title,
             description: form.description,
-            signature_type: form.signature_type,
-            hashtag: form.hashtag,
-            answer: form.answer,
-            answer_url: form.answer_url
+            hashtag: form.hashtag
           }
 
-          attrs[:answered_at] = Time.current if form.answer.present?
+          if form.signature_type_updatable?
+            attrs[:signature_type] = form.signature_type
+            attrs[:scoped_type_id] = form.scoped_type_id if form.scoped_type_id
+          end
 
           if current_user.admin?
             attrs[:signature_start_date] = form.signature_start_date
             attrs[:signature_end_date] = form.signature_end_date
-            attrs[:offline_votes] = form.offline_votes
+            attrs[:offline_votes] = form.offline_votes if form.offline_votes
+            attrs[:state] = form.state if form.state
 
             if initiative.published?
               @notify_extended = true if form.signature_end_date != initiative.signature_end_date &&

data/app/commands/decidim/initiatives/admin/update_initiative_answer.rb

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Initiatives
+    module Admin
+      # A command with all the business logic to answer
+      # initiatives.
+      class UpdateInitiativeAnswer < Rectify::Command
+        # Public: Initializes the command.
+        #
+        # initiative   - Decidim::Initiative
+        # form         - A form object with the params.
+        # current_user - Decidim::User
+        def initialize(initiative, form, current_user)
+          @form = form
+          @initiative = initiative
+          @current_user = current_user
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid.
+        # - :invalid if the form wasn't valid and we couldn't proceed.
+        #
+        # Returns nothing.
+        def call
+          return broadcast(:invalid) if form.invalid?
+
+          @initiative = Decidim.traceability.update!(
+            initiative,
+            current_user,
+            attributes
+          )
+          notify_initiative_is_extended if @notify_extended
+          broadcast(:ok, initiative)
+        rescue ActiveRecord::RecordInvalid
+          broadcast(:invalid, initiative)
+        end
+
+        private
+
+        attr_reader :form, :initiative, :current_user
+
+        def attributes
+          attrs = {
+            answer: form.answer,
+            answer_url: form.answer_url
+          }
+
+          attrs[:answered_at] = Time.current if form.answer.present?
+
+          if form.signature_dates_required?
+            attrs[:signature_start_date] = form.signature_start_date
+            attrs[:signature_end_date] = form.signature_end_date
+
+            if initiative.published?
+              @notify_extended = true if form.signature_end_date != initiative.signature_end_date &&
+                                         form.signature_end_date > initiative.signature_end_date
+            end
+          end
+
+          attrs
+        end
+
+        def notify_initiative_is_extended
+          Decidim::EventsManager.publish(
+            event: "decidim.events.initiatives.initiative_extended",
+            event_class: Decidim::Initiatives::ExtendInitiativeEvent,
+            resource: initiative,
+            followers: initiative.followers - [initiative.author]
+          )
+        end
+      end
+    end
+  end
+end

data/app/commands/decidim/initiatives/admin/update_initiative_type.rb

@@ -26,6 +26,7 @@ module Decidim
           initiative_type.update(attributes)
 
           if initiative_type.valid?
+            upate_initiatives_signature_type
             broadcast(:ok, initiative_type)
           else
             broadcast(:invalid)
@@ -39,12 +40,27 @@ module Decidim
         def attributes
           result = {
             title: form.title,
-            description: form.description
+            description: form.description,
+            online_signature_enabled: form.online_signature_enabled,
+            undo_online_signatures_enabled: form.undo_online_signatures_enabled,
+            minimum_committee_members: form.minimum_committee_members,
+            collect_user_extra_fields: form.collect_user_extra_fields,
+            extra_fields_legal_information: form.extra_fields_legal_information,
+            validate_sms_code_on_votes: form.validate_sms_code_on_votes,
+            document_number_authorization_handler: form.document_number_authorization_handler
           }
 
           result[:banner_image] = form.banner_image unless form.banner_image.nil?
           result
         end
+
+        def upate_initiatives_signature_type
+          unless initiative_type.online_signature_enabled
+            initiative_type.initiatives.signature_type_updatable.each do |initiative|
+              initiative.update!(signature_type: Initiative.signature_types["offline"])
+            end
+          end
+        end
       end
     end
   end

data/app/commands/decidim/initiatives/create_initiative.rb

@@ -46,6 +46,7 @@ module Decidim
           create_components_for(initiative)
           send_notification(initiative)
           add_author_as_follower(initiative)
+          add_author_as_committee_member(initiative)
         end
 
         initiative
@@ -109,6 +110,17 @@ module Decidim
 
         Decidim::CreateFollow.new(form, current_user).call
       end
+
+      def add_author_as_committee_member(initiative)
+        form = Decidim::Initiatives::CommitteeMemberForm
+               .from_params(initiative_id: initiative.id, user_id: initiative.decidim_author_id, state: "accepted")
+               .with_context(
+                 current_organization: initiative.organization,
+                 current_user: current_user
+               )
+
+        Decidim::Initiatives::SpawnCommitteeRequest.new(form, current_user).call
+      end
     end
   end
 end

data/app/commands/decidim/initiatives/spawn_committee_request.rb

@@ -7,10 +7,10 @@ module Decidim
     class SpawnCommitteeRequest < Rectify::Command
       # Public: Initializes the command.
       #
-      # initiative - Decidim::Initiative
+      # form - Decidim::Initiative::CommitteeMemberForm
       # current_user - Decidim::User
-      def initialize(initiative, current_user)
-        @initiative = initiative
+      def initialize(form, current_user)
+        @form = form
         @current_user = current_user
       end
 
@@ -21,6 +21,7 @@ module Decidim
       #
       # Returns nothing.
       def call
+        return broadcast(:invalid) if form.invalid?
         request = create_request
 
         if request.persisted?
@@ -32,13 +33,13 @@ module Decidim
 
       private
 
-      attr_reader :initiative, :current_user
+      attr_reader :form, :current_user
 
       def create_request
         request = InitiativesCommitteeMember.new(
-          decidim_initiatives_id: initiative&.id,
-          decidim_users_id: current_user&.id,
-          state: "requested"
+          decidim_initiatives_id: form.initiative_id,
+          decidim_users_id: form.user_id,
+          state: form.state
         )
         return request unless request.valid?