sinatra-hexacta 0.9.12 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc4e539f65371ebb4d52b73e185f6d41bf0576d568ca371150b6bbe9e4d0c49c
-  data.tar.gz: 841dc6b738b38f5afcdbf7b73dc23c9d57a7d7111d890c6f7457ee7fb8cfb82b
+  metadata.gz: df6a0ef3c8ba7cdd6d652d08a0c930519dca2aec379bd3275d24fb99f839129e
+  data.tar.gz: c47bab0989ad1a159a308cdc3c229c121293e6d483b14dce97efe0ced18474aa
 SHA512:
-  metadata.gz: 2240105d063c417614628c4ae4da5e9e4271d4d9e290d1aafba2421c9c7fff265bc5b519f99ff6281fb193755f166ae85ee657c23167ddf68f856c0ac83fe5cc
-  data.tar.gz: 643d0ac518473058ba06466037125019ff852fe03cfaf71b0b9cd1700c224fee5e80b77cc9df42a564c6d5d4102c87d33456e64a91881d947b3c6b3a5c21fa9e
+  metadata.gz: fafe733141d4516b0f0b360097ad195b638fced57dce48fd5fefe1fd0b968ef54afeae4720744827e60ae3742d8ed1870063eb30e9c71c9ee4072ffd9f246353
+  data.tar.gz: d19d3fb7fdc997ad5a4fddefcb1680e4b07e9bc7270b1373617b6688a8ca45ebffd68e706f78bd96ba2acaeff1def4e3488466da11bd53c55dd4b8d0ca3458a1

data/lib/sinatra/extensions/antiquity.rb

@@ -5,16 +5,16 @@ class Antiquity
     @periods = periods.sort { |a,b| a.start_date <=> b.start_date }
   end
 
-  def days
-    @periods.inject(0) { |total, period| total + period.days }
+  def days(upto_date=Date.today)
+    @periods.inject(0) { |total, period| total + period.days(upto_date) }
   end
 
-  def months
-    @periods.inject(0) { |total, period| total + period.months }
+  def months(upto_date=Date.today)
+    @periods.inject(0) { |total, period| total + period.months(upto_date) }
   end
 
-  def years
-    months.divmod(12).first
+  def years(upto_date=Date.today)
+    months(upto_date).divmod(12).first
   end
 
   def to_s(upto_date=Date.today)
@@ -22,11 +22,13 @@ class Antiquity
     result = ""
     return result if @periods.empty?
     if date >= @periods.first.start_date
-      result += years > 1 ? "#{years} años" : "#{years} año" unless years == 0
-      result += ", " if years >= 1 && !(months.modulo(12).eql?(0))
-      result += months.modulo(12) > 1 ? "#{months.modulo(12)} meses" : "#{months.modulo(12)} mes" unless months.modulo(12) == 0
-      result += "#{(date - @periods.last.start_date).to_i} dias" if months.modulo(12) == 0 && years == 0 && date > @periods.last.start_date
-      result += "Hoy!" if months.modulo(12) == 0 && date == @periods.last.start_date
+      years_upto_date = years(date)
+      months_upto_date = months(date)
+      result += years_upto_date > 1 ? "#{years_upto_date} años" : "#{years_upto_date} año" unless years_upto_date == 0
+      result += ", " if years_upto_date >= 1 && !(months_upto_date.modulo(12).eql?(0))
+      result += months_upto_date.modulo(12) > 1 ? "#{months_upto_date.modulo(12)} meses" : "#{months_upto_date.modulo(12)} mes" unless months_upto_date.modulo(12) == 0
+      result += "#{(date - @periods.last.start_date).to_i} dias" if months_upto_date.modulo(12) == 0 && years_upto_date == 0 && date > @periods.last.start_date
+      result += "Hoy!" if months_upto_date.modulo(12) == 0 && date == @periods.last.start_date
     end
     result += "En unos días..." if date < @periods.first.start_date
     result

data/lib/sinatra/extensions/processmanager.rb

