fixed Http Error
diff --git a/package-lock.json b/package-lock.json
index 2766a61..1d148d4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -296,11 +296,8 @@
},
"@ngx-translate/http-loader": {
"version": "0.1.0",
- "resolved": "https://registry.npmjs.org/@ngx-translate/http-loader/-/http-loader-3.0.1.tgz",
- "integrity": "sha1-ILD5i8bCUyESnT4zAqs8xInApCo=",
- "requires": {
- "tslib": "1.9.0"
- }
+ "resolved": "https://registry.npmjs.org/@ngx-translate/http-loader/-/http-loader-0.1.0.tgz",
+ "integrity": "sha1-YCkyVWHXho/jJaQZ3idw6Y/xUC4="
},
"@schematics/angular": {
"version": "0.3.2",
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index c2471a5..d8b6456 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -2,7 +2,7 @@
import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
import { FormsModule, ReactiveFormsModule } from '@angular/forms'
import { RouterModule, Routes} from '@angular/router';
-import {HttpModule, Http} from '@angular/http';
+import {HttpModule,Http} from '@angular/http';
import {CommonModule} from '@angular/common';
import {TranslateModule, TranslateStore} from '@ngx-translate/core';
import {CovalentLoadingModule} from '@covalent/core';
@@ -40,6 +40,7 @@
MatTableModule,
MatTabsModule,
MatStepperModule
+
} from '@angular/material';
@@ -71,7 +72,7 @@
import { AddChequeComponent } from './accounting/add-cheque/add-cheque.component';
import { AddPayrollComponent } from './accounting/add-payroll/add-payroll.component';
-import {HttpClient} from './sevices/http/http.service';
+import {HttpClients} from './sevices/http/http.service';
import {IdentityService} from './sevices/identity/identity.service';
import {OfficeService} from './sevices/office/office.service';
import {CustomerService} from './sevices/customer/customer.service';
@@ -213,7 +214,7 @@
MatTabsModule,
MatStepperModule
],
- providers: [ HttpClient,
+ providers: [ HttpClients,
AuthenticationService,
PermittableGroupIdMapper,
IdentityService,
diff --git a/src/app/office/store/teller/effects/notification.effects.ts b/src/app/office/store/teller/effects/notification.effects.ts
index 19aa943..61a1b4f 100644
--- a/src/app/office/store/teller/effects/notification.effects.ts
+++ b/src/app/office/store/teller/effects/notification.effects.ts
@@ -18,7 +18,7 @@
*/
import {Injectable} from '@angular/core';
import {Actions, Effect} from '@ngrx/effects';
-import {NotificationService, NotificationType} from '../../../sevices/notification/notification.service';
+import {NotificationService, NotificationType} from 'app/sevices/notification/notification.service';
import {Observable} from 'rxjs/Observable';
import {Action} from '@ngrx/store';
import * as tellerActions from '../teller.actions';
diff --git a/src/app/office/store/teller/effects/service.effects.ts b/src/app/office/store/teller/effects/service.effects.ts
index 8bbb784..18071a9 100644
--- a/src/app/office/store/teller/effects/service.effects.ts
+++ b/src/app/office/store/teller/effects/service.effects.ts
@@ -17,7 +17,7 @@
* under the License.
*/
-import {TellerService} from '../../../sevices/teller/teller-service';
+import {TellerService} from 'app/sevices/teller/teller-service';
import {Injectable} from '@angular/core';
import {Actions, Effect} from '@ngrx/effects';
import {Observable} from 'rxjs/Observable';
diff --git a/src/app/sevices/accounting/accounting.service.ts b/src/app/sevices/accounting/accounting.service.ts
index cb404bb..d911c43 100644
--- a/src/app/sevices/accounting/accounting.service.ts
+++ b/src/app/sevices/accounting/accounting.service.ts
@@ -17,7 +17,7 @@
* under the License.
*/
import {Inject, Injectable} from '@angular/core';
-import {HttpClient} from '../http/http.service';
+import {HttpClients} from '../http/http.service';
import {Ledger} from './domain/ledger.model';
import {Observable} from 'rxjs/Observable';
import {Account} from './domain/account.model';
@@ -40,7 +40,7 @@
@Injectable()
export class AccountingService {
- constructor(private http: HttpClient, @Inject('accountingBaseUrl') private baseUrl: string) {
+ constructor(private http: HttpClients, @Inject('accountingBaseUrl') private baseUrl: string) {
}
public createLedger(ledger: Ledger): Observable<void> {
diff --git a/src/app/sevices/catalog/catalog.service.ts b/src/app/sevices/catalog/catalog.service.ts
index 43eb77b..188fff5 100644
--- a/src/app/sevices/catalog/catalog.service.ts
+++ b/src/app/sevices/catalog/catalog.service.ts
@@ -17,7 +17,7 @@
* under the License.
*/
import {Inject, Injectable} from '@angular/core';
-import {HttpClient} from '../http/http.service';
+import {HttpClients} from '../http/http.service';
import {Observable} from 'rxjs/Observable';
import {Catalog} from './domain/catalog.model';
import {Field} from './domain/field.model';
@@ -25,7 +25,7 @@
@Injectable()
export class CatalogService {
- constructor(@Inject('customerBaseUrl') private baseUrl: string, private http: HttpClient) {
+ constructor(@Inject('customerBaseUrl') private baseUrl: string, private http: HttpClients) {
}
fetchCatalogs(): Observable<Catalog[]> {
diff --git a/src/app/sevices/cheque/cheque.service.ts b/src/app/sevices/cheque/cheque.service.ts
index 2d6f650..0c2aa64 100644
--- a/src/app/sevices/cheque/cheque.service.ts
+++ b/src/app/sevices/cheque/cheque.service.ts
@@ -17,7 +17,7 @@
* under the License.
*/
import {Inject, Injectable} from '@angular/core';
-import {HttpClient} from '../http/http.service';
+import {HttpClients} from '../http/http.service';
import {Observable} from 'rxjs/Observable';
import {RequestOptionsArgs, URLSearchParams} from '@angular/http';
import {Cheque} from './domain/cheque.model';
@@ -31,7 +31,7 @@
@Injectable()
export class ChequeService {
- constructor(private http: HttpClient, @Inject('chequeBaseUrl') private baseUrl: string) {
+ constructor(private http: HttpClients, @Inject('chequeBaseUrl') private baseUrl: string) {
}
public issue(issuingCount: IssuingCount): Observable<string> {
diff --git a/src/app/sevices/customer/customer.service.ts b/src/app/sevices/customer/customer.service.ts
index f093c2e..a942c66 100644
--- a/src/app/sevices/customer/customer.service.ts
+++ b/src/app/sevices/customer/customer.service.ts
@@ -19,7 +19,7 @@
import {Inject, Injectable} from '@angular/core';
import {Observable} from 'rxjs/Observable';
import {Customer} from './domain/customer.model';
-import {HttpClient} from '../http/http.service';
+import {HttpClients} from '../http/http.service';
import {CustomerPage} from './domain/customer-page.model';
import {FetchRequest} from '../domain/paging/fetch-request.model';
import {buildSearchParams} from '../domain/paging/search-param.builder';
@@ -35,7 +35,7 @@
@Injectable()
export class CustomerService {
- constructor(@Inject('customerBaseUrl') private baseUrl: string, private http: HttpClient, private imageService: ImageService) {
+ constructor(@Inject('customerBaseUrl') private baseUrl: string, private http: HttpClients, private imageService: ImageService) {
}
fetchCustomers(fetchRequest: FetchRequest): Observable<CustomerPage> {
diff --git a/src/app/sevices/depositAccount/deposit-account.service.ts b/src/app/sevices/depositAccount/deposit-account.service.ts
index 02ef3a0..e61071c 100644
--- a/src/app/sevices/depositAccount/deposit-account.service.ts
+++ b/src/app/sevices/depositAccount/deposit-account.service.ts
@@ -17,7 +17,7 @@
* under the License.
*/
import {Inject, Injectable} from '@angular/core';
-import {HttpClient} from '../http/http.service';
+import {HttpClients} from '../http/http.service';
import {Observable} from 'rxjs/Observable';
import {ProductDefinition} from './domain/definition/product-definition.model';
import {ProductDefinitionCommand} from './domain/definition/product-definition-command.model';
@@ -30,7 +30,7 @@
@Injectable()
export class DepositAccountService {
- constructor(private http: HttpClient, @Inject('depositAccountBaseUrl') private baseUrl: string) {
+ constructor(private http: HttpClients, @Inject('depositAccountBaseUrl') private baseUrl: string) {
}
createProductDefinition(productDefinition: ProductDefinition): Observable<void> {
diff --git a/src/app/sevices/http/http.service.spec.ts b/src/app/sevices/http/http.service.spec.ts
index 0500f29..49148ef 100644
--- a/src/app/sevices/http/http.service.spec.ts
+++ b/src/app/sevices/http/http.service.spec.ts
@@ -17,7 +17,7 @@
* under the License.
*/
import {MockBackend, MockConnection} from '@angular/http/testing';
-import {AUTHORIZATION_HEADER, HttpClient, TENANT_HEADER, USER_HEADER} from './http.service';
+import {AUTHORIZATION_HEADER, HttpClients, TENANT_HEADER, USER_HEADER} from './http.service';
import {
BaseRequestOptions,
ConnectionBackend,
@@ -49,7 +49,7 @@
}
};
- const doPostRequest = function (httpClient: HttpClient, options?: RequestOptionsArgs): void {
+ const doPostRequest = function (httpClient: HttpClients, options?: RequestOptionsArgs): void {
httpClient.post('/test', {}, options).subscribe(() => {
});
};
@@ -66,9 +66,9 @@
}
},
Http,
- HttpClient,
+ HttpClients,
]);
- this.httpClient = this.injector.get(HttpClient);
+ this.httpClient = this.injector.get(HttpClients);
this.backend = this.injector.get(ConnectionBackend) as MockBackend;
});
diff --git a/src/app/sevices/http/http.service.ts b/src/app/sevices/http/http.service.ts
index 7a33b35..07f239f 100644
--- a/src/app/sevices/http/http.service.ts
+++ b/src/app/sevices/http/http.service.ts
@@ -31,7 +31,7 @@
export const AUTHORIZATION_HEADER = 'Authorization';
@Injectable()
-export class HttpClient {
+export class HttpClients {
process: Subject<Action> = new Subject<Action>();
diff --git a/src/app/sevices/identity/identity.service.ts b/src/app/sevices/identity/identity.service.ts
index 12a8ad6..44c1c15 100644
--- a/src/app/sevices/identity/identity.service.ts
+++ b/src/app/sevices/identity/identity.service.ts
@@ -19,7 +19,7 @@
import {Inject, Injectable} from '@angular/core';
import {Observable} from 'rxjs/Observable';
import {Error} from '../domain/error.model';
-import {HttpClient} from '../http/http.service';
+import {HttpClients} from '../http/http.service';
import {Password} from './domain/password.model';
import {UserWithPassword} from './domain/user-with-password.model';
import {Role} from './domain/role.model';
@@ -36,7 +36,7 @@
private baseUrl: string = "http://163.172.130.175:8888/"
- constructor(private http: HttpClient ) { // , @Inject('identityBaseUrl') private baseUrl: string) {
+ constructor(private http: HttpClients ) { // , @Inject('identityBaseUrl') private baseUrl: string) {
}
changePassword(id: string, password: Password): Observable<any> {
diff --git a/src/app/sevices/office/office.service.ts b/src/app/sevices/office/office.service.ts
index 5df8ab2..8309090 100644
--- a/src/app/sevices/office/office.service.ts
+++ b/src/app/sevices/office/office.service.ts
@@ -18,7 +18,7 @@
*/
import {Inject, Injectable} from '@angular/core';
import {Observable} from 'rxjs/Observable';
-import {HttpClient} from '../http/http.service';
+import {HttpClients} from '../http/http.service';
import {Error} from '../domain/error.model';
import {RequestOptionsArgs, URLSearchParams,} from '@angular/http';
import {Office} from './domain/office.model';
@@ -32,7 +32,7 @@
@Injectable()
export class OfficeService {
- constructor(private http: HttpClient, @Inject('officeBaseUrl') private baseUrl: string) {
+ constructor(private http: HttpClients, @Inject('officeBaseUrl') private baseUrl: string) {
}
createOffice(office: Office): Observable<Office> {
diff --git a/src/app/sevices/payroll/payroll.service.ts b/src/app/sevices/payroll/payroll.service.ts
index c9236b8..d5abd3a 100644
--- a/src/app/sevices/payroll/payroll.service.ts
+++ b/src/app/sevices/payroll/payroll.service.ts
@@ -24,13 +24,13 @@
import {FetchRequest} from '../domain/paging/fetch-request.model';
import {PayrollCollectionHistory} from './domain/payroll-collection-history.model';
import {PayrollCollectionSheet} from './domain/payroll-collection-sheet.model';
-import {HttpClient} from '../http/http.service';
+import {HttpClients} from '../http/http.service';
import {PayrollConfiguration} from './domain/payroll-configuration.model';
@Injectable()
export class PayrollService {
- constructor(private http: HttpClient, @Inject('payrollBaseUrl') private baseUrl: string) {
+ constructor(private http: HttpClients, @Inject('payrollBaseUrl') private baseUrl: string) {
}
public distribute(sheet: PayrollCollectionSheet): Observable<void> {
diff --git a/src/app/sevices/portfolio/portfolio.service.ts b/src/app/sevices/portfolio/portfolio.service.ts
index 63bad61..d7ddf0a 100644
--- a/src/app/sevices/portfolio/portfolio.service.ts
+++ b/src/app/sevices/portfolio/portfolio.service.ts
@@ -17,7 +17,7 @@
* under the License.
*/
import {Inject, Injectable} from '@angular/core';
-import {HttpClient} from '../http/http.service';
+import {HttpClients} from '../http/http.service';
import {Observable} from 'rxjs/Observable';
import {Product} from './domain/product.model';
import {RequestOptionsArgs, URLSearchParams} from '@angular/http';
@@ -47,7 +47,7 @@
@Injectable()
export class PortfolioService {
- constructor(private http: HttpClient, @Inject('portfolioBaseUrl') private baseUrl: string) {
+ constructor(private http: HttpClients, @Inject('portfolioBaseUrl') private baseUrl: string) {
}
findAllPatterns(): Observable<void> {
diff --git a/src/app/sevices/reporting/reporting.service.ts b/src/app/sevices/reporting/reporting.service.ts
index 40a12d8..8132fe6 100644
--- a/src/app/sevices/reporting/reporting.service.ts
+++ b/src/app/sevices/reporting/reporting.service.ts
@@ -17,7 +17,7 @@
* under the License.
*/
import {Inject, Injectable} from '@angular/core';
-import {HttpClient} from '../http/http.service';
+import {HttpClients} from '../http/http.service';
import {Observable} from 'rxjs/Observable';
import {ReportDefinition} from './domain/report-definition.model';
import {FetchRequest} from '../domain/paging/fetch-request.model';
@@ -29,7 +29,7 @@
@Injectable()
export class ReportingService {
- constructor(private http: HttpClient, @Inject('reportingBaseUrl') private baseUrl: string) {
+ constructor(private http: HttpClients, @Inject('reportingBaseUrl') private baseUrl: string) {
}
fetchCategories(): Observable<string[]> {
diff --git a/src/app/sevices/teller/teller-service.ts b/src/app/sevices/teller/teller-service.ts
index 1655496..2302a2d 100644
--- a/src/app/sevices/teller/teller-service.ts
+++ b/src/app/sevices/teller/teller-service.ts
@@ -18,7 +18,7 @@
*/
import {Inject, Injectable} from '@angular/core';
-import {HttpClient} from '../http/http.service';
+import {HttpClients} from '../http/http.service';
import {Teller} from './domain/teller.model';
import {Observable} from 'rxjs/Observable';
import {TellerManagementCommand} from './domain/teller-management-command.model';
@@ -32,7 +32,7 @@
@Injectable()
export class TellerService {
- constructor(private http: HttpClient, @Inject('tellerBaseUrl') private baseUrl: string) {
+ constructor(private http: HttpClients, @Inject('tellerBaseUrl') private baseUrl: string) {
}
create(officeIdentifier: string, teller: Teller): Observable<void> {
