Gremlinsoft
/
Gremlin
2
0
Fork 0
Code Issues 1 Pull Requests Packages Projects 1 Releases Wiki Activity

change byte Gender in ViewModels to Enum.Gender

pull/1/head
Sascha Woitschetzki 2021-07-16 12:36:25 +07:00
parent 612411ca34
commit c206b84b73
22 changed files with 114 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gremlin/GremlinData/DBClasses/DbHelper.cs
Unescape Escape View File

@ -1915,7 +1915,7 @@ namespace Gremlin.GremlinData.DBClasses
public static Product ResolveProduct(GremlinContext context, string productNumber, string option)
{
try {return context.Products.Where(product => product.ProductNumber == productNumber && product.OptionNumber == option).First(); }
try { return context.Products.Where(product => product.ProductNumber == productNumber && product.OptionNumber == option).First(); }
catch { return null; }
}

6
Gremlin/GremlinData/DBClasses/EntityConfiguration.cs
Unescape Escape View File

@ -18,7 +18,7 @@ namespace Gremlin.GremlinData.DBClasses
entity.Property(e => e.AccountId).ValueGeneratedOnAdd();
entity.Property(e => e.ParentAccountId);
entity.Property(e => e.AccountName).IsRequired(true).HasMaxLength(250);
//.HasColumnType("VARCHAR(250)") ist überflüssig, da .HasMaxLength(250) VARCHAR(250) impliziert.
//.HasColumnType("VARCHAR(250)") ist überflüssig, da .HasMaxLength(250) VARCHAR(250) impliziert.
entity.Property(e => e.Notes);
entity.Property(e => e.Street).IsRequired(true).HasMaxLength(100);
entity.Property(e => e.ZIP).IsRequired(true).HasColumnType("Char(5)");
@ -39,9 +39,9 @@ namespace Gremlin.GremlinData.DBClasses
entity.Property(e => e.DataVersionNumber).HasDefaultValue(1).IsRequired(true);
entity.Property(e => e.DataVersionComment).HasDefaultValue("");
entity.Property(e => e.DataStatus).IsRequired(true);
//.HasDefaultValue("Active") //Default-Wert wird nicht gesetzt?!? Bug in EF Core?
//.HasDefaultValue("Active") //Default-Wert wird nicht gesetzt?!? Bug in EF Core?
entity.Property(e => e.DataModificationDate).HasColumnType("TIMESTAMP").HasDefaultValueSql("CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP").ValueGeneratedOnAddOrUpdate().IsConcurrencyToken(true);
//.IsRowVersion() impliziert .ValueGeneratedOnAddOrUpdate() und .IsConcurrencyToken(true)
//.IsRowVersion() impliziert .ValueGeneratedOnAddOrUpdate() und .IsConcurrencyToken(true)
entity.Property(e => e.DataModificationByUser).HasColumnType("TINYTEXT").IsRequired(true).HasDefaultValueSql("ON INSERT CURRENT_USER() ON UPDATE CURRENT_USER()");
}
}

10
Gremlin/GremlinData/DBClasses/GenericImporter.cs
Unescape Escape View File

