verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

#919 ticket.index

This commit is contained in:
Gerard 2018-12-21 07:53:04 +01:00
parent b84d94e3a4
commit b5e864d88e
8 changed files with 47 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/client/src/web-payment/style.scss
View File

@ -2,7 +2,7 @@
vn-client-web-payment {
vn-icon[icon=clear] {
color: $alert01;
color: $alert-01;
}
vn-icon[icon=check] {
color: $main-02;

4
client/core/src/components/table/style.scss
View File

@ -106,14 +106,14 @@ vn-table {
&.clickable {
@extend %clickable;
}
&.success {
&.success, & > vn-td.success {
background-color: rgba(163, 209, 49, 0.3);
&:hover {
background-color: rgba(163, 209, 49, 0.5);
}
}
&.warning {
&.warning, & > vn-td.warning {
background-color: rgba(247, 147, 30, 0.3);
&:hover {

4
client/salix/src/styles/colors.scss
View File

@ -14,7 +14,9 @@ $main-03: #32b1ce;
$main-03-05: rgba($main-03, 0.5);
$main-03-03: rgba($main-03, 0.3);
$lines: #9b9b9b;
$alert01: #f42121;
$alert-01: #f42121;
$alert-01-03: rgba($alert-01, 0.5);
$alert-01-05: rgba($alert-01, 0.5);
$color-green: #a3d131;
$color-orange: #f7931e;

4
client/salix/src/styles/font-style.scss
View File

@ -9,8 +9,10 @@ html [uppercase], .uppercase {
text-transform: uppercase;
}
html [green], .green{color: $color-green}
html [orange], .orange{color: $main-01}
html [green], .green{color: $main-02}
html [blue], .blue{color: $main-03}
html [red], html [alert], .red, .alert {color: $alert-01}
html [white], .white{color: $color-white}
html [dark], .dark{color: $color-dark}
html [dark-grey], .dark-grey{color: $color-dark-grey}

10
client/ticket/src/index/index.html
View File

@ -50,9 +50,7 @@
</vn-tr>
</vn-thead>
<vn-tbody>
<a
ng-repeat="ticket in tickets"
class="{{::$ctrl.compareDate(ticket.shipped)}} clickable vn-tr"
<a ng-repeat="ticket in tickets" class="clickable vn-tr"
ui-sref="ticket.card.summary({id: {{::ticket.id}}})">
<vn-td>
<vn-icon ng-show="ticket.problem" class="bright"
@ -62,7 +60,9 @@
</vn-td>
<vn-td number>{{::ticket.id}}</vn-td>
<vn-td>{{::ticket.salesPerson | dashIfEmpty}}</vn-td>
<vn-td>{{::ticket.shipped | dateTime: 'dd/MM/yyyy'}}</vn-td>
<vn-td class="{{$ctrl.compareDate(ticket.shipped)}}">
{{::ticket.shipped | dateTime: 'dd/MM/yyyy'}}
</vn-td>
<vn-td>{{::ticket.shipped | dateTime: 'HH:mm'}}</vn-td>
<vn-td>
<span
@ -72,7 +72,7 @@
</span>
</vn-td>
<vn-td>{{::ticket.province}}</vn-td>
<vn-td>{{::ticket.state}}</vn-td>
<vn-td class="{{$ctrl.stateColor(ticket)}}">{{::ticket.state}}</vn-td>
<vn-td>{{::ticket.agencyMode}}</vn-td>
<vn-td>{{::ticket.warehouse}}</vn-td>
<vn-td number>{{::ticket.refFk | dashIfEmpty}}</vn-td>

11
client/ticket/src/index/index.js
View File

@ -58,6 +58,17 @@ export default class Controller {
return 'success';
}
stateColor(ticket) {
if (ticket.alertLevelCode === 'OK')
return 'alertOk';
else if (ticket.alertLevelCode === 'FREE')
return 'alertFree';
else if (ticket.alertLevel === 1)
return 'alert1';
else if (ticket.alertLevel === 0)
return 'alert0';
}
showDescriptor(event, clientFk) {
event.preventDefault();
event.stopImmediatePropagation();

16
client/ticket/src/index/style.scss
View File

@ -9,4 +9,20 @@ vn-ticket-index{
color: initial;
}
}
.alert1 {
background-color: $main-01-03
}
.alertOk {
background-color: $main-02-03
}
.alertFree {
background-color: $main-03-03
}
.alert0 {
background-color: $alert-01-03
}
}

5
services/loopback/common/methods/ticket/filter.js
View File

@ -164,7 +164,10 @@ module.exports = Self => {
w.name AS warehouse,
am.name AS agencyMode,
st.name AS state,
wk.name AS salesPerson
wk.name AS salesPerson,
ts.stateFk as stateFk,
ts.alertLevel as alertLevel,
ts.code as alertLevelCode
FROM ticket t
LEFT JOIN address a ON a.id = t.addressFk
LEFT JOIN province p ON p.id = a.provinceFk