committed by
Abhay Chawla
parent
4ac086381f
commit
df12a6b4ba
@@ -0,0 +1,31 @@
|
|||||||
|
/** Angular Imports */
|
||||||
|
import { Injectable } from '@angular/core';
|
||||||
|
import { Resolve, ActivatedRouteSnapshot } from '@angular/router';
|
||||||
|
|
||||||
|
/** rxjs Imports */
|
||||||
|
import { Observable } from 'rxjs';
|
||||||
|
|
||||||
|
/** Custom Services */
|
||||||
|
import { OrganizationService } from 'app/organization/organization.service';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Employee data resolver.
|
||||||
|
*/
|
||||||
|
@Injectable()
|
||||||
|
export class EmployeeResolver implements Resolve<Object> {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param {OrganizationService} organizationService Organization service.
|
||||||
|
*/
|
||||||
|
constructor(private organizationService: OrganizationService) {}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the employee data.
|
||||||
|
* @returns {Observable<any>}
|
||||||
|
*/
|
||||||
|
resolve(route: ActivatedRouteSnapshot): Observable<any> {
|
||||||
|
const employeeId = route.paramMap.get('id');
|
||||||
|
return this.organizationService.getEmployee(employeeId);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -55,7 +55,7 @@
|
|||||||
</ng-container>
|
</ng-container>
|
||||||
|
|
||||||
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
|
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
|
||||||
<tr mat-row *matRowDef="let row; columns: displayedColumns;" class="select-row"></tr>
|
<tr mat-row *matRowDef="let row; columns: displayedColumns;" [routerLink]="[row.id]" class="select-row"></tr>
|
||||||
|
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,78 @@
|
|||||||
|
<div class="container m-b-20" fxLayout="row" fxLayoutAlign="end" fxLayoutGap="20px">
|
||||||
|
<button mat-raised-button color="primary">
|
||||||
|
<fa-icon icon="edit"></fa-icon>
|
||||||
|
Edit
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="container">
|
||||||
|
|
||||||
|
<mat-card>
|
||||||
|
|
||||||
|
<mat-card-content>
|
||||||
|
|
||||||
|
<div fxLayout="row wrap" class="content">
|
||||||
|
|
||||||
|
<div fxFlex="50%" class="mat-body-strong">
|
||||||
|
First Name
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div fxFlex="50%">
|
||||||
|
{{ employeeData.firstname }}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div fxFlex="50%" class="mat-body-strong">
|
||||||
|
Last Name
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div fxFlex="50%">
|
||||||
|
{{ employeeData.lastname }}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div fxFlex="50%" class="mat-body-strong">
|
||||||
|
Office
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div fxFlex="50%">
|
||||||
|
{{ employeeData.officeName }}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div fxFlex="50%" class="mat-body-strong">
|
||||||
|
Is Loan Officer
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div fxFlex="50%">
|
||||||
|
{{ employeeData.isLoanOfficer === true ? 'Yes' : 'No' }}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div fxFlex="50%" class="mat-body-strong" *ngIf="employeeData.mobileNo">
|
||||||
|
Mobile Number for SMS
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div fxFlex="50%" *ngIf="employeeData.mobileNo">
|
||||||
|
{{ employeeData.mobileNo }}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div fxFlex="50%" class="mat-body-strong">
|
||||||
|
Status
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div fxFlex="50%">
|
||||||
|
{{ employeeData.isActive === true ? 'Active' : 'Inactive' }}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div fxFlex="50%" class="mat-body-strong">
|
||||||
|
Joining Date
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div fxFlex="50%">
|
||||||
|
{{ employeeData.joiningDate | date }}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</mat-card-content>
|
||||||
|
|
||||||
|
</mat-card>
|
||||||
|
|
||||||
|
</div>
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
.container {
|
||||||
|
max-width: 37rem;
|
||||||
|
|
||||||
|
.content {
|
||||||
|
div {
|
||||||
|
margin: 1rem 0;
|
||||||
|
word-wrap: break-word;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { ViewEmployeeComponent } from './view-employee.component';
|
||||||
|
|
||||||
|
describe('ViewEmployeeComponent', () => {
|
||||||
|
let component: ViewEmployeeComponent;
|
||||||
|
let fixture: ComponentFixture<ViewEmployeeComponent>;
|
||||||
|
|
||||||
|
beforeEach(async(() => {
|
||||||
|
TestBed.configureTestingModule({
|
||||||
|
declarations: [ ViewEmployeeComponent ]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
}));
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
fixture = TestBed.createComponent(ViewEmployeeComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
/** Angular Imports */
|
||||||
|
import { Component, OnInit } from '@angular/core';
|
||||||
|
import { ActivatedRoute } from '@angular/router';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* View Employee Component.
|
||||||
|
*/
|
||||||
|
@Component({
|
||||||
|
selector: 'mifosx-view-employee',
|
||||||
|
templateUrl: './view-employee.component.html',
|
||||||
|
styleUrls: ['./view-employee.component.scss']
|
||||||
|
})
|
||||||
|
export class ViewEmployeeComponent implements OnInit {
|
||||||
|
|
||||||
|
/** Employee data. */
|
||||||
|
employeeData: any;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Retrieves the employee data from `resolve`.
|
||||||
|
* @param {ActivatedRoute} route Activated Route.
|
||||||
|
*/
|
||||||
|
constructor(private route: ActivatedRoute) {
|
||||||
|
this.route.data.subscribe((data: { employee: any }) => {
|
||||||
|
this.employeeData = data.employee;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
ngOnInit() {
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -14,6 +14,7 @@ import { LoanProvisioningCriteriaComponent } from './loan-provisioning-criteria/
|
|||||||
import { OfficesComponent } from './offices/offices.component';
|
import { OfficesComponent } from './offices/offices.component';
|
||||||
import { EmployeesComponent } from './employees/employees.component';
|
import { EmployeesComponent } from './employees/employees.component';
|
||||||
import { CreateEmployeeComponent } from './employees/create-employee/create-employee.component';
|
import { CreateEmployeeComponent } from './employees/create-employee/create-employee.component';
|
||||||
|
import { ViewEmployeeComponent } from './employees/view-employee/view-employee.component';
|
||||||
import { CurrenciesComponent } from './currencies/currencies.component';
|
import { CurrenciesComponent } from './currencies/currencies.component';
|
||||||
import { SmsCampaignsComponent } from './sms-campaigns/sms-campaigns.component';
|
import { SmsCampaignsComponent } from './sms-campaigns/sms-campaigns.component';
|
||||||
import { AdhocQueryComponent } from './adhoc-query/adhoc-query.component';
|
import { AdhocQueryComponent } from './adhoc-query/adhoc-query.component';
|
||||||
@@ -29,6 +30,7 @@ import { CreatePaymentTypeComponent } from './payment-types/create-payment-type/
|
|||||||
import { LoanProvisioningCriteriaResolver } from './loan-provisioning-criteria/loan-provisioning-criteria.resolver';
|
import { LoanProvisioningCriteriaResolver } from './loan-provisioning-criteria/loan-provisioning-criteria.resolver';
|
||||||
import { OfficesResolver } from './offices/offices.resolver';
|
import { OfficesResolver } from './offices/offices.resolver';
|
||||||
import { EmployeesResolver } from './employees/employees.resolver';
|
import { EmployeesResolver } from './employees/employees.resolver';
|
||||||
|
import { EmployeeResolver } from './employees/employee.resolver';
|
||||||
import { CurrenciesResolver } from './currencies/currencies.resolver';
|
import { CurrenciesResolver } from './currencies/currencies.resolver';
|
||||||
import { SmsCampaignsResolver } from './sms-campaigns/sms-campaigns.resolver';
|
import { SmsCampaignsResolver } from './sms-campaigns/sms-campaigns.resolver';
|
||||||
import { AdhocQueriesResolver } from './adhoc-query/adhoc-queries.resolver';
|
import { AdhocQueriesResolver } from './adhoc-query/adhoc-queries.resolver';
|
||||||
@@ -96,6 +98,14 @@ const routes: Routes = [
|
|||||||
resolve: {
|
resolve: {
|
||||||
offices: OfficesResolver
|
offices: OfficesResolver
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
path: ':id',
|
||||||
|
component: ViewEmployeeComponent,
|
||||||
|
data: { title: extract('View Employee'), routeResolveBreadcrumb: ['employee', 'displayName'] },
|
||||||
|
resolve: {
|
||||||
|
employee: EmployeeResolver
|
||||||
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
@@ -195,6 +205,7 @@ const routes: Routes = [
|
|||||||
LoanProvisioningCriteriaResolver,
|
LoanProvisioningCriteriaResolver,
|
||||||
OfficesResolver,
|
OfficesResolver,
|
||||||
EmployeesResolver,
|
EmployeesResolver,
|
||||||
|
EmployeeResolver,
|
||||||
CurrenciesResolver,
|
CurrenciesResolver,
|
||||||
SmsCampaignsResolver,
|
SmsCampaignsResolver,
|
||||||
AdhocQueriesResolver,
|
AdhocQueriesResolver,
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ import { WorkingDaysComponent } from './working-days/working-days.component';
|
|||||||
import { CreateOfficeComponent } from './offices/create-office/create-office.component';
|
import { CreateOfficeComponent } from './offices/create-office/create-office.component';
|
||||||
import { CreateEmployeeComponent } from './employees/create-employee/create-employee.component';
|
import { CreateEmployeeComponent } from './employees/create-employee/create-employee.component';
|
||||||
import { CreatePaymentTypeComponent } from './payment-types/create-payment-type/create-payment-type.component';
|
import { CreatePaymentTypeComponent } from './payment-types/create-payment-type/create-payment-type.component';
|
||||||
|
import { ViewEmployeeComponent } from './employees/view-employee/view-employee.component';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Organization Module
|
* Organization Module
|
||||||
@@ -49,7 +50,8 @@ import { CreatePaymentTypeComponent } from './payment-types/create-payment-type/
|
|||||||
WorkingDaysComponent,
|
WorkingDaysComponent,
|
||||||
CreateOfficeComponent,
|
CreateOfficeComponent,
|
||||||
CreateEmployeeComponent,
|
CreateEmployeeComponent,
|
||||||
CreatePaymentTypeComponent
|
CreatePaymentTypeComponent,
|
||||||
|
ViewEmployeeComponent
|
||||||
]
|
]
|
||||||
})
|
})
|
||||||
export class OrganizationModule { }
|
export class OrganizationModule { }
|
||||||
|
|||||||
@@ -55,6 +55,14 @@ export class OrganizationService {
|
|||||||
return this.http.post('/staff', employee);
|
return this.http.post('/staff', employee);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param {string} employeeId Employee ID of employee.
|
||||||
|
* @returns {Observable<any>} Employee.
|
||||||
|
*/
|
||||||
|
getEmployee(employeeId: string): Observable<any> {
|
||||||
|
return this.http.get(`/staff/${employeeId}`);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @returns {Observable<any>} Currencies data
|
* @returns {Observable<any>} Currencies data
|
||||||
*/
|
*/
|
||||||
|
|||||||
Reference in New Issue
Block a user