From 9acbbab49ee106f75fb5488ecba52c753d05bd39 Mon Sep 17 00:00:00 2001
From: Emmanuele Sassi <emmanuele.sassi@egaltech.com>
Date: Tue, 1 Apr 2025 11:13:50 +0200
Subject: [PATCH] - introdotto BottomRail - migliorie a grafica e CRM

---
 EgtWindowMaker/CRMPage/CRMPageV.xaml          |  3 +-
 .../EstimationDetailPageVM.vb                 |  1 +
 EgtWindowMaker/MainWindow/MainWindowV.xaml    | 14 ++++--
 .../ManageWindow/ManageWindowV.xaml           | 10 ++++
 EgtWindowMaker/ManageWindow/ManageWindowVM.vb | 22 ++++++++-
 .../NewWindowWnd/NewWindowWndV.xaml           | 21 ++++++---
 EgtWindowMaker/NewWindowWnd/NewWindowWndVM.vb |  3 +-
 EgtWindowMaker/Utility/Dictionary.xaml        | 47 +++++++++++++++++++
 EgtWindowMaker/Utility/JsonUtility.vb         | 15 +++++-
 9 files changed, 122 insertions(+), 14 deletions(-)

diff --git a/EgtWindowMaker/CRMPage/CRMPageV.xaml b/EgtWindowMaker/CRMPage/CRMPageV.xaml
index bf1d8dc..67838fa 100644
--- a/EgtWindowMaker/CRMPage/CRMPageV.xaml
+++ b/EgtWindowMaker/CRMPage/CRMPageV.xaml
@@ -38,7 +38,8 @@
       </StackPanel>
       <TabControl Grid.Row="1"
                   SelectedIndex="{Binding SelCRMPage}"
-                  TabStripPlacement="Right">
+                  TabStripPlacement="Right"
+                  Style="{StaticResource TabControl.NoHeader}">
          <TabItem Header="Nuovo cliente">
             <!--<local:NewEstimationPageV DataContext="{StaticResource NewEstimationPageVM}"/>-->
          </TabItem>
diff --git a/EgtWindowMaker/EstimationDetailPage/EstimationDetailPageVM.vb b/EgtWindowMaker/EstimationDetailPage/EstimationDetailPageVM.vb
index a373d24..b0fd6d8 100644
--- a/EgtWindowMaker/EstimationDetailPage/EstimationDetailPageVM.vb
+++ b/EgtWindowMaker/EstimationDetailPage/EstimationDetailPageVM.vb
@@ -420,6 +420,7 @@ Public Class TemplateRow
       m_sName = sName
       m_dWidth = dWidth
       m_dHeight = dHeight
+      m_sImagePath = Map.refMainWindowVM.MainWindowM.sTemplateDir & "\" & nId & ".png"
    End Sub
 
 End Class
diff --git a/EgtWindowMaker/MainWindow/MainWindowV.xaml b/EgtWindowMaker/MainWindow/MainWindowV.xaml
index 238fd4a..23be767 100644
--- a/EgtWindowMaker/MainWindow/MainWindowV.xaml
+++ b/EgtWindowMaker/MainWindow/MainWindowV.xaml
@@ -8,9 +8,9 @@
          <RowDefinition Height="Auto"/>
          <RowDefinition Height="1*"/>
       </Grid.RowDefinitions>
-      <local:ProjManagerV DataContext="{StaticResource ProjManagerVM}"/>
       <TabControl Grid.Row="1"
-                  SelectedIndex="{Binding SelPage}">
+                  SelectedIndex="{Binding SelPage}"
+                  Style="{StaticResource TabControl.NoHeader}">
          <TabItem Header="Home">
             <local:HomePageV DataContext="{StaticResource HomePageVM}"/>
          </TabItem>
@@ -21,7 +21,15 @@
             <local:ProducingPageV DataContext="{StaticResource ProducingPageVM}"/>
          </TabItem>
          <TabItem Header="WindowManager">
-            <local:ManageWindowV DataContext="{StaticResource ManageWindowVM}"/>
+            <Grid>
+               <Grid.RowDefinitions>
+                  <RowDefinition Height="Auto"/>
+                  <RowDefinition Height="1*"/>
+               </Grid.RowDefinitions>
+               <local:ProjManagerV DataContext="{StaticResource ProjManagerVM}"/>
+               <local:ManageWindowV Grid.Row="1"
+                                    DataContext="{StaticResource ManageWindowVM}"/>
+            </Grid>
          </TabItem>
       </TabControl>
    </Grid>
