Skip to content

Commit 73c9868

Browse files
pbatchupbatchu
authored andcommitted
add/list bills now fully functional
1 parent 9dc76c2 commit 73c9868

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

billrive-client/app/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@
116116
-->
117117

118118
<script src="lib/jquery-2.0.0.js"></script>
119-
<!--<script src="lib/angular/angular.js"></script>-->
120-
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.0.6/angular.js"></script>
119+
<script src="lib/angular/angular.js"></script>
120+
<!--<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.0.6/angular.js"></script>-->
121121
<script src="js/app.js"></script>
122122
<script src="js/services.js"></script>
123123
<script src="js/controllers.js"></script>

billrive-client/app/js/controllers.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ billRive.controller('billController', function($scope, billService) {
33
$scope.groups = billService.getGroups();
44
$scope.payers = billService.getPayers();
55
$scope.simpleUserCostMap=[];
6-
$scope.bills=[];
6+
$scope.bills= [];
77
// $scope.bill = billService.getBill();
88
$scope.bill =[];//= billService.getBill();
99

billrive-client/app/js/routes.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ billRive.config(['$routeProvider', function($routeProvider) {
22
// $routeProvider.when('/', {templateUrl: 'partials/dashboard.html', controller: 'billController'});
33
$routeProvider.when('/bills/list', {templateUrl: 'partials/bills/list.html'});
44
$routeProvider.when('/bills/add', {templateUrl: 'partials/bills/add.html', controller: 'BillAddCtrl'});
5-
$routeProvider.when('/bills/edit', {templateUrl: 'partials/bills/edit.html', controller: 'BillEditCtrl'});
5+
$routeProvider.when('/bills/edit/{{id}}', {templateUrl: 'partials/bills/edit.html', controller: 'BillEditCtrl'});
66
$routeProvider.when('/listFriends', {templateUrl: 'partials/listFriends.html', controller: 'billController'});
77
$routeProvider.otherwise({redirectTo: '/bills/list'});
88
}]);

billrive-client/app/partials/bills/list.html

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,21 @@
2020
</tr>
2121
</thead>
2222
<tbody>
23-
<!-- <tr ng-repeat="bill in bills | filter:query">
24-
<td>{{ bill.date}}</td>
25-
{{ bill.date.monthOfYear }}/{{ bill.date.dayOfMonth}}/{{ bill.date.yearOfCentury}}
26-
<td>{{ bill.title }}</td>
27-
<td>${{ bill.total }}</td>
23+
<!-- <tr ng-repeat="ibill in bills | filter:query">
24+
<td>{{ ibill.date}}</td>
25+
{{ ibill.date.monthOfYear }}/{{ ibill.date.dayOfMonth}}/{{ ibill.date.yearOfCentury}}
26+
<td>{{ ibill.title }}</td>
27+
<td>${{ ibill.total }}</td>
2828
<td>
2929
<button class="btn btn-small" href="#editBill">
3030
<i class="icon-edit"></i>&nbsp;Edit
3131
</button>
3232
</td>
3333
</tr>-->
34-
<tr ng-repeat="bill in bills | filter:query">
35-
<td>{{ bill.date}}</td>
36-
<td>{{ bill.title }}</td>
37-
<td>${{ bill.billFinances.billTotal }}</td>
34+
<tr ng-repeat="ibill in bills | filter:query">
35+
<td>{{ ibill.date}}</td>
36+
<td>{{ ibill.title }}</td>
37+
<td>${{ ibill.billFinances.billTotal }}</td>
3838
<td>
3939
<button class="btn btn-small" href="#editBill">
4040
<i class="icon-edit"></i>&nbsp;Edit

0 commit comments

Comments
 (0)