diff --git a/webapp/frontend/src/app/modules/detail/detail.component.html b/webapp/frontend/src/app/modules/detail/detail.component.html index 67ccc8e..861f34f 100644 --- a/webapp/frontend/src/app/modules/detail/detail.component.html +++ b/webapp/frontend/src/app/modules/detail/detail.component.html @@ -329,17 +329,62 @@ + + +
-
-
{{getAttributeName(attribute)}}
-
{{getAttributeName(attribute)}}
-
{{getAttributeName(attribute)}}
-
{{getAttributeName(attribute)}}
+ +
+
+ {{getAttributeDescription(attribute)}} +
-
- {{getAttributeDescription(attribute)}} - -- Wikipedia +
+
+
+
Type
+
Value
+
Worst/Thresh
+
Failure
+
+ +
+
+
+
Scrutiny
+
+
{{getAttributeValue(attribute)}}
+
--
+
{{(attribute.failure_rate | percent) || '--'}}
+
+ +
+
+
+
Normalized
+
+
{{attribute.value}}
+
{{getAttributeWorst(attribute) || '--' }}/{{getAttributeThreshold(attribute)}}
+
--
+
+ +
+
+
+
Raw
+
+
{{attribute.raw_value}}
+
--
+
--
+
+
diff --git a/webapp/frontend/src/app/modules/detail/detail.component.scss b/webapp/frontend/src/app/modules/detail/detail.component.scss index 947b793..89b9136 100644 --- a/webapp/frontend/src/app/modules/detail/detail.component.scss +++ b/webapp/frontend/src/app/modules/detail/detail.component.scss @@ -31,13 +31,13 @@ tr.attribute-detail-row { height: 0; } -tr.attribute-row:not(.attribute-expanded-row):hover { - @if ($is-dark) { - background: rgba(0, 0, 0, 0.05); - } @else { - background: map-get($primary, 50); - } -} +//tr.attribute-row:not(.attribute-expanded-row):hover { +// @if ($is-dark) { +// background: rgba(0, 0, 0, 0.05); +// } @else { +// background: map-get($primary, 50); +// } +//} tr.attribute-row:not(.attribute-expanded-row):active { background: #efefef; diff --git a/webapp/frontend/src/app/modules/detail/detail.component.ts b/webapp/frontend/src/app/modules/detail/detail.component.ts index 048ab0c..f52e495 100644 --- a/webapp/frontend/src/app/modules/detail/detail.component.ts +++ b/webapp/frontend/src/app/modules/detail/detail.component.ts @@ -150,6 +150,28 @@ export class DetailComponent implements OnInit, AfterViewInit, OnDestroy { return '' // tslint:enable:no-bitwise } + getAttributeScrutinyStatusName(attributeStatus: number): string { + // tslint:disable:no-bitwise + if ((attributeStatus & 4) !== 0){ + return 'failed' + } else if ((attributeStatus & 2) !== 0){ + return 'warn' + } else { + return 'passed' + } + // tslint:enable:no-bitwise + } + + getAttributeSmartStatusName(attributeStatus: number): string { + // tslint:disable:no-bitwise + if ((attributeStatus & 1) !== 0){ + return 'failed' + } else { + return 'passed' + } + // tslint:enable:no-bitwise + } + getAttributeName(attribute_data): string { let attribute_metadata = this.metadata[attribute_data.attribute_id] @@ -279,7 +301,7 @@ export class DetailComponent implements OnInit, AfterViewInit, OnDestroy { } else { //ATA attributes = latest_smart_result.attrs - this.smartAttributeTableColumns = ['status', 'id', 'name', 'value', 'worst', 'thresh','ideal', 'failure', 'history']; + this.smartAttributeTableColumns = ['status', 'id', 'name', 'value', 'thresh','ideal', 'failure', 'history']; } for(const attrId in attributes){