maket/MaketRandevu
1
1
Fork 0
Code Issues 15 Pull requests Projects Releases 4 Packages Wiki Activity

* A provider user can only see his appointments, not other's.

Browse source 
* Fixed backend/calendar modal form message appearence.
* Fixed backend/calendar modal form provider - service values when editing an existing appointment.
This commit is contained in:
alextselegidis@gmail.com 2013-09-27 12:49:29 +00:00
parent a9f3a5cbdb
commit 8863a6b6ba
4 changed files with 73 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/application/views/backend/calendar.php
View file

@ -88,9 +88,9 @@
<h3>Edit Appointment</h3>
</div>
<div class="modal-message alert" style="display: none;"></div>
<div class="modal-body">
<div class="modal-message alert" style="display: none;"></div>
<form class="form-horizontal">
<fieldset>
<legend>Appointment Details</legend>
@ -129,8 +129,10 @@
<fieldset class="row-fluid">
<legend>
Customer Details
<button id="new-customer" class="btn btn-mini" title="Clear the fields and enter a new customer."
type="button">New</button>
<button id="select-customer" class="btn btn-primary btn-mini"
title="Pick an existing customer." type="button">Select Existing Customer</button>
title="Pick an existing customer." type="button">Select</button>
<input type="text" id="filter-existing-customers" placeholder="Type to filter customers."
style="display: none;" class="input-medium"/>
<div id="existing-customers-list" style="display: none;"></div>
@ -214,9 +216,9 @@
</div>
<div class="modal-message alert" style="display: none;"></div>
<div class="modal-body">
<div class="modal-message alert" style="display: none;"></div>
<form class="form-horizontal">
<fieldset>
<input id="unavailable-id" type="hidden" />

5
src/assets/css/backend.css
View file

@ -131,6 +131,11 @@ body .modal-header h3 {
margin-top: 5px;
}
#calendar-page #calendar-filter select:disabled {
background: white;
cursor: auto;
}
#calendar-page #calendar-actions {
display: inline-block;
float: right;

7
src/assets/js/backend.js
View file

