Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5395-travel.extra-community

.vscode/settings.json

@@ -5,5 +5,6 @@
     "editor.codeActionsOnSave": {
         "source.fixAll.eslint": true
     },
-    "search.useIgnoreFiles": false
+    "search.useIgnoreFiles": false,
+    "editor.defaultFormatter": "dbaeumer.vscode-eslint"
 }

db/changes/231201/00-ACL.sql

@@ -0,0 +1,3 @@
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) 
+VALUES ('Operator', '*', 'READ', 'ALLOW', 'ROLE', 'employee'),
+    ('Operator', '*', 'WRITE', 'ALLOW', 'ROLE', 'employee');

db/changes/231201/00-operator.sql

@@ -0,0 +1,159 @@
+ALTER TABLE `vn`.`operator` ADD sectorFk int(11) NULL;
+ALTER TABLE `vn`.`operator` ADD labelerFk tinyint(3) unsigned NULL;
+ALTER TABLE `vn`.`operator` ADD CONSTRAINT operator_FK_5 FOREIGN KEY (labelerFk) REFERENCES `vn`.`printer`(id) ON DELETE CASCADE ON UPDATE CASCADE;
+
+UPDATE `vn`.`operator` o 
+JOIN (SELECT id, sectorFk, labelerFk
+			FROM `vn`.`worker`) sub ON sub.id = o.workerFk
+	SET o.sectorFk = sub.sectorFk,
+		o.labelerFk = sub.labelerFk;
+
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`collection_printSticker`(
+	vSelf INT, 
+	vLabelCount INT
+)
+BEGIN
+/**
+ * Prints a yellow label from a collection or a ticket 
+ *
+ * @param vSelf collection or ticket
+ * @param vLabelCount number of times the collection has been printed
+ */
+	DECLARE vPrintArgs JSON DEFAULT JSON_OBJECT('collectionOrTicketFk', vSelf);
+
+	IF vLabelCount IS NULL THEN 	
+		INSERT INTO ticketTrolley
+			SELECT ticketFk, 1
+				FROM ticketCollection 
+				WHERE collectionFk = vSelf
+					ON DUPLICATE KEY UPDATE labelCount = labelCount + 1;
+	ELSE
+		SET vPrintArgs = JSON_MERGE_PATCH(vPrintArgs, JSON_OBJECT('labelCount', vLabelCount));
+	END IF;
+
+	CALL report_print(
+			'LabelCollection', 
+			(SELECT o.labelerFk FROM operator o WHERE o.workerFk = account.myUser_getId()),
+			account.myUser_getId(), 
+			vPrintArgs,
+			'high'
+		);
+END$$
+DELIMITER ;
+
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`expeditionPallet_printLabel`(vSelf INT)
+BEGIN
+/**
+ * Calls the report_print procedure and passes it 
+ * the necessary parameters for printing.
+ *
+ * @param vSelf expeditioPallet id.
+ */
+	DECLARE vPrinterFk INT;
+	DECLARE vUserFk INT DEFAULT account.myUser_getId();
+	
+	SELECT o.labelerFk INTO vPrinterFk
+		FROM operator o
+		WHERE o.workerFk = vUserFk;
+
+	CALL vn.report_print(
+		'LabelPalletExpedition',
+		vPrinterFk,
+		account.myUser_getId(),
+		JSON_OBJECT('palletFk', vSelf, 'userFk', vUserFk),
+		'high'
+	);
+
+	UPDATE vn.expeditionPallet
+		SET isPrint = TRUE
+		WHERE id = vSelf;
+END$$
+DELIMITER ;
+
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`itemShelving_getAlternatives`(vShelvingFk VARCHAR(10))
+BEGIN
+/**
+ * Devuelve un listado de posibles ubicaciones alternativas a ubicar los item de la matricula
+ * del carro que se le ha pasado.
+ *
+ * @param vShelvingFk matricula del carro
+ */
+	SELECT is2.id,is2.shelvingFk , p.code, is2.itemFk , is2.visible, p.pickingOrder 
+		FROM itemShelving is2
+			JOIN shelving sh ON sh.code = is2.shelvingFk
+			JOIN parking p ON p.id = sh.parkingFk
+			JOIN sector s ON s.id = p.sectorFk
+			LEFT JOIN operator o ON  o.sectorFk = s.id
+			LEFT JOIN worker w ON w.sectorFk = s.id  AND w.id = account.myUser_getId()
+			JOIN warehouse wh ON wh.id = s.warehouseFk
+			JOIN itemShelving is3 ON is3.itemFk = is2.itemFk AND is3.shelvingFk  = vShelvingFk COLLATE utf8_unicode_ci
+		WHERE is2.shelvingFk <> vShelvingFk COLLATE utf8_unicode_ci
+		GROUP BY is2.id
+		ORDER BY p.pickingOrder DESC;
+END$$
+DELIMITER ;
+
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`operator_beforeInsert`
+	BEFORE INSERT ON `operator`
+	FOR EACH ROW
+BEGIN
+	CALL vn.printer_checkSector(NEW.labelerFk, NEW.sectorFk);
+END$$
+DELIMITER ;
+
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`operator_beforeUpdate`
+	BEFORE UPDATE ON `operator`
+	FOR EACH ROW
+BEGIN
+	IF NOT (NEW.labelerFk <=> OLD.labelerFk AND NEW.sectorFk <=> OLD.sectorFk) THEN	
+		CALL vn.printer_checkSector(NEW.labelerFk, NEW.sectorFk);
+	END IF;
+END$$
+DELIMITER ;
+
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`worker_beforeUpdate`
+	BEFORE UPDATE ON `worker`
+	FOR EACH ROW
+BEGIN
+	IF NOT (NEW.labelerFk <=> OLD.labelerFk AND NEW.sectorFk <=> OLD.sectorFk) THEN	
+		CALL vn.printer_checkSector(NEW.labelerFk, NEW.sectorFk);
+
+		INSERT IGNORE INTO vn.operator (workerFk)
+			VALUES (NEW.id);
+
+		UPDATE operator 
+			SET labelerFk = NEW.labelerFk,
+				sectorFk = NEW.sectorFk
+			WHERE workerFk = NEW.id;
+	END IF;
+END$$
+DELIMITER ;
+
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+	VIEW `vn`.`operatorWorkerCode`
+AS SELECT `o`.`workerFk` AS `workerFk`,
+	concat(`w`.`firstName`, ' ', `w`.`lastName`) AS `fullName`,
+	`w`.`code` AS `code`,
+	`o`.`numberOfWagons` AS `numberOfWagons`
+FROM (
+		(
+			`vn`.`worker` `w`
+			JOIN `vn`.`operator` `o` ON(`o`.`workerFk` = `w`.`id`)
+		)
+		JOIN `vn`.`sector` `s` ON(`o`.`sectorFk` = `s`.`id`)
+	)
+WHERE `o`.`sectorFk` IS NOT NULL
+	AND `s`.`code` IN (
+		'H2',
+		'H2',
+		'PEQUES_H',
+		'ALTILLO COMP',
+		'ALTILLO ARTI'
+	)

