#814 Service modules moved to project root, models reclassified

client/package.json

@@ -0,0 +1,27 @@
+{
+	"name": "salix-client",
+	"version": "1.0.0",
+	"description": "Salix client",
+	"license": "GPL-3.0",
+	"repository": {
+		"type": "git",
+		"url": "https://git.verdnatura.es/salix"
+	},
+	"dependencies": {
+		"@babel/polyfill": "^7.2.3",
+		"@uirouter/angularjs": "^1.0.20",
+		"angular": "^1.7.4",
+		"angular-cookies": "^1.7.4",
+		"angular-translate": "^2.18.1",
+		"angular-translate-loader-partial": "^2.18.1",
+		"flatpickr": "^4.5.2",
+		"fs-extra": "^5.0.0",
+		"js-yaml": "^3.12.0",
+		"material-design-lite": "^1.3.0",
+		"mg-crud": "^1.1.2",
+		"npm": "^5.10.0",
+		"oclazyload": "^0.6.3",
+		"require-yaml": "0.0.1",
+		"validator": "^6.3.0"
+	}
+}

client/salix/src/config-routes.js

@@ -1,6 +1,6 @@
 import ngModule from './module';
-import deps from 'client/modules.yml';
-import modules from 'client/spliting';
+import deps from 'modules.yml';
+import modules from 'spliting';
 import splitingRegister from 'core/src/lib/spliting-register';
 
 function loader(moduleName, validations) {
@@ -22,9 +22,9 @@ function config($stateProvider, $urlRouterProvider, aclServiceProvider, modulesF
         let params = '';
         let temporalParams = [];
 
-        if (!route.params) {
+        if (!route.params)
             return params;
-        }
+
 
         Object.keys(route.params).forEach(key => {
             temporalParams.push(`${key} = "${route.params[key]}"`);
@@ -69,9 +69,8 @@ function config($stateProvider, $urlRouterProvider, aclServiceProvider, modulesF
                         configRoute.params = route.routeParams;
 
                     $stateProvider.state(route.state, configRoute);
-                } else if (route.state === mainModule.state) {
+                } else if (route.state === mainModule.state)
                     break;
-                }
             }
         }
     }

client/vendor/src/angular-paging.js

@@ -1,5 +0,0 @@
-import 'angular-paging';
-
-export const angularPaging = {
-    name: 'bw.paging'
-};

client/vendor/src/vendor.js

@@ -1,7 +1,6 @@
 export * from './angular';
 export * from './angular-cookies';
 export * from './angular-translate';
-export * from './angular-paging';
 export * from './angular-ui-router';
 export * from './mg-crud';
 export * from './oc-lazy-load';

modules/agency/model-config.json

