anoubis 1.0.7 → 1.0.8

data/app/controllers/anoubis/data/setup.rb

@@ -0,0 +1,102 @@
+module Anoubis
+  ##
+  # Module consists all procedures and functons of {DataController}
+  module Data
+    ##
+    # Module setups system parameters for {DataController}
+    module Setup
+      ##
+      # Setups frame data information. It loads menu data, sets titles and tabs of the frame.
+      def setup_frame
+        self.load_menu_data
+        if self.etc.menu
+          self.get_parent_data
+          if self.etc.data.parent
+            self.output.title = self.etc.menu.page_title.sub '%{title}', self.etc.data.parent.sys_title.to_s
+          else
+            self.output.title = self.etc.menu.page_title
+          end
+          self.output.short = self.etc.menu.short_title
+          self.output.mode = self.etc.menu.mode
+          self.output.access = self.etc.menu.access
+        end
+        tabs = self.tabs
+        tabs.each do |key, item|
+          item = self.get_tab key, item
+          self.output.addTab(item)
+        end
+      end
+
+      ##
+      # Setups order for current tab. Parameters is set into {Anoubis::Etc::TabItem#sort self.etc.tab.sort} and
+      # {Anoubis::Etc::TabItem#order self.etc.tab.order} attributes.
+      def setup_order
+        sort = nil
+        first = nil
+        self.etc.data.fields.each do |key, field|
+          if field.order
+            first = key if !first
+            first = key if field.order.default
+            if params.key? :sort
+              sort = key if params[:sort] == key.to_s
+            end
+          end
+        end
+        sort = first if !sort
+        if sort
+          self.etc.tab.sort = sort.to_s
+          self.etc.tab.order = self.etc.data.fields[sort].order.order
+          if params.key? :order
+            self.etc.tab.order = :desc if params[:order] == 'desc'
+            self.etc.tab.order = :asc if params[:order] == 'asc'
+          end
+        end
+      end
+
+      ##
+      # @!group Block of fields setup functions
+
+      ##
+      # Setups defined fields and places it into attribute {Anoubis::Etc::Data#fields self.etc.data.fields}
+      def setup_fields
+        if !self.etc.data.fields
+          self.etc.data.fields = {}
+
+          fields = self.fields
+
+          fields.each_key do |key|
+            if fields[key].key? :edit
+              if self.menu_access fields[key][:edit], false
+                fields[key][:editable] = fields[key][:edit]
+              end
+            end
+            self.etc.data.fields[key] = Anoubis::Etc::Field.new(key, self.get_model, fields[key].merge(action: self.etc.action))
+          end
+          self.setup_order if %w[index export].include? self.etc.action
+        end
+      end
+
+      ##
+      # Setups additional parameters for table field with type 'datetime'
+      # Resulting data placed in {Etc::Data#fields self.etc.data.fields} (Hash)
+      # @param key [Symbol] key of table field.
+      def setup_fields_datetime (key)
+        self.etc.data.fields[key][:format] = 'full' if !self.etc.data.fields[key].has_key? :format
+        self.etc.data.fields[key][:format] = 'full' if !['full', 'month', 'date', 'datetime'].include? self.etc.data.fields[key][:format]
+      end
+
+
+
+      ##
+      # Setups additional parameters for table field with type 'float'
+      # Resulting data placed in {Etc::Data#fields self.etc.data.fields} (Hash)
+      # @param key [Symbol] key of table field.
+      def setup_fields_float (key)
+        self.etc.data.fields[key][:precision] = 2 if !self.etc.data.fields[key][:precision]
+        self.etc.data.fields[key][:point] = ',' if !self.etc.data.fields[key][:point]
+        self.etc.data.fields[key][:separator] = '' if !self.etc.data.fields[key][:separator]
+      end
+      # @!endgroup
+    end
+  end
+end

data/app/controllers/anoubis/data_controller.rb

@@ -1,5 +1,21 @@
+require_dependency "anoubis/data/actions"
+require_dependency "anoubis/data/load"
+require_dependency "anoubis/data/get"
+require_dependency "anoubis/data/set"
+require_dependency "anoubis/data/setup"
+require_dependency "anoubis/data/defaults"
+require_dependency "anoubis/data/convert"
+require_dependency "anoubis/data/callbacks"
+
 ##
 # Main data controller class
 class Anoubis::DataController < Anoubis::ApplicationController
