From 3d4fc9c18ef589fccaaa1b86095fa6a1b2ce43c3 Mon Sep 17 00:00:00 2001
From: Joan Sanchez <joan@verdnatura.es>
Date: Mon, 23 Dec 2019 08:05:58 +0100
Subject: [PATCH] #1963 Entry & zone style changes

---
 e2e/helpers/selectors.js                      |  2 +-
 front/core/components/chip/style.scss         | 19 ++++++++++-
 modules/agency/front/location/style.scss      | 13 +++++---
 modules/item/front/last-entries/index.html    | 32 +++++++++----------
 .../ticket/specs/deleteStowaway.spec.js       |  2 +-
 5 files changed, 45 insertions(+), 23 deletions(-)

diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js
index d752b265fa..bb23c9d963 100644
--- a/e2e/helpers/selectors.js
+++ b/e2e/helpers/selectors.js
@@ -360,7 +360,7 @@ export default {
         goBackToModuleIndexButton: 'vn-ticket-descriptor a[ui-sref="ticket.index"]',
         moreMenu: 'vn-ticket-descriptor vn-icon-menu[icon=more_vert]',
         moreMenuAddStowaway: '.vn-drop-down.shown li[name="Add stowaway"]',
-        moreMenuDeleteStowawayButton: '.vn-drop-down.shown li[name="Remove stowaway"]',
+        moreMenuDeleteStowawayButton: '.vn-drop-down.shown li[name="Delete stowaway"]',
         moreMenuAddToTurn: '.vn-drop-down.shown li[name="Add turn"]',
         moreMenuDeleteTicket: '.vn-drop-down.shown li[name="Delete ticket"]',
         moreMenuMakeInvoice: '.vn-drop-down.shown li[name="Make invoice"]',
diff --git a/front/core/components/chip/style.scss b/front/core/components/chip/style.scss
index 5840ecdf18..3778c62b95 100644
--- a/front/core/components/chip/style.scss
+++ b/front/core/components/chip/style.scss
@@ -14,8 +14,25 @@ vn-chip {
 
     &.colored {
         background-color: $color-main;
-        color: $color-font-dark;
+        color: $color-font-bg;
     }
+    &.notice {
+        background-color: $color-notice-medium
+    }
+    &.success {
+        background-color: $color-success-medium;
+    }
+    &.warning {
+        background-color: $color-main-medium;
+    }
+    &.alert {
+        background-color: $color-alert-medium;
+    }
+    &.message {
+        color: $color-font-dark;
+        background-color: $color-bg-dark
+    }
+
     & > div {
         display: flex;
         align-items: center;
diff --git a/modules/agency/front/location/style.scss b/modules/agency/front/location/style.scss
index 4972a5d293..2316a26225 100644
--- a/modules/agency/front/location/style.scss
+++ b/modules/agency/front/location/style.scss
@@ -1,14 +1,19 @@
 @import "variables";
 
 vn-treeview-child {
-    .content > .vn-check:not(.indeterminate) {
-        color: $color-button;
+    .content > .vn-check:not(.indeterminate):not(.checked) {
+        color: $color-alert;
 
         & > .btn {
-            border-color: $color-button;
+            border-color: $color-alert;
         }
     }
     .content > .vn-check.checked {
-        color: $color-button;
+        color: $color-notice;
+
+        & > .btn {
+            background-color: $color-notice;
+            border-color: $color-notice
+        }
     }
 }
\ No newline at end of file
diff --git a/modules/item/front/last-entries/index.html b/modules/item/front/last-entries/index.html
index a7046e17bd..28ba9989bc 100644
--- a/modules/item/front/last-entries/index.html
+++ b/modules/item/front/last-entries/index.html
@@ -43,27 +43,27 @@
                                 disabled="true">
                             </vn-check>
                         </vn-td>
-                        <vn-td>{{entry.warehouse| dashIfEmpty}}</vn-td>
-                        <vn-td>{{entry.landed | date:'dd/MM/yyyy HH:mm'}}</vn-td>
-                        <vn-td number>{{entry.entryFk | dashIfEmpty}}</vn-td>
-                        <vn-td number>{{entry.price2 | dashIfEmpty}}</vn-td>
-                        <vn-td number>{{entry.price3 | dashIfEmpty}}</vn-td>
+                        <vn-td>{{::entry.warehouse| dashIfEmpty}}</vn-td>
+                        <vn-td>{{::entry.landed | date:'dd/MM/yyyy HH:mm'}}</vn-td>
+                        <vn-td number>{{::entry.entryFk | dashIfEmpty}}</vn-td>
+                        <vn-td number>{{::entry.price2 | dashIfEmpty}}</vn-td>
+                        <vn-td number>{{::entry.price3 | dashIfEmpty}}</vn-td>
                         <vn-td number class="expendable">{{entry.stickers | dashIfEmpty}}</vn-td>
                         <vn-td number>
-                            <span class="chip" ng-class="{counter: entry.groupingMode == 2}">
-                                {{entry.packing | dashIfEmpty}}
-                            </span>
+                            <vn-chip translate-attr="{title: 'Packing'}" ng-class="{'message': entry.groupingMode == 2}"> 
+                                <span translate>{{::entry.packing | dashIfEmpty}}</span>
+                            </vn-chip>
                         </vn-td>
                         <vn-td number>
-                            <span class="chip" ng-class="{counter: entry.groupingMode == 1}">
-                                {{entry.grouping | dashIfEmpty}}
-                            </span>
+                            <vn-chip translate-attr="{title: 'Grouping'}" ng-class="{'message': entry.groupingMode == 1}"> 
+                                <span translate>{{::entry.grouping | dashIfEmpty}}</span>
+                            </vn-chip>
                         </vn-td>
-                        <vn-td number class="expendable">{{entry.stems | dashIfEmpty}}</vn-td>
-                        <vn-td number>{{entry.quantity}}</vn-td>
-                        <vn-td number class="expendable">{{entry.buyingValue | dashIfEmpty}}</vn-td>
-                        <vn-td number>{{entry.packageFk | dashIfEmpty}}</vn-td>
-                        <vn-td class="expendable">{{entry.supplier | dashIfEmpty}}</vn-td>
+                        <vn-td number class="expendable">{{::entry.stems | dashIfEmpty}}</vn-td>
+                        <vn-td number>{{::entry.quantity}}</vn-td>
+                        <vn-td number class="expendable">{{::entry.buyingValue | dashIfEmpty}}</vn-td>
+                        <vn-td number>{{::entry.packageFk | dashIfEmpty}}</vn-td>
+                        <vn-td class="expendable">{{::entry.supplier | dashIfEmpty}}</vn-td>
                     </vn-tr>
                 </vn-tbody>
             </vn-table>
diff --git a/modules/ticket/back/methods/ticket/specs/deleteStowaway.spec.js b/modules/ticket/back/methods/ticket/specs/deleteStowaway.spec.js
index d5a10ac3be..3c8097e370 100644
--- a/modules/ticket/back/methods/ticket/specs/deleteStowaway.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/deleteStowaway.spec.js
@@ -1,6 +1,6 @@
 const app = require('vn-loopback/server/server');
 
-fdescribe('ticket deleteStowaway()', () => {
+describe('ticket deleteStowaway()', () => {
     const shipId = 16;
     const stowawayId = 17;