Changeset 6223
- Timestamp:
- 08/21/08 14:22:28 (3 months ago)
- Location:
- trunk/centreon/www/include/monitoring/downtime
- Files:
-
- 2 modified
-
template/downtime.ihtml (modified) (2 diffs)
-
viewDowntime.php (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/centreon/www/include/monitoring/downtime/template/downtime.ihtml
r6211 r6223 19 19 <td class="ListColPicker"><input type="checkbox" name='select[{$tdh.host_name};{$tdh.internal_downtime_id}]'></td> 20 20 <td class="ListColLeft">{$tdh.host_name}</td> 21 <td class="ListColRight" >{$tdh.scheduled_start_time}</td>22 <td class="ListColRight" >{$tdh.scheduled_end_time}</td>23 <td class="ListColRight" >{$tdh.duration}</td>21 <td class="ListColRight" width="120">{$tdh.scheduled_start_time}</td> 22 <td class="ListColRight" width="120">{$tdh.scheduled_end_time}</td> 23 <td class="ListColRight" width="60">{$tdh.duration}</td> 24 24 <td class="ListColCenter">{$tdh.author_name}</td> 25 25 <td class="ListColLeft">{$tdh.comment_data}</td> 26 <td class="ListCol Left">{$tdh.is_fixed}</td>26 <td class="ListColCenter" width="50">{$tdh.is_fixed}</td> 27 27 </tr> 28 28 {/foreach} … … 59 59 <td class="ListColLeft">{$tds.host_name}</td> 60 60 <td class="ListColLeft">{$tds.service_description}</td> 61 <td class="ListColRight" >{$tds.scheduled_start_time}</td>62 <td class="ListColRight" >{$tds.scheduled_end_time}</td>61 <td class="ListColRight" width="120">{$tds.scheduled_start_time}</td> 62 <td class="ListColRight" width="120">{$tds.scheduled_end_time}</td> 63 63 <td class="ListColRight">{$tds.duration}</td> 64 64 <td class="ListColCenter">{$tds.author_name}</td> 65 65 <td class="ListColLeft">{$tds.comment_data}</td> 66 <td class="ListCol Left">{$tds.is_fixed}</td>66 <td class="ListColCenter" width="50">{$tds.is_fixed}</td> 67 67 </tr> 68 68 {/foreach} -
trunk/centreon/www/include/monitoring/downtime/viewDowntime.php
r6211 r6223 49 49 * Hosts Comments 50 50 */ 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 " . 52 52 " 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"; 54 54 $DBRESULT_NDO =& $pearDBndo->query($rq2); 55 55 if (PEAR::isError($DBRESULT_NDO)) … … 57 57 for ($i = 0; $data =& $DBRESULT_NDO->fetchRow(); $i++){ 58 58 $tab_downtime_host[$i] = $data; 59 $tab_downtime_host[$i]["duration"] .= " "._("s"); 59 60 } 60 61 unset($data); … … 70 71 $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 " . 71 72 " 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"; 73 74 $DBRESULT_NDO =& $pearDBndo->query($rq2); 74 75 if (PEAR::isError($DBRESULT_NDO))