@@ -3,6 +3,7 @@
 class AsyncProcess
   include SuckerPunch::Job
   attr_reader :handler
+  attr_reader :user_id
 end
 
 class ExampleProcess < AsyncProcess
@@ -25,10 +26,10 @@ end
 
 class ProcessHandler
 
-  attr_reader :log, :error, :interrupted, :name, :id, :performed, :total, :clazz
+  attr_reader :log, :error, :interrupted, :name, :id, :performed, :total, :clazz, :user_id
   attr_accessor :total
 
-  def initialize(id, name, clazz)
+  def initialize(id, name, clazz, user_id)
     @id = id
     @total = 0
     @performed = 0
@@ -37,6 +38,7 @@ class ProcessHandler
     @interrupted = false
     @name = name
     @clazz = clazz
+    @user_id = user_id
   end
 
   def progress
@@ -74,21 +76,22 @@ class ProcessManager
     @handlers = []
   end
 
-  def find(clazz)
-    @handlers.find { |handler| handler.clazz == clazz }
+  def find(clazz,user_id)
+    @handlers.find { |handler| handler.clazz == clazz && handler.user_id == user_id }
   end
 
   def run(*args)
-    clean(args.first.to_s)
-    if !running?(args.first.to_s)
-      handler = ProcessHandler.new(rand(1..100000000), args.first.name, args.first.to_s)
+    user_id = args[1][:user_id]
+    clean(args.first.to_s,user_id)
+    if !running?(args.first.to_s,user_id)
+      handler = ProcessHandler.new(rand(1..100000000), args.first.name, args.first.to_s, user_id)
       clazz = args.first
       args[0] = handler
       clazz.perform_async(*args)
       @handlers << handler
       handler
     else
-      find(args.first.to_s)
+      find(args.first.to_s,user_id)
     end
   end
 
@@ -96,15 +99,15 @@ class ProcessManager
     @handlers -= [handler]
   end
 
-  def clean(clazz)
-    @handlers.select { |handler| handler.clazz == clazz }.each do |handler|
+  def clean(clazz,user_id)
+    @handlers.select { |handler| handler.clazz == clazz && handler.user_id == user_id }.each do |handler|
       handler.interrupt
       self.finish(handler)
     end
   end
 
-  def running?(clazz)
-    !@handlers.select { |handler| handler.clazz == clazz }.empty?
+  def running?(clazz,user_id)
+    !@handlers.select { |handler| handler.clazz == clazz && handler.user_id == user_id }.empty?
   end
 
 end

data/lib/sinatra/handlers/constants.rb

@@ -0,0 +1,49 @@
+# encoding: utf-8
+module Sinatra
+  module ConstantHandler
+    extend Hexacta
+
+    def enable_constants
+      p "Enabling constants..."
+
+      before '/constant*' do
+        error(403) if authenticated(User).permissions.empty? && authenticated(User).recruiter.nil?
+      end
+
+      get '/constants' do
+        params[:format] = 'group' if params[:format].nil?
+        query = Constant.where(:kind => Constant.descendants.collect { |constant_class| constant_class.to_s })
+        slim :"#{Hexacta::GEM_FILE_DIR}/constants/#{params[:format]}", locals: { :constants => query.order(:kind,:value).all, :total => query.count, :filters => params, :query => query }
+      end
+
+      post '/constant' do
+        attributes = params.select { |attribute| Constant.columns.include?(attribute.to_sym) }
+        if params[:values].nil?
+          constant = Constant.create(attributes)
+        else
+          for value in params[:values].split(',')
+            attributes[:value] = value
+            constant = Constant.find_or_create(attributes)
+          end
+        end
+        redirect back
+      end
+
+      post '/constants/:id' do |id|
+        constant = Constant.find(:id => id.to_i)
+        constant.update_fields(params, Constant.columns, :missing=>:skip)
+        constant.save #This is import to force before save
+        redirect back
+      end
+
+      delete '/constants/:id' do |id|
+        constant = Constant.find(:id => id.to_i)
+        constant.destroy.to_hash.to_json
+      end
+
+    end
+
+  end
+
+  register ConstantHandler
+end

data/lib/sinatra/handlers/init.rb

@@ -4,3 +4,4 @@ require_relative 'notifications'
 require_relative 'params'
 require_relative 'reports'
 require_relative 'processes'
+require_relative 'constants'

data/lib/sinatra/handlers/processes.rb

@@ -7,17 +7,19 @@ module Sinatra
       p "Enabling processes..."
 
       get '/processes' do
-        return "" if ProcessManager.instance.find(params[:class]).nil?
+        return "" if ProcessManager.instance.find(params[:class],authenticated(User).id).nil?
         content_type :json
-        return { 'name' => ProcessManager.instance.find(params[:class]).name, 'progress' => ProcessManager.instance.find(params[:class]).progress }.to_json
+        process = ProcessManager.instance.find(params[:class],authenticated(User).id)
+        return { 'name' => process.name, 'progress' => process.progress }.to_json
       end
 
       post '/processes/:clazz' do |clazz|
-        ProcessManager.instance.clean(clazz)
+        ProcessManager.instance.clean(clazz,authenticated(User).id)
         200
       end
 
       post '/process' do
+        params[:user_id] = authenticated(User).id
         klass = Object.const_get("#{params[:class]}")
         a_handler = ProcessManager.instance.run(klass,params)
         a_handler.to_json

data/lib/sinatra/views/charts/bar.slim

@@ -1,56 +1,59 @@
-.ct-chart.bar-chart id="#{id}"
+-if labels.empty? || series.empty?
+  == empty_alert({ :title => "Sin datos suficientes", :message => "No hay suficientes datos para mostrar esta información."})
+-else
+  .ct-chart.bar-chart id="#{id}"
 
-.table-responsive.chart-table
-  table.table.table-striped
-    tbody
-      tr
-        -for label in labels
-          th #{label}
-      -for serie in series
+  .table-responsive.chart-table
+    table.table.table-striped
+      tbody
         tr
-          -for element in serie
-            td #{element}
+          -for label in labels
+            th #{label}
+        -for serie in series
+          tr
+            -for element in serie
+              td #{element}
 
 
-javascript:
-  var labels = #{{labels}};
-  var series = #{{series}};
+  javascript:
+    var labels = #{{labels}};
+    var series = #{{series}};
 
-  var options = {
-    seriesBarDistance: 30,
-    fullWidth: true,
-    chartPadding: {
-      right: 40
-    },
-    height: '300px',
-    showLabel: true,
-    plugins: [
-      Chartist.plugins.legend({
-          legendNames: #{{names}},
-      })
-    ]
-  };
+    var options = {
+      seriesBarDistance: 30,
+      fullWidth: true,
+      chartPadding: {
+        right: 40
+      },
+      height: '300px',
+      showLabel: true,
+      plugins: [
+        Chartist.plugins.legend({
+            legendNames: #{{names}},
+        })
+      ]
+    };
 
-  var responsiveOptions = [
-    ['screen and (max-width: 640px)', {
-      seriesBarDistance: 5,
-      axisX: {
-        labelInterpolationFnc: function (value) {
-          return value[0];
+    var responsiveOptions = [
+      ['screen and (max-width: 640px)', {
+        seriesBarDistance: 5,
+        axisX: {
+          labelInterpolationFnc: function (value) {
+            return value[0];
+          }
         }
-      }
-    }]
-  ];
+      }]
+    ];
 
-  new Chartist.Bar("##{id}", {
-      labels: labels,
-      series: series
-    },
-    options,
-    responsiveOptions
-  );
+    new Chartist.Bar("##{id}", {
+        labels: labels,
+        series: series
+      },
+      options,
+      responsiveOptions
+    );
 
-css:
-  ##{{id}} .ct-bar {
-    stroke-width:  #{{100/(labels.count*series.count)}}%
-  }
+  css:
+    ##{{id}} .ct-bar {
+      stroke-width:  #{{100/(labels.count*series.count)}}%
+    }

