kuppayam 0.1.5dev3 → 0.1.5dev4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 720f3df15058d1f58ce859da896830db4edb5bae
-  data.tar.gz: e7c419fbcfb00e4d2a35f049c98207444f3a14fd
+  metadata.gz: 85f6707e4fd3e6cc5fb402e489820c8a9251be63
+  data.tar.gz: 789034cf9ba14f8aba6513cd9707bb026c4277b7
 SHA512:
-  metadata.gz: ac2e13b0a6f4089d878bea0db754a3b75bd4669d0ebe354c535ef208b834dce3324c7b8200374168012ce534a45fe68232d38414235c181a6f95d99454c47a54
-  data.tar.gz: f751ad4e00be06cd46346c89517831f2daf56b9725f6aa2b4cf7a04a2634ad61967037926800865f8d6b4e4dfd7f0885e60de04153e2174809fe9bb6fc67ce68
+  metadata.gz: 4095f94e3bd48b0b18dcf010b71681ef4139c47daceb8fffe4dae6ac8feeb804c25bac4a5dbbdb87f0ef0912477ac0160b72dd54ba57ccfd2735b445d28ec958
+  data.tar.gz: 55417a161f925d62f0a1ec61d8705af7b830b71c2522bcbc06560d83ea11d4605bdee227b1bdef78e89e99c18bf5648f713c51fd1277395cc2d84c5071c9b1ff

data/app/assets/javascripts/kuppayam.js

@@ -12,6 +12,7 @@
 //
 //= require kuppayam/utilities.js
 //= require bootstrap.min.js
+//= require moment.min.js
 //= require TweenMax.min.js
 //= require resizeable.js
 //= require joinable.js
@@ -21,5 +22,7 @@
 //= require wysihtml5/lib/js/wysihtml5-0.3.0.js
 //= require wysihtml5/src/bootstrap-wysihtml5.js
 //= require toastr/toastr.min.js
+//= require daterangepicker/daterangepicker.js
+//= require multiselect/js/jquery.multi-select.js
 
 

data/app/assets/stylesheets/kuppayam.css

@@ -20,4 +20,5 @@
  *= require kuppayam/handycss.css
  *= require kuppayam/custom.css
  *= require wysihtml5/src/bootstrap-wysihtml5.css
+ *= require multiselect/css/multi-select.css
  */

data/app/helpers/filter_helper.rb

@@ -3,7 +3,6 @@ module FilterHelper
   
   def configure_filters
     configure_filter_settings
-    configure_filter_ui_settings
     configure_filter_param_mapping
   end
 
@@ -98,6 +97,8 @@ module FilterHelper
       options = rpf[:options] || {}
       parse_reference_filter_from_params(rpf[:filter_name], rpf[:filter_class], options)
     end if filter_settings.has_key?(:reference_filters)
+
+    configure_filter_ui_settings
   end
   
   # Use this method to create a filter if the value is in a variable
@@ -329,10 +330,15 @@ module FilterHelper
     end
     selected_text = filter_options[:select_label] unless selected_text
 
-    # Clone the existing filters firs
+    # Clone the existing filters first
     # remove the filters which are to be removed and add which are to be added
     # Also remove the filter which is currently selected
-    temp_filters = filter_options[:current_filters].clone
+
+    unless filter_options[:current_filters].blank?
+      temp_filters = {}
+    else
+      temp_filters = filter_options[:current_filters].clone
+    end
     temp_filters.merge!(filter_options[:filters_to_add])
     temp_filters.reject!{|k,v| filter_options[:filters_to_remove].include?(k)}
     temp_filters.reject!{|k,v| k == filter_name.to_sym }

data/app/helpers/resource_helper.rb

@@ -145,7 +145,7 @@ module ResourceHelper
       item_name: default_item_name,
       class: default_class,
       layout: :table,
-      show_modal_after_update: true,
+      show_modal_after_create: true,
       show_modal_after_update: true,
       view_path: "/kuppayam/workflows/peacock",
       js_view_path: "/kuppayam/workflows/peacock"

data/app/models/kuppayam/application_record.rb

@@ -2,8 +2,7 @@ module Kuppayam
 	class ApplicationRecord < ActiveRecord::Base
 	  self.abstract_class = true
 
-	  require 'kuppayam/importer.rb'
 	  extend Kuppayam::Importer
-	  extend KuppayamValidators
+	  extend Kuppayam::Validators
 	end
 end

data/app/views/kuppayam/filters/_display_dropdown_filters.html.erb

@@ -0,0 +1,11 @@
+<div class="row" id="div_kuppayam_report_filters">
+  <div class="col-md-12">
+    <% @filter_ui_settings.each do |filter_name, options| %>
+      <% if options[:object_filter] == true %>
+        <%= report_object_filter(filter_name, options) %>
+      <% else %>
+        <%= report_filter(filter_name, options) %>
+      <% end %>
+    <% end %>
+  </div>
+</div>

