From 5f321fba3ac9256da0546a7249189bd23cc11502 Mon Sep 17 00:00:00 2001
From: Emmanuele Sassi <emmanuele.sassi@egaltech.com>
Date: Mon, 28 Aug 2023 18:36:42 +0200
Subject: [PATCH] - aggiunta modifica nome progetto - migliorata gestione
 archiviazione - migliorata gestione cancellazione

---
 EgtBEAMWALL.Core/Constants/ConstColumns.vb    |   1 +
 .../Constants/ConstDataGridColumnsIni.vb      |   1 +
 EgtBEAMWALL.Core/Constants/ConstIni.vb        |   1 +
 .../NewOpenProjectFileDialogV.xaml            |  65 ++---
 .../NewOpenProjectFileDialogVM.vb             | 109 ++++++--
 EgtBEAMWALL.Core/ProjectFileVM/ProdFileM.vb   |  15 +-
 EgtBEAMWALL.Core/ProjectFileVM/ProjFileM.vb   |  32 +--
 .../ProjectFileVM/ProjectFileM.vb             |  20 ++
 EgtBEAMWALL.Core/ProjectManager/ProdFileVM.vb |   6 +
 .../ProjectManager/ProjectFileVM.vb           |  12 +
 .../Controllers/ProdController.cs             |   8 +-
 .../Controllers/ProjController.cs             |   2 +-
 .../MainWindow/MainWindowVM.vb                |  43 ++-
 .../NewOpenProjectFileDialogVM.vb             | 249 ++++++++----------
 .../ProdManager/ProdManagerVM.vb              |  26 +-
 .../ProjManager/ProjManagerVM.vb              |   2 +-
 16 files changed, 342 insertions(+), 250 deletions(-)

diff --git a/EgtBEAMWALL.Core/Constants/ConstColumns.vb b/EgtBEAMWALL.Core/Constants/ConstColumns.vb
index 5d821def..ceb43d42 100644
--- a/EgtBEAMWALL.Core/Constants/ConstColumns.vb
+++ b/EgtBEAMWALL.Core/Constants/ConstColumns.vb
@@ -18,5 +18,6 @@
    Public Const COL_SUPERVISORID As String = "colSUPERVISORID"
    Public Const COL_PRIORITY As String = "colPRIORITY"
    Public Const COL_NAME As String = "colNAME"
+   Public Const COL_ARCHIVED As String = "colARCHIVED"
 
 End Module
diff --git a/EgtBEAMWALL.Core/Constants/ConstDataGridColumnsIni.vb b/EgtBEAMWALL.Core/Constants/ConstDataGridColumnsIni.vb
index e8a55474..7777f509 100644
--- a/EgtBEAMWALL.Core/Constants/ConstDataGridColumnsIni.vb
+++ b/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"
diff --git a/EgtBEAMWALL.Core/Constants/ConstIni.vb b/EgtBEAMWALL.Core/Constants/ConstIni.vb
index 687b8d34..1b0bd759 100644
--- a/EgtBEAMWALL.Core/Constants/ConstIni.vb
+++ b/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"
diff --git a/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogV.xaml b/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogV.xaml
index 1aced268..48a6b46c 100644
--- a/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogV.xaml
+++ b/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogV.xaml
@@ -7,6 +7,7 @@
                             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" Topmost="True"
                             DataContext="{Binding RelativeSource={RelativeSource Self}}">
 
@@ -132,47 +133,33 @@
                   </Grid>
                </DataGridTextColumn.Header>
             </DataGridTextColumn>