db/dump/fixtures.sql

@@ -173,6 +173,10 @@ INSERT INTO `vn`.`sector`(`id`, `description`, `warehouseFk`, `isPreviousPrepare
         (1, 'First sector',     1, 1, 'FIRST'),
         (2, 'Second sector',    2, 0, 'SECOND');
 
+INSERT INTO `vn`.`operator` (`workerFk`, `numberOfWagons`, `trainFk`, `itemPackingTypeFk`, `warehouseFk`, `sectorFk`, `labelerFk`)
+ VALUES ('1106', '1', '1', 'H', '1', '1', '1'),
+		('1107', '1', '1', 'V', '1', '2', '1');
+
 INSERT INTO `vn`.`printer` (`id`, `name`, `path`, `isLabeler`, `sectorFk`, `ipAddress`)
     VALUES
         (1, 'printer1', 'path1', 0, 1   , NULL),
@@ -295,7 +299,8 @@ INSERT INTO `vn`.`payMethod`(`id`,`code`,  `name`, `graceDays`, `outstandingDebt
 INSERT INTO `vn`.`payDem`(`id`, `payDem`)
     VALUES
         (1, 10),
-        (2, 20);
+        (2, 20),
+        (7, 0);
 
 INSERT INTO `vn`.`autonomy`(`id`, `name`, `countryFk`)
     VALUES

front/core/components/calendar/index.js

@@ -114,12 +114,14 @@ export default class Calendar extends FormInput {
         let day = date.getDate();
         let wday = date.getDay();
         let month = date.getMonth();
+        let year = date.getFullYear();
 
         const currentDay = Date.vnNew().getDate();
         const currentMonth = Date.vnNew().getMonth();
+        const currentYear = Date.vnNew().getFullYear();
 
         let classes = {
-            today: day === currentDay && month === currentMonth,
+            today: day === currentDay && month === currentMonth && year === currentYear,
             weekend: wday === 6 || wday === 0,
             previous: month < this.month,
             current: month == this.month,

modules/client/back/methods/client/getTransactions.js

@@ -1,49 +0,0 @@
-
-const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
-
-module.exports = Self => {
-    Self.remoteMethod('getTransactions', {
-        description: 'Returns last entries',
-        accessType: 'READ',
-        accepts: [{
-            arg: 'filter',
-            type: 'object',
-            description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string',
-            http: {source: 'query'}
-        }],
-        returns: {
-            type: ['object'],
-            root: true
-        },
-        http: {
-            path: `/getTransactions`,
-            verb: 'GET'
-        }
-    });
-
-    Self.getTransactions = async(filter, options) => {
-        const myOptions = {};
-
-        if (typeof options == 'object')
-            Object.assign(myOptions, options);
-
-        const conn = Self.dataSource.connector;
-        const stmt = new ParameterizedSQL(`
-            SELECT 
-                t.id, 
-                t.clientFk, 
-                t.created, 
-                t.amount / 100 amount,
-                t.receiptFk IS NOT NULL AS isConfirmed,
-                tt.message responseMessage,
-                te.message errorMessage
-            FROM hedera.tpvTransaction t
-                JOIN hedera.tpvMerchant m ON m.id = t.merchantFk
-                LEFT JOIN hedera.tpvResponse tt ON tt.id = t.response
-                LEFT JOIN hedera.tpvError te ON te.code = errorCode`);
-
-        stmt.merge(conn.makeSuffix(filter, 't'));
-
-        return Self.rawStmt(stmt, myOptions);
-    };
-};

modules/client/back/methods/client/specs/getTransactions.spec.js

@@ -1,21 +0,0 @@
-const models = require('vn-loopback/server/server').models;
-
-describe('Client getTransations', () => {
-    it('should call getTransations() method to receive a list of Web Payments from Bruce Wayne', async() => {
-        const tx = await models.Client.beginTransaction({});
-
-        try {
-            const options = {transaction: tx};
-
-            const filter = {where: {clientFk: 1101}};
-            const result = await models.Client.getTransactions(filter, options);
-
-            expect(result[1].id).toBeTruthy();
-
-            await tx.rollback();
-        } catch (e) {
-            await tx.rollback();
-            throw e;
-        }
-    });
-});

modules/client/back/methods/client/specs/transactions.spec.js

@@ -0,0 +1,66 @@
+const models = require('vn-loopback/server/server').models;
+
+describe('Client transactions', () => {
+    it('should call transactions() method to receive a list of Web Payments from Bruce Wayne', async() => {
+        const tx = await models.Client.beginTransaction({});
+
+        try {
+            const options = {transaction: tx};
+
+            const ctx = {};
+            const filter = {where: {clientFk: 1101}};
+            const result = await models.Client.transactions(ctx, filter, options);
+
+            expect(result[1].id).toBeTruthy();
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+
+    it('should call transactions() method filtering by orderFk', async() => {
+        const tx = await models.Client.beginTransaction({});
+
+        try {
+            const options = {transaction: tx};
+
+            const ctx = {args: {orderFk: 6}};
+            const filter = {};
+            const result = await models.Client.transactions(ctx, filter, options);
+
+            const firstRow = result[0];
+
+            expect(result.length).toEqual(1);
+            expect(firstRow.id).toEqual(6);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+
+    it('should call transactions() method filtering by amount', async() => {
+        const tx = await models.Client.beginTransaction({});
+
+        try {
+            const options = {transaction: tx};
+
+            const ctx = {args: {amount: 40}};
+            const filter = {};
+            const result = await models.Client.transactions(ctx, filter, options);
+
+            const randomIndex = Math.floor(Math.random() * result.length);
+            const transaction = result[randomIndex];
+
+            expect(transaction.amount).toEqual(40);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+});

modules/client/back/methods/client/transactions.js

@@ -0,0 +1,84 @@
+
+const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
+const buildFilter = require('vn-loopback/util/filter').buildFilter;
+const mergeFilters = require('vn-loopback/util/filter').mergeFilters;
+
+module.exports = Self => {
+    Self.remoteMethodCtx('transactions', {
+        description: 'Returns customer transactions',
+        accessType: 'READ',
+        accepts: [
+            {
+                arg: 'filter',
+                type: 'object',
+                description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string',
+                http: {source: 'query'}
+            },
+            {
+                arg: 'orderFk',
+                type: 'number',
+                http: {source: 'query'}
+            },
+            {
+                arg: 'clientFk',
+                type: 'number',
+                http: {source: 'query'}
+            },
+            {
+                arg: 'amount',
+                type: 'number',
+                http: {source: 'query'}
+            }
+        ],
+        returns: {
+            type: ['object'],
+            root: true
+        },
+        http: {
+            path: `/transactions`,
+            verb: 'GET'
+        }
+    });
+
+    Self.transactions = async(ctx, filter, options) => {
+        const args = ctx.args;
+        const myOptions = {};
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        const where = buildFilter(args, (param, value) => {
+            switch (param) {
+            case 'orderFk':
+                return {'t.id': value};
+            case 'clientFk':
+                return {'t.clientFk': value};
+            case 'amount':
+                return {'t.amount': (value * 100)};
+            }
+        });
+
+        filter = mergeFilters(filter, {where});
+
+        const conn = Self.dataSource.connector;
+        const stmt = new ParameterizedSQL(`
+            SELECT 
+                t.id, 
+                t.clientFk, 
+                c.name AS customerName,
+                t.created, 
+                t.amount / 100 amount,
+                t.receiptFk IS NOT NULL AS isConfirmed,
+                tt.message responseMessage,
+                te.message errorMessage
+            FROM hedera.tpvTransaction t
+                JOIN client c ON c.id = t.clientFk
+                JOIN hedera.tpvMerchant m ON m.id = t.merchantFk
+                LEFT JOIN hedera.tpvResponse tt ON tt.id = t.response
+                LEFT JOIN hedera.tpvError te ON te.code = errorCode`);
+
+        stmt.merge(conn.makeSuffix(filter, 't'));
+
+        return Self.rawStmt(stmt, myOptions);
+    };
+};

modules/client/back/models/client-methods.js

@@ -13,7 +13,7 @@ module.exports = Self => {
     require('../methods/client/getCard')(Self);
     require('../methods/client/getDebt')(Self);
     require('../methods/client/getMana')(Self);
-    require('../methods/client/getTransactions')(Self);
+    require('../methods/client/transactions')(Self);
     require('../methods/client/hasCustomerRole')(Self);
     require('../methods/client/isValidClient')(Self);
     require('../methods/client/lastActiveTickets')(Self);

modules/client/front/web-payment/index.html

@@ -1,55 +1,39 @@
-<vn-crud-model
+<vn-crud-model vn-id="model" url="clients/transactions" link="{clientFk: $ctrl.$params.id}" limit="20"
-    vn-id="model"
+    data="transactions" order="created DESC" auto-load="true">
-    url="clients/getTransactions"
-    link="{clientFk: $ctrl.$params.id}"
-    limit="20"
-    data="transactions"
-    order="created DESC"
-    auto-load="true">
 </vn-crud-model>
-<vn-data-viewer
+<vn-data-viewer model="model" class="vn-w-md">
-    model="model"
-    class="vn-w-md">
     <vn-card>
-    <vn-table model="model">
+        <vn-table model="model">
-        <vn-thead>
+            <vn-thead>
-            <vn-tr>
+                <vn-tr>
-                <vn-th shrink>State</vn-th>
+                    <vn-th shrink>State</vn-th>
-                <vn-th field="id" number>Id</vn-th>
+                    <vn-th field="id" number>Id</vn-th>
-                <vn-th field="created" expand>Date</vn-th>
+                    <vn-th field="created" expand>Date</vn-th>
-                <vn-th field="amount" number>Amount</vn-th>
+                    <vn-th field="amount" number>Amount</vn-th>
-                <vn-th shrink></vn-th>
+                    <vn-th shrink></vn-th>
-            </vn-tr>
+                </vn-tr>
-        </vn-thead>
+            </vn-thead>
-        <vn-tbody>
+            <vn-tbody>
-            <vn-tr ng-repeat="transaction in transactions">
+                <vn-tr ng-repeat="transaction in transactions">
-                <vn-td shrink>
+                    <vn-td shrink>
-                    <vn-icon
+                        <vn-icon vn-tooltip="{{::$ctrl.getFormattedMessage(transaction)}}"
-                        vn-tooltip="{{::$ctrl.getFormattedMessage(transaction)}}"
+                            ng-show="::((transaction.errorMessage || transaction.responseMessage) && !transaction.isConfirmed)"
-                        ng-show="::((transaction.errorMessage || transaction.responseMessage) && !transaction.isConfirmed)" 
+                            icon="clear">
-                        icon="clear">
+                        </vn-icon>
-                    </vn-icon>
+                        <vn-icon vn-tooltip="Confirmed" ng-show="::(transaction.isConfirmed)" icon="check">
-                    <vn-icon
+                        </vn-icon>
-                        vn-tooltip="Confirmed"
+                    </vn-td>
-                        ng-show="::(transaction.isConfirmed)" 
+                    <vn-td number>{{::transaction.id}}</vn-td>
-                        icon="check">
+                    <vn-td>{{::transaction.created | date:'dd/MM/yyyy HH:mm'}}</vn-td>
-                    </vn-icon>
+                    <vn-td number>{{::transaction.amount | currency: 'EUR':2}}</vn-td>
-                </vn-td>
+                    <vn-td shrink>
-                <vn-td number>{{::transaction.id}}</vn-td>
+                        <vn-icon-button icon="done_all" vn-acl="administrative" vn-acl-action="remove"
-                <vn-td>{{::transaction.created | date:'dd/MM/yyyy HH:mm'}}</vn-td>
+                            translate-attr="{title: 'Confirm transaction'}" ng-show="::!transaction.isConfirmed"
-                <vn-td number>{{::transaction.amount | currency: 'EUR':2}}</vn-td>
+                            ng-click="$ctrl.confirm(transaction)">
-                <vn-td shrink>
+                        </vn-icon-button>
-                    <vn-icon-button
+                    </vn-td>
-                        icon="done_all"
+                </vn-tr>
-                        vn-acl="administrative"
+            </vn-tbody>
-                        vn-acl-action="remove"
+        </vn-table>
-                        translate-attr="{title: 'Confirm transaction'}"
-                        ng-show="::!transaction.isConfirmed"
-                        ng-click="$ctrl.confirm(transaction)">
-                    </vn-icon-button>
-                </vn-td>
-            </vn-tr>
-        </vn-tbody>
-    </vn-table>
     </vn-card>
 </vn-data-viewer>

modules/item/front/last-entries/index.html

@@ -86,11 +86,11 @@
                             class="expendable">
                                 <span
                                     vn-tooltip="
-                                    {{::$ctrl.$t('Cost')}}: {{::entry.buyingValue | currency: 'EUR':2 | dashIfEmpty}}<br>
+                                    {{::$ctrl.$t('Cost')}}: {{::entry.buyingValue | currency: 'EUR':3 | dashIfEmpty}}<br>
-                                    {{::$ctrl.$t('Package')}}: {{::entry.packageValue | currency: 'EUR':2 | dashIfEmpty}}<br>
+                                    {{::$ctrl.$t('Package')}}: {{::entry.packageValue | currency: 'EUR':3 | dashIfEmpty}}<br>
-                                    {{::$ctrl.$t('Freight')}}: {{::entry.freightValue | currency: 'EUR':2 | dashIfEmpty}}<br>
+                                    {{::$ctrl.$t('Freight')}}: {{::entry.freightValue | currency: 'EUR':3 | dashIfEmpty}}<br>
-                                    {{::$ctrl.$t('Comission')}}: {{::entry.comissionValue | currency: 'EUR':2 | dashIfEmpty}}">
+                                    {{::$ctrl.$t('Comission')}}: {{::entry.comissionValue | currency: 'EUR':3 | dashIfEmpty}}">
-                                    {{::entry.cost | currency: 'EUR':2 | dashIfEmpty}}
+                                    {{::entry.cost | currency: 'EUR':3 | dashIfEmpty}}
                                 </span>
                         </vn-td>
                         <vn-td number>{{::entry.weight | dashIfEmpty}}</vn-td>

modules/supplier/back/methods/supplier/newSupplier.js

@@ -1,11 +1,10 @@
 module.exports = Self => {
-    Self.remoteMethod('newSupplier', {
+    Self.remoteMethodCtx('newSupplier', {
         description: 'Creates a new supplier and returns it',
         accessType: 'WRITE',
         accepts: [{
-            arg: 'params',
+            arg: 'name',
-            type: 'object',
+            type: 'string'
-            http: {source: 'body'}
         }],
         returns: {
             type: 'string',
@@ -17,29 +16,18 @@ module.exports = Self => {
         }
     });
 
-    Self.newSupplier = async params => {
+    Self.newSupplier = async(ctx, options) => {
         const models = Self.app.models;
+        const args = ctx.args;
         const myOptions = {};
 
-        if (typeof(params) == 'string')
+        if (typeof options == 'object')
-            params = JSON.parse(params);
+            Object.assign(myOptions, options);
 
-        params.nickname = params.name;
+        delete args.ctx;
+        const data = {...args, ...{nickname: args.name}};
+        const supplier = await models.Supplier.create(data, myOptions);
 
-        if (!myOptions.transaction) {
+        return supplier;
-            tx = await Self.beginTransaction({});
-            myOptions.transaction = tx;
-        }
-
-        try {
-            const supplier = await models.Supplier.create(params, myOptions);
-
-            if (tx) await tx.commit();
-
-            return supplier;
-        } catch (e) {
-            if (tx) await tx.rollback();
-            throw e;
-        }
     };
 };

modules/supplier/back/methods/supplier/specs/newSupplier.spec.js

@@ -1,31 +1,39 @@
-const app = require('vn-loopback/server/server');
+const models = require('vn-loopback/server/server').models;
 const LoopBackContext = require('loopback-context');
 
 describe('Supplier newSupplier()', () => {
-    const newSupp = {
-        name: 'TestSupplier-1'
-    };
     const administrativeId = 5;
+    const activeCtx = {
+        accessToken: {userId: administrativeId},
+        http: {
+            req: {
+                headers: {origin: 'http://localhost'}
+            }
+        }
+    };
+    const ctx = {req: activeCtx};
 
-    it('should create a new supplier containing only the name', async() => {
+    beforeEach(() => {
-        pending('https://redmine.verdnatura.es/issues/5203');
-        const activeCtx = {
-            accessToken: {userId: administrativeId},
-        };
         spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
             active: activeCtx
         });
+    });
 
-        let result = await app.models.Supplier.newSupplier(JSON.stringify(newSupp));
+    it('should create a new supplier containing only the name', async() => {
+        const tx = await models.Supplier.beginTransaction({});
 
-        expect(result.name).toEqual('TestSupplier-1');
+        try {
-        expect(result.id).toEqual(443);
+            const options = {transaction: tx};
+            ctx.args = {
+                name: 'newSupplier'
+            };
 
-        const createdSupplier = await app.models.Supplier.findById(result.id);
+            const result = await models.Supplier.newSupplier(ctx, options);
 
-        expect(createdSupplier.id).toEqual(result.id);
+            expect(result.name).toEqual('newSupplier');
-        expect(createdSupplier.name).toEqual(result.name);
+        } catch (e) {
-        expect(createdSupplier.payDemFk).toEqual(7);
+            await tx.rollback();
-        expect(createdSupplier.nickname).toEqual(result.name);
+            throw e;
+        }
     });
 });

modules/supplier/front/create/index.html

@@ -1,7 +1,8 @@
 <vn-watcher
     vn-id="watcher"
-    url="suppliers/newSupplier"
+    url="Suppliers/newSupplier"
     data="$ctrl.supplier"
+    params="$ctrl.supplier"
     insert-mode="true"
     form="form">
 </vn-watcher>
@@ -9,8 +10,8 @@
     <vn-card class="vn-pa-lg">
         <vn-horizontal>
             <vn-textfield
-                label="Supplier name" 
+                label="Supplier name"
-                ng-model="$ctrl.supplier.name" 
+                ng-model="$ctrl.supplier.name"
                 vn-focus>
             </vn-textfield>
         </vn-horizontal>

modules/worker/back/model-config.json

@@ -94,6 +94,9 @@
     },
     "WorkerTimeControlMail": {
         "dataSource": "vn"
+    },
+    "Operator": {
+        "dataSource": "vn"
     }
 }
 

modules/worker/back/models/operator.json

@@ -0,0 +1,44 @@
+{
+	"name": "Operator",
+	"base": "VnModel",
+	"options": {
+		"mysql": {
+			"table": "operator"
+		}
+	},
+	"properties": {
+		"workerFk": {
+			"id": true,
+			"type": "number",
+			"required": true
+		},
+		"numberOfWagons": {
+			"type": "number"
+		},
+		"trainFk": {
+			"type": "number",
+			"required": true
+		},
+		"itemPackingTypeFk": {
+			"type": "string",
+			"required": true
+		},
+		"warehouseFk": {
+			"type": "number",
+			"required": true
+		},
+		"sectorFk ": {
+			"type": "number"
+		},
+		"labelerFk ": {
+			"type": "number"
+		}
+    },
+	"relations": {
+        "sector": {
+            "type": "belongsTo",
+            "model": "Sector",
+            "foreignKey": "sectorFk"
+        }
+    }
+}