-
+  include Anoubis::Data::Actions
+  include Anoubis::Data::Load
+  include Anoubis::Data::Get
+  include Anoubis::Data::Set
+  include Anoubis::Data::Setup
+  include Anoubis::Data::Defaults
+  include Anoubis::Data::Convert
+  include Anoubis::Data::Callbacks
 end

data/app/controllers/anoubis/output/basic.rb

@@ -30,7 +30,7 @@ module Anoubis
         self.result = 0
         self.tab = ''
         self.messages = {
-            '0': I18n.t('success'),
+            '0': I18n.t('anoubis.success'),
             '-1': I18n.t('errors.access_not_allowed'),
             '-2': I18n.t('errors.incorrect_parameters')
         }

data/app/controllers/anoubis/sso/server/login_controller.rb

@@ -23,7 +23,7 @@ class Anoubis::Sso::Server::LoginController < Anoubis::Sso::Server::ApplicationC
 
     result = {
       result: 0,
-      message: I18n.t('core.success')
+      message: I18n.t('anoubis.success')
     }
     code = 200
 
@@ -107,7 +107,7 @@ class Anoubis::Sso::Server::LoginController < Anoubis::Sso::Server::ApplicationC
   def create
     result = {
       result: 0,
-      message: I18n.t('core.success')
+      message: I18n.t('anoubis.success')
     }
     code = 200
 
@@ -155,7 +155,7 @@ class Anoubis::Sso::Server::LoginController < Anoubis::Sso::Server::ApplicationC
   def update
     result = {
       result: 0,
-      message: I18n.t('core.success')
+      message: I18n.t('anoubis.success')
     }
 
     if self.system
@@ -213,7 +213,7 @@ class Anoubis::Sso::Server::LoginController < Anoubis::Sso::Server::ApplicationC
   def destroy
     result = {
       result: 0,
-      message: I18n.t('core.success')
+      message: I18n.t('anoubis.success')
     }
 
     begin
@@ -263,7 +263,7 @@ class Anoubis::Sso::Server::LoginController < Anoubis::Sso::Server::ApplicationC
   def show
     result = {
       result: 0,
-      message: I18n.t('core.success')
+      message: I18n.t('anoubis.success')
     }
 
     if self.system

data/app/controllers/anoubis/sso/server/user_controller.rb

@@ -6,7 +6,7 @@ class Anoubis::Sso::Server::UserController < Anoubis::Sso::Server::ApplicationCo
   def show
     result = {
       result: 0,
-      message: I18n.t('anubis.core.success')
+      message: I18n.t('anoubis.success')
     }
     code = 200
 
@@ -25,7 +25,7 @@ class Anoubis::Sso::Server::UserController < Anoubis::Sso::Server::ApplicationCo
   def update
     result = {
       result: 0,
-      message: I18n.t('anubis.core.success')
+      message: I18n.t('anoubis.success')
     }
     code = 200
 

data/app/models/anoubis/application_record.rb

@@ -123,4 +123,11 @@ class Anoubis::ApplicationRecord < ActiveRecord::Base
     end
     result
   end
+
+  ##
+  # Returns system title of table element
+  # @return [String] System title
+  def sys_title
+    id.to_s
+  end
 end

data/config/locales/ru.yml

@@ -39,6 +39,8 @@ ru:
     all: "Все"
     success: "Успешное завершение"
     error: "Ошибка"
+    default_tab: "Основная"
+    default_tab_hint: "Это основная вкладка"
     errors:
       incorrect_login: "Некорректный логин или пароль"
       session_expired: "Сессия завершена"
@@ -66,8 +68,7 @@ ru:
         incorrect_parameters: Некорректные параметры
         error_changing_data: Ошибка изменения данных
 
-    default_tab: Основная
-    default_tab_hint: Это основная вкладка
+
     months:
       main:
         - Январь

data/lib/anoubis/version.rb

@@ -1,5 +1,5 @@
 module Anoubis
   ##
   # Anoubis current version
-  VERSION = '1.0.7'
+  VERSION = '1.0.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: anoubis
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Andrey Ryabov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-21 00:00:00.000000000 Z
+date: 2022-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -149,18 +149,17 @@ files:
 - Rakefile
 - app/controllers/anoubis/application_controller.rb
 - app/controllers/anoubis/core/application_controller.rb
-- app/controllers/anoubis/core/data/actions.rb
-- app/controllers/anoubis/core/data/callbacks.rb
-- app/controllers/anoubis/core/data/convert.rb
-- app/controllers/anoubis/core/data/defaults.rb
-- app/controllers/anoubis/core/data/get.rb
-- app/controllers/anoubis/core/data/load.rb
-- app/controllers/anoubis/core/data/set.rb
-- app/controllers/anoubis/core/data/setup.rb
-- app/controllers/anoubis/core/data_controller.rb
 - app/controllers/anoubis/core/index/actions.rb
 - app/controllers/anoubis/core/index/callbacks.rb
 - app/controllers/anoubis/core/index_controller.rb
+- app/controllers/anoubis/data/actions.rb
+- app/controllers/anoubis/data/callbacks.rb
+- app/controllers/anoubis/data/convert.rb
+- app/controllers/anoubis/data/defaults.rb
+- app/controllers/anoubis/data/get.rb
+- app/controllers/anoubis/data/load.rb
+- app/controllers/anoubis/data/set.rb
+- app/controllers/anoubis/data/setup.rb
 - app/controllers/anoubis/data_controller.rb
 - app/controllers/anoubis/etc.rb
 - app/controllers/anoubis/etc/base.rb
@@ -183,15 +182,6 @@ files:
 - app/controllers/anoubis/output/menu.rb
 - app/controllers/anoubis/output/update.rb
 - app/controllers/anoubis/sso/client/application_controller.rb
-- app/controllers/anoubis/sso/client/data/actions.rb
-- app/controllers/anoubis/sso/client/data/callbacks.rb
-- app/controllers/anoubis/sso/client/data/convert.rb
-- app/controllers/anoubis/sso/client/data/defaults.rb
-- app/controllers/anoubis/sso/client/data/get.rb
-- app/controllers/anoubis/sso/client/data/load.rb
-- app/controllers/anoubis/sso/client/data/set.rb
-- app/controllers/anoubis/sso/client/data/setup.rb
-- app/controllers/anoubis/sso/client/data_controller.rb
 - app/controllers/anoubis/sso/client/index/actions.rb
 - app/controllers/anoubis/sso/client/index/callbacks.rb
 - app/controllers/anoubis/sso/client/index_controller.rb
@@ -199,15 +189,6 @@ files:
 - app/controllers/anoubis/sso/server/login_controller.rb
 - app/controllers/anoubis/sso/server/user_controller.rb
 - app/controllers/anoubis/tenant/application_controller.rb
-- app/controllers/anoubis/tenant/data/actions.rb
-- app/controllers/anoubis/tenant/data/callbacks.rb
-- app/controllers/anoubis/tenant/data/convert.rb
-- app/controllers/anoubis/tenant/data/defaults.rb
-- app/controllers/anoubis/tenant/data/get.rb
-- app/controllers/anoubis/tenant/data/load.rb
-- app/controllers/anoubis/tenant/data/set.rb
-- app/controllers/anoubis/tenant/data/setup.rb
-- app/controllers/anoubis/tenant/data_controller.rb
 - app/controllers/anoubis/tenant/index/actions.rb
 - app/controllers/anoubis/tenant/index/callbacks.rb
 - app/controllers/anoubis/tenant/index_controller.rb
@@ -340,7 +321,7 @@ metadata:
   homepage_uri: https://github.com/RA-Company/
   source_code_uri: https://github.com/RA-Company/anoubis
   changelog_uri: https://github.com/RA-Company/anoubis/blob/main/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/anoubis/1.0.7
+  documentation_uri: https://www.rubydoc.info/gems/anoubis/1.0.8
 post_install_message: 
 rdoc_options: []
 require_paths: