diff --git a/db/sql/static/populate_setting_type.sql b/db/sql/static/populate_setting_type.sql index 89b1b3715..92199c400 100644 --- a/db/sql/static/populate_setting_type.sql +++ b/db/sql/static/populate_setting_type.sql @@ -516,6 +516,9 @@ description.','true'), (23088,'ItemDomainCableDesign.List.Display.TotalReqLengthDisplay','Display total required cable length.','false'), (23089,'ItemDomainCableDesign.List.FilterBy.TotalReqLengthDisplay','Filter for total required cable length.',NULL), (23090,'ItemDomainCableDesign.List.Display.QrId','Display component qrId.','false'), +(23091,'ItemDomainCableDesign.Default.CablePrefix','Default cable prefix for cable design.',NULL), +(23092,'ItemDomainCableDesign.Default.Project','Default project for cable design.',NULL), +(23093,'ItemDomainCableDesign.Default.TechnicalSystem','Default technical system for cable design.',NULL), (24000,'ItemDomainCableCatalog.List.AutoLoad.FilterBy.Properties','Automatically load component list with display properties for filtering.','true'), (24001,'ItemDomainCableCatalog.List.Display.ItemCategory','Display catalog item category.','true'), (24002,'ItemDomainCableCatalog.List.Display.CreatedByUser','Display created by username.','false'), diff --git a/db/sql/updates/updateTo3.16.2.sql b/db/sql/updates/updateTo3.16.2.sql index 9fe93d606..5ddd90275 100644 --- a/db/sql/updates/updateTo3.16.2.sql +++ b/db/sql/updates/updateTo3.16.2.sql @@ -6,4 +6,7 @@ -- Execute by running `mysql CDB_DB_NAME -h 127.0.0.1 -u cdb -p < updateTo3.16.2.sql` INSERT IGNORE INTO `setting_type` VALUES -(23090,'ItemDomainCableDesign.List.Display.QrId','Display component qrId.','false'); \ No newline at end of file +(23090,'ItemDomainCableDesign.List.Display.QrId','Display component qrId.','false'), +(23091,'ItemDomainCableDesign.Default.CablePrefix','Default cable prefix for cable design.',NULL), +(23092,'ItemDomainCableDesign.Default.Project','Default project for cable design.',NULL), +(23093,'ItemDomainCableDesign.Default.TechnicalSystem','Default technical system for cable design.',NULL); \ No newline at end of file diff --git a/src/java/CdbWebPortal/src/java/gov/anl/aps/cdb/portal/controllers/ItemDomainCableDesignController.java b/src/java/CdbWebPortal/src/java/gov/anl/aps/cdb/portal/controllers/ItemDomainCableDesignController.java index 5045074d8..f57bfdaa3 100644 --- a/src/java/CdbWebPortal/src/java/gov/anl/aps/cdb/portal/controllers/ItemDomainCableDesignController.java +++ b/src/java/CdbWebPortal/src/java/gov/anl/aps/cdb/portal/controllers/ItemDomainCableDesignController.java @@ -15,6 +15,7 @@ import gov.anl.aps.cdb.portal.model.ItemDomainCableDesignLazyDataModel; import gov.anl.aps.cdb.portal.model.ItemDomainMachineDesignTreeNode; import gov.anl.aps.cdb.portal.model.db.beans.ItemDomainCableDesignFacade; +import gov.anl.aps.cdb.portal.model.db.beans.ItemProjectFacade; import gov.anl.aps.cdb.portal.model.db.entities.CdbEntity; import gov.anl.aps.cdb.portal.model.db.entities.Item; import gov.anl.aps.cdb.portal.model.db.entities.ItemCategory; @@ -32,8 +33,10 @@ import gov.anl.aps.cdb.portal.view.objects.DomainImportExportInfo; import gov.anl.aps.cdb.portal.view.objects.ImportExportFormatInfo; import java.util.ArrayList; +import java.util.Arrays; import java.util.Comparator; import java.util.HashMap; +import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -57,6 +60,9 @@ @SessionScoped public class ItemDomainCableDesignController extends ItemController { + @EJB + ItemProjectFacade itemProjectFacade; + @Override protected ItemDomainCableDesignControllerUtility createControllerUtilityInstance() { return new ItemDomainCableDesignControllerUtility(); @@ -968,10 +974,31 @@ public String prepareCreate() { * Prepares cable wizard. */ public String prepareWizardCable() { - CableWizard.getInstance().reset(); + CableWizard wizard = CableWizard.getInstance(); + wizard.reset(); + ensureSettingDefaultsLoaded(); + + populateEmptyDefaultWizardValues(wizard); + return "/views/itemDomainCableDesign/create?faces-redirect=true"; } + public void populateEmptyDefaultWizardValues(CableWizard wizard) { + if (wizard.getInputValueName() == null || wizard.getInputValueName().isEmpty()) { + wizard.setInputValueName(settingObject.getDefaultCablePrefix()); + } + + if (wizard.getSelectionProjectList() == null || wizard.getSelectionProjectList().isEmpty()) { + List defaultProjectList = settingObject.getDefaultProjectList(); + wizard.setSelectionProjectList(new ArrayList<>(defaultProjectList)); + } + + if (wizard.getSelectionTechnicalSystemList() == null || wizard.getSelectionTechnicalSystemList().isEmpty()) { + List defaultCategoryList = settingObject.getDefaultCategoryList(); + wizard.setSelectionTechnicalSystemList(new ArrayList<>(defaultCategoryList)); + } + } + @Override public ItemDomainCableDesignLazyDataModel createItemLazyDataModel() { return new ItemDomainCableDesignLazyDataModel(itemDomainCableDesignFacade, getDefaultDomain(), settingObject); @@ -1168,6 +1195,75 @@ public void deleteConnection(CableDesignConnectionListObject connection) { connectionToDelete = null; } + public void ensureSettingDefaultsLoaded() { + ItemDomainCableDesignSettings settingObject = getSettingObject(); + + String namePrefix = settingObject.getDefaultCablePrefix(); + if (namePrefix == null) { + settingObject.setDefaultCablePrefix(""); + } + + // Load default project + String defaultProject = settingObject.getDefaultProject(); + List projectIds = new ArrayList<>(); + if (defaultProject != null && !defaultProject.trim().isEmpty()) { + projectIds = Arrays.stream(defaultProject.split(",")) + .map(Integer::parseInt) + .collect(Collectors.toList()); + } + List defaultProjectList = settingObject.getDefaultProjectList(); + if (defaultProjectList == null) { + defaultProjectList = new ArrayList<>(); + } + + Iterator projectIterator = defaultProjectList.iterator(); + while (projectIterator.hasNext()) { + ItemProject itemProject = projectIterator.next(); + Integer id = itemProject.getId(); + if (projectIds.contains(id)) { + projectIds.remove(id); + } else { + projectIterator.remove(); + } + } + + for (Integer projectId : projectIds) { + ItemProject project = itemProjectFacade.find(projectId); + defaultProjectList.add(project); + } + settingObject.setDefaultProjectList(defaultProjectList); + + // Load default category list + String defaultTechnicalSystem = settingObject.getDefaultTechnicalSystem(); + List categoryIds = new ArrayList<>(); + if (defaultTechnicalSystem != null && !defaultTechnicalSystem.trim().isEmpty()) { + categoryIds = Arrays.stream(defaultTechnicalSystem.split(",")) + .map(Integer::parseInt) + .collect(Collectors.toList()); + } + List defaultTechnicalSystemList = settingObject.getDefaultCategoryList(); + if (defaultTechnicalSystemList == null) { + defaultTechnicalSystemList = new ArrayList<>(); + } + + Iterator categoryIterator = defaultTechnicalSystemList.iterator(); + while (categoryIterator.hasNext()) { + ItemCategory itemCategory = categoryIterator.next(); + Integer id = itemCategory.getId(); + if (categoryIds.contains(id)) { + categoryIds.remove(id); + } else { + categoryIterator.remove(); + } + } + + for (Integer categoryId : categoryIds) { + ItemCategory category = itemCategoryFacade.find(categoryId); + defaultTechnicalSystemList.add(category); + } + settingObject.setDefaultCategoryList(defaultTechnicalSystemList); + } + // @Override public boolean getEntityDisplayImportButton() { diff --git a/src/java/CdbWebPortal/src/java/gov/anl/aps/cdb/portal/controllers/extensions/CableWizard.java b/src/java/CdbWebPortal/src/java/gov/anl/aps/cdb/portal/controllers/extensions/CableWizard.java index c84d68b86..ca4bec302 100644 --- a/src/java/CdbWebPortal/src/java/gov/anl/aps/cdb/portal/controllers/extensions/CableWizard.java +++ b/src/java/CdbWebPortal/src/java/gov/anl/aps/cdb/portal/controllers/extensions/CableWizard.java @@ -527,7 +527,7 @@ public void reset() { selectionProjectList = null; selectionTechnicalSystemList = null; members.clear(); - selectionCableType = null; + selectionCableType = cableTypeCatalog; selectionCableCatalogItem = null; cableItem = null; portEnd1 = null; diff --git a/src/java/CdbWebPortal/src/java/gov/anl/aps/cdb/portal/controllers/settings/ItemDomainCableDesignSettings.java b/src/java/CdbWebPortal/src/java/gov/anl/aps/cdb/portal/controllers/settings/ItemDomainCableDesignSettings.java index 2b9495fe7..1047e5659 100644 --- a/src/java/CdbWebPortal/src/java/gov/anl/aps/cdb/portal/controllers/settings/ItemDomainCableDesignSettings.java +++ b/src/java/CdbWebPortal/src/java/gov/anl/aps/cdb/portal/controllers/settings/ItemDomainCableDesignSettings.java @@ -4,17 +4,24 @@ */ package gov.anl.aps.cdb.portal.controllers.settings; +import java.util.Map; + import gov.anl.aps.cdb.portal.controllers.ItemDomainCableDesignController; +import gov.anl.aps.cdb.portal.model.db.entities.ItemCategory; +import gov.anl.aps.cdb.portal.model.db.entities.ItemProject; import gov.anl.aps.cdb.portal.model.db.entities.SettingEntity; import gov.anl.aps.cdb.portal.model.db.entities.SettingType; -import java.util.Map; +import java.util.List; /** * * @author djarosz */ public class ItemDomainCableDesignSettings extends ItemSettings { - + + private static final String DefaultCablePrefixSettingTypeKey = "ItemDomainCableDesign.Default.CablePrefix"; + private static final String DefaultProjectSettingTypeKey = "ItemDomainCableDesign.Default.Project"; + private static final String DefaultTechnicalSystemSettingTypeKey = "ItemDomainCableDesign.Default.TechnicalSystem"; private static final String DisplayAlternateNameSettingTypeKey = "ItemDomainCableDesign.List.Display.ItemIdentifier1"; private static final String DisplayDesignDescriptionSettingTypeKey = "ItemDomainCableDesign.List.Display.Description"; private static final String DisplayLocationSettingTypeKey = "ItemDomainCableDesign.List.Display.Location"; @@ -51,20 +58,20 @@ public class ItemDomainCableDesignSettings extends ItemSettings defaultProjectList; + protected List defaultCategoryList; + protected Boolean displayEndpoints = null; protected Boolean displayCatalogItem = null; protected Boolean displayAssignedInventory = null; protected Boolean displayInstallationStatus = null; protected Boolean displayLocation = null; protected Boolean displayLocationDetails = null; - + // cable metadata fields protected Boolean voltageDisplay = null; protected Boolean layingDisplay = null; @@ -133,7 +148,7 @@ public class ItemDomainCableDesignSettings extends ItemSettings getDefaultProjectList() { + return defaultProjectList; + } + + public void setDefaultProjectList(List defaultProjectList) { + if (defaultProjectList != null) { + defaultProject = ""; + for (ItemProject itemProject : defaultProjectList) { + if (defaultProject.length() > 0) { + defaultProject += ","; + } + defaultProject += itemProject.getId(); + } + } + this.defaultProjectList = defaultProjectList; + } + + public List getDefaultCategoryList() { + return defaultCategoryList; + } + + public void setDefaultCategoryList(List defaultCategoryList) { + if (defaultCategoryList != null) { + defaultTechnicalSystem = ""; + for (ItemCategory itemCategory : defaultCategoryList) { + if (defaultTechnicalSystem.length() > 0) { + defaultTechnicalSystem += ","; + } + defaultTechnicalSystem += itemCategory.getId(); + } + } + this.defaultCategoryList = defaultCategoryList; + } + + public String getDefaultProject() { + return defaultProject; + } + + public String getDefaultTechnicalSystem() { + return defaultTechnicalSystem; + } + public Boolean getDisplayEndpoints() { return displayEndpoints; } @@ -258,7 +323,7 @@ public Boolean getDisplayLocationDetails() { public void setDisplayLocationDetails(Boolean displayLocationDetails) { this.displayLocationDetails = displayLocationDetails; } - + public boolean isVoltageDisplay() { return voltageDisplay; } @@ -856,7 +921,7 @@ protected void updateSettingsFromSettingTypeDefaults(Map se displayLastModifiedByUser = Boolean.parseBoolean(settingTypeMap.get(DisplayLastModifiedByUserSettingTypeKey).getDefaultValue()); displayLastModifiedOnDateTime = Boolean.parseBoolean(settingTypeMap.get(DisplayLastModifiedOnDateTimeSettingTypeKey).getDefaultValue()); setDisplayItemCategory((Boolean) Boolean.parseBoolean(settingTypeMap.get(DisplayTechnicalSystemSettingTypeKey).getDefaultValue())); - + displayEndpoints = Boolean.parseBoolean(settingTypeMap.get(DisplayEndpointsSettingTypeKey).getDefaultValue()); displayCatalogItem = Boolean.parseBoolean(settingTypeMap.get(DisplayCatalogItemSettingTypeKey).getDefaultValue()); displayAssignedInventory = Boolean.parseBoolean(settingTypeMap.get(DisplayAssignedInventorySettingTypeKey).getDefaultValue()); @@ -884,7 +949,7 @@ protected void updateSettingsFromSettingTypeDefaults(Map se routeDisplay = Boolean.parseBoolean(settingTypeMap.get(DisplayRouteSettingTypeKey).getDefaultValue()); routeFilter = settingTypeMap.get(FilterRouteSettingTypeKey).getDefaultValue(); totalReqLengthDisplay = Boolean.parseBoolean(settingTypeMap.get(DisplayTotalReqLengthSettingTypeKey).getDefaultValue()); - totalReqLengthFilter = settingTypeMap.get(FilterTotalReqLengthSettingTypeKey).getDefaultValue(); + totalReqLengthFilter = settingTypeMap.get(FilterTotalReqLengthSettingTypeKey).getDefaultValue(); notesDisplay = Boolean.parseBoolean(settingTypeMap.get(DisplayNotesSettingTypeKey).getDefaultValue()); notesFilter = settingTypeMap.get(FilterNotesSettingTypeKey).getDefaultValue(); @@ -902,7 +967,7 @@ protected void updateSettingsFromSettingTypeDefaults(Map se notesEndpoint1Filter = settingTypeMap.get(FilterNotesEndpoint1SettingTypeKey).getDefaultValue(); drawingEndpoint1Display = Boolean.parseBoolean(settingTypeMap.get(DisplayDrawingEndpoint1SettingTypeKey).getDefaultValue()); drawingEndpoint1Filter = settingTypeMap.get(FilterDrawingEndpoint1SettingTypeKey).getDefaultValue(); - + descriptionEndpoint2Display = Boolean.parseBoolean(settingTypeMap.get(DisplayDescriptionEndpoint2SettingTypeKey).getDefaultValue()); descriptionEndpoint2Filter = settingTypeMap.get(FilterDescriptionEndpoint2SettingTypeKey).getDefaultValue(); routeEndpoint2Display = Boolean.parseBoolean(settingTypeMap.get(DisplayRouteEndpoint2SettingTypeKey).getDefaultValue()); @@ -917,7 +982,7 @@ protected void updateSettingsFromSettingTypeDefaults(Map se notesEndpoint2Filter = settingTypeMap.get(FilterNotesEndpoint2SettingTypeKey).getDefaultValue(); drawingEndpoint2Display = Boolean.parseBoolean(settingTypeMap.get(DisplayDrawingEndpoint2SettingTypeKey).getDefaultValue()); drawingEndpoint2Filter = settingTypeMap.get(FilterDrawingEndpoint2SettingTypeKey).getDefaultValue(); - + deviceEndpoint1Display = Boolean.parseBoolean(settingTypeMap.get(DisplayDeviceEndpoint1SettingTypeKey).getDefaultValue()); deviceEndpoint1Filter = settingTypeMap.get(FilterDeviceEndpoint1SettingTypeKey).getDefaultValue(); portEndpoint1Display = Boolean.parseBoolean(settingTypeMap.get(DisplayPortEndpoint1SettingTypeKey).getDefaultValue()); @@ -941,13 +1006,17 @@ protected void updateSettingsFromSettingTypeDefaults(Map se connectedDevicesEndpoint2Display = Boolean.parseBoolean(settingTypeMap.get(DisplayConnectedDevicesEndpoint2SettingTypeKey).getDefaultValue()); connectedDevicesEndpoint2Filter = settingTypeMap.get(FilterConnectedDevicesEndpoint2SettingTypeKey).getDefaultValue(); - autoLoadListFilterValues = Boolean.parseBoolean(settingTypeMap.get(AutoLoadListFilterValuesSettingTypeKey).getDefaultValue()); + autoLoadListFilterValues = Boolean.parseBoolean(settingTypeMap.get(AutoLoadListFilterValuesSettingTypeKey).getDefaultValue()); + + defaultCablePrefix = settingTypeMap.get(DefaultCablePrefixSettingTypeKey).getDefaultValue(); + defaultProject = settingTypeMap.get(DefaultProjectSettingTypeKey).getDefaultValue(); + defaultTechnicalSystem = settingTypeMap.get(DefaultTechnicalSystemSettingTypeKey).getDefaultValue(); } @Override protected void updateSettingsFromSessionSettingEntity(SettingEntity settingEntity) { super.updateSettingsFromSessionSettingEntity(settingEntity); - displayItemIdentifier1 = settingEntity.getSettingValueAsBoolean(DisplayAlternateNameSettingTypeKey, displayItemIdentifier1); + displayItemIdentifier1 = settingEntity.getSettingValueAsBoolean(DisplayAlternateNameSettingTypeKey, displayItemIdentifier1); displayDescription = settingEntity.getSettingValueAsBoolean(DisplayDesignDescriptionSettingTypeKey, displayDescription); displayItemProject = settingEntity.getSettingValueAsBoolean(DisplayProjectSettingTypeKey, displayItemProject); displayLocation = settingEntity.getSettingValueAsBoolean(DisplayLocationSettingTypeKey, displayLocation); @@ -989,7 +1058,7 @@ protected void updateSettingsFromSessionSettingEntity(SettingEntity settingEntit routeDisplay = settingEntity.getSettingValueAsBoolean(DisplayRouteSettingTypeKey, routeDisplay); routeFilter = settingEntity.getSettingValueAsString(FilterRouteSettingTypeKey, routeFilter); totalReqLengthDisplay = settingEntity.getSettingValueAsBoolean(DisplayTotalReqLengthSettingTypeKey, totalReqLengthDisplay); - totalReqLengthFilter = settingEntity.getSettingValueAsString(FilterTotalReqLengthSettingTypeKey, totalReqLengthFilter); + totalReqLengthFilter = settingEntity.getSettingValueAsString(FilterTotalReqLengthSettingTypeKey, totalReqLengthFilter); notesDisplay = settingEntity.getSettingValueAsBoolean(DisplayNotesSettingTypeKey, notesDisplay); notesFilter = settingEntity.getSettingValueAsString(FilterNotesSettingTypeKey, notesFilter); @@ -1046,9 +1115,13 @@ protected void updateSettingsFromSessionSettingEntity(SettingEntity settingEntit connectedDevicesEndpoint2Display = settingEntity.getSettingValueAsBoolean(DisplayConnectedDevicesEndpoint2SettingTypeKey, connectedDevicesEndpoint2Display); connectedDevicesEndpoint2Filter = settingEntity.getSettingValueAsString(FilterConnectedDevicesEndpoint2SettingTypeKey, connectedDevicesEndpoint2Filter); - autoLoadListFilterValues = settingEntity.getSettingValueAsBoolean(AutoLoadListFilterValuesSettingTypeKey, autoLoadListFilterValues); + autoLoadListFilterValues = settingEntity.getSettingValueAsBoolean(AutoLoadListFilterValuesSettingTypeKey, autoLoadListFilterValues); + + defaultCablePrefix = settingEntity.getSettingValueAsString(DefaultCablePrefixSettingTypeKey, defaultCablePrefix); + defaultProject = settingEntity.getSettingValueAsString(DefaultProjectSettingTypeKey, defaultProject); + defaultTechnicalSystem = settingEntity.getSettingValueAsString(DefaultTechnicalSystemSettingTypeKey, defaultTechnicalSystem); } - + @Override protected void saveSettingsForSessionSettingEntity(SettingEntity settingEntity) { super.saveSettingsForSessionSettingEntity(settingEntity); @@ -1152,5 +1225,9 @@ protected void saveSettingsForSessionSettingEntity(SettingEntity settingEntity) settingEntity.setSettingValue(FilterConnectedDevicesEndpoint2SettingTypeKey, connectedDevicesEndpoint2Filter); settingEntity.setSettingValue(AutoLoadListFilterValuesSettingTypeKey, autoLoadListFilterValues); + + settingEntity.setSettingValue(DefaultCablePrefixSettingTypeKey, defaultCablePrefix); + settingEntity.setSettingValue(DefaultProjectSettingTypeKey, defaultProject); + settingEntity.setSettingValue(DefaultTechnicalSystemSettingTypeKey, defaultTechnicalSystem); } } diff --git a/src/java/CdbWebPortal/src/java/gov/anl/aps/cdb/rest/routes/ItemRoute.java b/src/java/CdbWebPortal/src/java/gov/anl/aps/cdb/rest/routes/ItemRoute.java index 7ad9a39fe..a147ac3fc 100644 --- a/src/java/CdbWebPortal/src/java/gov/anl/aps/cdb/rest/routes/ItemRoute.java +++ b/src/java/CdbWebPortal/src/java/gov/anl/aps/cdb/rest/routes/ItemRoute.java @@ -617,6 +617,7 @@ public PropertyValue updateItemStatus(@PathParam("itemId") int itemId, @RequestB private void updateDbPropertyValueWithPassedInDate(PropertyValue dbPropertyValue, PropertyValue userPassedValue) { dbPropertyValue.setValue(userPassedValue.getValue()); + dbPropertyValue.setText(userPassedValue.getText()); dbPropertyValue.setTargetValue(userPassedValue.getTargetValue()); dbPropertyValue.setDisplayValue(userPassedValue.getDisplayValue()); dbPropertyValue.setTag(userPassedValue.getTag()); diff --git a/src/java/CdbWebPortal/web/views/item/private/templates/itemListViewObjectTemplate.xhtml b/src/java/CdbWebPortal/web/views/item/private/templates/itemListViewObjectTemplate.xhtml index 67486a3c6..e4cfa65f1 100644 --- a/src/java/CdbWebPortal/web/views/item/private/templates/itemListViewObjectTemplate.xhtml +++ b/src/java/CdbWebPortal/web/views/item/private/templates/itemListViewObjectTemplate.xhtml @@ -11,6 +11,9 @@ See LICENSE file. xmlns:f="http://xmlns.jcp.org/jsf/core" template="itemListObjectTemplate.xhtml"> + @@ -19,10 +22,10 @@ See LICENSE file. + rendered="#{itemListObject.id != null and displayItemNameColumnLink}"> - + @@ -32,37 +35,37 @@ See LICENSE file. - + - + - -
-
+ +
+
- -
-
+ +
+
- -
-
+ +
+
- -
-
+ +
+
diff --git a/src/java/CdbWebPortal/web/views/itemDomainCableDesign/create.xhtml b/src/java/CdbWebPortal/web/views/itemDomainCableDesign/create.xhtml index 82703ed41..624e6b5cd 100644 --- a/src/java/CdbWebPortal/web/views/itemDomainCableDesign/create.xhtml +++ b/src/java/CdbWebPortal/web/views/itemDomainCableDesign/create.xhtml @@ -21,7 +21,8 @@ See LICENSE file. - +

