From c2a06a1f3fd8ee85223558d328d4f4db3ff5e590 Mon Sep 17 00:00:00 2001
From: Emmanuele Sassi <emmanuele.sassi@egaltech.com>
Date: Wed, 14 Nov 2018 07:33:54 +0000
Subject: [PATCH] OmagOFFICE : - Correzioni finestra TRF.

---
 CompoTrfDataWindow/CompoTrfDataWindowV.xaml   | 79 ++++++++++++-------
 .../CompoTrfDataWindowV.xaml.vb               |  6 +-
 CompoTrfDataWindow/CompoTrfDataWindowVM.vb    | 14 +++-
 CompoWindow/CompoManager/CompoManagerV.xaml   |  1 +
 CompoWindow/CompoManager/CompoManagerVM.vb    | 69 ++++++++--------
 CompoWindow/CompoWindowVM.vb                  | 20 ++---
 Constants/ConstMsg.vb                         |  1 +
 7 files changed, 116 insertions(+), 74 deletions(-)

diff --git a/CompoTrfDataWindow/CompoTrfDataWindowV.xaml b/CompoTrfDataWindow/CompoTrfDataWindowV.xaml
index 900001b..75fdb2f 100644
--- a/CompoTrfDataWindow/CompoTrfDataWindowV.xaml
+++ b/CompoTrfDataWindow/CompoTrfDataWindowV.xaml
@@ -7,62 +7,85 @@
    IsMinimizable="False"
    ShowInTaskbar="False"
    Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
-   WindowStartupLocation="CenterOwner"
-   MinWidth="270" MinHeight="250"
-   Width="350" Height="300"
-   ResizeMode="NoResize">
+   SizeToContent="Height"
+   Width="400"
+   WindowStartupLocation="CenterOwner">
 
-   <StackPanel>
+   <StackPanel Margin="5,5,5,0">
       
       <UniformGrid Columns="2">
 
          <TextBlock Text="{Binding OrdCodeMsg}"
                     Style="{StaticResource OptionTextBlock}"/>
-         <EgtWPFLib5:EgtTextBox Text="{Binding OrdCode}"/>
+         <EgtWPFLib5:EgtTextBox Text="{Binding OrdCode}"
+                                Margin="0,0,0,5"/>
+         
+      </UniformGrid>
+      
+      <UniformGrid Columns="2">
 
          <TextBlock Text="{Binding OrdDescMsg}"
                     Style="{StaticResource OptionTextBlock}"/>
-         <EgtWPFLib5:EgtTextBox Text="{Binding OrdDesc}"/>
+         <EgtWPFLib5:EgtTextBox Text="{Binding OrdDesc}"
+                                Margin="0,0,0,5"/>
+         
+      </UniformGrid>
+      
+      <UniformGrid Columns="2">
 
          <TextBlock Text="{Binding PartCodeMsg}"
                     Style="{StaticResource OptionTextBlock}"/>
-         <EgtWPFLib5:EgtTextBox Text="{Binding PartCode}"/>
+         <EgtWPFLib5:EgtTextBox Text="{Binding PartCode}"
+                                Margin="0,0,0,5"/>
+         
+      </UniformGrid>
+      
+      <UniformGrid Columns="2">
 
          <TextBlock Text="{Binding MatCodeMsg}"
                     Style="{StaticResource OptionTextBlock}"/>
-         <EgtWPFLib5:EgtTextBox Text="{Binding MatCode}"/>
+         <EgtWPFLib5:EgtTextBox Text="{Binding MatCode}"
+                                Margin="0,0,0,5"/>
+         
+      </UniformGrid>
+      
+      <UniformGrid Columns="2">
 
          <TextBlock Text="{Binding SurfCodeMsg}"
                     Style="{StaticResource OptionTextBlock}"/>
-         <EgtWPFLib5:EgtTextBox Text="{Binding SurfCode}"/>
+         <EgtWPFLib5:EgtTextBox Text="{Binding SurfCode}"
+                                Margin="0,0,0,5"/>
+         
+      </UniformGrid>
+      
+      <UniformGrid Columns="2">
 
          <TextBlock Text="{Binding ThicknessMsg}"
                     Style="{StaticResource OptionTextBlock}"/>
