From 7a6eebcdab4fa8ba4583d93be54849b48842793c Mon Sep 17 00:00:00 2001
From: Emmanuele Sassi <emmanuele.sassi@egaltech.com>
Date: Wed, 30 Aug 2023 19:28:39 +0200
Subject: [PATCH] - correzioni

---
 .../NewOpenProjectFileDialogV.xaml            |  82 +--------------
 .../NewOpenProjectFileDialogV.xaml.vb         |   2 +-
 .../NewOpenProjectFileDialogVM.vb             |  35 ++++++-
 .../OpenProjectFileDialogV.xaml               |   2 +-
 .../OpenProjectFileDialogVM.vb                |  27 ++++-
 .../Controllers/ProdController.cs             |   2 +
 .../ConfigurationPage/ConfigurationPageVM.vb  |  53 +++++-----
 .../EgtBEAMWALL.ViewerOptimizer.vbproj        |   3 +
 .../MainWindow/MainWindowVM.vb                |  97 +++++++++---------
 .../NewOpenProjectFileDialogVM.vb             |   6 +-
 .../ProdManager/ProdManagerVM.vb              |   1 +
 .../OpenProjectFileDialog/Archived.png        | Bin 0 -> 596 bytes
 12 files changed, 147 insertions(+), 163 deletions(-)
 create mode 100644 EgtBEAMWALL.ViewerOptimizer/Resources/OpenProjectFileDialog/Archived.png

diff --git a/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogV.xaml b/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogV.xaml
index 48a6b46c..e47fc137 100644
--- a/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogV.xaml
+++ b/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogV.xaml
@@ -8,7 +8,7 @@
                             WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="True"
                             IsMinimizable="False" WindowStartupLocation="CenterScreen" ShowInTaskbar="False"
                             IsClosable="False"
-                            MinHeight="500" MinWidth="500" Topmost="True"
+                            MinHeight="500" MinWidth="500"
                             DataContext="{Binding RelativeSource={RelativeSource Self}}">
 
    <EgtWPFLib5:EgtCustomWindow.Resources>
@@ -22,7 +22,7 @@
          <RowDefinition Height="1*"/>
       </Grid.RowDefinitions>
 
-      <GroupBox Header="Filters"
+      <GroupBox Header="{Binding Filters_Msg}"
                 Margin="5"
                 Visibility="{Binding Filters_Visibility}">
          <Grid>
@@ -80,7 +80,7 @@
                                       Visibility="{Binding SearchText_Visibility}"/>
                <StackPanel Grid.Column="2" 
                            Orientation="Horizontal">
-                  <TextBlock Text="Rows"
+                  <TextBlock Text="{Binding Rows_Msg}"
                              Style="{StaticResource OptionTextBlock}"/>
                   <ComboBox ItemsSource="{Binding RowQuantityList}"
                             SelectedIndex="{Binding SelRowQuantity}"
@@ -149,7 +149,7 @@
             <DataGridTemplateColumn x:Key="colARCHIVED">
                <DataGridTemplateColumn.CellTemplate>
                   <DataTemplate>
-                     <Image Source="\Resources\CalcPanel\Edit.png"
+                     <Image Source="\Resources\OpenProjectFileDialog\Archived.png"
                             Visibility="{Binding Archived_Visibility}"
                             Height="15"
                             Width="15"
@@ -163,7 +163,6 @@
          </DataGrid.Resources>
          <DataGrid.RowStyle>
             <Style TargetType="DataGridRow">
-               <!--<Setter Property="IsEnabled" Value="{Binding bIsEnabled}"/>-->
                <Setter Property="FontWeight" Value="DemiBold"/>
                <Setter Property="VerticalContentAlignment" Value="Center"/>
                <EventSetter Event="MouseDoubleClick" Handler="ProjectList_MouseDoubleClick"/>
@@ -224,78 +223,6 @@
                      </DataTemplate>
                   </ItemsControl.ItemTemplate>
                </ItemsControl>
-               <!--<EgtBEAMWALL:EgtDataGrid Grid.Row="1"
-                                        ItemsSource="{Binding ProjFileList}" 
-                                        CanUserAddRows="False"
-                                        AutoGenerateColumns="False"
-                                        CanUserResizeRows="False"
-                                        SelectionMode="Single"
-                                        ScrollViewer.CanContentScroll="True" 
-                                        ScrollViewer.VerticalScrollBarVisibility="Auto"
-                                        ScrollViewer.HorizontalScrollBarVisibility="Auto"
-                                        Margin="0"
-                                        BindingColumns="{Binding Path=DataContext.ProjColumns, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:NewOpenProjectFileDialogV}}}">
-                  <DataGrid.Resources>
-                     -->
-               <!-- ProjId -->
-               <!--
-                     <DataGridTextColumn x:Key="colPROJID" Binding="{Binding sProjId}">
-                        <DataGridTextColumn.HeaderTemplate>
-                           <DataTemplate>
-                              <TextBlock Text="{Binding Path=DataContext.Id_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:NewOpenProjectFileDialogV}}}"/>
-                           </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:NewOpenProjectFileDialogV}}}"/>
-                           </DataTemplate>
-                        </DataGridTextColumn.HeaderTemplate>
-                     </DataGridTextColumn>
-                     -->
-               <!-- BTL FileName -->
-               <!--
-                     <DataGridTextColumn x:Key="colBTLNAME" Binding="{Binding sBTLFileName}">
-                        <DataGridTextColumn.HeaderTemplate>
-                           <DataTemplate>
-                              <TextBlock Text="{Binding Path=DataContext.BTLFileName_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:NewOpenProjectFileDialogV}}}"/>
-                           </DataTemplate>
-                        </DataGridTextColumn.HeaderTemplate>
-                     </DataGridTextColumn>
-                     -->
-               <!-- ListName -->
-               <!--
-                     <DataGridTextColumn x:Key="colLISTNAME" Binding="{Binding sListName}">
-                        <DataGridTextColumn.HeaderTemplate>
-                           <DataTemplate>
-                              <TextBlock Text="{Binding Path=DataContext.ListName_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:NewOpenProjectFileDialogV}}}"/>
-                           </DataTemplate>
-                        </DataGridTextColumn.HeaderTemplate>
-                     </DataGridTextColumn>
-                     -->
-               <!-- Exported date -->
-               <!--
-                     <DataGridTextColumn x:Key="colEXPDATE" Binding="{Binding dtExportDate}">
-                        <DataGridTextColumn.HeaderTemplate>
-                           <DataTemplate>
-                              <TextBlock Text="{Binding Path=DataContext.ExportDate_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:NewOpenProjectFileDialogV}}}"/>
-                           </DataTemplate>
-                        </DataGridTextColumn.HeaderTemplate>
-                     </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>
-                  </DataGrid.Resources>
-               </EgtBEAMWALL:EgtDataGrid>-->
             </DataTemplate>
          </DataGrid.RowDetailsTemplate>
       </EgtBEAMWALL:EgtDataGrid>
@@ -306,6 +233,7 @@
                  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}"
diff --git a/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogV.xaml.vb b/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogV.xaml.vb
index 45b0b482..82640ce6 100644
--- a/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogV.xaml.vb
+++ b/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogV.xaml.vb
@@ -80,7 +80,7 @@ Public Class NewOpenProjectFileDialogV
    End Sub
 
    Private Sub MainDataGrid_CellEditEnding(sender As Object, e As DataGridCellEditEndingEventArgs)
-      m_OpenProjFileDialogVM.SetIsEditNameActive(False)
+      'm_OpenProjFileDialogVM.SetIsEditNameActive(False)
    End Sub
 
 End Class
\ No newline at end of file
diff --git a/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb b/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb
index ac835909..4c779469 100644
--- a/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb
+++ b/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb
@@ -130,10 +130,13 @@ Public MustInherit Class NewOpenProjectFileDialogVM
          ' 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
@@ -185,7 +188,7 @@ Public MustInherit Class NewOpenProjectFileDialogVM
       End Set
    End Property
 
-   Private m_DayTypeList As New List(Of String)({"Last Month", "Last 3 Months", "Last 6 Months", EgtMsg(62531)})
+   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
@@ -388,6 +391,17 @@ Public MustInherit Class NewOpenProjectFileDialogVM
       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
@@ -405,9 +419,16 @@ Public MustInherit Class NewOpenProjectFileDialogVM
 
    Public ReadOnly Property Title As String
       Get
-         Return "Open Project"
+         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)
@@ -505,6 +526,12 @@ Public MustInherit Class NewOpenProjectFileDialogVM
       End Get
    End Property
 
+   Public ReadOnly Property Rows_Msg As String
+      Get
+         Return EgtMsg(61995)
+      End Get
+   End Property
+
 #End Region
 
    ' Definizione comandi