@ -22,7 +22,7 @@ namespace Gremlin.GremlinData.DBClasses
private static TextFieldParser _csvParser;
private static string _filepath;
private static bool _dataHasHeadings;
private static Encoding _encoding = default;
private static Encoding _encoding;
internal static GremlinContext db = new();
//Public properties
@ -207,7 +207,7 @@ namespace Gremlin.GremlinData.DBClasses
average = 0;
for (int i = 0; i < numberOfLinesToEvaluate - 1; i++)
{
if (score[i,j] == score[i+1,j] && score[i,j] > 1)
if (score[i, j] == score[i + 1, j] && score[i, j] > 1)
{
x++;
}
@ -235,7 +235,7 @@ namespace Gremlin.GremlinData.DBClasses
using (_csvParser)
{
//für geneerischen Code:
//für geneerischen Code:
//int numberOfLines = File.ReadAllLines(filepath).Length;
//Assembly Gremlin = Assembly.GetExecutingAssembly();
@ -858,7 +858,7 @@ namespace Gremlin.GremlinData.DBClasses
List<ProductLine> productLinesReadFromFile = new(50);
using (csvParser)
{
while (!csvParser.EndOfData)
while (!csvParser.EndOfData)
{
ProductLine importedProductLine = new();
string[] fields = csvParser.ReadFields();
@ -912,7 +912,7 @@ namespace Gremlin.GremlinData.DBClasses
List<SubMarket> subMarketsReadFromFile = new(20);
using (csvParser)
{
while (!csvParser.EndOfData)
while (!csvParser.EndOfData)
{
SubMarket importedSubMarket = new();
string[] fields = csvParser.ReadFields();

2
Gremlin/GremlinData/EntityClasses/Enums.cs
Unescape Escape View File

@ -1,6 +1,6 @@
namespace Gremlin.GremlinData.EntityClasses
{
internal class Enums
public class Enums
{
public enum Status : byte
{

6
Gremlin/GremlinUtilities/GUClasses/DataIdentificator.cs
Unescape Escape View File

@ -88,10 +88,10 @@ namespace Gremlin.GremlinUtilities.GUClasses
{
if (winners.Contains("ProductLine")) winners.Remove("ProductLine");
if (winners.Contains("AccountType")) winners.Remove("AccountType");
if (winners.Contains("SubMarket")) winners.Remove("SubMarket");
if (winners.Contains("SubMarket")) winners.Remove("SubMarket");
if (winners.Contains("Account")) winners.Remove("Account");
if (winners.Contains("Contact")) winners.Remove("Contact");
if (winners.Contains("Account")) winners.Remove("Account");
if (winners.Contains("Contact")) winners.Remove("Contact");
}
if (MustMatchAllQualifer == true && winners.Contains("Account"))

34
Gremlin/MVVM/Operations/PDFHandler.cs
Unescape Escape View File

@ -1,7 +1,5 @@
using DocumentFormat.OpenXml.Office2010.ExcelAc;
using Gremlin.MVVM;
using Gremlin.MVVM;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
@ -58,34 +56,18 @@ namespace Gremlin.Operations
process.StartInfo.WorkingDirectory = quoteVM.QuotePath;
process.StartInfo.FileName = "pdflatex";
process.StartInfo.Arguments = quoteVM.QuoteNumber;
process.StartInfo.UseShellExecute = false;
try { _ = process.Start(); }
process.StartInfo.UseShellExecute = true;
try { process.Start(); }
catch (Exception ex) { ErrorHandler.ShowErrorInMessageBox(ex); }
process.WaitForExit();
}
}
}
//private static void RunningPDFLaTeX(string quotePath, string fileName, int runs)
//{
// for (int i = 0; i < runs; i++)
// {
// using (Process process = new())
// {
// process.StartInfo.FileName = "pdflatex";
// process.StartInfo.Arguments = quotePath == "" ? $"{fileName}.tex" : $"{quotePath}\\{fileName}.tex";
// process.StartInfo.UseShellExecute = false;
// try
// {
// _ = process.Start();
// }
// catch (Exception ex)
// {
// ErrorHandler.ShowErrorInMessageBox(ex);
// }
// process.WaitForExit();
// }
// }
//}
public static void OpenPDF(QuoteViewModel quoteVM)
{
string pdfFile = $"explorer {quoteVM.QuotePath}";
Process.Start(pdfFile);
}
}
}

2
Gremlin/MVVM/Operations/TexHandler.cs
Unescape Escape View File

@ -52,7 +52,7 @@ namespace Gremlin.MVVM
_ = texFile.AppendLine("&\\\\\n&\\\\\n\\end{tabular}\n\\vspace{1cm}\\par ");
//Anrede
_ = quoteVM.Recipient.Gender == (byte)Gender.Male
_ = quoteVM.Recipient.Gender == Gender.Male
? texFile.AppendLine($"Sehr geehrter Herr {quoteVM.Recipient.LastName},\\par ")
: texFile.AppendLine($"Sehr geehrte Frau {quoteVM.Recipient.LastName},\\par ");

16
Gremlin/MVVM/ViewModels/ContactViewModel.cs
Unescape Escape View File

@ -11,7 +11,7 @@ namespace Gremlin.MVVM
{
public class ContactViewModel : PropertyChangedBase
{
private byte _gender = 1;
private Enums.Gender _gender = Enums.Gender.Male;
private string _firstName = "firstName";
private string _lastName = "lastName";
private string _eMail = "email@email.de";
@ -20,7 +20,7 @@ namespace Gremlin.MVVM
private uint _accountZIP;
private string _accountCity = "accountCity";
public byte Gender { get => _gender; set { _gender = value; NotifyOfPropertyChange(() => Gender); } }
public Enums.Gender Gender { get => _gender; set { _gender = value; NotifyOfPropertyChange(() => Gender); } }
public string FirstName { get => _firstName; set { _firstName = value; NotifyOfPropertyChange(() => FirstName); } }
public string LastName { get => _lastName; set { _lastName = value; NotifyOfPropertyChange(() => LastName); } }
public string EMail { get => _eMail; set { _eMail = value; NotifyOfPropertyChange(() => EMail); } }
@ -31,7 +31,7 @@ namespace Gremlin.MVVM
public ContactViewModel() { }
public ContactViewModel(byte gender, string firstName, string lastName, string eMail, string accountName, string accountStreet, uint accountZIP, string accountCity)
public ContactViewModel(Enums.Gender gender, string firstName, string lastName, string eMail, string accountName, string accountStreet, uint accountZIP, string accountCity)
{
Gender = gender;
FirstName = firstName ?? throw new ArgumentNullException(nameof(firstName));
@ -64,7 +64,7 @@ namespace Gremlin.MVVM
public override string ToString()
{
return Gender == (byte)Enums.Gender.Male
return Gender == Enums.Gender.Male
? $"Herr {FirstName} {LastName}; {AccountName}, {AccountStreet}, {AccountZIP} {AccountCity}"
: $"Frau {FirstName} {LastName}; {AccountName}, {AccountStreet}, {AccountZIP} {AccountCity}";
}
@ -98,7 +98,7 @@ namespace Gremlin.MVVM
{
case 1:
{
ContactViewModel salesRepWoitschetzki = new((byte)Enums.Gender.Male,
ContactViewModel salesRepWoitschetzki = new(Enums.Gender.Male,
"Sascha",
"Woitschetzki",
"sascha.woitschetzki@non.agilent.com",
@ -111,7 +111,7 @@ namespace Gremlin.MVVM
case 2:
{
ContactViewModel salesRepWelsch = new((byte)Enums.Gender.Male,
ContactViewModel salesRepWelsch = new(Enums.Gender.Male,
"Sebastian",
"Welsch",
"sebastian.welsch@non.agilent.com",
@ -133,7 +133,7 @@ namespace Gremlin.MVVM
internal static ContactViewModel ConvertContactToVM(Contact contact)
{
ContactViewModel contactVM = new();
contactVM.Gender = contact.Gender;
contactVM.Gender = (Enums.Gender)contact.Gender;
contactVM.LastName = contact.LastName;
contactVM.FirstName = contact.FirstName;
contactVM.EMail = contact.EMail;
@ -151,7 +151,7 @@ namespace Gremlin.MVVM
{
StringBuilder briefkopf = new();
_ = contactVM.Gender == (byte)Enums.Gender.Male
_ = contactVM.Gender == Enums.Gender.Male
? briefkopf.AppendLine($"Herr {contactVM.FirstName} {contactVM.LastName}")
: briefkopf.AppendLine($"Frau {contactVM.FirstName} {contactVM.LastName}");
if (tex) _ = briefkopf.AppendLine($"\\\\");

18
Gremlin/MVVM/ViewModels/LineItemViewModel.cs
Unescape Escape View File

@ -22,15 +22,15 @@ namespace Gremlin.MVVM
public ushort Position { get => _position; set { _position = value; NotifyOfPropertyChange(() => Position); } }
public ushort Amount { get => _amount; set { _amount = value; NotifyOfPropertyChange(() => Amount); } }
public string ProductNumber { get => _productNumber; set { _productNumber = value; NotifyOfPropertyChange(() => ProductNumber); }}
public string OptionNumber { get => _optionNumber; set { _optionNumber = value; NotifyOfPropertyChange(() => OptionNumber); }}
public string SapShortDescription { get => _sapShortDescription; set { _sapShortDescription = value; NotifyOfPropertyChange(() => SapShortDescription); }}
public CustomDescriptionViewModel CustomDescriptionVM { get => _customDescriptionVM; set { _customDescriptionVM = value; NotifyOfPropertyChange(() => CustomDescriptionVM); }}
public string ProductLine { get => _productLine; set { _productLine = value; NotifyOfPropertyChange(() => ProductLine); }}
public decimal TotalDiscount { get => _totalDiscount; set { _totalDiscount = value; NotifyOfPropertyChange(() => TotalDiscount); }}
public decimal CalcNetPrice { get => _calcNetPrice; set { _calcNetPrice = value; NotifyOfPropertyChange(() => CalcNetPrice); }}
public decimal CalcTotalNet { get => _calcTotalNet; set { _calcTotalNet = value; NotifyOfPropertyChange(() => CalcTotalNet); }}
public decimal ListPrice { get => _listPrice; set { _listPrice = value; NotifyOfPropertyChange(() => ListPrice); }}
public string ProductNumber { get => _productNumber; set { _productNumber = value; NotifyOfPropertyChange(() => ProductNumber); } }
public string OptionNumber { get => _optionNumber; set { _optionNumber = value; NotifyOfPropertyChange(() => OptionNumber); } }
public string SapShortDescription { get => _sapShortDescription; set { _sapShortDescription = value; NotifyOfPropertyChange(() => SapShortDescription); } }
public CustomDescriptionViewModel CustomDescriptionVM { get => _customDescriptionVM; set { _customDescriptionVM = value; NotifyOfPropertyChange(() => CustomDescriptionVM); } }
public string ProductLine { get => _productLine; set { _productLine = value; NotifyOfPropertyChange(() => ProductLine); } }
public decimal TotalDiscount { get => _totalDiscount; set { _totalDiscount = value; NotifyOfPropertyChange(() => TotalDiscount); } }
public decimal CalcNetPrice { get => _calcNetPrice; set { _calcNetPrice = value; NotifyOfPropertyChange(() => CalcNetPrice); } }
public decimal CalcTotalNet { get => _calcTotalNet; set { _calcTotalNet = value; NotifyOfPropertyChange(() => CalcTotalNet); } }
public decimal ListPrice { get => _listPrice; set { _listPrice = value; NotifyOfPropertyChange(() => ListPrice); } }
internal static ObservableCollection<LineItemViewModel> ReadLineItemsFromClipboard()
{

5
Gremlin/MVVM/ViewModels/ShellViewModel.cs
Unescape Escape View File

@ -94,5 +94,10 @@ namespace Gremlin.MVVM
{
PDFHandler.CreatePDF(QuoteVM);
}
public void OpenPDF()
{
PDFHandler.OpenPDF(QuoteVM);
}
}
}

2
Gremlin/MVVM/Views/ShellView.xaml
Unescape Escape View File

@ -7,6 +7,7 @@
<DataGrid
x:Name="Contacts"
AutoGenerateColumns="True"
FrozenColumnCount="3"
SelectionMode="Single"
SelectedItem="SelectedContact"
AlternatingRowBackground="LightGray"
@ -18,6 +19,7 @@
<StackPanel Orientation="Horizontal" HorizontalAlignment="Stretch">
<Button x:Name="CreateTex" Content="TexFile erzeugen" Margin="10,5,10,5"/>
<Button x:Name="CreatePDF" Content="PDF erzeugen" Margin="10,5,10,5"/>
<Button x:Name="OpenPDF" Content="PDF öffnen" Margin="10,5,10,5"/>
</StackPanel>
</StackPanel>
</UserControl>