From f1d82e715e28483d6bb650445c2ede867b8ce22b Mon Sep 17 00:00:00 2001
From: Adrian Short <adrian.short@gmail.com>
Date: Wed, 16 Jun 2010 12:01:42 +0100
Subject: [PATCH] Added filter by payment size to payments to suppliers view

---
 app.rb                           |  13 ++++-
 public/od_80x15_blue.png         | Bin 446 -> 0 bytes
 public/spinner.gif               | Bin 0 -> 1849 bytes
 public/style.css                 |  32 ++++++++++-
 views/layout.haml                |   1 +
 views/servicepayments.haml       |  93 ++++++++++++++++++-------------
 views/servicepaymentsdetail.haml |  24 ++++++++
 7 files changed, 120 insertions(+), 43 deletions(-)
 delete mode 100644 public/od_80x15_blue.png
 create mode 100644 public/spinner.gif
 create mode 100644 views/servicepaymentsdetail.haml

diff --git a/app.rb b/app.rb
index ca2c6c7..6b78df5 100644
--- a/app.rb
+++ b/app.rb
@@ -100,10 +100,21 @@ end
 
 get '/services/:slug/payments' do
   @service = Service.first(:slug => params[:slug])
-  @total = @service.payments.sum(:amount)
+  @payments = Payment.all(:service => @service, :amount.gte => 0, :order => 'd')
+  @total = @payments.sum(:amount)
   haml :servicepayments
 end
 
+get '/services/:slug/paymentsdetail' do
+  @service = Service.first(:slug => params[:slug])
+  min = 500
+  if params[:min].to_i > 0
+    min = params[:min].to_i
+  end
+  @payments = Payment.all(:service => @service, :amount.gte => min, :order => 'd')
+  @total = @payments.sum(:amount)
+  haml :servicepaymentsdetail, :layout => false
+end
 
 
 get '/services/?' do
