entrouvert
/
calebasse
Archived
17
0
Fork 0
Code Issues Pull Requests Releases Activity

agenda: datepicker buttons on editing events and appointments fix 

Closes #5024
This commit is contained in:
Serghei Mihai 2014-07-01 14:47:31 +02:00
parent c4d2d185cb
commit b472e22b2a
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
calebasse/static/js/calebasse.agenda.js
View File

@ -273,6 +273,11 @@ function toggle_ressource(ressource) {
return $(ressource_target).find('a.tab');
}
function init_datepickers(dialog) {
$('.datepicker-date', dialog).datepicker({dateFormat: 'd/m/yy', showOn: 'button'});
$('.datepicker input', dialog).datepicker({dateFormat: 'd/m/yy', showOn: 'button'});
}
function event_dialog(url, title, width, btn_text) {
function add_periodic_events(base) {
$(base).on('click', '.update-periodic-event', function () {
@ -302,11 +307,7 @@ function event_dialog(url, title, width, btn_text) {
}
};
generic_ajaxform_dialog('/' + service + '/' + app_name + '/' + current_date + '/update-periodic-event/' + id,
'Modifier un évènement périodique', '#ajax-dlg', '900px', 'Modifier', null,
function (dialog) {
$('#ajax-dlg .datepicker-date').datepicker({dateFormat: 'd/m/yy', showOn: 'button'});
}, null, delete_button
);
'Modifier un évènement périodique', '#ajax-dlg', '900px', 'Modifier', null, init_datepickers, null, delete_button);
});
$(base).on('click', '.update-periodic-rdv', function () {
$('.ui-icon-closethick').click();
@ -331,11 +332,7 @@ function event_dialog(url, title, width, btn_text) {
}
};
generic_ajaxform_dialog('/' + service + '/' + app_name + '/' + current_date + '/update-periodic-rdv/' + id,
'Modifier un rendez-vous périodique', '#ajax-dlg', '900px', 'Modifier', null,
function (dialog) {
$('#ajax-dlg .datepicker-date').datepicker({dateFormat: 'd/m/yy', showOn: 'button'});
}, null, delete_button
);
'Modifier un rendez-vous périodique', '#ajax-dlg', '900px', 'Modifier', null, init_datepickers, null, delete_button);
});
}

2
calebasse/static/js/calebasse.dialog.js
View File

@ -22,6 +22,8 @@ function generic_ajaxform_dialog(url, title, id, width, btn_submit_name, redirec
height = 'auto';
$(id).load(url,
function () {
$('.datepicker-date').datepicker({dateFormat: 'd/m/yy', showOn: 'button'});
$('.datepicker input').datepicker({dateFormat: 'd/m/yy', showOn: 'button'});
function onsuccess(response, status, xhr, form) {
enable_button($('#submit-btn'));
var parse = $(response);