smartkiosk-server 0.10.14 → 0.10.15

data/app/admin/terminals.rb

@@ -49,6 +49,11 @@ ActiveAdmin.register Terminal do
     end
   end
 
+  member_action(:session_records,
+    :method => :get,
+    :title  =>  I18n.t('smartkiosk.admin.panels.terminals.all_session_records')
+  )
+
   member_action(:upgrade_build,
     :method => :get,
     :title => I18n.t('smartkiosk.admin.panels.terminals.upgrade')
@@ -351,6 +356,24 @@ ActiveAdmin.register Terminal do
       end
     end
 
+    panel I18n.t('smartkiosk.admin.panels.terminals.session_records') do
+      table_for(terminal.session_records[0..20], :i18n => SessionRecord) do |t|
+        t.column :started_at do |x|
+          Time.at(x.started_at).strftime("%d.%m.%Y %H:%M:%S")
+        end
+        t.column :upstream
+        t.column :downstream
+        t.column :time
+      end
+
+      div(:class => 'more') do
+        text_node link_to(
+          I18n.t('smartkiosk.admin.panels.terminals.all_session_records'),
+          session_records_admin_terminal_path(terminal.id)
+        )
+      end
+    end
+
     panel I18n.t('activerecord.models.collection.other') do
       table_for(terminal.collections.limit(20), :i18n => Collection) do |t|
         t.column :cash_sum

data/app/controllers/session_records_controller.rb

@@ -0,0 +1,10 @@
+class SessionRecordsController < ApplicationController
+  before_filter :authenticate_terminal
+
+  def create
+    session = @terminal.session_records.create! params[:session_record]
+    render :text => session.id, :status => 200
+  rescue ActiveRecord::RecordInvalid
+    render :text => nil, :status => 400
+  end
+end

data/app/controllers/terminal_pings_controller.rb

@@ -20,7 +20,8 @@ class TerminalPingsController < ApplicationController
           :modified_at   => profile.updated_at
         },
         :orders => @terminal.terminal_orders.unsent.as_json(:only => [:id, :keyword, :args, :created_at]),
-        :update_providers => remote_timestamp.blank? || local_timestamp.to_i > remote_timestamp.to_i # to drop microseconds
+        :update_providers => remote_timestamp.blank? || local_timestamp.to_i > remote_timestamp.to_i, # to drop microseconds
+        :last_session_started_at => @terminal.last_session_started_at
       }
 
       render :json => response

data/app/models/session_record.rb

@@ -0,0 +1,24 @@
+class SessionRecord < ActiveRecord::Base
+  #
+  # RELATIONS
+  #
+  belongs_to :terminal
+
+  #
+  # VALIDATIONS
+  #
+  validates :terminal, :presence => true
+  validates :message_id, :presence => true, :uniqueness => true
+  validates :started_at, :presence => true
+  validates :upstream, :presence => true
+  validates :downstream, :presence => true
+  validates :time, :presence => true
+
+  after_create do
+    if terminal.last_session_started_at.blank? ||
+       self.started_at > terminal.last_session_started_at
+
+      terminal.update_attribute(:last_session_started_at, self.started_at)
+    end
+  end
+end

data/app/models/terminal.rb

@@ -17,6 +17,7 @@ class Terminal < ActiveRecord::Base
   has_many :collections, :order => 'id DESC'
   has_many :payments, :order => 'id DESC'
   has_many :terminal_orders, :order => 'id DESC'
+  has_many :session_records, :order => 'created_at DESC'
 
   list :pings, :marshal => true, :maxlength => 480
 

data/app/views/admin/terminals/session_records.html.arb

@@ -0,0 +1,10 @@
+paginated_collection(terminal.session_records.page(params[:page]).per(15), download_links: false) do
+  table_for(collection, :class => 'index_table index', :i18n => SessionRecord) do |t|
+    t.column :started_at do |x|
+      Time.at(x.started_at).strftime("%d.%m.%Y %H:%M:%S")
+    end
+    t.column :upstream
+    t.column :downstream
+    t.column :time
+  end
+end

data/config/locales/activerecord.ru.yml

@@ -660,4 +660,9 @@ ru:
         item_type: Тип сущности
         item_id: ID сущности
         event: Действие
-        user: Пользователь
+        user: Пользователь
+      session_record:
+        started_at: Время начала
+        upstream: Передано байт
+        downstream: Принято байт
+        time: Время соединения, секунд

data/config/locales/smartkiosk.ru.yml

@@ -78,6 +78,8 @@ ru:
           upgrade: Обновление терминалов
           all_pings: Полная история связи
           pings: История связи
+          all_session_records: Все сессии
+          session_records: Сессии
       terminal_build:
         gems_ready: Готова к деплою
         gems_not_ready: Подготавливается

