cryptum 0.0.454 → 0.0.456

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe56750d834a8a3e0538467db783230b134f9cea5ef38844c88bac82b62f65dd
-  data.tar.gz: 43212a6a0cbe059efe4f52be43ab8811b83d06b055e67501fadaada69e4faca6
+  metadata.gz: 4e3f976fdd41eb06a0f31c77a0f98052dd3b75b816cfd4a7ada3109c046f33f4
+  data.tar.gz: 986148e3bae656c4d32420c2b4d9dcc9e36d6680eb32242012bdfad73bb6d1eb
 SHA512:
-  metadata.gz: '008fe5c27c445c60451b8dfa1e9ffae8cc3d9679308aca824daafc0948b03bb0bf97f93c18b8a095a7fba92bc970a2309910fa8949112f592191b34eeb52b479'
-  data.tar.gz: eb22d2dd3a75e539d5d657b78de88ffce7738b8edc1d875e59ef91ab721519358cb668ae02997a820450f81f02d33a4180337fae8045c6430dc098636da1cd39
+  metadata.gz: 27280b8e5c51c90a3d46452dd5c449f3558c31306c3afd7411a7ac38db0accc2a3e70721b37892fe2e3ab839c2816215cda28220db3f611d5b1249b52dd7ba47
+  data.tar.gz: 919f242f11f071e1e5a5f211e509b85759ef3f3696c1073c67896a6c90efa01f8f671c353dc10b3a92771435e90159da81dc8e6d58026248bef388a57d230014

data/.rubocop.yml

@@ -6,7 +6,7 @@ Layout/LineLength:
 Lint/UselessRescue:
   Enabled: false
 Metrics/AbcSize:
-  Max: 459.9
+  Max: 486.2
 Metrics/BlockLength:
   Max: 138
 Metrics/BlockNesting:
@@ -14,13 +14,13 @@ Metrics/BlockNesting:
 Metrics/ClassLength:
   Max: 134
 Metrics/CyclomaticComplexity:
-  Max: 91
+  Max: 93
 Metrics/MethodLength:
-  Max: 421
+  Max: 457
 Metrics/ModuleLength:
-  Max: 431
+  Max: 467
 Metrics/PerceivedComplexity:
-  Max: 89
+  Max: 91
 Style/HashSyntax:
   EnforcedShorthandSyntax: never
 

data/lib/cryptum/order_book/generate.rb