@@ -516,6 +543,8 @@ Public MustInherit Class NewOpenProjectFileDialogVM
 #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)
@@ -747,6 +776,8 @@ 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
diff --git a/EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogV.xaml b/EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogV.xaml
index 74659190..b67033c7 100644
--- a/EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogV.xaml
+++ b/EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogV.xaml
@@ -7,7 +7,7 @@
                             Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
                             WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="True"
                             IsMinimizable="False" WindowStartupLocation="CenterScreen" ShowInTaskbar="False"
-                            MinHeight="500" MinWidth="500" Topmost="True"
+                            MinHeight="500" MinWidth="500"
                             DataContext="{Binding RelativeSource={RelativeSource Self}}">
 
    <EgtWPFLib5:EgtCustomWindow.Resources>
diff --git a/EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogVM.vb b/EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogVM.vb
index 20417c48..11df4009 100644
--- a/EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogVM.vb
+++ b/EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogVM.vb
@@ -146,7 +146,7 @@ Public MustInherit Class OpenProjectFileDialogVM
    End Property
 
 
-   Private m_DayTypeList As New List(Of String)({"Last Month", "Last 3 Months", "Last 6 Months", EgtMsg(62531)})
+   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
@@ -408,6 +408,31 @@ 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(31)
+         Case DayTypes.LAST3MONTHS
+            m_dtEndDate = DateTime.Today + TimeSpan.FromDays(1)
+            m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(31 * 3)
+         Case DayTypes.LAST6MONTHS
+            m_dtEndDate = DateTime.Today + TimeSpan.FromDays(1)
+            m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(31 * 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"
diff --git a/EgtBEAMWALL.DataLayer/Controllers/ProdController.cs b/EgtBEAMWALL.DataLayer/Controllers/ProdController.cs
index 9414550c..509259d7 100644
--- a/EgtBEAMWALL.DataLayer/Controllers/ProdController.cs
+++ b/EgtBEAMWALL.DataLayer/Controllers/ProdController.cs
@@ -233,6 +233,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                         p => p.ProdDbId,
                         e => e.ProdDbId,
                         (p, e) => p)
+                    .Distinct()
                     .OrderByDescending(x => x.ProdId)
                     .Take(numRecord)
                     .ToList();
@@ -273,6 +274,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                         p => p.ProdDbId,
                         e => e.ProdDbId,
                         (p, e) => p)
+                    .Distinct()
                     .OrderByDescending(x => x.ProdId)
                     .Take(numRecord)
                     .ToList();
diff --git a/EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/ConfigurationPageVM.vb b/EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/ConfigurationPageVM.vb
index c00aee32..e813597d 100644
--- a/EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/ConfigurationPageVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/ConfigurationPageVM.vb
@@ -200,7 +200,7 @@ Public Class ConfigurationPageVM
       End Set
    End Property
 
-   Private m_ReminderList As New List(Of IdNameStruct)({New IdNameStruct(0, "Never"), New IdNameStruct(1, "1 day"), New IdNameStruct(2, "2 days"), New IdNameStruct(7, "1 week"), New IdNameStruct(14, "2 weeks"), New IdNameStruct(30, "1 month")})
+   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
@@ -556,17 +556,17 @@ Public Class ConfigurationPageVM
       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, "Backup", "Database backup", 15)           ' Backup     ' Database backup
+      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("Backup failed! Impossible to create the backup package!", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+         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, "Projects backup", 15, 100)        ' Projects backup
+         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)
@@ -590,7 +590,7 @@ Public Class ConfigurationPageVM
                zip.Save()
             End Using
          Catch ex As Exception
