Pear-Trading/FoodLoop-Web
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'finn/OrgData' into development

Browse source
This commit is contained in:
piratefinn 2017-09-08 12:16:53 +01:00
parent 755588c7cd 2c23b8a64d
commit 3167472357
2 changed files with 32 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/app/dashboard/add-data.component.html
View file

@ -87,14 +87,14 @@
</div> </div>
</div> </div>
<div class="form-group row"> <div class="form-group row">
<label class="col-md-3 form-control-label" for="text-input">Total amount of Employees</label> <label class="col-md-3 form-control-label" for="text-input"><strong>Total amount of Employees</strong></label>
<div class="col-md-9"> <div class="col-md-9">
<input type="number" class="form-control" formControlName="employeeamount" placeholder="0"> <input type="number" class="form-control" formControlName="employeeamount" placeholder="0">
<span class="help-block">Enter the amount of employees the organisation has for the entry month.</span> <span class="help-block">Enter the amount of employees the organisation has for the entry month.</span>
</div> </div>
</div> </div>
<div class="form-group row"> <div class="form-group row">
<label class="col-md-3 form-control-label" for="text-input">Total amount of local Employees</label> <label class="col-md-3 form-control-label" for="text-input"><strong>Total amount of local Employees</strong></label>
<div class="col-md-9"> <div class="col-md-9">
<input type="number" class="form-control" formControlName="localemployeeamount" placeholder="0"> <input type="number" class="form-control" formControlName="localemployeeamount" placeholder="0">
<span class="help-block">Enter the amount of employees that live locally to the organisation for the entry month.</span> <span class="help-block">Enter the amount of employees that live locally to the organisation for the entry month.</span>
@ -111,7 +111,7 @@
</div> </div>
</div> </div>
<div class="form-group row"> <div class="form-group row">
<label class="col-md-3 form-control-label" for="text-input">Total Income Tax</label> <label class="col-md-3 form-control-label" for="text-input"><strong>Total Income Tax</strong></label>
<div class="col-md-9"> <div class="col-md-9">
<div class="input-group"> <div class="input-group">
<span class="input-group-addon"><i class="fa fa-gbp"></i></span> <span class="input-group-addon"><i class="fa fa-gbp"></i></span>
@ -121,7 +121,7 @@
</div> </div>
</div> </div>
<div class="form-group row"> <div class="form-group row">
<label class="col-md-3 form-control-label" for="text-input">Employees Total NI</label> <label class="col-md-3 form-control-label" for="text-input"><strong>Employees Total NI</strong></label>
<div class="col-md-9"> <div class="col-md-9">
<div class="input-group"> <div class="input-group">
<span class="input-group-addon"><i class="fa fa-gbp"></i></span> <span class="input-group-addon"><i class="fa fa-gbp"></i></span>
@ -131,7 +131,7 @@
</div> </div>
</div> </div>
<div class="form-group row"> <div class="form-group row">
<label class="col-md-3 form-control-label" for="text-input">Employers Total NI</label> <label class="col-md-3 form-control-label" for="text-input"><strong>Employers Total NI</strong></label>
<div class="col-md-9"> <div class="col-md-9">
<div class="input-group"> <div class="input-group">
<span class="input-group-addon"><i class="fa fa-gbp"></i></span> <span class="input-group-addon"><i class="fa fa-gbp"></i></span>
@ -141,7 +141,7 @@
</div> </div>
</div> </div>
<div class="form-group row"> <div class="form-group row">
<label class="col-md-3 form-control-label" for="text-input">Total Pensions</label> <label class="col-md-3 form-control-label" for="text-input"><strong>Total Pensions</strong></label>
<div class="col-md-9"> <div class="col-md-9">
<div class="input-group"> <div class="input-group">
<span class="input-group-addon"><i class="fa fa-gbp"></i></span> <span class="input-group-addon"><i class="fa fa-gbp"></i></span>
@ -151,7 +151,7 @@
</div> </div>
</div> </div>
<div class="form-group row"> <div class="form-group row">
<label class="col-md-3 form-control-label" for="text-input">Total Other Benefits</label> <label class="col-md-3 form-control-label" for="text-input"><strong>Total Other Benefits</strong></label>
<div class="col-md-9"> <div class="col-md-9">
<div class="input-group"> <div class="input-group">
<span class="input-group-addon"><i class="fa fa-gbp"></i></span> <span class="input-group-addon"><i class="fa fa-gbp"></i></span>
@ -181,7 +181,7 @@
<div *ngIf="accountType == 'organisation'" class="card"> <div *ngIf="accountType == 'organisation'" class="card">
<div class="card-header"> <div class="card-header">
<strong>Individual Supplier Data</strong> <strong>Individual Supplier Data</strong>
<small>Optional but recommended.</small> <small>Required Data marked in <strong>bold</strong>.</small>
</div> </div>
<form class="form-horizontal" [formGroup]="singleSupplierForm" (ngSubmit)="onSubmitSingleSupplier()"> <form class="form-horizontal" [formGroup]="singleSupplierForm" (ngSubmit)="onSubmitSingleSupplier()">
<div class="card-block"> <div class="card-block">
@ -193,21 +193,21 @@
</div> </div>
</div> </div>
<div class="form-group row"> <div class="form-group row">
<label class="col-md-3 form-control-label" for="text-input">Supplier Business Name</label> <label class="col-md-3 form-control-label" for="text-input"><strong>Supplier Business Name</strong></label>
<div class="col-md-9"> <div class="col-md-9">
<input type="text" class="form-control" formControlName="supplierbusinessname"> <input type="text" class="form-control" formControlName="supplierbusinessname">
<span class="help-block">Enter the business name of the supplier.</span> <span class="help-block">Enter the business name of the supplier.</span>
</div> </div>
</div> </div>
<div class="form-group row"> <div class="form-group row">
<label class="col-md-3 form-control-label" for="text-input">Postcode</label> <label class="col-md-3 form-control-label" for="text-input"><strong>Postcode</strong></label>
<div class="col-md-9"> <div class="col-md-9">
<input type="text" class="form-control" formControlName="postcode"> <input type="text" class="form-control" formControlName="postcode">
<span class="help-block">Enter the postcode where the supplier is located.</span> <span class="help-block">Enter the postcode where the supplier is located.</span>
</div> </div>
</div> </div>
<div class="form-group row"> <div class="form-group row">
<label class="col-md-3 form-control-label" for="text-input">Monthly Spend</label> <label class="col-md-3 form-control-label" for="text-input"><strong>Monthly Spend</strong></label>
<div class="col-md-9"> <div class="col-md-9">
<div class="input-group"> <div class="input-group">
<span class="input-group-addon"><i class="fa fa-gbp"></i></span> <span class="input-group-addon"><i class="fa fa-gbp"></i></span>
@ -237,7 +237,7 @@
<div *ngIf="accountType == 'organisation'" class="card"> <div *ngIf="accountType == 'organisation'" class="card">
<div class="card-header"> <div class="card-header">
<strong>Individual Employee Data</strong> <strong>Individual Employee Data</strong>
<small>Optional but recommended.</small> <small>Required Data marked in <strong>bold</strong>.</small>
</div> </div>
<form class="form-horizontal" [formGroup]="employeeForm" (ngSubmit)="onSubmitEmployee()"> <form class="form-horizontal" [formGroup]="employeeForm" (ngSubmit)="onSubmitEmployee()">
<div class="card-block"> <div class="card-block">
@ -249,14 +249,14 @@
</div> </div>
</div> </div>
<div class="form-group row"> <div class="form-group row">
<label class="col-md-3 form-control-label" for="text-input">Employee number</label> <label class="col-md-3 form-control-label" for="text-input"><strong>Employee number</strong></label>
<div class="col-md-9"> <div class="col-md-9">
<input type="number" class="form-control" formControlName="employeeno" placeholder="0"> <input type="number" class="form-control" formControlName="employeeno" placeholder="0">
<span class="help-block">Used to identify employee anonymously</span> <span class="help-block">Used to identify employee anonymously</span>
</div> </div>
</div> </div>
<div class="form-group row"> <div class="form-group row">
<label class="col-md-3 form-control-label" for="text-input">Gross Wage</label> <label class="col-md-3 form-control-label" for="text-input"><strong>Gross Wage</strong></label>
<div class="col-md-9"> <div class="col-md-9">
<div class="input-group"> <div class="input-group">
<span class="input-group-addon"><i class="fa fa-gbp"></i></span> <span class="input-group-addon"><i class="fa fa-gbp"></i></span>
@ -266,7 +266,7 @@
</div> </div>
</div> </div>
<div class="form-group row"> <div class="form-group row">
<label class="col-md-3 form-control-label" for="text-input">Total Income Tax</label> <label class="col-md-3 form-control-label" for="text-input"><strong>Total Income Tax</strong></label>
<div class="col-md-9"> <div class="col-md-9">
<div class="input-group"> <div class="input-group">
<span class="input-group-addon"><i class="fa fa-gbp"></i></span> <span class="input-group-addon"><i class="fa fa-gbp"></i></span>
@ -276,7 +276,7 @@
</div> </div>
</div> </div>
<div class="form-group row"> <div class="form-group row">
<label class="col-md-3 form-control-label" for="text-input">Total Employee NI</label> <label class="col-md-3 form-control-label" for="text-input"><strong>Total Employee NI</strong></label>
<div class="col-md-9"> <div class="col-md-9">
<div class="input-group"> <div class="input-group">
<span class="input-group-addon"><i class="fa fa-gbp"></i></span> <span class="input-group-addon"><i class="fa fa-gbp"></i></span>
@ -286,7 +286,7 @@
</div> </div>
</div> </div>
<div class="form-group row"> <div class="form-group row">
<label class="col-md-3 form-control-label" for="text-input">Employee's Pension</label> <label class="col-md-3 form-control-label" for="text-input"><strong>Employee's Pension</strong></label>
<div class="col-md-9"> <div class="col-md-9">
<div class="input-group"> <div class="input-group">
<span class="input-group-addon"><i class="fa fa-gbp"></i></span> <span class="input-group-addon"><i class="fa fa-gbp"></i></span>
@ -296,7 +296,7 @@
</div> </div>
</div> </div>
<div class="form-group row"> <div class="form-group row">
<label class="col-md-3 form-control-label" for="text-input">Total Employee Other Benefits</label> <label class="col-md-3 form-control-label" for="text-input"><strong>Total Employee Other Benefits</strong></label>
<div class="col-md-9"> <div class="col-md-9">
<div class="input-group"> <div class="input-group">
<span class="input-group-addon"><i class="fa fa-gbp"></i></span> <span class="input-group-addon"><i class="fa fa-gbp"></i></span>

