Fully working table org search and better error
This commit is contained in:
parent
f040a26794
commit
52de477cc2
7 changed files with 86 additions and 22 deletions
|
@ -30,8 +30,8 @@
|
||||||
<input type="text" class="form-control" placeholder="Organisation Name" [(ngModel)]="submitOrg.name" (input)="organisationSearch($event)" (ngModelChange)="transactionFormValidate()">
|
<input type="text" class="form-control" placeholder="Organisation Name" [(ngModel)]="submitOrg.name" (input)="organisationSearch($event)" (ngModelChange)="transactionFormValidate()">
|
||||||
<span class="help-block">This is a help text</span>
|
<span class="help-block">This is a help text</span>
|
||||||
</div>
|
</div>
|
||||||
<org-result organisation="Trouble"></org-result>
|
|
||||||
</div>
|
</div>
|
||||||
|
<org-table *ngIf="storeList != null" [orgList]="storeList" (onClick)="addStore($event)"></org-table>
|
||||||
<div *ngIf="showAddStore">
|
<div *ngIf="showAddStore">
|
||||||
<div class="form-group row">
|
<div class="form-group row">
|
||||||
<label class="col-md-3 form-control-label" for="text-input"><strong>Organisation Street Name</strong></label>
|
<label class="col-md-3 form-control-label" for="text-input"><strong>Organisation Street Name</strong></label>
|
||||||
|
|
|
@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
|
||||||
import { Validators, FormBuilder, FormGroup } from '@angular/forms';
|
import { Validators, FormBuilder, FormGroup } from '@angular/forms';
|
||||||
import { Http, Response } from '@angular/http';
|
import { Http, Response } from '@angular/http';
|
||||||
import { ApiService } from '../providers/api-service';
|
import { ApiService } from '../providers/api-service';
|
||||||
import { OrgResultComponent } from '../shared/org-result.component';
|
import { OrgTableComponent } from '../shared/org-table.component';
|
||||||
import * as moment from 'moment';
|
import * as moment from 'moment';
|
||||||
import 'rxjs/add/operator/map';
|
import 'rxjs/add/operator/map';
|
||||||
|
|
||||||
|
@ -229,8 +229,10 @@ export class AddDataComponent {
|
||||||
console.log('Upload Error');
|
console.log('Upload Error');
|
||||||
console.log(error);
|
console.log(error);
|
||||||
try {
|
try {
|
||||||
let jsonError = JSON.parse(error.body);
|
console.log(error.error);
|
||||||
this.transactionFormStatusError = JSON.stringify(jsonError.status) + 'Error, ' + JSON.stringify(jsonError.message);
|
let jsonError = error.json();
|
||||||
|
console.log("boop");
|
||||||
|
this.transactionFormStatusError = '"' + jsonError.error + '" Error, ' + jsonError.message;
|
||||||
} catch(e) {
|
} catch(e) {
|
||||||
this.transactionFormStatusError = 'There was a server error, please try again later.';
|
this.transactionFormStatusError = 'There was a server error, please try again later.';
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,6 +11,7 @@ import { AddDataComponent } from './add-data.component';
|
||||||
|
|
||||||
import { DashboardRoutingModule } from './dashboard.routing';
|
import { DashboardRoutingModule } from './dashboard.routing';
|
||||||
import { OrgResultComponent } from '../shared/org-result.component';
|
import { OrgResultComponent } from '../shared/org-result.component';
|
||||||
|
import { OrgTableComponent } from '../shared/org-table.component';
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
|
@ -28,6 +29,7 @@ import { OrgResultComponent } from '../shared/org-result.component';
|
||||||
AccountEditComponent,
|
AccountEditComponent,
|
||||||
AddDataComponent,
|
AddDataComponent,
|
||||||
OrgResultComponent,
|
OrgResultComponent,
|
||||||
|
OrgTableComponent,
|
||||||
]
|
]
|
||||||
})
|
})
|
||||||
export class DashboardModule { }
|
export class DashboardModule { }
|
||||||
|
|
4
src/app/shared/org-result.component.html
Normal file
4
src/app/shared/org-result.component.html
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
<td (click)="orgClick()">{{org.name}}</td>
|
||||||
|
<td (click)="orgClick()">{{org.street_name}}</td>
|
||||||
|
<td (click)="orgClick()">{{org.town}}</td>
|
||||||
|
<td (click)="orgClick()">{{org.postcode}}</td>
|
|
@ -1,10 +1,24 @@
|
||||||
import { Component, Input } from '@angular/core';
|
import { Component, Input, Output, EventEmitter } from '@angular/core';
|
||||||
|
|
||||||
|
interface OrgData {
|
||||||
|
id: number;
|
||||||
|
name: string;
|
||||||
|
street_name: string;
|
||||||
|
town: string;
|
||||||
|
postcode: string;
|
||||||
|
}
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'org-result',
|
selector: '[org-result]',
|
||||||
template:'banana {{ organisation }}',
|
templateUrl: 'org-result.component.html',
|
||||||
})
|
})
|
||||||
export class OrgResultComponent {
|
export class OrgResultComponent {
|
||||||
@Input() organisation: any;
|
@Input() public org: OrgData;
|
||||||
|
@Output() public onClick = new EventEmitter();
|
||||||
|
|
||||||
|
public orgClick(): void {
|
||||||
|
this.onClick.emit(
|
||||||
|
this.org
|
||||||
|
)
|
||||||
|
}
|
||||||
}
|
}
|
19
src/app/shared/org-table.component.html
Normal file
19
src/app/shared/org-table.component.html
Normal file
|
@ -0,0 +1,19 @@
|
||||||
|
<div class="form-group row">
|
||||||
|
<label class="col-md-3 form-control-label" for="text-input"><strong>Organisation Search Results</strong></label>
|
||||||
|
<div class="col-md-9">
|
||||||
|
<span class="help-block"><strong>Select an Organisation from the table below</strong></span>
|
||||||
|
<table class="table table-hover">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th>Organisation Name</th>
|
||||||
|
<th>Street Name</th>
|
||||||
|
<th>Town</th>
|
||||||
|
<th>Postcode</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
<tr org-result *ngFor="let org of orgList" [org]="org" (onClick)="orgClick($event)"></tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</div>
|
23
src/app/shared/org-table.component.ts
Normal file
23
src/app/shared/org-table.component.ts
Normal file
|
@ -0,0 +1,23 @@
|
||||||
|
import { Component, Input, Output, EventEmitter } from '@angular/core';
|
||||||
|
import { OrgResultComponent } from '../shared/org-result.component';
|
||||||
|
|
||||||
|
interface OrgData {
|
||||||
|
id: number;
|
||||||
|
name: string;
|
||||||
|
street_name: string;
|
||||||
|
town: string;
|
||||||
|
postcode: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'org-table',
|
||||||
|
templateUrl: 'org-table.component.html',
|
||||||
|
})
|
||||||
|
export class OrgTableComponent {
|
||||||
|
@Input() public orgList: Array<OrgData>;
|
||||||
|
@Output() public onClick = new EventEmitter();
|
||||||
|
|
||||||
|
public orgClick(event: any): void {
|
||||||
|
this.onClick.emit( event );
|
||||||
|
}
|
||||||
|
}
|
Reference in a new issue