OK-324 Refactoring
diff --git a/src/app/common-components/autocomplete/autocomplete.component.ts b/src/app/common-components/autocomplete/autocomplete.component.ts
index 3bfca5c..dd56355 100644
--- a/src/app/common-components/autocomplete/autocomplete.component.ts
+++ b/src/app/common-components/autocomplete/autocomplete.component.ts
@@ -25,10 +25,10 @@
}
searchChanged(newValue) {
- if (newValue == '') {
+ if (newValue === '') {
newValue = null;
}
- this.responsibilityForwarding = newValue;
+ this.responsibilityForwarding = newValue;
this.responsibilityForwardingChange.emit(newValue);
}
@@ -45,8 +45,7 @@
this.filteredList = this.items.filter((el: any) => {
if (this.responsibilityForwarding == null) {
return el.name.toLowerCase().indexOf(this.responsibilityForwarding) > -1;
- }
- else{
+ } else {
return el.name.toLowerCase().indexOf(this.responsibilityForwarding.toLowerCase()) > -1;
}
});
@@ -105,10 +104,10 @@
}
- select(item: any) {
+ select(item: any) {
this.filteredList = [];
- this.position = -1;
- if (item.name == '') {
+ this.position = -1;
+ if (item.name === '') {
item.name = null;
}
this.responsibilityForwarding = item.name;
diff --git a/src/app/dialogs/loading-spinner/loading-spinner.component.ts b/src/app/dialogs/loading-spinner/loading-spinner.component.ts
index 73bd513..0ec881e 100644
--- a/src/app/dialogs/loading-spinner/loading-spinner.component.ts
+++ b/src/app/dialogs/loading-spinner/loading-spinner.component.ts
@@ -1,7 +1,7 @@
import { Component, OnInit, Input } from '@angular/core';
@Component({
- selector: 'loading-spinner',
+ selector: 'app-loading-spinner',
templateUrl: './loading-spinner.component.html',
styleUrls: ['./loading-spinner.component.css']
})
diff --git a/src/app/lists/abstract-list/abstract-list.component.ts b/src/app/lists/abstract-list/abstract-list.component.ts
index 101fe22..91de8af 100644
--- a/src/app/lists/abstract-list/abstract-list.component.ts
+++ b/src/app/lists/abstract-list/abstract-list.component.ts
@@ -37,7 +37,7 @@
@Input() withDatePicker = true;
@Input() withEditButtons = true;
@Input() isCollapsible = true;
- @Input() stayHidden = true;
+ @Input() stayHidden = true;
@Input() gridId: string;
showSpinner = false;
globals = Globals;
@@ -91,7 +91,7 @@
if (oldStayHiddenVal != null) {
this.stayHidden = oldStayHiddenVal;
}
-
+
//Subscriptions
let subscription: any;
this.subscriptions = new Array<any>();
@@ -110,7 +110,7 @@
this.subscriptions.push(subscription);
subscription = this.reminderService.itemChanged$.subscribe(item => this.onItemChanged(item));
- this.subscriptions.push(subscription);
+ this.subscriptions.push(subscription);
//Daterangepicker Config
this.daterangepickerConfig.settings = {
@@ -168,8 +168,9 @@
}
});
const sortingState = this.sessionContext.getSortingState(this.gridId);
- if (!sortingState)
+ if (!sortingState) {
return;
+ }
this.sortingState = sortingState;
this.sort(undefined);
@@ -264,7 +265,7 @@
if (column) {
this.sortingState.isDesc = !this.sortingState.isDesc;
- if (this.sortingState.column !== undefined && this.sortingState.column != column) {
+ if (this.sortingState.column !== undefined && this.sortingState.column !== column) {
this.sortingState.counter = 1;
this.sortingState.isDesc = true;
} else {
@@ -274,36 +275,32 @@
}
- let direction = this.sortingState.isDesc ? 1 : -1;
+ const direction = this.sortingState.isDesc ? 1 : -1;
- if (this.sortingState.defaultState && !column || this.sortingState.counter > 0 && this.sortingState.counter % 3 == 0) {
+ if (this.sortingState.defaultState && !column || this.sortingState.counter > 0 && this.sortingState.counter % 3 === 0) {
this.sortingState.counter = 0;
this.notifications = Object.assign(new Array<Notification>(), this.defaultList);
this.sortingState.defaultState = true;
this.sortingState.isDesc = false;
- }
- else {
+ } else {
this.sortingState.defaultState = false;
this.notifications.sort((a, b) => {
- var a1 = this.getColumnValue(this.sortingState.column, a);
- var b1 = this.getColumnValue(this.sortingState.column, b);
+ const a1 = this.getColumnValue(this.sortingState.column, a);
+ const b1 = this.getColumnValue(this.sortingState.column, b);
- if ( a1 == null) {
+ if (a1 == null) {
return 1 * direction;
}
if (b1 == null) {
return -1 * direction;
- }
- else if (a1 < b1) {
+ } else if (a1 < b1) {
return -1 * direction;
- }
- else if (a1 > b1) {
+ } else if (a1 > b1) {
return 1 * direction;
- }
- else {
+ } else {
return 0;
}
});
@@ -315,13 +312,16 @@
switch (columnName) {
case 'fkRefBranch':
- return this.sessionContext.getBrancheById(notification.fkRefBranch) ? this.sessionContext.getBrancheById(notification.fkRefBranch).name.toLowerCase() : null;
+ return this.sessionContext.getBrancheById(notification.fkRefBranch) ?
+ this.sessionContext.getBrancheById(notification.fkRefBranch).name.toLowerCase() : null;
case 'fkRefNotificationStatus':
- return this.sessionContext.getStatusById(notification.fkRefNotificationStatus) ? this.sessionContext.getStatusById(notification.fkRefNotificationStatus).name.toLowerCase() : null;
+ return this.sessionContext.getStatusById(notification.fkRefNotificationStatus) ?
+ this.sessionContext.getStatusById(notification.fkRefNotificationStatus).name.toLowerCase() : null;
case 'fkRefGridTerritory':
- return this.sessionContext.getGridTerritoryById(notification.fkRefGridTerritory) ? this.sessionContext.getGridTerritoryById(notification.fkRefGridTerritory).name.toLowerCase() : null;
+ return this.sessionContext.getGridTerritoryById(notification.fkRefGridTerritory) ?
+ this.sessionContext.getGridTerritoryById(notification.fkRefGridTerritory).name.toLowerCase() : null;
default:
- return notification[columnName] ? notification[columnName].toLowerCase(): null;
+ return notification[columnName] ? notification[columnName].toLowerCase() : null;
}
}
diff --git a/src/app/lists/current-reminders/current-reminders.component.html b/src/app/lists/current-reminders/current-reminders.component.html
index c29d8e9..1a11409 100644
--- a/src/app/lists/current-reminders/current-reminders.component.html
+++ b/src/app/lists/current-reminders/current-reminders.component.html
@@ -132,7 +132,7 @@
</tr>
</tbody>
</table>
- <loading-spinner *ngIf="showSpinner"></loading-spinner>
+ <app-loading-spinner *ngIf="showSpinner"></app-loading-spinner>
</div>
</div>
</div>
\ No newline at end of file
diff --git a/src/app/lists/current-reminders/current-reminders.component.spec.ts b/src/app/lists/current-reminders/current-reminders.component.spec.ts
index 6e6c7e6..6141727 100644
--- a/src/app/lists/current-reminders/current-reminders.component.spec.ts
+++ b/src/app/lists/current-reminders/current-reminders.component.spec.ts
@@ -61,8 +61,8 @@
declarations: [
CurrentRemindersComponent, StringToDatePipe,
FormattedTimestampPipe,
- MockComponent({ selector: 'loading-spinner' }),
- MockComponent({selector: 'app-sorting', inputs: ['columnName','initColumnName','isDesc', 'defaultState']})
+ MockComponent({ selector: 'app-loading-spinner' }),
+ MockComponent({selector: 'app-sorting', inputs: ['columnName', 'initColumnName', 'isDesc', 'defaultState']})
],
providers: [
{ provide: ReminderService, useValue: mockReminderService },
diff --git a/src/app/lists/finished-notifications/finished-notifications.component.html b/src/app/lists/finished-notifications/finished-notifications.component.html
index 5b57281..c65006a 100644
--- a/src/app/lists/finished-notifications/finished-notifications.component.html
+++ b/src/app/lists/finished-notifications/finished-notifications.component.html
@@ -144,7 +144,7 @@
</tr>
</tbody>
</table>
- <loading-spinner *ngIf="showSpinner"></loading-spinner>
+ <app-loading-spinner *ngIf="showSpinner"></app-loading-spinner>
</div>
</div>
</div>
\ No newline at end of file
diff --git a/src/app/lists/finished-notifications/finished-notifications.component.spec.ts b/src/app/lists/finished-notifications/finished-notifications.component.spec.ts
index 784f0d9..547d18b 100644
--- a/src/app/lists/finished-notifications/finished-notifications.component.spec.ts
+++ b/src/app/lists/finished-notifications/finished-notifications.component.spec.ts
@@ -67,8 +67,8 @@
StringToDatePipe,
FormattedDatePipe,
FormattedTimestampPipe,
- MockComponent({ selector: 'loading-spinner' }),
- MockComponent({ selector: 'app-sorting', inputs:['columnName','initColumnName','isDesc', 'defaultState'] }),
+ MockComponent({ selector: 'app-loading-spinner' }),
+ MockComponent({ selector: 'app-sorting', inputs: ['columnName', 'initColumnName', 'isDesc', 'defaultState'] }),
MockComponent({ selector: 'input', inputs: ['options'] })
],
providers: [
diff --git a/src/app/lists/finished-notifications/finished-notifications.component.ts b/src/app/lists/finished-notifications/finished-notifications.component.ts
index 69b3a21..81472c0 100644
--- a/src/app/lists/finished-notifications/finished-notifications.component.ts
+++ b/src/app/lists/finished-notifications/finished-notifications.component.ts
@@ -17,7 +17,7 @@
column: string;
private getFinishedNotifications(): void {
- this.notificationService.getFinishedNotifications(this.notificationSearchFilter).subscribe(nots =>{
+ this.notificationService.getFinishedNotifications(this.notificationSearchFilter).subscribe(nots => {
this.setNotifications(nots);
this.showSpinner = false;
},
diff --git a/src/app/lists/future-notifications/future-notifications.component.html b/src/app/lists/future-notifications/future-notifications.component.html
index 6538f78..fea9d06 100644
--- a/src/app/lists/future-notifications/future-notifications.component.html
+++ b/src/app/lists/future-notifications/future-notifications.component.html
@@ -130,7 +130,7 @@
</tr>
</tbody>
</table>
- <loading-spinner *ngIf="showSpinner"></loading-spinner>
+ <app-loading-spinner *ngIf="showSpinner"></app-loading-spinner>
</div>
</div>
</div>
\ No newline at end of file
diff --git a/src/app/lists/future-notifications/future-notifications.component.spec.ts b/src/app/lists/future-notifications/future-notifications.component.spec.ts
index 2b71070..ac1afa9 100644
--- a/src/app/lists/future-notifications/future-notifications.component.spec.ts
+++ b/src/app/lists/future-notifications/future-notifications.component.spec.ts
@@ -66,8 +66,8 @@
StringToDatePipe,
FormattedDatePipe,
FormattedTimestampPipe,
- MockComponent({ selector: 'loading-spinner' }),
- MockComponent({ selector: 'app-sorting', inputs: ['columnName','initColumnName','isDesc', 'defaultState'] }),
+ MockComponent({ selector: 'app-loading-spinner' }),
+ MockComponent({ selector: 'app-sorting', inputs: ['columnName', 'initColumnName', 'isDesc', 'defaultState'] }),
MockComponent({ selector: 'input', inputs: ['options'] })
],
providers: [
diff --git a/src/app/lists/open-notifications/open-notifications.component.html b/src/app/lists/open-notifications/open-notifications.component.html
index 97dd8cc..ad01b0d 100644
--- a/src/app/lists/open-notifications/open-notifications.component.html
+++ b/src/app/lists/open-notifications/open-notifications.component.html
@@ -139,7 +139,7 @@
</tr>
</tbody>
</table>
- <loading-spinner *ngIf="showSpinner"></loading-spinner>
+ <app-loading-spinner *ngIf="showSpinner"></app-loading-spinner>
</div>
</div>
</div>
\ No newline at end of file
diff --git a/src/app/lists/open-notifications/open-notifications.component.spec.ts b/src/app/lists/open-notifications/open-notifications.component.spec.ts
index 2f4fc73..0ba4017 100644
--- a/src/app/lists/open-notifications/open-notifications.component.spec.ts
+++ b/src/app/lists/open-notifications/open-notifications.component.spec.ts
@@ -49,8 +49,8 @@
OpenNotificationsComponent,
StringToDatePipe,
FormattedTimestampPipe,
- MockComponent({ selector: 'loading-spinner' }),
- MockComponent({ selector: 'app-sorting', inputs: ['columnName','initColumnName','isDesc', 'defaultState']})
+ MockComponent({ selector: 'app-loading-spinner' }),
+ MockComponent({ selector: 'app-sorting', inputs: ['columnName', 'initColumnName', 'isDesc', 'defaultState']})
],
providers: [
diff --git a/src/app/lists/search-result-list/search-result-list.component.html b/src/app/lists/search-result-list/search-result-list.component.html
index d947a6f..cb3d5e8 100644
--- a/src/app/lists/search-result-list/search-result-list.component.html
+++ b/src/app/lists/search-result-list/search-result-list.component.html
@@ -95,7 +95,7 @@
</tr>
</tbody>
</table>
- <loading-spinner *ngIf="showSpinner"></loading-spinner>
+ <app-loading-spinner *ngIf="showSpinner"></app-loading-spinner>
</div>
</div>
</div>
diff --git a/src/app/lists/search-result-list/search-result-list.component.spec.ts b/src/app/lists/search-result-list/search-result-list.component.spec.ts
index 3834e87..6ab7638 100644
--- a/src/app/lists/search-result-list/search-result-list.component.spec.ts
+++ b/src/app/lists/search-result-list/search-result-list.component.spec.ts
@@ -65,7 +65,7 @@
StringToDatePipe,
FormattedTimestampPipe,
MockComponent({ selector: 'app-sorting', inputs: ['columnName', 'initColumnName', 'isDesc', 'defaultState'] }),
- MockComponent({ selector: 'loading-spinner' })
+ MockComponent({ selector: 'app-loading-spinner' })
],
providers: [
{ provide: ReminderService, useValue: mockService },
diff --git a/src/app/lists/search-result-list/search-result-list.component.ts b/src/app/lists/search-result-list/search-result-list.component.ts
index 0ff1abe..ec89f4a 100644
--- a/src/app/lists/search-result-list/search-result-list.component.ts
+++ b/src/app/lists/search-result-list/search-result-list.component.ts
@@ -23,10 +23,10 @@
@Input()
globalSearchFilter: GlobalSearchFilter;
oldNotification: Notification = null;
- incidentIdChange: boolean = true;
+ incidentIdChange = true;
- spinCtrl: boolean = false;
+ spinCtrl = false;
constructor(protected messageService: MessageService,
protected searchResultService: SearchResultService,
protected notificationService: NotificationService, protected reminderService: ReminderService,
@@ -67,19 +67,19 @@
}
isBranchGas(branchId: number): boolean {
- return this.sessionContext.getBranchClassById(branchId) == 'gas';
+ return this.sessionContext.getBranchClassById(branchId) === 'gas';
}
isBranchPower(branchId: number): boolean {
- return this.sessionContext.getBranchClassById(branchId) == 'power';
+ return this.sessionContext.getBranchClassById(branchId) === 'power';
}
isBranchWater(branchId: number): boolean {
- return this.sessionContext.getBranchClassById(branchId) == 'water';
+ return this.sessionContext.getBranchClassById(branchId) === 'water';
}
isBranchHeating(branchId: number): boolean {
- return this.sessionContext.getBranchClassById(branchId) == 'heating';
+ return this.sessionContext.getBranchClassById(branchId) === 'heating';
}
@@ -92,12 +92,10 @@
if (this.oldNotification == null) {
this.oldNotification = actualNotification;
this.incidentIdChange = false;
- }
- else if ( this.oldNotification.incidentId != actualNotification.incidentId) {
+ } else if ( this.oldNotification.incidentId !== actualNotification.incidentId) {
this.oldNotification = actualNotification;
this.incidentIdChange = true;
- }
- else {
+ } else {
this.incidentIdChange = false;
}
return this.incidentIdChange;
diff --git a/src/app/model/sorting-state.ts b/src/app/model/sorting-state.ts
index ab8666a..ed49827 100644
--- a/src/app/model/sorting-state.ts
+++ b/src/app/model/sorting-state.ts
@@ -1,6 +1,6 @@
export class SortingState {
column: string = '';
- counter: number = 0;
- defaultState: boolean = false;
- isDesc: boolean = false;
+ counter: number;
+ defaultState: boolean;
+ isDesc: boolean;
}
\ No newline at end of file
diff --git a/src/app/pages/overview/overview.component.spec.ts b/src/app/pages/overview/overview.component.spec.ts
index e4d2223..0c1dd93 100644
--- a/src/app/pages/overview/overview.component.spec.ts
+++ b/src/app/pages/overview/overview.component.spec.ts
@@ -129,7 +129,7 @@
'shiftChangeProtocolOpened', 'filterExpanded'] }),
MockComponent({ selector: 'input', inputs: ['options'] }),
MockComponent({
- selector: 'app-sorting', inputs: ['columnName','initColumnName','isDesc', 'defaultState']
+ selector: 'app-sorting', inputs: ['columnName', 'initColumnName', 'isDesc', 'defaultState']
}),
MockComponent({
selector: 'app-abstract-list', inputs: [
diff --git a/src/app/pages/overview/overview.component.ts b/src/app/pages/overview/overview.component.ts
index 4fef623..d0cb6f1 100644
--- a/src/app/pages/overview/overview.component.ts
+++ b/src/app/pages/overview/overview.component.ts
@@ -18,7 +18,7 @@
import { ResponsibilityService } from '../../services/responsibility.service';
import { FilterComponent } from '../../filter/filter.component';
-import { slideInOpacity } from '../../common/router.animations';
+import { slideInOpacity } from '../../common/router.animations';
@Component({
selector: 'app-overview',
diff --git a/src/app/pages/reminder/reminder.component.spec.ts b/src/app/pages/reminder/reminder.component.spec.ts
index 46ecc3e..2fd80da 100644
--- a/src/app/pages/reminder/reminder.component.spec.ts
+++ b/src/app/pages/reminder/reminder.component.spec.ts
@@ -49,7 +49,6 @@
let component: ReminderComponent;
let fixture: ComponentFixture<ReminderComponent>;
let router: Router;
- let spy: jasmine.Spy;
let mockNotificationService: MockNotificationService;
let mockReminderService: MockReminderService;
let mockRespService: MockResponsibilityService;
@@ -150,7 +149,7 @@
'filterExpanded'
]
}),
- MockComponent({ selector: 'loading-spinner' }),
+ MockComponent({ selector: 'app-loading-spinner' }),
MockComponent({ selector: 'app-entry' }),
MockComponent({ selector: 'input', inputs: ['options'] }),
MockComponent({
@@ -164,7 +163,7 @@
'responsiblitySelection']
}),
MockComponent({
- selector: 'app-sorting', inputs: ['columnName','initColumnName','isDesc', 'defaultState']
+ selector: 'app-sorting', inputs: ['columnName', 'initColumnName', 'isDesc', 'defaultState']
}),
MockComponent({
selector: 'app-autocomplete',
@@ -217,22 +216,6 @@
expect(component.user.id).toBe(correctUser.id);
}));
- // it('should should navigate to Overview after click at homebbutton', (() => {
- // //spy = spyOn(router, 'navigate');
- // spyOn(component, 'goToOverview').and.callThrough();
-
- // fixture.detectChanges();
-
-
- // fixture.whenStable().then(() => {
- // const button = fixture.debugElement.nativeElement.querySelector('button#homebutton');
- // button.click();
- // fixture.detectChanges();
- // expect(component.goToOverview).toHaveBeenCalled();
- // expect (router.navigate).toHaveBeenCalledWith(['/overview']);
- // });
- // }));
-
it('should open a dialog to edit a notification on button click', async(() => {
let entryOpend = false;
diff --git a/src/app/pages/search/search.component.spec.ts b/src/app/pages/search/search.component.spec.ts
index 138eb8d..c6e2fc6 100644
--- a/src/app/pages/search/search.component.spec.ts
+++ b/src/app/pages/search/search.component.spec.ts
@@ -61,7 +61,6 @@
let component: SearchComponent;
let fixture: ComponentFixture<SearchComponent>;
let router: Router;
- let spy: jasmine.Spy;
let mockNotificationService: MockNotificationService;
let mockNotificationSearchSortService: MockNotificationSearchSortService;
let mockSearchResultService: MockSearchResultService;
@@ -128,7 +127,7 @@
class MockSearchResultService extends AbstractMockObservableService {
//TODO
-
+
public getSearchResults(searchResultFilter?: GlobalSearchFilter) {
//const searchResultService = new SearchResultService();
@@ -144,7 +143,7 @@
}
beforeEach(async(() => {
- messageService = new MessageService();
+ messageService = new MessageService();
mockNotificationService = new MockNotificationService();
mockNotificationSearchSortService = new MockNotificationSearchSortService();
mockSearchResultService = new MockSearchResultService();
@@ -163,7 +162,7 @@
MdDialogModule,
MaterialModule.forRoot()],
declarations: [
- SearchComponent,
+ SearchComponent,
EntryComponent,
ShiftChangeProtocolComponent,
MainNavigationComponent,
@@ -175,25 +174,25 @@
selector: 'app-responsibility', inputs: [
'responsiblitySelection']
}),
- MockComponent({ selector: 'app-sorting', inputs: [ 'columnName', 'initColumnName', 'isDesc', 'defaultState' ]}),
+ MockComponent({ selector: 'app-sorting', inputs: ['columnName', 'initColumnName', 'isDesc', 'defaultState'] }),
MockComponent({ selector: 'input', inputs: ['options'] }),
- MockComponent({ selector: 'app-search', inputs: [ 'withCheckboxes', 'withEditButtons', 'isCollapsible' ] }),
+ MockComponent({ selector: 'app-search', inputs: ['withCheckboxes', 'withEditButtons', 'isCollapsible'] }),
MockComponent({ selector: 'app-autocomplete', inputs: ['responsibilityForwarding'], outputs: ['responsibilityForwarding'] }),
- MockComponent({ selector: 'loading-spinner' }),
+ MockComponent({ selector: 'app-loading-spinner' }),
MockComponent({
selector: 'app-abstract-list', inputs: [
'withCheckboxes', 'withEditButtons', 'isCollapsible', 'stayHidden']
}),
MockComponent({
- selector: 'app-finished-notifications', inputs: [ 'responsiblitySelection',
+ selector: 'app-finished-notifications', inputs: ['responsiblitySelection',
'withCheckboxes', 'withEditButtons', 'isCollapsible', 'stayHidden']
}),
MockComponent({
- selector: 'app-open-notifications', inputs: [ 'responsiblitySelection',
+ selector: 'app-open-notifications', inputs: ['responsiblitySelection',
'withCheckboxes', 'withEditButtons', 'isCollapsible', 'stayHidden']
}),
MockComponent({
- selector: 'app-future-notifications', inputs: [ 'responsiblitySelection',
+ selector: 'app-future-notifications', inputs: ['responsiblitySelection',
'withCheckboxes', 'withEditButtons', 'isCollapsible', 'stayHidden']
})
],
@@ -204,7 +203,7 @@
{ provide: OVERLAY_PROVIDERS, useClass: OVERLAY_PROVIDERS },
{ provide: DaterangepickerConfig, useClass: DaterangepickerConfig },
{ provide: NotificationService, useValue: mockNotificationService },
- { provide: NotificationSearchSortService, useValue: mockNotificationSearchSortService },
+ { provide: NotificationSearchSortService, useValue: mockNotificationSearchSortService },
{ provide: SearchResultService, useValue: mockSearchResultService },
{ provide: SessionContext, useClass: SessionContext },
{ provide: ReminderService, useClass: ReminderService },
@@ -218,7 +217,6 @@
beforeEach(() => {
fixture = TestBed.createComponent(SearchComponent);
component = fixture.componentInstance;
- //fixture.detectChanges();
sessionContext.clearStorage();
sessionContext.setCurrUser(USERS[0]);
component.sessionContext = sessionContext;
@@ -233,7 +231,6 @@
}));
it('should should navigate to Overview after click at homebbutton', (() => {
- //spy = spyOn(router, 'navigate');
//TODO
spyOn(component, 'goToOverview').and.callThrough();
@@ -249,10 +246,10 @@
}));
it('should navigate to overview on home-button click', () => {
- component.goToOverview();
+ component.goToOverview();
expect(routerStub.navigate).toHaveBeenCalledWith(['/overview']);
});
-
+
it('should open a dialog to view a notification on button click', async(() => {
let entryOpend = false;
@@ -299,7 +296,7 @@
fixture.whenStable().then(() => {
const button = fixture.debugElement.nativeElement.querySelector('button#deletesearch');
- button.click();
+ button.click();
fixture.detectChanges();
expect(component.globalSearchFilter.searchString).toBe('');
@@ -316,27 +313,27 @@
}));
-it('should execute fast search and store it in the session context', (() => {
- let dialog;
- const globalSearchFilter: GlobalSearchFilter = new GlobalSearchFilter();
- globalSearchFilter.searchString = 'a';
- globalSearchFilter.statusOpenSelection = true;
- globalSearchFilter.fastSearchSelected = true;
+ it('should execute fast search and store it in the session context', (() => {
+ let dialog;
+ const globalSearchFilter: GlobalSearchFilter = new GlobalSearchFilter();
+ globalSearchFilter.searchString = 'a';
+ globalSearchFilter.statusOpenSelection = true;
+ globalSearchFilter.fastSearchSelected = true;
- component.dialog.afterOpen.subscribe((value) => {
- dialog = value.componentInstance;
- spyOn(dialog, 'search');
+ component.dialog.afterOpen.subscribe((value) => {
+ dialog = value.componentInstance;
+ spyOn(dialog, 'search');
- });
+ });
- fixture.whenStable().then(() => {
- const button = fixture.debugElement.nativeElement.querySelector('button#search');
- button.click();
- fixture.detectChanges();
- expect(component.currentSearchFilter).toBe(true);
- expect(sessionContext.getGlobalSearchFilter().fastSearchSelected).toBe(true);
- });
-}));
+ fixture.whenStable().then(() => {
+ const button = fixture.debugElement.nativeElement.querySelector('button#search');
+ button.click();
+ fixture.detectChanges();
+ expect(component.currentSearchFilter).toBe(true);
+ expect(sessionContext.getGlobalSearchFilter().fastSearchSelected).toBe(true);
+ });
+ }));
it('should call search function after search button pressed', async(() => {
spyOn(component, 'search').and.callThrough();
@@ -355,7 +352,7 @@
currentSearchFilter.fastSearchSelected = false;
component.currentSearchFilter = currentSearchFilter;
let de: DebugElement;
-
+
de = fixture.debugElement.queryAll(By.css('form button:not(#deletesearch)'))[1];
//de.nativeElement.click();
click(de);
@@ -371,17 +368,17 @@
//console.log(buttons[1].nativeElement);
//buttons[1].nativeElement.click();
*/
-
- fixture.whenStable().then(() => {
- fixture.detectChanges();
- expect(component.search).toHaveBeenCalled();
- expect(component.sessionContext.getGlobalSearchFilter()).not.toBeNull();
- expect(component.sessionContext.getGlobalSearchFilter().searchString).toBe(currentSearchFilter.searchString);
-
- });
+
+ fixture.whenStable().then(() => {
+ fixture.detectChanges();
+ expect(component.search).toHaveBeenCalled();
+ expect(component.sessionContext.getGlobalSearchFilter()).not.toBeNull();
+ expect(component.sessionContext.getGlobalSearchFilter().searchString).toBe(currentSearchFilter.searchString);
+
});
-
+ });
+
//});
-
+
}));
});
