Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Rik Jurgens committed Dec 6, 2019
2 parents 177fb11 + e3cb963 commit 81e69a6
Show file tree
Hide file tree
Showing 51 changed files with 17,573 additions and 80 deletions.
Binary file not shown.
Binary file not shown.
1 change: 1 addition & 0 deletions C#/barroc/barroc/MainWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<StackPanel>
<StackPanel>
<Button x:Name="facturenAanmaken" Height="59" Click="facturenAanmaken_Click">Facturen Aanmaken</Button>
<Button x:Name="Factureninzien" Height="59" Click="Factureninzien_Click">Facturen Inzien</Button>
</StackPanel>
</StackPanel>
</Window>
6 changes: 6 additions & 0 deletions C#/barroc/barroc/MainWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,11 @@ private void facturenAanmaken_Click(object sender, RoutedEventArgs e)
facturenAanmaken factuur = new facturenAanmaken();
factuur.Show();
}

private void Factureninzien_Click(object sender, RoutedEventArgs e)
{
factureninzien inzien = new factureninzien();
inzien.Show();
}
}
}
7 changes: 7 additions & 0 deletions C#/barroc/barroc/barroc.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="factureninzien.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="MainWindow.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
Expand All @@ -71,6 +75,9 @@
<Compile Include="facturenAanmaken.xaml.cs">
<DependentUpon>facturenAanmaken.xaml</DependentUpon>
</Compile>
<Compile Include="factureninzien.xaml.cs">
<DependentUpon>factureninzien.xaml</DependentUpon>
</Compile>
<Compile Include="MainWindow.xaml.cs">
<DependentUpon>MainWindow.xaml</DependentUpon>
<SubType>Code</SubType>
Expand Down
Binary file not shown.
Binary file added C#/barroc/barroc/bin/Debug/Google.Protobuf.dll
Binary file not shown.
Binary file added C#/barroc/barroc/bin/Debug/MySql.Data.dll
Binary file not shown.
16,958 changes: 16,958 additions & 0 deletions C#/barroc/barroc/bin/Debug/MySql.Data.xml

Large diffs are not rendered by default.

Binary file added C#/barroc/barroc/bin/Debug/Renci.SshNet.dll
Binary file not shown.
Binary file modified C#/barroc/barroc/bin/Debug/barroc.exe
Binary file not shown.
Binary file modified C#/barroc/barroc/bin/Debug/barroc.pdb
Binary file not shown.
3 changes: 2 additions & 1 deletion C#/barroc/barroc/facturenAanmaken.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
<TextBox x:Name="nameTextBox" Margin="10,0,128,0"></TextBox>
<Label>Prijs</Label>
<TextBox x:Name="priceTextBox" Margin="10,0,128,0" PreviewTextInput="priceTextBox_PreviewTextInput"/>
<Label></Label>
<Button x:Name="sendDataBaseButton" Content="Button" Margin="10,0,129,0" Height="38" Click="sendDataBaseButton_Click"/>
<DataGrid x:Name="dataGrid" Height="100"/>
</StackPanel>
</StackPanel>
</Window>
14 changes: 14 additions & 0 deletions C#/barroc/barroc/facturenAanmaken.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
using System.Linq;
Expand Down Expand Up @@ -34,5 +35,18 @@ private void priceTextBox_PreviewTextInput(object sender, TextCompositionEventAr
{
nummeronly(e);
}

private void sendDataBaseButton_Click(object sender, RoutedEventArgs e)
{
string connStr = "server=localhost;user=root;database=barroc_intense;port=3306;password=";
MySqlConnection conn = new MySqlConnection(connStr);
conn.Open();

MySqlCommand cmd = new MySqlCommand("select * from users",conn);
MySqlDataReader dr = cmd.ExecuteReader();

dataGrid.ItemsSource = dr;
}

}
}
15 changes: 15 additions & 0 deletions C#/barroc/barroc/factureninzien.xaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<Window x:Class="barroc.factureninzien"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:barroc"
mc:Ignorable="d"
Title="factureninzien" Height="450" Width="800">
<StackPanel>
<StackPanel>
<Button x:Name="facturenInzienButton" Click="facturenInzienButton_Click">Inzien</Button>
<DataGrid x:Name="dataGrid" Height="400"/>
</StackPanel>
</StackPanel>
</Window>
40 changes: 40 additions & 0 deletions C#/barroc/barroc/factureninzien.xaml.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;