data/app/views/kuppayam/filters/_display_filters.html.erb

@@ -0,0 +1,29 @@
+<div class="mb-20" style="font-size:16px; color: darkred; text-align: left;">Selected Filters</div>
+
+<div class="table-responsive table-scrollable">
+	<table class="table table-striped table-condensed table-bordered"> 
+		<tbody>
+			<tr>
+				<% @filters.each do |name, value| %>
+					<th style="text-align: left;"><%= name.to_s.titleize %></th>
+				<% end %>
+			</tr>
+			<tr>
+				<% @filters.each do |name, value| %>
+					<% 
+						display = case value
+						when ActiveRecord::Base
+							value.display_name
+						when "null", nil
+							"IS NULL"
+						else
+							value.to_s.titleize
+						end
+						#display = value.is_a?(ActiveRecord::Base) ? value.display_name : value.to_s 
+					%>
+					<td style="text-align: left;"><%= display %></td>
+				<% end %>
+			</tr>
+		</tbody> 
+	</table>
+</div>

data/config/initializers/validators.rb

@@ -0,0 +1,78 @@
+module Kuppayam
+  module Validators
+
+    def generate_validation_options(attribute, options)
+      {a: 1}
+      reg_exp = /\A[a-zA-Z1-9\-\ \(\)\.+]*\z/i
+      options.reverse_merge!(
+        presence: true,
+        min_length: 3,
+        max_length: 256,
+        format: reg_exp,
+        uniqueness: false,
+        mandatory: false
+      )
+
+      if options.has_key?(:condition_method) && !options[:condition_method].blank?
+        condition_proc = proc {|obj| obj.send(options[:condition_method])}
+      elsif options.has_key?(:mandatory) && options[:mandatory] == false
+        condition_proc = proc {|obj| !obj.send(attribute).blank?}
+      else
+        condition_proc = nil
+      end
+
+      voptions = {
+        presence: options[:presence],
+        length: { minimum: options[:min_length], maximum: options[:max_length]},
+        format: {:with => options[:format]}
+      }
+      voptions.merge!(uniqueness: options[:uniqueness]) if options[:uniqueness]
+      voptions.merge!(if: condition_proc) if condition_proc
+
+      voptions
+    end
+
+    def validate_string(attribute, **options)
+      voptions = generate_validation_options(attribute, options)
+      validates attribute, **voptions
+    end
+
+    def validate_username(attribute, **options)
+      reg_exp = /\A[a-zA-Z0-9\_\.]*\z/
+      options.merge!(mandatory: true, min_length: 3, max_length: 128, format: reg_exp, :uniqueness => {:case_sensitive => false})
+      voptions = generate_validation_options(attribute, options)
+      validates attribute, **voptions
+    end
+
+    def validate_email(attribute, **options)
+      reg_exp = /\A(|(([A-Za-z0-9]+_+)|([A-Za-z0-9]+\-+)|([A-Za-z0-9]+\.+)|([A-Za-z0-9]+\++))*[A-Za-z0-9]+@((\w+\-+)|(\w+\.))*\w{1,63}\.[a-zA-Z]{2,6})\z/i
+      options.merge!(mandatory: true, format: reg_exp, :uniqueness => {:case_sensitive => false})
+      voptions = generate_validation_options(attribute, options)
+      validates attribute, **voptions
+    end
+
+    # format can be either :us or :indian
+    def validate_phone(attribute, **options)
+      options.reverse_merge!(phone_format: :india)
+      if options[:phone_format] == :us
+        reg_exp = /\A[0-9]{3}[-][0-9]{3}[-][0-9]{4}\z/
+        length = 12
+      else
+        reg_exp = /\A[0-9]{10}\z/
+        length = 10
+      end
+      options.merge!(format: reg_exp, min_length: length, max_length: length)
+      options.reverse_merge!(numericality: true, mandatory: true, uniqueness: true)
+      voptions = generate_validation_options(attribute, options)
+      validates attribute, **voptions
+    end
+
+    def validate_password(attribute, **options)
+      reg_exp = /\A(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9!@$#&*_\.,;:])/
+      options.merge!(mandatory: true, format: reg_exp, min_length: 7, max_length: 256)
+      voptions = generate_validation_options(attribute, options)
+      validates attribute, **voptions
+    end
+
+  end
+end

data/lib/kuppayam/version.rb

@@ -1,3 +1,3 @@
 module Kuppayam
-  VERSION = '0.1.5dev3'
+  VERSION = '0.1.5dev4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuppayam
 version: !ruby/object:Gem::Version
-  version: 0.1.5dev3
+  version: 0.1.5dev4
 platform: ruby
 authors:
 - kpvarma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-07 00:00:00.000000000 Z
+date: 2017-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -351,6 +351,8 @@ files:
 - app/views/kuppayam/documents/edit.js.erb
 - app/views/kuppayam/documents/new.js.erb
 - app/views/kuppayam/documents/update.html.erb
+- app/views/kuppayam/filters/_display_dropdown_filters.html.erb
+- app/views/kuppayam/filters/_display_filters.html.erb
 - app/views/kuppayam/http_status/404.html.erb
 - app/views/kuppayam/images/_action_buttons.html.erb
 - app/views/kuppayam/images/_crop_form.html.erb
@@ -407,8 +409,9 @@ files:
 - app/views/layouts/kuppayam/layout_horizontal_menu.html.erb
 - app/views/layouts/kuppayam/print_a4.html.erb
 - config/initializers/config_center.rb
+- config/initializers/importer.rb
 - config/initializers/inflections.rb
-- config/initializers/kuppayam_validators.rb
+- config/initializers/validators.rb
 - config/locales/kuppayam/general.yml
 - config/routes.rb
 - db/migrate/20170000000000_create_images.rb
@@ -419,7 +422,6 @@ files:
 - lib/kuppayam/action_view/modal_helper.rb
 - lib/kuppayam/action_view/theme_helper.rb
 - lib/kuppayam/engine.rb
-- lib/kuppayam/extras/kuppayam/importer.rb
 - lib/kuppayam/version.rb
 - lib/tasks/kuppayam_tasks.rake
 - vendor/assets/fonts/elusive/css/animation.css

data/config/initializers/kuppayam_validators.rb

@@ -1,76 +0,0 @@
-module KuppayamValidators
-
-  def generate_validation_options(attribute, options)
-    {a: 1}
-    reg_exp = /\A[a-zA-Z1-9\-\ \(\)\.+]*\z/i
-    options.reverse_merge!(
-      presence: true,
-      min_length: 3,
-      max_length: 256,
-      format: reg_exp,
-      uniqueness: false,
-      mandatory: false
-    )
-
-    if options.has_key?(:condition_method) && !options[:condition_method].blank?
-      condition_proc = proc {|obj| obj.send(options[:condition_method])}
-    elsif options.has_key?(:mandatory) && options[:mandatory] == false
-      condition_proc = proc {|obj| !obj.send(attribute).blank?}
-    else
-      condition_proc = nil
-    end
-
-    voptions = {
-      presence: options[:presence],
-      length: { minimum: options[:min_length], maximum: options[:max_length]},
-      format: {:with => options[:format]}
-    }
-    voptions.merge!(uniqueness: options[:uniqueness]) if options[:uniqueness]
-    voptions.merge!(if: condition_proc) if condition_proc
-
-    voptions
-  end
-
-  def validate_string(attribute, **options)
-    voptions = generate_validation_options(attribute, options)
-    validates attribute, **voptions
-  end
-
-  def validate_username(attribute, **options)
-    reg_exp = /\A[a-zA-Z0-9\_\.]*\z/
-    options.merge!(mandatory: true, min_length: 3, max_length: 128, format: reg_exp, :uniqueness => {:case_sensitive => false})
-    voptions = generate_validation_options(attribute, options)
-    validates attribute, **voptions
-  end
-
-  def validate_email(attribute, **options)
-    reg_exp = /\A(|(([A-Za-z0-9]+_+)|([A-Za-z0-9]+\-+)|([A-Za-z0-9]+\.+)|([A-Za-z0-9]+\++))*[A-Za-z0-9]+@((\w+\-+)|(\w+\.))*\w{1,63}\.[a-zA-Z]{2,6})\z/i
-    options.merge!(mandatory: true, format: reg_exp, :uniqueness => {:case_sensitive => false})
-    voptions = generate_validation_options(attribute, options)
-    validates attribute, **voptions
-  end
-
-  # format can be either :us or :indian
-  def validate_phone(attribute, **options)
-    options.reverse_merge!(phone_format: :india)
-    if options[:phone_format] == :us
-      reg_exp = /\A[0-9]{3}[-][0-9]{3}[-][0-9]{4}\z/
-      length = 12
-    else
-      reg_exp = /\A[0-9]{10}\z/
-      length = 10
-    end
-    options.merge!(format: reg_exp, min_length: length, max_length: length)
-    options.reverse_merge!(numericality: true, mandatory: true, uniqueness: true)
-    voptions = generate_validation_options(attribute, options)
-    validates attribute, **voptions
-  end
-
-  def validate_password(attribute, **options)
-    reg_exp = /\A(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9!@$#&*_\.,;:])/
-    options.merge!(mandatory: true, format: reg_exp, min_length: 7, max_length: 256)
-    voptions = generate_validation_options(attribute, options)
-    validates attribute, **voptions
-  end
-
-end