smerp-quotation-engine 0.3.1 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8546e16b5580393b492285b0e9a1b6ad03db1b07b0d1c020d793c5d072cc7c2d
-  data.tar.gz: 6f4f31d01f493c52c75ef4efe931e53803a737a9b07ca5447e89a0867d00106d
+  metadata.gz: 877f701dd655baa97ce7bfa6ccd12a6577efcb96f7988ead8756f7dff06df017
+  data.tar.gz: e8e2c6853575812585ab3e15ff45043fb9ac478cf662e72e04f608bff8361d8b
 SHA512:
-  metadata.gz: b22cf2555a4422d10f0e01a9e499bd41d76ba74b26f4f0b900f8a11a5382bdce58c6aba09e6c93f64615cd757e023c36f3cfdb1e1b93ffc12abfb025ad1131ca
-  data.tar.gz: bd09f9344fd1d7c9cce91d0958e953994dfcdc7e92e60be97c44e5a708a82c62e185c4e12056e26377b63ff657786d7e176386911735bc065c65682a55090567
+  metadata.gz: 435a82a08f9cf51494e8e385743cec220e2c83d38987e5fe0c93a2e0bd9933015d48bf580791f50d6953232ad088b1e67cb2006b02ff098b5f36400c0aa7d4f6
+  data.tar.gz: 156f5ea4da300e867e39ddeea60ff752b3439015b7251bbf09b7af46ba143ffdc7a66c161ea58a896b8ebfe4198ffce61e5c9e00bfe17bcd1dc5fd2fbd382244

data/app/controllers/smerp/quotation/engine/quotations_controller.rb

@@ -3,7 +3,7 @@ require 'smerp/quotation'
 
 module Smerp::Quotation::Engine
   class QuotationsController < ApplicationController
-    before_action :set_quotation, only: %i[ show edit update destroy extended_calculators new_extended_calculator create_calculator edit_extended_calculator update_extended_calculator delete_extended_calculator new_product_item resources_allocation_summary ]
+    before_action :set_quotation, only: %i[ show edit update destroy extended_calculators new_extended_calculator create_calculator edit_extended_calculator update_extended_calculator delete_extended_calculator new_product_item resources_allocation_summary filter ]
 
     # GET /quotations
     def index
@@ -177,13 +177,32 @@ module Smerp::Quotation::Engine
       @resTable = {}
       @quotation.quotation_items_allocated_resources.each do |qi|
         prodId = qi.quotation_product.name
-        @resTable[prodId] = { total: 0.0, rate: qi.quotation_product.unit_price.to_f } if @resTable[prodId].nil?
-        @resTable[prodId][:total] += qi.quantity
+        @resTable[prodId] = { total: 0, rate: qi.quotation_product.unit_price.to_f } if @resTable[prodId].nil?
+        @resTable[prodId][:total] += qi.quantity.to_i
 
         @resTable[prodId][:total_rate] = @resTable[prodId][:total] * @resTable[prodId][:rate]
       end
     end
 
+    def filter
+
+      val = params[:val]
+
+      case val
+      when "main_only"
+        session[:hide_children_parent_id] = [] if session[:hide_children_parent_id].nil?
+        @quotation.quotation_items.where(["parent_id is null"]).each do |qi|
+          session[:hide_children_parent_id] << qi.id
+        end
+      when "show_all"
+        if not session[:hide_children_parent_id].nil?
+          session[:hide_children_parent_id].clear
+        end
+      end
+
+      redirect_to quotation_url(@quotation)
+    end
+
     private
       # Use callbacks to share common setup or constraints between actions.
       def set_quotation

data/app/helpers/smerp/quotation/engine/quotations_helper.rb

@@ -1,3 +1,4 @@
+
 module Smerp::Quotation::Engine
   module QuotationsHelper
 
@@ -35,10 +36,31 @@ module Smerp::Quotation::Engine
         "#DBFED8", #light green
         "#FEF0D8",
         "#D8F8FE",
-        "#FED8D8"
+        "#FED8D8",
+        "#B7FFD8"
       ]
 
