Empty retrofitting table color fix

app/js/app.js

@@ -45,8 +45,13 @@ function($rootScope, $location, $window, $doc, $state, CArr, shipPurpose, sz, hp
   $rootScope.STATUS_CLASS = ['', 'disabled', 'warning', 'secondary-disabled'];
   $rootScope.title = 'Coriolis';
 
-  $rootScope.cName = function(c) {
-    return c.c ? c.c.name ? c.c.name : GroupMap[c.c.grp] : null;
+  /**
+   * Returns the name of the component mounted in the specified slot
+   * @param  {Object} slot The slot object
+   * @return {String}      The component name
+   */
+  $rootScope.cName = function(slot) {
+    return slot.c ? slot.c.name ? slot.c.name : GroupMap[slot.c.grp] : null;
   };
 
   // Formatters

app/js/controllers/controller-outfit.js

@@ -1,7 +1,8 @@
 angular.module('app').controller('OutfitController', ['$window', '$rootScope', '$scope', '$state', '$stateParams', 'ShipsDB', 'Ship', 'Components', 'Serializer', 'Persist', 'calcTotalRange', 'calcSpeed', function($window, $rootScope, $scope, $state, $p, Ships, Ship, Components, Serializer, Persist, calcTotalRange, calcSpeed) {
+  var win = angular.element($window);   // Angularized window object for event triggering
   var data = Ships[$p.shipId];   // Retrieve the basic ship properties, slots and defaults
   var ship = new Ship($p.shipId, data.properties, data.slots); // Create a new Ship instance
-  var win = angular.element($window);   // Angularized window object for event triggering
+  var retrofitShip = new Ship($p.shipId, data.properties, data.slots); // Create a new Ship for retrofit comparison
 
   //  Update the ship instance with the code (if provided) or the 'factory' defaults.
   if ($p.code) {
@@ -11,8 +12,6 @@ angular.module('app').controller('OutfitController', ['$window', '$rootScope', '
     ship.buildWith(data.defaults);  // Populate with default components
   }
 
-  ship.applyDiscounts($rootScope.discounts.ship, $rootScope.discounts.components);
-
   $scope.buildName = $p.bn;
   $rootScope.title = ship.name + ($scope.buildName ? ' - ' + $scope.buildName : '');
   $scope.ship = ship;
@@ -32,11 +31,27 @@ angular.module('app').controller('OutfitController', ['$window', '$rootScope', '
   $scope.selectedSlot = null;
   $scope.savedCode = Persist.getBuild(ship.id, $scope.buildName);
   $scope.canSave = Persist.isEnabled();
+  $scope.allBuilds = Persist.builds;
   $scope.fuel = 0;
   $scope.pwrDesc = false;
   $scope.pwrPredicate = 'type';
+  $scope.retroDesc = false;
+  $scope.retroPredicate = 'netCost';
   $scope.costDesc = true;
   $scope.costPredicate = 'c.cost';
+  $scope.costTab = 'retrofit';
+
+  if ($scope.savedCode) {
+    Serializer.toShip(retrofitShip, $scope.savedCode);  // Populate components from last save
+    $scope.retrofitBuild = $scope.buildName;
+  } else {
+    retrofitShip.buildWith(data.defaults);
+    $scope.retrofitBuild = null;
+  }
+
+  ship.applyDiscounts($rootScope.discounts.ship, $rootScope.discounts.components);
+  retrofitShip.applyDiscounts($rootScope.discounts.ship, $rootScope.discounts.components);
+  updateRetrofitCosts();
 
   $scope.jrSeries = {
     xMin: 0,
@@ -189,6 +204,9 @@ angular.module('app').controller('OutfitController', ['$window', '$rootScope', '
     if ($scope.code != $scope.savedCode) {
       Persist.saveBuild(ship.id, $scope.buildName, $scope.code);
       $scope.savedCode = $scope.code;
+      if ($scope.retrofitBuild === $scope.buildName) {
+        Serializer.toShip(retrofitShip, $scope.code);
+      }
       updateState($scope.code);
     }
   };
@@ -232,6 +250,11 @@ angular.module('app').controller('OutfitController', ['$window', '$rootScope', '
     $scope.pwrPredicate = key;
   };
 
+  $scope.sortRetrofit = function(key) {
+      $scope.retroDesc = $scope.retroPredicate == key ? !$scope.retroDesc : $scope.retroDesc;
+      $scope.retroPredicate = key;
+  };
+
   /**
    * Toggle the power on/off for the selected component
    * @param  {object} item The component being toggled
@@ -266,6 +289,15 @@ angular.module('app').controller('OutfitController', ['$window', '$rootScope', '
     return ship.getSlotStatus(slot, true);
   };
 
+  $scope.setRetrofitBase = function() {
+    if ($scope.retrofitBuild) {
+      Serializer.toShip(retrofitShip, Persist.getBuild(ship.id, $scope.retrofitBuild));
+    } else {
+      retrofitShip.buildWith(data.defaults);
+    }
+    updateRetrofitCosts();
+  };
+
   // Utilify functions
 
   function updateState(code) {
@@ -274,17 +306,61 @@ angular.module('app').controller('OutfitController', ['$window', '$rootScope', '
     $scope.speedSeries.xMax = $scope.trSeries.xMax = $scope.jrSeries.xMax = ship.cargoCapacity;
     $scope.jrSeries.yMax = ship.unladenRange;
     $scope.trSeries.yMax = ship.unladenTotalRange;
+    updateRetrofitCosts();
     win.triggerHandler('pwrchange');
   }
 
+  function updateRetrofitCosts() {
+    var costs = $scope.retrofitList = [];
+    var cName = $rootScope.cName;
+    var total = 0, i, l, item;
+
+    if (ship.bulkheads.id != retrofitShip.bulkheads.id) {
+      item = {
+        buyClassRating: ship.bulkheads.c.class + ship.bulkheads.c.rating,
+        buyName: cName(ship.bulkheads),
+        sellClassRating: retrofitShip.bulkheads.c.class + retrofitShip.bulkheads.c.rating,
+        sellName: cName(retrofitShip.bulkheads),
+        netCost: ship.bulkheads.discountedCost - retrofitShip.bulkheads.discountedCost
+      };
+      costs.push(item);
+      total += item.netCost;
+    }
+
+    for (var g in { common: 1, internal: 1, hardpoints: 1 }) {
+      var retroSlotGroup = retrofitShip[g];
+      var slotGroup = ship[g];
+      for (i = 0, l = slotGroup.length; i < l; i++) {
+        if (slotGroup[i].id != retroSlotGroup[i].id) {
+          item = { netCost: 0 };
+          if (slotGroup[i].id) {
+            item.buyName = cName(slotGroup[i]);
+            item.buyClassRating = slotGroup[i].c.class + slotGroup[i].c.rating;
+            item.netCost = slotGroup[i].discountedCost;
+          }
+          if (retroSlotGroup[i].id) {
+            item.sellName = cName(retroSlotGroup[i]);
+            item.sellClassRating = retroSlotGroup[i].c.class + retroSlotGroup[i].c.rating;
+            item.netCost -= retroSlotGroup[i].discountedCost;
+          }
+          costs.push(item);
+          total += item.netCost;
+        }
+      }
+    }
+    $scope.retrofitTotal = total;
+  }
+
   // Hide any open menu/slot/etc if the background is clicked
   $scope.$on('close', function() {
     $scope.selectedSlot = null;
   });
 
-    // Hide any open menu/slot/etc if the background is clicked
+  // Hide any open menu/slot/etc if the background is clicked
   $scope.$on('discountChange', function() {
     ship.applyDiscounts($rootScope.discounts.ship, $rootScope.discounts.components);
+    retrofitShip.applyDiscounts($rootScope.discounts.ship, $rootScope.discounts.components);
+    updateRetrofitCosts();
   });
 
 }]);

app/js/directives/directive-component-select.js

@@ -21,7 +21,7 @@ angular.module('app').directive('componentSelect', function() {
       list.push((o.maxmass && mass > o.maxmass) ? ' disabled"' : '" cpid="', id, '">');
 
       if (o.mode) {
-        list.push('<svg cpid="', id, '" class="icon lg"><use xlink:href="#mount-', o.mode, '"></use></svg> ');
+        list.push('<svg cpid="', id, '" class="icon lg"><use cpid="', id, '" xlink:href="#mount-', o.mode, '"></use></svg> ');
       }
 
       list.push(o.class, o.rating);

app/less/outfit.less

@@ -113,6 +113,25 @@ table.total {
   }
 }
 
+.tabs {
+  width: 100%;
+  margin-bottom: 1px;
+
+  &, th {
+    border-collapse: collapse;
+    color: @primary-disabled;
+    background-color: @primary-bg;
+    border: 1px solid @primary-disabled;
+    padding-top: 1px;
+  }
+
+  .active {
+    color: @primary-bg;
+    background-color: @primary-disabled;
+  }
+
+}
+
 .group {
   width: 25%;
   padding: 0.5em 0.2em;
@@ -228,9 +247,6 @@ table.total {
       &:nth-child(3) {
         display: none;
       }
-      &:nth-child(2) {
-        font-size: 0.7em;
-      }
     }
   });
 

app/less/select.less

@@ -1,3 +1,14 @@
+select {
+  .border-radius(0);
+  background: none;
+  color: @primary-disabled;
+  border: 1px solid @primary-disabled;
+  outline: none;
+  font-family: @fStandard;
+  font-size: 1em;
+  background-color: transparent;
+}
+
 .select {
   color: @primary-disabled;
   position: absolute;

app/views/_slot-internal.html

@@ -4,8 +4,8 @@
   {{c.c.class}}{{c.c.rating}} {{c.c.name || lbl}}
   <div class="r">{{c.c.mass || c.c.capacity || '0'}} <u>T</u></div>
   <div class="cb"></div>
-  <div class="l" ng-if="c.c.optmass">Opt: {{c.c.optmass}} <u>T</u></div>
-  <div class="l" ng-if="c.c.maxmass">Max: {{c.c.maxmass}} <u>T</u></div>
+  <div class="l" ng-if="c.c.optmass">Optimal Mass: {{c.c.optmass}} <u>T</u></div>
+  <div class="l" ng-if="c.c.maxmass">Max Mass: {{c.c.maxmass}} <u>T</u></div>
   <div class="l" ng-if="c.c.bins">{{c.c.bins}} <u>Bins</u></div>
   <div class="l" ng-if="c.c.rate">Rate: {{c.c.rate}} <u>Kg/s</u>&nbsp;&nbsp;&nbsp;Refuel Time: {{$r.fTime(fuel * 1000 / c.c.rate)}}</div>
   <div class="l" ng-if="c.c.ammo">Ammo: {{c.c.ammo}}</div>

app/views/page-outfit.html

@@ -239,28 +239,38 @@
   </div>
 
   <div class="group half">
-    <table style="width:100%">
+    <table class="tabs">
       <thead>
-        <tr class="main">
-          <th colspan="2" class="sortable le" ng-click="sortCost(cName)">
-            Component
-            <div class="r">
-              <u ng-if="discounts.ship < 1">[Ship {{fRPct(1 - discounts.ship)}} off]</u>
-              <u ng-if="discounts.components < 1">[Components {{fRPct(1 - discounts.components)}} off]</u>
-            </div>
-          </th>
-          <th class="sortable le" ng-click="sortCost('discountedCost')">Credits</th>
+        <tr>
+          <th style="width:50%" ng-class="{active: costTab == 'retrofit'}" ng-click="costTab = 'retrofit'">Retrofit Costs</th>
+          <th style="width:50%" ng-class="{active: costTab == 'costs'}" ng-click="costTab = 'costs'">Costs</th>
         </tr>
       </thead>
-      <tbody>
-        <tr class="highlight" ng-repeat="item in costList | orderBy:costPredicate:costDesc" ng-if="item.c.cost > 0" ng-class="{disabled:!item.incCost}">
-          <td class="toggleable" style="width:1em;"  ng-click="toggleCost(item)">{{item.c.class}}{{item.c.rating}}</td>
-          <td class="le toggleable shorten" ng-click="toggleCost(item)">{{cName(item)}}</td>
-          <td class="ri toggleable"  ng-click="toggleCost(item)">{{fCrd(item.discountedCost)}} <u>CR</u></td>
-        </tr>
-      </tbody>
     </table>
-    <table class="total">
+
+    <div ng-if="costTab == 'costs'">
+      <table style="width:100%">
+        <thead>
+          <tr class="main">
+            <th colspan="2" class="sortable le" ng-click="sortCost(cName)">
+              Component
+              <div class="r">
+                <u ng-if="discounts.ship < 1">[Ship {{fRPct(1 - discounts.ship)}} off]</u>
+                <u ng-if="discounts.components < 1">[Components {{fRPct(1 - discounts.components)}} off]</u>
+              </div>
+            </th>
+            <th class="sortable le" ng-click="sortCost('discountedCost')">Credits</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr class="highlight" ng-repeat="item in costList | orderBy:costPredicate:costDesc" ng-if="item.c.cost > 0" ng-class="{disabled:!item.incCost}">
+            <td class="toggleable" style="width:1em;"  ng-click="toggleCost(item)">{{item.c.class}}{{item.c.rating}}</td>
+            <td class="le toggleable shorten" ng-click="toggleCost(item)">{{cName(item)}}</td>
+            <td class="ri toggleable"  ng-click="toggleCost(item)">{{fCrd(item.discountedCost)}} <u>CR</u></td>
+          </tr>
+        </tbody>
+      </table>
+      <table class="total">
         <tr class="ri">
           <td class="lbl">Total</td>
           <td>{{fCrd(ship.totalCost)}} <u>CR</u></td>
@@ -269,7 +279,53 @@
           <td class="lbl">Insurance</td>
           <td>{{fCrd(ship.totalCost * insurance.current.pct)}} <u>CR</u></td>
         </tr>
-    </table>
+      </table>
+    </div>
+
+    <div ng-if="costTab == 'retrofit'">
+      <div style="overflow-x: auto;-webkit-overflow-scrolling: touch;">
+        <table style="width:100%">
+          <thead>
+            <tr class="main">
+              <th colspan="2" class="sortable le" ng-click="sortRetrofit('sellName')">Sell</th>
+              <th colspan="2" class="sortable le" ng-click="sortRetrofit('buyName')">Buy</th>
+              <th class="sortable le" ng-click="sortRetrofit('netCost')">
+                Net Cost
+                <div class="r">
+                  <u ng-if="discounts.components < 1">[{{fRPct(1 - discounts.components)}} off]</u>
+                </div>
+              </th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr ng-if="!retrofitList || retrofitList.length == 0">
+              <td colspan="5">No Retrofitting changes</td>
+            </tr>
+            <tr class="highlight" ng-repeat="item in retrofitList | orderBy:retroPredicate:retroDesc">
+              <td style="width:1em;">{{item.sellClassRating}}</td>
+              <td class="le shorten">{{item.sellName}}</td>
+              <td style="width:1em;">{{item.buyClassRating}}</td>
+              <td class="le shorten">{{item.buyName}}</td>
+              <td class="ri" ng-class="item.netCost > 0 ? 'warning' : 'secondary-disabled'">{{ fCrd(item.netCost)}} <u>CR</u></td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+      <table class="total">
+        <tr class="ri">
+          <td class="lbl">Cost</td>
+          <td ng-class="retrofitTotal > 0 ? 'warning' : 'secondary-disabled'">{{fCrd(retrofitTotal)}} <u>CR</u></td>
+        </tr>
+        <tr class="ri">
+          <td class="lbl">Retrofitting from</td>
+          <td style="padding:0;">
+            <select style="width: 100%; border: none;" ng-model="$parent.retrofitBuild" ng-change="setRetrofitBase()" ng-options="name as name for (name, build) in allBuilds[ship.id]">
+              <option value="">Stock / Standard</option>
+            </select>
+          </td>
+        </tr>
+      </table>
+    </div>
   </div>
 
   <div class="group half">

gulpfile.js

@@ -140,7 +140,7 @@ gulp.task('generateIndexHTML', function(done) {
       gulp.src('app/index.html')
         .pipe(template({
           version: pkg.version,
-          date : (new Date()).toLocaleDateString(),
+          date : new Date().toISOString().slice(0, 10),
           uaTracking: process.env.CORIOLIS_UA_TRACKING || false,
           svgContent: svgIconsContent,
           gapiKey: process.env.CORIOLIS_GAPI_KEY

package.json

@@ -1,6 +1,6 @@
 {
   "name": "coriolis_shipyard",
-  "version": "0.14.2",
+  "version": "1.0.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/cmmcleod/coriolis"

test/tests/test-controller-outfit.js

@@ -0,0 +1,50 @@
+describe("Outfit Controller", function() {
+  beforeEach(module('app'));
+
+  var outfitController, scope;
+
+  var eventStub = {
+      preventDefault: function(){ },
+      stopPropagation: function(){ }
+  };
+
+  beforeEach(inject(function(_$rootScope_, $controller) {
+      $rootScope = _$rootScope_;
+      $rootScope.discounts = { ship: 1, components: 1};
+      $stateParams = { shipId: 'anaconda'};
+      scope = $rootScope.$new();
+      outfitController = $controller('OutfitController', { $rootScope: $rootScope, $scope: scope, $stateParams: $stateParams });
+  }));
+
+  describe("Retrofitting Costs", function() {
+
+    it("are empty by default", function() {
+      expect(scope.retrofitTotal).toEqual(0);
+      expect(scope.retrofitList.length).toEqual(0);
+    });
+
+    it("updates on bulkheads change", function() {
+      scope.select('b', scope.ship.bulkheads, eventStub, "1"); // Use Reinforced Alloy Bulkheads
+      expect(scope.retrofitTotal).toEqual(58787780);
+      expect(scope.retrofitList.length).toEqual(1);
+      scope.select('b', scope.ship.bulkheads, eventStub, "0"); // Use Reinforced Alloy Bulkheads
+      expect(scope.retrofitTotal).toEqual(0);
+      expect(scope.retrofitList.length).toEqual(0);
+    });
+
+    it("updates on component change", function() {
+      scope.select('h', scope.ship.hardpoints[0], eventStub, "0u"); // 3C/F Beam Laser
+      expect(scope.retrofitTotal).toEqual(1177600);
+      expect(scope.retrofitList.length).toEqual(1);
+      scope.select('h', scope.ship.hardpoints[6], eventStub, "empty"); // Remove default pulse laser
+      scope.select('h', scope.ship.hardpoints[7], eventStub, "empty"); // Remove default pulse laser
+      expect(scope.retrofitTotal).toEqual(1173200);
+      expect(scope.retrofitList.length).toEqual(3);
+      scope.select('i', scope.ship.internal[3], eventStub, "11"); // Use 6A Auto field maintenance unit
+      expect(scope.retrofitTotal).toEqual(16478701);
+      expect(scope.retrofitList.length).toEqual(4);
+    });
+
+  });
+
+});