redmine_crm 0.0.40 → 0.0.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cec54924c890caa40b9affa944a8cf4186e4ca7c
-  data.tar.gz: 1b0b5395bc2f1e5f2c03ee4504725a6cbb153b57
+  metadata.gz: 937d5d243e43f7d09a1d11db2a8fb5b7201484dc
+  data.tar.gz: fc0ed270797f455ebaddbc14f6ea74d1d56eb43f
 SHA512:
-  metadata.gz: 2cbb08c06c06fa75356b93d25a23483f776b1c96a9f505f1ace7a54ae6123057dc1972145a93dd0632cf3ac8c8260c88513ec9d333f5912d4c39653d5a1c7406
-  data.tar.gz: 29c51f79b3d048c7d4ad59ff48be8f2757c85230fb1b5aa082fa4d07033d867142f3331d804363c10567d0f7aadfca404f273570f0056eb6ae440d7cb6291e60
+  metadata.gz: 77fc48be16fbba575c32f035af43aa4d0ec3e595f29b30364b62c3565dc4c600f5d809b839c62a779a5cb2cfa577f496205ebb2bb3d49bbc4ee06f4b72dd6c45
+  data.tar.gz: f45297ba257bd057cb6ad5073998fcd58bf3f99048a364b6d78967846d03c9d04d47af85407209b3df976168c706dc20fa2b8bd8c6146e679dfaf82154a54b62

data/lib/redmine_crm.rb

@@ -19,10 +19,12 @@ require 'redmine_crm/acts_as_draftable/draft'
 require 'redmine_crm/currency'
 require 'redmine_crm/helpers/tags_helper'
 require 'redmine_crm/money_helper'
+require 'redmine_crm/colors_helper'
 
 require 'liquid'
 require 'redmine_crm/liquid/filters/base'
 require 'redmine_crm/liquid/filters/arrays'
+require 'redmine_crm/liquid/filters/colors'
 require 'redmine_crm/liquid/drops/issues_drop'
 require 'redmine_crm/liquid/drops/news_drop'
 require 'redmine_crm/liquid/drops/projects_drop'

data/lib/redmine_crm/colors_helper.rb

