decidim-sortitions 0.28.4 → 0.29.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51387f036a0746cf84e722afecb40b4c6f40ff15b1eb7628da00a96198686c80
-  data.tar.gz: abe7def061cafba9abb3cf606f4d01b3bffca677889f1c0fd8e1cdd06571173c
+  metadata.gz: d9783e97fec8a58e1d45ae868626336d6987eb753bd0868ce2f9789ac97fa051
+  data.tar.gz: c187aea3fb5cbd52fba26352e451a3f3ef50f0797760c1fe2140e00689a575a4
 SHA512:
-  metadata.gz: a05f76d522c640ff227e68c46d796d896271143bfcab305bee7ea26bda3a8550e2985162eba0d10f09f14fe87087b8a6dff9f85d3c41a35c42ffa879b8b0cfb6
-  data.tar.gz: d6c6fdfe83f5fa000cb4fe6038d7c7ae837aa3592e955a37689d711b83b0d871163585d4133f728d5140746362414da2212b603d6765b178b71a16042ad6a97b
+  metadata.gz: 42dd8e23c26e7d125295afc334adf9d623ababca039818fd0ca811f59540e1c6907c8434485802a375fb7bc51fc4b05bd062cd07bf5d4d7c39603e4e1fa3693c
+  data.tar.gz: d6fdab6f444ecc09408232b4cc6018042a28d71de0c6d7ffc78ab91510724cd02b32a85a49dfea95c72a1458ff88b1e3776d74f92548be4465428e3f43fe1bdb

data/app/helpers/decidim/sortitions/admin/sortitions_helper.rb

@@ -7,7 +7,7 @@ module Decidim
         include Decidim::TranslationsHelper
         include Decidim::PaginateHelper
 
-        # Converst a list of components into a list of selectable options
+        # Converts a list of components into a list of selectable options
         def components_options(components)
           components.map do |f|
             [translated_attribute(f.name), f.id]

data/app/models/decidim/sortitions/sortition.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   module Sortitions
-    # Model that encapsulates the parameters of a sortion
+    # Model that encapsulates the parameters of a sortition
     class Sortition < ApplicationRecord
       include Decidim::Resourceable
       include Decidim::HasCategory

data/app/queries/decidim/sortitions/admin/participatory_space_proposals.rb

@@ -18,30 +18,23 @@ module Decidim
           @request_timestamp = sortition.request_timestamp
         end
 
-        # Given a particpiatory process retrieves its proposals
+        # Given a participatory process retrieves its proposals
         #
         # Returns an ActiveRecord::Relation.
         def query
-          if category.nil?
-            return Decidim::Proposals::Proposal
-                   .except_withdrawn
-                   .published
-                   .except_rejected
-                   .not_hidden
-                   .where("decidim_proposals_proposals.created_at < ?", request_timestamp)
-                   .where(component: sortition.decidim_proposals_component)
-                   .order(id: :asc)
-          end
+          proposals = Decidim::Proposals::Proposal
+                      .not_withdrawn
+                      .published
+                      .not_hidden
+                      .where("decidim_proposals_proposals.created_at < ?", request_timestamp)
+                      .where(component: sortition.decidim_proposals_component)
+          proposals = proposals.where.not(id: proposals.only_status(:rejected))
+
+          return proposals.order(id: :asc) if category.nil?
 
           # categorization -> category
-          Decidim::Proposals::Proposal
+          proposals
             .joins(:categorization)
-            .except_withdrawn
-            .published
-            .except_rejected
-            .not_hidden
-            .where(component: sortition.decidim_proposals_component)
-            .where("decidim_proposals_proposals.created_at < ?", request_timestamp)
             .where(decidim_categorizations: { decidim_category_id: category.id })
             .order(id: :asc)
         end

data/app/views/decidim/sortitions/admin/sortitions/index.html.erb

@@ -16,7 +16,7 @@
           <th><%= t("models.sortition.fields.reference", scope: "decidim.sortitions.admin") %></th>
           <th><%= t("models.sortition.fields.title", scope: "decidim.sortitions.admin") %></th>
           <th><%= t("models.sortition.fields.created_at", scope: "decidim.sortitions.admin") %></th>
-          <th class="actions"></th>
+          <th></th>
         </tr>
       </thead>
       <tbody>
@@ -25,9 +25,9 @@
           <td><%= sortition.reference %></td>
           <td>
             <% if allowed_to? :update, :sortition, sortition: sortition %>
-              <%= link_to decidim_html_escape(translated_attribute(sortition.title)), edit_sortition_path(sortition) %>
+              <%= link_to decidim_escape_translated(sortition.title), edit_sortition_path(sortition) %>
             <% else %>
-              <%= decidim_html_escape(translated_attribute(sortition.title)) %>
+              <%= decidim_escape_translated(sortition.title) %>
             <% end %>
           </td>
           <td><%= l sortition.created_at, format: :short %></td>

data/app/views/decidim/sortitions/admin/sortitions/show.html.erb

@@ -2,7 +2,7 @@
 <div class="card" id="sortition">
   <div class="item_show__header">
     <h1 class="item_show__header-title">
-      <%= decidim_html_escape(translated_attribute(sortition.title)) %>
+      <%= decidim_escape_translated(sortition.title) %>
     </h1>
   </div>
   <div class="table-scroll">

data/app/views/decidim/sortitions/sortitions/_linked_sortitions.html.erb

@@ -1,4 +1,4 @@
-<div class="card card--action card--list">
+<div class="card card--action">
   <% resources.each do |sortition| %>
     <div class="card--list__item">
       <div class="card--list__text">
@@ -7,7 +7,7 @@
         <% end %>
         <div>
           <%= link_to resource_locator(sortition).path, class: "card__link" do %>
-            <h5 class="card--list__heading"><%= decidim_html_escape(translated_attribute(sortition.title)) %></h5>
+            <h5 class="card--list__heading"><%= decidim_escape_translated(sortition.title) %></h5>
           <% end %>
           <div class="author">
             <span class="author__avatar">
@@ -19,8 +19,8 @@
           </div>
         </div>
       </div>
-      <div class="card--list__data">
-        <span class="card--list__data__number">
+      <div>
+        <span>
           <%= sortition.selected_proposals.size %>
         </span> <%= t(".selected_proposals", count: proposal.selected_proposals.size) %>
       </div>

data/app/views/decidim/sortitions/sortitions/_sortition_author.html.erb

@@ -1,11 +1,11 @@
-<div class="author-data__main">
-  <div class="author author--inline">
-    <span class="author__avatar author__avatar--small">
+<div>
+  <div class="author">
+    <span class="author__avatar">
       <%= image_tag present(sortition.author).avatar_url %>
     </span>
     <span class="author__name">
       <% if sortition.author&.deleted? %>
-        <span class="label label--small label--basic">
+        <span class="label">
           <%= t(".deleted") %>
         </span>
       <% else %>

data/app/views/decidim/sortitions/sortitions/_sortition_cancel_author.html.erb

@@ -1,11 +1,11 @@
-<div class="author-data__main">
-  <div class="author author--inline">
-    <span class="author__avatar author__avatar--small">
+<div>
+  <div class="author">
+    <span class="author__avatar">
       <%= image_tag present(sortition.cancelled_by_user).avatar_url %>
     </span>
     <span class="author__name">
       <% if sortition.cancelled_by_user&.deleted? %>
-        <span class="label label--small label--basic">
+        <span class="label">
           <%= t(".deleted") %>
         </span>
       <% else %>

data/app/views/decidim/sortitions/sortitions/_tags.html.erb

@@ -1,4 +1,4 @@
-<ul class="tags tags--sortition">
+<ul>
   <li>
     <%= link_to t("filters.active", scope: "decidim.sortitions.sortitions"),
                 sortitions_path(filter: { with_any_state: "active" }) unless sortition.cancelled? %>

data/app/views/decidim/sortitions/sortitions/show.html.erb

@@ -1,6 +1,6 @@
 <% add_decidim_meta_tags({
                            description: decidim_sanitize_editor(translated_attribute(sortition.additional_info)),
-                           title: decidim_html_escape(translated_attribute(sortition.title)),
+                           title: decidim_escape_translated(sortition.title),
                            url: sortition_url(sortition.to_param)
                          }) %>
 
