bozza modifiche (NON compila/non ok)

This commit is contained in:
Samuele E. Locatelli
2021-05-01 18:36:49 +02:00
parent 2baf65a26e
commit 81ead90085
21 changed files with 122 additions and 370 deletions
+55
View File
@@ -0,0 +1,55 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.28407.52
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SHERPA", "SHERPA\SHERPA.csproj", "{B59C0668-53A0-48C2-8959-CC7ECEB6D004}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VersGen", "VersGen\VersGen.csproj", "{6AE920DD-D404-4781-B6D6-CABCA89FB42D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GPW_data", "..\GPW\GPW_Data\GPW_data.csproj", "{7BEA5D99-8486-4592-B01D-FE2C76EB66CF}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SHERPA_SYNC", "SHERPA_SYNC\SHERPA_SYNC.csproj", "{BF6789C2-2592-4A8F-B75B-C938E3D90F71}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SHERPA.BBM", "SHERPA.BBM\SHERPA.BBM.csproj", "{248D0FE3-14C4-4205-AB5B-536755B93951}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SHERPA.BBM.UI", "SHERPA.BBM.UI\SHERPA.BBM.UI.csproj", "{BE36EFC1-CFCA-4A96-B75F-1CB233976B56}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{B59C0668-53A0-48C2-8959-CC7ECEB6D004}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B59C0668-53A0-48C2-8959-CC7ECEB6D004}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B59C0668-53A0-48C2-8959-CC7ECEB6D004}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B59C0668-53A0-48C2-8959-CC7ECEB6D004}.Release|Any CPU.Build.0 = Release|Any CPU
{6AE920DD-D404-4781-B6D6-CABCA89FB42D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6AE920DD-D404-4781-B6D6-CABCA89FB42D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6AE920DD-D404-4781-B6D6-CABCA89FB42D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6AE920DD-D404-4781-B6D6-CABCA89FB42D}.Release|Any CPU.Build.0 = Release|Any CPU
{7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.Release|Any CPU.Build.0 = Release|Any CPU
{BF6789C2-2592-4A8F-B75B-C938E3D90F71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BF6789C2-2592-4A8F-B75B-C938E3D90F71}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BF6789C2-2592-4A8F-B75B-C938E3D90F71}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BF6789C2-2592-4A8F-B75B-C938E3D90F71}.Release|Any CPU.Build.0 = Release|Any CPU
{248D0FE3-14C4-4205-AB5B-536755B93951}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{248D0FE3-14C4-4205-AB5B-536755B93951}.Debug|Any CPU.Build.0 = Debug|Any CPU
{248D0FE3-14C4-4205-AB5B-536755B93951}.Release|Any CPU.ActiveCfg = Release|Any CPU
{248D0FE3-14C4-4205-AB5B-536755B93951}.Release|Any CPU.Build.0 = Release|Any CPU
{BE36EFC1-CFCA-4A96-B75F-1CB233976B56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BE36EFC1-CFCA-4A96-B75F-1CB233976B56}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BE36EFC1-CFCA-4A96-B75F-1CB233976B56}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BE36EFC1-CFCA-4A96-B75F-1CB233976B56}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {ABA99076-1982-4649-B39C-D2A63DB228FA}
EndGlobalSection
EndGlobal
+3 -3
View File
@@ -98,7 +98,7 @@ namespace SHERPA.BBM.UI.Data
{
try
{
dbController.DocDelete(currItem.CodBasket);
dbController.DocDelete(currItem.DocId);
}
catch
{
@@ -111,9 +111,9 @@ namespace SHERPA.BBM.UI.Data
return Task.FromResult(dbController.DocGetLastDesc(numRec).ToArray());
}
public Task<DatabaseModels.DocsModel[]> DocsGetAsync(string CodBasket, string CodNegotiation, int numRec)
public Task<DatabaseModels.DocsModel[]> DocsGetAsync(int BasketId, int NegotiationId, int numRec)
{
return Task.FromResult(dbController.DocGetLastDesc(CodBasket, CodNegotiation, numRec).ToArray());
return Task.FromResult(dbController.DocGetLastDesc(BasketId, NegotiationId, numRec).ToArray());
}
public void DocsUpdate(DatabaseModels.DocsModel currItem)
+1 -1
View File
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
+3 -6
View File
@@ -1,14 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
</configSections>
<appSettings>
<add key="BBMModel" value="Data Source=SQL2012DEV;Initial Catalog=SHERPA.BBM;User ID=sa;Password=keyhammer16;integrated security=True;MultipleActiveResultSets=True;App=EntityFramework;" />
</appSettings>
<configSections>
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
<section name="entityFramework"
type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
requirePermission="false" />
</configSections>
<entityFramework>
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
<parameters>
+6 -6
View File
@@ -169,18 +169,18 @@ namespace SHERPA.BBM.Controllers
}
/// <summary>
/// Elimina item Basket
/// Elimina item Doc
/// </summary>
/// <param name="CodDoc"></param>
/// <param name="DocId"></param>
/// <returns></returns>
public bool DocDelete(string CodDoc)
public bool DocDelete(int DocId)
{
bool done = false;
try
{
var item2del = dbCtx
.DbSetDocs
.Where(x => x.CodDoc == CodDoc)
.Where(x => x.DocId == DocId)
.FirstOrDefault();
dbCtx.DbSetDocs.Remove(item2del);
dbCtx.SaveChanges();
@@ -221,7 +221,7 @@ namespace SHERPA.BBM.Controllers
/// <param name="CodNegotiation"></param>
/// <param name="numRecord"></param>
/// <returns></returns>
public List<DatabaseModels.DocsModel> DocGetLastDesc(string CodBasket = "", string CodNegotiation = "", int numRecord = 0)
public List<DatabaseModels.DocsModel> DocGetLastDesc(int BasketId = 0, int NegotiationId = 0, int numRecord = 0)
{
List<DatabaseModels.DocsModel> dbResult = new List<DatabaseModels.DocsModel>();
// se numRecord = 0 --> passo tutti
@@ -231,7 +231,7 @@ namespace SHERPA.BBM.Controllers
}
dbResult = dbCtx
.DbSetDocs
.Where(x => (x.CodBasket == CodBasket || CodBasket == "") && (x.CodNegotiation == CodNegotiation || CodNegotiation == ""))
.Where(x => (x.BasketId == BasketId || BasketId == 0) && (x.NegotiationId == NegotiationId || NegotiationId == 0))
.OrderByDescending(x => x.CodDoc)
.OrderByDescending(x => x.DataIns)
.Take(numRecord)
+7 -4
View File
@@ -14,16 +14,19 @@ namespace SHERPA.BBM.DatabaseModels
{
#region Public Properties
[Key, Column("CodBasket", Order = 0), MaxLength(50)]
[Key, Column("BasketId", Order = 0), DatabaseGenerated(DatabaseGeneratedOption.Identity)]
public int DocId { get; set; }
[Column("CodBasket", Order = 1), MaxLength(50)]
public string CodBasket { get; set; } = "BBM.0000.0000";
[Column("CodClient", Order = 2), MaxLength(50)]
[Column("CodClient", Order = 3), MaxLength(50)]
public string CodClient { get; set; } = "ND";
[Column("DataIns", Order = 1)]
[Column("DataIns", Order = 2)]
public DateTime DataIns { get; set; } = DateTime.Now;
[Column("Descript", Order = 3), MaxLength(250)]
[Column("Descript", Order = 4), MaxLength(250)]
public string Descript { get; set; } = "";
#endregion Public Properties
+15 -12
View File
@@ -14,34 +14,37 @@ namespace SHERPA.BBM.DatabaseModels
{
#region Public Properties
[ForeignKey("CodBasket")]
[ForeignKey("BasketId")]
public virtual BasketsModel Basket { get; set; }
[Column("CodBasket", Order = 6), MaxLength(50)]
public string CodBasket { get; set; } = "";
[Column("BasketId", Order = 7), MaxLength(50)]
public int BasketId { get; set; }
[Key, Column("CodDoc", Order = 0), MaxLength(50)]
[Column("CodDoc", Order = 1), MaxLength(50)]
public string CodDoc { get; set; } = "EGW.D.0000.0000.00";
[Column("CodNegotiation", Order = 1), MaxLength(50)]
public string CodNegotiation { get; set; } = "";
[Column("NegotiationId", Order = 2)]
public int NegotiationId { get; set; }
[Column("DataIns", Order = 5)]
[Column("DataIns", Order = 6)]
public DateTime DataIns { get; set; } = DateTime.Now;
[Column("Descript", Order = 2), MaxLength(250)]
[Column("Descript", Order = 3), MaxLength(250)]
public string Descript { get; set; } = "";
[Column("DocPath", Order = 7), MaxLength(500)]
[Key, Column("DocId", Order = 0), DatabaseGenerated(DatabaseGeneratedOption.Identity)]
public int DocId { get; set; }
[Column("DocPath", Order = 8), MaxLength(500)]
public string DocPath { get; set; } = "";
[Column("DocType", Order = 4)]
[Column("DocType", Order = 5)]
public BbmDocType DocType { get; set; } = BbmDocType.Quote;
[ForeignKey("CodNegotiation")]
[ForeignKey("NegotiationId")]
public virtual NegotiationsModel Negotiation { get; set; }
[Column("NumDoc", Order = 3)]
[Column("NumDoc", Order = 4)]
public int NumDoc { get; set; } = 0;
#endregion Public Properties
+3 -3
View File
@@ -14,13 +14,13 @@ namespace SHERPA.BBM.DatabaseModels
{
#region Public Properties
[Key, Column("CodDoc", Order = 0), MaxLength(50)]
public string CodDoc { get; set; } = "";
[Key, Column("DocId", Order = 0)]
public int DocId { get; set; }
[Column("DataIns", Order = 2)]
public DateTime DataIns { get; set; } = DateTime.Now;
[ForeignKey("CodDoc")]
[ForeignKey("DocId")]
public virtual DocsModel Document { get; set; }
[Key, Column("IdxFatt", Order = 1)]
+6 -6
View File
@@ -17,22 +17,22 @@ namespace SHERPA.BBM.DatabaseModels
[Key, Column("ItemId", Order = 0), DatabaseGenerated(DatabaseGeneratedOption.Identity)]
public int ItemId { get; set; }
[Column("CodItem", Order = 0), MaxLength(50)]
[Column("CodItem", Order = 1), MaxLength(50)]
public string CodItem { get; set; } = "ITEM.000000";
[Column("Descript", Order = 3), MaxLength(250)]
[Column("Descript", Order = 4), MaxLength(250)]
public string Descript { get; set; } = "";
[Column("ResType", Order = 1)]
[Column("ResType", Order = 2)]
public BbmResType ResType { get; set; } = BbmResType.ND;
[Column("UM", Order = 2), MaxLength(50)]
[Column("UM", Order = 3), MaxLength(50)]
public string UM { get; set; } = "nr";
[Column("UnitCost", Order = 4)]
[Column("UnitCost", Order = 5)]
public double UnitCost { get; set; } = 1;
[Column("UnitPrice", Order = 5)]
[Column("UnitPrice", Order = 6)]
public double UnitPrice { get; set; } = 1;
#endregion Public Properties
@@ -14,22 +14,25 @@ namespace SHERPA.BBM.DatabaseModels
{
#region Public Properties
[Column("BasePath", Order = 5)]
[Column("BasePath", Order = 6)]
public string BasePath { get; set; } = "";
[Column("CodClient", Order = 2), MaxLength(50)]
[Column("CodClient", Order = 3), MaxLength(50)]
public string CodClient { get; set; } = "ND";
[Key, Column("CodNegotiation", Order = 0), MaxLength(50)]
[Column("CodNegotiation", Order = 0), MaxLength(50)]
public string CodNegotiation { get; set; } = "EGW.0000.0000";
[Column("DataIns", Order = 1)]
[Column("DataIns", Order = 2)]
public DateTime DataIns { get; set; } = DateTime.Now;
[Column("Descript", Order = 3), MaxLength(250)]
[Column("Descript", Order = 4), MaxLength(250)]
public string Descript { get; set; } = "";
[Column("Refer", Order = 4), MaxLength(50)]
[Key, Column("NegotiationId", Order = 1), DatabaseGenerated(DatabaseGeneratedOption.Identity)]
public int NegotiationId { get; set; }
[Column("Refer", Order = 5), MaxLength(50)]
public string Refer { get; set; } = "";
#endregion Public Properties
+3 -3
View File
@@ -14,13 +14,13 @@ namespace SHERPA.BBM.DatabaseModels
{
#region Public Properties
[Column("CodDoc", Order = 1), MaxLength(50)]
public string CodDoc { get; set; } = "";
[Column("DocId", Order = 1)]
public int DocId { get; set; }
[Column("ItemId", Order = 3)]
public int ItemId { get; set; }
[ForeignKey("CodDoc")]
[ForeignKey("DocId")]
public virtual DocsModel Document { get; set; }
[ForeignKey("ItemId")]
-29
View File
@@ -1,29 +0,0 @@
// <auto-generated />
namespace SHERPA.BBM.Migrations
{
using System.CodeDom.Compiler;
using System.Data.Entity.Migrations;
using System.Data.Entity.Migrations.Infrastructure;
using System.Resources;
[GeneratedCode("EntityFramework.Migrations", "6.4.4")]
public sealed partial class InitDb : IMigrationMetadata
{
private readonly ResourceManager Resources = new ResourceManager(typeof(InitDb));
string IMigrationMetadata.Id
{
get { return "202103111741020_InitDb"; }
}
string IMigrationMetadata.Source
{
get { return null; }
}
string IMigrationMetadata.Target
{
get { return Resources.GetString("Target"); }
}
}
}
@@ -1,128 +0,0 @@
namespace SHERPA.BBM.Migrations
{
using System;
using System.Data.Entity.Migrations;
public partial class InitDb : DbMigration
{
public override void Up()
{
CreateTable(
"dbo.Baskets",
c => new
{
CodBasket = c.String(nullable: false, maxLength: 50),
DataIns = c.DateTime(nullable: false),
CodClient = c.String(maxLength: 50),
Descript = c.String(maxLength: 250),
})
.PrimaryKey(t => t.CodBasket);
CreateTable(
"dbo.Counters",
c => new
{
CodCounter = c.String(nullable: false, maxLength: 50),
LastNum = c.Int(nullable: false),
})
.PrimaryKey(t => t.CodCounter);
CreateTable(
"dbo.Docs",
c => new
{
CodDoc = c.String(nullable: false, maxLength: 50),
CodNegotiation = c.String(maxLength: 50),
Descript = c.String(maxLength: 250),
NumDoc = c.Int(nullable: false),
DocType = c.Int(nullable: false),
DataIns = c.DateTime(nullable: false),
CodBasket = c.String(maxLength: 50),
DocPath = c.String(maxLength: 500),
})
.PrimaryKey(t => t.CodDoc)
.ForeignKey("dbo.Baskets", t => t.CodBasket)
.ForeignKey("dbo.Negotiations", t => t.CodNegotiation)
.Index(t => t.CodNegotiation)
.Index(t => t.CodBasket);
CreateTable(
"dbo.Negotiations",
c => new
{
CodNegotiation = c.String(nullable: false, maxLength: 50),
DataIns = c.DateTime(nullable: false),
CodClient = c.String(maxLength: 50),
Descript = c.String(maxLength: 250),
Refer = c.String(maxLength: 50),
BasePath = c.String(),
})
.PrimaryKey(t => t.CodNegotiation);
CreateTable(
"dbo.Fatt2Doc",
c => new
{
CodDoc = c.String(nullable: false, maxLength: 50),
IdxFatt = c.Int(nullable: false),
DataIns = c.DateTime(nullable: false),
})
.PrimaryKey(t => new { t.CodDoc, t.IdxFatt })
.ForeignKey("dbo.Docs", t => t.CodDoc, cascadeDelete: true)
.Index(t => t.CodDoc);
CreateTable(
"dbo.Items",
c => new
{
CodItem = c.String(nullable: false, maxLength: 50),
ResType = c.Int(nullable: false),
UM = c.String(maxLength: 50),
Descript = c.String(maxLength: 250),
UnitCost = c.Double(nullable: false),
UnitPrice = c.Double(nullable: false),
})
.PrimaryKey(t => t.CodItem);
CreateTable(
"dbo.Resources",
c => new
{
ResourceId = c.Int(nullable: false, identity: true),
CodDoc = c.String(maxLength: 50),
Ord = c.Int(nullable: false),
CodItem = c.String(maxLength: 50),
QtyPrev = c.Double(nullable: false),
QtyOff = c.Double(nullable: false),
UnitPriceOff = c.Double(nullable: false),
})
.PrimaryKey(t => t.ResourceId)
.ForeignKey("dbo.Docs", t => t.CodDoc)
.ForeignKey("dbo.Items", t => t.CodItem)
.Index(t => t.CodDoc)
.Index(t => t.CodItem);
}
public override void Down()
{
DropForeignKey("dbo.Resources", "CodItem", "dbo.Items");
DropForeignKey("dbo.Resources", "CodDoc", "dbo.Docs");
DropForeignKey("dbo.Fatt2Doc", "CodDoc", "dbo.Docs");
DropForeignKey("dbo.Docs", "CodNegotiation", "dbo.Negotiations");
DropForeignKey("dbo.Docs", "CodBasket", "dbo.Baskets");
DropIndex("dbo.Resources", new[] { "CodItem" });
DropIndex("dbo.Resources", new[] { "CodDoc" });
DropIndex("dbo.Fatt2Doc", new[] { "CodDoc" });
DropIndex("dbo.Docs", new[] { "CodBasket" });
DropIndex("dbo.Docs", new[] { "CodNegotiation" });
DropTable("dbo.Resources");
DropTable("dbo.Items");
DropTable("dbo.Fatt2Doc");
DropTable("dbo.Negotiations");
DropTable("dbo.Docs");
DropTable("dbo.Counters");
DropTable("dbo.Baskets");
}
}
}
@@ -1,126 +0,0 @@
<?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>
-10
View File
@@ -86,23 +86,13 @@
<Compile Include="DatabaseModels\NegotiationsModel.cs" />
<Compile Include="DataLayer.cs" />
<Compile Include="Enums.cs" />
<Compile Include="Migrations\202103111741020_InitDb.cs" />
<Compile Include="Migrations\202103111741020_InitDb.designer.cs">
<DependentUpon>202103111741020_InitDb.cs</DependentUpon>
</Compile>
<Compile Include="Migrations\Configuration.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup />
<ItemGroup>
<None Include="App.config" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Migrations\202103111741020_InitDb.resx">
<DependentUpon>202103111741020_InitDb.cs</DependentUpon>
</EmbeddedResource>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
-12
View File
@@ -11,10 +11,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GPW_data", "..\GPW\GPW_Data
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SHERPA_SYNC", "SHERPA_SYNC\SHERPA_SYNC.csproj", "{BF6789C2-2592-4A8F-B75B-C938E3D90F71}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SHERPA.BBM", "SHERPA.BBM\SHERPA.BBM.csproj", "{248D0FE3-14C4-4205-AB5B-536755B93951}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SHERPA.BBM.UI", "SHERPA.BBM.UI\SHERPA.BBM.UI.csproj", "{BE36EFC1-CFCA-4A96-B75F-1CB233976B56}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -37,14 +33,6 @@ Global
{BF6789C2-2592-4A8F-B75B-C938E3D90F71}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BF6789C2-2592-4A8F-B75B-C938E3D90F71}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BF6789C2-2592-4A8F-B75B-C938E3D90F71}.Release|Any CPU.Build.0 = Release|Any CPU
{248D0FE3-14C4-4205-AB5B-536755B93951}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{248D0FE3-14C4-4205-AB5B-536755B93951}.Debug|Any CPU.Build.0 = Debug|Any CPU
{248D0FE3-14C4-4205-AB5B-536755B93951}.Release|Any CPU.ActiveCfg = Release|Any CPU
{248D0FE3-14C4-4205-AB5B-536755B93951}.Release|Any CPU.Build.0 = Release|Any CPU
{BE36EFC1-CFCA-4A96-B75F-1CB233976B56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BE36EFC1-CFCA-4A96-B75F-1CB233976B56}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BE36EFC1-CFCA-4A96-B75F-1CB233976B56}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BE36EFC1-CFCA-4A96-B75F-1CB233976B56}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
+4 -8
View File
@@ -119,8 +119,8 @@
<Reference Include="MongoDB.Driver.Core, Version=2.12.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MongoDB.Driver.Core.2.12.0\lib\net452\MongoDB.Driver.Core.dll</HintPath>
</Reference>
<Reference Include="MongoDB.LibMongocrypt, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MongoDB.LibMongocrypt.1.2.0\lib\net452\MongoDB.LibMongocrypt.dll</HintPath>
<Reference Include="MongoDB.Libmongocrypt, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MongoDB.Libmongocrypt.1.2.1\lib\net452\MongoDB.Libmongocrypt.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -811,10 +811,6 @@
<Project>{7bea5d99-8486-4592-b01d-fe2c76eb66cf}</Project>
<Name>GPW_data</Name>
</ProjectReference>
<ProjectReference Include="..\SHERPA.BBM\SHERPA.BBM.csproj">
<Project>{248d0fe3-14c4-4205-ab5b-536755b93951}</Project>
<Name>SHERPA.BBM</Name>
</ProjectReference>
<ProjectReference Include="..\SHERPA_SYNC\SHERPA_SYNC.csproj">
<Project>{bf6789c2-2592-4a8f-b75b-c938e3d90f71}</Project>
<Name>SHERPA_SYNC</Name>
@@ -894,11 +890,11 @@
<Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
<Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
<Error Condition="!Exists('..\packages\MongoDB.Driver.Core.2.12.0\build\MongoDB.Driver.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MongoDB.Driver.Core.2.12.0\build\MongoDB.Driver.Core.targets'))" />
<Error Condition="!Exists('..\packages\MongoDB.LibMongocrypt.1.2.0\build\MongoDB.Libmongocrypt.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MongoDB.LibMongocrypt.1.2.0\build\MongoDB.Libmongocrypt.targets'))" />
<Error Condition="!Exists('..\packages\MongoDB.Libmongocrypt.1.2.1\build\MongoDB.Libmongocrypt.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MongoDB.Libmongocrypt.1.2.1\build\MongoDB.Libmongocrypt.targets'))" />
</Target>
<Import Project="..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
<Import Project="..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.targets" Condition="Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.targets')" />
<Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
<Import Project="..\packages\MongoDB.Driver.Core.2.12.0\build\MongoDB.Driver.Core.targets" Condition="Exists('..\packages\MongoDB.Driver.Core.2.12.0\build\MongoDB.Driver.Core.targets')" />
<Import Project="..\packages\MongoDB.LibMongocrypt.1.2.0\build\MongoDB.Libmongocrypt.targets" Condition="Exists('..\packages\MongoDB.LibMongocrypt.1.2.0\build\MongoDB.Libmongocrypt.targets')" />
<Import Project="..\packages\MongoDB.Libmongocrypt.1.2.1\build\MongoDB.Libmongocrypt.targets" Condition="Exists('..\packages\MongoDB.Libmongocrypt.1.2.1\build\MongoDB.Libmongocrypt.targets')" />
</Project>
+1 -1
View File
@@ -33,7 +33,7 @@
<package id="MongoDB.Bson" version="2.12.0" targetFramework="net462" />
<package id="MongoDB.Driver" version="2.12.0" targetFramework="net462" />
<package id="MongoDB.Driver.Core" version="2.12.0" targetFramework="net462" />
<package id="MongoDB.LibMongocrypt" version="1.2.0" targetFramework="net462" />
<package id="MongoDB.Libmongocrypt" version="1.2.1" targetFramework="net462" />
<package id="NETStandard.Library" version="2.0.3" targetFramework="net462" />
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net462" />
<package id="NLog" version="4.7.4" targetFramework="net462" />
+4 -4
View File
@@ -61,8 +61,8 @@
<Reference Include="MongoDB.Driver.Core, Version=2.12.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MongoDB.Driver.Core.2.12.0\lib\net452\MongoDB.Driver.Core.dll</HintPath>
</Reference>
<Reference Include="MongoDB.LibMongocrypt, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MongoDB.LibMongocrypt.1.2.0\lib\net452\MongoDB.LibMongocrypt.dll</HintPath>
<Reference Include="MongoDB.Libmongocrypt, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MongoDB.Libmongocrypt.1.2.1\lib\net452\MongoDB.Libmongocrypt.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -184,9 +184,9 @@
</PropertyGroup>
<Error Condition="!Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets'))" />
<Error Condition="!Exists('..\packages\MongoDB.Driver.Core.2.12.0\build\MongoDB.Driver.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MongoDB.Driver.Core.2.12.0\build\MongoDB.Driver.Core.targets'))" />
<Error Condition="!Exists('..\packages\MongoDB.LibMongocrypt.1.2.0\build\MongoDB.Libmongocrypt.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MongoDB.LibMongocrypt.1.2.0\build\MongoDB.Libmongocrypt.targets'))" />
<Error Condition="!Exists('..\packages\MongoDB.Libmongocrypt.1.2.1\build\MongoDB.Libmongocrypt.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MongoDB.Libmongocrypt.1.2.1\build\MongoDB.Libmongocrypt.targets'))" />
</Target>
<Import Project="..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
<Import Project="..\packages\MongoDB.Driver.Core.2.12.0\build\MongoDB.Driver.Core.targets" Condition="Exists('..\packages\MongoDB.Driver.Core.2.12.0\build\MongoDB.Driver.Core.targets')" />
<Import Project="..\packages\MongoDB.LibMongocrypt.1.2.0\build\MongoDB.Libmongocrypt.targets" Condition="Exists('..\packages\MongoDB.LibMongocrypt.1.2.0\build\MongoDB.Libmongocrypt.targets')" />
<Import Project="..\packages\MongoDB.Libmongocrypt.1.2.1\build\MongoDB.Libmongocrypt.targets" Condition="Exists('..\packages\MongoDB.Libmongocrypt.1.2.1\build\MongoDB.Libmongocrypt.targets')" />
</Project>
+1 -1
View File
@@ -9,7 +9,7 @@
<package id="MongoDB.Bson" version="2.12.0" targetFramework="net462" />
<package id="MongoDB.Driver" version="2.12.0" targetFramework="net462" />
<package id="MongoDB.Driver.Core" version="2.12.0" targetFramework="net462" />
<package id="MongoDB.LibMongocrypt" version="1.2.0" targetFramework="net462" />
<package id="MongoDB.Libmongocrypt" version="1.2.1" targetFramework="net462" />
<package id="NETStandard.Library" version="2.0.3" targetFramework="net462" />
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net462" />
<package id="NLog" version="4.7.4" targetFramework="net462" />