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:55:49 +01:00
commit ab3daf177d
2 changed files with 38 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -82,21 +82,21 @@
<div class="form-group row"> <div class="form-group row">
<label class="col-md-3 form-control-label" for="text-input"><strong>Period of entry month</strong></label> <label class="col-md-3 form-control-label" for="text-input"><strong>Period of entry month</strong></label>
<div class="col-md-9"> <div class="col-md-9">
<input type="month" class="form-control" formControlName="entryperiod"> <input type="month" class="form-control" formControlName="entry_period">
<span class="help-block">Enter the month and year for this information.</span> <span class="help-block">Enter the month and year for this information.</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"><strong>Total amount of Employees</strong></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="employee_amount" 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"><strong>Total amount of local Employees</strong></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="local_employee_amount" 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>
</div> </div>
</div> </div>
@ -105,7 +105,7 @@
<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>
<input type="number" min="0.00" step="0.01" class="form-control" formControlName="grosspayroll" placeholder="0.00"> <input type="number" min="0.00" step="0.01" class="form-control" formControlName="gross_payroll" placeholder="0.00">
</div> </div>
<span class="help-block">Enter the Gross Payroll for the organisation for the entry month.</span> <span class="help-block">Enter the Gross Payroll for the organisation for the entry month.</span>
</div> </div>
@ -115,7 +115,7 @@
<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>
<input type="number" min="0.00" step="0.01" class="form-control" formControlName="payrollincometax" placeholder="0.00"> <input type="number" min="0.00" step="0.01" class="form-control" formControlName="payroll_income_tax" placeholder="0.00">
</div> </div>
<span class="help-block">Enter the organisation's total income tax for the entry month.</span> <span class="help-block">Enter the organisation's total income tax for the entry month.</span>
</div> </div>
@ -125,7 +125,7 @@
<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>
<input type="number" min="0.00" step="0.01" class="form-control" formControlName="payrollemployeeni" placeholder="0.00"> <input type="number" min="0.00" step="0.01" class="form-control" formControlName="payroll_employee_ni" placeholder="0.00">
</div> </div>
<span class="help-block">Total of Employees National Insurance contributions for the entry month</span> <span class="help-block">Total of Employees National Insurance contributions for the entry month</span>
</div> </div>
@ -135,7 +135,7 @@
<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>
<input type="number" min="0.00" step="0.01" class="form-control" formControlName="payrollemployerni" placeholder="0.00"> <input type="number" min="0.00" step="0.01" class="form-control" formControlName="payroll_employer_ni" placeholder="0.00">
</div> </div>
<span class="help-block">Employers National Insurance contributions for the entry month</span> <span class="help-block">Employers National Insurance contributions for the entry month</span>
</div> </div>
@ -145,7 +145,7 @@
<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>
<input type="number" min="0.00" step="0.01" class="form-control" formControlName="payrolltotalpension" placeholder="0.00"> <input type="number" min="0.00" step="0.01" class="form-control" formControlName="payroll_total_pension" placeholder="0.00">
</div> </div>
<span class="help-block">Total spent on employee pensions by the organisation for the entry month</span> <span class="help-block">Total spent on employee pensions by the organisation for the entry month</span>
</div> </div>
@ -155,7 +155,7 @@
<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>
<input type="number" min="0.00" step="0.01" class="form-control" formControlName="payrollotherbenefit" placeholder="0.00"> <input type="number" min="0.00" step="0.01" class="form-control" formControlName="payroll_other_benefit" placeholder="0.00">
</div> </div>
<span class="help-block">A total of other payments such as refunded fuel etc. for the entry month</span> <span class="help-block">A total of other payments such as refunded fuel etc. for the entry month</span>
</div> </div>
@ -188,14 +188,14 @@
<div class="form-group row"> <div class="form-group row">
<label class="col-md-3 form-control-label" for="text-input"><strong>Period of entry month</strong></label> <label class="col-md-3 form-control-label" for="text-input"><strong>Period of entry month</strong></label>
<div class="col-md-9"> <div class="col-md-9">
<input type="month" class="form-control" formControlName="entryperiod"> <input type="month" class="form-control" formControlName="entry_period">
<span class="help-block">Enter the month and year for this information.</span> <span class="help-block">Enter the month and year for this information.</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"><strong>Supplier Business Name</strong></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="supplier_business_name">
<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>
@ -211,7 +211,7 @@
<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>
<input type="number" min="0.00" step="0.01" class="form-control" formControlName="monthlyspend" placeholder="0.00"> <input type="number" min="0.00" step="0.01" class="form-control" formControlName="monthly_spend" placeholder="0.00">
</div> </div>
<span class="help-block">Enter the monthly spend paid towards the supplier.</span> <span class="help-block">Enter the monthly spend paid towards the supplier.</span>
</div> </div>
@ -244,14 +244,14 @@
<div class="form-group row"> <div class="form-group row">
<label class="col-md-3 form-control-label" for="text-input"><strong>Period of entry month</strong></label> <label class="col-md-3 form-control-label" for="text-input"><strong>Period of entry month</strong></label>
<div class="col-md-9"> <div class="col-md-9">
<input type="month" class="form-control" formControlName="entryperiod"> <input type="month" class="form-control" formControlName="entry_period">
<span class="help-block">Enter the month and year for this information.</span> <span class="help-block">Enter the month and year for this information.</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"><strong>Employee number</strong></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="employee_no" 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>
@ -260,7 +260,7 @@
<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>
<input type="number" min="0.00" step="0.01" class="form-control" formControlName="employeegrosswage" placeholder="0.00"> <input type="number" min="0.00" step="0.01" class="form-control" formControlName="employee_gross_wage" placeholder="0.00">
</div> </div>
<span class="help-block">Enter the gross wage of the employee for the entry month.</span> <span class="help-block">Enter the gross wage of the employee for the entry month.</span>
</div> </div>
@ -270,7 +270,7 @@
<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>
<input type="number" min="0.00" step="0.01" class="form-control" formControlName="employeeincometax" placeholder="0.00"> <input type="number" min="0.00" step="0.01" class="form-control" formControlName="employee_income_tax" placeholder="0.00">
</div> </div>
<span class="help-block">Enter the total income tax of the employee for the entry month</span> <span class="help-block">Enter the total income tax of the employee for the entry month</span>
</div> </div>
@ -280,7 +280,7 @@
<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>
<input type="number" min="0.00" step="0.01" class="form-control" formControlName="employeeni" placeholder="0.00"> <input type="number" min="0.00" step="0.01" class="form-control" formControlName="employee_ni" placeholder="0.00">
</div> </div>
<span class="help-block">Individual Employees National Insurance Contributions for the entry month</span> <span class="help-block">Individual Employees National Insurance Contributions for the entry month</span>
</div> </div>
@ -290,7 +290,7 @@
<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>
<input type="number" min="0.00" step="0.01" class="form-control" formControlName="employeepension" placeholder="0.00"> <input type="number" min="0.00" step="0.01" class="form-control" formControlName="employee_pension" placeholder="0.00">
</div> </div>
<span class="help-block">Individual Employees Pension contributions for the entry month</span> <span class="help-block">Individual Employees Pension contributions for the entry month</span>
</div> </div>
@ -300,7 +300,7 @@
<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>
<input type="number" min="0.00" step="0.01" class="form-control" formControlName="employeeotherbenefit" placeholder="0.00"> <input type="number" min="0.00" step="0.01" class="form-control" formControlName="employee_other_benefit" placeholder="0.00">
</div> </div>
<span class="help-block">A total of other payments such as refunded fuel etc. for the entry month</span> <span class="help-block">A total of other payments such as refunded fuel etc. for the entry month</span>
</div> </div>

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

