five-two-nw-olivander 0.1.2.25 → 0.1.2.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c84745db767e205f4aec15220fedbd5dd8d4dc3dc973e4a24624e51c59301443
-  data.tar.gz: 635805ef6e29cc864c36afc572811a452205aa947dbcce7bbac914cbb3740ecb
+  metadata.gz: 575201e4ba97a06d33425fffb69b3550f2c3fddc58e1ccb030a827914cbd65f0
+  data.tar.gz: e1570ff90c9a44764ea6c8e5d8b269d6482377c47010c36475eeabbbfcb5e1e1
 SHA512:
-  metadata.gz: a4f3cd18eccd926ef5fbc6e555ffa3450713f1c91647accfe6625d51df3ec2ccf0c11588c6d68f2a441d89087af319604916d5f9cc1368d45c7362f219541522
-  data.tar.gz: 9d9c6ccc4a03f07d14c98f9f20ba3fcc9c5f56cc782f9c7ffd2632bedcf38773cd9a1c981614e184dbefb4d1baea4155f5159827b4789e5bdad54ed3692e9ddf
+  metadata.gz: 97a5958aab8927d392183d9aea8b193491bf346af4a65fadc9faa96a4f57a54478e7a7247060ca0ec84a25fe7b09dd0c063001f5ae8dc50f59bdb03e86b1475a
+  data.tar.gz: 3c237985f2aee2131498cbf501734aa9d517f7827eee5d23fb0549452c0d96aadd2913f66269e937a0ae9b5280654c39d3bd179f203b7f42ea7af49584481b7d

data/app/datatables/olivander/datatable.rb

@@ -18,27 +18,36 @@ module Olivander
     def self.auto_datatable(klazz, collection: nil, link_path: nil, only: [], except: [], hide: [], show: [], order_by: [])
       Rails.logger.debug "initializing datatable for #{klazz}"
 
-      attributes = klazz.new.attributes.collect{ |x| x[0] }
-      attributes &&= only if only.size.positive?
-      attributes -= except if except.size.positive?
+      klazz_attributes = klazz.new.attributes.collect{ |x| x[0] }
+      column_attributes = klazz_attributes
+      column_attributes &&= only if only.size.positive?
+      column_attributes -= except if except.size.positive?
 
       default_hidden = %w[id created updated created_at updated_at deleted_at current_user current_action]
 
       collection do
-        collection.nil? ? klazz.all : collection
+        dc = collection.nil? ? klazz.all : collection
+
+        attributes.each do |att|
+          dc = dc.where("#{att[0]} = ?", att[1]) if klazz_attributes.include?(att[0].to_s)
+        end
+
+        dc
       end
 
       datatable do
         order(order_by[0], order_by[1]) if order_by.size == 2
         bulk_actions_col
-        attributes.each do |key|
+        column_attributes.each do |key|
           label = field_label_for(klazz, key)
-          sym = key.gsub('_id', '').to_sym
+          sym = key.gsub('_id', '')  #.to_sym
           visible = show.include?(key) || !(default_hidden.include?(key) || hide.include?(key))
           if link_path.present? && sym == :id
             link_col sym, link_path, :id, visible: visible
           elsif link_path.present? && sym == :name
             link_col sym, link_path, :id, visible: visible
+          elsif sym.include?('.')
+            col sym, visible: visible, label: label
           else
             col sym, visible: visible, label: label
           end

data/app/helpers/olivander/application_helper.rb

@@ -79,7 +79,8 @@ module Olivander
     end
 
     def field_label_for(resource_class, sym)
-      i18n_key = "activerecord.attributes.#{resource_class.name.underscore}.#{sym}"
+      sym_s = sym.to_s.gsub('.', '_')
+      i18n_key = "activerecord.attributes.#{resource_class.name.underscore}.#{sym_s}"
       return I18n.t(i18n_key) if I18n.exists?(i18n_key)
 
       sym.to_s.titleize
@@ -109,9 +110,41 @@ module Olivander
         (is_dev_environment? ? 'bg-danger' : 'bg-info')
     end
 
+    def header_page_title
+      [is_dev_environment? ? sidebar_context_suffix.upcase : nil, page_title].reject(&:blank?).join(' ')
+    end
+
     def favicon_link
       favicon_path = is_dev_environment? ? '/images/favicon-dev.png' : '/images/favicon.ico'
       favicon_link_tag(image_path(favicon_path))
     end
+
+    def flash_class key
+      case key
+      when "error"
+        "danger"
+      when "notice"
+        "info"
+      when "alert"
+        "danger"
+      else
+        key
+      end
+    end
+
+    def flash_icon key
+      case key
+      when "error"
+        "fas fa-exclamation-circle"
+      when "notice"
+        "fas fa-info-circle"
+      when "alert"
+        "fas fa-info-circle"
+      when "success"
+        "fas fa-check-circle"
+      else
+        "fas fa-question-circle"
+      end
+    end
   end
 end

data/app/views/devise/sessions/new.html.erb

@@ -1,5 +1,5 @@
 <h2>Log in</h2>
-;lkjasd;lkjasdf
+
 <%= simple_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
   <div class="form-inputs">
     <%= f.input :email,

data/app/views/layouts/olivander/adminlte/_head.html.haml

@@ -1,6 +1,6 @@
 %head
   %meta{:content => "text/html; charset=UTF-8", "http-equiv" => "Content-Type"}/
-  %title= page_title
+  %title= header_page_title
   %meta{:content => "width=device-width,initial-scale=1", :name => "viewport"}/
   = favicon_link
   = csrf_meta_tags

data/app/views/layouts/olivander/adminlte/_login_flashes.html.haml

@@ -0,0 +1,4 @@
+- flash.to_hash.slice("alert", "error", "notice", "success").each do |key, value|
+  .span.alert{ class: "alert-#{flash_class(key)}" }
+    %i.icon{ class: flash_icon(key) }
+    = value

data/lib/olivander/version.rb

@@ -1,3 +1,3 @@
 module Olivander
-  VERSION = '0.1.2.25'.freeze
+  VERSION = '0.1.2.27'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: five-two-nw-olivander
 version: !ruby/object:Gem::Version
-  version: 0.1.2.25
+  version: 0.1.2.27
 platform: ruby
 authors:
 - Eric Dennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-28 00:00:00.000000000 Z
+date: 2023-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chartkick