[OK-370] Renamings.
diff --git a/src/app/lists/search-result-list/search-result-list.component.css b/src/app/lists/search-result-list/search-result-list.component.css
index a16d575..75ce308 100644
--- a/src/app/lists/search-result-list/search-result-list.component.css
+++ b/src/app/lists/search-result-list/search-result-list.component.css
@@ -32,8 +32,8 @@
}
-.sameIncident-td {
+.incident-id-change {
border-top-width: 1px;
border-top-color: #26425E;
- border-top-style: solid;
+ border-top-style: solid;
}
\ No newline at end of file
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 9f80711..cf0b86b 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
@@ -50,47 +50,47 @@
<td colspan="9" style="padding:0px;" border=3>
<table style="width:100%">
<tbody>
- <tr [ngClass]="{'sameIncident' : isSameIncidentId(notification)}">
- <td *ngIf="withCheckboxes" class="notification-check-col" [ngClass]="{'sameIncident-td' : !sameIncidentId}">
+ <tr [ngClass]="{'sameIncident' : isIncidentIdChange(notification)}">
+ <td *ngIf="withCheckboxes" class="notification-check-col" [ngClass]="{'incident-id-change' : incidentIdChange}">
<input type="checkbox" [(ngModel)]="notification.selected" (change)="selectionChanged()">
</td>
- <td class="search-result-tab-first-col" [ngClass]="{'sameIncident-td' : !sameIncidentId}">{{ notification.beginDate | formattedTimestamp: 'DD.MM.YYYY HH:mm' }}
+ <td class="search-result-tab-first-col" [ngClass]="{'incident-id-change' : incidentIdChange}">{{ notification.beginDate | formattedTimestamp: 'DD.MM.YYYY HH:mm' }}
</td>
- <td class="search-result-tab-version-col" [ngClass]="{'sameIncident-td' : !sameIncidentId}">{{notification.version}}</td>
- <td class="notification-tab-branch" [ngClass]="{'sameIncident-td' : !sameIncidentId,
+ <td class="search-result-tab-version-col" [ngClass]="{'incident-id-change' : incidentIdChange}">{{notification.version}}</td>
+ <td class="notification-tab-branch" [ngClass]="{'incident-id-change' : incidentIdChange,
'gas' : isBranchGas(notification.fkRefBranch), 'power' : isBranchPower(notification.fkRefBranch),
'water' : isBranchWater(notification.fkRefBranch), 'heating' : isBranchHeating(notification.fkRefBranch)}">
<span>
{{ sessionContext.getBrancheById(notification.fkRefBranch)?.name }}
</span>
</td>
- <td class="notification-tab-grid-territory" [ngClass]="{'sameIncident-td' : !sameIncidentId}">
+ <td class="notification-tab-grid-territory" [ngClass]="{'incident-id-change' : incidentIdChange}">
<span>
{{ sessionContext.getGridTerritoryById(notification.fkRefGridTerritory)?.name }}
</span>
</td>
- <td class="notification-tab-description" [ngClass]="{'sameIncident-td' : !sameIncidentId}" data-toggle="tooltip" [attr.data-original-title]="notification.notificationText"
+ <td class="notification-tab-description" [ngClass]="{'incident-id-change' : incidentIdChange}" data-toggle="tooltip" [attr.data-original-title]="notification.notificationText"
style="overflow:hidden;text-overflow: ellipsis;">
<span>
{{ notification.notificationText }}
</span>
</td>
- <td class="notification-tab-status" [ngClass]="{'finished' : isStatusClassFinished(notification.fkRefNotificationStatus), 'sameIncident-td' : !sameIncidentId}">
+ <td class="notification-tab-status" [ngClass]="{'finished' : isStatusClassFinished(notification.fkRefNotificationStatus), 'incident-id-change' : incidentIdChange}">
<span>
{{ sessionContext.getStatusById(notification.fkRefNotificationStatus)?.name }}
</span>
</td>
- <td class="notification-tab-moduser" [ngClass]="{'sameIncident-td' : !sameIncidentId}">
+ <td class="notification-tab-moduser" [ngClass]="{'incident-id-change' : incidentIdChange}">
<span>
{{ notification.responsibilityControlPoint }}
</span>
</td>
- <td class="notification-tab-responsibility-forwarding" [ngClass]="{'sameIncident-td' : !sameIncidentId}">
+ <td class="notification-tab-responsibility-forwarding" [ngClass]="{'incident-id-change' : incidentIdChange}">
<span>
{{ notification.responsibilityForwarding }}
</span>
</td>
- <td class="notification-tab-edit-buttons" [ngClass]="{'sameIncident-td' : !sameIncidentId}" >
+ <td class="notification-tab-edit-buttons" [ngClass]="{'incident-id-change' : incidentIdChange}" >
<button type="button" class="btn btn-default btn-sm" (click)="lookUpNotification(notification)">
<span class="glyphicon glyphicon-eye-open"></span>
</button>
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 91d0077..0adc5d0 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
@@ -22,9 +22,9 @@
@Input()
globalSearchFilter: GlobalSearchFilter;
oldNotification: Notification = null;
- sameIncidentId: boolean = false;
+ incidentIdChange: boolean = true;
-
+
spinCtrl: boolean = false;
constructor(protected messageService: MessageService,
protected searchResultService: SearchResultService,
@@ -81,14 +81,14 @@
return this.sessionContext.getBranchClassById(branchId) == 'heating';
}
- isSameIncidentId(actualNotification: Notification): boolean {
+ isIncidentIdChange(actualNotification: Notification): boolean {
if (this.oldNotification == null || this.oldNotification == undefined || this.oldNotification.incidentId != actualNotification.incidentId) {
this.oldNotification = actualNotification;
- this.sameIncidentId = false;
+ this.incidentIdChange = true;
}
else {
- this.sameIncidentId = true;
+ this.incidentIdChange = false;
}
- return this.sameIncidentId;
+ return this.incidentIdChange;
}
}
