dschick/git_brcal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

saving is possible (again), fixed the nested parameter

Browse Source
This commit is contained in:
Daniel Schick 2023-10-09 17:37:44 +02:00
parent dc30fe9c53
commit c1a2f78a14
10 changed files with 526 additions and 314 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

562
misc/BreCalApi.cs
View File

File diff suppressed because it is too large Load Diff

21
misc/BreCalApi.yaml
View File

@ -331,7 +331,18 @@ components:
type: integer type: integer
shipcallId: shipcallId:
description: The unique identifier of a ship call description: The unique identifier of a ship call
type: integer type: integer
participant_assignment:
description: Participant assigned to a shipcall with a given role (type)
type: object
required:
- participant_id
- type
properties:
participant_id:
type: integer
type:
type: integer
shipcall: shipcall:
type: object type: object
required: required:
@ -421,13 +432,7 @@ components:
participants: participants:
type: array type: array
items: items:
type: object $ref: "#/components/schemas/participant_assignment"
properties:
participant_id:
type: integer
type:
type: integer
example: [{ "participant_id" : 1, "type" : 1}, { "participant_id" : 5, "type": 2}, { "participant_id" : 7, "type" : 3} ]
created: created:
type: string type: string
format: date-time format: date-time

55
src/BreCalClient/EditShipcallControl.xaml.cs
View File