-         <EgtWPFLib5:EgtTextBox Text="{Binding Thickness}"/>
+         <EgtWPFLib5:EgtTextBox Text="{Binding Thickness}"
+                                Margin="0,0,0,5"/>
 
       </UniformGrid>
 
-      <Grid Name="ButtonsGrid">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="1*"/>
-         </Grid.ColumnDefinitions>
+      <UniformGrid Columns="2"
+                   Margin="0,0,0,5">
 
          <Button Name="OkBtn"
+                 Content="{Binding OkMsg}"
                  Grid.Column="1"
-                 Style="{StaticResource OptionPanel_TextButton}"
-                 IsCancel="True">
-         </Button>
-         <Button Name="CancelBtn"
-                 Grid.Column="3"
-                 Style="{StaticResource OptionPanel_TextButton}"
-                 IsCancel="True">
-         </Button>
+                 IsDefault="True"
+                 Margin="0,0,2.5,0"
+                 Style="{StaticResource CompoWindow_Button}"/>
 
-      </Grid>
+         <Button Name="CancelBtn"
+                 Content="{Binding CancelMsg}"
+                 Grid.Column="3"
+                 IsCancel="True"
+                 Margin="2.5,0,0,0"
+                 Style="{StaticResource CompoWindow_Button}"/>
+
+
+      </UniformGrid>
 
    </StackPanel>
    
diff --git a/CompoTrfDataWindow/CompoTrfDataWindowV.xaml.vb b/CompoTrfDataWindow/CompoTrfDataWindowV.xaml.vb
index c799d10..3679883 100644
--- a/CompoTrfDataWindow/CompoTrfDataWindowV.xaml.vb
+++ b/CompoTrfDataWindow/CompoTrfDataWindowV.xaml.vb
@@ -15,8 +15,8 @@
       DialogResult = True
    End Sub
 
-   Private Sub Cancel_Click(sender As Object, e As RoutedEventArgs) Handles CancelBtn.Click
-      DialogResult = False
-   End Sub
+   'Private Sub Cancel_Click(sender As Object, e As RoutedEventArgs) Handles CancelBtn.Click
+   '   DialogResult = False
+   'End Sub
 
 End Class
diff --git a/CompoTrfDataWindow/CompoTrfDataWindowVM.vb b/CompoTrfDataWindow/CompoTrfDataWindowVM.vb
index 9f1a833..2204730 100644
--- a/CompoTrfDataWindow/CompoTrfDataWindowVM.vb
+++ b/CompoTrfDataWindow/CompoTrfDataWindowVM.vb
@@ -68,7 +68,7 @@ Public Class CompoTrfDataWindowVM
 
    Public ReadOnly Property TitleMsg As String
       Get
-         Return EgtMsg(MSG_DRAWPAGEUC + 19)
+         Return EgtMsg(MSG_DRAWPAGEUC + 9)
       End Get
    End Property
 
@@ -108,6 +108,18 @@ Public Class CompoTrfDataWindowVM
       End Get
    End Property
 
+   Public ReadOnly Property OkMsg As String
+      Get
+         Return EgtMsg(MSG_GENERIC + 1)
+      End Get
+   End Property
+
+   Public ReadOnly Property CancelMsg As String
+      Get
+         Return EgtMsg(MSG_GENERIC + 2)
+      End Get
+   End Property
+
 #End Region    ' Messages
 
 #End Region    'FIELDS & PROPERTIES
diff --git a/CompoWindow/CompoManager/CompoManagerV.xaml b/CompoWindow/CompoManager/CompoManagerV.xaml
index 509de4c..c815672 100644
--- a/CompoWindow/CompoManager/CompoManagerV.xaml
+++ b/CompoWindow/CompoManager/CompoManagerV.xaml
@@ -16,6 +16,7 @@
    <Button Content="{Binding TrfDataMsg}"
            Command="{Binding TrfData_Command}"
            Visibility="{Binding TrfData_Visibility}"
