using constants for Attribute status values.
This commit is contained in:
@@ -354,7 +354,7 @@
|
|||||||
<div class="flex-shrink-0 w-2 h-2 mr-3 rounded-full"
|
<div class="flex-shrink-0 w-2 h-2 mr-3 rounded-full"
|
||||||
[ngClass]="{'bg-red': getAttributeScrutinyStatusName(attribute.status) === 'failed',
|
[ngClass]="{'bg-red': getAttributeScrutinyStatusName(attribute.status) === 'failed',
|
||||||
'bg-green': getAttributeScrutinyStatusName(attribute.status) === 'passed',
|
'bg-green': getAttributeScrutinyStatusName(attribute.status) === 'passed',
|
||||||
'bg-yellow': getAttributeStatusName(attribute.status) === 'warn'}"></div>
|
'bg-yellow': getAttributeScrutinyStatusName(attribute.status) === 'warn'}"></div>
|
||||||
<div class="truncate">Scrutiny</div>
|
<div class="truncate">Scrutiny</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="w-1/4 items-center font-medium">{{getAttributeValue(attribute)}}</div>
|
<div class="w-1/4 items-center font-medium">{{getAttributeValue(attribute)}}</div>
|
||||||
|
|||||||
@@ -13,6 +13,13 @@ import {TreoConfigService} from "../../../@treo/services/config";
|
|||||||
import {AppConfig} from "../../core/config/app.config";
|
import {AppConfig} from "../../core/config/app.config";
|
||||||
import {animate, state, style, transition, trigger} from '@angular/animations';
|
import {animate, state, style, transition, trigger} from '@angular/animations';
|
||||||
|
|
||||||
|
// from Constants.go - these must match
|
||||||
|
const AttributeStatusPassed = 0
|
||||||
|
const AttributeStatusFailedSmart = 1
|
||||||
|
const AttributeStatusWarningScrutiny = 2
|
||||||
|
const AttributeStatusFailedScrutiny = 4
|
||||||
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'detail',
|
selector: 'detail',
|
||||||
templateUrl: './detail.component.html',
|
templateUrl: './detail.component.html',
|
||||||
@@ -42,7 +49,6 @@ export class DetailComponent implements OnInit, AfterViewInit, OnDestroy {
|
|||||||
smartAttributeDataSource: MatTableDataSource<any>;
|
smartAttributeDataSource: MatTableDataSource<any>;
|
||||||
smartAttributeTableColumns: string[];
|
smartAttributeTableColumns: string[];
|
||||||
|
|
||||||
|
|
||||||
@ViewChild('smartAttributeTable', {read: MatSort})
|
@ViewChild('smartAttributeTable', {read: MatSort})
|
||||||
smartAttributeTableMatSort: MatSort;
|
smartAttributeTableMatSort: MatSort;
|
||||||
|
|
||||||
@@ -130,21 +136,16 @@ export class DetailComponent implements OnInit, AfterViewInit, OnDestroy {
|
|||||||
// -----------------------------------------------------------------------------------------------------
|
// -----------------------------------------------------------------------------------------------------
|
||||||
// @ Private methods
|
// @ Private methods
|
||||||
// -----------------------------------------------------------------------------------------------------
|
// -----------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
getAttributeStatusName(attributeStatus: number): string {
|
getAttributeStatusName(attributeStatus: number): string {
|
||||||
// tslint:disable:no-bitwise
|
// tslint:disable:no-bitwise
|
||||||
|
|
||||||
// from Constants.go
|
if(attributeStatus === AttributeStatusPassed){
|
||||||
// AttributeStatusPassed AttributeStatus = 0
|
|
||||||
// AttributeStatusFailedSmart AttributeStatus = 1
|
|
||||||
// AttributeStatusWarningScrutiny AttributeStatus = 2
|
|
||||||
// AttributeStatusFailedScrutiny AttributeStatus = 4
|
|
||||||
|
|
||||||
if(attributeStatus === 0){
|
|
||||||
return 'passed'
|
return 'passed'
|
||||||
|
|
||||||
} else if ((attributeStatus & 1) !== 0 || (attributeStatus & 4) !== 0 ){
|
} else if ((attributeStatus & AttributeStatusFailedScrutiny) !== 0 || (attributeStatus & AttributeStatusFailedSmart) !== 0 ){
|
||||||
return 'failed'
|
return 'failed'
|
||||||
} else if ((attributeStatus & 2) !== 0){
|
} else if ((attributeStatus & AttributeStatusWarningScrutiny) !== 0){
|
||||||
return 'warn'
|
return 'warn'
|
||||||
}
|
}
|
||||||
return ''
|
return ''
|
||||||
@@ -152,9 +153,9 @@ export class DetailComponent implements OnInit, AfterViewInit, OnDestroy {
|
|||||||
}
|
}
|
||||||
getAttributeScrutinyStatusName(attributeStatus: number): string {
|
getAttributeScrutinyStatusName(attributeStatus: number): string {
|
||||||
// tslint:disable:no-bitwise
|
// tslint:disable:no-bitwise
|
||||||
if ((attributeStatus & 4) !== 0){
|
if ((attributeStatus & AttributeStatusFailedScrutiny) !== 0){
|
||||||
return 'failed'
|
return 'failed'
|
||||||
} else if ((attributeStatus & 2) !== 0){
|
} else if ((attributeStatus & AttributeStatusWarningScrutiny) !== 0){
|
||||||
return 'warn'
|
return 'warn'
|
||||||
} else {
|
} else {
|
||||||
return 'passed'
|
return 'passed'
|
||||||
@@ -164,7 +165,7 @@ export class DetailComponent implements OnInit, AfterViewInit, OnDestroy {
|
|||||||
|
|
||||||
getAttributeSmartStatusName(attributeStatus: number): string {
|
getAttributeSmartStatusName(attributeStatus: number): string {
|
||||||
// tslint:disable:no-bitwise
|
// tslint:disable:no-bitwise
|
||||||
if ((attributeStatus & 1) !== 0){
|
if ((attributeStatus & AttributeStatusFailedSmart) !== 0){
|
||||||
return 'failed'
|
return 'failed'
|
||||||
} else {
|
} else {
|
||||||
return 'passed'
|
return 'passed'
|
||||||
|
|||||||
Reference in New Issue
Block a user