@@ -0,0 +1,192 @@
+module RedmineCrm
+  class ColorsHelper
+    NAMED_COLORS = {
+      'aliceblue' => 'f0f8ff',
+      'antiquewhite' => 'faebd7',
+      'aqua' => '00ffff',
+      'aquamarine' => '7fffd4',
+      'azure' => 'f0ffff',
+      'beige' => 'f5f5dc',
+      'bisque' => 'ffe4c4',
+      'black' => '000',
+      'blanchedalmond' => 'ffebcd',
+      'blue' => '0000ff',
+      'blueviolet' => '8a2be2',
+      'brown' => 'a52a2a',
+      'burlywood' => 'deb887',
+      'burntsienna' => 'ea7e5d',
+      'cadetblue' => '5f9ea0',
+      'chartreuse' => '7fff00',
+      'chocolate' => 'd2691e',
+      'coral' => 'ff7f50',
+      'cornflowerblue' => '6495ed',
+      'cornsilk' => 'fff8dc',
+      'crimson' => 'dc143c',
+      'cyan' => '00ffff',
+      'darkblue' => '00008b',
+      'darkcyan' => '008b8b',
+      'darkgoldenrod' => 'b8860b',
+      'darkgray' => 'a9a9a9',
+      'darkgreen' => '006400',
+      'darkgrey' => 'a9a9a9',
+      'darkkhaki' => 'bdb76b',
+      'darkmagenta' => '8b008b',
+      'darkolivegreen' => '556b2f',
+      'darkorange' => 'ff8c00',
+      'darkorchid' => '9932cc',
+      'darkred' => '8b0000',
+      'darksalmon' => 'e9967a',
+      'darkseagreen' => '8fbc8f',
+      'darkslateblue' => '483d8b',
+      'darkslategray' => '2f4f4f',
+      'darkslategrey' => '2f4f4f',
+      'darkturquoise' => '00ced1',
+      'darkviolet' => '9400d3',
+      'deeppink' => 'ff1493',
+      'deepskyblue' => '00bfff',
+      'dimgray' => '696969',
+      'dimgrey' => '696969',
+      'dodgerblue' => '1e90ff',
+      'firebrick' => 'b22222',
+      'floralwhite' => 'fffaf0',
+      'forestgreen' => '228b22',
+      'fuchsia' => 'ff00ff',
+      'gainsboro' => 'dcdcdc',
+      'ghostwhite' => 'f8f8ff',
+      'gold' => 'ffd700',
+      'goldenrod' => 'daa520',
+      'gray' => '808080',
+      'green' => '008000',
+      'greenyellow' => 'adff2f',
+      'grey' => '808080',
+      'honeydew' => 'f0fff0',
+      'hotpink' => 'ff69b4',
+      'indianred' => 'cd5c5c',
+      'indigo' => '4b0082',
+      'ivory' => 'fffff0',
+      'khaki' => 'f0e68c',
+      'lavender' => 'e6e6fa',
+      'lavenderblush' => 'fff0f5',
+      'lawngreen' => '7cfc00',
+      'lemonchiffon' => 'fffacd',
+      'lightblue' => 'add8e6',
+      'lightcoral' => 'f08080',
+      'lightcyan' => 'e0ffff',
+      'lightgoldenrodyellow' => 'fafad2',
+      'lightgray' => 'd3d3d3',
+      'lightgreen' => '90ee90',
+      'lightgrey' => 'd3d3d3',
+      'lightpink' => 'ffb6c1',
+      'lightsalmon' => 'ffa07a',
+      'lightseagreen' => '20b2aa',
+      'lightskyblue' => '87cefa',
+      'lightslategray' => '789',
+      'lightslategrey' => '789',
+      'lightsteelblue' => 'b0c4de',
+      'lightyellow' => 'ffffe0',
+      'lime' => '00ff00',
+      'limegreen' => '32cd32',
+      'linen' => 'faf0e6',
+      'magenta' => 'ff00ff',
+      'maroon' => '800000',
+      'mediumaquamarine' => '66cdaa',
+      'mediumblue' => '0000cd',
+      'mediumorchid' => 'ba55d3',
+      'mediumpurple' => '9370db',
+      'mediumseagreen' => '3cb371',
+      'mediumslateblue' => '7b68ee',
+      'mediumspringgreen' => '00fa9a',
+      'mediumturquoise' => '48d1cc',
+      'mediumvioletred' => 'c71585',
+      'midnightblue' => '191970',
+      'mintcream' => 'f5fffa',
+      'mistyrose' => 'ffe4e1',
+      'moccasin' => 'ffe4b5',
+      'navajowhite' => 'ffdead',
+      'navy' => '000080',
+      'oldlace' => 'fdf5e6',
+      'olive' => '808000',
+      'olivedrab' => '6b8e23',
+      'orange' => 'ffa500',
+      'orangered' => 'ff4500',
+      'orchid' => 'da70d6',
+      'palegoldenrod' => 'eee8aa',
+      'palegreen' => '98fb98',
+      'paleturquoise' => 'afeeee',
+      'palevioletred' => 'db7093',
+      'papayawhip' => 'ffefd5',
+      'peachpuff' => 'ffdab9',
+      'peru' => 'cd853f',
+      'pink' => 'ffc0cb',
+      'plum' => 'dda0dd',
+      'powderblue' => 'b0e0e6',
+      'purple' => '800080',
+      'rebeccapurple' => '663399',
+      'red' => 'ff0000',
+      'rosybrown' => 'bc8f8f',
+      'royalblue' => '4169e1',
+      'saddlebrown' => '8b4513',
+      'salmon' => 'fa8072',
+      'sandybrown' => 'f4a460',
+      'seagreen' => '2e8b57',
+      'seashell' => 'fff5ee',
+      'sienna' => 'a0522d',
+      'silver' => 'c0c0c0',
+      'skyblue' => '87ceeb',
+      'slateblue' => '6a5acd',
+      'slategray' => '708090',
+      'slategrey' => '708090',
+      'snow' => 'fffafa',
+      'springgreen' => '00ff7f',
+      'steelblue' => '4682b4',
+      'tan' => 'd2b48c',
+      'teal' => '008080',
+      'thistle' => 'd8bfd8',
+      'tomato' => 'ff6347',
+      'turquoise' => '40e0d0',
+      'violet' => 'ee82ee',
+      'wheat' => 'f5deb3',
+      'white' => 'fff',
+      'whitesmoke' => 'f5f5f5',
+      'yellow' => 'ffff00',
+      'yellowgreen' => '9acd32'
+    }
+
+    class << self
+      # Amount should be a decimal between 0 and 1. Lower means darker
+
+      def darken_color(input_color, amount=0.4)
+        hex_color = hex_color(input_color).gsub('#','')
+        rgb = hex_color.scan(/../).map {|color| color.hex}
+        rgb[0] = (rgb[0].to_i * amount).round
+        rgb[1] = (rgb[1].to_i * amount).round
+        rgb[2] = (rgb[2].to_i * amount).round
+        "#%02x%02x%02x" % rgb
+      end
+        
+      # Amount should be a decimal between 0 and 1. Higher lightgreen lighter
+      def lighten_color(input_color, amount=0.6)
+        hex_color = hex_color(input_color).gsub('#','')
+        rgb = hex_color.scan(/../).map {|color| color.hex}
+        rgb[0] = [(rgb[0].to_i + 255 * amount).round, 255].min
+        rgb[1] = [(rgb[1].to_i + 255 * amount).round, 255].min
+        rgb[2] = [(rgb[2].to_i + 255 * amount).round, 255].min
+        "#%02x%02x%02x" % rgb
+      end
+
+      def contrasting_text_color(input_color)
+        color = hex_color(input_color).gsub('#','')
+        convert_to_brightness_value(color) > 382.5 ? darken_color(color) : lighten_color(color)
+      end
+      
+      def hex_color(input_color)
+        "##{NAMED_COLORS[input_color] || input_color}"
+      end
+
+      def convert_to_brightness_value(input_color)
+         (hex_color(input_color).scan(/../).map {|color| color.hex}).sum
+      end
+
+    end
+  end
+end

