Changeset 6 for index.php

Timestamp:

Oct 16, 2007, 10:12:26 PM (17 years ago)

Author:

george

Message:

Přepracovaná vývojová verze s oddělenými datovými tabulkami a různými datovými typy.

File:

• index.php (modified) (3 diffs)

index.php

@@ -98 +98 @@
 ); 
 
-$Variables = array(
-  'TimeStart' => time() - 3600*24,
-  'TimeEnd' => time(),
-  'Measure' => 1,
-  'Period' => 'day',
-  'TimeSpecify' => 0,
-);
-
-foreach($Variables as $Index => $Variable)
+foreach($Config['DefaultVariables'] as $Index => $Variable)
 {
   if(!array_key_exists($Index, $_SESSION)) $_SESSION[$Index] = $Variable;
@@ -182 +174 @@
 
 $Output .= '<table border="1" cellspacing="0" cellpadding="2" style="font-size: small;">';
-$Output .= '<tr><th>Mìøená velièina</th><th>Èas posledního mìøení</th><th>Poslední hodnota</th><th>Interpolace</th><th>Poznámky</th></tr>';
+$Output .= '<tr><th>Mìøená velièina</th><th>Èas posledního mìøení</th><th>Poslední hodnota</th><th>Interpolace</th><th>Poznámky</th>';
+if(array_key_exists('Debug', $_GET)) $Output .= '<th>Poèet polo¾ek</th><th>Èas vykonání</th>';
+$Output .= '</tr>';
 $Database->select_db('measure');
 $Result = $Database->select('measure', '*', 'Enabled=1 AND PermissionView="all" OR PermissionView="'.gethostbyaddr($_SERVER['REMOTE_ADDR']).'" ORDER BY Description');
@@ -190 +184 @@
 {
   $StopWatchStart = GetMicrotime();
-//  DB_Select('stat_data', 'COUNT(*)', 'measure='.$Measure['id']);
-//  $RowCount = DB_Row();
-//  $RowCount = $RowCount[0];
-//  $RowCount = 0;
-  $Result2 = $Database->select('stat_data', 'time, avg', 'measure='.$Measure['id'].' ORDER BY time DESC LIMIT 1');
+  if(array_key_exists('Debug', $_GET))
+  {  
+    $DbResult = $Database->select($Measure['DataTable'], 'COUNT(*)', 'measure='.$Measure['Id']);
+    $RowCount = $DbResult->fetch_array();
+    $RowCount = $RowCount[0];
+  }
+  $Result2 = $Database->select($Measure['DataTable'], 'time, avg', 'measure='.$Measure['Id'].' ORDER BY time DESC LIMIT 1');
   if($Result2->num_rows > 0)
   {
     $Row = $Result2->fetch_array();
     $LastMeasureTime = date('j.n.Y G:i:s', MysqlDateTimeToTime($Row['time']));
-    $LastMeasureValue = round($Row['avg'] / $Measure['display_divider']);
+    $LastMeasureValue = round($Row['avg'] / $Measure['Divider']);
   } else {
     $LastMeasureTime = '&nbsp;';
     $LastMeasureValue = '&nbsp;';
   }
-  if($Measure['continuity'] == 1) $Interpolate = 'Ano'; else $Interpolate = 'Ne';
-  if($Measure['info'] == '') $Measure['info'] = '&nbsp;';
+  if($Measure['Continuity'] == 1) $Interpolate = 'Ano'; else $Interpolate = 'Ne';
+  if($Measure['Info'] == '') $Measure['Info'] = '&nbsp;';
   $GenerationTime = floor((GetMicrotime() - $StopWatchStart) * 1000  ) / 1000;
-  $Output .= '<tr><td><a href="?Measure='.$Measure['id'].'">'.$Measure['description'].'</a></td><td align="center">'.$LastMeasureValue.' '.$Measure['display_unit'].'</td><td align="center">'.$LastMeasureTime.'</td><td align="center">'.$Interpolate.'</td><td>'.$Measure['info'].'</td>';
-  //<td>'.$RowCount.'</td><td>'.$GenerationTime.'</td></tr>');
-  flush();
+  $Output .= '<tr><td><a href="?Measure='.$Measure['Id'].'">'.$Measure['Description'].'</a></td><td align="center">'.$LastMeasureValue.' '.$Measure['Unit'].'</td><td align="center">'.$LastMeasureTime.'</td><td align="center">'.$Interpolate.'</td><td>'.$Measure['Info'].'</td>';
+  if(array_key_exists('Debug', $_GET)) $Output .= '<td>'.$RowCount.'</td><td>'.$GenerationTime.'</td>';
+  $Output .= '</tr>';
 }
 $Output .= '</table>';