namespace barroc
{
/// <summary>
/// Interaction logic for factureninzien.xaml
/// </summary>
public partial class factureninzien : Window
{
public factureninzien()
{
InitializeComponent();
}

private void facturenInzienButton_Click(object sender, RoutedEventArgs e)
{
string connStr = "server=localhost;user=root;database=barroc_intense;port=3306;password=";
MySqlConnection conn = new MySqlConnection(connStr);
conn.Open();

MySqlCommand cmd = new MySqlCommand("select * from invoices", conn);
MySqlDataReader dr = cmd.ExecuteReader();

dataGrid.ItemsSource = dr;
}
}
}
Binary file added C#/barroc/barroc/obj/Debug/MainWindow.baml
Binary file not shown.
21 changes: 21 additions & 0 deletions C#/barroc/barroc/obj/Debug/MainWindow.g.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
<<<<<<< HEAD
#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "9AC3338DBB860DBD06AAB2130034575F1F009C12A883418071B50DEF876C6DA6"
=======
#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "41AC2D0E4C87E5B9A4972B8CAC12A85060FBDD869866E13E90902910729079E9"
>>>>>>> master
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
Expand Down Expand Up @@ -48,6 +52,14 @@ public partial class MainWindow : System.Windows.Window, System.Windows.Markup.I
#line default
#line hidden


#line 12 "..\..\MainWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button Factureninzien;

#line default
#line hidden

private bool _contentLoaded;

/// <summary>
Expand Down Expand Up @@ -84,6 +96,15 @@ void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object
#line 11 "..\..\MainWindow.xaml"
this.facturenAanmaken.Click += new System.Windows.RoutedEventHandler(this.facturenAanmaken_Click);

#line default
#line hidden
return;
case 2:
this.Factureninzien = ((System.Windows.Controls.Button)(target));

#line 12 "..\..\MainWindow.xaml"
this.Factureninzien.Click += new System.Windows.RoutedEventHandler(this.Factureninzien_Click);

#line default
#line hidden
return;
Expand Down
21 changes: 21 additions & 0 deletions C#/barroc/barroc/obj/Debug/MainWindow.g.i.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
<<<<<<< HEAD
#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "9AC3338DBB860DBD06AAB2130034575F1F009C12A883418071B50DEF876C6DA6"
=======
#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "41AC2D0E4C87E5B9A4972B8CAC12A85060FBDD869866E13E90902910729079E9"
>>>>>>> master
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
Expand Down Expand Up @@ -48,6 +52,14 @@ public partial class MainWindow : System.Windows.Window, System.Windows.Markup.I
#line default
#line hidden


#line 12 "..\..\MainWindow.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button Factureninzien;

#line default
#line hidden

private bool _contentLoaded;

/// <summary>
Expand Down Expand Up @@ -84,6 +96,15 @@ void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object
#line 11 "..\..\MainWindow.xaml"
this.facturenAanmaken.Click += new System.Windows.RoutedEventHandler(this.facturenAanmaken_Click);

#line default
#line hidden
return;
case 2:
this.Factureninzien = ((System.Windows.Controls.Button)(target));

#line 12 "..\..\MainWindow.xaml"
this.Factureninzien.Click += new System.Windows.RoutedEventHandler(this.Factureninzien_Click);