-            <!-- Name -->
-            <!--<DataGridTemplateColumn x:Key="colNAME">
-               <DataGridTemplateColumn.CellTemplate>
-                  <DataTemplate>
-                     <Grid>
-                        <Grid.ColumnDefinitions>
-                           <ColumnDefinition Width="1*"/>
-                           <ColumnDefinition Width="Auto"/>
-                        </Grid.ColumnDefinitions>
-                        <TextBlock Text="{Binding sName}"/>
-                        <Button Grid.Column="1"
-                                Margin="5,0,0,0"
-                                Click="ModifyNameButton_Click"
-                                Style="{StaticResource ToolBar_SmallButton}">
-                           <Image Source="\Resources\CalcPanel\Edit.png"
-                                  Style="{StaticResource LockImage}"/>
-                        </Button>
-                     </Grid>
-                  </DataTemplate>
-               </DataGridTemplateColumn.CellTemplate>
-               <DataGridTemplateColumn.CellEditingTemplate>
-                  <DataTemplate>
-                     <TextBox Text="{Binding sName}"/>
-                  </DataTemplate>
-               </DataGridTemplateColumn.CellEditingTemplate>
-               <DataGridTemplateColumn.Header>
-                  <TextBlock Text="{Binding Path=DataContext.Name_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:NewOpenProjectFileDialogV}}}"/>
-               </DataGridTemplateColumn.Header>
-            </DataGridTemplateColumn>-->
             <!-- 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}}}"/>
+                  <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}}}"/>
+                  <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\CalcPanel\Edit.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">
@@ -217,28 +204,21 @@
                                  <RowDefinition Height="1*"/>
                                  <RowDefinition Height="1*"/>
                               </Grid.RowDefinitions>
-                              <TextBlock Text="{Binding Path=DataContext.BTLFileName_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:NewOpenProjectFileDialogV}}}"
+                              <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}}}"
+                                         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}}}"
+                                         Text="{Binding Path=DataContext.ExportDate_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:NewOpenProjectFileDialogV}}}"
                                          Style="{StaticResource OpenWnd_TextBlock}"/>
                               <TextBlock Grid.Column="3"
                                          Text="{Binding dtExportDate}"/>
-                              <!--<TextBlock Grid.Column="2"
-                                         Grid.Row="1"
-                                         Text="{Binding Path=DataContext.CreateDate_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:NewOpenProjectFileDialogV}}}"
-                                         Style="{StaticResource OpenWnd_TextBlock}"/>
-                              <TextBlock Grid.Column="3"
-                                         Grid.Row="1"
-                                         Text="{Binding dtCreateDate}"/>-->
                            </Grid>
                         </Grid>
                      </DataTemplate>
@@ -329,8 +309,9 @@
                  Style="{DynamicResource EgtWPFLib5_InputButton}"/>
          <Button Content="{Binding Delete_Msg}"
                  Command="{Binding Delete_Command}"
+                 IsEnabled="{Binding bDelete_IsEnabled}"
                  Style="{DynamicResource EgtWPFLib5_InputButton}"/>
-         <Button IsCancel="True"
+         <Button Command="{Binding Cancel_Command}"
                  Content="{Binding Cancel_Msg}" 
                  Style="{DynamicResource EgtWPFLib5_InputButton}"/>
       </UniformGrid>
diff --git a/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb b/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb
index 9df381c7..ac835909 100644
--- a/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb
+++ b/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb
@@ -59,6 +59,13 @@ Public MustInherit Class NewOpenProjectFileDialogVM
       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
@@ -120,6 +127,15 @@ Public MustInherit Class NewOpenProjectFileDialogVM
       End Get
       Set(value As ProdItem)
          m_SelProject = value
+         ' verifico se abilitare il bottone Delete
+         If IsNothing(m_SelProject) Then
+            SetDeleteIsEnabled(False)
+         ElseIf IsNothing(m_SelProject.ProdFileVM) Then
+            SetDeleteIsEnabled(True)
+         Else
+            SetDeleteIsEnabled(Not SelProject.ProdFileVM.bIsProduced)
+         End If
+         NotifyPropertyChanged(NameOf(Archive_Msg))
       End Set
    End Property
 
@@ -367,10 +383,24 @@ Public MustInherit Class NewOpenProjectFileDialogVM
       Set(value As Boolean)
          m_bViewArchived = value
          WriteMainPrivateProfileString(S_OPENFILEDIALOG, K_VIEWARCHIVED, If(bViewArchived, 1, 0))
+         m_colArchived_Name.Visible = value
          RefreshProjectList()
       End Set
    End Property
 
+   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
@@ -430,9 +460,20 @@ Public MustInherit Class NewOpenProjectFileDialogVM
          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
-         Return EgtMsg(61981)
+         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
@@ -470,7 +511,7 @@ Public MustInherit Class NewOpenProjectFileDialogVM
    Private m_cmdProjectDoubleClick As ICommand
    Private m_cmdDelete As ICommand
    Private m_cmdArchive As ICommand
-   Private m_cmdModifyName As ICommand
+   Private m_cmdCancel As ICommand
 
 #End Region    ' FIELDS & PROPERTIES
 
@@ -478,6 +519,7 @@ Public MustInherit Class NewOpenProjectFileDialogVM
       ' 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
@@ -530,7 +572,7 @@ Public MustInherit Class NewOpenProjectFileDialogVM
       '   NotifyPropertyChanged(NameOf(SelFilterType))
       'ElseIf ProjectType = ProjectType.PROD Then
       ' carico le colonne della datagrid
-      GetPrivateProfileColumns(S_OPENPROJFILEDLG_PROD, ProdColumns)
+      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
@@ -596,6 +638,10 @@ Public MustInherit Class NewOpenProjectFileDialogVM
       Return bProjectOk
    End Function
 
+   Protected Sub CloseWindow(bDialogResult As Boolean)
+      RaiseEvent m_CloseWindow(bDialogResult)
+   End Sub
+
 #End Region    ' METHODS
 
 #Region "COMMANDS"
@@ -672,37 +718,34 @@ Public MustInherit Class NewOpenProjectFileDialogVM
 
 #End Region ' Delete
 
-#Region "ModifyName"
+#Region "Cancel"
 
    ''' <summary>
    ''' Returns a command that do New.
    ''' </summary>
-   Public ReadOnly Property ModifyName_Command As ICommand
+   Public ReadOnly Property Cancel_Command As ICommand
       Get
-         If m_cmdModifyName Is Nothing Then
-            m_cmdModifyName = New Command(AddressOf ModifyName)
+         If m_cmdCancel Is Nothing Then
+            m_cmdCancel = New Command(AddressOf Cancel)
          End If
-         Return m_cmdModifyName
+         Return m_cmdCancel
       End Get
    End Property
 
    ''' <summary>
    ''' Execute the New.  This method is invoked by the NewCommand.
    ''' </summary>
-   Public Sub ModifyName()
-      Dim NameColumn As EgtDataGridColumn = m_ProdColumns.FirstOrDefault(Function(x) x.Name = COL_NAME)
-      If Not IsNothing(NameColumn) Then
-         NameColumn.IsReadOnly = False
-      End If
+   Public Overridable Sub Cancel()
    End Sub
 
-#End Region ' ModifyName
+#End Region ' Cancel
 
 #End Region    ' Commands
 
 End Class
 
 Public Class ProdItem
+   Inherits VMBase
 
    Protected m_ProdFileVM As ProdFileVM
    Public ReadOnly Property ProdFileVM As ProdFileVM
@@ -734,6 +777,7 @@ Public Class ProdItem
          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))
@@ -744,9 +788,33 @@ Public Class ProdItem
          Return dtCreateDate.ToString()
       End Get
    End Property
+
    Public ReadOnly Property sMachine As String
       Get
-         Return If(Not IsNothing(m_ProdFileVM), m_ProdFileVM.sMachine, "")
+         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
 
@@ -765,14 +833,3 @@ Public Class ProdItem
    End Sub
 
 End Class
-
-'Public Class ProjItem
-
-'   Private m_ProjFileVM As ProjectFileVM
-
-
-'   Sub New(ProjFileVM As ProjectFileVM)
-'      m_ProjFileVM = ProjFileVM
-'   End Sub
-
-'End Class
\ No newline at end of file
diff --git a/EgtBEAMWALL.Core/ProjectFileVM/ProdFileM.vb b/EgtBEAMWALL.Core/ProjectFileVM/ProdFileM.vb
index bedcf3e8..58286ce9 100644
--- a/EgtBEAMWALL.Core/ProjectFileVM/ProdFileM.vb
+++ b/EgtBEAMWALL.Core/ProjectFileVM/ProdFileM.vb
@@ -24,6 +24,16 @@ Public Class ProdFileM
       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"
 
    Protected Sub New()
@@ -34,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
@@ -44,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
 
diff --git a/EgtBEAMWALL.Core/ProjectFileVM/ProjFileM.vb b/EgtBEAMWALL.Core/ProjectFileVM/ProjFileM.vb
index df3cc588..c42731b8 100644
--- a/EgtBEAMWALL.Core/ProjectFileVM/ProjFileM.vb
+++ b/EgtBEAMWALL.Core/ProjectFileVM/ProjFileM.vb
@@ -47,21 +47,23 @@ Public Class 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, sDescription As String, IsNew As Boolean, IsLocked As Boolean, nType As BWType, sMachine As String) As ProjFileM
-        Dim NewProjectFileM As New ProjFileM
-        NewProjectFileM.m_nProjId = nProjId
-        NewProjectFileM.m_nProdId = nProdId
-        NewProjectFileM.m_dtCreateDate = dtCreateProjDate
-        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
-        Return NewProjectFileM
-    End Function
+   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
+      NewProjectFileM.m_dtCreateDate = dtCreateProjDate
+      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
 
 #End Region    ' CONSTRUCTORS
 
diff --git a/EgtBEAMWALL.Core/ProjectFileVM/ProjectFileM.vb b/EgtBEAMWALL.Core/ProjectFileVM/ProjectFileM.vb
index 12786f45..b4d8fba2 100644
--- a/EgtBEAMWALL.Core/ProjectFileVM/ProjectFileM.vb
+++ b/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
diff --git a/EgtBEAMWALL.Core/ProjectManager/ProdFileVM.vb b/EgtBEAMWALL.Core/ProjectManager/ProdFileVM.vb
index ca5d2173..884dcf74 100644
--- a/EgtBEAMWALL.Core/ProjectManager/ProdFileVM.vb
+++ b/EgtBEAMWALL.Core/ProjectManager/ProdFileVM.vb
@@ -66,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)
diff --git a/EgtBEAMWALL.Core/ProjectManager/ProjectFileVM.vb b/EgtBEAMWALL.Core/ProjectManager/ProjectFileVM.vb
index 9ecad508..3a44e706 100644
--- a/EgtBEAMWALL.Core/ProjectManager/ProjectFileVM.vb
+++ b/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
diff --git a/EgtBEAMWALL.DataLayer/Controllers/ProdController.cs b/EgtBEAMWALL.DataLayer/Controllers/ProdController.cs
index 48f6ee12..9414550c 100644
--- a/EgtBEAMWALL.DataLayer/Controllers/ProdController.cs
+++ b/EgtBEAMWALL.DataLayer/Controllers/ProdController.cs
@@ -202,7 +202,7 @@ 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>
@@ -239,7 +239,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             }
 
             // 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;
         }
 
@@ -279,7 +279,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             }
 
             // 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;
         }
 
@@ -907,7 +907,7 @@ 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;
         }
 
diff --git a/EgtBEAMWALL.DataLayer/Controllers/ProjController.cs b/EgtBEAMWALL.DataLayer/Controllers/ProjController.cs
index 90654e8d..b546fea7 100644
--- a/EgtBEAMWALL.DataLayer/Controllers/ProjController.cs
+++ b/EgtBEAMWALL.DataLayer/Controllers/ProjController.cs
@@ -903,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.ProjDescription, 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;
         }
