Reconstructed the table view so that it works with fullcalendar (better handling) (#739).

This commit is contained in:
Alex Tselegidis 2020-05-04 11:32:00 +02:00
parent 17f99883c0
commit 080488aa7d
30 changed files with 953 additions and 363 deletions

View file

@ -316,3 +316,4 @@ $lang['apply_to_all_providers'] = 'Apply To All Providers';
$lang['display_any_provider'] = 'Display Any Provider Option'; $lang['display_any_provider'] = 'Display Any Provider Option';
$lang['display_any_provider_hint'] = 'The booking page will get an additional option that allows customers to book without specifying a provider.'; $lang['display_any_provider_hint'] = 'The booking page will get an additional option that allows customers to book without specifying a provider.';
$lang['load_more'] = 'Load More'; $lang['load_more'] = 'Load More';
$lang['list'] = 'List';

View file

@ -316,3 +316,4 @@ $lang['apply_to_all_providers'] = 'Apply To All Providers';
$lang['display_any_provider'] = 'Display Any Provider Option'; $lang['display_any_provider'] = 'Display Any Provider Option';
$lang['display_any_provider_hint'] = 'The booking page will get an additional option that allows customers to book without specifying a provider.'; $lang['display_any_provider_hint'] = 'The booking page will get an additional option that allows customers to book without specifying a provider.';
$lang['load_more'] = 'Load More'; $lang['load_more'] = 'Load More';
$lang['list'] = 'List';

View file

@ -316,3 +316,4 @@ $lang['apply_to_all_providers'] = 'Apply To All Providers';
$lang['display_any_provider'] = 'Display Any Provider Option'; $lang['display_any_provider'] = 'Display Any Provider Option';
$lang['display_any_provider_hint'] = 'The booking page will get an additional option that allows customers to book without specifying a provider.'; $lang['display_any_provider_hint'] = 'The booking page will get an additional option that allows customers to book without specifying a provider.';
$lang['load_more'] = 'Load More'; $lang['load_more'] = 'Load More';
$lang['list'] = 'List';

View file

@ -316,3 +316,4 @@ $lang['apply_to_all_providers'] = 'Apply To All Providers';
$lang['display_any_provider'] = 'Display Any Provider Option'; $lang['display_any_provider'] = 'Display Any Provider Option';
$lang['display_any_provider_hint'] = 'The booking page will display an additional option that allows customers to book without selecting a particular provider.'; $lang['display_any_provider_hint'] = 'The booking page will display an additional option that allows customers to book without selecting a particular provider.';
$lang['load_more'] = 'Load More'; $lang['load_more'] = 'Load More';
$lang['list'] = 'List';

View file

@ -316,3 +316,4 @@ $lang['apply_to_all_providers'] = 'Apply To All Providers';
$lang['display_any_provider'] = 'Display Any Provider Option'; $lang['display_any_provider'] = 'Display Any Provider Option';
$lang['display_any_provider_hint'] = 'The booking page will get an additional option that allows customers to book without specifying a provider.'; $lang['display_any_provider_hint'] = 'The booking page will get an additional option that allows customers to book without specifying a provider.';
$lang['load_more'] = 'Load More'; $lang['load_more'] = 'Load More';
$lang['list'] = 'List';

View file

@ -316,3 +316,4 @@ $lang['apply_to_all_providers'] = 'Apply To All Providers';
$lang['display_any_provider'] = 'Display Any Provider Option'; $lang['display_any_provider'] = 'Display Any Provider Option';
$lang['display_any_provider_hint'] = 'The booking page will get an additional option that allows customers to book without specifying a provider.'; $lang['display_any_provider_hint'] = 'The booking page will get an additional option that allows customers to book without specifying a provider.';
$lang['load_more'] = 'Load More'; $lang['load_more'] = 'Load More';
$lang['list'] = 'List';

View file

@ -316,3 +316,4 @@ $lang['apply_to_all_providers'] = 'Apply To All Providers';
$lang['display_any_provider'] = 'Display Any Provider Option'; $lang['display_any_provider'] = 'Display Any Provider Option';
$lang['display_any_provider_hint'] = 'The booking page will get an additional option that allows customers to book without specifying a provider.'; $lang['display_any_provider_hint'] = 'The booking page will get an additional option that allows customers to book without specifying a provider.';
$lang['load_more'] = 'Load More'; $lang['load_more'] = 'Load More';
$lang['list'] = 'List';

View file

@ -316,3 +316,4 @@ $lang['apply_to_all_providers'] = 'Apply To All Providers';
$lang['display_any_provider'] = 'Display Any Provider Option'; $lang['display_any_provider'] = 'Display Any Provider Option';
$lang['display_any_provider_hint'] = 'The booking page will display an additional option that allows customers to book without selecting a particular provider.'; $lang['display_any_provider_hint'] = 'The booking page will display an additional option that allows customers to book without selecting a particular provider.';
$lang['load_more'] = 'Load More'; $lang['load_more'] = 'Load More';
$lang['list'] = 'List';

View file

@ -316,3 +316,4 @@ $lang['apply_to_all_providers'] = 'Apply To All Providers';
$lang['display_any_provider'] = 'Display Any Provider Option'; $lang['display_any_provider'] = 'Display Any Provider Option';
$lang['display_any_provider_hint'] = 'The booking page will get an additional option that allows customers to book without specifying a provider.'; $lang['display_any_provider_hint'] = 'The booking page will get an additional option that allows customers to book without specifying a provider.';
$lang['load_more'] = 'Load More'; $lang['load_more'] = 'Load More';
$lang['list'] = 'List';

View file

@ -316,3 +316,4 @@ $lang['apply_to_all_providers'] = 'Apply To All Providers';
$lang['display_any_provider'] = 'Display Any Provider Option'; $lang['display_any_provider'] = 'Display Any Provider Option';
$lang['display_any_provider_hint'] = 'The booking page will get an additional option that allows customers to book without specifying a provider.'; $lang['display_any_provider_hint'] = 'The booking page will get an additional option that allows customers to book without specifying a provider.';
$lang['load_more'] = 'Load More'; $lang['load_more'] = 'Load More';
$lang['list'] = 'List';

View file

@ -316,3 +316,4 @@ $lang['apply_to_all_providers'] = 'Apply To All Providers';
$lang['display_any_provider'] = 'Display Any Provider Option'; $lang['display_any_provider'] = 'Display Any Provider Option';
$lang['display_any_provider_hint'] = 'The booking page will get an additional option that allows customers to book without specifying a provider.'; $lang['display_any_provider_hint'] = 'The booking page will get an additional option that allows customers to book without specifying a provider.';
$lang['load_more'] = 'Load More'; $lang['load_more'] = 'Load More';
$lang['list'] = 'List';

View file

@ -316,3 +316,4 @@ $lang['apply_to_all_providers'] = 'Apply To All Providers';
$lang['display_any_provider'] = 'Display Any Provider Option'; $lang['display_any_provider'] = 'Display Any Provider Option';
$lang['display_any_provider_hint'] = 'The booking page will get an additional option that allows customers to book without specifying a provider.'; $lang['display_any_provider_hint'] = 'The booking page will get an additional option that allows customers to book without specifying a provider.';
$lang['load_more'] = 'Load More'; $lang['load_more'] = 'Load More';
$lang['list'] = 'List';

View file

@ -316,3 +316,4 @@ $lang['apply_to_all_providers'] = 'Apply To All Providers';
$lang['display_any_provider'] = 'Display Any Provider Option'; $lang['display_any_provider'] = 'Display Any Provider Option';
$lang['display_any_provider_hint'] = 'The booking page will display an additional option that allows customers to book without selecting a particular provider.'; $lang['display_any_provider_hint'] = 'The booking page will display an additional option that allows customers to book without selecting a particular provider.';
$lang['load_more'] = 'Load More'; $lang['load_more'] = 'Load More';
$lang['list'] = 'List';

View file

@ -316,3 +316,4 @@ $lang['apply_to_all_providers'] = 'Apply To All Providers';
$lang['display_any_provider'] = 'Display Any Provider Option'; $lang['display_any_provider'] = 'Display Any Provider Option';
$lang['display_any_provider_hint'] = 'The booking page will get an additional option that allows customers to book without specifying a provider.'; $lang['display_any_provider_hint'] = 'The booking page will get an additional option that allows customers to book without specifying a provider.';
$lang['load_more'] = 'Load More'; $lang['load_more'] = 'Load More';
$lang['list'] = 'List';

View file

@ -316,3 +316,4 @@ $lang['apply_to_all_providers'] = 'Apply To All Providers';
$lang['display_any_provider'] = 'Display Any Provider Option'; $lang['display_any_provider'] = 'Display Any Provider Option';
$lang['display_any_provider_hint'] = 'The booking page will get an additional option that allows customers to book without specifying a provider.'; $lang['display_any_provider_hint'] = 'The booking page will get an additional option that allows customers to book without specifying a provider.';
$lang['load_more'] = 'Load More'; $lang['load_more'] = 'Load More';
$lang['list'] = 'List';

View file

@ -316,3 +316,4 @@ $lang['apply_to_all_providers'] = 'Apply To All Providers';
$lang['display_any_provider'] = 'Display Any Provider Option'; $lang['display_any_provider'] = 'Display Any Provider Option';
$lang['display_any_provider_hint'] = 'The booking page will display an additional option that allows customers to book without selecting a particular provider.'; $lang['display_any_provider_hint'] = 'The booking page will display an additional option that allows customers to book without selecting a particular provider.';
$lang['load_more'] = 'Load More'; $lang['load_more'] = 'Load More';
$lang['list'] = 'List';

View file

@ -316,3 +316,4 @@ $lang['apply_to_all_providers'] = 'Apply To All Providers';
$lang['display_any_provider'] = 'Display Any Provider Option'; $lang['display_any_provider'] = 'Display Any Provider Option';
$lang['display_any_provider_hint'] = 'The booking page will get an additional option that allows customers to book without specifying a provider.'; $lang['display_any_provider_hint'] = 'The booking page will get an additional option that allows customers to book without specifying a provider.';
$lang['load_more'] = 'Load More'; $lang['load_more'] = 'Load More';
$lang['list'] = 'List';

View file

@ -316,3 +316,4 @@ $lang['apply_to_all_providers'] = 'Apply To All Providers';
$lang['display_any_provider'] = 'Display Any Provider Option'; $lang['display_any_provider'] = 'Display Any Provider Option';
$lang['display_any_provider_hint'] = 'The booking page will get an additional option that allows customers to book without specifying a provider.'; $lang['display_any_provider_hint'] = 'The booking page will get an additional option that allows customers to book without specifying a provider.';
$lang['load_more'] = 'Load More'; $lang['load_more'] = 'Load More';
$lang['list'] = 'List';

View file

@ -316,3 +316,4 @@ $lang['apply_to_all_providers'] = 'Apply To All Providers';
$lang['display_any_provider'] = 'Display Any Provider Option'; $lang['display_any_provider'] = 'Display Any Provider Option';
$lang['display_any_provider_hint'] = 'The booking page will get an additional option that allows customers to book without specifying a provider.'; $lang['display_any_provider_hint'] = 'The booking page will get an additional option that allows customers to book without specifying a provider.';
$lang['load_more'] = 'Load More'; $lang['load_more'] = 'Load More';
$lang['list'] = 'List';

View file

@ -316,3 +316,4 @@ $lang['apply_to_all_providers'] = 'Apply To All Providers';
$lang['display_any_provider'] = 'Display Any Provider Option'; $lang['display_any_provider'] = 'Display Any Provider Option';
$lang['display_any_provider_hint'] = 'The booking page will display an additional option that allows customers to book without selecting a particular provider.'; $lang['display_any_provider_hint'] = 'The booking page will display an additional option that allows customers to book without selecting a particular provider.';
$lang['load_more'] = 'Load More'; $lang['load_more'] = 'Load More';
$lang['list'] = 'List';

View file

@ -314,6 +314,7 @@ $lang['overwrite_existing_working_plans'] = 'This will overwrite the existing pr
$lang['working_plans_got_updated'] = 'All the working plans got updated.'; $lang['working_plans_got_updated'] = 'All the working plans got updated.';
$lang['apply_to_all_providers'] = 'Apply To All Providers'; $lang['apply_to_all_providers'] = 'Apply To All Providers';
$lang['load_more'] = 'Load More'; $lang['load_more'] = 'Load More';
$lang['list'] = 'List';
$lang['api_token_hint'] = 'Set a secret token in order to enable the token based authentication of the Easy!Appointments API.'; $lang['api_token_hint'] = 'Set a secret token in order to enable the token based authentication of the Easy!Appointments API.';
$lang['timezone'] = 'Timezone'; $lang['timezone'] = 'Timezone';
$lang['overwrite_existing_working_plans'] = 'This will overwrite the existing provider working plans, are you sure that you want to continue?'; $lang['overwrite_existing_working_plans'] = 'This will overwrite the existing provider working plans, are you sure that you want to continue?';

View file

@ -316,3 +316,4 @@ $lang['apply_to_all_providers'] = 'Apply To All Providers';
$lang['display_any_provider'] = 'Display Any Provider Option'; $lang['display_any_provider'] = 'Display Any Provider Option';
$lang['display_any_provider_hint'] = 'The booking page will get an additional option that allows customers to book without specifying a provider.'; $lang['display_any_provider_hint'] = 'The booking page will get an additional option that allows customers to book without specifying a provider.';
$lang['load_more'] = 'Load More'; $lang['load_more'] = 'Load More';
$lang['list'] = 'List';

View file

@ -316,3 +316,4 @@ $lang['apply_to_all_providers'] = 'Apply To All Providers';
$lang['display_any_provider'] = 'Display Any Provider Option'; $lang['display_any_provider'] = 'Display Any Provider Option';
$lang['display_any_provider_hint'] = 'The booking page will get an additional option that allows customers to book without specifying a provider.'; $lang['display_any_provider_hint'] = 'The booking page will get an additional option that allows customers to book without specifying a provider.';
$lang['load_more'] = 'Load More'; $lang['load_more'] = 'Load More';
$lang['list'] = 'List';

View file

@ -316,3 +316,4 @@ $lang['apply_to_all_providers'] = 'Apply To All Providers';
$lang['display_any_provider'] = 'Display Any Provider Option'; $lang['display_any_provider'] = 'Display Any Provider Option';
$lang['display_any_provider_hint'] = 'The booking page will get an additional option that allows customers to book without specifying a provider.'; $lang['display_any_provider_hint'] = 'The booking page will get an additional option that allows customers to book without specifying a provider.';
$lang['load_more'] = 'Load More'; $lang['load_more'] = 'Load More';
$lang['list'] = 'List';

View file

@ -316,3 +316,4 @@ $lang['apply_to_all_providers'] = 'Apply To All Providers';
$lang['display_any_provider'] = 'Display Any Provider Option'; $lang['display_any_provider'] = 'Display Any Provider Option';
$lang['display_any_provider_hint'] = 'The booking page will display an additional option that allows customers to book without selecting a particular provider.'; $lang['display_any_provider_hint'] = 'The booking page will display an additional option that allows customers to book without selecting a particular provider.';
$lang['load_more'] = 'Load More'; $lang['load_more'] = 'Load More';
$lang['list'] = 'List';

View file

@ -468,11 +468,10 @@ body .form-horizontal .controls {
#calendar .calendar-view .date-column .provider-column .not-working { #calendar .calendar-view .date-column .provider-column .not-working {
width: 115px; width: 115px;
background: #eaeaea;
border-radius: 3px; border-radius: 3px;
padding: 10px; padding: 10px;
text-align: center; text-align: center;
background-image: url('../img/unavailable.jpg'); background: #eaeaea url('../img/unavailable.jpg');
opacity: 0.7; opacity: 0.7;
} }
@ -480,6 +479,7 @@ body .form-horizontal .controls {
overflow: auto; overflow: auto;
float: left; float: left;
margin-right: 10px; margin-right: 10px;
width: 500px;
} }
#calendar .calendar-view .date-column .provider-column table thead { #calendar .calendar-view .date-column .provider-column table thead {