+           Margin="0,0,0,5"
            Style="{StaticResource CompoWindow_Button}"/>
 
    <Grid Visibility="{Binding PartName_Visibility}"
diff --git a/CompoWindow/CompoManager/CompoManagerVM.vb b/CompoWindow/CompoManager/CompoManagerVM.vb
index f183abc..67b3523 100644
--- a/CompoWindow/CompoManager/CompoManagerVM.vb
+++ b/CompoWindow/CompoManager/CompoManagerVM.vb
@@ -113,40 +113,40 @@ Public Class CompoManagerVM
          Return m_bTrfData
       End Get
    End Property
-   Private m_bTrfOrderCode As String = ""
-   Public ReadOnly Property bTrfOrderCode As Boolean
+   Private m_sTrfOrderCode As String = ""
+   Public ReadOnly Property sTrfOrderCode As String
       Get
-         Return m_bTrfOrderCode
+         Return m_sTrfOrderCode
       End Get
    End Property
-   Private m_bTrfOrderDesc As String = ""
-   Public ReadOnly Property bTrfOrderDesc As Boolean
+   Private m_sTrfOrderDesc As String = ""
+   Public ReadOnly Property sTrfOrderDesc As String
       Get
-         Return m_bTrfOrderDesc
+         Return m_sTrfOrderDesc
       End Get
    End Property
-   Private m_bTrfPartCode As String = ""
-   Public ReadOnly Property bTrfPartCode As Boolean
+   Private m_sTrfPartCode As String = ""
+   Public ReadOnly Property sTrfPartCode As String
       Get
-         Return m_bTrfPartCode
+         Return m_sTrfPartCode
       End Get
    End Property
-   Private m_bTrfMatCode As String = ""
-   Public ReadOnly Property bTrfMatCode As Boolean
+   Private m_sTrfMatCode As String = ""
+   Public ReadOnly Property sTrfMatCode As String
       Get
-         Return m_bTrfMatCode
+         Return m_sTrfMatCode
       End Get
    End Property
-   Private m_bTrfSurfCode As String = ""
-   Public ReadOnly Property bTrfSurfCode As Boolean
+   Private m_sTrfSurfCode As String = ""
+   Public ReadOnly Property sTrfSurfCode As String
       Get
-         Return m_bTrfSurfCode
+         Return m_sTrfSurfCode
       End Get
    End Property
-   Private m_bTrfThickness As Double = 0
-   Public ReadOnly Property bTrfThickness As Boolean
+   Private m_dTrfThickness As Double = 0
+   Public ReadOnly Property dTrfThickness As Double
       Get
-         Return m_bTrfThickness
+         Return m_dTrfThickness
       End Get
    End Property
 
@@ -159,7 +159,12 @@ Public Class CompoManagerVM
    End Property
    Public ReadOnly Property PartNameMsg As String
       Get
-         Return "Nome"
+         Return EgtMsg(MSG_DRAWPAGEUC + 8)
+      End Get
+   End Property
+   Public ReadOnly Property TrfDataMsg As String
+      Get
+         Return EgtMsg(MSG_DRAWPAGEUC + 9)
       End Get
    End Property
    Public ReadOnly Property PartNumMsg As String
@@ -169,12 +174,12 @@ Public Class CompoManagerVM
    End Property
    Public ReadOnly Property OkMsg As String
       Get
-         Return "Ok"
+         Return EgtMsg(MSG_GENERIC + 1)
       End Get
    End Property
    Public ReadOnly Property ExitMsg As String
       Get
-         Return "Exit"
+         Return EgtMsg(MSG_GENERIC + 2)
       End Get
    End Property
 
@@ -216,12 +221,12 @@ Public Class CompoManagerVM
       PartNum = 1.ToString
       PartName = String.Empty
       ' Reset dati TRF