diff --git a/EgtWindowMaker/ManageWindow/ManageWindowV.xaml b/EgtWindowMaker/ManageWindow/ManageWindowV.xaml
index a9a3c63..28f3631 100644
--- a/EgtWindowMaker/ManageWindow/ManageWindowV.xaml
+++ b/EgtWindowMaker/ManageWindow/ManageWindowV.xaml
@@ -77,6 +77,16 @@
                      </ItemsControl.ItemTemplate>
                   </ItemsControl>
                </GroupBox>
+               <Expander IsExpanded="{Binding SelArea.BottomRail}"
+                         Header="Bottom Rail"
+                         Margin="0,0,0,10"
+                         Style="{StaticResource Expander.CheckBoxHeader}">
+                  <UniformGrid Columns="2"
+                               Margin="0,5">
+                     <TextBlock Text="Quantità"/>
+                     <TextBox Text="{Binding SelArea.BottomRailQty}"/>
+                  </UniformGrid>
+               </Expander>
                <Button Content="Calcola"
                        Command="{Binding ApplyFrame_Command}"
                        Style="{StaticResource Button.ManageWindow.LeftBar}"/>
diff --git a/EgtWindowMaker/ManageWindow/ManageWindowVM.vb b/EgtWindowMaker/ManageWindow/ManageWindowVM.vb
index c5b02dd..ecf7d54 100644
--- a/EgtWindowMaker/ManageWindow/ManageWindowVM.vb
+++ b/EgtWindowMaker/ManageWindow/ManageWindowVM.vb
@@ -108,7 +108,7 @@ Public Class ManageWindowVM
    Private m_DShowMode As DShowModes = DShowModes.MODESIMPLE3D
    Friend Sub SetDShowMode(value As DShowModes)
       m_DShowMode = value
-      DrawWindow()
+      DrawWindow(False)
    End Sub
 
    Public Property bIsShow2DOn As Boolean
@@ -1011,6 +1011,7 @@ Public Class SashDimension
          m_SelOpeningType = value
          m_Parent.RefreshHardwareList()
          m_Parent.RefreshHardwareOptionList()
+         m_Parent.SetFirstHardware()
       End Set
    End Property
 
@@ -1633,6 +1634,19 @@ Public Class Frame
       m_bBottomRail = bBottomRail
    End Sub
 
+   Private m_nBottomRailQty As Integer = 0
+   Public Property BottomRailQty As Integer
+      Get
+         Return m_nBottomRailQty
+      End Get
+      Set(value As Integer)
+         m_nBottomRailQty = value
+      End Set
+   End Property
+   Friend Sub SetBottomRailQty(nBottomRailQty As Integer)
+      m_nBottomRailQty = nBottomRailQty
+   End Sub
+
    Private m_Outline As ObservableCollection(Of Curve)
    Public Property Outline As ObservableCollection(Of Curve)
       Get
@@ -1715,6 +1729,7 @@ Public Class Frame
       If m_nAreaId = GDB_ID.NULL Then Return False
       ' aggiungo BottomRail se necessario
       If m_bBottomRail Then
+         EgtLuaSetGlobIntVar("WDG.NBR", m_nBottomRailQty)
          Dim tdlt = EgtLuaCallFunction("WinCreate_AddBottomRail")
       End If
       ' lancio disegno delle sotto aree
@@ -1737,7 +1752,7 @@ Public Class Frame
    End Function
 
    Friend Overrides Function Serialize() As JsonArea
-      Dim JsonFrame As JsonFrame = New JsonFrame(m_Shape, m_bBottomRail)
+      Dim JsonFrame As JsonFrame = New JsonFrame(m_Shape, m_bBottomRail, m_nBottomRailQty)
       For Each Dimension In DimensionList
          JsonFrame.DimensionList.Add(Dimension.Serialize())
       Next
@@ -1962,6 +1977,9 @@ Public Class Sash
    End Sub
    Friend Sub SetSelHardwareFromId(sId As String)
       m_SelHardware = m_HardwareList.FirstOrDefault(Function(x) x.sId = sId)
+      If IsNothing(m_SelHardware) Then
+         m_SelHardware = m_HardwareList(0)
+      End If
       NotifyPropertyChanged(NameOf(SelHardware))
    End Sub
    Friend Sub SetFirstHardware()
diff --git a/EgtWindowMaker/NewWindowWnd/NewWindowWndV.xaml b/EgtWindowMaker/NewWindowWnd/NewWindowWndV.xaml
index 7bebafe..5d7c979 100644
--- a/EgtWindowMaker/NewWindowWnd/NewWindowWndV.xaml
+++ b/EgtWindowMaker/NewWindowWnd/NewWindowWndV.xaml
@@ -8,9 +8,11 @@
         Title="Editor Finestra"
         Height="900" Width="1200"
         WindowStartupLocation="CenterOwner">
