From 4f5ab7f3c2e3ec4d30715a9843dfda1ecf055d2d Mon Sep 17 00:00:00 2001
From: Emmanuele Sassi <emmanuele.sassi@egaltech.com>
Date: Mon, 30 Dec 2024 10:58:16 +0100
Subject: [PATCH] - rimossa colonna tempo di scarico - corretto orario in 24h -
 gestito ritorno a ready anche per on load station

---
 .../DoorListPage/DoorListPageV.xaml           |  4 +-
 .../DoorListPage/DoorListPageVM.vb            | 19 +++---
 .../MultipleCopyWnd/MultipleCopyWndV.xaml     |  3 +-
 .../Utility/Dictionary.xaml                   | 68 +++++++++----------
 4 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/Effector.Plugin.DoorArreda/DoorListPage/DoorListPageV.xaml b/Effector.Plugin.DoorArreda/DoorListPage/DoorListPageV.xaml
index bd7fe33..7c5df98 100644
--- a/Effector.Plugin.DoorArreda/DoorListPage/DoorListPageV.xaml
+++ b/Effector.Plugin.DoorArreda/DoorListPage/DoorListPageV.xaml
@@ -201,12 +201,12 @@
                              IsReadOnly="True"
                              ElementStyle="{StaticResource DataGridTextColumn_TextBlock}"
                              EditingElementStyle="{StaticResource DataGridTextColumn_TextBox}"/>
-         <DataGridTextColumn Header="Scarico"
+         <!--<DataGridTextColumn Header="Scarico"
                              Binding="{Binding sUnloadTime}"
                              Width="Auto"
                              IsReadOnly="True"
                              ElementStyle="{StaticResource DataGridTextColumn_TextBlock}"
-                             EditingElementStyle="{StaticResource DataGridTextColumn_TextBox}"/>
+                             EditingElementStyle="{StaticResource DataGridTextColumn_TextBox}"/>-->
       </DataGrid.Columns>
       <!--<DataGrid.InputBindings>
          <KeyBinding Key="Delete" Command="{Binding Tag.SelectedMachGroup.DeleteMachGroup_Command,
diff --git a/Effector.Plugin.DoorArreda/DoorListPage/DoorListPageVM.vb b/Effector.Plugin.DoorArreda/DoorListPage/DoorListPageVM.vb
index dc2d50e..3bd0a61 100644
--- a/Effector.Plugin.DoorArreda/DoorListPage/DoorListPageVM.vb
+++ b/Effector.Plugin.DoorArreda/DoorListPage/DoorListPageVM.vb
@@ -254,7 +254,7 @@ Public Class DoorListPageVM
 
    Friend Sub ResetStateAfterReset()
       For Each Door In m_DoorList
-         If Door.nState > Door.DoorStates.VERIFIED AndAlso Door.nState < Door.DoorStates.PRODUCED Then
+         If Door.nState > Door.DoorStates.VERIFIED AndAlso Door.nState < Door.DoorStates.MACHINE_1_END Then
             Door.SetState(Door.DoorStates.VERIFIED, False)
          End If
       Next
@@ -709,7 +709,7 @@ Public Class DoorListPageVM
       WriteBackup()
    End Sub
 
-#End Region ' SkipDoor
+#End Region ' NotProduceDoor
 
 #Region "AddDoor"
 
@@ -909,6 +909,7 @@ Public Class DoorListPageVM
 
    Public Sub ProduceDoor(DoorToProduce As Door, Optional bWriteBackup As Boolean = True)
       If IsNothing(DoorToProduce) OrElse DoorToProduce.nState = Door.DoorStates.SKIPPED OrElse
+                                         DoorToProduce.nState = Door.DoorStates.NOTPRODUCE OrElse
                                          DoorToProduce.nState = Door.DoorStates.VERIFICATION_FAILED OrElse
                                          DoorToProduce.nState >= Door.DoorStates.READY_FOR_PRODUCTION Then Return
       ' la sposto dopo l'ultima da produrre
@@ -960,7 +961,7 @@ Public Class DoorListPageVM
 
    Public Sub ResetProductionQueue()
       For Each Door In m_DoorList
-         If Door.nState = Door.DoorStates.READY_FOR_PRODUCTION Then
+         If Door.nState = Door.DoorStates.READY_FOR_PRODUCTION OrElse Door.nState = Door.DoorStates.ON_LOAD_STATION Then
             Door.SetState(Door.DoorStates.VERIFIED)
          End If
       Next
@@ -1420,7 +1421,7 @@ Public Class Door
    End Property
    Public ReadOnly Property sLoadTime As String
       Get
