forked from DGNum/gestioCOF
Moment.js sur les dates d'annulation K-Psul
This commit is contained in:
parent
f7e9cceb70
commit
bbbfd4aef5
|
@ -987,11 +987,11 @@ $(document).ready(function() {
|
||||||
|
|
||||||
if (ope['canceled_at']) {
|
if (ope['canceled_at']) {
|
||||||
ope_html.addClass('canceled');
|
ope_html.addClass('canceled');
|
||||||
if (ope['canceled_by__trigramme']) {
|
var cancel = 'Annulé';
|
||||||
var cancel = 'Annulé par '+ope['canceled_by__trigramme']+' le '+ope['canceled_at'];
|
if (ope['canceled_by__trigramme'])
|
||||||
} else {
|
cancel += ' par '+ope['canceled_by__trigramme'];
|
||||||
var cancel = 'Annulé le '+ope['canceled_at'];
|
var canceled_at = moment.tz(ope['canceled_at'],'UTC');
|
||||||
}
|
cancel += ' le '+canceled_at.tz('Europe/Paris').format('DD/MM/YY à HH:mm:ss');
|
||||||
ope_html.find('.canceled').text(cancel);
|
ope_html.find('.canceled').text(cancel);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1182,11 +1182,11 @@ $(document).ready(function() {
|
||||||
function cancelOpe(ope) {
|
function cancelOpe(ope) {
|
||||||
var ope_html = history_container.find('[data-ope='+ope['id']+']');
|
var ope_html = history_container.find('[data-ope='+ope['id']+']');
|
||||||
ope_html.addClass('canceled');
|
ope_html.addClass('canceled');
|
||||||
if (ope['canceled_by__trigramme']) {
|
var cancel = 'Annulé';
|
||||||
var cancel = 'Annulé par '+ope['canceled_by__trigramme']+' le '+ope['canceled_at'];
|
if (ope['canceled_by__trigramme'])
|
||||||
} else {
|
cancel += ' par '+ope['canceled_by__trigramme'];
|
||||||
var cancel = 'Annulé le '+ope['canceled_at'];
|
var canceled_at = moment.tz(ope['canceled_at'], 'UTC');
|
||||||
}
|
cancel += ' le '+canceled_at.tz('Europe/Paris').format('DD/MM/YY à HH:mm:ss');
|
||||||
ope_html.find('.canceled').text(cancel);
|
ope_html.find('.canceled').text(cancel);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue