Show
Ignore:
Timestamp:
08/21/08 14:22:28 (5 months ago)
Author:
jmathis
Message:

improve downtime display and request

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/centreon/www/include/monitoring/downtime/viewDowntime.php

    r6211 r6223  
    4949         * Hosts Comments 
    5050         */ 
    51         $rq2 =  " SELECT dtm.internal_downtime_id, dtm.entry_time,dtm.duration, dtm.author_name, dtm.comment_data, dtm.is_fixed, dtm.scheduled_start_time, dtm.scheduled_end_time, obj.name1 host_name, obj.name2 service_description " . 
     51        $rq2 =  " SELECT dtm.internal_downtime_id, dtm.entry_time, dtm.duration, dtm.author_name, dtm.comment_data, dtm.is_fixed, dtm.scheduled_start_time, dtm.scheduled_end_time, obj.name1 host_name, obj.name2 service_description " . 
    5252                        " FROM ".$ndo_base_prefix."downtimehistory dtm, ".$ndo_base_prefix."objects obj " . 
    53                         " WHERE obj.name1 IS NOT NULL AND obj.name2 IS  NULL AND obj.object_id = dtm.object_id AND dtm.was_cancelled = '0' ORDER BY dtm.actual_start_time"; 
     53                        " WHERE obj.name1 IS NOT NULL AND obj.name2 IS  NULL AND obj.object_id = dtm.object_id AND dtm.was_cancelled = '0' AND dtm.scheduled_end_time > '".date("Y-m-d G:i:s", time())."' ORDER BY dtm.actual_start_time"; 
    5454        $DBRESULT_NDO =& $pearDBndo->query($rq2); 
    5555        if (PEAR::isError($DBRESULT_NDO)) 
     
    5757        for ($i = 0; $data =& $DBRESULT_NDO->fetchRow(); $i++){ 
    5858                $tab_downtime_host[$i] = $data; 
     59                $tab_downtime_host[$i]["duration"] .= " "._("s"); 
    5960        } 
    6061        unset($data);    
     
    7071        $rq2 =  " SELECT dtm.internal_downtime_id, dtm.entry_time, dtm.duration, dtm.author_name, dtm.comment_data, dtm.is_fixed, dtm.scheduled_start_time, dtm.scheduled_end_time, obj.name1 host_name, obj.name2 service_description " . 
    7172                        " FROM ".$ndo_base_prefix."downtimehistory dtm, ".$ndo_base_prefix."objects obj " . 
    72                         " WHERE obj.name1 IS NOT NULL AND obj.name2 IS NOT NULL AND obj.object_id = dtm.object_id AND dtm.was_cancelled = '0' ORDER BY dtm.actual_start_time"; 
     73                        " WHERE obj.name1 IS NOT NULL AND obj.name2 IS NOT NULL AND obj.object_id = dtm.object_id AND dtm.was_cancelled = '0' AND dtm.scheduled_end_time > '".date("Y-m-d G:i:s", time())."' ORDER BY dtm.actual_start_time"; 
    7374        $DBRESULT_NDO =& $pearDBndo->query($rq2); 
    7475        if (PEAR::isError($DBRESULT_NDO))