decidim-accountability 0.1.2 → 0.7.0

data/app/services/decidim/accountability/results_calculator.rb

@@ -19,7 +19,7 @@ module Decidim
         # if there are children return the total number of children results
         # if not return the count of results (they are leafs)
         children = results.sum(:children_count)
-        children > 0 ? children : results.count
+        children.positive? ? children : results.count
       end
 
       private

data/app/views/decidim/accountability/admin/results/_form.html.erb

@@ -52,10 +52,6 @@
       </div>
     </div>
 
-    <div class="columns">
-      <%= form.text_field :external_id %>
-    </div>
-
     <div class="row column">
       <% if @form.proposals %>
         <%= form.select :proposal_ids,

data/app/views/decidim/accountability/admin/results/index.html.erb

@@ -3,8 +3,11 @@
     <h2 class="card-title">
       <%= link_to "#{translated_attribute(parent_result.title)} > ", edit_result_path(parent_result) if parent_result %>
       <%= t(".title") %>
-      <%= link_to t("actions.new", scope: "decidim.accountability", name: t("models.result.name", scope: "decidim.accountability.admin")), new_result_path(parent_id: parent_result), class: 'button tiny button--title' if can? :manage, current_feature %>
-      <%= render partial: "decidim/accountability/admin/shared/subnav" unless parent_result %>
+      <div class="button--title">
+        <%= link_to t("actions.new", scope: "decidim.accountability", name: t("models.result.name", scope: "decidim.accountability.admin")), new_result_path(parent_id: parent_result), class: 'button tiny button--simple' if can? :manage, current_feature %>
+        <%= render partial: "decidim/accountability/admin/shared/subnav" unless parent_result %>
+        <%= render partial: "decidim/accountability/admin/shared/extra" %>
+      </div>
     </h2>
   </div>
 

data/app/views/decidim/accountability/admin/shared/_extra.html.erb

@@ -0,0 +1 @@
+<%= export_dropdown %>

data/app/views/decidim/accountability/admin/shared/_subnav.html.erb

@@ -1,3 +1 @@
-<%= link_to t(".import_csv"), new_import_path, class: 'button tiny button--title' %>
-<%= link_to t(".statuses"), statuses_path, class: 'button tiny button--title' %>
-<%= link_to t(".template_texts"), edit_template_texts_path, class: 'button tiny button--title' %>
+<%= link_to t(".statuses"), statuses_path, class: 'button tiny button--simple' %>

data/app/views/decidim/accountability/results/_home_categories.html.erb

@@ -28,14 +28,18 @@
                 <p class="heading3">
                 <%= link_to translated_attribute(category.name),results_path(filter: { category_id: category, scope_id: current_scope }) %></p>
 
-                <div class="progress">
-                  <div class="progress-meter" style="width:<%= progress_calculator(current_scope, category.id) %>%"></div>
-                </div>
+                <% if progress_calculator(current_scope, category.id).present? %>
+                  <div class="progress">
+                    <div class="progress-meter" style="width:<%= progress_calculator(current_scope, category.id) %>%"></div>
+                  </div>
+                <% end %>
 
                 <div class="progress-info">
-                  <div class="progress-figure heading3">
-                    <%= display_percentage progress_calculator(current_scope, category.id) %>
-                  </div>
+                  <% if progress_calculator(current_scope, category.id).present? %>
+                    <div class="progress-figure heading3">
+                      <%= display_percentage progress_calculator(current_scope, category.id) %>
+                    </div>
+                  <% end %>
                   <div class="category--count">
                     <%= display_count(category_results_count) if category_results_count && category_results_count > 0 %>
                   </div>
@@ -51,9 +55,11 @@
                       <div class="category--line">
                         <strong><%= translated_attribute(subcategory.name) %></strong>
 
-                        <div class="progress-figure heading3">
-                          <%= display_percentage progress_calculator(current_scope, subcategory.id) %>
-                        </div>
+                        <% if progress_calculator(current_scope, subcategory.id).present? %>
+                          <div class="progress-figure heading3">
+                            <%= display_percentage progress_calculator(current_scope, subcategory.id) %>
+                          </div>
+                        <% end %>
 
                         <div class="category--count">
                           <%= display_count subcategory_results_count %>

data/app/views/decidim/accountability/results/_home_header.html.erb

@@ -1,24 +1,23 @@
 <div class="intro section">
   <div class="row">
     <div class="small-12 medium-7 columns">
-      <%== translated_attribute template_texts.intro %>
+      <%== translated_attribute feature_settings.intro %>
     </div>
 
-    <div class="small-12 medium-5 columns">
-      <div class="progress-level">
-        <p><%= t(".global_status") %></p>
+    <% if progress_calculator(current_scope, nil).present? %>
+      <div class="small-12 medium-5 columns">
+        <div class="progress-level">
+          <p><%= t(".global_status") %></p>
 
