+
+
+
+
+
+
+
diff --git a/db-23.04-to-24.01.sql b/db-23.04-to-24.01.sql
index 22c9ac1e1..9c8f6bac0 100755
--- a/db-23.04-to-24.01.sql
+++ b/db-23.04-to-24.01.sql
@@ -3,3 +3,27 @@
---
UPDATE fac_Config set Value="24.01" WHERE Parameter="Version";
+INSERT INTO fac_Config (Parameter, Value) VALUES ('feature_hdd', 'disabled')
+ON DUPLICATE KEY UPDATE Value = Value;
+ALTER TABLE fac_People ADD COLUMN ManageHDD TINYINT(1) DEFAULT 0;
+CREATE TABLE fac_DeviceTemplateHdd (
+ TemplateID INT NOT NULL,
+ EnableHDDFeature TINYINT(1) DEFAULT 0,
+ HDDCount INT DEFAULT 0,
+ PRIMARY KEY (TemplateID)
+);
+CREATE TABLE fac_HDD (
+ HDDID INT NOT NULL AUTO_INCREMENT,
+ DeviceID INT NOT NULL,
+ Label VARCHAR(100),
+ SerialNo VARCHAR(100) UNIQUE,
+ Status ENUM('on','off','replace','pending_destruction','destroyed_h2') DEFAULT 'on',
+ Size INT, -- en Go
+ TypeMedia ENUM('SATA', 'SCSI', 'SD'),
+ DateAdd DATETIME DEFAULT CURRENT_TIMESTAMP,
+ DateWithdrawn DATETIME,
+ DateDestruction DATETIME,
+ StatusDestruction ENUM('none', 'pending', 'destroyed'),
+ Note TEXT,
+ PRIMARY KEY (HDDID)
+);
\ No newline at end of file
diff --git a/device_templates.php b/device_templates.php
index a09fcc480..f42cea5ee 100644
--- a/device_templates.php
+++ b/device_templates.php
@@ -65,6 +65,7 @@
}
// Transfers are done, delete this shit
$template->DeleteTemplate();
+ $tempplate->DeleteTemplateHDD(); // feature management hdd: delete
}
echo '1';
exit;
@@ -82,6 +83,7 @@
$template->TemplateID=$_REQUEST['TemplateID'];
$template->GetTemplateByID();
$deviceList = Device::GetDevicesByTemplate( $template->TemplateID );
+ $Template->LoadHDDConfig(); // feature management hdd: Load
}
if(isset($_POST['action'])){
@@ -240,6 +242,7 @@ function updatecdu($template,$status){
if($template->CreateTemplate()){
$oldstatus=$status;
$status=UpdateSlotsPorts($template,$status);
+ $template->UpdateTemplateHDD(); // feature management hdd
if($oldstatus==$status){
$status=UpdateCustomValues($template,$status);
}
@@ -255,6 +258,7 @@ function updatecdu($template,$status){
$status=($template->UpdateTemplate())?__("Updated"):__("Error updating template");
if($status==__("Updated")){
$status=UpdateSlotsPorts($template,$status);
+ $template->UpdateTemplateHDD();// feature management hdd
}
if($status==__("Updated")){
$status=UpdateCustomValues($template,$status);
@@ -271,6 +275,7 @@ function updatecdu($template,$status){
$status=($template->UpdateTemplate())?__("Updated"):__("Error updating template");
if ($status==__("Updated")){
$status=UpdateSlotsPorts($template,$status);
+ $template->UpdateTemplateHDD();// feature management hdd
}
if ($status==__("Updated")){
$status=UpdateCustomValues($template,$status);
@@ -288,6 +293,7 @@ function updatecdu($template,$status){
$status=($template->UpdateTemplate())?__("Updated"):__("Error");
if ($status==__("Updated")){
$status=UpdateSlotsPorts($template,$status);
+ $template->UpdateTemplateHDD();// feature management hdd
}
if ($status==__("Updated")){
$status=UpdateCustomValues($template,$status);
@@ -826,6 +832,26 @@ function applynames(inputs,portnames,e){
';
+// feature management hdd
+if($config->ParameterArray['feature_hdd'] == 'enabled'){
+ echo '
+
+
+
+
+
+
+
+
+
+
+
+
';
+}
+
foreach($dcaList as $dca) {
$templatedcaChecked = "";
$templatedcaDisabled = "";
diff --git a/devices.php b/devices.php
index 26d2e822d..992f6d5d4 100644
--- a/devices.php
+++ b/devices.php
@@ -2065,7 +2065,22 @@ function setPreferredLayout() {
';
}
-
+ //feature management hdd
+ if(
+ $config->ParameterArray['feature_hdd'] == 'enabled' &&
+ $template->EnableHDDFeature == 1 &&
+ $dev->DeviceID > 0 &&
+ $person->ManageHDD == 1
+ ){
+ echo '
';
+ }
+ //device images
echo '
From 78e0f06bd6dd4682f536b0f4f79038df34ded8c2 Mon Sep 17 00:00:00 2001
From: Alexandre <146840804+alex001x@users.noreply.github.com>
Date: Wed, 7 May 2025 19:27:00 +0200
Subject: [PATCH 02/25] feature_managementhdd
---
classes/hdd.class.php | 127 ++++++++++++++++++++++++++++++++++++++----
hdd_log_view.php | 71 +++++++++++++++++++++++
managementhdd.php | 80 ++++++++++++++++++++++----
savehdd.php | 91 ++++++++++++++++++++++++++++++
4 files changed, 347 insertions(+), 22 deletions(-)
create mode 100644 hdd_log_view.php
create mode 100644 savehdd.php
diff --git a/classes/hdd.class.php b/classes/hdd.class.php
index 4d1d148b7..7eff65684 100644
--- a/classes/hdd.class.php
+++ b/classes/hdd.class.php
@@ -1,17 +1,17 @@
HDDID = intval($this->HDDID);
@@ -189,4 +189,107 @@ static function GetPendingDestruction() {
return $hddList;
}
}
+
+ private static function logAction($action, $HDDID) {
+ global $person, $dbh;
+ $sql = "INSERT INTO fac_GenericLog (UserID, Time, ItemType, ItemID, LogText) VALUES (?, NOW(), 'HDD', ?, ?)";
+ $stmt = $dbh->prepare($sql);
+ $stmt->execute([$person->UserID, $HDDID, $action]);
+ }
+
+ public static function WithdrawByID($id) {
+ global $dbh;
+ $sql = "UPDATE fac_HDD SET Status='pending_destruction', dateWithdrawn=NOW() WHERE HDDID=?";
+ $stmt = $dbh->prepare($sql);
+ $stmt->execute([$id]);
+ self::logAction("Withdrawn (pending destruction)", $id);
+ }
+
+ public static function DeleteByID($id) {
+ global $dbh;
+ $sql = "DELETE FROM fac_HDD WHERE HDDID=?";
+ $stmt = $dbh->prepare($sql);
+ $stmt->execute([$id]);
+ self::logAction("Deleted", $id);
+ }
+
+ public static function MarkDestroyed($id) {
+ global $dbh;
+ $sql = "UPDATE fac_HDD SET StatusDestruction='destroyed', dateDestruction=NOW() WHERE HDDID=?";
+ $stmt = $dbh->prepare($sql);
+ $stmt->execute([$id]);
+ self::logAction("Marked as destroyed", $id);
+ }
+
+ public static function ReassignToDevice($id, $deviceID) {
+ global $dbh;
+ $sql = "UPDATE fac_HDD SET Status='on', DeviceID=?, dateWithdrawn=NULL, dateDestruction=NULL, StatusDestruction=NULL WHERE HDDID=?";
+ $stmt = $dbh->prepare($sql);
+ $stmt->execute([$deviceID, $id]);
+ self::logAction("Reassigned to DeviceID $deviceID", $id);
+ }
+
+ public static function MarkAsSpare($id) {
+ global $dbh;
+ $sql = "UPDATE fac_HDD SET Status='spare' WHERE HDDID=?";
+ $stmt = $dbh->prepare($sql);
+ $stmt->execute([$id]);
+ self::logAction("Marked as spare", $id);
+ }
+
+ public static function CreateEmpty($deviceID) {
+ global $dbh;
+ $sql = "INSERT INTO fac_HDD (DeviceID, Label, SerialNo, Status, TypeMedia, Size, dateAdd) VALUES (?, '', '', 'on', 'SATA', 0, NOW())";
+ $stmt = $dbh->prepare($sql);
+ $stmt->execute([$deviceID]);
+ $id = $dbh->lastInsertId();
+ self::logAction("Created new empty HDD", $id);
+ }
+
+ public static function DuplicateToEmptySlots($sourceHDDID) {
+ global $dbh;
+ $sql = "SELECT * FROM fac_HDD WHERE HDDID=?";
+ $stmt = $dbh->prepare($sql);
+ $stmt->execute([$sourceHDDID]);
+ if (!$hdd = $stmt->fetch(PDO::FETCH_ASSOC)) return;
+
+ $sql = "SELECT DeviceID FROM fac_HDD WHERE HDDID=?";
+ $devID = $dbh->prepare($sql);
+ $devID->execute([$sourceHDDID]);
+ $DeviceID = $devID->fetchColumn();
+
+ $sql = "SELECT HDDCount FROM fac_DeviceTemplateHdd dt INNER JOIN fac_Device d ON d.TemplateID=dt.TemplateID WHERE d.DeviceID=?";
+ $stmt = $dbh->prepare($sql);
+ $stmt->execute([$DeviceID]);
+ $max = $stmt->fetchColumn();
+
+ $sql = "SELECT COUNT(*) FROM fac_HDD WHERE DeviceID=?";
+ $stmt = $dbh->prepare($sql);
+ $stmt->execute([$DeviceID]);
+ $current = $stmt->fetchColumn();
+
+ $remaining = $max - $current;
+ if ($remaining <= 0) return;
+
+ $sql = "INSERT INTO fac_HDD (DeviceID, Label, SerialNo, Status, TypeMedia, Size, dateAdd) VALUES (?, ?, '', ?, ?, ?, NOW())";
+ $stmt = $dbh->prepare($sql);
+ for ($i = 0; $i < $remaining; $i++) {
+ $stmt->execute([$DeviceID, $hdd['Label'], $hdd['Status'], $hdd['TypeMedia'], $hdd['Size']]);
+ $id = $dbh->lastInsertId();
+ self::logAction("Duplicated from HDDID $sourceHDDID", $id);
+ }
+ }
+
+ public static function ExportPendingDestruction($deviceID) {
+ global $dbh;
+ $sql = "SELECT Label, SerialNo, dateWithdrawn FROM fac_HDD WHERE DeviceID=? AND Status='pending_destruction'";
+ $stmt = $dbh->prepare($sql);
+ $stmt->execute([$deviceID]);
+
+ echo "Label\tSerial Number\tDate Withdrawn\n";
+ while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
+ echo "{$row['Label']}\t{$row['SerialNo']}\t{$row['dateWithdrawn']}\n";
+ }
+ }
+}
?>
diff --git a/hdd_log_view.php b/hdd_log_view.php
new file mode 100644
index 000000000..80e60a318
--- /dev/null
+++ b/hdd_log_view.php
@@ -0,0 +1,71 @@
+ManageHDD) {
+ header("Location: index.php");
+ exit;
+}
+
+$deviceID = isset($_GET['DeviceID']) ? intval($_GET['DeviceID']) : 0;
+
+if (!$deviceID) {
+ echo __("DeviceID is required");
+ exit;
+}
+
+$sql = "
+ SELECT g.Time, g.UserID, g.LogText, h.Label, h.SerialNo
+ FROM fac_GenericLog g
+ JOIN fac_HDD h ON g.ItemID = h.hddID
+ WHERE g.ItemType = 'HDD' AND h.DeviceID = ?
+ ORDER BY g.Time DESC
+";
+
+$stmt = $dbh->prepare($sql);
+$stmt->execute([$deviceID]);
+$logEntries = $stmt->fetchAll(PDO::FETCH_ASSOC);
+?>
+
+
+
+
+
+
<?php echo $subheader; ?>
+
+
+
+
+
+
+
+
+
+
+
+ |
+ |
+ |
+ |
+ |
+
+
+
+
+
+ |
+ |
+ |
+ |
+ |
+
+
+
+
+
+
+
+
+
diff --git a/managementhdd.php b/managementhdd.php
index 0acaeba93..16f09550a 100644
--- a/managementhdd.php
+++ b/managementhdd.php
@@ -28,7 +28,13 @@
$template->GetTemplateByID();
$template->LoadHDDConfig();
+if (!$template->EnableHDDFeature) {
+ echo '
'.__("This equipment does not support HDD management.").'
';
+ exit;
+}
+
$hddList = HDD::GetHDDByDevice($device->DeviceID);
+$hddWaitList = HDD::GetRetiredHDDByDevice($device->DeviceID);
?>
@@ -38,11 +44,13 @@
openDCIM Data Center Inventory
-
+
@@ -54,9 +62,11 @@
+