From 8f37b69bc248b4daa3ce30d22aa200f80d7792e0 Mon Sep 17 00:00:00 2001 From: jgallego Date: Wed, 4 Apr 2018 13:56:16 +0200 Subject: [PATCH] data step one Tarea #215 --- client/ticket/routes.json | 18 +- client/ticket/src/data/step-one/step-one.html | 54 + client/ticket/src/data/step-one/step-one.js | 22 + .../step-three.html} | 0 .../step-three.js} | 0 client/ticket/src/data/step-two/step-two.html | 0 client/ticket/src/data/step-two/step-two.js | 0 client/ticket/src/locale/es.yml | 34 +- client/ticket/src/ticket.js | 4 +- package-lock.json | 991 ++++++++---------- package.json | 2 +- services/client/server/model-config.json | 3 - .../common/models/company.json | 0 services/loopback/server/model-config.json | 3 + 14 files changed, 579 insertions(+), 552 deletions(-) create mode 100644 client/ticket/src/data/step-one/step-one.html create mode 100644 client/ticket/src/data/step-one/step-one.js rename client/ticket/src/data/{ticket-data.html => step-three/step-three.html} (100%) rename client/ticket/src/data/{ticket-data.js => step-three/step-three.js} (100%) create mode 100644 client/ticket/src/data/step-two/step-two.html create mode 100644 client/ticket/src/data/step-two/step-two.js rename services/{client => loopback}/common/models/company.json (100%) diff --git a/client/ticket/routes.json b/client/ticket/routes.json index fedad09a1..9746a2e56 100644 --- a/client/ticket/routes.json +++ b/client/ticket/routes.json @@ -37,7 +37,13 @@ { "url" : "/data", "state": "ticket.card.data", - "component": "vn-ticket-data", + "component": "ui-view", + "abstract": true + }, + { + "url" : "/step-one", + "state": "ticket.card.data.stepOne", + "component": "vn-ticket-data-step-one", "params": { "ticket": "$ctrl.ticket" }, @@ -46,6 +52,16 @@ "icon": "settings" } }, + { + "url" : "/step-two", + "state": "ticket.card.data.stepTwo", + "component": "vn-ticket-data-step-two" + }, + { + "url" : "/step-three", + "state": "ticket.card.data.stepThree", + "component": "vn-ticket-data-step-three" + }, { "url": "/observation", "state": "ticket.card.observation", diff --git a/client/ticket/src/data/step-one/step-one.html b/client/ticket/src/data/step-one/step-one.html new file mode 100644 index 000000000..93ff63e50 --- /dev/null +++ b/client/ticket/src/data/step-one/step-one.html @@ -0,0 +1,54 @@ +
+ + Basic data + + + + + + + + + + + + + + + + + + + + +
diff --git a/client/ticket/src/data/step-one/step-one.js b/client/ticket/src/data/step-one/step-one.js new file mode 100644 index 000000000..3db7aa4b0 --- /dev/null +++ b/client/ticket/src/data/step-one/step-one.js @@ -0,0 +1,22 @@ +import ngModule from '../../module'; + +class Controller { + constructor($scope, $timeout, $state) { + this.$scope = $scope; + this.$timeout = $timeout; + this.$state = $state; + } + onSubmit() { + this.$state.go('ticket.card.data.stepTwo'); + } +} + +Controller.$inject = ['$scope', '$timeout', '$state']; + +ngModule.component('vnTicketDataStepOne', { + template: require('./step-one.html'), + bindings: { + ticket: '<' + }, + controller: Controller +}); diff --git a/client/ticket/src/data/ticket-data.html b/client/ticket/src/data/step-three/step-three.html similarity index 100% rename from client/ticket/src/data/ticket-data.html rename to client/ticket/src/data/step-three/step-three.html diff --git a/client/ticket/src/data/ticket-data.js b/client/ticket/src/data/step-three/step-three.js similarity index 100% rename from client/ticket/src/data/ticket-data.js rename to client/ticket/src/data/step-three/step-three.js diff --git a/client/ticket/src/data/step-two/step-two.html b/client/ticket/src/data/step-two/step-two.html new file mode 100644 index 000000000..e69de29bb diff --git a/client/ticket/src/data/step-two/step-two.js b/client/ticket/src/data/step-two/step-two.js new file mode 100644 index 000000000..e69de29bb diff --git a/client/ticket/src/locale/es.yml b/client/ticket/src/locale/es.yml index a95164c74..78863e737 100644 --- a/client/ticket/src/locale/es.yml +++ b/client/ticket/src/locale/es.yml @@ -1,29 +1,37 @@ +#Ordenar alfabeticamente +Address: Consignatario +Agency: Agencia Amount: Importe Basic data: Datos básicos -Description: Descripción -Discount: Descuento -Item: Articulo +Checked: Comprobado +Client: Cliente +Company: Empresa +Counter: Contador +Date : Fecha Delete: Borrar delete expedition: borrar expedición +Description: Descripción +Discount: Descuento +Employee : Empleado Expedition: Expedición +Item: Articulo Name: Nombre -Package type: Tipo de porte -Counter: Contador -Checked: Comprobado -Worker: Trabajador +New : Nuevo +New state: Nuevo estado Notes: Notas +Landing: Llegada Observation type: Tipo de observación +Package type: Tipo de porte Price: Precio Quantity: Cantidad Sale: Lineas del pedido +Sale Checked: Control clientes +Shipment: Salida +Next: Siguiente Some fields are invalid: Algunos campos no son válidos +State: Estado The observation type must be unique: El tipo de observación debe ser único Tickets: Tickets -Date : Fecha -Employee : Empleado -State: Estado Tracking: Revisión +Worker: Trabajador Created : Añadido -New : Nuevo -New state: Nuevo estado -Sale Checked: Control clientes diff --git a/client/ticket/src/ticket.js b/client/ticket/src/ticket.js index 6cf8be337..0c2486ca1 100644 --- a/client/ticket/src/ticket.js +++ b/client/ticket/src/ticket.js @@ -4,7 +4,9 @@ import './list/ticket-list'; import './create/ticket-create'; import './card/ticket-card'; import './summary/ticket-summary'; -import './data/ticket-data'; +import './data/step-one/step-one'; +import './data/step-two/step-two'; +import './data/step-three/step-three'; import './note/ticket-observation'; import './expedition/ticket-expedition'; import './volume/ticket-volume'; diff --git a/package-lock.json b/package-lock.json index 7f4aa7ddf..d61c561fb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6474,7 +6474,8 @@ "jsbn": { "version": "0.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "json-schema": { "version": "0.2.3", @@ -12518,9 +12519,9 @@ "dev": true }, "npm": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/npm/-/npm-5.7.1.tgz", - "integrity": "sha512-r1grvv6mcEt+nlMzMWPc5n/z5q8NNuBWj0TGFp1PBSFCl6ubnAoUGBsucYsnZYT7MOJn0ha1ptEjmdBoAdJ+SA==", + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/npm/-/npm-5.8.0.tgz", + "integrity": "sha512-DowXzQwtSWDtbAjuWecuEiismR0VdNEYaL3VxNTYTdW6AGkYxfGk9LUZ/rt6etEyiH4IEk95HkJeGfXE5Rz9xQ==", "requires": { "JSONStream": "1.3.2", "abbrev": "1.1.1", @@ -12540,6 +12541,7 @@ "config-chain": "1.1.11", "debuglog": "1.0.1", "detect-indent": "5.0.0", + "detect-newline": "2.1.0", "dezalgo": "1.0.3", "editor": "1.0.0", "find-npm-prefix": "1.0.2", @@ -12549,17 +12551,18 @@ "glob": "7.1.2", "graceful-fs": "4.1.11", "has-unicode": "2.0.1", - "hosted-git-info": "2.5.0", + "hosted-git-info": "2.6.0", "iferr": "0.1.5", "imurmurhash": "0.1.4", "inflight": "1.0.6", "inherits": "2.0.3", "ini": "1.3.5", - "init-package-json": "1.10.1", + "init-package-json": "1.10.3", "is-cidr": "1.0.0", + "json-parse-better-errors": "1.0.1", "lazy-property": "1.0.0", - "libcipm": "1.3.3", - "libnpx": "9.7.1", + "libcipm": "1.6.0", + "libnpx": "10.0.1", "lockfile": "1.0.3", "lodash._baseindexof": "3.1.0", "lodash._baseuniq": "4.6.0", @@ -12574,24 +12577,24 @@ "lodash.without": "4.4.0", "lru-cache": "4.1.1", "meant": "1.0.1", - "mississippi": "2.0.0", + "mississippi": "3.0.0", "mkdirp": "0.5.1", "move-concurrently": "1.0.1", "nopt": "4.0.1", "normalize-package-data": "2.4.0", "npm-cache-filename": "1.0.2", "npm-install-checks": "3.0.0", - "npm-lifecycle": "2.0.0", + "npm-lifecycle": "2.0.1", "npm-package-arg": "6.0.0", "npm-packlist": "1.1.10", "npm-profile": "3.0.1", - "npm-registry-client": "8.5.0", + "npm-registry-client": "8.5.1", "npm-user-validate": "1.0.0", "npmlog": "4.1.2", "once": "1.4.0", "opener": "1.4.3", "osenv": "0.1.5", - "pacote": "7.3.3", + "pacote": "7.6.1", "path-is-inside": "1.0.2", "promise-inflight": "1.0.1", "qrcode-terminal": "0.11.0", @@ -12600,9 +12603,9 @@ "read": "1.0.7", "read-cmd-shim": "1.0.1", "read-installed": "4.0.3", - "read-package-json": "2.0.12", + "read-package-json": "2.0.13", "read-package-tree": "5.1.6", - "readable-stream": "2.3.4", + "readable-stream": "2.3.5", "readdir-scoped-modules": "1.0.2", "request": "2.83.0", "retry": "0.10.1", @@ -12615,7 +12618,7 @@ "sorted-union-stream": "2.1.3", "ssri": "5.2.4", "strip-ansi": "4.0.0", - "tar": "4.3.3", + "tar": "4.4.0", "text-table": "0.2.0", "uid-number": "0.0.6", "umask": "1.1.0", @@ -12626,9 +12629,9 @@ "validate-npm-package-license": "3.0.1", "validate-npm-package-name": "3.0.0", "which": "1.3.0", - "worker-farm": "1.5.2", + "worker-farm": "1.5.4", "wrappy": "1.0.2", - "write-file-atomic": "2.1.0" + "write-file-atomic": "2.3.0" }, "dependencies": { "JSONStream": { @@ -12708,6 +12711,138 @@ "y18n": "4.0.0" }, "dependencies": { + "mississippi": { + "version": "2.0.0", + "bundled": true, + "requires": { + "concat-stream": "1.6.1", + "duplexify": "3.5.4", + "end-of-stream": "1.4.1", + "flush-write-stream": "1.0.2", + "from2": "2.3.0", + "parallel-transform": "1.1.0", + "pump": "2.0.1", + "pumpify": "1.4.0", + "stream-each": "1.2.2", + "through2": "2.0.3" + }, + "dependencies": { + "concat-stream": { + "version": "1.6.1", + "bundled": true, + "requires": { + "inherits": "2.0.3", + "readable-stream": "2.3.5", + "typedarray": "0.0.6" + }, + "dependencies": { + "typedarray": { + "version": "0.0.6", + "bundled": true + } + } + }, + "duplexify": { + "version": "3.5.4", + "bundled": true, + "requires": { + "end-of-stream": "1.4.1", + "inherits": "2.0.3", + "readable-stream": "2.3.5", + "stream-shift": "1.0.0" + }, + "dependencies": { + "stream-shift": { + "version": "1.0.0", + "bundled": true + } + } + }, + "end-of-stream": { + "version": "1.4.1", + "bundled": true, + "requires": { + "once": "1.4.0" + } + }, + "flush-write-stream": { + "version": "1.0.2", + "bundled": true, + "requires": { + "inherits": "2.0.3", + "readable-stream": "2.3.5" + } + }, + "from2": { + "version": "2.3.0", + "bundled": true, + "requires": { + "inherits": "2.0.3", + "readable-stream": "2.3.5" + } + }, + "parallel-transform": { + "version": "1.1.0", + "bundled": true, + "requires": { + "cyclist": "0.2.2", + "inherits": "2.0.3", + "readable-stream": "2.3.5" + }, + "dependencies": { + "cyclist": { + "version": "0.2.2", + "bundled": true + } + } + }, + "pump": { + "version": "2.0.1", + "bundled": true, + "requires": { + "end-of-stream": "1.4.1", + "once": "1.4.0" + } + }, + "pumpify": { + "version": "1.4.0", + "bundled": true, + "requires": { + "duplexify": "3.5.4", + "inherits": "2.0.3", + "pump": "2.0.1" + } + }, + "stream-each": { + "version": "1.2.2", + "bundled": true, + "requires": { + "end-of-stream": "1.4.1", + "stream-shift": "1.0.0" + }, + "dependencies": { + "stream-shift": { + "version": "1.0.0", + "bundled": true + } + } + }, + "through2": { + "version": "2.0.3", + "bundled": true, + "requires": { + "readable-stream": "2.3.5", + "xtend": "4.0.1" + }, + "dependencies": { + "xtend": { + "version": "4.0.1", + "bundled": true + } + } + } + } + }, "y18n": { "version": "4.0.0", "bundled": true @@ -12858,6 +12993,10 @@ "version": "5.0.0", "bundled": true }, + "detect-newline": { + "version": "2.1.0", + "bundled": true + }, "dezalgo": { "version": "1.0.3", "bundled": true, @@ -12896,7 +13035,7 @@ "graceful-fs": "4.1.11", "iferr": "0.1.5", "imurmurhash": "0.1.4", - "readable-stream": "2.3.4" + "readable-stream": "2.3.5" } }, "gentle-fs": { @@ -12971,7 +13110,7 @@ "bundled": true }, "hosted-git-info": { - "version": "2.5.0", + "version": "2.6.0", "bundled": true }, "iferr": { @@ -12999,29 +13138,19 @@ "bundled": true }, "init-package-json": { - "version": "1.10.1", + "version": "1.10.3", "bundled": true, "requires": { "glob": "7.1.2", - "npm-package-arg": "5.1.2", + "npm-package-arg": "6.0.0", "promzard": "0.3.0", "read": "1.0.7", - "read-package-json": "2.0.12", + "read-package-json": "2.0.13", "semver": "5.5.0", "validate-npm-package-license": "3.0.1", "validate-npm-package-name": "3.0.0" }, "dependencies": { - "npm-package-arg": { - "version": "5.1.2", - "bundled": true, - "requires": { - "hosted-git-info": "2.5.0", - "osenv": "0.1.5", - "semver": "5.5.0", - "validate-npm-package-name": "3.0.0" - } - }, "promzard": { "version": "0.3.0", "bundled": true, @@ -13044,12 +13173,16 @@ } } }, + "json-parse-better-errors": { + "version": "1.0.1", + "bundled": true + }, "lazy-property": { "version": "1.0.0", "bundled": true }, "libcipm": { - "version": "1.3.3", + "version": "1.6.0", "bundled": true, "requires": { "bin-links": "1.1.0", @@ -13057,20 +13190,16 @@ "find-npm-prefix": "1.0.2", "graceful-fs": "4.1.11", "lock-verify": "2.0.0", - "npm-lifecycle": "2.0.0", + "npm-lifecycle": "2.0.1", "npm-logical-tree": "1.2.1", "npm-package-arg": "6.0.0", - "pacote": "7.3.3", + "pacote": "7.6.1", "protoduck": "5.0.0", - "read-package-json": "2.0.12", + "read-package-json": "2.0.13", "rimraf": "2.6.2", - "worker-farm": "1.5.2" + "worker-farm": "1.5.4" }, "dependencies": { - "find-npm-prefix": { - "version": "1.0.2", - "bundled": true - }, "lock-verify": { "version": "2.0.0", "bundled": true, @@ -13083,7 +13212,7 @@ "version": "5.1.2", "bundled": true, "requires": { - "hosted-git-info": "2.5.0", + "hosted-git-info": "2.6.0", "osenv": "0.1.5", "semver": "5.5.0", "validate-npm-package-name": "3.0.0" @@ -13109,7 +13238,7 @@ } }, "worker-farm": { - "version": "1.5.2", + "version": "1.5.4", "bundled": true, "requires": { "errno": "0.1.7", @@ -13138,116 +13267,103 @@ } }, "libnpx": { - "version": "9.7.1", + "version": "10.0.1", "bundled": true, "requires": { - "dotenv": "4.0.0", - "npm-package-arg": "5.1.2", + "dotenv": "5.0.1", + "npm-package-arg": "6.0.0", "rimraf": "2.6.2", "safe-buffer": "5.1.1", "update-notifier": "2.3.0", "which": "1.3.0", - "y18n": "3.2.1", - "yargs": "8.0.2" + "y18n": "4.0.0", + "yargs": "11.0.0" }, "dependencies": { "dotenv": { + "version": "5.0.1", + "bundled": true + }, + "y18n": { "version": "4.0.0", "bundled": true }, - "npm-package-arg": { - "version": "5.1.2", - "bundled": true, - "requires": { - "hosted-git-info": "2.5.0", - "osenv": "0.1.5", - "semver": "5.5.0", - "validate-npm-package-name": "3.0.0" - } - }, - "y18n": { - "version": "3.2.1", - "bundled": true - }, "yargs": { - "version": "8.0.2", + "version": "11.0.0", "bundled": true, "requires": { - "camelcase": "4.1.0", - "cliui": "3.2.0", + "cliui": "4.0.0", "decamelize": "1.2.0", + "find-up": "2.1.0", "get-caller-file": "1.0.2", "os-locale": "2.1.0", - "read-pkg-up": "2.0.0", "require-directory": "2.1.1", "require-main-filename": "1.0.1", "set-blocking": "2.0.0", "string-width": "2.1.1", "which-module": "2.0.0", "y18n": "3.2.1", - "yargs-parser": "7.0.0" + "yargs-parser": "9.0.2" }, "dependencies": { - "camelcase": { - "version": "4.1.0", - "bundled": true - }, "cliui": { - "version": "3.2.0", + "version": "4.0.0", "bundled": true, "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1", + "string-width": "2.1.1", + "strip-ansi": "4.0.0", "wrap-ansi": "2.1.0" }, "dependencies": { - "string-width": { - "version": "1.0.2", - "bundled": true, - "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" - }, - "dependencies": { - "code-point-at": { - "version": "1.1.0", - "bundled": true - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "bundled": true, - "requires": { - "number-is-nan": "1.0.1" - }, - "dependencies": { - "number-is-nan": { - "version": "1.0.1", - "bundled": true - } - } - } - } - }, - "strip-ansi": { - "version": "3.0.1", - "bundled": true, - "requires": { - "ansi-regex": "2.1.1" - }, - "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "bundled": true - } - } - }, "wrap-ansi": { "version": "2.1.0", "bundled": true, "requires": { "string-width": "1.0.2", "strip-ansi": "3.0.1" + }, + "dependencies": { + "string-width": { + "version": "1.0.2", + "bundled": true, + "requires": { + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" + }, + "dependencies": { + "code-point-at": { + "version": "1.1.0", + "bundled": true + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "bundled": true, + "requires": { + "number-is-nan": "1.0.1" + }, + "dependencies": { + "number-is-nan": { + "version": "1.0.1", + "bundled": true + } + } + } + } + }, + "strip-ansi": { + "version": "3.0.1", + "bundled": true, + "requires": { + "ansi-regex": "2.1.1" + }, + "dependencies": { + "ansi-regex": { + "version": "2.1.1", + "bundled": true + } + } + } } } } @@ -13256,6 +13372,51 @@ "version": "1.2.0", "bundled": true }, + "find-up": { + "version": "2.1.0", + "bundled": true, + "requires": { + "locate-path": "2.0.0" + }, + "dependencies": { + "locate-path": { + "version": "2.0.0", + "bundled": true, + "requires": { + "p-locate": "2.0.0", + "path-exists": "3.0.0" + }, + "dependencies": { + "p-locate": { + "version": "2.0.0", + "bundled": true, + "requires": { + "p-limit": "1.2.0" + }, + "dependencies": { + "p-limit": { + "version": "1.2.0", + "bundled": true, + "requires": { + "p-try": "1.0.0" + }, + "dependencies": { + "p-try": { + "version": "1.0.0", + "bundled": true + } + } + } + } + }, + "path-exists": { + "version": "3.0.0", + "bundled": true + } + } + } + } + }, "get-caller-file": { "version": "1.0.2", "bundled": true @@ -13358,129 +13519,17 @@ "version": "1.1.0", "bundled": true, "requires": { - "mimic-fn": "1.1.0" + "mimic-fn": "1.2.0" }, "dependencies": { "mimic-fn": { - "version": "1.1.0", + "version": "1.2.0", "bundled": true } } } } }, - "read-pkg-up": { - "version": "2.0.0", - "bundled": true, - "requires": { - "find-up": "2.1.0", - "read-pkg": "2.0.0" - }, - "dependencies": { - "find-up": { - "version": "2.1.0", - "bundled": true, - "requires": { - "locate-path": "2.0.0" - }, - "dependencies": { - "locate-path": { - "version": "2.0.0", - "bundled": true, - "requires": { - "p-locate": "2.0.0", - "path-exists": "3.0.0" - }, - "dependencies": { - "p-locate": { - "version": "2.0.0", - "bundled": true, - "requires": { - "p-limit": "1.1.0" - }, - "dependencies": { - "p-limit": { - "version": "1.1.0", - "bundled": true - } - } - }, - "path-exists": { - "version": "3.0.0", - "bundled": true - } - } - } - } - }, - "read-pkg": { - "version": "2.0.0", - "bundled": true, - "requires": { - "load-json-file": "2.0.0", - "normalize-package-data": "2.4.0", - "path-type": "2.0.0" - }, - "dependencies": { - "load-json-file": { - "version": "2.0.0", - "bundled": true, - "requires": { - "graceful-fs": "4.1.11", - "parse-json": "2.2.0", - "pify": "2.3.0", - "strip-bom": "3.0.0" - }, - "dependencies": { - "parse-json": { - "version": "2.2.0", - "bundled": true, - "requires": { - "error-ex": "1.3.1" - }, - "dependencies": { - "error-ex": { - "version": "1.3.1", - "bundled": true, - "requires": { - "is-arrayish": "0.2.1" - }, - "dependencies": { - "is-arrayish": { - "version": "0.2.1", - "bundled": true - } - } - } - } - }, - "pify": { - "version": "2.3.0", - "bundled": true - }, - "strip-bom": { - "version": "3.0.0", - "bundled": true - } - } - }, - "path-type": { - "version": "2.0.0", - "bundled": true, - "requires": { - "pify": "2.3.0" - }, - "dependencies": { - "pify": { - "version": "2.3.0", - "bundled": true - } - } - } - } - } - } - }, "require-directory": { "version": "2.1.1", "bundled": true @@ -13511,11 +13560,21 @@ "version": "2.0.0", "bundled": true }, + "y18n": { + "version": "3.2.1", + "bundled": true + }, "yargs-parser": { - "version": "7.0.0", + "version": "9.0.2", "bundled": true, "requires": { "camelcase": "4.1.0" + }, + "dependencies": { + "camelcase": { + "version": "4.1.0", + "bundled": true + } } } } @@ -13610,27 +13669,27 @@ "bundled": true }, "mississippi": { - "version": "2.0.0", + "version": "3.0.0", "bundled": true, "requires": { - "concat-stream": "1.6.0", - "duplexify": "3.5.3", + "concat-stream": "1.6.1", + "duplexify": "3.5.4", "end-of-stream": "1.4.1", "flush-write-stream": "1.0.2", "from2": "2.3.0", "parallel-transform": "1.1.0", - "pump": "2.0.1", + "pump": "3.0.0", "pumpify": "1.4.0", "stream-each": "1.2.2", "through2": "2.0.3" }, "dependencies": { "concat-stream": { - "version": "1.6.0", + "version": "1.6.1", "bundled": true, "requires": { "inherits": "2.0.3", - "readable-stream": "2.3.4", + "readable-stream": "2.3.5", "typedarray": "0.0.6" }, "dependencies": { @@ -13641,12 +13700,12 @@ } }, "duplexify": { - "version": "3.5.3", + "version": "3.5.4", "bundled": true, "requires": { "end-of-stream": "1.4.1", "inherits": "2.0.3", - "readable-stream": "2.3.4", + "readable-stream": "2.3.5", "stream-shift": "1.0.0" }, "dependencies": { @@ -13668,7 +13727,7 @@ "bundled": true, "requires": { "inherits": "2.0.3", - "readable-stream": "2.3.4" + "readable-stream": "2.3.5" } }, "from2": { @@ -13676,7 +13735,7 @@ "bundled": true, "requires": { "inherits": "2.0.3", - "readable-stream": "2.3.4" + "readable-stream": "2.3.5" } }, "parallel-transform": { @@ -13685,7 +13744,7 @@ "requires": { "cyclist": "0.2.2", "inherits": "2.0.3", - "readable-stream": "2.3.4" + "readable-stream": "2.3.5" }, "dependencies": { "cyclist": { @@ -13695,7 +13754,7 @@ } }, "pump": { - "version": "2.0.1", + "version": "3.0.0", "bundled": true, "requires": { "end-of-stream": "1.4.1", @@ -13706,9 +13765,19 @@ "version": "1.4.0", "bundled": true, "requires": { - "duplexify": "3.5.3", + "duplexify": "3.5.4", "inherits": "2.0.3", "pump": "2.0.1" + }, + "dependencies": { + "pump": { + "version": "2.0.1", + "bundled": true, + "requires": { + "end-of-stream": "1.4.1", + "once": "1.4.0" + } + } } }, "stream-each": { @@ -13729,7 +13798,7 @@ "version": "2.0.3", "bundled": true, "requires": { - "readable-stream": "2.3.4", + "readable-stream": "2.3.5", "xtend": "4.0.1" }, "dependencies": { @@ -13787,93 +13856,6 @@ } } }, - "node-gyp": { - "version": "3.6.2", - "bundled": true, - "requires": { - "fstream": "1.0.11", - "glob": "7.1.2", - "graceful-fs": "4.1.11", - "minimatch": "3.0.4", - "mkdirp": "0.5.1", - "nopt": "3.0.6", - "npmlog": "4.1.2", - "osenv": "0.1.5", - "request": "2.83.0", - "rimraf": "2.6.2", - "semver": "5.3.0", - "tar": "2.2.1", - "which": "1.3.0" - }, - "dependencies": { - "fstream": { - "version": "1.0.11", - "bundled": true, - "requires": { - "graceful-fs": "4.1.11", - "inherits": "2.0.3", - "mkdirp": "0.5.1", - "rimraf": "2.6.2" - } - }, - "minimatch": { - "version": "3.0.4", - "bundled": true, - "requires": { - "brace-expansion": "1.1.8" - }, - "dependencies": { - "brace-expansion": { - "version": "1.1.8", - "bundled": true, - "requires": { - "balanced-match": "1.0.0", - "concat-map": "0.0.1" - }, - "dependencies": { - "balanced-match": { - "version": "1.0.0", - "bundled": true - }, - "concat-map": { - "version": "0.0.1", - "bundled": true - } - } - } - } - }, - "nopt": { - "version": "3.0.6", - "bundled": true, - "requires": { - "abbrev": "1.1.1" - } - }, - "semver": { - "version": "5.3.0", - "bundled": true - }, - "tar": { - "version": "2.2.1", - "bundled": true, - "requires": { - "block-stream": "0.0.9", - "fstream": "1.0.11", - "inherits": "2.0.3" - }, - "dependencies": { - "block-stream": { - "version": "0.0.9", - "bundled": true, - "requires": { - "inherits": "2.0.3" - } - } - } - } - } - }, "nopt": { "version": "4.0.1", "bundled": true, @@ -13886,7 +13868,7 @@ "version": "2.4.0", "bundled": true, "requires": { - "hosted-git-info": "2.5.0", + "hosted-git-info": "2.6.0", "is-builtin-module": "1.0.0", "semver": "5.5.0", "validate-npm-package-license": "3.0.1" @@ -13919,7 +13901,7 @@ } }, "npm-lifecycle": { - "version": "2.0.0", + "version": "2.0.1", "bundled": true, "requires": { "byline": "5.0.0", @@ -13936,6 +13918,93 @@ "version": "5.0.0", "bundled": true }, + "node-gyp": { + "version": "3.6.2", + "bundled": true, + "requires": { + "fstream": "1.0.11", + "glob": "7.1.2", + "graceful-fs": "4.1.11", + "minimatch": "3.0.4", + "mkdirp": "0.5.1", + "nopt": "3.0.6", + "npmlog": "4.1.2", + "osenv": "0.1.5", + "request": "2.83.0", + "rimraf": "2.6.2", + "semver": "5.3.0", + "tar": "2.2.1", + "which": "1.3.0" + }, + "dependencies": { + "fstream": { + "version": "1.0.11", + "bundled": true, + "requires": { + "graceful-fs": "4.1.11", + "inherits": "2.0.3", + "mkdirp": "0.5.1", + "rimraf": "2.6.2" + } + }, + "minimatch": { + "version": "3.0.4", + "bundled": true, + "requires": { + "brace-expansion": "1.1.11" + }, + "dependencies": { + "brace-expansion": { + "version": "1.1.11", + "bundled": true, + "requires": { + "balanced-match": "1.0.0", + "concat-map": "0.0.1" + }, + "dependencies": { + "balanced-match": { + "version": "1.0.0", + "bundled": true + }, + "concat-map": { + "version": "0.0.1", + "bundled": true + } + } + } + } + }, + "nopt": { + "version": "3.0.6", + "bundled": true, + "requires": { + "abbrev": "1.1.1" + } + }, + "semver": { + "version": "5.3.0", + "bundled": true + }, + "tar": { + "version": "2.2.1", + "bundled": true, + "requires": { + "block-stream": "0.0.9", + "fstream": "1.0.11", + "inherits": "2.0.3" + }, + "dependencies": { + "block-stream": { + "version": "0.0.9", + "bundled": true, + "requires": { + "inherits": "2.0.3" + } + } + } + } + } + }, "resolve-from": { "version": "4.0.0", "bundled": true @@ -13946,7 +14015,7 @@ "version": "6.0.0", "bundled": true, "requires": { - "hosted-git-info": "2.5.0", + "hosted-git-info": "2.6.0", "osenv": "0.1.5", "semver": "5.5.0", "validate-npm-package-name": "3.0.0" @@ -14164,7 +14233,7 @@ "bundled": true, "requires": { "inherits": "2.0.3", - "readable-stream": "2.3.4", + "readable-stream": "2.3.5", "typedarray": "0.0.6" }, "dependencies": { @@ -14180,7 +14249,7 @@ "requires": { "end-of-stream": "1.4.1", "inherits": "2.0.3", - "readable-stream": "2.3.4", + "readable-stream": "2.3.5", "stream-shift": "1.0.0" }, "dependencies": { @@ -14202,7 +14271,7 @@ "bundled": true, "requires": { "inherits": "2.0.3", - "readable-stream": "2.3.4" + "readable-stream": "2.3.5" } }, "from2": { @@ -14210,7 +14279,7 @@ "bundled": true, "requires": { "inherits": "2.0.3", - "readable-stream": "2.3.4" + "readable-stream": "2.3.5" } }, "parallel-transform": { @@ -14219,7 +14288,7 @@ "requires": { "cyclist": "0.2.2", "inherits": "2.0.3", - "readable-stream": "2.3.4" + "readable-stream": "2.3.5" }, "dependencies": { "cyclist": { @@ -14273,7 +14342,7 @@ "version": "2.0.3", "bundled": true, "requires": { - "readable-stream": "2.3.4", + "readable-stream": "2.3.5", "xtend": "4.0.1" }, "dependencies": { @@ -14382,28 +14451,29 @@ } }, "npm-registry-client": { - "version": "8.5.0", + "version": "8.5.1", "bundled": true, "requires": { - "concat-stream": "1.6.0", + "concat-stream": "1.6.1", "graceful-fs": "4.1.11", "normalize-package-data": "2.4.0", - "npm-package-arg": "5.1.2", + "npm-package-arg": "6.0.0", "npmlog": "4.1.2", "once": "1.4.0", "request": "2.83.0", "retry": "0.10.1", + "safe-buffer": "5.1.1", "semver": "5.5.0", "slide": "1.1.6", - "ssri": "4.1.6" + "ssri": "5.2.4" }, "dependencies": { "concat-stream": { - "version": "1.6.0", + "version": "1.6.1", "bundled": true, "requires": { "inherits": "2.0.3", - "readable-stream": "2.3.4", + "readable-stream": "2.3.5", "typedarray": "0.0.6" }, "dependencies": { @@ -14412,23 +14482,6 @@ "bundled": true } } - }, - "npm-package-arg": { - "version": "5.1.2", - "bundled": true, - "requires": { - "hosted-git-info": "2.5.0", - "osenv": "0.1.5", - "semver": "5.5.0", - "validate-npm-package-name": "3.0.0" - } - }, - "ssri": { - "version": "4.1.6", - "bundled": true, - "requires": { - "safe-buffer": "5.1.1" - } } } }, @@ -14451,7 +14504,7 @@ "bundled": true, "requires": { "delegates": "1.0.0", - "readable-stream": "2.3.4" + "readable-stream": "2.3.5" }, "dependencies": { "delegates": { @@ -14572,7 +14625,7 @@ } }, "pacote": { - "version": "7.3.3", + "version": "7.6.1", "bundled": true, "requires": { "bluebird": "3.5.1", @@ -14582,7 +14635,8 @@ "lru-cache": "4.1.1", "make-fetch-happen": "2.6.0", "minimatch": "3.0.4", - "mississippi": "2.0.0", + "mississippi": "3.0.0", + "mkdirp": "0.5.1", "normalize-package-data": "2.4.0", "npm-package-arg": "6.0.0", "npm-packlist": "1.1.10", @@ -14591,10 +14645,11 @@ "promise-inflight": "1.0.1", "promise-retry": "1.1.1", "protoduck": "5.0.0", + "rimraf": "2.6.2", "safe-buffer": "5.1.1", "semver": "5.5.0", "ssri": "5.2.4", - "tar": "4.3.3", + "tar": "4.4.0", "unique-filename": "1.1.0", "which": "1.3.0" }, @@ -14607,11 +14662,11 @@ "version": "2.6.0", "bundled": true, "requires": { - "agentkeepalive": "3.3.0", + "agentkeepalive": "3.4.0", "cacache": "10.0.4", "http-cache-semantics": "3.8.1", - "http-proxy-agent": "2.0.0", - "https-proxy-agent": "2.1.1", + "http-proxy-agent": "2.1.0", + "https-proxy-agent": "2.2.0", "lru-cache": "4.1.1", "mississippi": "1.3.1", "node-fetch-npm": "2.0.2", @@ -14621,7 +14676,7 @@ }, "dependencies": { "agentkeepalive": { - "version": "3.3.0", + "version": "3.4.0", "bundled": true, "requires": { "humanize-ms": "1.2.1" @@ -14647,11 +14702,11 @@ "bundled": true }, "http-proxy-agent": { - "version": "2.0.0", + "version": "2.1.0", "bundled": true, "requires": { "agent-base": "4.2.0", - "debug": "2.6.9" + "debug": "3.1.0" }, "dependencies": { "agent-base": { @@ -14677,7 +14732,7 @@ } }, "debug": { - "version": "2.6.9", + "version": "3.1.0", "bundled": true, "requires": { "ms": "2.0.0" @@ -14692,7 +14747,7 @@ } }, "https-proxy-agent": { - "version": "2.1.1", + "version": "2.2.0", "bundled": true, "requires": { "agent-base": "4.2.0", @@ -14740,8 +14795,8 @@ "version": "1.3.1", "bundled": true, "requires": { - "concat-stream": "1.6.0", - "duplexify": "3.5.3", + "concat-stream": "1.6.1", + "duplexify": "3.5.4", "end-of-stream": "1.4.1", "flush-write-stream": "1.0.2", "from2": "2.3.0", @@ -14753,11 +14808,11 @@ }, "dependencies": { "concat-stream": { - "version": "1.6.0", + "version": "1.6.1", "bundled": true, "requires": { "inherits": "2.0.3", - "readable-stream": "2.3.4", + "readable-stream": "2.3.5", "typedarray": "0.0.6" }, "dependencies": { @@ -14768,12 +14823,12 @@ } }, "duplexify": { - "version": "3.5.3", + "version": "3.5.4", "bundled": true, "requires": { "end-of-stream": "1.4.1", "inherits": "2.0.3", - "readable-stream": "2.3.4", + "readable-stream": "2.3.5", "stream-shift": "1.0.0" }, "dependencies": { @@ -14795,7 +14850,7 @@ "bundled": true, "requires": { "inherits": "2.0.3", - "readable-stream": "2.3.4" + "readable-stream": "2.3.5" } }, "from2": { @@ -14803,7 +14858,7 @@ "bundled": true, "requires": { "inherits": "2.0.3", - "readable-stream": "2.3.4" + "readable-stream": "2.3.5" } }, "parallel-transform": { @@ -14812,7 +14867,7 @@ "requires": { "cyclist": "0.2.2", "inherits": "2.0.3", - "readable-stream": "2.3.4" + "readable-stream": "2.3.5" }, "dependencies": { "cyclist": { @@ -14833,7 +14888,7 @@ "version": "1.4.0", "bundled": true, "requires": { - "duplexify": "3.5.3", + "duplexify": "3.5.4", "inherits": "2.0.3", "pump": "2.0.1" }, @@ -14866,7 +14921,7 @@ "version": "2.0.3", "bundled": true, "requires": { - "readable-stream": "2.3.4", + "readable-stream": "2.3.5", "xtend": "4.0.1" }, "dependencies": { @@ -14985,138 +15040,6 @@ } } }, - "mississippi": { - "version": "2.0.0", - "bundled": true, - "requires": { - "concat-stream": "1.6.0", - "duplexify": "3.5.3", - "end-of-stream": "1.4.1", - "flush-write-stream": "1.0.2", - "from2": "2.3.0", - "parallel-transform": "1.1.0", - "pump": "2.0.1", - "pumpify": "1.4.0", - "stream-each": "1.2.2", - "through2": "2.0.3" - }, - "dependencies": { - "concat-stream": { - "version": "1.6.0", - "bundled": true, - "requires": { - "inherits": "2.0.3", - "readable-stream": "2.3.4", - "typedarray": "0.0.6" - }, - "dependencies": { - "typedarray": { - "version": "0.0.6", - "bundled": true - } - } - }, - "duplexify": { - "version": "3.5.3", - "bundled": true, - "requires": { - "end-of-stream": "1.4.1", - "inherits": "2.0.3", - "readable-stream": "2.3.4", - "stream-shift": "1.0.0" - }, - "dependencies": { - "stream-shift": { - "version": "1.0.0", - "bundled": true - } - } - }, - "end-of-stream": { - "version": "1.4.1", - "bundled": true, - "requires": { - "once": "1.4.0" - } - }, - "flush-write-stream": { - "version": "1.0.2", - "bundled": true, - "requires": { - "inherits": "2.0.3", - "readable-stream": "2.3.4" - } - }, - "from2": { - "version": "2.3.0", - "bundled": true, - "requires": { - "inherits": "2.0.3", - "readable-stream": "2.3.4" - } - }, - "parallel-transform": { - "version": "1.1.0", - "bundled": true, - "requires": { - "cyclist": "0.2.2", - "inherits": "2.0.3", - "readable-stream": "2.3.4" - }, - "dependencies": { - "cyclist": { - "version": "0.2.2", - "bundled": true - } - } - }, - "pump": { - "version": "2.0.1", - "bundled": true, - "requires": { - "end-of-stream": "1.4.1", - "once": "1.4.0" - } - }, - "pumpify": { - "version": "1.4.0", - "bundled": true, - "requires": { - "duplexify": "3.5.3", - "inherits": "2.0.3", - "pump": "2.0.1" - } - }, - "stream-each": { - "version": "1.2.2", - "bundled": true, - "requires": { - "end-of-stream": "1.4.1", - "stream-shift": "1.0.0" - }, - "dependencies": { - "stream-shift": { - "version": "1.0.0", - "bundled": true - } - } - }, - "through2": { - "version": "2.0.3", - "bundled": true, - "requires": { - "readable-stream": "2.3.4", - "xtend": "4.0.1" - }, - "dependencies": { - "xtend": { - "version": "4.0.1", - "bundled": true - } - } - } - } - }, "npm-pick-manifest": { "version": "2.1.0", "bundled": true, @@ -15151,10 +15074,6 @@ "bundled": true } } - }, - "semver": { - "version": "5.5.0", - "bundled": true } } }, @@ -15223,7 +15142,7 @@ "requires": { "debuglog": "1.0.1", "graceful-fs": "4.1.11", - "read-package-json": "2.0.12", + "read-package-json": "2.0.13", "readdir-scoped-modules": "1.0.2", "semver": "5.5.0", "slide": "1.1.6", @@ -15237,7 +15156,7 @@ } }, "read-package-json": { - "version": "2.0.12", + "version": "2.0.13", "bundled": true, "requires": { "glob": "7.1.2", @@ -15264,12 +15183,12 @@ "debuglog": "1.0.1", "dezalgo": "1.0.3", "once": "1.4.0", - "read-package-json": "2.0.12", + "read-package-json": "2.0.13", "readdir-scoped-modules": "1.0.2" } }, "readable-stream": { - "version": "2.3.4", + "version": "2.3.5", "bundled": true, "requires": { "core-util-is": "1.0.2", @@ -15686,7 +15605,7 @@ "bundled": true, "requires": { "graceful-fs": "4.1.11", - "readable-stream": "2.3.4" + "readable-stream": "2.3.5" } }, "slide": { @@ -15743,7 +15662,7 @@ "version": "1.2.0", "bundled": true, "requires": { - "readable-stream": "2.3.4", + "readable-stream": "2.3.5", "stream-shift": "1.0.0" }, "dependencies": { @@ -15776,7 +15695,7 @@ } }, "tar": { - "version": "4.3.3", + "version": "4.4.0", "bundled": true, "requires": { "chownr": "1.0.1", @@ -16094,7 +16013,7 @@ "graceful-fs": "4.1.11", "make-dir": "1.0.0", "unique-string": "1.0.0", - "write-file-atomic": "2.1.0", + "write-file-atomic": "2.3.0", "xdg-basedir": "3.0.0" }, "dependencies": { @@ -16407,7 +16326,7 @@ } }, "worker-farm": { - "version": "1.5.2", + "version": "1.5.4", "bundled": true, "requires": { "errno": "0.1.7", @@ -16438,12 +16357,18 @@ "bundled": true }, "write-file-atomic": { - "version": "2.1.0", + "version": "2.3.0", "bundled": true, "requires": { "graceful-fs": "4.1.11", "imurmurhash": "0.1.4", - "slide": "1.1.6" + "signal-exit": "3.0.2" + }, + "dependencies": { + "signal-exit": { + "version": "3.0.2", + "bundled": true + } } } } diff --git a/package.json b/package.json index a622cc66e..64f01d4ff 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "fs-extra": "^5.0.0", "material-design-lite": "^1.3.0", "mg-crud": "^1.1.2", - "npm": "^5.7.1", + "npm": "^5.8.0", "oclazyload": "^0.6.3", "require-yaml": "0.0.1", "validator": "^6.2.1" diff --git a/services/client/server/model-config.json b/services/client/server/model-config.json index ca33ffc1e..3bed51e41 100644 --- a/services/client/server/model-config.json +++ b/services/client/server/model-config.json @@ -8,9 +8,6 @@ "ClientObservation": { "dataSource": "vn" }, - "Company": { - "dataSource": "vn" - }, "Greuge": { "dataSource": "vn" }, diff --git a/services/client/common/models/company.json b/services/loopback/common/models/company.json similarity index 100% rename from services/client/common/models/company.json rename to services/loopback/common/models/company.json diff --git a/services/loopback/server/model-config.json b/services/loopback/server/model-config.json index 597f45c4b..0067d4557 100644 --- a/services/loopback/server/model-config.json +++ b/services/loopback/server/model-config.json @@ -39,6 +39,9 @@ "ClientCreditLimit": { "dataSource": "vn" }, + "Company": { + "dataSource": "vn" + }, "ContactChannel": { "dataSource": "vn" },