28
src/app/dashboard/add-data.component.ts
View file

@ -50,26 +50,26 @@ export class AddDataComponent {
employeeamount: ['', [Validators.required]], employeeamount: ['', [Validators.required]],
localemployeeamount: ['', [Validators.required]], localemployeeamount: ['', [Validators.required]],
grosspayroll: ['', [Validators.required]], grosspayroll: ['', [Validators.required]],
payrollincometax: [''], payrollincometax: ['', [Validators.required]],
payrollemployeeni: [''], payrollemployeeni: ['', [Validators.required]],
payrollemployerni: [''], payrollemployerni: ['', [Validators.required]],
payrolltotalpension: [''], payrolltotalpension: ['', [Validators.required]],
payrollotherbenefit: [''], payrollotherbenefit: ['', [Validators.required]],
}); });
this.singleSupplierForm = this.formBuilder.group({ this.singleSupplierForm = this.formBuilder.group({
entryperiod: ['', [Validators.required]], entryperiod: ['', [Validators.required]],
supplierbusinessname: [''], supplierbusinessname: ['', [Validators.required]],
postcode: [''], postcode: ['', [Validators.required]],
monthlyspend: [''], monthlyspend: ['', [Validators.required]],
}); });
this.employeeForm = this.formBuilder.group({ this.employeeForm = this.formBuilder.group({
entryperiod: ['', [Validators.required]], entryperiod: ['', [Validators.required]],
employeeno: [''], employeeno: ['', [Validators.required]],
employeeincometax: [''], employeeincometax: ['', [Validators.required]],
employeegrosswage: [''], employeegrosswage: ['', [Validators.required]],
employeeni: [''], employeeni: ['', [Validators.required]],
employeepension: [''], employeepension: ['', [Validators.required]],
employeeotherbenefit: [''], employeeotherbenefit: ['', [Validators.required]],
}); });
this.myDate = moment().format('YYYY-MM-DD[T]HH:mm'); this.myDate = moment().format('YYYY-MM-DD[T]HH:mm');
// this.myDate = new Date().toISOString().slice(0, 16); // this.myDate = new Date().toISOString().slice(0, 16);