Merge branch 'dev'

backend/views/report/index.php

@@ -60,7 +60,7 @@ $this->addBreadcrumb('Rapports') ;
                     <div class="content-max-height">
                         <ul id="list-users">
                             <li v-for="user in usersArray" v-if="!termSearchUser.length || (termSearchUser.length && (user.lastname.toLowerCase().indexOf(termSearchUser.toLowerCase()) != -1 || user.name.toLowerCase().indexOf(termSearchUser.toLowerCase()) != -1 ))">
-                                <input type="checkbox" :id="'user_'+user.user_id" v-model="user.checked" @change="reportChange" /> 
+                                <input type="checkbox" :id="'user_'+user.user_id" v-model="user.checked" @change="reportChange()" /> 
                                 <label :for="'user_'+user.user_id" v-html="user.lastname+' '+user.name"></label>
                             </li>
                         </ul>
@@ -72,7 +72,7 @@ $this->addBreadcrumb('Rapports') ;
                     <div class="content-max-height">
                         <ul class="list" id="list-points-sale">
                             <li v-for="pointSale in pointsSaleArray">
-                                <input type="checkbox" :id="'pointsale_'+pointSale.id" v-model="pointSale.checked" @change="reportChange" /> 
+                                <input type="checkbox" :id="'pointsale_'+pointSale.id" v-model="pointSale.checked" @change="reportChange()" /> 
                                 <label :for="'pointsale_'+pointSale.id" v-html="pointSale.name"></label>
                             </li>
                         </ul>
@@ -93,7 +93,7 @@ $this->addBreadcrumb('Rapports') ;
                                 <a @click="selectDistributions(month)" class="btn btn-default btn-xs btn-select"><span class="glyphicon glyphicon-check"></span> Tout <span v-if="countDistributionsByMonth(month)">déselectionner</span><span v-else>sélectionner</span></a> 
                                 <ul>
                                     <li v-for="distribution in distributionsMonth.distributions">
-                                        <input type="checkbox" :id="'distribution_'+distribution.id" v-model="distribution.checked" @change="reportChange" />
+                                        <input type="checkbox" :id="'distribution_'+distribution.id" v-model="distribution.checked" @change="reportChange()" />
                                         <label :for="'distribution_'+distribution.id">{{ distribution.date }}</label>
                                     </li>
                                 </ul>

backend/web/js/vuejs/report-index.js

@@ -95,7 +95,7 @@ var app = new Vue({
             for(var j = 0; j < this.distributionsByMonthArray[month].distributions.length; j++) {
                 Vue.set(this.distributionsByMonthArray[month].distributions[j], 'checked', countDistributions ? false : true);
             }
-            this.reportChange = true ;
+            this.reportChange();
         },
         generateReport: function() {
             var app = this ;