-         Return If(m_dtLoadTime <> DateTime.MinValue, m_dtLoadTime.ToString("yy/MM/dd hh:mm:ss"), "")
+         Return If(m_dtLoadTime <> DateTime.MinValue, m_dtLoadTime.ToString("yy/MM/dd HH:mm:ss"), "")
       End Get
    End Property
    Friend Sub SetLoadTime(LoadTime As Long)
@@ -1436,7 +1437,7 @@ Public Class Door
    End Property
    Public ReadOnly Property sMachining1Start As String
       Get
-         Return If(m_dtMachining1Start <> DateTime.MinValue, m_dtMachining1Start.ToString("yy/MM/dd hh:mm:ss"), "")
+         Return If(m_dtMachining1Start <> DateTime.MinValue, m_dtMachining1Start.ToString("yy/MM/dd HH:mm:ss"), "")
       End Get
    End Property
    Friend Sub SetMachining1Start(Machining1Start As Long)
@@ -1452,7 +1453,7 @@ Public Class Door
    End Property
    Public ReadOnly Property sMachining1End As String
       Get
-         Return If(m_dtMachining1End <> DateTime.MinValue, m_dtMachining1End.ToString("yy/MM/dd hh:mm:ss"), "")
+         Return If(m_dtMachining1End <> DateTime.MinValue, m_dtMachining1End.ToString("yy/MM/dd HH:mm:ss"), "")
       End Get
    End Property
    Friend Sub SetMachining1End(Machining1End As Long)
@@ -1468,7 +1469,7 @@ Public Class Door
    End Property
    Public ReadOnly Property sMachining2Start As String
       Get
-         Return If(m_dtMachining2Start <> DateTime.MinValue, m_dtMachining2Start.ToString("yy/MM/dd hh:mm:ss"), "")
+         Return If(m_dtMachining2Start <> DateTime.MinValue, m_dtMachining2Start.ToString("yy/MM/dd HH:mm:ss"), "")
       End Get
    End Property
    Friend Sub SetMachining2Start(Machining2Start As Long)
@@ -1484,7 +1485,7 @@ Public Class Door
    End Property
    Public ReadOnly Property sMachining2End As String
       Get
-         Return If(m_dtMachining2End <> DateTime.MinValue, m_dtMachining2End.ToString("yy/MM/dd hh:mm:ss"), "")
+         Return If(m_dtMachining2End <> DateTime.MinValue, m_dtMachining2End.ToString("yy/MM/dd HH:mm:ss"), "")
       End Get
    End Property
    Friend Sub SetMachining2End(Machining2End As Long)
@@ -1500,7 +1501,7 @@ Public Class Door
    End Property
    Public ReadOnly Property sUnloadTime As String
       Get
-         Return If(m_dtUnloadTime <> DateTime.MinValue, m_dtUnloadTime.ToString("yy/MM/dd hh:mm:ss"), "")
+         Return If(m_dtUnloadTime <> DateTime.MinValue, m_dtUnloadTime.ToString("yy/MM/dd HH:mm:ss"), "")
       End Get
    End Property
    Friend Sub SetUnloadTime(UnloadTime As Long)
diff --git a/Effector.Plugin.DoorArreda/MultipleCopyWnd/MultipleCopyWndV.xaml b/Effector.Plugin.DoorArreda/MultipleCopyWnd/MultipleCopyWndV.xaml
index cca5b2e..202601f 100644
--- a/Effector.Plugin.DoorArreda/MultipleCopyWnd/MultipleCopyWndV.xaml
+++ b/Effector.Plugin.DoorArreda/MultipleCopyWnd/MultipleCopyWndV.xaml
@@ -2,7 +2,8 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         SizeToContent="WidthAndHeight"
-        WindowStartupLocation="CenterOwner">
+        WindowStartupLocation="CenterOwner"
+        ShowInTaskbar="False">
    <Grid Margin="5">
       <Grid.RowDefinitions>
          <RowDefinition Height="1*"/>
diff --git a/Effector.Plugin.DoorArreda/Utility/Dictionary.xaml b/Effector.Plugin.DoorArreda/Utility/Dictionary.xaml
index 8585859..8419065 100644
--- a/Effector.Plugin.DoorArreda/Utility/Dictionary.xaml
+++ b/Effector.Plugin.DoorArreda/Utility/Dictionary.xaml
@@ -75,9 +75,6 @@
    <Color x:Key="Effector_Purple_Color" R="167" G="76" B="119" A="255"/>
    <SolidColorBrush x:Key="Effector_Purple" Color="{StaticResource Effector_Purple_Color}" />-->
 
-   <!--Colori per EgtWPFLib5-->
-   <SolidColorBrush x:Key="TextBox.Static.Border" Color="#FFABAdB3"/>
-
    <!--Colori default dei controlli-->
    <SolidColorBrush x:Key="Button.Static.Background" Color="#FFDDDDDD"/>
    <SolidColorBrush x:Key="Button.Static.Border" Color="#FF707070"/>
