From 6782d518ebb80fbaa3045ab01c95116835d987fa Mon Sep 17 00:00:00 2001 From: Skylar Ittner Date: Wed, 27 Jun 2018 02:04:31 -0600 Subject: [PATCH] Split info page into two columns --- routes/info.php | 206 +++++++++++++++++++++++++----------------------- 1 file changed, 107 insertions(+), 99 deletions(-) diff --git a/routes/info.php b/routes/info.php index 6e7fb7b..4e0dad9 100644 --- a/routes/info.php +++ b/routes/info.php @@ -8,120 +8,128 @@
- + getMachineInfo(); + $info = $machine->getMachineInfo(); - if (count($info) > 0) { - ?> -
Machine Info:
-
- $val) { - if (empty($val)) { - continue; - } - $echo = ""; - switch ($key) { - case "model": - $echo = "Model: " . htmlspecialchars($val); - break; - case "condition": - $filled = floor($val); - $echo = "Condition: "; - $empty = 10; - while ($filled > 0) { - $filled--; - $empty--; - $echo .= " "; + if (count($info) > 0) { + ?> +
+
Machine Info:
+
+ $val) { + if (empty($val)) { + continue; } - if ($val - floor($val) > 0.75) { - $empty--; - $echo .= " "; - } else if ($val - floor($val) > 0.25) { - $empty--; - $echo .= " "; + $echo = ""; + switch ($key) { + case "model": + $echo = "Model: " . htmlspecialchars($val); + break; + case "condition": + $filled = floor($val); + $echo = "Condition: "; + $empty = 10; + while ($filled > 0) { + $filled--; + $empty--; + $echo .= " "; + } + if ($val - floor($val) > 0.75) { + $empty--; + $echo .= " "; + } else if ($val - floor($val) > 0.25) { + $empty--; + $echo .= " "; + } + while ($empty > 0) { + $empty--; + $echo .= " "; + } + break; + case "price": + $echo = "Sale Value: $" . number_format($val * 1.0, 2); + break; + case "notes": + $echo = "
" . htmlspecialchars($val) . "
"; + break; } - while ($empty > 0) { - $empty--; - $echo .= " "; + if ($echo != "") { + echo "
\n$echo\n
\n"; } - break; - case "price": - $echo = "Sale Value: $" . number_format($val * 1.0, 2); - break; - case "notes": - $echo = "
" . htmlspecialchars($val) . "
"; - break; - } - if ($echo != "") { - echo "
\n$echo\n
\n"; - } - } - ?> -
- +
+
+ getHistory(); + $components = $machine->getComponents(); - if (count($history) > 0) { - ?> -
History:
-
- \n"; - echo "$h[eventname] on " . date(DATETIME_FORMAT, strtotime($h['date'])) . "
\n"; - if (!empty($h['notes'])) { - echo "
" . htmlspecialchars($h['notes']) . "
"; - } - echo "\n
\n"; - } + if (count($components) > 0) { ?> -
- +
Components:
+
+ \n"; + echo "$c[type]
\n"; + echo "Serial: $c[serial]
\n"; + if (!empty($c['tested'])) { + echo "Tested on: " . date(DATETIME_FORMAT, strtotime($c['tested'])) . "
\n"; + } + if (!empty($c['capacity'])) { + echo "Capacity: $c[capacity]
\n"; + } + if (!empty($c['model'])) { + echo "Model: $c[model]
\n"; + } + if (!empty($h['notes'])) { + echo "
" . htmlspecialchars($h['notes']) . "
"; + } + echo "\n
\n"; + } + ?> + + + getComponents(); + $history = $machine->getHistory(); - if (count($components) > 0) { - ?> -
Components:
-
- \n"; - echo "$c[type]
\n"; - echo "Serial: $c[serial]
\n"; - if (!empty($c['tested'])) { - echo "Tested on: " . date(DATETIME_FORMAT, strtotime($c['tested'])) . "
\n"; - } - if (!empty($c['capacity'])) { - echo "Capacity: $c[capacity]
\n"; - } - if (!empty($c['model'])) { - echo "Model: $c[model]
\n"; - } - if (!empty($h['notes'])) { - echo "
" . htmlspecialchars($h['notes']) . "
"; - } - echo "\n
\n"; - } + if (count($history) > 0) { ?> - - +
History:
+
+ \n"; + echo "$h[eventname] on " . date(DATETIME_FORMAT, strtotime($h['date'])) . "
\n"; + if (!empty($h['notes'])) { + echo "
" . htmlspecialchars($h['notes']) . "
"; + } + echo "\n
\n"; + } + ?> + + + " . $ex->getMessage() . "

"; } - } catch (Exception $ex) { - echo "

" . $ex->getMessage() . "

"; - } - ?> + ?> +

Look up another machine: