rawbotz 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 402f796c506cac2364cab880d48e8181c69cf8d0
-  data.tar.gz: c2b42f12e6c8eea8f23e5e7037f53fb15136130c
+  metadata.gz: 788bb5000f74251dc1c2aadd371f6260ea4ff84f
+  data.tar.gz: bd7d6705020f6fedeccdda86e96d798fb6f7be98
 SHA512:
-  metadata.gz: 453857bee3be25903bf77b984cf137b2e28ff59539478b9773ba077bcfaac4b3f08f15d68ae2fa2b5081a3b65cc9b54d3086cf030fe09afc659c76ce1e9d97e5
-  data.tar.gz: 60662be5fae280a77f09ac2ee953cfb9d3b4a72bfe97864c437024077533d7c2f054d6bc58dc502eebea18a19bd79b3889280ab96ef318ff661774126a003541
+  metadata.gz: 35d61d51553864fe25bd25896e04372a9603578e111562e8dcb0447b7f3c10af8818862b970d946bfebf59904b18c1cf145859b062f3e63c5201e77fc2cc40d0
+  data.tar.gz: 2f9bebba8f40938e0433c3a94323a001ef2af91467698201f368b934d277ba929b51280734b61cf209a38822eabdee0db1cd89b1af124e5952d2b873a3f0369f

data/lib/rawbotz/app.rb

@@ -1,4 +1,5 @@
 require 'sinatra/base'
+require 'open-uri'
 require 'action_view' # Workaround https://github.com/haml/haml/issues/695
 require 'haml'
 require 'rawbotz/helpers/icon_helper'

data/lib/rawbotz/chart_month_dataset.rb

@@ -0,0 +1,36 @@
+module Rawbotz
+  class ChartMonthDataset
+    attr_accessor :date, :value, :length, :darkness
+    def initialize date, value, length, darkness
+      @date   = date
+      @value  = value
+      @length = length
+      @darkness = darkness
+    end
+
+    def to_s
+      monthname = Date::MONTHNAMES[@date.month]
+      <<-eos
+      {
+      label: "Sales #{monthname[0..2]} #{@date.year}",
+      fill: true,
+      lineTension: 0.2,
+      backgroundColor: "rgba(175,155,155,0)",
+      borderColor: "rgba(35,42,102,#{@darkness})",
+      borderCapStyle: 'round',
+      pointBorderColor: "rgba(0,0,0,#{@darkness})",
+      pointBackgroundColor: "#fff",
+      pointBorderWidth: 1,
+      pointHoverRadius: 8,
+      pointHoverBackgroundColor: "rgba(99,102,152,1)",
+      pointHoverBorderColor: "rgba(210,210,210,1)",
+      pointHoverBorderWidth: 2,
+      pointRadius: 2,
+      pointHitRadius: 10,
+      data : [#{([@value] * @length).join(',')}]
+      },
+      eos
+      #/*data : [#{plot_data.values.map{|v| v[:stock].to_i}.join(',')}]*/
+    end
+  end
+end

data/lib/rawbotz/mail_template.rb

@@ -22,7 +22,7 @@ module Rawbotz
         order_item_line.gsub!(/PRODUCTNAME/, oi[:local_product][:name].to_s)
         order_item_line
       end
-      lines[lines.find_index(product_line)] = order_lines
+      lines[lines.find_index(product_line)] = order_lines if product_line
       lines.flatten.join("\n")
     end
   end

data/lib/rawbotz/routes/products.rb

@@ -27,8 +27,13 @@ module Rawbotz::RawbotzApp::Routing::Products
                                                        Date.today,
                                                        Date.today - 30,
                                                        settings)
+        @sales_monthly = RawgentoDB::Query.sales_monthly_between(@product.product_id,
+                                                         Date.today,
+                                                         Date.today - (12 * 30),
+                                                         settings).uniq
       rescue
         @sales = []
+        @sales_monthly = []
         add_flash :error, 'Cannot connect to MySQL database'
       end
       @plot_data = Rawbotz::Datapolate.create_data @sales, @product.stock_items.where(created_at: (Date.today - 30)..Date.today)

data/lib/rawbotz/version.rb

@@ -1,3 +1,3 @@
 module Rawbotz
-  VERSION = "0.1.3".freeze
+  VERSION = "0.1.4".freeze
 end

data/lib/rawbotz/views/_menu.haml

@@ -1,5 +1,9 @@
 .pure-menu.pure-menu-horizontal#menu
   %center
+    %ul.pure-menu-list
+      %li.pure-menu-item
+        %a.pure-menu-link(href="/")
+          r a w b o t z
     %ul.pure-menu-list
       %li.pure-menu-item
         %a.pure-menu-link(href="/orders")

data/lib/rawbotz/views/index.haml

@@ -2,14 +2,28 @@
 
 #main-threes.pure-g
   .pure-u-1-3.center
-    %i.fa.fa-shopping-cart.huge-icon
+    %a(href="/orders")
+      %i.fa.fa-shopping-cart.huge-icon
     %br
-    Order
+    %h3 Last 3 Orders
+    %table.pure-table-horizontal.pure-table
+      - Order.where(state: [Order::STATES.new, Order::STATES.processing, Order::STATES.queued, Order::STATES.ordered]).order("updated_at DESC").first(3).each do |order|
+        %tr
+          %td
+            %a(href="/order/#{order.id}")
+              = order.updated_at.strftime("%Y-%m-%d %H:%M")
+          %td
+            = supplier_link order.supplier
+          %td
+            = order.state
   .pure-u-1-3.center
-    %i.fa.fa-cubes.huge-icon
+    %a(href="/products")
+      %i.fa.fa-cubes.huge-icon
     %br
-    Products
+    %h3 Products
+    -# latest addition?
   .pure-u-1-3.center
-    %i.fa.fa-truck.huge-icon
+    %a(href="/suppliers")
+      %i.fa.fa-truck.huge-icon
     %br
-    Supplier
+    %h3 Suppliers

data/lib/rawbotz/views/order/non_remote.haml

@@ -4,8 +4,13 @@
 
 #modal-plot.modal-plot
 
+- if @mail_preview.to_s != ""
+  %h2 Mail preview
+  %pre~ @mail_preview
+  %a{:href => "mailto:#{@supplier.email}?Subject=Order&body=%s" % URI::escape(@mail_preview).gsub(/&/,'%26')} Open mail
+
 %center
-  %form.pure-form(action="" method="post")
+  %form#non_remote_order.pure-form(action="" method="post")
     %input(name="supplier_id" type="hidden" value="#{@supplier.id}")
     %table.pure-table
       %thead
@@ -36,4 +41,32 @@
     %center
       %button.pure-button.pure-button-primary
         %i.fa.fa-envelope
-        Send me the mail!
+          Send me the mail!
+      -#%button#ajax_mailto.pure-button.pure-button-secondary
+      -#  %i.fa.fa-envelope
+      -#    Open mail
+      -#:javascript
+      -#  $("#ajax_mailto").click(function(e){
+      -#    e.preventDefault();
+      -#    var parameters = $('#non_remote_order').serialize();
+      -#    //alert(parameters);
+      -#    $.ajax({
+      -#      url: "/order/non_remote/#{@supplier.id}/mailto",
+      -#      data: parameters,
+      -#      type: 'POST',
+      -#      success: function(data){
+      -#        if(data.indexOf('mailto') > -1){
+      -#          window.location = data;
+      -#        }
+      -#      }
+      -#    });
+      -#  });
+
+-#Edit supplier ...
+
+%br
+%h2 Mail template
+%pre~ @supplier.order_template
+%a.pure-button(href="/supplier/#{@supplier.id}")
+  Edit template
+%br

data/lib/rawbotz/views/product/_stock_sales_plot.haml

@@ -3,6 +3,12 @@
     %div
       %canvas(id="canvas" height="450" width="800")
 
