Egalware/egtbeamwall
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Aggiunto Delete del Proj

Browse Source
This commit is contained in:
Emmanuele Sassi
2021-03-05 16:36:26 +01:00
parent 9d84be5583
commit 42758d3670
6 changed files with 212 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EgtBEAMWALL.DataLayer/EgtBEAMWALL.DataLayer.csproj
+7
View File
@@ -78,6 +78,10 @@
<Compile Include="Migrations\202103051205114_updateProj.Designer.cs">
<DependentUpon>202103051205114_updateProj.cs</DependentUpon>
</Compile>
<Compile Include="Migrations\202103051521083_ProjNew.cs" />
<Compile Include="Migrations\202103051521083_ProjNew.Designer.cs">
<DependentUpon>202103051521083_ProjNew.cs</DependentUpon>
</Compile>
<Compile Include="Migrations\Configuration.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
@@ -98,6 +102,9 @@
<EmbeddedResource Include="Migrations\202103051205114_updateProj.resx">
<DependentUpon>202103051205114_updateProj.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Migrations\202103051521083_ProjNew.resx">
<DependentUpon>202103051521083_ProjNew.cs</DependentUpon>
</EmbeddedResource>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
EgtBEAMWALL.DataLayer/Migrations/202103051521083_ProjNew.Designer.cs
Generated
+29
View File
@@ -0,0 +1,29 @@
// <auto-generated />
namespace EgtBEAMWALL.DataLayer.Migrations
{
using System.CodeDom.Compiler;
using System.Data.Entity.Migrations;
using System.Data.Entity.Migrations.Infrastructure;
using System.Resources;
[GeneratedCode("EntityFramework.Migrations", "6.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"); }
}
}
}
EgtBEAMWALL.DataLayer/Migrations/202103051521083_ProjNew.cs
+18
View File
@@ -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");
}
}
}
EgtBEAMWALL.DataLayer/Migrations/202103051521083_ProjNew.resx
+126
View File
@@ -0,0 +1,126 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="Target" xml:space="preserve">
<value>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</value>
</data>
<data name="DefaultSchema" xml:space="preserve">
<value>dbo</value>
</data>
</root>
EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb
+31 -32
View File
@@ -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
EgtBEAMWALL.ViewerOptimizer/ProjectManager/ProjectFile.vb
+1 -1
View File
@@ -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