diff --git a/public/od_80x15_blue.png b/public/od_80x15_blue.png
deleted file mode 100644
index 6314d594007363e3ff8d2f8e2c2f288bef6fdb8c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 446
zcmV;v0YUzWP)<h;3K|Lk000e1NJLTq002+`000jN1^@s6bIC}L00004b3#c}2nYxW
zd<bNS0000PbVXQnQ*UN;cVTj60C#tHE@^ISb7Ns}WiD@WXPfRk8UO$RP)S5VR9J=W
zm|Jp!KoCXGpk`YU)`Ek{PZoeijj)9TgtdUF?8*n^12L$WXvR3Pit|S^Ro!*x_Vj>|
zQsy-Lnl?ZfhPvyxNgT&11k{D?COXqA5&ISZhUPkMo<=}LYFoH$t<t8|*nYe>NXR#1
zDDo_X069zvCS43e0Ef@}blL`QlP&;@<(kLw`_B6^Us*%DB?w+j0G6wahtYhyHu6k_
z5LY`M4jgE^39)Yx`_@4b$KsJ!#6?9PIZVm2(+B)wxyE)Ap1coU$M-uqZ8zE01+ZG@
z^q<pO@p^+4+f9f(^W@wroHa!1oC$>s;md&lv#CjcG$+_NONIS>ms)!X&JyrgaaG}}
z%%<kqPORhD#(lR|n**yYdg^Z0Ik2P@@h9#&En?rQJp=zULQ0wIx=7#pJ<xHS<{G0)
oBcLK$Kjp4HG5-S5{EboL6E$6u4$WhMSO5S307*qoM6N<$g4p=M7XSbN

diff --git a/public/spinner.gif b/public/spinner.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d42f72c723644bbf8cf8d6e1b7ff0bea7ddd305a
GIT binary patch
literal 1849
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

literal 0
HcmV?d00001

diff --git a/public/style.css b/public/style.css
index 06d9169..87e1d0f 100644
--- a/public/style.css
+++ b/public/style.css
@@ -10,7 +10,6 @@ body
 p
 {
   font-size: 110%;
-  margin: 30px 0;
 }
 
 input
@@ -94,7 +93,7 @@ strong
 table
 {
   border-collapse: collapse;
-  margin-bottom: 30px 0;
+  margin-bottom: 50px;
 }
 
 td, th
@@ -144,4 +143,33 @@ tr
   padding: 0px;
   font-size: 150%;
   line-height: 1.5em;
+}
+
+.spinner
+{
+  display: none;
+}
+
+.filter li
+{
+  display: inline;
+}
+
+.filter a, .filter a:visited
+{
+  margin: 0 0px 0 0;
+  padding: 5px 10px;
+  background-color: #333;
+  color: #fff;
+}
+
+.filter a:hover
+{
+
+}
+
+a.filter_selected
+{
+  background-color: red;
+  color: #fff;
 }
\ No newline at end of file
diff --git a/views/layout.haml b/views/layout.haml
index 29cfe25..5866fc8 100644
--- a/views/layout.haml
+++ b/views/layout.haml
@@ -7,6 +7,7 @@
     %link{ :rel => 'stylesheet', :type => 'text/css', :href => '/breadcrumb/breadcrumb.css' }
     %link{ :rel => 'stylesheet', :type => 'text/css', :href => '/print.css', :media => 'print' }
     %link{ :rel => 'stylesheet', :type => 'text/css', :href => '/grid.css' }
+    %script{:type => 'text/javascript', :src => 'http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js'}
     <script type="text/javascript">
     var _gaq = _gaq || [];
     _gaq.push(['_setAccount', 'UA-3042981-18']);
diff --git a/views/servicepayments.haml b/views/servicepayments.haml
index a56963b..2f3f687 100644
--- a/views/servicepayments.haml
+++ b/views/servicepayments.haml
@@ -1,3 +1,22 @@
+:javascript
+  function getPayments(min, objj) {
+    $('.spinner').show()
+    $.get("/services/#{@service.slug}/paymentsdetail", { min: min }, function(data) {
+      $('#payments').html(data);
+    $('.spinner').hide()
+    $('.filter a').removeClass('filter_selected');
+    $(objj).addClass('filter_selected');
+    });
+  }
+
+  $(function(){
+    $('#min500').click(function() { getPayments(500, $(this)); return false; });
+    $('#min1000').click(function() { getPayments(1000, $(this)); return false; });
+    $('#min2500').click(function() { getPayments(2500, $(this)); return false; });
+    $('#min5000').click(function() { getPayments(5000, $(this)); return false; });
+    $('#min10000').click(function() { getPayments(10000, $(this)); return false; });
+  });
+
 .grid_12
   %ul#breadcrumb
     %li.home
@@ -8,7 +27,7 @@
       %a{ :href => "/services/#{@service.slug}" }
         = @service.name
     %li Payments to Suppliers
-
+  
   %h2= @page_title = "#{@service.name}: Payments to Suppliers"
   
   %p
@@ -25,45 +44,39 @@
   %p.noprint.download
     %a{ :href => "/services/#{@service.slug}/payments.csv" }
       Download data as CSV
+
+  .noprint
+    %p
+      Show payments over:&nbsp;&nbsp;
+      %img.spinner{ :src => "/spinner.gif" } <!-- Thanks, http://ajaxload.info/ -->
       
-  %table
-    %tr
-      %th Date
-      %th Ref.
-      %th Supplier
-      %th.right &pound;
-        
-    - for payment in @service.payments
-      %tr
-        %td= payment.d.strftime("%d&nbsp;%b&nbsp;%Y")
-        %td.right
-          %a{ :href => "/payments/#{payment.id}" }
-            = payment.id
-        %td
-          %a{ :href => '/suppliers/' + payment.supplier.slug }
-            = payment.supplier.name
-        %td.right= commify(sprintf("%0d", payment.amount))
-    
-    %tr
-      %td
-      %td
-      %td
-        %strong TOTAL
-      %td.right= commify(sprintf("%0d", @total))
+    %p.filter
+      %a#min500.filter_selected{:href => '#'}
+        &pound;500
+      %a#min1000{:href => '#'}
+        &pound;1,000
+      %a#min2500{:href => '#'}
+        &pound;2,500
+      %a#min5000{:href => '#'}
+        &pound;5,000
+      %a#min10000{:href => '#'}
+        &pound;10,000
+
+  #payments= haml :servicepaymentsdetail, :layout => false
   
 .clear
-<div class="grid_9 noprint">
-= haml_partial "comment_header"
-<div id="disqus_thread" class="noprint"></div>
-<script type="text/javascript">
-var disqus_developer = 1;
-(function() {
-var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-dsq.src = 'http://armchairauditor.disqus.com/embed.js';
-(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-})();
-</script>
-<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript=armchairauditor">comments powered by Disqus.</a></noscript>
-<a href="http://disqus.com" class="dsq-brlink noprint">Comments powered by <span class="logo-disqus">Disqus</span></a>
-</div>
-    
\ No newline at end of file
+-#
+  <div class="grid_9 noprint">
+  = haml_partial "comment_header"
+  <div id="disqus_thread" class="noprint"></div>
+  <script type="text/javascript">
+  var disqus_developer = 1;
+  (function() {
+  var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+  dsq.src = 'http://armchairauditor.disqus.com/embed.js';
+  (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+  })();
+  </script>
+  <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript=armchairauditor">comments powered by Disqus.</a></noscript>
+  <a href="http://disqus.com" class="dsq-brlink noprint">Comments powered by <span class="logo-disqus">Disqus</span></a>
+  </div>
diff --git a/views/servicepaymentsdetail.haml b/views/servicepaymentsdetail.haml
new file mode 100644
index 0000000..396afe2
--- /dev/null
+++ b/views/servicepaymentsdetail.haml
@@ -0,0 +1,24 @@
+%table
+  %tr
+    %th Date
+    %th Ref.
+    %th Supplier
+    %th.right &pound;
+      
+  - for payment in @payments
+    %tr
+      %td= payment.d.strftime("%d&nbsp;%b&nbsp;%Y")
+      %td.right
+        %a{ :href => "/payments/#{payment.id}" }
+          = payment.id
+      %td
+        %a{ :href => '/suppliers/' + payment.supplier.slug }
+          = payment.supplier.name
+      %td.right= commify(sprintf("%0d", payment.amount))
+        
+  %tr
+    %td
+    %td
+    %td
+      %strong TOTAL
+    %td.right= commify(sprintf("%0d", @total))
\ No newline at end of file