Alarm View column width and coloured by severity
Change-Id: I9e11efb5a6d42a9fda13a413023f4ddeb3ab0c5a
diff --git a/apps/faultmanagement/fm-gui2-lib/projects/fm-gui2-lib/src/lib/alarmdetails/alarmdetails.component.css b/apps/faultmanagement/fm-gui2-lib/projects/fm-gui2-lib/src/lib/alarmdetails/alarmdetails.component.css
index 6bbd5bb..97cfc46 100644
--- a/apps/faultmanagement/fm-gui2-lib/projects/fm-gui2-lib/src/lib/alarmdetails/alarmdetails.component.css
+++ b/apps/faultmanagement/fm-gui2-lib/projects/fm-gui2-lib/src/lib/alarmdetails/alarmdetails.component.css
@@ -65,3 +65,32 @@
text-align: right;
padding-right: 6px;
}
+
+
+@keyframes blinker {
+ 50% {
+ opacity: 0;
+ }
+}
+
+td.severity.CRITICAL {
+ background-color: #c72930;
+ color: white;
+ font-weight: bold;
+ animation: blinker 1s linear infinite;
+}
+
+td.severity.MAJOR {
+ background-color: #db7773;
+ color: white;
+ font-weight: bold;
+}
+
+td.severity.MINOR {
+ background-color: #007dc4;
+ color: white;
+}
+
+td.severity.WARNING {
+ background-color: #87d6f9;
+}
diff --git a/apps/faultmanagement/fm-gui2-lib/projects/fm-gui2-lib/src/lib/alarmdetails/alarmdetails.component.html b/apps/faultmanagement/fm-gui2-lib/projects/fm-gui2-lib/src/lib/alarmdetails/alarmdetails.component.html
index 72c1fb3..15e7ea4 100644
--- a/apps/faultmanagement/fm-gui2-lib/projects/fm-gui2-lib/src/lib/alarmdetails/alarmdetails.component.html
+++ b/apps/faultmanagement/fm-gui2-lib/projects/fm-gui2-lib/src/lib/alarmdetails/alarmdetails.component.html
@@ -56,7 +56,7 @@
</tr>
<tr>
<td class="label" width="110">Severity :</td>
- <td class="value" width="80">{{detailsData.alarmSeverity}}</td>
+ <td width="80" [ngClass]="[detailsData.alarmSeverity ? detailsData.alarmSeverity:'', 'severity', 'value']">{{detailsData.alarmSeverity}}</td>
</tr>
<hr>
<tr>
diff --git a/apps/faultmanagement/fm-gui2-lib/projects/fm-gui2-lib/src/lib/alarmtable/alarmtable.component.css b/apps/faultmanagement/fm-gui2-lib/projects/fm-gui2-lib/src/lib/alarmtable/alarmtable.component.css
index c7af5aa..2ec51bf 100644
--- a/apps/faultmanagement/fm-gui2-lib/projects/fm-gui2-lib/src/lib/alarmtable/alarmtable.component.css
+++ b/apps/faultmanagement/fm-gui2-lib/projects/fm-gui2-lib/src/lib/alarmtable/alarmtable.component.css
@@ -15,7 +15,63 @@
*/
/* css for alarm table view */
+#ov-alarm-table .tabular-header {
+ text-align: left;
+}
#ov-alarm-table h2 {
display: inline-block;
}
+
+#ov-alarm-table div.summary-list .table-header td {
+ font-weight: bold;
+ font-variant: small-caps;
+ text-transform: uppercase;
+ font-size: 10pt;
+ padding-top: 8px;
+ padding-bottom: 8px;
+ letter-spacing: 0.02em;
+ cursor: pointer;
+ background-color: #e5e5e6;
+ color: #3c3a3a;
+}
+
+#ov-alarm-table div.summary-list .table-body {
+ overflow:scroll;
+}
+
+#ov-alarm-table, div.ctrl-btns {
+}
+
+#ov-alarm-table th, td {
+ text-align: left;
+ padding: 8px;
+}
+
+@keyframes blinker {
+ 50% {
+ opacity: 0;
+ }
+}
+
+td.severity.CRITICAL {
+ background-color: #c72930;
+ color: white;
+ font-weight: bold;
+ animation: blinker 1s linear infinite;
+}
+
+td.severity.MAJOR {
+ background-color: #db7773;
+ color: white;
+ font-weight: bold;
+}
+
+td.severity.MINOR {
+ background-color: #007dc4;
+ color: white;
+}
+
+td.severity.WARNING {
+ background-color: #87d6f9;
+}
diff --git a/apps/faultmanagement/fm-gui2-lib/projects/fm-gui2-lib/src/lib/alarmtable/alarmtable.component.html b/apps/faultmanagement/fm-gui2-lib/projects/fm-gui2-lib/src/lib/alarmtable/alarmtable.component.html
index 42add2b..da4ad92 100644
--- a/apps/faultmanagement/fm-gui2-lib/projects/fm-gui2-lib/src/lib/alarmtable/alarmtable.component.html
+++ b/apps/faultmanagement/fm-gui2-lib/projects/fm-gui2-lib/src/lib/alarmtable/alarmtable.component.html
@@ -14,16 +14,18 @@
~ limitations under the License.
-->
<div id="ov-alarm-table">
- <onos-loading [theme]="'light'" [running]="loadingIconShown"></onos-loading>
- <div class="tabular-header">
- <h2>Alarms for {{ "all devices."}} ({{ tableData.length }} total)</h2>
+ <onos-loading [theme]="'light'" [running]="loadingIconShown"></onos-loading>
+ <div class="tabular-header">
+ <h2>Alarms for {{ devId ? devId : "all devices" }} ({{ tableData.length }} total)</h2>
<div class="ctrl-btns">
<div class="refresh" (click)="toggleRefresh()">
<!-- See icon.theme.css for the defintions of the classes active and refresh-->
- <onos-icon classes="{{ autoRefresh?'active refresh':'refresh' }}" iconId="refresh" iconSize="36" toolTip="{{ autoRefreshTip }}"></onos-icon>
+ <onos-icon classes="{{ autoRefresh?'active refresh':'refresh' }}"
+ iconId="refresh" iconSize="36"
+ toolTip="{{ autoRefreshTip }}"></onos-icon>
</div>
- <!--div class="separator"></div>
- <div (click)="(!!selId) ? confirmAction(AlarmActionEnum.ACKNOWLEDGE) : ''">
+ <div class="separator"></div>
+ <!--div (click)="(!!selId) ? confirmAction(AlarmActionEnum.ACKNOWLEDGE) : ''">
<onos-icon classes="{{ ctrlBtnState.acknowledged?'active-rect play':'play' }}"
iconId="play" iconSize="42" toolTip="{{ acknowledgeTip }}"></onos-icon>
</div>
@@ -35,30 +37,38 @@
</div>
<div class="summary-list" class="summary-list" onosTableResize>
-
<div class="table-header">
<table>
<tr>
- <td colId="alarmId" (click)="onSort('id')">Id
- <onos-icon classes="active-sort" [iconSize]="10" [iconId]="sortIcon('id')"></onos-icon>
+ <td colId="alarmId" (click)="onSort('id')">Alarm Id
+ <onos-icon classes="active-sort" [iconSize]="10"
+ [iconId]="sortIcon('id')"></onos-icon>
</td>
<td colId="alarmDeviceId" (click)="onSort('alarmDeviceId')">Device
- <onos-icon classes="active-sort" [iconSize]="10" [iconId]="sortIcon('alarmDeviceId')"></onos-icon>
+ <onos-icon classes="active-sort" [iconSize]="10"
+ [iconId]="sortIcon('alarmDeviceId')"></onos-icon>
</td>
<td colId="alarmDesc" (click)="onSort('alarmDesc')">Description
- <onos-icon classes="active-sort" [iconSize]="10" [iconId]="sortIcon('alarmDesc')"></onos-icon>
+ <onos-icon classes="active-sort" [iconSize]="10"
+ [iconId]="sortIcon('alarmDesc')"></onos-icon>
</td>
<td colId="alarmSource" (click)="onSort('alarmSource')">Source
- <onos-icon classes="active-sort" [iconSize]="10" [iconId]="sortIcon('alarmSource')"></onos-icon>
+ <onos-icon classes="active-sort" [iconSize]="10"
+ [iconId]="sortIcon('alarmSource')"></onos-icon>
</td>
- <td colId="alarmTimeRaised" (click)="onSort('alarmTimeRaised')">Time Raised
- <onos-icon classes="active-sort" [iconSize]="10" [iconId]="sortIcon('alarmTimeRaised')"></onos-icon>
+ <td colId="alarmTimeRaised" (click)="onSort('alarmTimeRaised')">Time
+ Raised
+ <onos-icon classes="active-sort" [iconSize]="10"
+ [iconId]="sortIcon('alarmTimeRaised')"></onos-icon>
</td>
<td colId="alarmSeverity" (click)="onSort('alarmSeverity')">Severity
- <onos-icon classes="active-sort" [iconSize]="10" [iconId]="sortIcon('alarmSeverity')"></onos-icon>
+ <onos-icon classes="active-sort" [iconSize]="10"
+ [iconId]="sortIcon('alarmSeverity')"></onos-icon>
</td>
- <td colId="alarmAcknowledged" (click)="onSort('alarmAcknowledged')">Acknowledged
- <onos-icon classes="active-sort" [iconSize]="10" [iconId]="sortIcon('alarmAcknowledged')"></onos-icon>
+ <td colId="alarmAcknowledged" class="table-icon"
+ (click)="onSort('alarmAcknowledged')">Ack
+ <onos-icon classes="active-sort" [iconSize]="10"
+ [iconId]="sortIcon('alarmAcknowledged')"></onos-icon>
</td>
</tr>
</table>
@@ -69,13 +79,15 @@
<tr class="table-body" *ngIf="tableData.length === 0" class="no-data">
<td colspan="9">{{ annots.noRowsMsg }}</td>
</tr>
- <tr *ngFor="let item of tableData | filter : tableDataFilter" (click)="selectCallback($event, item)" [ngClass]="{selected: item.id === selId, 'data-change': isChanged(item.id)}">
+ <tr *ngFor="let item of tableData | filter : tableDataFilter"
+ (click)="selectCallback($event, item)"
+ [ngClass]="{selected: item.id === selId, 'data-change': isChanged(item.id)}">
<td>{{ item.id }}</td>
<td>{{ item.alarmDeviceId }}</td>
<td>{{ item.alarmDesc }}</td>
<td>{{ item.alarmSource }}</td>
<td>{{ item.alarmTimeRaised }}</td>
- <td>{{ item.alarmSeverity }}</td>
+ <td [ngClass]="[item.alarmSeverity, 'severity']">{{ item.alarmSeverity }}</td>
<td class="table-icon">
<onos-icon [iconId]="ackIcon(item.alarmAcknowledged)"></onos-icon>
</td>
@@ -84,5 +96,6 @@
</div>
</div>
- <onos-alarmdetails class="floatpanels" id="{{ selId }}" (closeEvent)="deselectRow($event)"></onos-alarmdetails>
+ <onos-alarmdetails class="floatpanels" id="{{ selId }}"
+ (closeEvent)="deselectRow($event)"></onos-alarmdetails>
</div>