tanshu/brewman
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Renamed groups to roles in the frontend

Browse Source 
Working:
 Account
 Cost Centre
 Employee
 Product Group
 Product
 Role
 User
 Client
This commit is contained in:
tanshu
2020-05-12 01:31:21 +05:30
parent cd764be49c
commit 6dbab6442f
50 changed files with 272 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
overlord/src/app/core/account.service.ts
View File

@ -19,7 +19,7 @@ export class AccountService {
}
get(id: string): Observable<Account> {
const getUrl: string = (id === null) ? `${url}/` : `${url}/${id}`;
const getUrl: string = (id === null) ? `${url}` : `${url}/${id}`;
return <Observable<Account>>this.http.get<Account>(getUrl)
.pipe(
catchError(this.log.handleError(serviceName, `get id=${id}`))
@ -33,16 +33,16 @@ export class AccountService {
);
}
paymentAutocomplete(term: string): Observable<Account[]> {
const options = {params: new HttpParams().set('q', term).set('t', '1')};
paymentAutocomplete(query: string): Observable<Account[]> {
const options = {params: new HttpParams().set('q', query).set('t', '1')};
return <Observable<Account[]>>this.http.get<Account[]>(`${url}/query`, options)
.pipe(
catchError(this.log.handleError(serviceName, 'list'))
);
}
receiptAutocomplete(term: string): Observable<Account[]> {
const options = {params: new HttpParams().set('q', term).set('t', '1')};
receiptAutocomplete(query: string): Observable<Account[]> {
const options = {params: new HttpParams().set('q', query).set('t', '1')};
return <Observable<Account[]>>this.http.get<Account[]>(`${url}/query`, options)
.pipe(
catchError(this.log.handleError(serviceName, 'list'))
@ -50,7 +50,7 @@ export class AccountService {
}
save(account: Account): Observable<Account> {
return <Observable<Account>>this.http.post<Account>(`${url}/`, account, httpOptions)
return <Observable<Account>>this.http.post<Account>(`${url}`, account, httpOptions)
.pipe(
catchError(this.log.handleError(serviceName, 'save'))
);
@ -78,8 +78,8 @@ export class AccountService {
);
}
autocomplete(term: string): Observable<Account[]> {
const options = {params: new HttpParams().set('q', term)};
autocomplete(query: string): Observable<Account[]> {
const options = {params: new HttpParams().set('q', query)};
return <Observable<Account[]>>this.http.get<Account[]>(`${url}/query`, options)
.pipe(
catchError(this.log.handleError(serviceName, 'autocomplete'))
@ -87,8 +87,8 @@ export class AccountService {
}
balance(id: string, date: string): Observable<any> {
const options = {params: new HttpParams().set('b', 'true').set('d', date)};
return <Observable<any>>this.http.get<any>(`${url}/${id}`, options)
const options = {params: new HttpParams().set('d', date)};
return <Observable<any>>this.http.get<any>(`${url}/${id}/balance`, options)
.pipe(
catchError(this.log.handleError(serviceName, 'balance'))
);

2
overlord/src/app/core/nav-bar/nav-bar.component.html
View File

@ -67,7 +67,7 @@
<a mat-menu-item (click)="logout()">Logout {{(auth.currentUser | async)?.name}}</a>
<a mat-menu-item routerLink="/users/me">Change Password</a>
<a mat-menu-item routerLink="/users">Users</a>
<a mat-menu-item routerLink="/groups">Groups</a>
<a mat-menu-item routerLink="/roles">Roles</a>
<a mat-menu-item routerLink="/clients">Clients</a>
<a mat-menu-item routerLink="/settings">Settings</a>
</mat-menu>