PG-1260

-> renamed xaml files similarly as delivered sample xaml files, so they are displayed right after the according ps script files in windows explorer
coolOrangeLabs · Nov 30, 2022 · 06f8233 · 06f8233
1 parent c46cd0f
commit 06f8233
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 21 deletions.
diff --git a/Files/powerEvents/Events/ERPBOM_Tab.xaml → ...powerEvents/Events/TransferERPBomTab.xaml b/Files/powerEvents/Events/ERPBOM_Tab.xaml → ...powerEvents/Events/TransferERPBomTab.xaml
diff --git a/Files/powerEvents/Events/TransferERPBomViaFileTab.ps1 b/Files/powerEvents/Events/TransferERPBomViaFileTab.ps1
@@ -1,5 +1,5 @@
 #region Debugging
-if((Get-Process -Id $PID).ProcessName -in @('powershell','powershell_ise')){
+if((Get-Process -Id $PID).ProcessName -in @('powershell','powershell_ise') -and $host.Name.StartsWith('powerEvents') -eq $false){
 	Import-Module powerEvents
 
 	Open-VaultConnection -Server $env:Computername -Vault Vault -User Administrator -Password ""
@@ -25,7 +25,6 @@ if((Get-Process -Id $PID).ProcessName -in @('powershell','powershell_ise')){
 		$debugERPTab_window.ShowDialog()
 	}
 
-
 	Import-Module powergate
 	Connect-ERP -Service 'http://localhost:8080/PGS/ErpServices'
 }
@@ -43,7 +42,7 @@ Set-LogFilePath -Path $logPath
 Add-VaultTab -Name 'ERP BOM' -EntityType 'File' -Action {
 	param($selectedFile)
 
-	$erpBomTab_control = [Windows.Markup.XamlReader]::Load([System.Xml.XmlNodeReader]::new([xml](Get-Content "$PSScriptRoot\ERPBOM_Tab.xaml")))
+	$erpBomTab_control = [Windows.Markup.XamlReader]::Load([System.Xml.XmlNodeReader]::new([xml](Get-Content "$PSScriptRoot\TransferERPBomTab.xaml")))
 
 	$statusMessage_label = $erpItemTab_control.FindName('lblStatusMessage')
 	$erpServices = Get-ERPServices -Available
@@ -62,8 +61,7 @@ Add-VaultTab -Name 'ERP BOM' -EntityType 'File' -Action {
 
 	$erpItemTab_GoToBOMButton = $erpItemTab_control.FindName('GoToBomButton')
 
-	$number = GetEntityNumber -entity $selectedFile
-	$erpBomHeader = Get-ERPObject -EntitySet "BomHeaders" -Keys @{Number = $number } -Expand "BomRows"
+	$erpBomHeader = Get-ERPObject -EntitySet "BomHeaders" -Keys @{Number = $selectedFile._PartNumber } -Expand "BomRows"
 	if(-not $?) {
 		$statusMessage_label.Content = $Error[0]
 		$statusMessage_label.Foreground = "Red"

diff --git a/Files/powerEvents/Events/TransferERPBomViaItemTab.ps1 b/Files/powerEvents/Events/TransferERPBomViaItemTab.ps1
@@ -1,5 +1,5 @@
 #region Debugging
-if((Get-Process -Id $PID).ProcessName -in @('powershell','powershell_ise')){
+if((Get-Process -Id $PID).ProcessName -in @('powershell','powershell_ise') -and $host.Name.StartsWith('powerEvents') -eq $false){
 	Import-Module powerEvents
 
 	Open-VaultConnection -Server $env:Computername -Vault Vault -User Administrator -Password ""
@@ -25,7 +25,6 @@ if((Get-Process -Id $PID).ProcessName -in @('powershell','powershell_ise')){
 		$debugERPTab_window.ShowDialog()
 	}
 
-
 	Import-Module powergate
 	Connect-ERP -Service 'http://localhost:8080/PGS/ErpServices'
 }
@@ -43,7 +42,7 @@ Set-LogFilePath -Path $logPath
 Add-VaultTab -Name 'ERP BOM' -EntityType 'Item' -Action {
 	param($selectedItem)
 
-	$erpBomTab_control = [Windows.Markup.XamlReader]::Load([System.Xml.XmlNodeReader]::new([xml](Get-Content "$PSScriptRoot\ERPBOM_Tab.xaml")))
+	$erpBomTab_control = [Windows.Markup.XamlReader]::Load([System.Xml.XmlNodeReader]::new([xml](Get-Content "$PSScriptRoot\TransferERPBomTab.xaml")))
 
 	$statusMessage_label = $erpItemTab_control.FindName('lblStatusMessage')
 	$erpServices = Get-ERPServices -Available
@@ -62,8 +61,7 @@ Add-VaultTab -Name 'ERP BOM' -EntityType 'Item' -Action {
 
 	$erpItemTab_GoToBOMButton = $erpItemTab_control.FindName('GoToBomButton')
 
-	$number = GetEntityNumber -entity $selectedFile
-	$erpBomHeader = Get-ERPObject -EntitySet "BomHeaders" -Keys @{Number = $number } -Expand "BomRows"
+	$erpBomHeader = Get-ERPObject -EntitySet "BomHeaders" -Keys @{Number = $selectedItem._Number } -Expand "BomRows"
 	if(-not $?) {
 		$statusMessage_label.Content = $Error[0]
 		$statusMessage_label.Foreground = "Red"

diff --git a/Files/powerEvents/Events/ERPItem_Tab.xaml → ...owerEvents/Events/TransferERPItemTab.xaml b/Files/powerEvents/Events/ERPItem_Tab.xaml → ...owerEvents/Events/TransferERPItemTab.xaml
@@ -109,7 +109,7 @@
 						<ComboBox x:Name="MaterialTypeList" SelectedValue="{Binding Type}" DisplayMemberPath="Value" SelectedValuePath="Key" Grid.Column="4" Grid.Row="1" />
 
 						<Label Content="Base Unit of Measure" Grid.Column="3" Grid.Row="0" />
-						<ComboBox Name="UomList" SelectedValue="{Binding UnitOfMeasure}" SelectedValuePath="Key" DisplayMemberPath="Value" SelectedValuePath="Key" Grid.Column="4" Grid.Row="0" />
+						<ComboBox Name="UomList" SelectedValue="{Binding UnitOfMeasure}" DisplayMemberPath="Value" SelectedValuePath="Key" Grid.Column="4" Grid.Row="0" />
 
 						<Label x:Name="ModifiedDateLabel" Content="Last Modified Date" Grid.Column="3" Grid.Row="2" />
 						<TextBox x:Name="ModifiedDateTextBox" Text="{Binding ModifiedDate}" Grid.Column="4" Grid.Row="2" IsEnabled="False" />

diff --git a/Files/powerEvents/Events/TransferERPItemViaFileTab.ps1 b/Files/powerEvents/Events/TransferERPItemViaFileTab.ps1
@@ -1,5 +1,5 @@
 #region Debugging
-if((Get-Process -Id $PID).ProcessName -in @('powershell','powershell_ise')){
+if((Get-Process -Id $PID).ProcessName -in @('powershell','powershell_ise') -and $host.Name.StartsWith('powerEvents') -eq $false){
 	Import-Module powerEvents
 
 	Open-VaultConnection -Server $env:Computername -Vault Vault -User Administrator -Password ""
@@ -25,7 +25,6 @@ if((Get-Process -Id $PID).ProcessName -in @('powershell','powershell_ise')){
 		$debugERPTab_window.ShowDialog()
 	}
 
-
 	Import-Module powergate
 	Connect-ERP -Service 'http://localhost:8080/PGS/ErpServices'
 }
@@ -43,7 +42,7 @@ Set-LogFilePath -Path $logPath
 Add-VaultTab -Name 'ERP Item' -EntityType 'File' -Action {
 	param($selectedFile)
 
-	$erpItemTab_control = [Windows.Markup.XamlReader]::Load([System.Xml.XmlNodeReader]::new([xml](Get-Content "$PSScriptRoot\ERPItem_Tab.xaml")))
+	$erpItemTab_control = [Windows.Markup.XamlReader]::Load([System.Xml.XmlNodeReader]::new([xml](Get-Content "$PSScriptRoot\TransferERPItemTab.xaml")))
 
 	$statusMessage_label = $erpItemTab_control.FindName('lblStatusMessage')
 	$erpServices = Get-ERPServices -Available
@@ -66,8 +65,7 @@ Add-VaultTab -Name 'ERP Item' -EntityType 'File' -Action {
 	$erpItemTab_CreateOrUpdateMaterialButton = $erpItemTab_control.FindName('CreateOrUpdateMaterialButton')
 	$erpItemTab_GoToMaterialButton = $erpItemTab_control.FindName('GoToMaterialButton')
 
-	$number = GetEntityNumber -entity $selectedFile
-	$erpMaterial = Get-ERPObject -EntitySet "Materials" -Keys @{ Number = $number }
+	$erpMaterial = Get-ERPObject -EntitySet "Materials" -Keys @{ Number = $selectedFile._PartNumber }
 	if(-not $?) {
 		$statusMessage_label.Content = $Error[0]
 		$statusMessage_label.Foreground = "Red"

diff --git a/Files/powerEvents/Events/TransferERPItemViaItemTab.ps1 b/Files/powerEvents/Events/TransferERPItemViaItemTab.ps1
@@ -1,5 +1,5 @@
 #region Debugging
-if((Get-Process -Id $PID).ProcessName -in @('powershell','powershell_ise')){
+if((Get-Process -Id $PID).ProcessName -in @('powershell','powershell_ise') -and $host.Name.StartsWith('powerEvents') -eq $false){
 	Import-Module powerEvents
 
 	Open-VaultConnection -Server $env:Computername -Vault Vault -User Administrator -Password ""
@@ -25,7 +25,6 @@ if((Get-Process -Id $PID).ProcessName -in @('powershell','powershell_ise')){
 		$debugERPTab_window.ShowDialog()
 	}
 
-
 	Import-Module powergate
 	Connect-ERP -Service 'http://localhost:8080/PGS/ErpServices'
 }
@@ -42,7 +41,7 @@ Set-LogFilePath -Path $logPath
 
 Add-VaultTab -Name 'ERP Item' -EntityType 'Item' -Action {
 	param($selectedItem)
-	$erpItemTab_control = [Windows.Markup.XamlReader]::Load([System.Xml.XmlNodeReader]::new([xml](Get-Content "$PSScriptRoot\ERPItem_Tab.xaml")))
+	$erpItemTab_control = [Windows.Markup.XamlReader]::Load([System.Xml.XmlNodeReader]::new([xml](Get-Content "$PSScriptRoot\TransferERPItemTab.xaml")))
 
 	$statusMessage_label = $erpItemTab_control.FindName("lblStatusMessage")
 	$erpServices = Get-ERPServices -Available
@@ -65,8 +64,7 @@ Add-VaultTab -Name 'ERP Item' -EntityType 'Item' -Action {
 	$erpItemTab_CreateOrUpdateMaterialButton = $erpItemTab_control.FindName('CreateOrUpdateMaterialButton')
 	$erpItemTab_GoToMaterialButton = $erpItemTab_control.FindName('GoToMaterialButton')
 
-	$number = GetEntityNumber -entity $selectedItem
-	$erpMaterial = Get-ERPObject -EntitySet "Materials" -Keys @{ Number = $number }
+	$erpMaterial = Get-ERPObject -EntitySet "Materials" -Keys @{ Number = $selectedItem._Number  }
 	if(-not $?) {
 		$statusMessage_label.Content = $Error[0]
 		$statusMessage_label.Foreground = "Red"