Client very WIP und Fehlerkorrektur API

This commit is contained in:
Daniel Schick 2023-08-08 07:43:47 +02:00
parent 6b93f0ac3f
commit 383f6a38c7
11 changed files with 271 additions and 131 deletions

View File

@ -1,7 +1,7 @@
//----------------------
// <auto-generated>
// Generated REST API Client Code Generator v1.7.17.0 on 28.07.2023 08:12:12
// Generated REST API Client Code Generator v1.7.17.0 on 07.08.2023 15:13:59
// Using the tool OpenAPI Generator v6.6.0
// </auto-generated>
//----------------------
@ -120,7 +120,7 @@ namespace BreCalClient.misc.Api
/// <param name="userId">**Id of user**. *Example: 2*. User id returned by verify call. (optional)</param>
/// <param name="operationIndex">Index associated with the operation.</param>
/// <returns>List&lt;Participant&gt;</returns>
List<Participant> ParticipantGet(int? userId = default(int?), int operationIndex = 0);
List<Participant> ParticipantsGet(int? userId = default(int?), int operationIndex = 0);
/// <summary>
/// gets a particular participant entry corresponding to user id
/// </summary>
@ -131,7 +131,7 @@ namespace BreCalClient.misc.Api
/// <param name="userId">**Id of user**. *Example: 2*. User id returned by verify call. (optional)</param>
/// <param name="operationIndex">Index associated with the operation.</param>
/// <returns>ApiResponse of List&lt;Participant&gt;</returns>
ApiResponse<List<Participant>> ParticipantGetWithHttpInfo(int? userId = default(int?), int operationIndex = 0);
ApiResponse<List<Participant>> ParticipantsGetWithHttpInfo(int? userId = default(int?), int operationIndex = 0);
/// <summary>
/// Gets a list of ship calls
/// </summary>
@ -371,7 +371,7 @@ namespace BreCalClient.misc.Api
/// <param name="operationIndex">Index associated with the operation.</param>
/// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
/// <returns>Task of List&lt;Participant&gt;</returns>
System.Threading.Tasks.Task<List<Participant>> ParticipantGetAsync(int? userId = default(int?), int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
System.Threading.Tasks.Task<List<Participant>> ParticipantsGetAsync(int? userId = default(int?), int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
/// <summary>
/// gets a particular participant entry corresponding to user id
/// </summary>
@ -383,7 +383,7 @@ namespace BreCalClient.misc.Api
/// <param name="operationIndex">Index associated with the operation.</param>
/// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
/// <returns>Task of ApiResponse (List&lt;Participant&gt;)</returns>
System.Threading.Tasks.Task<ApiResponse<List<Participant>>> ParticipantGetWithHttpInfoAsync(int? userId = default(int?), int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
System.Threading.Tasks.Task<ApiResponse<List<Participant>>> ParticipantsGetWithHttpInfoAsync(int? userId = default(int?), int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
/// <summary>
/// Gets a list of ship calls
/// </summary>
@ -1050,9 +1050,9 @@ namespace BreCalClient.misc.Api
/// <param name="userId">**Id of user**. *Example: 2*. User id returned by verify call. (optional)</param>
/// <param name="operationIndex">Index associated with the operation.</param>
/// <returns>List&lt;Participant&gt;</returns>
public List<Participant> ParticipantGet(int? userId = default(int?), int operationIndex = 0)
public List<Participant> ParticipantsGet(int? userId = default(int?), int operationIndex = 0)
{
BreCalClient.misc.Client.ApiResponse<List<Participant>> localVarResponse = ParticipantGetWithHttpInfo(userId);
BreCalClient.misc.Client.ApiResponse<List<Participant>> localVarResponse = ParticipantsGetWithHttpInfo(userId);
return localVarResponse.Data;
}
/// <summary>
@ -1062,7 +1062,7 @@ namespace BreCalClient.misc.Api
/// <param name="userId">**Id of user**. *Example: 2*. User id returned by verify call. (optional)</param>
/// <param name="operationIndex">Index associated with the operation.</param>
/// <returns>ApiResponse of List&lt;Participant&gt;</returns>
public BreCalClient.misc.Client.ApiResponse<List<Participant>> ParticipantGetWithHttpInfo(int? userId = default(int?), int operationIndex = 0)
public BreCalClient.misc.Client.ApiResponse<List<Participant>> ParticipantsGetWithHttpInfo(int? userId = default(int?), int operationIndex = 0)
{
BreCalClient.misc.Client.RequestOptions localVarRequestOptions = new BreCalClient.misc.Client.RequestOptions();
string[] _contentTypes = new string[] {
@ -1085,7 +1085,7 @@ namespace BreCalClient.misc.Api
{
localVarRequestOptions.QueryParameters.Add(BreCalClient.misc.Client.ClientUtils.ParameterToMultiMap("", "user_id", userId));
}
localVarRequestOptions.Operation = "DefaultApi.ParticipantGet";
localVarRequestOptions.Operation = "DefaultApi.ParticipantsGet";
localVarRequestOptions.OperationIndex = operationIndex;
// authentication (ApiKey) required
if (!string.IsNullOrEmpty(this.Configuration.GetApiKeyWithPrefix("Authorization")))
@ -1093,10 +1093,10 @@ namespace BreCalClient.misc.Api
localVarRequestOptions.HeaderParameters.Add("Authorization", this.Configuration.GetApiKeyWithPrefix("Authorization"));
}
// make the HTTP request
var localVarResponse = this.Client.Get<List<Participant>>("/participant", localVarRequestOptions, this.Configuration);
var localVarResponse = this.Client.Get<List<Participant>>("/participants", localVarRequestOptions, this.Configuration);
if (this.ExceptionFactory != null)
{
Exception _exception = this.ExceptionFactory("ParticipantGet", localVarResponse);
Exception _exception = this.ExceptionFactory("ParticipantsGet", localVarResponse);
if (_exception != null)
{
throw _exception;
@ -1112,9 +1112,9 @@ namespace BreCalClient.misc.Api
/// <param name="operationIndex">Index associated with the operation.</param>
/// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
/// <returns>Task of List&lt;Participant&gt;</returns>
public async System.Threading.Tasks.Task<List<Participant>> ParticipantGetAsync(int? userId = default(int?), int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
public async System.Threading.Tasks.Task<List<Participant>> ParticipantsGetAsync(int? userId = default(int?), int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
{
BreCalClient.misc.Client.ApiResponse<List<Participant>> localVarResponse = await ParticipantGetWithHttpInfoAsync(userId, operationIndex, cancellationToken).ConfigureAwait(false);
BreCalClient.misc.Client.ApiResponse<List<Participant>> localVarResponse = await ParticipantsGetWithHttpInfoAsync(userId, operationIndex, cancellationToken).ConfigureAwait(false);
return localVarResponse.Data;
}
/// <summary>
@ -1125,7 +1125,7 @@ namespace BreCalClient.misc.Api
/// <param name="operationIndex">Index associated with the operation.</param>
/// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
/// <returns>Task of ApiResponse (List&lt;Participant&gt;)</returns>
public async System.Threading.Tasks.Task<BreCalClient.misc.Client.ApiResponse<List<Participant>>> ParticipantGetWithHttpInfoAsync(int? userId = default(int?), int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
public async System.Threading.Tasks.Task<BreCalClient.misc.Client.ApiResponse<List<Participant>>> ParticipantsGetWithHttpInfoAsync(int? userId = default(int?), int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
{
BreCalClient.misc.Client.RequestOptions localVarRequestOptions = new BreCalClient.misc.Client.RequestOptions();
string[] _contentTypes = new string[] {
@ -1148,7 +1148,7 @@ namespace BreCalClient.misc.Api
{
localVarRequestOptions.QueryParameters.Add(BreCalClient.misc.Client.ClientUtils.ParameterToMultiMap("", "user_id", userId));
}
localVarRequestOptions.Operation = "DefaultApi.ParticipantGet";
localVarRequestOptions.Operation = "DefaultApi.ParticipantsGet";
localVarRequestOptions.OperationIndex = operationIndex;
// authentication (ApiKey) required
if (!string.IsNullOrEmpty(this.Configuration.GetApiKeyWithPrefix("Authorization")))
@ -1156,10 +1156,10 @@ namespace BreCalClient.misc.Api
localVarRequestOptions.HeaderParameters.Add("Authorization", this.Configuration.GetApiKeyWithPrefix("Authorization"));
}
// make the HTTP request
var localVarResponse = await this.AsynchronousClient.GetAsync<List<Participant>>("/participant", localVarRequestOptions, this.Configuration, cancellationToken).ConfigureAwait(false);
var localVarResponse = await this.AsynchronousClient.GetAsync<List<Participant>>("/participants", localVarRequestOptions, this.Configuration, cancellationToken).ConfigureAwait(false);
if (this.ExceptionFactory != null)
{
Exception _exception = this.ExceptionFactory("ParticipantGet", localVarResponse);
Exception _exception = this.ExceptionFactory("ParticipantsGet", localVarResponse);
if (_exception != null)
{
throw _exception;
@ -5534,15 +5534,17 @@ namespace BreCalClient.misc.Model
/// <param name="street">street.</param>
/// <param name="postalCode">postalCode.</param>
/// <param name="city">city.</param>
/// <param name="type">type.</param>
/// <param name="created">created.</param>
/// <param name="modified">modified.</param>
public Participant(int id = default(int), string name = default(string), string street = default(string), string postalCode = default(string), string city = default(string), DateTime created = default(DateTime), DateTime? modified = default(DateTime?))
public Participant(int id = default(int), string name = default(string), string street = default(string), string postalCode = default(string), string city = default(string), int type = default(int), DateTime created = default(DateTime), DateTime? modified = default(DateTime?))
{
this.Id = id;
this.Name = name;
this.Street = street;
this.PostalCode = postalCode;
this.City = city;
this.Type = type;
this.Created = created;
this.Modified = modified;
}
@ -5572,6 +5574,11 @@ namespace BreCalClient.misc.Model
[DataMember(Name = "city", EmitDefaultValue = true)]
public string City { get; set; }
/// <summary>
/// Gets or Sets Type
/// </summary>
[DataMember(Name = "type", EmitDefaultValue = true)]
public int Type { get; set; }
/// <summary>
/// Gets or Sets Created
/// </summary>
[DataMember(Name = "created", EmitDefaultValue = true)]
@ -5594,6 +5601,7 @@ namespace BreCalClient.misc.Model
sb.Append(" Street: ").Append(Street).Append("\n");
sb.Append(" PostalCode: ").Append(PostalCode).Append("\n");
sb.Append(" City: ").Append(City).Append("\n");
sb.Append(" Type: ").Append(Type).Append("\n");
sb.Append(" Created: ").Append(Created).Append("\n");
sb.Append(" Modified: ").Append(Modified).Append("\n");
sb.Append("}\n");
@ -5652,6 +5660,10 @@ namespace BreCalClient.misc.Model
(this.City != null &&
this.City.Equals(input.City))
) &&
(
this.Type == input.Type ||
this.Type.Equals(input.Type)
) &&
(
this.Created == input.Created ||
(this.Created != null &&
@ -5689,6 +5701,7 @@ namespace BreCalClient.misc.Model
{
hashCode = (hashCode * 59) + this.City.GetHashCode();
}
hashCode = (hashCode * 59) + this.Type.GetHashCode();
if (this.Created != null)
{
hashCode = (hashCode * 59) + this.Created.GetHashCode();

View File

@ -127,7 +127,7 @@ paths:
503:
$ref: '#/components/responses/503'
/participant:
/participants:
get:
summary: gets a particular participant entry corresponding to user id
parameters:
@ -146,6 +146,8 @@ paths:
$ref: '#/components/schemas/participant_list'
400:
$ref: '#/components/responses/400'
404:
$ref: '#/components/responses/404'
401:
$ref: '#/components/responses/401'
500:
@ -520,6 +522,8 @@ components:
type: string
city:
type: string
type:
type: integer
created:
type: string
format: date-time

View File

@ -8,9 +8,10 @@
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="Resources\StringResources.xaml"/>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Application.Resources>
</Application>

View File

@ -44,14 +44,44 @@
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="56" />
<RowDefinition Height="28" />
<RowDefinition Height="34" />
<RowDefinition Height="*" />
<RowDefinition Height="28" />
</Grid.RowDefinitions>
<local:SearchFilterControl Grid.Row="0" x:Name="searchFilterControl" />
<ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto">
<Grid Grid.Row="1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="60" />
<ColumnDefinition Width=".1*" />
<ColumnDefinition Width=".2*" />
<ColumnDefinition Width=".6*" />
</Grid.ColumnDefinitions>
<Label Content="{x:Static p:Resources.textSortOrder}" Grid.Column="1" />
<ComboBox x:Name="comboBoxSortOrder" Margin="2" Grid.Column="2" />
</Grid>
<Grid Grid.Row="2">
<Grid.ColumnDefinitions>
<ColumnDefinition Width=".1*" />
<ColumnDefinition Width=".15*" />
<ColumnDefinition Width=".15*" />
<ColumnDefinition Width=".15*" />
<ColumnDefinition Width=".15*" />
<ColumnDefinition Width=".15*" />
<ColumnDefinition Width=".15*" />
</Grid.ColumnDefinitions>
<Label Grid.Column="0" Background="#203864" Foreground="White" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" VerticalContentAlignment="Center" HorizontalContentAlignment="Center"></Label>
<Label Grid.Column="1" Background="#203864" Foreground="White" Content="Agent" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" VerticalContentAlignment="Center" HorizontalContentAlignment="Center"></Label>
<Label Grid.Column="2" Background="#203864" Foreground="White" Content="Festmacher" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" VerticalContentAlignment="Center" HorizontalContentAlignment="Center"></Label>
<Label Grid.Column="3" Background="#203864" Foreground="White" Content="Hafenamt" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" VerticalContentAlignment="Center" HorizontalContentAlignment="Center"></Label>
<Label Grid.Column="4" Background="#203864" Foreground="White" Content="Lotsen" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" VerticalContentAlignment="Center" HorizontalContentAlignment="Center"></Label>
<Label Grid.Column="5" Background="#203864" Foreground="White" Content="Schlepper" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" VerticalContentAlignment="Center" HorizontalContentAlignment="Center"></Label>
<Label Grid.Column="6" Background="#203864" Foreground="White" Content="Terminal" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" VerticalContentAlignment="Center" HorizontalContentAlignment="Center"></Label>
</Grid>
<ScrollViewer Grid.Row="3" VerticalScrollBarVisibility="Auto">
<StackPanel x:Name="stackPanel"/>
</ScrollViewer>
<StatusBar Grid.Row="2">
<StatusBar Grid.Row="4">
<StatusBar.ItemsPanel>
<ItemsPanelTemplate>
<Grid>

View File

@ -114,7 +114,7 @@ namespace BreCalClient
this._ships = await _api.ShipsGetAsync();
foreach(var ship in this._ships)
_shipLookupDict[ship.Id] = ship;
this._participants = await _api.ParticipantGetAsync();
this._participants = await _api.ParticipantsGetAsync();
List<Participant> agencies = new List<Participant>();
foreach (Participant participant in this._participants)
{
@ -155,11 +155,14 @@ namespace BreCalClient
scm.Shipcall = shipcall;
if (this._shipLookupDict.ContainsKey(shipcall.ShipId))
scm.Ship = this._shipLookupDict[shipcall.ShipId];
if (this._berthLookupDict.ContainsKey(shipcall.ArrivalBerthId ?? 0))
scm.Berth = this._berthLookupDict[shipcall.ArrivalBerthId ?? 0].Name1;
_controlModels.Add(scm);
this.Dispatcher.Invoke(new Action(() =>
{
ShipcallControl sc = new ShipcallControl();
sc.Height = 80;
sc.Height = 120;
sc.ShipcallControlModel = scm;
sc.TimesRequested += Sc_TimesRequested;
sc.EditRequested += Sc_EditRequested;

View File

@ -10,8 +10,8 @@
namespace BreCalClient.Resources {
using System;
/// <summary>
/// A strongly-typed resource class, for looking up localized strings, etc.
/// </summary>
@ -23,15 +23,15 @@ namespace BreCalClient.Resources {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
public class Resources {
private static global::System.Resources.ResourceManager resourceMan;
private static global::System.Globalization.CultureInfo resourceCulture;
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal Resources() {
}
/// <summary>
/// Returns the cached ResourceManager instance used by this class.
/// </summary>
@ -45,7 +45,7 @@ namespace BreCalClient.Resources {
return resourceMan;
}
}
/// <summary>
/// Overrides the current thread's CurrentUICulture property for all
/// resource lookups using this strongly typed resource class.
@ -59,27 +59,27 @@ namespace BreCalClient.Resources {
resourceCulture = value;
}
}
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
internal static byte[] arrow_down_green {
public static byte[] arrow_down_green {
get {
object obj = ResourceManager.GetObject("arrow_down_green", resourceCulture);
return ((byte[])(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
internal static byte[] arrow_down_red {
public static byte[] arrow_down_red {
get {
object obj = ResourceManager.GetObject("arrow_down_red", resourceCulture);
return ((byte[])(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
@ -89,7 +89,7 @@ namespace BreCalClient.Resources {
return ((byte[])(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
@ -99,27 +99,27 @@ namespace BreCalClient.Resources {
return ((byte[])(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
internal static byte[] arrow_up_red {
public static byte[] arrow_up_red {
get {
object obj = ResourceManager.GetObject("arrow_up_red", resourceCulture);
return ((byte[])(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
internal static byte[] clipboard {
public static byte[] clipboard {
get {
object obj = ResourceManager.GetObject("clipboard", resourceCulture);
return ((byte[])(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
@ -129,7 +129,7 @@ namespace BreCalClient.Resources {
return ((byte[])(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
@ -139,7 +139,7 @@ namespace BreCalClient.Resources {
return ((byte[])(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
@ -149,7 +149,7 @@ namespace BreCalClient.Resources {
return ((byte[])(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
@ -159,7 +159,7 @@ namespace BreCalClient.Resources {
return ((byte[])(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
@ -169,7 +169,7 @@ namespace BreCalClient.Resources {
return ((byte[])(obj));
}
}
/// <summary>
/// Looks up a localized string similar to Agencies.
/// </summary>
@ -178,7 +178,25 @@ namespace BreCalClient.Resources {
return ResourceManager.GetString("textAgencies", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Agency.
/// </summary>
public static string textAgency {
get {
return ResourceManager.GetString("textAgency", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Berth.
/// </summary>
public static string textBerth {
get {
return ResourceManager.GetString("textBerth", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Berths.
/// </summary>
@ -187,7 +205,16 @@ namespace BreCalClient.Resources {
return ResourceManager.GetString("textBerths", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Callsign.
/// </summary>
public static string textCallsign {
get {
return ResourceManager.GetString("textCallsign", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Categories.
/// </summary>
@ -196,7 +223,7 @@ namespace BreCalClient.Resources {
return ResourceManager.GetString("textCategories", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Enter keyword.
/// </summary>
@ -205,7 +232,7 @@ namespace BreCalClient.Resources {
return ResourceManager.GetString("textEnterKeyword", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Exit.
/// </summary>
@ -214,7 +241,7 @@ namespace BreCalClient.Resources {
return ResourceManager.GetString("textExit", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to from.
/// </summary>
@ -223,7 +250,7 @@ namespace BreCalClient.Resources {
return ResourceManager.GetString("textFrom", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Interval.
/// </summary>
@ -232,7 +259,16 @@ namespace BreCalClient.Resources {
return ResourceManager.GetString("textInterval", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to L/W.
/// </summary>
public static string textLengthWidth {
get {
return ResourceManager.GetString("textLengthWidth", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Login.
/// </summary>
@ -241,7 +277,7 @@ namespace BreCalClient.Resources {
return ResourceManager.GetString("textLogin", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Password.
/// </summary>
@ -250,7 +286,7 @@ namespace BreCalClient.Resources {
return ResourceManager.GetString("textPassword", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Search.
/// </summary>
@ -259,7 +295,7 @@ namespace BreCalClient.Resources {
return ResourceManager.GetString("textSearch", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Ship length.
/// </summary>
@ -268,7 +304,16 @@ namespace BreCalClient.Resources {
return ResourceManager.GetString("textShipLength", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Sort order.
/// </summary>
public static string textSortOrder {
get {
return ResourceManager.GetString("textSortOrder", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to to.
/// </summary>
@ -277,7 +322,7 @@ namespace BreCalClient.Resources {
return ResourceManager.GetString("textTo", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to User login.
/// </summary>
@ -286,7 +331,7 @@ namespace BreCalClient.Resources {
return ResourceManager.GetString("textUserlogin", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to User name.
/// </summary>
@ -295,7 +340,7 @@ namespace BreCalClient.Resources {
return ResourceManager.GetString("textUsername", resourceCulture);
}
}
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
@ -305,7 +350,7 @@ namespace BreCalClient.Resources {
return ((byte[])(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
@ -315,7 +360,7 @@ namespace BreCalClient.Resources {
return ((byte[])(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
@ -325,7 +370,7 @@ namespace BreCalClient.Resources {
return ((byte[])(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
@ -335,7 +380,7 @@ namespace BreCalClient.Resources {
return ((byte[])(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
@ -345,7 +390,7 @@ namespace BreCalClient.Resources {
return ((byte[])(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
@ -355,7 +400,7 @@ namespace BreCalClient.Resources {
return ((byte[])(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
@ -365,7 +410,7 @@ namespace BreCalClient.Resources {
return ((byte[])(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
@ -375,7 +420,7 @@ namespace BreCalClient.Resources {
return ((byte[])(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>

View File

@ -148,9 +148,18 @@
<data name="textAgencies" xml:space="preserve">
<value>Agenturen</value>
</data>
<data name="textAgency" xml:space="preserve">
<value>Agentur</value>
</data>
<data name="textBerth" xml:space="preserve">
<value>Liegeplatz</value>
</data>
<data name="textBerths" xml:space="preserve">
<value>Liegeplätze</value>
</data>
<data name="textCallsign" xml:space="preserve">
<value>Rufzeichen</value>
</data>
<data name="textCategories" xml:space="preserve">
<value>Kategorien</value>
</data>
@ -166,6 +175,9 @@
<data name="textInterval" xml:space="preserve">
<value>Zeitraum</value>
</data>
<data name="textLengthWidth" xml:space="preserve">
<value>L/B</value>
</data>
<data name="textLogin" xml:space="preserve">
<value>Anmelden</value>
</data>
@ -178,6 +190,9 @@
<data name="textShipLength" xml:space="preserve">
<value>Schiffslänge</value>
</data>
<data name="textSortOrder" xml:space="preserve">
<value>Sortierung</value>
</data>
<data name="textTo" xml:space="preserve">
<value>bis</value>
</data>

View File

@ -154,9 +154,18 @@
<data name="textAgencies" xml:space="preserve">
<value>Agencies</value>
</data>
<data name="textAgency" xml:space="preserve">
<value>Agency</value>
</data>
<data name="textBerth" xml:space="preserve">
<value>Berth</value>
</data>
<data name="textBerths" xml:space="preserve">
<value>Berths</value>
</data>
<data name="textCallsign" xml:space="preserve">
<value>Callsign</value>
</data>
<data name="textCategories" xml:space="preserve">
<value>Categories</value>
</data>
@ -172,6 +181,9 @@
<data name="textInterval" xml:space="preserve">
<value>Interval</value>
</data>
<data name="textLengthWidth" xml:space="preserve">
<value>L/W</value>
</data>
<data name="textLogin" xml:space="preserve">
<value>Login</value>
</data>
@ -184,6 +196,9 @@
<data name="textShipLength" xml:space="preserve">
<value>Ship length</value>
</data>
<data name="textSortOrder" xml:space="preserve">
<value>Sort order</value>
</data>
<data name="textTo" xml:space="preserve">
<value>to</value>
</data>

View File

@ -7,79 +7,89 @@
xmlns:p = "clr-namespace:BreCalClient.Resources"
xmlns:db="clr-namespace:BreCalClient;assembly=BreCalClient"
mc:Ignorable="d"
d:DesignHeight="100" d:DesignWidth="800" Loaded="UserControl_Loaded">
d:DesignHeight="120" d:DesignWidth="800" Loaded="UserControl_Loaded">
<Border BorderBrush="LightGray" Margin="1" BorderThickness="1">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height=".3*"/>
<RowDefinition Height=".3*"/>
<RowDefinition Height=".3*"/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width=".4*" />
<ColumnDefinition Width=".1*" />
<ColumnDefinition Width=".4*" />
<ColumnDefinition Width=".1*" />
<ColumnDefinition Width=".15*" />
<ColumnDefinition Width=".15*" />
<ColumnDefinition Width=".15*" />
<ColumnDefinition Width=".15*" />
<ColumnDefinition Width=".15*" />
<ColumnDefinition Width=".15*" />
</Grid.ColumnDefinitions>
<Viewbox Grid.Column="0" Grid.Row="0" Grid.RowSpan="2" HorizontalAlignment="Left">
<Border BorderThickness="1" BorderBrush="AliceBlue" >
<TextBlock x:Name="textBlockShipname" Text="{Binding Ship.Name}" Foreground="DarkBlue" />
</Border>
</Viewbox>
<Grid Grid.Row="2" Grid.Column="0">
<Grid.RowDefinitions>
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Grid Grid.Column="0" Grid.Row="0" >
<Grid.RowDefinitions>
<RowDefinition Height=".125*"/>
<RowDefinition Height=".125*"/>
<RowDefinition Height=".125*"/>
<RowDefinition Height=".125*"/>
<RowDefinition Height=".125*"/>
<RowDefinition Height=".05*"/>
<RowDefinition Height=".125*"/>
<RowDefinition Height=".125*"/>
<RowDefinition Height=".125*"/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width=".2*" />
<ColumnDefinition Width=".3*" />
<ColumnDefinition Width=".2*" />
<ColumnDefinition Width=".3*" />
<ColumnDefinition Width=".4*" />
<ColumnDefinition Width=".6*" />
</Grid.ColumnDefinitions>
<Viewbox HorizontalAlignment="Left" Margin="4,0,0,0">
<TextBlock Text="IMO:"/>
<Viewbox Grid.Row="0" Grid.Column="0" Stretch="Uniform" Grid.RowSpan="2" Grid.ColumnSpan="2" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
<TextBlock Text="{Binding Ship.Name}" Background="#203864" Foreground="White" />
</Viewbox>
<Viewbox Grid.Column="1" HorizontalAlignment="Left" Margin="4,0,0,0">
<Viewbox Grid.Row="2" Grid.Column="0">
<TextBlock Text="IMO" />
</Viewbox>
<Viewbox Grid.Row="2" Grid.Column="1">
<TextBlock Text="{Binding Ship.Imo}" />
</Viewbox>
<Viewbox Grid.Column="2" HorizontalAlignment="Left">
<TextBlock Text="Callsign:" />
<Viewbox Grid.Row="3" Grid.Column="0">
<TextBlock Text="{x:Static p:Resources.textCallsign}" />
</Viewbox>
<Viewbox Grid.Row="3" Grid.Column="1">
<TextBlock Text="{Binding Ship.Callsign}" />
</Viewbox>
<Viewbox Grid.Column="3" HorizontalAlignment="Left" Margin="4,0,0,0">
<TextBlock Text="{Binding Ship.Callsign}" />
<Viewbox Grid.Row="4" Grid.Column="0">
<TextBlock Text="{x:Static p:Resources.textLengthWidth}" />
</Viewbox>
<Viewbox Grid.Row="4" Grid.Column="1">
<TextBlock>
<TextBlock.Text>
<MultiBinding StringFormat="{}{0}m/{1}m">
<Binding Path="Ship.Length" />
<Binding Path="Ship.Width" />
</MultiBinding>
</TextBlock.Text>
</TextBlock>
</Viewbox>
<Viewbox Grid.Row="6" Grid.Column="0">
<TextBlock Text="ETA" />
</Viewbox>
<Viewbox Grid.Row="6" Grid.Column="1">
<TextBlock Text="{Binding Shipcall.Eta}" />
</Viewbox>
<Viewbox Grid.Row="7" Grid.Column="0">
<TextBlock Text="{x:Static p:Resources.textBerth}" />
</Viewbox>
<Viewbox Grid.Row="7" Grid.Column="1">
<TextBlock Text="{Binding Berth}" />
</Viewbox>
<Viewbox Grid.Row="8" Grid.Column="0">
<TextBlock Text="{x:Static p:Resources.textAgency}" />
</Viewbox>
<Viewbox Grid.Row="8" Grid.Column="1">
<TextBlock Text="{Binding Agency}" />
</Viewbox>
</Grid>
<Viewbox Grid.Column="1" Grid.Row="0">
<TextBlock Text="ETA:" />
</Viewbox>
<Viewbox Grid.Column="2" Grid.Row="0" HorizontalAlignment="Left">
<TextBlock Text="{Binding Shipcall.Eta}" />
</Viewbox>
<Viewbox Grid.Column="1" Grid.Row="1">
<TextBlock Text="ETD:" />
</Viewbox>
<Viewbox Grid.Column="2" Grid.Row="1" HorizontalAlignment="Left">
<TextBlock Text="{Binding Shipcall.Etd}" />
</Viewbox>
<Grid Grid.Row="2" Grid.Column="1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width=".4*" />
<ColumnDefinition Width=".4*" />
<ColumnDefinition Width=".2*" />
</Grid.ColumnDefinitions>
<Button x:Name="buttonListTimes" Click="buttonListTimes_Click" Grid.Column="0" Background="Transparent" ToolTip="List times" Margin="1" BorderThickness="0" HorizontalAlignment="Right">
<Image Source="./Resources/clock.png" />
</Button>
<Button x:Name="buttonEditShipcall" Click="buttonEditShipcall_Click" Grid.Column="1" Background="Transparent" ToolTip="Edit shipcall" Margin="1" BorderThickness="0" HorizontalAlignment="Left">
<Image Source="./Resources/clipboard.png" />
</Button>
<Button x:Name="buttonOpenDropDown" Click="buttonOpenDropDown_Click" Grid.Column="2" Background="Transparent" ToolTip="Show extra info" Margin="1" BorderThickness="0" HorizontalAlignment="Left">
<Image Source="./Resources/arrow_down_green.png" />
</Button>
</Grid>
<Viewbox Grid.Column="2" Grid.Row="3">
<TextBlock Text="" />
</Viewbox>
<Image Margin="2" Grid.Column="3" Grid.Row="0" Grid.RowSpan="3">
<!-- Image Margin="2" Grid.Column="3" Grid.Row="0" Grid.RowSpan="3">
<Image.Style>
<Style TargetType="Image">
<Setter Property="Source" Value="{Binding NotFolderImage}"/>
@ -105,7 +115,7 @@
</Style.Triggers>
</Style>
</Image.Style>
</Image>
</Image-->
</Grid>
</Border>
</UserControl>

View File

@ -37,6 +37,10 @@ namespace BreCalClient
public Shipcall? Shipcall { get; set; }
public Ship? Ship { get; set; }
public string? Agency { get; set; }
public string? Berth { get; set; }
public string Test { get { return "Gurkensalat"; } }
public TrafficLightMode LightMode

View File

@ -17,7 +17,7 @@ def GetParticipant(options):
pooledConnection = local_db.getPoolConnection()
commands = pydapper.using(pooledConnection)
if "user_id" in options and options["user_id"]:
data = commands.query("SELECT p.id as id, p.name as name, p.street as street, p.postal_code as postal_code, p.city as city, p.type as type, p.flags as flags, p.created as created, p.modified as modified FROM p INNER JOIN user u WHERE u.participant_id = p.id and u.id = ?userid?", model=model.Participant, param={"userid" : options["user_id"]})
data = commands.query("SELECT p.id as id, p.name as name, p.street as street, p.postal_code as postal_code, p.city as city, p.type as type, p.flags as flags, p.created as created, p.modified as modified FROM participant p INNER JOIN user u WHERE u.participant_id = p.id and u.id = ?userid?", model=model.Participant, param={"userid" : options["user_id"]})
else:
data = commands.query("SELECT p.id as id, p.name as name, p.street as street, p.postal_code as postal_code, p.city as city, p.type as type, p.flags as flags, p.created as created, p.modified as modified FROM participant p ORDER BY p.name", model=model.Participant)
pooledConnection.close()