- modifiche alla creazione PrId su Duplo

- aggiornamento EgtUILib e EgtWPFLib5
- piccola miglioria per SpecialPanel
- correzione calcolo numero pezzi inseriti in barre grazie a nuova funzione EgtDuploInRawCount.

EgtBEAMWALL.Core/BTLModel/BTLFeatureM.vb

@@ -554,7 +554,7 @@ Public Class BTLFeatureM
          ' Impossibile creare una feature con questi valori - ERRORE
          MessageBox.Show(EgtMsg(61852), EgtMsg(30007))
          nFeatureId = EgtBeamModifyProcess(Me.nFeatureId, Me.nSelGRP, Me.nPRC, Me.nSelSIDE, "", Me.nPRID,
-                                           New Frame3d(), vPar, sPar, vParQ, nCrvId, nCrv2Id)
+                                           Me.frFRAME, vPar, sPar, vParQ, nCrvId, nCrv2Id)
          SetFeatureId(nFeatureId)
          bOk = False
       End If

EgtBEAMWALL.Core/BTLModel/BTLPartM.vb

@@ -587,7 +587,7 @@ Public Class BTLPartM
    Public ReadOnly Property nINPROD As Integer
       Get
          Dim INPROD As Integer = 0
-         EgtDuploCount(m_nPartId, INPROD)
+         EgtDuploInRawCount(m_nPartId, INPROD)
          Return INPROD
       End Get
    End Property

EgtBEAMWALL.Core/Constants/ConstColumns.vb

@@ -17,5 +17,11 @@
    Public Const COL_DESCRIPTION As String = "colDESCRIPTION"
    Public Const COL_SUPERVISORID As String = "colSUPERVISORID"
    Public Const COL_PRIORITY As String = "colPRIORITY"
+   Public Const COL_NAME As String = "colNAME"
+   Public Const COL_H As String = "colH"
+   Public Const COL_MATERIAL As String = "colMATERIAL"
+   Public Const COL_USAGE As String = "colUSAGE"
+   Public Const COL_WASTE As String = "colWASTE"
+   Public Const COL_ARCHIVED As String = "colARCHIVED"
 
 End Module

EgtBEAMWALL.Core/Constants/ConstDataGridColumnsIni.vb

@@ -5,6 +5,7 @@
    Public Const S_FEATURELIST As String = "DG_FeatureList"
    Public Const S_OPENPROJFILEDLG_PROJ As String = "DG_OpenProjectFileDialog_PROJ"
    Public Const S_OPENPROJFILEDLG_PROD As String = "DG_OpenProjectFileDialog_PROD"
+   Public Const S_NEWOPENPROJFILEDLG_PROD As String = "DG_NewOpenProjectFileDialog_PROD"
    Public Const S_RAWPARTLIST_BEAM As String = "DG_RawPartList_BEAM"
    Public Const S_RAWPARTLIST_WALL As String = "DG_RawPartList_WALL"
    Public Const S_PARTINRAWPARTLIST_BEAM As String = "DG_PartInRawPartList_BEAM"

EgtBEAMWALL.Core/Constants/ConstIni.vb

@@ -46,6 +46,7 @@ Public Module ConstIni
    Public Const K_ENABLEEDIT As String = "EnableEdit"
    Public Const K_FASTPRODUCE As String = "FastProduce"
    Public Const K_ADDPROJ As String = "AddProj"
+   Public Const K_PROJECTMODE As String = "ProjectMode"
 
    'Public Const S_LANGUAGES As String = "Languages"
    'Public Const K_LANGUAGE As String = "Language"
@@ -120,6 +121,16 @@ Public Module ConstIni
    Public Const K_WALLBASEDIR As String = "BaseDir"
    Public Const K_WALLBWEEXEC As String = "BweExec"
 
+   Public Const S_MACHINELOGFILTER As String = "MachineLogFilters"
+   Public Const K_PARTEVENTTYPE As String = "PartEventType"
+   Public Const K_ENTITYTYPE As String = "EntityType"
+   Public Const K_DAYTYPE As String = "DayType"
+   Public Const K_STARTDATE As String = "StartDate"
+   Public Const K_ENDDATE As String = "EndDate"
+
+   Public Const S_OPENFILEDIALOG As String = "OpenFileDialog"
+   Public Const K_VIEWARCHIVED As String = "ViewArchived"
+
    'Public Const S_NEST As String = "Nest"
    Public Const K_NESTEXEC As String = "NestExec"
    Public Const K_FLIPROT As String = "FlipRot"
@@ -152,4 +163,12 @@ Public Module ConstIni
    Public Const K_TYPE As String = "Type"
    Public Const K_DEFAULTQUANTITY As String = "DefaultQuantity"
 
+   Public Const S_BACKUPANDRESTORE As String = "Backup&Restore"
+   Public Const K_EXTERNALBACKUPACTIVE As String = "ExternalBackupActive"
+   Public Const K_EXTERNALFILEPATH As String = "ExternalFilePath"
+   Public Const K_REMINDERFREQUENCY As String = "ReminderFrequency"
+
+   Public Const S_SPECIAL As String = "Special"
+   Public Const K_SPECIALENABLE As String = "SpecialEnable"
+
 End Module

EgtBEAMWALL.Core/EgtBEAMWALL.Core.vbproj

@@ -112,6 +112,10 @@
       <DependentUpon>LoadingWndV.xaml</DependentUpon>
     </Compile>
     <Compile Include="LoadingWnd\LoadingWndVM.vb" />
+    <Compile Include="NewOpenProjectFileDialog\NewOpenProjectFileDialogV.xaml.vb">
+      <DependentUpon>NewOpenProjectFileDialogV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="NewOpenProjectFileDialog\NewOpenProjectFileDialogVM.vb" />
     <Compile Include="Utility\DimensionsIniFile.vb" />
     <Compile Include="Utility\Enum.vb" />
     <Compile Include="MachGroupPanel\MyMachGroupPanelVM.vb" />
@@ -190,6 +194,10 @@
       <SubType>Designer</SubType>
       <Generator>XamlIntelliSenseFileGenerator</Generator>
     </Page>
+    <Page Include="NewOpenProjectFileDialog\NewOpenProjectFileDialogV.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="OpenProjectFileDialog\OpenProjectFileDialogV.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>

EgtBEAMWALL.Core/EgtDataGrid/EgtDataGrid.xaml.vb

@@ -12,6 +12,8 @@ Imports EgtWPFLib5
 
 Public Class EgtDataGrid
 
+   Public Event ResetSort()
+
    ' vecchio indice da salvare per il Reorder delle colonne
    Public OldIndex As Integer = 0
    ' indice header su cui è aperto il ContextMenu per gestione check/uncheck LockTable
@@ -361,6 +363,7 @@ Public Class EgtDataGrid
             ' resetto graficamente anche l'header della colonna
             CurrDataGrid.Columns(column.DisplayIndex).SortDirection = Nothing
          Next
+         RaiseEvent ResetSort()
       End If
    End Sub
 
@@ -438,6 +441,9 @@ Public Class EgtDataGridColumn
          End If
       End Set
    End Property
+   Public Sub ResetToOrigIsReadOnly()
+      IsReadOnly = m_OrigIsReadOnly
+   End Sub
 
    Friend OldCanUserReorder As Boolean?
    Private m_CanUserReorder As Boolean

EgtBEAMWALL.Core/LoadingWnd/LoadingWndHelper.vb

@@ -16,6 +16,8 @@ Public Module LoadingWndHelper
       CHANGEPARAM = 10
       CREATINGPDF = 11
       CHANGEMATERIAL = 12
+      BACKUP = 13
+      RESTORE = 14
    End Enum
 
    Dim m_MainWindow As Windows.Window

EgtBEAMWALL.Core/MachGroupModel/MyMachGroupPanelM.vb

@@ -186,7 +186,13 @@ Public Class MyMachGroupPanelM
                While nOutlineId <> GDB_ID.NULL
                   ' verifico che sia feature
                   If EgtExistsInfo(nOutlineId, MGR_FTR_PRC) Then
-                     If EgtExistsInfo(nOutlineId, MGR_FTR_PRID) Then
+                     Dim nCurrPrId As Integer = GDB_ID.NULL
+                     If EgtGetInfo(nOutlineId, MGR_FTR_PRID, nCurrPrId) AndAlso nCurrPrId <> GDB_ID.NULL Then
+                        If nCurrPrId < nPRId Then
+                           EgtSetInfo(nOutlineId, MGR_FTR_PRID, nPRId)
+                           nPRId += 1
+                        End If
+                        nPRId = Math.Max(nPRId - 1, nCurrPrId) + 1
                         nOutlineId = EgtGetNext(nOutlineId)
                         Continue While
                      Else
@@ -225,7 +231,14 @@ Public Class MyMachGroupPanelM
                         Dim nPRC As Integer
                         If EgtGetInfo(nOutlineId, MGR_FTR_PRC, nPRC) Then
                            nPRId = 0
-                           If Not EgtGetInfo(nOutlineId, MGR_FTR_PRID, nPRId) Then
+                           If EgtGetInfo(nOutlineId, MGR_FTR_PRID, nPRId) Then
+                              If nPRId < nGlobPRId Then
+                                 EgtSetInfo(nOutlineId, MGR_FTR_PRID, nGlobPRId)
+                                 nPRId = nGlobPRId
+                                 nGlobPRId += 1
+                              End If
+                              nGlobPRId = Math.Max(nGlobPRId - 1, nPRId) + 1
+                           Else
                               EgtSetInfo(nOutlineId, MGR_FTR_PRID, nGlobPRId)
                               nPRId = nGlobPRId
                               nGlobPRId += 1

EgtBEAMWALL.Core/MachGroupPanel/PartVM.vb

@@ -562,8 +562,9 @@ Public MustInherit Class PartVM
 
    Public Sub CalcFallUpdate(FALL As Integer)
       EgtSetInfo(nPartId, ITG_PROD_FALL, FALL, True)
-      m_PartM.nCALC_FALL = 0
+      m_PartM.nCALC_FALL = FALL
       NotifyPropertyChanged(NameOf(nCALC_FALL))
+      NotifyPropertyChanged(NameOf(CALC_FALL_Visibility))
    End Sub
 
    ' funzione che aggiorna lo stato e gli errori dopo calcolo

EgtBEAMWALL.Core/My Project/AssemblyInfo.vb

@@ -35,5 +35,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2.5.5.4")>
-<Assembly: AssemblyFileVersion("2.5.5.4")>
+<Assembly: AssemblyVersion("2.5.12.2")>
+<Assembly: AssemblyFileVersion("2.5.12.2")>

EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogV.xaml

@@ -0,0 +1,249 @@
+<EgtWPFLib5:EgtCustomWindow x:Class="NewOpenProjectFileDialogV"
+                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                            xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.Core"
+                            Title="{Binding Title}"
+                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
+                            WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="True"
+                            IsMinimizable="False" WindowStartupLocation="CenterScreen" ShowInTaskbar="False"
+                            IsClosable="False"
+                            MinHeight="500" MinWidth="500"
+                            DataContext="{Binding RelativeSource={RelativeSource Self}}">
+
+   <EgtWPFLib5:EgtCustomWindow.Resources>
+      <EgtWPFLib5:FileNameConverter x:Key="FileNameConverter"/>
+   </EgtWPFLib5:EgtCustomWindow.Resources>
+
+   <Grid>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto"/>
+         <RowDefinition Height="5*"/>
+         <RowDefinition Height="1*"/>
+      </Grid.RowDefinitions>
+
+      <GroupBox Header="{Binding Filters_Msg}"
+                Margin="5"
+                Visibility="{Binding Filters_Visibility}">
+         <Grid>
+            <Grid.RowDefinitions>
+               <RowDefinition Height="Auto"/>
+               <RowDefinition Height="Auto"/>
+            </Grid.RowDefinitions>
+            <Grid>
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="Auto"/>
+                  <ColumnDefinition Width="1*"/>
+                  <ColumnDefinition Width="Auto"/>
+               </Grid.ColumnDefinitions>
+               <ComboBox ItemsSource="{Binding BTLDateTypeList}"
+                         SelectedIndex="{Binding SelBTLDateType}"
+                         Width="105"
+                         Margin="5"
+                         Style="{StaticResource FeatureComboBox}"/>
+               <StackPanel Grid.Column="1" Orientation="Horizontal">
+                  <ComboBox ItemsSource="{Binding DayTypeList}"
+                            SelectedIndex="{Binding SelDayType}"
+                            Width="105"
+                            Margin="0,0,2.5,0"
+                            Style="{StaticResource PartParam_ComboBox}"/>
+                  <StackPanel Orientation="Horizontal" Visibility="{Binding Date_Visibility}">
+                     <TextBlock Text="{Binding From_Msg}"
+                                Style="{StaticResource Filter_TextBlock}"/>
+                     <DatePicker SelectedDate="{Binding dtStartDate}"
+                                 Style="{StaticResource Filter_DatePicker}"/>
+                     <TextBlock Text="{Binding To_Msg}"
+                                Style="{StaticResource Filter_TextBlock}"/>
+                     <DatePicker SelectedDate="{Binding dtEndDate}"
+                                 Style="{StaticResource Filter_DatePicker}"/>
+                  </StackPanel>
+               </StackPanel>
+               <CheckBox Grid.Column="2"
+                         IsChecked="{Binding bViewArchived}"
+                         Content="{Binding ViewArchived_Msg}"
+                         VerticalAlignment="Center"/>
+            </Grid>
+            <Grid Grid.Row="1">
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="Auto"/>
+                  <ColumnDefinition Width="1*"/>
+                  <ColumnDefinition Width="Auto"/>
+               </Grid.ColumnDefinitions>
+               <ComboBox ItemsSource="{Binding FilterTypeList}"
+                         SelectedItem="{Binding SelFilterType}"
+                         Width="105"
+                         Margin="5"
+                         Style="{StaticResource FeatureComboBox}"/>
+               <EgtWPFLib5:EgtTextBox Grid.Column="1"
+                                      Text="{Binding SearchText}"
+                                      Margin="5"
+                                      Visibility="{Binding SearchText_Visibility}"/>
+               <StackPanel Grid.Column="2" 
+                           Orientation="Horizontal">
+                  <TextBlock Text="{Binding Rows_Msg}"
+                             Style="{StaticResource OptionTextBlock}"/>
+                  <ComboBox ItemsSource="{Binding RowQuantityList}"
+                            SelectedIndex="{Binding SelRowQuantity}"
+                            Style="{StaticResource FeatureComboBox}"/>
+               </StackPanel>
+            </Grid>
+         </Grid>
+      </GroupBox>
+
+      <EgtBEAMWALL:EgtDataGrid x:Name="MainDataGrid"
+                               Grid.Row="1"
+                               ItemsSource="{Binding ProjectList}" 
+                               SelectedItem="{Binding SelProject}"
+                               CanUserAddRows="False"
+                               AutoGenerateColumns="False"
+                               CanUserResizeRows="False"
+                               SelectionMode="Single"
+                               ScrollViewer.CanContentScroll="True" 
+                               ScrollViewer.VerticalScrollBarVisibility="Auto"
+                               ScrollViewer.HorizontalScrollBarVisibility="Auto"
+                               Margin="5"
+                               RowDetailsVisibilityMode="Visible"
+                               CellEditEnding="MainDataGrid_CellEditEnding"
+                               BindingColumns="{Binding ProdColumns}">
+         <DataGrid.Resources>
+            <!-- ProdId -->
+            <DataGridTextColumn x:Key="colPRODID" Binding="{Binding sProdId}">
+               <DataGridTextColumn.HeaderTemplate>
+                  <DataTemplate>
+                     <TextBlock Text="{Binding Path=DataContext.Id_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:NewOpenProjectFileDialogV}}}"/>
+                  </DataTemplate>
+               </DataGridTextColumn.HeaderTemplate>
+            </DataGridTextColumn>
+            <!--Name-->
+            <DataGridTextColumn x:Key="colNAME" Binding="{Binding sName}">
+               <DataGridTextColumn.Header>
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="Auto"/>
+                     </Grid.ColumnDefinitions>
+                     <TextBlock Text="{Binding Path=DataContext.Name_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:NewOpenProjectFileDialogV}}}"/>
+                     <ToggleButton Grid.Column="1"
+                                   Margin="5,0,0,0"
+                                   IsChecked="{Binding Path=DataContext.bIsEditNameActive,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:NewOpenProjectFileDialogV}}}"
+                                   Style="{StaticResource ToolBar_SmallToggleButton}">
+                        <Image Source="\Resources\CalcPanel\Edit.png"
+                               Style="{StaticResource LockImage}"/>
+                     </ToggleButton>
+                  </Grid>
+               </DataGridTextColumn.Header>
+            </DataGridTextColumn>
+            <!-- Creation date -->
+            <DataGridTextColumn x:Key="colCRTDATE" Binding="{Binding dtCreateDate}">
+               <DataGridTextColumn.Header>
+                  <TextBlock Text="{Binding Path=DataContext.CreateDate_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:NewOpenProjectFileDialogV}}}"/>
+               </DataGridTextColumn.Header>
+            </DataGridTextColumn>
+            <!-- Machine -->
+            <DataGridTextColumn x:Key="colMACHINE" Binding="{Binding sMachine}">
+               <DataGridTextColumn.Header>
+                  <TextBlock Text="{Binding Path=DataContext.Machine_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:NewOpenProjectFileDialogV}}}"/>
+               </DataGridTextColumn.Header>
+            </DataGridTextColumn>
+            <!-- Archived -->
+            <DataGridTemplateColumn x:Key="colARCHIVED">
+               <DataGridTemplateColumn.CellTemplate>
+                  <DataTemplate>
+                     <Image Source="\Resources\OpenProjectFileDialog\Archived.png"
+                            Visibility="{Binding Archived_Visibility}"
+                            Height="15"
+                            Width="15"
+                            Stretch="UniformToFill"/>
+                  </DataTemplate>
+               </DataGridTemplateColumn.CellTemplate>
+               <DataGridTemplateColumn.Header>
+                  <TextBlock Text="{Binding Path=DataContext.Archived_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:NewOpenProjectFileDialogV}}}"/>
+               </DataGridTemplateColumn.Header>
+            </DataGridTemplateColumn>
+         </DataGrid.Resources>
+         <DataGrid.RowStyle>
+            <Style TargetType="DataGridRow">
+               <Setter Property="FontWeight" Value="DemiBold"/>
+               <Setter Property="VerticalContentAlignment" Value="Center"/>
+               <EventSetter Event="MouseDoubleClick" Handler="ProjectList_MouseDoubleClick"/>
+            </Style>
+         </DataGrid.RowStyle>
+         <DataGrid.RowDetailsTemplate>
+            <DataTemplate>
+               <ItemsControl ItemsSource="{Binding ProjFileList}"
+                             BorderThickness="0"
+                             Margin="0,-1,0,0"
+                             Padding="0">
+                  <ItemsControl.ItemTemplate>
+                     <DataTemplate>
+                        <Grid TextBlock.FontSize="12"
+                              TextBlock.FontWeight="Normal">
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="{Binding Path=DataContext.ProdColumns[0].ActualWidth, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:NewOpenProjectFileDialogV}}}"/>
+                              <ColumnDefinition Width="1*"/>
+                           </Grid.ColumnDefinitions>
+                           <Grid.RowDefinitions>
+                              <RowDefinition Height="1"/>
+                              <RowDefinition Height="1*"/>
+                           </Grid.RowDefinitions>
+                           <Grid Grid.Row="0"
+                                 Grid.ColumnSpan="2"
+                                 Background="Gray"
+                                 Margin="40,0,40,0"/>
+                           <Grid Grid.Column="1"
+                                 Grid.Row="1"
+                                 Margin="2">
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="Auto"/>
+                                 <ColumnDefinition Width="1*"/>
+                                 <ColumnDefinition Width="Auto"/>
+                                 <ColumnDefinition Width="1*"/>
+                              </Grid.ColumnDefinitions>
+                              <Grid.RowDefinitions>
+                                 <RowDefinition Height="1*"/>
+                                 <RowDefinition Height="1*"/>
+                              </Grid.RowDefinitions>
+                              <TextBlock Text="{Binding Path=DataContext.BTLFileName_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:NewOpenProjectFileDialogV}}}"
+                                         Style="{StaticResource OpenWnd_TextBlock}"/>
+                              <TextBlock Grid.Column="1"
+                                         Text="{Binding sBTLFileName}"/>
+                              <TextBlock Grid.Row="1"
+                                         Text="{Binding Path=DataContext.ListName_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:NewOpenProjectFileDialogV}}}"
+                                         Style="{StaticResource OpenWnd_TextBlock}"/>
+                              <TextBlock Grid.Column="1"
+                                         Grid.Row="1"
+                                         Text="{Binding sListName}"/>
+                              <TextBlock Grid.Column="2"
+                                         Text="{Binding Path=DataContext.ExportDate_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:NewOpenProjectFileDialogV}}}"
+                                         Style="{StaticResource OpenWnd_TextBlock}"/>
+                              <TextBlock Grid.Column="3"
+                                         Text="{Binding dtExportDate}"/>
+                           </Grid>
+                        </Grid>
+                     </DataTemplate>
+                  </ItemsControl.ItemTemplate>
+               </ItemsControl>
+            </DataTemplate>
+         </DataGrid.RowDetailsTemplate>
+      </EgtBEAMWALL:EgtDataGrid>
+
+      <UniformGrid Columns="4" Grid.Row="2" Margin="0,0,0,5">
+         <Button IsDefault="True" Name="OpenBtn"
+                 Content="{Binding Open_Msg}" 
+                 Style="{DynamicResource EgtWPFLib5_InputButton}"/>
+         <Button Content="{Binding Archive_Msg}"
+                 Command="{Binding Archive_Command}"
+                 IsEnabled="{Binding bArchived_IsEnabled}"
+                 Style="{DynamicResource EgtWPFLib5_InputButton}"/>
+         <Button Content="{Binding Delete_Msg}"
+                 Command="{Binding Delete_Command}"
+                 IsEnabled="{Binding bDelete_IsEnabled}"
+                 Style="{DynamicResource EgtWPFLib5_InputButton}"/>
+         <Button Command="{Binding Cancel_Command}"
+                 Content="{Binding Cancel_Msg}" 
+                 Style="{DynamicResource EgtWPFLib5_InputButton}"/>
+      </UniformGrid>
+
+   </Grid>
+
+</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogV.xaml.vb

@@ -0,0 +1,86 @@
+Imports System.ComponentModel
+Imports System.IO
+Imports System.Windows
+Imports System.Windows.Controls
+Imports System.Windows.Input
+Imports EgtBEAMWALL.Core.ConstBeam
+Imports EgtUILib
+Imports EgtWPFLib5
+Imports EgtBEAMWALL
+Imports System.Windows.Media
+
+Public Class NewOpenProjectFileDialogV
+
+   Private WithEvents m_OpenProjFileDialogVM As NewOpenProjectFileDialogVM
+
+#Region "CONSTRUCTOR"
+
+   Sub New(Owner As Window, OpenProjFileDialogVM As NewOpenProjectFileDialogVM)
+      ' Funzione che interpreta l'xaml
+      InitializeComponent()
+      Me.Owner = Owner
+      Me.DataContext = OpenProjFileDialogVM
+      ' Assegno al riferimento locale al VM il VM preso dal DataContext
+      m_OpenProjFileDialogVM = OpenProjFileDialogVM
+      AddHandler Me.Loaded, AddressOf OpenProjectFileDialog_Loaded
+      AddHandler Me.Closing, AddressOf OpenProjectFileDialog_Closing
+   End Sub
+
+#End Region    ' CONSTRUCTOR
+
+#Region "METHODS"
+
+   Public Function EgtShowDialog(ProjectType As ProjectType) As Boolean?
+      m_OpenProjFileDialogVM.Init(ProjectType)
+      ' mostro la finestra di dialogo
+      Return Me.ShowDialog()
+   End Function
+   Public Function EgtShowDialog(ProjectType As ProjectType, ProjectList As List(Of ProjectFileVM)) As Boolean?
+      m_OpenProjFileDialogVM.Init(ProjectType, ProjectList)
+      ' mostro la finestra di dialogo
+      Return Me.ShowDialog()
+   End Function
+
+   Public Function EgtShowDialog(ProjectType As ProjectType, GoToProd As Boolean) As Boolean?
+      m_OpenProjFileDialogVM.Init(ProjectType, Nothing, GoToProd)
+      ' mostro la finestra di dialogo
+      Return Me.ShowDialog()
+   End Function
+
+   Private Sub OpenProjectFileDialog_Loaded(sender As Object, e As RoutedEventArgs)
+      ' Carico e imposto posizione finestra
+      WinPosFromIniToWindow(S_OPENFILEDIALOG, K_VIEWOPTIMWINPLACE, Me)
+   End Sub
+
+   Private Sub OpenProjectFileDialog_Closing(sender As Object, e As System.ComponentModel.CancelEventArgs)
+      If (Keyboard.Modifiers And ModifierKeys.Alt) = ModifierKeys.Alt OrElse Keyboard.IsKeyDown(Key.F4) Then
+         e.Cancel = True
+         Return
+      End If
+      ' Salvo posizione finestra (se non minimizzata)
+      WinPosFromWindowToIni(Me, S_OPENFILEDIALOG, K_VIEWOPTIMWINPLACE)
+   End Sub
+
+#End Region    ' METHODS
+
+#Region "EVENTS"
+
+   Private Sub ProjectList_MouseDoubleClick(sender As Object, e As MouseButtonEventArgs)
+      m_OpenProjFileDialogVM.ProjDoubleClick()
+   End Sub
+
+#End Region    ' EVENTS
+
+   Private Sub OpenBtn_Click(sender As Object, e As RoutedEventArgs) Handles OpenBtn.Click
+      DialogResult = m_OpenProjFileDialogVM.VerifySelected()
+   End Sub
+
+   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_OpenProjFileDialogVM.m_CloseWindow
+      Me.DialogResult = bDialogResult
+   End Sub
+
+   Private Sub MainDataGrid_CellEditEnding(sender As Object, e As DataGridCellEditEndingEventArgs)
+      'm_OpenProjFileDialogVM.SetIsEditNameActive(False)
+   End Sub
+
+End Class

EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb

@@ -0,0 +1,872 @@
+Imports System.Collections.ObjectModel
+Imports System.IO
+Imports System.Windows
+Imports System.Windows.Controls
+Imports System.Windows.Data
+Imports System.Windows.Input
+Imports EgtBEAMWALL.Core
+Imports EgtBEAMWALL.Core.ConstBeam
+Imports EgtUILib
+Imports EgtWPFLib5
+
+Public MustInherit Class NewOpenProjectFileDialogVM
+   Inherits VMBase
+
+#Region "FIELDS & PROPERTIES"
+
+   Public Enum BTLDateTypes As Integer
+      CREATEDATE = 0
+      EXPORTDATE = 1
+   End Enum
+
+   Private Enum FilterTypes As Integer
+      NULL = 0
+      ID = 1
+      BTLFILENAME = 2
+      LISTNAME = 3
+      MACHINE = 4
+   End Enum
+
+   Public Enum DayTypes As Integer
+      LASTMONTH = 0
+      LAST3MONTHS = 1
+      LAST6MONTHS = 2
+      PERIOD = 3
+      ALWAYS = 4
+   End Enum
+
+   Public Enum RowQuantities As Integer
+      FIFTY = 0
+      HUNDRED = 1
+      HUNDREDANDFIFTY = 2
+   End Enum
+
+   Friend Event m_CloseWindow(bDialogResult As Boolean)
+
+   Protected m_ProdColumns As New ObservableCollection(Of EgtDataGridColumn)
+   Public Property ProdColumns As ObservableCollection(Of EgtDataGridColumn)
+      Get
+         Return m_ProdColumns
+      End Get
+      Set(value As ObservableCollection(Of EgtDataGridColumn))
+         m_ProdColumns = value
+      End Set
+   End Property
+
+   Private m_colProdFile_Name As EgtDataGridColumn
+   Public ReadOnly Property colProdFile_Name As EgtDataGridColumn
+      Get
+         Return m_colProdFile_Name
+      End Get
+   End Property
+
+   Private m_colArchived_Name As EgtDataGridColumn
+   Public ReadOnly Property colArchived_Name As EgtDataGridColumn
+      Get
+         Return m_colArchived_Name
+      End Get
+   End Property
+
+   Protected m_ProjColumns As New ObservableCollection(Of EgtDataGridColumn)
+   Public Property ProjColumns As ObservableCollection(Of EgtDataGridColumn)
+      Get
+         Return m_ProjColumns
+      End Get
+      Set(value As ObservableCollection(Of EgtDataGridColumn))
+         m_ProjColumns = value
+      End Set
+   End Property
+
+   Protected m_ProjectType As ProjectType
+
+   Protected m_sFilter As String
+   Public Property Filter As String
+      Get
+         Return m_sFilter
+      End Get
+      Set(value As String)
+         m_sFilter = value
+      End Set
+   End Property
+
+   Protected m_sFileNameFilter As Predicate(Of String)
+   Public Property FileNameFilter As Predicate(Of String)
+      Get
+         Return m_sFileNameFilter
+      End Get
+      Set(value As Predicate(Of String))
+         m_sFileNameFilter = value
+      End Set
+   End Property
+
+   Protected m_sExtensions As New List(Of String)
+   Public ReadOnly Property Extensions As List(Of String)
+      Get
+         Return m_sExtensions
+      End Get
+   End Property
+
+   Public m_ProjectList_View As CollectionView = Nothing
+   Protected m_ProjectList As New ObservableCollection(Of ProdItem)
+   Public ReadOnly Property ProjectList As ObservableCollection(Of ProdItem)
+      Get
+         Return m_ProjectList
+      End Get
+   End Property
+
+   Private m_nSelProjIndex As Integer
+   Public ReadOnly Property nSelProjIndex As Integer
+      Get
+         Return m_nSelProjIndex
+      End Get
+   End Property
+
+   Protected m_SelProject As ProdItem
+   Public Property SelProject As ProdItem
+      Get
+         Return m_SelProject
+      End Get
+      Set(value As ProdItem)
+         m_SelProject = value
+         ' verifico se abilitare il bottone Delete
+         If IsNothing(m_SelProject) Then
+            SetDeleteIsEnabled(False)
+            SetArchivedIsEnabled(False)
+         ElseIf IsNothing(m_SelProject.ProdFileVM) Then
+            SetDeleteIsEnabled(True)
+            SetArchivedIsEnabled(False)
+         Else
+            SetDeleteIsEnabled(Not SelProject.ProdFileVM.bIsProduced)
+            SetArchivedIsEnabled(True)
+         End If
+         NotifyPropertyChanged(NameOf(Archive_Msg))
+      End Set
+   End Property
+
+   Protected m_FileName As String
+   Public Property FileName As String
+      Get
+         Return m_FileName
+      End Get
+      Set(value As String)
+         m_FileName = value
+      End Set
+   End Property
+
+   Private m_bFixedProjectList As Boolean
+   Public ReadOnly Property bFixedProjectList As Boolean
+      Get
+         Return m_bFixedProjectList
+      End Get
+   End Property
+   Public Sub SetFixedProjectList(bValue As Boolean)
+      m_bFixedProjectList = bValue
+      NotifyPropertyChanged(NameOf(Filters_Visibility))
+   End Sub
+
+   Public ReadOnly Property Filters_Visibility As Visibility
+      Get
+         Return If(m_bFixedProjectList, Visibility.Collapsed, Visibility.Visible)
+      End Get
+   End Property
+
+   Protected m_BTLDateTypeList As New List(Of String)
+   Public ReadOnly Property BTLDateTypeList As List(Of String)
+      Get
+         Return m_BTLDateTypeList
+      End Get
+   End Property
+
+   Protected m_SelBTLDateType As BTLDateTypes = Nothing
+   Public Property SelBTLDateType As Integer
+      Get
+         Return m_SelBTLDateType
+      End Get
+      Set(value As Integer)
+         ' aggiorno lista da Db
+         RefreshProjectList()
+         m_ProjectList_View.Refresh()
+      End Set
+   End Property
+
+   Private m_DayTypeList As New List(Of String)({EgtMsg(62532), EgtMsg(62533), EgtMsg(62534), EgtMsg(62531)})
+   Public Overridable ReadOnly Property DayTypeList As List(Of String)
+      Get
+         Return m_DayTypeList
+      End Get
+   End Property
+
+   Protected m_SelDayType As DayTypes = DayTypes.LASTMONTH
+   Public Property SelDayType As Integer
+      Get
+         Return m_SelDayType
+      End Get
+      Set(value As Integer)
+         Dim PrevSelDayType As DayTypes = m_SelDayType
+         m_SelDayType = value
+         WriteMainPrivateProfileString(S_OPENFILEDIALOG, K_DAYTYPE, Convert.ToInt32(m_SelDayType))
+         m_Date_Visibility = If(m_SelDayType = DayTypes.PERIOD, Visibility.Visible, Visibility.Collapsed)
+         If m_SelDayType = DayTypes.PERIOD Then
+            Select Case PrevSelDayType
+               Case DayTypes.LASTMONTH
+                  m_dtEndDate = DateTime.Today + TimeSpan.FromDays(1)
+                  m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(30.5)
+               Case DayTypes.LAST3MONTHS
+                  m_dtEndDate = DateTime.Today + TimeSpan.FromDays(1)
+                  m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(30.5 * 3)
+               Case DayTypes.LAST6MONTHS
+                  m_dtEndDate = DateTime.Today + TimeSpan.FromDays(1)
+                  m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(30.5 * 6)
+               Case DayTypes.ALWAYS
+                  m_dtEndDate = DateTime.Today + TimeSpan.FromDays(1)
+                  m_dtStartDate = New DateTime(2020, 1, 1)
+            End Select
+            NotifyPropertyChanged(NameOf(dtStartDate))
+            NotifyPropertyChanged(NameOf(dtEndDate))
+         End If
+         NotifyPropertyChanged(NameOf(Date_Visibility))
+         ' aggiorno lista da Db
+         RefreshProjectList()
+         m_ProjectList_View.Refresh()
+      End Set
+   End Property
+
+   Private m_dtStartDate As DateTime = DateTime.Today
+   Public Property dtStartDate As DateTime
+      Get
+         Return m_dtStartDate
+      End Get
+      Set(value As DateTime)
+         m_dtStartDate = value
+         Dim lStartDate As Long = m_dtStartDate.ToFileTimeUtc()
+         WriteMainPrivateProfileString(S_OPENFILEDIALOG, K_STARTDATE, lStartDate.ToString())
+         ' aggiorno lista da Db
+         RefreshProjectList()
+         m_ProjectList_View.Refresh()
+      End Set
+   End Property
+
+   Private m_dtEndDate As DateTime = DateTime.Today
+   Public Property dtEndDate As DateTime
+      Get
+         Return m_dtEndDate
+      End Get
+      Set(value As DateTime)
+         m_dtEndDate = value
+         Dim lEndDate As Long = m_dtEndDate.ToFileTimeUtc()
+         WriteMainPrivateProfileString(S_OPENFILEDIALOG, K_ENDDATE, lEndDate.ToString())
+         ' aggiorno lista da Db
+         RefreshProjectList()
+         m_ProjectList_View.Refresh()
+      End Set
+   End Property
+
+   Private m_Date_Visibility As Visibility = Visibility.Collapsed
+   Public ReadOnly Property Date_Visibility As Visibility
+      Get
+         Return m_Date_Visibility
+      End Get
+   End Property
+
+   Private m_RowQuantityList As New List(Of String)({50, 100, 150})
+   Public ReadOnly Property RowQuantityList As List(Of String)
+      Get
+         Return m_RowQuantityList
+      End Get
+   End Property
+
+   Private m_SelRowQuantity As RowQuantities
+   Public Property SelRowQuantity As Integer
+      Get
+         Return m_SelRowQuantity
+      End Get
+      Set(value As Integer)
+         m_SelRowQuantity = value
+         RefreshProjectList()
+         m_ProjectList_View.Refresh()
+      End Set
+   End Property
+
+   ' lista campi per ricerca testuale e con datepicker
+   Protected m_FilterTypeList As New ObservableCollection(Of IdNameStruct)
+   Public ReadOnly Property FilterTypeList As ObservableCollection(Of IdNameStruct)
+      Get
+         Return m_FilterTypeList
+      End Get
+   End Property
+
+   Protected m_SelFilterType As IdNameStruct = Nothing
+   Public Property SelFilterType As IdNameStruct
+      Get
+         Return m_SelFilterType
+      End Get
+      Set(value As IdNameStruct)
+         ' resetto il contenuto della barra di ricerca testuale
+         m_SearchText = ""
+         NotifyPropertyChanged(NameOf(SearchText))
+         ' resetto le selezioni sul calendario
+         If Not IsNothing(SearchDate) Then SearchDate.Clear()
+         ' setto il Tipo Filtro a NULL e refresho la lista dei progetti (in modo da averli visibili tutti)
+         m_SelFilterType = m_FilterTypeList(0)
+         m_ProjectList_View.Refresh()
+         ' ora setto il valore scelto come Tipo Filtro
+         m_SelFilterType = value
+         Select Case m_SelFilterType.Id
+            Case FilterTypes.ID, FilterTypes.BTLFILENAME, FilterTypes.LISTNAME, FilterTypes.MACHINE
+               SearchText_Visibility = Visibility.Visible
+               SearchDate_Visibility = Visibility.Collapsed
+            Case BTLDateTypes.EXPORTDATE, BTLDateTypes.CREATEDATE
+               SearchText_Visibility = Visibility.Collapsed
+               SearchDate_Visibility = Visibility.Visible
+            Case Else
+               SearchText_Visibility = Visibility.Collapsed
+               SearchDate_Visibility = Visibility.Collapsed
+         End Select
+      End Set
+   End Property
+
+   Protected m_SearchText As String = ""
+   Public Property SearchText As String
+      Get
+         Return m_SearchText
+      End Get
+      Set(value As String)
+         m_SearchText = value
+         m_ProjectList_View.Refresh()
+      End Set
+   End Property
+
+   Friend m_SearchDate As SelectedDatesCollection = Nothing
+   Public ReadOnly Property SearchDate As SelectedDatesCollection
+      Get
+         Return m_SearchDate
+      End Get
+   End Property
+
+   Protected m_SearchText_Visibility As Visibility = Visibility.Collapsed
+   Public Property SearchText_Visibility As Visibility
+      Get
+         Return m_SearchText_Visibility
+      End Get
+      Set(value As Visibility)
+         m_SearchText_Visibility = value
+         NotifyPropertyChanged(NameOf(SearchText_Visibility))
+      End Set
+   End Property
+
+   Protected m_SearchDate_Visibility As Visibility = Visibility.Collapsed
+   Public Property SearchDate_Visibility As Visibility
+      Get
+         Return m_SearchDate_Visibility
+      End Get
+      Set(value As Visibility)
+         m_SearchDate_Visibility = value
+         NotifyPropertyChanged(NameOf(SearchDate_Visibility))
+      End Set
+   End Property
+
+   Public Property bIsEditNameActive As Boolean
+      Get
+         Return Not m_colProdFile_Name.IsReadOnly
+      End Get
+      Set(value As Boolean)
+         If Not IsNothing(m_colProdFile_Name) Then
+            m_colProdFile_Name.IsReadOnly = Not value
+         End If
+      End Set
+   End Property
+   Public Sub SetIsEditNameActive(value As Boolean)
+      If Not IsNothing(m_colProdFile_Name) Then
+         m_colProdFile_Name.IsReadOnly = Not value
+      End If
+      NotifyPropertyChanged(NameOf(bIsEditNameActive))
+   End Sub
+
+   Private m_bViewArchived As Boolean
+   Public Property bViewArchived As Boolean
+      Get
+         Return m_bViewArchived
+      End Get
+      Set(value As Boolean)
+         m_bViewArchived = value
+         WriteMainPrivateProfileString(S_OPENFILEDIALOG, K_VIEWARCHIVED, If(bViewArchived, 1, 0))
+         If Not IsNothing( m_colArchived_Name) Then
+             m_colArchived_Name.Visible = value
+             RefreshProjectList()
+         End If
+      End Set
+   End Property
+
+   Private m_bArchived_IsEnabled As Boolean
+   Public ReadOnly Property bArchived_IsEnabled As Boolean
+      Get
+         Return m_bArchived_IsEnabled
+      End Get
+   End Property
+   Public Sub SetArchivedIsEnabled(bValue As Boolean)
+      m_bArchived_IsEnabled = bValue
+      NotifyPropertyChanged(NameOf(bArchived_IsEnabled))
+   End Sub
+
+   Private m_bDelete_IsEnabled As Boolean
+   Public ReadOnly Property bDelete_IsEnabled As Boolean
+      Get
+         Return m_bDelete_IsEnabled
+      End Get
+   End Property
+   Public Sub SetDeleteIsEnabled(bValue As Boolean)
+      m_bDelete_IsEnabled = bValue
+      NotifyPropertyChanged(NameOf(bDelete_IsEnabled))
+   End Sub
+
+   Protected m_ChangeOpenedProjectOnCancel As Boolean = False
+
+#Region "Messages"
+
+   Public ReadOnly Property Title As String
+      Get
+         Return EgtMsg(61986)
+      End Get
+   End Property
+
+   Public ReadOnly Property Filters_Msg As String
+      Get
+         Return EgtMsg(61985)
+      End Get
+   End Property
+
+   Public ReadOnly Property FilterType_Msg As String
+      Get
+         Return EgtMsg(61836)
+      End Get
+   End Property
+   Public ReadOnly Property Search_Msg As String
+      Get
+         Return EgtMsg(61837)
+      End Get
+   End Property
+
+   Public ReadOnly Property Id_Msg As String
+      Get
+         Return EgtMsg(61815)
+      End Get
+   End Property
+   Public ReadOnly Property BTLFileName_Msg As String
+      Get
+         Return EgtMsg(61819)
+      End Get
+   End Property
+   Public ReadOnly Property ListName_Msg As String
+      Get
+         Return EgtMsg(61820)
+      End Get
+   End Property
+   Public ReadOnly Property ExportDate_Msg As String
+      Get
+         Return EgtMsg(61821)
+      End Get
+   End Property
+   Public ReadOnly Property CreateDate_Msg As String
+      Get
+         Return EgtMsg(61822)
+      End Get
+   End Property
+   Public ReadOnly Property Machine_Msg As String
+      Get
+         Return EgtMsg(61886)
+      End Get
+   End Property
+   Public ReadOnly Property Name_Msg As String
+      Get
+         Return EgtMsg(61808)
+      End Get
+   End Property
+
+   Public ReadOnly Property Open_Msg As String
+      Get
+         Return EgtMsg(30006)
+      End Get
+   End Property
+
+   Public ReadOnly Property Archived_Msg As String
+      Get
+         Return EgtMsg(61983)
+      End Get
+   End Property
+
+   Public ReadOnly Property Archive_Msg As String
+      Get
+         If Not IsNothing(m_SelProject) AndAlso m_SelProject.bIsArchived Then
+            Return EgtMsg(61984)
+         Else
+            Return EgtMsg(61981)
+         End If
+      End Get
+   End Property
+   Public ReadOnly Property Delete_Msg As String
+      Get
+         Return EgtMsg(61823)
+      End Get
+   End Property
+   Public ReadOnly Property Cancel_Msg As String
+      Get
+         Return EgtMsg(30002)
+      End Get
+   End Property
+
+   Public ReadOnly Property From_Msg As String
+      Get
+         Return EgtMsg(62523)
+      End Get
+   End Property
+
+   Public ReadOnly Property To_Msg As String
+      Get
+         Return EgtMsg(62524)
+      End Get
+   End Property
+
+   Public ReadOnly Property ViewArchived_Msg As String
+      Get
+         Return EgtMsg(61982)
+      End Get
+   End Property
+
+   Public ReadOnly Property Rows_Msg As String
+      Get
+         Return EgtMsg(61995)
+      End Get
+   End Property
+
+#End Region
+
+   ' Definizione comandi
+   Private m_cmdProjectDoubleClick As ICommand
+   Private m_cmdDelete As ICommand
+   Private m_cmdArchive As ICommand
+   Private m_cmdCancel As ICommand
+
+#End Region    ' FIELDS & PROPERTIES
+
+   Sub New()
+      ' assegno delegato a elementi lista
+      ProdItem.m_delIsModifiedSetUp = AddressOf SetIsEditNameActive
+      ' carico colonne
+      LoadColumns()
+      m_colProdFile_Name = m_ProdColumns.FirstOrDefault(Function(x) x.Name = COL_NAME)
+      m_colArchived_Name = m_ProdColumns.FirstOrDefault(Function(x) x.Name = COL_ARCHIVED)
+      ' leggo valori per filtri
+      m_SelDayType = GetMainPrivateProfileInt(S_OPENFILEDIALOG, K_DAYTYPE, 0)
+      Select Case m_SelDayType
+         Case DayTypes.LASTMONTH
+            m_dtEndDate = DateTime.Today + TimeSpan.FromDays(1)
+            m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(30.5)
+         Case DayTypes.LAST3MONTHS
+            m_dtEndDate = DateTime.Today + TimeSpan.FromDays(1)
+            m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(30.5 * 3)
+         Case DayTypes.LAST6MONTHS
+            m_dtEndDate = DateTime.Today + TimeSpan.FromDays(1)
+            m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(30.5 * 6)
+         Case DayTypes.PERIOD
+            Dim sStartDate As String = "0"
+            Dim lStartDate As Long = 0
+            GetMainPrivateProfileString(S_OPENFILEDIALOG, K_STARTDATE, 0, sStartDate)
+            Long.TryParse(sStartDate, lStartDate)
+            m_dtStartDate = If(lStartDate > 0, DateTime.FromFileTimeUtc(lStartDate), DateTime.Today)
+            Dim sEndDate As String = "0"
+            Dim lEndDate As Long = 0
+            GetMainPrivateProfileString(S_OPENFILEDIALOG, K_ENDDATE, 0, sEndDate)
+            Long.TryParse(sEndDate, lEndDate)
+            m_dtEndDate = If(lEndDate > 0, DateTime.FromFileTimeUtc(lEndDate), DateTime.Today)
+            m_Date_Visibility = Visibility.Visible
+      End Select
+      m_bViewArchived = GetMainPrivateProfileInt(S_OPENFILEDIALOG, K_VIEWARCHIVED, 0) <> 0
+   End Sub
+
+#Region "METHODS"
+
+   Public MustOverride Function Init(ProjectType As ProjectType, Optional CurrProjectList As List(Of ProjectFileVM) = Nothing, Optional GoToProd As Boolean = False) As Boolean?
+   Public Overridable Sub RefreshProjectList(Optional GoToProd As Boolean = False)
+   End Sub
+
+   Protected Sub LoadColumns()
+      'If ProjectType = ProjectType.PROJ Then
+      ' carico le colonne della datagrid
+      ' GetPrivateProfileColumns(S_OPENPROJFILEDLG_PROJ, ProjColumns)
+      '   ' carico campi su cui eseguire il filtro di ricerca
+      '   m_BTLDateTypeList = New List(Of String)({CreateDate_Msg, ExportDate_Msg})
+      '   m_SelBTLDateType = BTLDateTypes.CREATEDATE
+      '   NotifyPropertyChanged(NameOf(BTLDateTypeList))
+      '   NotifyPropertyChanged(NameOf(SelBTLDateType))
+      '   m_FilterTypeList = New ObservableCollection(Of IdNameStruct)({New IdNameStruct(FilterTypes.NULL, ""),
+      '                                                                 New IdNameStruct(FilterTypes.ID, Id_Msg),
+      '                                                                 New IdNameStruct(FilterTypes.BTLFILENAME, BTLFileName_Msg),
+      '                                                                 New IdNameStruct(FilterTypes.LISTNAME, ListName_Msg),
+      '                                                                 New IdNameStruct(FilterTypes.MACHINE, Machine_Msg)})
+      '   m_SelFilterType = m_FilterTypeList.FirstOrDefault(Function(x) x.Id = FilterTypes.NULL)
+      '   NotifyPropertyChanged(NameOf(SelFilterType))
+      'ElseIf ProjectType = ProjectType.PROD Then
+      ' carico le colonne della datagrid
+      GetPrivateProfileColumns(S_NEWOPENPROJFILEDLG_PROD, ProdColumns)
+      ' carico campi su cui eseguire il filtro di ricerca
+      m_BTLDateTypeList = New List(Of String)({CreateDate_Msg})
+      m_SelBTLDateType = BTLDateTypes.CREATEDATE
+      NotifyPropertyChanged(NameOf(BTLDateTypeList))
+      NotifyPropertyChanged(NameOf(SelBTLDateType))
+      m_FilterTypeList = New ObservableCollection(Of IdNameStruct)({New IdNameStruct(FilterTypes.NULL, ""),
+                                                                    New IdNameStruct(FilterTypes.BTLFILENAME, BTLFileName_Msg),
+                                                                    New IdNameStruct(FilterTypes.LISTNAME, ListName_Msg),
+                                                                    New IdNameStruct(FilterTypes.MACHINE, Machine_Msg)})
+      m_SelFilterType = m_FilterTypeList.FirstOrDefault(Function(x) x.Id = FilterTypes.NULL)
+      NotifyPropertyChanged(NameOf(SelFilterType))
+      'End If
+      ' setto la visibilità delle colonne delle EgtDataGrid
+      For Each col In ProjColumns
+         col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed)
+      Next
+      For Each col In ProdColumns
+         col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed)
+      Next
+   End Sub
+
+   Friend Function VerifySelected() As Boolean
+      If IsNothing(SelProject) Then Return False
+      Dim AllFilesInDir As IEnumerable(Of String) = Nothing
+      If m_ProjectType = Core.ConstBeam.ProjectType.PROJ Then
+         If Not IsNothing(SelProject.ProdFileVM) Then
+            If String.IsNullOrWhiteSpace(SelProject.ProdFileVM.sProdDirPath) OrElse Not Directory.Exists(SelProject.ProdFileVM.sProdDirPath) Then Return False
+            AllFilesInDir = Directory.EnumerateFiles(SelProject.ProdFileVM.sProdDirPath)
+         ElseIf SelProject.ProjFileList.Count > 0 Then
+            If String.IsNullOrWhiteSpace(SelProject.ProjFileList(0).sProjDirPath) OrElse Not Directory.Exists(SelProject.ProjFileList(0).sProjDirPath) Then Return False
+            AllFilesInDir = Directory.EnumerateFiles(SelProject.ProjFileList(0).sProjDirPath)
+         Else Return False
+         End If
+      ElseIf m_ProjectType = Core.ConstBeam.ProjectType.PROD Then
+         If String.IsNullOrWhiteSpace(SelProject.ProdFileVM.sProdDirPath) OrElse Not Directory.Exists(SelProject.ProdFileVM.sProdDirPath) Then Return False
+         AllFilesInDir = Directory.EnumerateFiles(SelProject.ProdFileVM.sProdDirPath)
+      Else
+         Return False
+      End If
+      Return AllFilesInDir.Any(Function(x) Path.GetExtension(x).ToLower() = ".nge")
+   End Function
+
+   Protected Function ProjectFilter(Proj As Object) As Boolean
+      Dim bProjectOk As Boolean = True
+      'If TypeOf Proj Is ProjFileVM Then
+      Dim CurrProj As ProdItem = DirectCast(Proj, ProdItem)
+      If m_SelFilterType.Id <> FilterTypes.NULL AndAlso (
+         (m_SelFilterType.Id = BTLDateTypes.EXPORTDATE AndAlso Not CurrProj.ProjFileList.Any(Function(x) SearchDate.Contains(DirectCast(x, ProjFileVM).dtExportDate.Date))) OrElse
+         (m_SelFilterType.Id = BTLDateTypes.CREATEDATE AndAlso Not SearchDate.Contains(CurrProj.dtCreateDate.Date))) Then bProjectOk = False
+      If m_SelFilterType.Id <> FilterTypes.NULL AndAlso m_SearchText <> String.Empty AndAlso (
+         (m_SelFilterType.Id = FilterTypes.BTLFILENAME AndAlso CurrProj.ProjFileList.Any(Function(x) DirectCast(x, ProjFileVM).sBTLFileName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) OrElse
+         (m_SelFilterType.Id = FilterTypes.LISTNAME AndAlso CurrProj.ProjFileList.Any(Function(x) DirectCast(x, ProjFileVM).sListName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) OrElse
+         (m_SelFilterType.Id = FilterTypes.MACHINE AndAlso CurrProj.sMachine.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) Then bProjectOk = False
+      'ElseIf TypeOf Proj Is ProdFileVM Then
+      '   Dim CurrProj As ProdFileVM = DirectCast(Proj, ProdFileVM)
+      '   If m_SelFilterType.Id <> FilterTypes.NULL AndAlso (
+      '      (m_SelFilterType.Id = BTLDateTypes.CREATEDATE AndAlso Not SearchDate.Contains(CurrProj.dtCreateDate.Date))) Then bProjectOk = False
+      '   If m_SelFilterType.Id <> FilterTypes.NULL AndAlso m_SearchText <> String.Empty AndAlso (
+      '      (m_SelFilterType.Id = FilterTypes.ID AndAlso CurrProj.sProdId.ToString.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0) OrElse
+      '      (m_SelFilterType.Id = FilterTypes.BTLFILENAME AndAlso CurrProj.sBTLFileName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0) OrElse
+      '      (m_SelFilterType.Id = FilterTypes.MACHINE AndAlso CurrProj.sMachine.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) Then bProjectOk = False
+      'End If
+      Return bProjectOk
+   End Function
+
+   Protected Sub CloseWindow(bDialogResult As Boolean)
+      RaiseEvent m_CloseWindow(bDialogResult)
+   End Sub
+
+#End Region    ' METHODS
+
+#Region "COMMANDS"
+
+#Region "ProjectDoubleClick"
+
+   ''' <summary>
+   ''' Returns a command that do New.
+   ''' </summary>
+   Public ReadOnly Property ProjectDoubleClick_Command As ICommand
+      Get
+         If m_cmdProjectDoubleClick Is Nothing Then
+            m_cmdProjectDoubleClick = New Command(AddressOf ProjDoubleClick)
+         End If
+         Return m_cmdProjectDoubleClick
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the New.  This method is invoked by the NewCommand.
+   ''' </summary>
+   Friend Sub ProjDoubleClick()
+      ' verifico se non e' attivo edit del nome
+      If bIsEditNameActive Then Return
+      ' verifico validita' selezionato
+      If VerifySelected() Then
+         RaiseEvent m_CloseWindow(True)
+      End If
+   End Sub
+
+#End Region ' ProjectDoubleClick
+
+#Region "Archive"
+
+   ''' <summary>
+   ''' Returns a command that do New.
+   ''' </summary>
+   Public ReadOnly Property Archive_Command As ICommand
+      Get
+         If m_cmdArchive Is Nothing Then
+            m_cmdArchive = New Command(AddressOf Archive)
+         End If
+         Return m_cmdArchive
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the New.  This method is invoked by the NewCommand.
+   ''' </summary>
+   Public Overridable Sub Archive()
+   End Sub
+
+#End Region ' Archive
+
+#Region "Delete"
+
+   ''' <summary>
+   ''' Returns a command that do New.
+   ''' </summary>
+   Public ReadOnly Property Delete_Command As ICommand
+      Get
+         If m_cmdDelete Is Nothing Then
+            m_cmdDelete = New Command(AddressOf Delete)
+         End If
+         Return m_cmdDelete
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the New.  This method is invoked by the NewCommand.
+   ''' </summary>
+   Public Overridable Sub Delete()
+   End Sub
+
+#End Region ' Delete
+
+#Region "Cancel"
+
+   ''' <summary>
+   ''' Returns a command that do New.
+   ''' </summary>
+   Public ReadOnly Property Cancel_Command As ICommand
+      Get
+         If m_cmdCancel Is Nothing Then
+            m_cmdCancel = New Command(AddressOf Cancel)
+         End If
+         Return m_cmdCancel
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the New.  This method is invoked by the NewCommand.
+   ''' </summary>
+   Public Overridable Sub Cancel()
+   End Sub
+
+#End Region ' Cancel
+
+#End Region    ' Commands
+
+End Class
+
+Public Class ProdItem
+   Inherits VMBase
+
+   Public Shared m_delIsModifiedSetUp As Action(Of Boolean)
+
+   Protected m_ProdFileVM As ProdFileVM
+   Public ReadOnly Property ProdFileVM As ProdFileVM
+      Get
+         Return m_ProdFileVM
+      End Get
+   End Property
+
+   Private m_ProjFileList As New List(Of ProjectFileVM)
+   Public ReadOnly Property ProjFileList As List(Of ProjectFileVM)
+      Get
+         Return m_ProjFileList
+      End Get
+   End Property
+
+   Public ReadOnly Property sProdId As String
+      Get
+         Return If(Not IsNothing(m_ProdFileVM), m_ProdFileVM.sProdId, "")
+      End Get
+   End Property
+
+   Public Overridable Property sName As String
+      Get
+         Return If(Not IsNothing(m_ProdFileVM), m_ProdFileVM.sName, "")
+      End Get
+      Set(value As String)
+         If Not IsNothing(m_ProdFileVM) Then
+            m_ProdFileVM.sName = value
+         End If
+      End Set
+   End Property
+
+   Public ReadOnly Property dtCreateDate As Date
+      Get
+         Return If(Not IsNothing(m_ProdFileVM), {m_ProdFileVM.dtCreateDate, m_ProjFileList.Min(Function(x) x.dtCreateDate)}.Min(), m_ProjFileList.Min(Function(x) x.dtCreateDate))
+      End Get
+   End Property
+   Public ReadOnly Property sCreateDate As String
+      Get
+         Return dtCreateDate.ToString()
+      End Get
+   End Property
+
+   Public ReadOnly Property sMachine As String
+      Get
+         If Not IsNothing(m_ProdFileVM) Then
+            Return m_ProdFileVM.sMachine
+         ElseIf Not IsNothing(m_ProjFileList(0)) Then
+            Return m_ProjFileList(0).sMachine
+         Else Return ""
+         End If
+      End Get
+   End Property
+
+   Public ReadOnly Property bIsArchived As Boolean
+      Get
+         If Not IsNothing(m_ProdFileVM) Then
+            Return m_ProdFileVM.bIsArchived
+         ElseIf Not IsNothing(m_ProjFileList(0)) Then
+            Return m_ProjFileList(0).bIsArchived
+         Else
+            Return True
+         End If
+      End Get
+   End Property
+
+   Public ReadOnly Property Archived_Visibility As Visibility
+      Get
+         Return If(bIsArchived, Visibility.Visible, Visibility.Collapsed)
+      End Get
+   End Property
+
+   Sub New(ProdFileVM As ProdFileVM, ProjFileVM As ProjFileVM)
+      m_ProdFileVM = ProdFileVM
+      m_ProjFileList.Add(ProjFileVM)
+   End Sub
+
+   Sub New(ProjFileVM As ProjFileVM)
+      m_ProjFileList = New List(Of ProjectFileVM)({ProjFileVM})
+   End Sub
+
+   Sub New(ProdFileVM As ProjectFileVM, ProjFileVMList As List(Of ProjectFileVM))
+      m_ProdFileVM = ProdFileVM
+      m_ProjFileList = ProjFileVMList
+   End Sub
+
+End Class

EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogV.xaml

@@ -5,9 +5,9 @@
                             xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.Core"
                             Title="{Binding Title}"
                             Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
-                            WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="False"
+                            WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="True"
                             IsMinimizable="False" WindowStartupLocation="CenterScreen" ShowInTaskbar="False"
-                            Height="500" Width="500" Topmost="True"
+                            MinHeight="500" MinWidth="500"
                             DataContext="{Binding RelativeSource={RelativeSource Self}}">
 
    <EgtWPFLib5:EgtCustomWindow.Resources>
@@ -21,42 +21,106 @@
          <RowDefinition Height="1*"/>
       </Grid.RowDefinitions>
 
-        <StackPanel>
-            <Grid Grid.Row="0" Margin="5">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="1*" />
-                    <RowDefinition Height="1*" />
-                </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="1*" />
-                    <ColumnDefinition Width="1*" />
-                </Grid.ColumnDefinitions>
+      <GroupBox Header="Filters"
+                Margin="5"
+                Visibility="{Binding Filters_Visibility}">
+         <Grid>
+            <Grid.RowDefinitions>
+               <RowDefinition Height="Auto"/>
+               <RowDefinition Height="Auto"/>
+            </Grid.RowDefinitions>
+            <Grid>
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="Auto"/>
+                  <ColumnDefinition Width="1*"/>
+               </Grid.ColumnDefinitions>
+               <ComboBox ItemsSource="{Binding BTLDateTypeList}"
+                         SelectedIndex="{Binding SelBTLDateType}"
+                         Width="105"
+                         Margin="5"
+                         Style="{StaticResource FeatureComboBox}"/>
+               <StackPanel Grid.Column="1" Orientation="Horizontal">
+                  <ComboBox ItemsSource="{Binding DayTypeList}"
+                            SelectedIndex="{Binding SelDayType}"
+                            Width="105"
+                            Margin="0,0,2.5,0"
+                            Style="{StaticResource PartParam_ComboBox}"/>
+                  <StackPanel Orientation="Horizontal" Visibility="{Binding Date_Visibility}">
+                     <TextBlock Text="{Binding From_Msg}"
+                                Style="{StaticResource Filter_TextBlock}"/>
+                     <DatePicker SelectedDate="{Binding dtStartDate}"
+                                 Style="{StaticResource Filter_DatePicker}"/>
+                     <TextBlock Text="{Binding To_Msg}"
+                                Style="{StaticResource Filter_TextBlock}"/>
+                     <DatePicker SelectedDate="{Binding dtEndDate}"
+                                 Style="{StaticResource Filter_DatePicker}"/>
+                  </StackPanel>
+               </StackPanel>
+            </Grid>
+            <Grid Grid.Row="1">
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="Auto"/>
+                  <ColumnDefinition Width="1*"/>
+                  <ColumnDefinition Width="Auto"/>
+               </Grid.ColumnDefinitions>
+               <ComboBox ItemsSource="{Binding FilterTypeList}"
+                         SelectedItem="{Binding SelFilterType}"
+                         Width="105"
+                         Margin="5"
+                         Style="{StaticResource FeatureComboBox}"/>
+               <EgtWPFLib5:EgtTextBox Grid.Column="1"
+                                      Text="{Binding SearchText}"
+                                      Margin="5"
+                                      Visibility="{Binding SearchText_Visibility}"/>
+               <StackPanel Grid.Column="2" 
+                           Orientation="Horizontal">
+                  <TextBlock Text="Rows"
+                             Style="{StaticResource OptionTextBlock}"/>
+                  <ComboBox ItemsSource="{Binding RowQuantityList}"
+                            SelectedIndex="{Binding SelRowQuantity}"
+                            Style="{StaticResource FeatureComboBox}"/>
+               </StackPanel>
+            </Grid>
+         </Grid>
+      </GroupBox>
 
-                <TextBlock Text="{Binding FilterType_Msg}"
+
+      <!--<StackPanel>
+         <Grid Grid.Row="0" Margin="5">
+            <Grid.RowDefinitions>
+               <RowDefinition Height="1*" />
+               <RowDefinition Height="1*" />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="1*" />
+               <ColumnDefinition Width="1*" />
+            </Grid.ColumnDefinitions>
+
+            <TextBlock Text="{Binding FilterType_Msg}"
                            Grid.Row="0" Grid.Column="0"
                            Style="{StaticResource OptionTextBlock}"/>
-                <ComboBox ItemsSource="{Binding SearchColumnList}"
+            <ComboBox ItemsSource="{Binding SearchColumnList}"
                           SelectedItem="{Binding SelSearchColumn}"
                           Width="Auto"
                           Margin="5"
                           Grid.Row="0" Grid.Column="1"
                           Style="{StaticResource FeatureComboBox}"/>
-                <TextBlock Text="{Binding Search_Msg}"
+            <TextBlock Text="{Binding Search_Msg}"
                            Margin="0,5,0,0"
                            Grid.Row="1" Grid.Column="0"
                            Style="{StaticResource OptionTextBlock}"/>
-                <EgtWPFLib5:EgtTextBox Text="{Binding SearchText}"
+            <EgtWPFLib5:EgtTextBox Text="{Binding SearchText}"
                                        Margin="5"
                                        Grid.Row="1" Grid.Column="1"
                                        Visibility="{Binding SearchText_Visibility}"/>
-                <Calendar SelectedDatesChanged="Calendar_SelectedDatesChanged"
+            <Calendar SelectedDatesChanged="Calendar_SelectedDatesChanged"
                           SelectionMode="MultipleRange" 
                           Grid.Row="1" Grid.Column="1"
                           Visibility="{Binding SearchDate_Visibility}"/>
-            </Grid>
-        </StackPanel>
+         </Grid>
+      </StackPanel>-->
 
-        <EgtBEAMWALL:EgtDataGrid Grid.Row="1"
+      <EgtBEAMWALL:EgtDataGrid Grid.Row="1"
                ItemsSource="{Binding ProjectList}" 
                SelectedItem="{Binding SelProject}"
                CanUserAddRows="False"
@@ -85,6 +149,14 @@
                   </DataTemplate>
                </DataGridTextColumn.HeaderTemplate>
             </DataGridTextColumn>
+            <!-- Project Name -->
+            <DataGridTextColumn x:Key="colPROJNAME" Binding="{Binding sDescription}">
+               <DataGridTextColumn.HeaderTemplate>
+                  <DataTemplate>
+                     <TextBlock Text="{Binding Path=DataContext.BTLFileName_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OpenProjectFileDialogV}}}"/>
+                  </DataTemplate>
+               </DataGridTextColumn.HeaderTemplate>
+            </DataGridTextColumn>
             <!-- BTL FileName -->
             <DataGridTextColumn x:Key="colBTLNAME" Binding="{Binding sBTLFileName}">
                <DataGridTextColumn.HeaderTemplate>

EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogV.xaml.vb

@@ -5,6 +5,8 @@ Imports System.Windows.Controls
 Imports System.Windows.Input
 Imports EgtBEAMWALL.Core.ConstBeam
 Imports EgtUILib
+Imports EgtWPFLib5
+Imports EgtBEAMWALL
 
 Public Class OpenProjectFileDialogV
 
@@ -19,6 +21,8 @@ Public Class OpenProjectFileDialogV
       Me.DataContext = OpenProjFileDialogVM
       ' Assegno al riferimento locale al VM il VM preso dal DataContext
       m_OpenProjFileDialogVM = OpenProjFileDialogVM
+      AddHandler Me.Loaded, AddressOf OpenProjectFileDialog_Loaded
+      AddHandler Me.Closing, AddressOf OpenProjectFileDialog_Closing
    End Sub
 
 #End Region    ' CONSTRUCTOR
@@ -42,6 +46,20 @@ Public Class OpenProjectFileDialogV
       Return Me.ShowDialog()
    End Function
 
+   Private Sub OpenProjectFileDialog_Loaded(sender As Object, e As RoutedEventArgs)
+      ' Carico e imposto posizione finestra
+      WinPosFromIniToWindow(S_OPENFILEDIALOG, K_VIEWOPTIMWINPLACE, Me)
+   End Sub
+
+   Private Sub OpenProjectFileDialog_Closing(sender As Object, e As System.ComponentModel.CancelEventArgs)
+      If (Keyboard.Modifiers And ModifierKeys.Alt) = ModifierKeys.Alt OrElse Keyboard.IsKeyDown(Key.F4) Then
+         e.Cancel = True
+         Return
+      End If
+      ' Salvo posizione finestra (se non minimizzata)
+      WinPosFromWindowToIni(Me, S_OPENFILEDIALOG, K_VIEWOPTIMWINPLACE)
+   End Sub
+
 #End Region    ' METHODS
 
 #Region "EVENTS"
@@ -60,10 +78,4 @@ Public Class OpenProjectFileDialogV
       Me.DialogResult = bDialogResult
    End Sub
 
-   Private Sub Calendar_SelectedDatesChanged(sender As Object, e As SelectionChangedEventArgs)
-      Dim cal As System.Windows.Controls.Calendar = sender
-      m_OpenProjFileDialogVM.m_SearchDate = cal.SelectedDates
-      m_OpenProjFileDialogVM.m_ProjectList_View.Refresh()
-   End Sub
-
 End Class

EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogVM.vb

@@ -14,6 +14,32 @@ Public MustInherit Class OpenProjectFileDialogVM
 
 #Region "FIELDS & PROPERTIES"
 
+   Public Enum BTLDateTypes As Integer
+      CREATEDATE = 0
+      EXPORTDATE = 1
+   End Enum
+
+   Private Enum FilterTypes As Integer
+      NULL = 0
+      ID = 1
+      BTLFILENAME = 2
+      LISTNAME = 3
+      MACHINE = 4
+   End Enum
+
+   Public Enum DayTypes As Integer
+      LASTMONTH = 0
+      LAST3MONTHS = 1
+      LAST6MONTHS = 2
+      PERIOD = 3
+   End Enum
+
+   Public Enum RowQuantities As Integer
+      FIFTY = 0
+      HUNDRED = 1
+      HUNDREDANDFIFTY = 2
+   End Enum
+
    Friend Event m_CloseWindow(bDialogResult As Boolean)
 
    Protected m_ProjectColumns As New ObservableCollection(Of EgtDataGridColumn)
@@ -83,18 +109,148 @@ Public MustInherit Class OpenProjectFileDialogVM
       End Set
    End Property
 
-   ' lista campi per ricerca testuale e con datepicker
-   Protected m_SearchColumnList As New ObservableCollection(Of IdNameStruct)
-   Public ReadOnly Property SearchColumnList As ObservableCollection(Of IdNameStruct)
+   Private m_bFixedProjectList As Boolean
+   Public ReadOnly Property bFixedProjectList As Boolean
       Get
-         Return m_SearchColumnList
+         Return m_bFixedProjectList
+      End Get
+   End Property
+   Public Sub SetFixedProjectList(bValue As Boolean)
+      m_bFixedProjectList = bValue
+      NotifyPropertyChanged(NameOf(Filters_Visibility))
+   End Sub
+
+   Public ReadOnly Property Filters_Visibility As Visibility
+      Get
+         Return If(m_bFixedProjectList, Visibility.Collapsed, Visibility.Visible)
       End Get
    End Property
 
-   Protected m_SelSearchColumn As IdNameStruct = Nothing
-   Public Property SelSearchColumn As IdNameStruct
+   Protected m_BTLDateTypeList As New List(Of String)
+   Public ReadOnly Property BTLDateTypeList As List(Of String)
       Get
-         Return m_SelSearchColumn
+         Return m_BTLDateTypeList
+      End Get
+   End Property
+
+   Protected m_SelBTLDateType As BTLDateTypes = Nothing
+   Public Property SelBTLDateType As Integer
+      Get
+         Return m_SelBTLDateType
+      End Get
+      Set(value As Integer)
+         ' aggiorno lista da Db
+         RefreshProjectList()
+         m_ProjectList_View.Refresh()
+      End Set
+   End Property
+
+
+   Private m_DayTypeList As New List(Of String)({EgtMsg(62532), EgtMsg(62533), EgtMsg(62534), EgtMsg(62531)})
+   Public ReadOnly Property DayTypeList As List(Of String)
+      Get
+         Return m_DayTypeList
+      End Get
+   End Property
+
+   Protected m_SelDayType As DayTypes = DayTypes.LASTMONTH
+   Public Property SelDayType As Integer
+      Get
+         Return m_SelDayType
+      End Get
+      Set(value As Integer)
+         Dim PrevSelDayType As DayTypes = m_SelDayType
+         m_SelDayType = value
+         WriteMainPrivateProfileString(S_OPENFILEDIALOG, K_DAYTYPE, Convert.ToInt32(m_SelDayType))
+         m_Date_Visibility = If(m_SelDayType = DayTypes.PERIOD, Visibility.Visible, Visibility.Collapsed)
+         If m_SelDayType = DayTypes.PERIOD Then
+            Select Case PrevSelDayType
+               Case DayTypes.LASTMONTH
+                  m_dtStartDate = DateTime.Today + TimeSpan.FromDays(1)
+                  m_dtEndDate = m_dtStartDate - TimeSpan.FromDays(30.5)
+               Case DayTypes.LAST3MONTHS
+
+               Case DayTypes.LAST6MONTHS
+
+            End Select
+            NotifyPropertyChanged(NameOf(dtStartDate))
+            NotifyPropertyChanged(NameOf(dtEndDate))
+         End If
+         NotifyPropertyChanged(NameOf(Date_Visibility))
+         ' aggiorno lista da Db
+         RefreshProjectList()
+         m_ProjectList_View.Refresh()
+      End Set
+   End Property
+
+   Private m_dtStartDate As DateTime = DateTime.Today
+   Public Property dtStartDate As DateTime
+      Get
+         Return m_dtStartDate
+      End Get
+      Set(value As DateTime)
+         m_dtStartDate = value
+         Dim lStartDate As Long = m_dtStartDate.ToFileTimeUtc()
+         WriteMainPrivateProfileString(S_OPENFILEDIALOG, K_STARTDATE, lStartDate.ToString())
+         ' aggiorno lista da Db
+         RefreshProjectList()
+         m_ProjectList_View.Refresh()
+      End Set
+   End Property
+
+   Private m_dtEndDate As DateTime = DateTime.Today
+   Public Property dtEndDate As DateTime
+      Get
+         Return m_dtEndDate
+      End Get
+      Set(value As DateTime)
+         m_dtEndDate = value
+         Dim lEndDate As Long = m_dtEndDate.ToFileTimeUtc()
+         WriteMainPrivateProfileString(S_OPENFILEDIALOG, K_ENDDATE, lEndDate.ToString())
+         ' aggiorno lista da Db
+         RefreshProjectList()
+         m_ProjectList_View.Refresh()
+      End Set
+   End Property
+
+   Private m_Date_Visibility As Visibility = Visibility.Collapsed
+   Public ReadOnly Property Date_Visibility As Visibility
+      Get
+         Return m_Date_Visibility
+      End Get
+   End Property
+
+   Private m_RowQuantityList As New List(Of String)({50, 100, 150})
+   Public ReadOnly Property RowQuantityList As List(Of String)
+      Get
+         Return m_RowQuantityList
+      End Get
+   End Property
+
+   Private m_SelRowQuantity As RowQuantities
+   Public Property SelRowQuantity As Integer
+      Get
+         Return m_SelRowQuantity
+      End Get
+      Set(value As Integer)
+         m_SelRowQuantity = value
+         RefreshProjectList()
+         m_ProjectList_View.Refresh()
+      End Set
+   End Property
+
+   ' lista campi per ricerca testuale e con datepicker
+   Protected m_FilterTypeList As New ObservableCollection(Of IdNameStruct)
+   Public ReadOnly Property FilterTypeList As ObservableCollection(Of IdNameStruct)
+      Get
+         Return m_FilterTypeList
+      End Get
+   End Property
+
+   Protected m_SelFilterType As IdNameStruct = Nothing
+   Public Property SelFilterType As IdNameStruct
+      Get
+         Return m_SelFilterType
       End Get
       Set(value As IdNameStruct)
          ' resetto il contenuto della barra di ricerca testuale
@@ -103,15 +259,15 @@ Public MustInherit Class OpenProjectFileDialogVM
          ' resetto le selezioni sul calendario
          If Not IsNothing(SearchDate) Then SearchDate.Clear()
          ' setto il Tipo Filtro a NULL e refresho la lista dei progetti (in modo da averli visibili tutti)
-         m_SelSearchColumn = m_SearchColumnList(0)
+         m_SelFilterType = m_FilterTypeList(0)
          m_ProjectList_View.Refresh()
          ' ora setto il valore scelto come Tipo Filtro
-         m_SelSearchColumn = value
-         Select Case m_SelSearchColumn.Id
-            Case OpenProjFileColumn.ID, OpenProjFileColumn.BTLFILENAME, OpenProjFileColumn.LISTNAME, OpenProjFileColumn.MACHINE
+         m_SelFilterType = value
+         Select Case m_SelFilterType.Id
+            Case FilterTypes.ID, FilterTypes.BTLFILENAME, FilterTypes.LISTNAME, FilterTypes.MACHINE
                SearchText_Visibility = Visibility.Visible
                SearchDate_Visibility = Visibility.Collapsed
-            Case OpenProjFileColumn.EXPORTDATE, OpenProjFileColumn.CREATEDATE
+            Case BTLDateTypes.EXPORTDATE, BTLDateTypes.CREATEDATE
                SearchText_Visibility = Visibility.Collapsed
                SearchDate_Visibility = Visibility.Visible
             Case Else
@@ -161,18 +317,13 @@ Public MustInherit Class OpenProjectFileDialogVM
       End Set
    End Property
 
-   Public Enum OpenProjFileColumn As Integer
-      NULL = 0
-      ID = 1
-      BTLFILENAME = 2
-      LISTNAME = 3
-      EXPORTDATE = 4
-      CREATEDATE = 5
-      MACHINE = 6
-   End Enum
-
 #Region "Messages"
 
+   Public ReadOnly Property Title As String
+      Get
+         Return "Open Project"
+      End Get
+   End Property
    Public ReadOnly Property FilterType_Msg As String
       Get
          Return EgtMsg(61836)
@@ -236,6 +387,18 @@ Public MustInherit Class OpenProjectFileDialogVM
       End Get
    End Property
 
+   Public ReadOnly Property From_Msg As String
+      Get
+         Return EgtMsg(62523)
+      End Get
+   End Property
+
+   Public ReadOnly Property To_Msg As String
+      Get
+         Return EgtMsg(62524)
+      End Get
+   End Property
+
 #End Region
 
    ' Definizione comandi
@@ -244,31 +407,70 @@ Public MustInherit Class OpenProjectFileDialogVM
 
 #End Region    ' FIELDS & PROPERTIES
 
+   Sub New()
+      ' leggo valori per filtri
+      m_SelDayType = GetMainPrivateProfileInt(S_OPENFILEDIALOG, K_DAYTYPE, 0)
+      Select Case m_SelDayType
+         Case DayTypes.LASTMONTH
+            m_dtEndDate = DateTime.Today + TimeSpan.FromDays(1)
+            m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(30.5)
+         Case DayTypes.LAST3MONTHS
+            m_dtEndDate = DateTime.Today + TimeSpan.FromDays(1)
+            m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(30.5 * 3)
+         Case DayTypes.LAST6MONTHS
+            m_dtEndDate = DateTime.Today + TimeSpan.FromDays(1)
+            m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(30.5 * 6)
+         Case DayTypes.PERIOD
+            Dim sStartDate As String = "0"
+            Dim lStartDate As Long = 0
+            GetMainPrivateProfileString(S_OPENFILEDIALOG, K_STARTDATE, 0, sStartDate)
+            Long.TryParse(sStartDate, lStartDate)
+            m_dtStartDate = If(lStartDate > 0, DateTime.FromFileTimeUtc(lStartDate), DateTime.Today)
+            Dim sEndDate As String = "0"
+            Dim lEndDate As Long = 0
+            GetMainPrivateProfileString(S_OPENFILEDIALOG, K_ENDDATE, 0, sEndDate)
+            Long.TryParse(sEndDate, lEndDate)
+            m_dtEndDate = If(lEndDate > 0, DateTime.FromFileTimeUtc(lEndDate), DateTime.Today)
+            m_Date_Visibility = Visibility.Visible
+      End Select
+   End Sub
+
 #Region "METHODS"
 
    Public MustOverride Function Init(ProjectType As ProjectType, Optional CurrProjectList As List(Of ProjectFileVM) = Nothing, Optional GoToProd As Boolean = False) As Boolean?
+   Public Overridable Sub RefreshProjectList(Optional GoToProd As Boolean = False)
+   End Sub
 
    Protected Sub LoadColumns(ProjectType As ProjectType)
       If ProjectType = ProjectType.PROJ Then
          ' carico le colonne della datagrid
          GetPrivateProfileColumns(S_OPENPROJFILEDLG_PROJ, ProjectColumns)
          ' carico campi su cui eseguire il filtro di ricerca
-         m_SearchColumnList = New ObservableCollection(Of IdNameStruct)({New IdNameStruct(OpenProjFileColumn.NULL, ""),
-                                                                        New IdNameStruct(OpenProjFileColumn.ID, Id_Msg),
-                                                                        New IdNameStruct(OpenProjFileColumn.BTLFILENAME, BTLFileName_Msg),
-                                                                        New IdNameStruct(OpenProjFileColumn.LISTNAME, ListName_Msg),
-                                                                        New IdNameStruct(OpenProjFileColumn.EXPORTDATE, ExportDate_Msg),
-                                                                        New IdNameStruct(OpenProjFileColumn.CREATEDATE, CreateDate_Msg),
-                                                                        New IdNameStruct(OpenProjFileColumn.MACHINE, Machine_Msg)})
+         m_BTLDateTypeList = New List(Of String)({CreateDate_Msg, ExportDate_Msg})
+         m_SelBTLDateType = BTLDateTypes.CREATEDATE
+         NotifyPropertyChanged(NameOf(BTLDateTypeList))
+         NotifyPropertyChanged(NameOf(SelBTLDateType))
+         m_FilterTypeList = New ObservableCollection(Of IdNameStruct)({New IdNameStruct(FilterTypes.NULL, ""),
+                                                                       New IdNameStruct(FilterTypes.ID, Id_Msg),
+                                                                       New IdNameStruct(FilterTypes.BTLFILENAME, BTLFileName_Msg),
+                                                                       New IdNameStruct(FilterTypes.LISTNAME, ListName_Msg),
+                                                                       New IdNameStruct(FilterTypes.MACHINE, Machine_Msg)})
+         m_SelFilterType = m_FilterTypeList.FirstOrDefault(Function(x) x.Id = FilterTypes.NULL)
+         NotifyPropertyChanged(NameOf(SelFilterType))
       ElseIf ProjectType = ProjectType.PROD Then
          ' carico le colonne della datagrid
          GetPrivateProfileColumns(S_OPENPROJFILEDLG_PROD, ProjectColumns)
          ' carico campi su cui eseguire il filtro di ricerca
-         m_SearchColumnList = New ObservableCollection(Of IdNameStruct)({New IdNameStruct(OpenProjFileColumn.NULL, ""),
-                                                                        New IdNameStruct(OpenProjFileColumn.ID, Id_Msg),
-                                                                        New IdNameStruct(OpenProjFileColumn.BTLFILENAME, BTLFileName_Msg),
-                                                                        New IdNameStruct(OpenProjFileColumn.CREATEDATE, CreateDate_Msg),
-                                                                        New IdNameStruct(OpenProjFileColumn.MACHINE, Machine_Msg)})
+         m_BTLDateTypeList = New List(Of String)({CreateDate_Msg})
+         m_SelBTLDateType = BTLDateTypes.CREATEDATE
+         NotifyPropertyChanged(NameOf(BTLDateTypeList))
+         NotifyPropertyChanged(NameOf(SelBTLDateType))
+         m_FilterTypeList = New ObservableCollection(Of IdNameStruct)({New IdNameStruct(FilterTypes.NULL, ""),
+                                                                         New IdNameStruct(FilterTypes.ID, Id_Msg),
+                                                                         New IdNameStruct(FilterTypes.BTLFILENAME, BTLFileName_Msg),
+                                                                         New IdNameStruct(FilterTypes.MACHINE, Machine_Msg)})
+         m_SelFilterType = m_FilterTypeList.FirstOrDefault(Function(x) x.Id = FilterTypes.NULL)
+         NotifyPropertyChanged(NameOf(SelFilterType))
       End If
       ' setto la visibilità delle colonne delle EgtDataGrid
       For Each col In ProjectColumns
@@ -301,22 +503,22 @@ Public MustInherit Class OpenProjectFileDialogVM
       Dim bProjectOk As Boolean = True
       If m_ProjectType = ProjectType.PROJ Then
          Dim CurrProj As ProjFileVM = DirectCast(Proj, ProjFileVM)
-         If m_SelSearchColumn.Id <> OpenProjFileColumn.NULL AndAlso (
-            (m_SelSearchColumn.Id = OpenProjFileColumn.EXPORTDATE AndAlso Not SearchDate.Contains(CurrProj.dtExportDate.Date)) OrElse
-            (m_SelSearchColumn.Id = OpenProjFileColumn.CREATEDATE AndAlso Not SearchDate.Contains(CurrProj.dtCreateDate.Date))) Then bProjectOk = False
-         If m_SelSearchColumn.Id <> OpenProjFileColumn.NULL AndAlso m_SearchText <> String.Empty AndAlso (
-            (m_SelSearchColumn.Id = OpenProjFileColumn.ID AndAlso CurrProj.sProjId.ToString.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0) OrElse
-            (m_SelSearchColumn.Id = OpenProjFileColumn.BTLFILENAME AndAlso CurrProj.sBTLFileName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0) OrElse
-            (m_SelSearchColumn.Id = OpenProjFileColumn.LISTNAME AndAlso CurrProj.sListName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0) OrElse
-            (m_SelSearchColumn.Id = OpenProjFileColumn.MACHINE AndAlso CurrProj.sMachine.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) Then bProjectOk = False
+         If m_SelFilterType.Id <> FilterTypes.NULL AndAlso (
+            (m_SelFilterType.Id = BTLDateTypes.EXPORTDATE AndAlso Not SearchDate.Contains(CurrProj.dtExportDate.Date)) OrElse
+            (m_SelFilterType.Id = BTLDateTypes.CREATEDATE AndAlso Not SearchDate.Contains(CurrProj.dtCreateDate.Date))) Then bProjectOk = False
+         If m_SelFilterType.Id <> FilterTypes.NULL AndAlso m_SearchText <> String.Empty AndAlso (
+            (m_SelFilterType.Id = FilterTypes.ID AndAlso CurrProj.sProjId.ToString.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0) OrElse
+            (m_SelFilterType.Id = FilterTypes.BTLFILENAME AndAlso CurrProj.sBTLFileName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0) OrElse
+            (m_SelFilterType.Id = FilterTypes.LISTNAME AndAlso CurrProj.sListName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0) OrElse
+            (m_SelFilterType.Id = FilterTypes.MACHINE AndAlso CurrProj.sMachine.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) Then bProjectOk = False
       ElseIf m_ProjectType = ProjectType.PROD Then
          Dim CurrProj As ProdFileVM = DirectCast(Proj, ProdFileVM)
-         If m_SelSearchColumn.Id <> OpenProjFileColumn.NULL AndAlso (
-            (m_SelSearchColumn.Id = OpenProjFileColumn.CREATEDATE AndAlso Not SearchDate.Contains(CurrProj.dtCreateDate.Date))) Then bProjectOk = False
-         If m_SelSearchColumn.Id <> OpenProjFileColumn.NULL AndAlso m_SearchText <> String.Empty AndAlso (
-            (m_SelSearchColumn.Id = OpenProjFileColumn.ID AndAlso CurrProj.sProdId.ToString.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0) OrElse
-            (m_SelSearchColumn.Id = OpenProjFileColumn.BTLFILENAME AndAlso CurrProj.sBTLFileName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0) OrElse
-            (m_SelSearchColumn.Id = OpenProjFileColumn.MACHINE AndAlso CurrProj.sMachine.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) Then bProjectOk = False
+         If m_SelFilterType.Id <> FilterTypes.NULL AndAlso (
+            (m_SelFilterType.Id = BTLDateTypes.CREATEDATE AndAlso Not SearchDate.Contains(CurrProj.dtCreateDate.Date))) Then bProjectOk = False
+         If m_SelFilterType.Id <> FilterTypes.NULL AndAlso m_SearchText <> String.Empty AndAlso (
+            (m_SelFilterType.Id = FilterTypes.ID AndAlso CurrProj.sProdId.ToString.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0) OrElse
+            (m_SelFilterType.Id = FilterTypes.BTLFILENAME AndAlso CurrProj.sBTLFileName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0) OrElse
+            (m_SelFilterType.Id = FilterTypes.MACHINE AndAlso CurrProj.sMachine.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) Then bProjectOk = False
       End If
       Return bProjectOk
    End Function

EgtBEAMWALL.Core/ProjectFileVM/ProdFileM.vb

@@ -15,10 +15,23 @@ Public Class ProdFileM
    End Sub
 
    Protected m_sName As String
-   Public ReadOnly Property sName As String
+   Public Property sName As String
       Get
          Return m_sName
       End Get
+      Set(value As String)
+         m_sName = value
+      End Set
+   End Property
+
+   Protected m_bIsProduced As Boolean
+   Public Property bIsProduced As Boolean
+      Get
+         Return m_bIsProduced
+      End Get
+      Set(value As Boolean)
+         m_bIsProduced = value
+      End Set
    End Property
 
 #Region "CONSTRUCTORS"
@@ -31,7 +44,7 @@ Public Class ProdFileM
    End Function
 
    Public Shared Function CreateProdFileM(nProdId As Integer, nProjIdList As List(Of Integer), dtCreateProjDate As DateTime, sName As String, nType As BWType,
-                                          sMachine As String, sLockedBy As String, dtLock As DateTime) As ProdFileM
+                                          sMachine As String, sLockedBy As String, dtLock As DateTime, bIsActive As Boolean, bIsProduced As Boolean, bIsArchived As Boolean) As ProdFileM
       Dim NewProjectFileM As New ProdFileM
       NewProjectFileM.m_nProdId = nProdId
       NewProjectFileM.m_nProjIdList = nProjIdList
@@ -41,6 +54,9 @@ Public Class ProdFileM
       NewProjectFileM.m_sMachine = sMachine
       NewProjectFileM.m_sLockedBy = sLockedBy
       NewProjectFileM.m_dtLock = dtLock
+      NewProjectFileM.m_bIsActive = bIsActive
+      NewProjectFileM.m_bIsProduced = bIsProduced
+      NewProjectFileM.m_bIsArchived = bIsArchived
       Return NewProjectFileM
    End Function
 

EgtBEAMWALL.Core/ProjectFileVM/ProjFileM.vb

@@ -19,26 +19,35 @@ Public Class ProjFileM
    End Property
 
    Protected m_sBTLFileName As String = String.Empty
-   Public Property sBTLFileName As String
-      Get
-         Return m_sBTLFileName
-      End Get
-      Set(value As String)
-         m_sBTLFileName = value
-      End Set
-   End Property
+    Public Property sBTLFileName As String
+        Get
+            Return m_sBTLFileName
+        End Get
+        Set(value As String)
+            m_sBTLFileName = value
+        End Set
+    End Property
+
+    Protected m_sDescription As String = String.Empty
+    Public Property sDescription As String
+        Get
+            Return m_sDescription
+        End Get
+        Set(value As String)
+            m_sDescription = value
+        End Set
+    End Property
 
 #Region "CONSTRUCTORS"
 
-   Protected Sub New()
+    Protected Sub New()
    End Sub
 
    Public Shared Function CreateNewProjFileM() As ProjFileM
       Return New ProjFileM
    End Function
 
-   Public Shared Function CreateProjFileM(nProjId As Integer, nProdId As Integer, dtCreateProjDate As DateTime, dtExportDate As DateTime, sListName As String,
-                                          sBTLFileName As String, IsNew As Boolean, IsLocked As Boolean, nType As BWType, sMachine As String) As ProjFileM
+   Public Shared Function CreateProjFileM(nProjId As Integer, nProdId As Integer, dtCreateProjDate As DateTime, dtExportDate As DateTime, sListName As String, sBTLFileName As String, sDescription As String, IsNew As Boolean, IsLocked As Boolean, nType As BWType, sMachine As String, bIsActive As Boolean, bIsArchived As Boolean) As ProjFileM
       Dim NewProjectFileM As New ProjFileM
       NewProjectFileM.m_nProjId = nProjId
       NewProjectFileM.m_nProdId = nProdId
@@ -46,10 +55,13 @@ Public Class ProjFileM
       NewProjectFileM.m_dtExportDate = dtExportDate
       NewProjectFileM.m_sListName = sListName
       NewProjectFileM.m_sBTLFileName = sBTLFileName
+      NewProjectFileM.m_sDescription = sDescription
       NewProjectFileM.m_bIsNew = IsNew
       NewProjectFileM.m_bIsLocked = IsLocked
       NewProjectFileM.m_nType = nType
       NewProjectFileM.m_sMachine = sMachine
+      NewProjectFileM.m_bIsActive = bIsActive
+      NewProjectFileM.m_bIsArchived = bIsArchived
       Return NewProjectFileM
    End Function
 

EgtBEAMWALL.Core/ProjectFileVM/ProjectFileM.vb

@@ -94,6 +94,26 @@ Public Class ProjectFileM
       End Set
    End Property
 
+   Protected m_bIsActive As Boolean
+   Public Property bIsActive As Boolean
+      Get
+         Return m_bIsActive
+      End Get
+      Set(value As Boolean)
+         m_bIsActive = value
+      End Set
+   End Property
+
+   Protected m_bIsArchived As Boolean
+   Public Property bIsArchived As Boolean
+      Get
+         Return m_bIsArchived
+      End Get
+      Set(value As Boolean)
+         m_bIsArchived = value
+      End Set
+   End Property
+
 #Region "CONSTRUCTORS"
 
 #End Region    ' CONSTRUCTORS

EgtBEAMWALL.Core/ProjectManager/ProdFileVM.vb

@@ -47,10 +47,13 @@ Public Class ProdFileVM
       End Set
    End Property
 
-   Public ReadOnly Property sName As String
+   Public Property sName As String
       Get
          Return ProdFileM.sName
       End Get
+      Set(value As String)
+         ProdFileM.sName = value
+      End Set
    End Property
 
    Private m_sBTLFileName As String
@@ -63,6 +66,12 @@ Public Class ProdFileVM
       m_sBTLFileName = value
    End Sub
 
+   Public ReadOnly Property bIsProduced As Boolean
+      Get
+         Return ProdFileM.bIsProduced
+      End Get
+   End Property
+
 #Region "CONSTRUCTORS"
 
    Sub New(ProdFileM As ProdFileM)

EgtBEAMWALL.Core/ProjectManager/ProjFileVM.vb

@@ -68,6 +68,12 @@ Public Class ProjFileVM
       End Get
    End Property
 
+   Public ReadOnly Property sDescription As String
+      Get
+         Return ProjFileM.sDescription
+      End Get
+   End Property
+
    Public ReadOnly Property sListName As String
       Get
          Return ProjFileM.sListName

EgtBEAMWALL.Core/ProjectManager/ProjectFileVM.vb

@@ -117,6 +117,18 @@ Public Class ProjectFileVM
       End Get
    End Property
 
+   Public ReadOnly Property bIsActive As Boolean
+      Get
+         Return m_ProjectFileM.bIsActive
+      End Get
+   End Property
+
+   Public ReadOnly Property bIsArchived As Boolean
+      Get
+         Return m_ProjectFileM.bIsArchived
+      End Get
+   End Property
+
 #Region "Messages"
 
    Public ReadOnly Property Id_Msg As String

EgtBEAMWALL.Core/Utility/MachLog.vb

@@ -87,7 +87,6 @@
 
    Public ReadOnly Property sPROD As String
       Get
-
          Return m_VarValue
       End Get
    End Property

EgtBEAMWALL.DataLayer/App.config

@@ -6,7 +6,7 @@
    </configSections>
    <entityFramework>
       <!--<defaultConnectionFactory type="MySql.Data.Entity.MySqlConnectionFactory, MySql.Data.EntityFramework" />-->
-      <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework"/>
+      <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" />
       <providers>
          <provider invariantName="MySql.Data.MySqlClient" type="MySql.Data.MySqlClient.MySqlProviderServices, MySql.Data.EntityFramework, Version=8.0.21.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d">
          </provider>

EgtBEAMWALL.DataLayer/Controllers/ProdController.cs

@@ -1,6 +1,5 @@
 using EgtBEAMWALL.DataLayer.DatabaseModels;
 using NLog;
-using NLog.LayoutRenderers;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -58,10 +57,15 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             return done;
         }
 
-        public bool DeleteProd(int ProdId)
+        /// <summary>
+        /// Delete Prod(+proj...) logically / on DB by ProdId
+        /// </summary>
+        /// <param name="ProjId"></param>
+        /// <param name="IsLogical"></param>
+        /// <returns></returns>
+        public bool DeleteProd(int ProdId, bool IsLogical)
         {
             bool done = false;
-
             using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
                 var currProd = localDbCtx
@@ -69,50 +73,78 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                                 .Where(x => x.ProdId == ProdId)
                                 .SingleOrDefault();
 
-                // sel dei proj da aggiornare...
-                var proj2update = localDbCtx
-                                    .ProjList
-                                    .Where(x => x.ProdDbId == currProd.ProdDbId)
-                                    .ToList();
-
-                // sel dei MachGroup da prod
-                var machGroup2del = localDbCtx
-                                    .MachGroupList
-                                    .Where(x => x.ProdDbId == currProd.ProdDbId)
-                                    .ToList();
-
-                // selezione dei part da machgroup
-                var part2del = localDbCtx
-                                .PartList
-                                .Where(x => x.MachGroup.ProdDbId == currProd.ProdDbId)
-                                .ToList();
-
-                try
+                // procedo SOLO SE NON è stato prodotto (se è stato prodotto --> NON permetto la
+                // cancellazione ed esco con false...)
+                if (!currProd.IsProduced)
                 {
-                    // update proj...
-                    foreach (var item in proj2update)
+                    // sel dei proj da aggiornare...
+                    var proj2update = localDbCtx
+                                        .ProjList
+                                        .Where(x => x.ProdDbId == currProd.ProdDbId)
+                                        .ToList();
+
+                    // se richiesta cancellazione logica o cmq se fosse stato taggato come prodotto
+                    if (IsLogical)
                     {
-                        item.ProdDbId = null;
+                        try
+                        {
+                            // segno eliminazione logica al/ai PROJ...
+                            foreach (var item in proj2update)
+                            {
+                                item.IsActive = false;
+                            }
+                            // segno eliminazione logica al prod
+                            currProd.IsActive = false;
+                            // Commit changes
+                            localDbCtx.SaveChanges();
+                            done = true;
+                        }
+                        catch (Exception exc)
+                        {
+                            string errMessage = $"EXCEPTION on Prod.DeleteProd (logical only): {Environment.NewLine}{exc}";
+                            Console.WriteLine(errMessage);
+                            Log.Error(errMessage);
+                        }
+                    }
+                    else
+                    {
+                        // sel dei MachGroup da prod
+                        var machGroup2del = localDbCtx
+                                            .MachGroupList
+                                            .Where(x => x.ProdDbId == currProd.ProdDbId)
+                                            .ToList();
+
+                        // selezione dei part da machgroup
+                        var part2del = localDbCtx
+                                        .PartList
+                                        .Where(x => x.MachGroup.ProdDbId == currProd.ProdDbId)
+                                        .ToList();
+                        try
+                        {
+                            // update proj...
+                            foreach (var item in proj2update)
+                            {
+                                item.ProdDbId = null;
+                            }
+                            // remove from database
+                            localDbCtx.PartList.RemoveRange(part2del);
+                            //// salvo
+                            //localDbCtx.SaveChanges();
+                            localDbCtx.MachGroupList.RemoveRange(machGroup2del);
+                            //// salvo
+                            //localDbCtx.SaveChanges();
+                            localDbCtx.ProdList.Remove(currProd);
+                            // salvo
+                            localDbCtx.SaveChanges();
+                            done = true;
+                        }
+                        catch (Exception exc)
+                        {
+                            string errMessage = $"EXCEPTION on Prod.DeleteProd: {Environment.NewLine}{exc}";
+                            Console.WriteLine(errMessage);
+                            Log.Error(errMessage);
+                        }
                     }
-                    //// salvo
-                    //localDbCtx.SaveChanges();
-                    // remove from database
-                    localDbCtx.PartList.RemoveRange(part2del);
-                    //// salvo
-                    //localDbCtx.SaveChanges();
-                    localDbCtx.MachGroupList.RemoveRange(machGroup2del);
-                    //// salvo
-                    //localDbCtx.SaveChanges();
-                    localDbCtx.ProdList.Remove(currProd);
-                    // salvo
-                    localDbCtx.SaveChanges();
-                    done = true;
-                }
-                catch (Exception exc)
-                {
-                    string errMessage = $"EXCEPTION on Prod.DeleteProd: {Environment.NewLine}{exc}";
-                    Console.WriteLine(errMessage);
-                    Log.Error(errMessage);
                 }
             }
             return done;
@@ -170,20 +202,86 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             {
                 return null;
             }
-            return Core.ProdFileM.CreateProdFileM(currProd.ProdId, ProjIdByProd(ProdId), currProd.DtCreated, currProd.Description, currProd.PType, currProd.Machine, currProd.LockedBy, currProd.LockDate);
+            return Core.ProdFileM.CreateProdFileM(currProd.ProdId, ProjIdByProd(ProdId), currProd.DtCreated, currProd.Description, currProd.PType, currProd.Machine, currProd.LockedBy, currProd.LockDate, currProd.IsActive, currProd.IsProduced, currProd.IsArchived);
         }
 
         /// <summary>
-        /// Elenco progetti
+        /// Elenco prod
         /// </summary>
-        /// <param name="numRecord"></param>
+        /// <param name="numRecord">Num max record da recuperare</param>
+        /// <param name="OnlyActive">Solo con ALMENO 1 PROJ attivo (senza cancellazione logica)</param>
+        /// <param name="ShowArchived">Se true: mostra anche archiviati (default li nasconde)</param>
         /// <returns></returns>
-        public List<Core.ProdFileM> GetLastDesc(int numRecord)
+        public List<Core.ProdFileM> GetLastDesc(int numRecord, bool OnlyActive, bool ShowArchived = false)
         {
             List<Core.ProdFileM> result = new List<Core.ProdFileM>();
-            var dbResult = GetLastDbModelDesc(numRecord);
+            //List<ProdModel> dbResult = GetLastDbModelDesc(numRecord);
+            List<ProdModel> dbResult = new List<ProdModel>();
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                // se numRecord = 0 --> passo tutti
+                if (numRecord == 0)
+                {
+                    numRecord = localDbCtx.ProdList.Count();
+                }
+                // retrieve
+                dbResult = localDbCtx
+                    .ProdList
+                    .Where(x => (!x.IsArchived || ShowArchived))
+                    // condizione join sui PROJ
+                    .Join(localDbCtx.ProjList.Where(x => x.IsActive || !OnlyActive),
+                        p => p.ProdDbId,
+                        e => e.ProdDbId,
+                        (p, e) => p)
+                    .Distinct()
+                    .OrderByDescending(x => x.ProdId)
+                    .Take(numRecord)
+                    .ToList();
+            }
+
             // conversione
-            result = dbResult.Select(x => Core.ProdFileM.CreateProdFileM(x.ProdId, ProjIdByProd(x.ProdId), x.DtCreated, x.Description, x.PType, x.Machine, x.LockedBy, x.LockDate)).ToList();
+            result = dbResult.Select(x => Core.ProdFileM.CreateProdFileM(x.ProdId, ProjIdByProd(x.ProdId), x.DtCreated, x.Description, x.PType, x.Machine, x.LockedBy, x.LockDate, x.IsActive, x.IsProduced, x.IsArchived)).ToList();
+            return result;
+        }
+
+        /// <summary>
+        /// Elenco prod
+        /// </summary>
+        /// <param name="dtStart">Inizio periodo estrazione</param>
+        /// <param name="dtEnd">Fine periodo estrazione</param>
+        /// <param name="numRecord">Num max record da recuperare</param>
+        /// <param name="OnlyActive">Solo con ALMENO 1 PROJ attivo (senza cancellazione logica)</param>
+        /// <param name="ShowArchived">Se true: mostra anche archiviati (default li nasconde)</param>
+        /// <returns></returns>
+        public List<Core.ProdFileM> GetLastDesc(DateTime dtStart, DateTime dtEnd, int numRecord, bool OnlyActive, bool ShowArchived = false)
+        {
+            List<Core.ProdFileM> result = new List<Core.ProdFileM>();
+            //List<ProdModel> dbResult = GetLastDbModelDesc(numRecord);
+            List<ProdModel> dbResult = new List<ProdModel>();
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                // se numRecord = 0 --> passo tutti
+                if (numRecord == 0)
+                {
+                    numRecord = localDbCtx.ProdList.Count();
+                }
+                // retrieve
+                dbResult = localDbCtx
+                    .ProdList
+                    .Where(x => x.DtCreated >= dtStart && x.DtCreated <= dtEnd && (!x.IsArchived || ShowArchived))
+                    // condizione join sui PROJ
+                    .Join(localDbCtx.ProjList.Where(x => x.IsActive || !OnlyActive),
+                        p => p.ProdDbId,
+                        e => e.ProdDbId,
+                        (p, e) => p)
+                    .Distinct()
+                    .OrderByDescending(x => x.ProdId)
+                    .Take(numRecord)
+                    .ToList();
+            }
+
+            // conversione
+            result = dbResult.Select(x => Core.ProdFileM.CreateProdFileM(x.ProdId, ProjIdByProd(x.ProdId), x.DtCreated, x.Description, x.PType, x.Machine, x.LockedBy, x.LockDate, x.IsActive, x.IsProduced, x.IsArchived)).ToList();
             return result;
         }
 
@@ -385,6 +483,105 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             return done;
         }
 
+        /// <summary>
+        /// Update record su DB x campo IsArchived
+        /// </summary>
+        /// <param name="ProdId"></param>
+        /// <param name="IsArchived"></param>
+        /// <returns></returns>
+        public bool UpdateArchived(int ProdId, bool IsArchived)
+        {
+            bool fatto = false;
+            // cerco specifico Prod
+            ProdModel currData = new ProdModel();
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                currData = localDbCtx
+                               .ProdList
+                               .Where(x => x.ProdId == ProdId)
+                               .SingleOrDefault();
+                if (currData != null)
+                {
+                    // sel dei proj da aggiornare...
+                    var proj2update = localDbCtx
+                                        .ProjList
+                                        .Where(x => x.ProdDbId == currData.ProdDbId)
+                                        .ToList();
+                    try
+                    {
+                        // aggiorno valore descrizione
+                        currData.IsArchived = IsArchived;
+
+                        // update dei proj relativi
+                        foreach (var item in proj2update)
+                        {
+                            item.IsArchived = IsArchived;
+                        }
+
+                        // Commit changes
+                        localDbCtx.SaveChanges();
+                    }
+                    catch (Exception exc)
+                    {
+                        string errMessage = $"EXCEPTION on Prod.UpdateArchived:{Environment.NewLine}{exc}";
+                        Console.WriteLine(errMessage);
+                        Log.Error(errMessage);
+                    }
+                }
+                else
+                {
+                    string errMessage = $"ERROR on Prod.UpdateArchived: req item was not found | ProdId {ProdId} | IsArchived {IsArchived}";
+                    Console.WriteLine(errMessage);
+                    Log.Error(errMessage);
+                }
+            }
+            return fatto;
+        }
+
+        /// <summary>
+        /// Update record su DB x Description
+        /// </summary>
+        /// <param name="ProdId"></param>
+        /// <param name="Description"></param>
+        /// <returns></returns>
+        public bool UpdateDescription(int ProdId, string Description)
+        {
+            bool fatto = false;
+            // cerco specifico Prod
+            ProdModel currData = new ProdModel();
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                currData = localDbCtx
+                               .ProdList
+                               .Where(x => x.ProdId == ProdId)
+                               .SingleOrDefault();
+                if (currData != null)
+                {
+                    try
+                    {
+                        // aggiorno valore descrizione
+                        currData.Description = Description;
+
+                        // Commit changes
+                        localDbCtx.SaveChanges();
+                    }
+                    catch (Exception exc)
+                    {
+                        string errMessage = $"EXCEPTION on Prod.UpdateDescription:{Environment.NewLine}{exc}";
+                        Console.WriteLine(errMessage);
+                        Log.Error(errMessage);
+                    }
+                }
+                else
+                {
+                    string errMessage = $"ERROR on Prod.UpdateDescription: req item was not found | ProdId {ProdId} | Description {Description}";
+                    Console.WriteLine(errMessage);
+                    Log.Error(errMessage);
+                }
+            }
+            return fatto;
+        }
+
         /// <summary>
         /// Update record su DB x elenco MachGroup:
         /// - NON vengono eliminati record (se ce ne son altri sul DB non saranno toccati)
@@ -408,7 +605,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                                 .OrderBy(n => n.PartCount);
 
             // controllo: nell'elenco delle barre MachGroupList NON devono esserci duplicati per
-            //            l'ID (esterno) che deve essere univoco...
+            // l'ID (esterno) che deve essere univoco...
             testOk = listaCheck.Where(x => x.PartCount > 1).Count() == 0;
             if (testOk)
             {
@@ -712,33 +909,10 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         protected Core.ProdFileM coreConv(ProdModel currProd)
         {
-            Core.ProdFileM answ = Core.ProdFileM.CreateProdFileM(currProd.ProdId, ProjIdByProd(currProd.ProdId), currProd.DtCreated, currProd.Description, currProd.PType, currProd.Machine, currProd.LockedBy, currProd.LockDate);
+            Core.ProdFileM answ = Core.ProdFileM.CreateProdFileM(currProd.ProdId, ProjIdByProd(currProd.ProdId), currProd.DtCreated, currProd.Description, currProd.PType, currProd.Machine, currProd.LockedBy, currProd.LockDate, currProd.IsActive, currProd.IsProduced, currProd.IsArchived);
             return answ;
         }
 
-        /// <summary>
-        /// Get LAST paginated data from DB (DESC ordered)
-        /// </summary>
-        /// <param name="numRecord"></param>
-        /// <returns></returns>
-        protected List<ProdModel> GetLastDbModelDesc(int numRecord)
-        {
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                // se numRecord = 0 --> passo tutti
-                if (numRecord == 0)
-                {
-                    numRecord = localDbCtx.ProdList.Count();
-                }
-                // retrieve
-                return localDbCtx
-                    .ProdList
-                    .OrderByDescending(x => x.ProdId)
-                    .Take(numRecord)
-                    .ToList();
-            }
-        }
-
         protected List<int> ProjIdByProd(int ProdId)
         {
             var ProjCtr = new ProjController();
@@ -756,5 +930,54 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         private NLog.Logger Log = LogManager.GetCurrentClassLogger();
 
         #endregion Private Fields
+
+        #region Private Methods
+
+        /// <summary>
+        /// Update record su DB x campo IsProduced lasciato private se servisse in futuro x ora NON
+        /// esposto e fatto implicitamente in StatusMapController.StartProd
+        /// </summary>
+        /// <param name="ProdId"></param>
+        /// <param name="IsProduced"></param>
+        /// <returns></returns>
+        private bool UpdateProduced(int ProdId, bool IsProduced)
+        {
+            bool fatto = false;
+            // cerco specifico Prod
+            ProdModel currData = new ProdModel();
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                currData = localDbCtx
+                               .ProdList
+                               .Where(x => x.ProdId == ProdId)
+                               .SingleOrDefault();
+                if (currData != null)
+                {
+                    try
+                    {
+                        // aggiorno valore descrizione
+                        currData.IsProduced = IsProduced;
+
+                        // Commit changes
+                        localDbCtx.SaveChanges();
+                    }
+                    catch (Exception exc)
+                    {
+                        string errMessage = $"EXCEPTION on Prod.UpdateProduced:{Environment.NewLine}{exc}";
+                        Console.WriteLine(errMessage);
+                        Log.Error(errMessage);
+                    }
+                }
+                else
+                {
+                    string errMessage = $"ERROR on Prod.UpdateProduced: req item was not found | ProdId {ProdId} | IsProduced {IsProduced}";
+                    Console.WriteLine(errMessage);
+                    Log.Error(errMessage);
+                }
+            }
+            return fatto;
+        }
+
+        #endregion Private Methods
     }
 }

EgtBEAMWALL.DataLayer/Controllers/ProjController.cs

@@ -45,11 +45,12 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         }
 
         /// <summary>
-        /// Delete Proj on DB by ProjId
+        /// Delete Proj logically / on DB by ProjId
         /// </summary>
         /// <param name="ProjId"></param>
+        /// <param name="IsLogical"></param>
         /// <returns></returns>
-        public bool DeleteProj(int ProjId)
+        public bool DeleteProj(int ProjId, bool IsLogical)
         {
             bool done = false;
 
@@ -59,25 +60,45 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                                 .ProjList
                                 .Where(x => x.ProjId == ProjId)
                                 .SingleOrDefault();
-                // sel delle BTLParts da proj
-                var parts2del = localDbCtx
-                                    .BTLPartList
-                                    .Where(x => x.ProjDbId == currProj.ProjDbId);
 
-                try
+                if (IsLogical)
                 {
-                    // remove from database
-                    localDbCtx.BTLPartList.RemoveRange(parts2del);
-                    localDbCtx.ProjList.Remove(currProj);
-                    // Commit changes
-                    localDbCtx.SaveChanges();
-                    done = true;
+                    try
+                    {
+                        currProj.IsActive = false;
+                        // Commit changes
+                        localDbCtx.SaveChanges();
+                        done = true;
+                    }
+                    catch (Exception exc)
+                    {
+                        string errMessage = $"EXCEPTION on Proj.DeleteProj (logical only): {Environment.NewLine}{exc}";
+                        Console.WriteLine(errMessage);
+                        Log.Error(errMessage);
+                    }
                 }
-                catch (Exception exc)
+                else
                 {
-                    string errMessage = $"EXCEPTION on Proj.DeleteProj: {Environment.NewLine}{exc}";
-                    Console.WriteLine(errMessage);
-                    Log.Error(errMessage);
+                    // sel delle BTLParts da proj
+                    var parts2del = localDbCtx
+                                        .BTLPartList
+                                        .Where(x => x.ProjDbId == currProj.ProjDbId);
+
+                    try
+                    {
+                        // remove from database
+                        localDbCtx.BTLPartList.RemoveRange(parts2del);
+                        localDbCtx.ProjList.Remove(currProj);
+                        // Commit changes
+                        localDbCtx.SaveChanges();
+                        done = true;
+                    }
+                    catch (Exception exc)
+                    {
+                        string errMessage = $"EXCEPTION on Proj.DeleteProj (on DB): {Environment.NewLine}{exc}";
+                        Console.WriteLine(errMessage);
+                        Log.Error(errMessage);
+                    }
                 }
             }
             return done;
@@ -91,8 +112,9 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// Get records filtered by BtlPartName matching regexp BtlFileName[_number]
         /// </summary>
         /// <param name="BtlFileName">Base name to search for (=starts by BtlFileName%)</param>
+        /// <param name="OnlyActive">Solo i record attivi (senza cancellazione logica)</param>
         /// <returns></returns>
-        public List<ProjModel> FindByBtlFileName(string BtlFileName)
+        public List<ProjModel> FindByBtlFileName(string BtlFileName, bool OnlyActive)
         {
             List<ProjModel> searchResult = new List<ProjModel>();
             using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
@@ -100,7 +122,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                 // in primi cerco il record "parent" generale, se non ci fosse inutile proseguire...
                 ProjModel parentRec = localDbCtx
                         .ProjList
-                        .Where(x => x.BTLFileName == BtlFileName)
+                        .Where(x => x.BTLFileName == BtlFileName && (!OnlyActive || x.IsActive))
                         .FirstOrDefault();
                 if (parentRec != null && parentRec.ProjId > 0)
                 {
@@ -109,7 +131,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                     // cerco eventuali dati "child" puliti
                     var childRec = localDbCtx
                             .ProjList
-                            .Where(x => x.BTLFileName.StartsWith(BtlFileName + "_"))
+                            .Where(x => x.BTLFileName.StartsWith(BtlFileName + "_") && (!OnlyActive || x.IsActive))
                             .ToList();
                     // faccio filtro con ricerca regexp x scartare "falsi positivi" come BtlFileName_nonNumero...
                     if (childRec.Count > 0)
@@ -180,7 +202,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <summary>
         /// Get filtered data by ProdId (ASC ordered)
         /// </summary>
-        /// <param name="ProdDbId"></param>
+        /// <param name="ProdId"></param>
         /// <returns></returns>
         public List<Core.ProjFileM> GetByProdAsc(int ProdId)
         {
@@ -280,9 +302,13 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <summary>
         /// Elenco progetti
         /// </summary>
-        /// <param name="numRecord"></param>
+        /// <param name="dtStart">Inizio periodo estrazione (per export date)</param>
+        /// <param name="dtEnd">Fine periodo estrazione (per export date)</param>
+        /// <param name="numRecord">Num max record da recuperare</param>
+        /// <param name="OnlyActive">Solo i record attivi (senza cancellazione logica)</param>
+        /// <param name="ShowArchived">Se true: mostra anche archiviati (default li nasconde)</param>
         /// <returns></returns>
-        public List<Core.ProjFileM> GetLastDesc(int numRecord)
+        public List<Core.ProjFileM> GetLastByExpDesc(DateTime dtStart, DateTime dtEnd, int numRecord, bool OnlyActive, bool ShowArchived = false)
         {
             List<Core.ProjFileM> answ = new List<Core.ProjFileM>();
 
@@ -296,6 +322,71 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                 // retrieve
                 var dbRes = localDbCtx
                                 .ProjList
+                                .Where(x => (!x.IsArchived || ShowArchived) && (x.DtExported >= dtStart && x.DtExported <= dtEnd) && (!OnlyActive || x.IsActive))
+                                .OrderByDescending(x => x.ProjId)
+                                .Take(numRecord)
+                                .ToList();
+                // conversione
+                answ = dbRes.Select(x => coreConv(x)).ToList();
+            }
+            return answ;
+        }
+
+        /// <summary>
+        /// Elenco progetti
+        /// </summary>
+        /// <param name="numRecord">Num max record da recuperare</param>
+        /// <param name="OnlyActive">Solo i record attivi (senza cancellazione logica)</param>
+        /// <param name="ShowArchived">Se true: mostra anche archiviati (default li nasconde)</param>
+        /// <returns></returns>
+        public List<Core.ProjFileM> GetLastDesc(int numRecord, bool OnlyActive, bool ShowArchived = false)
+        {
+            List<Core.ProjFileM> answ = new List<Core.ProjFileM>();
+
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                // se numRecord = 0 --> passo tutti
+                if (numRecord == 0)
+                {
+                    numRecord = localDbCtx.ProjList.Count();
+                }
+                // retrieve
+                var dbRes = localDbCtx
+                                .ProjList
+                                .Where(x => (!x.IsArchived || ShowArchived) && (!OnlyActive || x.IsActive))
+                                .OrderByDescending(x => x.ProjId)
+                                .Take(numRecord)
+                                .ToList();
+                // conversione
+                answ = dbRes.Select(x => coreConv(x)).ToList();
+            }
+            return answ;
+        }
+
+        /// <summary>
+        /// Elenco progetti
+        /// </summary>
+        /// <param name="dtStart">Inizio periodo estrazione</param>
+        /// <param name="dtEnd">Fine periodo estrazione</param>
+        /// <param name="numRecord">Num max record da recuperare</param>
+        /// <param name="OnlyActive">Solo i record attivi (senza cancellazione logica)</param>
+        /// <param name="ShowArchived">Se true: mostra anche archiviati (default li nasconde)</param>
+        /// <returns></returns>
+        public List<Core.ProjFileM> GetLastDesc(DateTime dtStart, DateTime dtEnd, int numRecord, bool OnlyActive, bool ShowArchived = false)
+        {
+            List<Core.ProjFileM> answ = new List<Core.ProjFileM>();
+
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                // se numRecord = 0 --> passo tutti
+                if (numRecord == 0)
+                {
+                    numRecord = localDbCtx.ProjList.Count();
+                }
+                // retrieve
+                var dbRes = localDbCtx
+                                .ProjList
+                                .Where(x => (!x.IsArchived || ShowArchived) && (x.DtCreated >= dtStart && x.DtCreated <= dtEnd) && (!OnlyActive || x.IsActive))
                                 .OrderByDescending(x => x.ProjId)
                                 .Take(numRecord)
                                 .ToList();
@@ -341,6 +432,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                     {
                         ProjId = nextId,
                         BTLFileName = "",
+                        ProjDescription = "",
                         IsNew = true,
                         Locked = true,
                         LockedBy = UserKey,
@@ -577,15 +669,62 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             return currData;
         }
 
+        /// <summary>
+        /// Update record su DB x Description
+        /// </summary>
+        /// <param name="ProjId"></param>
+        /// <param name="Description"></param>
+        /// <returns></returns>
+        public Core.ProjFileM UpdateDescription(int ProjId, string Description)
+        {
+            // cerco specifico Proj
+            ProjModel currData;
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                currData = localDbCtx
+                               .ProjList
+                               .Where(x => x.ProjId == ProjId)
+                               .SingleOrDefault();
+                if (currData != null)
+                {
+                    try
+                    {
+                        // aggiorno valore BTL
+                        currData.ProjDescription = Description;
+
+                        // Commit changes
+                        localDbCtx.SaveChanges();
+                    }
+                    catch (Exception exc)
+                    {
+                        string errMessage = $"EXCEPTION on Proj.UpdateDescription:{Environment.NewLine}{exc}";
+                        Console.WriteLine(errMessage);
+                        Log.Error(errMessage);
+                    }
+                }
+                else
+                {
+                    string errMessage = $"ERROR on Proj.UpdateDescription: req item was not found | ProjId {ProjId} | Description {Description}";
+                    Console.WriteLine(errMessage);
+                    Log.Error(errMessage);
+                }
+            }
+
+            return coreConv(currData);
+        }
+
         /// <summary>
         /// Update record su DB x nomeBTL, ListName, ExportDate
         /// </summary>
         /// <param name="ProjId"></param>
         /// <param name="BTLFileName"></param>
+        /// <param name="Description"></param>
         /// <param name="ListName"></param>
         /// <param name="DtExported"></param>
+        /// <param name="PType"></param>
+        /// <param name="Machine"></param>
         /// <returns></returns>
-        public Core.ProjFileM UpdateInfo(int ProjId, string BTLFileName, string ListName, DateTime DtExported, BWType PType, string Machine)
+        public Core.ProjFileM UpdateInfo(int ProjId, string BTLFileName, string Description, string ListName, DateTime DtExported, BWType PType, string Machine)
         {
             // cerco specifico Proj
             ProjModel currData;
@@ -600,8 +739,10 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                     try
                     {
                         // 2022.01.24: verifico UNIVOCITA' nel nome del file: SE fosse duplicato -->
-                        // nuovo nome, nel formato nomeOriginale_idx, dove idx è il contatore libero successivo
-                        var duplicateList = FindByBtlFileName(BTLFileName);
+                        // nuovo nome, nel formato nomeOriginale_idx, dove idx è il contatore libero
+                        // successivo 2023.06.08: lasciato come prima, anche NON attivi
+                        // (cancellazione logica)
+                        var duplicateList = FindByBtlFileName(BTLFileName, false);
                         // devo verificare SOLO SE la lista non è vuota
                         if (duplicateList != null && duplicateList.Count > 0)
                         {
@@ -635,6 +776,8 @@ namespace EgtBEAMWALL.DataLayer.Controllers
 
                         // aggiorno valore BTL
                         currData.BTLFileName = BTLFileName;
+                        // aggiorno il resto
+                        currData.ProjDescription = Description;
                         currData.DtExported = DtExported;
                         currData.ListName = ListName;
                         currData.PType = PType;
@@ -652,7 +795,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                 }
                 else
                 {
-                    string errMessage = $"ERROR on Proj.UpdateInfo: req item was not found | ProjId {ProjId} | BTLFileName {BTLFileName} | ListName {ListName} | DtExported {DtExported} | PType {PType} | Machine {Machine}";
+                    string errMessage = $"ERROR on Proj.UpdateInfo: req item was not found | ProjId {ProjId} | Description {BTLFileName} | ListName {ListName} | DtExported {DtExported} | PType {PType} | Machine {Machine}";
                     Console.WriteLine(errMessage);
                     Log.Error(errMessage);
                 }
@@ -760,7 +903,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             Core.ProjFileM answ = null;
             if (currProj != null)
             {
-                answ = Core.ProjFileM.CreateProjFileM(currProj.ProjId, ProdIdByProdDbId(currProj.ProdDbId), currProj.DtCreated, currProj.DtExported, currProj.ListName, currProj.BTLFileName, currProj.IsNew, currProj.Locked, currProj.PType, currProj.Machine);
+                answ = Core.ProjFileM.CreateProjFileM(currProj.ProjId, ProdIdByProdDbId(currProj.ProdDbId), currProj.DtCreated, currProj.DtExported, currProj.ListName, currProj.BTLFileName, currProj.ProjDescription, currProj.IsNew, currProj.Locked, currProj.PType, currProj.Machine, currProj.IsActive, currProj.IsArchived);
             }
             return answ;
         }

EgtBEAMWALL.DataLayer/Controllers/StatusMapController.cs

@@ -170,7 +170,37 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                 // Initialize database context
                 using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
                 {
-                    // aggiungo
+                    // per prima cosa indico come prodotto il PROD...
+                    var currProdData = localDbCtx
+                              .ProdList
+                              .Where(x => x.ProdId == ProdId)
+                              .SingleOrDefault();
+                    if (currProdData != null)
+                    {
+                        try
+                        {
+                            // aggiorno valore descrizione
+                            currProdData.IsProduced = true;
+                            // Commit changes
+                            localDbCtx.SaveChanges();
+                            done = true;
+                        }
+                        catch (Exception exc)
+                        {
+                            string errMessage = $"EXCEPTION on Prod.UpdateProduced:{Environment.NewLine}{exc}";
+                            Console.WriteLine(errMessage);
+                            Log.Error(errMessage);
+                        }
+                    }
+                    else
+                    {
+                        string errMessage = $"ERROR on Prod.UpdateProduced: req item was not found | ProdId {ProdId} | IsProduced: true";
+                        Console.WriteLine(errMessage);
+                        Log.Error(errMessage);
+                    }
+                    // resetto done
+                    done = false;
+                    // aggiungo in StatusMap
                     localDbCtx.StatusMapList.Add(prodSMRecord);
 
                     // recupero MachGroup da PROD
@@ -185,8 +215,8 @@ namespace EgtBEAMWALL.DataLayer.Controllers
 
                     // salvo
                     localDbCtx.SaveChanges();
+                    done = true;
                 }
-                done = true;
             }
             return done;
         }

EgtBEAMWALL.DataLayer/DatabaseModels/ProdModel.cs

@@ -8,6 +8,9 @@ using static EgtBEAMWALL.Core.ConstBeam;
 
 namespace EgtBEAMWALL.DataLayer.DatabaseModels
 {
+    // <Auto-Generated>
+    // This is here so CodeMaid doesn't reorganize this document
+    // </Auto-Generated>
     /// <summary>
     /// Tabella deiu raggruppamenti PROJ in forma di PROD
     /// </summary>
@@ -16,12 +19,19 @@ namespace EgtBEAMWALL.DataLayer.DatabaseModels
     {
         #region Public Properties
 
+        /// <summary>
+        /// Chiave univoca DB
+        /// </summary>
+        [Key, Column("ProdDbId"), DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public int ProdDbId { get; set; }
+
         [Column("Description")]
         public string Description { get; set; } = "";
 
         /// <summary>
         /// Data Creazione
         /// </summary>
+        [Index]
         [Column("DtCreated")]
         public DateTime DtCreated { get; set; }
 
@@ -37,6 +47,24 @@ namespace EgtBEAMWALL.DataLayer.DatabaseModels
         [Column("Lock")]
         public bool Locked { get; set; } = false;
 
+        /// <summary>
+        ///  Chiave univoca per EgtBM
+        /// </summary>
+        [Column("Id")]
+        [Index]
+        public int ProdId { get; set; }
+
+        /// <summary>
+        /// Tipologia del progetto (Travi, Pareti, ...)
+        /// </summary>
+        public BWType PType { get; set; } = BWType.NULL;
+
+        /// <summary>
+        /// Macchina
+        /// </summary>
+        [Column("Machine")]
+        public string Machine { get; set; } = "";
+
         /// <summary>
         /// ID utente che ha bloccato (NumKey), quando aperto da un dispositivo in rete
         /// </summary>
@@ -50,27 +78,25 @@ namespace EgtBEAMWALL.DataLayer.DatabaseModels
         public DateTime LockDate { get; set; } = DateTime.MinValue;
 
         /// <summary>
-        /// Macchina
+        /// Record attivo (se false == cancellazione logica)
         /// </summary>
-        [Column("Machine")]
-        public string Machine { get; set; } = "";
+        [Index]
+        [Column("IsActive")]
+        public bool IsActive { get; set; } = true;
 
         /// <summary>
-        /// Chiave univoca DB
+        /// Stato Prodotto = inviato ALMENO UNA VOLTA al supervisore --> NON eliminabile se non in modo logico
         /// </summary>
-        [Key, Column("ProdDbId"), DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-        public int ProdDbId { get; set; }
+        [Index]
+        [Column("IsProduced")]
+        public bool IsProduced { get; set; } = false;
 
         /// <summary>
-        ///  chiave univoca per EgtBM
+        /// Stato Archiviato = NON visualizzabile normalmente, già prodotto
         /// </summary>
-        [Column("Id")]
-        public int ProdId { get; set; }
-
-        /// <summary>
-        /// Tipologia del progetto (Travi, Pareti, ...)
-        /// </summary>
-        public BWType PType { get; set; } = BWType.NULL;
+        [Index]
+        [Column("IsArchived")]
+        public bool IsArchived { get; set; } = false;
 
         #endregion Public Properties
     }

EgtBEAMWALL.DataLayer/DatabaseModels/ProjModel.cs

@@ -1,13 +1,13 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using static EgtBEAMWALL.Core.ConstBeam;
 
 namespace EgtBEAMWALL.DataLayer.DatabaseModels
 {
+    // <Auto-Generated>
+    // This is here so CodeMaid doesn't reorganize this document
+    // </Auto-Generated>
     /// <summary>
     /// Tabella dei PROJ caricati dal BTL
     /// </summary>
@@ -16,6 +16,9 @@ namespace EgtBEAMWALL.DataLayer.DatabaseModels
     {
         #region Public Properties
 
+        [Key, Column("ProjDbId"), DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public int ProjDbId { get; set; }
+
         [Column("BTLFileName")]
         public string BTLFileName { get; set; } = "";
 
@@ -23,17 +26,20 @@ namespace EgtBEAMWALL.DataLayer.DatabaseModels
         /// Data Creazione
         /// </summary>
         [Column("DtCreated")]
+        [Index]
         public DateTime DtCreated { get; set; }
 
         /// <summary>
         /// Data Esportazione
         /// </summary>
         [Column("DtExported")]
+        [Index]
         public DateTime DtExported { get; set; }
 
         /// <summary>
         /// Stato NEW = creato ma NON salvato
         /// </summary>
+        [Index]
         [Column("IsNew")]
         public bool IsNew { get; set; } = true;
 
@@ -49,34 +55,14 @@ namespace EgtBEAMWALL.DataLayer.DatabaseModels
         [Column("Lock")]
         public bool Locked { get; set; } = false;
 
-        /// <summary>
-        /// ID utente che ha bloccato (NumKey), quando aperto da un dispositivo in rete
-        /// </summary>
-        [Column("LockedBy")]
-        public string LockedBy { get; set; } = "";
-
-        /// <summary>
-        /// DataOra ultima operazione di Lock (o di rimozione di lock), quando aperto da un dispositivo in rete
-        /// </summary>
-        [Column("LockDate")]
-        public DateTime LockDate { get; set; } = DateTime.MinValue;
-
-        /// <summary>
-        /// Macchina
-        /// </summary>
-        [Column("Machine")]
-        public string Machine { get; set; } = "";
-
-        [ForeignKey("ProdDbId")]
-        public virtual ProdModel Prod { get; set; }
-
         [Column("ProdDbId")]
         public int? ProdDbId { get; set; }
 
-        [Key, Column("ProjDbId"), DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-        public int ProjDbId { get; set; }
-
+        /// <summary>
+        /// ID da modello ext
+        /// </summary>
         [Column("Id")]
+        [Index]
         public int ProjId { get; set; }
 
         /// <summary>
@@ -84,6 +70,47 @@ namespace EgtBEAMWALL.DataLayer.DatabaseModels
         /// </summary>
         public BWType PType { get; set; } = BWType.NULL;
 
+        /// <summary>
+        /// Macchina
+        /// </summary>
+        [Column("Machine")]
+        public string Machine { get; set; } = "";
+
+        /// <summary>
+        /// ID utente che ha bloccato (NumKey), quando aperto da un dispositivo in rete
+        /// </summary>
+        [Column("LockedBy")]
+        public string LockedBy { get; set; } = "";
+
+        /// <summary>
+        /// DataOra ultima operazione di Lock (o di rimozione di lock), quando aperto da un
+        /// dispositivo in rete
+        /// </summary>
+        [Column("LockDate")]
+        public DateTime LockDate { get; set; } = DateTime.MinValue;
+
+        /// <summary>
+        /// Record attivo (se false == cancellazione logica)
+        /// </summary>
+        [Index]
+        [Column("IsActive")]
+        public bool IsActive { get; set; } = true;
+        /// <summary>
+        /// Descrizione progetto (copiata da BTLFileName inizialmente)
+        /// </summary>
+        [Column("ProjDescription")]
+        public string ProjDescription { get; set; } = "";
+
+        /// <summary>
+        /// Stato Archiviato = NON visualizzabile normalmente, già prodotto
+        /// </summary>
+        [Index]
+        [Column("IsArchived")]
+        public bool IsArchived { get; set; } = false;
+
+        [ForeignKey("ProdDbId")]
+        public virtual ProdModel Prod { get; set; }
+
         #endregion Public Properties
     }
 }

EgtBEAMWALL.DataLayer/DbConfig.cs

@@ -1,7 +1,10 @@
-using System.Diagnostics;
+using Ionic.Zip;
 using System;
+using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using System.Reflection;
+using System.Xml.Linq;
 
 namespace EgtBEAMWALL.DataLayer
 {
@@ -18,6 +21,7 @@ namespace EgtBEAMWALL.DataLayer
         public static string DATABASE_SERV = "127.0.0.1";
 
         public static string DATABASE_USER = "EgtUser";
+        public static string ZIP_PWD = "viacremasca-viacremasca-viacremasca-viacremasca";
 
         #endregion Public Fields
 
@@ -29,7 +33,7 @@ namespace EgtBEAMWALL.DataLayer
         public static string ADMIN_CONNECTION_STRING { get; set; } = "";
 
         /// <summary>
-        /// DB Connection string
+        /// DB Connection string, per effettuare migration riportare valore connessione admin cablato (server=localhost;port=3306;database=EgtBwDb_000102;)
         /// </summary>
         public static string CONNECTION_STRING { get; set; } = "";
 
@@ -72,35 +76,130 @@ namespace EgtBEAMWALL.DataLayer
             // esecuzione script di install locale
             return Controllers.DbController.man.refreshViews(DATABASE_NAME);
         }
+
         /// <summary>
-        /// Effettua DUMP del DB dato utente admin + percorso salvataggio
+        /// Effettua DUMP del DB dato utente admin + percorso salvataggio (zip cifrato)
         /// </summary>
-        /// <param name="outFilePath">Percorso di salvataggio del dump (*.sql)</param>
+        /// <param name="zipFilePath">Percorso di salvataggio del dump (*.zip)</param>
+        /// <param name="dbName">Nome del DB da processare (se vuoto quello di default calcolato)</param>
+        /// <param name="mysqlDumpPath">Nome o Percorso Eseguibile mysqldump (opzionale)</param>
+        /// <param name="exportOpt">Opzioni in fase di export (default: --skip-extended-insert)</param>
         /// <returns></returns>
-        public static bool DumpDB(string mysqlDumpPath, string outFilePath)
+        public static bool DataBaseDumpToFile(string zipFilePath, string dbName = "", string mysqlDumpPath = "mysqldump", string exportOpt = "--skip-extended-insert")
         {
             bool fatto = false;
-            // aggiungo sql finale
-            if (!outFilePath.EndsWith(".sql"))
+            // fix path eseguibile
+            if (string.IsNullOrEmpty(mysqlDumpPath))
             {
-                outFilePath = $"{outFilePath}.sql";
+                mysqlDumpPath = "mysqldump";
             }
+            if (string.IsNullOrEmpty(dbName))
+            {
+                dbName = DATABASE_NAME;
+            }
+            // verifica zip finale
+            if (!zipFilePath.EndsWith(".zip"))
+            {
+                zipFilePath = $"{zipFilePath}.zip";
+            }
+            // creo nome file per export sql (temporaneo)
+            string tempSqlPath = zipFilePath.Replace(".zip", ".sql");
             // esecuzione script x dump del DB
-            string dirPath = Path.GetDirectoryName(outFilePath);
+            string dirPath = Path.GetDirectoryName(zipFilePath);
             if (!Directory.Exists(dirPath))
             {
                 Directory.CreateDirectory(dirPath);
             }
-            // se ci fosse già file elimino...
-            if (File.Exists(outFilePath))
+            // se ci fosse già file elimino (sql/zip)
+            if (File.Exists(tempSqlPath))
             {
-                File.Delete(outFilePath);
+                File.Delete(tempSqlPath);
             }
-            // chiamo script esterno...
-            string callScript = $"\"{mysqlDumpPath}\" -u{DATABASE_USER}  -p{DATABASE_PWD} {DATABASE_NAME} > {outFilePath}";
+            if (File.Exists(zipFilePath))
+            {
+                File.Delete(zipFilePath);
+            }
+            // creazione SQL, tramite  script esterno... importante parametro "--skip-extended-insert" altrimenti problemi con restore (anche se + verboso e lento in backup...)
+            string callScript = $"\"{mysqlDumpPath}\" -u{DATABASE_USER}  -p{DATABASE_PWD} {dbName} {exportOpt} > {tempSqlPath}";
             ExecuteCommand(callScript);
+            // compressione con pwd!
+            using (ZipFile zip = new ZipFile())
+            {
+                // aggiungo pwd
+                zip.Password = ZIP_PWD;
+                // inserisco file
+                zip.AddFile(tempSqlPath, "");
+                zip.Save(zipFilePath);
+                fatto = true;
+            }
+            // elimino file sql temporaneo...
+            if (File.Exists(tempSqlPath))
+            {
+                File.Delete(tempSqlPath);
+            }
             return fatto;
         }
+
+        /// <summary>
+        /// Effettua restore come overwrite del DB di DEFAULT... irreversibile
+        /// </summary>
+        /// <param name="zipFilePath">Percorso di lettura del dump cifrato (*.zip)</param>
+        /// <param name="dbName">Nome del DB da processare (se vuoto quello di default calcolato)</param>
+        /// <param name="tempFolder">Percorso cartella temp x esecuzione</param>
+        /// <param name="mysqlPath">Nome o Percorso Eseguibile mysql (opzionale)</param>
+        /// <param name="importOpt">Opzioni in fase di import (default: --force)</param>
+        /// <returns></returns>
+        public static bool DataBaseRestoreFromFile(string zipFilePath, string dbName = "", string tempFolder="", string mysqlPath = "mysql", string importOpt = "--force")
+        {
+            bool fatto = false;
+            // fix path eseguibile
+            if (string.IsNullOrEmpty(mysqlPath))
+            {
+                mysqlPath = "mysql";
+            }
+            if (string.IsNullOrEmpty(dbName))
+            {
+                dbName = DATABASE_NAME;
+            }
+            if (string.IsNullOrEmpty(tempFolder))
+            {
+                tempFolder = "C:\\Temp";
+            }
+            // verifica zip finale
+            if (!zipFilePath.EndsWith(".zip"))
+            {
+                zipFilePath = $"{zipFilePath}.zip";
+            }
+            // elimino eventuale temp folder precedente...
+            if (Directory.Exists(tempFolder))
+            {
+                Directory.Delete(tempFolder, true);
+            }
+            Directory.CreateDirectory(tempFolder);
+            // scompatto file zip --> sql
+            using (ZipFile zip = ZipFile.Read(zipFilePath))
+            {
+                zip.Password = ZIP_PWD;
+                zip.ExtractAll(tempFolder, ExtractExistingFileAction.OverwriteSilently);
+            }
+            // verifico che ci sia 1 file sql...
+            var sqlFiles = Directory.GetFiles(tempFolder, "*.sql");
+            if (sqlFiles != null && sqlFiles.Length == 1)
+            {
+                // verifico nome file per export sql (temporaneo)
+                string tempSqlPath = sqlFiles.FirstOrDefault();
+                // chiamo script esterno...
+                string callScript = $"\"{mysqlPath}\" -u{DATABASE_USER}  -p{DATABASE_PWD} {importOpt} {dbName} < {tempSqlPath}";
+                ExecuteCommand(callScript);
+                // elimino il file sql importato...
+                File.Delete(tempSqlPath);
+                // elimino temp folder...
+                Directory.Delete(tempFolder, true);
+                fatto = true;
+            }
+            return fatto;
+        }
+
         /// <summary>
         /// Esecuzione di un comando esterno
         /// </summary>
@@ -134,13 +233,12 @@ namespace EgtBEAMWALL.DataLayer
             process.Close();
         }
 
-
         /// <summary>
         /// Metodo di init standard per DB in rete con Master_Key
         /// </summary>
         /// <param name="server">Indirizzo del server (tipicamente indirizzo di rete)</param>
         /// <param name="nKey">Numero chiave</param>
-        /// <param name="sKey">Codice/pwd associato a chaive</param>
+        /// <param name="sKey">Codice/pwd associato a chiave</param>
         /// <param name="masterKey">Numero di chiave master con cui è creato il DB</param>
         public static void InitDb(string server, string nKey, string sKey, string masterKey = "")
         {
@@ -150,6 +248,7 @@ namespace EgtBEAMWALL.DataLayer
             DATABASE_NAME = $"EgtBwDb_{masterKey}";
             DATABASE_USER = $"user_{nKey}";
             DATABASE_PWD = $"pwd_{sKey}";
+            ZIP_PWD = $"{DATABASE_USER}:{DATABASE_PWD}:{DATABASE_USER}:{DATABASE_PWD}";
             CONNECTION_STRING = $"server={DATABASE_SERV};port=3306;database={DATABASE_NAME};uid={DATABASE_USER};pwd={DATABASE_PWD};SslMode=None";
             // stringa admin con utente root egalware...
             ADMIN_CONNECTION_STRING = $"server={DATABASE_SERV};port=3306;database=mysql;uid=root;pwd=Egalware_24068!;SslMode=none;CHARSET=utf8";

EgtBEAMWALL.DataLayer/EgtBEAMWALL.DataLayer.csproj

@@ -40,6 +40,9 @@
     <Reference Include="BouncyCastle.Crypto, Version=1.9.0.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
       <HintPath>..\packages\Portable.BouncyCastle.1.9.0\lib\net40\BouncyCastle.Crypto.dll</HintPath>
     </Reference>
+    <Reference Include="DotNetZip, Version=1.16.0.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
+      <HintPath>..\packages\DotNetZip.1.16.0\lib\net40\DotNetZip.dll</HintPath>
+    </Reference>
     <Reference Include="EgtWPFLib5">
       <HintPath>..\ExtLibs\EgtWPFLib5.dll</HintPath>
     </Reference>
@@ -172,6 +175,18 @@
     <Compile Include="Migrations\202207051703296_UpgradeLockModel.designer.cs">
       <DependentUpon>202207051703296_UpgradeLockModel.cs</DependentUpon>
     </Compile>
+    <Compile Include="Migrations\202306081452095_UpdateProjModel.cs" />
+    <Compile Include="Migrations\202306081452095_UpdateProjModel.designer.cs">
+      <DependentUpon>202306081452095_UpdateProjModel.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Migrations\202308241516227_AddProdStatusVarAndIndex.cs" />
+    <Compile Include="Migrations\202308241516227_AddProdStatusVarAndIndex.designer.cs">
+      <DependentUpon>202308241516227_AddProdStatusVarAndIndex.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Migrations\202308250853396_AddProjArchivedField.cs" />
+    <Compile Include="Migrations\202308250853396_AddProjArchivedField.designer.cs">
+      <DependentUpon>202308250853396_AddProjArchivedField.cs</DependentUpon>
+    </Compile>
     <Compile Include="Migrations\Configuration.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Utils.cs" />
@@ -211,6 +226,15 @@
     <EmbeddedResource Include="Migrations\202207051703296_UpgradeLockModel.resx">
       <DependentUpon>202207051703296_UpgradeLockModel.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Migrations\202306081452095_UpdateProjModel.resx">
+      <DependentUpon>202306081452095_UpdateProjModel.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Migrations\202308241516227_AddProdStatusVarAndIndex.resx">
+      <DependentUpon>202308241516227_AddProdStatusVarAndIndex.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Migrations\202308250853396_AddProjArchivedField.resx">
+      <DependentUpon>202308250853396_AddProjArchivedField.cs</DependentUpon>
+    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

EgtBEAMWALL.DataLayer/Migrations/202306081452095_UpdateProjModel.Designer.cs

@@ -0,0 +1,29 @@
+// <auto-generated />
+namespace EgtBEAMWALL.DataLayer.Migrations
+{
+    using System.CodeDom.Compiler;
+    using System.Data.Entity.Migrations;
+    using System.Data.Entity.Migrations.Infrastructure;
+    using System.Resources;
+    
+    [GeneratedCode("EntityFramework.Migrations", "6.4.4")]
+    public sealed partial class UpdateProjModel : IMigrationMetadata
+    {
+        private readonly ResourceManager Resources = new ResourceManager(typeof(UpdateProjModel));
+        
+        string IMigrationMetadata.Id
+        {
+            get { return "202306081452095_UpdateProjModel"; }
+        }
+        
+        string IMigrationMetadata.Source
+        {
+            get { return null; }
+        }
+        
+        string IMigrationMetadata.Target
+        {
+            get { return Resources.GetString("Target"); }
+        }
+    }
+}

EgtBEAMWALL.DataLayer/Migrations/202306081452095_UpdateProjModel.cs

@@ -0,0 +1,20 @@
+namespace EgtBEAMWALL.DataLayer.Migrations
+{
+    using System;
+    using System.Data.Entity.Migrations;
+    
+    public partial class UpdateProjModel : DbMigration
+    {
+        public override void Up()
+        {
+            AddColumn("dbo.ProjList", "IsActive", c => c.Boolean(nullable: false, defaultValueSql: "1"));
+            AddColumn("dbo.ProjList", "ProjDescription", c => c.String(unicode: false));
+        }
+        
+        public override void Down()
+        {
+            DropColumn("dbo.ProjList", "ProjDescription");
+            DropColumn("dbo.ProjList", "IsActive");
+        }
+    }
+}

EgtBEAMWALL.DataLayer/Migrations/202308241516227_AddProdStatusVarAndIndex.Designer.cs

@@ -0,0 +1,29 @@
+// <auto-generated />
+namespace EgtBEAMWALL.DataLayer.Migrations
+{
+    using System.CodeDom.Compiler;
+    using System.Data.Entity.Migrations;
+    using System.Data.Entity.Migrations.Infrastructure;
+    using System.Resources;
+    
+    [GeneratedCode("EntityFramework.Migrations", "6.4.4")]
+    public sealed partial class AddProdStatusVarAndIndex : IMigrationMetadata
+    {
+        private readonly ResourceManager Resources = new ResourceManager(typeof(AddProdStatusVarAndIndex));
+        
+        string IMigrationMetadata.Id
+        {
+            get { return "202308241516227_AddProdStatusVarAndIndex"; }
+        }
+        
+        string IMigrationMetadata.Source
+        {
+            get { return null; }
+        }
+        
+        string IMigrationMetadata.Target
+        {
+            get { return Resources.GetString("Target"); }
+        }
+    }
+}

EgtBEAMWALL.DataLayer/Migrations/202308241516227_AddProdStatusVarAndIndex.cs

@@ -0,0 +1,42 @@
+namespace EgtBEAMWALL.DataLayer.Migrations
+{
+    using System;
+    using System.Data.Entity.Migrations;
+    
+    public partial class AddProdStatusVarAndIndex : DbMigration
+    {
+        public override void Up()
+        {
+            AddColumn("dbo.ProdList", "IsActive", c => c.Boolean(nullable: false));
+            AddColumn("dbo.ProdList", "IsProduced", c => c.Boolean(nullable: false));
+            AddColumn("dbo.ProdList", "IsArchived", c => c.Boolean(nullable: false));
+            CreateIndex("dbo.ProjList", "DtCreated");
+            CreateIndex("dbo.ProjList", "DtExported");
+            CreateIndex("dbo.ProjList", "IsActive");
+            CreateIndex("dbo.ProjList", "IsNew");
+            CreateIndex("dbo.ProjList", "Id");
+            CreateIndex("dbo.ProdList", "DtCreated");
+            CreateIndex("dbo.ProdList", "Id");
+            CreateIndex("dbo.ProdList", "IsActive");
+            CreateIndex("dbo.ProdList", "IsProduced");
+            CreateIndex("dbo.ProdList", "IsArchived");
+        }
+        
+        public override void Down()
+        {
+            DropIndex("dbo.ProdList", new[] { "IsArchived" });
+            DropIndex("dbo.ProdList", new[] { "IsProduced" });
+            DropIndex("dbo.ProdList", new[] { "IsActive" });
+            DropIndex("dbo.ProdList", new[] { "Id" });
+            DropIndex("dbo.ProdList", new[] { "DtCreated" });
+            DropIndex("dbo.ProjList", new[] { "Id" });
+            DropIndex("dbo.ProjList", new[] { "IsNew" });
+            DropIndex("dbo.ProjList", new[] { "IsActive" });
+            DropIndex("dbo.ProjList", new[] { "DtExported" });
+            DropIndex("dbo.ProjList", new[] { "DtCreated" });
+            DropColumn("dbo.ProdList", "IsArchived");
+            DropColumn("dbo.ProdList", "IsProduced");
+            DropColumn("dbo.ProdList", "IsActive");
+        }
+    }
+}

EgtBEAMWALL.DataLayer/Migrations/202308250853396_AddProjArchivedField.Designer.cs

@@ -0,0 +1,29 @@
+// <auto-generated />
+namespace EgtBEAMWALL.DataLayer.Migrations
+{
+    using System.CodeDom.Compiler;
+    using System.Data.Entity.Migrations;
+    using System.Data.Entity.Migrations.Infrastructure;
+    using System.Resources;
+    
+    [GeneratedCode("EntityFramework.Migrations", "6.4.4")]
+    public sealed partial class AddProjArchivedField : IMigrationMetadata
+    {
+        private readonly ResourceManager Resources = new ResourceManager(typeof(AddProjArchivedField));
+        
+        string IMigrationMetadata.Id
+        {
+            get { return "202308250853396_AddProjArchivedField"; }
+        }
+        
+        string IMigrationMetadata.Source
+        {
+            get { return null; }
+        }
+        
+        string IMigrationMetadata.Target
+        {
+            get { return Resources.GetString("Target"); }
+        }
+    }
+}

EgtBEAMWALL.DataLayer/Migrations/202308250853396_AddProjArchivedField.cs

@@ -0,0 +1,20 @@
+namespace EgtBEAMWALL.DataLayer.Migrations
+{
+    using System;
+    using System.Data.Entity.Migrations;
+    
+    public partial class AddProjArchivedField : DbMigration
+    {
+        public override void Up()
+        {
+            AddColumn("dbo.ProjList", "IsArchived", c => c.Boolean(nullable: false));
+            CreateIndex("dbo.ProjList", "IsArchived");
+        }
+        
+        public override void Down()
+        {
+            DropIndex("dbo.ProjList", new[] { "IsArchived" });
+            DropColumn("dbo.ProjList", "IsArchived");
+        }
+    }
+}

EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.5.5.4")]
-[assembly: AssemblyFileVersion("2.5.5.4")]
+[assembly: AssemblyVersion("2.5.12.2")]
+[assembly: AssemblyFileVersion("2.5.12.2")]

EgtBEAMWALL.DataLayer/packages.config

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="BouncyCastle" version="1.8.5" targetFramework="net472" />
+  <package id="DotNetZip" version="1.16.0" targetFramework="net472" />
   <package id="EntityFramework" version="6.4.4" targetFramework="net452" />
   <package id="Google.Protobuf" version="3.21.9" targetFramework="net472" />
   <package id="K4os.Compression.LZ4" version="1.3.5" targetFramework="net472" />

EgtBEAMWALL.StressTest/App.config

@@ -1,31 +1,51 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <configSections>
-        <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
+        <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
         <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
     </configSections>
     <entityFramework>
-        <defaultConnectionFactory type="MySql.Data.Entity.MySqlConnectionFactory, MySql.Data.Entity.EF6"/>
+        <defaultConnectionFactory type="MySql.Data.Entity.MySqlConnectionFactory, MySql.Data.Entity.EF6" />
         <providers>
 
             <provider invariantName="MySql.Data.MySqlClient" type="MySql.Data.MySqlClient.MySqlProviderServices, Version=6.10.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"></provider>
         </providers>
     </entityFramework>
     <connectionStrings>
-        <add name="DefaultConnection" connectionString="server=localhost;port=3306;User Id=EgtUser;password=viacremasca;Persist Security Info=True;database=EgtBwDb;SslMode=none" providerName="MySql.Data.MySqlClient"/>
+        <add name="DefaultConnection" connectionString="server=localhost;port=3306;User Id=EgtUser;password=viacremasca;Persist Security Info=True;database=EgtBwDb;SslMode=none" providerName="MySql.Data.MySqlClient" />
     </connectionStrings>
     <runtime>
         <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
             <dependentAssembly>
-                <assemblyIdentity name="MySql.Data" publicKeyToken="c5687fc88969c44d" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-6.10.9.0" newVersion="6.10.9.0"/>
+                <assemblyIdentity name="MySql.Data" publicKeyToken="c5687fc88969c44d" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-6.10.9.0" newVersion="6.10.9.0" />
+            </dependentAssembly>
+            <dependentAssembly>
+                <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
+            </dependentAssembly>
+            <dependentAssembly>
+                <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+            </dependentAssembly>
+            <dependentAssembly>
+                <assemblyIdentity name="Google.Protobuf" publicKeyToken="a7d26565bac4d604" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-3.21.9.0" newVersion="3.21.9.0" />
+            </dependentAssembly>
+            <dependentAssembly>
+                <assemblyIdentity name="K4os.Compression.LZ4.Streams" publicKeyToken="2186fa9121ef231d" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-1.3.5.0" newVersion="1.3.5.0" />
+            </dependentAssembly>
+            <dependentAssembly>
+                <assemblyIdentity name="BouncyCastle.Crypto" publicKeyToken="0e99375e54769942" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-1.9.0.0" newVersion="1.9.0.0" />
             </dependentAssembly>
         </assemblyBinding>
     </runtime>
     <system.data>
         <DbProviderFactories>
-            <remove invariant="MySql.Data.MySqlClient"/>
-            <add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.10.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+            <remove invariant="MySql.Data.MySqlClient" />
+            <add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.10.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
         </DbProviderFactories>
     </system.data>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" /></startup></configuration>

EgtBEAMWALL.StressTest/EgtBEAMWALL.StressTest.csproj

@@ -8,7 +8,7 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>EgtBEAMWALL.StressTest</RootNamespace>
     <AssemblyName>EgtBEAMWALL.StressTest</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
     <TargetFrameworkProfile />

EgtBEAMWALL.StressTest/Properties/Resources.Designer.cs

@@ -19,7 +19,7 @@ namespace EgtBEAMWALL.StressTest.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {

EgtBEAMWALL.StressTest/Properties/Settings.Designer.cs

@@ -12,7 +12,7 @@ namespace EgtBEAMWALL.StressTest.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.6.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));

EgtBEAMWALL.StressTest/Simulator.cs

@@ -1,25 +1,11 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
-using System.Text;
 
 namespace EgtBEAMWALL.StressTest
 {
     public class Simulator
     {
-        #region Protected Fields
-
-        protected DataLayer.Controllers.BTLPartController BtlPartCtr = new DataLayer.Controllers.BTLPartController();
-        protected DataLayer.Controllers.MachGroupController MachGroupCtr = new DataLayer.Controllers.MachGroupController();
-        protected SimParams MaxParams = new SimParams();
-
-        protected DataLayer.Controllers.PartController PartCtr = new DataLayer.Controllers.PartController();
-        protected DataLayer.Controllers.ProdController ProdCtr = new DataLayer.Controllers.ProdController();
-        protected DataLayer.Controllers.ProjController ProjCtr = new DataLayer.Controllers.ProjController();
-
-        #endregion Protected Fields
-
         #region Public Fields
 
         public List<Core.BTLPartM> BtlPartList = new List<Core.BTLPartM>();
@@ -30,30 +16,6 @@ namespace EgtBEAMWALL.StressTest
 
         #endregion Public Fields
 
-        #region Protected Properties
-
-        /// <summary>
-        /// restituisce un set di parametri simulazione generando a caso dal set di base
-        /// </summary>
-        protected SimParams RandomParamSet
-        {
-            get
-            {
-                Random rndGen = new Random();
-                SimParams answ = new SimParams()
-                {
-                    BtlPart2Proj = rndGen.Next(MaxParams.BtlPart2Proj) + 1,
-                    BtlRepeat = rndGen.Next(MaxParams.BtlRepeat) + 1,
-                    Part2MachGroup = rndGen.Next(MaxParams.Part2MachGroup) + 1,
-                    Proj2Prod = rndGen.Next(MaxParams.Proj2Prod) + 1
-                };
-
-                return answ;
-            }
-        }
-
-        #endregion Protected Properties
-
         #region Public Methods
 
         /// <summary>
@@ -79,7 +41,7 @@ namespace EgtBEAMWALL.StressTest
                 List<DataLayer.DatabaseModels.BTLPartModel> currPartList = new List<DataLayer.DatabaseModels.BTLPartModel>();
                 List<Core.MyMachGroupM> currMachGroupList = new List<Core.MyMachGroupM>();
                 List<Core.PartM> currMGPartList = new List<Core.PartM>();
-                ProjCtr.UpdateInfo(currProjId, $"{DateTime.Now:yyyyMMdd_HHmmssfff}", $"LN_{DateTime.Now:yyyyMMdd_HHmm}", DateTime.Now.AddSeconds(15), Core.ConstBeam.BWType.BEAM, "SIM01");
+                ProjCtr.UpdateInfo(currProjId, "TestBTL", $"{DateTime.Now:yyyyMMdd_HHmmssfff}", $"LN_{DateTime.Now:yyyyMMdd_HHmm}", DateTime.Now.AddSeconds(15), Core.ConstBeam.BWType.BEAM, "SIM01");
                 // genero le BTLParts ed assegno..
                 for (int j = 0; j < currRandom.BtlPart2Proj; j++)
                 {
@@ -107,8 +69,8 @@ namespace EgtBEAMWALL.StressTest
                     {
                         for (int l = 0; l < currRandom.Part2MachGroup; l++)
                         {
-                            // FixME!!! non può creare x loop in CreateBeamDL che vuole nParentMachGroup
-                            // genero le Part x MachGroup ed assegno
+                            // FixME!!! non può creare x loop in CreateBeamDL che vuole
+                            // nParentMachGroup genero le Part x MachGroup ed assegno
                             Core.PartM currPart = Core.PartM.CreatePart(Core.ConstBeam.BWType.BEAM, currMachGroupList.FirstOrDefault(), currPartList[BPIdx].PartId, 1);
                             currMGPartList.Add(currPart);
                             //currMGPartList.Add(new DataLayer.DatabaseModels.PartModel() { BTLPartDbId = currBTLPart.BTLPartDbId, PDN = l * k * currRandom.Part2MachGroup, PartId = l, H = 10 * l, L = 50 * l, W = 5 * l });
@@ -138,9 +100,45 @@ namespace EgtBEAMWALL.StressTest
 
         public void initDb()
         {
-            var firstData = ProjCtr.GetLastDesc(1);
+            var firstData = ProjCtr.GetLastDesc(1, true);
         }
 
         #endregion Public Methods
+
+        #region Protected Fields
+
+        protected DataLayer.Controllers.BTLPartController BtlPartCtr = new DataLayer.Controllers.BTLPartController();
+        protected DataLayer.Controllers.MachGroupController MachGroupCtr = new DataLayer.Controllers.MachGroupController();
+        protected SimParams MaxParams = new SimParams();
+
+        protected DataLayer.Controllers.PartController PartCtr = new DataLayer.Controllers.PartController();
+        protected DataLayer.Controllers.ProdController ProdCtr = new DataLayer.Controllers.ProdController();
+        protected DataLayer.Controllers.ProjController ProjCtr = new DataLayer.Controllers.ProjController();
+
+        #endregion Protected Fields
+
+        #region Protected Properties
+
+        /// <summary>
+        /// restituisce un set di parametri simulazione generando a caso dal set di base
+        /// </summary>
+        protected SimParams RandomParamSet
+        {
+            get
+            {
+                Random rndGen = new Random();
+                SimParams answ = new SimParams()
+                {
+                    BtlPart2Proj = rndGen.Next(MaxParams.BtlPart2Proj) + 1,
+                    BtlRepeat = rndGen.Next(MaxParams.BtlRepeat) + 1,
+                    Part2MachGroup = rndGen.Next(MaxParams.Part2MachGroup) + 1,
+                    Proj2Prod = rndGen.Next(MaxParams.Proj2Prod) + 1
+                };
+
+                return answ;
+            }
+        }
+
+        #endregion Protected Properties
     }
 }

EgtBEAMWALL.StressTest/StressTest.Designer.cs

@@ -35,6 +35,10 @@ namespace EgtBEAMWALL.StressTest
             this.groupBox1 = new System.Windows.Forms.GroupBox();
             this.buttonDataSeed = new System.Windows.Forms.Button();
             this.labelResult = new System.Windows.Forms.Label();
+            this.btnDbDump = new System.Windows.Forms.Button();
+            this.btnDbRestore = new System.Windows.Forms.Button();
+            this.txtDumpFile = new System.Windows.Forms.TextBox();
+            this.txtDbName = new System.Windows.Forms.TextBox();
             this.groupBox1.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -92,17 +96,57 @@ namespace EgtBEAMWALL.StressTest
             // labelResult
             // 
             this.labelResult.AutoSize = true;
-            this.labelResult.Location = new System.Drawing.Point(479, 91);
+            this.labelResult.Location = new System.Drawing.Point(250, 75);
             this.labelResult.Name = "labelResult";
             this.labelResult.Size = new System.Drawing.Size(35, 13);
             this.labelResult.TabIndex = 4;
             this.labelResult.Text = "label2";
             // 
+            // btnDbDump
+            // 
+            this.btnDbDump.Location = new System.Drawing.Point(18, 136);
+            this.btnDbDump.Name = "btnDbDump";
+            this.btnDbDump.Size = new System.Drawing.Size(75, 45);
+            this.btnDbDump.TabIndex = 5;
+            this.btnDbDump.Text = "DB Dump";
+            this.btnDbDump.UseVisualStyleBackColor = true;
+            this.btnDbDump.Click += new System.EventHandler(this.btnDbDump_Click);
+            // 
+            // btnDbRestore
+            // 
+            this.btnDbRestore.Location = new System.Drawing.Point(338, 136);
+            this.btnDbRestore.Name = "btnDbRestore";
+            this.btnDbRestore.Size = new System.Drawing.Size(75, 45);
+            this.btnDbRestore.TabIndex = 6;
+            this.btnDbRestore.Text = "DB Restore";
+            this.btnDbRestore.UseVisualStyleBackColor = true;
+            this.btnDbRestore.Click += new System.EventHandler(this.btnDbRestore_Click);
+            // 
+            // txtDumpFile
+            // 
+            this.txtDumpFile.Location = new System.Drawing.Point(118, 161);
+            this.txtDumpFile.Name = "txtDumpFile";
+            this.txtDumpFile.Size = new System.Drawing.Size(186, 20);
+            this.txtDumpFile.TabIndex = 3;
+            this.txtDumpFile.Text = "C:\\Temp\\MyDbDump.zip";
+            // 
+            // txtDbName
+            // 
+            this.txtDbName.Location = new System.Drawing.Point(118, 136);
+            this.txtDbName.Name = "txtDbName";
+            this.txtDbName.Size = new System.Drawing.Size(186, 20);
+            this.txtDbName.TabIndex = 7;
+            this.txtDbName.Text = "egtbwdb_000142";
+            // 
             // StressTest
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(800, 450);
+            this.Controls.Add(this.txtDbName);
+            this.Controls.Add(this.txtDumpFile);
+            this.Controls.Add(this.btnDbRestore);
+            this.Controls.Add(this.btnDbDump);
             this.Controls.Add(this.labelResult);
             this.Controls.Add(this.groupBox1);
             this.Name = "StressTest";
@@ -122,6 +166,10 @@ namespace EgtBEAMWALL.StressTest
         private System.Windows.Forms.GroupBox groupBox1;
         private System.Windows.Forms.Button buttonDataSeed;
         private System.Windows.Forms.Label labelResult;
+        private System.Windows.Forms.Button btnDbDump;
+        private System.Windows.Forms.Button btnDbRestore;
+        private System.Windows.Forms.TextBox txtDumpFile;
+        private System.Windows.Forms.TextBox txtDbName;
     }
 }
 

EgtBEAMWALL.StressTest/StressTest.cs

@@ -1,17 +1,25 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
 using System.Diagnostics;
-using System.Drawing;
-using System.Linq;
-using System.Text;
+using System.IO;
 using System.Windows.Forms;
 
 namespace EgtBEAMWALL.StressTest
 {
     public partial class StressTest : Form
     {
+        #region Public Constructors
+
+        public StressTest()
+        {
+            InitializeComponent();
+            // init cablato sul mio DB
+            DataLayer.DbConfig.InitDb("127.0.0.1", "000470", "36311", "000470");
+            //// warm up DB
+            //CurrSim.initDb();
+        }
+
+        #endregion Public Constructors
+
         #region Protected Fields
 
         /// <summary>
@@ -21,17 +29,6 @@ namespace EgtBEAMWALL.StressTest
 
         #endregion Protected Fields
 
-        #region Public Constructors
-
-        public StressTest()
-        {
-            InitializeComponent();
-            // warm up DB
-            CurrSim.initDb();
-        }
-
-        #endregion Public Constructors
-
         #region Protected Properties
 
         protected int numProj
@@ -52,6 +49,54 @@ namespace EgtBEAMWALL.StressTest
 
         #region Private Methods
 
+        private void btnDbDump_Click(object sender, EventArgs e)
+        {
+            var result = MessageBox.Show("Sicuro di voler generare il dump del DB corrente?", "DB Dump", MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation);
+
+            if (result == DialogResult.Yes)
+            {
+                labelResult.Text = "...";
+                Stopwatch sw = new Stopwatch();
+                sw.Start();
+                //string binPath = "C:\\Program Files\\MariaDB 10.5\\bin";
+                //string myDumpPath = Path.Combine(binPath, "mysqldump.exe");
+                string outPath = txtDumpFile.Text.Trim();
+                string dbName = txtDbName.Text.Trim();
+                if (!string.IsNullOrEmpty(outPath))
+                {
+                    // effettua dump
+                    //DataLayer.DbConfig.DataBaseDumpToFile(outPath,  "mysqldump");
+                    //DataLayer.DbConfig.DataBaseDumpToFile(outPath, "mysqldump", "--skip-extended-insert");
+                    DataLayer.DbConfig.DataBaseDumpToFile(outPath, dbName);
+                    sw.Stop();
+                    var elapsed = sw.Elapsed;
+                    labelResult.Text = $"{DateTime.Now:yyyy/MM/dd HH:mm:ss} | Dump Done in {elapsed.TotalSeconds:N3} sec!";
+                }
+            }
+        }
+
+        private void btnDbRestore_Click(object sender, EventArgs e)
+        {
+            var result = MessageBox.Show("Sicuro di voler ripristinare il file dump sul DB corrente?", "DB Restore", MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation);
+
+            if (result == DialogResult.Yes)
+            {
+                labelResult.Text = "...";
+                string inPath = txtDumpFile.Text.Trim();
+                string dbName = txtDbName.Text.Trim();
+                string tempFolder = Path.Combine(Path.GetDirectoryName(inPath), "DbRestore");
+                Stopwatch sw = new Stopwatch();
+                sw.Start();
+                // effettua restore
+                DataLayer.DbConfig.DataBaseRestoreFromFile(inPath, dbName, tempFolder); sw.Stop();
+                //string binPath = "C:\\Program Files\\MariaDB 10.5\\bin";
+                //string mysqlPath = Path.Combine(binPath, "mysql.exe");
+                //DataLayer.DbConfig.DataBaseRestoreFromFile(inPath, "mysql");
+                var elapsed = sw.Elapsed;
+                labelResult.Text = $"{DateTime.Now:yyyy/MM/dd HH:mm:ss} | Restore Done in {elapsed.TotalSeconds:N3} sec!";
+            }
+        }
+
         private void buttonDataSeed_Click(object sender, EventArgs e)
         {
             // genero dati col SIM

EgtBEAMWALL.Supervisor/EgtBEAMWALL.Supervisor.vbproj

@@ -149,6 +149,9 @@
     <Reference Include="Csv, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Csv.1.0.31\lib\net40\Csv.dll</HintPath>
     </Reference>
+    <Reference Include="DotNetZip, Version=1.16.0.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
+      <HintPath>..\packages\DotNetZip.1.16.0\lib\net40\DotNetZip.dll</HintPath>
+    </Reference>
     <Reference Include="EgtUILib, Version=2.4.3.1, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\ExtLibs\EgtUILib.dll</HintPath>
@@ -177,9 +180,6 @@
       <HintPath>..\ExtLibs\Interop.FXServer.dll</HintPath>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
-    <Reference Include="Ionic.Zip, Version=1.9.1.8, Culture=neutral, PublicKeyToken=edbe51ad942a3f5c, processorArchitecture=MSIL">
-      <HintPath>..\packages\Ionic.Zip.1.9.1.8\lib\Ionic.Zip.dll</HintPath>
-    </Reference>
     <Reference Include="ISOCNC.Remoting">
       <HintPath>..\ExtLibs\ISOCNC.Remoting.dll</HintPath>
     </Reference>

EgtBEAMWALL.Supervisor/ItemParamList/RawPartListV.xaml

@@ -4,10 +4,12 @@
              xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.Supervisor"
              xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core">
    <!--<ToggleButton IsChecked="{Binding DataContext.bL_IsReadOnly, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:RawPartListV}}}"/>-->
-   <EgtBEAMWALLCORE:EgtDataGrid ItemsSource="{Binding Tag.MachGroupVMList,
+   <EgtBEAMWALLCORE:EgtDataGrid x:Name="MachGroupDataGrid"
+                                ItemsSource="{Binding Tag.MachGroupVMList_View,
                                                       RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:RawPartListV}}}"
                                 SelectedItem="{Binding Tag.SelectedMachGroup,
                                                        RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:RawPartListV}}}"
+                                IsSynchronizedWithCurrentItem="True"
                                 AutoGenerateColumns="False"
                                 CanUserDeleteRows="False"
                                 CanUserResizeRows="False"
@@ -17,6 +19,7 @@
                                 ScrollViewer.HorizontalScrollBarVisibility="Auto"
                                 Margin="0,0,0,5"
                                 BindingColumns="{Binding RawPartColumns}"
+                                Sorting="MachGroupVMList_Sorting"
                                 Style="{StaticResource DataGrid_CustomHighLight}">
       <DataGrid.Resources>
          <!--ID - Id gruppo-->

EgtBEAMWALL.Supervisor/ItemParamList/RawPartListV.xaml.vb

@@ -1,4 +1,19 @@
-Public Class RawPartListV
+Imports EgtBEAMWALL.Core
+Imports Mysqlx
+Imports Org.BouncyCastle.Crypto
+Imports System.ComponentModel
+
+Public Class RawPartListV
+
+   Sub New()
+
+      ' This call is required by the designer.
+      InitializeComponent()
+
+      ' Add any initialization after the InitializeComponent() call.
+      MyComparer.SetDataGrid(MachGroupDataGrid)
+      AddHandler MachGroupDataGrid.ResetSort, AddressOf MachGroupDataGrid_ResetSort
+   End Sub
 
    ' funzione che permette di selezionare un RawPart anche quando gia' selezionato
    Private Sub RawPartRow_PreviewMouseDown(sender As Object, e As MouseButtonEventArgs)
@@ -12,4 +27,432 @@
       End If
    End Sub
 
+   Private Sub MachGroupVMList_Sorting(sender As Object, e As DataGridSortingEventArgs)
+      ' aggiorno direziona colonna
+      Dim column As DataGridColumn = e.Column
+      column.SortDirection = If((column.SortDirection <> ListSortDirection.Ascending), ListSortDirection.Ascending, ListSortDirection.Descending)
+      ' ricalcolo colonne sort
+      Dim datagrid As DataGrid = sender
+      MyComparer.RefreshColumns()
+      ' lancio sort custom
+      Map.refSupervisorMachGroupPanelVM.RefreshMachGroupVMSort()
+      e.Handled = True
+   End Sub
+
+   'Private Sub MachGroupVMList_Sorting(sender As Object, e As DataGridSortingEventArgs)
+   '   Dim column As DataGridColumn = e.Column
+   '   Dim datagrid As DataGrid = sender
+   '   Dim comparer As IComparer = Nothing
+   '   e.Handled = True
+   '   Dim direction As ListSortDirection = If((column.SortDirection <> ListSortDirection.Ascending), ListSortDirection.Ascending, ListSortDirection.Descending)
+   '   column.SortDirection = direction
+   '   Dim m_ColumnList As New List(Of DataGridColumn)
+   '   Dim m_EgtColumnList As New List(Of EgtDataGridColumn)
+   '   For Each col In datagrid.Columns
+   '      If Not IsNothing(col.SortDirection) Then
+   '         m_ColumnList.Add(col)
+   '         m_EgtColumnList.Add(Map.refRawPartListVM.RawPartColumns(col.DisplayIndex))
+   '      End If
+   '   Next
+   '   Dim lcv As ListCollectionView = CType(CollectionViewSource.GetDefaultView(datagrid.ItemsSource), ListCollectionView)
+   '   comparer = New MyComparer(Map.refRawPartListVM.RawPartColumns(column.DisplayIndex), m_ColumnList, m_EgtColumnList, direction)
+   '   lcv.CustomSort = comparer
+   'End Sub
+
+   Private Sub MachGroupDataGrid_ResetSort()
+      MyComparer.RefreshColumns()
+      Map.refSupervisorMachGroupPanelVM.RefreshMachGroupVMSort()
+   End Sub
+
 End Class
+
+Friend Class MyComparer
+   Implements IComparer
+
+   Private Shared DataGrid As DataGrid
+   Friend Shared Sub SetDataGrid(value As DataGrid)
+      DataGrid = value
+   End Sub
+
+   Private Shared m_ColumnList As New List(Of DataGridColumn)
+   Private Shared m_EgtColumnList As New List(Of EgtDataGridColumn)
+
+   Friend Shared Sub RefreshColumns()
+      m_ColumnList.Clear()
+      m_EgtColumnList.Clear()
+      For Each col In DataGrid.Columns
+         If Not IsNothing(col.SortDirection) Then
+            m_ColumnList.Add(col)
+            m_EgtColumnList.Add(Map.refRawPartListVM.RawPartColumns(col.DisplayIndex))
+         End If
+      Next
+      Map.refRawPartListVM.SetRawPartListSorted(m_ColumnList.Count > 0)
+   End Sub
+
+
+   Public Function Compare(x As Object, y As Object) As Integer Implements IComparer.Compare
+      Dim First As MyMachGroupVM = DirectCast(x, MyMachGroupVM)
+      Dim Second As MyMachGroupVM = DirectCast(y, MyMachGroupVM)
+      Dim bFirstProduced As Boolean = First.nProduction_State = Core.ItemState.WIP OrElse First.nProduction_State = Core.ItemState.Produced
+      Dim bSecondProduced As Boolean = Second.nProduction_State = Core.ItemState.WIP OrElse Second.nProduction_State = Core.ItemState.Produced
+      Dim bFirstInQueue As Boolean = First.bToBeProduced
+      Dim bSecondInQueue As Boolean = Second.bToBeProduced
+      ' verifico se gia' prodotti
+      If bFirstProduced AndAlso bSecondProduced Then
+         If First.nProductionIndex > Second.nProductionIndex Then
+            Return 1
+         ElseIf First.nProductionIndex < Second.nProductionIndex Then
+            Return -1
+         Else
+            Return 0
+         End If
+      ElseIf bFirstProduced Then
+         Return -1
+      ElseIf bSecondProduced Then
+         Return 1
+      ElseIf bFirstInQueue AndAlso bSecondInQueue Then
+         If First.nProductionIndex > Second.nProductionIndex Then
+            Return 1
+         ElseIf First.nProductionIndex < Second.nProductionIndex Then
+            Return -1
+         Else
+            Return 0
+         End If
+      ElseIf bFirstInQueue Then
+         Return -1
+      ElseIf bSecondInQueue Then
+         Return 1
+      Else
+         ' verifico ordine per colonne
+         Dim ColumnIndex = 0
+         While ColumnIndex <= m_EgtColumnList.Count - 1
+            Dim nDir As ListSortDirection = If(m_ColumnList(ColumnIndex).SortDirection, 1, -1)
+            Dim nCheck As Integer = Check(First, Second, nDir, m_EgtColumnList(ColumnIndex))
+            If nCheck <> 0 Then
+               Return nCheck
+            End If
+            ColumnIndex += 1
+         End While
+         ' se non trovo colonne, metto in ordine indice di produzione
+         If First.nProductionIndex > Second.nProductionIndex Then
+            Return 1
+         ElseIf First.nProductionIndex < Second.nProductionIndex Then
+            Return -1
+         Else
+            Return 0
+         End If
+      End If
+   End Function
+
+   Private Function Check(First As MyMachGroupVM, Second As MyMachGroupVM, nDirection As Integer, Column As EgtDataGridColumn) As Integer
+      Select Case Column.Name
+         Case COL_NAME
+            If First.nName > Second.nName Then
+               Return 1 * nDirection
+            ElseIf First.nName < Second.nName Then
+               Return -1 * nDirection
+            Else
+               Return 0
+            End If
+         Case COL_STARTCUT
+            If First.Id > Second.Id Then
+               Return 1 * nDirection
+            ElseIf First.Id < Second.Id Then
+               Return -1 * nDirection
+            Else
+               Return 0
+            End If
+         Case COL_W
+            If First.dW > Second.dW Then
+               Return 1 * nDirection
+            ElseIf First.dW < Second.dW Then
+               Return -1 * nDirection
+            Else
+               Return 0
+            End If
+         Case COL_H
+            If First.dH > Second.dH Then
+               Return 1 * nDirection
+            ElseIf First.dH < Second.dH Then
+               Return -1 * nDirection
+            Else
+               Return 0
+            End If
+         Case COL_L
+            If First.dL > Second.dL Then
+               Return 1 * nDirection
+            ElseIf First.dL < Second.dL Then
+               Return -1 * nDirection
+            Else
+               Return 0
+            End If
+         Case COL_POSZ
+               'If First.posz > Second.dL Then
+               '   Return 1 * nDirection
+               'ElseIf First.dL < Second.dL Then
+               '   Return -1 * nDirection
+               'Else
+               '   Return 0
+               'End If
+         Case COL_MATERIAL
+            If First.sMATERIAL > Second.sMATERIAL Then
+               Return 1 * nDirection
+            ElseIf First.sMATERIAL < Second.sMATERIAL Then
+               Return -1 * nDirection
+            Else
+               Return 0
+            End If
+         Case COL_USAGE
+            If First.dUsage > Second.dUsage Then
+               Return 1 * nDirection
+            ElseIf First.dUsage < Second.dUsage Then
+               Return -1 * nDirection
+            Else
+               Return 0
+            End If
+         Case COL_WASTE
+            If First.dWaste > Second.dWaste Then
+               Return 1 * nDirection
+            ElseIf First.dWaste < Second.dWaste Then
+               Return -1 * nDirection
+            Else
+               Return 0
+            End If
+      End Select
+      Return 0
+   End Function
+
+End Class
+
+
+'Friend Class MyComparer
+'   Implements IComparer
+
+'   Dim m_Direction As ListSortDirection
+'   Dim m_Column As EgtDataGridColumn
+'   Dim m_ColumnList As List(Of DataGridColumn)
+'   Dim m_EgtColumnList As New List(Of EgtDataGridColumn)
+
+'   Sub New(Column As EgtDataGridColumn, ColumnList As List(Of DataGridColumn), EgtColumnList As List(Of EgtDataGridColumn), Direction As ListSortDirection)
+'      m_Column = Column
+'      m_ColumnList = ColumnList
+'      m_EgtColumnList = EgtColumnList
+'      m_Direction = Direction
+'   End Sub
+
+'   Public Function Compare(x As Object, y As Object) As Integer Implements IComparer.Compare
+'      Dim First As MyMachGroupVM = DirectCast(x, MyMachGroupVM)
+'      Dim Second As MyMachGroupVM = DirectCast(y, MyMachGroupVM)
+'      Dim bFirstProduced As Boolean = First.nProduction_State = Core.ItemState.WIP OrElse First.nProduction_State = Core.ItemState.Produced
+'      Dim bSecondProduced As Boolean = Second.nProduction_State = Core.ItemState.WIP OrElse Second.nProduction_State = Core.ItemState.Produced
+'      Dim nDirection As Integer = If(m_Direction, 1, -1)
+'      If bFirstProduced AndAlso bSecondProduced Then
+'         If First.nProductionIndex > Second.nProductionIndex Then
+'            Return 1
+'         ElseIf First.nProductionIndex < Second.nProductionIndex Then
+'            Return -1
+'         Else
+'            Return 0
+'         End If
+'      ElseIf bFirstProduced Then
+'         Return -1
+'      ElseIf bSecondProduced Then
+'         Return 1
+'      Else
+'         Dim ColumnIndex = 0
+'         While ColumnIndex <= m_EgtColumnList.Count - 1
+'            Dim nDir As ListSortDirection = If(m_ColumnList(ColumnIndex).SortDirection, 1, -1)
+'            Dim nCheck As Integer = Check(First, Second, nDir, m_EgtColumnList(ColumnIndex))
+'            If nCheck <> 0 Then
+'               Return nCheck
+'            End If
+'            ColumnIndex += 1
+'         End While
+'         Return 0
+'      End If
+'   End Function
+
+'   Private Function Check(First As MyMachGroupVM, Second As MyMachGroupVM, nDirection As Integer, Column As EgtDataGridColumn) As Integer
+'      Select Case Column.Name
+'         Case COL_NAME
+'            If First.nName > Second.nName Then
+'               Return 1 * nDirection
+'            ElseIf First.nName < Second.nName Then
+'               Return -1 * nDirection
+'            Else
+'               Return 0
+'            End If
+'         Case COL_STARTCUT
+'            If First.Id > Second.Id Then
+'               Return 1 * nDirection
+'            ElseIf First.Id < Second.Id Then
+'               Return -1 * nDirection
+'            Else
+'               Return 0
+'            End If
+'         Case COL_W
+'            If First.dW > Second.dW Then
+'               Return 1 * nDirection
+'            ElseIf First.dW < Second.dW Then
+'               Return -1 * nDirection
+'            Else
+'               Return 0
+'            End If
+'         Case COL_H
+'            If First.dH > Second.dH Then
+'               Return 1 * nDirection
+'            ElseIf First.dH < Second.dH Then
+'               Return -1 * nDirection
+'            Else
+'               Return 0
+'            End If
+'         Case COL_L
+'            If First.dL > Second.dL Then
+'               Return 1 * nDirection
+'            ElseIf First.dL < Second.dL Then
+'               Return -1 * nDirection
+'            Else
+'               Return 0
+'            End If
+'         Case COL_POSZ
+'               'If First.posz > Second.dL Then
+'               '   Return 1 * nDirection
+'               'ElseIf First.dL < Second.dL Then
+'               '   Return -1 * nDirection
+'               'Else
+'               '   Return 0
+'               'End If
+'         Case COL_MATERIAL
+'            If First.sMATERIAL > Second.sMATERIAL Then
+'               Return 1 * nDirection
+'            ElseIf First.sMATERIAL < Second.sMATERIAL Then
+'               Return -1 * nDirection
+'            Else
+'               Return 0
+'            End If
+'         Case COL_USAGE
+'            If First.dUsage > Second.dUsage Then
+'               Return 1 * nDirection
+'            ElseIf First.dUsage < Second.dUsage Then
+'               Return -1 * nDirection
+'            Else
+'               Return 0
+'            End If
+'         Case COL_WASTE
+'            If First.dWaste > Second.dWaste Then
+'               Return 1 * nDirection
+'            ElseIf First.dWaste < Second.dWaste Then
+'               Return -1 * nDirection
+'            Else
+'               Return 0
+'            End If
+'      End Select
+'   End Function
+
+'   'Public Function Compare(x As Object, y As Object) As Integer Implements IComparer.Compare
+'   '   Dim First As MyMachGroupVM = DirectCast(x, MyMachGroupVM)
+'   '   Dim Second As MyMachGroupVM = DirectCast(y, MyMachGroupVM)
+'   '   Dim bFirstProduced As Boolean = First.nProduction_State = Core.ItemState.WIP OrElse First.nProduction_State = Core.ItemState.Produced
+'   '   Dim bSecondProduced As Boolean = Second.nProduction_State = Core.ItemState.WIP OrElse Second.nProduction_State = Core.ItemState.Produced
+'   '   Dim nDirection As Integer = If(m_Direction, 1, -1)
+'   '   If bFirstProduced AndAlso bSecondProduced Then
+'   '      If First.nProductionIndex > Second.nProductionIndex Then
+'   '         Return 1
+'   '      ElseIf First.nProductionIndex < Second.nProductionIndex Then
+'   '         Return -1
+'   '      Else
+'   '         Return 0
+'   '      End If
+'   '   ElseIf bFirstProduced Then
+'   '      Return -1
+'   '   ElseIf bSecondProduced Then
+'   '      Return 1
+'   '   Else
+'   '      Select Case m_Column.Name
+'   '         Case COL_NAME
+'   '            If First.nName > Second.nName Then
+'   '               Return 1 * nDirection
+'   '            ElseIf First.nName < Second.nName Then
+'   '               Return -1 * nDirection
+'   '            Else
+'   '               Return 0
+'   '            End If
+'   '         Case COL_STARTCUT
+'   '            If First.Id > Second.Id Then
+'   '               Return 1 * nDirection
+'   '            ElseIf First.Id < Second.Id Then
+'   '               Return -1 * nDirection
+'   '            Else
+'   '               Return 0
+'   '            End If
+'   '         Case COL_W
+'   '            If First.dW > Second.dW Then
+'   '               Return 1 * nDirection
+'   '            ElseIf First.dW < Second.dW Then
+'   '               Return -1 * nDirection
+'   '            Else
+'   '               Return 0
+'   '            End If
+'   '         Case COL_H
+'   '            If First.dH > Second.dH Then
+'   '               Return 1 * nDirection
+'   '            ElseIf First.dH < Second.dH Then
+'   '               Return -1 * nDirection
+'   '            Else
+'   '               Return 0
+'   '            End If
+'   '         Case COL_L
+'   '            If First.dL > Second.dL Then
+'   '               Return 1 * nDirection
+'   '            ElseIf First.dL < Second.dL Then
+'   '               Return -1 * nDirection
+'   '            Else
+'   '               Return 0
+'   '            End If
+'   '         Case COL_POSZ
+'   '            'If First.posz > Second.dL Then
+'   '            '   Return 1 * nDirection
+'   '            'ElseIf First.dL < Second.dL Then
+'   '            '   Return -1 * nDirection
+'   '            'Else
+'   '            '   Return 0
+'   '            'End If
+'   '         Case COL_MATERIAL
+'   '            If First.sMATERIAL > Second.sMATERIAL Then
+'   '               Return 1 * nDirection
+'   '            ElseIf First.sMATERIAL < Second.sMATERIAL Then
+'   '               Return -1 * nDirection
+'   '            Else
+'   '               Return 0
+'   '            End If
+'   '         Case COL_USAGE
+'   '            If First.dUsage > Second.dUsage Then
+'   '               Return 1 * nDirection
+'   '            ElseIf First.dUsage < Second.dUsage Then
+'   '               Return -1 * nDirection
+'   '            Else
+'   '               Return 0
+'   '            End If
+'   '         Case COL_WASTE
+'   '            If First.dWaste > Second.dWaste Then
+'   '               Return 1 * nDirection
+'   '            ElseIf First.dWaste < Second.dWaste Then
+'   '               Return -1 * nDirection
+'   '            Else
+'   '               Return 0
+'   '            End If
+'   '      End Select
+'   '      'Dim dFirstValue As Double
+'   '      'If First.nProductionIndex > Second.nProductionIndex Then
+'   '      '   Return 1 * nDirection
+'   '      'ElseIf First.nProductionIndex < Second.nProductionIndex Then
+'   '      '   Return -1 * nDirection
+'   '      'Else
+'   '      '   Return 0
+'   '      'End If
+'   '   End If
+
+'   '   Throw New NotImplementedException()
+'   'End Function
+
+'End Class

EgtBEAMWALL.Supervisor/ItemParamList/RawPartListVM.vb

@@ -6,6 +6,17 @@ Public Class RawPartListVM
 
 #Region "FIELDS & PROPERTIES"
 
+   Private m_bRawPartListSorted As Boolean
+   Public ReadOnly Property bRawPartListSorted As Boolean
+      Get
+         Return m_bRawPartListSorted
+      End Get
+   End Property
+   Friend Sub SetRawPartListSorted(value As Boolean)
+      m_bRawPartListSorted = value
+      Map.refLeftPanelVM.NotifyPropertyChanged(NameOf(Map.refLeftPanelVM.MoveRawPart_IsEnabled))
+   End Sub
+
    Private m_colRawPart_StartCut As EgtDataGridColumn
    Public ReadOnly Property colRawPart_StartCut As EgtDataGridColumn
       Get

EgtBEAMWALL.Supervisor/LeftPanel/LeftPanelVM.vb

@@ -1,4 +1,5 @@
 Imports System.Collections.ObjectModel
+Imports System.ComponentModel
 Imports System.Globalization
 Imports System.IO
 Imports System.Windows.Threading
@@ -40,7 +41,7 @@ Public Class LeftPanelVM
          Return m_SelChannel
       End Get
       Set(ByVal value As IdNameStruct)
-         MachManaging.CommandList.Add(ThreadCommand.CreateCommand(CommandTypes.SETCHANNEL, value.Id))
+         MachManaging.AddToCommandList(ThreadCommand.CreateCommand(CommandTypes.SETCHANNEL, value.Id))
          m_SelChannel = value
       End Set
    End Property
@@ -86,7 +87,7 @@ Public Class LeftPanelVM
          Return m_SelOPMode
       End Get
       Set(ByVal value As OPState)
-         MachManaging.CommandList.Add(ThreadCommand.CreateCommand(CommandTypes.SETOPMODE, value.Id))
+         MachManaging.AddToCommandList(ThreadCommand.CreateCommand(CommandTypes.SETOPMODE, value.Id))
          ' se MDI
          If value.Id = OPModes.Mdi Then
             ' mostro pagina comandi MDI
@@ -198,6 +199,8 @@ Public Class LeftPanelVM
             Return False
          ElseIf IsNothing(Map.refProjectVM.SupervisorMachGroupPanelVM.SelectedMachGroup) Then
             Return False
+         ElseIf Map.refRawPartListVM.bRawPartListSorted Then
+            Return False
          ElseIf Not IsNothing(Map.refProjectVM.SupervisorMachGroupPanelVM.SelectedMachGroup) Then
             Dim SelMachgroup As MyMachGroupVM = DirectCast(Map.refProjectVM.SupervisorMachGroupPanelVM.SelectedMachGroup, MyMachGroupVM)
             Return SelMachgroup.nProduction_State <= ItemState.Confirmed AndAlso Not SelMachgroup.bToBeProduced
@@ -434,6 +437,10 @@ Public Class LeftPanelVM
                                                          New OPState("Reset", OPStates.End),
                                                          New OPState("Unspecified", OPStates.Unspecified)
          }
+         Case Else
+            m_OPStateList = New List(Of OPState) From {
+                                                         New OPState("Unspecified", OPStates.Unspecified)
+         }
       End Select
       ' seleziono in partenza unspecified
       Dim UnspecifiedState As OPState = m_OPStateList.FirstOrDefault(Function(x) x.Id = OPStates.Unspecified)
@@ -512,7 +519,8 @@ Public Class LeftPanelVM
       If IsNothing(Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList) OrElse Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList.Count = 0 Then Return
       If Not Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList.Any(Function(x As MyMachGroupVM) x.nProduction_State <= ItemState.Confirmed) Then Return
       If Not Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList.Any(Function(x As MyMachGroupVM) x.dtStartTime = DateTime.MinValue) Then Return
-      Dim ToDoList As List(Of MachGroupVM) = Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList.Where(Function(x As MyMachGroupVM) x.nProduction_State <= 1 AndAlso Not x.bResetWhileCutting AndAlso x.dtStartTime = DateTime.MinValue AndAlso Not x.bToBeProduced).ToList()
+      Dim View As List(Of MachGroupVM) = Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList_View.Cast(Of MachGroupVM).ToList()
+      Dim ToDoList As List(Of MachGroupVM) = View.Where(Function(x As MyMachGroupVM) x.nProduction_State <= 1 AndAlso Not x.bResetWhileCutting AndAlso x.dtStartTime = DateTime.MinValue AndAlso Not x.bToBeProduced).ToList()
       If Not IsNothing(ToDoList) AndAlso ToDoList.Count > 0 Then
          MyMachGroupVM.Produce(ToDoList)
       End If
@@ -561,6 +569,8 @@ Public Class LeftPanelVM
       If CurrentMachine.Flow = FlowTypes.ONEBYONE Then
          MyMachGroupVM.UpdateProduceIsEnabledForAll()
       End If
+      ' aggiorno log macchina
+      Map.refMachineLogPageVM.UpdateMachineLogList(False)
    End Sub
 
 #End Region    ' DoneRawPart
@@ -800,6 +810,8 @@ Public Class LeftPanelVM
       Next
       SetDonePart(SelMachGroup, SelMachGroup.SelPart)
       Map.refProjectVM.SupervisorMachGroupPanelVM.SelectedMachGroup = SelMachGroup
+      ' aggiorno log macchina
+      Map.refMachineLogPageVM.UpdateMachineLogList(False)
    End Sub
 
    Public Sub SetDonePart(MachGroup As MyMachGroupVM, Part As PartVM)
@@ -815,8 +827,9 @@ Public Class LeftPanelVM
          DbControllers.m_LogMachineController.Create(LogEvent.CreatePartStateLog(Time - TimeSpan.FromSeconds(1), Map.refSupervisorManagerVM.CurrProd.nProdId, MachGroup.Id, Part.nPartId, 1, DbControllers.SupervisorId))
          ' se e' il primo ad essere lavorato
          If Not MachGroup.PartVMList.Any(Function(x) x IsNot Part AndAlso x.dtStartTime > DateTime.MinValue) Then
+            Dim bCurrToBeProduced As Boolean = MachGroup.bToBeProduced Or MachGroup.bReadyForMachining Or MachGroup.bSentToMachine
             ' se non e' gia' in coda per essere prodotto
-            If Not (MachGroup.bToBeProduced Or MachGroup.bReadyForMachining Or MachGroup.bSentToMachine) Then
+            If Not bCurrToBeProduced Then
                ' riposiziono il gruppo come primo dei non lavorati assegnandogli indice corretto
                ' cerco primo indice di pezzo non in produzione
                Dim NewIndex As Integer = Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList.IndexOf(Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList.FirstOrDefault(Function(x) DirectCast(x, MyMachGroupVM).dtStartTime = DateTime.MinValue AndAlso DirectCast(x, MyMachGroupVM).bToBeProduced = False))
@@ -840,6 +853,10 @@ Public Class LeftPanelVM
             MachGroup.dtStartTime = Time
             MachGroup.nProduction_State = ItemState.WIP
             MachGroup.NotifyPropertyChanged(NameOf(MachGroup.Production_Background))
+            ' aggiorno sort custom dei MachGroup
+            If Not bCurrToBeProduced Then
+               Map.refSupervisorMachGroupPanelVM.RefreshMachGroupVMSort()
+            End If
             ' scrivo evento inizio MachGroup su DB
             DbControllers.m_LogMachineController.Create(LogEvent.CreateMachGroupStateLog(Time - TimeSpan.FromSeconds(1), Map.refSupervisorManagerVM.CurrProd.nProdId, MachGroup.Id, 1, DbControllers.SupervisorId))
             ' blocco produzione di tutti gli altri perche' iniziato questo
@@ -907,7 +924,13 @@ Public Class LeftPanelVM
       If nSelMGIndex = 0 Then Return
       Dim PreviousMG As MyMachGroupVM = Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList(nSelMGIndex - 1)
       If PreviousMG.nProduction_State >= ItemState.WIP Or PreviousMG.bReadyForMachining Then Return
+      ' scambio indici
+      Dim nSelMGProdIndex As Integer = SelMachGroup.nProductionIndex
+      SelMachGroup.SetProductionIndex(PreviousMG.nProductionIndex)
+      PreviousMG.SetProductionIndex(nSelMGProdIndex)
       Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList.Move(nSelMGIndex, nSelMGIndex - 1)
+      ' lancio sort custom
+      Map.refSupervisorMachGroupPanelVM.RefreshMachGroupVMSort()
    End Sub
 
 #End Region    ' MoveUpRawPart
@@ -936,7 +959,14 @@ Public Class LeftPanelVM
       If SelMachGroup.nProduction_State >= ItemState.WIP Or SelMachGroup.bReadyForMachining Then Return
       Dim nSelMGIndex = Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList.IndexOf(SelMachGroup)
       If nSelMGIndex = Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList.Count - 1 Then Return
+      ' scambio indici
+      Dim NextMG As MyMachGroupVM = Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList(nSelMGIndex + 1)
+      Dim nSelMGProdIndex As Integer = SelMachGroup.nProductionIndex
+      SelMachGroup.SetProductionIndex(NextMG.nProductionIndex)
+      NextMG.SetProductionIndex(nSelMGProdIndex)
       Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList.Move(nSelMGIndex, nSelMGIndex + 1)
+      ' lancio sort custom
+      Map.refSupervisorMachGroupPanelVM.RefreshMachGroupVMSort()
    End Sub
 
 #End Region    ' MoveDownRawPart

EgtBEAMWALL.Supervisor/MDIPage/MDIPageVM.vb

@@ -163,7 +163,7 @@ Public Class MDIPageVM
    ''' </summary>
    Friend Sub SendMDI()
       If Not String.IsNullOrWhiteSpace(m_sMDICommand_Text) Then
-         MachManaging.CommandList.Add(ThreadCommand.CreateCommand(CommandTypes.MDI, m_sMDICommand_Text))
+         MachManaging.AddToCommandList(ThreadCommand.CreateCommand(CommandTypes.MDI, m_sMDICommand_Text))
       End If
    End Sub
 

EgtBEAMWALL.Supervisor/MachCommandMessagePanel/MachCommandMessagePanelVM.vb

@@ -427,11 +427,11 @@ Public Class MachCommandMessagePanelVM
    End Property
 
    Public Sub Disconnect()
-      MachManaging.CommandList.Add(ThreadCommand.CreateCommand(CommandTypes.DISCONNECT))
+      MachManaging.AddToCommandList(ThreadCommand.CreateCommand(CommandTypes.DISCONNECT))
    End Sub
 
    Public Sub SetOPState(OpState As Integer)
-      MachManaging.CommandList.Add(ThreadCommand.CreateCommand(CommandTypes.SETOPMODE))
+      MachManaging.AddToCommandList(ThreadCommand.CreateCommand(CommandTypes.SETOPMODE))
    End Sub
 
    Public ReadOnly Property Start_Command As ICommand
@@ -442,7 +442,7 @@ Public Class MachCommandMessagePanelVM
    End Property
 
    Public Sub Start(ByVal param As Object)
-      MachManaging.CommandList.Add(ThreadCommand.CreateCommand(CommandTypes.START))
+      MachManaging.AddToCommandList(ThreadCommand.CreateCommand(CommandTypes.START))
    End Sub
 
    Public ReadOnly Property Stop_Command As ICommand
@@ -453,7 +453,7 @@ Public Class MachCommandMessagePanelVM
    End Property
 
    Public Sub [Stop](ByVal param As Object)
-      MachManaging.CommandList.Add(ThreadCommand.CreateCommand(CommandTypes.STOP_))
+      MachManaging.AddToCommandList(ThreadCommand.CreateCommand(CommandTypes.STOP_))
    End Sub
 
    Public ReadOnly Property Reset_Command As ICommand
@@ -464,9 +464,12 @@ Public Class MachCommandMessagePanelVM
    End Property
 
    Public Sub Reset(ByVal param As Object)
-      MachManaging.CommandList.Add(ThreadCommand.CreateCommand(CommandTypes.RESET))
+      MachManaging.AddToCommandList(ThreadCommand.CreateCommand(CommandTypes.RESET))
       ' annullo stato di pronto ad essere lavorato di tutti i programmi
       If Not IsNothing(Map.refProjectVM.SupervisorMachGroupPanelVM) Then Map.refProjectVM.SupervisorMachGroupPanelVM.ResetAllMachGroups()
+      ' rifaccio sort lista grezzi
+      ' lancio sort custom
+      Map.refSupervisorMachGroupPanelVM.RefreshMachGroupVMSort()
    End Sub
 
    Public ReadOnly Property Step_Command As ICommand
@@ -477,7 +480,7 @@ Public Class MachCommandMessagePanelVM
    End Property
 
    Public Sub [Step](ByVal param As Object)
-      MachManaging.CommandList.Add(ThreadCommand.CreateCommand(CommandTypes.STEP_))
+      MachManaging.AddToCommandList(ThreadCommand.CreateCommand(CommandTypes.STEP_))
    End Sub
 
    Public ReadOnly Property SetPoint_Command As ICommand
@@ -488,7 +491,7 @@ Public Class MachCommandMessagePanelVM
    End Property
 
    Public Sub SetPoint(ByVal param As Object)
-      MachManaging.CommandList.Add(ThreadCommand.CreateCommand(CommandTypes.SETPOINT))
+      MachManaging.AddToCommandList(ThreadCommand.CreateCommand(CommandTypes.SETPOINT))
    End Sub
 
 
@@ -500,7 +503,7 @@ Public Class MachCommandMessagePanelVM
    End Property
 
    Public Sub DeleteAlarms(ByVal param As Object)
-      MachManaging.CommandList.Add(ThreadCommand.CreateCommand(CommandTypes.DELETEALARMS))
+      MachManaging.AddToCommandList(ThreadCommand.CreateCommand(CommandTypes.DELETEALARMS))
    End Sub
 
    Public Function GetVarPathByName(Name As String) As String

EgtBEAMWALL.Supervisor/MachGroupPanel/MyMachGroupVM.vb

@@ -317,6 +317,7 @@ Public Class MyMachGroupVM
          ' segno pezzo da produrre
          MachGroup.m_bToBeProduced = True
          MachGroup.NotifyPropertyChanged(NameOf(MachGroup.Production_Background))
+         Map.refSupervisorMachGroupPanelVM.MachGroupVMList_View.Refresh()
 
          ' sposto MachGroup in lista come ultimo dei pronti da produrre
          Dim OldIndex As Integer = Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList.IndexOf(MachGroup)

EgtBEAMWALL.Supervisor/MachGroupPanel/SupervisorMachGroupPanelVM.vb

@@ -21,6 +21,13 @@ Public Class SupervisorMachGroupPanelVM
       End Get
    End Property
 
+   Private m_MachGroupVMList_View As ListCollectionView = Nothing
+   Public ReadOnly Property MachGroupVMList_View As ListCollectionView
+      Get
+         Return m_MachGroupVMList_View
+      End Get
+   End Property
+
    ' lock per aggiunta elemento a lista MachGroup
    Private m_Lock_AddMachGroup As New Object
 
@@ -39,6 +46,23 @@ Public Class SupervisorMachGroupPanelVM
 #End Region    ' FIELDS & PROPERTIES
 
 #Region "CONSTRUCTOR"
+   Private m_MachGroupVMListComparer As MyComparer
+   Friend ReadOnly Property MachGroupVMListComparer As MyComparer
+      Get
+         Return m_MachGroupVMListComparer
+      End Get
+   End Property
+
+   Friend Sub SetMachGroupVMListView()
+      m_MachGroupVMList_View = CollectionViewSource.GetDefaultView(m_MachGroupVMList)
+      m_MachGroupVMListComparer = New MyComparer
+      m_MachGroupVMList_View.CustomSort = m_MachGroupVMListComparer
+      NotifyPropertyChanged(NameOf(MachGroupVMList_View))
+   End Sub
+
+   Friend Sub RefreshMachGroupVMSort()
+      m_MachGroupVMList_View.CustomSort = m_MachGroupVMListComparer
+   End Sub
 
    Sub New(MachGroupPanelM As MachGroupPanelM)
       MyBase.New(MachGroupPanelM)
@@ -166,3 +190,151 @@ Public Class SupervisorMachGroupPanelVM
 #End Region    ' METHODS
 
 End Class
+
+'Friend Class MachGroupVMListComparer
+'   Implements IComparer
+
+'   Dim m_Direction As ListSortDirection
+'   Dim m_Column As EgtDataGridColumn
+'   Dim m_ColumnList As List(Of DataGridColumn)
+'   Dim m_EgtColumnList As New List(Of EgtDataGridColumn)
+
+'   Sub New()
+'      m_Column = column
+'      m_ColumnList = ColumnList
+'      m_EgtColumnList = EgtColumnList
+'      m_Direction = direction
+
+
+'      Dim column As DataGridColumn = e.Column
+'      Dim datagrid As DataGrid = sender
+'      Dim comparer As IComparer = Nothing
+'      e.Handled = True
+'      Dim direction As ListSortDirection = If((column.SortDirection <> ListSortDirection.Ascending), ListSortDirection.Ascending, ListSortDirection.Descending)
+'      column.SortDirection = direction
+'      Dim m_ColumnList As New List(Of DataGridColumn)
+'      Dim m_EgtColumnList As New List(Of EgtDataGridColumn)
+'      For Each col In datagrid.Columns
+'         If Not IsNothing(col.SortDirection) Then
+'            m_ColumnList.Add(col)
+'            m_EgtColumnList.Add(Map.refRawPartListVM.RawPartColumns(col.DisplayIndex))
+'         End If
+'      Next
+'      Dim lcv As ListCollectionView = CType(CollectionViewSource.GetDefaultView(datagrid.ItemsSource), ListCollectionView)
+'      comparer = New MyComparer(Map.refRawPartListVM.RawPartColumns(column.DisplayIndex), m_ColumnList, m_EgtColumnList, direction)
+'      lcv.CustomSort = comparer
+
+
+
+'   End Sub
+
+'   Public Function Compare(x As Object, y As Object) As Integer Implements IComparer.Compare
+'      Dim First As MyMachGroupVM = DirectCast(x, MyMachGroupVM)
+'      Dim Second As MyMachGroupVM = DirectCast(y, MyMachGroupVM)
+'      Dim bFirstProduced As Boolean = First.nProduction_State = Core.ItemState.WIP OrElse First.nProduction_State = Core.ItemState.Produced
+'      Dim bSecondProduced As Boolean = Second.nProduction_State = Core.ItemState.WIP OrElse Second.nProduction_State = Core.ItemState.Produced
+'      Dim nDirection As Integer = If(m_Direction, 1, -1)
+'      If bFirstProduced AndAlso bSecondProduced Then
+'         If First.nProductionIndex > Second.nProductionIndex Then
+'            Return 1
+'         ElseIf First.nProductionIndex < Second.nProductionIndex Then
+'            Return -1
+'         Else
+'            Return 0
+'         End If
+'      ElseIf bFirstProduced Then
+'         Return -1
+'      ElseIf bSecondProduced Then
+'         Return 1
+'      Else
+'         Dim ColumnIndex = 0
+'         While ColumnIndex <= m_EgtColumnList.Count - 1
+'            Dim nDir As ListSortDirection = If(m_ColumnList(ColumnIndex).SortDirection, 1, -1)
+'            Dim nCheck As Integer = Check(First, Second, nDir, m_EgtColumnList(ColumnIndex))
+'            If nCheck <> 0 Then
+'               Return nCheck
+'            End If
+'            ColumnIndex += 1
+'         End While
+'         Return 0
+'      End If
+'   End Function
+
+'   Private Function Check(First As MyMachGroupVM, Second As MyMachGroupVM, nDirection As Integer, Column As EgtDataGridColumn) As Integer
+'      Select Case Column.Name
+'         Case COL_NAME
+'            If First.nName > Second.nName Then
+'               Return 1 * nDirection
+'            ElseIf First.nName < Second.nName Then
+'               Return -1 * nDirection
+'            Else
+'               Return 0
+'            End If
+'         Case COL_STARTCUT
+'            If First.Id > Second.Id Then
+'               Return 1 * nDirection
+'            ElseIf First.Id < Second.Id Then
+'               Return -1 * nDirection
+'            Else
+'               Return 0
+'            End If
+'         Case COL_W
+'            If First.dW > Second.dW Then
+'               Return 1 * nDirection
+'            ElseIf First.dW < Second.dW Then
+'               Return -1 * nDirection
+'            Else
+'               Return 0
+'            End If
+'         Case COL_H
+'            If First.dH > Second.dH Then
+'               Return 1 * nDirection
+'            ElseIf First.dH < Second.dH Then
+'               Return -1 * nDirection
+'            Else
+'               Return 0
+'            End If
+'         Case COL_L
+'            If First.dL > Second.dL Then
+'               Return 1 * nDirection
+'            ElseIf First.dL < Second.dL Then
+'               Return -1 * nDirection
+'            Else
+'               Return 0
+'            End If
+'         Case COL_POSZ
+'               'If First.posz > Second.dL Then
+'               '   Return 1 * nDirection
+'               'ElseIf First.dL < Second.dL Then
+'               '   Return -1 * nDirection
+'               'Else
+'               '   Return 0
+'               'End If
+'         Case COL_MATERIAL
+'            If First.sMATERIAL > Second.sMATERIAL Then
+'               Return 1 * nDirection
+'            ElseIf First.sMATERIAL < Second.sMATERIAL Then
+'               Return -1 * nDirection
+'            Else
+'               Return 0
+'            End If
+'         Case COL_USAGE
+'            If First.dUsage > Second.dUsage Then
+'               Return 1 * nDirection
+'            ElseIf First.dUsage < Second.dUsage Then
+'               Return -1 * nDirection
+'            Else
+'               Return 0
+'            End If
+'         Case COL_WASTE
+'            If First.dWaste > Second.dWaste Then
+'               Return 1 * nDirection
+'            ElseIf First.dWaste < Second.dWaste Then
+'               Return -1 * nDirection
+'            Else
+'               Return 0
+'            End If
+'      End Select
+'   End Function
+
+'End Class

EgtBEAMWALL.Supervisor/MachManagingThread/MachManaging.vb

@@ -10,6 +10,9 @@ Imports EgtBEAMWALL.Supervisor.CommVar
 
 Public Class MachManaging
 
+   ' lock per aggiunta elemento a lista MachGroup
+   Private Shared Lock_CommandList As New Object
+
    Private m_bConnected As Boolean = False
    Public ReadOnly Property bConnected As Boolean
       Get
@@ -53,6 +56,22 @@ Public Class MachManaging
          Return m_CommandList
       End Get
    End Property
+   Friend Shared Sub AddToCommandList(value As ThreadCommand)
+      SyncLock Lock_CommandList
+         ' EgtOutLog("Inizio ciclo rimozioni")
+         For CommandIndex = m_CommandList.Count - 1 To 0 Step -1
+            Dim Command As ThreadCommand = m_CommandList(CommandIndex)
+            If Command.ProcessingStatus = ThreadCommand.ProcessingStatuses.DONE Then
+               ' EgtOutLog("Inizio rimozione comando")
+               m_CommandList.Remove(Command)
+               ' EgtOutLog("Fine rimozione comando")
+            End If
+         Next
+         ' EgtOutLog("Fine ciclo rimozioni")
+         CommandList.Add(value)
+         ' EgtOutLog("Count dopo aggiunta: " & CommandList.Count)
+      End SyncLock
+   End Sub
 
    Private m_bStartPending As Boolean = False
    Public ReadOnly Property StartPending As Boolean
@@ -569,6 +588,8 @@ Public Class MachManaging
                      ' scrivo evento inizio MachGroup su DB
                      DbControllers.m_LogMachineController.Create(LogEvent.CreateMachGroupStateLog(dtStart, nP_Prod, nP_Machgroup, nP_State, DbControllers.SupervisorId))
                   End If
+                  ' flag di aggiornamento log macchina
+                  Map.refMachineLogPageVM.UpdateMachineLogList(False)
                   ' attesa per essere sicuro che abbia scritto e riletto variabili
                   Threading.Thread.Sleep(300)
                ElseIf nP_State = PartState.END_ Then
@@ -638,7 +659,7 @@ Public Class MachManaging
 
                      ' se non impostata data start
                      If MachGroup.dtStartTime = DateTime.MinValue Then
-                        EgtOutLog("Start date not set on Prod " & nP_Prod & " Machgroup " & nP_Machgroup)
+                        ' EgtOutLog("Start date not set on Prod " & nP_Prod & " Machgroup " & nP_Machgroup)
                         Dim dtStart As DateTime = MachGroup.dtEndTime - TimeSpan.FromSeconds(60)
                         ' provo a recuperare tempo stimato
                         If MachGroup.nCALC_TIME > 0 Then
@@ -678,6 +699,8 @@ Public Class MachManaging
                         Map.refLeftPanelVM.PrintLabel(MachGroup, Part)
                      End If
                   End If
+                  ' flag di aggiornamento log macchina
+                  Map.refMachineLogPageVM.UpdateMachineLogList(False)
                   ' attesa per essere sicuro che abbia scritto e riletto variabili
                   Threading.Thread.Sleep(300)
                End If
@@ -722,7 +745,7 @@ Public Class MachManaging
    End Function
 
    Private Function SendNextProgram() As Boolean
-      EgtOutLog("Inizio SendNextProgram")
+      ' EgtOutLog("Inizio SendNextProgram")
       Dim bSent As Boolean = False
       If (CurrentMachine.NCType = NCTypes.TPA AndAlso Not m_bStartPending AndAlso Tpa.opState = MachineOperatingState.Pending) OrElse
          (CurrentMachine.NCType = NCTypes.NUM_FLEXIUM AndAlso Not Num_Flexium.bIsTransferActive) OrElse
@@ -730,20 +753,20 @@ Public Class MachManaging
          (CurrentMachine.NCType = NCTypes.NUM_AXIUM_PCTOOLKIT AndAlso Not Num_Axium_PCToolkit.bIsTransferActive) Then ' Or Tpa.opState = MachineOperatingState.Start) Then
          ' verifico se c'e' un programma da lanciare
          If Not IsNothing(Map.refProjectVM.SupervisorMachGroupPanelVM) Then
-            EgtOutLog("Start " & DateTime.Now())
+            ' EgtOutLog("Start " & DateTime.Now())
             Dim bMachGroupNotReady As Boolean = False
             SyncLock m_Lock_SendProgram
                For Each MyMachGroup As MyMachGroupVM In Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList
-                  EgtOutLog("Ciclo su name: " & MyMachGroup.Name & " id: " & MyMachGroup.Id)
+                  ' EgtOutLog("Ciclo su name: " & MyMachGroup.Name & " id: " & MyMachGroup.Id)
                   If Not MyMachGroup.bSentToMachine AndAlso (MyMachGroup.dtStartTime = DateTime.MinValue OrElse
                      (Map.refSupervisorManagerVM.CurrProd.nType = BWType.WALL AndAlso MyMachGroup.bResetWhileCutting)) Then
-                     EgtOutLog(MyMachGroup.Name & " id: " & MyMachGroup.Id & " è da fare")
+                     ' EgtOutLog(MyMachGroup.Name & " id: " & MyMachGroup.Id & " è da fare")
                      ' verifico se ricalcolo finito
                      If MyMachGroup.bReadyForMachining AndAlso If(CurrentMachine.NCType = NCTypes.NUM_FLEXIUM Or CurrentMachine.NCType = NCTypes.NUM_AXIUM_APSERVER OrElse CurrentMachine.NCType = NCTypes.NUM_AXIUM_PCTOOLKIT, Not MyMachGroup.bSendingToMachine, True) Then
-                        EgtOutLog(MyMachGroup.Name & " id: " & MyMachGroup.Id & " pronto per essere lavorato")
+                        ' EgtOutLog(MyMachGroup.Name & " id: " & MyMachGroup.Id & " pronto per essere lavorato")
                         ' lo lancio
                         bSent = SendProgram(MyMachGroup.CnFilePath(), MyMachGroup.Name)
-                        EgtOutLog(MyMachGroup.Name & " id: " & MyMachGroup.Id & " mandato " & DateTime.Now() & " " & MyMachGroup.Name & " " & bSent.ToString())
+                        ' EgtOutLog(MyMachGroup.Name & " id: " & MyMachGroup.Id & " mandato " & DateTime.Now() & " " & MyMachGroup.Name & " " & bSent.ToString())
                         Select Case CurrentMachine.NCType
                            Case NCTypes.TPA
                               MyMachGroup.SetSentToMachine(bSent)
@@ -755,7 +778,7 @@ Public Class MachManaging
                      Else
                         ' programma non ancora pronto, esco per attendere
                         bMachGroupNotReady = True
-                        EgtOutLog(MyMachGroup.Name & " id: " & MyMachGroup.Id & " non ancora pronto per essere mandato")
+                        ' EgtOutLog(MyMachGroup.Name & " id: " & MyMachGroup.Id & " non ancora pronto per essere mandato")
                         Exit For
                         'Return False
                      End If
@@ -763,7 +786,7 @@ Public Class MachManaging
                Next
             End SyncLock
             If bMachGroupNotReady Then Return False
-            EgtOutLog("End " & DateTime.Now())
+            ' EgtOutLog("End " & DateTime.Now())
          End If
       End If
       Return bSent
@@ -771,10 +794,17 @@ Public Class MachManaging
 
    Private Sub CommandList_CollectionChanged(sender As Object, e As NotifyCollectionChangedEventArgs)
       If Not IsNothing(e.NewItems) Then
-         For Each Command In e.NewItems
-            ExecuteCommand(DirectCast(Command, ThreadCommand))
-            m_CommandList.Remove(Command)
+         ' EgtOutLog("Inizio ciclo esecuzione comandi")
+         Dim nCommandCount As Integer = e.NewItems.Count
+         For CommandIndex = 0 To nCommandCount - 1
+            Dim Command As ThreadCommand = e.NewItems(CommandIndex)
+            If Command.ProcessingStatus = ThreadCommand.ProcessingStatuses.WAITING Then
+               Command.SetProcessingStatus(ThreadCommand.ProcessingStatuses.PROCESSING)
+               ExecuteCommand(DirectCast(Command, ThreadCommand))
+               Command.SetProcessingStatus(ThreadCommand.ProcessingStatuses.DONE)
+            End If
          Next
+         ' EgtOutLog("Fine ciclo esecuzione di " & nCommandCount & " comandi")
       End If
    End Sub
 
@@ -1044,7 +1074,7 @@ Public Class MachManaging
             Num_Axium_APServer.StartTransfer()
             Return True
          Case NCTypes.NUM_AXIUM_PCTOOLKIT
-            EgtOutLog("Pre Download")
+            ' EgtOutLog("Pre Download")
             Dim nFileType As Integer = 0
             If Integer.TryParse(ProgramId, nFileType) AndAlso nFileType > 0 Then
                Num_Axium_PCToolkit.FileDownload(nFileType * 10, ProgramPath)

EgtBEAMWALL.Supervisor/MachManagingThread/MachManagingThread.vb

@@ -54,6 +54,12 @@ End Class
 
 Public Class ThreadCommand
 
+   Public Enum ProcessingStatuses
+      WAITING = 1
+      PROCESSING = 2
+      DONE = 3
+   End Enum
+
    Private m_CommandType As CommandTypes
    Public ReadOnly Property CommandType As CommandTypes
       Get
@@ -95,6 +101,16 @@ Public Class ThreadCommand
       End Get
    End Property
 
+   Private m_ProcessingStatus As ProcessingStatuses = ProcessingStatuses.WAITING
+   Public ReadOnly Property ProcessingStatus As ProcessingStatuses
+      Get
+         Return m_ProcessingStatus
+      End Get
+   End Property
+   Friend Sub SetProcessingStatus(value As ProcessingStatuses)
+      m_ProcessingStatus = value
+   End Sub
+
    Protected Sub New()
    End Sub
 

EgtBEAMWALL.Supervisor/MachineLogPage/MachineLogPageV.xaml

@@ -25,16 +25,37 @@
       </Grid>
 
       <StackPanel Orientation="Horizontal" Height="30">
+         <TextBlock Text="{Binding Entity_Msg}"
+                    Style="{StaticResource Log_TextBlock}"/>
          <ComboBox ItemsSource="{Binding EntityTypeList}"
                    SelectedIndex="{Binding SelEntityType}"
                    Width="70"
                    Margin="0,0,2.5,0"
                    Style="{StaticResource PartParam_ComboBox}"/>
+         <TextBlock Text="{Binding Event_Msg}"
+                    Style="{StaticResource Log_TextBlock}"/>
          <ComboBox ItemsSource="{Binding PartEventTypeList}"
                    SelectedIndex="{Binding SelPartEventType}"
                    Width="70"
                    Margin="0,0,2.5,0"
                    Style="{StaticResource PartParam_ComboBox}"/>
+         <TextBlock Text="{Binding Date_Msg}"
+                    Style="{StaticResource Log_TextBlock}"/>
+         <ComboBox ItemsSource="{Binding DayTypeList}"
+                   SelectedIndex="{Binding SelDayType}"
+                   Width="70"
+                   Margin="0,0,2.5,0"
+                   Style="{StaticResource PartParam_ComboBox}"/>
+         <StackPanel Orientation="Horizontal" Visibility="{Binding Date_Visibility}">
+            <TextBlock Text="{Binding From_Msg}"
+                       Style="{StaticResource Log_TextBlock}"/>
+            <DatePicker SelectedDate="{Binding dtStartDate}"
+                        Style="{StaticResource Log_DatePicker}"/>
+            <TextBlock Text="{Binding To_Msg}"
+                       Style="{StaticResource Log_TextBlock}"/>
+            <DatePicker SelectedDate="{Binding dtEndDate}"
+                        Style="{StaticResource Log_DatePicker}"/>
+         </StackPanel>
          <!--<TextBox Text="{Binding MaxRowNumber}"/>-->
          <Button Grid.Column="1"
                  Command="{Binding Refresh_Command}"

EgtBEAMWALL.Supervisor/MachineLogPage/MachineLogPageVM.vb

@@ -9,6 +9,16 @@ Imports EgtBEAMWALL.Core.MachLog
 Public Class MachineLogPageVM
    Inherits VMBase
 
+   Private m_Lock_LogList As New Object
+
+   Private m_MachineLog_Timer As New DispatcherTimer
+
+   Private Enum DayTypes As Integer
+      TODAY = 0
+      YESTERDAY = 1
+      PERIOD = 2
+   End Enum
+
    Private m_colMachineLog_Type As EgtDataGridColumn
    Public ReadOnly Property colMachineLog_Type As EgtDataGridColumn
       Get
@@ -62,7 +72,7 @@ Public Class MachineLogPageVM
       End Set
    End Property
 
-   Private m_PartEventTypeList As New List(Of String)({"", "Inizio", "Fine"})
+   Private m_PartEventTypeList As New List(Of String)({"", EgtMsg(62527), EgtMsg(62528)})
    Public ReadOnly Property PartEventTypeList As List(Of String)
       Get
          Return m_PartEventTypeList
@@ -76,11 +86,12 @@ Public Class MachineLogPageVM
       End Get
       Set(value As Integer)
          m_SelPartEventType = value
+         WriteMainPrivateProfileString(S_MACHINELOGFILTER, K_PARTEVENTTYPE, m_SelPartEventType.ToString())
          m_MachineLogList_View.Refresh()
       End Set
    End Property
 
-   Private m_EntityTypeList As New List(Of String)({"", "Pezzo", "Barra"})
+   Private m_EntityTypeList As New List(Of String)({"", EgtMsg(62525), EgtMsg(62526)})
    Public ReadOnly Property EntityTypeList As List(Of String)
       Get
          Return m_EntityTypeList
@@ -94,10 +105,75 @@ Public Class MachineLogPageVM
       End Get
       Set(value As Integer)
          m_SelEntityType = value
+         WriteMainPrivateProfileString(S_MACHINELOGFILTER, K_ENTITYTYPE, m_SelEntityType.ToString())
          m_MachineLogList_View.Refresh()
       End Set
    End Property
 
+   Private m_DayTypeList As New List(Of String)({EgtMsg(62529), EgtMsg(62530), EgtMsg(62531)})
+   Public ReadOnly Property DayTypeList As List(Of String)
+      Get
+         Return m_DayTypeList
+      End Get
+   End Property
+
+   Private m_SelDayType As DayTypes = DayTypes.TODAY
+   Public Property SelDayType As Integer
+      Get
+         Return m_SelDayType
+      End Get
+      Set(value As Integer)
+         Dim PrevSelDayType As DayTypes = m_SelDayType
+         m_SelDayType = value
+         WriteMainPrivateProfileString(S_MACHINELOGFILTER, K_DAYTYPE, Convert.ToInt32(m_SelDayType))
+         m_Date_Visibility = If(m_SelDayType = DayTypes.PERIOD, Visibility.Visible, Visibility.Collapsed)
+         If m_SelDayType = DayTypes.PERIOD Then
+            m_dtStartDate = If(PrevSelDayType = DayTypes.TODAY, DateTime.Today, DateTime.Today - TimeSpan.FromDays(1))
+            m_dtEndDate = If(PrevSelDayType = DayTypes.TODAY, DateTime.Today, DateTime.Today - TimeSpan.FromDays(1))
+            NotifyPropertyChanged(NameOf(dtStartDate))
+            NotifyPropertyChanged(NameOf(dtEndDate))
+         End If
+         NotifyPropertyChanged(NameOf(Date_Visibility))
+         ' aggiorno lista da Db
+         UpdateMachineLogList(True)
+      End Set
+   End Property
+
+   Private m_dtStartDate As DateTime = DateTime.Today
+   Public Property dtStartDate As DateTime
+      Get
+         Return m_dtStartDate
+      End Get
+      Set(value As DateTime)
+         m_dtStartDate = value
+         Dim lStartDate As Long = m_dtStartDate.ToFileTimeUtc()
+         WriteMainPrivateProfileString(S_MACHINELOGFILTER, K_STARTDATE, lStartDate.ToString())
+         ' aggiorno lista da Db
+         UpdateMachineLogList(True)
+      End Set
+   End Property
+
+   Private m_dtEndDate As DateTime = DateTime.Today
+   Public Property dtEndDate As DateTime
+      Get
+         Return m_dtEndDate
+      End Get
+      Set(value As DateTime)
+         m_dtEndDate = value
+         Dim lEndDate As Long = m_dtEndDate.ToFileTimeUtc()
+         WriteMainPrivateProfileString(S_MACHINELOGFILTER, K_ENDDATE, lEndDate.ToString())
+         ' aggiorno lista da Db
+         UpdateMachineLogList(True)
+      End Set
+   End Property
+
+   Private m_Date_Visibility As Visibility = Visibility.Collapsed
+   Public ReadOnly Property Date_Visibility As Visibility
+      Get
+         Return m_Date_Visibility
+      End Get
+   End Property
+
    ' Definizione comandi
    Private m_cmdRefresh As ICommand
 
@@ -151,6 +227,35 @@ Public Class MachineLogPageVM
       End Get
    End Property
 
+   Public ReadOnly Property Entity_Msg As String
+      Get
+         Return EgtMsg(62520)
+      End Get
+   End Property
+
+   Public ReadOnly Property Event_Msg As String
+      Get
+         Return EgtMsg(62521)
+      End Get
+   End Property
+
+   Public ReadOnly Property Date_Msg As String
+      Get
+         Return EgtMsg(62522)
+      End Get
+   End Property
+
+   Public ReadOnly Property From_Msg As String
+      Get
+         Return EgtMsg(62523)
+      End Get
+   End Property
+
+   Public ReadOnly Property To_Msg As String
+      Get
+         Return EgtMsg(62524)
+      End Get
+   End Property
 
 #End Region    ' Messages
 
@@ -167,6 +272,33 @@ Public Class MachineLogPageVM
       m_colMachineLog_Type = m_MachineLogColumns.FirstOrDefault(Function(x) x.Name = COL_TYPE)
       m_colMachineLog_Description = m_MachineLogColumns.FirstOrDefault(Function(x) x.Name = COL_DESCRIPTION)
       m_colMachineLog_SupervisorId = m_MachineLogColumns.FirstOrDefault(Function(x) x.Name = COL_SUPERVISORID)
+      ' imposto valori filtri da ini
+      m_SelPartEventType = GetMainPrivateProfileInt(S_MACHINELOGFILTER, K_PARTEVENTTYPE, 2)
+      m_SelEntityType = GetMainPrivateProfileInt(S_MACHINELOGFILTER, K_ENTITYTYPE, 1)
+      m_SelDayType = GetMainPrivateProfileInt(S_MACHINELOGFILTER, K_DAYTYPE, 0)
+      Select Case m_SelDayType
+         Case DayTypes.TODAY
+            m_dtStartDate = DateTime.Today
+            m_dtEndDate = DateTime.Today
+         Case DayTypes.YESTERDAY
+            m_dtStartDate = DateTime.Today - TimeSpan.FromDays(1)
+            m_dtEndDate = DateTime.Today - TimeSpan.FromDays(1)
+         Case DayTypes.PERIOD
+            Dim sStartDate As String = "0"
+            Dim lStartDate As Long = 0
+            GetMainPrivateProfileString(S_MACHINELOGFILTER, K_STARTDATE, 0, sStartDate)
+            Long.TryParse(sStartDate, lStartDate)
+            m_dtStartDate = If(lStartDate > 0, DateTime.FromFileTimeUtc(lStartDate), DateTime.Today)
+            Dim sEndDate As String = "0"
+            Dim lEndDate As Long = 0
+            GetMainPrivateProfileString(S_MACHINELOGFILTER, K_ENDDATE, 0, sEndDate)
+            Long.TryParse(sEndDate, lEndDate)
+            m_dtEndDate = If(lEndDate > 0, DateTime.FromFileTimeUtc(lEndDate), DateTime.Today)
+            m_Date_Visibility = Visibility.Visible
+      End Select
+      m_MachineLog_Timer.Interval = TimeSpan.FromMilliseconds(100)
+      AddHandler m_MachineLog_Timer.Tick, AddressOf MachineLog_Timer_Tick
+      m_MachineLog_Timer.Start()
    End Sub
 
 #End Region    ' CONSTRUCTORS
@@ -209,13 +341,69 @@ Public Class MachineLogPageVM
          m_colMachineLog_Description.ColumnVisibility = Visibility.Collapsed
          m_colMachineLog_SupervisorId.ColumnVisibility = Visibility.Collapsed
       End If
-      UpdateMachineLogList()
+      UpdateMachineLogList(True)
       m_MachineLogList_View = CollectionViewSource.GetDefaultView(m_MachineLogList)
       m_MachineLogList_View.Filter = AddressOf MachineLogFilter
    End Sub
 
-   Friend Sub UpdateMachineLogList()
-      m_MachineLogList = New ObservableCollection(Of LogEvent)(DbControllers.m_LogMachineController.GetCoreDesc(DateTime.Now - TimeSpan.FromDays(300), DateTime.Now).Select(Of LogEvent)(Function(x) New LogEvent(x)).ToList())
+   ' indice di aggiornamento della lista rispetto a Db
+   Private m_nUpdateIndex As Integer
+   ' indice di ricaricamento completo della lista dal Db
+   Private m_nRefreshIndex As Integer
+   ' indice dell'ultimo update/refresh
+   Private m_nLastLogUpdate As Integer
+
+   Friend Sub UpdateMachineLogList(bRefresh As Boolean)
+      Dim nMaxIndex As Integer = Math.Max(m_nUpdateIndex, m_nRefreshIndex)
+      If bRefresh Then
+         m_nRefreshIndex = nMaxIndex + 1
+      Else
+         m_nUpdateIndex = nMaxIndex + 1
+      End If
+   End Sub
+
+   Private Sub MachineLog_Timer_Tick(sender As Object, e As EventArgs)
+      SyncLock m_Lock_LogList
+         Dim nRefresh As Integer = m_nRefreshIndex
+         Dim nUpdate As Integer = m_nUpdateIndex
+         If nRefresh > m_nLastLogUpdate Then
+            m_nLastLogUpdate = nRefresh
+            UpdateFromDb(True)
+         ElseIf nUpdate > m_nLastLogUpdate Then
+            m_nLastLogUpdate = nUpdate
+            UpdateFromDb(False)
+         End If
+      End SyncLock
+   End Sub
+
+   Friend Sub UpdateFromDb(bRefresh As Boolean)
+      'm_MachineLogList = New ObservableCollection(Of LogEvent)(DbControllers.m_LogMachineController.GetCoreDesc(DateTime.Now - TimeSpan.FromDays(300), DateTime.Now).Select(Of LogEvent)(Function(x) New LogEvent(x)).ToList())
+      Dim DbList As List(Of LogEvent)
+      Select Case m_SelDayType
+         Case DayTypes.PERIOD
+            DbList = DbControllers.m_LogMachineController.GetCoreDesc(m_dtStartDate, m_dtEndDate + TimeSpan.FromDays(1)).Select(Of LogEvent)(Function(x) New LogEvent(x)).ToList()
+         Case DayTypes.YESTERDAY
+            DbList = DbControllers.m_LogMachineController.GetCoreDesc(DateTime.Today - TimeSpan.FromDays(1), DateTime.Today).Select(Of LogEvent)(Function(x) New LogEvent(x)).ToList()
+         Case Else      ' DayTypes.TODAY
+            DbList = DbControllers.m_LogMachineController.GetCoreDesc(DateTime.Today, DateTime.Today + TimeSpan.FromDays(1)).Select(Of LogEvent)(Function(x) New LogEvent(x)).ToList()
+      End Select
+      If bRefresh OrElse m_MachineLogList.Count < 1 Then
+         m_MachineLogList = New ObservableCollection(Of LogEvent)(DbList)
+      Else
+         ' cerco in lista Db ultimo elemento della mia lista
+         Dim LastItem As LogEvent = m_MachineLogList(0)
+         Dim CommonItem As LogEvent = DbList.FirstOrDefault(Function(x) x.EventDateTime = LastItem.EventDateTime AndAlso x.EventType = LastItem.EventType AndAlso x.SupervisorId = LastItem.SupervisorId AndAlso x.Value = LastItem.Value)
+         Dim nCommonItemIndex As Integer
+         If Not IsNothing(CommonItem) Then
+            nCommonItemIndex = DbList.IndexOf(CommonItem)
+         End If
+         ' aggiorno i successivi
+         If nCommonItemIndex >= 0 Then
+            For Index = nCommonItemIndex - 1 To 0 Step -1
+               m_MachineLogList.Insert(0, DbList(Index))
+            Next
+         End If
+      End If
       NotifyPropertyChanged(NameOf(MachineLogList))
       m_MachineLogList_View = CollectionViewSource.GetDefaultView(m_MachineLogList)
       m_MachineLogList_View.Filter = AddressOf MachineLogFilter
@@ -243,7 +431,7 @@ Public Class MachineLogPageVM
    ''' Execute the Open.  This method is invoked by the OpenCommand.
    ''' </summary>
    Friend Sub Refresh()
-      UpdateMachineLogList()
+      UpdateMachineLogList(False)
    End Sub
 
 #End Region ' Refresh

EgtBEAMWALL.Supervisor/MainMenu/MainMenuVM.vb

@@ -277,31 +277,31 @@ Public Class MainMenuVM
 
    Private Function InitINPUTS() As Boolean
       ' fermo e riavvio lettura variabili per includere quelle della pagina input
-      MachManaging.CommandList.Add(ThreadCommand.CreateCommand(CommandTypes.STOPREAD_NUMFLEXIUM))
-      MachManaging.CommandList.Add(ThreadCommand.CreateCommand(CommandTypes.READ_NUMFLEXIUM))
+      MachManaging.AddToCommandList(ThreadCommand.CreateCommand(CommandTypes.STOPREAD_NUMFLEXIUM))
+      MachManaging.AddToCommandList(ThreadCommand.CreateCommand(CommandTypes.READ_NUMFLEXIUM))
       Map.refMainWindowVM.NotifyPropertyChanged(NameOf(Map.refMainWindowVM.nSelTabPage))
       Return True
    End Function
 
    Private Function ExitINPUTS() As Boolean
       ' fermo e riavvio lettura variabili per includere quelle della pagina input
-      MachManaging.CommandList.Add(ThreadCommand.CreateCommand(CommandTypes.STOPREAD_NUMFLEXIUM))
-      MachManaging.CommandList.Add(ThreadCommand.CreateCommand(CommandTypes.READ_NUMFLEXIUM))
+      MachManaging.AddToCommandList(ThreadCommand.CreateCommand(CommandTypes.STOPREAD_NUMFLEXIUM))
+      MachManaging.AddToCommandList(ThreadCommand.CreateCommand(CommandTypes.READ_NUMFLEXIUM))
       Return True
    End Function
 
    Private Function InitOUTPUTS() As Boolean
       ' fermo e riavvio lettura variabili per includere quelle della pagina input
-      MachManaging.CommandList.Add(ThreadCommand.CreateCommand(CommandTypes.STOPREAD_NUMFLEXIUM))
-      MachManaging.CommandList.Add(ThreadCommand.CreateCommand(CommandTypes.READ_NUMFLEXIUM))
+      MachManaging.AddToCommandList(ThreadCommand.CreateCommand(CommandTypes.STOPREAD_NUMFLEXIUM))
+      MachManaging.AddToCommandList(ThreadCommand.CreateCommand(CommandTypes.READ_NUMFLEXIUM))
       Map.refMainWindowVM.NotifyPropertyChanged(NameOf(Map.refMainWindowVM.nSelTabPage))
       Return True
    End Function
 
    Private Function ExitOUTPUTS() As Boolean
       ' fermo e riavvio lettura variabili per includere quelle della pagina input
-      MachManaging.CommandList.Add(ThreadCommand.CreateCommand(CommandTypes.STOPREAD_NUMFLEXIUM))
-      MachManaging.CommandList.Add(ThreadCommand.CreateCommand(CommandTypes.READ_NUMFLEXIUM))
+      MachManaging.AddToCommandList(ThreadCommand.CreateCommand(CommandTypes.STOPREAD_NUMFLEXIUM))
+      MachManaging.AddToCommandList(ThreadCommand.CreateCommand(CommandTypes.READ_NUMFLEXIUM))
       Return True
    End Function
 

EgtBEAMWALL.Supervisor/MainWindow/MainWindowM.vb

@@ -248,8 +248,8 @@ Public Class MainWindowM
          EgtSetLockId( sLockId)
       End If
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(5327, 2505, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(5327, 2505, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(5327, 2512, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(5327, 2512, 1, m_nKeyOptions)
       ' Inizializzazione generale di EgtInterface
       m_nDebug = GetMainPrivateProfileInt(S_GENERAL, K_DEBUG, 0)
       m_sLogFile = m_sTempDir & "\" & SUPGENLOG_FILE_NAME.Replace("#", m_nInstance.ToString())

EgtBEAMWALL.Supervisor/MainWindow/MainWindowVM.vb

@@ -234,7 +234,7 @@ Public Class MainWindowVM
          Return
       End If
       ' disconnetto comunicazione con macchina
-      MachManaging.CommandList.Add(ThreadCommand.CreateCommand(CommandTypes.DISCONNECT))
+      MachManaging.AddToCommandList(ThreadCommand.CreateCommand(CommandTypes.DISCONNECT))
       ' termino thread di comunicazione con Db ed altri programmi
       ViewerOptimizerCommThread.StopThread()
       ' Verifico modifica parametri in Configurazione e chiedo il salvataggio

EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb

@@ -70,5 +70,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2.5.5.4")>
-<Assembly: AssemblyFileVersion("2.5.5.4")>
+<Assembly: AssemblyVersion("2.5.12.2")>
+<Assembly: AssemblyFileVersion("2.5.12.2")>

EgtBEAMWALL.Supervisor/OpenProjectFileDialog/OpenProjectFileDialogVM.vb

@@ -12,19 +12,12 @@ Public Class OpenProjectFileDialogVM
    Public Overrides Function Init(ProjectType As ProjectType, Optional CurrProjectList As List(Of ProjectFileVM) = Nothing, Optional GoToProd As Boolean = False) As Boolean?
       m_ProjectType = ProjectType
       ' carico colonne
-      LoadColumns(ProjectType)
-      NotifyPropertyChanged(NameOf(SearchColumnList))
-      m_SelSearchColumn = m_SearchColumnList(0)
+      LoadColumns(m_ProjectType)
+      NotifyPropertyChanged(NameOf(FilterTypeList))
+      m_SelFilterType = m_FilterTypeList(0)
       ' carico lista progetti
       If IsNothing(CurrProjectList) OrElse CurrProjectList.Count = 0 Then
-         ' leggo da db
-         If ProjectType = ProjectType.PROD Then
-            Dim DbProjectList As New List(Of ProdFileM)
-            DbProjectList = DbControllers.m_ProdController.GetLastDesc(50)
-            For Each Project In DbProjectList
-               m_ProjectList.Add(New ProdFileVM(Project))
-            Next
-         End If
+         RefreshProjectList(GoToProd)
       Else
          m_ProjectList = New ObservableCollection(Of ProjectFileVM)(CurrProjectList)
          NotifyPropertyChanged(NameOf(ProjectList))
@@ -33,6 +26,45 @@ Public Class OpenProjectFileDialogVM
       m_ProjectList_View.Filter = AddressOf ProjectFilter
    End Function
 
+   Public Overrides Sub RefreshProjectList(Optional GoToProd As Boolean = False)
+      m_ProjectList.Clear()
+      ' calcolo periodo e righe
+      Dim dtStart As DateTime
+      Dim dtEnd As DateTime
+      Dim nRowQuantity As Integer = 20
+      Select Case SelRowQuantity
+         Case RowQuantities.FIFTY
+            nRowQuantity = 50
+         Case RowQuantities.HUNDRED
+            nRowQuantity = 100
+         Case RowQuantities.HUNDREDANDFIFTY
+            nRowQuantity = 150
+      End Select
+      Select Case m_SelDayType
+         Case DayTypes.LASTMONTH
+            dtEnd = DateTime.Today + TimeSpan.FromDays(1)
+            dtStart = dtEnd - TimeSpan.FromDays(30.5)
+         Case DayTypes.LAST3MONTHS
+            dtEnd = DateTime.Today + TimeSpan.FromDays(1)
+            dtStart = dtEnd - TimeSpan.FromDays(30.5 * 3)
+         Case DayTypes.LAST6MONTHS
+            dtEnd = DateTime.Today + TimeSpan.FromDays(1)
+            dtStart = dtEnd - TimeSpan.FromDays(30.5 * 6)
+         Case DayTypes.PERIOD
+            dtStart = dtStartDate + TimeSpan.FromDays(1)
+            dtEnd = dtEndDate
+      End Select
+      ' leggo da db
+      If m_ProjectType = ProjectType.PROD Then
+         Dim DbProjectList As New List(Of ProdFileM)
+         DbProjectList = DbControllers.m_ProdController.GetLastDesc(dtStart, dtEnd, nRowQuantity, True)
+         For Each Project In DbProjectList
+            m_ProjectList.Add(New ProdFileVM(Project))
+         Next
+      End If
+
+   End Sub
+
 #End Region    ' METHODS
 
 End Class

EgtBEAMWALL.Supervisor/SupervisorManager/SupervisorManagerVM.vb

@@ -77,24 +77,25 @@ Public Class SupervisorManagerVM
    'Private m_cmdSave As ICommand
    Private m_cmdGoToProd As ICommand
 
-   #Region "ToolTip"
+#Region "ToolTip"
 
-      'Proprietà ToolTip
-      Public ReadOnly Property OpenToolTip As String
-         Get
-            Return EgtMsg(MSG_TOPCOMMANDBAR + 2)
-         End Get
-      End Property
-      Public ReadOnly Property GoToProd_ToolTip As String
-         Get
-            Return EgtMsg(61835)
-         End Get
-      End Property
+   'Proprietà ToolTip
+   Public ReadOnly Property OpenToolTip As String
+      Get
+         Return EgtMsg(MSG_TOPCOMMANDBAR + 2)
+      End Get
+   End Property
+   Public ReadOnly Property GoToProd_ToolTip As String
+      Get
+         Return EgtMsg(61835)
+      End Get
+   End Property
 
-   #End Region ' ToolTip
 
+
+
+#End Region ' ToolTip
 #End Region    ' Fields & Properties
-
 #Region "CONSTRUCTOR"
 
    Sub New()
@@ -297,6 +298,11 @@ Public Class SupervisorManagerVM
       End If
       Map.refProjectVM.SupervisorMachGroupPanelVM.NotifyPropertyChanged(NameOf(Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList))
       m_bLoadingProd = False
+
+      MyComparer.RefreshColumns()
+      Map.refSupervisorMachGroupPanelVM.SetMachGroupVMListView()
+      Map.refSupervisorMachGroupPanelVM.RefreshMachGroupVMSort()
+
       NotifyPropertyChanged(NameOf(MruFileNames))
       LoadingWndHelper.CloseLoadingWnd(ActiveIds.OPENPROD)
    End Sub

EgtBEAMWALL.Supervisor/Utility/Dictionary.xaml

@@ -342,6 +342,16 @@
       <Setter Property="VerticalAlignment" Value="Center"/>
       <Setter Property="Margin" Value="10,0,10,0"/>
    </Style>
+   
+   <Style x:Key="Log_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+      <Setter Property="VerticalAlignment" Value="Center"/>
+      <Setter Property="Margin" Value="5,0,5,0"/>
+   </Style>
+
+   <Style x:Key="Filter_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
+      <Setter Property="VerticalAlignment" Value="Center"/>
+      <Setter Property="Margin" Value="2.5,0,2.5,0"/>
+   </Style>
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
@@ -720,4 +730,22 @@
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
+
+   <!-- DatePicker -->
+
+   <Style x:Key="Log_DatePicker" TargetType="{x:Type DatePicker}">
+      <Setter Property="Height" Value="22" />
+   </Style>
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+  
+   <!-- DatePicker -->
+
+   <Style x:Key="Filter_DatePicker" TargetType="{x:Type DatePicker}">
+      <Setter Property="Height" Value="22" />
+      <Setter Property="Width" Value="100" />
+   </Style>
+
+   <!-- ______________________________________________________________________________________________________________________________________________ -->
+
 </ResourceDictionary>

EgtBEAMWALL.Supervisor/Utility/LogEvent.vb

@@ -1,4 +1,5 @@
-Imports EgtWPFLib5
+Imports EgtUILib
+Imports EgtWPFLib5
 Imports EgtBEAMWALL.Core
 
 Public Class LogEvent
@@ -77,9 +78,9 @@ Public Class LogEvent
       Get
          Select Case m_Status
             Case 1
-               Return "Inizio"
+               Return EgtMsg(62527)
             Case 2
-               Return "Fine"
+               Return EgtMsg(62528)
             Case Else
                Return ""
          End Select

EgtBEAMWALL.Supervisor/VariablesList/VariablesListVM.vb

@@ -64,7 +64,7 @@ Public Class Variable
          Return CommVar.sValue
       End Get
       Set(value As String)
-         MachManaging.CommandList.Add(ThreadCommand.CreateCommand(CommandTypes.WRITE, {CommVar.nType}, Nothing, {CommVar.sAddress, value}))
+         MachManaging.AddToCommandList(ThreadCommand.CreateCommand(CommandTypes.WRITE, {CommVar.nType}, Nothing, {CommVar.sAddress, value}))
          NotifyPropertyChanged(NameOf(sValue))
       End Set
    End Property

EgtBEAMWALL.Supervisor/app.config

@@ -6,7 +6,7 @@
    </configSections>
    <entityFramework>
       <!--<defaultConnectionFactory type="MySql.Data.Entity.MySqlConnectionFactory, MySql.Data.EntityFramework" />-->
-      <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework"/>
+      <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" />
       <providers>
          <provider invariantName="MySql.Data.MySqlClient" type="MySql.Data.MySqlClient.MySqlProviderServices, MySql.Data.EntityFramework, Version=8.0.21.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d">
          </provider>

EgtBEAMWALL.Supervisor/packages.config

@@ -2,10 +2,10 @@
 <packages>
   <package id="BouncyCastle" version="1.8.5" targetFramework="net472" />
   <package id="Csv" version="1.0.31" targetFramework="net472" />
+  <package id="DotNetZip" version="1.16.0" targetFramework="net472" />
   <package id="EntityFramework" version="6.4.4" targetFramework="net452" />
   <package id="FluentFTP" version="19.2.2" targetFramework="net472" />
   <package id="Google.Protobuf" version="3.21.9" targetFramework="net472" />
-  <package id="Ionic.Zip" version="1.9.1.8" targetFramework="net472" />
   <package id="K4os.Compression.LZ4" version="1.3.5" targetFramework="net472" />
   <package id="K4os.Compression.LZ4.Streams" version="1.3.5" targetFramework="net472" />
   <package id="K4os.Hash.xxHash" version="1.0.8" targetFramework="net472" />

EgtBEAMWALL.ViewerOptimizer/App.config

@@ -6,7 +6,7 @@
    </configSections>
    <entityFramework>
       <!--<defaultConnectionFactory type="MySql.Data.Entity.MySqlConnectionFactory, MySql.Data.EntityFramework" />-->
-      <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework"/>
+      <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" />
       <providers>
          <provider invariantName="MySql.Data.MySqlClient" type="MySql.Data.MySqlClient.MySqlProviderServices, MySql.Data.EntityFramework, Version=8.0.21.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d">
          </provider>
@@ -41,6 +41,14 @@
             <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
             <bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
          </dependentAssembly>
+         <dependentAssembly>
+            <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+            <bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
+         </dependentAssembly>
+         <dependentAssembly>
+            <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+            <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+         </dependentAssembly>
       </assemblyBinding>
    </runtime>
    <system.data>

EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLFeatureVM.vb

@@ -120,9 +120,17 @@ Public Class BTLFeatureVM
       End Get
       Set(value As String)
          Dim nTemp As Integer = 0
-         If Integer.TryParse(value, nTemp) Then 
-            m_BTLFeatureM.nPriority = nTemp
-            EgtSetInfo( nFeatureId, BTL_FTR_PRIORITY, m_BTLFeatureM.nPriority)
+         If Integer.TryParse(value, nTemp) Then
+            If EgtSetInfo(nFeatureId, BTL_FTR_PRIORITY, nTemp) Then
+               m_BTLFeatureM.nPriority = nTemp
+               ' setto feature da ricalcolare
+               ResetCalcFeature()
+               ' se in View
+               If Map.refMainMenuVM.SelPage = Pages.VIEW Then
+                  ' imposto modificato per copie
+                  EgtDuploSetModified(m_BTLPartM.nPartId)
+               End If
+            End If
          End If
          NotifyPropertyChanged(NameOf(sPriority))
       End Set

EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLPartVM.vb

@@ -2164,7 +2164,7 @@ Public Class BTLPartVM
             ' imposto path disegno da mostrare in BottomPanel
             Dim SelPBTLParam As BTLParamVM = Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM.SelPBTLParam
             If Not IsNothing(SelPBTLParam) Then Map.refBottomPanelVM.SetCurrDraw(SelPBTLParam.sDrawPath)
-         Case NameOf(sender.bDO)
+         Case NameOf(sender.bDO), NameOf(sender.sPriority)
             NotifyPropertyChanged(NameOf(bDOALL))
             ' setto pezzo da ricalcolare
             'ResetCalcTotalPart()

EgtBEAMWALL.ViewerOptimizer/CALCPanel/CalcPanelV.xaml

@@ -47,6 +47,7 @@
            Visibility="{Binding ChooseMachineBtn_Visibility}">
       <Image Source="/Resources/CALCPanel/ChooseMachine.png" Stretch="Uniform"/>
    </Button>
+
    <Grid Margin="0,0,5,0" Visibility="{Binding ChooseMachine_Visibility}">
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto"/>

EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/ConfigurationPageV.xaml

@@ -71,6 +71,64 @@
                         <CheckBox IsChecked="{Binding bPrintLabel_IsChecked}"
                                  Margin="0,5,0,0"/>
                      </UniformGrid>
+                     <GroupBox Header="Backup And Restore">
+                        <Grid>
+                           <Grid.RowDefinitions>
+                              <RowDefinition Height="Auto"/>
+                              <RowDefinition Height="Auto"/>
+                              <RowDefinition Height="Auto"/>
+                              <RowDefinition Height="Auto"/>
+                           </Grid.RowDefinitions>
+                           <Grid Grid.Row="0"
+                                 Margin="0,2,0,5">
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="Auto"/>
+                                 <ColumnDefinition Width="1*"/>
+                              </Grid.ColumnDefinitions>
+                              <CheckBox x:Name="ExternalBackup_CheckBox"
+                                        IsChecked="{Binding bExternalBackupActive}"
+                                        VerticalAlignment="Center"/>
+                              <TextBlock Grid.Column="1"
+                                         Text="External file path:"
+                                         VerticalAlignment="Center"/>
+                           </Grid>
+                           <Grid Grid.Row="1"
+                                 Margin="0,2,0,5">
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="1*"/>
+                                 <ColumnDefinition Width="Auto"/>
+                              </Grid.ColumnDefinitions>
+                              <TextBox Text="{Binding ExternalBackupFolderPath}"
+                                       IsEnabled="{Binding IsChecked, ElementName=ExternalBackup_CheckBox}"
+                                       Margin="0,0,2.5,0"/>
+                              <Button Grid.Column="1"
+                                      Content="..."
+                                      Width="18"
+                                      Command="{Binding ChooseExternalBackupFolderPath_Command}"
+                                      IsEnabled="{Binding IsChecked, ElementName=ExternalBackup_CheckBox}"
+                                      Margin="2.5,0,0,0"/>
+                           </Grid>
+                           <Grid Grid.Row="2">
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="1*"/>
+                                 <ColumnDefinition Width="Auto"/>
+                              </Grid.ColumnDefinitions>
+                              <TextBlock Text="Reminder Frequency"/>
+                              <ComboBox Grid.Column="1"
+                                        ItemsSource="{Binding ReminderList}"
+                                        SelectedItem="{Binding SelReminder}"/>
+                           </Grid>
+                           <StackPanel Grid.Row="3"
+                                       Orientation="Horizontal">
+                              <Button Content="Backup"
+                                      Command="{Binding Backup_Command}"
+                                      Style="{StaticResource ToolBar_TextButton}"/>
+                              <Button Content="Restore"
+                                      Command="{Binding Restore_Command}"
+                                      Style="{StaticResource ToolBar_TextButton}"/>
+                           </StackPanel>
+                        </Grid>
+                     </GroupBox>
                   </StackPanel>
                </Grid>
             </TabItem.Content>

EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/ConfigurationPageVM.vb

@@ -3,6 +3,12 @@ Imports System.IO
 Imports EgtUILib
 Imports EgtWPFLib5
 Imports EgtBEAMWALL.Core
+Imports MS.Internal
+Imports Org.BouncyCastle.X509
+Imports Ionic.Zip
+Imports Org.BouncyCastle.Bcpg
+Imports Microsoft.VisualBasic.ApplicationServices
+Imports Renci.SshNet.Security
 
 Public Class ConfigurationPageVM
    Inherits VMBase
@@ -36,8 +42,6 @@ Public Class ConfigurationPageVM
    ' flag modifica parametri Macchina
    Friend bModifyMachParam As Boolean
 
-   ' Definizione comandi
-   Private m_cmdSave As ICommand
 
    Public ReadOnly Property MachinePanelVM As MachinePanelVM
       Get
@@ -160,6 +164,66 @@ Public Class ConfigurationPageVM
       End Set
    End Property
 
+   Private m_bBackupRunning As Boolean = False
+   Public ReadOnly Property bBackupRunning As Boolean
+      Get
+         Return m_bBackupRunning
+      End Get
+   End Property
+
+   Private m_bRestoreRunning As Boolean = False
+   Public ReadOnly Property bRestoreRunning As Boolean
+      Get
+         Return m_bRestoreRunning
+      End Get
+   End Property
+
+   Private m_bExternalBackupActive As Boolean
+   Public Property bExternalBackupActive As Boolean
+      Get
+         Return m_bExternalBackupActive
+      End Get
+      Set(value As Boolean)
+         m_bExternalBackupActive = value
+         WriteMainPrivateProfileString(S_BACKUPANDRESTORE, K_EXTERNALBACKUPACTIVE, If(m_bExternalBackupActive, 1, 0))
+      End Set
+   End Property
+
+   Private m_ExternalBackupFolderPath As String
+   Public Property ExternalBackupFolderPath As String
+      Get
+         Return m_ExternalBackupFolderPath
+      End Get
+      Set(value As String)
+         m_ExternalBackupFolderPath = value
+         WriteMainPrivateProfileString(S_BACKUPANDRESTORE, K_EXTERNALFILEPATH, m_ExternalBackupFolderPath)
+      End Set
+   End Property
+
+   Private m_ReminderList As New List(Of IdNameStruct)({New IdNameStruct(0, EgtMsg(61988)), New IdNameStruct(1, EgtMsg(61989)), New IdNameStruct(2, EgtMsg(61990)), New IdNameStruct(7, EgtMsg(61991)), New IdNameStruct(14, EgtMsg(61992)), New IdNameStruct(30, EgtMsg(61993))})
+   Public ReadOnly Property ReminderList As List(Of IdNameStruct)
+      Get
+         Return m_ReminderList
+      End Get
+   End Property
+
+   Private m_SelReminder As IdNameStruct
+   Public Property SelReminder As IdNameStruct
+      Get
+         Return m_SelReminder
+      End Get
+      Set(value As IdNameStruct)
+         m_SelReminder = value
+         WriteMainPrivateProfileString(S_BACKUPANDRESTORE, K_REMINDERFREQUENCY, m_SelReminder.Id)
+      End Set
+   End Property
+
+   ' Definizione comandi
+   Private m_cmdSave As ICommand
+   Private m_cmdChooseExternalBackupFolderPath As ICommand
+   Private m_cmdBackup As ICommand
+   Private m_cmdRestore As ICommand
+
 #Region "Messages"
 
    Public ReadOnly Property L_Msg As String
@@ -327,7 +391,7 @@ Public Class ConfigurationPageVM
       ' leggo SectionTime e PartTime
       GetMainPrivateProfileString(S_NEST, K_SECTIONTIME, "", SectionTime)
       GetMainPrivateProfileString(S_NEST, K_PARTTIME, "", PartTime)
-      m_bPrintLabel_IsChecked = ( GetMainPrivateProfileInt(S_PRINTER, K_ENABLE, 0) <> 0)
+      m_bPrintLabel_IsChecked = (GetMainPrivateProfileInt(S_PRINTER, K_ENABLE, 0) <> 0)
       ' assegno le liste dei parametri della macchina corrente alla ConfigMachTableList alla pagina di Configurazione
       ConfigMachTableList = CurrentMachine.MachTableList
       ' carico i parametri Q dei Process letti dall'ini
@@ -346,10 +410,19 @@ Public Class ConfigurationPageVM
       m_QBTLParamVMList_View = CollectionViewSource.GetDefaultView(m_QBTLParamVMList)
       m_QBTLParamVMList_View.GroupDescriptions.Add(New PropertyGroupDescription(NameOf(QBTLParamVM.GroupType)))
       m_QBTLParamVMList_View.GroupDescriptions.Add(New PropertyGroupDescription(NameOf(QBTLParamVM.ghDesc)))
+      ' leggo dati per backup
+      GetMainPrivateProfileString(S_BACKUPANDRESTORE, K_EXTERNALFILEPATH, "", m_ExternalBackupFolderPath)
+      Dim nDefaultReminderFrequency As Integer = GetMainPrivateProfileInt(S_BACKUPANDRESTORE, K_REMINDERFREQUENCY, 1)
+      SelReminder = m_ReminderList.FirstOrDefault(Function(x) x.Id = nDefaultReminderFrequency)
+      Dim nExternalBackupActive As Integer = GetMainPrivateProfileInt(S_BACKUPANDRESTORE, K_EXTERNALBACKUPACTIVE, 0)
+      m_bExternalBackupActive = nExternalBackupActive > 0
+      NotifyPropertyChanged(NameOf(bExternalBackupActive))
    End Sub
 
 #End Region ' Constructor
 
+#Region "COMMANDS"
+
 #Region "SaveCommand"
 
    ''' <summary>
@@ -373,6 +446,328 @@ Public Class ConfigurationPageVM
 
 #End Region ' SaveCommand
 
+#Region "ChooseExternalBackupFolderPath"
+
+   ''' <summary>
+   ''' Returns a command that do Save.
+   ''' </summary>
+   Public ReadOnly Property ChooseExternalBackupFolderPath_Command As ICommand
+      Get
+         If m_cmdChooseExternalBackupFolderPath Is Nothing Then
+            m_cmdChooseExternalBackupFolderPath = New Command(AddressOf ChooseExternalBackupFolderPath)
+         End If
+         Return m_cmdChooseExternalBackupFolderPath
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the Save.  This method is invoked by the SaveCommand.
+   ''' </summary>
+   Public Sub ChooseExternalBackupFolderPath()
+      'Dim FileDialog As New System.Windows.Forms.FolderBrowserDialog With {.SelectedPath = m_ExternalBackupFolderPath,
+      '                                                                     .Description = "Backup & Restore File Path"}
+      Dim FileDialog As New Microsoft.Win32.SaveFileDialog() With {.InitialDirectory = m_ExternalBackupFolderPath,
+                                                                   .CheckFileExists = False,
+                                                                   .CheckPathExists = False,
+                                                                   .DefaultExt = ".folder",
+                                                                   .OverwritePrompt = False,
+                                                                   .FileName = "Select this ",
+                                                                   .Title = "Backup & Restore File Path"}
+      If FileDialog.ShowDialog() Then
+         m_ExternalBackupFolderPath = Path.GetDirectoryName(FileDialog.FileName)
+         WriteMainPrivateProfileString(S_BACKUPANDRESTORE, K_EXTERNALFILEPATH, m_ExternalBackupFolderPath)
+         NotifyPropertyChanged(NameOf(ExternalBackupFolderPath))
+      End If
+   End Sub
+
+#End Region ' ChooseExternalBackupFolderPath
+
+#Region "Backup"
+
+   ''' <summary>
+   ''' Returns a command that do Save.
+   ''' </summary>
+   Public ReadOnly Property Backup_Command As ICommand
+      Get
+         If m_cmdBackup Is Nothing Then
+            m_cmdBackup = New Command(AddressOf BackupCmd)
+         End If
+         Return m_cmdBackup
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the Save.  This method is invoked by the SaveCommand.
+   ''' </summary>
+   Public Sub BackupCmd()
+      Backup(True)
+   End Sub
+
+   Public Sub Backup(bLoadingWindow As Boolean)
+      m_bBackupRunning = True
+      ' verifico se esiste cartella backup, altrimenti la creo
+      Dim sBackupFolder As String = Map.refMainWindowVM.MainWindowM.sDataDir & "\Backup"
+      If Directory.Exists(sBackupFolder) Then
+         ' verifico se devo cancellare backup vecchi
+         Dim nBackupCount As Integer = 0
+         Dim YearDirList() As String = Directory.GetDirectories(sBackupFolder)
+         For YearIndex = YearDirList.Length - 1 To 0 Step -1
+            Dim nYear As Integer = 0
+            Integer.TryParse(Path.GetFileName(YearDirList(YearIndex)), nYear)
+            Dim sYearDir As String = sBackupFolder & "\" & nYear
+            Dim MonthDirList() As String = Directory.GetDirectories(sYearDir)
+            For MonthIndex = MonthDirList.Length - 1 To 0 Step -1
+               Dim nMonth As Integer = 0
+               Integer.TryParse(Path.GetFileName(MonthDirList(MonthIndex)), nMonth)
+               Dim sMonthDir As String = sYearDir & "\" & nMonth
+               Dim DayDirList() As String = Directory.GetDirectories(sMonthDir)
+               For DayIndex = DayDirList.Length - 1 To 0 Step -1
+                  Dim nDay As Integer = 0
+                  Integer.TryParse(Path.GetFileName(DayDirList(DayIndex)), nDay)
+                  If nBackupCount > 3 Then
+                     Directory.Delete(sBackupFolder & "\" & nYear & "\" & nMonth & "\" & nDay, True)
+                  End If
+               Next
+               DayDirList = Directory.GetDirectories(sMonthDir)
+               If IsNothing(DayDirList) OrElse DayDirList.Length = 0 Then
+                  Directory.Delete(sMonthDir)
+               End If
+            Next
+            MonthDirList = Directory.GetDirectories(sYearDir)
+            If IsNothing(MonthDirList) OrElse MonthDirList.Length = 0 Then
+               Directory.Delete(sYearDir)
+            End If
+         Next
+      Else
+         Directory.CreateDirectory(sBackupFolder)
+      End If
+      sBackupFolder &= "\" & DateTime.Now().Year
+      If Not Directory.Exists(sBackupFolder) Then
+         Directory.CreateDirectory(sBackupFolder)
+      End If
+      sBackupFolder &= "\" & DateTime.Now().Month
+      If Not Directory.Exists(sBackupFolder) Then
+         Directory.CreateDirectory(sBackupFolder)
+      End If
+      sBackupFolder &= "\" & DateTime.Now().Day
+      If Not Directory.Exists(sBackupFolder) Then
+         Directory.CreateDirectory(sBackupFolder)
+      End If
+      sBackupFolder &= "\" & DateTime.Now().ToString("yyyyMMddHHmmss") & ".bwbck"
+      Dim sBackupZipPath As String = Map.refMainWindowVM.MainWindowM.sTempDir & "\DbBackup.zip"
+      ' apro finestra di caricamento
+      If bLoadingWindow Then LoadingWndHelper.OpenLoadingWnd(ActiveIds.BACKUP, 2, EgtMsg(63022), EgtMsg(63023), 15)           ' Backup     ' Database backup
+      Dim bOk As Boolean = True
+      ' backup del Db corrente
+      Try
+         DataLayer.DbConfig.DataBaseDumpToFile(sBackupZipPath)
+      Catch ex As Exception
+         MessageBox.Show(EgtMsg(62103), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)
+         bOk = False
+      End Try
+      If bOk AndAlso File.Exists(sBackupZipPath) Then
+         If bLoadingWindow Then LoadingWndHelper.UpdateLoadingWnd(ActiveIds.BACKUP, 2, EgtMsg(63024), 15, 100)        ' Projects backup
+         ' backup dei progetti correnti
+         Try
+            Using zip As New Ionic.Zip.ZipFile(sBackupFolder, Console.Out)
+               zip.AlternateEncodingUsage = ZipOption.Always
+               zip.AlternateEncoding = Text.Encoding.UTF8
+               zip.CompressionMethod = CompressionMethod.None
+               ' aggiungo Db
+               zip.AddItem(sBackupZipPath, "")
+               ' aggiungo cartella progetti
+               Dim sProjectFolder As String = Map.refMainWindowVM.MainWindowM.sDataDir & "\"
+               Dim sKey As String = ""
+               EgtGetKeyInfo(sKey)
+               sKey = sKey.Replace(" ", "")
+               Dim sUserFolder As String = ""
+               If Not IsNothing(sKey) AndAlso sKey.Length > 11 Then
+                  sUserFolder = sKey.Substring(3, 6)
+                  sProjectFolder &= sUserFolder
+               End If
+               zip.AddItem(sProjectFolder, sUserFolder)
+               ' salvo lo zip
+               zip.Save()
+            End Using
+         Catch ex As Exception
+            MessageBox.Show(EgtMsg(62103), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)
+            bOk = False
+         End Try
+      End If
+      ' se esiste zip del Db, lo elimino
+      If File.Exists(sBackupZipPath) Then
+         File.Delete(sBackupZipPath)
+      End If
+      ' se richiesto faccio copia su external source
+      If m_bExternalBackupActive Then
+         If Directory.Exists(m_ExternalBackupFolderPath) Then
+            CopyForExternalBackup(sBackupFolder, m_ExternalBackupFolderPath)
+         Else
+            MessageBox.Show(EgtMsg(62104), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)                      ' External folder does not exist or is not reachable! Copy to external folder impossible!
+         End If
+      End If
+      'chiudo finestra di caricamento
+      If bLoadingWindow Then LoadingWndHelper.CloseLoadingWnd(ActiveIds.BACKUP)
+      m_bBackupRunning = False
+   End Sub
+
+   Private Async Sub CopyForExternalBackup(sBackupFile As String, sExternalBackupFolder As String)
+      Using SourceStream As FileStream = File.Open(sBackupFile, FileMode.Open)
+         Dim sExternalBackupFile As String = sExternalBackupFolder & "\" & Path.GetFileName(sBackupFile)
+         Using DestinationStream As FileStream = File.Create(sExternalBackupFile)
+            Await SourceStream.CopyToAsync(DestinationStream)
+         End Using
+      End Using
+   End Sub
+
+#End Region ' Backup
+
+#Region "Restore"
+
+   ''' <summary>
+   ''' Returns a command that do Save.
+   ''' </summary>
+   Public ReadOnly Property Restore_Command As ICommand
+      Get
+         If m_cmdRestore Is Nothing Then
+            m_cmdRestore = New Command(AddressOf Restore)
+         End If
+         Return m_cmdRestore
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the Save.  This method is invoked by the SaveCommand.
+   ''' </summary>
+   Public Sub Restore()
+      ' recupero processo del supervisore
+      Dim sSupervisorName As String = "EgtBEAMWALL.SupervisorR32"
+      Dim localProc As Process() = Process.GetProcessesByName(sSupervisorName)
+      ' verifico che sia chiuso
+      If localProc.Length > 0 Then
+         MessageBox.Show(EgtMsg(62105), EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)          ' Please verify the machine is stoped and close the supervisor before proceding with the restore operation!
+         Return
+      End If
+      m_bRestoreRunning = True
+      ' verifico se esiste backup
+      Dim sBackupFolder As String = Map.refMainWindowVM.MainWindowM.sDataDir & "\Backup"
+      Dim nYear As Integer = 0
+      Dim nMonth As Integer = 0
+      Dim nDay As Integer = 0
+      Dim sRestorePath As String = ""
+      If Directory.Exists(sBackupFolder) Then
+         Dim YearDirList() As String = Directory.GetDirectories(sBackupFolder)
+         For YearIndex = YearDirList.Length - 1 To 0 Step -1
+            nYear = 0
+            Integer.TryParse(Path.GetFileName(YearDirList(YearIndex)), nYear)
+            Dim sYearDir As String = sBackupFolder & "\" & nYear
+            Dim MonthDirList() As String = Directory.GetDirectories(sYearDir)
+            For MonthIndex = MonthDirList.Length - 1 To 0 Step -1
+               nMonth = 0
+               Integer.TryParse(Path.GetFileName(MonthDirList(MonthIndex)), nMonth)
+               Dim sMonthDir As String = sYearDir & "\" & nMonth
+               Dim DayDirList() As String = Directory.GetDirectories(sMonthDir)
+               For DayIndex = DayDirList.Length - 1 To 0 Step -1
+                  nDay = 0
+                  Integer.TryParse(Path.GetFileName(DayDirList(DayIndex)), nDay)
+                  Dim sDayDir As String = sMonthDir & "\" & nDay
+                  Dim VersionList() As String = Directory.GetFiles(sDayDir)
+                  If VersionList.Length > 0 Then
+                     Dim nMaxVersion As Int64 = VersionList.Max(Function(x) Int64.Parse(Path.GetFileNameWithoutExtension(x)))
+                     sRestorePath = sDayDir & "\" & nMaxVersion & ".bwbck"
+                     Exit For
+                  End If
+               Next
+               If Not String.IsNullOrEmpty(sRestorePath) Then Exit For
+            Next
+            If Not String.IsNullOrEmpty(sRestorePath) Then Exit For
+         Next
+      End If
+      If String.IsNullOrEmpty(sRestorePath) Then
+         MessageBox.Show(EgtMsg(62106), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)            ' Restore impossible! Last backup not found!
+      End If
+      If MessageBox.Show(String.Format(EgtMsg(62107), nYear, nMonth, nDay), EgtMsg(15002), MessageBoxButton.OKCancel, MessageBoxImage.Warning) <> MessageBoxResult.OK Then               'Are you sure you want to restore the last backup from {0}\{1}\{2}? If you proceed you will lose actual data!
+         m_bRestoreRunning = False
+         Return
+      End If
+      Dim bDoBackup = False
+      Select Case MessageBox.Show(EgtMsg(62108), EgtMsg(15003), MessageBoxButton.YesNoCancel, MessageBoxImage.Information)                  ' Do you want to do a backup of the current project before proceding with the restore?
+         Case MessageBoxResult.Yes
+            bDoBackup = True
+         Case MessageBoxResult.No
+            bDoBackup = False
+         Case MessageBoxResult.Cancel
+            MessageBox.Show(EgtMsg(62109), EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)
+            m_bRestoreRunning = False
+            Return
+      End Select
+      ' apro finestra di caricamento
+      LoadingWndHelper.OpenLoadingWnd(ActiveIds.RESTORE, 3, EgtMsg(63025), EgtMsg(63026), If(bDoBackup, 40, 10))           ' Restore     ' Database Restore
+      If bDoBackup Then
+         Backup(False)
+      End If
+      ' recupero cartella corrente dei progetti 
+      Dim sProjectFolder As String = Map.refMainWindowVM.MainWindowM.sDataDir
+      Dim sKey As String = ""
+      EgtGetKeyInfo(sKey)
+      sKey = sKey.Replace(" ", "")
+      Dim sUserFolder As String = ""
+      If Not IsNothing(sKey) AndAlso sKey.Length > 11 Then
+         sUserFolder = sKey.Substring(3, 6)
+      End If
+      If Directory.Exists(sProjectFolder & "\" & sUserFolder) Then
+         ' elimino cartella dei progetti
+         Directory.Delete(sProjectFolder & "\" & sUserFolder, True)
+      End If
+      LoadingWndHelper.UpdateLoadingWnd(ActiveIds.RESTORE, 2, EgtMsg(63027), If(bDoBackup, 40, 10), 80)        ' Restore data extraction
+      ' estraggo lo zip nella cartella Temp
+      Dim sRestoreDir As String = Map.refMainWindowVM.MainWindowM.sTempDir & "\Restore"
+      If Directory.Exists(sRestoreDir) Then
+         Directory.Delete(sRestoreDir, True)
+      End If
+      Directory.CreateDirectory(sRestoreDir)
+      Dim bOk As Boolean = True
+      ' apro file zip
+      Try
+         Using zip As New Ionic.Zip.ZipFile(sRestorePath, Console.Out)
+            ' estraggo file da zip
+            zip.ExtractAll(sRestoreDir)
+         End Using
+      Catch ex1 As Exception
+         EgtOutLog("Error! Impossible importing Recovery file " & sRestorePath & "!")
+         EgtOutLog("Exception in zip: " & ex1.ToString())
+         MessageBox.Show(EgtMsg(62110), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)             ' Impossible importing Recovery file!
+         bOk = False
+      End Try
+      Dim sBackupTempPath As String = Map.refMainWindowVM.MainWindowM.sTempDir & "\DbRestore"
+      LoadingWndHelper.UpdateLoadingWnd(ActiveIds.RESTORE, 3, EgtMsg(63028), 80, 100)        ' Database restore
+      If bOk Then
+         ' restore del Db
+         Try
+            DataLayer.DbConfig.DataBaseRestoreFromFile(sRestoreDir & "\DbBackup.zip", "", sBackupTempPath)
+         Catch ex As Exception
+            MessageBox.Show(EgtMsg(62111), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)                 ' Restore failed! Impossible to restore the backup Database
+            bOk = False
+         End Try
+      End If
+      If File.Exists(sRestoreDir & "\DbBackup.zip") Then
+         File.Delete(sRestoreDir & "\DbBackup.zip")
+      End If
+      If bOk Then
+         ' sposto il backup al posto giusto
+         Directory.Move(sRestoreDir & "\" & sUserFolder, sProjectFolder & "\" & sUserFolder)
+      End If
+      If Directory.Exists(sRestoreDir) Then
+         Directory.Delete(sRestoreDir)
+      End If
+      LoadingWndHelper.CloseLoadingWnd(ActiveIds.RESTORE)
+      m_bRestoreRunning = False
+   End Sub
+
+#End Region ' Restore
+
+#End Region    ' COMMANDS
+
 #Region "Methods"
 
    ' funzione che scrive i parametri modificati sul file INI
@@ -680,21 +1075,17 @@ Public Class MachParam
          Dim dNewValue As Double
          ' verifico se valore immesso è diverso dall'originale
          If nParentTable > 0 Then
-            Dim sOrigValue As String = String.Empty
-            Dim dOrigValue As Double
-            MachParamIniFile.GetMachPrivateProfileParamValue(nParentTable, nParamIndex, sOrigValue)
             ' trasformo valori
             Select Case nType
                Case MachParamType.DOUBLE_
                   StringToDoubleAdv(value, dNewValue, True)
-                  StringToDoubleAdv(sOrigValue, dOrigValue, True)
+                  m_IsModifiedValue = Math.Abs(dNewValue - m_dValue) > EPS_SMALL
                Case MachParamType.LENGTH
                   StringToLenAdv(value, dNewValue, True)
-                  StringToLenAdv(sOrigValue, dOrigValue, True)
+                  m_IsModifiedValue = Math.Abs(dNewValue - m_dValue) > EPS_SMALL
                Case Else
-                  ' per string non faccio nulla
+                  m_IsModifiedValue = String.Compare(value, m_sValue) <> 0
             End Select
-            m_IsModifiedValue = dNewValue <> dOrigValue
          End If
          ' se valore immesso è diverso e password non inserita
          If m_IsModifiedValue AndAlso Not Map.refConfigurationPageVM.bModifyMachParam Then

EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj

@@ -141,6 +141,9 @@
     <Reference Include="BouncyCastle.Crypto, Version=1.9.0.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
       <HintPath>..\packages\Portable.BouncyCastle.1.9.0\lib\net40\BouncyCastle.Crypto.dll</HintPath>
     </Reference>
+    <Reference Include="DotNetZip, Version=1.16.0.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
+      <HintPath>..\packages\DotNetZip.1.16.0\lib\net40\DotNetZip.dll</HintPath>
+    </Reference>
     <Reference Include="EgtUILib, Version=2.4.3.1, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\ExtLibs\EgtUILib.dll</HintPath>
@@ -158,9 +161,6 @@
     <Reference Include="Google.Protobuf, Version=3.21.9.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
       <HintPath>..\packages\Google.Protobuf.3.21.9\lib\net45\Google.Protobuf.dll</HintPath>
     </Reference>
-    <Reference Include="Ionic.Zip, Version=1.9.1.8, Culture=neutral, PublicKeyToken=edbe51ad942a3f5c, processorArchitecture=MSIL">
-      <HintPath>..\packages\Ionic.Zip.1.9.1.8\lib\Ionic.Zip.dll</HintPath>
-    </Reference>
     <Reference Include="K4os.Compression.LZ4, Version=1.3.5.0, Culture=neutral, PublicKeyToken=2186fa9121ef231d, processorArchitecture=MSIL">
       <HintPath>..\packages\K4os.Compression.LZ4.1.3.5\lib\net462\K4os.Compression.LZ4.dll</HintPath>
     </Reference>
@@ -327,6 +327,7 @@
       <DependentUpon>NestingRunningWndV.xaml</DependentUpon>
     </Compile>
     <Compile Include="NestingRunningWnd\NestingRunningWndVM.vb" />
+    <Compile Include="NewOpenProjectFileDialog\NewOpenProjectFileDialogVM.vb" />
     <Compile Include="ProjectTypeWnd\ProjectTypeWndV.xaml.vb">
       <DependentUpon>ProjectTypeWndV.xaml</DependentUpon>
     </Compile>
@@ -337,6 +338,10 @@
       <DependentUpon>SetUpV.xaml</DependentUpon>
     </Compile>
     <Compile Include="SetUp\SetUpVM.vb" />
+    <Compile Include="SpecialPanel\SpecialPanelV.xaml.vb">
+      <DependentUpon>SpecialPanelV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="SpecialPanel\SpecialPanelVM.vb" />
     <Compile Include="StatisticsTimePanel\StatisticsTimePanelV.xaml.vb">
       <DependentUpon>StatisticsTimePanelV.xaml</DependentUpon>
     </Compile>
@@ -543,6 +548,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="SpecialPanel\SpecialPanelV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>XamlIntelliSenseFileGenerator</Generator>
+    </Page>
     <Page Include="StatisticsTimePanel\StatisticsTimePanelV.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -996,6 +1005,9 @@
   <ItemGroup>
     <Resource Include="Resources\ProjectManager\AddProj.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\OpenProjectFileDialog\Archived.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\EgtBEAMWALL\EgtBEAMWALL.ViewerOptimizerR32.exe

EgtBEAMWALL.ViewerOptimizer/FeatureManager/FeatureManagerVM.vb

@@ -29,7 +29,7 @@ Public Class FeatureManagerVM
 
    Public ReadOnly Property Priority_Visibility As Visibility
       Get
-         Return if(CurrentMachine.nType = Core.ConstBeam.MachineType.WALL, Visibility.Visible, Visibility.Collapsed)
+         Return If(CurrentMachine.nType = Core.ConstBeam.MachineType.WALL AndAlso CurrentMachine.bIsEnabledPriority, Visibility.Visible, Visibility.Collapsed)
       End Get
    End Property
 

EgtBEAMWALL.ViewerOptimizer/ItemParamList/FeatureInPartInRawPartListVM.vb

@@ -62,7 +62,7 @@ Public Class FeatureInPartInRawPartListVM
 
    Friend Sub UpdateColumns(nMachType As MachineType)
       If Not IsNothing(m_colFeatureInPartInRawPart_Priority) Then
-         m_colFeatureInPartInRawPart_Priority.Visible = (nMachType=MachineType.WALL)
+         m_colFeatureInPartInRawPart_Priority.Visible = (nMachType = MachineType.WALL AndAlso CurrentMachine.bIsEnabledPriority)
       End If
    End Sub
 

EgtBEAMWALL.ViewerOptimizer/ItemParamList/RawPartListVM.vb

@@ -27,6 +27,13 @@ Public Class RawPartListVM
       End Get
    End Property
 
+   Private m_colRawPart_PosZ As EgtDataGridColumn
+   Public ReadOnly Property colRawPart_PosZ As EgtDataGridColumn
+      Get
+         Return m_colRawPart_PosZ
+      End Get
+   End Property
+
    Private m_RawPartColumns As New ObservableCollection(Of EgtDataGridColumn)
    Public Property RawPartColumns As ObservableCollection(Of EgtDataGridColumn)
       Get
@@ -120,6 +127,7 @@ Public Class RawPartListVM
       m_colRawPart_StartCut = RawPartColumns.FirstOrDefault(Function(x) x.Name = COL_STARTCUT)
       m_colRawPart_W = RawPartColumns.FirstOrDefault(Function(x) x.Name = COL_W)
       m_colRawPart_L = RawPartColumns.FirstOrDefault(Function(x) x.Name = COL_L)
+      m_colRawPart_PosZ = RawPartColumns.FirstOrDefault(Function(x) x.Name = COL_POSZ)
       ' aggiorno la visibilità delle colonne
       For Each col In RawPartColumns
          col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed)

EgtBEAMWALL.ViewerOptimizer/LeftPanel/LeftPanelVM.vb

@@ -609,15 +609,7 @@ Public Class LeftPanelVM
          sW = LenToString(CurrSParam.dW, 3)
          sL = LenToString(CurrSParam.dL, 3)
          ' ricavo l'indice del SecionXMaterial dalla Wall_List
-         Dim SectXMatIndex As Integer = 1
-         Dim sSxMValue As String = ""
-         While EgtUILib.GetPrivateProfileString(S_WALL_LIST, SectXMatIndex, String.Empty, sSxMValue, sWarehousePath)
-            If sSxMValue = CurrSParam.sValue Then
-               ' se l'ho trovato esco dal while, il SectXMatIndex è l'indice che cercavamo
-               Exit While
-            End If
-            SectXMatIndex += 1
-         End While
+         Dim SectXMatIndex As Integer = GetSectIndexFromSection(MachineType.WALL, CurrSParam.SectXMat)
          ' ricavo nuovo indice materiale
          Dim ParamIndex As Integer = 1
          Dim sParam As String = ""

EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowM.vb

@@ -157,6 +157,13 @@ Public Class MainWindowM
       End Get
    End Property
 
+   Private m_bSpecialPanel As Boolean = False
+   Friend ReadOnly Property bSpecialPanel As Boolean
+      Get
+         Return m_bSpecialPanel
+      End Get
+   End Property
+
 #End Region    ' FIELDS
 
 #Region "CONSTRUCTOR"
@@ -235,8 +242,8 @@ Public Class MainWindowM
          EgtSetLockId( sLockId)
       End If
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(5327, 2505, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(5327, 2505, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(5327, 2512, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(5327, 2512, 1, m_nKeyOptions)
       ' Inizializzazione generale di EgtInterface
       m_nDebug = GetMainPrivateProfileInt(S_GENERAL, K_DEBUG, 0)
       m_sLogFile = m_sTempDir & "\" & VWOPTGENLOG_FILE_NAME.Replace("#", m_nInstance.ToString())
@@ -278,6 +285,8 @@ Public Class MainWindowM
       EgtSetUiUnits(GetMainPrivateProfileInt(S_SCENE, K_MMUNITS, 1) <> 0)
       ' Leggo e imposto livello utilizzatore
       m_nUserLevel = Math.Min(m_nKeyLevel, GetMainPrivateProfileInt(S_GENERAL, K_USERLEVEL, 1))
+      ' Recupero flag SpecialPanel
+      m_bSpecialPanel = GetMainPrivateProfileInt(S_SPECIAL, K_SPECIALENABLE, 0) = 1
       ' Imposto dir font Nfe e font default
       Dim sNfeDir As String = String.Empty
       GetMainPrivateProfileString(S_GEOMDB, K_NFEFONTDIR, "", sNfeDir)

EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowVM.vb

@@ -88,14 +88,31 @@ Public Class MainWindowVM
       m_Title = ""
       Select Case Map.refMainMenuVM.SelPage
          Case Pages.VIEW
-            If Not IsNothing(Map.refProjManagerVM.CurrProj) Then
-               If Map.refProjManagerVM.CurrProj.bIsNew Then m_Title = "New - "
-               m_Title &= Map.refProjManagerVM.CurrProj.nProjId.ToString("0000") & " - " & Map.refProjManagerVM.CurrProj.sBTLFileName
+            If GetMainPrivateProfileInt(S_GENERAL, K_PROJECTMODE, 0) = 1 Then
+               If Not IsNothing(Map.refProjManagerVM.CurrProj) Then
+                  If Map.refProjManagerVM.CurrProj.bIsNew Then m_Title = "New - "
+                  If Not IsNothing(Map.refProjManagerVM.CurrProj.nProdId) AndAlso Map.refProjManagerVM.CurrProj.nProdId > 0 Then
+                     m_Title &= Map.refProjManagerVM.CurrProj.nProdId.ToString("0000") & " - "
+                  End If
+                  m_Title &= Map.refProjManagerVM.CurrProj.sBTLFileName
+               End If
+            Else
+               If Not IsNothing(Map.refProjManagerVM.CurrProj) Then
+                  If Map.refProjManagerVM.CurrProj.bIsNew Then m_Title = "New - "
+                  m_Title &= Map.refProjManagerVM.CurrProj.nProjId.ToString("0000") & " - " & Map.refProjManagerVM.CurrProj.sBTLFileName
+               End If
             End If
          Case Pages.MACHINING
-            If Not IsNothing(Map.refProdManagerVM.CurrProd) Then
-               If Map.refProdManagerVM.CurrProd.bIsNew Then m_Title = "New - "
-               m_Title &= Map.refProdManagerVM.CurrProd.nProdId.ToString("0000") & " - " & Map.refProdManagerVM.CurrProd.sBTLFileName
+            If GetMainPrivateProfileInt(S_GENERAL, K_PROJECTMODE, 0) = 1 Then
+               If Not IsNothing(Map.refProdManagerVM.CurrProd) Then
+                  If Map.refProdManagerVM.CurrProd.bIsNew Then m_Title = "New - "
+                  m_Title &= Map.refProdManagerVM.CurrProd.nProdId.ToString("0000") & " - " & Map.refProdManagerVM.CurrProd.sName
+               End If
+            Else
+               If Not IsNothing(Map.refProdManagerVM.CurrProd) Then
+                  If Map.refProdManagerVM.CurrProd.bIsNew Then m_Title = "New - "
+                  m_Title &= Map.refProdManagerVM.CurrProd.nProdId.ToString("0000") & " - " & Map.refProdManagerVM.CurrProd.sBTLFileName
+               End If
             End If
          Case Pages.CONFIG
             m_Title = "Configuration Page"
@@ -154,6 +171,51 @@ Public Class MainWindowVM
       ' avvio thread di gestione della macchina che avvia la connessione
       m_SupervisorCommThread.Start()
 
+      ' verifico se richiedere di fare backup
+      If Map.refConfigurationPageVM.SelReminder.Id <> 0 Then
+         Dim sBackupFolder As String = Map.refMainWindowVM.MainWindowM.sDataDir & "\Backup"
+         Dim nYear As Integer = 0
+         Dim nMonth As Integer = 0
+         Dim nDay As Integer = 0
+         Dim LastBackupDate As Date = Date.MinValue
+         ' verifico se esiste backup
+         If Directory.Exists(sBackupFolder) Then
+            ' cerco ultimo backup
+            Dim YearDirList() As String = Directory.GetDirectories(sBackupFolder)
+            For YearIndex = YearDirList.Length - 1 To 0 Step -1
+               nYear = 0
+               Integer.TryParse(Path.GetFileName(YearDirList(YearIndex)), nYear)
+               Dim sYearDir As String = sBackupFolder & "\" & nYear
+               Dim MonthDirList() As String = Directory.GetDirectories(sYearDir)
+               For MonthIndex = MonthDirList.Length - 1 To 0 Step -1
+                  nMonth = 0
+                  Integer.TryParse(Path.GetFileName(MonthDirList(MonthIndex)), nMonth)
+                  Dim sMonthDir As String = sYearDir & "\" & nMonth
+                  Dim DayDirList() As String = Directory.GetDirectories(sMonthDir)
+                  For DayIndex = DayDirList.Length - 1 To 0 Step -1
+                     nDay = 0
+                     Integer.TryParse(Path.GetFileName(DayDirList(DayIndex)), nDay)
+                     Dim sDayDir As String = sMonthDir & "\" & nDay
+                     Dim VersionList() As String = Directory.GetFiles(sDayDir)
+                     If VersionList.Length > 0 Then
+                        Dim nMaxVersion As Int64 = VersionList.Max(Function(x) Int64.Parse(Path.GetFileNameWithoutExtension(x)))
+                        LastBackupDate = New Date(nYear, nMonth, nDay)
+                        Exit For
+                     End If
+                  Next
+                  If LastBackupDate <> Date.MinValue Then Exit For
+               Next
+               If LastBackupDate <> Date.MinValue Then Exit For
+            Next
+         End If
+         Dim TimeFromLastBackup As TimeSpan = DateTime.Now - LastBackupDate
+         If TimeFromLastBackup > TimeSpan.FromDays(Map.refConfigurationPageVM.SelReminder.Id) Then
+            If MessageBox.Show(String.Format(EgtMsg(61987), Map.refConfigurationPageVM.SelReminder.Name), EgtMsg(15002), MessageBoxButton.YesNo, MessageBoxImage.Warning) = MessageBoxResult.Yes Then
+               Map.refConfigurationPageVM.Backup(True)
+            End If
+         End If
+      End If
+
    End Sub
 
    Friend Function ProcessCommandLine(ByRef nCommandType As Integer, ByRef nPage As Pages, ByRef nProdId As Integer) As Boolean
@@ -266,7 +328,16 @@ Public Class MainWindowVM
       End If
       ' verifico se sono in modifica percorso libero
       If Map.refFreeContourManagerVM.bIsActive Then
-         MessageBox.Show("Before closing software exit from path modification!")
+         MessageBox.Show(EgtMsg(61994))
+         Return
+      End If
+      ' verifico se sto facendo backup
+      If Map.refConfigurationPageVM.bBackupRunning Then
+         MessageBox.Show(EgtMsg(62101), EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)              'Backup running! Impossible closing the software until finish the backup process!
+         Return
+      End If
+      If Map.refConfigurationPageVM.bRestoreRunning Then
+         MessageBox.Show(EgtMsg(62102), EgtMsg(15002), MessageBoxButton.OK, MessageBoxImage.Warning)                 'Restore running! Impossible closing the software until finish the restore process!
          Return
       End If
       'If Map.refOptionPanelVM.SelItem = OptionPanelVM.Tabs.SIMUL Then

EgtBEAMWALL.ViewerOptimizer/My Project/AssemblyInfo.vb

@@ -70,5 +70,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2.5.5.4")>
-<Assembly: AssemblyFileVersion("2.5.5.4")>
+<Assembly: AssemblyVersion("2.5.12.2")>
+<Assembly: AssemblyFileVersion("2.5.12.2")>

EgtBEAMWALL.ViewerOptimizer/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb

@@ -0,0 +1,282 @@
+Imports System.Collections.ObjectModel
+Imports System.IO
+Imports EgtBEAMWALL.Core
+Imports EgtBEAMWALL.Core.ConstBeam
+Imports EgtUILib
+Imports EgtWPFLib5
+
+Public Class NewOpenProjectFileDialogVM
+   Inherits Core.NewOpenProjectFileDialogVM
+
+   Public Overrides ReadOnly Property DayTypeList As List(Of String)
+      Get
+         Dim CurrDayTypeList As New List(Of String)({EgtMsg(62532), EgtMsg(62533), EgtMsg(62534), EgtMsg(62531)})
+         If Map.refMainWindowVM.MainWindowM.nUserLevel > 5 Then
+            CurrDayTypeList.Add("Always")
+         End If
+         Return CurrDayTypeList
+      End Get
+   End Property
+
+#Region "METHODS"
+
+   Public Overrides Function Init(ProjectType As ProjectType, Optional CurrProjectList As List(Of ProjectFileVM) = Nothing, Optional GoToProd As Boolean = False) As Boolean?
+      m_ProjectType = ProjectType
+
+      NotifyPropertyChanged(NameOf(FilterTypeList))
+      m_SelFilterType = m_FilterTypeList(0)
+      ' carico lista progetti
+      If IsNothing(CurrProjectList) OrElse CurrProjectList.Count = 0 Then
+         SetFixedProjectList(False)
+         RefreshProjectList(GoToProd)
+      Else
+         SetFixedProjectList(True)
+         NotifyPropertyChanged(NameOf(ProjectList))
+      End If
+      m_ProjectList_View = CollectionViewSource.GetDefaultView(m_ProjectList)
+      m_ProjectList_View.Filter = AddressOf ProjectFilter
+   End Function
+
+   Public Overrides Sub RefreshProjectList(Optional GoToProd As Boolean = False)
+      m_ProjectList.Clear()
+      ' calcolo periodo e righe
+      Dim dtStart As DateTime
+      Dim dtEnd As DateTime
+      Dim nRowQuantity As Integer = 20
+      Select Case SelRowQuantity
+         Case RowQuantities.FIFTY
+            nRowQuantity = 50
+         Case RowQuantities.HUNDRED
+            nRowQuantity = 100
+         Case RowQuantities.HUNDREDANDFIFTY
+            nRowQuantity = 150
+      End Select
+      Select Case m_SelDayType
+         Case DayTypes.LASTMONTH
+            dtEnd = DateTime.Today + TimeSpan.FromDays(1)
+            dtStart = dtEnd - TimeSpan.FromDays(30.5)
+         Case DayTypes.LAST3MONTHS
+            dtEnd = DateTime.Today + TimeSpan.FromDays(1)
+            dtStart = dtEnd - TimeSpan.FromDays(30.5 * 3)
+         Case DayTypes.LAST6MONTHS
+            dtEnd = DateTime.Today + TimeSpan.FromDays(1)
+            dtStart = dtEnd - TimeSpan.FromDays(30.5 * 6)
+         Case DayTypes.PERIOD
+            dtEnd = dtEndDate + TimeSpan.FromDays(1)
+            dtStart = dtStartDate
+         Case DayTypes.ALWAYS
+            dtEnd = DateTime.Today + TimeSpan.FromDays(1)
+            dtStart = New DateTime(2020, 1, 1)
+      End Select
+      ' leggo da db
+      If m_ProjectType = ProjectType.PROJ Then
+         Dim DbProjList As New List(Of ProjFileM)
+         If m_SelBTLDateType = BTLDateTypes.CREATEDATE Then
+            DbProjList = DbControllers.m_ProjController.GetLastDesc(dtStart, dtEnd, nRowQuantity * 3, True, bViewArchived)
+         Else
+            DbProjList = DbControllers.m_ProjController.GetLastByExpDesc(dtStart, dtEnd, nRowQuantity * 3, True, bViewArchived)
+         End If
+         For Each Project In DbProjList
+            If IsNothing(Project.nProjId) OrElse Project.nProjId = 0 Then Continue For
+            ' verifico se ha prod
+            If Not IsNothing(Project.nProdId) And Project.nProdId > 0 Then
+               ' verifico se prod e' gia' stato creato
+               Dim SameProdItem As ProdItem = m_ProjectList.FirstOrDefault(Function(x) Not IsNothing(x.ProdFileVM) AndAlso Not IsNothing(x.ProdFileVM.nProdId) AndAlso x.ProdFileVM.nProdId = Project.nProdId)
+               If Not IsNothing(SameProdItem) Then
+                  SameProdItem.ProjFileList.Add(New ProjFileVM(Project))
+               Else
+                  ' recupero Prod
+                  Dim NewDbProd As ProdFileM = DbControllers.m_ProdController.FindCoreByProdId(Project.nProdId)
+                  If Not IsNothing(NewDbProd) Then
+                     m_ProjectList.Add(New ProdItem(New ProdFileVM(NewDbProd), New ProjFileVM(Project)))
+                  End If
+               End If
+            Else
+               m_ProjectList.Add(New ProdItem(New ProjFileVM(Project)))
+            End If
+         Next
+      ElseIf m_ProjectType = ProjectType.PROD Then
+         Dim DbProdList As New List(Of ProdFileM)
+         DbProdList = DbControllers.m_ProdController.GetLastDesc(dtStart, dtEnd, nRowQuantity, True, bViewArchived)
+         If GoToProd Then
+            For Each Project In DbProdList
+               ' recupero path per verificare esista
+               If IsNothing(Project.nProdId) OrElse Project.nProdId = 0 Then Continue For
+               Dim sPath As String = Map.refMainWindowVM.MainWindowM.sProdsDir & "\" & Project.nProdId.ToString("0000") & "\" & Project.nProdId.ToString("0000") & ".nge"
+               If Project.sMachine = Map.refProjManagerVM.CurrProj.sMachine AndAlso
+                  Project.nType = Map.refProjManagerVM.CurrProj.nType Then
+                  If File.Exists(sPath) Then
+                     '                     m_ProjectList.Add(New ProdItem(New ProdFileVM(Project)))
+                     'Else
+                     '   DbControllers.m_ProdController.DeleteProd(Project.nProdId)
+                     '   EgtOutLog("Found project on Db without the folder and erased it! Prod number " & Project.nProdId.ToString("0000"))
+                  End If
+               End If
+            Next
+         Else
+            For Each Project In DbProdList
+               ' recupero path per verificare esista
+               If IsNothing(Project.nProdId) OrElse Project.nProdId = 0 Then Continue For
+               Dim sPath As String = Map.refMainWindowVM.MainWindowM.sProdsDir & "\" & Project.nProdId.ToString("0000") & "\" & Project.nProdId.ToString("0000") & ".nge"
+               If File.Exists(sPath) Then
+                  ' recupero i proj
+                  Dim ProjList As New List(Of ProjectFileVM)
+                  For Each ProjFileId In Project.nProjIdList
+                     Dim ProjFileM As ProjectFileM = DbControllers.m_ProjController.FindByProjIdConv(ProjFileId)
+                     ProjList.Add(New ProjFileVM(ProjFileM))
+                  Next
+                  m_ProjectList.Add(New ProdItem(New ProdFileVM(Project), ProjList))
+                  'Else
+                  '   DbControllers.m_ProdController.DeleteProd(Project.nProdId)
+                  '   EgtOutLog("Found project on Db without the folder and erased it! Prod number " & Project.nProdId.ToString("0000"))
+               End If
+            Next
+         End If
+      End If
+   End Sub
+
+   Public Overrides Sub Archive()
+      If IsNothing(SelProject) Then Return
+      If Not IsNothing(SelProject.ProdFileVM) Then
+         ' archivio il progetto
+         DbControllers.m_ProdController.UpdateArchived(SelProject.ProdFileVM.nProdId, Not SelProject.bIsArchived)
+         NotifyPropertyChanged(NameOf(Archive_Msg))
+      End If
+      ' aggiorno lista progetti
+      RefreshProjectList()
+   End Sub
+
+   Public Overrides Sub Delete()
+      If IsNothing(SelProject) Then Return
+      ' recupero indice per riselezionare
+      Dim ProjListIndex As Integer = m_ProjectList.IndexOf(SelProject)
+      ' verifico se proj selezionato e' il corrente
+      If Not IsNothing(Map.refProjManagerVM.CurrProj) AndAlso SelProject.ProjFileList.Any(Function(x) x.nProjId = Map.refProjManagerVM.CurrProj.nProjId) Then
+         If m_ProjectType = ProjectType.PROJ AndAlso MessageBox.Show(EgtMsg(61872), EgtMsg(30009), MessageBoxButton.OKCancel, MessageBoxImage.Warning) = MessageBoxResult.Cancel Then
+            Return
+         Else
+            m_ChangeOpenedProjectOnCancel = True
+         End If
+      End If
+      ' verifico se prod selezionato e' il corrente
+      If Not IsNothing(Map.refProdManagerVM.CurrProd) AndAlso SelProject.ProdFileVM.nProdId = Map.refProdManagerVM.CurrProd.nProdId Then
+         If m_ProjectType = ProjectType.PROD AndAlso MessageBox.Show(EgtMsg(61872), EgtMsg(30009), MessageBoxButton.OKCancel, MessageBoxImage.Warning) = MessageBoxResult.Cancel Then
+            Return
+         Else
+            m_ChangeOpenedProjectOnCancel = True
+         End If
+      End If
+      ' rimuovo da lista ultimi progetti aperti
+      For Each Project In SelProject.ProjFileList
+         Map.refProjManagerVM.m_MruFiles.Remove(Project.sProjPath)
+      Next
+      Map.refProjManagerVM.NotifyPropertyChanged(NameOf(Map.refProjManagerVM.MruFileNames))
+      If Not IsNothing(SelProject.ProdFileVM) Then
+         Map.refProdManagerVM.m_MruFiles.Remove(SelProject.ProdFileVM.sProdPath)
+         Map.refProdManagerVM.NotifyPropertyChanged(NameOf(Map.refProdManagerVM.MruFileNames))
+      End If
+      ' cancello progetto
+      If Not IsNothing(SelProject.ProdFileVM) Then
+         DbControllers.m_ProdController.DeleteProd(SelProject.ProdFileVM.nProdId, True)
+         '' cancello cartella del Prod
+         'Try
+         '   Directory.Delete(SelProject.ProdFileVM.sProdDirPath, True)
+         'Catch ex As Exception
+         '   EgtOutLog("Error in deleting directory " & SelProject.ProdFileVM.sProdDirPath)
+         'End Try
+      End If
+      For Each Project In SelProject.ProjFileList
+         DbControllers.m_ProjController.DeleteProj(Project.nProjId, True)
+         '' cancello cartella del Proj
+         'Try
+         '   Directory.Delete(Project.sProjDirPath, True)
+         'Catch ex As Exception
+         '   EgtOutLog("Error in deleting directory " & Project.sProjDirPath)
+         'End Try
+      Next
+      ' aggiorno lista progetti
+      RefreshProjectList()
+      ' ripristino selezionato
+      If ProjListIndex >= 0 AndAlso ProjListIndex <= m_ProjectList.Count - 1 Then
+         SelProject = m_ProjectList(ProjListIndex)
+         NotifyPropertyChanged(NameOf(SelProject))
+      End If
+      ' reset dei controller per tornare in sync
+      DbControllers.m_ProjController.ResetController()
+      DbControllers.m_ProdController.ResetController()
+   End Sub
+
+   Public Overrides Sub Cancel()
+      If m_ChangeOpenedProjectOnCancel Then
+         Dim bOpened As Boolean = False
+         If m_ProjectType = ProjectType.PROJ Then
+            For Each ProjectName In Map.refProjManagerVM.m_MruFiles.FileNames
+               If Not String.IsNullOrWhiteSpace(ProjectName) Then
+                  Dim sProjId As String = Path.GetFileNameWithoutExtension(ProjectName)
+                  If Not String.IsNullOrWhiteSpace(sProjId) Then
+                     Dim nProjId As Integer = 0
+                     Integer.TryParse(sProjId, nProjId)
+                     Dim PjFileM = DbControllers.m_ProjController.FindByProjIdConv(nProjId)
+                     Dim PjFileVM = New ProjFileVM(PjFileM)
+                     Map.refProjManagerVM.OpenProject(PjFileVM)
+                     bOpened = True
+                     Exit For
+                  End If
+               End If
+            Next
+            If Not bOpened Then
+               Map.refProjManagerVM.OpenProject(m_ProjectList(0).ProjFileList(0))
+            End If
+         ElseIf m_ProjectType = ProjectType.PROD Then
+            For Each ProjectName In Map.refProdManagerVM.m_MruFiles.FileNames
+               If Not String.IsNullOrWhiteSpace(ProjectName) Then
+                  Dim sProdId As String = Path.GetFileNameWithoutExtension(ProjectName)
+                  If Not String.IsNullOrWhiteSpace(sProdId) Then
+                     Dim nProdId As Integer = 0
+                     Integer.TryParse(sProdId, nProdId)
+                     Dim PjFileM = DbControllers.m_ProdController.FindCoreByProdId(nProdId)
+                     Dim PjFileVM = New ProdFileVM(PjFileM)
+                     Map.refProdManagerVM.OpenProject(PjFileVM)
+                     bOpened = True
+                     Exit For
+                  End If
+               End If
+            Next
+         End If
+      End If
+      CloseWindow(False)
+   End Sub
+
+#End Region    ' METHODS
+
+End Class
+
+Public Class ProdItem
+   Inherits Core.ProdItem
+
+   Public Overrides Property sName As String
+      Get
+         Return If(Not IsNothing(m_ProdFileVM), m_ProdFileVM.sName, "")
+      End Get
+      Set(value As String)
+         If Not IsNothing(m_ProdFileVM) Then
+            DbControllers.m_ProdController.UpdateDescription(m_ProdFileVM.nProdId, value)
+            m_ProdFileVM.sName = value
+            m_delIsModifiedSetUp(False)
+         End If
+      End Set
+   End Property
+
+   Sub New(ProdFileVM As ProdFileVM, ProjFileVM As ProjFileVM)
+      MyBase.New(ProdFileVM, ProjFileVM)
+   End Sub
+
+   Sub New(ProjFileVM As ProjFileVM)
+      MyBase.New(ProjFileVM)
+   End Sub
+
+   Sub New(ProdFileVM As ProjectFileVM, ProjFileVMList As List(Of ProjectFileVM))
+      MyBase.New(ProdFileVM, ProjFileVMList)
+   End Sub
+
+End Class

EgtBEAMWALL.ViewerOptimizer/OpenProjectFileDialog/OpenProjectFileDialogVM.vb

@@ -14,58 +14,14 @@ Public Class OpenProjectFileDialogVM
       m_ProjectType = ProjectType
       ' carico colonne
       LoadColumns(ProjectType)
-      NotifyPropertyChanged(NameOf(SearchColumnList))
-      m_SelSearchColumn = m_SearchColumnList(0)
+      NotifyPropertyChanged(NameOf(FilterTypeList))
+      m_SelFilterType = m_FilterTypeList(0)
       ' carico lista progetti
       If IsNothing(CurrProjectList) OrElse CurrProjectList.Count = 0 Then
-         ' leggo da db
-         If ProjectType = ProjectType.PROJ Then
-            Dim DbProjectList As New List(Of ProjFileM)
-            DbProjectList = DbControllers.m_ProjController.GetLastDesc(5000)
-            For Each Project In DbProjectList
-               ' recupero path per verificare esista
-               If IsNothing(Project.nProjId) OrElse Project.nProjId = 0 Then Continue For
-               Dim sPath As String = Map.refMainWindowVM.MainWindowM.sProjsDir & "\" & Project.nProjId.ToString("0000") & "\" & Project.nProjId.ToString("0000") & ".nge"
-               If File.Exists(sPath) Then
-                  m_ProjectList.Add(New ProjFileVM(Project))
-               Else
-                  DbControllers.m_ProjController.DeleteProj(Project.nProjId)
-                  EgtOutLog("Found project on Db without the folder and erased it! Proj number " & Project.nProjId.ToString("0000"))
-               End If
-            Next
-         ElseIf ProjectType = ProjectType.PROD Then
-            Dim DbProjectList As New List(Of ProdFileM)
-            DbProjectList = DbControllers.m_ProdController.GetLastDesc(5000)
-            If GoToProd Then
-               For Each Project In DbProjectList
-                  ' recupero path per verificare esista
-                  If IsNothing(Project.nProdId) OrElse Project.nProdId = 0 Then Continue For
-                  Dim sPath As String = Map.refMainWindowVM.MainWindowM.sProdsDir & "\" & Project.nProdId.ToString("0000") & "\" & Project.nProdId.ToString("0000") & ".nge"
-                  If Project.sMachine = Map.refProjManagerVM.CurrProj.sMachine AndAlso
-                     Project.nType = Map.refProjManagerVM.CurrProj.nType Then
-                     If File.Exists(sPath) Then
-                        m_ProjectList.Add(New ProdFileVM(Project))
-                     Else
-                        DbControllers.m_ProdController.DeleteProd(Project.nProdId)
-                        EgtOutLog("Found project on Db without the folder and erased it! Prod number " & Project.nProdId.ToString("0000"))
-                     End If
-                  End If
-               Next
-            Else
-               For Each Project In DbProjectList
-                  ' recupero path per verificare esista
-                  If IsNothing(Project.nProdId) OrElse Project.nProdId = 0 Then Continue For
-                  Dim sPath As String = Map.refMainWindowVM.MainWindowM.sProdsDir & "\" & Project.nProdId.ToString("0000") & "\" & Project.nProdId.ToString("0000") & ".nge"
-                  If File.Exists(sPath) Then
-                     m_ProjectList.Add(New ProdFileVM(Project))
-                  Else
-                     DbControllers.m_ProdController.DeleteProd(Project.nProdId)
-                     EgtOutLog("Found project on Db without the folder and erased it! Prod number " & Project.nProdId.ToString("0000"))
-                  End If
-               Next
-            End If
-         End If
+         SetFixedProjectList(False)
+         RefreshProjectList(GoToProd)
       Else
+         SetFixedProjectList(True)
          m_ProjectList = New ObservableCollection(Of ProjectFileVM)(CurrProjectList)
          NotifyPropertyChanged(NameOf(ProjectList))
       End If
@@ -73,6 +29,89 @@ Public Class OpenProjectFileDialogVM
       m_ProjectList_View.Filter = AddressOf ProjectFilter
    End Function
 
+   Public Overrides Sub RefreshProjectList(Optional GoToProd As Boolean = False)
+      m_ProjectList.Clear()
+      ' calcolo periodo e righe
+      Dim dtStart As DateTime
+      Dim dtEnd As DateTime
+      Dim nRowQuantity As Integer = 20
+      Select Case SelRowQuantity
+         Case RowQuantities.FIFTY
+            nRowQuantity = 50
+         Case RowQuantities.HUNDRED
+            nRowQuantity = 100
+         Case RowQuantities.HUNDREDANDFIFTY
+            nRowQuantity = 150
+      End Select
+      Select Case m_SelDayType
+         Case DayTypes.LASTMONTH
+            dtEnd = DateTime.Today + TimeSpan.FromDays(1)
+            dtStart = dtEnd - TimeSpan.FromDays(30.5)
+         Case DayTypes.LAST3MONTHS
+            dtEnd = DateTime.Today + TimeSpan.FromDays(1)
+            dtStart = dtEnd - TimeSpan.FromDays(30.5 * 3)
+         Case DayTypes.LAST6MONTHS
+            dtEnd = DateTime.Today + TimeSpan.FromDays(1)
+            dtStart = dtEnd - TimeSpan.FromDays(30.5 * 6)
+         Case DayTypes.PERIOD
+            dtEnd = dtEndDate + TimeSpan.FromDays(1)
+            dtStart = dtStartDate
+      End Select
+      ' leggo da db
+      If m_ProjectType = ProjectType.PROJ Then
+         Dim DbProjectList As New List(Of ProjFileM)
+         ' CheckMe: lasciato come prima, anche NON attivi (cancellazione logica)
+         If m_SelBTLDateType = BTLDateTypes.CREATEDATE Then
+            DbProjectList = DbControllers.m_ProjController.GetLastDesc(dtStart, dtEnd, nRowQuantity, True)
+         Else
+            DbProjectList = DbControllers.m_ProjController.GetLastByExpDesc(dtStart, dtEnd, nRowQuantity, False)
+         End If
+         For Each Project In DbProjectList
+            ' recupero path per verificare esista
+            If IsNothing(Project.nProjId) OrElse Project.nProjId = 0 Then Continue For
+            Dim sPath As String = Map.refMainWindowVM.MainWindowM.sProjsDir & "\" & Project.nProjId.ToString("0000") & "\" & Project.nProjId.ToString("0000") & ".nge"
+            If File.Exists(sPath) Then
+               m_ProjectList.Add(New ProjFileVM(Project))
+            Else
+               ' CheckMe impostata come cancellazione FISICA dal DB...
+               DbControllers.m_ProjController.DeleteProj(Project.nProjId, False)
+               EgtOutLog("Found project on Db without the folder and erased it! Proj number " & Project.nProjId.ToString("0000"))
+            End If
+         Next
+      ElseIf m_ProjectType = ProjectType.PROD Then
+         Dim DbProjectList As New List(Of ProdFileM)
+         DbProjectList = DbControllers.m_ProdController.GetLastDesc(dtStart, dtEnd, nRowQuantity, True)
+         If GoToProd Then
+            For Each Project In DbProjectList
+               ' recupero path per verificare esista
+               If IsNothing(Project.nProdId) OrElse Project.nProdId = 0 Then Continue For
+               Dim sPath As String = Map.refMainWindowVM.MainWindowM.sProdsDir & "\" & Project.nProdId.ToString("0000") & "\" & Project.nProdId.ToString("0000") & ".nge"
+               If Project.sMachine = Map.refProjManagerVM.CurrProj.sMachine AndAlso
+                  Project.nType = Map.refProjManagerVM.CurrProj.nType Then
+                  If File.Exists(sPath) Then
+                     m_ProjectList.Add(New ProdFileVM(Project))
+                  Else
+                     DbControllers.m_ProdController.DeleteProd(Project.nProdId, True)
+                     EgtOutLog("Found project on Db without the folder and erased it! Prod number " & Project.nProdId.ToString("0000"))
+                  End If
+               End If
+            Next
+         Else
+            For Each Project In DbProjectList
+               ' recupero path per verificare esista
+               If IsNothing(Project.nProdId) OrElse Project.nProdId = 0 Then Continue For
+               Dim sPath As String = Map.refMainWindowVM.MainWindowM.sProdsDir & "\" & Project.nProdId.ToString("0000") & "\" & Project.nProdId.ToString("0000") & ".nge"
+               If File.Exists(sPath) Then
+                  m_ProjectList.Add(New ProdFileVM(Project))
+               Else
+                  DbControllers.m_ProdController.DeleteProd(Project.nProdId, True)
+                  EgtOutLog("Found project on Db without the folder and erased it! Prod number " & Project.nProdId.ToString("0000"))
+               End If
+            Next
+         End If
+      End If
+   End Sub
+
    Public Overrides Sub Delete()
       If IsNothing(SelProject) Then Return
       ' recupero indice per riselezionare
@@ -91,7 +130,8 @@ Public Class OpenProjectFileDialogVM
          Map.refProjManagerVM.m_MruFiles.Remove(SelProject.sProjPath)
          Map.refProjManagerVM.NotifyPropertyChanged(NameOf(Map.refProjManagerVM.MruFileNames))
          ' cancello progetto
-         DbControllers.m_ProjController.DeleteProj(SelProject.nProjId)
+         ' CheckMe impostata come cancellazione FISICA dal DB...
+         DbControllers.m_ProjController.DeleteProj(SelProject.nProjId, False)
          ' cancello cartella del Proj
          Try
             Directory.Delete(SelProject.sProjDirPath, True)
@@ -101,7 +141,7 @@ Public Class OpenProjectFileDialogVM
          ' aggiorno lista progetti
          m_ProjectList.Clear()
          Dim DbProjectList As New List(Of ProjFileM)
-         DbProjectList = DbControllers.m_ProjController.GetLastDesc(50)
+         DbProjectList = DbControllers.m_ProjController.GetLastDesc(50, False)
          For Each Project In DbProjectList
             m_ProjectList.Add(New ProjFileVM(Project))
          Next
@@ -119,7 +159,7 @@ Public Class OpenProjectFileDialogVM
          Map.refProdManagerVM.m_MruFiles.Remove(SelProject.sProdPath)
          Map.refProdManagerVM.NotifyPropertyChanged(NameOf(Map.refProdManagerVM.MruFileNames))
          ' cancello progetto
-         DbControllers.m_ProdController.DeleteProd(SelProject.nProdId)
+         DbControllers.m_ProdController.DeleteProd(SelProject.nProdId, True)
          ' riporto prod in proj
          Dim nCurrCtx As Integer = EgtGetCurrentContext()
          Dim nTempCtx As Integer = EgtInitContext()
@@ -179,7 +219,7 @@ Public Class OpenProjectFileDialogVM
          ' aggiorno lista progetti
          m_ProjectList.Clear()
          Dim DbProjectList As New List(Of ProdFileM)
-         DbProjectList = DbControllers.m_ProdController.GetLastDesc(50)
+         DbProjectList = DbControllers.m_ProdController.GetLastDesc(50, False)
          For Each Project In DbProjectList
             m_ProjectList.Add(New ProdFileVM(Project))
          Next

EgtBEAMWALL.ViewerOptimizer/ProdManager/ProdManagerVM.vb

@@ -274,15 +274,26 @@ Public Class ProdManagerVM
       m_TempCurrProd = TempCurrPd
       Dim sFilePath As String = ""
       ' se la string è vuota
-      Dim OpenProjectFileDialogVM As OpenProjectFileDialogVM = Nothing
       If IsNothing(TempCurrProd) Then
-         ' apro dialogo di scelta file
-         OpenProjectFileDialogVM = New OpenProjectFileDialogVM
-         Dim OpenFile As New OpenProjectFileDialogV(Application.Current.MainWindow, OpenProjectFileDialogVM)
-         Dim DialogResult As Boolean? = OpenFile.EgtShowDialog(ProjectType.PROD)
-         If IsNothing(DialogResult) OrElse Not DialogResult Then Return
-         sFilePath = OpenProjectFileDialogVM.SelProject.sProdPath
-         TempCurrProd = OpenProjectFileDialogVM.SelProject
+         If GetMainPrivateProfileInt(S_GENERAL, K_PROJECTMODE, 0) = 1 Then
+            Dim OpenProdFileDialogVM As NewOpenProjectFileDialogVM = Nothing
+            ' apro dialogo di scelta Prod
+            OpenProdFileDialogVM = New NewOpenProjectFileDialogVM
+            Dim OpenFile As New NewOpenProjectFileDialogV(Application.Current.MainWindow, OpenProdFileDialogVM)
+            Dim DialogResult As Boolean? = OpenFile.EgtShowDialog(ProjectType.PROD)
+            If IsNothing(DialogResult) OrElse Not DialogResult Then Return
+            sFilePath = OpenProdFileDialogVM.SelProject.ProdFileVM.sProdPath
+            m_TempCurrProd = OpenProdFileDialogVM.SelProject.ProdFileVM
+         Else
+            Dim OpenProjectFileDialogVM As OpenProjectFileDialogVM = Nothing
+            ' apro dialogo di scelta file
+            OpenProjectFileDialogVM = New OpenProjectFileDialogVM
+            Dim OpenFile As New OpenProjectFileDialogV(Application.Current.MainWindow, OpenProjectFileDialogVM)
+            Dim DialogResult As Boolean? = OpenFile.EgtShowDialog(ProjectType.PROD)
+            If IsNothing(DialogResult) OrElse Not DialogResult Then Return
+            sFilePath = OpenProjectFileDialogVM.SelProject.sProdPath
+            TempCurrProd = OpenProjectFileDialogVM.SelProject
+         End If
       Else
          sFilePath = If(Not IsNothing(TempCurrProd.sProdPath), TempCurrProd.sProdPath, "")
       End If

EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb

@@ -230,7 +230,7 @@ Public Class ProjManagerVM
          Map.refProdManagerVM.CurrProd.bIsNew = True
       Else
          ' elimino da DB
-         DbControllers.m_ProdController.DeleteProd(nProdId)
+         DbControllers.m_ProdController.DeleteProd(nProdId, True)
       End If
    End Sub
 
@@ -269,9 +269,19 @@ Public Class ProjManagerVM
                                                                   .ListName = sListName})
    End Function
 
-   Private Function UpdateBTLFileName(nProjId As Integer, BTLFileName As String)
-      Return DbControllers.m_ProjController.Update(New ProjModel() With {.ProjId = nProjId,
-                                                                  .BTLFileName = BTLFileName})
+   'Private Function UpdateBTLFileName(nProjId As Integer, BTLFileName As String)
+   '    Return DbControllers.m_ProjController.Update(New ProjModel() With {.ProjId = nProjId,
+   '                                                              .BTLFileName = BTLFileName})
+   'End Function
+
+   ''' <summary>
+   ''' Aggiornamento descrizione del PROJ con nuova colonna
+   ''' </summary>
+   ''' <param name="nProjId"></param>
+   ''' <param name="Description"></param>
+   ''' <returns></returns>
+   Private Function UpdateDescription(nProjId As Integer, Description As String)
+      Return DbControllers.m_ProjController.UpdateDescription(nProjId, Description)
    End Function
 
    Public Function SetCurrProj(nProjId As Integer) As Boolean
@@ -380,7 +390,7 @@ Public Class ProjManagerVM
             Dim sBTLFlag As String = If(nType = Core.ConstBeam.BWType.BEAM, K_BTLFLAG, K_WALLBTLFLAG)
             Dim nFlag As Integer = GetMainPrivateProfileInt(S_IMPORT, sBTLFlag, EIB_FL.TS3_POS + EIB_FL.SORT + EIB_FL.USEUATTR)
             EgtBeamSetFlag(nFlag)
-            DbControllers.m_ProjController.UpdateInfo(nProjId, "Hand made", "", Date.MinValue, nType, Map.refMachinePanelVM.SelectedMachine.Name)
+            DbControllers.m_ProjController.UpdateInfo(nProjId, "Hand made", "Hand made", "", Date.MinValue, nType, Map.refMachinePanelVM.SelectedMachine.Name)
             SetCurrProj(nProjId)
          End If
          Map.refProjectVM.SetOptimizePanel_Visibility(Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.WALL AndAlso Map.refMainWindowVM.MainWindowM.GetKeyOption(KEY_OPT.NESTING_AUTO))
@@ -420,14 +430,36 @@ Public Class ProjManagerVM
       Dim bStart As Boolean = IsNothing(m_TempCurrProj)
       m_TempCurrProj = ReceivedCurrProj
       ' se la stringa è vuota
-      Dim OpenProjectFileDialogVM As OpenProjectFileDialogVM = Nothing
       If IsNothing(TempCurrProj) Then
-         ' apro dialogo di scelta file
-         OpenProjectFileDialogVM = New OpenProjectFileDialogVM
-         Dim OpenFile As New OpenProjectFileDialogV(Application.Current.MainWindow, OpenProjectFileDialogVM)
-         Dim DialogResult As Boolean? = OpenFile.EgtShowDialog(ProjectType.PROJ)
-         If IsNothing(DialogResult) OrElse Not DialogResult Then Return
-         TempCurrProj = OpenProjectFileDialogVM.SelProject
+         If GetMainPrivateProfileInt(S_GENERAL, K_PROJECTMODE, 0) = 1 Then
+            Dim OpenProdFileDialogVM As NewOpenProjectFileDialogVM = Nothing
+            ' apro dialogo di scelta Prod
+            OpenProdFileDialogVM = New NewOpenProjectFileDialogVM
+            Dim OpenFile As New NewOpenProjectFileDialogV(Application.Current.MainWindow, OpenProdFileDialogVM)
+            Dim DialogResult As Boolean? = OpenFile.EgtShowDialog(ProjectType.PROJ)
+            If IsNothing(DialogResult) OrElse Not DialogResult Then Return
+            Dim TempProd As ProdItem = OpenProdFileDialogVM.SelProject
+            If TempProd.ProjFileList.Count > 1 Then
+               ' apro dialogo di scelta Proj
+               Dim OpenProjFileDialogVM As OpenProjectFileDialogVM = Nothing
+               OpenProjFileDialogVM = New OpenProjectFileDialogVM
+               Dim ProjOpenFile As New OpenProjectFileDialogV(Application.Current.MainWindow, OpenProjFileDialogVM)
+               Dim ProjDialogResult As Boolean? = ProjOpenFile.EgtShowDialog(ProjectType.PROJ, OpenProdFileDialogVM.SelProject.ProjFileList)
+               If IsNothing(DialogResult) OrElse Not ProjDialogResult Then Return
+               TempCurrProj = OpenProjFileDialogVM.SelProject
+            ElseIf TempProd.ProjFileList.Count = 1 Then
+               TempCurrProj = OpenProdFileDialogVM.SelProject.ProjFileList(0)
+            Else Return
+            End If
+         Else
+            Dim OpenProjectFileDialogVM As OpenProjectFileDialogVM = Nothing
+            ' apro dialogo di scelta file
+            OpenProjectFileDialogVM = New OpenProjectFileDialogVM
+            Dim OpenFile As New OpenProjectFileDialogV(Application.Current.MainWindow, OpenProjectFileDialogVM)
+            Dim DialogResult As Boolean? = OpenFile.EgtShowDialog(ProjectType.PROJ)
+            If IsNothing(DialogResult) OrElse Not DialogResult Then Return
+            TempCurrProj = OpenProjectFileDialogVM.SelProject
+         End If
       End If
       LoadingWndHelper.OpenLoadingWnd(ActiveIds.OPENPROJ, 3, EgtMsg(63000), EgtMsg(63001), 50)       ' Project opening    ' Loading project geometries
       ' imposto ProjId di caricamento
@@ -628,7 +660,7 @@ Public Class ProjManagerVM
                   ' cancello BTLParts su DB
                   DbControllers.m_ProjController.UpdateBtlParts(nAlreadyImported, New List(Of BTLPartM))
                   ' cancello nome BTL
-                  DbControllers.m_ProjController.UpdateInfo(nAlreadyImported, DateTime.Now.ToString(), "", DateTime.MinValue, BWType.NULL, "")
+                  DbControllers.m_ProjController.UpdateInfo(nAlreadyImported, DateTime.Now.ToString(), DateTime.Now.ToString(), "", DateTime.MinValue, BWType.NULL, "")
                   nProjId = nAlreadyImported
                   sProjDir = refMainWindowVM.MainWindowM.sProjsDir & "\" & nProjId.ToString("0000")
                Case MessageBoxResult.No
@@ -703,7 +735,7 @@ Public Class ProjManagerVM
          Dim ExportDate As DateTime
          DateTime.TryParse(Map.refProjectVM.BTLStructureVM.BTLStructureM.m_sEXPDATE & " " &
                            Map.refProjectVM.BTLStructureVM.BTLStructureM.m_sEXPTIME, ExportDate)
-         DbControllers.m_ProjController.UpdateInfo(nProjId, sBTLFileName, Map.refProjectVM.BTLStructureVM.sLISTNAME, ExportDate, nType, Map.refMachinePanelVM.SelectedMachine.Name)
+         DbControllers.m_ProjController.UpdateInfo(nProjId, sBTLFileName, sBTLFileName, Map.refProjectVM.BTLStructureVM.sLISTNAME, ExportDate, nType, Map.refMachinePanelVM.SelectedMachine.Name)
          SetCurrProj(nProjId)
          ' se progetto pareti e vista ruotata
          If nType = BWType.WALL AndAlso (CurrentMachine.ViewDir = VT.ISO_NW OrElse CurrentMachine.ViewDir = VT.ISO_NE) Then
@@ -725,7 +757,8 @@ Public Class ProjManagerVM
       Else
          Map.refShowBeamPanelVM.ShowBuilding_IsChecked = bAssembly
          ' elimino da Db
-         DbControllers.m_ProjController.DeleteProj(nProjId)
+         ' CheckMe impostata come cancellazione FISICA dal DB...
+         DbControllers.m_ProjController.DeleteProj(nProjId, False)
       End If
       ' carico filtri di ricerca
       Map.refProjectVM.BTLStructureVM.LoadFilters()
@@ -1577,10 +1610,12 @@ Public Class ProjManagerVM
             Dim ExportDate As DateTime
             DateTime.TryParse(Map.refProjectVM.BTLStructureVM.BTLStructureM.m_sEXPDATE & " " &
                            Map.refProjectVM.BTLStructureVM.BTLStructureM.m_sEXPTIME, ExportDate)
-            DbControllers.m_ProjController.UpdateInfo(nNewProjId, sBTLFileName, Map.refProjectVM.BTLStructureVM.sLISTNAME, ExportDate, nType, Machine.Name)
+            DbControllers.m_ProjController.UpdateInfo(nNewProjId, sBTLFileName, sBTLFileName, Map.refProjectVM.BTLStructureVM.sLISTNAME, ExportDate, nType, Machine.Name)
          Else
             ' elimino da Db
-            DbControllers.m_ProjController.DeleteProj(nNewProjId)
+
+            ' CheckMe impostata come cancellazione FISICA dal DB...
+            DbControllers.m_ProjController.DeleteProj(nNewProjId, False)
          End If
          ' aggiorno BTLParts su DB
          DbControllers.m_ProjController.UpdateBtlParts(nNewProjId, Map.refProjectVM.BTLStructureVM.BTLStructureM.BTLPartMList)
@@ -1664,7 +1699,7 @@ Public Class ProjManagerVM
                Next
             Else
                ' elimino da DB
-               DbControllers.m_ProdController.DeleteProd(nProdId)
+               DbControllers.m_ProdController.DeleteProd(nProdId, True)
             End If
             Dim MyMachGroupList As New List(Of MyMachGroupM)
             If Not IsNothing(Map.refProjectVM.MachGroupPanelVM) Then

EgtBEAMWALL.ViewerOptimizer/Project/ProjectV.xaml

@@ -52,6 +52,8 @@
             <EgtBEAMWALL:ViewPanelV DataContext="{StaticResource ViewPanelVM}"/>
             <EgtBEAMWALL:InstrumentPanelV DataContext="{StaticResource InstrumentPanelVM}"/>
             <EgtBEAMWALL:CalcPanelV DataContext="{StaticResource CALCPanelVM}"/>
+            <EgtBEAMWALL:SpecialPanelV DataContext="{StaticResource SpecialPanelVM}"
+                                       Visibility="{Binding DataContext.SpecialPanel_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProjectV}}}"/>
             <EgtBEAMWALL:FreeContourManagerV DataContext="{StaticResource FreeContourManagerVM}"
                                              Visibility="{Binding DataContext.FreeContourManager_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProjectV}}}"/>
          </WrapPanel>

EgtBEAMWALL.ViewerOptimizer/Project/ProjectVM.vb

@@ -3,6 +3,7 @@ Imports EgtBEAMWALL.Core
 Imports EgtWPFLib5
 Imports EgtUILib
 Imports System.Collections.ObjectModel
+Imports EgtBEAMWALL.DataLayer.Controllers
 
 Public Class ProjectVM
    Inherits VMBase
@@ -11,6 +12,12 @@ Public Class ProjectVM
 
    Private m_Calc_Timer As New DispatcherTimer
 
+   Friend Event OnPreControllerExec(sFilePath As String)
+   Friend Event OnPostControllerExec()
+
+   ' Flag per non salvare Script appena eseguito in elenco MruScript
+   Private m_bScriptInMru As Boolean = True
+
    Private Property m_GridDims As New ObservableCollection(Of GridDimension)
    Public Property GridDims As ObservableCollection(Of GridDimension)
       Get
@@ -189,6 +196,13 @@ Public Class ProjectVM
       NotifyPropertyChanged("FreeContourManager_Visibility")
    End Sub
 
+   Public ReadOnly Property SpecialPanel_Visibility As Visibility
+      Get
+         Return If(Map.refMainWindowVM.MainWindowM.bSpecialPanel AndAlso Map.refMainWindowVM.MainWindowM.nUserLevel > 5, Visibility.Visible, Visibility.Collapsed)
+      End Get
+   End Property
+
+
    Friend Sub NotifyAllPanelVisibility()
       NotifyPropertyChanged("LeftPanel_Visibility")
       NotifyPropertyChanged("TopPanel_Visibility")
@@ -267,6 +281,9 @@ Public Class ProjectVM
             If Not IsNothing(Map.refRawPartListVM.colRawPart_L) Then
                Map.refRawPartListVM.colRawPart_L.IsReadOnly = True
             End If
+            If Not IsNothing(Map.refRawPartListVM.colRawPart_PosZ) Then
+               Map.refRawPartListVM.colRawPart_PosZ.IsReadOnly = True
+            End If
             If Not IsNothing(Map.refPartInRawPartListVM.colPartInRawPart_Offset) Then
                Map.refPartInRawPartListVM.colPartInRawPart_Offset.IsReadOnly = True
             End If
@@ -285,58 +302,55 @@ Public Class ProjectVM
             If Not IsNothing(Map.refFeatureInPartInRawPartListVM.colFeatureInPartInRawPart_Do) Then
                Map.refFeatureInPartInRawPartListVM.colFeatureInPartInRawPart_Do.IsReadOnly = True
             End If
-            If Not IsNothing(Map.refFeatureInPartInRawPartListVM.colFeatureInPartInRawPart_Priority) Then
-               Map.refFeatureInPartInRawPartListVM.colFeatureInPartInRawPart_Priority.IsReadOnly = True
-            End If
             m_bLockUX = True
             ' se calcolo finito
          Else
             ManageIsEnabled(True)
             ' aggiungere gestione colonne editabili delle tabelle
             If Not IsNothing(Map.refPartListVM.colPart_Do) Then
-               Map.refPartListVM.colPart_Do.IsReadOnly = False
+               Map.refPartListVM.colPart_Do.ResetToOrigIsReadOnly()
             End If
             If Not IsNothing(Map.refFeatureListVM.colFeature_Do) Then
-               Map.refFeatureListVM.colFeature_Do.IsReadOnly = False
+               Map.refFeatureListVM.colFeature_Do.ResetToOrigIsReadOnly()
             End If
             If Not IsNothing(Map.refPParameterListVM.colPParam_Value) Then
-               Map.refPParameterListVM.colPParam_Value.IsReadOnly = False
+               Map.refPParameterListVM.colPParam_Value.ResetToOrigIsReadOnly()
             End If
             If Not IsNothing(Map.refQParameterListVM.colQParam_Value) Then
-               Map.refQParameterListVM.colQParam_Value.IsReadOnly = False
+               Map.refQParameterListVM.colQParam_Value.ResetToOrigIsReadOnly()
             End If
             If Not IsNothing(Map.refQParameterListVM.colQParam_Custom) Then
-               Map.refQParameterListVM.colQParam_Custom.IsReadOnly = False
+               Map.refQParameterListVM.colQParam_Custom.ResetToOrigIsReadOnly()
             End If
             If Not IsNothing(Map.refRawPartListVM.colRawPart_StartCut) Then
-               Map.refRawPartListVM.colRawPart_StartCut.IsReadOnly = False
+               Map.refRawPartListVM.colRawPart_StartCut.ResetToOrigIsReadOnly()
             End If
             If m_BTLStructureVM.nPROJTYPE <> BWType.BEAM AndAlso Not IsNothing(Map.refRawPartListVM.colRawPart_W) Then
-               Map.refRawPartListVM.colRawPart_W.IsReadOnly = False
+               Map.refRawPartListVM.colRawPart_W.ResetToOrigIsReadOnly()
             End If
             If Not IsNothing(Map.refRawPartListVM.colRawPart_L) Then
-               Map.refRawPartListVM.colRawPart_L.IsReadOnly = False
+               Map.refRawPartListVM.colRawPart_L.ResetToOrigIsReadOnly()
+            End If
+            If Not IsNothing(Map.refRawPartListVM.colRawPart_PosZ) Then
+               Map.refRawPartListVM.colRawPart_PosZ.ResetToOrigIsReadOnly()
             End If
             If Not IsNothing(Map.refPartInRawPartListVM.colPartInRawPart_Offset) Then
-               Map.refPartInRawPartListVM.colPartInRawPart_Offset.IsReadOnly = False
+               Map.refPartInRawPartListVM.colPartInRawPart_Offset.ResetToOrigIsReadOnly()
             End If
             If Not IsNothing(Map.refPartInRawPartListVM.colPartInRawPart_Rot) Then
-               Map.refPartInRawPartListVM.colPartInRawPart_Rot.IsReadOnly = False
+               Map.refPartInRawPartListVM.colPartInRawPart_Rot.ResetToOrigIsReadOnly()
             End If
             If Not IsNothing(Map.refPartInRawPartListVM.colPartInRawPart_Flip) Then
-               Map.refPartInRawPartListVM.colPartInRawPart_Flip.IsReadOnly = False
+               Map.refPartInRawPartListVM.colPartInRawPart_Flip.ResetToOrigIsReadOnly()
             End If
             If Not IsNothing(Map.refPartInRawPartListVM.colPartInRawPart_PosX) Then
-               Map.refPartInRawPartListVM.colPartInRawPart_PosX.IsReadOnly = False
+               Map.refPartInRawPartListVM.colPartInRawPart_PosX.ResetToOrigIsReadOnly()
             End If
             If Not IsNothing(Map.refPartInRawPartListVM.colPartInRawPart_PosY) Then
-               Map.refPartInRawPartListVM.colPartInRawPart_PosY.IsReadOnly = False
+               Map.refPartInRawPartListVM.colPartInRawPart_PosY.ResetToOrigIsReadOnly()
             End If
             If Not IsNothing(Map.refFeatureInPartInRawPartListVM.colFeatureInPartInRawPart_Do) Then
-               Map.refFeatureInPartInRawPartListVM.colFeatureInPartInRawPart_Do.IsReadOnly = False
-            End If
-            If Not IsNothing(Map.refFeatureInPartInRawPartListVM.colFeatureInPartInRawPart_Priority) Then
-               Map.refFeatureInPartInRawPartListVM.colFeatureInPartInRawPart_Priority.IsReadOnly = False
+               Map.refFeatureInPartInRawPartListVM.colFeatureInPartInRawPart_Do.ResetToOrigIsReadOnly()
             End If
             ' fermo il timer
             If Not m_bCalcRunning Then

EgtBEAMWALL.ViewerOptimizer/ProjectFileVM/ProdFileVM.vb

@@ -1,6 +1,7 @@
 Imports System.IO
 Imports EgtBEAMWALL.Core
 Imports EgtUILib
+Imports EgtWPFLib5
 
 Public Class ProdFileVM
    Inherits Core.ProdFileVM
@@ -16,6 +17,16 @@ Public Class ProdFileVM
          If Not IsNothing(TempProj) Then sBTLFileName &= TempProj.sListName
       Next
       SetBTLFileName(sBTLFileName)
+      ' verifico valore description
+      If Not IsNothing(ProdFileM) AndAlso String.IsNullOrWhiteSpace(ProdFileM.sName) Then
+         For Each CurrProj In nProjIdList
+            Dim TempProj As ProjFileM = DbControllers.m_ProjController.FindByProjIdConv(CurrProj)
+            If Not IsNothing(TempProj) AndAlso Not String.IsNullOrWhiteSpace(TempProj.sBTLFileName) Then
+               DbControllers.m_ProdController.UpdateDescription(ProdFileM.nProdId, TempProj.sBTLFileName)
+               ProdFileM.sName = TempProj.sBTLFileName
+            End If
+         Next
+      End If
    End Sub
 
 #End Region    ' CONSTRUCTORS
@@ -145,7 +156,7 @@ Public Class ProdFileVM
                   End Try
                   Map.refProdManagerVM.m_MruFiles.Remove(CurrProject.sProdPath)
                   Map.refProdManagerVM.NotifyPropertyChanged(NameOf(Map.refProdManagerVM.MruFileNames))
-                  DbControllers.m_ProdController.DeleteProd(CurrProject.nProdId)
+                  DbControllers.m_ProdController.DeleteProd(CurrProject.nProdId, False)
                   If CurrProject.nProdId = Map.refProjManagerVM.CurrProj.nProdId Then
                      ' reset prod in path proj
                      Map.refProjManagerVM.UpdateCurrProj()

EgtBEAMWALL.ViewerOptimizer/ProjectFileVM/ProjFileVM.vb

@@ -15,6 +15,11 @@ Public Class ProjFileVM
 
    Sub New(ProjectFileM As ProjFileM)
       MyBase.New(ProjectFileM)
+      ' verifico valore description
+      If Not IsNothing(ProjectFileM) AndAlso String.IsNullOrWhiteSpace(ProjectFileM.sDescription) Then
+         DbControllers.m_ProjController.UpdateDescription(ProjectFileM.nProjId, ProjectFileM.sBTLFileName)
+         ProjectFileM.sDescription = ProjectFileM.sBTLFileName
+      End If
    End Sub
 
 #End Region    ' CONSTRUCTORS
@@ -137,9 +142,11 @@ Public Class ProjFileVM
                      Directory.Delete(sProjectDirPath, True)
                   End If
                   Map.refProjManagerVM.m_MruFiles.Remove(CurrProject.sProjPath)
-                  Map.refProjManagerVM.NotifyPropertyChanged(NameOf(Map.refProjManagerVM.MruFileNames))
-                  DbControllers.m_ProjController.DeleteProj(CurrProject.nProjId)
-                  Map.refProjManagerVM.CurrProj = Nothing
+                        Map.refProjManagerVM.NotifyPropertyChanged(NameOf(Map.refProjManagerVM.MruFileNames))
+
+                        ' CheckMe impostata come cancellazione FISICA dal DB...
+                        DbControllers.m_ProjController.DeleteProj(CurrProject.nProjId, False)
+                        Map.refProjManagerVM.CurrProj = Nothing
                   EgtResetModified()
                   Return True
                End If

EgtBEAMWALL.ViewerOptimizer/SceneHost/MySceneHostVM.vb

@@ -59,6 +59,8 @@ Public Class MySceneHostVM
          PostInitializeScene()
          ' Imposto stato gestione mouse diretto della scena a nessuno
          MainScene.SetStatusNull()
+         ' Imposto focus pulsante su false 
+         MainScene.SetFocusOnMove(False)
          ' Recupero e imposto handle finestra principale
          Dim hMainWnd As IntPtr = New WindowInteropHelper(Application.Current.MainWindow).Handle
          EgtSetMainWindowHandle(hMainWnd)

EgtBEAMWALL.ViewerOptimizer/SpecialPanel/SpecialPanelV.xaml

@@ -0,0 +1,24 @@
+<EgtFloating:EgtFloatingPanel x:Class="SpecialPanelV"
+                              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                              xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
+                              IsTopDockable="True" IsBottomDockable="False" IsLeftDockable="False"
+                              IsRightDockable="False" Style="{StaticResource ToolBar_EgtFloatingPanel}">
+
+   <ItemsControl ItemsSource="{Binding ButtonList}">
+      <ItemsControl.ItemsPanel>
+         <ItemsPanelTemplate>
+            <StackPanel Orientation="Horizontal"/>
+         </ItemsPanelTemplate>
+      </ItemsControl.ItemsPanel>
+      <ItemsControl.ItemTemplate>
+         <DataTemplate>
+            <Button ToolTip="{Binding ToolTip}" Command="{Binding LuaExecCommand}" Style="{StaticResource DrawPanelButton}" 
+                    Visibility="{Binding Btn_Visibility}" IsEnabled="{Binding Btn_IsEnabled}">
+               <Image Source="{Binding ImagePath}"/>
+            </Button>
+         </DataTemplate>
+      </ItemsControl.ItemTemplate>
+   </ItemsControl>
+   
+</EgtFloating:EgtFloatingPanel>

EgtBEAMWALL.ViewerOptimizer/SpecialPanel/SpecialPanelV.xaml.vb

@@ -0,0 +1,3 @@
+Public Class SpecialPanelV
+
+End Class