diff --git a/.gitignore b/.gitignore index 45f1a7d..f59793b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ PX.SmartSheetIntegration/bin/ PX.SmartSheetIntegration/obj/ -PX.SmartSheetIntegration/packages/ \ No newline at end of file +PX.SmartSheetIntegration/packages/ +PX.SmartSheetIntegration/.vs/ \ No newline at end of file diff --git a/AcumaticaSmartsheetIntegration23R1.zip b/AcumaticaSmartsheetIntegration23R1.zip new file mode 100644 index 0000000..7b11a55 Binary files /dev/null and b/AcumaticaSmartsheetIntegration23R1.zip differ diff --git a/DeploymentSource/Bin/PX.SmartSheetIntegration.dll b/DeploymentSource/Bin/PX.SmartSheetIntegration.dll index 216695f..f8ceeaa 100644 Binary files a/DeploymentSource/Bin/PX.SmartSheetIntegration.dll and b/DeploymentSource/Bin/PX.SmartSheetIntegration.dll differ diff --git a/DeploymentSource/_project/File_Bin_NLog_dll.xml b/DeploymentSource/_project/File_Bin_NLog_dll.xml deleted file mode 100644 index 8d6f7f0..0000000 --- a/DeploymentSource/_project/File_Bin_NLog_dll.xml +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/DeploymentSource/_project/File_Bin_PX_SmartSheetIntegration_dll.xml b/DeploymentSource/_project/File_Bin_PX_SmartSheetIntegration_dll.xml deleted file mode 100644 index b029336..0000000 --- a/DeploymentSource/_project/File_Bin_PX_SmartSheetIntegration_dll.xml +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/DeploymentSource/_project/File_Bin_smartsheet_csharp_sdk_dll.xml b/DeploymentSource/_project/File_Bin_smartsheet_csharp_sdk_dll.xml deleted file mode 100644 index 839f348..0000000 --- a/DeploymentSource/_project/File_Bin_smartsheet_csharp_sdk_dll.xml +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/DeploymentSource/_project/File_Pages_SS_SS501000_aspx.xml b/DeploymentSource/_project/File_Pages_SS_SS501000_aspx.xml deleted file mode 100644 index 9cc098c..0000000 --- a/DeploymentSource/_project/File_Pages_SS_SS501000_aspx.xml +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/DeploymentSource/_project/File_Pages_SS_SS501000_aspx_cs.xml b/DeploymentSource/_project/File_Pages_SS_SS501000_aspx_cs.xml deleted file mode 100644 index 9f1fb3d..0000000 --- a/DeploymentSource/_project/File_Pages_SS_SS501000_aspx_cs.xml +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/DeploymentSource/_project/pages_ep_ep203000_aspx.xml b/DeploymentSource/_project/pages_ep_ep203000_aspx.xml index 343caa0..424980d 100644 --- a/DeploymentSource/_project/pages_ep_ep203000_aspx.xml +++ b/DeploymentSource/_project/pages_ep_ep203000_aspx.xml @@ -1,4 +1,4 @@ - + diff --git a/DeploymentSource/_project/pages_pm_pm101000_aspx.xml b/DeploymentSource/_project/pages_pm_pm101000_aspx.xml index 7186116..4bf7212 100644 --- a/DeploymentSource/_project/pages_pm_pm101000_aspx.xml +++ b/DeploymentSource/_project/pages_pm_pm101000_aspx.xml @@ -1,4 +1,4 @@ - + diff --git a/DeploymentSource/_project/pages_pm_pm301000_aspx.xml b/DeploymentSource/_project/pages_pm_pm301000_aspx.xml index b5aefd2..22a47c5 100644 --- a/DeploymentSource/_project/pages_pm_pm301000_aspx.xml +++ b/DeploymentSource/_project/pages_pm_pm301000_aspx.xml @@ -1,4 +1,4 @@ - + diff --git a/DeploymentSource/_project/pages_sm_sm203010_aspx.xml b/DeploymentSource/_project/pages_sm_sm203010_aspx.xml index 8a8e1e2..f5b6c56 100644 --- a/DeploymentSource/_project/pages_sm_sm203010_aspx.xml +++ b/DeploymentSource/_project/pages_sm_sm203010_aspx.xml @@ -1,4 +1,4 @@ - + diff --git a/PX.SmartSheetIntegration/PM/ProjectEntrySmartsheetExt.cs b/PX.SmartSheetIntegration/PM/ProjectEntrySmartsheetExt.cs index 0c8f78e..68ab273 100644 --- a/PX.SmartSheetIntegration/PM/ProjectEntrySmartsheetExt.cs +++ b/PX.SmartSheetIntegration/PM/ProjectEntrySmartsheetExt.cs @@ -533,9 +533,12 @@ public class ProjectEntry_WorkflowSmartsheetExt : PXGraphExtension context) { + var processingCategory = context.Categories.CreateNew(ToolbarCategory.ActionCategoryNames.Processing, + category => category.DisplayName(ToolbarCategory.ActionCategory.Processing)); + var synGanttSmartsheetProject = context.ActionDefinitions - .CreateExisting(g => g.synGanttSmartsheetProject, a => a - .InFolder(FolderType.ActionsFolder) + .CreateExisting(g => g.synGanttSmartsheetProject, + a => a.WithCategory(processingCategory) ); context.UpdateScreenConfigurationFor(screen => diff --git a/PX.SmartSheetIntegration/PX.SmartSheetIntegration.csproj b/PX.SmartSheetIntegration/PX.SmartSheetIntegration.csproj index aeddfa4..d27269b 100644 --- a/PX.SmartSheetIntegration/PX.SmartSheetIntegration.csproj +++ b/PX.SmartSheetIntegration/PX.SmartSheetIntegration.csproj @@ -39,9 +39,8 @@ False ..\..\..\..\Bin\IdentityModel.dll - - False - ..\..\..\..\Bin\Microsoft.AspNet.SignalR.Core.dll + + ..\..\..\..\Bin\Microsoft.AspNetCore.SignalR.Core.dll False @@ -51,8 +50,7 @@ False ..\..\..\..\Bin\Newtonsoft.Json.dll - - False + ..\..\..\..\Bin\NLog.dll diff --git a/PX.SmartSheetIntegration/SM/MyProfileMaintExt.cs b/PX.SmartSheetIntegration/SM/MyProfileMaintExt.cs index 49e2f74..843214a 100644 --- a/PX.SmartSheetIntegration/SM/MyProfileMaintExt.cs +++ b/PX.SmartSheetIntegration/SM/MyProfileMaintExt.cs @@ -10,16 +10,11 @@ using System.Security.Cryptography; using System.Collections.Generic; using PX.Data.DependencyInjection; -using Microsoft.AspNet.SignalR.Infrastructure; -using PX.OAuthClient.Hubs; namespace SmartSheetIntegration { public class MyProfileMaintExt : PXGraphExtension, IGraphWithInitialization - { - [InjectDependency] - private IConnectionManager _signalRConnectionManager { get; set; } - + { #region Events protected virtual void Users_RowSelected(PXCache cache, PXRowSelectedEventArgs e) { @@ -103,7 +98,6 @@ public void GetSmartsheetToken(string currentURL) } } } - SendRefreshCall(); return; } @@ -295,11 +289,5 @@ private string sha256Hash(String value) return Sb.ToString(); } #endregion - - private void SendRefreshCall() - { - var hubContext = _signalRConnectionManager.GetHubContext(); - hubContext.Clients.All.RefreshPage(); - } } } \ No newline at end of file