tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-27 07:44:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

2007-08-06 Sancho Lerena <slerena@gmail.com>

Browse Source 
* pandoradb.sql, alert_manager.php: Alert time support uses TIME format
        instead numeric (changes requested by esanchezm).



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@593 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
slerena 2007-08-06 15:50:05 +00:00
parent 7a62ba22dd
commit 0590bc5aee
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2007-08-06 Sancho Lerena <slerena@gmail.com>
* pandoradb.sql, alert_manager.php: Alert time support uses TIME format
instead numeric (changes requested by esanchezm).
2007-08-06 Sancho Lerena <slerena@artica.es> 2007-08-06 Sancho Lerena <slerena@artica.es>
* include/functions_db.php: Fixed unsorted render (E.Ross). * include/functions_db.php: Fixed unsorted render (E.Ross).

17
pandora_console/godmode/agentes/alert_manager.php
View File

@ -95,13 +95,13 @@ $result=mysql_query($sql1);
$string = $string."<td class='$tdcolor'>".$mymin."</td>"; $string = $string."<td class='$tdcolor'>".$mymin."</td>";
$string = $string."<td class='$tdcolor'>".$mymax."</td>"; $string = $string."<td class='$tdcolor'>".$mymax."</td>";
} }
$mytimefrom =$row3["time_from"]; $time_from_table =$row3["time_from"];
$mytimeto =$row3["time_to"]; $time_to_table =$row3["time_to"];
$string = $string."<td class='$tdcolor'>"; $string = $string."<td class='$tdcolor'>";
if ($mytimeto == $mytimefrom) if ($time_to_table == $time_from_table)
$string .= $lang_label["N/A"]; $string .= $lang_label["N/A"];
else else
$string .= render_time($mytimefrom)." - ".render_time($mytimeto); $string .= substr($time_from_table,0,5)." - ".substr($time_to_table,0,5);
$string = $string."</td><td class='$tdcolor'>".salida_limpia($row3["descripcion"]); $string = $string."</td><td class='$tdcolor'>".salida_limpia($row3["descripcion"]);
$string = $string."</td><td class='$tdcolor'>"; $string = $string."</td><td class='$tdcolor'>";
@ -150,6 +150,7 @@ $result=mysql_query($sql1);
echo '<form name="agente" method="post" action="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=alert&id_agente='.$id_agente.'">'; echo '<form name="agente" method="post" action="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=alert&id_agente='.$id_agente.'">';
if (! isset($update_alert)) if (! isset($update_alert))
$update_alert = -1; $update_alert = -1;
if ($update_alert != 1) { if ($update_alert != 1) {
echo '<input type="hidden" name="insert_alert" value=1>'; echo '<input type="hidden" name="insert_alert" value=1>';
} else { } else {
@ -247,12 +248,12 @@ _data_<br>
echo "<tr><td class='datos2'>".$lang_label["time_from"]; echo "<tr><td class='datos2'>".$lang_label["time_from"];
echo "<td class='datos2'><select name='time_from'>"; echo "<td class='datos2'><select name='time_from'>";
if ($time_from != ""){ if ($time_from != ""){
echo "<option value='$time_from'>".render_time($time_from); echo "<option value='$time_from'>".substr($time_from,0,5);
} }
for ($a=0; $a < 48; $a++){ for ($a=0; $a < 48; $a++){
echo "<option value='"; echo "<option value='";
echo $a; echo render_time ($a);
echo "'>"; echo "'>";
echo render_time ($a); echo render_time ($a);
} }
@ -261,12 +262,12 @@ echo "</select>";
echo "<td class='datos2'>".$lang_label["time_to"]; echo "<td class='datos2'>".$lang_label["time_to"];
echo "<td class='datos2'><select name='time_to'>"; echo "<td class='datos2'><select name='time_to'>";
if ($time_from != ""){ if ($time_from != ""){
echo "<option value='$time_to'>".render_time($time_to); echo "<option value='$time_to'>".substr($time_to,0,5);
} }
for ($a=0; $a < 48; $a++){ for ($a=0; $a < 48; $a++){
echo "<option value='"; echo "<option value='";
echo $a; echo render_time ($a);
echo "'>"; echo "'>";
echo render_time ($a); echo render_time ($a);
} }

4
pandora_console/pandoradb.sql
View File

@ -181,8 +181,8 @@ CREATE TABLE `talerta_agente_modulo` (
`internal_counter` int(4) default '0', `internal_counter` int(4) default '0',
`alert_text` varchar(255) default '', `alert_text` varchar(255) default '',
`disable` int(4) default '0', `disable` int(4) default '0',
`time_from` int(8) default '0', `time_from` TIME default '00:00:00',
`time_to` int(8) default '0', `time_to` TIME default '00:00:00',
PRIMARY KEY (`id_aam`) PRIMARY KEY (`id_aam`)
) ENGINE=InnoDB; ) ENGINE=InnoDB;