smartkiosk-server 0.11.1 → 0.11.2

data/app/admin/provider_receipt_templates.rb

@@ -13,7 +13,8 @@ ActiveAdmin.register ProviderReceiptTemplate do
   #
   # INDEX
   #
-  filter :providers_id, :as => 'multiple_select', :input_html => { :class => 'chosen' }
+  filter :providers_id, :as => 'multiple_select', :input_html => { :class => 'chosen' },
+    :collection => proc { Provider.rmap }
   filter :created_at
   filter :updated_at
 

data/app/admin/terminals.rb

@@ -118,6 +118,8 @@ ActiveAdmin.register Terminal do
   filter :state, :as => 'multiple_select',
     :collection => proc { I18n.t('smartkiosk.terminal_states').invert },
     :input_html => { :class => 'chosen' }
+  filter :terminal_profile, :as => 'multiple_select', :input_html => { :class => 'chosen' },
+    :collection => proc { TerminalProfile.rmap }
   filter :keyword
   filter :address
   filter :ip
@@ -220,6 +222,7 @@ ActiveAdmin.register Terminal do
 
   show do |terminal|
     attributes_table do
+      row :terminal_profile
       row :agent
       row :keyword
       row :description
@@ -290,7 +293,6 @@ ActiveAdmin.register Terminal do
 
     panel I18n.t('smartkiosk.admin.panels.terminals.juridical') do
       attributes_table_for terminal do
-        row :terminal_profile
         row :sector
         row :contact_name
         row :contact_phone

data/app/assets/javascripts/active_admin.js.coffee

@@ -1,5 +1,16 @@
 # encoding: utf-8
-#= require active_admin/base
+#= require jquery
+#= require jquery-ui
+#= require jquery_ujs
+
+#= require active_admin/lib/namespace
+#= require active_admin/components/jquery.aa.checkbox-toggler
+#= require active_admin/components/jquery.aa.dropdown-menu
+#= require active_admin/components/jquery.aa.popover
+#= require active_admin/components/jquery.aa.table-checkbox-toggler
+#= require active_admin/pages/application
+#= require active_admin/pages/batch_actions
+
 #= require chosen.jquery
 #= require qtip.jquery
 #= require datepicker-ru.jquery

data/app/assets/javascripts/active_admin/pages/application.js.coffee

@@ -0,0 +1,12 @@
+#
+# Active Admin JS
+#
+
+$ ->
+  # Date picker
+  $(".datepicker").datepicker dateFormat: "dd.mm.yy"
+  $(".clear_filters_btn").click ->
+    window.location.search = ""
+    false
+
+  $(".dropdown_button").popover()

data/config/initializers/active_admin.rb

@@ -2,6 +2,7 @@ require 'active_admin/cancan_integration'
 require 'active_admin/views/pages/base_fix'
 require 'active_admin/form_builder_fix'
 require 'active_admin/resource_controller_fix'
+require 'active_admin/inputs/datepicker_input_fix'
 require 'active_admin/inputs/filter_numeric_range_input'
 require 'active_admin/inputs/filter_multiple_select_input'
 require 'active_admin/inputs/filter_date_range_input_fix'

data/lib/active_admin/inputs/datepicker_input_fix.rb

@@ -0,0 +1,14 @@
+module ActiveAdmin
+  module Inputs
+    class DatepickerInput < ::Formtastic::Inputs::StringInput
+      def input_html_options
+        options = super
+        value   = object.send(method)
+
+        options[:class] = [options[:class], "datepicker"].compact.join(' ')
+        options[:value] = value.blank? ? '' : value.strftime("%d.%m.%Y")
+        options
+      end
+    end
+  end
+end

data/lib/active_admin/inputs/filter_date_range_input_fix.rb

@@ -12,12 +12,12 @@ module ActiveAdmin
         end
       end
 
-      def input_html_options(input_name = gt_input_name, extra_class = '')
+      def input_html_options(input_name=gt_input_name, extra_class='')
         current_value = @object.send(input_name)
         { :size => 12,
           :class => "datepicker #{extra_class}",
           :max => 10,
-          :value => current_value.respond_to?(:strftime) ? current_value.strftime("%Y-%m-%d") : "" }
+          :value => current_value.respond_to?(:strftime) ? current_value.strftime("%d.%m.%Y") : "" }
       end
     end
   end

data/lib/seeder.rb

@@ -57,7 +57,7 @@ class Seeder
   end
 
   def seed_terminal_profiles
-    TerminalProfile.make!
+    TerminalProfile.create! :keyword => 'default', :title => 'Основные'
   end
 
   def seed_test_providers

data/lib/smartkiosk/server/version.rb

@@ -1,5 +1,5 @@
 module Smartkiosk
   module Server
-    VERSION = '0.11.1'
+    VERSION = '0.11.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartkiosk-server
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-14 00:00:00.000000000 Z
+date: 2013-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -98,6 +98,7 @@ files:
 - app/assets/images/chosen-sprite.png
 - app/assets/javascripts/active_admin.js.coffee
 - app/assets/javascripts/active_admin/chosen.js.erb.coffee
+- app/assets/javascripts/active_admin/pages/application.js.coffee
 - app/assets/javascripts/active_admin/qtip.js.coffee
 - app/assets/javascripts/active_admin/sortable_forms.js.coffee
 - app/assets/javascripts/application.js
@@ -269,6 +270,7 @@ files:
 - init.rb
 - lib/active_admin/cancan_integration.rb
 - lib/active_admin/form_builder_fix.rb
+- lib/active_admin/inputs/datepicker_input_fix.rb
 - lib/active_admin/inputs/filter_date_range_input_fix.rb
 - lib/active_admin/inputs/filter_multiple_select_input.rb
 - lib/active_admin/inputs/filter_numeric_range_input.rb
@@ -330,7 +332,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2694465880755644150
+      hash: -1222065104892859917
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: