forked from DGNum/gestioCOF
Merge branch 'aureplop/fix_ws' into 'aureplop/kpsul_js_refactor'
Fix some ws updates on khistory See merge request !230
This commit is contained in:
Ludovic Stephan
commit
ef1f00c15b
|
|
@ -5,53 +5,12 @@ class KHistory {
|
|||
static get default_options() {
|
||||
return {
|
||||
'templates': {
|
||||
'purchase': `
|
||||
<div class="ope">
|
||||
<span class="amount"></span>
|
||||
<span class="infos1"></span>
|
||||
<span class="infos2"></span>
|
||||
<span class="addcost"></span>
|
||||
<span class="canceled"></span>
|
||||
</div>
|
||||
`,
|
||||
'specialope': `
|
||||
<div class="ope">
|
||||
<span class="amount"></span>
|
||||
<span class="infos1"></span>
|
||||
<span class="infos2"></span>
|
||||
<span class="addcost"></span>
|
||||
<span class="canceled"></span>
|
||||
</div>
|
||||
`,
|
||||
'opegroup': `
|
||||
<div class="opegroup">
|
||||
<span class="time"></span>
|
||||
<span class="trigramme"></span>
|
||||
<span class="amount"></span>
|
||||
<span class="valid_by"></span>
|
||||
<span class="comment"></span>
|
||||
</div>`,
|
||||
'transfergroup': `
|
||||
<div class="opegroup">
|
||||
<span class="time"></span>
|
||||
<span class="infos"></span>
|
||||
<span class="valid_by"></span>
|
||||
<span class="comment"></span>
|
||||
</div>
|
||||
`,
|
||||
'day': `
|
||||
<div class="day">
|
||||
<span class="date"></span>
|
||||
</div>
|
||||
`,
|
||||
'transfer': `
|
||||
<div class="ope">
|
||||
<span class="amount"></span>
|
||||
<span class="infos1"></span>
|
||||
<span class="glyphicon glyphicon-arrow-right"></span>
|
||||
<span class="infos2"></span>
|
||||
<span class="canceled"></span>
|
||||
</div>`,
|
||||
'purchase': '<div class="ope"><span class="amount"></span><span class="infos1"></span><span class="infos2"></span><span class="addcost"></span><span class="canceled"></span></div>',
|
||||
'specialope': '<div class="ope"><span class="amount"></span><span class="infos1"></span><span class="infos2"></span><span class="addcost"></span><span class="canceled"></span></div>',
|
||||
'opegroup': '<div class="opegroup"><span class="time"></span><span class="trigramme"></span><span class="amount"></span><span class="valid_by"></span><span class="comment"></span></div>',
|
||||
'transfergroup': '<div class="opegroup"><span class="time"></span><span class="infos"></span><span class="valid_by"></span><span class="comment"></span></div>',
|
||||
'day': '<div class="day"><span class="date"></span></div>',
|
||||
'transfer': '<div class="ope"><span class="amount"></span><span class="infos1"></span><span class="glyphicon glyphicon-arrow-right"></span><span class="infos2"></span><span class="canceled"></span></div>',
|
||||
},
|
||||
|
||||
'api_options': {
|
||||
|
|
@ -78,14 +37,7 @@ class KHistory {
|
|||
|
||||
var templates = all_options.templates;
|
||||
if (all_options.no_trigramme)
|
||||
templates['opegroup'] = `
|
||||
<div class="opegroup">
|
||||
<span class="time"></span>
|
||||
<span class="amount"></span>
|
||||
<span class="valid_by"></span>
|
||||
<span class="comment"></span>
|
||||
</div>
|
||||
`;
|
||||
templates['opegroup'] = '<div class="opegroup"><span class="time"></span><span class="amount"></span><span class="valid_by"></span><span class="comment"></span></div>';
|
||||
|
||||
this.display = new ForestDisplay(this._$container, templates, this.data);
|
||||
|
||||
|
|
@ -155,26 +107,47 @@ class KHistory {
|
|||
is_valid(opegroup) {
|
||||
var options = this.api_options;
|
||||
|
||||
if (options.from && dateUTCToParis(opegroup.at).isBefore(moment(options.from)))
|
||||
if (options.from && dateUTCToParis(opegroup.content.at).isBefore(moment(options.from)))
|
||||
return false;
|
||||
|
||||
if (options.to && dateUTCToParis(opegroup.at).isAfter(moment(options.to)))
|
||||
if (options.to && dateUTCToParis(opegroup.content.at).isAfter(moment(options.to)))
|
||||
return false;
|
||||
|
||||
if (options.transfersonly && opegroup.constructor.verbose_name == 'opegroup')
|
||||
return false;
|
||||
var accounts_filter = options.accounts && options.accounts.length;
|
||||
var checkouts_filter = options.checkouts && options.checkouts.length;
|
||||
|
||||
if (options.opesonly && opegroup.constructor.verbose_name == 'transfergroup')
|
||||
return false;
|
||||
if (opegroup.modelname == 'opegroup') {
|
||||
|
||||
if (options.accounts && options.accounts.length &&
|
||||
options.accounts.indexOf(opegroup.account_id) < 0)
|
||||
return false;
|
||||
if (options.transfersonly)
|
||||
return false;
|
||||
|
||||
if (options.checkouts && options.checkouts.length &&
|
||||
(opegroup.modelname == 'transfergroup' ||
|
||||
options.checkouts.indexOf(opegroup.checkout_id) < 0))
|
||||
return false;
|
||||
if (accounts_filter && options.accounts.indexOf(opegroup.content.account_id) < 0)
|
||||
return false;
|
||||
|
||||
if (checkouts_filter && options.checkouts.indexOf(opegroup.content.checkout_id) < 0)
|
||||
return false;
|
||||
|
||||
} else if (opegroup.modelname == 'transfergroup') {
|
||||
|
||||
if (options.opesonly)
|
||||
return false;
|
||||
|
||||
if (checkouts_filter)
|
||||
return false;
|
||||
|
||||
if (accounts_filter) {
|
||||
opegroup.content.children =
|
||||
opegroup.content.children.filter( function(transfer) {
|
||||
var is_from_in =
|
||||
options.accounts.indexOf(transfer.content.from_acc_id) >= 0;
|
||||
var is_to_in =
|
||||
options.accounts.indexOf(transfer.content.to_acc_id) >= 0;
|
||||
return is_from_in || is_to_in;
|
||||
});
|
||||
if (opegroup.content.children.length == 0)
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -64,21 +64,9 @@ class AccountManager {
|
|||
// buttons: search, read or create
|
||||
this._$buttons_container = this._$container.find('.buttons');
|
||||
this._buttons_templates = {
|
||||
create: template`
|
||||
<a href="${'url'}" class="btn btn-primary" target="_blank" title="Créer ce compte">
|
||||
<span class="glyphicon glyphicon-plus"></span>
|
||||
</a>
|
||||
`,
|
||||
read: template`
|
||||
<a href="${'url'}" class="btn btn-primary" target="_blank" title="Détails du compte">
|
||||
<span class="glyphicon glyphicon-info-sign"></span>
|
||||
</a>
|
||||
`,
|
||||
search: template`
|
||||
<button class="btn btn-primary search" title="Rechercher">
|
||||
<span class="glyphicon glyphicon-search"></span>
|
||||
</button>
|
||||
`,
|
||||
create: template`<a href="${'url'}" class="btn btn-primary" target="_blank" title="Créer ce compte"><span class="glyphicon glyphicon-plus"></span></a>`,
|
||||
read: template`<a href="${'url'}" class="btn btn-primary" target="_blank" title="Détails du compte"><span class="glyphicon glyphicon-info-sign"></span></a>`,
|
||||
search: template`<button class="btn btn-primary search" title="Rechercher"><span class="glyphicon glyphicon-search"></span></button>`,
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -208,10 +196,7 @@ class AccountSearch {
|
|||
constructor(manager) {
|
||||
this.manager = manager;
|
||||
|
||||
this._content = `
|
||||
<input type="text" name="q" id="search_autocomplete" autocomplete="off" spellcheck="false" autofocus>
|
||||
<div id="account_results"></div>
|
||||
`;
|
||||
this._content = '<input type="text" name="q" id="search_autocomplete" autocomplete="off" spellcheck="false" autofocus><div id="account_results"></div>';
|
||||
this._input = '#search_autocomplete';
|
||||
this._results_container = '#account_results';
|
||||
|
||||
|
|
@ -305,16 +290,8 @@ class CheckoutManager {
|
|||
|
||||
this._$buttons_container = this._$container.find('.buttons');
|
||||
this._buttons_templates = {
|
||||
read: template`
|
||||
<a class="btn btn-primary" href="${'url'}" title="En savoir plus" target="_blank">
|
||||
<span class="glyphicon glyphicon-info-sign"></span>
|
||||
</a>
|
||||
`,
|
||||
statement_create: template`
|
||||
<a href="${'url'}" title="Effectuer un relevé" class="btn btn-primary" target="_blank">
|
||||
<span class="glyphicon glyphicon-euro"></span>
|
||||
</a>
|
||||
`,
|
||||
read: template`<a class="btn btn-primary" href="${'url'}" title="En savoir plus" target="_blank"><span class="glyphicon glyphicon-info-sign"></span></a>`,
|
||||
statement_create: template`<a href="${'url'}" title="Effectuer un relevé" class="btn btn-primary" target="_blank"><span class="glyphicon glyphicon-euro"></span></a>`,
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -457,18 +434,8 @@ class ArticleManager {
|
|||
this.data = new ArticleList();
|
||||
var $container = $('#articles_data');
|
||||
var templates = {
|
||||
category: `
|
||||
<div class="category">
|
||||
<span class="name"></span>
|
||||
</div>
|
||||
`,
|
||||
article: `
|
||||
<div class="article">
|
||||
<span class="name"></span>
|
||||
<span class="price"></span>
|
||||
<span class="stock"></span>
|
||||
</div>
|
||||
`,
|
||||
category: '<div class="category"><span class="name"></span></div>',
|
||||
article: '<div class="article"><span class="name"></span><span class="price"></span><span class="stock"></span></div>',
|
||||
};
|
||||
this.display = new ForestDisplay($container, templates, this.data);
|
||||
this.autocomplete = new ArticleAutocomplete(this, $container);
|
||||
|
|
|
|||
|
|
@ -94,7 +94,8 @@ $(document).ready(function() {
|
|||
if ($checkouts)
|
||||
data['checkouts'] = checkouts;
|
||||
var accounts = getSelectedMultiple($accounts);
|
||||
data['accounts'] = accounts;
|
||||
if (accounts)
|
||||
data['accounts'] = accounts.map(id => parseInt(id));
|
||||
|
||||
// Update history
|
||||
khistory.fetch(data);
|
||||
|
|
|
|||
|
|
@ -1799,22 +1799,29 @@ def perform_transfers(request):
|
|||
websocket_data['opegroups'] = [{
|
||||
'add': True,
|
||||
'modelname': 'transfergroup',
|
||||
'id': transfergroup.pk,
|
||||
'at': transfergroup.at,
|
||||
'comment': transfergroup.comment,
|
||||
'valid_by__trigramme': (transfergroup.valid_by and
|
||||
transfergroup.valid_by.trigramme or None),
|
||||
'opes': [],
|
||||
'content': {
|
||||
'id': transfergroup.pk,
|
||||
'at': transfergroup.at,
|
||||
'comment': transfergroup.comment,
|
||||
'valid_by__trigramme': (transfergroup.valid_by and
|
||||
transfergroup.valid_by.trigramme or None),
|
||||
'children': []
|
||||
},
|
||||
}]
|
||||
for transfer in transfers:
|
||||
ope_data = {
|
||||
'id': transfer.pk,
|
||||
'amount': transfer.amount,
|
||||
'from_acc': transfer.from_acc.trigramme,
|
||||
'to_acc': transfer.to_acc.trigramme,
|
||||
'canceled_by__trigramme': None, 'canceled_at': None,
|
||||
'modelname': 'transfer',
|
||||
'content': {
|
||||
'id': transfer.pk,
|
||||
'amount': transfer.amount,
|
||||
'from_acc': transfer.from_acc.trigramme,
|
||||
'to_acc': transfer.to_acc.trigramme,
|
||||
'canceled_by__trigramme': None, 'canceled_at': None,
|
||||
'from_acc_id': transfer.from_acc.id,
|
||||
'to_acc_id': transfer.to_acc.id,
|
||||
},
|
||||
}
|
||||
websocket_data['opegroups'][0]['opes'].append(ope_data)
|
||||
websocket_data['opegroups'][0]['content']['children'].append(ope_data)
|
||||
|
||||
consumers.KPsul.group_send('kfet.kpsul', websocket_data)
|
||||
return JsonResponse(data)
|
||||
|
|
|
|||
Loading…
Reference in a new issue