#line default
#line hidden
return;
Expand Down
Empty file.
8 changes: 8 additions & 0 deletions C#/barroc/barroc/obj/Debug/barroc.csproj.FileListAbsolute.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,11 @@ C:\xampp\htdocs\barroc\Barroc_Intenss\C#\barroc\barroc\obj\Debug\barroc.Properti
C:\xampp\htdocs\barroc\Barroc_Intenss\C#\barroc\barroc\obj\Debug\barroc.csproj.GenerateResource.cache
C:\xampp\htdocs\barroc\Barroc_Intenss\C#\barroc\barroc\obj\Debug\barroc.exe
C:\xampp\htdocs\barroc\Barroc_Intenss\C#\barroc\barroc\obj\Debug\barroc.pdb
C:\xampp\htdocs\barroc\Barroc_Intenss\C#\barroc\barroc\bin\Debug\MySql.Data.dll
C:\xampp\htdocs\barroc\Barroc_Intenss\C#\barroc\barroc\bin\Debug\Google.Protobuf.dll
C:\xampp\htdocs\barroc\Barroc_Intenss\C#\barroc\barroc\bin\Debug\BouncyCastle.Crypto.dll
C:\xampp\htdocs\barroc\Barroc_Intenss\C#\barroc\barroc\bin\Debug\Renci.SshNet.dll
C:\xampp\htdocs\barroc\Barroc_Intenss\C#\barroc\barroc\bin\Debug\MySql.Data.xml
C:\xampp\htdocs\barroc\Barroc_Intenss\C#\barroc\barroc\obj\Debug\barroc.csproj.CopyComplete
C:\xampp\htdocs\barroc\Barroc_Intenss\C#\barroc\barroc\obj\Debug\factureninzien.g.cs
C:\xampp\htdocs\barroc\Barroc_Intenss\C#\barroc\barroc\obj\Debug\factureninzien.baml
Binary file modified C#/barroc/barroc/obj/Debug/barroc.exe
Binary file not shown.
Binary file modified C#/barroc/barroc/obj/Debug/barroc.g.resources
Binary file not shown.
Binary file modified C#/barroc/barroc/obj/Debug/barroc.pdb
Binary file not shown.
9 changes: 9 additions & 0 deletions C#/barroc/barroc/obj/Debug/barroc_MarkupCompile.cache
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,21 @@ barroc
none
false
DEBUG;TRACE
<<<<<<< HEAD
C:\xampp\htdocs\Barroc_Intenss\C#\barroc\barroc\App.xaml
2234482645

7-1443068387
13-1505183044
facturenAanmaken.xaml;MainWindow.xaml;
=======
C:\xampp\htdocs\barroc\Barroc_Intenss\C#\barroc\barroc\App.xaml
3-37160895

7-239638642
14-430030424
facturenAanmaken.xaml;factureninzien.xaml;MainWindow.xaml;
>>>>>>> master

True

9 changes: 9 additions & 0 deletions C#/barroc/barroc/obj/Debug/barroc_MarkupCompile.i.cache
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,21 @@ barroc
none
false
DEBUG;TRACE
<<<<<<< HEAD
C:\xampp\htdocs\Barroc_Intenss\C#\barroc\barroc\App.xaml
2234482645

8-813990615
13-1505183044
facturenAanmaken.xaml;MainWindow.xaml;
=======
C:\xampp\htdocs\barroc\Barroc_Intenss\C#\barroc\barroc\App.xaml
3-37160895

8-41809788
14-430030424
facturenAanmaken.xaml;factureninzien.xaml;MainWindow.xaml;
>>>>>>> master

True

6 changes: 6 additions & 0 deletions C#/barroc/barroc/obj/Debug/barroc_MarkupCompile.i.lref
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@


<<<<<<< HEAD
FC:\xampp\htdocs\Barroc_Intenss\C#\barroc\barroc\facturenAanmaken.xaml;;
FC:\xampp\htdocs\Barroc_Intenss\C#\barroc\barroc\MainWindow.xaml;;
=======
FC:\xampp\htdocs\barroc\Barroc_Intenss\C#\barroc\barroc\facturenAanmaken.xaml;;
FC:\xampp\htdocs\barroc\Barroc_Intenss\C#\barroc\barroc\factureninzien.xaml;;
FC:\xampp\htdocs\barroc\Barroc_Intenss\C#\barroc\barroc\MainWindow.xaml;;
>>>>>>> master

6 changes: 6 additions & 0 deletions C#/barroc/barroc/obj/Debug/barroc_MarkupCompile.lref
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@


<<<<<<< HEAD
FC:\xampp\htdocs\Barroc_Intenss\C#\barroc\barroc\facturenAanmaken.xaml;;
FC:\xampp\htdocs\Barroc_Intenss\C#\barroc\barroc\MainWindow.xaml;;
=======
FC:\xampp\htdocs\barroc\Barroc_Intenss\C#\barroc\barroc\facturenAanmaken.xaml;;
FC:\xampp\htdocs\barroc\Barroc_Intenss\C#\barroc\barroc\MainWindow.xaml;;
FC:\xampp\htdocs\barroc\Barroc_Intenss\C#\barroc\barroc\factureninzien.xaml;;
>>>>>>> master

Binary file added C#/barroc/barroc/obj/Debug/facturenAanmaken.baml
Binary file not shown.
32 changes: 32 additions & 0 deletions C#/barroc/barroc/obj/Debug/facturenAanmaken.g.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
<<<<<<< HEAD
#pragma checksum "..\..\facturenAanmaken.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "408DA13DD0089F72AAAFC5A930C8A41A9EA4247F144BFC66ED128D868CBBEE73"
=======
#pragma checksum "..\..\facturenAanmaken.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "B1DAC643918C7C4A6775229334BFBDE9C9C7596097CA7E081C3741F7D55CA79C"
>>>>>>> master
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
Expand Down Expand Up @@ -56,6 +60,22 @@ public partial class facturenAanmaken : System.Windows.Window, System.Windows.Ma
#line default
#line hidden


#line 16 "..\..\facturenAanmaken.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button sendDataBaseButton;

#line default
#line hidden


#line 17 "..\..\facturenAanmaken.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.DataGrid dataGrid;

#line default
#line hidden

private bool _contentLoaded;

/// <summary>
Expand Down Expand Up @@ -98,6 +118,18 @@ void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object
#line default
#line hidden
return;
case 3:
this.sendDataBaseButton = ((System.Windows.Controls.Button)(target));

#line 16 "..\..\facturenAanmaken.xaml"
this.sendDataBaseButton.Click += new System.Windows.RoutedEventHandler(this.sendDataBaseButton_Click);

#line default
#line hidden
return;
case 4:
this.dataGrid = ((System.Windows.Controls.DataGrid)(target));
return;
}
this._contentLoaded = true;
}
Expand Down
32 changes: 32 additions & 0 deletions C#/barroc/barroc/obj/Debug/facturenAanmaken.g.i.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
<<<<<<< HEAD
#pragma checksum "..\..\facturenAanmaken.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "408DA13DD0089F72AAAFC5A930C8A41A9EA4247F144BFC66ED128D868CBBEE73"
=======
#pragma checksum "..\..\facturenAanmaken.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "B1DAC643918C7C4A6775229334BFBDE9C9C7596097CA7E081C3741F7D55CA79C"
>>>>>>> master
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
Expand Down Expand Up @@ -56,6 +60,22 @@ public partial class facturenAanmaken : System.Windows.Window, System.Windows.Ma
#line default
#line hidden


#line 16 "..\..\facturenAanmaken.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button sendDataBaseButton;

#line default
#line hidden


#line 17 "..\..\facturenAanmaken.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.DataGrid dataGrid;

#line default
#line hidden

private bool _contentLoaded;

/// <summary>
Expand Down Expand Up @@ -98,6 +118,18 @@ void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object
#line default
#line hidden
return;
case 3:
this.sendDataBaseButton = ((System.Windows.Controls.Button)(target));

#line 16 "..\..\facturenAanmaken.xaml"
this.sendDataBaseButton.Click += new System.Windows.RoutedEventHandler(this.sendDataBaseButton_Click);

#line default
#line hidden
return;
case 4:
this.dataGrid = ((System.Windows.Controls.DataGrid)(target));
return;
}
this._contentLoaded = true;
}
Expand Down
Binary file added C#/barroc/barroc/obj/Debug/factureninzien.baml
Binary file not shown.
Loading

0 comments on commit 81e69a6

Please sign in to comment.