Merge branch 'finn/OrgData' into development

src/app/dashboard/add-data.component.html

@@ -69,7 +69,7 @@
           </div>
         </div>
         <div class="card-footer">
-          <button type="submit" (click)="postTransaction()" [disabled]="TransactionFormInvalid" class="btn btn-sm btn-primary"><i class="fa fa-dot-circle-o"></i> Submit</button>
+          <button type="submit" (click)="postTransaction()" [disabled]="transactionFormInvalid" class="btn btn-sm btn-primary"><i class="fa fa-dot-circle-o"></i> Submit</button>
         </div>
       </div>
       <div *ngIf="accountType == 'organisation'" class="card">

src/app/dashboard/add-data.component.ts

@@ -158,7 +158,7 @@ export class AddDataComponent {
   }
 
   transactionFormValidate() {
-    if( this.submitOrg.name.length == 0 ||
+    if( this.submitOrg.name.length == 0 &&
         this.amount == 0 ) {
           this.transactionFormInvalid = true;
         }else{
@@ -252,7 +252,7 @@ export class AddDataComponent {
 	 console.log(this.payrollForm.value);
 
 	this.api
-      .login(this.payrollForm.value)
+      .orgPayroll(this.payrollForm.value)
       .subscribe(
         result => {
           console.log('data submitted!');
@@ -271,7 +271,7 @@ export class AddDataComponent {
 	 console.log(this.singleSupplierForm.value);
 
 	this.api
-      .login(this.singleSupplierForm.value)
+      .orgSupplier(this.singleSupplierForm.value)
       .subscribe(
         result => {
           console.log('data submitted!');
@@ -290,7 +290,7 @@ export class AddDataComponent {
 	 console.log(this.employeeForm.value);
 
 	this.api
-      .login(this.employeeForm.value)
+      .orgEmployee(this.employeeForm.value)
       .subscribe(
         result => {
           console.log('data submitted!');

src/app/providers/api-service.ts

@@ -130,6 +130,32 @@ export class ApiService {
     ).map( response => response.json() )
   }
 
+  // handles Org data added
+
+  public orgPayroll(data) {
+    data.session_key = this.sessionKey;
+    return this.http.post(
+      this.apiUrl + '/org/payroll',
+      data
+    ).map( response => response.json() )
+  }
+
+  public orgSupplier(data) {
+    data.session_key = this.sessionKey;
+    return this.http.post(
+      this.apiUrl + '/org/supplier',
+      data
+    ).map( response => response.json() )
+  }
+
+  public orgEmployee(data) {
+    data.session_key = this.sessionKey;
+    return this.http.post(
+      this.apiUrl + '/org/employee',
+      data
+    ).map( response => response.json() )
+  }
+
   // Handles user data interaction
 
   // Checks for login status