@ -145,16 +145,16 @@ namespace BreCalClient
if (this.ShipcallModel.Shipcall != null) if (this.ShipcallModel.Shipcall != null)
{ {
this.ShipcallModel.Shipcall.Type = (int)this.comboBoxCategories.SelectedItem; this.ShipcallModel.Shipcall.Type = (int)this.comboBoxCategories.SelectedItem;
this.ShipcallModel.Shipcall.Eta = this.datePickerETA.Value ?? DateTime.Now; this.ShipcallModel.Shipcall.Eta = this.datePickerETA.Value ?? DateTime.Now;
this.ShipcallModel.Shipcall.Etd = this.datePickerETD.Value ?? DateTime.Now.AddDays(1); this.ShipcallModel.Shipcall.Etd = this.datePickerETD.Value ?? DateTime.Now.AddDays(1);
this.ShipcallModel.Shipcall.ShipId = ((Ship)this.comboBoxShip.SelectedItem).Id; this.ShipcallModel.Shipcall.ShipId = ((Ship)this.comboBoxShip.SelectedItem).Id;
this.ShipcallModel.Ship = (Ship)this.comboBoxShip.SelectedItem; this.ShipcallModel.Ship = (Ship)this.comboBoxShip.SelectedItem;
this.ShipcallModel.Shipcall.ArrivalBerthId = (this.comboBoxArrivalBerth.SelectedItem != null) ? ((Berth)this.comboBoxArrivalBerth.SelectedItem).Id : null; this.ShipcallModel.Shipcall.ArrivalBerthId = (this.comboBoxArrivalBerth.SelectedItem != null) ? ((Berth)this.comboBoxArrivalBerth.SelectedItem).Id : null;
this.ShipcallModel.Shipcall.DepartureBerthId = (this.comboBoxDepartureBerth.SelectedItem != null) ? ((Berth)this.comboBoxDepartureBerth.SelectedItem).Id : null; this.ShipcallModel.Shipcall.DepartureBerthId = (this.comboBoxDepartureBerth.SelectedItem != null) ? ((Berth)this.comboBoxDepartureBerth.SelectedItem).Id : null;
// remove all and add selected participants // remove all and add selected participants
this.ShipcallModel.Shipcall.Participants.Clear(); this.ShipcallModel.Shipcall.Participants.Clear();
this.ShipcallModel.AssignedParticipants.Clear(); this.ShipcallModel.AssignedParticipants.Clear();
@ -163,23 +163,42 @@ namespace BreCalClient
participant = (Participant?)this.comboBoxAgency.SelectedItem; participant = (Participant?)this.comboBoxAgency.SelectedItem;
if (participant != null) if (participant != null)
{ {
this.ShipcallModel.Shipcall.Participants.Add(participant.Id); ParticipantAssignment pa = new()
this.ShipcallModel.AssignedParticipants[Extensions.ParticipantType.AGENCY] = participant; {
ParticipantId = participant.Id,
Type = (int)Extensions.ParticipantType.AGENCY
};
this.ShipcallModel.AssignedParticipants[Extensions.ParticipantType.AGENCY] = pa;
} }
// BSMD and port authority are always added // BSMD and port authority are always added
foreach (Participant p in BreCalLists.Participants)
// get port authority from berth
int? berthId = this.ShipcallModel.Shipcall.ArrivalBerthId;
if (berthId == null) berthId = this.ShipcallModel.Shipcall.DepartureBerthId;
if (berthId != null)
{ {
if (p.Type == (int)Extensions.ParticipantType.PORT_ADMINISTRATION) Berth? selectedBerth = BreCalLists.Berths.Find((x) => x.Id == berthId);
if (selectedBerth?.AuthorityId != null)
{ {
this.ShipcallModel.Shipcall.Participants.Add(p.Id); if (BreCalLists.ParticipantLookupDict.ContainsKey(selectedBerth.AuthorityId.Value))
this.ShipcallModel.AssignedParticipants[Extensions.ParticipantType.PORT_ADMINISTRATION] = p; {
ParticipantAssignment pab = new()
{
ParticipantId = selectedBerth.AuthorityId.Value,
Type = (int)Extensions.ParticipantType.PORT_ADMINISTRATION
};
this.ShipcallModel.AssignedParticipants[ParticipantType.PORT_ADMINISTRATION] = pab;
}
} }
if (p.Type == (int)Extensions.ParticipantType.BSMD)
ParticipantAssignment pa = new()
{ {
this.ShipcallModel.Shipcall.Participants.Add(p.Id); ParticipantId = App.Participant.Id,
this.ShipcallModel.AssignedParticipants[Extensions.ParticipantType.BSMD] = p; Type = (int)Extensions.ParticipantType.BSMD
} };
this.ShipcallModel.AssignedParticipants[Extensions.ParticipantType.BSMD] = pa;
} }
} }
} }
@ -200,9 +219,9 @@ namespace BreCalClient
if (this.ShipcallModel.Shipcall.Participants == null) this.ShipcallModel.Shipcall.Participants = new(); if (this.ShipcallModel.Shipcall.Participants == null) this.ShipcallModel.Shipcall.Participants = new();
foreach (int participant_id in this.ShipcallModel.Shipcall.Participants) foreach (ParticipantAssignment participantAssignment in this.ShipcallModel.Shipcall.Participants)
{ {
if (((List<Participant>)this.comboBoxAgency.ItemsSource).Any(x => x.Id == participant_id)) this.comboBoxAgency.SelectedValue = participant_id; if (((List<Participant>)this.comboBoxAgency.ItemsSource).Any(x => x.Id == participantAssignment.ParticipantId)) this.comboBoxAgency.SelectedValue = participantAssignment.ParticipantId;
} }
} }
} }

42
src/BreCalClient/EditTimesAgencyIncomingControl.xaml.cs
View File

