diff --git a/create.sql b/create.sql
index 3ac925d65..a805fd3da 100644
--- a/create.sql
+++ b/create.sql
@@ -863,7 +863,10 @@ INSERT INTO fac_Config VALUES
('HumidityRedLow', '35', 'percentage', 'float', '35'),
('HumidityYellowHigh', '55', 'percentage', 'float', '55'),
('HumidityYellowLow', '45', 'percentage', 'float', '45'),
- ('WorkOrderBuilder', 'disabled', 'Enabled/Disabled', 'string', 'Disabled'),
+ ('feature_hdd', 'disabled', 'Enabled/Disabled', 'string', 'disabled'),
+ ('Log_for_user_hdd', 'disabled', 'Enabled/Disabled', 'string', 'disabled'),
+ ('hdd_proof_path', 'assets/files/hdd/', 'path', 'string', 'assets/files/hdd/'),
+ ('WorkOrderBuilder', 'disabled', 'Enabled/Disabled', 'string', 'disabled'),
('RackRequests', 'enabled', 'Enabled/Disabled', 'string', 'Enabled'),
('dot', '/usr/bin/dot', 'path', 'string', '/usr/bin/dot'),
('AppendCabDC', 'disabled', 'Enabled/Disabled', 'string', 'Disabled'),
@@ -1078,3 +1081,32 @@ CREATE TABLE fac_Country (
--
INSERT INTO `fac_Country` VALUES ('AD','Andorra'),('AE','United Arab Emirates'),('AF','Afghanistan'),('AG','Antigua and Barbuda'),('AI','Anguilla'),('AL','Albania'),('AM','Armenia'),('AO','Angola'),('AQ','Antarctica'),('AR','Argentina'),('AS','American Samoa'),('AT','Austria'),('AU','Australia'),('AW','Aruba'),('AX','Åland'),('AZ','Azerbaijan'),('BA','Bosnia and Herzegovina'),('BB','Barbados'),('BD','Bangladesh'),('BE','Belgium'),('BF','Burkina Faso'),('BG','Bulgaria'),('BH','Bahrain'),('BI','Burundi'),('BJ','Benin'),('BL','Saint Barthélemy'),('BM','Bermuda'),('BN','Brunei'),('BO','Bolivia'),('BQ','Bonaire, Sint Eustatius, and Saba'),('BR','Brazil'),('BS','Bahamas'),('BT','Bhutan'),('BV','Bouvet Island'),('BW','Botswana'),('BY','Belarus'),('BZ','Belize'),('CA','Canada'),('CC','Cocos (Keeling) Islands'),('CD','DR Congo'),('CF','Central African Republic'),('CG','Congo Republic'),('CH','Switzerland'),('CI','Ivory Coast'),('CK','Cook Islands'),('CL','Chile'),('CM','Cameroon'),('CN','China'),('CO','Colombia'),('CR','Costa Rica'),('CU','Cuba'),('CV','Cabo Verde'),('CW','Curaçao'),('CX','Christmas Island'),('CY','Cyprus'),('CZ','Czechia'),('DE','Germany'),('DJ','Djibouti'),('DK','Denmark'),('DM','Dominica'),('DO','Dominican Republic'),('DZ','Algeria'),('EC','Ecuador'),('EE','Estonia'),('EG','Egypt'),('EH','Western Sahara'),('ER','Eritrea'),('ES','Spain'),('ET','Ethiopia'),('FI','Finland'),('FJ','Fiji'),('FK','Falkland Islands'),('FM','Micronesia'),('FO','Faroe Islands'),('FR','France'),('GA','Gabon'),('GB','United Kingdom'),('GD','Grenada'),('GE','Georgia'),('GF','French Guiana'),('GG','Guernsey'),('GH','Ghana'),('GI','Gibraltar'),('GL','Greenland'),('GM','The Gambia'),('GN','Guinea'),('GP','Guadeloupe'),('GQ','Equatorial Guinea'),('GR','Greece'),('GS','South Georgia and South Sandwich Islands'),('GT','Guatemala'),('GU','Guam'),('GW','Guinea-Bissau'),('GY','Guyana'),('HK','Hong Kong'),('HM','Heard and McDonald Islands'),('HN','Honduras'),('HR','Croatia'),('HT','Haiti'),('HU','Hungary'),('ID','Indonesia'),('IE','Ireland'),('IL','Israel'),('IM','Isle of Man'),('IN','India'),('IO','British Indian Ocean Territory'),('IQ','Iraq'),('IR','Iran'),('IS','Iceland'),('IT','Italy'),('JE','Jersey'),('JM','Jamaica'),('JO','Jordan'),('JP','Japan'),('KE','Kenya'),('KG','Kyrgyzstan'),('KH','Cambodia'),('KI','Kiribati'),('KM','Comoros'),('KN','St Kitts and Nevis'),('KP','North Korea'),('KR','South Korea'),('KW','Kuwait'),('KY','Cayman Islands'),('KZ','Kazakhstan'),('LA','Laos'),('LB','Lebanon'),('LC','Saint Lucia'),('LI','Liechtenstein'),('LK','Sri Lanka'),('LR','Liberia'),('LS','Lesotho'),('LT','Lithuania'),('LU','Luxembourg'),('LV','Latvia'),('LY','Libya'),('MA','Morocco'),('MC','Monaco'),('MD','Moldova'),('ME','Montenegro'),('MF','Saint Martin'),('MG','Madagascar'),('MH','Marshall Islands'),('MK','North Macedonia'),('ML','Mali'),('MM','Myanmar'),('MN','Mongolia'),('MO','Macao'),('MP','Northern Mariana Islands'),('MQ','Martinique'),('MR','Mauritania'),('MS','Montserrat'),('MT','Malta'),('MU','Mauritius'),('MV','Maldives'),('MW','Malawi'),('MX','Mexico'),('MY','Malaysia'),('MZ','Mozambique'),('NA','Namibia'),('NC','New Caledonia'),('NE','Niger'),('NF','Norfolk Island'),('NG','Nigeria'),('NI','Nicaragua'),('NL','Netherlands'),('NO','Norway'),('NP','Nepal'),('NR','Nauru'),('NU','Niue'),('NZ','New Zealand'),('OM','Oman'),('PA','Panama'),('PE','Peru'),('PF','French Polynesia'),('PG','Papua New Guinea'),('PH','Philippines'),('PK','Pakistan'),('PL','Poland'),('PM','Saint Pierre and Miquelon'),('PN','Pitcairn Islands'),('PR','Puerto Rico'),('PS','Palestine'),('PT','Portugal'),('PW','Palau'),('PY','Paraguay'),('QA','Qatar'),('RE','Réunion'),('RO','Romania'),('RS','Serbia'),('RU','Russia'),('RW','Rwanda'),('SA','Saudi Arabia'),('SB','Solomon Islands'),('SC','Seychelles'),('SD','Sudan'),('SE','Sweden'),('SG','Singapore'),('SH','Saint Helena'),('SI','Slovenia'),('SJ','Svalbard and Jan Mayen'),('SK','Slovakia'),('SL','Sierra Leone'),('SM','San Marino'),('SN','Senegal'),('SO','Somalia'),('SR','Suriname'),('SS','South Sudan'),('ST','São Tomé and Príncipe'),('SV','El Salvador'),('SX','Sint Maarten'),('SY','Syria'),('SZ','Eswatini'),('TC','Turks and Caicos Islands'),('TD','Chad'),('TF','French Southern Territories'),('TG','Togo'),('TH','Thailand'),('TJ','Tajikistan'),('TK','Tokelau'),('TL','Timor-Leste'),('TM','Turkmenistan'),('TN','Tunisia'),('TO','Tonga'),('TR','Turkey'),('TT','Trinidad and Tobago'),('TV','Tuvalu'),('TW','Taiwan'),('TZ','Tanzania'),('UA','Ukraine'),('UG','Uganda'),('UM','U.S. Outlying Islands'),('US','United States'),('UY','Uruguay'),('UZ','Uzbekistan'),('VA','Vatican City'),('VC','St Vincent and Grenadines'),('VE','Venezuela'),('VG','British Virgin Islands'),('VI','U.S. Virgin Islands'),('VN','Vietnam'),('VU','Vanuatu'),('WF','Wallis and Futuna'),('WS','Samoa'),('XK','Kosovo'),('YE','Yemen'),('YT','Mayotte'),('ZA','South Africa'),('ZM','Zambia'),('ZW','Zimbabwe');
+
+--
+-- Table for fac_HDD feature managementHDD
+--
+CREATE TABLE fac_HDD (
+ HDDID INT(11) NOT NULL AUTO_INCREMENT,
+ DeviceID INT(11) NOT NULL,
+ SerialNo VARCHAR(100),
+ Status ENUM('On','Off','Pending_destruction','Destroyed','Spare')
+ DEFAULT 'On',
+ Size INT(11) DEFAULT NULL, -- en Go
+ TypeMedia ENUM('HDD','SSD','MVME'),
+ ProofFile VARCHAR(255) DEFAULT NULL,
+ DateAdd DATETIME DEFAULT CURRENT_TIMESTAMP,
+ DateWithdrawn DATETIME DEFAULT NULL,
+ DateDestroyed DATETIME DEFAULT NULL,
+ PRIMARY KEY (HDDID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+--
+-- Table for fac_DeviceTemplateHdd feature managementHDD
+--
+
+ CREATE TABLE fac_DeviceTemplateHdd (
+ TemplateID int(11) NOT NULL,
+ EnableHDDFeature tinyint(1) DEFAULT 0,
+ HDDCount int(11) DEFAULT 0,
+ PRIMARY KEY (TemplateID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
diff --git a/css/inventory.php b/css/inventory.php
index 0faa03b06..2f9465197 100644
--- a/css/inventory.php
+++ b/css/inventory.php
@@ -394,6 +394,34 @@
.whiteborder, .whiteborder div {border: 1px solid white;}
.border, .border div {border: 1px solid gray;}
+.assign-device-table {
+ text-align: center;
+}
+#assignDeviceList {
+ margin: 0 auto;
+ border-collapse: separate !important;
+ border-spacing: 10px 6px;
+}
+#assignDeviceList th,
+#assignDeviceList td {
+ padding: 8px 18px;
+}
+#assignDeviceList .assign-device-row:hover {
+ background-color: #eef6ff;
+ cursor: pointer;
+}
+
+.hdd-status-select {
+ transition: background-color .2s ease-in-out;
+ color: #000;
+}
+.hdd-status-select.status-on {
+ background-color: #dff5d8;
+}
+.hdd-status-select.status-off {
+ background-color: #ffd6d6;
+}
+
/* Search Results */
.search .center {text-align: left;}
.search .main ol, .search .main ul{list-style-type: none;margin-left: 1em;}
diff --git a/db-23.04-to-24.01.sql b/db-23.04-to-24.01.sql
index 22c9ac1e1..fa60738bf 100755
--- a/db-23.04-to-24.01.sql
+++ b/db-23.04-to-24.01.sql
@@ -3,3 +3,34 @@
---
UPDATE fac_Config set Value="24.01" WHERE Parameter="Version";
+--- feature hdd
+--- -fac_config
+INSERT INTO fac_Config (Parameter, Value, UnitOfMeasure, ValType, DefaultVal) VALUES ('feature_hdd', 'disabled','Enabled/Disabled','string','Disabled')
+ON DUPLICATE KEY UPDATE Value = Value;
+INSERT INTO fac_Config (Parameter, Value, UnitOfMeasure, ValType, DefaultVal) VALUES ('Log_for_user_hdd', 'disabled','Enabled/Disabled','string','Disabled')
+ON DUPLICATE KEY UPDATE Value = Value;
+--- -fac_people
+ALTER TABLE fac_People ADD COLUMN ManageHDD TINYINT(1) DEFAULT 0 AFTER SiteAdmin;
+--- -fac_devicetemplatehdd
+CREATE TABLE fac_DeviceTemplateHdd (
+ TemplateID INT NOT NULL,
+ EnableHDDFeature TINYINT(1) DEFAULT 0,
+ HDDCount INT DEFAULT 0,
+ PRIMARY KEY (TemplateID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+--- -fac_hdd
+CREATE TABLE fac_HDD (
+ HDDID INT NOT NULL AUTO_INCREMENT,
+ DeviceID INT NOT NULL,
+ SerialNo VARCHAR(100),
+ Status ENUM('On','Off','Pending_destruction','Destroyed','Spare')
+ DEFAULT 'On',
+ Size INT(11) DEFAULT NULL, -- en Go
+ TypeMedia ENUM('HDD','SSD','MVME') DEFAULT NULL,
+ DateAdd DATETIME DEFAULT CURRENT_TIMESTAMP,
+ DateWithdrawn DATETIME DEFAULT NULL,
+ DateDestroyed DATETIME DEFAULT NULL,
+ PRIMARY KEY (HDDID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+
diff --git a/db-24.01-to-24.02.sql b/db-24.01-to-24.02.sql
new file mode 100644
index 000000000..eb919370b
--- /dev/null
+++ b/db-24.01-to-24.02.sql
@@ -0,0 +1,7 @@
+-- HDD proof of destruction support
+ALTER TABLE fac_HDD ADD COLUMN ProofFile VARCHAR(255) DEFAULT NULL AFTER TypeMedia;
+
+-- Config parameter for HDD proofs base path (with trailing slash)
+INSERT INTO fac_Config (Parameter, Value, UnitOfMeasure, ValType, DefaultVal)
+SELECT 'hdd_proof_path','assets/files/hdd/','path','string','assets/files/hdd/'
+WHERE NOT EXISTS (SELECT 1 FROM fac_Config WHERE Parameter='hdd_proof_path');
diff --git a/device_templates.php b/device_templates.php
index a09fcc480..9c96e580f 100644
--- a/device_templates.php
+++ b/device_templates.php
@@ -1,4 +1,8 @@
DeleteTemplate();
+ $tempplate->DeleteTemplateHDD(); // feature management hdd: delete
}
echo '1';
exit;
@@ -82,6 +87,7 @@
$template->TemplateID=$_REQUEST['TemplateID'];
$template->GetTemplateByID();
$deviceList = Device::GetDevicesByTemplate( $template->TemplateID );
+ $template->LoadHDDConfig(); // feature management hdd: Load
}
if(isset($_POST['action'])){
@@ -240,6 +246,8 @@ function updatecdu($template,$status){
if($template->CreateTemplate()){
$oldstatus=$status;
$status=UpdateSlotsPorts($template,$status);
+ $template->UpdateTemplateHDD(); // feature management hdd
+ //$template->LoadHDDConfig(); // load data from hdd
if($oldstatus==$status){
$status=UpdateCustomValues($template,$status);
}
@@ -255,6 +263,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 +280,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 +298,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 +837,22 @@ 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..19a41055f 100644
--- a/devices.php
+++ b/devices.php
@@ -1,6 +1,9 @@
ParameterArray['feature_hdd'] == 'enabled'){
+ require_once( 'classes/hdd.class.php' );
+ }
$subheader=__("Data Center Device Detail");
@@ -2052,10 +2055,36 @@ function setPreferredLayout() {DeviceType){$selected=" selected";}else{$selected="";}
print "\t\t\t