-      m_bTrfOrderCode = ""
-      m_bTrfOrderDesc = ""
-      m_bTrfPartCode = ""
-      m_bTrfMatCode = ""
-      m_bTrfSurfCode = ""
-      m_bTrfThickness = 0
+      m_sTrfOrderCode = ""
+      m_sTrfOrderDesc = ""
+      m_sTrfPartCode = ""
+      m_sTrfMatCode = ""
+      m_sTrfSurfCode = ""
+      m_dTrfThickness = 0
 
       If Not CompoWindowMap.refCompoWindowVM.bTrfData Then
          TrfData_Visibility = Windows.Visibility.Collapsed
@@ -282,10 +287,10 @@ Public Class CompoManagerVM
    ' Returns a command that manage the MainWindow_Unloaded command
    Public ReadOnly Property TrfData_Command() As ICommand
       Get
-         If m_cmdOk Is Nothing Then
-            m_cmdOk = New Command(AddressOf TrfData)
+         If m_cmdTrfData Is Nothing Then
+            m_cmdTrfData = New Command(AddressOf TrfData)
          End If
-         Return m_cmdOk
+         Return m_cmdTrfData
       End Get
    End Property
 
@@ -293,9 +298,9 @@ Public Class CompoManagerVM
    Public Sub TrfData(ByVal param As Object)
       Dim DlgTrfDataVM As New CompoTrfDataWindowVM()
       Dim DlgTrfDataV As New CompoTrfDataWindowV(Application.Current.MainWindow, DlgTrfDataVM)
-      DlgTrfDataVM.SetData(m_bTrfOrderCode, m_bTrfOrderDesc, m_bTrfPartCode, m_bTrfMatCode, m_bTrfSurfCode, m_bTrfThickness)
+      DlgTrfDataVM.SetData(m_sTrfOrderCode, m_sTrfOrderDesc, m_sTrfPartCode, m_sTrfMatCode, m_sTrfSurfCode, m_dTrfThickness)
       If DlgTrfDataV.ShowDialog() Then
-         DlgTrfDataVM.GetData(m_bTrfOrderCode, m_bTrfOrderDesc, m_bTrfPartCode, m_bTrfMatCode, m_bTrfSurfCode, m_bTrfThickness)
+         DlgTrfDataVM.GetData(m_sTrfOrderCode, m_sTrfOrderDesc, m_sTrfPartCode, m_sTrfMatCode, m_sTrfSurfCode, m_dTrfThickness)
       End If
    End Sub
 
diff --git a/CompoWindow/CompoWindowVM.vb b/CompoWindow/CompoWindowVM.vb
index f4d50f3..5ce6262 100644
--- a/CompoWindow/CompoWindowVM.vb
+++ b/CompoWindow/CompoWindowVM.vb
@@ -216,9 +216,9 @@ Public Class CompoWindowVM
          Dim nTextId = EgtGetFirstInGroup(nRegLayId)
          While nTextId <> GDB_ID.NULL
             If EgtGetType(nTextId) = GDB_TY.EXT_TEXT Then
-               Dim sText As String = CompoWindowMap.refCompoManagerVM.bTrfOrderCode & "-" & CompoWindowMap.refCompoManagerVM.bTrfOrderDesc
-               Dim sText2 As String = CompoWindowMap.refCompoManagerVM.bTrfMatCode & "-" & CompoWindowMap.refCompoManagerVM.bTrfSurfCode
-               Dim sText3 As String = LenToString(b3Part.DimX(), 0) & " x " & LenToString(b3Part.DimY(), 0) & " x " & LenToString(CompoWindowMap.refCompoManagerVM.bTrfThickness, 0)
+               Dim sText As String = CompoWindowMap.refCompoManagerVM.sTrfOrderCode & "-" & CompoWindowMap.refCompoManagerVM.sTrfOrderDesc
+               Dim sText2 As String = CompoWindowMap.refCompoManagerVM.sTrfMatCode & "-" & CompoWindowMap.refCompoManagerVM.sTrfSurfCode
+               Dim sText3 As String = LenToString(b3Part.DimX(), 0) & " x " & LenToString(b3Part.DimY(), 0) & " x " & LenToString(CompoWindowMap.refCompoManagerVM.dTrfThickness, 0)
                Dim dRatio As Double = Math.Max(b3Part.DimX(), b3Part.DimY()) / Math.Min(b3Part.DimX(), b3Part.DimY())
                If dRatio < 5 Then
                   sText = sText & "<br/>" & sText2 & "<br/>" & sText3