@ -98,26 +98,42 @@ namespace BreCalClient
Participant? participant = (Participant?)this.comboBoxMooring.SelectedItem; Participant? participant = (Participant?)this.comboBoxMooring.SelectedItem;
if (participant != null) if (participant != null)
{ {
this.ShipcallModel.Shipcall.Participants.Add(participant.Id); ParticipantAssignment participantAssignment = new() {
this.ShipcallModel.AssignedParticipants[Extensions.ParticipantType.MOORING] = participant; ParticipantId = participant.Id,
Type = (int)Extensions.ParticipantType.MOORING
};
this.ShipcallModel.AssignedParticipants[Extensions.ParticipantType.MOORING] = participantAssignment;
} }
participant = (Participant?)this.comboBoxPilot.SelectedItem; participant = (Participant?)this.comboBoxPilot.SelectedItem;
if (participant != null) if (participant != null)
{ {
this.ShipcallModel.Shipcall.Participants.Add(participant.Id); ParticipantAssignment participantAssignment = new()
this.ShipcallModel.AssignedParticipants[Extensions.ParticipantType.PILOT] = participant; {
ParticipantId = participant.Id,
Type = (int)Extensions.ParticipantType.PILOT
};
this.ShipcallModel.AssignedParticipants[Extensions.ParticipantType.PILOT] = participantAssignment;
} }
participant = (Participant?)this.comboBoxTerminal.SelectedItem; participant = (Participant?)this.comboBoxTerminal.SelectedItem;
if (participant != null) if (participant != null)
{ {
this.ShipcallModel.Shipcall.Participants.Add(participant.Id); ParticipantAssignment participantAssignment = new()
this.ShipcallModel.AssignedParticipants[Extensions.ParticipantType.TERMINAL] = participant; {
ParticipantId = participant.Id,
Type = (int)Extensions.ParticipantType.TERMINAL
};
this.ShipcallModel.AssignedParticipants[Extensions.ParticipantType.TERMINAL] = participantAssignment;
} }
participant = (Participant?)this.comboBoxTug.SelectedItem; participant = (Participant?)this.comboBoxTug.SelectedItem;
if (participant != null) if (participant != null)
{ {
this.ShipcallModel.Shipcall.Participants.Add(participant.Id); ParticipantAssignment participantAssignment = new()
this.ShipcallModel.AssignedParticipants[Extensions.ParticipantType.TUG] = participant; {
ParticipantId = participant.Id,
Type = (int)Extensions.ParticipantType.TUG
};
this.ShipcallModel.AssignedParticipants[Extensions.ParticipantType.TUG] = participantAssignment;
} }
} }
} }
@ -168,12 +184,12 @@ namespace BreCalClient
if(!string.IsNullOrEmpty(this.Times.Remarks)) if(!string.IsNullOrEmpty(this.Times.Remarks))
this.textBoxRemarks.Text = this.Times.Remarks; this.textBoxRemarks.Text = this.Times.Remarks;
foreach (int participant_id in this.ShipcallModel.Shipcall.Participants) foreach (ParticipantAssignment participantAssignment in this.ShipcallModel.Shipcall.Participants)
{ {
if (((List<Participant>)this.comboBoxMooring.ItemsSource).Any(x => x.Id == participant_id)) this.comboBoxMooring.SelectedValue = participant_id; if (((List<Participant>)this.comboBoxMooring.ItemsSource).Any(x => x.Id == participantAssignment.ParticipantId)) this.comboBoxMooring.SelectedValue = participantAssignment.ParticipantId;
if (((List<Participant>)this.comboBoxPilot.ItemsSource).Any(x => x.Id == participant_id)) this.comboBoxPilot.SelectedValue = participant_id; if (((List<Participant>)this.comboBoxPilot.ItemsSource).Any(x => x.Id == participantAssignment.ParticipantId)) this.comboBoxPilot.SelectedValue = participantAssignment.ParticipantId;
if (((List<Participant>)this.comboBoxTerminal.ItemsSource).Any(x => x.Id == participant_id)) this.comboBoxTerminal.SelectedValue = participant_id; if (((List<Participant>)this.comboBoxTerminal.ItemsSource).Any(x => x.Id == participantAssignment.ParticipantId)) this.comboBoxTerminal.SelectedValue = participantAssignment.ParticipantId;
if (((List<Participant>)this.comboBoxTug.ItemsSource).Any(x => x.Id == participant_id)) this.comboBoxTug.SelectedValue = participant_id; if (((List<Participant>)this.comboBoxTug.ItemsSource).Any(x => x.Id == participantAssignment.ParticipantId)) this.comboBoxTug.SelectedValue = participantAssignment.ParticipantId;
} }
} }
} }

42
src/BreCalClient/EditTimesAgencyOutgoingControl.xaml.cs
View File

