Fix strata position (#26)

RubenBlazquez · web-flow · commit 97f84c7344fb · 2026-03-10T09:36:17.000+01:00
* Fix strata position

* Extract create stratum and substratum methods
diff --git a/app/commands/decidim/stratified_sortitions/admin/create_stratified_sortition.rb b/app/commands/decidim/stratified_sortitions/admin/create_stratified_sortition.rb
@@ -62,7 +62,8 @@ def create_strata(stratified_sortition)
             stratum = Decidim::StratifiedSortitions::Stratum.create!(
               stratified_sortition:,
               name: stratum_form.name,
-              kind: stratum_form.kind
+              kind: stratum_form.kind,
+              position: stratum_form.position
             )
 
             stratum_form.substrata_to_persist.each do |substratum_form|
@@ -71,7 +72,8 @@ def create_strata(stratified_sortition)
                 name: substratum_form.name,
                 value: substratum_form.value,
                 range: substratum_form.range,
-                max_quota_percentage: substratum_form.max_quota_percentage
+                max_quota_percentage: substratum_form.max_quota_percentage,
+                position: substratum_form.position
               )
             end
           end
diff --git a/app/commands/decidim/stratified_sortitions/admin/update_stratified_sortition.rb b/app/commands/decidim/stratified_sortitions/admin/update_stratified_sortition.rb
@@ -91,21 +91,11 @@ def update_strata(stratified_sortition)
                   position: stratum_form.position
                 )
               else
-                stratum_object = Decidim::StratifiedSortitions::Stratum.create!(
-                  stratified_sortition:,
-                  name: stratum_form.name,
-                  kind: stratum_form.kind,
-                  position: stratum_form.position
-                )
+                stratum_object = create_stratum(stratified_sortition, stratum_form)
               end
               update_substrata(stratum_object, stratum_form)
             else
-              stratum_object = Decidim::StratifiedSortitions::Stratum.create!(
-                stratified_sortition:,
-                name: stratum_form.name,
-                kind: stratum_form.kind,
-                position: stratum_form.position
-              )
+              stratum_object = create_stratum(stratified_sortition, stratum_form)
               create_substrata(stratum_object, stratum_form)
             end
           end
@@ -129,29 +119,15 @@ def update_substrata(stratum, stratum_form)
                   value: substratum_form.value,
                   range: substratum_form.range,
                   max_quota_percentage: substratum_form.max_quota_percentage,
-                  position: stratum_form.position
+                  position: substratum_form.position
                 )
                 updated_or_created_ids << substratum.id
               else
-                Decidim::StratifiedSortitions::Substratum.create!(
-                  stratum:,
-                  name: substratum_form.name,
-                  value: substratum_form.value,
-                  range: substratum_form.range,
-                  max_quota_percentage: substratum_form.max_quota_percentage,
-                  position: stratum_form.position
-                )
+                new_substratum = create_substratum(stratum, substratum_form)
                 updated_or_created_ids << new_substratum.id
               end
             else
-              new_substratum = Decidim::StratifiedSortitions::Substratum.create!(
-                stratum:,
-                name: substratum_form.name,
-                value: substratum_form.value,
-                range: substratum_form.range,
-                max_quota_percentage: substratum_form.max_quota_percentage,
-                position: stratum_form.position
-              )
+              new_substratum = create_substratum(stratum, substratum_form)
               updated_or_created_ids << new_substratum.id
             end
           end
@@ -167,17 +143,31 @@ def update_substrata(stratum, stratum_form)
           end
         end
 
+        def create_stratum(stratified_sortition, stratum_form)
+          Decidim::StratifiedSortitions::Stratum.create!(
+            stratified_sortition:,
+            name: stratum_form.name,
+            kind: stratum_form.kind,
+            position: stratum_form.position
+          )
+        end
+
         def create_substrata(stratum, stratum_form)
           stratum_form.substrata_to_persist.each do |substratum_form|
-            Decidim::StratifiedSortitions::Substratum.create!(
-              stratum:,
-              name: substratum_form.name,
-              value: substratum_form.value,
-              range: substratum_form.range,
-              max_quota_percentage: substratum_form.max_quota_percentage
-            )
+            create_substratum(stratum, substratum_form)
           end
         end
+
+        def create_substratum(stratum, substratum_form)
+          Decidim::StratifiedSortitions::Substratum.create!(
+            stratum:,
+            name: substratum_form.name,
+            value: substratum_form.value,
+            range: substratum_form.range,
+            max_quota_percentage: substratum_form.max_quota_percentage,
+            position: substratum_form.position
+          )
+        end
       end
     end
   end
diff --git a/app/controllers/concerns/decidim/stratified_sortitions/strata_charts_data.rb b/app/controllers/concerns/decidim/stratified_sortitions/strata_charts_data.rb
@@ -12,8 +12,8 @@ module StrataChartsData
       private
 
       def strata_data(stratified_sortition)
-        stratified_sortition.strata.map do |stratum|
-          chart_data = stratum.substrata.map do |substratum|
+        stratified_sortition.strata.order(:position).map do |stratum|
+          chart_data = stratum.substrata.order(:position).map do |substratum|
             quota_value = substratum.max_quota_percentage.present? ? substratum.max_quota_percentage.to_f : 0.0
             label_with_percentage = "#{translated_attribute(substratum.name)} (#{quota_value}%)"
             [label_with_percentage, quota_value]
