wip special days alerts
This commit is contained in:
Daniel Barbero Martin
parent
e8c6342af4
commit
bd75912a0d
|
|
@ -11,8 +11,11 @@
|
|||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
// Load global vars
|
||||
// Load global vars.
|
||||
global $config;
|
||||
|
||||
use PandoraFMS\Calendar;
|
||||
|
||||
require_once $config['homedir'].'/include/functions_alerts.php';
|
||||
require_once $config['homedir'].'/include/functions_users.php';
|
||||
enterprise_include_once('meta/include/functions_alerts_meta.php');
|
||||
|
|
@ -288,7 +291,7 @@ function update_template($step)
|
|||
$friday = (bool) get_parameter('friday');
|
||||
$saturday = (bool) get_parameter('saturday');
|
||||
$sunday = (bool) get_parameter('sunday');
|
||||
$special_day = (bool) get_parameter('special_day');
|
||||
$special_day = (int) get_parameter('special_day');
|
||||
$time_from = (string) get_parameter('time_from');
|
||||
$time_from = date('H:i:00', strtotime($time_from));
|
||||
$time_to = (string) get_parameter('time_to');
|
||||
|
|
@ -418,7 +421,7 @@ $thursday = true;
|
|||
$friday = true;
|
||||
$saturday = true;
|
||||
$sunday = true;
|
||||
$special_day = false;
|
||||
$special_day = 0;
|
||||
$default_action = 0;
|
||||
$fields = [];
|
||||
for ($i = 1; $i <= $config['max_macro_fields']; $i++) {
|
||||
|
|
@ -561,7 +564,7 @@ if ($id && ! $create_template) {
|
|||
$friday = (bool) $template['friday'];
|
||||
$saturday = (bool) $template['saturday'];
|
||||
$sunday = (bool) $template['sunday'];
|
||||
$special_day = (bool) $template['special_day'];
|
||||
$special_day = (int) $template['special_day'];
|
||||
$max_alerts = $template['max_alerts'];
|
||||
$min_alerts = $template['min_alerts'];
|
||||
$min_alerts_reset_counter = $template['min_alerts_reset_counter'];
|
||||
|
|
@ -671,11 +674,36 @@ if ($step == 2) {
|
|||
);
|
||||
|
||||
$table->data[0][2] = __('Use special days list');
|
||||
$table->data[0][3] = html_print_checkbox(
|
||||
$data_special_days = Calendar::calendars(
|
||||
// Fields.
|
||||
[ '`talert_calendar`.*' ],
|
||||
// Filter.
|
||||
[],
|
||||
// Count.
|
||||
false,
|
||||
// Offset.
|
||||
null,
|
||||
// Limit.
|
||||
null,
|
||||
// Order.
|
||||
null,
|
||||
// Sort field.
|
||||
null,
|
||||
// Reduce to a select.
|
||||
true
|
||||
);
|
||||
|
||||
$table->data[0][3] = html_print_select(
|
||||
$data_special_days,
|
||||
'special_day',
|
||||
1,
|
||||
$special_day,
|
||||
'',
|
||||
__('None'),
|
||||
0,
|
||||
true,
|
||||
false,
|
||||
false,
|
||||
'',
|
||||
(!$is_management_allowed | $disabled)
|
||||
);
|
||||
|
||||
|
|
|
|||
|
|
@ -306,17 +306,19 @@ class CalendarManager
|
|||
*/
|
||||
public function iCalendarSpecialDay()
|
||||
{
|
||||
include_once 'include/ics-parser/class.iCalReader.php';
|
||||
|
||||
$day_code = (string) get_parameter('day_code');
|
||||
$overwrite = (bool) get_parameter('overwrite', 0);
|
||||
$values = [];
|
||||
$values['id_group'] = (string) get_parameter('id_group');
|
||||
$values['id_calendar'] = get_parameter('id_calendar');
|
||||
$values['day_code'] = $day_code;
|
||||
|
||||
$error = $_FILES['ical_file']['error'];
|
||||
$extension = substr($_FILES['ical_file']['name'], -3);
|
||||
|
||||
if ($error == 0 && strcasecmp($extension, 'ics') == 0) {
|
||||
$result = true;
|
||||
$skipped_dates = '';
|
||||
$this_month = date('Ym');
|
||||
$ical = new \ICal($_FILES['ical_file']['tmp_name']);
|
||||
|
|
@ -331,6 +333,7 @@ class CalendarManager
|
|||
$date_check = '';
|
||||
$filter['id_group'] = $values['id_group'];
|
||||
$filter['date'] = $date;
|
||||
$filter['id_calendar'] = $values['id_calendar'];
|
||||
$date_check = db_get_value_filter(
|
||||
'date',
|
||||
'talert_special_days',
|
||||
|
|
@ -882,12 +885,13 @@ class CalendarManager
|
|||
View::render(
|
||||
'calendar/special_days_edit',
|
||||
[
|
||||
'ajax_url' => $this->ajaxUrl,
|
||||
'url' => $this->url.'&id_calendar='.$specialDay->id_calendar().'&op=edit&tab=special_days',
|
||||
'tabs' => $this->getTabs('special_days'),
|
||||
'specialDay' => $specialDay,
|
||||
'message' => $this->message,
|
||||
'create' => $new,
|
||||
'ajax_url' => $this->ajaxUrl,
|
||||
'url' => $this->url.'&id_calendar='.$specialDay->id_calendar().'&op=edit&tab=special_days',
|
||||
'tabs' => $this->getTabs('special_days'),
|
||||
'specialDay' => $specialDay,
|
||||
'message' => $this->message,
|
||||
'create' => $new,
|
||||
'id_calendar' => $specialDay->id_calendar(),
|
||||
]
|
||||
);
|
||||
|
||||
|
|
@ -903,12 +907,10 @@ class CalendarManager
|
|||
public function drawAlertTemplates()
|
||||
{
|
||||
global $config;
|
||||
|
||||
$filter['special_day'] = 1;
|
||||
$templates = alerts_get_alert_templates($filter);
|
||||
$date = get_parameter('date', '');
|
||||
$id_group = get_parameter('id_group', 0);
|
||||
$day_code = get_parameter('day_code', '');
|
||||
$id_calendar = get_parameter('id_calendar', 0);
|
||||
|
||||
$output = '<h4>'.__('Same as %s', $day_code);
|
||||
$output .= ' » ';
|
||||
|
|
@ -951,8 +953,9 @@ class CalendarManager
|
|||
'column_names' => $column_names,
|
||||
'ajax_url' => 'godmode/alerts/alert_special_days',
|
||||
'ajax_data' => [
|
||||
'method' => 'dataAlertTemplates',
|
||||
'day_code' => $day_code,
|
||||
'method' => 'dataAlertTemplates',
|
||||
'day_code' => $day_code,
|
||||
'id_calendar' => $id_calendar,
|
||||
],
|
||||
'no_sortable_columns' => [-1],
|
||||
'order' => [
|
||||
|
|
@ -1009,17 +1012,28 @@ class CalendarManager
|
|||
$filter[] = "name LIKE '%".$filters['name']."%'";
|
||||
}
|
||||
|
||||
$filter['special_day'] = 1;
|
||||
|
||||
$id_calendar = get_parameter('id_calendar', 0);
|
||||
$filter['special_day'] = $id_calendar;
|
||||
$templates = alerts_get_alert_templates($filter);
|
||||
|
||||
$count = alerts_get_alert_templates($filter, ['COUNT(*) AS total']);
|
||||
|
||||
$day_code = get_parameter('day_code', '');
|
||||
|
||||
$weekdays = [
|
||||
1 => 'monday',
|
||||
2 => 'tuesday',
|
||||
3 => 'wednesday',
|
||||
4 => 'thursday',
|
||||
5 => 'friday',
|
||||
6 => 'saturday',
|
||||
7 => 'sunday',
|
||||
];
|
||||
|
||||
$data = [];
|
||||
if (empty($templates) === false) {
|
||||
foreach ($templates as $template) {
|
||||
// TODO
|
||||
if ((bool) $template[$day_code] === false) {
|
||||
if ((bool) $template[$weekdays[$day_code]] === false) {
|
||||
$data[] = [
|
||||
'name' => $template['name'],
|
||||
'id_group' => ui_print_group_icon(
|
||||
|
|
|
|||
|
|
@ -71,7 +71,8 @@ function load_templates_alerts_special_days(settings) {
|
|||
method: "drawAlertTemplates",
|
||||
date: settings.date,
|
||||
id_group: settings.id_group,
|
||||
day_code: settings.day_code
|
||||
day_code: settings.day_code,
|
||||
id_calendar: settings.id_calendar
|
||||
},
|
||||
datatype: "html",
|
||||
success: function(data) {
|
||||
|
|
|
|||
|
|
@ -160,13 +160,14 @@ class Calendar extends Entity
|
|||
/**
|
||||
* Returns an array with all calendar filtered.
|
||||
*
|
||||
* @param array $fields Fields array or 'count' keyword to retrieve count.
|
||||
* @param array $filter Filters to be applied.
|
||||
* @param boolean $count Retrieve count of items instead results.
|
||||
* @param integer $offset Offset (pagination).
|
||||
* @param integer $limit Limit (pagination).
|
||||
* @param string $order Sort order.
|
||||
* @param string $sort_field Sort field.
|
||||
* @param array $fields Fields array or 'count' keyword to retrieve count.
|
||||
* @param array $filter Filters to be applied.
|
||||
* @param boolean $count Retrieve count of items instead results.
|
||||
* @param integer $offset Offset (pagination).
|
||||
* @param integer $limit Limit (pagination).
|
||||
* @param string $order Sort order.
|
||||
* @param string $sort_field Sort field.
|
||||
* @param boolean $select_options Array options for select.
|
||||
*
|
||||
* @return array With all results.
|
||||
* @throws \Exception On error.
|
||||
|
|
@ -178,7 +179,8 @@ class Calendar extends Entity
|
|||
?int $offset=null,
|
||||
?int $limit=null,
|
||||
?string $order=null,
|
||||
?string $sort_field=null
|
||||
?string $sort_field=null,
|
||||
?bool $select_options=false
|
||||
) {
|
||||
$sql_filters = [];
|
||||
$order_by = '';
|
||||
|
|
@ -255,6 +257,16 @@ class Calendar extends Entity
|
|||
return [];
|
||||
}
|
||||
|
||||
if ($select_options === true) {
|
||||
$return = array_reduce(
|
||||
$return,
|
||||
function ($carry, $item) {
|
||||
$carry[$item['id']] = $item['name'];
|
||||
return $carry;
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
return $return;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -278,8 +278,6 @@ class SpecialDay extends Entity
|
|||
$pagination
|
||||
);
|
||||
|
||||
hd($sql);
|
||||
|
||||
if ($count === true) {
|
||||
$sql = sprintf('SELECT count(*) as n FROM ( %s ) tt', $sql);
|
||||
|
||||
|
|
|
|||
|
|
@ -118,13 +118,13 @@ $inputs[] = [
|
|||
// Print form.
|
||||
HTML::printForm(
|
||||
[
|
||||
'form' => [
|
||||
'action' => $url.'&op=upload_ical&id='.$id_calendar,
|
||||
'method' => 'POST',
|
||||
'id' => 'icalendar-special-days',
|
||||
'form' => [
|
||||
'action' => $url.'&op=upload_ical&id='.$id_calendar,
|
||||
'method' => 'POST',
|
||||
'id' => 'icalendar-special-days',
|
||||
'enctype' => 'multipart/form-data',
|
||||
],
|
||||
'inputs' => $inputs,
|
||||
'enctype' => 'multipart/form-data',
|
||||
'inputs' => $inputs,
|
||||
],
|
||||
false
|
||||
);
|
||||
|
|
@ -372,6 +372,7 @@ for ($month = 1; $month <= 12; $month++) {
|
|||
'date' => $special_day['date'],
|
||||
'id_group' => $special_day['id_group'],
|
||||
'day_code' => $special_day['day_code'],
|
||||
'id_calendar' => $special_day['id_calendar'],
|
||||
'btn_ok_text' => __('Create'),
|
||||
'btn_cancel_text' => __('Cancel'),
|
||||
'title' => date_format($dateformat, 'd M Y'),
|
||||
|
|
@ -465,6 +466,7 @@ $(document).ready (function () {
|
|||
date: '',
|
||||
id_group: $("#id_group").val(),
|
||||
day_code: $("#day_code").val(),
|
||||
id_calendar: '<?php echo $id_calendar; ?>',
|
||||
btn_ok_text: '<?php echo __('Create'); ?>',
|
||||
btn_cancel_text: '<?php echo __('Cancel'); ?>',
|
||||
title: '<?php echo __('Load calendar'); ?>',
|
||||
|
|
|
|||
|
|
@ -174,6 +174,7 @@ $(document).ready (function () {
|
|||
date: $("#text-date").val(),
|
||||
id_group: $("#id_group").val(),
|
||||
day_code: $("#day_code").val(),
|
||||
id_calendar: '<?php echo $id_calendar; ?>',
|
||||
btn_ok_text: '<?php echo __('Create'); ?>',
|
||||
btn_cancel_text: '<?php echo __('Cancel'); ?>',
|
||||
title: dateformat,
|
||||
|
|
|
|||
Loading…
Reference in New Issue