Merge 9e0a07c into 87d5948

allegro · Oct 21, 2014 · adda7fe · adda7fe
2 parents 87d5948 + 9e0a07c
commit adda7fe
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 14 deletions.
diff --git a/src/ralph_scrooge/media/scrooge/app/filters.js b/src/ralph_scrooge/media/scrooge/app/filters.js
@@ -19,3 +19,25 @@ ang_filters.filter('intToMonth', function() {
         return _intToMonth[input]
     }
 });
+
+ang_filters.filter('intToService', ['stats', function(stats) {
+    return function(input, scope) {
+        for (var i in stats.leftMenus[stats.currentLeftMenu]) {
+            if (stats.leftMenus[stats.currentLeftMenu][i].id == input) {
+                return stats.leftMenus[stats.currentLeftMenu][i].name
+            }
+        }
+    }
+}]);
+
+ang_filters.filter('intToEnv', ['stats', function(stats) {
+    return function(input, scope) {
+        for (var i in stats.leftMenus[stats.currentLeftMenu]) {
+            for (var k in stats.leftMenus[stats.currentLeftMenu][i].value.envs) {
+                if (stats.leftMenus[stats.currentLeftMenu][i].value.envs[k].id == input) {
+                    return stats.leftMenus[stats.currentLeftMenu][i].value.envs[k].name
+                }
+            }
+        }
+    }
+}]);
diff --git a/src/ralph_scrooge/media/scrooge/app/services.js b/src/ralph_scrooge/media/scrooge/app/services.js
@@ -98,7 +98,7 @@ ang_services.factory('stats', ['$http', function ($http) {
                     + self.menuStats['env']['current'] + '/'
                     + self.menuStats['year']['current'] + '/'
                     + self.menuStats['month']['current'] + '/'
-                    + self.menuStats['day']['current'],
+                    + self.menuStats['day']['current'] + '/',
             }).
             success(function(data, status, headers, config) {
                 self.components.content = data

diff --git a/src/ralph_scrooge/media/scrooge/partials/allocationclient.html b/src/ralph_scrooge/media/scrooge/partials/allocationclient.html
@@ -1,12 +1,8 @@
 <div class="row">
   <menuservicedirective ng-if="stats.menuReady"></menuservicedirective>
   <div class="content col-xs-12 col-md-10">
-    <div class="row">
-      <div class="title col-xs-12 col-md-12">
-        <h1>Components</h1>
-        <h2>Allegro</h2>
-      </div>
-    </div>
+
+  <div ng-include="'/static/scrooge/partials/bredcrumbs.html'"></div>
     <div class="row data">
       <div class="row">
         <menucalendardirective></menucalendardirective>
@@ -25,6 +21,7 @@ <h2>Allegro</h2>
     </div>
   </div>
 </div>
+
 <!-- <div class="container-xs-height body-container">
     <div class="col-xs-2 left-menu-container col-xs-height col-bottom">
       <div class="navbar-default sidebar-navbar-default" role="navigation">

diff --git a/src/ralph_scrooge/media/scrooge/partials/bredcrumbs.html b/src/ralph_scrooge/media/scrooge/partials/bredcrumbs.html
@@ -0,0 +1,9 @@
+<div class="row">
+  <div class="title col-xs-12 col-md-12">
+    <h1>{{stats.currentSubMenu.name}}</h1>
+    <h2>></h2>
+    <h2>{{stats.menuStats.service.current | intToService}}</h2>
+    <h2>></h2>
+    <h2>{{stats.menuStats.env.current | intToEnv}}</h2>
+  </div>
+</div>
diff --git a/src/ralph_scrooge/media/scrooge/partials/calendarmenu.html b/src/ralph_scrooge/media/scrooge/partials/calendarmenu.html
@@ -6,7 +6,7 @@
     </div>
     <div class="row">
         <div class="col-md-12 btn-group">
-            <button ng-click="menuCalendar.changeMonth(month)" class="{{stats.menuStats['month']['current'] == month ? 'active' : ''}} btn-datepicker btn btn-default btn-month-scrooge" ng-repeat="month in menuCalendar.getMonths()">{{month}}</button>
+            <button ng-click="menuCalendar.changeMonth(month)" class="{{stats.menuStats['month']['current'] == month ? 'active' : ''}} btn-datepicker btn btn-default btn-month-scrooge" ng-repeat="month in menuCalendar.getMonths()">{{month | intToMonth}}</button>
         </div>
     </div>
     <div class="row">

diff --git a/src/ralph_scrooge/media/scrooge/partials/components.html b/src/ralph_scrooge/media/scrooge/partials/components.html
@@ -1,12 +1,7 @@
 <div class="row">
   <menuservicedirective ng-if="stats.menuReady"></menuservicedirective>
   <div class="content col-xs-12 col-md-10">
-    <div class="row">
-      <div class="title col-xs-12 col-md-12">
-        <h1>Components</h1>
-        <h2>Allegro</h2>
-      </div>
-    </div>
+    <div ng-include="'/static/scrooge/partials/bredcrumbs.html'"></div>
     <div class="row data">
       <div class="col-xs-12 col-md-12">
         <menucalendardirective></menucalendardirective>