forked from s434786/DINO_SCRUM
Added serverURL to config, set up box for searching
This commit is contained in:
parent
4ed58fb34a
commit
1be5d1f7c0
@ -3,4 +3,7 @@
|
|||||||
<startup>
|
<startup>
|
||||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
|
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
|
||||||
</startup>
|
</startup>
|
||||||
|
<appSettings>
|
||||||
|
<add key="serverUrl" value="https://sysmag.herokuapp.com/api/"/>
|
||||||
|
</appSettings>
|
||||||
</configuration>
|
</configuration>
|
@ -46,6 +46,7 @@
|
|||||||
<HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
|
<HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
|
<Reference Include="System.Configuration" />
|
||||||
<Reference Include="System.Data" />
|
<Reference Include="System.Data" />
|
||||||
<Reference Include="System.Xml" />
|
<Reference Include="System.Xml" />
|
||||||
<Reference Include="Microsoft.CSharp" />
|
<Reference Include="Microsoft.CSharp" />
|
||||||
|
@ -37,6 +37,8 @@
|
|||||||
<TextBlock x:Name="pageBlock" FontSize="16" Margin="274,0,273,25" TextWrapping="Wrap" Text="NaN" Height="19" VerticalAlignment="Bottom"/>
|
<TextBlock x:Name="pageBlock" FontSize="16" Margin="274,0,273,25" TextWrapping="Wrap" Text="NaN" Height="19" VerticalAlignment="Bottom"/>
|
||||||
<Label Content="Status:" HorizontalAlignment="Left" Margin="4,0,0,14" VerticalAlignment="Bottom" Grid.RowSpan="3"/>
|
<Label Content="Status:" HorizontalAlignment="Left" Margin="4,0,0,14" VerticalAlignment="Bottom" Grid.RowSpan="3"/>
|
||||||
<TextBlock Name="netStatus" HorizontalAlignment="Left" Margin="50,0,0,19" TextWrapping="Wrap" Text="TextBlock" VerticalAlignment="Bottom" Grid.RowSpan="3"/>
|
<TextBlock Name="netStatus" HorizontalAlignment="Left" Margin="50,0,0,19" TextWrapping="Wrap" Text="TextBlock" VerticalAlignment="Bottom" Grid.RowSpan="3"/>
|
||||||
|
<TextBox x:Name="searchBox" TextWrapping="Wrap" Text="" HorizontalAlignment="Right" Width="120" Height="23" VerticalAlignment="Top" TextChanged="TextBox_TextChanged" />
|
||||||
|
<materialDesign:PackIcon Kind="Search" Height="23" Width="23" Margin="0,0,121,0" VerticalAlignment="Top" HorizontalAlignment="Right"/>
|
||||||
|
|
||||||
|
|
||||||
</Grid>
|
</Grid>
|
||||||
|
@ -22,6 +22,7 @@ using System.Net;
|
|||||||
using Magazyn.Windows;
|
using Magazyn.Windows;
|
||||||
using Magazyn.Tools;
|
using Magazyn.Tools;
|
||||||
using System.Net.NetworkInformation;
|
using System.Net.NetworkInformation;
|
||||||
|
using System.Configuration;
|
||||||
|
|
||||||
namespace Magazyn
|
namespace Magazyn
|
||||||
{
|
{
|
||||||
@ -39,9 +40,14 @@ namespace Magazyn
|
|||||||
|
|
||||||
Size windowSize;
|
Size windowSize;
|
||||||
|
|
||||||
|
string serverUrl;
|
||||||
|
|
||||||
public MainWindow()
|
public MainWindow()
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
|
|
||||||
|
serverUrl = ConfigurationManager.AppSettings.Get("serverUrl");
|
||||||
|
|
||||||
client = new HttpClient();
|
client = new HttpClient();
|
||||||
this.Loaded += MainWindowLoaded;
|
this.Loaded += MainWindowLoaded;
|
||||||
netConn = checkInternetConnection();
|
netConn = checkInternetConnection();
|
||||||
@ -62,7 +68,7 @@ namespace Magazyn
|
|||||||
{
|
{
|
||||||
string json = "{\"id\": " + fruit.Id.ToString() + ", \"change\": " + amountChanged.ToString() + " }";
|
string json = "{\"id\": " + fruit.Id.ToString() + ", \"change\": " + amountChanged.ToString() + " }";
|
||||||
|
|
||||||
Task<HttpResponseMessage> response = client.PostAsync("https://sysmag.herokuapp.com/api/product/change-quantity", new StringContent(json, Encoding.UTF8, "application/json"));
|
Task<HttpResponseMessage> response = client.PostAsync(serverUrl+"product/change-quantity", new StringContent(json, Encoding.UTF8, "application/json"));
|
||||||
while (response.IsCompleted != true) ;
|
while (response.IsCompleted != true) ;
|
||||||
|
|
||||||
if (response.Result.StatusCode == HttpStatusCode.BadRequest)
|
if (response.Result.StatusCode == HttpStatusCode.BadRequest)
|
||||||
@ -92,12 +98,11 @@ namespace Magazyn
|
|||||||
|
|
||||||
private void RefreshListOfFruits()
|
private void RefreshListOfFruits()
|
||||||
{
|
{
|
||||||
|
|
||||||
if (netConn)
|
if (netConn)
|
||||||
{
|
{
|
||||||
pageBlock.Text = (page+1).ToString();
|
pageBlock.Text = (page+1).ToString();
|
||||||
|
|
||||||
Task<HttpResponseMessage> response = client.GetAsync("https://sysmag.herokuapp.com/api/get-all?page=" + page.ToString() + "&size=" + size.ToString());
|
Task<HttpResponseMessage> response = client.GetAsync(serverUrl+"get-all?page=" + page.ToString() + "&size=" + size.ToString());
|
||||||
while (response.IsCompleted != true) ;
|
while (response.IsCompleted != true) ;
|
||||||
|
|
||||||
if (response.Result.StatusCode != HttpStatusCode.OK)
|
if (response.Result.StatusCode != HttpStatusCode.OK)
|
||||||
@ -139,7 +144,7 @@ namespace Magazyn
|
|||||||
|
|
||||||
private WarehousePrice GetWarehousePrice()
|
private WarehousePrice GetWarehousePrice()
|
||||||
{
|
{
|
||||||
Task<HttpResponseMessage> response = client.GetAsync("https://sysmag.herokuapp.com/api/get-price-of-all");
|
Task<HttpResponseMessage> response = client.GetAsync(serverUrl+"get-price-of-all");
|
||||||
while (response.IsCompleted != true) ;
|
while (response.IsCompleted != true) ;
|
||||||
|
|
||||||
WarehousePrice price = JsonConvert.DeserializeObject<WarehousePrice>(response.Result.Content.ReadAsStringAsync().Result.ToString());
|
WarehousePrice price = JsonConvert.DeserializeObject<WarehousePrice>(response.Result.Content.ReadAsStringAsync().Result.ToString());
|
||||||
@ -170,7 +175,7 @@ namespace Magazyn
|
|||||||
{
|
{
|
||||||
Size size = e.NewSize;
|
Size size = e.NewSize;
|
||||||
|
|
||||||
if( Math.Abs(windowSize.Height - size.Height) >= 40 )
|
if( Math.Abs(windowSize.Height - size.Height) >= 64 )
|
||||||
{
|
{
|
||||||
//size -> number of elementy by page
|
//size -> number of elementy by page
|
||||||
this.size = (int)((size.Height - 124) / 80);
|
this.size = (int)((size.Height - 124) / 80);
|
||||||
@ -200,6 +205,11 @@ namespace Magazyn
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void TextBox_TextChanged(object sender, TextChangedEventArgs e)
|
||||||
|
{
|
||||||
|
//RefreshListOfFruits();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user