-        <div class="progress">
-          <div class="progress-meter" style="width:<%= progress_calculator(current_scope, nil) %>%"></div>
-        </div>
+          <div class="progress">
+            <div class="progress-meter" style="width:<%= progress_calculator(current_scope, nil) %>%"></div>
+          </div>
 
-        <div class="progress-figure">
-          <%= display_percentage progress_calculator(current_scope, nil) %>
+          <div class="progress-figure">
+            <%= display_percentage progress_calculator(current_scope, nil) %>
+          </div>
         </div>
-
-        <%= link_to t(".csv_download"), csv_path %>
       </div>
-    </div>
-
+    <% end %>
   </div>
 </div>

data/app/views/decidim/accountability/results/_linked_results.html.erb

@@ -2,7 +2,7 @@
   <% resources.each do |result| %>
     <div class="card--list__item">
       <%= icon "actions", class: "card--list__icon", remove_icon_class: true %>
-      <%= link_to decidim_resource_path(result), class: "card--list__text card__link card__link--block" do %>
+      <%= link_to resource_locator(result).path, class: "card--list__text card__link card__link--block" do %>
         <h5 class="card--list__heading">
           <%= translated_attribute(result.title) %>
         </h5>

data/app/views/decidim/accountability/results/_results_leaf.html.erb

@@ -34,9 +34,11 @@
             </div>
           <% end %>
 
-          <div class="card--list__data">
-            <span class="card--list__data__number"><%= display_percentage result.progress %></span>
-          </div>
+          <% if result.progress.present? %>
+            <div class="card--list__data">
+              <span class="card--list__data__number"><%= display_percentage result.progress %></span>
+            </div>
+          <% end%>
         </div>
       <% end %>
     </div>

data/app/views/decidim/accountability/results/_results_parent.html.erb

@@ -19,9 +19,11 @@
             <span class="text-small"><%= heading_leaf_level_results(result.children.count) %></span>
           <% end %>
 
-          <div class="card--list__data">
-            <span class="card--list__data__number"><%= display_percentage result.progress %></span>
-          </div>
+          <% if result.progress.present? %>
+            <div class="card--list__data">
+              <span class="card--list__data__number"><%= display_percentage result.progress %></span>
+            </div>
+          <% end%>
         </div>
       <% end %>
     </div>

data/app/views/decidim/accountability/results/_show_leaf.html.erb

@@ -9,20 +9,22 @@
     </div>
 
     <div class="row">
-      <div class="columns section mediumlarge-3 mediumlarge-push-9">
-        <div class="progress-level">
-          <div class="progress-label">
-            <span class="progress-text"><%= t("models.result.fields.progress", scope: "decidim.accountability") %>:</span>
-            <span class="progress-figure">
-              <%= display_percentage result.progress %>
-            </span>
-          </div>
+      <% if result.progress.present? %>
+        <div class="columns section mediumlarge-3 mediumlarge-push-9">
+          <div class="progress-level">
+            <div class="progress-label">
+              <span class="progress-text"><%= t("models.result.fields.progress", scope: "decidim.accountability") %>:</span>
+              <span class="progress-figure">
+                <%= display_percentage result.progress %>
+              </span>
+            </div>
 
-          <div class="progress">
-            <div class="progress-meter" style="width:<%= result.progress %>%"></div>
+            <div class="progress">
+              <div class="progress-meter" style="width:<%= result.progress %>%"></div>
+            </div>
           </div>
         </div>
-      </div>
+      <% end %>
 
       <div class="columns mediumlarge-9 mediumlarge-pull-3">
         <div class="section">
@@ -61,12 +63,10 @@
       <div class="small-12 mediumlarge-8 large-9 columns">
         <div class="section result-description">
           <%== translated_attribute result.description %>
-          <%= render partial: "tags", locals: { result: result } %>
+          <%= render partial: "decidim/shared/tags", locals: { resource: result, tags_class_extra: "tags--result" } %>
         </div>
       </div>
 
-
-
       <%= render partial: "stats_box" %>
 
       <%= render partial: "timeline", locals: { result: result } if result.timeline_entries.any? %>

data/app/views/decidim/accountability/results/_show_parent.html.erb

@@ -11,7 +11,7 @@
         <div class="description">
           <%== translated_attribute result.description %>
         </div>
-        <%= render partial: "tags", locals: { result: result } %>
+        <%= render partial: "decidim/shared/tags", locals: { resource: result, tags_class_extra: "tags--result" } %>
       </div>
     </div>
 

data/config/locales/ca.yml

@@ -8,33 +8,18 @@ ca:
         decidim_scope_id: Àmbit
         description: Descripció
         end_date: Fi
