diff --git a/client/ticket/src/index/style.scss b/client/ticket/src/index/style.scss index eaef18b00..4583a1378 100644 --- a/client/ticket/src/index/style.scss +++ b/client/ticket/src/index/style.scss @@ -11,18 +11,30 @@ vn-ticket-index{ } .alert1 { - background-color: $main-01-03 + background-color: $main-01-03; + &:hover { + background-color: $main-01-05; + } } .alertOk { - background-color: $main-02-03 + background-color: $main-02-03; + &:hover { + background-color: $main-02-05; + } } .alertFree { - background-color: $main-03-03 + background-color: $main-03-03; + &:hover { + background-color: $main-03-05; + } } .alert0 { - background-color: $alert-01-03 + background-color: $alert-01-03; + &:hover { + background-color: $alert-01-05; + } } } \ No newline at end of file diff --git a/client/ticket/src/search-panel/index.html b/client/ticket/src/search-panel/index.html index d1492ba1c..f3de42631 100644 --- a/client/ticket/src/search-panel/index.html +++ b/client/ticket/src/search-panel/index.html @@ -85,6 +85,14 @@ + + { arg: 'orderFk', type: 'Number', description: `The order id filter` + }, { + arg: 'alertLevel', + type: 'Number', + description: `The alert level of the tickets` } ], returns: { @@ -132,6 +136,8 @@ module.exports = Self => { return {'ts.stateFk': value}; case 'myTeam': return {'c.salesPersonFk': {inq: teamIds}}; + case 'alertLevel': + return {'ts.alertLevel': value}; case 'id': case 'clientFk': case 'agencyModeFk': diff --git a/services/loopback/common/models/alert-level.json b/services/loopback/common/models/alert-level.json new file mode 100644 index 000000000..75b5a9c46 --- /dev/null +++ b/services/loopback/common/models/alert-level.json @@ -0,0 +1,29 @@ +{ + "name": "AlertLevel", + "description": "Alert levels of a ticket", + "base": "VnModel", + "options": { + "mysql": { + "table": "alertLevel" + } + }, + "properties": { + "code": { + "type": "String", + "id": true, + "description": "Identifier" + }, + "alertLevel": { + "type": "Number", + "id": true + } + }, + "acls": [ + { + "accessType": "READ", + "principalType": "ROLE", + "principalId": "$everyone", + "permission": "ALLOW" + } + ] + } \ No newline at end of file