-      marker[level%4]
+      marker[level%marker.length]
+    end
+
+    def level_seq_conv(level, seq)
+      levelConv = [:to_i, :alpha_lowercase, :roman_lowercase, :alpha_upcase, :roman_upcase]
+      conv = levelConv[level%levelConv.length]
+
+      case conv
+      when :to_i
+        seq.to_i
+      when :alpha_lowercase
+        seq.to_i.int_to_alpha_downcase
+      when :roman_lowercase
+        seq.to_i.int_to_roman_downcase
+      when :alpha_upcase
+        seq.to_i.int_to_alpha
+      when :roman_upcase
+        seq.to_i.int_to_roman
+      else
+        seq.to_i
+      end
     end
 
     def extended_calculator_name(ec)
@@ -91,7 +113,7 @@ module Smerp::Quotation::Engine
         elsif balMonthDay > 0
           "#{months} month(s) and #{weeks} week(s) (Calendar Based)"
         else
-          "#{months} month(s)"
+          "#{months} month(s) (Calendar Based)"
         end
       else
         "#{days} calendar day(s)"

data/app/views/smerp/quotation/engine/quotations/_quotation_item.html.erb

@@ -2,8 +2,9 @@
 
   <tr style="background-color: <%= level_marker(level) %>">
     <td>
-      <%= (" * " * level).html_safe %>
-      <%= index+1 %>.
+      <%= (" &nbsp; " * level).html_safe %>
+      <%# index += 1 %>
+      <%= level_seq_conv(level, index+1) %>.
       <%= link_to quotation_item.name, quotation_quotation_item_path(@quotation, quotation_item) %>
       <%#= link_to "Add Sub Item", add_sub_item_quotation_item_url(quotation_item) %>
       <%= link_to image_tag('add.png', size: "20x20"), add_sub_item_quotation_item_url(quotation_item) %>

data/app/views/smerp/quotation/engine/quotations/resources_allocation_summary.html.erb

@@ -47,11 +47,21 @@
 
   <tr style="font-weight: bold; background-color: #8EFEC1">
     <td></td>
-    <td class="text-end">Grand Total : </td>
-    <td class="text-end"><%= ttlMd %></td>
-    <td style="font-style: italic">(Roughly <%= days_to_human_readable(ttlMd) %>)</td>
-    <td class="text-end"><%= currency(ttlPrice) %></td>
-    <td style="font-style: italic;"><%= ttlPrice.percent_of(@quotation.total, 2) %>%</td>
+    <td class="text-end">
+      Grand Total : 
+    </td>
+    <td class="text-end">
+      <%= ttlMd %>
+    </td>
+    <td style="font-style: italic">
+      (Roughly <%= ttlMd %> mandays ~ <%= days_to_human_readable(ttlMd) %>)
+    </td>
+    <td class="text-end">
+      <%= currency(ttlPrice) %>
+    </td>
+    <td style="font-style: italic;">
+      (<%= ttlPrice.percent_of(@quotation.total, 2) %>%)
+    </td>
   </tr>
 
 </table>

data/app/views/smerp/quotation/engine/quotations/show.html.erb

@@ -69,6 +69,13 @@
 
 <h3>Details</h3>
 
+<div class="pb-1">
+  <%= button_to "Main Items Only", filter_quotation_path(@quotation, val: "main_only"), class: "btn btn-info" %>
+</div>
+<div>
+  <%= button_to "Show All Items", filter_quotation_path(@quotation, val: "show_all"), class: "btn btn-info" %>
+</div>
+
 <% if not notice.nil? %>
 <div class="alert alert-success text-center w-100" role="alert">
   <%= notice %>

data/config/routes.rb

@@ -27,6 +27,8 @@ Smerp::Quotation::Engine::Engine.routes.draw do
 
       get :resources_allocation_summary
 
+      post :filter
+
     end
 
   end # quotations

data/lib/smerp/quotation/engine/version.rb

@@ -1,7 +1,7 @@
 module Smerp
   module Quotation
     module Engine
-      VERSION = "0.3.1"
+      VERSION = "0.3.6"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smerp-quotation-engine
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.6
 platform: ruby
 authors:
 - Ian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-05 00:00:00.000000000 Z
+date: 2022-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails