From 55c95c6a86e3ea823a3db5357d837a9d3f152086 Mon Sep 17 00:00:00 2001 From: Skylar Ittner Date: Tue, 2 Jun 2020 22:57:14 -0600 Subject: [PATCH] Add manufacturer field to components --- database.mwb | Bin 15590 -> 17947 bytes lib/Component.lib.php | 15 +++++++++++++-- pages/editcomponent.php | 1 + 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/database.mwb b/database.mwb index 79264d08d64cec5dc1563d11066b3f95b64a14af..d1bf12b5afc23cbf9a6e2f0f99149a0a1440f738 100644 GIT binary patch literal 17947 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 diff --git a/lib/Component.lib.php b/lib/Component.lib.php index a6ad7cb..fef9f10 100644 --- a/lib/Component.lib.php +++ b/lib/Component.lib.php @@ -15,7 +15,7 @@ class Component { $this->componentid = $componentid; if (Component::exists($componentid)) { $this->exists = true; - $this->component = $database->get("components", ["machineid", "serial", "typeid", "tested", "capacity", "model", "price", "publicnotes", "privatenotes"], ["compid" => $componentid]); + $this->component = $database->get("components", ["machineid", "serial", "typeid", "tested", "capacity", "model", "price", "manufacturer", "publicnotes", "privatenotes"], ["compid" => $componentid]); } } @@ -108,6 +108,13 @@ class Component { return 0.0; } + public function getManufacturer(): string { + if (!empty($this->component["manufacturer"])) { + return $this->component["manufacturer"]; + } + return ""; + } + public function getPublicNotes(): string { if (!empty($this->component["publicnotes"])) { return $this->component["publicnotes"]; @@ -139,7 +146,7 @@ class Component { public function setTestedDate(string $tested) { $this->component["tested"] = date("Y-m-d H:i:s", strtotime($tested)); } - + public function clearTestedDate() { $this->component["tested"] = null; } @@ -156,6 +163,10 @@ class Component { $this->component["price"] = $price; } + public function setManufacturer(string $manufacturer) { + $this->component["manufacturer"] = $manufacturer; + } + public function setPrivateNotes(string $notes) { $this->component["privatenotes"] = $notes; } diff --git a/pages/editcomponent.php b/pages/editcomponent.php index 073caa4..df5ec1c 100644 --- a/pages/editcomponent.php +++ b/pages/editcomponent.php @@ -74,6 +74,7 @@ $form->addInput("date", $date, "date", false, null, null, "Tested Date", "fas fa $form->addInput("time", $time, "time", false, null, null, "Tested Time", "fas fa-clock"); $form->addInput("capacity", $component->getCapacity(), "text", false, null, null, "Capacity", "fas fa-database", 4, 0, 200); $form->addInput("model", $component->getModel(), "text", false, null, null, "Model", "fas fa-hashtag", 4, 0, 200); +$form->addInput("manufacturer", $component->getManufacturer(), "text", false, null, null, "Manufacturer", "fas fa-industry", 4, 0, 200); $form->addInput("price", $component->getPrice(), "number", false, null, null, "Price", "fas fa-money-bill-wave"); $form->addInput("privatenotes", $component->getPrivateNotes(), "textarea", false, null, null, "Private Notes", "fas fa-comment-dots"); $form->addInput("publicnotes", $component->getPublicNotes(), "textarea", false, null, null, "Public Notes", "far fa-comment-dots");