@ -93,26 +93,42 @@ namespace BreCalClient
Participant? participant = (Participant?)this.comboBoxMooring.SelectedItem; Participant? participant = (Participant?)this.comboBoxMooring.SelectedItem;
if (participant != null) if (participant != null)
{ {
this.ShipcallModel.Shipcall.Participants.Add(participant.Id); ParticipantAssignment participantAssignment = new()
this.ShipcallModel.AssignedParticipants[Extensions.ParticipantType.MOORING] = participant; {
ParticipantId = participant.Id,
Type = (int)Extensions.ParticipantType.MOORING
};
this.ShipcallModel.AssignedParticipants[Extensions.ParticipantType.MOORING] = participantAssignment;
} }
participant = (Participant?)this.comboBoxPilot.SelectedItem; participant = (Participant?)this.comboBoxPilot.SelectedItem;
if (participant != null) if (participant != null)
{ {
this.ShipcallModel.Shipcall.Participants.Add(participant.Id); ParticipantAssignment participantAssignment = new()
this.ShipcallModel.AssignedParticipants[Extensions.ParticipantType.PILOT] = participant; {
ParticipantId = participant.Id,
Type = (int)Extensions.ParticipantType.PILOT
};
this.ShipcallModel.AssignedParticipants[Extensions.ParticipantType.PILOT] = participantAssignment;
} }
participant = (Participant?)this.comboBoxTerminal.SelectedItem; participant = (Participant?)this.comboBoxTerminal.SelectedItem;
if (participant != null) if (participant != null)
{ {
this.ShipcallModel.Shipcall.Participants.Add(participant.Id); ParticipantAssignment participantAssignment = new()
this.ShipcallModel.AssignedParticipants[Extensions.ParticipantType.TERMINAL] = participant; {
ParticipantId = participant.Id,
Type = (int)Extensions.ParticipantType.TERMINAL
};
this.ShipcallModel.AssignedParticipants[Extensions.ParticipantType.TERMINAL] = participantAssignment;
} }
participant = (Participant?)this.comboBoxTug.SelectedItem; participant = (Participant?)this.comboBoxTug.SelectedItem;
if (participant != null) if (participant != null)
{ {
this.ShipcallModel.Shipcall.Participants.Add(participant.Id); ParticipantAssignment participantAssignment = new()
this.ShipcallModel.AssignedParticipants[Extensions.ParticipantType.TUG] = participant; {
ParticipantId = participant.Id,
Type = (int)Extensions.ParticipantType.TUG
};
this.ShipcallModel.AssignedParticipants[Extensions.ParticipantType.TUG] = participantAssignment;
} }
} }
} }
@ -158,12 +174,12 @@ namespace BreCalClient
if(!string.IsNullOrEmpty(this.Times.Remarks)) if(!string.IsNullOrEmpty(this.Times.Remarks))
this.textBoxRemarks.Text = this.Times.Remarks; this.textBoxRemarks.Text = this.Times.Remarks;
foreach (int participant_id in this.ShipcallModel.Shipcall.Participants) foreach (ParticipantAssignment participantAssignment in this.ShipcallModel.Shipcall.Participants)
{ {
if (((List<Participant>)this.comboBoxMooring.ItemsSource).Any(x => x.Id == participant_id)) this.comboBoxMooring.SelectedValue = participant_id; if (((List<Participant>)this.comboBoxMooring.ItemsSource).Any(x => x.Id == participantAssignment.ParticipantId)) this.comboBoxMooring.SelectedValue = participantAssignment.ParticipantId;
if (((List<Participant>)this.comboBoxPilot.ItemsSource).Any(x => x.Id == participant_id)) this.comboBoxPilot.SelectedValue = participant_id; if (((List<Participant>)this.comboBoxPilot.ItemsSource).Any(x => x.Id == participantAssignment.ParticipantId)) this.comboBoxPilot.SelectedValue = participantAssignment.ParticipantId;
if (((List<Participant>)this.comboBoxTerminal.ItemsSource).Any(x => x.Id == participant_id)) this.comboBoxTerminal.SelectedValue = participant_id; if (((List<Participant>)this.comboBoxTerminal.ItemsSource).Any(x => x.Id == participantAssignment.ParticipantId)) this.comboBoxTerminal.SelectedValue = participantAssignment.ParticipantId;
if (((List<Participant>)this.comboBoxTug.ItemsSource).Any(x => x.Id == participant_id)) this.comboBoxTug.SelectedValue = participant_id; if (((List<Participant>)this.comboBoxTug.ItemsSource).Any(x => x.Id == participantAssignment.ParticipantId)) this.comboBoxTug.SelectedValue = participantAssignment.ParticipantId;
} }
} }
} }

42
src/BreCalClient/EditTimesAgencyShiftingControl.xaml.cs
View File

