Updates to schedule maintenance

html/forms/schedule-maintenance.inc.php

@@ -12,4 +12,75 @@
  * the source code distribution for details.
  */
 
+if(is_admin() === false) {
+    die('ERROR: You need to be admin');
+}
 
+$sub_type = $_POST['sub_type'];
+
+if ($sub_type == 'new-maintenance') {
+
+    // Defaults
+    $status = 'error';
+
+    $title = mres($_POST['title']);
+    $notes = mres($_POST['notes']);
+    $start = mres($_POST['start']);
+    $end   = mres($_POST['end']);
+    $maps  = mres($_POST['maps']);
+
+    if (empty($title)) {
+        $message = "Missing title<br />";
+    }
+    if (empty($start)) {
+        $message .= "Missing start date<br />";
+    }
+    if (empty($end)) {
+        $message .= "Missing end date<br />";
+    }
+    if( !is_array($_POST['maps']) ) {
+        $message .= "Not mapped to any groups or devices<br />";
+    }
+
+    if (empty($message)) {
+        $schedule_id = dbInsert(array('start'=>$start,'end'=>$end,'title'=>$title,'notes'=>$notes),'alert_schedule');
+        if ($schedule_id > 0) {
+            $items = array();
+            $fail = 0;
+            foreach( $_POST['maps'] as $target ) {
+                $item = dbInsert(array('schedule_id'=>$schedule_id,'target'=>$target),'alert_schedule_items');
+                if ($item > 0) {
+                     array_push($items,$item);
+                } else {
+                    $fail = 1;
+                }
+            }
+            if ($fail == 1) {
+                foreach ($items as $item) {
+                    dbDelete('alert_schedule_items', '`item_id`=?', array($item));
+                }
+                dbDelete('alert_schedule', '`schedule_id`=?', array($schedule_id));
+                $message = 'Creating maintenance schedule failed'.$yeah;
+            } else {
+                $status = 'ok';
+                $message = 'Created maintenance schedule';
+            }
+        } else {
+            $message = "Issue creating maintenance schedule";
+        }
+    }
+
+    $response = array('status'=>$status,'message'=>$message);
+
+} elseif ($sub_type == 'parse-maintenance') {
+
+    $schedule_id = $_POST['schedule_id'];
+    $schedule = dbFetchRow("SELECT * FROM `alert_schedule` WHERE `schedule_id`=?",array($schedule_id));
+    $items = array();
+    foreach (dbFetchRows("SELECT `target` FROM `alert_schedule_items` WHERE `schedule_id`=?",array($schedule_id)) as $targets) {
+        $items[] = $targets;
+    }
+    $response = array('start'=>$schedule['start'],'end'=>$schedule['end'],'title'=>$schedule['title'],'notes'=>$schedule['notes'],'targets'=>$items);
+}
+
+echo _json_encode($response);

html/includes/table/alert-schedule.inc.php

@@ -15,14 +15,14 @@
 $where = 1;
 
 if ($_SESSION['userlevel'] >= '5') {
-    $sql = " FROM `alert_schedule` AS S LEFT JOIN `devices` AS `D` ON `S`.`device_id`=`D`.`device_id` WHERE $where";
+    $sql = " FROM `alert_schedule` AS S WHERE $where";
 } else {
-    $sql = " FROM `alert_schedule` AS S, devices_perms AS P LEFT JOIN `devices` AS `D` WHERE $where AND `S`.`device_id` = `P`.`device_id` AND `P`.`user_id` = ?";
+    $sql = " FROM `alert_schedule` AS S WHERE $where";
     $param[] = $_SESSION['user_id'];
 }
 
 if (isset($searchPhrase) && !empty($searchPhrase)) {
-    $sql .= " AND (`D`.`hostname` LIKE '%$searchPhrase%' OR `S`.`start` LIKE '%$searchPhrase%' OR `S`.`end` LIKE '%$searchPhrase%')";
+    $sql .= " AND (`S`.`title` LIKE '%$searchPhrase%' OR `S`.`start` LIKE '%$searchPhrase%' OR `S`.`end` LIKE '%$searchPhrase%')";
 }
 
 $count_sql = "SELECT COUNT(`id`) $sql";
@@ -32,7 +32,7 @@ if (empty($total)) {
 }
 
 if (!isset($sort) || empty($sort)) {
-    $sort = '`D`.`hostname` ASC ';
+    $sort = '`S`.`title` ASC ';
 }
 
 $sql .= " ORDER BY $sort";
@@ -46,18 +46,13 @@ if ($rowCount != -1) {
     $sql .= " LIMIT $limit_low,$limit_high";
 }
 
-$sql = "SELECT DATE_FORMAT(`S`.`start`, '%D %b %Y %T') AS `start`, DATE_FORMAT(`S`.`end`, '%D %b %Y %T') AS `end`, `D`.`hostname`, `S`.`device_id` $sql";
+$sql = "SELECT `S`.`schedule_id`, DATE_FORMAT(`S`.`start`, '%D %b %Y %T') AS `start`, DATE_FORMAT(`S`.`end`, '%D %b %Y %T') AS `end`, `S`.`title` $sql";
 
 foreach (dbFetchRows($sql,$param) as $schedule) {
-    if ($schedule['device_id'] == '-1') {
+    $response[] = array('title'=>$schedule['title'],
-        $host_link = 'All devices';
-    } else {
-        $dev = device_by_id_cache($schedule['device_id']);
-        $host_link = generate_device_link($dev, shorthost($dev['hostname']));
-    }
-    $response[] = array('hostname'=>$host_link,
                         'start'=>$schedule['start'],
-                        'end'=>$schedule['end']);
+                        'end'=>$schedule['end'],
+                        'id'=>$schedule['schedule_id']);
 }
 
 $output = array('current'=>$current,'rowCount'=>$rowCount,'rows'=>$response,'total'=>$total);

html/pages/alert-schedule.inc.php

@@ -14,6 +14,7 @@
 
 $pagetitle[] = "Alert Schedule";
 $no_refresh = TRUE;
