From d0bb8fbdba92e5558c48c26e84989286e1885cfa Mon Sep 17 00:00:00 2001
From: Sam Pullara <spullara@wavefront.com>
Date: Tue, 2 Jun 2015 20:07:38 -0700
Subject: [PATCH] add the new damage and energy values to the UI

---
 app/views/_slot-hardpoint.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/views/_slot-hardpoint.html b/app/views/_slot-hardpoint.html
index fc9c2289..96475f5d 100755
--- a/app/views/_slot-hardpoint.html
+++ b/app/views/_slot-hardpoint.html
@@ -4,8 +4,9 @@
   <div class="l">{{hp.c.class}}{{hp.c.rating}}<span ng-if="hp.c.mode">/{{hp.c.mode}}{{hp.c.missile}}</span> {{hp.c.name || lbl}}</div>
   <div class="r">{{hp.c.mass}} <u>T</u></div>
   <div class="cb">
-    <div class="l" ng-if="hp.c.damage">DMG: {{hp.c.damage}}</div>
-    <div class="l" ng-if="hp.c.dps">DPS: {{hp.c.dps}}</div>
+    <div class="l" ng-if="hp.c.damage">DMG: {{hp.c.damage}} <u ng-if="hp.c.ssdam">({{$r.fCrd(hp.c.ssdam)}} MJ)</u></div>
+    <div class="l" ng-if="hp.c.dps">DPS: {{hp.c.dps}} <u ng-if="hp.c.mjdps">({{$r.fCrd(hp.c.mjdps)}} MJ)</u></div>
+    <div class="l" ng-if="hp.c.mjeps">EPS: {{$r.fCrd(hp.c.mjeps)}} MJ</div>
     <div class="l"  ng-if="hp.c.thermload">T-Load: {{hp.c.thermload}}</div>
     <div class="l" ng-if="hp.c.type">Type: {{hp.c.type}}</div>
     <div class="l" ng-if="hp.c.rof">ROF: {{hp.c.rof}}<u>/s</u></div>