From a8f97f0c4fe2bea23be66965c250b257ace04971 Mon Sep 17 00:00:00 2001
From: Dennis Eriksen <dennis.se@gmail.com>
Date: Fri, 24 May 2013 22:49:33 +0200
Subject: fixed settlement in projects on dashboard. improves on #9 and closes
 #29

---
 views/dashboard.ejs | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

(limited to 'views')

diff --git a/views/dashboard.ejs b/views/dashboard.ejs
index 21aef0d..c759add 100644
--- a/views/dashboard.ejs
+++ b/views/dashboard.ejs
@@ -32,7 +32,8 @@
                                         </small>
                                     </div>
                                     <div class="span4">
-                                        <small>Oppgjør: <span class="text-error">-200 kr</span></small>
+                                        <% s = (pro.project[projects.project._id].user - (pro.project[projects.project._id].total / pro.project[projects.project._id].users)).toFixed(2); %>
+                                        <small>Oppgjør: <%- s >= 0 ? '<span class="text-success">' + s : '<span class="text-error">' + s %></span> <%= projects.project.currency %></small>
                                     </div>
                                 </div>
                             </div>
@@ -55,25 +56,7 @@
 
         <div class="smallfullwidth span7">
             <section class="status">
-                <div class="row-fluid">
-                    <div class="span6 smallfullwidth">
-                        <h1>Status total</h1>
-                    </div>
-                    <div class="span6 smallfullwidth">
-                        <div class="row-fluid">
-                                <table class="table table-bordered table-condensed">
-                                    <tr>
-                                        <td class="success">3000</td>
-                                        <td class="error">4000</td>
-                                        <td>1000</td>
-                                    </tr>
-                                </table><a href="#table-info" class="accordion-toggle" data-toggle="collapse"><i class="icon-info-sign"></i></a>
-                        </div>
-                        <div class="row-fluid accordion collapse" id="table-info">
-                            <p class="text-info"><small>Her vises hvor mye andre skylder deg totalt, hvor mye du skylder andre totalt, og differansen mellom disse to tallene</small></p>
-                        </div>
-                    </div>
-                </div>
+                <h1>Status total</h1>
                 <canvas id="myChart" width="530" height="200"></canvas>
             </section>
             <section class="overview">
-- 
cgit v1.2.3