@@ -80,7 +80,6 @@ module Cryptum
           order_book[:order_history_meta].keep_if do |ohm|
             order_book[:order_history].find do |oh|
               (oh[:id] == ohm[:buy_order_id] || oh[:id] == ohm[:sell_order_id]) && (
-                ohm[:color].to_sym == :cyan ||
                 ohm[:color].to_sym == :green ||
                 ohm[:color].to_sym == :magenta ||
                 ohm[:color].to_sym == :red ||

data/lib/cryptum/ui/order/execute.rb

@@ -239,7 +239,15 @@ module Cryptum
             end
           end
 
-          # Snag all sold orders YTD
+          # Snad all orders sold YTD
+          oh_sold_ytd_arr = order_history.select do |oh|
+            oh[:side] == 'sell' &&
+              oh.key?(:done_at) &&
+              Time.now.strftime('%Y') == Time.parse(oh[:done_at]).strftime('%Y')
+          end
+          order_hist_sold_ytd = oh_sold_ytd_arr.length
+
+          # Snag all session orders sold YTD
           oh_meta_sold_arr = order_history_meta.select do |ohm|
             ohm[:color].to_sym == :green &&
               ohm.key?(:done_at) &&
@@ -306,7 +314,16 @@ module Cryptum
           # OK, now let's tally up everything...
           twenty_four_hrs_ago = Time.now - 86_400
 
-          # Snag all sold orders within past 24 hrs
+          # Snag all orders sold within past 24 hrs
+          oh_sold_twenty_four_arr = []
+          unless oh_sold_ytd_arr.empty?
+            oh_sold_twenty_four_arr = oh_sold_ytd_arr.select do |o|
+              Time.parse(o[:done_at]) >= twenty_four_hrs_ago
+            end
+          end
+          order_hist_sold_twenty_four = oh_sold_twenty_four_arr.length
+
+          # Snag all session orders sold within past 24 hrs
           ohm_sold_twenty_four_arr = []
           unless oh_meta_sold_arr.empty?
             ohm_sold_twenty_four_arr = oh_meta_sold_arr.select do |o|
@@ -343,27 +360,27 @@ module Cryptum
           # end
           # order_hist_meta_24h_expired = ohm_expire_twenty_four_arr.length
 
-          # Calculate gains within past 24 hrs
-          # && Calculate gains YTD
-          gains_sum = oh_meta_sold_arr.map do |ohms|
+          # Calculate session gains YTD
+          sess_gains_sum = oh_meta_sold_arr.map do |ohms|
             ohms[:profit].to_f
           end.sum
 
-          gains_out = Cryptum.beautify_large_number(
+          sess_gains_out = Cryptum.beautify_large_number(
             value: format(
               '%0.2f',
-              gains_sum
+              sess_gains_sum
             )
           )
 
-          gains_24h_sum = ohm_sold_twenty_four_arr.map do |ohms|
+          # Calculate session gains within past 24 hrs
+          sess_gains_24h_sum = ohm_sold_twenty_four_arr.map do |ohms|
             ohms[:profit].to_f
           end.sum
 
-          gains_24h_out = Cryptum.beautify_large_number(
+          sess_gains_24h_out = Cryptum.beautify_large_number(
             value: format(
               '%0.2f',
-              gains_24h_sum
+              sess_gains_24h_sum
             )
           )
 
@@ -562,24 +579,51 @@ module Cryptum
             string: ''.ljust(col_just1, ' ')
           )
 
-          header_str = "OPEN S/T: #{total_selling_this_session}/#{total_to_sell} TPMsD: $#{total_selling_profit_out} | "
-          header_str += "SOLD 24h: #{order_hist_meta_sold_twenty_four} YTD: #{order_hist_meta_sold} | "
-          header_str += "GAINS 24h: $#{gains_24h_out} YTD: $#{gains_out} | "
-          header_str += "AVG RndT DAYS: #{avg_round_trip_days_out}"
+          sess_header_str = "SESS OPEN: #{total_selling_this_session} TPMD: $#{total_selling_profit_out} | "
+          sess_header_str += "SOLD 24h: #{order_hist_meta_sold_twenty_four} YTD: #{order_hist_meta_sold} | "
+          sess_header_str += "PROF 24h: $#{sess_gains_24h_out} YTD: $#{sess_gains_out} | "
+          sess_header_str += "AvgRndT DAYS: #{avg_round_trip_days_out}"
           order_execute_win.setpos(
             out_line_no,
-            Cryptum::UI.col_center(str: header_str)
+            Cryptum::UI.col_center(str: sess_header_str)
           )
 
           Cryptum::UI.colorize(
             ui_win: order_execute_win,
             color: header_color,
             style: header_style,
-            string: header_str
+            string: sess_header_str
           )
 
           # ROW 11
           out_line_no += 1
+          order_execute_win.setpos(out_line_no, Cryptum::UI.col_first)
+          order_execute_win.clrtoeol
+          Cryptum::UI.colorize(
+            ui_win: order_execute_win,
+            color: header_color,
+            style: header_style,
+            string: ''.ljust(col_just1, ' ')
+          )
+
+          tot_header_str = "TOTAL OPEN: #{total_to_sell} TPMD: $TBD | "
+          tot_header_str += "SOLD 24h: #{order_hist_sold_twenty_four} YTD: #{order_hist_sold_ytd} | "
+          tot_header_str += 'PROF 24h: $TBD Y: $TBD | '
+          tot_header_str += 'AvgRndT DAYS: TBD'
+          order_execute_win.setpos(
+            out_line_no,
+            Cryptum::UI.col_center(str: tot_header_str)
+          )
+
+          Cryptum::UI.colorize(
+            ui_win: order_execute_win,
+            color: header_color,
+            style: header_style,
+            string: tot_header_str
+          )
+
+          # ROW 12
+          out_line_no += 1
           Cryptum::UI.line(
             ui_win: order_execute_win,
             out_line_no: out_line_no,

data/lib/cryptum/ui/order/execute_details.rb

@@ -239,7 +239,7 @@ module Cryptum
           )
 
           # Clear to OK ROW
-          ok_row = 9
+          ok_row = 10
           out_line_no += 1
           to_ok_row = ok_row - 1
           (out_line_no..to_ok_row).each do |clr_line|

data/lib/cryptum/ui/terminal_window.rb

@@ -79,14 +79,14 @@ module Cryptum
         )
 
         self.order_execute_section = Cryptum::UI.window(
-          height: 11,
+          height: 12,
           width: 0,
           top: 29,
           left: 0
         )
 
         self.order_execute_details_section = Cryptum::UI.window(
-          height: 11,
+          height: 12,
           width: 0,
           top: 29,
           left: 0
@@ -95,7 +95,7 @@ module Cryptum
         self.command_section = Cryptum::UI.window(
           height: 3,
           width: 0,
-          top: 40,
+          top: 41,
           left: 0
         )
       end

data/lib/cryptum/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Cryptum
-  VERSION = '0.0.454'
+  VERSION = '0.0.456'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cryptum
 version: !ruby/object:Gem::Version
-  version: 0.0.454
+  version: 0.0.456
 platform: ruby
 authors:
 - 0day Inc.