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

Korrekturen nach Feedback 7.13.0.1

Browse Source
This commit is contained in:
Daniel Schick 2023-08-02 09:10:13 +02:00
parent d596f1f7fb
commit c1b7bce386
13 changed files with 45 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ENI2/App.config
View File

@ -26,17 +26,20 @@
<value>1000</value> <value>1000</value>
</setting> </setting>
<setting name="LockingServerAddress" serializeAs="String"> <setting name="LockingServerAddress" serializeAs="String">
<value>http://192.168.2.24/LockingService/LockingService.svc</value> <value>http://192.168.2.24/LockingService/LockingService.svc</value>
</setting>
<setting name="ReportAuthor" serializeAs="String">
<value>BSMD ReportGenerator</value>
</setting> </setting>
<setting name="ConnectionString" serializeAs="String"> <setting name="ConnectionString" serializeAs="String">
<value>Initial Catalog=nswtest;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false</value> <value>Initial Catalog=nswtest;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false</value>
</setting> </setting>
</ENI2.Properties.Settings> </ENI2.Properties.Settings>
</applicationSettings> </applicationSettings>
<userSettings> <userSettings>
<ENI2.Properties.Settings> <ENI2.Properties.Settings>
<setting name="MainWindowPlacement" serializeAs="String"> <setting name="MainWindowPlacement" serializeAs="String">
<value/> <value />
</setting> </setting>
</ENI2.Properties.Settings> </ENI2.Properties.Settings>
</userSettings> </userSettings>

4
ENI2/Controls/ServerStatusControl.xaml
View File

@ -16,12 +16,8 @@
<RowDefinition Height="*" /> <RowDefinition Height="*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<StackPanel Grid.Row="0" Orientation="Horizontal"> <StackPanel Grid.Row="0" Orientation="Horizontal">
<Label Content="Excel:" />
<Label Name="labelStatusExcel" Content="?" FontWeight="Bold" />
<Label Content="Transmitter:" /> <Label Content="Transmitter:" />
<Label Name="labelStatusTransmitter" Content="?" FontWeight="Bold" /> <Label Name="labelStatusTransmitter" Content="?" FontWeight="Bold" />
<Label Content="Report:" />
<Label Name="labelStatusReport" Content="?" FontWeight="Bold" />
<Button Name="refreshButton" Content="{x:Static p:Resources.textRefresh}" Margin="4" Background="Transparent" Click="refreshButton_Click"/> <Button Name="refreshButton" Content="{x:Static p:Resources.textRefresh}" Margin="4" Background="Transparent" Click="refreshButton_Click"/>
</StackPanel> </StackPanel>
<local:ENIDataGrid Grid.Row="1" <local:ENIDataGrid Grid.Row="1"

26
ENI2/Controls/ServerStatusControl.xaml.cs
View File