View file

@ -80,6 +80,7 @@ body .ui-widget.ui-widget-content {
body #ui-datepicker-div { body #ui-datepicker-div {
margin-top: 4px; margin-top: 4px;
z-index: 4 !important;
} }
body .ui-datepicker .ui-widget-header { body .ui-datepicker .ui-widget-header {

View file

@ -102,7 +102,7 @@ window.Backend = window.Backend || {};
* provided then an action link will be displayed too. * provided then an action link will be displayed too.
* *
* @param {String} message Notification message * @param {String} message Notification message
* @param {Array} actions An array with custom actions that will be available to the user. Every array item is an * @param {Array} [actions] An array with custom actions that will be available to the user. Every array item is an
* object that contains the 'label' and 'function' key values. * object that contains the 'label' and 'function' key values.
*/ */
exports.displayNotification = function (message, actions) { exports.displayNotification = function (message, actions) {

View file

@ -299,7 +299,7 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
+ '<br>' + + '<br>' +
'<strong>' + EALang.end + '</strong> ' '<strong>' + EALang.end + '</strong> '
+ GeneralFunctions.formatDate(event.end.format('YYYY-MM-DD HH:mm:ss'), GlobalVariables.dateFormat, true) + GeneralFunctions.formatDate(event.end.format('YYYY-MM-DD HH:mm:ss'), GlobalVariables.dateFormat, true)
+ '<br>' + + '<br>'
+ notes + notes
+ '<hr>' + + '<hr>' +
'<center>' + '<center>' +

File diff suppressed because it is too large Load diff