Improvements in to manage census (#10)

* Change literals to import form

* Improvements in manage census view

Author: RubenBlazquez

app/commands/decidim/stratified_sortitions/admin/import_sample.rb

@@ -7,12 +7,12 @@ module Admin
       class ImportSample < Decidim::Command
         # Public: Initializes the command.
         #
-        # file - The CSV file to import
+        # form - A SampleUploadForm with the file blob
         # stratified_sortition - The stratified sortition to import samples to
         # user - The user performing the import
-        def initialize(file, stratified_sortition, user)
+        def initialize(form, stratified_sortition, user)
           super()
-          @file = file
+          @form = form
           @stratified_sortition = stratified_sortition
           @user = user
         end
@@ -24,8 +24,14 @@ def initialize(file, stratified_sortition, user)
         #
         # Returns nothing.
         def call
+          return broadcast(:invalid) unless @form.valid?
+
+          blob = @form.file
+          file_content = blob.download
+          filename = blob.filename.to_s
+
           Decidim::StratifiedSortitions::Admin::ImportSampleJob
-            .perform_later(@file.read, @file.original_filename, @stratified_sortition, @user)
+            .perform_later(file_content, filename, @stratified_sortition, @user)
           broadcast(:ok)
         end
       end

app/controllers/decidim/stratified_sortitions/admin/samples_controller.rb

@@ -26,7 +26,9 @@ def download_template
         def create
           enforce_permission_to :upload_sample, :stratified_sortition
 
-          Decidim::StratifiedSortitions::Admin::ImportSample.call(params[:file], stratified_sortition, current_user) do
+          @form = form(SampleUploadForm).from_params(params)
+
+          Decidim::StratifiedSortitions::Admin::ImportSample.call(@form, stratified_sortition, current_user) do
             on(:ok) do
               flash[:notice] = I18n.t("sample_imports.create.success", scope: "decidim.stratified_sortitions.admin")
               redirect_to upload_sample_stratified_sortition_path(stratified_sortition)

app/controllers/decidim/stratified_sortitions/admin/stratified_sortitions_controller.rb

@@ -102,6 +102,7 @@ def upload_sample
           enforce_permission_to :upload_sample, :stratified_sortition
           if stratified_sortition.strata_and_substrata_configured?
             @stratified_sortition = stratified_sortition
+            @form = SampleUploadForm.new
             @sample_participants_count = @stratified_sortition.sample_participants.count
             @last_sample = SampleImport.where(stratified_sortition: @stratified_sortition).order(created_at: :desc).first
             @samples = SampleImport.where(stratified_sortition: @stratified_sortition).order(created_at: :asc)

app/forms/decidim/stratified_sortitions/admin/sample_upload_form.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Decidim
+  module StratifiedSortitions
+    module Admin
+      class SampleUploadForm < Decidim::Form
+        include Decidim::HasUploadValidations
+
+        attribute :file, Decidim::Attributes::Blob
+
+        validates :file, presence: true
+      end
+    end
+  end
+end

app/models/decidim/stratified_sortitions/stratified_sortition.rb

@@ -17,6 +17,7 @@ class StratifiedSortition < ApplicationRecord
       component_manifest_name "stratified_sortitions"
 
       has_many :strata, class_name: "Decidim::StratifiedSortitions::Stratum", foreign_key: "decidim_stratified_sortition_id", dependent: :destroy
+      has_many :sample_imports, class_name: "Decidim::StratifiedSortitions::SampleImport", dependent: :destroy
       has_many :sample_participants, class_name: "Decidim::StratifiedSortitions::SampleParticipant", foreign_key: "decidim_stratified_sortition_id", dependent: :destroy
       has_one :panel_portfolio, class_name: "Decidim::StratifiedSortitions::PanelPortfolio", foreign_key: "decidim_stratified_sortitions_stratified_sortition_id",
                                 dependent: :destroy

app/models/decidim/stratified_sortitions/stratum.rb

@@ -10,6 +10,9 @@ class Stratum < ApplicationRecord
 
       belongs_to :stratified_sortition, class_name: "Decidim::StratifiedSortitions::StratifiedSortition", foreign_key: "decidim_stratified_sortition_id"
       has_many :substrata, class_name: "Decidim::StratifiedSortitions::Substratum", foreign_key: "decidim_stratified_sortitions_stratum_id", dependent: :destroy
+      has_many :sample_participant_strata, class_name: "Decidim::StratifiedSortitions::SampleParticipantStratum",
+                                           foreign_key: "decidim_stratified_sortitions_stratum_id",
+                                           dependent: :destroy
 
       KINDS = %w(value numeric_range).freeze
 

app/models/decidim/stratified_sortitions/substratum.rb

@@ -9,6 +9,9 @@ class Substratum < ApplicationRecord
       include Decidim::TranslatableAttributes
 
       belongs_to :stratum, class_name: "Decidim::StratifiedSortitions::Stratum", foreign_key: "decidim_stratified_sortitions_stratum_id"
+      has_many :sample_participant_strata, class_name: "Decidim::StratifiedSortitions::SampleParticipantStratum",
+                                           foreign_key: "decidim_stratified_sortitions_substratum_id",
+                                           dependent: :destroy
 
       translatable_fields :name
     end

app/packs/src/decidim/stratified_sortitions/upload_sample.js

@@ -1,14 +1,16 @@
-document.addEventListener('DOMContentLoaded', () => {
-  const fileInput = document.getElementById('sample-file-input');
-  const submitButton = document.getElementById('sample-submit-button');
+document.addEventListener("DOMContentLoaded", () => {
+  const form = document.getElementById("sample-upload-form");
+  if (!form) return;
 
-  if (!fileInput || !submitButton) return;
+  const modal = form.querySelector("[data-dialog]");
+  if (!modal) return;
 
-  const toggle = () => {
-    const hasFile = fileInput.files && fileInput.files.length > 0;
-    submitButton.disabled = !hasFile;
-  };
+  const saveButton = modal.querySelector("[data-dropzone-save]");
+  if (!saveButton) return;
 
-  toggle();
-  fileInput.addEventListener('change', toggle);
+  saveButton.addEventListener("click", () => {
+    // Allow Decidim's upload_field.js handler to run first (updateActiveUploads),
+    // then submit the form.
+    setTimeout(() => form.submit(), 100);
+  });
 });

app/packs/stylesheets/decidim/stratified_sortitions/admin/stratified_sortitions.scss

@@ -187,4 +187,8 @@ input[readonly] {
       border-bottom: 2px solid rgba(21, 90, 191, 1);
     }
   }
+}
+
+.upload-census-btn {
+  margin: 0 !important;
 }

app/views/decidim/stratified_sortitions/admin/stratified_sortitions/execute.html.erb

@@ -10,7 +10,7 @@
     <button type="button"
             class="button button__sm button__secondary"
             data-dialog-open="confirm-execute-modal"
-            disabled="<%= stratified_sortition.panel_portfolio&.sampled? %>">
+            <%= 'disabled' if stratified_sortition.panel_portfolio&.sampled? %>>
       <%= t('.execute_stratified_sortition') %>
     </button>
     <% if stratified_sortition.panel_portfolio&.sampled? %>