additional WLL MBS % changes as well as category labels

Syntaf · Sep 3, 2016 · 5f7bc26 · 5f7bc26
1 parent c530bd6
commit 5f7bc26
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 20 deletions.
diff --git a/css/main.css b/css/main.css
@@ -667,6 +667,10 @@ th {
         font-size: 12px;
     }
 
+    .wrapper {
+        margin-top: 10px;
+    }
+
     #neg-margin {
         margin-bottom: 0px;
         padding-bottom: 0px;

diff --git a/js/controllers/AddItemController.js b/js/controllers/AddItemController.js
@@ -77,9 +77,13 @@ $sessionStorage, $rootScope, $window, $timeout) {
         $('#dropdown-subcategory').show();
         if($routeParams.subcategory == null) {
             // if no subcategory was selected, only filter by category
+
+            $('#dropdown-button-main').html(capitalizeRoutes($routeParams.category) + ' <span class="caret"></span></button>');
             $scope.filters = {category : $routeParams.category}
         } else {
             // filter by both category and subcategory
+            $('#dropdown-button-main').html(capitalizeRoutes($routeParams.category) + ' <span class="caret"></span></button>');
+            $('#dropdown-button-sub').html(capitalizeRoutes($routeParams.subcategory) + ' <span class="caret"></span></button>');
             $scope.filters = {
                 category : $routeParams.category,
                 subcategory: $routeParams.subcategory

diff --git a/js/directives/productlist.js b/js/directives/productlist.js
@@ -15,23 +15,27 @@ function($sessionStorage) {
             // plus a couple other items
             scope.fillDescription = function(product) {
                 $('.title-box').text(product.name);
-                $('.product-info').show();
-                if(product.wll != undefined) {
-                    $('.product-wll').text(product.wll + 'kN');
-                } else {
-                    $('.details-box').text('');
-                }
-                if(product.mbs != undefined) {
-                    $('.product-mbs').text(product.mbs + 'kN');
-                } else {
-                    $('.product-mbs').text('');
-                }
-                if(product.stretch != undefined) {
-                    $('.webbing-only').show();
-                    $('.product-stretch').text(product.stretch + '%');
-                } else {
-                    $('.webbing-only').hide();
-                    $('.product-stretch').text('');
+                if(product.mbs != undefined || product.wll != undefined
+                    || product.stretch != undefined)
+                {
+                    $('.product-info').show();
+                    if(product.wll != undefined) {
+                        $('.product-wll').text(product.wll + 'kN');
+                    } else {
+                        $('.details-box').text('');
+                    }
+                    if(product.mbs != undefined) {
+                        $('.product-mbs').text(product.mbs + 'kN');
+                    } else {
+                        $('.product-mbs').text('');
+                    }
+                    if(product.stretch != undefined) {
+                        $('.webbing-only').show();
+                        $('.product-stretch').text(product.stretch + '%');
+                    } else {
+                        $('.webbing-only').hide();
+                        $('.product-stretch').text('');
+                    }
                 }
                 $('.description-box').text(product.description);
                 $('.description-box').append(

diff --git a/js/helpers/parsehooks.js b/js/helpers/parsehooks.js
@@ -30,3 +30,8 @@ var makeId = function()
 
     return text;
 }
+
+var capitalizeRoutes = function(input)
+{
+    return input.replace('_', ' ').replace(/\w\S*/g, function(txt){return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();});
+}
diff --git a/js/services/products.js b/js/services/products.js
@@ -1,6 +1,6 @@
 app.factory('products', ['$http', function($http) {
         return $http.get(
-            'https://gist.githubusercontent.com/Syntaf/aaeda8682a39928daf038cab746c392a/raw/0a4f3b9d5752195bf7e5470116a1224e9d311e34/betaproducts.json')
+            'https://gist.githubusercontent.com/Syntaf/aaeda8682a39928daf038cab746c392a/raw/306db76def98ba63f41acd1bd4e9d101df7cc9a0/betaproducts.json')
             .success(function(data) {
                 return data;
             })

diff --git a/views/add.html b/views/add.html
@@ -3,7 +3,7 @@
     <div class="row" id="row-overflow">
         <div class="col-xs-12 col-md-3">
             <div class="dropdown" ng-click="categoryClicked=true">
-                <button class="btn btn-primary dropdown-toggle"
+                <button id="dropdown-button-main" class="btn btn-primary dropdown-toggle"
                         type="button"
                         data-toggle="dropdown">
                     Category
@@ -86,7 +86,20 @@ <h5 class="title-box"> </h5>
             <div class="filters mobile-v">
                 <h5 class="title-box"> </h5>
                 <div class="desc-overflow">
-                    <p class="details-box"></p>
+                    <table class="table-bordered product-info">
+                        <tr>
+                            <td>WLL</td>
+                            <td class="product-wll"></td>
+                        </tr>
+                        <tr>
+                            <td>MBS</td>
+                            <td class="product-mbs"></td>
+                        </tr>
+                        <tr class="webbing-only">
+                            <td>% @ WLL</td>
+                            <td class="product-stretch"></td>
+                        </tr>
+                    </table>
                     <p class="description-box mobile">
                         Please note all prices are an <span><strong>estimation</strong></span>.
                         prices may vary over time and could take time to be updated manually.