diff --git a/misc/BreCalApi.cs b/misc/BreCalApi.cs index e9a90a7..7ca119f 100644 --- a/misc/BreCalApi.cs +++ b/misc/BreCalApi.cs @@ -1,7 +1,7 @@ //---------------------- // -// 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 // //---------------------- @@ -120,7 +120,7 @@ namespace BreCalClient.misc.Api /// **Id of user**. *Example: 2*. User id returned by verify call. (optional) /// Index associated with the operation. /// List<Participant> - List ParticipantGet(int? userId = default(int?), int operationIndex = 0); + List ParticipantsGet(int? userId = default(int?), int operationIndex = 0); /// /// gets a particular participant entry corresponding to user id /// @@ -131,7 +131,7 @@ namespace BreCalClient.misc.Api /// **Id of user**. *Example: 2*. User id returned by verify call. (optional) /// Index associated with the operation. /// ApiResponse of List<Participant> - ApiResponse> ParticipantGetWithHttpInfo(int? userId = default(int?), int operationIndex = 0); + ApiResponse> ParticipantsGetWithHttpInfo(int? userId = default(int?), int operationIndex = 0); /// /// Gets a list of ship calls /// @@ -371,7 +371,7 @@ namespace BreCalClient.misc.Api /// Index associated with the operation. /// Cancellation Token to cancel the request. /// Task of List<Participant> - System.Threading.Tasks.Task> ParticipantGetAsync(int? userId = default(int?), int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + System.Threading.Tasks.Task> ParticipantsGetAsync(int? userId = default(int?), int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); /// /// gets a particular participant entry corresponding to user id /// @@ -383,7 +383,7 @@ namespace BreCalClient.misc.Api /// Index associated with the operation. /// Cancellation Token to cancel the request. /// Task of ApiResponse (List<Participant>) - System.Threading.Tasks.Task>> ParticipantGetWithHttpInfoAsync(int? userId = default(int?), int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + System.Threading.Tasks.Task>> ParticipantsGetWithHttpInfoAsync(int? userId = default(int?), int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); /// /// Gets a list of ship calls /// @@ -1050,9 +1050,9 @@ namespace BreCalClient.misc.Api /// **Id of user**. *Example: 2*. User id returned by verify call. (optional) /// Index associated with the operation. /// List<Participant> - public List ParticipantGet(int? userId = default(int?), int operationIndex = 0) + public List ParticipantsGet(int? userId = default(int?), int operationIndex = 0) { - BreCalClient.misc.Client.ApiResponse> localVarResponse = ParticipantGetWithHttpInfo(userId); + BreCalClient.misc.Client.ApiResponse> localVarResponse = ParticipantsGetWithHttpInfo(userId); return localVarResponse.Data; } /// @@ -1062,7 +1062,7 @@ namespace BreCalClient.misc.Api /// **Id of user**. *Example: 2*. User id returned by verify call. (optional) /// Index associated with the operation. /// ApiResponse of List<Participant> - public BreCalClient.misc.Client.ApiResponse> ParticipantGetWithHttpInfo(int? userId = default(int?), int operationIndex = 0) + public BreCalClient.misc.Client.ApiResponse> 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>("/participant", localVarRequestOptions, this.Configuration); + var localVarResponse = this.Client.Get>("/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 /// Index associated with the operation. /// Cancellation Token to cancel the request. /// Task of List<Participant> - public async System.Threading.Tasks.Task> ParticipantGetAsync(int? userId = default(int?), int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + public async System.Threading.Tasks.Task> ParticipantsGetAsync(int? userId = default(int?), int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { - BreCalClient.misc.Client.ApiResponse> localVarResponse = await ParticipantGetWithHttpInfoAsync(userId, operationIndex, cancellationToken).ConfigureAwait(false); + BreCalClient.misc.Client.ApiResponse> localVarResponse = await ParticipantsGetWithHttpInfoAsync(userId, operationIndex, cancellationToken).ConfigureAwait(false); return localVarResponse.Data; } /// @@ -1125,7 +1125,7 @@ namespace BreCalClient.misc.Api /// Index associated with the operation. /// Cancellation Token to cancel the request. /// Task of ApiResponse (List<Participant>) - public async System.Threading.Tasks.Task>> ParticipantGetWithHttpInfoAsync(int? userId = default(int?), int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) + public async System.Threading.Tasks.Task>> 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>("/participant", localVarRequestOptions, this.Configuration, cancellationToken).ConfigureAwait(false); + var localVarResponse = await this.AsynchronousClient.GetAsync>("/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 /// street. /// postalCode. /// city. + /// type. /// created. /// modified. - 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; } /// + /// Gets or Sets Type + /// + [DataMember(Name = "type", EmitDefaultValue = true)] + public int Type { get; set; } + /// /// Gets or Sets Created /// [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(); diff --git a/misc/BreCalApi.yaml b/misc/BreCalApi.yaml index 7f2aa4c..0ac733a 100644 --- a/misc/BreCalApi.yaml +++ b/misc/BreCalApi.yaml @@ -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 diff --git a/src/BreCalClient/App.xaml b/src/BreCalClient/App.xaml index e6f282b..6702ce6 100644 --- a/src/BreCalClient/App.xaml +++ b/src/BreCalClient/App.xaml @@ -8,9 +8,10 @@ + - + diff --git a/src/BreCalClient/MainWindow.xaml b/src/BreCalClient/MainWindow.xaml index 9e1a5c2..6fe04e5 100644 --- a/src/BreCalClient/MainWindow.xaml +++ b/src/BreCalClient/MainWindow.xaml @@ -44,14 +44,44 @@ + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/src/BreCalClient/MainWindow.xaml.cs b/src/BreCalClient/MainWindow.xaml.cs index f7957bd..dd633e5 100644 --- a/src/BreCalClient/MainWindow.xaml.cs +++ b/src/BreCalClient/MainWindow.xaml.cs @@ -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 agencies = new List(); 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; diff --git a/src/BreCalClient/Resources/Resources.Designer.cs b/src/BreCalClient/Resources/Resources.Designer.cs index 253a440..5b11248 100644 --- a/src/BreCalClient/Resources/Resources.Designer.cs +++ b/src/BreCalClient/Resources/Resources.Designer.cs @@ -10,8 +10,8 @@ namespace BreCalClient.Resources { using System; - - + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -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() { } - + /// /// Returns the cached ResourceManager instance used by this class. /// @@ -45,7 +45,7 @@ namespace BreCalClient.Resources { return resourceMan; } } - + /// /// 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; } } - + /// /// Looks up a localized resource of type System.Byte[]. /// - internal static byte[] arrow_down_green { + public static byte[] arrow_down_green { get { object obj = ResourceManager.GetObject("arrow_down_green", resourceCulture); return ((byte[])(obj)); } } - + /// /// Looks up a localized resource of type System.Byte[]. /// - internal static byte[] arrow_down_red { + public static byte[] arrow_down_red { get { object obj = ResourceManager.GetObject("arrow_down_red", resourceCulture); return ((byte[])(obj)); } } - + /// /// Looks up a localized resource of type System.Byte[]. /// @@ -89,7 +89,7 @@ namespace BreCalClient.Resources { return ((byte[])(obj)); } } - + /// /// Looks up a localized resource of type System.Byte[]. /// @@ -99,27 +99,27 @@ namespace BreCalClient.Resources { return ((byte[])(obj)); } } - + /// /// Looks up a localized resource of type System.Byte[]. /// - internal static byte[] arrow_up_red { + public static byte[] arrow_up_red { get { object obj = ResourceManager.GetObject("arrow_up_red", resourceCulture); return ((byte[])(obj)); } } - + /// /// Looks up a localized resource of type System.Byte[]. /// - internal static byte[] clipboard { + public static byte[] clipboard { get { object obj = ResourceManager.GetObject("clipboard", resourceCulture); return ((byte[])(obj)); } } - + /// /// Looks up a localized resource of type System.Byte[]. /// @@ -129,7 +129,7 @@ namespace BreCalClient.Resources { return ((byte[])(obj)); } } - + /// /// Looks up a localized resource of type System.Byte[]. /// @@ -139,7 +139,7 @@ namespace BreCalClient.Resources { return ((byte[])(obj)); } } - + /// /// Looks up a localized resource of type System.Byte[]. /// @@ -149,7 +149,7 @@ namespace BreCalClient.Resources { return ((byte[])(obj)); } } - + /// /// Looks up a localized resource of type System.Byte[]. /// @@ -159,7 +159,7 @@ namespace BreCalClient.Resources { return ((byte[])(obj)); } } - + /// /// Looks up a localized resource of type System.Byte[]. /// @@ -169,7 +169,7 @@ namespace BreCalClient.Resources { return ((byte[])(obj)); } } - + /// /// Looks up a localized string similar to Agencies. /// @@ -178,7 +178,25 @@ namespace BreCalClient.Resources { return ResourceManager.GetString("textAgencies", resourceCulture); } } - + + /// + /// Looks up a localized string similar to Agency. + /// + public static string textAgency { + get { + return ResourceManager.GetString("textAgency", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Berth. + /// + public static string textBerth { + get { + return ResourceManager.GetString("textBerth", resourceCulture); + } + } + /// /// Looks up a localized string similar to Berths. /// @@ -187,7 +205,16 @@ namespace BreCalClient.Resources { return ResourceManager.GetString("textBerths", resourceCulture); } } - + + /// + /// Looks up a localized string similar to Callsign. + /// + public static string textCallsign { + get { + return ResourceManager.GetString("textCallsign", resourceCulture); + } + } + /// /// Looks up a localized string similar to Categories. /// @@ -196,7 +223,7 @@ namespace BreCalClient.Resources { return ResourceManager.GetString("textCategories", resourceCulture); } } - + /// /// Looks up a localized string similar to Enter keyword. /// @@ -205,7 +232,7 @@ namespace BreCalClient.Resources { return ResourceManager.GetString("textEnterKeyword", resourceCulture); } } - + /// /// Looks up a localized string similar to Exit. /// @@ -214,7 +241,7 @@ namespace BreCalClient.Resources { return ResourceManager.GetString("textExit", resourceCulture); } } - + /// /// Looks up a localized string similar to from. /// @@ -223,7 +250,7 @@ namespace BreCalClient.Resources { return ResourceManager.GetString("textFrom", resourceCulture); } } - + /// /// Looks up a localized string similar to Interval. /// @@ -232,7 +259,16 @@ namespace BreCalClient.Resources { return ResourceManager.GetString("textInterval", resourceCulture); } } - + + /// + /// Looks up a localized string similar to L/W. + /// + public static string textLengthWidth { + get { + return ResourceManager.GetString("textLengthWidth", resourceCulture); + } + } + /// /// Looks up a localized string similar to Login. /// @@ -241,7 +277,7 @@ namespace BreCalClient.Resources { return ResourceManager.GetString("textLogin", resourceCulture); } } - + /// /// Looks up a localized string similar to Password. /// @@ -250,7 +286,7 @@ namespace BreCalClient.Resources { return ResourceManager.GetString("textPassword", resourceCulture); } } - + /// /// Looks up a localized string similar to Search. /// @@ -259,7 +295,7 @@ namespace BreCalClient.Resources { return ResourceManager.GetString("textSearch", resourceCulture); } } - + /// /// Looks up a localized string similar to Ship length. /// @@ -268,7 +304,16 @@ namespace BreCalClient.Resources { return ResourceManager.GetString("textShipLength", resourceCulture); } } - + + /// + /// Looks up a localized string similar to Sort order. + /// + public static string textSortOrder { + get { + return ResourceManager.GetString("textSortOrder", resourceCulture); + } + } + /// /// Looks up a localized string similar to to. /// @@ -277,7 +322,7 @@ namespace BreCalClient.Resources { return ResourceManager.GetString("textTo", resourceCulture); } } - + /// /// Looks up a localized string similar to User login. /// @@ -286,7 +331,7 @@ namespace BreCalClient.Resources { return ResourceManager.GetString("textUserlogin", resourceCulture); } } - + /// /// Looks up a localized string similar to User name. /// @@ -295,7 +340,7 @@ namespace BreCalClient.Resources { return ResourceManager.GetString("textUsername", resourceCulture); } } - + /// /// Looks up a localized resource of type System.Byte[]. /// @@ -305,7 +350,7 @@ namespace BreCalClient.Resources { return ((byte[])(obj)); } } - + /// /// Looks up a localized resource of type System.Byte[]. /// @@ -315,7 +360,7 @@ namespace BreCalClient.Resources { return ((byte[])(obj)); } } - + /// /// Looks up a localized resource of type System.Byte[]. /// @@ -325,7 +370,7 @@ namespace BreCalClient.Resources { return ((byte[])(obj)); } } - + /// /// Looks up a localized resource of type System.Byte[]. /// @@ -335,7 +380,7 @@ namespace BreCalClient.Resources { return ((byte[])(obj)); } } - + /// /// Looks up a localized resource of type System.Byte[]. /// @@ -345,7 +390,7 @@ namespace BreCalClient.Resources { return ((byte[])(obj)); } } - + /// /// Looks up a localized resource of type System.Byte[]. /// @@ -355,7 +400,7 @@ namespace BreCalClient.Resources { return ((byte[])(obj)); } } - + /// /// Looks up a localized resource of type System.Byte[]. /// @@ -365,7 +410,7 @@ namespace BreCalClient.Resources { return ((byte[])(obj)); } } - + /// /// Looks up a localized resource of type System.Byte[]. /// @@ -375,7 +420,7 @@ namespace BreCalClient.Resources { return ((byte[])(obj)); } } - + /// /// Looks up a localized resource of type System.Byte[]. /// diff --git a/src/BreCalClient/Resources/Resources.de.resx b/src/BreCalClient/Resources/Resources.de.resx index 4a78ef7..a1f1af6 100644 --- a/src/BreCalClient/Resources/Resources.de.resx +++ b/src/BreCalClient/Resources/Resources.de.resx @@ -148,9 +148,18 @@ Agenturen + + Agentur + + + Liegeplatz + Liegeplätze + + Rufzeichen + Kategorien @@ -166,6 +175,9 @@ Zeitraum + + L/B + Anmelden @@ -178,6 +190,9 @@ Schiffslänge + + Sortierung + bis diff --git a/src/BreCalClient/Resources/Resources.resx b/src/BreCalClient/Resources/Resources.resx index ab3230b..b7875c9 100644 --- a/src/BreCalClient/Resources/Resources.resx +++ b/src/BreCalClient/Resources/Resources.resx @@ -154,9 +154,18 @@ Agencies + + Agency + + + Berth + Berths + + Callsign + Categories @@ -172,6 +181,9 @@ Interval + + L/W + Login @@ -184,6 +196,9 @@ Ship length + + Sort order + to diff --git a/src/BreCalClient/ShipcallControl.xaml b/src/BreCalClient/ShipcallControl.xaml index e2ca2b5..5f2c4a1 100644 --- a/src/BreCalClient/ShipcallControl.xaml +++ b/src/BreCalClient/ShipcallControl.xaml @@ -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"> - - - - - - - - + + + + + + - - - - - - - - + + + + + + + + + + + + + + + - - - - + + - - + + - + + + + - - + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + diff --git a/src/BreCalClient/ShipcallControlModel.cs b/src/BreCalClient/ShipcallControlModel.cs index 03524cf..6ff4d5e 100644 --- a/src/BreCalClient/ShipcallControlModel.cs +++ b/src/BreCalClient/ShipcallControlModel.cs @@ -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 diff --git a/src/server/BreCal/impl/participant.py b/src/server/BreCal/impl/participant.py index 4a9d094..e447b73 100644 --- a/src/server/BreCal/impl/participant.py +++ b/src/server/BreCal/impl/participant.py @@ -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()