ifl/iflrandevu
1
1
Fork 0
forked from mirrors/easyappointments
Code Issues 6 Pull requests Releases 3 Activity

Various calendar page variable fixes

Browse source
This commit is contained in:
Alex Tselegidis 2021-11-25 09:13:27 +01:00
parent d94617945b
commit c9457a30e7
1 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
application/views/pages/calendar/calendar_page.php
View file

@ -43,23 +43,22 @@
<script> <script>
var GlobalVariables = { var GlobalVariables = {
csrfToken: <?= json_encode($this->security->get_csrf_hash()) ?>, csrfToken: <?= json_encode($this->security->get_csrf_hash()) ?>,
baseUrl: <?= json_encode(config('base_url')) ?>,
dateFormat: <?= json_encode(setting('date_format')) ?>,
timeFormat: <?= json_encode(setting('time_format')) ?>,
firstWeekday: <?= json_encode(setting('first_weekday')) ?>,
timezones: <?= json_encode($timezones) ?>,
availableProviders: <?= json_encode($available_providers) ?>, availableProviders: <?= json_encode($available_providers) ?>,
availableServices: <?= json_encode($available_services) ?>, availableServices: <?= json_encode($available_services) ?>,
baseUrl: <?= json_encode($base_url) ?>,
dateFormat: <?= json_encode($date_format) ?>,
timeFormat: <?= json_encode($time_format) ?>,
firstWeekday: <?= json_encode($first_weekday) ?>,
editAppointment: <?= json_encode($edit_appointment) ?>,
customers: <?= json_encode($customers) ?>,
secretaryProviders: <?= json_encode($secretary_providers) ?>, secretaryProviders: <?= json_encode($secretary_providers) ?>,
calendarView: <?= json_encode($calendar_view) ?>, calendarView: <?= json_encode($calendar_view) ?>,
timezones: <?= json_encode($timezones) ?>, editAppointment: <?= json_encode($edit_appointment) ?>,
user: { user: {
id: <?= $user_id ?>, id: <?= session('user_id') ?>,
email: <?= json_encode($user_email) ?>, email: <?= json_encode(session('user_email')) ?>,
timezone: <?= json_encode($timezone) ?>, timezone: <?= json_encode(session('timezone')) ?>,
role_slug: <?= json_encode($role_slug) ?>, role_slug: <?= json_encode(session('role_slug')) ?>,
privileges: <?= json_encode($privileges) ?>, privileges: <?= json_encode($privileges) ?>
} }
}; };
@ -75,7 +74,7 @@
<div class="container-fluid backend-page" id="calendar-page"> <div class="container-fluid backend-page" id="calendar-page">
<div class="row" id="calendar-toolbar"> <div class="row" id="calendar-toolbar">
<div id="calendar-filter" class="col-12 col-sm-5"> <div id="calendar-filter" class="col-12 col-sm-5">
<div class="mb-3 calendar-filter-items"> <div class="calendar-filter-items">
<select id="select-filter-item" class="form-control col" <select id="select-filter-item" class="form-control col"
data-tippy-content="<?= lang('select_filter_item_hint') ?>"> data-tippy-content="<?= lang('select_filter_item_hint') ?>">
</select> </select>
@ -83,7 +82,7 @@
</div> </div>
<div id="calendar-actions" class="col-12 col-sm-7"> <div id="calendar-actions" class="col-12 col-sm-7">
<?php if (($role_slug == DB_SLUG_ADMIN || $role_slug == DB_SLUG_PROVIDER) <?php if ((session('role_slug') == DB_SLUG_ADMIN || session('role_slug') == DB_SLUG_PROVIDER)
&& config('google_sync_feature') == TRUE): ?> && config('google_sync_feature') == TRUE): ?>
<button id="google-sync" class="btn btn-primary" <button id="google-sync" class="btn btn-primary"
data-tippy-content="<?= lang('trigger_google_sync_hint') ?>"> data-tippy-content="<?= lang('trigger_google_sync_hint') ?>">
@ -98,7 +97,7 @@
</button> </button>
<?php endif ?> <?php endif ?>
<?php if ($privileges[PRIV_APPOINTMENTS]['add'] == TRUE): ?> <?php if (can('add', PRIV_APPOINTMENTS)): ?>
<div class="btn-group"> <div class="btn-group">
<button class="btn btn-light" id="insert-appointment"> <button class="btn btn-light" id="insert-appointment">
<i class="fas fa-plus-square me-2"></i> <i class="fas fa-plus-square me-2"></i>
@ -116,7 +115,7 @@
<?= lang('unavailable') ?> <?= lang('unavailable') ?>
</a> </a>
<a class="dropdown-item" href="#" id="insert-working-plan-exception" <a class="dropdown-item" href="#" id="insert-working-plan-exception"
<?= $this->session->userdata('role_slug') !== 'admin' ? 'hidden' : '' ?>> <?= session('role_slug') !== DB_SLUG_ADMIN ? 'hidden' : '' ?>>
<i class="fas fa-plus-square me-2"></i> <i class="fas fa-plus-square me-2"></i>
<?= lang('working_plan_exception') ?> <?= lang('working_plan_exception') ?>
</a> </a>
@ -153,9 +152,13 @@
<!-- Page Components --> <!-- Page Components -->
<?php component('manage_appointment_modal', '', ['timezones' => $timezones]) ?> <?php component('manage_appointment_modal', '', ['timezones' => $timezones]) ?>
<?php component('manage_appointment_modal') ?> <?php component('manage_appointment_modal') ?>
<?php component('manage_unavailable_modal') ?> <?php component('manage_unavailable_modal') ?>
<?php component('select_google_calendar_modal') ?> <?php component('select_google_calendar_modal') ?>
<?php component('working_plan_exceptions_modal') ?> <?php component('working_plan_exceptions_modal') ?>
<?php section('content') ?> <?php section('content') ?>