diff --git a/CHANGELOG.md b/CHANGELOG.md index 84ec5f1..83a368e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ # Next Release +* Payroll Log Data added * Fixed register box view on login page * Made the form reset properly if adding a new one * Added better error messages on register and account edit diff --git a/src/app/dashboard/dashboard.module.ts b/src/app/dashboard/dashboard.module.ts index 55bb110..134d8bd 100644 --- a/src/app/dashboard/dashboard.module.ts +++ b/src/app/dashboard/dashboard.module.ts @@ -13,6 +13,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 { PayrollLogComponent } from './payroll-log.component'; import { GraphWidget } from '../widgets/graph-widget.component'; import { OrgBarSnippetComponent } from '../snippets/org-snippet-bar.component'; @@ -22,6 +23,7 @@ import { DashboardRoutingModule } from './dashboard.routing'; import { OrgResultComponent } from '../shared/org-result.component'; import { OrgTableComponent } from '../shared/org-table.component'; import { TransactionResultComponent } from '../shared/transaction-result.component'; +import { PayrollResultComponent } from '../shared/payroll-result.component'; @NgModule({ imports: [ @@ -43,6 +45,8 @@ import { TransactionResultComponent } from '../shared/transaction-result.compone OrgTableComponent, TransactionLogComponent, TransactionResultComponent, + PayrollLogComponent, + PayrollResultComponent, FeedbackComponent, GraphWidget, OrgBarSnippetComponent, diff --git a/src/app/dashboard/dashboard.routing.ts b/src/app/dashboard/dashboard.routing.ts index acb81b7..c36cfb2 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 { PayrollLogComponent } from './payroll-log.component'; // Using child path to allow for FullLayout theming const routes: Routes = [ @@ -48,6 +49,12 @@ const routes: Routes = [ component: TransactionLogComponent, data: { title: 'Transaction Log' }, }, + { + path: 'payroll-log', + component: PayrollLogComponent, + data: { title: 'Payroll Log' }, + canActivate: [OrgGuard], + }, { path: 'feedback', component: FeedbackComponent, diff --git a/src/app/dashboard/payroll-log.component.html b/src/app/dashboard/payroll-log.component.html index 68ec8af..0b08ed8 100644 --- a/src/app/dashboard/payroll-log.component.html +++ b/src/app/dashboard/payroll-log.component.html @@ -10,13 +10,13 @@
Seller | -Value | -Purchase Time | +Entry Period | +Gross Payroll | +Employees |
---|---|---|---|---|---|