diff --git a/EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowVM.vb b/EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowVM.vb
index c58b71ac..b0fe1f20 100644
--- a/EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowVM.vb
+++ b/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"
@@ -320,13 +337,13 @@ Public Class MainWindowVM
          End If
       End If
 
-         'If Map.refOptionPanelVM.SelItem = OptionPanelVM.Tabs.SIMUL Then
-         '   Map.refSimulTabVM.ResetSimulation()
-         'End If
-         ' Imposto contesto principale
-         'EgtSetCurrentContext(Map.refSceneHostVM.MainScene.GetCtx())
-         ' Gestisco eventuale file corrente modificato
-         Dim bOk As Boolean = True
+      'If Map.refOptionPanelVM.SelItem = OptionPanelVM.Tabs.SIMUL Then
+      '   Map.refSimulTabVM.ResetSimulation()
+      'End If
+      ' Imposto contesto principale
+      'EgtSetCurrentContext(Map.refSceneHostVM.MainScene.GetCtx())
+      ' Gestisco eventuale file corrente modificato
+      Dim bOk As Boolean = True
       Select Case Map.refMainMenuVM.SelPage
          Case Pages.VIEW
             bOk = ProjFileVM.VerifyProjectModification(Map.refProjManagerVM.CurrProj, ProjectType.PROJ)
diff --git a/EgtBEAMWALL.ViewerOptimizer/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb b/EgtBEAMWALL.ViewerOptimizer/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb
index 47aa678c..d6386205 100644
--- a/EgtBEAMWALL.ViewerOptimizer/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb
@@ -55,24 +55,13 @@ Public Class NewOpenProjectFileDialogVM
             dtStart = dtStartDate + TimeSpan.FromDays(1)
             dtEnd = dtEndDate
       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, True)
+            DbProjList = DbControllers.m_ProjController.GetLastDesc(dtStart, dtEnd, nRowQuantity, True, bViewArchived)
          Else
-            DbProjList = DbControllers.m_ProjController.GetLastByExpDesc(dtStart, dtEnd, nRowQuantity, True)
+            DbProjList = DbControllers.m_ProjController.GetLastByExpDesc(dtStart, dtEnd, nRowQuantity, True, bViewArchived)
          End If
          For Each Project In DbProjList
             If IsNothing(Project.nProjId) OrElse Project.nProjId = 0 Then Continue For
@@ -135,137 +124,119 @@ Public Class NewOpenProjectFileDialogVM
 
    Public Overrides Sub Archive()
       If IsNothing(SelProject) Then Return
