[DEMAD-374] Correcciones

AyuntamientoMadrid · Jun 3, 2022 · b75a3c1 · b75a3c1
1 parent 402c104
commit b75a3c1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/app/controllers/admin/legislation/questions_controller.rb b/app/controllers/admin/legislation/questions_controller.rb
@@ -256,13 +256,13 @@ def statistics
     @data_without[:totals] = users_uniq.count
 
     District.all.order(name: :asc).each do |d|
-      aux_count = User.joins(:adress).where("adresses.district = ? and users.id in (?)", d.id.to_s, users_uniq).count
+      aux_count = User.joins(:adress).where("UPPER(adresses.district) = UPPER(?) OR adresses.district = ?  and users.id in (?)",d.name, d.id.to_s, users_uniq).count
       @data_district[:totals] = @data_district[:totals] + aux_count
       @data_district[:options].push({name: d.name, responses: aux_count})
     end
 
     Borought.all.order(name: :asc).each do |d|
-      aux_count = User.joins(:adress).where("adresses.borought = ? and users.id in (?)", d.id.to_s, users_uniq).count
+      aux_count = User.joins(:adress).where("UPPER(adresses.borought) = UPPER(?) OR adresses.borought = ?  and users.id in (?)",d.name, d.id.to_s, users_uniq).count
       @data_borought[:totals] = @data_borought[:totals] + aux_count
       @data_borought[:options].push({name: d.name, responses: aux_count})
     end
@@ -358,13 +358,13 @@ def statistics_generic
     @data_without[:totals] = users_uniq.count
 
     District.all.order(name: :asc).each do |d|
-      aux_count = User.joins(:adress).where("adresses.district = ? and users.id in (?)", d.id.to_s, users_uniq).count
+      aux_count = User.joins(:adress).where("UPPER(adresses.district) = UPPER(?) OR adresses.district = ?  and users.id in (?)",d.name, d.id.to_s, users_uniq).count
       @data_district[:totals] = @data_district[:totals] + aux_count
       @data_district[:options].push({name: d.name, responses: aux_count})
     end
 
     Borought.all.order(name: :asc).each do |d|
-      aux_count = User.joins(:adress).where("adresses.borought = ? and users.id in (?)", d.id.to_s, users_uniq).count
+      aux_count = User.joins(:adress).where("UPPER(adresses.borought) = UPPER(?) OR adresses.borought = ?  and users.id in (?)",d.name, d.id.to_s, users_uniq).count
       @data_borought[:totals] = @data_borought[:totals] + aux_count
       @data_borought[:options].push({name: d.name, responses: aux_count})
     end

diff --git a/app/views/legislation/processes/debate.html.erb b/app/views/legislation/processes/debate.html.erb
@@ -70,9 +70,13 @@
               </div>
             </div>
           <%end%>
-        <% elsif @process.debate_phase.started? and !@process.debate_phase.open? %>
+        <% elsif !@process.debate_phase.open?  %>
           <span class="callout notice alert">
-            <%=t("legislation.questions.not_phase")%>
+            <%=t("legislation.questions.not_started")%>
+          </span>
+        <% else %>
+          <span class="callout notice alert">
+              <%=t("legislation.questions.not_phase")%>
           </span>
         <% end %>
       </div>

diff --git a/config/locales/es/legislation.yml b/config/locales/es/legislation.yml
@@ -110,6 +110,7 @@ es:
         others: Ecosistema
     questions:
       not_phase: No se puede realizar el cuestionario debido a que se ha terminado la fase de consulta
+      not_started: No se puede realizar el cuestionario debido a que aun no ha empezado la fase de consulta
       generate_questions:
         value_other: Otra respuesta
         value_range: Respuesta de un rango