section no longer nukes salesPerson-user relation #353

Merged
carlosjr merged 3 commits from 2365-claim_descriptor_bug into dev 2020-08-14 16:30:39 +00:00
5 changed files with 1733 additions and 875 deletions

View File

@ -36,7 +36,7 @@ module.exports = Self => {
relation: 'client', relation: 'client',
scope: { scope: {
include: { include: {
relation: 'salesPerson' relation: 'salesPersonUser'
} }
} }
} }

View File

@ -34,17 +34,7 @@ class Controller extends ModuleCard {
scope: { scope: {
fields: ['salesPersonFk', 'name', 'email'], fields: ['salesPersonFk', 'name', 'email'],
include: { include: {
relation: 'salesPerson', relation: 'salesPersonUser'
scope: {
fields: ['userFk'],
include: {
relation: 'user',
scope: {
fields: ['nickname']
}
}
}
} }
} }
} }

View File

@ -33,7 +33,7 @@
</vn-label-value> </vn-label-value>
<vn-label-value <vn-label-value
label="Salesperson" label="Salesperson"
value="{{$ctrl.claim.client.salesPerson.user.nickname}}"> value="{{$ctrl.claim.client.salesPersonUser.nickname}}">
</vn-label-value> </vn-label-value>
<vn-label-value <vn-label-value
label="Attended by" label="Attended by"

2570
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -40,7 +40,7 @@
"@babel/core": "^7.7.7", "@babel/core": "^7.7.7",
"@babel/plugin-syntax-dynamic-import": "^7.7.4", "@babel/plugin-syntax-dynamic-import": "^7.7.4",
"@babel/polyfill": "^7.7.0", "@babel/polyfill": "^7.7.0",
"@babel/preset-env": "^7.7.7", "@babel/preset-env": "^7.11.0",
"@babel/register": "^7.7.7", "@babel/register": "^7.7.7",
"angular-mocks": "^1.7.9", "angular-mocks": "^1.7.9",
"babel-jest": "^26.0.1", "babel-jest": "^26.0.1",