✨ Ioc list view ✨

db/sql/create_cdb_tables.sql

@@ -921,6 +921,7 @@ CREATE TABLE `allowed_property_metadata_value` (
     `property_type_metadata_id` int(11) unsigned NOT NULL,
     `metadata_value` varchar(255) NOT NULL, 
     `description` varchar(256) DEFAULT NULL,
+    `sort_order` float(10,2) unsigned DEFAULT NULL,
     PRIMARY KEY (`id`),
     UNIQUE KEY `allowed_property_metadata_value_u1` (`property_type_metadata_id`,`metadata_value`), 
     KEY `allowed_property_metadata_value_k1` (`property_type_metadata_id`),

db/sql/static/populate_allowed_entity_type_domain.sql

@@ -12,6 +12,7 @@ INSERT INTO `allowed_entity_type_domain` VALUES
 (6,7),
 (6,8),
 (6,9),
-(6,10);
+(6,10),
+(6,11);
 /*!40000 ALTER TABLE `allowed_entity_type_domain` ENABLE KEYS */;
 UNLOCK TABLES;

db/sql/static/populate_entity_type.sql

@@ -10,6 +10,7 @@ INSERT INTO `entity_type` VALUES
 (7,'Inventory','Entity type used for marking a sub domain of intevntory type items.'),
 (8,'Deleted','Entity type used for marking an item deleted.'),
 (9,'Control','Entity type used for marking a sub domain of control type items.'),
-(10,'Power','Entity type used for marking a sub domain of power type items.');
+(10,'Power','Entity type used for marking a sub domain of power type items.'),
+(11,'IOC','Entity type used for marking a sub domain of ioc type items.');
 /*!40000 ALTER TABLE `entity_type` ENABLE KEYS */;
 UNLOCK TABLES;

db/sql/static/populate_setting_type.sql

@@ -391,6 +391,22 @@ description.','true'),
 (21417,'ItemDomainMachineDesignControl.List.Display.PropertyTypeId3','Display property value for property type id #3.',''),
 (21418,'ItemDomainMachineDesignControl.List.Display.PropertyTypeId4','Display property value for property type id #4.',''),
 (21419,'ItemDomainMachineDesignControl.List.Display.PropertyTypeId5','Display property value for property type id #5.',''),
+(21500,'ItemDomainMachineDesignIOC.List.Display.AlternateName','Display alternate name.','false'),
+(21501,'ItemDomainMachineDesignIOC.List.Display.Description','Display design description.','true'),
+(21502,'ItemDomainMachineDesignIOC.List.Display.ItemProject','Display project.','false'),
+(21503,'ItemDomainMachineDesignIOC.List.Display.Id','Display id.','false'),
+(21504,'ItemDomainMachineDesignIOC.List.Display.QrId','Display QR id.','false'),
+(21505,'ItemDomainMachineDesignIOC.List.Display.OwnerUser','Display owner username.','false'),
+(21506,'ItemDomainMachineDesignIOC.List.Display.OwnerGroup','Display owner group name.','false'),
+(21507,'ItemDomainMachineDesignIOC.List.Display.CreatedByUser','Display created by username.','false'),
+(21508,'ItemDomainMachineDesignIOC.List.Display.CreatedOnDateTime','Display created on date/time.','false'),
+(21509,'ItemDomainMachineDesignIOC.List.Display.LastModifiedByUser','Display last modified by username.','false'),
+(21510,'ItemDomainMachineDesignIOC.List.Display.LastModifiedOnDateTime','Display last modified on date/time.','false'),
+(21511,'ItemDomainMachineDesignIOC.List.Display.PropertyTypeId1','Display property value for property type id #1.',''),
+(21512,'ItemDomainMachineDesignIOC.List.Display.PropertyTypeId2','Display property value for property type id #2.',''),
+(21513,'ItemDomainMachineDesignIOC.List.Display.PropertyTypeId3','Display property value for property type id #3.',''),
+(21514,'ItemDomainMachineDesignIOC.List.Display.PropertyTypeId4','Display property value for property type id #4.',''),
+(21515,'ItemDomainMachineDesignIOC.List.Display.PropertyTypeId5','Display property value for property type id #5.',''),
 (22000,'ItemDomainMAARC.List.Display.NumberOfItemsPerPage', 'Display specified number of items per page.','25'),
 (22001,'ItemDomainMAARC.List.Display.Id','Display component id.','false'),
 (22002,'ItemDomainMAARC.List.Display.EntityTypes','Display Item Entity Types','true'),

db/sql/updates/updateTo3.17.0.sql

@@ -0,0 +1,31 @@
+--
+-- Copyright (c) UChicago Argonne, LLC. All rights reserved.
+-- See LICENSE file.
+--
+
+-- Execute by running `mysql CDB_DB_NAME -h 127.0.0.1 -u cdb -p < updateTo3.16.2.sql`
+
+
+INSERT IGNORE INTO `entity_type` VALUES (11,'IOC','Entity type used for marking a sub domain of ioc type items.');
+INSERT IGNORE INTO `allowed_entity_type_domain` VALUES (6,11);
+
+INSERT IGNORE INTO `setting_type` VALUES 
+(21500,'ItemDomainMachineDesignIOC.List.Display.AlternateName','Display alternate name.','false'),
+(21501,'ItemDomainMachineDesignIOC.List.Display.Description','Display design description.','true'),
+(21502,'ItemDomainMachineDesignIOC.List.Display.ItemProject','Display project.','false'),
+(21503,'ItemDomainMachineDesignIOC.List.Display.Id','Display id.','false'),
+(21504,'ItemDomainMachineDesignIOC.List.Display.QrId','Display QR id.','false'),
+(21505,'ItemDomainMachineDesignIOC.List.Display.OwnerUser','Display owner username.','false'),
+(21506,'ItemDomainMachineDesignIOC.List.Display.OwnerGroup','Display owner group name.','false'),
+(21507,'ItemDomainMachineDesignIOC.List.Display.CreatedByUser','Display created by username.','false'),
+(21508,'ItemDomainMachineDesignIOC.List.Display.CreatedOnDateTime','Display created on date/time.','false'),
+(21509,'ItemDomainMachineDesignIOC.List.Display.LastModifiedByUser','Display last modified by username.','false'),
+(21510,'ItemDomainMachineDesignIOC.List.Display.LastModifiedOnDateTime','Display last modified on date/time.','false'),
+(21511,'ItemDomainMachineDesignIOC.List.Display.PropertyTypeId1','Display property value for property type id #1.',''),
+(21512,'ItemDomainMachineDesignIOC.List.Display.PropertyTypeId2','Display property value for property type id #2.',''),
+(21513,'ItemDomainMachineDesignIOC.List.Display.PropertyTypeId3','Display property value for property type id #3.',''),
+(21514,'ItemDomainMachineDesignIOC.List.Display.PropertyTypeId4','Display property value for property type id #4.',''),
+(21515,'ItemDomainMachineDesignIOC.List.Display.PropertyTypeId5','Display property value for property type id #5.','');
+
+
+ALTER IGNORE TABLE `allowed_property_metadata_value` ADD COLUMN `sort_order` float(10,2) unsigned DEFAULT NULL AFTER `description`;

src/java/CdbWebPortal/src/java/gov/anl/aps/cdb/portal/constants/EntityTypeName.java

@@ -9,13 +9,15 @@ public enum EntityTypeName {
     inventory("Inventory", EntityTypeName.INVENTORY_ID),
     deleted("Deleted", EntityTypeName.DELETED_ID),
     power("Power", EntityTypeName.POWER_ID),
-    control("Control", EntityTypeName.CONTROL_ID);
+    control("Control", EntityTypeName.CONTROL_ID),
+    ioc("IOC", EntityTypeName.IOC_ID);
 
     public final static int TEMPLATE_ID = 5;
     public final static int INVENTORY_ID = 7;
     public final static int DELETED_ID = 8;
     public final static int POWER_ID = 10;
     public final static int CONTROL_ID = 9;         
+    public final static int IOC_ID = 11;
 
     private String value;
     private int dbId; 

src/java/CdbWebPortal/src/java/gov/anl/aps/cdb/portal/constants/PortalStyles.java

@@ -7,15 +7,13 @@
 public enum PortalStyles {
     favoritesOn("favoriteOn"),
     favoritesOff("favoriteOff"),
-
-    rowStyleErrorInEntity("errorItemInRow"), 
+    rowStyleErrorInEntity("errorItemInRow"),
     rowStyleNewEntity("newItemInRow"),
-
-    itemConnectorIcon("ui-icon-item-connector"), 
-
+    itemConnectorIcon("ui-icon-item-connector"),
     machineDesingTemplateIcon("ui-icon-machine-design-template"),
-    machineDesignControlIcon("fa fa-code"), 
+    machineDesignControlIcon("fa fa-code"),
     machineDesignPowerIcon("fa fa-bolt"),
+    machineDesignIOCIcon("ui-icon-control"),
     machineDesignIcon("ui-icon-machine-design"),
     catalogIcon("ui-icon-catalog"),
     inventoryIcon("ui-icon-inventory"),