@ -98,26 +98,42 @@ namespace BreCalClient
Participant? participant = (Participant?)this.comboBoxMooring.SelectedItem; Participant? participant = (Participant?)this.comboBoxMooring.SelectedItem;
if (participant != null) if (participant != null)
{ {
this.ShipcallModel.Shipcall.Participants.Add(participant.Id); ParticipantAssignment pa = new()
this.ShipcallModel.AssignedParticipants[Extensions.ParticipantType.MOORING] = participant; {
ParticipantId = participant.Id,
Type = (int)Extensions.ParticipantType.MOORING
};
this.ShipcallModel.AssignedParticipants[Extensions.ParticipantType.MOORING] = pa;
} }
participant = (Participant?)this.comboBoxPilot.SelectedItem; participant = (Participant?)this.comboBoxPilot.SelectedItem;
if (participant != null) if (participant != null)
{ {
this.ShipcallModel.Shipcall.Participants.Add(participant.Id); ParticipantAssignment pa = new()
this.ShipcallModel.AssignedParticipants[Extensions.ParticipantType.PILOT] = participant; {
ParticipantId = participant.Id,
Type = (int)Extensions.ParticipantType.PILOT
};
this.ShipcallModel.AssignedParticipants[Extensions.ParticipantType.PILOT] = pa;
} }
participant = (Participant?)this.comboBoxTerminal.SelectedItem; participant = (Participant?)this.comboBoxTerminal.SelectedItem;
if (participant != null) if (participant != null)
{ {
this.ShipcallModel.Shipcall.Participants.Add(participant.Id); ParticipantAssignment pa = new()
this.ShipcallModel.AssignedParticipants[Extensions.ParticipantType.TERMINAL] = participant; {
ParticipantId = participant.Id,
Type = (int)Extensions.ParticipantType.TERMINAL
};
this.ShipcallModel.AssignedParticipants[Extensions.ParticipantType.TERMINAL] = pa;
} }
participant = (Participant?)this.comboBoxTug.SelectedItem; participant = (Participant?)this.comboBoxTug.SelectedItem;
if (participant != null) if (participant != null)
{ {
this.ShipcallModel.Shipcall.Participants.Add(participant.Id); ParticipantAssignment pa = new()
this.ShipcallModel.AssignedParticipants[Extensions.ParticipantType.TUG] = participant; {
ParticipantId = participant.Id,
Type = (int)Extensions.ParticipantType.TUG
};
this.ShipcallModel.AssignedParticipants[Extensions.ParticipantType.TUG] = pa;
} }
} }
} }
@ -175,12 +191,12 @@ namespace BreCalClient
if(!string.IsNullOrEmpty(this.Times.Remarks)) if(!string.IsNullOrEmpty(this.Times.Remarks))
this.textBoxRemarks.Text = this.Times.Remarks; this.textBoxRemarks.Text = this.Times.Remarks;
foreach (int participant_id in this.ShipcallModel.Shipcall.Participants) foreach (ParticipantAssignment participantAssignment in this.ShipcallModel.Shipcall.Participants)
{ {
if (((List<Participant>)this.comboBoxMooring.ItemsSource).Any(x => x.Id == participant_id)) this.comboBoxMooring.SelectedValue = participant_id; if (((List<Participant>)this.comboBoxMooring.ItemsSource).Any(x => x.Id == participantAssignment.ParticipantId)) this.comboBoxMooring.SelectedValue = participantAssignment.ParticipantId;
if (((List<Participant>)this.comboBoxPilot.ItemsSource).Any(x => x.Id == participant_id)) this.comboBoxPilot.SelectedValue = participant_id; if (((List<Participant>)this.comboBoxPilot.ItemsSource).Any(x => x.Id == participantAssignment.ParticipantId)) this.comboBoxPilot.SelectedValue = participantAssignment.ParticipantId;
if (((List<Participant>)this.comboBoxTerminal.ItemsSource).Any(x => x.Id == participant_id)) this.comboBoxTerminal.SelectedValue = participant_id; if (((List<Participant>)this.comboBoxTerminal.ItemsSource).Any(x => x.Id == participantAssignment.ParticipantId)) this.comboBoxTerminal.SelectedValue = participantAssignment.ParticipantId;
if (((List<Participant>)this.comboBoxTug.ItemsSource).Any(x => x.Id == participant_id)) this.comboBoxTug.SelectedValue = participant_id; if (((List<Participant>)this.comboBoxTug.ItemsSource).Any(x => x.Id == participantAssignment.ParticipantId)) this.comboBoxTug.SelectedValue = participantAssignment.ParticipantId;
} }
} }
} }