data/lib/redmine_crm/liquid/drops/issues_drop.rb

@@ -115,6 +115,26 @@ module RedmineCrm
         @journals ||= JournalsDrop.new @issue.journals.where("#{Journal.table_name}.notes IS NOT ?", nil)
       end
 
+      def tags
+        @issue.respond_to?(:tag_list) && @issue.tag_list
+      end
+
+      def story_points
+        @issue.respond_to?(:story_points) && @issue.story_points
+      end
+
+      def color
+        @issue.respond_to?(:color) && @issue.color
+      end
+      
+      def day_in_state
+        @issue.respond_to?(:day_in_state) && @issue.day_in_state
+      end
+
+      def checklists
+        @issue.respond_to?(:checklists) && @issue.checklists.map{|item| {"id_done": item.is_done, "subject": item.subject}}
+      end
+
       def custom_field_values
         @issue.custom_field_values
       end      
@@ -150,7 +170,8 @@ module RedmineCrm
                :notes,
                :created_on,
                :private_notes,
-               :to => :@journal
+               :to => :@journal, 
+               allow_nil: true
 
       def initialize(journal)
         @journal = journal

data/lib/redmine_crm/liquid/drops/time_entries_drop.rb

@@ -37,7 +37,8 @@ module RedmineCrm
                :visible?,
                :updated_on,
                :created_on,
-               :to => :@time_entry
+               :to => :@time_entry, 
+               allow_nil: true
 
       def initialize(time_entry)
         @time_entry = time_entry

data/lib/redmine_crm/liquid/drops/users_drop.rb

@@ -35,7 +35,7 @@ module RedmineCrm
     end
 
     class UserDrop < ::Liquid::Drop
-      delegate :id, :name, :firstname, :lastname, :mail, :active?, :admin?, :logged?, :language, :to => :@user
+      delegate :id, :name, :firstname, :lastname, :mail, :active?, :admin?, :logged?, :language, :to => :@user, allow_nil: true
 
       def initialize(user)
         @user = user
@@ -45,10 +45,6 @@ module RedmineCrm
         ApplicationController.helpers.avatar(@user)
       end
 