-      If IsNothing(SelProject.ProdFileVM) Then Return
-      ' archivio il progetto
-      DbControllers.m_ProdController.UpdateArchived(SelProject.ProdFileVM.nProdId, True)
+      If Not IsNothing(SelProject.ProdFileVM) Then
+         ' archivio il progetto
+         DbControllers.m_ProdController.UpdateArchived(SelProject.ProdFileVM.nProdId, Not SelProject.bIsArchived)
+         NotifyPropertyChanged(NameOf(Archive_Msg))
+      Else
+         If m_SelProject.ProjFileList.Count > 0 Then
+            ' DbControllers.m_ProjController.archived
+         Else Return
+         End If
+      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)
-      'If m_ProjectType = ProjectType.PROJ Then
-      '   ' 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
-      '      MessageBox.Show(EgtMsg(61872), EgtMsg(30009), MessageBoxButton.OK, MessageBoxImage.Warning)
-      '      Return
-      '   End If
-      '   ' verifico se proj selezionato ha prod 
-      '   If Not IsNothing(SelProject.ProdFileVM) AndAlso SelProject.ProdFileVM.nProdId > 0 Then
-      '      MessageBox.Show(EgtMsg(61873), EgtMsg(30009), MessageBoxButton.OK, MessageBoxImage.Warning)
-      '      Return
-      '   End If
-      '   ' rimuovo dai progetti correnti
-      '   For Each Project In SelProject.ProjFileList
-      '      Map.refProjManagerVM.m_MruFiles.Remove(Project.sProjPath)
-      '   Next
-      '   Map.refProjManagerVM.NotifyPropertyChanged(NameOf(Map.refProjManagerVM.MruFileNames))
-      '   ' cancello progetto
-      '   ' CheckMe impostata come cancellazione FISICA dal DB...
-      '   DbControllers.m_ProjController.DeleteProj(SelProject.nProjId, True)
-      '   ' cancello cartella del Proj
-      '   Try
-      '      Directory.Delete(SelProject.sProjDirPath, True)
-      '   Catch ex As Exception
-      '      EgtOutLog("Error in deleting directory " & SelProject.sProjDirPath)
-      '   End Try
-      '   ' aggiorno lista progetti
-      '   RefreshProjectList()
-      '   'm_ProjectList.Clear()
-      '   'Dim DbProjectList As New List(Of ProjFileM)
-      '   'DbProjectList = DbControllers.m_ProjController.GetLastDesc(50, False)
-      '   'For Each Project In DbProjectList
-      '   '   m_ProjectList.Add(New ProjFileVM(Project))
-      '   'Next
-      'ElseIf m_ProjectType = ProjectType.PROD Then
-      '   ' verifico se prod selezionato e' il corrente
-      '   If Not IsNothing(Map.refProdManagerVM.CurrProd) AndAlso SelProject.nProdId = Map.refProdManagerVM.CurrProd.nProdId Then
-      '      MessageBox.Show(EgtMsg(61872), EgtMsg(30009), MessageBoxButton.OK, MessageBoxImage.Warning)
-      '      Return
-      '   End If
-      '   ' verifico se ci sono grezzi mandati al supervisore
-      '   If DbControllers.m_ProdController.IsAnyInSupervisor(SelProject.nProdId) Then
-      '      MessageBox.Show(EgtMsg(61874), EgtMsg(30009), MessageBoxButton.OK, MessageBoxImage.Warning)
-      '      Return
-      '   End If
-      '   Map.refProdManagerVM.m_MruFiles.Remove(SelProject.sProdPath)
-      '   Map.refProdManagerVM.NotifyPropertyChanged(NameOf(Map.refProdManagerVM.MruFileNames))
-      '   ' cancello progetto
-      '   DbControllers.m_ProdController.DeleteProd(SelProject.nProdId)
-      '   ' riporto prod in proj
-      '   Dim nCurrCtx As Integer = EgtGetCurrentContext()
-      '   Dim nTempCtx As Integer = EgtInitContext()
-      '   If nTempCtx <> 0 Then
-      '      ' inizializzo gestore lavorazioni
-      '      EgtInitMachMgr(Map.refMainWindowVM.MainWindowM.sMachinesRoot, Map.refMainWindowVM.MainWindowM.sToolMakersDir)
-      '      ' apro, ripulisco e salvo il progetto in tutti i proj correlati
-      '      Dim ProdFile As ProdFileVM = DirectCast(SelProject, ProdFileVM)
-      '      For Each nProjId In ProdFile.nProjIdList
-      '         EgtOpenFile(SelProject.sProdPath)
-      '         ' cancello tutti i gruppi di lavorazione
-      '         Dim nMachGroupId As Integer = EgtGetFirstMachGroup()
-      '         While nMachGroupId <> GDB_ID.NULL
-      '            EgtSetCurrMachGroup(nMachGroupId)
-      '            Dim nRawPartId As Integer = EgtGetFirstRawPart()
-      '            While nRawPartId <> GDB_ID.NULL
-      '               Dim nPartId As Integer = EgtGetFirstPartInRawPart(nRawPartId)
-      '               While nPartId <> GDB_ID.NULL
-      '                  EgtRemovePartFromRawPart(nPartId)
-      '                  ' elimino pezzo copia
-      '                  EgtErase(nPartId)
-      '                  nPartId = EgtGetFirstPartInRawPart(nRawPartId)
-      '               End While
-      '               nRawPartId = EgtGetNextRawPart(nRawPartId)
-      '            End While
-      '            EgtRemoveMachGroup(nMachGroupId)
-      '            nMachGroupId = EgtGetFirstMachGroup()
-      '         End While
-      '         ' cancello tutti i gruppi che sono di un progetto diverso da questo
-      '         Dim nGroupId As Integer = EgtGetFirstInGroup(GDB_ID.ROOT)
-      '         While nGroupId <> GDB_ID.NULL
-      '            Dim nGroupProjId As Integer = GDB_ID.NULL
-      '            Dim nNextGroupId As Integer = EgtGetNext(nGroupId)
-      '            If EgtGetInfo(nGroupId, BTL_PRT_PROJ, nGroupProjId) Then
-      '               If nGroupProjId <> nProjId Then
-      '                  EgtErase(nGroupId)
-      '               End If
-      '            End If
-      '            nGroupId = nNextGroupId
-      '         End While
-      '         EgtSaveFile(ProdFile.GetProjPath(nProjId), NGE.CMPTEXT)
-      '      Next
-      '      ' torno sul contesto corrente
-      '      EgtSetCurrentContext(nCurrCtx)
-      '      EgtDeleteContext(nTempCtx)
-      '   End If
-      '   ' se proj corrente era il prod cancellato, aggiorno proj corrente
-      '   If Not IsNothing(Map.refProjManagerVM.CurrProj) AndAlso Map.refProjManagerVM.CurrProj.nProdId = SelProject.nProdId Then
-      '      Map.refProjManagerVM.UpdateCurrProj()
-      '   End If
-      '   ' cancello cartella del Prod
-      '   Try
-      '      Directory.Delete(SelProject.sProdDirPath, True)
-      '   Catch ex As Exception
-      '      EgtOutLog("Error in deleting directory " & SelProject.sProdDirPath)
-      '   End Try
-      '   ' aggiorno lista progetti
-      '   m_ProjectList.Clear()
-      '   Dim DbProjectList As New List(Of ProdFileM)
-      '   DbProjectList = DbControllers.m_ProdController.GetLastDesc(50, False)
-      '   For Each Project In DbProjectList
-      '      m_ProjectList.Add(New ProdFileVM(Project))
-      '   Next
-      'End If
-      '' 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()
+      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
diff --git a/EgtBEAMWALL.ViewerOptimizer/ProdManager/ProdManagerVM.vb b/EgtBEAMWALL.ViewerOptimizer/ProdManager/ProdManagerVM.vb
index f77692bf..89546cc2 100644
--- a/EgtBEAMWALL.ViewerOptimizer/ProdManager/ProdManagerVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/ProdManager/ProdManagerVM.vb
@@ -274,15 +274,25 @@ 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
+            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
diff --git a/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb b/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb
index b18838b8..6d66aba7 100644
--- a/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb
@@ -431,7 +431,7 @@ Public Class ProjManagerVM
       m_TempCurrProj = ReceivedCurrProj
       ' se la stringa è vuota
       If IsNothing(TempCurrProj) Then
-         If GetMainPrivateProfileInt(S_GENERAL, "ProjectMode", 0) = 1 Then
+         If GetMainPrivateProfileInt(S_GENERAL, K_PROJECTMODE, 0) = 1 Then
             Dim OpenProdFileDialogVM As NewOpenProjectFileDialogVM = Nothing
             ' apro dialogo di scelta Prod
             OpenProdFileDialogVM = New NewOpenProjectFileDialogVM