mirrors/easyappointments
1
0
Fork 1
mirror of https://github.com/alextselegidis/easyappointments.git synced 2024-11-26 01:43:06 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix calendar pop up actions

Browse source
This commit is contained in:
Janina Phillips 2020-06-22 09:55:46 -04:00
parent 63072ead77
commit 8f3f4a3d28
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
assets/js/backend_calendar_default_view.js
View file

@ -291,10 +291,10 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
if ($(this).hasClass('fc-unavailable') || $parent.hasClass('fc-unavailable') || $altParent.hasClass('fc-unavailable')) { if ($(this).hasClass('fc-unavailable') || $parent.hasClass('fc-unavailable') || $altParent.hasClass('fc-unavailable')) {
displayEdit = (($parent.hasClass('fc-custom') || $altParent.hasClass('fc-custom')) displayEdit = (($parent.hasClass('fc-custom') || $altParent.hasClass('fc-custom'))
&& GlobalVariables.user.privileges.appointments.edit === true) && GlobalVariables.user.privileges.appointments.edit === true)
? '' : 'hide'; ? 'mr-2' : 'd-none';
displayDelete = (($parent.hasClass('fc-custom') || $altParent.hasClass('fc-custom')) displayDelete = (($parent.hasClass('fc-custom') || $altParent.hasClass('fc-custom'))
&& GlobalVariables.user.privileges.appointments.delete === true) && GlobalVariables.user.privileges.appointments.delete === true)
? '' : 'hide'; // Same value at the time. ? 'mr-2' : 'd-none'; // Same value at the time.
var notes = ''; var notes = '';
if (event.data) { // Only custom unavailable periods have notes. if (event.data) { // Only custom unavailable periods have notes.
@ -327,7 +327,7 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
$('<hr/>'), $('<hr/>'),
$('<div/>', { $('<div/>', {
'class': 'd-flex justify-content-between', 'class': 'd-flex justify-content-center',
'html': [ 'html': [
$('<button/>', { $('<button/>', {
'class': 'edit-popover btn btn-primary ' + displayEdit, 'class': 'edit-popover btn btn-primary ' + displayEdit,
@ -348,7 +348,7 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
} else if ($(this).hasClass('fc-extra') || $parent.hasClass('fc-extra') || $altParent.hasClass('fc-extra')) { } else if ($(this).hasClass('fc-extra') || $parent.hasClass('fc-extra') || $altParent.hasClass('fc-extra')) {
displayDelete = (($parent.hasClass('fc-custom') || $altParent.hasClass('fc-custom')) displayDelete = (($parent.hasClass('fc-custom') || $altParent.hasClass('fc-custom'))
&& GlobalVariables.user.privileges.appointments.delete === true) && GlobalVariables.user.privileges.appointments.delete === true)
? '' : 'hide'; // Same value at the time. ? 'mr-2' : 'd-none'; // Same value at the time.
var provider = ''; var provider = '';
@ -411,9 +411,9 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
}); });
} else { } else {
displayEdit = (GlobalVariables.user.privileges.appointments.edit === true) displayEdit = (GlobalVariables.user.privileges.appointments.edit === true)
? '' : 'hide'; ? 'mr-2' : 'd-none';
displayDelete = (GlobalVariables.user.privileges.appointments.delete === true) displayDelete = (GlobalVariables.user.privileges.appointments.delete === true)
? '' : 'hide'; ? 'mr-2' : 'd-none';
$html = $('<div/>', { $html = $('<div/>', {
'html': [ 'html': [
@ -488,7 +488,7 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
$('<hr/>'), $('<hr/>'),
$('<div/>', { $('<div/>', {
'class': 'd-flex justify-content-between', 'class': 'd-flex justify-content-center',
'html': [ 'html': [
$('<button/>', { $('<button/>', {
'class': 'edit-popover btn btn-primary ' + displayEdit, 'class': 'edit-popover btn btn-primary ' + displayEdit,

14
assets/js/backend_calendar_table_view.js
View file

@ -1018,10 +1018,10 @@ window.BackendCalendarTableView = window.BackendCalendarTableView || {};
if ($(this).hasClass('fc-unavailable') || $parent.hasClass('fc-unavailable') || $altParent.hasClass('fc-unavailable')) { if ($(this).hasClass('fc-unavailable') || $parent.hasClass('fc-unavailable') || $altParent.hasClass('fc-unavailable')) {
displayEdit = (($parent.hasClass('fc-custom') || $altParent.hasClass('fc-custom')) displayEdit = (($parent.hasClass('fc-custom') || $altParent.hasClass('fc-custom'))
&& GlobalVariables.user.privileges.appointments.edit === true) && GlobalVariables.user.privileges.appointments.edit === true)
? '' : 'hide'; ? 'mr-2' : 'd-none';
displayDelete = (($parent.hasClass('fc-custom') || $altParent.hasClass('fc-custom')) displayDelete = (($parent.hasClass('fc-custom') || $altParent.hasClass('fc-custom'))
&& GlobalVariables.user.privileges.appointments.delete === true) && GlobalVariables.user.privileges.appointments.delete === true)
? '' : 'hide'; // Same value at the time. ? 'mr-2' : 'd-none'; // Same value at the time.
var notes = ''; var notes = '';
if (event.data) { // Only custom unavailable periods have notes. if (event.data) { // Only custom unavailable periods have notes.
@ -1075,7 +1075,7 @@ window.BackendCalendarTableView = window.BackendCalendarTableView || {};
} else if ($(this).hasClass('fc-extra') || $parent.hasClass('fc-extra') || $altParent.hasClass('fc-extra')) { } else if ($(this).hasClass('fc-extra') || $parent.hasClass('fc-extra') || $altParent.hasClass('fc-extra')) {
displayDelete = (($parent.hasClass('fc-custom') || $altParent.hasClass('fc-custom')) displayDelete = (($parent.hasClass('fc-custom') || $altParent.hasClass('fc-custom'))
&& GlobalVariables.user.privileges.appointments.delete === true) && GlobalVariables.user.privileges.appointments.delete === true)
? '' : 'hide'; // Same value at the time. ? 'mr-2' : 'd-none'; // Same value at the time.
var provider = ''; var provider = '';
@ -1122,7 +1122,7 @@ window.BackendCalendarTableView = window.BackendCalendarTableView || {};
$('<hr/>'), $('<hr/>'),
$('<div/>', { $('<div/>', {
'class': 'd-flex justify-content-between', 'class': 'd-flex justify-content-center',
'html': [ 'html': [
$('<button/>', { $('<button/>', {
'class': 'delete-popover btn btn-danger ' + displayDelete, 'class': 'delete-popover btn btn-danger ' + displayDelete,
@ -1138,9 +1138,9 @@ window.BackendCalendarTableView = window.BackendCalendarTableView || {};
}); });
} else { } else {
displayEdit = (GlobalVariables.user.privileges.appointments.edit === true) displayEdit = (GlobalVariables.user.privileges.appointments.edit === true)
? '' : 'hide'; ? 'mr-2' : 'd-none';
displayDelete = (GlobalVariables.user.privileges.appointments.delete === true) displayDelete = (GlobalVariables.user.privileges.appointments.delete === true)
? '' : 'hide'; ? 'mr-2' : 'd-none';
$html = $('<div/>', { $html = $('<div/>', {
'html': [ 'html': [
@ -1215,7 +1215,7 @@ window.BackendCalendarTableView = window.BackendCalendarTableView || {};
$('<hr/>'), $('<hr/>'),
$('<div/>', { $('<div/>', {
'class': 'd-flex justify-content-between', 'class': 'd-flex justify-content-center',
'html': [ 'html': [
$('<button/>', { $('<button/>', {
'class': 'edit-popover btn btn-primary ' + displayEdit, 'class': 'edit-popover btn btn-primary ' + displayEdit,