2022-02-28 13:44:49 +00:00
12 changed files with 157 additions and 36 deletions
--- a/db/changes/10420-valentines/00-ticket_getMovable.sql
+++ b/db/changes/10420-valentines/00-ticket_getMovable.sql
@ -6,19 +6,22 @@ CREATE DEFINER=`root`@`%` PROCEDURE `vn`.`ticket_getMovable`(vTicketFk INT, vDat
 BEGIN
 /**
 * Cálcula el stock movible para los artículos de un ticket
+ * vDatedNew debe ser menor que vDatedOld, en los otros casos se
+ * asume que siempre es posible
 *
 * @param vTicketFk -> Ticket
 * @param vDatedNew -> Nueva fecha
 * @return Sales con Movible
 */    
    DECLARE vDatedOld DATETIME;
+	SET vDatedNew = DATE_ADD(vDatedNew, INTERVAL 1 DAY);

    SELECT t.shipped INTO vDatedOld
        FROM ticket t 
        WHERE t.id = vTicketFk;

-    CALL itemStock(vWarehouseFk, DATE_SUB(vDatedNew, INTERVAL 1 DAY), NULL);    
-    CALL item_getMinacum(vWarehouseFk, vDatedNew, DATEDIFF(vDatedOld, vDatedNew), NULL);    
+    CALL itemStock(vWarehouseFk, vDatedNew, NULL); 
+    CALL item_getMinacum(vWarehouseFk, vDatedNew, DATEDIFF(DATE_SUB(vDatedOld, INTERVAL 1 DAY), vDatedNew), NULL);
 	
    SELECT s.id, 
 			s.itemFk, 
--- a/modules/account/back/models/role-config.js
+++ b/modules/account/back/models/role-config.js
@ -1,6 +1,10 @@

 module.exports = Self => {
    Self.getSynchronizer = async function() {
+        let NODE_ENV = process.env.NODE_ENV;
+        if (!NODE_ENV || NODE_ENV == 'development')
+            return null;
+
        return await Self.findOne({
            fields: ['id', 'rolePrefix', 'userPrefix', 'userHost']
        });
--- a/modules/client/back/methods/client/specs/sendSms.spec.js
+++ b/modules/client/back/methods/client/specs/sendSms.spec.js
@ -1,7 +1,8 @@
 const models = require('vn-loopback/server/server').models;
 const soap = require('soap');

-describe('client sendSms()', () => {
+// #3673 sendSms tests excluded
+xdescribe('client sendSms()', () => {
    it('should now send a message and log it', async() => {
        spyOn(soap, 'createClientAsync').and.returnValue('a so fake client');
        const tx = await models.Client.beginTransaction({});
--- a/modules/client/back/methods/sms/send.spec.js
+++ b/modules/client/back/methods/sms/send.spec.js
@ -1,6 +1,7 @@
 const app = require('vn-loopback/server/server');

-describe('sms send()', () => {
+// #3673 sendSms tests excluded
+xdescribe('sms send()', () => {
    it('should not return status error', async() => {
        const ctx = {req: {accessToken: {userId: 1}}};
        const result = await app.models.Sms.send(ctx, 1105, '123456789', 'My SMS Body');
--- a/modules/item/front/waste/index/index.html
+++ b/modules/item/front/waste/index/index.html
@ -3,13 +3,21 @@
    url="Items/getWasteByWorker"
    data="details">
 </vn-crud-model>
-
 <vn-data-viewer model="model">
-    <vn-card>
-        <section ng-repeat="detail in details" class="vn-pa-md">
-            <vn-horizontal class="header">
-                <h5><span><span translate>{{detail.buyer}}</span></h5>
-            </vn-horizontal>
+    <section ng-repeat="detail in details" class="vn-pa-md">
+        <vn-horizontal class="header">
+            <h5><span translate>{{detail.buyer}}</span></h5>
+            <vn-none>
+                <vn-icon
+                    ng-class="{'hidden': !$ctrl.wasteConfig[detail.buyer].hidden}"
+                    class="arrow pointer"
+                    icon="keyboard_arrow_up"
+                    vn-tooltip="Minimize/Maximize"
+                    ng-click="$ctrl.toggleHidePanel(detail)">
+                </vn-icon>
+            </vn-none>
+        </vn-horizontal>
+        <vn-card ng-class="{'hidden': !$ctrl.wasteConfig[detail.buyer].hidden}">
            <vn-table>
                <vn-thead>
                    <vn-tr>
@ -21,7 +29,7 @@
                </vn-thead>
                <vn-tbody>
                    <a ng-repeat="waste in detail.lines" class="clickable vn-tr"
-                        ui-sref="item.waste.detail({buyer: waste.buyer, family: waste.family})" >
+                        ui-sref="item.waste.detail({buyer: waste.buyer, family: waste.family})">
                        <vn-td class="waste-family">{{::waste.family}}</vn-td>
                        <vn-td number>{{::(waste.percentage / 100) | percentage: 2}}</vn-td>
                        <vn-td number>{{::waste.dwindle | currency: 'EUR'}}</vn-td>
@ -29,6 +37,6 @@
                    </vn-tr>
                </vn-tbody>
            </vn-table>
-        </section>
-    </vn-card>
+        </vn-card>
+    </section>
 </vn-data-viewer>
--- a/modules/item/front/waste/index/index.js
+++ b/modules/item/front/waste/index/index.js
@ -2,7 +2,34 @@ import ngModule from '../../module';
 import Section from 'salix/components/section';
 import './style.scss';

+export default class Controller extends Section {
+    constructor($element, $) {
+        super($element, $);
+
+        this.getWasteConfig();
+    }
+
+    getWasteConfig() {
+        return this.wasteConfig = JSON.parse(localStorage.getItem('wasteConfig')) || {};
+    }
+
+    setWasteConfig() {
+        localStorage.setItem('wasteConfig', JSON.stringify(this.wasteConfig));
+    }
+
+    toggleHidePanel(detail) {
+        if (!this.wasteConfig[detail.buyer]) {
+            this.wasteConfig[detail.buyer] = {
+                hidden: true
+            };
+        } else
+            this.wasteConfig[detail.buyer].hidden = !this.wasteConfig[detail.buyer].hidden;
+
+        this.setWasteConfig();
+    }
+}
+
 ngModule.vnComponent('vnItemWasteIndex', {
    template: require('./index.html'),
-    controller: Section
+    controller: Controller
 });
--- a/modules/item/front/waste/index/index.spec.js
+++ b/modules/item/front/waste/index/index.spec.js
@ -0,0 +1,53 @@
+import './index.js';
+import crudModel from 'core/mocks/crud-model';
+
+describe('Item', () => {
+    describe('Component vnItemWasteIndex', () => {
+        let $scope;
+        let controller;
+
+        beforeEach(ngModule('item'));
+
+        beforeEach(inject(($componentController, $rootScope) => {
+            $scope = $rootScope.$new();
+            $scope.model = crudModel;
+            const $element = angular.element('<vn-item-waste-index></vn-item-waste-index>');
+            controller = $componentController('vnItemWasteIndex', {$element, $scope});
+        }));
+
+        describe('getWasteConfig / setWasteConfig', () => {
+            it('should return the local storage wasteConfig', () => {
+                const result = controller.getWasteConfig();
+
+                expect(result).toEqual({});
+            });
+
+            it('should set and return the local storage wasteConfig', () => {
+                controller.wasteConfig = {salesPerson: {hidden: true}};
+                controller.setWasteConfig();
+
+                const result = controller.getWasteConfig();
+
+                expect(result).toEqual(controller.wasteConfig);
+            });
+        });
+
+        describe('toggleHidePanel()', () => {
+            it('should make details hidden by default', () => {
+                controller.wasteConfig = {};
+
+                controller.toggleHidePanel({buyer: 'salesPerson'});
+
+                expect(controller.wasteConfig.salesPerson.hidden).toEqual(true);
+            });
+
+            it('should toggle hidden false', () => {
+                controller.wasteConfig = {salesPerson: {hidden: true}};
+
+                controller.toggleHidePanel({buyer: 'salesPerson'});
+
+                expect(controller.wasteConfig.salesPerson.hidden).toEqual(false);
+            });
+        });
+    });
+});
--- a/modules/item/front/waste/index/style.scss
+++ b/modules/item/front/waste/index/style.scss
@ -1,21 +1,24 @@
@import "variables";
+@import "effects";

 vn-item-waste-index,
 vn-item-waste-detail {
    .header {
-        margin-bottom: 16px;
-        text-transform: uppercase;
-        font-size: 1.25rem;
-        line-height: 1;
-        padding: 7px;
-        padding-bottom: 7px;
-        padding-bottom: 4px;
-        font-weight: lighter;
-        background-color: $color-bg;
-        border-bottom: 1px solid #f7931e;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
+        padding: 12px 0 5px 0;
+        color: gray;
+        font-size: 1.2rem;
+        border-bottom: $border;
+        margin-bottom: 10px;
+
+        & > vn-none > vn-icon {
+            @extend %clickable-light;
+            color: $color-button;
+            font-size: 1.4rem;
+        }
+
+        vn-none > .arrow {
+            transition: transform 200ms;
+        }
    }

    vn-table vn-th.waste-family,
@ -23,4 +26,12 @@ vn-item-waste-detail {
        max-width: 64px;
        width: 64px
    }
+    .hidden {
+        display: none;
+                
+    }
+    .header > vn-none > .arrow.hidden {
+        display: block;
+        transform: rotate(180deg);
+    }
 }
--- a/modules/item/front/waste/locale/es.yml
+++ b/modules/item/front/waste/locale/es.yml
@ -1,3 +1,4 @@
 Family: Familia
 Percentage: Porcentaje
 Dwindle: Mermas
+Minimize/Maximize: Minimizar/Maximizar
--- a/modules/ticket/back/methods/ticket/specs/priceDifference.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/priceDifference.spec.js
@ -86,8 +86,8 @@ describe('sale priceDifference()', () => {
            const firstItem = result.items[0];
            const secondtItem = result.items[1];

-            expect(firstItem.movable).toEqual(440);
-            expect(secondtItem.movable).toEqual(1980);
+            expect(firstItem.movable).toEqual(410);
+            expect(secondtItem.movable).toEqual(1870);

            await tx.rollback();
        } catch (e) {
--- a/modules/ticket/back/methods/ticket/specs/sendSms.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/sendSms.spec.js
@ -1,7 +1,8 @@
 const models = require('vn-loopback/server/server').models;
 const soap = require('soap');

-describe('ticket sendSms()', () => {
+// #3673 sendSms tests excluded
+xdescribe('ticket sendSms()', () => {
    it('should send a message and log it', async() => {
        const tx = await models.Ticket.beginTransaction({});

--- a/modules/ticket/front/basic-data/step-two/index.html
+++ b/modules/ticket/front/basic-data/step-two/index.html
@ -18,7 +18,14 @@
        </vn-thead>
        <vn-tbody>
            <vn-tr ng-repeat="sale in $ctrl.ticket.sale.items track by sale.id">
-                <vn-td number>{{("000000"+sale.itemFk).slice(-6)}}</vn-td>
+                <vn-td number>
+                    <span
+                        title="{{::sale.item.name}}"
+                        vn-click-stop="itemDescriptor.show($event, sale.itemFk, sale.id)"
+                        class="link">
+                        {{::sale.itemFk | zeroFill:6}}
+                    </span>
+                </vn-td>
                <vn-td vn-fetched-tags>
                    <div>
                        <vn-one title="{{::sale.item.name}}">{{::sale.item.name}}</vn-one>
@ -83,5 +90,9 @@
        </div>
    </div>
 </vn-side-menu>
-
+<vn-item-descriptor-popover
+    vn-id="item-descriptor"
+    warehouse-fk="$ctrl.ticket.warehouseFk"
+    ticket-fk="$ctrl.ticket.id">
+</vn-item-descriptor-popover>