@@ -21,7 +21,7 @@ edit_link(
 
   <section class="layout-main__section layout-main__heading">
     <h1 class="h1 decorator mb-4">
-      <%= decidim_html_escape(translated_attribute(sortition.title)) %>
+      <%= decidim_escape_translated(sortition.title) %>
     </h1>
     <div class="layout-author">
       <%= cell "decidim/author", present(sortition.author), context_actions: [:date], from: sortition, layout: :compact %>

data/config/locales/sv.yml

@@ -3,7 +3,7 @@ sv:
   activemodel:
     attributes:
       sortition:
-        additional_info: Information om lottningen
+        additional_info: Information om tilldelningen
         decidim_category_id: Kategorier för de förslag som du vill tillämpa lottningen på
         decidim_proposals_component_id: Förslagen
         dice: Tärningskast. Slå en sexsidig tärning inför vittnen, eller använd ett annat sätt att slumpmässigt skapa ett tal från 1 till 6, och skriv in resultatet. Detta bidrar till kvalitén och garanterar resultatets slumpmässighet
@@ -11,22 +11,22 @@ sv:
         title: Titel
         witnesses: Vittnen
     models:
-      decidim/sortitions/create_sortition_event: Lottning
+      decidim/sortitions/create_sortition_event: Tilldelning
   activerecord:
     models:
       decidim/sortitions/sortition:
-        one: Lottning
-        other: Lottningar
+        one: Tilldelning
+        other: Tilldelningar
   decidim:
     components:
       sortitions:
         actions:
           comment: Kommentera
-        name: Lottningar
+        name: Tilldelningar
         settings:
           global:
-            comments_enabled: Aktivera kommentarer
-            comments_max_length: Maximal kommentarslängd (ange 0 för att använda standardvärdet)
+            comments_enabled: Kommentarer aktiverade
+            comments_max_length: Maximal längd för kommentarer (Lämna 0 för standardvärde)
     events:
       sortitions:
         sortition_created:
@@ -39,7 +39,6 @@ sv:
         actions:
           destroy: Avbryt tilldelningen
           edit: Redigera
-          new_sortition: Ny lottning
           show: Detaljer om tilldelningen
         models:
           sortition:
@@ -60,10 +59,6 @@ sv:
             title: Avbryta tilldelningen
           create:
             error: Det gick inte att skapa en ny tilldelning.
-            success: Lottningen har skapats.
-          destroy:
-            error: Det går inte att avbryta lottningen.
-            success: Lottningen har avbrutits.
           edit:
             title: Uppdatera informationen om tilldelningen
             update: Uppdatera
@@ -71,16 +66,14 @@ sv:
             all_categories: Alla kategorier
             select_proposal_component: Välj förslagen som ska behandlas
           index:
-            title: Lottningar
+            title: Tilldelningar
           new:
-            confirm: När du trycker på knappen Nästa registrerar Decidim datum och tid (till och med sekunder) och tillsammans med tärningskastet används denna information för att generera ett slumpmässigt val. Åtgärden är oåterkallelig. När du har tryckt på knappen publiceras resultatet av dragningen tillsammans med de uppgifter som angetts i detta formulär och kan inte ändras. Gå igenom innehållet noggrant.
             create: Skapa
             title: Ny tilldelning
           show:
             selected_proposals: Förslag som valts för lottning
           update:
             error: Det gick inte att uppdatera tilldelningen.
-            success: Lottningen har uppdaterats.
       admin_log:
         sortition:
           create: "%{user_name} skapade tilldelningen %{resource_name} i %{space_name}"
@@ -97,8 +90,6 @@ sv:
           cancelled: Avbrutna
           category: Kategori
           state: Status
-        index:
-          empty: Det finns inga lottningar än.
         linked_sortitions:
           selected_proposals: Utvalda förslag
         orders:
@@ -107,8 +98,8 @@ sv:
           recent: Senaste
         results_count:
           count:
-            one: Valt förslaget
-            other: Valda förslag
+            one: valt förslaget
+            other: valda förslag
         show:
           algorithm: Tilldelningens algoritmkod
           any_category: från alla kategorier
@@ -116,9 +107,9 @@ sv:
           candidate_proposal_ids: Förslagens ordning och ID i tilldelningen
           candidate_proposals_info: 'Tilldelningen gjordes bland följande förslag (%{category_label}), med följande ID (de utvalda förslagen i fetstil)  '
           category: från kategorin %{category}
-          dice_result: Tärningsresultat
+          dice_result: (1) Tärningskast
           introduction: 'Den här sidan innehåller resultaten från tilldelningen %{reference}. Med hjälp av tilldelningen har %{target_items} resultat valts ut slumpmässigt och med lika stor sannolikhet från listan med förslag nedan. Tillsammans med resultaten, innehåller informationen på denna sida allt som krävs för att garantera och återskapa resultaten. Nyckeln till kvalitén på tilldelningen är den dubblerade slumpmässigheten från ett bevittnat tärningskast samt den exakta tiden för tilldelningen, som matas in i en algoritm som genererar det slumpmässiga urvalet. Tidsfröet för tilldelningen är så exakt (sekunder) att den är omöjlig att styras av människor, vilket ger en dubblerad "okontrollerad" indata, i syfte att att garantera ett rättvist resultat.  '
-          mathematical_result: Resultat (tärning x dragning)
+          mathematical_result: Resultat (1) x (2)
           proposals_selected_by_sortition: Förslag valda genom tilldelning
           sortition_reproducibility_details: Detaljer för tilldelningens reproducerbarhet
           time_seed: (2) Tidsfrö

data/decidim-sortitions.gemspec

@@ -17,11 +17,11 @@ Gem::Specification.new do |s|
     "homepage_uri" => "https://decidim.org",
     "source_code_uri" => "https://github.com/decidim/decidim"
   }
