Transaction notes and delete function

16 files changed, 48 insertions, 5 deletions

diff --git a/public/css/images/animated-overlay.gif b/public/assets/css/images/animated-overlay.gif
index d441f75e..d441f75e 100644
--- a/public/css/images/animated-overlay.gif
+++ b/public/assets/css/images/animated-overlay.gif
diff --git a/public/css/images/ui-bg_flat_0_aaaaaa_40x100.png b/public/assets/css/images/ui-bg_flat_0_aaaaaa_40x100.png
index 9aab30b1..9aab30b1 100644
--- a/public/css/images/ui-bg_flat_0_aaaaaa_40x100.png
+++ b/public/assets/css/images/ui-bg_flat_0_aaaaaa_40x100.png
diff --git a/public/css/images/ui-bg_flat_75_ffffff_40x100.png b/public/assets/css/images/ui-bg_flat_75_ffffff_40x100.png
index 0b2088de..0b2088de 100644
--- a/public/css/images/ui-bg_flat_75_ffffff_40x100.png
+++ b/public/assets/css/images/ui-bg_flat_75_ffffff_40x100.png
diff --git a/public/css/images/ui-bg_glass_55_fbf9ee_1x400.png b/public/assets/css/images/ui-bg_glass_55_fbf9ee_1x400.png
index b1e1380b..b1e1380b 100644
--- a/public/css/images/ui-bg_glass_55_fbf9ee_1x400.png
+++ b/public/assets/css/images/ui-bg_glass_55_fbf9ee_1x400.png
diff --git a/public/css/images/ui-bg_glass_65_ffffff_1x400.png b/public/assets/css/images/ui-bg_glass_65_ffffff_1x400.png
index 0850cce5..0850cce5 100644
--- a/public/css/images/ui-bg_glass_65_ffffff_1x400.png
+++ b/public/assets/css/images/ui-bg_glass_65_ffffff_1x400.png
diff --git a/public/css/images/ui-bg_glass_75_dadada_1x400.png b/public/assets/css/images/ui-bg_glass_75_dadada_1x400.png
index 7d57debb..7d57debb 100644
--- a/public/css/images/ui-bg_glass_75_dadada_1x400.png
+++ b/public/assets/css/images/ui-bg_glass_75_dadada_1x400.png
diff --git a/public/css/images/ui-bg_glass_75_e6e6e6_1x400.png b/public/assets/css/images/ui-bg_glass_75_e6e6e6_1x400.png
index 4061d4a2..4061d4a2 100644
--- a/public/css/images/ui-bg_glass_75_e6e6e6_1x400.png
+++ b/public/assets/css/images/ui-bg_glass_75_e6e6e6_1x400.png
diff --git a/public/css/images/ui-bg_glass_95_fef1ec_1x400.png b/public/assets/css/images/ui-bg_glass_95_fef1ec_1x400.png
index 83e61bc8..83e61bc8 100644
--- a/public/css/images/ui-bg_glass_95_fef1ec_1x400.png
+++ b/public/assets/css/images/ui-bg_glass_95_fef1ec_1x400.png
diff --git a/public/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/public/assets/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png
index 7d58f386..7d58f386 100644
--- a/public/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png
+++ b/public/assets/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png
diff --git a/public/css/images/ui-icons_222222_256x240.png b/public/assets/css/images/ui-icons_222222_256x240.png
index c1cb1170..c1cb1170 100644
--- a/public/css/images/ui-icons_222222_256x240.png
+++ b/public/assets/css/images/ui-icons_222222_256x240.png
diff --git a/public/css/images/ui-icons_2e83ff_256x240.png b/public/assets/css/images/ui-icons_2e83ff_256x240.png
index 84b601bf..84b601bf 100644
--- a/public/css/images/ui-icons_2e83ff_256x240.png
+++ b/public/assets/css/images/ui-icons_2e83ff_256x240.png
diff --git a/public/css/images/ui-icons_454545_256x240.png b/public/assets/css/images/ui-icons_454545_256x240.png
index b6db1acd..b6db1acd 100644
--- a/public/css/images/ui-icons_454545_256x240.png
+++ b/public/assets/css/images/ui-icons_454545_256x240.png
diff --git a/public/css/images/ui-icons_888888_256x240.png b/public/assets/css/images/ui-icons_888888_256x240.png
index feea0e20..feea0e20 100644
--- a/public/css/images/ui-icons_888888_256x240.png
+++ b/public/assets/css/images/ui-icons_888888_256x240.png
diff --git a/public/css/images/ui-icons_cd0a0a_256x240.png b/public/assets/css/images/ui-icons_cd0a0a_256x240.png
index ed5b6b09..ed5b6b09 100644
--- a/public/css/images/ui-icons_cd0a0a_256x240.png
+++ b/public/assets/css/images/ui-icons_cd0a0a_256x240.png
diff --git a/public/css/calculator.less b/public/css/calculator.less
index 4ba5058a..316fd9cd 100644
--- a/public/css/calculator.less
+++ b/public/css/calculator.less
@@ -53,3 +53,9 @@ td#total { font-weight: bold; text-align: right; }
   background-image: url('../img/coinos_logo.svg') !important;
   background-size: 300px 80px;
 }
+
+@media screen and (min-width: 768px) {
+    .modal-dialog {
+        width: 400px; /* either % (e.g. 60%) or px (400px) */
+    }
+}
diff --git a/public/js/report.coffee b/public/js/report.coffee
index 99a0df25..72000fc8 100644
--- a/public/js/report.coffee
+++ b/public/js/report.coffee
@@ -56,20 +56,57 @@ display = (transactions) ->
   else
     $('.alert').hide()
     $.each(transactions, ->
-      exchange = parseFloat(this.exchange)
-      received = parseFloat(this.received)
+      exchange = parseFloat(@exchange)
+      received = parseFloat(@received)
       amount = received * exchange
+      notes = @notes
+      txid = @txid
+      date = moment(@date, 'YYYY-MM-DD h:mm:ss').format('MMM D h:mma')
 
-      $('.report tbody').append("""
-        <tr>
-          <td>#{moment(this.date, 'YYYY-MM-DD h:mm:ss').format('MMM D h:mma')}</td>
+      row = $("""
+        <tr id='#{@txid}'>
+          <td>#{date}&nbsp;&nbsp;<span class='glyphicon glyphicon-tag hidden'></span></td>
           <td>#{exchange.toFixed(2)}</td>
           <td>#{received.toFixed(8)}</td>
           <td>#{amount.toFixed(2)}</td>
         </tr>
       """)
+
+      if notes
+        row.attr('data-notes', notes)
+        row.find('span').removeClass('hidden')
+
+      $('.report tbody').append(row) 
+      
+      row.click(-> 
+        notes = $(this).attr('data-notes')
+
+        $('#modal').modal()
+        $('#modal textarea').val('')
+
+        $('#modal .btn-danger').off().click(->
+          $.ajax(type: 'delete', url: "/#{$('#user').val()}/transactions/#{txid}")
+          $('#modal').modal('hide')
+          row.remove()
+        )
+
+        $('#modal textarea').off().change(->
+          notes = $(this).val()
+          $.post("/transactions/#{txid}", notes: $(this).val()) if txid
+
+          row.find('span').addClass('hidden')
+          if notes
+            row.find('span').removeClass('hidden')
+
+          row.attr('data-notes', $(this).val())
+        )
+
+        if notes
+          $('#modal textarea').val(notes) 
+      )
     )
 
+
     btc = 0
     $('table.report tbody td:nth-child(3)').each(->
       btc += parseFloat($(this).html())