-        external_id: External ID
         progress: Progrés
         proposal_ids: Propostes incloses
         start_date: Inici
         title: Títol
       status:
         description: Descripció
-        key: Key
+        key: Clau
         name: Nom
         progress: Progrés
-      template_texts:
-        categories_label: Nom per "Categories"
-        heading_leaf_level_results: Nom per "Projectes"
-        heading_parent_level_results: Nom per "Resultats"
-        intro: Text d'introducció
-        subcategories_label: Nom per "Subcategories"
       timeline_entry:
         description: Descripció
         entry_date: Data
-    errors:
-      models:
-        result:
-          attributes:
-            end_date:
-              invalid_date: no vàlida
-            start_date:
-              invalid_date: no vàlida
   decidim:
     accountability:
       actions:
@@ -46,16 +31,8 @@ ca:
         timeline_entries: Evolució del projecte
         title: Accions
       admin:
-        imports:
-          create:
-            invalid: Hi ha hagut un problema en importar aquest fitxer
-            not_found: No s'ha trobat un resultat amb result_id %{result_id}
-            success: El fitxer ha estat importat correctament
-          new:
-            errors: Errors
-            import: Import
-            row_number: Fila
-            title: Importar resultats des de CSV
+        exports:
+          results: Resultats
         models:
           result:
             name: Resultat
@@ -82,9 +59,7 @@ ca:
             success: El resultat ha estat actualitzat correctament
         shared:
           subnav:
-            import_csv: Importa CSV
             statuses: Estats
-            template_texts: Portada
         statuses:
           create:
             invalid: Hi ha hagut un problema en crear aquest estat
@@ -102,15 +77,6 @@ ca:
           update:
             invalid: Hi ha hagut un problema en actualitzar aquest estat
             success: El estat ha estat actualitzat correctament
-        template_texts:
-          edit:
-            title: Actualitza texts
-            update: Actualitza texts
-          form:
-            title: Actualitza texts
-          update:
-            invalid: Hi ha hagut un problema en actualitzar les texts
-            success: Texts ha estat actualitzat correctament
         timeline_entries:
           create:
             invalid: Hi ha hagut un problema en crear aquest element
@@ -139,7 +105,7 @@ ca:
         status:
           fields:
             description: Descripció
-            key: Key
+            key: Clau
             name: Nom
             progress: Progrés
         timeline_entry:
@@ -159,7 +125,6 @@ ca:
           categories_label: Categories
           subcategories_label: Subcategories
         home_header:
-          csv_download: Descarregar dades en CSV
           global_status: Estat d'execució global
         nav_breadcrumb:
           global: Execució global
@@ -180,11 +145,14 @@ ca:
         name: Seguiment
         settings:
           global:
+            categories_label: Nom per a "Categories"
             comments_enabled: Comentaris habilitats
+            heading_leaf_level_results: Nom per a "Projectes"
+            heading_parent_level_results: Nom per a "Resultats"
+            intro: Introducció
+            subcategories_label: Nom per a "Subcategories"
           step:
             comments_blocked: Comentaris bloquejats
     resource_links:
       included_proposals:
         result_proposals: Propostes incloses en aquest resultat
-      meetings_through_proposals:
-        result_meetings: Trobades relacionades

data/config/locales/en.yml

@@ -8,7 +8,6 @@ en:
         decidim_scope_id: Scope
         description: Description
         end_date: End date
-        external_id: External ID
         progress: Progress
         proposal_ids: Included proposals
         start_date: Start date
@@ -18,23 +17,9 @@ en:
         key: Key
         name: Name
         progress: Progress
-      template_texts:
-        categories_label: Name for "Categories"
-        heading_leaf_level_results: Name for "Projects"
-        heading_parent_level_results: Name for "Results"
-        intro: Intro text
-        subcategories_label: Name for "Subcategories"
       timeline_entry:
         description: Description
         entry_date: Date
-    errors:
-      models:
-        result:
-          attributes:
-            end_date:
-              invalid_date: is invalid
-            start_date:
-              invalid_date: is invalid
   decidim:
     accountability:
       actions:
@@ -46,16 +31,8 @@ en:
         timeline_entries: Project evolution
         title: Actions
       admin:
-        imports:
-          create:
-            invalid: There's been a problem importing this file
-            not_found: No result found with result_id %{result_id}
-            success: File successfully imported
-          new:
-            errors: Errors
-            import: Import
-            row_number: Row
-            title: Import results from CSV
+        exports:
+          results: Results
         models:
           result:
             name: Result
@@ -82,9 +59,7 @@ en:
             success: Result successfully updated
         shared:
           subnav:
-            import_csv: Import CSV
             statuses: Statuses
