e2e fix

client/ticket/src/index/index.html

@@ -21,7 +21,7 @@
             <vn-thead>
                 <vn-tr>
                     <vn-th></vn-th>
-                    <vn-th field="ticketFk" number>Id</vn-th>
+                    <vn-th field="id" number>Id</vn-th>
                     <vn-th field="salesPersonFk">Salesperson</vn-th>
                     <vn-th field="shipped">Date</vn-th>
                     <vn-th>Hour</vn-th>
@@ -39,7 +39,7 @@
             <vn-tbody>
                 <vn-tr ng-repeat="ticket in tickets"
                     class="{{::$ctrl.compareDate(ticket.shipped)}} clickable"
-                    ui-sref="ticket.card.summary({id: {{::ticket.ticketFk}}})">
+                    ui-sref="ticket.card.summary({id: {{::ticket.id}}})">
                     <vn-td>
                         <vn-icon ng-show="ticket.problem" class="bright"
                             vn-tooltip="{{ticket.problem}}"

client/ticket/src/index/index.js

@@ -2,7 +2,7 @@ import ngModule from '../module';
 
 export default class Controller {
     constructor($scope) {
-        this.$ = $scope;
+        this.$scope = $scope;
         this.ticketSelected = null;
 
         this.filter = {
@@ -61,13 +61,13 @@ export default class Controller {
         case 'search':
             return /^\d+$/.test(value)
                 ? {id: value}
-                : {nickname: {regexp: value}};
+                : {nickname: {like: value}};
         case 'from':
             return {shipped: {gte: value}};
         case 'to':
             return {shipped: {lte: value}};
         case 'nickname':
-            return {[param]: {regexp: value}};
+            return {[param]: {like: value}};
         case 'id':
         case 'clientFk':
         case 'agencyModeFk':
@@ -92,21 +92,21 @@ export default class Controller {
     }
 
     showDescriptor(event, clientFk) {
-        this.$.descriptor.clientFk = clientFk;
+        this.$scope.descriptor.clientFk = clientFk;
-        this.$.descriptor.parent = event.target;
+        this.$scope.descriptor.parent = event.target;
-        this.$.descriptor.show();
+        this.$scope.descriptor.show();
         event.preventDefault();
         event.stopImmediatePropagation();
     }
 
     onDescriptorLoad() {
-        this.$.popover.relocate();
+        this.$scope.popover.relocate();
     }
 
     preview(event, ticket) {
         event.preventDefault();
         event.stopImmediatePropagation();
-        this.$.dialogSummaryTicket.show();
+        this.$scope.dialogSummaryTicket.show();
         this.ticketSelected = ticket;
     }
 }

e2e/helpers/selectors.js

@@ -195,27 +195,22 @@ export default {
         tagsButton: `vn-menu-item a[ui-sref="item.card.tags"]`,
         firstRemoveTagButton: `vn-item-tags vn-horizontal:nth-child(2) vn-icon-button[icon="remove_circle_outline"]`,
         firstTagSelect: `vn-item-tags vn-horizontal:nth-child(2) > vn-autocomplete[field="itemTag.tagFk"] input`,
-        firstTagDisabled: `vn-item-tags vn-horizontal:nth-child(2) > vn-autocomplete > div > div > input`,
         firstTagSelectOptionOne: `vn-item-tags vn-horizontal:nth-child(2) > vn-autocomplete[field="itemTag.tagFk"] vn-drop-down ul > li:nth-child(1)`,
         firstValueInput: `vn-item-tags vn-horizontal:nth-child(2) > vn-textfield[label="Value"] input`,
         firstRelevancyInput: `vn-horizontal:nth-child(2) > vn-textfield[label="Relevancy"] input`,
         secondTagSelect: `vn-item-tags vn-horizontal:nth-child(3) > vn-autocomplete[field="itemTag.tagFk"] input`,
-        secondTagDisabled: `vn-item-tags vn-horizontal:nth-child(3) > vn-autocomplete > div > div > input`,
         secondTagSelectOptionOne: `vn-item-tags vn-horizontal:nth-child(3) > vn-autocomplete[field="itemTag.tagFk"] vn-drop-down ul > li:nth-child(1)`,
         secondValueInput: `vn-item-tags vn-horizontal:nth-child(3) > vn-textfield[label="Value"] input`,
         secondRelevancyInput: `vn-horizontal:nth-child(3) > vn-textfield[label="Relevancy"] input`,
         thirdTagSelect: `vn-item-tags vn-horizontal:nth-child(4) > vn-autocomplete[field="itemTag.tagFk"] input`,
-        thirdTagDisabled: `vn-item-tags vn-horizontal:nth-child(4) > vn-autocomplete > div > div > input`,
         thirdTagSelectOptionOne: `vn-item-tags vn-horizontal:nth-child(4) > vn-autocomplete[field="itemTag.tagFk"] vn-drop-down ul > li:nth-child(1)`,
         thirdValueInput: `vn-item-tags vn-horizontal:nth-child(4) > vn-textfield[label="Value"]  input`,
         thirdRelevancyInput: `vn-horizontal:nth-child(4) > vn-textfield[label="Relevancy"] input`,
         fourthTagSelect: `vn-item-tags vn-horizontal:nth-child(5) > vn-autocomplete[field="itemTag.tagFk"] input`,
-        fourthTagDisabled: `vn-item-tags vn-horizontal:nth-child(5) > vn-autocomplete > div > div > input`,
         fourthTagSelectOptionOne: `vn-item-tags vn-horizontal:nth-child(5) > vn-autocomplete[field="itemTag.tagFk"] vn-drop-down ul > li:nth-child(1)`,
         fourthValueInput: `vn-item-tags vn-horizontal:nth-child(5) > vn-textfield[label="Value"] input`,
         fourthRelevancyInput: `vn-horizontal:nth-child(5) > vn-textfield[label="Relevancy"] input`,
         fifthTagSelect: `vn-item-tags vn-horizontal:nth-child(6) > vn-autocomplete[field="itemTag.tagFk"] input`,
-        fifthTagDisabled: `vn-item-tags vn-horizontal:nth-child(6) > vn-autocomplete > div > div > input`,
         fifthValueInput: `vn-item-tags vn-horizontal:nth-child(6) > vn-textfield[label="Value"] input`,
         fifthRelevancyInput: `vn-horizontal:nth-child(6) > vn-textfield[label="Relevancy"] input`,
         seventhTagSelectOptionFive: `vn-item-tags vn-horizontal:nth-child(8) > vn-autocomplete[field="itemTag.tagFk"] vn-drop-down ul > li:nth-child(5)`,
@@ -285,9 +280,8 @@ export default {
         notesButton: `vn-menu-item a[ui-sref="ticket.card.observation"]`,
         firstNoteRemoveButton: `vn-icon[icon="remove_circle_outline"]`,
         addNoteButton: `vn-icon[icon="add_circle"]`,
-        firstNoteSelect: `vn-autocomplete[field="ticketObservation.observationTypeFk"] input`,
+        firstNoteSelect: `vn-autocomplete[field="observation.observationTypeFk"] input`,
-        firstNoteSelectSecondOption: `vn-autocomplete[field="ticketObservation.observationTypeFk"] vn-drop-down ul > li:nth-child(2)`,
+        firstNoteSelectSecondOption: `vn-autocomplete[field="observation.observationTypeFk"] vn-drop-down ul > li:nth-child(2)`,
-        firstNoteDisabled: `vn-textfield[label="Observation type"] input`,
         firstDescriptionInput: `vn-textfield[label="Description"] input`,
         submitNotesButton: `${components.vnSubmit}`
     },

e2e/paths/ticket-module/01_create_ticket_observations.spec.js

@@ -64,8 +64,8 @@ describe('Ticket', () => {
             .click(selectors.ticketPackages.packagesButton)
             .wait(selectors.ticketPackages.firstPackageSelect)
             .click(selectors.ticketNotes.notesButton)
-            .waitForTextInInput(selectors.ticketNotes.firstNoteDisabled, 'observation two')
+            .waitForTextInInput(selectors.ticketNotes.firstNoteSelect, 'observation two')
-            .getInputValue(selectors.ticketNotes.firstNoteDisabled)
+            .getInputValue(selectors.ticketNotes.firstNoteSelect)
             .then(result => {
                 expect(result).toEqual('observation two');
                 return nightmare

services/loopback/common/methods/ticket/filter.js

@@ -32,7 +32,8 @@ module.exports = Self => {
         stmt = new ParameterizedSQL(
             `CREATE TEMPORARY TABLE tmp.filter 
 			(PRIMARY KEY (ticketFk)) ENGINE = MEMORY
-				SELECT
+                SELECT
+                    t.id,
 					t.id AS ticketFk,
 					t.shipped,
 					t.nickname,