-      def name
-        @user.name
-      end
-
       def permissions
         roles = @user.memberships.collect { |m| m.roles }.flatten.uniq
         roles << (@user.logged? ? Role.non_member : Role.anonymous)

data/lib/redmine_crm/liquid/filters/arrays.rb

@@ -65,16 +65,26 @@ module RedmineCrm
             end || []
           elsif operator == '>'
             input.select do |object|
-              item_property(object, property) > value
+              item_property_value = item_property(object, property) 
+              item_property_value && item_property_value > value
             end || []
           elsif operator == '<'
             input.select do |object|
-              item_property(object, property) < value
+              item_property_value = item_property(object, property) 
+              item_property_value && item_property_value < value
             end || []
           elsif operator == 'match'
             input.select do |object|
               Array(item_property(object, property)).map(&:to_s).any?{|i| i.match(value.to_s)}
             end || []
+          elsif operator == 'any'
+            input.select do |object|
+              item_property(object, property).present?
+            end || []
+          elsif operator == 'none'
+            input.select do |object|
+              item_property(object, property).blank?
+            end || []
           else
             []
           end

data/lib/redmine_crm/liquid/filters/base.rb

@@ -172,7 +172,9 @@ module RedmineCrm
 
         def item_property(item, property)
           if item.respond_to?(:to_liquid)
-            item.to_liquid[property.to_s]
+            property.to_s.split(".").reduce(item.to_liquid) do |subvalue, attribute|
+              subvalue[attribute]
+            end
           elsif item.respond_to?(:data)
             item.data[property.to_s]
           else

data/lib/redmine_crm/liquid/filters/colors.rb

@@ -0,0 +1,31 @@
+require 'liquid'
+
+module RedmineCrm
+  module Liquid
+    module Filters
+      module Colors
+        def darken_color(input, value=0.4)
+          RedmineCrm::ColorsHelper.darken_color(input, value.to_f)
+        end
+
+        def lighten_color(input, value=0.6)
+          RedmineCrm::ColorsHelper.lighten_color(input, value.to_f)
+        end
+
+        def contrasting_text_color(input)
+          RedmineCrm::ColorsHelper.contrasting_text_color(input)
+        end
+
+        def hex_color(input)
+          RedmineCrm::ColorsHelper.hex_color(input)
+        end
+
+        def convert_to_brightness_value(input)
+          RedmineCrm::ColorsHelper.convert_to_brightness_value(input)
+        end
+
+      end
+      ::Liquid::Template.register_filter(RedmineCrm::Liquid::Filters::Colors)
+    end
+  end
+end

data/lib/redmine_crm/version.rb

@@ -1,3 +1,3 @@
 module RedmineCrm
-  VERSION = '0.0.40'
+  VERSION = '0.0.41'
 end

data/test/fixtures/issues.yml

@@ -14,7 +14,7 @@ third_issue:
   subject: Issue 3 subject
   description: Third issue
   user: sam
-  author: sam
+  author: homer
   project: second_project
 fourth_issue:
   subject: Issue 4 subject

data/test/fixtures/users.yml

@@ -4,3 +4,6 @@ jonathan:
 sam:
   name: Sam
   language: 'RU'
+homer:
+  name: Homer
+  language: 'CH'

data/test/liquid/drops/uses_drop_test.rb

@@ -21,7 +21,7 @@ module RedmineCrm
     end
 
     def test_users_size
-      assert_equal '2', @liquid_render.render('{{ users.size }}')
+      assert_equal '3', @liquid_render.render('{{ users.size }}')
     end
 
     def test_user_name

data/test/liquid/filters/arrays_filter_test.rb

@@ -18,6 +18,13 @@ module RedmineCrm
 
     def test_where_filter
       assert_match '{"name"=>"two", "value"=>5}', @liquid_render.render("{{ objects_arr | where: 'name', 'two' }}")