-   <TabControl SelectedIndex="{Binding SelPage}">
+   <TabControl SelectedIndex="{Binding SelPage}"
+               Style="{StaticResource TabControl.NoHeader}">
       <TabItem Header="TemplateList">
          <DataGrid ItemsSource="{Binding TemplateList}"
+                   SelectedItem="{Binding SelTemplate}"
                    AutoGenerateColumns="False"
                    CanUserDeleteRows="False"
                    CanUserResizeRows="False"
@@ -26,7 +28,7 @@
                    FontSize="12"
                    FontFamily="/Resources/Fonts/#Roboto"
                    FontWeight="Regular"
-                   RowHeight="32"
+                   RowHeight="150"
                    BorderThickness="0">
             <DataGrid.ColumnHeaderStyle>
                <Style TargetType="{x:Type DataGridColumnHeader}">
@@ -42,20 +44,27 @@
                                    Binding="{Binding nId}"
                                    Width="Auto"
                                    ElementStyle="{StaticResource TextBlock.DataGridTextColumn}"/>
-               <DataGridTextColumn Header="Immagine"
-                                   Binding="{Binding sImagePath}"
-                                   Width="1*"
-                                   ElementStyle="{StaticResource TextBlock.DataGridTextColumn}"/>
+               <DataGridTemplateColumn Header="Immagine"
+                                   Width="1*">
+                  <DataGridTemplateColumn.CellTemplate>
+                     <DataTemplate>
+                        <Image Source="{Binding sImagePath}"/>
+                     </DataTemplate>
+                  </DataGridTemplateColumn.CellTemplate>
+               </DataGridTemplateColumn>
                <DataGridTextColumn Header="Name"
                                    Binding="{Binding sName}"
+                                   IsReadOnly="True"
                                    Width="1*"
                                    ElementStyle="{StaticResource TextBlock.DataGridTextColumn}"/>
                <DataGridTextColumn Header="Larghezza"
                                    Binding="{Binding dWidth}"
+                                   IsReadOnly="True"
                                    Width="1*"
                                    ElementStyle="{StaticResource TextBlock.DataGridTextColumn}"/>
                <DataGridTextColumn Header="Altezza"
                                    Binding="{Binding dHeight}"
+                                   IsReadOnly="True"
                                    Width="1*"
                                    ElementStyle="{StaticResource TextBlock.DataGridTextColumn}"/>
             </DataGrid.Columns>
diff --git a/EgtWindowMaker/NewWindowWnd/NewWindowWndVM.vb b/EgtWindowMaker/NewWindowWnd/NewWindowWndVM.vb
index f7f54a8..f13ac33 100644
--- a/EgtWindowMaker/NewWindowWnd/NewWindowWndVM.vb
+++ b/EgtWindowMaker/NewWindowWnd/NewWindowWndVM.vb
@@ -95,6 +95,7 @@ Public Class NewWindowWndVM
          ' carico template
          Dim TemplateFiles() As String = Directory.GetFiles(Map.refMainWindowVM.MainWindowM.sTemplateDir)
          For Each Template In TemplateFiles
+            If Path.GetExtension(Template).ToLower <> ".jwd" Then Continue For
             Dim TemplateData() As String = Path.GetFileNameWithoutExtension(Template).Split("_"c)
             Dim nTemplateId As Integer = 0
             Integer.TryParse(TemplateData(0), nTemplateId)
@@ -116,7 +117,7 @@ Public Class NewWindowWndVM
    End Sub
 
    Public Sub TemplateConfirmed()
