Final bits to the schedule maintenance section

html/forms/schedule-maintenance.inc.php

@@ -22,7 +22,12 @@ if ($sub_type == 'new-maintenance') {
 
     // Defaults
     $status = 'error';
+    $update = 0;
 
+    $schedule_id = mres($_POST['schedule_id']);
+    if ($schedule_id > 0) {
+        $update = 1;
+    }
     $title = mres($_POST['title']);
     $notes = mres($_POST['notes']);
     $start = mres($_POST['start']);
@@ -43,11 +48,21 @@ if ($sub_type == 'new-maintenance') {
     }
 
     if (empty($message)) {
-        $schedule_id = dbInsert(array('start'=>$start,'end'=>$end,'title'=>$title,'notes'=>$notes),'alert_schedule');
+        if (empty($schedule_id)) {
+            $schedule_id = dbInsert(array('start'=>$start,'end'=>$end,'title'=>$title,'notes'=>$notes),'alert_schedule');
+        } else {
+            dbUpdate(array('start'=>$start,'end'=>$end,'title'=>$title,'notes'=>$notes),'alert_schedule','`schedule_id`=?',array($schedule_id));
+        }
         if ($schedule_id > 0) {
             $items = array();
             $fail = 0;
+ 
+            if ($update == 1) {
+                dbDelete('alert_schedule_items', '`schedule_id`=?', array($schedule_id));
+            }
+
             foreach( $_POST['maps'] as $target ) {
+                $target = target_to_id($target);
                 $item = dbInsert(array('schedule_id'=>$schedule_id,'target'=>$target),'alert_schedule_items');
                 if ($item > 0) {
                      array_push($items,$item);
@@ -55,18 +70,18 @@ if ($sub_type == 'new-maintenance') {
                     $fail = 1;
                 }
             }
-            if ($fail == 1) {
+            if ($fail == 1 && $update == 0) {
                 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;
+                $message = 'Issue scheduling maintenance';
             } else {
                 $status = 'ok';
-                $message = 'Created maintenance schedule';
+                $message = 'Scheduling maintenance ok';
             }
         } else {
-            $message = "Issue creating maintenance schedule";
+            $message = "Issue scheduling maintenance";
         }
     }
 
@@ -74,13 +89,21 @@ if ($sub_type == 'new-maintenance') {
 
 } elseif ($sub_type == 'parse-maintenance') {
 
-    $schedule_id = $_POST['schedule_id'];
+    $schedule_id = mres($_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;
+        $targets = id_to_target($targets['target']);
+        array_push($items,$targets);
     }
     $response = array('start'=>$schedule['start'],'end'=>$schedule['end'],'title'=>$schedule['title'],'notes'=>$schedule['notes'],'targets'=>$items);
+} elseif ($sub_type == 'del-maintenance') {
+    $schedule_id = mres($_POST['del_schedule_id']);
+    dbDelete('alert_schedule_items','`schedule_id`=?',array($schedule_id));
+    dbDelete('alert_schedule','`schedule_id`=?', array($schedule_id));
+    $status = 'ok';
+    $message = 'Maintenance schedule has been removed';
+    $response = array('status'=>$status,'message'=>$message);
 }
 
 echo _json_encode($response);

html/includes/modal/alert_schedule.inc.php

@@ -0,0 +1,187 @@
+<?php
+
+/*
+ * LibreNMS
+ *
+ * Copyright (c) 2014 Neil Lathwood <https://github.com/laf/ http://www.lathwood.co.uk/fa>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.  Please see LICENSE.txt at the top level of
+ * the source code distribution for details.
+ */
+
+if(is_admin() !== false) {
+
+?>
+
+<div class="modal fade bs-example-modal-sm" id="schedule-maintenance" tabindex="-1" role="dialog" aria-labelledby="Create" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                <h5 class="modal-title" id="Create">Create maintenance</h5>
+            </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="title" class="col-sm-4 control-label">Title: </label>
+                        <div class="col-sm-8">
+                            <input type="text" class="form-control" id="title" name="title" placeholder="Maintenance title">
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label for="notes" class="col-sm-4 control-label">Notes: </label>
+                        <div class="col-sm-8">
+                            <textarea class="form-control" id="notes" name="notes" placeholder="Maintenance notes"></textarea>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label for="start" class="col-sm-4 control-label">Start: </label>
+                        <div class="col-sm-8">
+                            <input type="text" class="form-control date" id="start" name="start" value="<?php echo date('Y-m-d H:i'); ?>" data-date-format="YYYY-MM-DD HH:mm">
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label for="end" class="col-sm-4 control-label">End: </label>
+                        <div class="col-sm-8">
+                            <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-success" type="submit" name="sched-submit" id="sched-submit" value="save">Schedule maintenance</button>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+</div>
+<script>
+$('#schedule-maintenance').on('hide.bs.modal', function (event) {
+    $('#map-tags').data('tagmanager').empty();
+    $('#schedule_id').val('');
+    $('#title').val('');
+    $('#notes').val('');
+    $('#start').val('');
+    $('#end').val('');
+});
+
+$('#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, value ) {
+                    arr.push(value);
+                });
+                $('#map-tags').data('tagmanager').populate(arr);
+                $('#title').val(output['title']);
+                $('#notes').val(output['notes']);
+                $('#start').val(output['start']);
+                $('#end').val(output['end']);
+            }
+        });
+    }
+});
+
+$('#sched-submit').click('', function(e) {
+    e.preventDefault();
+    $.ajax({
+        type: "POST",
+        url: "/ajax_form.php",
+        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>');
+            }
+        },
+        error: function(){
+            $("#response").html('<div class="alert alert-info">An error occurred.</div>');
+        }
+    });
+});
+
+$('#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({
+        minDate: '<?php echo date('Y-m-d H:i'); ?>'
+    });
+    $("#end").datetimepicker();
+    $("#start").on("dp.change", function (e) {
+        $("#end").data("DateTimePicker").minDate(e.date);
+    });
+    $("#end").on("dp.change", function (e) {
+        $("#start").data("DateTimePicker").maxDate(e.date);
+    });
+});
+
+</script>
+<?php
+
+}
+
+?>

html/includes/modal/remove_alert_schedule.inc.php

@@ -0,0 +1,78 @@
+<?php
+
+/*
+ * LibreNMS
+ *
+ * Copyright (c) 2014 Neil Lathwood <https://github.com/laf/ http://www.lathwood.co.uk/fa>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.  Please see LICENSE.txt at the top level of
+ * the source code distribution for details.
+ */
+
+if(is_admin() !== false) {
+
+?>
+
+<div class="modal fade bs-example-modal-sm" id="delete-maintenance" tabindex="-1" role="dialog" aria-labelledby="delete" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                <h5 class="modal-title" id="Create">Delete maintenance</h5>
+            </div>
+            <div class="modal-body">
+                <p>If you would like to remove this maintenance then please click Delete.</p>
+            </div>
+            <div class="modal-footer">
+                <form method="post" role="form" id="sched-del" class="form-horizontal schedule-maintenance-del">
+                    <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+                    <button type="submit" class="btn btn-danger danger" id="sched-maintenance-removal" data-target="sched-maintenance-removal">Delete</button>
+                    <input type="hidden" name="del_schedule_id" id="del_schedule_id">
+                    <input type="hidden" name="type" id="type" value="schedule-maintenance">
+                    <input type="hidden" name="sub_type" id="sub_type" value="del-maintenance">
+                </form>
+            </div>
+        </div>
+    </div>
+</div>
+<script>
+$('#schedule-maintenance').on('hide.bs.modal', function (event) {
+    $('#map-tags').data('tagmanager').empty();
+    $('#schedule_id').val('');
+    $('#title').val('');
+    $('#notes').val('');
+    $('#start').val('');
+    $('#end').val('');
+});
+
+$('#sched-maintenance-removal').click('', function(e) {
+    e.preventDefault();
+    $.ajax({
+        type: "POST",
+        url: "/ajax_form.php",
+        data: $('form.schedule-maintenance-del').serialize(),
+        dataType: "json",
+        success: function(data){
+            if(data.status == 'ok') {
+                $("#message").html('<div class="alert alert-info">'+data.message+'</div>');
+                $("#delete-maintenance").modal('hide');
+                $("#alert-schedule").bootgrid('reload');
+            } else {
+                $("#response").html('<div class="alert alert-info">'+data.message+'</div>');
+            }
+        },
+        error: function(){
+            $("#response").html('<div class="alert alert-info">An error occurred.</div>');
+        }
+    });
+});
+
+</script>
+<?php
+
+}
+
+?>

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

@@ -32,7 +32,7 @@ if (empty($total)) {
 }
 
 if (!isset($sort) || empty($sort)) {
-    $sort = '`S`.`title` ASC ';
+    $sort = '`S`.`start` DESC ';
 }
 
 $sql .= " ORDER BY $sort";
@@ -49,10 +49,18 @@ if ($rowCount != -1) {
 $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) {
+    $status = 0;
+    if ($schedule['end'] < date('dS M Y H:i::s')) {
+        $status = 1;
+    }
+    if (date('dS M Y H:i::s') >= $schedule['start'] && date('dS M Y H:i::s') < $schedule['end']) {
+        $status = 2;
+    }
     $response[] = array('title'=>$schedule['title'],
                         'start'=>$schedule['start'],
                         'end'=>$schedule['end'],
-                        'id'=>$schedule['schedule_id']);
+                        'id'=>$schedule['schedule_id'],
+                        'status'=>$status);
 }
 
 $output = array('current'=>$current,'rowCount'=>$rowCount,'rows'=>$response,'total'=>$total);

html/pages/alert-schedule.inc.php

@@ -16,73 +16,10 @@ $pagetitle[] = "Alert Schedule";
 $no_refresh = TRUE;
 if(is_admin() !== false) {
 
-?>
+require_once("includes/modal/alert_schedule.inc.php");
+require_once("includes/modal/remove_alert_schedule.inc.php");
 
-<div class="modal fade bs-example-modal-sm" id="schedule-maintenance" tabindex="-1" role="dialog" aria-labelledby="Create" aria-hidden="true">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-                <h5 class="modal-title" id="Create">Alert Rules</h5>
-            </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="title" class="col-sm-4 control-label">Title: </label>
-                        <div class="col-sm-8">
-                            <input type="text" class="form-control" id="title" name="title" placeholder="Maintenance title">
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="notes" class="col-sm-4 control-label">Notes: </label>
-                        <div class="col-sm-8">
-                            <textarea class="form-control" id="notes" name="notes" placeholder="Maintenance notes"></textarea>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="start" class="col-sm-4 control-label">Start: </label>
-                        <div class="col-sm-8">
-                            <input type="text" class="form-control date" id="start" name="start" value="<?php echo date('Y-m-d H:i'); ?>" data-date-format="YYYY-MM-DD HH:mm">
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="end" class="col-sm-4 control-label">End: </label>
-                        <div class="col-sm-8">
-                            <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-success" type="submit" name="sched-submit" id="sched-submit" value="save">Add maintenance schedule</button>
-                        </div>
-                    </div>
-                </form>
-            </div>
-        </div>
-    </div>
-</div>
+?>
 
 <div class="row">
     <div class="col-sm-12">
@@ -95,8 +32,8 @@ if(is_admin() !== false) {
         <table id="alert-schedule" class="table table-condensed">
             <thead>
                 <tr>
-                    <th data-column-id="title" data-order="asc">Title</th>
-                    <th data-column-id="start">Start</th>
+                    <th data-column-id="title">Title</th>
+                    <th data-column-id="start" data-order="desc">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>
@@ -111,8 +48,16 @@ var grid = $("#alert-schedule").bootgrid({
     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>";
+            if (row.status == 1) {
+                return '<button type="button" class="btn btn-xs btn-danger" disabled>Lapsed</button>';
+            } else {
+                var response = "<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>";
+                if (row.status == 2) {
+                    response = response + ' <button type="button" class="btn btn-xs btn-success" disabled>Current</button>';
+                }
+                return response;
+            }
         }
     },
     templates: {
@@ -139,93 +84,8 @@ var grid = $("#alert-schedule").bootgrid({
         $("#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();
-    $.ajax({
-        type: "POST",
-        url: "/ajax_form.php",
-        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>');
-            }
-        },
-        error: function(){
-            $("#response").html('<div class="alert alert-info">An error occurred.</div>');
-        }
-    });
-
-});
-
-$('#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();
-    $("#start").on("dp.change", function (e) {
-        $("#end").data("DateTimePicker").minDate(e.date);
-    });
-    $("#end").on("dp.change", function (e) {
-        $("#start").data("DateTimePicker").maxDate(e.date);
+        $('#del_schedule_id').val($(this).data("schedule_id"));
+        $('#delete-maintenance').modal('show');
     });
 });
 

includes/functions.php

@@ -1154,3 +1154,21 @@ function set_curl_proxy($post)
 	curl_setopt($post, CURLOPT_PROXY, $config['callback_proxy']);
     }
 }
+
+function target_to_id($target) {
+    if( $target[0].$target[1] == "g:" ) {
+        $target = "g".dbFetchCell('SELECT id FROM device_groups WHERE name = ?',array(substr($target,2)));
+    } else {
+        $target = dbFetchCell('SELECT device_id FROM devices WHERE hostname = ?',array($target));
+    }
+    return $target;
+}
+
+function id_to_target($id) {
+    if( $id[0] == "g" ) {
+        $id = 'g:'.dbFetchCell("SELECT name FROM device_groups WHERE id = ?",array(substr($id,1)));
+    } else {
+        $id = dbFetchCell("SELECT hostname FROM devices WHERE device_id = ?",array($id));
+    }
+    return $id;
+}