@ -46,30 +46,30 @@ export class AddDataComponent {
private api: ApiService, private api: ApiService,
) { ) {
this.payrollForm = this.formBuilder.group({ this.payrollForm = this.formBuilder.group({
entryperiod: ['', [Validators.required]], entry_period: ['', [Validators.required]],
employeeamount: ['', [Validators.required]], employee_amount: ['', [Validators.required]],
localemployeeamount: ['', [Validators.required]], local_employee_amount: ['', [Validators.required]],
grosspayroll: ['', [Validators.required]], gross_payroll: ['', [Validators.required]],
payrollincometax: ['', [Validators.required]], payroll_income_tax: ['', [Validators.required]],
payrollemployeeni: ['', [Validators.required]], payroll_employee_ni: ['', [Validators.required]],
payrollemployerni: ['', [Validators.required]], payroll_employer_ni: ['', [Validators.required]],
payrolltotalpension: ['', [Validators.required]], payroll_total_pension: ['', [Validators.required]],
payrollotherbenefit: ['', [Validators.required]], payroll_other_benefit: ['', [Validators.required]],
}); });
this.singleSupplierForm = this.formBuilder.group({ this.singleSupplierForm = this.formBuilder.group({
entryperiod: ['', [Validators.required]], entry_period: ['', [Validators.required]],
supplierbusinessname: ['', [Validators.required]], supplier_business_name: ['', [Validators.required]],
postcode: ['', [Validators.required]], postcode: ['', [Validators.required]],
monthlyspend: ['', [Validators.required]], monthly_spend: ['', [Validators.required]],
}); });
this.employeeForm = this.formBuilder.group({ this.employeeForm = this.formBuilder.group({
entryperiod: ['', [Validators.required]], entry_period: ['', [Validators.required]],
employeeno: ['', [Validators.required]], employee_no: ['', [Validators.required]],
employeeincometax: ['', [Validators.required]], employee_income_tax: ['', [Validators.required]],
employeegrosswage: ['', [Validators.required]], employee_gross_wage: ['', [Validators.required]],
employeeni: ['', [Validators.required]], employee_ni: ['', [Validators.required]],
employeepension: ['', [Validators.required]], employee_pension: ['', [Validators.required]],
employeeotherbenefit: ['', [Validators.required]], employee_other_benefit: ['', [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);