diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf79a2b..4f5d783 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
# Next Release
+# v0.1.3
+
+* Made fix to Travis config
+
# v0.1.2
* Removed unused button
diff --git a/package-lock.json b/package-lock.json
index 4335e6e..3ea83eb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "localloop-web",
- "version": "0.1.1",
+ "version": "0.1.3",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index 7d58ebe..c0f2c8b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "localloop-web",
- "version": "0.1.1",
+ "version": "0.1.3",
"description": "LocalLoop Web - Web interface for LocalLoop app",
"author": "",
"url": "http://www.peartrade.org",
diff --git a/src/app/dashboard/add-data.component.html b/src/app/dashboard/add-data.component.html
index f43870e..c778998 100644
--- a/src/app/dashboard/add-data.component.html
+++ b/src/app/dashboard/add-data.component.html
@@ -28,7 +28,7 @@
-
10 && disableSectorButton == false" class="divider text-center">
+ sectorLimit && disableSectorButton == false" class="divider text-center">
diff --git a/src/app/dashboard/dashboard-customer.component.ts b/src/app/dashboard/dashboard-customer.component.ts
index 54867f2..55f1b6a 100644
--- a/src/app/dashboard/dashboard-customer.component.ts
+++ b/src/app/dashboard/dashboard-customer.component.ts
@@ -168,7 +168,7 @@ export class DashboardCustomerComponent implements OnInit {
this.sectorPurchases = Object.keys(data.purchases).map(key => data.purchases[key]);
}
- public loadMore () {
+ private loadMore () {
this.disableSectorButton = true;
this.sectorLimit = 22;
}
diff --git a/src/app/dashboard/dashboard.module.ts b/src/app/dashboard/dashboard.module.ts
index d6fcfca..2e47f80 100644
--- a/src/app/dashboard/dashboard.module.ts
+++ b/src/app/dashboard/dashboard.module.ts
@@ -16,6 +16,7 @@ import { AccountEditComponent } from './account-edit.component';
import { AddDataComponent } from './add-data.component';
import { FeedbackComponent } from './feedback.component';
import { TransactionLogComponent } from './transaction-log.component';
+import { CategoryMonthComponent } from './category-month.component';
import { PayrollLogComponent } from './payroll-log.component';
import { LeaderboardComponent } from './leaderboard.component';
import { MapComponent } from './map.component';
@@ -61,6 +62,7 @@ import { environment } from '../../environments/environment';
OrgResultComponent,
OrgTableComponent,
TransactionLogComponent,
+ CategoryMonthComponent,
TransactionResultComponent,
PayrollLogComponent,
PayrollResultComponent,
diff --git a/src/app/dashboard/dashboard.routing.ts b/src/app/dashboard/dashboard.routing.ts
index 46b9df3..6505f9a 100644
--- a/src/app/dashboard/dashboard.routing.ts
+++ b/src/app/dashboard/dashboard.routing.ts
@@ -12,6 +12,7 @@ import { AccountEditComponent } from './account-edit.component';
import { AddDataComponent } from './add-data.component';
import { FeedbackComponent } from './feedback.component';
import { TransactionLogComponent } from './transaction-log.component';
+import { CategoryMonthComponent } from './category-month.component';
import { PayrollLogComponent } from './payroll-log.component';
import { LeaderboardComponent } from './leaderboard.component';
import { MapComponent } from './map.component';
@@ -58,6 +59,11 @@ const routes: Routes = [
component: TransactionLogComponent,
data: { title: 'Transaction Log' },
},
+ {
+ path: 'category-month',
+ component: CategoryMonthComponent,
+ data: { title: 'Budget' },
+ },
{
path: 'map',
component: MapComponent,
diff --git a/src/app/layouts/full-layout.component.html b/src/app/layouts/full-layout.component.html
index 8a205f9..8e4d931 100644
--- a/src/app/layouts/full-layout.component.html
+++ b/src/app/layouts/full-layout.component.html
@@ -81,6 +81,14 @@
+
+
+
+
+
diff --git a/src/app/providers/api-service.ts b/src/app/providers/api-service.ts
index 25e9ce1..bbf3464 100644
--- a/src/app/providers/api-service.ts
+++ b/src/app/providers/api-service.ts
@@ -127,6 +127,17 @@ export class ApiService {
);
}
+ // Basic Customer User stats API
+ public categoryTransactionList() {
+ const key = this.sessionKey;
+ return this.http.post
(
+ this.apiUrl + '/stats/category',
+ {
+ session_key : key,
+ }
+ );
+ }
+
// Searches organisations used for transaction submission
public search(data) {