diff --git a/Adaptation/.vscode/settings.json b/Adaptation/.vscode/settings.json index baf51b2..7994909 100644 --- a/Adaptation/.vscode/settings.json +++ b/Adaptation/.vscode/settings.json @@ -13,5 +13,25 @@ "PDSF", "THFTIRQS", "uctor" - ] + ], + "workbench.colorCustomizations": { + "activityBar.activeBackground": "#eaf2d1", + "activityBar.activeBorder": "#51b0ce", + "activityBar.background": "#eaf2d1", + "activityBar.foreground": "#15202b", + "activityBar.inactiveForeground": "#15202b99", + "activityBarBadge.background": "#51b0ce", + "activityBarBadge.foreground": "#15202b", + "sash.hoverBorder": "#eaf2d1", + "statusBar.background": "#d7e7a9", + "statusBar.foreground": "#15202b", + "statusBarItem.hoverBackground": "#c4dc81", + "statusBarItem.remoteBackground": "#d7e7a9", + "statusBarItem.remoteForeground": "#15202b", + "titleBar.activeBackground": "#d7e7a9", + "titleBar.activeForeground": "#15202b", + "titleBar.inactiveBackground": "#d7e7a999", + "titleBar.inactiveForeground": "#15202b99" + }, + "peacock.color": "#d7e7a9" } \ No newline at end of file diff --git a/Adaptation/FileHandlers/MET08THFTIRQS408M/FileRead.cs b/Adaptation/FileHandlers/MET08THFTIRQS408M/FileRead.cs index 3c4495c..5e81466 100644 --- a/Adaptation/FileHandlers/MET08THFTIRQS408M/FileRead.cs +++ b/Adaptation/FileHandlers/MET08THFTIRQS408M/FileRead.cs @@ -201,7 +201,9 @@ public class FileRead : Shared.FileRead, IFileRead catch (Exception) { } } string[] segments = Path.GetFileNameWithoutExtension(reportFullPath).Split('_'); - if (_Hyphens != _HyphenIsXToOpenInsight) + if (_Hyphens == _HyphenIsXToIQSSi) + duplicateDirectory = string.Concat(_FileConnectorConfiguration.TargetFileLocation, @"\All"); + else if (_Hyphens != _HyphenIsXToOpenInsight) duplicateDirectory = string.Concat(_FileConnectorConfiguration.TargetFileLocation, @"\", segments[0]); else duplicateDirectory = string.Concat(Path.GetDirectoryName(Path.GetDirectoryName(_FileConnectorConfiguration.TargetFileLocation)), @"\Data"); @@ -209,7 +211,7 @@ public class FileRead : Shared.FileRead, IFileRead duplicateDirectory = string.Concat(duplicateDirectory, @"-", segments[2]); if (!Directory.Exists(duplicateDirectory)) _ = Directory.CreateDirectory(duplicateDirectory); - if ((isDummyRun || isNotUsedInsightMetrologyViewerAttachments || _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)) + if (isDummyRun || isNotUsedInsightMetrologyViewerAttachments || _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0) { if (!Directory.Exists(duplicateDirectory)) _ = Directory.CreateDirectory(duplicateDirectory);