-            template_texts: Template Texts
         statuses:
           create:
             invalid: There's been a problem creating this status
@@ -95,22 +70,13 @@ en:
             title: Edit status
             update: Update status
           index:
-            title: Estats
+            title: Statuses
           new:
             create: Create status
             title: New status
           update:
             invalid: There's been a problem updating this status
             success: Status successfully updated
-        template_texts:
-          edit:
-            title: Update template texts
-            update: Update texts
-          form:
-            title: Update texts
-          update:
-            invalid: There's been a problem updating template texts
-            success: Template texts successfully updated
         timeline_entries:
           create:
             invalid: There's been a problem creating this entry
@@ -159,7 +125,6 @@ en:
           categories_label: Categories
           subcategories_label: Subcategories
         home_header:
-          csv_download: Download data in CSV
           global_status: Global execution status
         nav_breadcrumb:
           global: Global execution
@@ -180,11 +145,14 @@ en:
         name: Accountability
         settings:
           global:
+            categories_label: Name for "Categories"
             comments_enabled: Comments enabled
+            heading_leaf_level_results: Name for "Projects"
+            heading_parent_level_results: Name for "Results"
+            intro: Intro
+            subcategories_label: Name for "Subcategories"
           step:
             comments_blocked: Comments blocked
     resource_links:
       included_proposals:
         result_proposals: Proposals included in this result
-      meetings_through_proposals:
-        result_meetings: Related meetings

data/config/locales/es.yml

@@ -8,33 +8,18 @@ es:
         decidim_scope_id: Ámbito
         description: Descripción
         end_date: Fin
-        external_id: External ID
         progress: Progreso
         proposal_ids: Propuestas incluidas
         start_date: Inicio
         title: Título
       status:
         description: Descripción
-        key: Key
+        key: Clave
         name: Nombre
         progress: Progreso
-      template_texts:
-        categories_label: Nombre para "Categorías"
-        heading_leaf_level_results: Nombre para "Proyectos"
-        heading_parent_level_results: Nombre para "Resultados"
-        intro: Texto de introducción
-        subcategories_label: Nombre para "Subcategorías"
       timeline_entry:
         description: Descripción
         entry_date: Fecha
-    errors:
-      models:
-        result:
-          attributes:
-            end_date:
-              invalid_date: no válida
-            start_date:
-              invalid_date: no válida
   decidim:
     accountability:
       actions:
@@ -46,16 +31,8 @@ es:
         timeline_entries: Evolución del proyecto
         title: Acciones
       admin:
-        imports:
-          create:
-            invalid: Ha habido un problema al importar este fichero
-            not_found: No se ha encontrado ningún resultado con result_id %{result_id}
-            success: El fichero ha sido importado correctamente
-          new:
-            errors: Errores
-            import: Importar
-            row_number: Fila
-            title: Importar resultados desde CSV
+        exports:
+          results: Resultados
         models:
           result:
             name: Resultado
@@ -82,9 +59,7 @@ es:
             success: El resultado ha actualizado correctamente
         shared:
           subnav:
-            import_csv: Import CSV
             statuses: Estados
-            template_texts: Portada
         statuses:
           create:
             invalid: Ha habido un problema al crear este estado
@@ -102,15 +77,6 @@ es:
           update:
             invalid: Ha habido un problema al actualizar este estado
             success: El estado ha actualizado correctamente
-        template_texts:
-          edit:
-            title: Actualizar textos
-            update: Actualizar textos
-          form:
-            title: Actualizar textos
-          update:
-            invalid: Ha habido un problema al actualizar los textos
-            success: Los textos se han actualizado correctamente
         timeline_entries:
           create:
             invalid: Ha habido un problema al crear este elemento
@@ -139,7 +105,7 @@ es:
         status:
           fields:
             description: Descripción
-            key: Key
+            key: Clave
             name: Nombre
             progress: Progreso
         timeline_entry:
@@ -159,7 +125,6 @@ es:
           categories_label: Categorías
           subcategories_label: Subcategorías
         home_header:
-          csv_download: Descargar datos en CSV
           global_status: Estado de ejecución global
         nav_breadcrumb:
           global: Ejecución global
@@ -180,11 +145,14 @@ es:
         name: Seguimiento
         settings:
           global:
+            categories_label: Nombre para "Categorías"
             comments_enabled: Comentarios habilitados
+            heading_leaf_level_results: Nombre para "Proyectos"
+            heading_parent_level_results: Nombre para "Resultados"
+            intro: Introducción
+            subcategories_label: Nombre para "Subcategorías"
           step:
             comments_blocked: Comentarios bloqueados
     resource_links:
       included_proposals:
         result_proposals: Propuestas incluidas en este resultado
-      meetings_through_proposals:
-        result_meetings: Encuentros relacionados