13
src/BreCalClient/MainWindow.xaml.cs
View File

@ -172,6 +172,9 @@ namespace BreCalClient
{ {
this.UpdateUI(); this.UpdateUI();
esc.ShipcallModel.Shipcall?.Participants.Clear();
foreach (ParticipantAssignment pa in esc.ShipcallModel.AssignedParticipants.Values)
esc.ShipcallModel.Shipcall?.Participants.Add(pa);
this._api.ShipcallsPost(esc.ShipcallModel.Shipcall); // save new ship call this._api.ShipcallsPost(esc.ShipcallModel.Shipcall); // save new ship call
this.AddShipcall(esc.ShipcallModel); this.AddShipcall(esc.ShipcallModel);
@ -365,7 +368,7 @@ namespace BreCalClient
scm.Ship = BreCalLists.ShipLookupDict[shipcall.ShipId]; scm.Ship = BreCalLists.ShipLookupDict[shipcall.ShipId];
if (BreCalLists.BerthLookupDict.ContainsKey(shipcall.ArrivalBerthId ?? 0)) if (BreCalLists.BerthLookupDict.ContainsKey(shipcall.ArrivalBerthId ?? 0))
scm.Berth = BreCalLists.BerthLookupDict[shipcall.ArrivalBerthId ?? 0].Name; scm.Berth = BreCalLists.BerthLookupDict[shipcall.ArrivalBerthId ?? 0].Name;
scm.AssignParticipants(BreCalLists.Participants); scm.AssignParticipants();
this.Dispatcher.Invoke(() => this.Dispatcher.Invoke(() =>
{ {
@ -390,7 +393,7 @@ namespace BreCalClient
scm.Ship = BreCalLists.ShipLookupDict[shipcall.ShipId]; scm.Ship = BreCalLists.ShipLookupDict[shipcall.ShipId];
if (BreCalLists.BerthLookupDict.ContainsKey(shipcall.ArrivalBerthId ?? 0)) if (BreCalLists.BerthLookupDict.ContainsKey(shipcall.ArrivalBerthId ?? 0))
scm.Berth = BreCalLists.BerthLookupDict[shipcall.ArrivalBerthId ?? 0].Name; scm.Berth = BreCalLists.BerthLookupDict[shipcall.ArrivalBerthId ?? 0].Name;
scm.AssignParticipants(BreCalLists.Participants); scm.AssignParticipants();
} }
private void RemoveShipcall(int shipcallId) private void RemoveShipcall(int shipcallId)
@ -533,6 +536,9 @@ namespace BreCalClient
{ {
try try
{ {
obj.ShipcallControlModel.Shipcall?.Participants.Clear();
foreach(ParticipantAssignment pa in obj.ShipcallControlModel.AssignedParticipants.Values)
obj.ShipcallControlModel.Shipcall?.Participants.Add(pa);
await _api.ShipcallsPutAsync(obj.ShipcallControlModel.Shipcall); await _api.ShipcallsPutAsync(obj.ShipcallControlModel.Shipcall);
obj.RefreshData(); obj.RefreshData();
_refreshImmediately = true; _refreshImmediately = true;
@ -637,6 +643,9 @@ namespace BreCalClient
sc.ShipcallControlModel?.Times.Add(editControl.Times); sc.ShipcallControlModel?.Times.Add(editControl.Times);
} }
editControl.ShipcallModel.Shipcall?.Participants.Clear();
foreach (ParticipantAssignment pa in editControl.ShipcallModel.AssignedParticipants.Values)
editControl.ShipcallModel.Shipcall?.Participants.Add(pa);
await _api.ShipcallsPutAsync(editControl.ShipcallModel.Shipcall); await _api.ShipcallsPutAsync(editControl.ShipcallModel.Shipcall);
_refreshImmediately = true; _refreshImmediately = true;
_tokenSource.Cancel(); _tokenSource.Cancel();

26
src/BreCalClient/ShipcallControlModel.cs
View File

@ -47,7 +47,7 @@ namespace BreCalClient
public string? Berth { get; set; } public string? Berth { get; set; }
internal Dictionary<Extensions.ParticipantType, Participant> AssignedParticipants { get; } = new(); internal Dictionary<Extensions.ParticipantType, ParticipantAssignment> AssignedParticipants { get; } = new();
public List<Times> Times { get; set; } = new(); public List<Times> Times { get; set; } = new();
@ -79,22 +79,14 @@ namespace BreCalClient
#region public methods #region public methods
public void AssignParticipants(List<Participant> participants) public void AssignParticipants()
{ {
this.AssignedParticipants.Clear(); this.AssignedParticipants.Clear();
if (Shipcall != null) if (Shipcall != null)
{ {
foreach (int participantId in Shipcall.Participants) foreach (ParticipantAssignment participantAssignment in Shipcall.Participants)
{ {
Participant? participant = participants.Find((x) => x.Id == participantId); AssignedParticipants[(Extensions.ParticipantType)participantAssignment.Type] = participantAssignment;
if (participant != null)
{
foreach(Extensions.ParticipantType participantType in Enum.GetValues(typeof(Extensions.ParticipantType)))
{
if(participant.IsTypeFlagSet(participantType))
AssignedParticipants[participantType] = participant;
}
}
} }
} }
} }
@ -103,7 +95,7 @@ namespace BreCalClient
{ {
if (AssignedParticipants.ContainsKey(type)) { if (AssignedParticipants.ContainsKey(type)) {
int participantId = AssignedParticipants[type].Id; int participantId = AssignedParticipants[type].ParticipantId;
foreach (Times times in this.Times) foreach (Times times in this.Times)
{ {
if ((times.ParticipantId == participantId) && (times.ParticipantType == (int) type)) if ((times.ParticipantId == participantId) && (times.ParticipantType == (int) type))
@ -145,11 +137,9 @@ namespace BreCalClient
internal Participant? GetParticipantForType(Extensions.ParticipantType participantType) internal Participant? GetParticipantForType(Extensions.ParticipantType participantType)
{ {
foreach(Participant p in AssignedParticipants.Values) if(AssignedParticipants.ContainsKey(participantType) && BreCalLists.ParticipantLookupDict.ContainsKey(AssignedParticipants[participantType].ParticipantId))
{ return BreCalLists.ParticipantLookupDict[AssignedParticipants[participantType].ParticipantId];
if (p.IsTypeFlagSet(participantType))
return p;
}
return null; return null;
} }

26
src/server/BreCal/impl/shipcalls.py
View File

@ -25,7 +25,8 @@ def GetShipcalls(options):
participant_query = "SELECT participant_id, type FROM shipcall_participant_map WHERE shipcall_id=?shipcall_id?"; participant_query = "SELECT participant_id, type FROM shipcall_participant_map WHERE shipcall_id=?shipcall_id?";
for record in commands.query(participant_query, model=dict, param={"shipcall_id" : shipcall.id}, buffered=False): for record in commands.query(participant_query, model=dict, param={"shipcall_id" : shipcall.id}, buffered=False):
# model.Participant_Assignment = model.Participant_Assignment() # model.Participant_Assignment = model.Participant_Assignment()
shipcall.participants.append(record["participant_id"]) pa = model.Participant_Assignment(record["participant_id"], record["type"])
shipcall.participants.append(pa)
pooledConnection.close() pooledConnection.close()
@ -93,11 +94,9 @@ def PostShipcalls(schemaModel):
new_id = commands.execute_scalar("select last_insert_id()") new_id = commands.execute_scalar("select last_insert_id()")
# add participant assignments # add participant assignments
# TODO: make sure there are not two participants of the same type pquery = "INSERT INTO shipcall_participant_map (shipcall_id, participant_id, type) VALUES (?shipcall_id?, ?participant_id?, ?type?)"
for participant_assignment in schemaModel["participants"]:
pquery = "INSERT INTO shipcall_participant_map (shipcall_id, participant_id) VALUES (?shipcall_id?, ?participant_id?)" commands.execute(pquery, param={"shipcall_id" : new_id, "participant_id" : participant_assignment["participant_id"], "type" : participant_assignment["type"]})
for participant_id in schemaModel["participants"]:
commands.execute(pquery, param={"shipcall_id" : new_id, "participant_id" : participant_id})
pooledConnection.close() pooledConnection.close()
@ -154,27 +153,26 @@ def PutShipcalls(schemaModel):
query += "WHERE id = ?id?" query += "WHERE id = ?id?"
affected_rows = commands.execute(query, param=schemaModel) affected_rows = commands.execute(query, param=schemaModel)
pquery = "SELECT id, participant_id FROM shipcall_participant_map where shipcall_id = ?id?" pquery = "SELECT id, participant_id, type FROM shipcall_participant_map where shipcall_id = ?id?"
pdata = commands.query(pquery,param={"id" : schemaModel["id"]}) # existing list of assignments pdata = commands.query(pquery,param={"id" : schemaModel["id"]}) # existing list of assignments
# loop across passed participant ids, creating entries for those not present in pdata # loop across passed participant ids, creating entries for those not present in pdata
# TODO: make sure there are not two participants of the same type
for participant_id in schemaModel["participants"]: for participant_assignment in schemaModel["participants"]:
found_participant = False found_participant = False
for elem in pdata: for elem in pdata:
if elem["participant_id"] == participant_id: if elem["participant_id"] == participant_assignment["participant_id"] and elem["type"] == participant_assignment["type"]:
found_participant = True found_participant = True
break break
if not found_participant: if not found_participant:
nquery = "INSERT INTO shipcall_participant_map (shipcall_id, participant_id) VALUES (?shipcall_id?, ?participant_id?)" nquery = "INSERT INTO shipcall_participant_map (shipcall_id, participant_id, type) VALUES (?shipcall_id?, ?participant_id?, ?type?)"
commands.execute(nquery, param={"shipcall_id" : schemaModel["id"], "participant_id" : participant_id}) commands.execute(nquery, param={"shipcall_id" : schemaModel["id"], "participant_id" : participant_assignment["participant_id"], "type" : participant_assignment["type"]})
# loop across existing pdata entries, deleting those not present in participant list # loop across existing pdata entries, deleting those not present in participant list
for elem in pdata: for elem in pdata:
found_participant = False found_participant = False
for participant_id in schemaModel["participants"]: for participant_assignment in schemaModel["participants"]:
if(participant_id == elem["participant_id"]): if(participant_assignment["participant_id"] == elem["participant_id"] and participant_assignment["type"] == elem["type"]):
found_participant = True found_participant = True
break; break;
if not found_participant: if not found_participant:

11
src/server/BreCal/schemas/model.py
View File

@ -59,6 +59,10 @@ class Participant(Schema):
class ParticipantList(Participant): class ParticipantList(Participant):
pass pass
class ParticipantAssignmentSchema(Schema):
participant_id = fields.Int()
type = fields.Int()
class ShipcallSchema(Schema): class ShipcallSchema(Schema):
def __init__(self): def __init__(self):
super().__init__(unknown=None) super().__init__(unknown=None)
@ -89,12 +93,17 @@ class ShipcallSchema(Schema):
canceled = fields.Bool(Required = False, allow_none=True) canceled = fields.Bool(Required = False, allow_none=True)
evaluation = fields.Int(Required = False, allow_none=True) evaluation = fields.Int(Required = False, allow_none=True)
evaluation_message = fields.Str(Required = False, allow_none=True) evaluation_message = fields.Str(Required = False, allow_none=True)
participants = fields.List(fields.Int) participants = fields.List(fields.Nested(ParticipantAssignmentSchema))
created = fields.DateTime(Required = False, allow_none=True) created = fields.DateTime(Required = False, allow_none=True)
modified = fields.DateTime(Required = False, allow_none=True) modified = fields.DateTime(Required = False, allow_none=True)
@dataclass @dataclass
class Participant_Assignment: class Participant_Assignment:
def __init__(self, participant_id, type):
self.participant_id = participant_id
self.type = type
pass
participant_id: int participant_id: int
type: int type: int