diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js
index 0172ca4e0..e757ca385 100644
--- a/e2e/helpers/selectors.js
+++ b/e2e/helpers/selectors.js
@@ -308,7 +308,7 @@ export default {
anyClient: 'vn-client-defaulter-index vn-tbody > vn-tr',
firstClientName: 'vn-client-defaulter-index vn-tbody > vn-tr:nth-child(1) > vn-td:nth-child(2) > span',
firstSalesPersonName: 'vn-client-defaulter-index vn-tbody > vn-tr:nth-child(1) > vn-td:nth-child(3) > span',
- firstObservation: 'vn-client-defaulter-index vn-tbody > vn-tr:nth-child(1) > vn-td:nth-child(5) > vn-textarea[ng-model="defaulter.observation"]',
+ firstObservation: 'vn-client-defaulter-index vn-tbody > vn-tr:nth-child(1) > vn-td:nth-child(6) > vn-textarea[ng-model="defaulter.observation"]',
allDefaulterCheckbox: 'vn-client-defaulter-index vn-thead vn-multi-check',
addObservationButton: 'vn-client-defaulter-index vn-button[icon="icon-notes"]',
observation: '.vn-dialog.shown vn-textarea[ng-model="$ctrl.defaulter.observation"]',
diff --git a/e2e/paths/02-client/21_defaulter.spec.js b/e2e/paths/02-client/21_defaulter.spec.js
index 406c802ab..1d5fc8efb 100644
--- a/e2e/paths/02-client/21_defaulter.spec.js
+++ b/e2e/paths/02-client/21_defaulter.spec.js
@@ -36,7 +36,7 @@ describe('Client defaulter path', () => {
const expectedObservation = 'Madness, as you know, is like gravity, all it takes is a little push';
const result = await page.waitToGetProperty(selectors.clientDefaulter.firstObservation, 'value');
- expect(result).toEqual(expectedObservation);
+ expect(result).toContain(expectedObservation);
});
it('should not add empty observation', async() => {
@@ -68,6 +68,6 @@ describe('Client defaulter path', () => {
const message = await page.waitForSnackbar();
expect(message.text).toContain('Observation saved!');
- expect(result).toEqual('My new observation');
+ expect(result).toContain('My new observation');
});
});
diff --git a/modules/client/back/methods/defaulter/filter.js b/modules/client/back/methods/defaulter/filter.js
index 15a56fb63..c06d1c51b 100644
--- a/modules/client/back/methods/defaulter/filter.js
+++ b/modules/client/back/methods/defaulter/filter.js
@@ -61,7 +61,8 @@ module.exports = Self => {
u.name salesPersonName,
d.amount,
co.created,
- co.text observation,
+ CONCAT(DATE(co.created), ' ', co.text) observation,
+ uw.id workerFk,
uw.name workerName,
c.creditInsurance,
d.defaulterSinced
diff --git a/modules/client/front/defaulter/index.html b/modules/client/front/defaulter/index.html
index ed50ebad9..121556df2 100644
--- a/modules/client/front/defaulter/index.html
+++ b/modules/client/front/defaulter/index.html
@@ -15,23 +15,21 @@
model="model">
-
-
-
+ class="vn-w-xl">
-