@@ -155,6 +152,7 @@
       <Setter Property="Height" Value="30"/>
       <Setter Property="Padding" Value="10,0,10,0"/>
    </Style>
+   
    <!--ToggleButton-->
 
    <Style TargetType="{x:Type ToggleButton}">
@@ -204,35 +202,6 @@
    <Style x:Key="MainMenu_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
       <Setter Property="Padding" Value="25,0,25,0"/>
    </Style>
-   
-   <!--Stili per disegno macchina con porte-->
-   
-   <Style x:Key="Table" TargetType="Border">
-      <Setter Property="BorderBrush" Value="Gray"/>
-      <Setter Property="BorderThickness" Value="2"/>
-   </Style>
-   <Style x:Key="Door" TargetType="Border">
-      <Setter Property="BorderBrush" Value="SaddleBrown"/>
-      <Setter Property="BorderThickness" Value="5"/>
-      <Setter Property="Background" Value="SandyBrown"/>
-   </Style>
-   <Style x:Key="Advancement_Button" TargetType="Button">
-      <Setter Property="HorizontalAlignment" Value="Center"/>
-      <Setter Property="VerticalAlignment" Value="Center"/>
-      <Setter Property="TextBlock.TextAlignment" Value="Center"/>
-   </Style>
-   <Style x:Key="Sensor" TargetType="Ellipse">
-      <Setter Property="Height" Value="{Binding ActualWidth, RelativeSource={RelativeSource Self}}"/>
-   </Style>
-   <Style x:Key="MachDrawVar_TextBlock" TargetType="TextBlock">
-      <Setter Property="HorizontalAlignment" Value="Center"/>
-      <Setter Property="VerticalAlignment" Value="Center"/>
-   </Style>
-   <Style x:Key="MachDrawVar_CheckBox" TargetType="CheckBox">
-      <Setter Property="IsHitTestVisible" Value="False"/>
-      <Setter Property="Focusable" Value="False"/>
-      <Setter Property="BorderThickness" Value="0"/>
-   </Style>
 
    <!--Border-->
 
@@ -262,7 +231,7 @@
          <SolidColorBrush x:Key="{x:Static SystemColors.InactiveSelectionHighlightTextBrushKey}" Color="Black" />
       </Style.Resources>
    </Style>
-   
+
    <!--Styles for DataGrid columns-->
 
    <Style x:Key="DataGridTextColumn_TextBlock" TargetType="{x:Type TextBlock}">
@@ -278,13 +247,42 @@
       <Setter Property="HorizontalContentAlignment" Value="Center"/>
       <Setter Property="VerticalContentAlignment" Value="Center"/>
    </Style>
-   
+
    <!--Style for page tabcontrol-->
-   
+
    <Style x:Key="MainPage_Tabcontrol" TargetType="{x:Type TabControl}">
       <Setter Property="BorderThickness" Value="0"/>
       <Setter Property="Margin" Value="0"/>
       <Setter Property="Padding" Value="0"/>
    </Style>
+
+   <!--Stili per disegno macchina con porte-->
+   
+   <Style x:Key="Table" TargetType="Border">
+      <Setter Property="BorderBrush" Value="Gray"/>
+      <Setter Property="BorderThickness" Value="2"/>
+   </Style>
+   <Style x:Key="Door" TargetType="Border">
+      <Setter Property="BorderBrush" Value="SaddleBrown"/>
+      <Setter Property="BorderThickness" Value="5"/>
+      <Setter Property="Background" Value="SandyBrown"/>
+   </Style>
+   <Style x:Key="Advancement_Button" TargetType="Button">
+      <Setter Property="HorizontalAlignment" Value="Center"/>
+      <Setter Property="VerticalAlignment" Value="Center"/>
+      <Setter Property="TextBlock.TextAlignment" Value="Center"/>
+   </Style>
+   <Style x:Key="Sensor" TargetType="Ellipse">
+      <Setter Property="Height" Value="{Binding ActualWidth, RelativeSource={RelativeSource Self}}"/>
+   </Style>
+   <Style x:Key="MachDrawVar_TextBlock" TargetType="TextBlock">
+      <Setter Property="HorizontalAlignment" Value="Center"/>
+      <Setter Property="VerticalAlignment" Value="Center"/>
+   </Style>
+   <Style x:Key="MachDrawVar_CheckBox" TargetType="CheckBox">
+      <Setter Property="IsHitTestVisible" Value="False"/>
+      <Setter Property="Focusable" Value="False"/>
+      <Setter Property="BorderThickness" Value="0"/>
+   </Style>
       
 </ResourceDictionary>