From 42758d3670713fcf89fcadde110554d97e2ec4ec Mon Sep 17 00:00:00 2001 From: Emmanuele Sassi Date: Fri, 5 Mar 2021 16:36:26 +0100 Subject: [PATCH] Aggiunto Delete del Proj --- .../EgtBEAMWALL.DataLayer.csproj | 7 + .../202103051521083_ProjNew.Designer.cs | 29 ++++ .../Migrations/202103051521083_ProjNew.cs | 18 +++ .../Migrations/202103051521083_ProjNew.resx | 126 ++++++++++++++++++ .../ProjManager/ProjManagerVM.vb | 63 +++++---- .../ProjectManager/ProjectFile.vb | 2 +- 6 files changed, 212 insertions(+), 33 deletions(-) create mode 100644 EgtBEAMWALL.DataLayer/Migrations/202103051521083_ProjNew.Designer.cs create mode 100644 EgtBEAMWALL.DataLayer/Migrations/202103051521083_ProjNew.cs create mode 100644 EgtBEAMWALL.DataLayer/Migrations/202103051521083_ProjNew.resx diff --git a/EgtBEAMWALL.DataLayer/EgtBEAMWALL.DataLayer.csproj b/EgtBEAMWALL.DataLayer/EgtBEAMWALL.DataLayer.csproj index 5773bd65..fe1e0645 100644 --- a/EgtBEAMWALL.DataLayer/EgtBEAMWALL.DataLayer.csproj +++ b/EgtBEAMWALL.DataLayer/EgtBEAMWALL.DataLayer.csproj @@ -78,6 +78,10 @@ 202103051205114_updateProj.cs + + + 202103051521083_ProjNew.cs + @@ -98,6 +102,9 @@ 202103051205114_updateProj.cs + + 202103051521083_ProjNew.cs + diff --git a/EgtBEAMWALL.DataLayer/Migrations/202103051521083_ProjNew.Designer.cs b/EgtBEAMWALL.DataLayer/Migrations/202103051521083_ProjNew.Designer.cs new file mode 100644 index 00000000..fde87707 --- /dev/null +++ b/EgtBEAMWALL.DataLayer/Migrations/202103051521083_ProjNew.Designer.cs @@ -0,0 +1,29 @@ +// +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.0.0-20911")] + public sealed partial class ProjNew : IMigrationMetadata + { + private readonly ResourceManager Resources = new ResourceManager(typeof(ProjNew)); + + string IMigrationMetadata.Id + { + get { return "202103051521083_ProjNew"; } + } + + string IMigrationMetadata.Source + { + get { return null; } + } + + string IMigrationMetadata.Target + { + get { return Resources.GetString("Target"); } + } + } +} diff --git a/EgtBEAMWALL.DataLayer/Migrations/202103051521083_ProjNew.cs b/EgtBEAMWALL.DataLayer/Migrations/202103051521083_ProjNew.cs new file mode 100644 index 00000000..458c7618 --- /dev/null +++ b/EgtBEAMWALL.DataLayer/Migrations/202103051521083_ProjNew.cs @@ -0,0 +1,18 @@ +namespace EgtBEAMWALL.DataLayer.Migrations +{ + using System; + using System.Data.Entity.Migrations; + + public partial class ProjNew : DbMigration + { + public override void Up() + { + AddColumn("dbo.ProjList", "Proj_IsNew", c => c.Boolean(nullable: false)); + } + + public override void Down() + { + DropColumn("dbo.ProjList", "Proj_IsNew"); + } + } +} diff --git a/EgtBEAMWALL.DataLayer/Migrations/202103051521083_ProjNew.resx b/EgtBEAMWALL.DataLayer/Migrations/202103051521083_ProjNew.resx new file mode 100644 index 00000000..0a1dbe1b --- /dev/null +++ b/EgtBEAMWALL.DataLayer/Migrations/202103051521083_ProjNew.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 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 + + + dbo + + \ No newline at end of file diff --git a/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb b/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb index 00f2cc8d..9df51b7f 100644 --- a/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb +++ b/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb @@ -244,47 +244,46 @@ Public Class ProjManagerVM Map.refSceneHostVM.SaveProject() Map.refMainWindowVM.SetTitle(CurrProj.nProjId.ToString("0000") & " - " & CurrProj.BTLFileName & " - EgtBEAMWALL") ' se nuovo progetto, incremento l'indice di progetto - If m_CurrProj.NewProj Then - m_nLastProjId = m_nLastProjId + 1 - WriteMainPrivateProfileString(S_GENERAL, K_PROJSINDEX, (m_nLastProjId).ToString()) - m_CurrProj.NewProj = False + DbControllers.m_ProjController.UpdateBtlParts(CurrProj.nProjId, Map.refProjectVM.BTLStructure.PartList.ToList()) - ' ' bozza salvataggio su DB - ' Dim DbMan As New DataLayer.DbManager - ' Dim newDbProj As DataLayer.DatabaseModels.ProjModel - ' newDbProj = DbMan.ProjCtr.Create(m_CurrProj.nProjId, m_CurrProj.BTLFileName) + 'If m_CurrProj.NewProj Then - ' If (False) Then + ' 'm_nLastProjId = m_nLastProjId + 1 + ' 'WriteMainPrivateProfileString(S_GENERAL, K_PROJSINDEX, (m_nLastProjId).ToString()) + ' m_CurrProj.NewProj = False - ' ' caso FALSE ADV - ' DataLayer.DbManager.AdvDataModel = False + ' ' ' bozza salvataggio su DB + ' ' Dim DbMan As New DataLayer.DbManager + ' ' Dim newDbProj As DataLayer.DatabaseModels.ProjModel + ' ' newDbProj = DbMan.ProjCtr.Create(m_CurrProj.nProjId, m_CurrProj.BTLFileName) - ' ' creo le parts - ' Dim BTLPartList As New List(Of DataLayer.DatabaseModels.BTLPartModel) + ' ' If (False) Then - ' For Each part As BTLPart In Map.refProjectVM.BTLStructure.PartList - ' BTLPartList.Add(New DataLayer.DatabaseModels.BTLPartModel() With {.PartId = part.nPartId}) - ' Next + ' ' ' caso FALSE ADV + ' ' DataLayer.DbManager.AdvDataModel = False - ' DbMan.BtlPartCtr.Create(newDbProj.ProjDbId, BTLPartList) - ' Else - ' DataLayer.DbManager.AdvDataModel = True + ' ' ' creo le parts + ' ' Dim BTLPartList As New List(Of DataLayer.DatabaseModels.BTLPartModel) - ' ' creo le parts - ' Dim BTLPartList As New List(Of DataLayer.DatabaseModels.BTLPartModel) + ' ' For Each part As BTLPart In Map.refProjectVM.BTLStructure.PartList + ' ' BTLPartList.Add(New DataLayer.DatabaseModels.BTLPartModel() With {.PartId = part.nPartId}) + ' ' Next - ' For Each part As Core.BTLPart In Map.refProjectVM.BTLStructure.PartList - ' BTLPartList.Add(DbMan.BtlPartCtr.Convert(part)) - ' Next - - ' DbMan.BtlPartCtr.Create(newDbProj.ProjDbId, BTLPartList) - ' End If - - End If + ' ' DbMan.BtlPartCtr.Create(newDbProj.ProjDbId, BTLPartList) + ' ' Else + ' ' DataLayer.DbManager.AdvDataModel = True + ' ' ' creo le parts + ' ' Dim BTLPartList As New List(Of DataLayer.DatabaseModels.BTLPartModel) + ' ' For Each part As Core.BTLPart In Map.refProjectVM.BTLStructure.PartList + ' ' BTLPartList.Add(DbMan.BtlPartCtr.Convert(part)) + ' ' Next + ' ' DbMan.BtlPartCtr.Create(newDbProj.ProjDbId, BTLPartList) + ' ' End If + 'End If End Sub #End Region ' SaveCommand @@ -353,14 +352,14 @@ Public Class ProjManagerVM If bOk Then ' salvo il progetto bOk = EgtSaveFile(sProjFileName, NGE.BIN) - ' aggiorno Db - DbControllers.m_ProjController.Update(nProjId, Path.GetFileName(BTLDlg.FileName)) Else EgtOutLog("Errore nell'importazione BTL") End If If bOk Then + ' aggiorno Db + DbControllers.m_ProjController.UpdateName(nProjId, Path.GetFileName(BTLDlg.FileName)) m_CurrProj = New ProjectFile(ProjectType.PROJ, Path.GetFileNameWithoutExtension(sProjFileName)) - m_CurrProj.NewProj = True + 'm_CurrProj.NewProj = True Map.refMainWindowVM.SetTitle(CurrProj.nProjId.ToString("0000") & " - " & CurrProj.BTLFileName & " - EgtBEAMWALL") End If End Sub diff --git a/EgtBEAMWALL.ViewerOptimizer/ProjectManager/ProjectFile.vb b/EgtBEAMWALL.ViewerOptimizer/ProjectManager/ProjectFile.vb index 18a0e192..ee233346 100644 --- a/EgtBEAMWALL.ViewerOptimizer/ProjectManager/ProjectFile.vb +++ b/EgtBEAMWALL.ViewerOptimizer/ProjectManager/ProjectFile.vb @@ -185,7 +185,7 @@ Public Class ProjectFile Dim bNewProject As Boolean = False Dim sProjectDirPath As String = "" If Type = ProjectType.PROJ Then - bNewProject = CurrProject.NewProj + bNewProject = DbControllers.m_ProjController.FindByProjId(CurrProject.m_nProjId).IsNew sProjectDirPath = CurrProject.sProjDirPath Else bNewProject = CurrProject.NewProd