diff --git a/client/client/src/card/card.html b/client/client/src/card/card.html index c40a20169a..626a81d71d 100644 --- a/client/client/src/card/card.html +++ b/client/client/src/card/card.html @@ -7,7 +7,7 @@ - + diff --git a/client/client/src/descriptor/descriptor.html b/client/client/src/descriptor/descriptor.html index a535c0d5e4..c7c2349744 100644 --- a/client/client/src/descriptor/descriptor.html +++ b/client/client/src/descriptor/descriptor.html @@ -24,6 +24,9 @@ {{$ctrl.client.creditInsurance | currency:'€':2}} - +
+ Sales person {{$ctrl.client.salesPerson.firstName}} {{$ctrl.client.salesPerson.name}} +
- - - - - - - - - -
{{$ctrl.item.id}}
-
-
-
- -
-
+ + + + + + +
{{$ctrl.item.id}}
+
+
+
Basic data
diff --git a/client/salix/src/styles/misc.scss b/client/salix/src/styles/misc.scss index b7fbde50ea..6c74565a7f 100644 --- a/client/salix/src/styles/misc.scss +++ b/client/salix/src/styles/misc.scss @@ -235,4 +235,10 @@ fieldset[disabled] .mdl-checkbox .mdl-checkbox__label, .mdl-checkbox.is-disabled fieldset[disabled] .mdl-textfield .mdl-textfield__label, .mdl-textfield.is-disabled.is-disabled .mdl-textfield__label { color: rgb(255,171,64) !important; } -/** END - FORM ELEMENTS DISABLED **/ \ No newline at end of file +/** END - FORM ELEMENTS DISABLED **/ + +.ellipsize { + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden +} \ No newline at end of file diff --git a/services/client/common/models/address-observation.json b/services/client/common/models/address-observation.json index 53b6155ec6..147e19f079 100644 --- a/services/client/common/models/address-observation.json +++ b/services/client/common/models/address-observation.json @@ -8,27 +8,27 @@ } }, "properties": { - "id": { - "type": "Number", - "id": true, - "description": "Identifier" - }, - "description": { - "type": "string", - "required": true - } + "id": { + "type": "Number", + "id": true, + "description": "Identifier" + }, + "description": { + "type": "string", + "required": true + } }, "relations": { - "address": { - "type": "belongsTo", - "model": "Address", - "foreignKey": "addressFk" - }, - "observationType": { - "type": "belongsTo", - "model": "ObservationType", - "foreignKey": "observationTypeFk" - } + "address": { + "type": "belongsTo", + "model": "Address", + "foreignKey": "addressFk" + }, + "observationType": { + "type": "belongsTo", + "model": "ObservationType", + "foreignKey": "observationTypeFk" + } } - } +} \ No newline at end of file diff --git a/services/loopback/common/methods/client/specs/getAverageInvoiced.spec.js b/services/loopback/common/methods/client/specs/getAverageInvoiced.spec.js new file mode 100644 index 0000000000..46072461a9 --- /dev/null +++ b/services/loopback/common/methods/client/specs/getAverageInvoiced.spec.js @@ -0,0 +1,18 @@ +const getAverageInvoiced = require('../getAverageInvoiced'); +const {rawSql} = require('./helpers'); +const model = { + remoteMethod: () => {} +}; + +rawSql(model); +getAverageInvoiced(model); + +describe('client getAverageInvoiced()', () => { + it('should call the getAverageInvoiced method', done => { + model.getAverageInvoiced(101) + .then(response => { + expect(response.invoiced).toEqual(0); + done(); + }); + }); +});