data/config/routes.rb

@@ -51,4 +51,6 @@ Rails.application.class.routes.draw do
       post :pay
     end
   end
+
+  resources :session_records
 end

data/db/migrate/20130217113617_add_last_session_started_at_to_terminals.rb

@@ -0,0 +1,5 @@
+class AddLastSessionStartedAtToTerminals < ActiveRecord::Migration
+  def change
+    add_column :terminals, :last_session_started_at, :integer, :null => false, :default => 0
+  end
+end

data/db/migrate/20130217113740_create_session_records.rb

@@ -0,0 +1,17 @@
+class CreateSessionRecords < ActiveRecord::Migration
+  def change
+    create_table :session_records do |t|
+      t.belongs_to :terminal
+      t.string     :message_id
+      t.integer    :started_at
+      t.integer    :upstream
+      t.integer    :downstream
+      t.integer    :time
+
+      t.timestamps
+    end
+
+    add_index :session_records, [ :terminal_id, :message_id ], :unique => true
+    add_index :session_records, :created_at
+  end
+end

data/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130108091644) do
+ActiveRecord::Schema.define(:version => 20130217113740) do
 
   create_table "active_admin_comments", :force => true do |t|
     t.string   "resource_id",   :null => false
@@ -350,6 +350,20 @@ ActiveRecord::Schema.define(:version => 20130108091644) do
     t.datetime "updated_at", :null => false
   end
 
+  create_table "session_records", :force => true do |t|
+    t.integer  "terminal_id"
+    t.string   "message_id"
+    t.integer  "started_at"
+    t.integer  "upstream"
+    t.integer  "downstream"
+    t.integer  "time"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+  end
+
+  add_index "session_records", ["created_at"], :name => "index_session_records_on_created_at"
+  add_index "session_records", ["terminal_id", "message_id"], :name => "index_session_records_on_terminal_id_and_message_id", :unique => true
+
   create_table "system_receipt_templates", :force => true do |t|
     t.string   "keyword"
     t.text     "template"
@@ -444,6 +458,9 @@ ActiveRecord::Schema.define(:version => 20130108091644) do
     t.integer  "incomplete_orders_count", :default => 0,         :null => false
     t.datetime "created_at",                                     :null => false
     t.datetime "updated_at",                                     :null => false
+    t.integer  "card_reader_error"
+    t.integer  "watchdog_error"
+    t.integer  "last_session_started_at", :default => 0,         :null => false
   end
 
   add_index "terminals", ["agent_id"], :name => "index_terminals_on_agent_id"

data/lib/smartkiosk/server/version.rb

@@ -1,5 +1,5 @@
 module Smartkiosk
   module Server
-    VERSION = '0.10.14'
+    VERSION = '0.10.15'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartkiosk-server
 version: !ruby/object:Gem::Version
-  version: 0.10.14
+  version: 0.10.15
   prerelease: 
 platform: ruby
 authors:
@@ -113,6 +113,7 @@ files:
 - app/controllers/application_controller.rb
 - app/controllers/collections_controller.rb
 - app/controllers/payments_controller.rb
+- app/controllers/session_records_controller.rb
 - app/controllers/system_receipt_templates_controller.rb
 - app/controllers/terminal_builds_controller.rb
 - app/controllers/terminal_orders_controller.rb
@@ -148,6 +149,7 @@ files:
 - app/models/report_template.rb
 - app/models/revision.rb
 - app/models/role.rb
+- app/models/session_record.rb
 - app/models/system_receipt_template.rb
 - app/models/terminal.rb
 - app/models/terminal_build.rb
@@ -171,6 +173,7 @@ files:
 - app/views/admin/terminal_profiles/_tree.html.haml
 - app/views/admin/terminal_profiles/sort.html.haml
 - app/views/admin/terminals/pings.html.arb
+- app/views/admin/terminals/session_records.html.arb
 - app/views/admin/terminals/upgrade_build.html.arb
 - app/views/layouts/application.html.erb
 - app/views/welcome/index.html.erb
@@ -252,6 +255,8 @@ files:
 - db/migrate/20130104090957_create_terminal_profile_provider_groups.rb
 - db/migrate/20130108091644_create_terminal_profile_promotions.rb
 - db/migrate/20130216173828_add_watchdog_and_card_reader_errors_to_terminals.rb
+- db/migrate/20130217113617_add_last_session_started_at_to_terminals.rb
+- db/migrate/20130217113740_create_session_records.rb
 - db/schema.rb
 - db/seeds.rb
 - db/seeds/receipt_templates/payment.txt
@@ -323,7 +328,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3902194901356889278
+      hash: -211246162211189659
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -332,10 +337,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3902194901356889278
+      hash: -211246162211189659
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Smartkiosk server application