diff --git a/aura/sdg/sdg.cmp b/aura/sdg/sdg.cmp index 584e32f..dd8b43a 100644 --- a/aura/sdg/sdg.cmp +++ b/aura/sdg/sdg.cmp @@ -76,6 +76,7 @@ + @@ -346,4 +347,4 @@ - \ No newline at end of file + diff --git a/aura/sdg/sdgController.js b/aura/sdg/sdgController.js index 11abe67..5e92409 100644 --- a/aura/sdg/sdgController.js +++ b/aura/sdg/sdgController.js @@ -35,6 +35,7 @@ helper.getSDG(component); helper.getNamespace(component); + helper.setTabTitle(component, event, helper); }, handleObjectManagerEvent: function(component, event, helper) {}, paging: function(component, event, helper) { diff --git a/aura/sdg/sdgHelper.js b/aura/sdg/sdgHelper.js index 09c9de4..5f222c0 100644 --- a/aura/sdg/sdgHelper.js +++ b/aura/sdg/sdgHelper.js @@ -481,5 +481,40 @@ } this.FireEvent(component, actionid, selectedrow); - } + }, + + setTabTitle: function (component, event, helper) { + let workspaceAPI = component.find("workspace"); + workspaceAPI.isConsoleNavigation().then(isConsoleNavigation => { + if (isConsoleNavigation) { + workspaceAPI.getEnclosingTabId().then(tabId => { + if (tabId !== false) { + workspaceAPI.isSubtab({ + tabId: tabId + }).then(isSubTab => { + // Only set the tab label if it is a subtab (otherwise it overwrites the primary object tab name) + if (isSubTab) { + workspaceAPI.getTabInfo({ + tabId: tabId + }).then(info => { + // Only update the tab if it is a standard__component + if (/standard__component/i.test(info.pageReference.type)) { + workspaceAPI.setTabLabel({ + 'tabId': tabId, + 'label': component.get("v.TitleName") + }); + workspaceAPI.setTabIcon({ + 'tabId': tabId, + 'icon': component.get("v.SVGName"), + 'iconAlt': component.get("v.TitleName") + }) + } + }); + } + }) + } + }); + } + }); + } }); diff --git a/aura/sdgDatagridCell/sdgDatagridCellController.js b/aura/sdgDatagridCell/sdgDatagridCellController.js index 13267b9..78297e9 100644 --- a/aura/sdgDatagridCell/sdgDatagridCellController.js +++ b/aura/sdgDatagridCell/sdgDatagridCellController.js @@ -105,7 +105,18 @@ component, helper.formatDurationDateTime(component, datevalue) ); - } else { + } else if (fieldstyle === "Numeric Date") { + helper.CreateCmp( + component, + "lightning:formattedDateTime", + { + value: datevalue, + year: "numeric", + month: "2-digit", + day: "numeric" + } + ); + } else { //Render this date WITHOUT a timezone helper.CreateCmp( component, @@ -155,6 +166,18 @@ component, helper.formatDurationDateTime(component, datetimevalue) ); + } else if (fieldstyle === "Numeric Date") { + var timezone = $A.get("$Locale.timezone"); + helper.CreateCmp(component, "lightning:formattedDateTime", { + value: datetimevalue, + timeZone: timezone, + year: "numeric", + month: "2-digit", + day: "numeric", + hour: "numeric", + minute: "numeric", + second: "numeric" + }); } else { var timezone = $A.get("$Locale.timezone"); helper.CreateCmp(component, "lightning:formattedDateTime", { diff --git a/objects/SDG_Field__c.object b/objects/SDG_Field__c.object index 527d802..e7240f7 100644 --- a/objects/SDG_Field__c.object +++ b/objects/SDG_Field__c.object @@ -126,6 +126,11 @@ false + + Numeric Date + false + +