+- month_datasets = []
+- if markers ||= nil
+  - markers.sort_by{|m|m[0]}.last(4).each_with_index do |m,i|
+    - month_datasets << Rawbotz::ChartMonthDataset.new(m[0],
+      m[1], plot_data.length, (i + 1)/(4.0))
+
 - sales_value = ->(h) { h[:sales].to_i }
 :javascript
   //Chart.defaults.global.multiTooltipTemplate = "<%= datasetLabel %>: <%= value %>";
@@ -47,7 +53,9 @@
         pointHitRadius: 10,
         data : [#{plot_data.values.map{|v| v[:stock].nil? ? 'null' : v[:stock].to_i}.join(',')}]
         /*data : [#{plot_data.values.map{|v| v[:stock].to_i}.join(',')}]*/
-      }
+      },
+      #{month_datasets.join("\n")}
+      // month-datasets #{@sales_monthly}, red green blue
     ]
   }
 

data/lib/rawbotz/views/product/view.haml

@@ -45,20 +45,33 @@
     .pure-u-1-1
       %h2 Stock and Sales Values (30 days)
     .pure-u-2-5
-      %table.pure-table
+      %table.pure-table.pure-table-striped
         %thead
           %tr
-            %th Date
-            %th Qty in Stock
+            %th Month
             %th Qty Sold
+            %th Quarter
         %tbody
-          - @plot_data.values.each do |s|
-            %tr{:class => s[:stock].to_i <= 0 ? "empty-stock" : ""}
-              %td= s[:label]
-              %td= s[:stock]
-              %td= s[:sales]
-    
+          - @sales_monthly.each_slice(3) do |sales|
+            - sales.each do |s|
+              %tr
+                %td
+                  = Date::MONTHNAMES[s[0].month]
+                  = s[0].year
+                %td=s[1]
+                %td
+            %tr(style="background-color: rgb(132,122,102);")
+              %td(colspan="2")
+                = Date::MONTHNAMES[sales[0][0].month]
+                = sales[0][0].year
+                \-
+                = Date::MONTHNAMES[sales[-1][0].month]
+                = sales[-1][0].year
+              %td
+                -#= sales.inspect
+                = sales.inject(0) {|acc, s| acc + s[1].to_i }
+
     .pure-u-3-5
-      = haml :"product/_stock_sales_plot", locals: {plot_data: @plot_data}
+      = haml :"product/_stock_sales_plot", locals: {plot_data: @plot_data, markers: @sales_monthly}
 -#%h2 Orders
 -#= product.order_items.order ... link

data/lib/rawbotz/views/supplier/view.haml

@@ -58,9 +58,9 @@
           %br
           %textarea#example_order_template(name="example_order_template" readonly rows="10" cols="80")
             :preserve
-              SUBJECT=Order NAME
+              SUBJECT=Order SUPPLIERNAME
     
-              Dear NAME,
+              Dear SUPPLIERNAME,
     
               We will order
     
@@ -75,7 +75,7 @@
           %dl
             %dt SUBJECT=
             %dd will be subject of the mail (and NOT included in mail itself)
-            %dt NAME
+            %dt SUPPLIERNAME
             %dd will be replaced by this suppliers name
             %dt *
             %dd the line starting with a star will be iterated over with every product

data/lib/rawbotz.rb

@@ -3,6 +3,7 @@ require "rawbotz/remote_shop"
 require "rawbotz/local_shop"
 require "rawbotz/order_processor"
 require "rawbotz/datapolate"
+require "rawbotz/chart_month_dataset"
 require "rawbotz/product_updater"
 require "rawbotz/mail_template"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rawbotz
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Felix Wolfsteller
@@ -185,6 +185,7 @@ files:
 - exe/rawbotz_update_remote_products
 - lib/rawbotz.rb
 - lib/rawbotz/app.rb
+- lib/rawbotz/chart_month_dataset.rb
 - lib/rawbotz/cli/order_result_table.rb
 - lib/rawbotz/datapolate.rb
 - lib/rawbotz/helpers/flash_helper.rb