+      assert_match '{"name"=>"one", "value"=>10}', @liquid_render.render("{{ objects_arr | where: 'value', 6, '>' }}")
+      assert_match '{"name"=>"one", "value"=>10}', @liquid_render.render("{{ objects_arr | where: 'name', 'on', 'match' }}")
+      assert_match '3', @liquid_render.render("{{ objects_arr | where: 'value', '', 'any' | size }}")
+      assert_match '1', @liquid_render.render("{{ objects_arr | where: 'value', '', 'none' | size }}")
+      assert_match '2', @liquid_render.render("{{ issues.all | where: 'author.name', 'Jonathan', '==' | size }}")
+      assert_match '1', @liquid_render.render("{{ issues.all | where: 'author.language', 'CH', '==' | size }}")
+      assert_match '0', @liquid_render.render("{{ issues.all | where: 'author.name', '', 'none' | size }}")
     end
 
   end

data/test/liquid/filters/colors_filter_test.rb

@@ -0,0 +1,33 @@
+require File.dirname(__FILE__) + '/../liquid_helper'
+include LiquidHelperMethods
+
+module RedmineCrm
+  class ColorsFilterTest < ActiveSupport::TestCase
+    
+    def setup
+      @liquid_render = LiquidRender.new
+    end
+
+    def test_hex_color
+      assert_match '#ff0000', @liquid_render.render("{{ 'red' | hex_color }}")
+    end
+
+    def test_darken_color
+      assert_match '#000066', @liquid_render.render("{{ 'blue' | darken_color }}")
+    end
+
+    def test_lighten_color
+      assert_match '#9999ff', @liquid_render.render("{{ 'blue' | lighten_color }}")
+    end
+
+    def test_contrasting_text_color
+      assert_match '#9999ff', @liquid_render.render("{{ 'blue' | contrasting_text_color }}")
+    end
+
+    def test_convert_to_brightness_value
+      assert_match '15', @liquid_render.render("{{ 'blue' | convert_to_brightness_value }}")
+    end
+
+
+  end
+end

data/test/liquid/liquid_helper.rb

@@ -6,11 +6,13 @@ class LiquidRender
     @objects_hash = [
       {'name' => 'one', "value" => 10},
       {'name' => 'two', "value" => 5},
+      {'name' => 'blank', "value" => nil},
       {'name' => 'three', "value" => 6}
     ]
     @registers = {}
     @assigns = {}
     @assigns['objects_arr'] = @objects_hash
+    @assigns['issues'] = RedmineCrm::Liquid::IssuesDrop.new(Issue.all)
     @assigns['now'] = Time.now
     @assigns['today'] = Date.today.strftime(date_format)
     drops.each do |key, drop|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine_crm
 version: !ruby/object:Gem::Version
-  version: 0.0.40
+  version: 0.0.41
 platform: ruby
 authors:
 - RedmineUP
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-28 00:00:00.000000000 Z
+date: 2018-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -111,6 +111,7 @@ files:
 - lib/redmine_crm/acts_as_votable/vote.rb
 - lib/redmine_crm/acts_as_votable/voter.rb
 - lib/redmine_crm/assets_manager.rb
+- lib/redmine_crm/colors_helper.rb
 - lib/redmine_crm/compatibility/application_controller_patch.rb
 - lib/redmine_crm/currency.rb
 - lib/redmine_crm/currency/formatting.rb
@@ -127,6 +128,7 @@ files:
 - lib/redmine_crm/liquid/drops/users_drop.rb
 - lib/redmine_crm/liquid/filters/arrays.rb
 - lib/redmine_crm/liquid/filters/base.rb
+- lib/redmine_crm/liquid/filters/colors.rb
 - lib/redmine_crm/money_helper.rb
 - lib/redmine_crm/version.rb
 - redmine_crm.gemspec
@@ -158,6 +160,7 @@ files:
 - test/liquid/drops/uses_drop_test.rb
 - test/liquid/filters/arrays_filter_test.rb
 - test/liquid/filters/base_filter_test.rb
+- test/liquid/filters/colors_filter_test.rb
 - test/liquid/liquid_helper.rb
 - test/models/issue.rb
 - test/models/news.rb
@@ -227,6 +230,7 @@ test_files:
 - test/liquid/drops/uses_drop_test.rb
 - test/liquid/filters/arrays_filter_test.rb
 - test/liquid/filters/base_filter_test.rb
+- test/liquid/filters/colors_filter_test.rb
 - test/liquid/liquid_helper.rb
 - test/models/issue.rb
 - test/models/news.rb