+if(is_admin() !== false) {
 
 ?>
 
@@ -26,33 +27,24 @@ $no_refresh = TRUE;
             </div>
             <div class="modal-body">
                 <form method="post" role="form" id="sched-form" class="form-horizontal schedule-maintenance-form">
+                    <input type="hidden" name="schedule_id" id="schedule_id">
+                    <input type="hidden" name="type" id="type" value="schedule-maintenance">
+                    <input type="hidden" name="sub_type" id="sub_type" value="new-maintenance">
                     <div class="row">
                         <div class="col-md-12">
                             <span id="response"></span>
                         </div>
                     </div>
                     <div class="form-group">
-                        <label for='device' class='col-sm-4 control-label'>Maintenance for? </label>
+                        <label for="title" class="col-sm-4 control-label">Title: </label>
                         <div class="col-sm-8">
-                            <select id='device' name='device' class='form-control'>
+                            <input type="text" class="form-control" id="title" name="title" placeholder="Maintenance title">
-                                <option disabled>Devices</option>
+                        </div>
-                                <option disabled>-------</option>
+                    </div>
-                                <option value="-1">All devices</option>
+                    <div class="form-group">
-<?php
+                        <label for="notes" class="col-sm-4 control-label">Notes: </label>
-
+                        <div class="col-sm-8">
-foreach (dbFetchRows("SELECT `device_id`,`hostname` FROM `devices` WHERE `ignore`=0 AND `disabled`=0") as $device_row) {
+                            <textarea class="form-control" id="notes" name="notes" placeholder="Maintenance notes"></textarea>
-    echo '<option value="'.$device_row['device_id'].'">'.$device_row['hostname'].'</option>';
-}
-
-echo "<option disabled>Groups</option>";
-echo "<option disabled>------</option>";
-
-foreach (dbFetchRows("SELECT `id`,`name` FROM `device_groups`") as $device_group) {
-    echo '<option value="'.$device_group['id'].'">'.$device_group['name'].'</option>';
-}
-
-?>
-                            </select>
                         </div>
                     </div>
                     <div class="form-group">
@@ -67,9 +59,23 @@ foreach (dbFetchRows("SELECT `id`,`name` FROM `device_groups`") as $device_group
                             <input type="text" class="form-control date" id="end" name="end" value="<?php echo date('Y-m-d H:i',strtotime('+1 hour')); ?>" data-date-format="YYYY-MM-DD HH:mm">
                         </div>
                     </div>
+                    <div class="form-group">
+                         <label for='map-stub' class='col-sm-4 control-label'>Map To: </label>
+                        <div class="col-sm-5">
+                            <input type='text' id='map-stub' name='map-stub' class='form-control'/>
+                        </div>
+                        <div class="col-sm-3">
+                            <button class="btn btn-primary btn-sm" type="button" name="add-map" id="add-map" value="Add">Add</button>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <div class="col-md-12">
+                            <span id="map-tags"></span>
+                        </div>
+                    </div>
                     <div class="form-group">
                         <div class="col-sm-offset-3 col-sm-3">
-                            <button class="btn btn-default btn-sm" type="submit" name="sched-submit" id="sched-submit" value="save">Save Rule</button>
+                            <button class="btn btn-success" type="submit" name="sched-submit" id="sched-submit" value="save">Add maintenance schedule</button>
                         </div>
                     </div>
                 </form>
@@ -89,9 +95,10 @@ foreach (dbFetchRows("SELECT `id`,`name` FROM `device_groups`") as $device_group
         <table id="alert-schedule" class="table table-condensed">
             <thead>
                 <tr>
-                    <th data-column-id="hostname" data-order="asc">Hostname</th>
+                    <th data-column-id="title" data-order="asc">Title</th>
                     <th data-column-id="start">Start</th>
                     <th data-column-id="end">End</th>
+                    <th data-column-id="actions" data-sortable="false" data-searchable="false" data-formatter="commands">Actions</th>
                 </tr>
             </thead>
         </table>
@@ -101,6 +108,13 @@ foreach (dbFetchRows("SELECT `id`,`name` FROM `device_groups`") as $device_group
 
 var grid = $("#alert-schedule").bootgrid({
     ajax: true,
+    formatters: {
+        "commands": function(column, row)
+        {
+            return "<button type=\"button\" class=\"btn btn-xs btn-primary command-edit\" data-toggle='modal' data-target='#schedule-maintenance' data-schedule_id=\"" + row.id + "\"><span class=\"fa fa-pencil\"></span></button> " + 
+                "<button type=\"button\" class=\"btn btn-xs btn-danger command-delete\" data-schedule_id=\"" + row.id + "\"><span class=\"fa fa-trash-o\"></span></button>";
+        }
+    },
     templates: {
         header: "<div id=\"{{ctx.id}}\" class=\"{{css.header}}\"><div class=\"row\">"+
                 "<div class=\"col-sm-8 actionBar\"><span class=\"pull-left\">"+
@@ -116,22 +130,59 @@ var grid = $("#alert-schedule").bootgrid({
         };
     },
     url: "/ajax_table.php"
+}).on("loaded.rs.jquery.bootgrid", function()
+{
+    /* Executes after data is loaded and rendered */
+    grid.find(".command-edit").on("click", function(e)
+    {
+        $('#schedule_id').val($(this).data("schedule_id"));
+        $("#schedule-maintenance").modal('show');
+    }).end().find(".command-delete").on("click", function(e)
+    {
+        alert("You pressed delete on row: " + $(this).data("row-id"));
+    });
+});
+
+$('#schedule-maintenance').on('show.bs.modal', function (event) {
+    $('#tagmanager').tagmanager();
+    var schedule_id = $('#schedule_id').val();
+    $('#map-tags').tagmanager({
+           strategy: 'array',
+           tagFieldName: 'maps[]',
+           initialCap: false
+    });
+    if (schedule_id > 0) {
+        $.ajax({
+            type: "POST",
+            url: "/ajax_form.php",
+            data: { type: "schedule-maintenance", sub_type: "parse-maintenance", schedule_id: schedule_id },
+            dataType: "json",
+            success: function(output) {
+                var arr = [];
+                $.each ( output['targets'], function( key ) {
+                    arr.push(key);
+                });
+                $('#response').data('tagmanager').populate(arr);
+                $('#severity').val(output['severity']).change;
+                var extra = $.parseJSON(output['extra']);
+                $('#count').val(extra['count']);
+            }
+        });
+    }
 });
 
 $('#sched-submit').click('', function(e) {
     e.preventDefault();
-    var device = $("#device").val();
-    var start = $("#start").val();
-    var end = $("#end").val();
     $.ajax({
         type: "POST",
         url: "/ajax_form.php",
-        data: { type: "schedule-maintenance", subtype: "add", device: device, start: start, end: end },
+        data: $('form.schedule-maintenance-form').serialize(),
         dataType: "json",
         success: function(data){
             if(data.status == 'ok') {
                 $("#message").html('<div class="alert alert-info">'+data.message+'</div>');
                 $("#schedule-maintenance").modal('hide');
+                $("#alert-schedule").bootgrid('reload');
             } else {
                 $("#response").html('<div class="alert alert-info">'+data.message+'</div>');
             }
@@ -143,6 +194,30 @@ $('#sched-submit').click('', function(e) {
 
 });
 
+$('#add-map').click('',function (event) {
+        $('#map-tags').data('tagmanager').populate([ $('#map-stub').val() ]);
+        $('#map-stub').val('');
+});
+
+$('#map-stub').typeahead([
+    {
+      name: 'map_devices',
+      remote : '/ajax_search.php?search=%QUERY&type=device&map=1',
+      header : '<h5><strong>&nbsp;Devices</strong></h5>',
+      template: '{{name}}',
+      valueKey:"name",
+      engine: Hogan
+    },
+    {
+      name: 'map_groups',
+      remote : '/ajax_search.php?search=%QUERY&type=group&map=1',
+      header : '<h5><strong>&nbsp;Groups</strong></h5>',
+      template: '{{name}}',
+      valueKey:"name",
+      engine: Hogan
+    }
+]);
+
 $(function () {
     $("#start").datetimepicker();
     $("#end").datetimepicker();
@@ -155,3 +230,9 @@ $(function () {
 });
 
 </script>
+
+<?php
+
+}
+
+?>

sql-schema/048.sql

@@ -0,0 +1,4 @@
+ALTER TABLE `alert_schedule` DROP `device_id`;
+ALTER TABLE  `alert_schedule` CHANGE  `id`  `schedule_id` INT( 11 ) NOT NULL AUTO_INCREMENT;
+ALTER TABLE  `alert_schedule` ADD  `title` VARCHAR( 255 ) NOT NULL ,ADD  `notes` TEXT NOT NULL ;
+CREATE TABLE  `librenms`.`alert_schedule_items` (`item_id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,`schedule_id` INT NOT NULL ,`target` VARCHAR( 255 ) NOT NULL ,INDEX (  `schedule_id` )) ENGINE = INNODB;