@@ -239,14 +239,14 @@ Public Class CompoWindowVM
             nTextId = EgtGetNext(nTextId)
          End While
          ' Info di pezzo da dati Trf
-         EgtSetInfo(Pz, "OC", CompoWindowMap.refCompoManagerVM.bTrfOrderCode)
-         EgtSetInfo(Pz, "OD", CompoWindowMap.refCompoManagerVM.bTrfOrderDesc)
-         EgtSetInfo(Pz, "PC", CompoWindowMap.refCompoManagerVM.bTrfPartCode)
-         EgtSetInfo(Pz, "MT", CompoWindowMap.refCompoManagerVM.bTrfMatCode)
-         EgtSetInfo(Pz, "SRF", CompoWindowMap.refCompoManagerVM.bTrfSurfCode)
+         EgtSetInfo(Pz, "OC", CompoWindowMap.refCompoManagerVM.sTrfOrderCode)
+         EgtSetInfo(Pz, "OD", CompoWindowMap.refCompoManagerVM.sTrfOrderDesc)
+         EgtSetInfo(Pz, "PC", CompoWindowMap.refCompoManagerVM.sTrfPartCode)
+         EgtSetInfo(Pz, "MT", CompoWindowMap.refCompoManagerVM.sTrfMatCode)
+         EgtSetInfo(Pz, "SRF", CompoWindowMap.refCompoManagerVM.sTrfSurfCode)
          EgtSetInfo(Pz, "L", DoubleToString(b3Part.DimX(), 1))
          EgtSetInfo(Pz, "W", DoubleToString(b3Part.DimY(), 1))
-         EgtSetInfo(Pz, "T", CompoWindowMap.refCompoManagerVM.bTrfThickness)
+         EgtSetInfo(Pz, "T", CompoWindowMap.refCompoManagerVM.dTrfThickness)
          EgtSetInfo(Pz, "V1", DoubleToString(b3Part.DimX(), 1))
          EgtSetInfo(Pz, "V2", DoubleToString(b3Part.DimY(), 1))
       End If
@@ -282,7 +282,7 @@ Public Class CompoWindowVM
             ' Aggiusto per lavorazioni
             AdjustFlatPart(nId2)
             ' Se dati Trf assegno nome univoco
-            If m_bTrfData Then EgtSetInfo(nId2, "CsvPart", CompoWindowMap.refCompoManagerVM.bTrfOrderCode & "-" & nId2.ToString())
+            If m_bTrfData Then EgtSetInfo(nId2, "CsvPart", CompoWindowMap.refCompoManagerVM.sTrfOrderCode & "-" & nId2.ToString())
             ' Inserisco in parcheggio
             EstCalc.StoreOnePart(nId2, True)
             ' Aggiungo riferimento e lo inserisco in VeinMatching
diff --git a/Constants/ConstMsg.vb b/Constants/ConstMsg.vb
index 1f8d2d1..f039130 100644
--- a/Constants/ConstMsg.vb
+++ b/Constants/ConstMsg.vb
@@ -39,6 +39,7 @@
    Public Const MSG_TOPCMDBAR As Integer = MSG_OMAGOFFICE + 100
    Public Const MSG_RAWPARTTAB As Integer = MSG_OMAGOFFICE + 150
    Public Const MSG_VEINMATCHING As Integer = MSG_OMAGOFFICE + 200
+   Public Const MSG_GENERIC As Integer = MSG_OMAGOFFICE + 250
 
    Public Const MSG_EGTWPFLIB5 As Integer = 30000
    Public Const MSG_TOPCOMMANDBAR As Integer = MSG_EGTWPFLIB5 + 500