verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 56 Releases Wiki Activity

added Agency module

This commit is contained in:
Joan Sanchez 2018-09-25 08:53:57 +02:00
parent 7afa99f25d
commit 4388a6dbff
43 changed files with 3862 additions and 3784 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/agency/index.js Normal file
View File

@ -0,0 +1 @@
export * from './src';

58
client/agency/routes.json Normal file
View File

@ -0,0 +1,58 @@
{
"module": "agency",
"name": "Agencies",
"icon" : "local_shipping",
"validations" : true,
"routes": [
{
"url": "/zone",
"state": "zone",
"abstract": true,
"component": "ui-view",
"description": "Zones"
},
{
"url": "/index?q",
"state": "zone.index",
"component": "vn-zone-index",
"description": "List",
"acl": ["developer"]
},
{
"url": "/create",
"state": "zone.create",
"component": "vn-zone-create",
"description": "New zone"
},
{
"url": "/:id",
"state": "zone.card",
"abstract": true,
"component": "vn-zone-card"
},
{
"url": "/basic-data",
"state": "zone.card.basicData",
"component": "vn-zone-basic-data",
"description": "Basic data",
"params": {
"zone": "$ctrl.zone"
},
"menu": {
"icon": "settings"
}
},
{
"url": "/delivery-day",
"state": "zone.card.deliveryDay",
"component": "vn-zone-delivery-day",
"description": "Delivery days",
"params": {
"zone": "$ctrl.zone"
},
"menu": {
"icon": "today"
}
}
]
}

11
client/agency/src/index.js Normal file
View File

@ -0,0 +1,11 @@
export * from './module';
// import components
import './zone/card';
import './zone/descriptor';
import './zone/search-panel';
import './zone/index';
import './zone/create';
import './zone/basic-data';
import './zone/delivery-day';
import './zone/calendar';

1
client/agency/src/locale/en.yml Normal file
View File

@ -0,0 +1 @@
Agencies: Agencies

11
client/agency/src/locale/es.yml Normal file
View File

@ -0,0 +1,11 @@
Name: Nombre
Agency: Agencia
Warehouse: Almacén
Hour: Hora (ETD)
Price: Precio
Create: Crear
Zones: Zonas
List: Listado
New zone: Nueva zona
Basic data: Datos básicos

5
client/agency/src/module.js Normal file
View File

@ -0,0 +1,5 @@
import {ng} from 'vendor';
import 'core';
const ngModule = ng.module('agency', ['vnCore']);
export default ngModule;

6
client/route/src/zone/basic-data/index.html → client/agency/src/zone/basic-data/index.html
View File

@ -1,4 +1,4 @@
<mg-ajax path="/route/api/Zones/{{patch.params.id}}" options="vnPatch"></mg-ajax>
<mg-ajax path="/agency/api/Zones/{{patch.params.id}}" options="vnPatch"></mg-ajax>
<vn-watcher
vn-id="watcher"
data="$ctrl.zone"
@ -18,7 +18,7 @@
<vn-autocomplete
vn-one
field="$ctrl.zone.warehouseFk"
url="/route/api/Warehouses"
url="/agency/api/Warehouses"
show-field="name"
value-field="id"
label="Warehouse">
@ -26,7 +26,7 @@
<vn-autocomplete
vn-one
field="$ctrl.zone.agencyModeFk"
url="/route/api/AgencyModes"
url="/agency/api/AgencyModes"
show-field="name"
value-field="id"
label="Agency">

0
client/route/src/zone/basic-data/index.js → client/agency/src/zone/basic-data/index.js
View File

0
client/route/src/zone/calendar/index.html → client/agency/src/zone/calendar/index.html
View File

0
client/route/src/zone/calendar/index.js → client/agency/src/zone/calendar/index.js
View File

0
client/route/src/zone/card/index.html → client/agency/src/zone/card/index.html
View File

2
client/route/src/zone/card/index.js → client/agency/src/zone/card/index.js
View File

