ish_manager 0.1.8.410 → 0.1.8.412

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8324ef683622d8aca6298965f060b9f7bb28c8d2ec6bbd99011b34914ccd6b70
-  data.tar.gz: af207371888cee567d554cb1f0313fd717399dd42c93fc9b06f3b16fca0212fa
+  metadata.gz: 00f50c9d4c8e8eb28c03a8cf7b5a3bf9dad3a1942b7171cf0bd24ef9e4023b42
+  data.tar.gz: b8093f2152ec12c05daa5af3a57da34772492193c3413b129933520c24ad9c86
 SHA512:
-  metadata.gz: 01d1fa18a16bcf11c0f991972eae21b57ed17024b33da5249d5396f85c812e8644448547f2fed3164ba565ee2daa89205b8b047e56d6727ee3f759b51f641d29
-  data.tar.gz: bae46a73d36c3bcdfd0f098fd9d75f2e86cab52f6e50a0b8c8eb07810b64ba0f2195f80e51fe87f5af0c4d02974d923612fd74ec7b63d1b2c7f3b83dffde2548
+  metadata.gz: 9542bb26d8e7eab5e96416006bf0003fa8a2e4947c48004b0a50df093e177884af300f51186a8d9c632b9629e2aafcdbfa480e76db88e4da59ab144a06a4eaa5
+  data.tar.gz: e8547c17dc63d91f7858999446db3ea754109b37b9d0355c0394ccce58523f2a1dc392b2dcc32bdaf7374a53700311aab6f40005ddab3a33a43d441a174fdb04

data/app/assets/javascripts/ish_manager/application.js

@@ -25,6 +25,7 @@
 //= require ish_manager/email_conversations
 //= require ish_manager/email_templates
 //= require ish_manager/galleries
+//= require ish_manager/iro
 
 const AppRouter = {
   gallery_update_ordering_path: ({ id, slug }) => `/manager/galleries/${slug || id}/update_ordering`,

data/app/assets/javascripts/ish_manager/iro.js

@@ -0,0 +1,51 @@
+
+$(document).ready(function () {
+
+  const origin = 23
+  scale = 200 // pixels per dollar
+
+
+
+  $(".gameuiW").each( function (idx, w) {
+
+    let ccStrike = $(w).data('ccStrike')
+    let ccStartPrice = $(w).data('ccStartprice') // e.g. 0.88
+    let ccCurrentPrice = $(w).data('ccCurrentprice')
+    let cUS = $(w).data('cus')
+
+    $(".c-u-s").each(function (idx, elem) {
+      $(elem).html(cUS)
+    })
+
+    $(".windW").each(function (idx, elem) {
+      $(elem).css('left', (origin - cUS)*scale)
+    })
+
+    $($(w).find('.elephantW')).css('left', (origin - ccStrike)* scale )
+    $(w).find('.elephantC > .amount').html( " $" + ccStrike )
+    $(w).find('.riderStart > .amount').html( " $" + ccStartPrice )
+    $(w).find('.riderStart').css('width', scale * ccStartPrice )
+    $(w).find('.riderStart').css('left', -1 * scale * ccStartPrice )
+    $(w).find('.riderStart2').css('width', scale * ccStartPrice )
+
+    let currentAmount = ((ccStartPrice - ccCurrentPrice)*100).toPrecision(1)/100
+    let ccCurrentGain = ccStartPrice - ccCurrentPrice
+    // logg(ccCurrentGain, 'ccCurrentGain')
+    // logg(currentAmount, 'currentAmount')
+    $(w).find('.riderCurrent > .amount').html( " $" + currentAmount )
+    let ans = `${-1*ccCurrentGain*scale}px`
+    logg(ans, 'ans')
+    $(w).find('.riderW').css('left', ans)
+
+    if (ccCurrentGain > 0) {
+      $(w).find('.riderCurrent').css('width', scale * ccCurrentGain )
+    } else {
+      ccCurrentGain = -1 * ccCurrentGain
+      $(w).find('.riderCurrent').css('width', scale * ccCurrentGain )
+      $(w).find('.riderCurrent').css('background', 'red')
+      $(w).find('.riderCurrent').css('right', `-${ccCurrentGain*scale}px`)
+      $(w).find('.rider').addClass('riderF')
+    }
+  })
+
+})

data/app/assets/stylesheets/ish_manager/application.scss

@@ -155,6 +155,44 @@ table.bordered {
   text-align: center;
 }
 
+.chip,
+// .main-header a.chip,
+._ {
+  margin-right: 20px;
+  // border: 1px solid black;
+
+  border-radius: 1em 0 0 1em;
+  padding-left: .6em;
+
+  background: white;
+  position: relative;
+
+
+
+  &::after {
+    // border: 1px solid red;
+
+    content: "";
+
+    position: absolute;
+    right: -30px;
+    width: 10px;
+    display: block;
+    // background: inherit;
+    // background: red;
+    margin: 0 20px;
+    top: -1px;
+    bottom: 0;
+
+    border-top: 16px solid white;
+    border-bottom: 16px solid white;
+
+    border-right: 10px solid transparent;
+
+    // border: 1px solid red;
+  }
+}
+
 .close {
   position: absolute;
   top: 0;

data/app/assets/stylesheets/ish_manager/iro.scss

@@ -6,7 +6,9 @@
   }
 }
 
-.iro-purses-show {
+.iro-purses-show,
+.iro-purses-show-gameui,
+._ {
   font-size: 14px;
 
   table {
@@ -89,7 +91,6 @@
   }
 
   .strategies {
-
     display: flex;
     flex-wrap: wrap;
   }
@@ -113,223 +114,328 @@
   }
 }
 
+
+
+
+
+
+
+/*
+ * GameUI in Purse
+**/
 .gameuiW {
-  border: 1px solid cyan;
-  border-radius: 0.5em;
+  border: 1px solid #ff9966;
+  border-radius: 1em;
 
   position: relative;
 
-  margin-bottom: 100px;
-
-  width: 1000px;
+  width: 1200px;
   height: 200px;
 
+  margin-bottom: 10px;
+
   z-index: 0;
 
-  .elephant {
-    // border: 2px solid yellow;
+  .gameui {
 
-    background-image: url('https://d15g8hc4183yn4.cloudfront.net/wp-content/uploads/2023/04/04103931/200x125-elephant-1rmTiny.png');
-    width: 200px;
-    height: 125px;
+    border-left: 1px dashed black;
 
     position: absolute;
 
-    left: 700px;
-    bottom: 0;
+    height: 100%;
+    left: 50%;
+    width: 600px;
+
+    .gameuiC {
+      // border: 2px solid red;
+
+      background-color: brown;
 
-    &::after { /* arrow-up */
-      content: "";
       position: absolute;
+
+      right: 0;
+      left: 0;
       bottom: 0;
-      right: calc( 50% - 25px );
+      height: 10px;
 
-      width: 0;
-      height: 0;
-      border-left: 25px solid transparent;
-      border-right: 25px solid transparent;
+      &::before {
+        content: "24";
+        color: white;
+        position: absolute;
+        left: -200px;
+        width: 200px;
+        height: 2px;
+        background: white;
+      }
+      &::after {
+        content: "22";
+        color: white;
+        position: absolute;
+        left: 200px;
+        width: 200px;
+        height: 2px;
+        background: white;
+      }
+    }
 
-      border-bottom: 25px solid red;
+    .elephantW {
+      border: 2px solid black;
+      position: absolute;
+      // left: ?? ; /* data: cc strike */
     }
-  }
 
-  .elephantNext {
-    // border: 5px solid white;
-    border-radius: 50%;
+    .elephant {
+      // border: 2px solid yellow;
 
-    display: none;
+      background-image: url('https://d15g8hc4183yn4.cloudfront.net/wp-content/uploads/2023/04/04103931/200x125-elephant-1rmTiny.png');
+      width: 200px;
+      height: 125px;
 
-    position: absolute;
-    bottom: -50px;
-    margin-left: 50px;
-    transform: scale(1.2);
-    opacity: 0.33;
-    background-color: green;
+      position: absolute;
 
-  }
+      left: -100px;
+      padding-left: 100px;
+      bottom: 0;
 
-  .grid {
-    background: url('https://d15g8hc4183yn4.cloudfront.net/wp-content/uploads/2023/04/04110701/500x250-gridTiny.png');
-    background-size: 100%;
-    background-position: bottom center;
+      &::after { /* arrow-up */
+        content: "";
+        position: absolute;
+        bottom: 0;
+        right: calc( 50% - 25px );
 
-    width: 1000px;
-    height: 200px;
+        width: 0;
+        height: 0;
+        border-left: 25px solid transparent;
+        border-right: 25px solid transparent;
 
-    position: absolute;
-    bottom: 0;
-    left: 0;
+        border-bottom: 25px solid red;
+      }
 
-    z-index: -1;
-  }
+      .elephantC {
+        // border: 10px solid black;
 
-  .ground {
-    border-bottom: 5px solid gray;
+        // width: 10px;
+        // height: 10px;
 
-    position: absolute;
-    left: 0;
-    right: 0;
-    top: 100%;
-    bottom: -50px;
+        z-index: 1;
+        position: absolute;
+        color: #333;
+        background: #ddd;
+        display: inline-block;
 
-    background: gray;
-  }
+        .q {
+          border: 2px solid #eee;
+          color: #fff;
+          background: #ccc;
+          padding: 0.4em;
+          border-radius: 50%;
 
-  .groundedW {
-    position: absolute;
+          position: absolute;
+          left: 50px;
+          top: -25px;
+        }
+      }
 
-    right: -250px;
-    bottom: 0;
 
-    .grounded {
-      border: 2px solid pink;
-      background: rgba(255,255,255, 0.75);
+    }
+
+    .elephantNext {
+      // border: 5px solid white;
       border-radius: 50%;
 
-      width: 100px;
-      height: 100px;
+      display: none;
 
-      background-image: url('https://d15g8hc4183yn4.cloudfront.net/wp-content/uploads/2023/04/04105933/200x200-spearman-rmTiny.png');
-      background-size: cover;
+      position: absolute;
+      bottom: -50px;
+      margin-left: 50px;
+      transform: scale(1.2);
+      opacity: 0.33;
+      background-color: green;
+    }
 
-      .groundedStart {
-        // border: 2px solid white;
-        position: absolute;
-        background: #999;
-        bottom: 50px;
-        top: 11px;
-        left: 50%;
-        right: -40px;
+    .groundedW {
+      position: absolute;
 
-        z-index: -1;
-      }
+      right: -250px;
+      bottom: 0;
 
-      .groundedCurrent {
-        position: absolute;
-        background: red;
-        bottom: 45px;
-        top: 52px;
-        left: 50%;
-        right: -30px;
+      .grounded {
+        border: 2px solid pink;
+        background: rgba(255,255,255, 0.75);
+        border-radius: 50%;
+
+        width: 100px;
+        height: 100px;
+
+        background-image: url('https://d15g8hc4183yn4.cloudfront.net/wp-content/uploads/2023/04/04105933/200x200-spearman-rmTiny.png');
+        background-size: cover;
+
+        .groundedStart {
+          // border: 2px solid white;
+          position: absolute;
+          background: #999;
+          bottom: 50px;
+          top: 11px;
+          left: 50%;
+          right: -40px;
+
+          z-index: -1;
+        }
+
+        .groundedCurrent {
+          position: absolute;
+          background: red;
+          bottom: 45px;
+          top: 52px;
+          left: 50%;
+          right: -30px;
+        }
       }
     }
-  }
 
-  .spearmanW {
-    border: 2px solid yellow;
+    .riderCurrent {
+      display: none;
 
-    position: absolute;
-    display: inline-block;
+      position: absolute;
+      background: #339933;
+      bottom: -7px;
+      height: 5px;
+      right: 0;
+      // width: 105px;
 
-    left: 800px;
+    }
+    .riderStart {
+      // border: 2px solid #cc33ff;
+      border-right: 2px solid #cc33ff;
 
-    .spearman {
-      // border: 2px solid orange;
-      background: rgba(255,255,255, 0.75);
-      border-radius: 50%;
+      position: absolute;
+      background: #999;
+      // background: red;
+      bottom: 50px;
+      height: 35px;
+      // right: 50px;
+      // right: 0;
+      bottom: 50px;
+      // width: 176px;
+      // left: 0;
+
+      z-index: -1;
+    }
+
+    .riderStart2 {
+      // border: 2px solid #30033f;
 
-      background-image: url('https://d15g8hc4183yn4.cloudfront.net/wp-content/uploads/2023/04/04105933/200x200-spearman-rmTiny.png');
-      background-size: cover;
+      position: absolute;
+      background: #999;
+      // background: red;
+      bottom: 50px;
+      height: 35px;
+      // right: 50px;
+      right: left;
+      bottom: 50px;
+      // width: 176px;
+      // left: 0;
+
+      z-index: -1;
+    }
 
-      width: 100px;
-      height: 100px;
+    .riderW {
+      // border: 2px solid yellow;
 
       position: absolute;
-      left: -50px;
 
-      // &::after { /* arrow-up */
-      //   content: "";
-      //   position: absolute;
-      //   bottom: 0;
-      //   right: calc( 50% - 25px );
+      left: 0;
+      top: 20px;
+
+      .rider {
+        // border: 2px solid orange;
 
-      //   width: 0;
-      //   height: 0;
-      //   border-left: 25px solid transparent;
-      //   border-right: 25px solid transparent;
+        // background: rgba(255,255,255, 0.5);
+        border-radius: 50%;
 
-      //   border-bottom: 25px solid red;
-      // }
+        background-image: url('https://d15g8hc4183yn4.cloudfront.net/wp-content/uploads/2023/04/04105933/200x200-spearman-rmTiny.png');
+        background-size: cover;
 
-      .spearmanStart {
         position: absolute;
-        background: #999;
-        bottom: 50px;
-        top: 11px;
-        right: 50%;
-        left: -134px;
+        width: 100px;
+        left: -50px;
+        height: 100px;
+        bottom: 0;
+        padding-left: 50px;
+        padding-top: 50px;
 
-        z-index: -1;
-      }
 
-      .spearmanCurrent {
-        position: absolute;
-        background: red;
-        bottom: 45px;
-        top: 52px;
-        right: 50%;
-        left: -97px;
+
+        .riderC {
+          border: 6px solid white;
+          border-radius: 6px;
+
+          position: absolute;
+          left: calc( 50% - 6px );
+          bottom: calc( 50% - 6px );
+
+        }
       }
-    }
-  }
 
-  .windW {
-    // border: 2px solid blue;
+      .riderF {
+        background-image: url('https://d15g8hc4183yn4.cloudfront.net/wp-content/uploads/2023/04/05142539/200x200-spearman-rmFTiny.png');
+      }
 
-    position: absolute;
-    left: 910px; /* ( <price> - 20 ) * 200 */
-    bottom: 0;
+    }
 
-    &::after { /* arrow-up */
-      border-bottom: 25px solid yellow;
+    .windW {
+      border: 2px solid blue;
 
-      content: "";
       position: absolute;
+      left: 232px; /* Data: current underlying strike */
       bottom: 0;
-      // right: 50%;
-      left: -25px;
 
-      // width: 0;
-      // height: 0;
-      border-left: 25px solid transparent;
-      border-right: 25px solid transparent;
-    }
 
-    .wind {
+      &::before { /* arrow-up */
+        border-bottom: 25px solid yellow;
 
-      background-image: url('https://d15g8hc4183yn4.cloudfront.net/wp-content/uploads/2023/04/04104623/200x200-windTiny.png');
-      background-position: bottom center;
+        content: "";
+        position: absolute;
+        bottom: 0;
+        left: -25px;
+        z-index: 1;
 
-      opacity: 0.5;
+        border-left: 25px solid transparent;
+        border-right: 25px solid transparent;
+      }
 
-      width: 200px;
-      height: 200px;
+      .wind {
+        // border: 2px solid green;
 
-      margin-left: -25px;
+        display: flex;
+        flex-direction: column-reverse;
+
+        .c-u-s {
+          position: relative;
+          z-index: 2;
+
+          background: #333;
+          color: white;
+          display: inline-block
+        }
+
+        .windC {
+          // border: 1px solid red;
 
-      .windC {
+          position: absolute;
+          bottom: 0;
+          left: 0;
+
+          background-image: url('https://d15g8hc4183yn4.cloudfront.net/wp-content/uploads/2023/04/04104623/200x200-windTiny.png');
+          background-position: bottom center;
+          margin-left: -25px;
+
+          opacity: 0.5;
+
+          width: 200px;
+          height: 200px;
+        }
       }
     }
   }
-
 }

data/app/controllers/ish_manager/iro_purses_controller.rb

@@ -43,7 +43,7 @@ class ::IshManager::IroPursesController < IshManager::ApplicationController
     @positions = @purse.positions.order({ expires_on: :asc, strike: :asc })
     @positions.map &:refresh
 
-    render @purse.parsed_config[:kind] || 'show'
+    render @purse.parsed_config[:kind] || params[:kind] || 'show'
   end
 
   def update

data/app/controllers/ish_manager/iro_strategies_controller.rb

@@ -3,14 +3,14 @@ class ::IshManager::IroStrategiesController < IshManager::ApplicationController
 
   def create
     @strategy = Iro::CoveredCallStrategy.new params[:iro_strategy].permit!
-    @strategy.iro_purse_id = Iro::Purse.where( user_id: current_user.id ).first.id
+    # @strategy.iro_purse_id = Iro::Purse.where( user_id: current_user.id ).first.id
     authorize! :create, @strategy
     flag = @strategy.save
     if flag
       flash[:notice] = 'Success.'
-      redirect_to my_purse_path
+      redirect_to controller: 'ish_manager/iro_purses', action: :show, id: @strategy.iro_purse_id
     else
-      flash[:alert] = "No luck: #{@strategy.full_errors.messages.join(', ')}."
+      flash[:alert] = "No luck: #{@strategy.errors.full_messages.join(', ')}."
       render action: 'new'
     end
   end
@@ -33,7 +33,7 @@ class ::IshManager::IroStrategiesController < IshManager::ApplicationController
       flash[:notice] = 'Success.'
       redirect_to my_purse_path
     else
-      flash[:alert] = "No luck: #{@strategy.full_errors.messages.join(', ')}."
+      flash[:alert] = "No luck: #{@strategy.errors.full_messages.join(', ')}."
       render action: 'new'
     end
   end

data/app/helpers/ish_manager/application_helper.rb

@@ -61,6 +61,7 @@ module IshManager
       "$ #{'%.2f' % a}"
     end
     def pp_money a; pp_amount a; end
+    def pp_currency a; pp_amount a; end
     def pp_percent a
       "#{(a*100).round(2)}%"
     end

data/app/views/ish_manager/application/_main_header_admin.haml

@@ -52,7 +52,8 @@
     .a
       %ul
         %li
-          = link_to "#{WpTag::INBOX} (#{Office::EmailConversation.in_emailtag(WpTag::INBOX).length})", email_conversations_in_path(WpTag::INBOX)
+          .chip
+            = link_to "#{WpTag::INBOX} (#{Office::EmailConversation.in_emailtag(WpTag::INBOX).length})", email_conversations_in_path(WpTag::INBOX)
           = link_to '[+]', new_email_context_path
         %li
           = link_to "Templates (#{Ish::EmailTemplate.all.count})", email_templates_path
@@ -97,6 +98,7 @@
           %span.label Purses:
           - Iro::Purse.all.map do |p|
             = link_to "[#{p.id}]", iro_purse_path(p)
+            = link_to "[gui]", iro_purse_gameui_path(p)
           = link_to '[+]', new_iro_purse_path
         %li
           = link_to 'Watches', iro_watches_path

data/app/views/ish_manager/iro_purses/show.haml

@@ -14,12 +14,11 @@
     -# %pre= @purse.config
     = render 'form', iro_purse: @purse
 
-  %h5.collapse-expand#strategies Strategies (#{@strategies.length}) #{link_to '[+]', new_iro_strategy_path}
+  %h5.collapse-expand#strategies
+    Strategies (#{@strategies.length})
+    = link_to '[+]', new_iro_strategy_path({ iro_purse_id: @purse.id })
   .strategies.items
     - @strategies.each do |strat|
-      -# .strategy.item
-      -#   = link_to '[~]', edit_iro_strategy_path( strat )
-      -#   <pre>#{JSON.pretty_generate( strat.display_attrs )}</pre>
       .strategy.item= render 'ish_manager/iro_strategies/form', strategy: strat
 
 

data/app/views/ish_manager/iro_purses/show_gameui.haml

@@ -1,5 +1,5 @@
 
-.iro-purses-show.padded
+.iro-purses-show-gameui.padded
   .max-width
     .header
       %h4.title
@@ -14,42 +14,64 @@
     -# %pre= @purse.config
     = render 'form', iro_purse: @purse
 
-  %h5.collapse-expand#strategies Strategies (#{@strategies.length}) #{link_to '[+]', new_iro_strategy_path}
+  %h5.collapse-expand#strategies
+    Strategies (#{@strategies.length})
+    = link_to '[+]', new_iro_strategy_path({ iro_purse_id: @purse.id })
   .strategies.items
     - @strategies.each do |strat|
-      -# .strategy.item
-      -#   = link_to '[~]', edit_iro_strategy_path( strat )
-      -#   <pre>#{JSON.pretty_generate( strat.display_attrs )}</pre>
       .strategy.item= render 'ish_manager/iro_strategies/form', strategy: strat
 
-  %h5.collapse-expand#gameuiPositions1
+
+  %h5.collapse-expand#gameuiPositions
     Gameui Positions (#{@positions.length})
     = link_to '[+]', new_iro_position_path({ iro_purse_id: @purse.id })
-  .gameuiW
-    .gameui
-      .gameuiC
-
-
-        .elephant
-        .windW
-          .wind
-            .windC
-        .ground
-        .grid
-        .spearmanW
-          .spearman
-            .spearmanStart
-            .spearmanCurrent
-        .groundedW
-          .grounded
-            .groundedC
-            .groundedStart
-            .groundedCurrent
-
-        .elephant.elephantNext
-
-
-  %h5.collapse-expand#positions2
+
+  .gameui-positions
+    - @positions.each do |p|
+
+      -# something like, $23 Apr-14
+      .gameuiW.show-amounts{ data: { cc: { strike: p.strike, startPrice: p.opened_price, currentPrice: p.current_price, cus: p.strategy.current_underlying_strike } } }
+        .gameui
+          .gameuiC
+
+            .elephantW
+              .elephant
+                .elephantC
+
+                  .amount
+
+                  .q= p.quantity
+
+                  .riderW
+                    .rider
+                      .riderC
+
+                  .riderStart
+                    .amount
+                    .riderCurrent
+                      .amount
+                  .riderStart2
+
+                .sunflowerW
+                  .sunflower
+                    .sunflowerC
+
+                      .days-left= (p.expires_on.to_date - Time.now.to_date).to_i
+
+            .windW
+              .wind
+                .c-u-s= pp_currency p.strategy.current_underlying_strike
+                .windC
+
+
+            .spearW
+              .spear
+                .spearC
+                  .spearStart
+                    .spearCurrent
+
+
+  %h5.collapse-expand#spreadsheetPositions
     Positions (#{@positions.length})
     = link_to '[+]', new_iro_position_path({ iro_purse_id: @purse.id })
   .positions

data/app/views/ish_manager/iro_strategies/_form.haml

@@ -2,6 +2,7 @@
 - url = strategy.new_record? ? iro_strategies_path : iro_strategy_path(strategy)
 .iro-strategies--form
   = form_for strategy, url: url, as: :iro_strategy do |f|
+    = hidden_field_tag 'iro_strategy[iro_purse_id]', params[:iro_purse_id]
     .field
       = "#{strategy.id}." if strategy.id
       = f.label :slug

data/config/routes.rb

@@ -28,6 +28,7 @@ IshManager::Engine.routes.draw do
 
   resources :iro_watches
 
+  get 'iro_purses/:id/show-gameui', to: 'iro_purses#show', as: :iro_purse_gameui, defaults: { kind: 'show_gameui' }
   resources :iro_purses
 
   resources :iro_strategies

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.410
+  version: 0.1.8.412
 platform: ruby
 authors:
 - piousbox
@@ -251,6 +251,7 @@ files:
 - app/assets/javascripts/ish_manager/email_conversations.js
 - app/assets/javascripts/ish_manager/email_templates.js
 - app/assets/javascripts/ish_manager/galleries.js
+- app/assets/javascripts/ish_manager/iro.js
 - app/assets/javascripts/ish_manager/maps.js
 - app/assets/javascripts/ish_manager/shared.js
 - app/assets/javascripts/ish_manager/vendor/bootstrap.min.js