@ -28,17 +28,17 @@ namespace ENI2.Controls
private ProgressBar _updateProgressBar; private ProgressBar _updateProgressBar;
private TextBlock _updateTextBlock; private TextBlock _updateTextBlock;
private bool _isUpdating = false; private bool _isUpdating = false;
private readonly static Dictionary<Guid, string> coreIdVisitIdMap = new Dictionary<Guid, string>();
public ServerStatusControl() public ServerStatusControl()
{ {
InitializeComponent(); InitializeComponent();
this.dataGridStatus.ItemsSource = this.entries; this.dataGridStatus.ItemsSource = this.entries;
this.Loaded += ServerStatusControl_Loaded; this.Loaded += ServerStatusControl_Loaded;
} }
private void ServerStatusControl_Loaded(object sender, System.Windows.RoutedEventArgs e) private void ServerStatusControl_Loaded(object sender, System.Windows.RoutedEventArgs e)
{ {
this.refreshButton_Click(null, null); this.refreshButton_Click(null, null);
} }
@ -106,12 +106,6 @@ namespace ENI2.Controls
{ {
// Enumeration parsen und text ausgeben // Enumeration parsen und text ausgeben
ServiceControllerStatus excel = (ServiceControllerStatus)serverStatus.Excel;
this.labelStatusExcel.Content = excel.ToString();
ServiceControllerStatus report = (ServiceControllerStatus)serverStatus.Report;
this.labelStatusReport.Content = report.ToString();
ServiceControllerStatus transmitter = (ServiceControllerStatus)serverStatus.Transmitter; ServiceControllerStatus transmitter = (ServiceControllerStatus)serverStatus.Transmitter;
this.labelStatusTransmitter.Content = transmitter.ToString(); this.labelStatusTransmitter.Content = transmitter.ToString();
@ -152,15 +146,23 @@ namespace ENI2.Controls
string guidString = m.Groups[2].Value; string guidString = m.Groups[2].Value;
string idString = "";
if (!guidIdDict.ContainsKey(guidString)) if (!guidIdDict.ContainsKey(guidString))
{ {
string idString = "";
if (Guid.TryParse(m.Groups[2].Value, out Guid coreId)) if (Guid.TryParse(m.Groups[2].Value, out Guid coreId))
{ {
MessageCore aCore = DBManager.Instance.GetMessageCoreById(coreId); if (!coreIdVisitIdMap.ContainsKey(coreId))
if (aCore != null)
{ {
idString = aCore.DisplayId; MessageCore aCore = DBManager.Instance.GetMessageCoreById(coreId);
if (aCore != null)
{
coreIdVisitIdMap[coreId] = aCore.DisplayId;
idString = aCore.DisplayId;
}
}
else
{
idString = coreIdVisitIdMap[coreId];
} }
} }
guidIdDict[guidString] = idString; guidIdDict[guidString] = idString;

11
ENI2/DetailViewControls/PortNotificationDetailControl.xaml
View File

@ -66,10 +66,10 @@
<Label HorizontalContentAlignment="Right" Grid.Row="4" Grid.Column="0" Content="{x:Static p:Resources.textSternThrusterPower}" Name="label_INFOSternThrusterPower" VerticalContentAlignment="Center" Margin="0,0,10,0"/> <Label HorizontalContentAlignment="Right" Grid.Row="4" Grid.Column="0" Content="{x:Static p:Resources.textSternThrusterPower}" Name="label_INFOSternThrusterPower" VerticalContentAlignment="Center" Margin="0,0,10,0"/>
<Label HorizontalContentAlignment="Right" Grid.Row="5" Grid.Column="0" Content="{x:Static p:Resources.textFumigatedBulkCargo}" Name="label_INFOFumigatedBulkCargo" VerticalContentAlignment="Center" Margin="0,0,10,0"/> <Label HorizontalContentAlignment="Right" Grid.Row="5" Grid.Column="0" Content="{x:Static p:Resources.textFumigatedBulkCargo}" Name="label_INFOFumigatedBulkCargo" VerticalContentAlignment="Center" Margin="0,0,10,0"/>
<Label HorizontalContentAlignment="Right" Grid.Row="6" Grid.Column="0" Content="{x:Static p:Resources.textDeplacementSummerDraught}" Name="label_INFODeplacementSummerDraught" VerticalContentAlignment="Center" Margin="0,0,10,0"/> <Label HorizontalContentAlignment="Right" Grid.Row="6" Grid.Column="0" Content="{x:Static p:Resources.textDeplacementSummerDraught}" Name="label_INFODeplacementSummerDraught" VerticalContentAlignment="Center" Margin="0,0,10,0"/>
<Label HorizontalContentAlignment="Right" Grid.Row="2" Grid.Column="2" Content="{x:Static p:Resources.textSpecialRequirementsOfShipAtBerth}" Name="label_INFOSpecialRequirements" VerticalContentAlignment="Center" Margin="0,0,10,0"/> <Label HorizontalContentAlignment="Right" Grid.Row="4" Grid.Column="2" Content="{x:Static p:Resources.textSpecialRequirementsOfShipAtBerth}" Name="label_INFOSpecialRequirements" VerticalContentAlignment="Center" Margin="0,0,10,0"/>
<Label HorizontalContentAlignment="Right" Grid.Row="4" Grid.Column="2" Content="{x:Static p:Resources.textConstructionCharacteristics}" Name="label_INFOConstructionCharacteristics" VerticalContentAlignment="Center" Margin="0,0,10,0"/> <Label HorizontalContentAlignment="Right" Grid.Row="6" Grid.Column="2" Content="{x:Static p:Resources.textConstructionCharacteristics}" Name="label_INFOConstructionCharacteristics" VerticalContentAlignment="Center" Margin="0,0,10,0"/>
<ComboBox Grid.Row="0" Grid.Column="1" x:Name="comboBoxShippingArea" Margin="2" SelectedIndex="{Binding ShippingArea, Converter={util:ByteConverter}}" ContextMenu="{DynamicResource ClearContextMenu}" /> <ComboBox Grid.Row="0" Grid.Column="1" x:Name="comboBoxShippingArea" Margin="2" SelectedIndex="{Binding ShippingArea, Converter={util:ByteConverter}}" ContextMenu="{DynamicResource ClearContextMenu}" />
<ComboBox Grid.Row="0" Grid.Column="3" x:Name="comboBoxGroup" Margin="0,2,4,2" ItemsSource="{StaticResource arrList}" DisplayMemberPath="Key" SelectedValuePath="Value" SelectionChanged="comboBoxGroup_SelectionChanged"/> <ComboBox Grid.Row="0" Grid.Column="3" x:Name="comboBoxGroup" Margin="2,2,4,2" ItemsSource="{StaticResource arrList}" DisplayMemberPath="Key" SelectedValuePath="Value" SelectionChanged="comboBoxGroup_SelectionChanged"/>
<ComboBox Grid.Row="1" Grid.Column="1" Name="comboBoxPortArea" Margin="2" SelectedValue="{Binding PortArea}" SelectedValuePath="Key" DisplayMemberPath="Value" ContextMenu="{DynamicResource ClearContextMenu}" /> <ComboBox Grid.Row="1" Grid.Column="1" Name="comboBoxPortArea" Margin="2" SelectedValue="{Binding PortArea}" SelectedValuePath="Key" DisplayMemberPath="Value" ContextMenu="{DynamicResource ClearContextMenu}" />
<Grid Grid.Row="1" Grid.Column="3"> <Grid Grid.Row="1" Grid.Column="3">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
@ -88,8 +88,9 @@
<TextBox Grid.Row="4" Grid.Column="1" Name="textSternThrusterPower" Margin="2" Text="{Binding SternThrusterPower, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/> <TextBox Grid.Row="4" Grid.Column="1" Name="textSternThrusterPower" Margin="2" Text="{Binding SternThrusterPower, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/>
<CheckBox Grid.Row="5" Grid.Column="1" Name="checkBoxFumigatedBulkCargo" VerticalContentAlignment="Center" IsChecked="{Binding FumigatedBulkCargoBool, Mode=TwoWay}" Margin="2"/> <CheckBox Grid.Row="5" Grid.Column="1" Name="checkBoxFumigatedBulkCargo" VerticalContentAlignment="Center" IsChecked="{Binding FumigatedBulkCargoBool, Mode=TwoWay}" Margin="2"/>
<xctk:DoubleUpDown Grid.Row="6" Grid.Column="1" Name="doubleUpDownDisplacementSummerDraught" ShowButtonSpinner="False" ParsingNumberStyle="Any" Value="{Binding DeplacementSummerDraught_TNE}" Margin="4,2,0,2" FormatString="N1" TextAlignment="Left"/> <xctk:DoubleUpDown Grid.Row="6" Grid.Column="1" Name="doubleUpDownDisplacementSummerDraught" ShowButtonSpinner="False" ParsingNumberStyle="Any" Value="{Binding DeplacementSummerDraught_TNE}" Margin="4,2,0,2" FormatString="N1" TextAlignment="Left"/>
<TextBox Grid.Row="2" Grid.Column="3" Grid.RowSpan="2" Name="textSpecialRequirements" Margin="2" Text="{Binding SpecialRequirementsOfShipAtBerth, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/> <TextBlock Grid.Row="2" Grid.Column="3" Grid.RowSpan="2" Name="textBlockPortAreaRemarks" Text="-" TextWrapping="WrapWithOverflow" Height="52" VerticalAlignment="Center" Margin="2" />
<TextBox Grid.Row="4" Grid.Column="3" Grid.RowSpan="2" Name="textConstructionCharacteristics" Margin="2" Text="{Binding ConstructionCharacteristicsOfShip, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/> <TextBox Grid.Row="4" Grid.Column="3" Grid.RowSpan="2" Name="textSpecialRequirements" Margin="2" Text="{Binding SpecialRequirementsOfShipAtBerth, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Top" />
<TextBox Grid.Row="6" Grid.Column="3" Grid.RowSpan="1" Name="textConstructionCharacteristics" Margin="2" Text="{Binding ConstructionCharacteristicsOfShip, Converter={util:TrimStringConverter}}" VerticalContentAlignment="Center"/>
</Grid> </Grid>
</GroupBox> </GroupBox>
<GroupBox Name="servGroupBox" Header="{x:Static p:Resources.textServ}" Grid.Row="2"> <GroupBox Name="servGroupBox" Header="{x:Static p:Resources.textServ}" Grid.Row="2">

3
ENI2/DetailViewControls/PortNotificationDetailControl.xaml.cs
View File

@ -490,7 +490,8 @@ namespace ENI2.DetailViewControls
if (this.comboBoxPortAreaHelper.SelectedItem != null) if (this.comboBoxPortAreaHelper.SelectedItem != null)
{ {
PortAreaInfo pai = this.comboBoxPortAreaHelper.SelectedItem as PortAreaInfo; PortAreaInfo pai = this.comboBoxPortAreaHelper.SelectedItem as PortAreaInfo;
this.comboBoxPortAreaHelper.ToolTip = $"{pai.Remark} Ships: {pai.Ships} Agentur: {pai.Agency} Liegeplatz: {pai.Berth}"; // this.comboBoxPortAreaHelper.ToolTip = $"{pai.Remark} Ships: {pai.Ships} Agentur: {pai.Agency} Liegeplatz: {pai.Berth}";
this.textBlockPortAreaRemarks.Text = $"Ag:{pai.Agency} Ship:{pai.Ships} :{pai.Remark}";
} }
} }

2
ENI2/ENI2.csproj
View File

@ -36,7 +36,7 @@
<MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion> <MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
<CreateWebPageOnPublish>true</CreateWebPageOnPublish> <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
<WebPage>publish.html</WebPage> <WebPage>publish.html</WebPage>
<ApplicationRevision>0</ApplicationRevision> <ApplicationRevision>2</ApplicationRevision>
<ApplicationVersion>7.13.0.%2a</ApplicationVersion> <ApplicationVersion>7.13.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust> <UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut> <CreateDesktopShortcut>true</CreateDesktopShortcut>

4
ENI2/Properties/Settings.Designer.cs generated
View File

@ -82,8 +82,8 @@ namespace ENI2.Properties {
[global::System.Configuration.ApplicationScopedSettingAttribute()] [global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("Initial Catalog=nsw;Data Source=192.168.2.24\\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;P" + [global::System.Configuration.DefaultSettingValueAttribute("Initial Catalog=nswtest;Data Source=192.168.2.24\\SQLEXPRESS;Uid=dfuser;pwd=dfpass" +
"ersist Security Info=False;Connection Reset=false")] "wd;Persist Security Info=False;Connection Reset=false")]
public string ConnectionString { public string ConnectionString {
get { get {
return ((string)(this["ConnectionString"])); return ((string)(this["ConnectionString"]));

2
ENI2/Properties/Settings.settings
View File

@ -21,7 +21,7 @@
<Value Profile="(Default)">BSMD ReportGenerator</Value> <Value Profile="(Default)">BSMD ReportGenerator</Value>
</Setting> </Setting>
<Setting Name="ConnectionString" Type="System.String" Scope="Application"> <Setting Name="ConnectionString" Type="System.String" Scope="Application">
<Value Profile="(Default)">Initial Catalog=nsw;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false</Value> <Value Profile="(Default)">Initial Catalog=nswtest;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false</Value>
</Setting> </Setting>
</Settings> </Settings>
</SettingsFile> </SettingsFile>

18
bsmd.LockingService/LockingService.svc.cs
View File

@ -12,7 +12,7 @@ using System.IO;
namespace bsmd.LockingService namespace bsmd.LockingService
{ {
[AspNetCompatibilityRequirements(RequirementsMode = AspNetCompatibilityRequirementsMode.Allowed)] [AspNetCompatibilityRequirements(RequirementsMode = AspNetCompatibilityRequirementsMode.Allowed)]
public class LockingService : IService public class LockingService : IService
{ {
@ -73,13 +73,13 @@ namespace bsmd.LockingService
} }
} }
} }
return result; return result;
} }
public void Unlock(Guid messageCoreId, Guid userId) public void Unlock(Guid messageCoreId, Guid userId)
{ {
lock(lockDict) lock(lockDict)
{ {
if(lockDict.ContainsKey(messageCoreId)) if(lockDict.ContainsKey(messageCoreId))
@ -89,19 +89,19 @@ namespace bsmd.LockingService
} }
} }
} }
public void LockRefresh(List<Guid> currentLocks, Guid userId) public void LockRefresh(List<Guid> currentLocks, Guid userId)
{ {
foreach (Guid messageCoreId in currentLocks) foreach (Guid messageCoreId in currentLocks)
this.Lock(messageCoreId, userId); this.Lock(messageCoreId, userId);
} }
public void Log(string msg, string host, Guid userId) public void Log(string msg, string host, Guid userId)
{ {
log.Info(string.Format("{0} {1}:{2}", host, userId, msg)); log.Info(string.Format("{0} {1}:{2}", host, userId, msg));
} }
public List<CoreLock> GetLocks() public List<CoreLock> GetLocks()
{ {
List<CoreLock> result = new List<CoreLock>(); List<CoreLock> result = new List<CoreLock>();
@ -152,8 +152,8 @@ namespace bsmd.LockingService
string impPath = Path.Combine(Properties.Settings.Default.TransmitterRoot, "IMP"); string impPath = Path.Combine(Properties.Settings.Default.TransmitterRoot, "IMP");
if(Directory.Exists(impPath)) if(Directory.Exists(impPath))
{ {
foreach(string file in Directory.GetFiles(impPath)) foreach(string file in Directory.GetFiles(impPath))
serverStatus.IMPFiles.Add(Path.GetFileNameWithoutExtension(file)); serverStatus.IMPFiles.Add(Path.GetFileNameWithoutExtension(file));
} }
serverStatus.READYFiles = new List<string>(); serverStatus.READYFiles = new List<string>();

2
bsmd.LockingService/Properties/Settings.Designer.cs generated
View File

@ -25,7 +25,7 @@ namespace bsmd.LockingService.Properties {
[global::System.Configuration.ApplicationScopedSettingAttribute()] [global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")] [global::System.Configuration.DefaultSettingValueAttribute("E:\\svnlager\\BSMD\\nsw\\HIS-NORD\\Transmitter-Tool")]
public string TransmitterRoot { public string TransmitterRoot {
get { get {
return ((string)(this["TransmitterRoot"])); return ((string)(this["TransmitterRoot"]));

2
bsmd.LockingService/Properties/Settings.settings
View File

@ -3,7 +3,7 @@
<Profiles /> <Profiles />
<Settings> <Settings>
<Setting Name="TransmitterRoot" Type="System.String" Scope="Application"> <Setting Name="TransmitterRoot" Type="System.String" Scope="Application">
<Value Profile="(Default)" /> <Value Profile="(Default)">E:\svnlager\BSMD\nsw\HIS-NORD\Transmitter-Tool</Value>
</Setting> </Setting>
</Settings> </Settings>
</SettingsFile> </SettingsFile>

2
bsmd.LockingService/Web.config
View File

@ -58,7 +58,7 @@
<applicationSettings> <applicationSettings>
<bsmd.LockingService.Properties.Settings> <bsmd.LockingService.Properties.Settings>
<setting name="TransmitterRoot" serializeAs="String"> <setting name="TransmitterRoot" serializeAs="String">
<value>E:\svnlager\BSMD\nsw\HIS-NORD\Transmitter-Tool</value>&gt; <value>E:\svnlager\BSMD\nsw\HIS-NORD\Transmitter-Tool</value>
</setting> </setting>
</bsmd.LockingService.Properties.Settings> </bsmd.LockingService.Properties.Settings>
</applicationSettings> </applicationSettings>

2
bsmd.database/INFO.cs
View File

@ -258,7 +258,7 @@ namespace bsmd.database
public override string ToString() public override string ToString()
{ {
return string.Format("{0} ({1})", PortArea, PortAreaCode); return string.Format("{0} ({1})", PortArea, Berth);
} }
} }