Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev

front/core/components/treeview/child.html

@@ -5,7 +5,7 @@
                 <vn-icon icon="keyboard_arrow_up" ng-if="item.childs.length" 
                     ng-click="$ctrl.toggle(item, $event)">
                 </vn-icon> 
-                <vn-icon icon="keyboard_arrow_down" ng-if="!item.childs" 
+                <vn-icon icon="keyboard_arrow_down" ng-if="item.sons > 0 && !item.childs" 
                     ng-click="$ctrl.toggle(item, $event)">
                 </vn-icon> 
             </vn-auto>

front/core/components/treeview/index.js

@@ -20,6 +20,7 @@ export default class Treeview extends Component {
     refresh() {
         this.model.refresh().then(() => {
             this.data = this.model.data;
+            console.log(this.data);
             this.repaintAll();
         });
     }

modules/agency/front/index/index.js

@@ -16,7 +16,7 @@ export default class Controller {
         case 'search':
             return /^\d+$/.test(value)
                 ? {id: value}
-                : {name: {regexp: value}};
+                : {name: {like: `%${value}%`}};
         case 'warehouseFk':
         case 'agencyModeFk':
             return {[param]: value};

modules/item/front/ticket-descriptor/addStowaway.js

@@ -20,7 +20,7 @@ class Controller {
         let params = {id: this.possibleStowaways[index].id, shipFk: this.ticket.id};
         this.$http.post(`/api/Stowaways/`, params)
             .then(() => {
-                this.card.reload();
+                this.cardReload();
                 this.vnApp.showSuccess(this.$translate.instant('Data saved!'));
             });
     }
@@ -40,9 +40,7 @@ ngModule.component('vnAddStowaway', {
     template: require('./addStowaway.html'),
     controller: Controller,
     bindings: {
-        ticket: '<'
+        ticket: '<',
-    },
+        cardReload: '&?'
-    require: {
-        card: '^vnTicketCard'
     }
 });

modules/item/front/ticket-descriptor/index.html

@@ -100,6 +100,7 @@
                 show-field="id"
                 value-field="id"
                 vn-tooltip="Ship stowaways"
+                tooltip-position="up"
                 data="$ctrl.ticket.ship"
                 on-change="$ctrl.goToTicket(value)">
             </vn-button-menu>
@@ -152,5 +153,5 @@
     question="You are going to delete this ticket"
     message="Continue anyway?">
 </vn-confirm>
-<vn-add-stowaway vn-id="addStowaway" ticket="$ctrl.ticket"></vn-add-stowaway>
+<vn-add-stowaway vn-id="addStowaway" card-reload="$ctrl.cardReload()" ticket="$ctrl.ticket"></vn-add-stowaway>
-<vn-remove-stowaway vn-id="removeStowaway" ticket="$ctrl.ticket"></vn-remove-stowaway>
+<vn-remove-stowaway vn-id="removeStowaway" card-reload="$ctrl.cardReload()" ticket="$ctrl.ticket"></vn-remove-stowaway>

modules/item/front/ticket-descriptor/index.js

@@ -11,7 +11,7 @@ class Controller {
         this.moreOptions = [
             {callback: this.showAddTurnDialog, name: 'Add turn', show: true},
             {callback: this.showDeleteTicketDialog, name: 'Delete ticket', show: true},
-            {callback: this.showAddStowaway, name: 'Add stowaway', show: true},
+            {callback: this.showAddStowaway, name: 'Add stowaway', show: () => this.isTicketModule()},
             {callback: this.showRemoveStowaway, name: 'Remove stowaway', show: () => this.shouldShowRemoveStowaway()},
             /* callback: this.showChangeShipped, name: 'Change shipped hour', show: true} */
         ];
@@ -37,8 +37,16 @@ class Controller {
         }
     }
 
+    isTicketModule() {
+        let path = this.$state.getCurrentPath();
+        if (path[1].state.name === 'ticket')
+            return true;
+
+        return false;
+    }
+
     shouldShowRemoveStowaway() {
-        if (!this._ticket)
+        if (!this._ticket || !this.isTicketModule())
             return false;
 
         return (this._ticket.stowaway || (this._ticket.ship && this._ticket.ship.length > 0));
@@ -157,7 +165,8 @@ Controller.$inject = ['$state', '$scope', '$http', 'vnApp', '$translate'];
 ngModule.component('vnTicketDescriptor', {
     template: require('./index.html'),
     bindings: {
-        ticket: '<'
+        ticket: '<',
+        cardReload: '&'
     },
     controller: Controller
 });

modules/item/front/ticket-descriptor/removeStowaway.js

@@ -46,7 +46,7 @@ class Controller {
     deleteStowaway(response) {
         if (response === 'ACCEPT') {
             this.$http.delete(`/api/Stowaways/${this.stowawayToDelete.id}`).then(res => {
-                this.card.reload();
+                this.cardReload();
                 this.vnApp.showSuccess(this.$translate.instant('Data saved!'));
             });
         }
@@ -72,9 +72,7 @@ ngModule.component('vnRemoveStowaway', {
     template: require('./removeStowaway.html'),
     controller: Controller,
     bindings: {
-        ticket: '<'
+        ticket: '<',
-    },
+        cardReload: '&?'
-    require: {
-        card: '^vnTicketCard'
     }
 });

modules/order/front/filter/index.js

@@ -27,9 +27,9 @@ class Controller {
     }
 
     set order(value) {
-        this._order = value;
+        if (!value.id || this._order) return;
 
-        if (!value.id) return;
+        this._order = value;
 
         this.$scope.$$postDigest(() => {
             let category;

modules/ticket/back/methods/ticket/getPossibleStowaways.js

@@ -20,6 +20,10 @@ module.exports = Self => {
 
     Self.getPossibleStowaways = async ticketFk => {
         let ship = await Self.app.models.Ticket.findById(ticketFk);
+
+        if (!ship || !ship.shipped)
+            return [];
+
         let lowestDate = new Date(ship.shipped.getTime());
         lowestDate.setHours(0, 0, -1, 0);
 

modules/ticket/front/card/index.html

@@ -1,6 +1,6 @@
 <vn-main-block>
     <div class="left-menu">
-        <vn-ticket-descriptor ticket="$ctrl.ticket"></vn-ticket-descriptor>
+        <vn-ticket-descriptor ticket="$ctrl.ticket" card-reload="$ctrl.reload()"></vn-ticket-descriptor>
         <vn-left-menu></vn-left-menu>
     </div>
     <div class="content-block" ui-view></div>