From 4fa1115e8fdcec216e799d29671ab38d59c95345 Mon Sep 17 00:00:00 2001 From: Kevin Chang Date: Thu, 6 Aug 2015 20:58:11 -0700 Subject: [PATCH 1/2] Extend PD Boost warning to PP Retracted power (TODO: extend to two-stage warning for DEP/RET) --- app/js/controllers/controller-outfit.js | 4 ++++ app/views/page-outfit.html | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/js/controllers/controller-outfit.js b/app/js/controllers/controller-outfit.js index 71f6401e..2f959d39 100755 --- a/app/js/controllers/controller-outfit.js +++ b/app/js/controllers/controller-outfit.js @@ -392,6 +392,10 @@ angular.module('app').controller('OutfitController', ['$window', '$rootScope', ' $scope.costTab = tab; }; + $scope.ppWarning = function(pp) { + return pp.pGen < ship.powerRetracted; + } + $scope.pdWarning = function(pd) { return pd.enginecapacity < ship.boostEnergy; }; diff --git a/app/views/page-outfit.html b/app/views/page-outfit.html index adda08d1..cb35d356 100644 --- a/app/views/page-outfit.html +++ b/app/views/page-outfit.html @@ -111,7 +111,7 @@
-
+
{{::pp.maxClass}}
{{pp.id}} Power Plant
{{pp.c.mass}} T
@@ -119,7 +119,7 @@
Efficiency: {{pp.c.eff}}
Power: {{pp.c.pGen}} MW
-
+
From 1b3ca2f697fab9d823762df287677eab0f66af94 Mon Sep 17 00:00:00 2001 From: Kevin Chang Date: Thu, 13 Aug 2015 22:22:46 -0700 Subject: [PATCH 2/2] Fix lint error --- app/js/controllers/controller-outfit.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/js/controllers/controller-outfit.js b/app/js/controllers/controller-outfit.js index 2f959d39..8c4670c6 100755 --- a/app/js/controllers/controller-outfit.js +++ b/app/js/controllers/controller-outfit.js @@ -394,7 +394,7 @@ angular.module('app').controller('OutfitController', ['$window', '$rootScope', ' $scope.ppWarning = function(pp) { return pp.pGen < ship.powerRetracted; - } + }; $scope.pdWarning = function(pd) { return pd.enginecapacity < ship.boostEnergy;