-      m_ManageWindowVM.Read(Map.refMainWindowVM.MainWindowM.sTemplateDir & "\" & TEMPLATE_DIR & "\" & SelTemplate.sName & ".jwd")
+      m_ManageWindowVM.Read(Map.refMainWindowVM.MainWindowM.sTemplateDir & "\" & SelTemplate.nId & "_" & SelTemplate.sName & "_" & SelTemplate.dWidth & "_" & SelTemplate.dHeight & ".jwd")
       SetSelPage(NewWindowPages.EDIT)
    End Sub
 
diff --git a/EgtWindowMaker/Utility/Dictionary.xaml b/EgtWindowMaker/Utility/Dictionary.xaml
index eab469e..263dbe2 100644
--- a/EgtWindowMaker/Utility/Dictionary.xaml
+++ b/EgtWindowMaker/Utility/Dictionary.xaml
@@ -430,6 +430,53 @@
       <Setter Property="Width" Value="100"/>
    </Style>
 
+   <ControlTemplate x:Key="ControlTemplate.TabControl.NoHeader" TargetType="{x:Type TabControl}">
+      <Grid x:Name="templateRoot" ClipToBounds="true" SnapsToDevicePixels="true" KeyboardNavigation.TabNavigation="Local">
+         <Border x:Name="contentPanel" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" KeyboardNavigation.DirectionalNavigation="Contained" KeyboardNavigation.TabIndex="1" KeyboardNavigation.TabNavigation="Local">
+            <ContentPresenter x:Name="PART_SelectedContentHost" ContentSource="SelectedContent" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+         </Border>
+      </Grid>
+      <ControlTemplate.Triggers>
+         <Trigger Property="IsEnabled" Value="false">
+            <Setter Property="TextElement.Foreground" TargetName="templateRoot" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
+         </Trigger>
+      </ControlTemplate.Triggers>
+   </ControlTemplate>
+   <Style x:Key="TabControl.NoHeader" TargetType="{x:Type TabControl}">
+      <Setter Property="BorderThickness" Value="0"/>
+      <Setter Property="Padding" Value="0"/>
+      <Setter Property="Template" Value="{StaticResource ControlTemplate.TabControl.NoHeader}"/>
+   </Style>
+
+   <Style x:Key="Expander.CheckBoxHeader" TargetType="{x:Type Expander}">
+      <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
+      <Setter Property="Background" Value="Transparent"/>
+      <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+      <Setter Property="VerticalContentAlignment" Value="Stretch"/>
+      <Setter Property="BorderBrush" Value="Transparent"/>
+      <Setter Property="BorderThickness" Value="1"/>
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type Expander}">
+               <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="3" SnapsToDevicePixels="true">
+                  <DockPanel>
+                     <CheckBox x:Name="HeaderSite" ContentTemplate="{TemplateBinding HeaderTemplate}" Content="{TemplateBinding Header}" ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}" DockPanel.Dock="Top" FontStretch="{TemplateBinding FontStretch}" Foreground="{TemplateBinding Foreground}" FocusVisualStyle="{StaticResource FocusVisual}" FontStyle="{TemplateBinding FontStyle}" FontFamily="{TemplateBinding FontFamily}" FontWeight="{TemplateBinding FontWeight}" FontSize="{TemplateBinding FontSize}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource Mode=TemplatedParent}}" Margin="1,1,5,1" MinWidth="0" MinHeight="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                     <ContentPresenter x:Name="ExpandSite" DockPanel.Dock="Bottom" Focusable="false" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Visibility="Collapsed"/>
+                  </DockPanel>
+               </Border>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsExpanded" Value="true">
+                     <Setter Property="Visibility" TargetName="ExpandSite" Value="Visible"/>
+                  </Trigger>
+                  <Trigger Property="IsEnabled" Value="false">
+                     <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
    <!--#endregion USERCONTROL-->
    
 </ResourceDictionary>
diff --git a/EgtWindowMaker/Utility/JsonUtility.vb b/EgtWindowMaker/Utility/JsonUtility.vb
index cbb6207..7ca9f1e 100644
--- a/EgtWindowMaker/Utility/JsonUtility.vb
+++ b/EgtWindowMaker/Utility/JsonUtility.vb
@@ -127,14 +127,26 @@ Public Class JsonFrame
       End Set
    End Property
 
+   Private m_nBottomRailQty As Integer = 0
+   <JsonProperty>
+   Public Property BottomRailQty As Integer
+      Get
+         Return m_nBottomRailQty
+      End Get
+      Set(value As Integer)
+         m_nBottomRailQty = value
+      End Set
+   End Property
+
    Sub New()
       MyBase.New(AreaTypes.FRAME)
    End Sub
 
-   Sub New(Shape As Shapes, BottomRail As Boolean)
+   Sub New(Shape As Shapes, BottomRail As Boolean, BottomRailQty As Integer)
       MyBase.New(AreaTypes.FRAME)
       m_Shape = Shape
       m_bBottomRail = BottomRail
+      m_nBottomRailQty = BottomRailQty
    End Sub
 
    Friend Overrides Function Deserialize(ParentArea As Area) As Area
@@ -142,6 +154,7 @@ Public Class JsonFrame
       Frame.SetAreaType(AreaTypes.FRAME)
       Frame.SetSelShape(m_Shape)
       Frame.SetBottomRail(m_bBottomRail)
+      Frame.SetBottomRailQty(m_nBottomRailQty)
       Frame.AppliedDone()
       For DimensionIndex = 0 To m_DimensionList.Count - 1
          Frame.DimensionList(DimensionIndex).dValue = m_DimensionList(DimensionIndex).dValue