2691 - Added "or" between date ranges and scope days

front/core/components/field/index.js

@@ -187,7 +187,10 @@ export default class Field extends FormInput {
     }
 
     onChange() {
-        this.emit('change', {value: this.field});
+        // Changes doesn't reflect until appling async
+        this.$.$applyAsync(() => {
+            this.emit('change', {value: this.field});
+        });
     }
 }
 Field.$inject = ['$element', '$scope'];

modules/ticket/front/search-panel/index.html

@@ -27,13 +27,13 @@
                     vn-one
                     label="From"
                     ng-model="filter.from"
-                    on-change="$ctrl.from = value">
+                    on-change="filter.scopeDays = null">
                 </vn-date-picker>
                 <vn-date-picker
                     vn-one
                     label="To"
                     ng-model="filter.to"
-                    on-change="$ctrl.to = value">
+                    on-change="filter.scopeDays = null">
                 </vn-date-picker>
                 <vn-none class="or vn-px-md">O</vn-none>
                 <vn-input-number
@@ -45,6 +45,10 @@
                     on-change="$ctrl.scopeDays = value"
                     display-controls="true">
                 </vn-input-number>
+                <vn-icon color-marginal
+                    icon="info"
+                    vn-tooltip="Cannot choose a range of dates and days onward at the same time">
+                </vn-icon>
             </vn-horizontal>
         </section>
         <vn-horizontal class="vn-px-lg">

modules/ticket/front/search-panel/index.js

@@ -24,26 +24,6 @@ class Controller extends SearchPanel {
         });
     }
 
-    get from() {
-        return this._from;
-    }
-
-    set from(value) {
-        this._from = value;
-
-        this.filter.scopeDays = null;
-    }
-
-    get to() {
-        return this._to;
-    }
-
-    set to(value) {
-        this._to = value;
-
-        this.filter.scopeDays = null;
-    }
-
     get scopeDays() {
         return this._scopeDays;
     }

modules/ticket/front/search-panel/index.spec.js

@@ -10,6 +10,7 @@ describe('Ticket Component vnTicketSearchPanel', () => {
         $httpBackend = _$httpBackend_;
         controller = $componentController('vnTicketSearchPanel', {$element: null});
         controller.$t = () => {};
+        controller.filter = {};
     }));
 
     describe('getGroupedStates()', () => {
@@ -32,4 +33,16 @@ describe('Ticket Component vnTicketSearchPanel', () => {
             }]);
         });
     });
+
+    describe('scopeDays() setter', () => {
+        it('should clear the date range', () => {
+            controller.filter.from = new Date();
+            controller.filter.to = new Date();
+
+            controller.scopeDays = 1;
+
+            expect(controller.filter.from).toBeNull();
+            expect(controller.filter.to).toBeNull();
+        });
+    });
 });

modules/ticket/front/search-panel/locale/es.yml

@@ -17,3 +17,4 @@ FREE: Libre
 DELIVERED: Servido
 ON_PREPARATION: En preparacion
 PACKED: Encajado
+Cannot choose a range of dates and days onward at the same time: No se puede selecionar un rango de fechas y días en adelante a la vez

modules/ticket/front/search-panel/style.scss

@@ -8,6 +8,7 @@ form#ticket-form {
 
 .scope-days {
     border: $border-thin-light;
+    position: relative;
     text-align: right;
 
     & > p {
@@ -17,6 +18,13 @@ form#ticket-form {
 
     .or {
         font-weight: bold;
-        font-size: 26px
+        font-size: 26px;
+        color: $color-font-secondary
+    }
+
+    vn-icon[icon="info"] {
+        position: absolute; 
+        top: 2px;
+        right: 2px
     }
 }

modules/ticket/front/weekly/locale/es.yml

@@ -4,4 +4,4 @@ You are going to delete this weekly ticket: Vas a eliminar este ticket programad
 This ticket will be removed from weekly tickets! Continue anyway?: Este ticket se eliminará de tickets programados! ¿Continuar de todas formas?
 Search weekly ticket by id or client id: Busca tickets programados por el identificador o el identificador del cliente
 Search by weekly ticket: Buscar por tickets programados
-weekDay:  Dia
+Weekday: Llegada