data/lib/sinatra/views/charts/pie.slim

@@ -9,6 +9,10 @@
       tr
         -for element in serie
           td #{element}
+      tr
+        -total = [1,serie.reduce(:+)].max
+        -for element in serie
+          td #{(element.to_f*100/total).round(0)}%
 
 javascript:
   var labels = #{{labels}};
@@ -25,7 +29,7 @@ javascript:
         Chartist.plugins.legend()
       ]
     }
-    );
+  );
 
 css:
   .pie .ct-legend.ct-legend-inside {

data/lib/sinatra/views/charts/stacked_bar.slim

@@ -18,8 +18,8 @@ javascript:
   var series = #{{series}};
 
   new Chartist.Bar("##{id}", {
-      labels: labels,
-      series: series
+    labels: labels,
+    series: series
   }, {
     stackBars: true,
     axisY: {

data/lib/sinatra/views/constants/group.slim

@@ -0,0 +1,59 @@
+.block-header
+  h2 
+    | Constantes
+
+-grouped_constants = constants.group_by { |constant| constant.kind }
+-for kind in grouped_constants.keys
+  .card.m-b-5
+    .card-header style="padding: 20px;"
+      .media
+        .media-body.m-t-0
+          .row
+            .col-md-3
+              h2
+                small.m-0 Tipo de constante
+                h5.m-0 #{grouped_constants[kind].first.name}
+                small.m-0 #{grouped_constants[kind].count} valores
+            .col-md-9
+              -for constant in grouped_constants[kind]
+                a.btn.btn-link.bgm-lightgray.m-5.c-gray onclick="editConstant(#{constant.id},'#{constant.kind}','#{constant.value}')"
+                  .di-block.v-middle #{constant.value}
+
+.footer-text
+  a.text.btn.bgm-white.c-gray data-toggle="modal" data-target="#new-constant" Nueva constante
+
+a.btn.btn-float.bgm-blue.m-btn.waves-effect.waves-circle.waves-float data-toggle="modal" data-target="#new-constant"
+  i.zmdi.zmdi-plus
+
+== slim :'sinatra-hexacta/constants/new'
+
+
+.modal.fade id="edit-constant" tabindex="-1" role="dialog" aria-labelledby="editConstant"
+  .modal-dialog
+    form.modal-content method="POST" data-toggle="validator"
+      .modal-content
+        .modal-header
+          h4.modal-title Editar constante
+        .modal-body
+          .row
+            .col-sm-12
+              == select_input({ :id => 'edit_kind', :name => "kind", :elements => [{ :value => nil, :text => 'Elige tipo de constante' }] + (Constant.descendants).collect { |constant_class| { :value => constant_class, :text => constant_class.new.name } }.uniq, :placeholder => "Tipo de constante", :chosen => nil, :required => true })
+            .col-sm-12
+              == input({ :id => 'edit_value', :name => "value", :title => "Valor", :type => 'text', :value => nil, :required => true })
+        .modal-footer
+          a.btn.waves-effect.bgm-red#delete.pull-left.c-white Borrar
+          button.btn.btn-link.waves-effect data-dismiss="modal" type="button" Cerrar
+          button.btn.btn-link.waves-effect type="submit" Actualizar
+
+
+javascript:
+  function editConstant(constant_id,kind,value) {
+    $('#edit-constant .action').attr('action', '/constants/' + constant_id);
+
+    $('#edit-constant #edit_kind').val(kind);
+    $('#edit-constant #edit_value').val(value);
+
+    $('#edit-constant #edit_kind').trigger("chosen:updated");
+    $('#edit-constant #delete').attr("onclick","rm_object('constants','"+ constant_id +"')");
+    $('#edit-constant').modal('show');
+  }

data/lib/sinatra/views/constants/new.slim

@@ -0,0 +1,35 @@
+.modal.fade id="new-constant" tabindex="-1" role="dialog" aria-labelledby="newConstant"
+  .modal-dialog.modal-lg
+    .row
+      .col-xs-4
+        form.modal-content action="/constant" method="POST" data-toggle="validator"
+          .modal-content
+            .modal-header
+              h4.modal-title Nueva constante
+            .modal-body
+              .row
+                .col-sm-12
+                  == select_input({ :name => "kind", :elements => [{ :value => nil, :text => 'Elige tipo de constante' }] + (Constant.descendants).collect { |constant_class| { :value => constant_class, :text => constant_class.new.name } }.uniq, :placeholder => "Tipo de constante", :selected_elements => nil, :required => true })
+                .col-sm-12
+                  == input({:name => "value", :title => "Valor", :type => 'text', :value => '', :required => true })
+            .modal-footer
+              button.btn.btn-link.waves-effect data-dismiss="modal" type="button" Cerrar
+              button.btn.btn-link.waves-effect type="submit" Crear
+
+      .col-xs-8
+        form.modal-content action="/constant" method="POST" data-toggle="validator"
+          .modal-content
+            .modal-header
+              h4.modal-title Nuevas constantes
+            .modal-body
+              .row
+                .col-sm-12
+                  == select_input({ :name => "kind", :elements => [{ :value => nil, :text => 'Elige tipo de constante' }] + (Constant.descendants).collect { |constant_class| { :value => constant_class, :text => constant_class.new.name } }.uniq, :placeholder => "Tipo de constante", :selected_elements => nil, :required => true })
+                .col-sm-12
+                  == input({:name => "values", :title => "Valores separados por coma", :type => 'text', :value => '', :required => true })
+            .modal-footer
+              button.btn.btn-link.waves-effect data-dismiss="modal" type="button" Cerrar
+              button.btn.btn-link.waves-effect type="submit" Crear
+        br
+        .modal-content
+          == slim info_alert({ :title => 'Creación masiva', :message => "Separa por coma los valores para crear multiples constantes de una sola vez."})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-hexacta
 version: !ruby/object:Gem::Version
-  version: 0.9.12
+  version: 1.1.0
 platform: ruby
 authors:
 - Marco Zanger
@@ -83,6 +83,7 @@ files:
 - lib/sinatra/extensions/menu.rb
 - lib/sinatra/extensions/notification.rb
 - lib/sinatra/extensions/processmanager.rb
+- lib/sinatra/handlers/constants.rb
 - lib/sinatra/handlers/errors.rb
 - lib/sinatra/handlers/init.rb
 - lib/sinatra/handlers/notifications.rb
@@ -163,7 +164,6 @@ files:
 - lib/sinatra/public/vendors/malihu-custom-scrollbar-plugin/mCSB_buttons.png
 - lib/sinatra/public/vendors/material-design-iconic-font/css/material-design-iconic-font.css
 - lib/sinatra/public/vendors/material-design-iconic-font/css/material-design-iconic-font.min.css
-- lib/sinatra/public/vendors/material-design-iconic-font/fonts/Material-Design-Iconic-Font.eot
 - lib/sinatra/public/vendors/material-design-iconic-font/fonts/Material-Design-Iconic-Font.svg
 - lib/sinatra/public/vendors/material-design-iconic-font/fonts/Material-Design-Iconic-Font.ttf
 - lib/sinatra/public/vendors/material-design-iconic-font/fonts/Material-Design-Iconic-Font.woff
@@ -186,6 +186,8 @@ files:
 - lib/sinatra/views/charts/line.slim
 - lib/sinatra/views/charts/pie.slim
 - lib/sinatra/views/charts/stacked_bar.slim
+- lib/sinatra/views/constants/group.slim
+- lib/sinatra/views/constants/new.slim
 - lib/sinatra/views/errors/403.slim
 - lib/sinatra/views/errors/404.slim
 - lib/sinatra/views/errors/500.slim