Browse Source

Merge branch 'dev'

master
Guillaume Bourgeois 5 years ago
parent
commit
8777943347
2 changed files with 4 additions and 4 deletions
  1. +3
    -3
      backend/views/report/index.php
  2. +1
    -1
      backend/web/js/vuejs/report-index.js

+ 3
- 3
backend/views/report/index.php View File

<div class="content-max-height"> <div class="content-max-height">
<ul id="list-users"> <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 ))"> <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> <label :for="'user_'+user.user_id" v-html="user.lastname+' '+user.name"></label>
</li> </li>
</ul> </ul>
<div class="content-max-height"> <div class="content-max-height">
<ul class="list" id="list-points-sale"> <ul class="list" id="list-points-sale">
<li v-for="pointSale in pointsSaleArray"> <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> <label :for="'pointsale_'+pointSale.id" v-html="pointSale.name"></label>
</li> </li>
</ul> </ul>
<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> <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> <ul>
<li v-for="distribution in distributionsMonth.distributions"> <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> <label :for="'distribution_'+distribution.id">{{ distribution.date }}</label>
</li> </li>
</ul> </ul>

+ 1
- 1
backend/web/js/vuejs/report-index.js View File

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

Loading…
Cancel
Save