Add Cable Design

diff --git a/src/java/CdbWebPortal/web/views/itemDomainCableDesign/private/newCableDesignDefaultsDialog.xhtml b/src/java/CdbWebPortal/web/views/itemDomainCableDesign/private/newCableDesignDefaultsDialog.xhtml new file mode 100644 index 000000000..410bbadff --- /dev/null +++ b/src/java/CdbWebPortal/web/views/itemDomainCableDesign/private/newCableDesignDefaultsDialog.xhtml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/java/CdbWebPortal/web/views/itemDomainCableDesign/private/wizard/cableWizard.xhtml b/src/java/CdbWebPortal/web/views/itemDomainCableDesign/private/wizard/cableWizard.xhtml index d7c58bb7f..2ffe402e2 100644 --- a/src/java/CdbWebPortal/web/views/itemDomainCableDesign/private/wizard/cableWizard.xhtml +++ b/src/java/CdbWebPortal/web/views/itemDomainCableDesign/private/wizard/cableWizard.xhtml @@ -7,7 +7,6 @@ See LICENSE file. @@ -81,6 +80,9 @@ See LICENSE file. rendered="#{cableWizard.isTypeCatalog()}"> + + @@ -88,7 +90,8 @@ See LICENSE file. value="cableWizardDetailsTab" /> - diff --git a/src/java/CdbWebPortal/web/views/itemDomainCableDesign/private/wizard/templates/basicsTabTemplate.xhtml b/src/java/CdbWebPortal/web/views/itemDomainCableDesign/private/wizard/templates/basicsTabTemplate.xhtml index 243963e1a..080e5010b 100644 --- a/src/java/CdbWebPortal/web/views/itemDomainCableDesign/private/wizard/templates/basicsTabTemplate.xhtml +++ b/src/java/CdbWebPortal/web/views/itemDomainCableDesign/private/wizard/templates/basicsTabTemplate.xhtml @@ -11,9 +11,9 @@ See LICENSE file. xmlns:f="http://xmlns.jcp.org/jsf/core"> - + - + @@ -25,7 +25,7 @@ See LICENSE file. - + - + @@ -56,8 +56,21 @@ See LICENSE file. - + + + Update defaults to new cable + + + + + + + + diff --git a/src/java/CdbWebPortal/web/views/itemDomainMachineDesignBase/private/templates/itemDomainMachineDesignListObjectTemplate.xhtml b/src/java/CdbWebPortal/web/views/itemDomainMachineDesignBase/private/templates/itemDomainMachineDesignListObjectTemplate.xhtml index 3f10a02bb..dce6bc763 100644 --- a/src/java/CdbWebPortal/web/views/itemDomainMachineDesignBase/private/templates/itemDomainMachineDesignListObjectTemplate.xhtml +++ b/src/java/CdbWebPortal/web/views/itemDomainMachineDesignBase/private/templates/itemDomainMachineDesignListObjectTemplate.xhtml @@ -67,9 +67,9 @@ See LICENSE file. Machine Element Name
- @@ -256,10 +256,12 @@ See LICENSE file. rendered="#{hideOptionalColumns and hideSearchColumns and settingObject.displayItemProject}"> - + - +