Merge branch 'master' of https://github.com/lhhong/crumbs

lhhong · May 7, 2017 · 929f1c8 · 929f1c8
2 parents e61dff0 + 21b8acf
commit 929f1c8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/app-main/scripts/controllers/MyPredictions.js b/app-main/scripts/controllers/MyPredictions.js
@@ -288,8 +288,8 @@ angular.module('sbAdminApp')
         var predictions = $scope.demand;
         var paddingLeft = [null,null,null,null,null,null,null];
         var predictionChart = new Chart(ctx).Line({
-            labels: ["Apr 7", "", "Apr 9", "", "Apr 11", "", "Apr 13", "", "Apr 15", "", "Apr 17", "", "Apr 19",
-                        "", "Apr 21", "", "Apr 23", "", "Apr 25", "", "Apr 27"],
+            labels: ["May 4", "", "May 6", "", "May 8", "", "May 10", "", "May 12", "", "May 14", "", "May 16",
+                        "", "May 18", "", "May 20", "", "May 22", "", "May 24"],
             datasets: [
                 {
                 // plotting past demand

diff --git a/app-main/views/dashboard/MyPredictions.html b/app-main/views/dashboard/MyPredictions.html
@@ -259,7 +259,7 @@ <h4 class="modal-title">Prediction Model for {{ predictedItem.name }}</h4>
 					<!-- /.Graph showing sales projection -->
 					<div class="panel panel-default">
 						<div class="panel-heading">
-							<strong> Sales Projection</strong> <i>(starting 14 April)</i>
+							<strong> Sales Projection</strong> <i>(starting 11 May)</i>
 						</div>
 						<div class="panel-body">
 							<div>
@@ -277,11 +277,11 @@ <h4 class="modal-title">Prediction Model for {{ predictedItem.name }}</h4>
 								<thead>
 									<tr>
 										<th ng-style="getMonthCellColour()"></th>
-										<td class="text-center" colspan="15" ng-style="getMonthCellColour()"><strong>April</strong></td>
+										<td class="text-center" colspan="15" ng-style="getMonthCellColour()"><strong>May</strong></td>
 									</tr>
 									<tr>
 										<th>Date</th>
-										<th ng-repeat="x in chart track by $index" ng-if="$index>6" ng-style="formatColumn($index)" class="text-center">{{ $index+7 }}</th>
+										<th ng-repeat="x in chart track by $index" ng-if="$index>6" ng-style="formatColumn($index)" class="text-center">{{ $index+4 }}</th>
 									</tr>
 								</thead>
 								<tbody>