-            MessageBox.Show("Backup failed! Impossible to create the backup package!", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+            MessageBox.Show(EgtMsg(62103), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)
             bOk = False
          End Try
       End If
@@ -603,7 +603,7 @@ Public Class ConfigurationPageVM
          If Directory.Exists(m_ExternalBackupFolderPath) Then
             CopyForExternalBackup(sBackupFolder, m_ExternalBackupFolderPath)
          Else
-            MessageBox.Show("External folder does not exist or is not reachable! Copy to external folder impossible!", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+            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
@@ -645,7 +645,7 @@ Public Class ConfigurationPageVM
       Dim localProc As Process() = Process.GetProcessesByName(sSupervisorName)
       ' verifico che sia chiuso
       If localProc.Length > 0 Then
-         MessageBox.Show("Please verify the machine is stoped and close the supervisor before proceding with the restore operation!", "Warning", MessageBoxButton.OK, MessageBoxImage.Warning)
+         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
@@ -684,22 +684,25 @@ Public Class ConfigurationPageVM
          Next
       End If
       If String.IsNullOrEmpty(sRestorePath) Then
-         MessageBox.Show("Restore impossible! Last backup not found!", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+         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
-      If MessageBox.Show("Are you sure you want to restore the last backup from " & nYear & "\" & nMonth & "\" & nDay & "? If you proceed you will lose actual data!", "Warning", MessageBoxButton.OKCancel, MessageBoxImage.Warning) <> MessageBoxResult.OK Then Return
       Dim bDoBackup = False
-      Select Case MessageBox.Show("Do you want to do a backup of the current project before proceding with the restore?", "Information", MessageBoxButton.YesNoCancel, MessageBoxImage.Information)
+      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("Restore operation aborted!", "Warning", MessageBoxButton.OK, MessageBoxImage.Warning)
+            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, "Restore", "Backup current", If(bDoBackup, 40, 10))           ' Restore     ' Database Restore
+      LoadingWndHelper.OpenLoadingWnd(ActiveIds.RESTORE, 3, EgtMsg(63025), EgtMsg(63026), If(bDoBackup, 40, 10))           ' Restore     ' Database Restore
       If bDoBackup Then
          Backup(False)
       End If
@@ -713,18 +716,10 @@ Public Class ConfigurationPageVM
          sUserFolder = sKey.Substring(3, 6)
       End If
       If Directory.Exists(sProjectFolder & "\" & sUserFolder) Then
-         ' se faccio backup elimino cartella dei progetti
-         If bDoBackup Then
-            Directory.Delete(sProjectFolder & "\" & sUserFolder, True)
-         Else
-            ' altrimenti la rinomino old
-            If Directory.Exists(sProjectFolder & "\" & sUserFolder & ".old") Then
-               Directory.Delete(sProjectFolder & "\" & sUserFolder & ".old", True)
-            End If
-            Directory.Move(sProjectFolder & "\" & sUserFolder, sProjectFolder & "\" & sUserFolder & ".old")
-         End If
+         ' elimino cartella dei progetti
+         Directory.Delete(sProjectFolder & "\" & sUserFolder, True)
       End If
-      LoadingWndHelper.UpdateLoadingWnd(ActiveIds.RESTORE, 2, "Restore data extraction", If(bDoBackup, 40, 10), 80)        ' Restore data extraction
+      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
@@ -741,17 +736,17 @@ Public Class ConfigurationPageVM
       Catch ex1 As Exception
          EgtOutLog("Error! Impossible importing Recovery file " & sRestorePath & "!")
          EgtOutLog("Exception in zip: " & ex1.ToString())
-         MessageBox.Show("Impossible importing Recovery file!", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+         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, "Database restore", 80, 100)        ' Database restore
+      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("Restore failed! Impossible to restore the backup Database!", "Error", MessageBoxButton.OK, MessageBoxImage.Error)
+            MessageBox.Show(EgtMsg(62111), EgtMsg(15001), MessageBoxButton.OK, MessageBoxImage.Error)                 ' Restore failed! Impossible to restore the backup Database
             bOk = False
          End Try
       End If
@@ -1084,12 +1079,12 @@ Public Class MachParam
             Select Case nType
                Case MachParamType.DOUBLE_
                   StringToDoubleAdv(value, dNewValue, True)
-                  m_IsModifiedValue = Math.Abs( dNewValue - m_dValue) > EPS_SMALL
+                  m_IsModifiedValue = Math.Abs(dNewValue - m_dValue) > EPS_SMALL
                Case MachParamType.LENGTH
                   StringToLenAdv(value, dNewValue, True)
-                  m_IsModifiedValue =  Math.Abs( dNewValue - m_dValue) > EPS_SMALL
+                  m_IsModifiedValue = Math.Abs(dNewValue - m_dValue) > EPS_SMALL
                Case Else
-                  m_IsModifiedValue = String.Compare( value, m_sValue) <> 0
+                  m_IsModifiedValue = String.Compare(value, m_sValue) <> 0
             End Select
          End If
          ' se valore immesso è diverso e password non inserita
diff --git a/EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj b/EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj
index 2730050c..4138ed9f 100644
--- a/EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj
+++ b/EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj
@@ -997,6 +997,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
diff --git a/EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowVM.vb b/EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowVM.vb
index b0fe1f20..08fd969b 100644
--- a/EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowVM.vb
@@ -171,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
@@ -283,60 +328,18 @@ Public Class MainWindowVM
       End If
       ' verifico se sono in modifica percorso libero
       If Map.refFreeContourManagerVM.bIsActive Then
-         MessageBox.Show("Exit from path modification before closing software!")
+         MessageBox.Show(EgtMsg(61994))
          Return
       End If
       ' verifico se sto facendo backup
       If Map.refConfigurationPageVM.bBackupRunning Then
-         MessageBox.Show("Backup running! Impossible closing the software until finish the backup process!", "Warning", MessageBoxButton.OK, MessageBoxImage.Warning)
+         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("Restore running! Impossible closing the software until finish the restore process!", "Warning", MessageBoxButton.OK, MessageBoxImage.Warning)
+         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.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(Map.refConfigurationPageVM.SelReminder.Name & " have passed from last backup. Do you want to do a backup before closing the software?", "Warning", MessageBoxButton.YesNo, MessageBoxImage.Warning) = MessageBoxResult.Yes Then
-               Map.refConfigurationPageVM.Backup(True)
-            End If
-         End If
-      End If
-
       'If Map.refOptionPanelVM.SelItem = OptionPanelVM.Tabs.SIMUL Then
       '   Map.refSimulTabVM.ResetSimulation()
       'End If
diff --git a/EgtBEAMWALL.ViewerOptimizer/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb b/EgtBEAMWALL.ViewerOptimizer/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb
index d6386205..6d3814b2 100644
--- a/EgtBEAMWALL.ViewerOptimizer/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb
@@ -128,11 +128,6 @@ Public Class NewOpenProjectFileDialogVM
          ' 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()
@@ -254,6 +249,7 @@ Public Class ProdItem
          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
diff --git a/EgtBEAMWALL.ViewerOptimizer/ProdManager/ProdManagerVM.vb b/EgtBEAMWALL.ViewerOptimizer/ProdManager/ProdManagerVM.vb
index 89546cc2..0ab55fd2 100644
--- a/EgtBEAMWALL.ViewerOptimizer/ProdManager/ProdManagerVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/ProdManager/ProdManagerVM.vb
@@ -282,6 +282,7 @@ Public Class ProdManagerVM
             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
diff --git a/EgtBEAMWALL.ViewerOptimizer/Resources/OpenProjectFileDialog/Archived.png b/EgtBEAMWALL.ViewerOptimizer/Resources/OpenProjectFileDialog/Archived.png
new file mode 100644
index 0000000000000000000000000000000000000000..bad56a1f5b565093cefd03bf9849def984ce017e
GIT binary patch
literal 596
zcmeAS@N?(olHy`uVBq!ia0vp^svyk41|*NpQ(y*CEX7WqAsj$Z!;#Vf<Z~8yL>4nJ
z@ErkR#;MwT(m+AU64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq!<_&FM7H-
zhD5Z!o$i|*>?q=Je(v`*6SsM6DSNmm@L>OvwV}HN#FJt*UpP4`Z@K%^{g-<T+m}?;
zh!xWN!(uful5<#E&A60!Sxhdeojp@JSxo!l_e~n5hUvwUZPm~3SkIRHP+?Qu{3rYK
zm&K<NR^6Px^-){kOY;ryj$B=$dV1+hAKP_5DiTfC*3L4`YLk(1__93eXPc+)^v{QT
zQ-X@K+%{kBcH6-i!+z|a(mR%EbFv(775y(ic=5&Og$&jFDNzq~5_Ub&&hQL*HuvK3
z_orsMK08u6RjNO%`@q{BoPPrMimf=aZ?E;Ilt+nQR|)Gfv{$cW6!HG)Q<uH*?$Im8
zyp6MM#hep7T+<n>Hij!UM9=+P?zML9UUP>Vrm5dKt)DaBeP4b4V~{6S^izN7w)y)l
zi?%s!W#nNfZC%cx-;))|9GTd>YgU0nk1d~%QWftEre7l07`G{1V4AmhlR{hgI@vWH
z+2$S-#a17mb83d*&NVMY6?p%gn7H|=->1I&XO1-MFQ2oqIbEVM_)K^2>kOk`B^xv!
zF8w?Ew^+Qt{Mxzw`{Zs;xz^g7_WJ4Zo0IQ9{`B5ODrChx;hbd6`bW-hIBez4>wV^4
Yuenfd)6J8bz!bpX>FVdQ&MBb@04VkeQUCw|

literal 0
HcmV?d00001