diff --git a/front/core/components/smart-table/index.html b/front/core/components/smart-table/index.html index 9cfcf78496..8051502a7f 100644 --- a/front/core/components/smart-table/index.html +++ b/front/core/components/smart-table/index.html @@ -7,15 +7,12 @@ vn-tooltip="Shown columns">
-
- < - Showing - {{model.data.length}} - results - > -
+
+ {{model.data.length}} + results +
-
-
Check the columns you want to see
+
+ +
Shown columns
+ +
+
+ + +
+ { diff --git a/front/core/components/smart-table/locale/es.yml b/front/core/components/smart-table/locale/es.yml index f65df07b7d..422871fbfb 100644 --- a/front/core/components/smart-table/locale/es.yml +++ b/front/core/components/smart-table/locale/es.yml @@ -5,4 +5,5 @@ Save data: Guardar datos Shown columns: Columnas visibles Check the columns you want to see: Marca las columnas que quieres ver Showing: Mostrando -results: resultados \ No newline at end of file +results: resultados +Tick all: Marcar todas \ No newline at end of file diff --git a/front/core/components/smart-table/style.scss b/front/core/components/smart-table/style.scss index ed6b6d41ff..6b973c5b06 100644 --- a/front/core/components/smart-table/style.scss +++ b/front/core/components/smart-table/style.scss @@ -5,6 +5,51 @@ smart-table { th[field] { overflow: visible; cursor: pointer; + align-items: center; + + & > * { + display: flex + } + } + th[field][number] { + & > :before { + display: flex; + font-family: 'Material Icons'; + content: 'arrow_downward'; + color: $color-spacer; + margin: 2px 2px 0 0; + opacity: 0 + + } + + &.asc > :before, &.desc > :before { + color: $color-font; + opacity: 1; + } + + &.asc > :before { + content: 'arrow_upward'; + } + + &.desc > :before { + content: 'arrow_downward'; + } + + &:hover > :before { + opacity: 1; + } + } + + th[field]:not([number]) { + & > :after { + display: flex; + font-family: 'Material Icons'; + content: 'arrow_downward'; + color: $color-spacer; + margin: 2px 0 0 2px; + opacity: 0 + + } &.asc > :after, &.desc > :after { color: $color-font; @@ -12,23 +57,13 @@ smart-table { } &.asc > :after { - content: 'arrow_drop_up'; + content: 'arrow_upward'; } &.desc > :after { - content: 'arrow_drop_down'; + content: 'arrow_downward'; } - & > :after { - font-family: 'Material Icons'; - content: 'arrow_drop_down'; - position: absolute; - color: $color-spacer; - font-size: 1.5em; - margin-top: -2px; - opacity: 0 - - } &:hover > :after { opacity: 1; } @@ -81,6 +116,7 @@ smart-table { #table { overflow-x: auto; + margin-top: 15px } vn-tbody a[ng-repeat].vn-tr:focus { @@ -108,6 +144,6 @@ smart-table { vn-check { flex: initial; - width: 50% + width: 33% } } \ No newline at end of file diff --git a/front/core/components/smart-table/table.scss b/front/core/components/smart-table/table.scss index 377c3bf8ea..d3b9fa9909 100644 --- a/front/core/components/smart-table/table.scss +++ b/front/core/components/smart-table/table.scss @@ -35,7 +35,7 @@ smart-table table { text-align: right; width: 96px; } - &[center] { + &[centered] { text-align: center; } &[shrink] { @@ -54,6 +54,13 @@ smart-table table { max-width: 400px; min-width: 0; } + &[actions] { + width: 1px; + + & > * { + vertical-align: middle; + } + } vn-icon.bright, i.bright { color: #f7931e; } diff --git a/modules/entry/front/latest-buys/index.html b/modules/entry/front/latest-buys/index.html index ce1dcbaa01..61f4ce6fc9 100644 --- a/modules/entry/front/latest-buys/index.html +++ b/modules/entry/front/latest-buys/index.html @@ -36,13 +36,13 @@ Identifier - + Packing - + Grouping - + Quantity @@ -75,29 +75,29 @@ Entry - + Buying value - + Freight value - + Commission value - + Package value Is ignored - - Grouping price + + Grouping - - Packing price + + Packing - - Min price + + Min Ekt @@ -106,10 +106,10 @@ Weight - Package name + Package - Packing out + Package out @@ -139,21 +139,21 @@ {{::buy.itemFk | zeroFill:6}} - + {{::buy.packing | dashIfEmpty}} - + {{::buy.grouping | dashIfEmpty}} - {{::buy.quantity}} + {{::buy.quantity}} {{::buy.description | dashIfEmpty}} - {{::buy.size}} + {{::buy.size}}
{{::buy.name}} @@ -189,19 +189,19 @@ {{::buy.entryFk}} - {{::buy.buyingValue | currency: 'EUR':2}} - {{::buy.freightValue | currency: 'EUR':2}} - {{::buy.comissionValue | currency: 'EUR':2}} - {{::buy.packageValue | currency: 'EUR':2}} + {{::buy.buyingValue | currency: 'EUR':2}} + {{::buy.freightValue | currency: 'EUR':2}} + {{::buy.comissionValue | currency: 'EUR':2}} + {{::buy.packageValue | currency: 'EUR':2}} - {{::buy.price2 | currency: 'EUR':2}} - {{::buy.price3 | currency: 'EUR':2}} - {{::buy.minPrice | currency: 'EUR':2}} + {{::buy.price2 | currency: 'EUR':2}} + {{::buy.price3 | currency: 'EUR':2}} + {{::buy.minPrice | currency: 'EUR':2}} {{::buy.ektFk | dashIfEmpty}} {{::buy.weight}} {{::buy.packageFk}} diff --git a/modules/entry/front/latest-buys/locale/es.yml b/modules/entry/front/latest-buys/locale/es.yml index cb45724f81..21eae03078 100644 --- a/modules/entry/front/latest-buys/locale/es.yml +++ b/modules/entry/front/latest-buys/locale/es.yml @@ -14,4 +14,4 @@ Field to edit: Campo a editar PackageName: Cubo Edit: Editar buy(s): compra(s) -PackingOut: Packing envíos \ No newline at end of file +Package out: Embalaje envíos \ No newline at end of file diff --git a/modules/monitor/front/index/tickets/index.html b/modules/monitor/front/index/tickets/index.html index 04f7f339fe..87fdd407a7 100644 --- a/modules/monitor/front/index/tickets/index.html +++ b/modules/monitor/front/index/tickets/index.html @@ -34,141 +34,180 @@ - - - - Problems - Client - Salesperson - Date - Prep. - Theoretical - Practical - Province - State - Zone - Total - - - - - - - - - - - - - - - - - - - - - - {{::ticket.nickname}} - - - - - {{::ticket.userName | dashIfEmpty}} - - - - - {{::ticket.shipped | date: 'dd/MM/yyyy'}} - - - {{::ticket.shipped | date: 'HH:mm'}} - {{::ticket.zoneLanding | date: 'HH:mm'}} - {{::ticket.practicalHour | date: 'HH:mm'}} - {{::ticket.province}} - - - {{::ticket.refFk}} - - - {{::ticket.state}} - - - - - {{::ticket.zoneName | dashIfEmpty}} - - - - - {{::(ticket.totalWithVat ? ticket.totalWithVat : 0) | currency: 'EUR': 2}} - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + }"> + + + + + + + + + + + + + + + +
+ Problems + + Identifier + + Client + + Salesperson + + Date + + Preparation + + Theoretical + + Practical + + Province + + State + + Zone + + Total +
+ + + + + + + + + + + + + + + {{::ticket.id}} + + + + {{::ticket.nickname}} + + + + {{::ticket.userName | dashIfEmpty}} + + + + {{::ticket.shipped | date: 'dd/MM/yyyy'}} + + {{::ticket.shipped | date: 'HH:mm'}}{{::ticket.zoneLanding | date: 'HH:mm'}}{{::ticket.practicalHour | date: 'HH:mm'}}{{::ticket.province}} + + {{::ticket.refFk}} + + + {{::ticket.state}} + + + + {{::ticket.zoneName | dashIfEmpty}} + + + + {{::(ticket.totalWithVat ? ticket.totalWithVat : 0) | currency: 'EUR': 2}} + + + + + + +
+
+
@@ -185,7 +224,7 @@ model="model"> -