Merge branch 'more-cal-improvements' into '3-3-0'
Moar Calendar Improvements See merge request mike-koch/Mods-for-HESK!87
This commit is contained in:
Mike Koch
commit
1978948f4a
@ -2220,6 +2220,106 @@ $modsForHesk_settings = mfh_getSettings();
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="show-start-time" class="col-sm-4 col-xs-12 control-label">
|
||||
<?php echo $hesklang['show_event_start_time']; ?>
|
||||
<i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
|
||||
title="<?php echo $hesklang['show_event_start_time']; ?>"
|
||||
data-content="<?php echo $hesklang['show_event_start_time_help']; ?>"></i>
|
||||
</label>
|
||||
<div class="col-sm-8 form-inline">
|
||||
<?php
|
||||
$on = $modsForHesk_settings['calendar_show_start_time'] == 'true' ? 'checked="checked"' : '';
|
||||
$off = $modsForHesk_settings['calendar_show_start_time'] == 'false' ? 'checked="checked"' : '';
|
||||
echo '
|
||||
<div class="radio"><label><input type="radio" name="calendar-show-start-time" value="true" ' . $on . ' /> ' . $hesklang['yes'] . '</label></div><br>
|
||||
<div class="radio"><label><input type="radio" name="calendar-show-start-time" value="false" ' . $off . ' /> ' . $hesklang['no'] . '</label></div><br>'; ?>
|
||||
</div>
|
||||
</div>
|
||||
<h4 class="bold">
|
||||
<?php echo $hesklang['business_hours']; ?>
|
||||
<i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
|
||||
title="<?php echo $hesklang['business_hours']; ?>"
|
||||
data-content="<?php echo $hesklang['business_hours_help']; ?>"></i>
|
||||
</h4>
|
||||
<?php
|
||||
$rs = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "mfh_calendar_business_hours`");
|
||||
$business_hours = array();
|
||||
while ($row = hesk_dbFetchAssoc($rs)) {
|
||||
$business_hours[intval($row['day_of_week'])]['start'] = $row['start_time'];
|
||||
$business_hours[intval($row['day_of_week'])]['end'] = $row['end_time'];
|
||||
}
|
||||
?>
|
||||
<div class="form-group">
|
||||
<label for="business-hours-sunday" class="col-sm-4 col-xs-12 control-label">
|
||||
<?php echo $hesklang['d0']; ?>
|
||||
</label>
|
||||
<div class="col-sm-8 col-xs-12 form-inline">
|
||||
<input type="text" class="form-control clockpicker" data-autoclose="true" name="business-hours-sunday[0]" value="<?php echo $business_hours[0]['start']; ?>">
|
||||
<?php echo $hesklang['to']; ?>
|
||||
<input type="text" class="form-control clockpicker" data-autoclose="true" name="business-hours-sunday[1]" value="<?php echo $business_hours[0]['end']; ?>">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="business-hours-monday" class="col-sm-4 col-xs-12 control-label">
|
||||
<?php echo $hesklang['d1']; ?>
|
||||
</label>
|
||||
<div class="col-sm-8 col-xs-12 form-inline">
|
||||
<input type="text" class="form-control clockpicker" data-autoclose="true" name="business-hours-monday[0]" value="<?php echo $business_hours[1]['start']; ?>">
|
||||
<?php echo $hesklang['to']; ?>
|
||||
<input type="text" class="form-control clockpicker" data-autoclose="true" name="business-hours-monday[1]" value="<?php echo $business_hours[1]['end']; ?>">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="business-hours-tuesday" class="col-sm-4 col-xs-12 control-label">
|
||||
<?php echo $hesklang['d2']; ?>
|
||||
</label>
|
||||
<div class="col-sm-8 col-xs-12 form-inline">
|
||||
<input type="text" class="form-control clockpicker" data-autoclose="true" name="business-hours-tuesday[0]" value="<?php echo $business_hours[2]['start']; ?>">
|
||||
<?php echo $hesklang['to']; ?>
|
||||
<input type="text" class="form-control clockpicker" data-autoclose="true" name="business-hours-tuesday[1]" value="<?php echo $business_hours[2]['end']; ?>">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="business-hours-wednesday" class="col-sm-4 col-xs-12 control-label">
|
||||
<?php echo $hesklang['d3']; ?>
|
||||
</label>
|
||||
<div class="col-sm-8 col-xs-12 form-inline">
|
||||
<input type="text" class="form-control clockpicker" data-autoclose="true" name="business-hours-wednesday[0]" value="<?php echo $business_hours[3]['start']; ?>">
|
||||
<?php echo $hesklang['to']; ?>
|
||||
<input type="text" class="form-control clockpicker" data-autoclose="true" name="business-hours-wednesday[1]" value="<?php echo $business_hours[3]['end']; ?>">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="business-hours-thursday" class="col-sm-4 col-xs-12 control-label">
|
||||
<?php echo $hesklang['d4']; ?>
|
||||
</label>
|
||||
<div class="col-sm-8 col-xs-12 form-inline">
|
||||
<input type="text" class="form-control clockpicker" data-autoclose="true" name="business-hours-thursday[0]" value="<?php echo $business_hours[4]['start']; ?>">
|
||||
<?php echo $hesklang['to']; ?>
|
||||
<input type="text" class="form-control clockpicker" data-autoclose="true" name="business-hours-thursday[1]" value="<?php echo $business_hours[4]['end']; ?>">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="business-hours-friday" class="col-sm-4 col-xs-12 control-label">
|
||||
<?php echo $hesklang['d5']; ?>
|
||||
</label>
|
||||
<div class="col-sm-8 col-xs-12 form-inline">
|
||||
<input type="text" class="form-control clockpicker" data-autoclose="true" name="business-hours-friday[0]" value="<?php echo $business_hours[5]['start']; ?>">
|
||||
<?php echo $hesklang['to']; ?>
|
||||
<input type="text" class="form-control clockpicker" data-autoclose="true" name="business-hours-friday[1]" value="<?php echo $business_hours[5]['end']; ?>">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="business-hours-saturday" class="col-sm-4 col-xs-12 control-label">
|
||||
<?php echo $hesklang['d6']; ?>
|
||||
</label>
|
||||
<div class="col-sm-8 col-xs-12 form-inline">
|
||||
<input type="text" class="form-control clockpicker" data-autoclose="true" name="business-hours-saturday[0]" value="<?php echo $business_hours[6]['start']; ?>">
|
||||
<?php echo $hesklang['to']; ?>
|
||||
<input type="text" class="form-control clockpicker" data-autoclose="true" name="business-hours-saturday[1]" value="<?php echo $business_hours[6]['end']; ?>">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@ -480,6 +480,7 @@ $set['navbar_title_url'] = hesk_POST('navbar_title_url');
|
||||
$set['enable_calendar'] = hesk_checkMinMax(intval(hesk_POST('enable_calendar')), 0, 2, 2);
|
||||
$set['first_day_of_week'] = hesk_POST('first-day-of-week', 0);
|
||||
$set['default_view'] = hesk_POST('default-view', 'month');
|
||||
$set['calendar_show_start_time'] = hesk_POST('calendar-show-start-time', 'true');
|
||||
|
||||
if ($set['customer-email-verification-required']) {
|
||||
//-- Don't allow multiple emails if verification is required
|
||||
@ -514,6 +515,13 @@ $set['admin_sidebar_text_hover'] = hesk_input(hesk_POST('admin-sidebar-text-hove
|
||||
|
||||
$set['login_background_type'] = hesk_input(hesk_POST('login-background'));
|
||||
$set['login_box_header'] = hesk_input(hesk_POST('login-box-header'));
|
||||
$set['business_hours_sunday'] = hesk_POST_array('business-hours-sunday');
|
||||
$set['business_hours_monday'] = hesk_POST_array('business-hours-monday');
|
||||
$set['business_hours_tuesday'] = hesk_POST_array('business-hours-tuesday');
|
||||
$set['business_hours_wednesday'] = hesk_POST_array('business-hours-wednesday');
|
||||
$set['business_hours_thursday'] = hesk_POST_array('business-hours-thursday');
|
||||
$set['business_hours_friday'] = hesk_POST_array('business-hours-friday');
|
||||
$set['business_hours_saturday'] = hesk_POST_array('business-hours-saturday');
|
||||
|
||||
$changedBackground = false;
|
||||
$loadedAttachmentFuncs = false;
|
||||
@ -655,6 +663,7 @@ mfh_updateSetting('use_mailgun', $set['use_mailgun'], false);
|
||||
mfh_updateSetting('enable_calendar', $set['enable_calendar'], false);
|
||||
mfh_updateSetting('first_day_of_week', $set['first_day_of_week'], false);
|
||||
mfh_updateSetting('default_calendar_view', $set['default_view'], true);
|
||||
mfh_updateSetting('calendar_show_start_time', $set['calendar_show_start_time'], true);
|
||||
mfh_updateSetting('admin_color_scheme', $set['admin_color_scheme'], true);
|
||||
|
||||
mfh_updateSetting('login_background_type', $set['login_background_type'], true);
|
||||
@ -667,6 +676,29 @@ if ($changedLoginImage) {
|
||||
mfh_updateSetting('login_box_header_image', $set['login_box_header_image'], true);
|
||||
}
|
||||
|
||||
// Update business hours
|
||||
hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "mfh_calendar_business_hours`
|
||||
SET `start_time` = '" . hesk_dbEscape($set['business_hours_sunday'][0]) . "',
|
||||
`end_time` = '" . hesk_dbEscape($set['business_hours_sunday'][1]) . "' WHERE `day_of_week` = " . intval(0));
|
||||
hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "mfh_calendar_business_hours`
|
||||
SET `start_time` = '" . hesk_dbEscape($set['business_hours_monday'][0]) . "',
|
||||
`end_time` = '" . hesk_dbEscape($set['business_hours_monday'][1]) . "' WHERE `day_of_week` = " . intval(1));
|
||||
hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "mfh_calendar_business_hours`
|
||||
SET `start_time` = '" . hesk_dbEscape($set['business_hours_tuesday'][0]) . "',
|
||||
`end_time` = '" . hesk_dbEscape($set['business_hours_tuesday'][1]) . "' WHERE `day_of_week` = " . intval(2));
|
||||
hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "mfh_calendar_business_hours`
|
||||
SET `start_time` = '" . hesk_dbEscape($set['business_hours_wednesday'][0]) . "',
|
||||
`end_time` = '" . hesk_dbEscape($set['business_hours_wednesday'][1]) . "' WHERE `day_of_week` = " . intval(3));
|
||||
hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "mfh_calendar_business_hours`
|
||||
SET `start_time` = '" . hesk_dbEscape($set['business_hours_thursday'][0]) . "',
|
||||
`end_time` = '" . hesk_dbEscape($set['business_hours_thursday'][1]) . "' WHERE `day_of_week` = " . intval(4));
|
||||
hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "mfh_calendar_business_hours`
|
||||
SET `start_time` = '" . hesk_dbEscape($set['business_hours_friday'][0]) . "',
|
||||
`end_time` = '" . hesk_dbEscape($set['business_hours_friday'][1]) . "' WHERE `day_of_week` = " . intval(5));
|
||||
hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "mfh_calendar_business_hours`
|
||||
SET `start_time` = '" . hesk_dbEscape($set['business_hours_saturday'][0]) . "',
|
||||
`end_time` = '" . hesk_dbEscape($set['business_hours_saturday'][1]) . "' WHERE `day_of_week` = " . intval(6));
|
||||
|
||||
// Prepare settings file and save it
|
||||
$settings_file_content = '<?php
|
||||
// Settings file for HESK ' . $set['hesk_version'] . '
|
||||
|
||||
@ -605,6 +605,14 @@ echo mfh_get_hidden_fields_for_language(array('error_loading_events',
|
||||
echo $view_array[$_SESSION['default_calendar_view']];
|
||||
?>
|
||||
</p>
|
||||
<p id="setting_show_start_time"><?php echo $modsForHesk_settings['calendar_show_start_time']; ?></p>
|
||||
<?php
|
||||
$businessHoursRs = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "mfh_calendar_business_hours`");
|
||||
while ($row = hesk_dbFetchAssoc($businessHoursRs)):
|
||||
?>
|
||||
<p id="business_hours_<?php echo $row['day_of_week']; ?>_start"><?php echo $row['start_time']; ?></p>
|
||||
<p id="business_hours_<?php echo $row['day_of_week']; ?>_end"><?php echo $row['end_time']; ?></p>
|
||||
<?php endwhile; ?>
|
||||
</div>
|
||||
<script type="text/html" id="audit-trail-template">
|
||||
<tr>
|
||||
|
||||
15
api/BusinessLogic/Calendar/BusinessHours.php
Normal file
15
api/BusinessLogic/Calendar/BusinessHours.php
Normal file
@ -0,0 +1,15 @@
|
||||
<?php
|
||||
|
||||
namespace BusinessLogic\Calendar;
|
||||
|
||||
|
||||
class BusinessHours {
|
||||
/* @var $dayOfWeek int */
|
||||
public $dayOfWeek;
|
||||
|
||||
/* @var $startTime string */
|
||||
public $startTime;
|
||||
|
||||
/* @var $endTime string */
|
||||
public $endTime;
|
||||
}
|
||||
@ -89,4 +89,8 @@ class CalendarHandler extends \BaseClass {
|
||||
public function deleteEvent($id, $userContext, $heskSettings) {
|
||||
$this->calendarGateway->deleteEvent($id, $userContext, $heskSettings);
|
||||
}
|
||||
|
||||
public function getBusinessHours($heskSettings) {
|
||||
return $this->calendarGateway->getBusinessHours($heskSettings);
|
||||
}
|
||||
}
|
||||
@ -124,4 +124,12 @@ class CalendarController extends \BaseClass {
|
||||
|
||||
return $event;
|
||||
}
|
||||
|
||||
static function getBusinessHours() {
|
||||
global $applicationContext, $hesk_settings;
|
||||
|
||||
$calendarHandler = $applicationContext->get(CalendarHandler::clazz());
|
||||
|
||||
return output($calendarHandler->getBusinessHours($hesk_settings));
|
||||
}
|
||||
}
|
||||
@ -4,6 +4,7 @@ namespace DataAccess\Calendar;
|
||||
|
||||
|
||||
use BusinessLogic\Calendar\AbstractEvent;
|
||||
use BusinessLogic\Calendar\BusinessHours;
|
||||
use BusinessLogic\Calendar\CalendarEvent;
|
||||
use BusinessLogic\Calendar\ReminderUnit;
|
||||
use BusinessLogic\Calendar\SearchEventsFilter;
|
||||
@ -243,4 +244,23 @@ class CalendarGateway extends CommonDao {
|
||||
|
||||
$this->close();
|
||||
}
|
||||
|
||||
public function getBusinessHours($heskSettings) {
|
||||
$this->init();
|
||||
|
||||
$rs = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "mfh_calendar_business_hours`");
|
||||
$businessHours = array();
|
||||
while ($row = hesk_dbFetchAssoc($rs)) {
|
||||
$businessHour = new BusinessHours();
|
||||
$businessHour->dayOfWeek = intval($row['day_of_week']);
|
||||
$businessHour->startTime = $row['start_time'];
|
||||
$businessHour->endTime = $row['end_time'];
|
||||
|
||||
$businessHours[] = $businessHour;
|
||||
}
|
||||
|
||||
$this->close();
|
||||
|
||||
return $businessHours;
|
||||
}
|
||||
}
|
||||
@ -211,6 +211,7 @@ Link::all(array(
|
||||
// Settings
|
||||
'/v1/settings' => action(\Controllers\Settings\SettingsController::clazz(), RequestMethod::all()),
|
||||
// Calendar
|
||||
'/v1/calendar/business-hours' => action(\Controllers\Calendar\CalendarController::clazz() . '::getBusinessHours', array(RequestMethod::GET), SecurityHandler::OPEN),
|
||||
'/v1/calendar/events' => action(\Controllers\Calendar\CalendarController::clazz(), array(RequestMethod::GET), SecurityHandler::OPEN),
|
||||
'/v1/calendar/events/staff' => action(\Controllers\Calendar\CalendarController::clazz(), array(RequestMethod::GET, RequestMethod::POST), SecurityHandler::INTERNAL_OR_AUTH_TOKEN),
|
||||
'/v1/calendar/events/staff/{i}' => action(\Controllers\Calendar\CalendarController::clazz(), array(RequestMethod::PUT, RequestMethod::DELETE), SecurityHandler::INTERNAL_OR_AUTH_TOKEN),
|
||||
|
||||
10
calendar.php
10
calendar.php
@ -119,4 +119,12 @@ echo mfh_get_hidden_fields_for_language(array(
|
||||
<div style="display: none">
|
||||
<p id="setting_default_view"><?php echo $modsForHesk_settings['default_calendar_view']; ?></p>
|
||||
<p id="setting_first_day_of_week"><?php echo $modsForHesk_settings['first_day_of_week']; ?></p>
|
||||
</div>
|
||||
<p id="setting_show_start_time"><?php echo $modsForHesk_settings['calendar_show_start_time']; ?></p>
|
||||
</div>
|
||||
<?php
|
||||
$businessHoursRs = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "mfh_calendar_business_hours`");
|
||||
while ($row = hesk_dbFetchAssoc($businessHoursRs)):
|
||||
?>
|
||||
<p id="business_hours_<?php echo $row['day_of_week']; ?>_start"><?php echo $row['start_time']; ?></p>
|
||||
<p id="business_hours_<?php echo $row['day_of_week']; ?>_end"><?php echo $row['end_time']; ?></p>
|
||||
<?php endwhile; ?>
|
||||
@ -206,6 +206,8 @@ hesk_dbConnect();
|
||||
$all_good &= run_column_check('categories', 'mfh_description');
|
||||
$all_good &= run_column_check('custom_fields', 'mfh_description');
|
||||
$all_good &= run_setting_check('migrationNumber');
|
||||
output_header_row('3.3.0');
|
||||
$all_good &= run_table_check('mfh_calendar_business_hours');
|
||||
|
||||
if ($all_good) {
|
||||
echo "<script>$('#all-good').show()</script>";
|
||||
|
||||
@ -222,5 +222,8 @@ function getAllMigrations() {
|
||||
164 => new \v330\ServiceMessagesImprovements\CreateServiceMessageToLocationTable(164),
|
||||
165 => new \v330\ServiceMessagesImprovements\UpdateExistingServiceMessagesLocations(165),
|
||||
166 => new \v330\ServiceMessagesImprovements\AddLanguageColumnToServiceMessages(166),
|
||||
167 => new \v330\CalendarImprovements\AddBusinessHoursTable(167),
|
||||
168 => new \v330\CalendarImprovements\InsertDefaultBusinessHours(168),
|
||||
169 => new \v330\CalendarImprovements\AddShowStartTimeSetting(169),
|
||||
);
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
<?php
|
||||
|
||||
namespace v330\CalendarImprovements;
|
||||
|
||||
class AddBusinessHoursTable extends \AbstractUpdatableMigration {
|
||||
|
||||
function innerUp($hesk_settings) {
|
||||
$this->executeQuery("CREATE TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "mfh_calendar_business_hours`
|
||||
(`day_of_week` INT NOT NULL, `start_time` VARCHAR(5) NOT NULL, `end_time` VARCHAR(5) NOT NULL)");
|
||||
}
|
||||
|
||||
function innerDown($hesk_settings) {
|
||||
$this->executeQuery("DROP TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "mfh_calendar_business_hours`");
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,17 @@
|
||||
<?php
|
||||
|
||||
namespace v330\CalendarImprovements;
|
||||
|
||||
|
||||
class AddShowStartTimeSetting extends \AbstractUpdatableMigration {
|
||||
|
||||
function innerUp($hesk_settings) {
|
||||
$this->executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` (`Key`, `Value`)
|
||||
VALUES ('calendar_show_start_time', 'true')");
|
||||
}
|
||||
|
||||
function innerDown($hesk_settings) {
|
||||
$this->executeQuery("DELETE FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings`
|
||||
WHERE `Key` = 'calendar_show_start_time'");
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,28 @@
|
||||
<?php
|
||||
|
||||
namespace v330\CalendarImprovements;
|
||||
|
||||
|
||||
class InsertDefaultBusinessHours extends \AbstractUpdatableMigration {
|
||||
|
||||
function innerUp($hesk_settings) {
|
||||
$this->executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "mfh_calendar_business_hours` (`day_of_week`, `start_time`, `end_time`)
|
||||
VALUES (0, '00:00', '23:59')");
|
||||
$this->executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "mfh_calendar_business_hours` (`day_of_week`, `start_time`, `end_time`)
|
||||
VALUES (1, '00:00', '23:59')");
|
||||
$this->executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "mfh_calendar_business_hours` (`day_of_week`, `start_time`, `end_time`)
|
||||
VALUES (2, '00:00', '23:59')");
|
||||
$this->executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "mfh_calendar_business_hours` (`day_of_week`, `start_time`, `end_time`)
|
||||
VALUES (3, '00:00', '23:59')");
|
||||
$this->executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "mfh_calendar_business_hours` (`day_of_week`, `start_time`, `end_time`)
|
||||
VALUES (4, '00:00', '23:59')");
|
||||
$this->executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "mfh_calendar_business_hours` (`day_of_week`, `start_time`, `end_time`)
|
||||
VALUES (5, '00:00', '23:59')");
|
||||
$this->executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "mfh_calendar_business_hours` (`day_of_week`, `start_time`, `end_time`)
|
||||
VALUES (6, '00:00', '23:59')");
|
||||
}
|
||||
|
||||
function innerDown($hesk_settings) {
|
||||
$this->executeQuery("DELETE FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "mfh_calendar_business_hours`");
|
||||
}
|
||||
}
|
||||
@ -12,6 +12,44 @@ $(document).ready(function() {
|
||||
eventLimit: true,
|
||||
timeFormat: 'H:mm',
|
||||
axisFormat: 'H:mm',
|
||||
displayEventTime: $('#setting_show_start_time').text(),
|
||||
businessHours: [
|
||||
{
|
||||
dow: [0],
|
||||
start: $('#business_hours_0_start').text(),
|
||||
end: $('#business_hours_0_end').text()
|
||||
},
|
||||
{
|
||||
dow: [1],
|
||||
start: $('#business_hours_1_start').text(),
|
||||
end: $('#business_hours_1_end').text()
|
||||
},
|
||||
{
|
||||
dow: [2],
|
||||
start: $('#business_hours_2_start').text(),
|
||||
end: $('#business_hours_2_end').text()
|
||||
},
|
||||
{
|
||||
dow: [3],
|
||||
start: $('#business_hours_3_start').text(),
|
||||
end: $('#business_hours_3_end').text()
|
||||
},
|
||||
{
|
||||
dow: [4],
|
||||
start: $('#business_hours_4_start').text(),
|
||||
end: $('#business_hours_4_end').text()
|
||||
},
|
||||
{
|
||||
dow: [5],
|
||||
start: $('#business_hours_5_start').text(),
|
||||
end: $('#business_hours_5_end').text()
|
||||
},
|
||||
{
|
||||
dow: [6],
|
||||
start: $('#business_hours_6_start').text(),
|
||||
end: $('#business_hours_6_end').text()
|
||||
}
|
||||
],
|
||||
firstDay: $('#setting_first_day_of_week').text(),
|
||||
defaultView: $('#setting_default_view').text().trim(),
|
||||
events: function(start, end, timezone, callback) {
|
||||
|
||||
@ -12,6 +12,44 @@ $(document).ready(function() {
|
||||
eventLimit: true,
|
||||
timeFormat: 'H:mm',
|
||||
axisFormat: 'H:mm',
|
||||
displayEventTime: $('#setting_show_start_time').text(),
|
||||
businessHours: [
|
||||
{
|
||||
dow: [0],
|
||||
start: $('#business_hours_0_start').text(),
|
||||
end: $('#business_hours_0_end').text()
|
||||
},
|
||||
{
|
||||
dow: [1],
|
||||
start: $('#business_hours_1_start').text(),
|
||||
end: $('#business_hours_1_end').text()
|
||||
},
|
||||
{
|
||||
dow: [2],
|
||||
start: $('#business_hours_2_start').text(),
|
||||
end: $('#business_hours_2_end').text()
|
||||
},
|
||||
{
|
||||
dow: [3],
|
||||
start: $('#business_hours_3_start').text(),
|
||||
end: $('#business_hours_3_end').text()
|
||||
},
|
||||
{
|
||||
dow: [4],
|
||||
start: $('#business_hours_4_start').text(),
|
||||
end: $('#business_hours_4_end').text()
|
||||
},
|
||||
{
|
||||
dow: [5],
|
||||
start: $('#business_hours_5_start').text(),
|
||||
end: $('#business_hours_5_end').text()
|
||||
},
|
||||
{
|
||||
dow: [6],
|
||||
start: $('#business_hours_6_start').text(),
|
||||
end: $('#business_hours_6_end').text()
|
||||
}
|
||||
],
|
||||
firstDay: $('#setting_first_day_of_week').text(),
|
||||
defaultView: $('#setting_default_view').text().trim(),
|
||||
events: function(start, end, timezone, callback) {
|
||||
|
||||
@ -12,6 +12,44 @@ $(document).ready(function() {
|
||||
eventLimit: true,
|
||||
timeFormat: 'H:mm',
|
||||
axisFormat: 'H:mm',
|
||||
displayEventTime: $('#setting_show_start_time').text() === 'true',
|
||||
businessHours: [
|
||||
{
|
||||
dow: [0],
|
||||
start: $('#business_hours_0_start').text(),
|
||||
end: $('#business_hours_0_end').text()
|
||||
},
|
||||
{
|
||||
dow: [1],
|
||||
start: $('#business_hours_1_start').text(),
|
||||
end: $('#business_hours_1_end').text()
|
||||
},
|
||||
{
|
||||
dow: [2],
|
||||
start: $('#business_hours_2_start').text(),
|
||||
end: $('#business_hours_2_end').text()
|
||||
},
|
||||
{
|
||||
dow: [3],
|
||||
start: $('#business_hours_3_start').text(),
|
||||
end: $('#business_hours_3_end').text()
|
||||
},
|
||||
{
|
||||
dow: [4],
|
||||
start: $('#business_hours_4_start').text(),
|
||||
end: $('#business_hours_4_end').text()
|
||||
},
|
||||
{
|
||||
dow: [5],
|
||||
start: $('#business_hours_5_start').text(),
|
||||
end: $('#business_hours_5_end').text()
|
||||
},
|
||||
{
|
||||
dow: [6],
|
||||
start: $('#business_hours_6_start').text(),
|
||||
end: $('#business_hours_6_end').text()
|
||||
}
|
||||
],
|
||||
firstDay: $('#setting_first_day_of_week').text(),
|
||||
defaultView: $('#setting_default_view').text().trim(),
|
||||
events: function(start, end, timezone, callback) {
|
||||
|
||||
@ -2230,6 +2230,11 @@ $hesklang['sm_view_kb_article'] = 'View Knowledgebase Article';
|
||||
$hesklang['sm_submit_ticket'] = 'Submit Ticket';
|
||||
$hesklang['sm_view_ticket'] = 'View Ticket';
|
||||
$hesklang['sm_login_page'] = 'Login Page';
|
||||
$hesklang['business_hours'] = 'Business Hours';
|
||||
$hesklang['business_hours_help'] = 'Set business hours for the calendar. There is no functional change by setting this,
|
||||
but times outside of the defined business hours will have a darker gray background for increased visibility.';
|
||||
$hesklang['show_event_start_time'] = 'Show event start time in title';
|
||||
$hesklang['show_event_start_time_help'] = 'Always show the start time on event titles (unless the event is an all-day event).';
|
||||
|
||||
// DO NOT CHANGE BELOW
|
||||
if (!defined('IN_SCRIPT')) die('PHP syntax OK!');
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user