@ -18,7 +18,7 @@ class Controller {
]
};
let json = encodeURIComponent(JSON.stringify(filter));
let query = `/route/api/Zones/${this.$stateParams.id}?filter=${json}`;
let query = `/agency/api/Zones/${this.$stateParams.id}?filter=${json}`;
this.$http.get(query).then(res => {
if (res.data)
this.zone = res.data;

6
client/route/src/zone/card/index.spec.js → client/agency/src/zone/card/index.spec.js
View File

@ -1,6 +1,6 @@
import './index.js';
describe('Route', () => {
describe('Agency', () => {
describe('Component vnZoneCard', () => {
let $componentController;
let $scope;
@ -9,7 +9,7 @@ describe('Route', () => {
let $stateParams;
beforeEach(() => {
angular.mock.module('route');
angular.mock.module('agency');
});
beforeEach(angular.mock.inject((_$componentController_, $rootScope, _$httpBackend_) => {
@ -30,7 +30,7 @@ describe('Route', () => {
]
};
let json = encodeURIComponent(JSON.stringify(filter));
$httpBackend.expectGET(`/route/api/Zones/1?filter=${json}`).respond({id: 1});
$httpBackend.expectGET(`/agency/api/Zones/1?filter=${json}`).respond({id: 1});
controller.getCard();
$httpBackend.flush();

6
client/route/src/zone/create/index.html → client/agency/src/zone/create/index.html
View File

@ -1,4 +1,4 @@
<mg-ajax path="/route/api/Zones" options="vnPost"></mg-ajax>
<mg-ajax path="/agency/api/Zones" options="vnPost"></mg-ajax>
<vn-watcher
vn-id="watcher"
data="$ctrl.zone"
@ -19,7 +19,7 @@
<vn-autocomplete
vn-one
field="$ctrl.zone.warehouseFk"
url="/route/api/Warehouses"
url="/agency/api/Warehouses"
show-field="name"
value-field="id"
label="Warehouse">
@ -27,7 +27,7 @@
<vn-autocomplete
vn-one
field="$ctrl.zone.agencyModeFk"
url="/route/api/AgencyModes"
url="/agency/api/AgencyModes"
show-field="name"
value-field="id"
label="Agency">

0
client/route/src/zone/create/index.js → client/agency/src/zone/create/index.js
View File

5
client/route/src/zone/create/index.spec.js → client/agency/src/zone/create/index.spec.js
View File

@ -1,7 +1,7 @@
import './index';
import {watcher} from '../../../../helpers/watcherHelper';
describe('Route', () => {
describe('Agency', () => {
describe('Component vnZoneCreate', () => {
let $componentController;
let $httpBackend;
@ -10,14 +10,13 @@ describe('Route', () => {
let controller;
beforeEach(() => {
angular.mock.module('route');
angular.mock.module('agency');
});
beforeEach(angular.mock.inject((_$componentController_, $rootScope, _$httpBackend_, _$state_) => {
$componentController = _$componentController_;
$httpBackend = _$httpBackend_;
$httpBackend.when('GET', /\/locale\/\w+\/[a-z]{2}\.json/).respond({});
$httpBackend.when('GET', 'claim/api/Claims/ClaimBeginnings').respond({});
$scope = $rootScope.$new();
$state = _$state_;
$scope.watcher = watcher;

0
client/route/src/zone/create/locale/es.yml → client/agency/src/zone/create/locale/es.yml
View File

0
client/route/src/zone/delivery-day/index.html → client/agency/src/zone/delivery-day/index.html
View File

0
client/route/src/zone/delivery-day/index.js → client/agency/src/zone/delivery-day/index.js
View File

0
client/route/src/zone/descriptor/index.html → client/agency/src/zone/descriptor/index.html
View File

0
client/route/src/zone/descriptor/index.js → client/agency/src/zone/descriptor/index.js
View File

4
client/route/src/zone/index/index.html → client/agency/src/zone/index/index.html
View File

@ -1,6 +1,6 @@
<vn-crud-model
vn-id="model"
url="/route/api/Zones"
url="/agency/api/Zones"
filter="::$ctrl.filter"
limit="20"
data="zones"
@ -51,5 +51,5 @@
</div>
<a ui-sref="zone.create" vn-tooltip="New zone" vn-bind="+" fixed-bottom-right>
<vn-float-button icon="add_location"></vn-float-button>
<vn-float-button icon="add"></vn-float-button>
</a>

0
client/route/src/zone/index/index.js → client/agency/src/zone/index/index.js
View File

4
client/route/src/zone/index/index.spec.js → client/agency/src/zone/index/index.spec.js
View File

@ -1,12 +1,12 @@
import './index.js';
describe('Route', () => {
describe('Agency', () => {
describe('Component vnZoneIndex', () => {
let $componentController;
let controller;
beforeEach(() => {
angular.mock.module('route');
angular.mock.module('agency');
});
beforeEach(angular.mock.inject(_$componentController_ => {

0
client/route/src/zone/search-panel/index.html → client/agency/src/zone/search-panel/index.html
View File

0
client/route/src/zone/search-panel/index.js → client/agency/src/zone/search-panel/index.js
View File

1
client/modules.yml
View File

@ -7,3 +7,4 @@ ticket: [item, client]
order: [item, ticket]
claim: [item, client]
route: []
agency: []

52
client/route/routes.json
View File

@ -4,7 +4,7 @@
"icon" : "local_shipping",
"validations" : true,
"routes": [
/* {
{
"url": "/route",
"state": "route",
"abstract": true,
@ -17,56 +17,6 @@
"component": "vn-route-index",
"description": "List",
"acl": ["developer"]
}, */
{
"url": "/zone",
"state": "zone",
"abstract": true,
"component": "ui-view",
"description": "Zones"
},
{
"url": "/index?q",
"state": "zone.index",
"component": "vn-zone-index",
"description": "List",
"acl": ["developer"]
},
{
"url": "/create",
"state": "zone.create",
"component": "vn-zone-create",
"description": "New zone"
},
{
"url": "/:id",
"state": "zone.card",
"abstract": true,
"component": "vn-zone-card"
},
{
"url": "/basic-data",
"state": "zone.card.basicData",
"component": "vn-zone-basic-data",
"description": "Basic data",
"params": {
"zone": "$ctrl.zone"
},
"menu": {
"icon": "settings"
}
},
{
"url": "/delivery-day",
"state": "zone.card.deliveryDay",
"component": "vn-zone-delivery-day",
"description": "Delivery days",
"params": {
"zone": "$ctrl.zone"
},
"menu": {
"icon": "today"
}
}
]
}

8
client/route/src/index.js
View File

@ -1,11 +1,3 @@
export * from './module';
// import components
import './zone/card';
import './zone/descriptor';
import './zone/search-panel';
import './zone/index';
import './zone/create';
import './zone/basic-data';
import './zone/delivery-day';
import './zone/calendar';

13
client/route/src/locale/es.yml
View File

@ -1,11 +1,2 @@
Name: Nombre
Agency: Agencia
Warehouse: Almacén
Hour: Hora (ETD)
Price: Precio
Create: Crear
Zones: Zonas
List: Listado
New zone: Nueva zona
Basic data: Datos básicos
Routes: Rutas
List: Listado

3
client/salix/src/locale/es.yml
View File

@ -25,4 +25,5 @@ Return to module index: Volver a la página principal del módulo
Routes: Rutas
What is new: Novedades de la versión
Web Account inactive: Sin acceso Web
Orders: Pedidos
Orders: Pedidos
Agencies: Agencias

4
client/spliting.js
View File

@ -10,5 +10,7 @@ export default {
order:
cb => require.ensure([], () => cb(require('order'))),
claim:
cb => require.ensure([], () => cb(require('claim')))
cb => require.ensure([], () => cb(require('claim'))),
agency:
cb => require.ensure([], () => cb(require('agency')))
};

7390
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

5
services/agency/Dockerfile Normal file
View File

@ -0,0 +1,5 @@
FROM vn-loopback:latest
COPY route /app
WORKDIR /app
CMD ["pm2-docker", "./server/server.js"]

0
services/route/common/models/zone-calendar.json → services/agency/common/models/zone-calendar.json
View File

0
services/route/common/models/zone-geo.json → services/agency/common/models/zone-geo.json
View File

0
services/route/common/models/zone-included.json → services/agency/common/models/zone-included.json
View File

0
services/route/common/models/zone.js → services/agency/common/models/zone.js
View File

0
services/route/common/models/zone.json → services/agency/common/models/zone.json
View File

19
services/agency/package.json Normal file
View File

@ -0,0 +1,19 @@
{
"name": "vn-agency",
"version": "1.0.0",
"main": "server/server.js",
"scripts": {
"lint": "eslint .",
"start": "node .",
"posttest": "npm run lint && nsp check"
},
"repository": {
"type": "git",
"url": "https://git.verdnatura.es/salix"
},
"license": "GPL-3.0",
"description": "vn-agency",
"dependencies": {
"vn-loopback": "file:../loopback"
}
}

14
services/agency/server/model-config.json Normal file
View File

@ -0,0 +1,14 @@
{
"Zone": {
"dataSource": "vn"
},
"ZoneGeo": {
"dataSource": "vn"
},
"ZoneCalendar": {
"dataSource": "vn"
},
"ZoneIncluded": {
"dataSource": "vn"
}
}

5
services/agency/server/server.js Normal file
View File

@ -0,0 +1,5 @@
var vnLoopback = require('vn-loopback/server/server.js');
var app = module.exports = vnLoopback.loopback();
vnLoopback.boot(app, __dirname, module);

12
services/route/server/model-config.json
View File

@ -4,17 +4,5 @@
},
"Vehicle": {
"dataSource": "vn"
},
"Zone": {
"dataSource": "vn"
},
"ZoneGeo": {
"dataSource": "vn"
},
"ZoneCalendar": {
"dataSource": "vn"
},
"ZoneIncluded": {
"dataSource": "vn"
}
}