-  s.required_ruby_version = "~> 3.1.0"
+  s.required_ruby_version = "~> 3.2.0"
 
   s.name = "decidim-sortitions"
   s.summary = "Decidim sortitions module"
-  s.description = "This module makes possible to select amont a set of proposal by sortition"
+  s.description = "This module makes possible to select amount a set of proposal by sortition"
 
   s.files = Dir.chdir(__dir__) do
     `git ls-files -z`.split("\x0").select do |f|

data/lib/decidim/sortitions/admin_engine.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   module Sortitions
-    # This is the engine that runs on the administration interface of `decidim_sorititions`.
+    # This is the engine that runs on the administration interface of `decidim_sortitions`.
     # It mostly handles rendering the created projects associated to a participatory
     # process.
     class AdminEngine < ::Rails::Engine

data/lib/decidim/sortitions/version.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Sortitions
     def self.version
-      "0.28.4"
+      "0.29.0.rc1"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-sortitions
 version: !ruby/object:Gem::Version
-  version: 0.28.4
+  version: 0.29.0.rc1
 platform: ruby
 authors:
 - Juan Salvador Perez Garcia
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-02 00:00:00.000000000 Z
+date: 2024-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-admin
@@ -16,71 +16,71 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.29.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.29.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.29.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.29.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.29.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.29.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.29.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.29.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
+        version: 0.29.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.4
-description: This module makes possible to select amont a set of proposal by sortition
+        version: 0.29.0.rc1
+description: This module makes possible to select amount a set of proposal by sortition
 email:
 - jsperezg@gmail.com
 executables: []
@@ -127,7 +127,6 @@ files:
 - app/views/decidim/sortitions/sortitions/_count.html.erb
 - app/views/decidim/sortitions/sortitions/_linked_sortitions.html.erb
 - app/views/decidim/sortitions/sortitions/_proposal.html.erb
-- app/views/decidim/sortitions/sortitions/_proposal_badge.html.erb
 - app/views/decidim/sortitions/sortitions/_results_count.html.erb
 - app/views/decidim/sortitions/sortitions/_sortition.html.erb
 - app/views/decidim/sortitions/sortitions/_sortition_author.html.erb
@@ -264,14 +263,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Decidim sortitions module

data/app/views/decidim/sortitions/sortitions/_proposal_badge.html.erb

@@ -1,3 +0,0 @@
-<% if proposal.answered? %>
-  <span class="<%= proposal_state_badge_css_class(proposal.state) %> label proposal-status"><%= humanize_proposal_state proposal.state %></span>
-<% end %>