@@ -1,11 +1,20 @@
 {
+  "Agency": {
+      "dataSource": "vn"
+  },
+  "AgencyMode": {
+      "dataSource": "vn"
+  },
+  "DeliveryMethod": {
+      "dataSource": "vn"
+  },
   "Zone": {
     "dataSource": "vn"
   },
-  "ZoneGeo": {
+  "ZoneCalendar": {
     "dataSource": "vn"
   },
-  "ZoneCalendar": {
+  "ZoneGeo": {
     "dataSource": "vn"
   },
   "ZoneIncluded": {

modules/claim/methods/claim/updateClaim.js

@@ -1,4 +1,4 @@
-const UserError = require('../../../common/helpers').UserError;
+const UserError = require('vn-loopback/common/helpers').UserError;
 let pick = require('object.pick');
 let diff = require('object-diff');
 
@@ -23,7 +23,7 @@ module.exports = Self => {
         }
     });
 
-    Self.updateClaim = async (ctx, params) => {
+    Self.updateClaim = async(ctx, params) => {
         let models = Self.app.models;
         let isSalesAssistant;
         let token = ctx.req.accessToken;

modules/claim/model-config.json

@@ -1,23 +1,35 @@
 {
-    "ClaimState": {
+    "Claim": {
+        "dataSource": "vn"
+    },
+    "ClaimBeginning": {
+        "dataSource": "vn"
+    },
+    "ClaimDestination": {
+        "dataSource": "vn"
+    },
+    "ClaimDevelopment": {
+        "dataSource": "vn"
+    },
+    "ClaimEnd": {
+        "dataSource": "vn"
+    },
+    "ClaimRatio": {
         "dataSource": "vn"
     },
     "ClaimReason": {
         "dataSource": "vn"
     },
-    "ClaimResult": {
-        "dataSource": "vn"
-    },
     "ClaimRedelivery": {
         "dataSource": "vn"
     },
     "ClaimResponsible": {
         "dataSource": "vn"
     },
-    "ClaimEnd": {
+    "ClaimResult": {
         "dataSource": "vn"
     },
-    "ClaimDevelopment": {
+    "ClaimState": {
         "dataSource": "vn"
-    }               
+    }         
 }

modules/client/methods/client/activeWorkersWithRole.js

@@ -1,6 +1,6 @@
 const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
-const buildFilter = require('../../filter.js').buildFilter;
-const mergeFilters = require('../../filter.js').mergeFilters;
+const buildFilter = require('vn-loopback/common/filter').buildFilter;
+const mergeFilters = require('vn-loopback/common/filter').mergeFilters;
 
 module.exports = Self => {
     Self.remoteMethod('activeWorkersWithRole', {

modules/client/methods/client/updateFiscalData.js

@@ -1,4 +1,4 @@
-let UserError = require('../../helpers').UserError;
+let UserError = require('vn-loopback/common/helpers').UserError;
 
 module.exports = Self => {
     Self.remoteMethodCtx('updateFiscalData', {

modules/client/methods/receipt/filter.js

@@ -1,4 +1,4 @@
-const ParameterizedSQL = require('vn-loopback/node_modules/loopback-connector').ParameterizedSQL;
+const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
 
 module.exports = Self => {
     Self.remoteMethod('filter', {

modules/client/model-config.json

@@ -1,17 +1,44 @@
 {
+    "Address": {
+        "dataSource": "vn"
+    },
     "AddressObservation": {
         "dataSource": "vn"
     },
     "BankEntity": {
         "dataSource": "vn"
     },
+    "Client": {
+        "dataSource": "vn"
+    },
+    "ClientContact": {
+        "dataSource": "vn"
+    },
     "ClientCredit": {
         "dataSource": "vn"
     },
+    "ClientCreditLimit": {
+        "dataSource": "vn"
+    },
+    "ClientLog": {
+        "dataSource": "vn"
+    },
     "ClientObservation": {
         "dataSource": "vn"
     },
-    "ClientContact": {
+    "ClientRisk": {
+        "dataSource": "vn"
+    },
+    "ContactChannel": {
+        "dataSource": "vn"
+    },
+    "CreditClassification": {
+        "dataSource": "vn"
+    },
+    "CreditInsurance": {
+        "dataSource": "vn"
+    },
+    "Defaulter": {
         "dataSource": "vn"
     },
     "Greuge": {
@@ -20,6 +47,9 @@
     "GreugeType": {
         "dataSource": "vn"
     },
+    "InvoiceOut": {
+        "dataSource": "vn"
+    },
     "Mandate": {
         "dataSource": "vn"
     },
@@ -29,18 +59,15 @@
     "ObservationType": {
         "dataSource": "vn"
     },
+    "PayMethod": {
+        "dataSource": "vn"
+    },
+    "Receipt": {
+        "dataSource": "vn"
+    },
     "Recovery": {
         "dataSource": "vn"
     },
-    "InvoiceOut": {
-        "dataSource": "vn"
-    },
-    "CreditInsurance": {
-        "dataSource": "vn"
-    },
-    "CreditClassification": {
-        "dataSource": "vn"
-    },
     "Sample": {
         "dataSource": "vn"
     },
@@ -55,14 +82,5 @@
     },
     "TpvResponse": {
         "dataSource": "vn"
-    },
-    "Defaulter": {
-        "dataSource": "vn"
-    },
-    "ClientRisk": {
-        "dataSource": "vn"
-    },
-    "Receipt": {
-        "dataSource": "vn"
     }
 }

modules/client/models/address.js

@@ -1,6 +1,6 @@
-let UserError = require('../helpers').UserError;
-let getFinalState = require('../helpers').getFinalState;
-let isMultiple = require('../helpers').isMultiple;
+let UserError = require('vn-loopback/common/helpers').UserError;
+let getFinalState = require('vn-loopback/common/helpers').getFinalState;
+let isMultiple = require('vn-loopback/common/helpers').isMultiple;
 
 module.exports = Self => {
     Self.validate('isDefaultAddress', isActive,

modules/client/models/client.js

@@ -1,6 +1,6 @@
-let UserError = require('../helpers').UserError;
-let getFinalState = require('../helpers').getFinalState;
-let isMultiple = require('../helpers').isMultiple;
+let UserError = require('vn-loopback/common/helpers').UserError;
+let getFinalState = require('vn-loopback/common/helpers').getFinalState;
+let isMultiple = require('vn-loopback/common/helpers').isMultiple;
 
 module.exports = Self => {
     // Methods