@@ -32,7 +32,7 @@ def candidates_data(stratified_sortition)
       end
 
       def results_data(stratified_sortition)
-        return stratified_sortition.strata.map { |stratum| { stratum:, chart_data: [] } } unless stratified_sortition.panel_portfolio&.sampled?
+        return stratified_sortition.strata.order(:position).map { |stratum| { stratum:, chart_data: [] } } unless stratified_sortition.panel_portfolio&.sampled?
 
         selected_ids = stratified_sortition.panel_portfolio.selected_panel
         participants_distribution_data(stratified_sortition, selected_ids)
@@ -43,7 +43,7 @@ def participants_distribution_data(stratified_sortition, participant_ids)
         by_stratum = group_by_stratum(sample_candidates_stratum)
         by_stratum_and_substratum = group_by_stratum_and_substratum(sample_candidates_stratum)
 
-        stratified_sortition.strata.map do |stratum|
+        stratified_sortition.strata.order(:position).map do |stratum|
           build_stratum_chart(stratum, by_stratum, by_stratum_and_substratum)
         end
       end
@@ -69,7 +69,7 @@ def group_by_stratum_and_substratum(sample_candidates_stratum)
       end
 
       def build_stratum_chart(stratum, by_stratum, by_stratum_and_substratum)
-        substrata = stratum.substrata
+        substrata = stratum.substrata.order(:position)
         total = by_stratum[stratum.id]&.map(&:decidim_stratified_sortitions_sample_participant_id)&.uniq&.count || 0
         chart_data = substrata.map do |substratum|
           build_substratum_chart_row(stratum, substratum, by_stratum_and_substratum, total)
diff --git a/app/controllers/decidim/stratified_sortitions/admin/samples_controller.rb b/app/controllers/decidim/stratified_sortitions/admin/samples_controller.rb
@@ -102,7 +102,7 @@ def generate_template_sample
             I18n.t("decidim.stratified_sortitions.admin.samples.template.personal_data_3"),
             I18n.t("decidim.stratified_sortitions.admin.samples.template.personal_data_4"),
           ]
-          strata = stratified_sortition.strata.order(:id)
+          strata = stratified_sortition.strata.order(:position)
           strata_headers = strata.map do |stratum|
             translated_attribute(stratum.name)
           end
diff --git a/app/forms/decidim/stratified_sortitions/admin/stratified_sortitions_form.rb b/app/forms/decidim/stratified_sortitions/admin/stratified_sortitions_form.rb
@@ -37,7 +37,7 @@ class StratifiedSortitionsForm < Decidim::Form
 
         def map_model(model)
           super
-          self.strata = model.strata.map do |stratum|
+          self.strata = model.strata.order(:position).map do |stratum|
             Decidim::StratifiedSortitions::Admin::StratumForm.from_model(stratum)
           end
         end
diff --git a/app/forms/decidim/stratified_sortitions/admin/stratum_form.rb b/app/forms/decidim/stratified_sortitions/admin/stratum_form.rb
@@ -47,7 +47,7 @@ def substrata=(value)
 
         def map_model(model)
           super
-          self.substrata = model.substrata.map do |substratum|
+          self.substrata = model.substrata.order(:position).map do |substratum|
             Decidim::StratifiedSortitions::Admin::SubstratumForm.from_model(substratum)
           end
         end
diff --git a/app/packs/src/decidim/stratified_sortitions/stratum_fields.js b/app/packs/src/decidim/stratified_sortitions/stratum_fields.js
@@ -13,7 +13,7 @@ $(() => {
     listSelector: ".stratified-sortition-stratum:not(.hidden)",
     labelSelector: ".card-title span:first",
     onPositionComputed: (el, idx) => {
-      $(el).find("input[name$=\\[position\\]]").val(idx);
+      $(el).find("input[name$=\\[position\\]]").not("[name*=substrata]").first().val(idx);
     }
   });
 

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ def generate_template_sample`
`102`	`102`	`I18n.t("decidim.stratified_sortitions.admin.samples.template.personal_data_3"),`
`103`	`103`	`I18n.t("decidim.stratified_sortitions.admin.samples.template.personal_data_4"),`
`104`	`104`	`]`
`105`		`- strata = stratified_sortition.strata.order(:id)`
	`105`	`+ strata = stratified_sortition.strata.order(:position)`
`106`	`106`	`strata_headers = strata.map do \|stratum\|`
`107`	`107`	`translated_attribute(stratum.name)`
`108`	`108`	`end`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ $(() => {`
`13`	`13`	`listSelector: ".stratified-sortition-stratum:not(.hidden)",`
`14`	`14`	`labelSelector: ".card-title span:first",`
`15`	`15`	`onPositionComputed: (el, idx) => {`
`16`		`- $(el).find("input[name$=\\[position\\]]").val(idx);`
	`16`	`+ $(el).find("input[name$=\\[position\\]]").not("[name*=substrata]").first().val(idx);`
`17`	`17`	`}`
`18`	`18`	`});`
`19`	`19`