@ -35,6 +35,13 @@ var Backend = {
PRIV_EDIT: 4,
PRIV_DELETE: 8,
PRIV_APPOINTMENTS: 'appointments',
PRIV_CUSTOMERS: 'customers',
PRIV_SERVICES: 'services',
PRIV_USERS: 'users',
PRIV_SYSTEM_SETTINGS: 'system_settings',
PRIV_USER_SETTINGS: 'user_settings',
/**
* Place the backend footer always on the bottom of the page.
*/

98
src/assets/js/backend_calendar.js
View file

@ -90,6 +90,11 @@ var BackendCalendar = {
optgroupHtml += '</optgroup>';
$('#select-filter-item').append(optgroupHtml);
if (GlobalVariables.user.role_slug == Backend.DB_SLUG_PROVIDER) {
$('#select-filter-item optgroup:eq(0)').val(GlobalVariables.user.id);
$('#select-filter-item').prop('disabled', true);
}
// :: BIND THE DEFAULT EVENT HANDLERS (IF NEEDED)
if (defaultEventHandlers === true) {
BackendCalendar.bindEventHandlers();
@ -195,7 +200,7 @@ var BackendCalendar = {
if (response.exceptions) {
response.exceptions = GeneralFunctions.parseExceptions(response.exceptions);
GeneralFunctions.displayMessageBox(Backend.EXCEPTIONS_TITLE, Backend.EXCEPTIONS_MESSAGE);
GeneralFunctions.displayMessageBox(GeneralFunctions.EXCEPTIONS_TITLE, GeneralFunctions.EXCEPTIONS_MESSAGE);
$('#message_box').append(GeneralFunctions.exceptionsToHtml(response.exceptions));
return;
}
@ -254,7 +259,7 @@ var BackendCalendar = {
// :: APPLY APPOINTMENT DATA AND SHOW TO MODAL DIALOG
$dialog.find('.modal-header h3').text('Edit Appointment');
$dialog.find('#appointment-id').val(appointment['id']);
$dialog.find('#select-service').val(appointment['id_services']);
$dialog.find('#select-service').val(appointment['id_services']).trigger('change');
$dialog.find('#select-provider').val(appointment['id_users_provider']);
// Set the start and end datetime of the appointment.
@ -327,7 +332,7 @@ var BackendCalendar = {
if (response.exceptions) {
response.exceptions = GeneralFunctions.parseExceptions(response.exceptions);
GeneralFunctions.displayMessageBox(Backend.EXCEPTIONS_TITLE, Backend.EXCEPTIONS_MESSAGE);
GeneralFunctions.displayMessageBox(GeneralFunctions.EXCEPTIONS_TITLE, GeneralFunctions.EXCEPTIONS_MESSAGE);
$('#message_box').append(GeneralFunctions.exceptionsToHtml(response.exceptions));
return;
}
@ -368,7 +373,7 @@ var BackendCalendar = {
if (response.exceptions) {
response.exceptions = GeneralFunctions.parseExceptions(response.exceptions);
GeneralFunctions.displayMessageBox(Backend.EXCEPTIONS_TITLE, Backend.EXCEPTIONS_MESSAGE);
GeneralFunctions.displayMessageBox(GeneralFunctions.EXCEPTIONS_TITLE, GeneralFunctions.EXCEPTIONS_MESSAGE);
$('#message_box').append(GeneralFunctions.exceptionsToHtml(response.exceptions));
return;
}
@ -451,22 +456,20 @@ var BackendCalendar = {
var successCallback = function(response) {
if (response.exceptions) {
response.exceptions = GeneralFunctions.parseExceptions(response.exceptions);
GeneralFunctions.displayMessageBox(Backend.EXCEPTIONS_TITLE, Backend.EXCEPTIONS_MESSAGE);
GeneralFunctions.displayMessageBox(GeneralFunctions.EXCEPTIONS_TITLE, GeneralFunctions.EXCEPTIONS_MESSAGE);
$('#messsage_box').append(GeneralFunctions.exceptionsToHtml(response.exceptions));
$dialog.find('.modal-header').append(
'<br><div class="alert alert-error">' +
'Unexpected issues occured!' +
'</div>');
$dialog.find('.modal-message').text('Unexpected issues occured!');
$dialog.find('.modal-message').addClass('alert-error');
$dialog.find('.modal-message').fadeIn();
return;
}
// Display success message to the user.
$dialog.find('.modal-header').append(
'<br><div class="alert alert-success">' +
'Appointment saved successfully!' +
'</div>');
$dialog.find('.modal-message').text('Appointment saved successfully!');
$dialog.find('.modal-message').addClass('alert-success').removeClass('alert-error');
$dialog.find('.modal-message').fadeIn();
// Close the modal dialog and refresh the calendar appointments
// after one second.
@ -479,10 +482,9 @@ var BackendCalendar = {
// :: DEFINE AJAX ERROR EVENT CALLBACK
var errorCallback = function() {
$dialog.find('.modal-header').append(
'<br><div class="alert alert-error">' +
'A server communication error occured, please try again.' +
'</div>');
$dialog.find('.modal-message').text('A server communication error occured, please try again.');
$dialog.find('.modal-message').addClass('alert-error');
$dialog.find('.modal-message').fadeIn();
};
// :: CALL THE UPDATE APPOINTMENT METHOD
@ -503,11 +505,9 @@ var BackendCalendar = {
if (start > end) {
// Start time is after end time - display message to user.
$dialog.find('.modal-message').html(
'<div class="alert alert-error">' +
'Start date value is bigger than end date!' +
'</div>');
$dialog.find('.modal-message').show();
$dialog.find('.modal-message').text('Start date value is bigger than end date!');
$dialog.find('.modal-message').addClass('alert-error');
$dialog.find('.modal-message').fadeIn();
return;
}
@ -531,13 +531,12 @@ var BackendCalendar = {
if (response.exceptions) {
response.exceptions = GeneralFunctions.parseExceptions(response.exceptions);
GeneralFunctions.displayMessageBox(Backend.EXCEPTIONS_TITLE, Backend.EXCEPTIONS_MESSAGE);
GeneralFunctions.displayMessageBox(GeneralFunctions.EXCEPTIONS_TITLE, GeneralFunctions.EXCEPTIONS_MESSAGE);
$('#message_box').append(GeneralFunctions.exceptionsToHtml(response.exceptions));
$dialog.find('.modal-header').append(
'<br><div class="alert alert-error">' +
'Unexpected issues occured!' +
'</div>');
$dialog.find('.modal-message').text('Unexpected issues occured!');
$dialog.find('.modal-message').addClass('alert-error');
$dialog.find('.modal-message').fadeIn();
return;
}
@ -549,10 +548,10 @@ var BackendCalendar = {
}
// Display success message to the user.
$dialog.find('.modal-header').append(
'<br><div class="alert alert-success">' +
'Appointment saved successfully!' +
'</div>');
$dialog.find('.modal-message').text('Appointment saved successfully!');
$dialog.find('.modal-message').removeClass('alert-error');
$dialog.find('.modal-message').addClass('alert-success');
$dialog.find('.modal-message').fadeIn();
// Close the modal dialog and refresh the calendar appointments
// after one second.
@ -571,10 +570,9 @@ var BackendCalendar = {
GeneralFunctions.displayMessageBox('Communication Error', 'Unfortunately ' +
'the operation could not complete due to server communication errors.');
$dialog.find('.modal-header').append(
'<br><div class="alert alert-error">' +
'A server communication error occured, please try again.' +
'</div>');
$dialog.find('.modal-message').txt('A server communication error occured, please try again.');
$dialog.find('.modal-message').addClass('alert-error');
$dialog.find('.modal-message').fadeIn();
};
BackendCalendar.saveUnavailable(unavailable, successCallback, errorCallback);
@ -679,7 +677,7 @@ var BackendCalendar = {
var $list = $('#existing-customers-list');
if (!$list.is(':visible')) {
$(this).text('Hide List');
$(this).text('Hide');
$list.empty();
$list.slideDown('slow');
$('#filter-existing-customers').fadeIn('slow');
@ -691,7 +689,7 @@ var BackendCalendar = {
} else {
$list.slideUp('slow');
$('#filter-existing-customers').fadeOut('slow');
$(this).text('Select Existing Customer');
$(this).text('Select');
}
});
@ -763,6 +761,13 @@ var BackendCalendar = {
});
});
/**
* Event: Enter New Customer Button "Click"
*/
$('#new-customer').click(function() {
$('#manage-appointment').find('#customer-id, #first-name, #last-name, #email, '
+ '#phone-number, #address, #city, #zip-code').val('');
});
},
/**
@ -806,7 +811,7 @@ var BackendCalendar = {
if (response.exceptions) {
response.exceptions = GeneralFunctions.parseExceptions(response.exceptions);
GeneralFunctions.displayMessageBox(Backend.EXCEPTIONS_TITLE, Backend.EXCEPTIONS_MESSAGE);
GeneralFunctions.displayMessageBox(GeneralFunctions.EXCEPTIONS_TITLE, GeneralFunctions.EXCEPTIONS_MESSAGE);
$('#message_box').append(GeneralFunctions.exceptionsToHtml(response.exceptions));
return;
}
@ -1133,7 +1138,7 @@ var BackendCalendar = {
var successCallback = function(response) {
if (response.exceptions) {
response.exceptions = GeneralFunctions.parseExceptions(response.exceptions);
GeneralFunctions.displayMessageBox(Backend.EXCEPTIONS_TITLE, Backend.EXCEPTIONS_MESSAGE);
GeneralFunctions.displayMessageBox(GeneralFunctions.EXCEPTIONS_TITLE, GeneralFunctions.EXCEPTIONS_MESSAGE);
$('#message_box').append(GeneralFunctions.exceptionsToHtml(response.exceptions));
return;
}
@ -1186,7 +1191,7 @@ var BackendCalendar = {
var successCallback = function(response) {
if (response.exceptions) {
response.exceptions = GeneralFunctions.parseExceptions(response.exceptions);
GeneralFunctions.displayMessageBox(Backend.EXCEPTIONS_TITLE, Backend.EXCEPTIONS_MESSAGE);
GeneralFunctions.displayMessageBox(GeneralFunctions.EXCEPTIONS_TITLE, GeneralFunctions.EXCEPTIONS_MESSAGE);
$('#message_box').append(GeneralFunctions.exceptionsToHtml(response.exceptions));
return;
}
@ -1274,7 +1279,8 @@ var BackendCalendar = {
displayEdit = (($parent.hasClass('fc-custom') || $altParent.hasClass('fc-custom'))
&& GlobalVariables.user.privileges.appointments.edit == true)
? '' : 'hide';
displayDelete = (GlobalVariables.user.privileges.appointments.delete == true)
displayDelete = (($parent.hasClass('fc-custom') || $altParent.hasClass('fc-custom'))
&& GlobalVariables.user.privileges.appointments.delete == true)
? '' : 'hide'; // Same value at the time.
var notes = '';
@ -1399,7 +1405,7 @@ var BackendCalendar = {
var successCallback = function(response) {
if (response.exceptions) {
response.exceptions = GeneralFunctions.parseExceptions(response.exceptions);
GeneralFunctions.displayMessageBox(Backend.EXCEPTIONS_TITLE, Backend.EXCEPTIONS_MESSAGE);
GeneralFunctions.displayMessageBox(GeneralFunctions.EXCEPTIONS_TITLE, GeneralFunctions.EXCEPTIONS_MESSAGE);
$('#message_box').append(GeneralFunctions.exceptionsToHtml(response.exceptions));
return;
}
@ -1463,7 +1469,7 @@ var BackendCalendar = {
if (response.exceptions) {
reponse.exceptions = GeneralFunctions.parseExceptions(response.exceptions);
GeneralFunctions.displayMessageBox(Backend.EXCEPTIONS_TITLE, Backend.EXCEPTIONS_MESSAGE);
GeneralFunctions.displayMessageBox(GeneralFunctions.EXCEPTIONS_TITLE, GeneralFunctions.EXCEPTIONS_MESSAGE);
$('#message_box').append(GeneralFunctions.exceptionsToHtml(response.exceptions));
return;
}
@ -1554,7 +1560,7 @@ var BackendCalendar = {
if (response.exceptions) {
response.exceptions = GeneralFunctions.parseExceptions(response.exceptions);
GeneralFunctions.displayMessageBox(Backend.EXCEPTIONS_TITLE, Backend.EXCEPTIONS_MESSAGE);
GeneralFunctions.displayMessageBox(GeneralFunctions.EXCEPTIONS_TITLE, GeneralFunctions.EXCEPTIONS_MESSAGE);
$('#message_box').append(GeneralFunctions.exceptionsToHtml(response.exceptions));
return;
}
@ -1571,7 +1577,7 @@ var BackendCalendar = {
// :: EMPTY FORM FIELDS
$dialog.find('input, textarea').val('');
$dialog.find('.modal-message').hide();
$dialog.find('.modal-message').fadeOut();
$dialog.find('#select-service, #select-provider').empty();
// :: PREPARE SERVICE AND PROVIDER LISTBOXES
@ -1639,7 +1645,7 @@ var BackendCalendar = {
// Reset previous validation css formating.
$dialog.find('.control-group').removeClass('error');
$dialog.find('.modal-message').hide();
$dialog.find('.modal-message').fadeOut();
try {
// :: CHECK REQUIRED FIELDS