klastera 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6cd1ffdd78e48cf6ed10e49ca9c25aec28b85687edfab45128c19e0fe355bbe6
-  data.tar.gz: b973e72ea86f49cdafdb2651470a6cf9ce4285ba255db1a83ecc0efffb3bd980
+  metadata.gz: 280e925c5270bc97994f02d9a01833a0145faf0a23e7f6d4997d894917e72a6d
+  data.tar.gz: 4f59e0354a9f828f76fe0f07b35fe6edaff61cb5eccd58d910c13044aa776533
 SHA512:
-  metadata.gz: 19db0f35f3a830aaea9e0805a4235ee67ef25713f0cdde55675098d18d2d79ed2eefd9bbfc206b8feba2c4cc0df2d87901a5b2eeae97006aade6142fbcd1f79c
-  data.tar.gz: 8a1092f64ada8807fc6f8db2f2903a59a42a30cccb7b399dd151a2e9e274972c57d0d428a8926d2c2c155df49625e81a4b2165c0c9af15e005a802ebd3826495
+  metadata.gz: 8a06f21fd4e70f4adc24e70aea484c2edf61b4263f6b197da3baeb18409e702caba181212e70876e1138b6bbc22562cb05bd793844d92a6b6dcb70b6a2448159
+  data.tar.gz: 84abb2005421a9aa81acfd33a5f96fe5077841c16287fe0434bdbeadd9427b67a2d0632f57c545b0e77821075713e4953e119451acf4af360512673cbddc6d0f

data/app/controllers/klastera/clusters_controller.rb

@@ -58,7 +58,7 @@ module Klastera
       end
 
       def cluster_params
-        parameters = params.require(:cluster).permit(:nid, :name, :color)
+        parameters = params.require(:cluster).permit(:nid, :name, :color, :order)
         parameters[:organization_id]=current_organization.id
         parameters
       end

data/app/models/klastera/concerns/cluster.rb

@@ -10,7 +10,7 @@ module Klastera::Concerns::Cluster
 
     MODES = [ :suborganization, :required_filter, :optional_filter ].freeze
 
-    default_scope { includes(:organization).order(id: :desc) }
+    default_scope { order(id: :desc) }
     belongs_to :organization, class_name: Klastera.organization_class
 
     scope :all_clusters_of, lambda { |organization,except_ids=[]|

data/app/views/klastera/clusters/_form.html.erb

@@ -9,12 +9,12 @@
       <div class="col-xs-12">
         <%= f.input :nid, as: :string, label: t('klastera.cluster_nid') %>
       </div>
-      <%# <div class="col-xs-12"> %>
-        <%# <%= f.input :organization_id, as: :string, label: t('klastera.organization_name') %>
-      <%# </div> %>
       <div class="col-xs-12">
         <%= f.input :color, as: :string, label: t('klastera.cluster_color'), input_html: { class: 'color-picker'} %>
       </div>
+      <div class="col-xs-12">
+        <%= f.input :order, as: :string, label: t('klastera.cluster_order') %>
+      </div>
     </div>
   </div>
   

data/app/views/klastera/clusters/_table.html.erb

@@ -1,7 +1,9 @@
 <table class="table table-striped table-hover table-condensed table-bordered datatable">
   <thead>
     <tr>
-      <th class="text-center cluster-name"><%=t('klastera.cluster_color')%></th>
+      <th class="text-center cluster-id"><%=t('klastera.cluster_id')%></th>
+      <th class="text-center cluster-order"><%=t('klastera.cluster_order')%></th>
+      <th class="text-center cluster-color"><%=t('klastera.cluster_color')%></th>
       <th class="text-center cluster-name"><%=t('klastera.cluster_name')%></th>
       <th class="text-center cluster-nid"><%=t('klastera.cluster_nid')%></th>
       <th class="cogs-actions four-icons"><span class="fa fa-cogs"></span></th>
@@ -10,9 +12,10 @@
   <tbody>
     <% @clusters.each do |cluster| %>
       <tr>
+        <td class="text-center cluster-id"><%= cluster.id %></td>
+        <td class="text-center cluster-order"><%= cluster.order %></td>
         <td class="text-center cluster-color">
           <i style='<%="color:#{cluster.color}" if cluster.color.present?%>' class="fa fa-square fa-2x<%=' colorless' if cluster.color.blank?%>" aria-hidden="true"></i>
-          <span class="hide"><%=cluster.id%></span>
         </td>
         <td class="text-center cluster-name"><%= cluster.name %></td>
         <td class="text-center cluster-nid"><%= cluster.nid %></td>
@@ -29,6 +32,9 @@
   </tbody>
 </table>
 <style type="text/css">
+  .cluster-id { width: 70px; }
+  .cluster-order { width: 70px; }
+  .cluster-color { width: 70px; }
   .odd .colorless { color: #F9F9F9 }
   .even .colorless { color: #FFF }
   tr:hover .colorless { color: #F5F5F5 }

data/config/locales/es.yml

@@ -12,6 +12,8 @@ es:
       admin: Admin Cliente [ Ignora asignación, ve todos los clusters ]
       user: Usuario normal [ Ve sólo los clusters asignados ]
     using_cluster_as: Usando cluster como
+    cluster_order: Orden
+    cluster_id: ID
     cluster_role: Cluster rol
     cluster_name: Nombre
     cluster_nid: Código

data/db/migrate/20200330221601_add_order_field_to_clusters.rb

@@ -0,0 +1,5 @@
+class AddOrderFieldToClusters < ActiveRecord::Migration
+  def change
+    add_column :clusters, :order, :integer
+  end
+end

data/lib/klastera/version.rb

@@ -1,3 +1,3 @@
 module Klastera
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: klastera
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Gino Barahona
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-30 00:00:00.000000000 Z
+date: 2020-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -85,6 +85,7 @@ files:
 - db/migrate/20200324203929_create_klastera_clusters.rb
 - db/migrate/20200326111219_add_cluster_options_to_organizations.rb
 - db/migrate/20200330010551_create_klastera_cluster_users.rb
+- db/migrate/20200330221601_add_order_field_to_clusters.rb
 - lib/klastera.rb
 - lib/klastera/engine.rb
 - lib/klastera/version.rb