Version 3.9.8
Maincontrols scrollbar gemacht, einige kleine Änderungen im Excelhighlighting und der Validierung
This commit is contained in:
parent
8fd4dffa24
commit
1e76f1f045
@ -12,6 +12,7 @@
|
|||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
d:DesignHeight="800" d:DesignWidth="1024">
|
d:DesignHeight="800" d:DesignWidth="1024">
|
||||||
<GroupBox Name="arrivalNotificationGroupBox" Header="{x:Static p:Resources.textPortNotification}">
|
<GroupBox Name="arrivalNotificationGroupBox" Header="{x:Static p:Resources.textPortNotification}">
|
||||||
|
<ScrollViewer>
|
||||||
<Grid>
|
<Grid>
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition Height="50" />
|
<RowDefinition Height="50" />
|
||||||
@ -76,5 +77,6 @@
|
|||||||
</GroupBox>
|
</GroupBox>
|
||||||
|
|
||||||
</Grid>
|
</Grid>
|
||||||
|
</ScrollViewer>
|
||||||
</GroupBox>
|
</GroupBox>
|
||||||
</src:DetailBaseControl>
|
</src:DetailBaseControl>
|
||||||
|
|||||||
@ -14,11 +14,12 @@
|
|||||||
<TabControl Margin="10" Name="mainFrame">
|
<TabControl Margin="10" Name="mainFrame">
|
||||||
<TabItem Header="{x:Static p:Resources.textTabBorderPolice}" Name="tabBorderPolice">
|
<TabItem Header="{x:Static p:Resources.textTabBorderPolice}" Name="tabBorderPolice">
|
||||||
<GroupBox Name="groupBoxBorderPolice" Header="{x:Static p:Resources.textGroupBoxBorderPolice}">
|
<GroupBox Name="groupBoxBorderPolice" Header="{x:Static p:Resources.textGroupBoxBorderPolice}">
|
||||||
|
<ScrollViewer>
|
||||||
<Grid>
|
<Grid>
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
<ColumnDefinition Width="1*" />
|
<ColumnDefinition Width="1*" />
|
||||||
<ColumnDefinition Width="1*" />
|
<ColumnDefinition Width="1*" />
|
||||||
<ColumnDefinition Width="2*" />
|
<ColumnDefinition Width="1*" />
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition Height="28" />
|
<RowDefinition Height="28" />
|
||||||
@ -44,6 +45,7 @@
|
|||||||
</DataGrid.Columns>
|
</DataGrid.Columns>
|
||||||
</enictrl:ENIDataGrid>
|
</enictrl:ENIDataGrid>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
</ScrollViewer>
|
||||||
</GroupBox>
|
</GroupBox>
|
||||||
</TabItem>
|
</TabItem>
|
||||||
<TabItem Header="{x:Static p:Resources.textTabCrewList}" Name="tabCrewList">
|
<TabItem Header="{x:Static p:Resources.textTabCrewList}" Name="tabCrewList">
|
||||||
|
|||||||
@ -12,6 +12,7 @@
|
|||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
d:DesignHeight="800" d:DesignWidth="1024">
|
d:DesignHeight="800" d:DesignWidth="1024">
|
||||||
<GroupBox Name="arrivalNotificationGroupBox" Header="{x:Static p:Resources.textPortNotification}">
|
<GroupBox Name="arrivalNotificationGroupBox" Header="{x:Static p:Resources.textPortNotification}">
|
||||||
|
<ScrollViewer>
|
||||||
<Grid>
|
<Grid>
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition Height="50" />
|
<RowDefinition Height="50" />
|
||||||
@ -74,7 +75,7 @@
|
|||||||
</DataGrid.Columns>
|
</DataGrid.Columns>
|
||||||
</enictrl:ENIDataGrid>
|
</enictrl:ENIDataGrid>
|
||||||
</GroupBox>
|
</GroupBox>
|
||||||
|
|
||||||
</Grid>
|
</Grid>
|
||||||
|
</ScrollViewer>
|
||||||
</GroupBox>
|
</GroupBox>
|
||||||
</src:DetailBaseControl>
|
</src:DetailBaseControl>
|
||||||
|
|||||||
@ -13,6 +13,7 @@
|
|||||||
<TabControl Margin="10" Name="mainFrame">
|
<TabControl Margin="10" Name="mainFrame">
|
||||||
<TabItem Header="{x:Static p:Resources.textMaritimeHealthDeclaration}" Name="tabMaritimeHealthDeclaration">
|
<TabItem Header="{x:Static p:Resources.textMaritimeHealthDeclaration}" Name="tabMaritimeHealthDeclaration">
|
||||||
<GroupBox Name="mdhGroupBox" Header="{x:Static p:Resources.textMDH}">
|
<GroupBox Name="mdhGroupBox" Header="{x:Static p:Resources.textMDH}">
|
||||||
|
<ScrollViewer>
|
||||||
<Grid>
|
<Grid>
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
<ColumnDefinition Width="3*" />
|
<ColumnDefinition Width="3*" />
|
||||||
@ -82,6 +83,7 @@
|
|||||||
<DatePicker Name="datePickerDateOfIssue" Grid.Row="14" Grid.Column="3" SelectedDate="{Binding DateOfIssue}" Margin="2" ContextMenu="{DynamicResource ClearContextMenu}" />
|
<DatePicker Name="datePickerDateOfIssue" Grid.Row="14" Grid.Column="3" SelectedDate="{Binding DateOfIssue}" Margin="2" ContextMenu="{DynamicResource ClearContextMenu}" />
|
||||||
<CheckBox Name="checkBoxReinspectionSanitary" IsChecked="{Binding SanitaryControlReinspectionRequired}" Grid.Row="15" Grid.Column="1" VerticalAlignment="Center"/>
|
<CheckBox Name="checkBoxReinspectionSanitary" IsChecked="{Binding SanitaryControlReinspectionRequired}" Grid.Row="15" Grid.Column="1" VerticalAlignment="Center"/>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
</ScrollViewer>
|
||||||
</GroupBox>
|
</GroupBox>
|
||||||
</TabItem>
|
</TabItem>
|
||||||
<TabItem Header="{x:Static p:Resources.textPortsOfCallLast30Days}" Name="tabPortsOfCallLast30Days">
|
<TabItem Header="{x:Static p:Resources.textPortsOfCallLast30Days}" Name="tabPortsOfCallLast30Days">
|
||||||
|
|||||||
@ -26,6 +26,7 @@
|
|||||||
</xctk:BusyIndicator.BusyContent>
|
</xctk:BusyIndicator.BusyContent>
|
||||||
|
|
||||||
<GroupBox Name="visitTransitGroupBox" Header="{x:Static p:Resources.textVisitTransit}">
|
<GroupBox Name="visitTransitGroupBox" Header="{x:Static p:Resources.textVisitTransit}">
|
||||||
|
<ScrollViewer>
|
||||||
<Grid>
|
<Grid>
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition Height="28" />
|
<RowDefinition Height="28" />
|
||||||
@ -272,6 +273,7 @@
|
|||||||
</DataGrid.Columns>
|
</DataGrid.Columns>
|
||||||
</DataGrid>
|
</DataGrid>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
</ScrollViewer>
|
||||||
</GroupBox>
|
</GroupBox>
|
||||||
</xctk:BusyIndicator>
|
</xctk:BusyIndicator>
|
||||||
</src:DetailBaseControl>
|
</src:DetailBaseControl>
|
||||||
|
|||||||
@ -12,6 +12,7 @@
|
|||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
d:DesignHeight="800" d:DesignWidth="1024">
|
d:DesignHeight="800" d:DesignWidth="1024">
|
||||||
<GroupBox Name="groupBoxPre72H" Header="{x:Static p:Resources.textPre72hGroupBox}">
|
<GroupBox Name="groupBoxPre72H" Header="{x:Static p:Resources.textPre72hGroupBox}">
|
||||||
|
<ScrollViewer>
|
||||||
<Grid>
|
<Grid>
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition Height="28" />
|
<RowDefinition Height="28" />
|
||||||
@ -27,7 +28,7 @@
|
|||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
<ColumnDefinition Width="1*" />
|
<ColumnDefinition Width="1*" />
|
||||||
<ColumnDefinition Width="1*" />
|
<ColumnDefinition Width="1*" />
|
||||||
<ColumnDefinition Width="2*" />
|
<ColumnDefinition Width="1*" />
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
|
|
||||||
<Label Content="{x:Static p:Resources.textTanker}" Grid.Column="0" Grid.Row="0" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
|
<Label Content="{x:Static p:Resources.textTanker}" Grid.Column="0" Grid.Row="0" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
|
||||||
@ -49,5 +50,6 @@
|
|||||||
<Label Content="{x:Static p:Resources.textPlannedPeriodOfStay}" Grid.Column="0" Grid.Row="8" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
|
<Label Content="{x:Static p:Resources.textPlannedPeriodOfStay}" Grid.Column="0" Grid.Row="8" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
|
||||||
<xctk:IntegerUpDown Grid.Row="8" Grid.Column="1" Name="integerUpDownPlannedPeriodOfStay" Value="{Binding PlannedPeriodOfStay_HUR, Mode=TwoWay}" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2,2,2,2" TextAlignment="Left"/>
|
<xctk:IntegerUpDown Grid.Row="8" Grid.Column="1" Name="integerUpDownPlannedPeriodOfStay" Value="{Binding PlannedPeriodOfStay_HUR, Mode=TwoWay}" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2,2,2,2" TextAlignment="Left"/>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
</ScrollViewer>
|
||||||
</GroupBox>
|
</GroupBox>
|
||||||
</src:DetailBaseControl>
|
</src:DetailBaseControl>
|
||||||
|
|||||||
@ -12,6 +12,7 @@
|
|||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
d:DesignHeight="600" d:DesignWidth="800">
|
d:DesignHeight="600" d:DesignWidth="800">
|
||||||
<GroupBox Name="portCallGroupBox" Header="{x:Static p:Resources.textPortCall}">
|
<GroupBox Name="portCallGroupBox" Header="{x:Static p:Resources.textPortCall}">
|
||||||
|
<ScrollViewer>
|
||||||
<Grid>
|
<Grid>
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition Height="300" />
|
<RowDefinition Height="300" />
|
||||||
@ -111,5 +112,6 @@
|
|||||||
</Grid>
|
</Grid>
|
||||||
</GroupBox>
|
</GroupBox>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
</ScrollViewer>
|
||||||
</GroupBox>
|
</GroupBox>
|
||||||
</src:DetailBaseControl>
|
</src:DetailBaseControl>
|
||||||
|
|||||||
@ -12,6 +12,7 @@
|
|||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
d:DesignHeight="800" d:DesignWidth="800">
|
d:DesignHeight="800" d:DesignWidth="800">
|
||||||
<GroupBox Name="portNotificationGroupBox" Header="{x:Static p:Resources.textPortNotification}">
|
<GroupBox Name="portNotificationGroupBox" Header="{x:Static p:Resources.textPortNotification}">
|
||||||
|
<ScrollViewer>
|
||||||
<Grid>
|
<Grid>
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition Height="50" />
|
<RowDefinition Height="50" />
|
||||||
@ -96,5 +97,6 @@
|
|||||||
|
|
||||||
</GroupBox>
|
</GroupBox>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
</ScrollViewer>
|
||||||
</GroupBox>
|
</GroupBox>
|
||||||
</src:DetailBaseControl>
|
</src:DetailBaseControl>
|
||||||
|
|||||||
@ -14,6 +14,7 @@
|
|||||||
<TabControl Margin="10" Name="mainFrame">
|
<TabControl Margin="10" Name="mainFrame">
|
||||||
<TabItem Header="{x:Static p:Resources.textSecurityNotification}" Name="tabSecurityNotification">
|
<TabItem Header="{x:Static p:Resources.textSecurityNotification}" Name="tabSecurityNotification">
|
||||||
<GroupBox Name="secGroupBox" Header="{x:Static p:Resources.textSEC}">
|
<GroupBox Name="secGroupBox" Header="{x:Static p:Resources.textSEC}">
|
||||||
|
<ScrollViewer>
|
||||||
<Grid>
|
<Grid>
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
<ColumnDefinition Width="1*" />
|
<ColumnDefinition Width="1*" />
|
||||||
@ -89,6 +90,7 @@
|
|||||||
<ComboBox Name="comboBoxGeneralDescriptionOfCargo" Grid.Row="18" Grid.Column="3" IsEditable="True" StaysOpenOnEdit="True" SelectedIndex="{Binding GeneralDescriptionOfCargo, Converter={util:ByteConverter}}" Margin="2" IsTextSearchEnabled="True"/>
|
<ComboBox Name="comboBoxGeneralDescriptionOfCargo" Grid.Row="18" Grid.Column="3" IsEditable="True" StaysOpenOnEdit="True" SelectedIndex="{Binding GeneralDescriptionOfCargo, Converter={util:ByteConverter}}" Margin="2" IsTextSearchEnabled="True"/>
|
||||||
|
|
||||||
</Grid>
|
</Grid>
|
||||||
|
</ScrollViewer>
|
||||||
</GroupBox>
|
</GroupBox>
|
||||||
</TabItem>
|
</TabItem>
|
||||||
<TabItem Header="{x:Static p:Resources.textLast10PortFacilities}" Name="tabLast10PortFacilites">
|
<TabItem Header="{x:Static p:Resources.textLast10PortFacilities}" Name="tabLast10PortFacilites">
|
||||||
|
|||||||
@ -11,6 +11,7 @@
|
|||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
d:DesignHeight="600" d:DesignWidth="800">
|
d:DesignHeight="600" d:DesignWidth="800">
|
||||||
<GroupBox Name="shipDataGroupBox" Header="{x:Static p:Resources.textShipData}" >
|
<GroupBox Name="shipDataGroupBox" Header="{x:Static p:Resources.textShipData}" >
|
||||||
|
<ScrollViewer>
|
||||||
<Grid>
|
<Grid>
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition Height="210" />
|
<RowDefinition Height="210" />
|
||||||
@ -98,7 +99,7 @@
|
|||||||
|
|
||||||
</Grid>
|
</Grid>
|
||||||
</GroupBox>
|
</GroupBox>
|
||||||
|
|
||||||
</Grid>
|
</Grid>
|
||||||
|
</ScrollViewer>
|
||||||
</GroupBox>
|
</GroupBox>
|
||||||
</src:DetailBaseControl>
|
</src:DetailBaseControl>
|
||||||
|
|||||||
@ -10,6 +10,7 @@
|
|||||||
xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
|
xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
|
||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
d:DesignHeight="800" d:DesignWidth="1024">
|
d:DesignHeight="800" d:DesignWidth="1024">
|
||||||
|
<ScrollViewer>
|
||||||
<Grid>
|
<Grid>
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition Height="300" />
|
<RowDefinition Height="300" />
|
||||||
@ -63,4 +64,5 @@
|
|||||||
</enictrl:ENIDataGrid>
|
</enictrl:ENIDataGrid>
|
||||||
</GroupBox>
|
</GroupBox>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
</ScrollViewer>
|
||||||
</src:DetailBaseControl>
|
</src:DetailBaseControl>
|
||||||
|
|||||||
@ -12,6 +12,7 @@
|
|||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
d:DesignHeight="600" d:DesignWidth="800">
|
d:DesignHeight="600" d:DesignWidth="800">
|
||||||
<GroupBox Name="wasGroupBox" Header="{x:Static p:Resources.textWaste}">
|
<GroupBox Name="wasGroupBox" Header="{x:Static p:Resources.textWaste}">
|
||||||
|
<ScrollViewer>
|
||||||
<Grid>
|
<Grid>
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition Height="250" />
|
<RowDefinition Height="250" />
|
||||||
@ -128,7 +129,7 @@
|
|||||||
</DataGridTemplateColumn>
|
</DataGridTemplateColumn>
|
||||||
</DataGrid.Columns>
|
</DataGrid.Columns>
|
||||||
</enictrl:ENIDataGrid>
|
</enictrl:ENIDataGrid>
|
||||||
|
|
||||||
</Grid>
|
</Grid>
|
||||||
|
</ScrollViewer>
|
||||||
</GroupBox>
|
</GroupBox>
|
||||||
</src:DetailBaseControl>
|
</src:DetailBaseControl>
|
||||||
|
|||||||
@ -36,7 +36,7 @@
|
|||||||
<CreateWebPageOnPublish>true</CreateWebPageOnPublish>
|
<CreateWebPageOnPublish>true</CreateWebPageOnPublish>
|
||||||
<WebPage>publish.html</WebPage>
|
<WebPage>publish.html</WebPage>
|
||||||
<ApplicationRevision>1</ApplicationRevision>
|
<ApplicationRevision>1</ApplicationRevision>
|
||||||
<ApplicationVersion>3.9.6.%2a</ApplicationVersion>
|
<ApplicationVersion>3.9.8.%2a</ApplicationVersion>
|
||||||
<UseApplicationTrust>false</UseApplicationTrust>
|
<UseApplicationTrust>false</UseApplicationTrust>
|
||||||
<CreateDesktopShortcut>true</CreateDesktopShortcut>
|
<CreateDesktopShortcut>true</CreateDesktopShortcut>
|
||||||
<PublishWizardCompleted>true</PublishWizardCompleted>
|
<PublishWizardCompleted>true</PublishWizardCompleted>
|
||||||
|
|||||||
@ -36,7 +36,7 @@ namespace ENI2.EditControls
|
|||||||
};
|
};
|
||||||
|
|
||||||
this.comboBoxInitialHIS.ItemsSource = comboDataSource;
|
this.comboBoxInitialHIS.ItemsSource = comboDataSource;
|
||||||
|
this.comboBoxInitialHIS.SelectedIndex = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool ValidId { get; set; }
|
public bool ValidId { get; set; }
|
||||||
|
|||||||
@ -36,6 +36,8 @@ namespace ENI2.EditControls
|
|||||||
};
|
};
|
||||||
|
|
||||||
this.comboBoxInitialHIS.ItemsSource = comboDataSource;
|
this.comboBoxInitialHIS.ItemsSource = comboDataSource;
|
||||||
|
this.comboBoxInitialHIS.SelectedIndex = 2;
|
||||||
|
|
||||||
this.EnableOK(false);
|
this.EnableOK(false);
|
||||||
this.locodePoC.PropertyChanged += LocodePoC_PropertyChanged;
|
this.locodePoC.PropertyChanged += LocodePoC_PropertyChanged;
|
||||||
}
|
}
|
||||||
|
|||||||
Binary file not shown.
@ -135,18 +135,12 @@ namespace bsmd.ExcelReadService
|
|||||||
|
|
||||||
// save all messages now
|
// save all messages now
|
||||||
|
|
||||||
//if (!(messageCore.ExcelImportComplete ?? false))
|
|
||||||
//{
|
|
||||||
// messageCore.ExcelImportComplete = true;
|
|
||||||
// DBManager.Instance.Save(messageCore);
|
|
||||||
|
|
||||||
foreach (Message message in messages)
|
foreach (Message message in messages)
|
||||||
{
|
{
|
||||||
message.CreatedBy = "EXCEL";
|
message.CreatedBy = "EXCEL";
|
||||||
DBManager.Instance.Save(message);
|
DBManager.Instance.Save(message);
|
||||||
message.SaveElements();
|
message.SaveElements();
|
||||||
}
|
}
|
||||||
//}
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -1242,7 +1236,14 @@ namespace bsmd.ExcelReadService
|
|||||||
((WasteDisposalServiceProvider) was.WasteDisposalServiceProvider[0]).WasteDisposalServiceProviderName = wastedispServProvName;
|
((WasteDisposalServiceProvider) was.WasteDisposalServiceProvider[0]).WasteDisposalServiceProviderName = wastedispServProvName;
|
||||||
((WasteDisposalServiceProvider) was.WasteDisposalServiceProvider[0]).WasteDisposalDelivery = was.WasteDisposalDelivery;
|
((WasteDisposalServiceProvider) was.WasteDisposalServiceProvider[0]).WasteDisposalDelivery = was.WasteDisposalDelivery;
|
||||||
}
|
}
|
||||||
reader.Conf.ConfirmText("WAS.WasteDisposalServiceProviderName", wastedispServProvName, wastedispServProvName.IsNullOrEmpty() ? ExcelReader.ReadState.WARN : ExcelReader.ReadState.OK);
|
|
||||||
|
ExcelReader.ReadState readState = ExcelReader.ReadState.WARN;
|
||||||
|
if (!wastedispServProvName.IsNullOrEmpty()) {
|
||||||
|
if (wastedispServProvName.Length > 90) readState = ExcelReader.ReadState.FAIL;
|
||||||
|
else readState = ExcelReader.ReadState.OK;
|
||||||
|
}
|
||||||
|
|
||||||
|
reader.Conf.ConfirmText("WAS.WasteDisposalServiceProviderName", wastedispServProvName, readState);
|
||||||
|
|
||||||
// Waste 1 - 15
|
// Waste 1 - 15
|
||||||
for (int i = 1; i <= was.NumberOfExcelRows; i++)
|
for (int i = 1; i <= was.NumberOfExcelRows; i++)
|
||||||
@ -1478,7 +1479,7 @@ namespace bsmd.ExcelReadService
|
|||||||
string[] crew = crewNameString.Split(';');
|
string[] crew = crewNameString.Split(';');
|
||||||
if (crew.Length == 1)
|
if (crew.Length == 1)
|
||||||
crew = crewNameString.Split(',');
|
crew = crewNameString.Split(',');
|
||||||
|
ExcelReader.ReadState readState = ExcelReader.ReadState.OK;
|
||||||
for (int j = 0; j < crew.Length; j++)
|
for (int j = 0; j < crew.Length; j++)
|
||||||
{
|
{
|
||||||
PortOfCallLast30DaysCrewJoinedShip poc30dCrew = poc30d.GetSublistElementWithIdentifier((j + 1).ToString()) as PortOfCallLast30DaysCrewJoinedShip;
|
PortOfCallLast30DaysCrewJoinedShip poc30dCrew = poc30d.GetSublistElementWithIdentifier((j + 1).ToString()) as PortOfCallLast30DaysCrewJoinedShip;
|
||||||
@ -1491,8 +1492,10 @@ namespace bsmd.ExcelReadService
|
|||||||
}
|
}
|
||||||
|
|
||||||
poc30dCrew.PortOfCallLast30DaysCrewJoinedShipName = crew[j];
|
poc30dCrew.PortOfCallLast30DaysCrewJoinedShipName = crew[j];
|
||||||
|
if (crew[j].Length > 90)
|
||||||
|
readState = ExcelReader.ReadState.FAIL;
|
||||||
}
|
}
|
||||||
reader.Conf.ConfirmText(crewName, crewNameString, ExcelReader.ReadState.OK);
|
reader.Conf.ConfirmText(crewName, crewNameString, readState);
|
||||||
} else
|
} else
|
||||||
{
|
{
|
||||||
reader.Conf.ConfirmText(crewName, null, ExcelReader.ReadState.FAIL);
|
reader.Conf.ConfirmText(crewName, null, ExcelReader.ReadState.FAIL);
|
||||||
@ -1528,9 +1531,17 @@ namespace bsmd.ExcelReadService
|
|||||||
}
|
}
|
||||||
|
|
||||||
smd.SanitaryMeasuresType = reader.ReadText(smType);
|
smd.SanitaryMeasuresType = reader.ReadText(smType);
|
||||||
reader.Conf.ConfirmText(smType, smd.SanitaryMeasuresType, smd.SanitaryMeasuresType.IsNullOrEmpty() ? ExcelReader.ReadState.FAIL : ExcelReader.ReadState.OK);
|
ExcelReader.ReadState readState = ExcelReader.ReadState.OK;
|
||||||
|
if (smd.SanitaryMeasuresType.IsNullOrEmpty() || smd.SanitaryMeasuresType.Length > 90)
|
||||||
|
readState = ExcelReader.ReadState.FAIL;
|
||||||
|
reader.Conf.ConfirmText(smType, smd.SanitaryMeasuresType, readState);
|
||||||
|
|
||||||
smd.SanitaryMeasuresLocation = reader.ReadText(smLocation);
|
smd.SanitaryMeasuresLocation = reader.ReadText(smLocation);
|
||||||
|
readState = ExcelReader.ReadState.OK;
|
||||||
|
if (smd.SanitaryMeasuresLocation.IsNullOrEmpty() || smd.SanitaryMeasuresLocation.Length > 90)
|
||||||
|
readState = ExcelReader.ReadState.FAIL;
|
||||||
reader.Conf.ConfirmText(smLocation, smd.SanitaryMeasuresLocation, smd.SanitaryMeasuresLocation.IsNullOrEmpty() ? ExcelReader.ReadState.FAIL : ExcelReader.ReadState.OK);
|
reader.Conf.ConfirmText(smLocation, smd.SanitaryMeasuresLocation, smd.SanitaryMeasuresLocation.IsNullOrEmpty() ? ExcelReader.ReadState.FAIL : ExcelReader.ReadState.OK);
|
||||||
|
|
||||||
smd.SanitaryMeasuresDate = reader.ReadDate(smDate);
|
smd.SanitaryMeasuresDate = reader.ReadDate(smDate);
|
||||||
// dont save completely empty structs
|
// dont save completely empty structs
|
||||||
if (!smd.SanitaryMeasuresDate.HasValue && smd.SanitaryMeasuresLocation.IsNullOrEmpty() && smd.SanitaryMeasuresType.IsNullOrEmpty())
|
if (!smd.SanitaryMeasuresDate.HasValue && smd.SanitaryMeasuresLocation.IsNullOrEmpty() && smd.SanitaryMeasuresType.IsNullOrEmpty())
|
||||||
@ -1557,7 +1568,10 @@ namespace bsmd.ExcelReadService
|
|||||||
ia.MDH = mdh;
|
ia.MDH = mdh;
|
||||||
}
|
}
|
||||||
ia.InfectedAreaPort = reader.ReadText(iaPort);
|
ia.InfectedAreaPort = reader.ReadText(iaPort);
|
||||||
reader.Conf.ConfirmText(iaPort, ia.InfectedAreaPort, ia.InfectedAreaPort.IsNullOrEmpty() ? ExcelReader.ReadState.FAIL : ExcelReader.ReadState.OK);
|
ExcelReader.ReadState readState = ExcelReader.ReadState.OK;
|
||||||
|
if (ia.InfectedAreaPort.IsNullOrEmpty() || ia.InfectedAreaPort.Length > 90)
|
||||||
|
readState = ExcelReader.ReadState.FAIL;
|
||||||
|
reader.Conf.ConfirmText(iaPort, ia.InfectedAreaPort, readState);
|
||||||
ia.InfectedAreaDate = reader.ReadDate(iaDate);
|
ia.InfectedAreaDate = reader.ReadDate(iaDate);
|
||||||
// dont save completely empty structs
|
// dont save completely empty structs
|
||||||
if (!ia.InfectedAreaDate.HasValue && ia.InfectedAreaPort.IsNullOrEmpty())
|
if (!ia.InfectedAreaDate.HasValue && ia.InfectedAreaPort.IsNullOrEmpty())
|
||||||
@ -1591,7 +1605,11 @@ namespace bsmd.ExcelReadService
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
reader.Conf.ConfirmText(sjlLookup, sjl.StowawayJoiningLocation, ExcelReader.ReadState.OK);
|
ExcelReader.ReadState readState = ExcelReader.ReadState.OK;
|
||||||
|
if (sjl.StowawayJoiningLocation.Length > 90)
|
||||||
|
readState = ExcelReader.ReadState.FAIL;
|
||||||
|
|
||||||
|
reader.Conf.ConfirmText(sjlLookup, sjl.StowawayJoiningLocation, readState);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -2408,6 +2426,7 @@ namespace bsmd.ExcelReadService
|
|||||||
object propValue = property.GetValue(dbEntity, null);
|
object propValue = property.GetValue(dbEntity, null);
|
||||||
string value = (propValue == null) ? string.Empty : propValue.ToString();
|
string value = (propValue == null) ? string.Empty : propValue.ToString();
|
||||||
LookupNameAttribute lookupNameAttribute = Attribute.GetCustomAttribute(property, typeof(LookupNameAttribute)) as LookupNameAttribute;
|
LookupNameAttribute lookupNameAttribute = Attribute.GetCustomAttribute(property, typeof(LookupNameAttribute)) as LookupNameAttribute;
|
||||||
|
|
||||||
if (property.PropertyType == typeof(DateTime?))
|
if (property.PropertyType == typeof(DateTime?))
|
||||||
{
|
{
|
||||||
DateTime? sheetValue = reader.ReadDate(lookupNameAttribute.LookupName);
|
DateTime? sheetValue = reader.ReadDate(lookupNameAttribute.LookupName);
|
||||||
@ -2440,8 +2459,20 @@ namespace bsmd.ExcelReadService
|
|||||||
string sheetValue = reader.ReadText(lookupNameAttribute.LookupName);
|
string sheetValue = reader.ReadText(lookupNameAttribute.LookupName);
|
||||||
if (sheetValue != null)
|
if (sheetValue != null)
|
||||||
{
|
{
|
||||||
|
|
||||||
property.SetValue(dbEntity, sheetValue);
|
property.SetValue(dbEntity, sheetValue);
|
||||||
reader.Conf.ConfirmText(lookupNameAttribute.LookupName, sheetValue, ExcelReader.ReadState.OK);
|
ExcelReader.ReadState readState = ExcelReader.ReadState.OK;
|
||||||
|
// Wenn der Zellentext länger ist als 90 Zeichen und maximal 99/100 Zeichen lang ist soll die Zelle rot gefärbt werden
|
||||||
|
if (Attribute.IsDefined(property, typeof(MaxLengthAttribute)))
|
||||||
|
{
|
||||||
|
MaxLengthAttribute mla = Attribute.GetCustomAttribute(property, typeof(MaxLengthAttribute)) as MaxLengthAttribute;
|
||||||
|
if ((sheetValue.Length >= 90) && ((mla.MaxLength == 99) || (mla.MaxLength == 100)))
|
||||||
|
{
|
||||||
|
readState = ExcelReader.ReadState.FAIL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
reader.Conf.ConfirmText(lookupNameAttribute.LookupName, sheetValue, readState);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -2721,6 +2752,9 @@ namespace bsmd.ExcelReadService
|
|||||||
}
|
}
|
||||||
|
|
||||||
DBManager.Instance.Save(result);
|
DBManager.Instance.Save(result);
|
||||||
|
// Meldeklassen erzeugen um doppelte Generierung über ENI-2 zu vermeiden
|
||||||
|
bsmd.database.Util.CreateMessagesForCore(result, new List<Message>(), null);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
@ -2738,6 +2772,7 @@ namespace bsmd.ExcelReadService
|
|||||||
Message newMessage = DBManager.Instance.GetMessage(core, type);
|
Message newMessage = DBManager.Instance.GetMessage(core, type);
|
||||||
if (newMessage == null)
|
if (newMessage == null)
|
||||||
{
|
{
|
||||||
|
newMessage = new Message();
|
||||||
newMessage.MessageNotificationClass = type;
|
newMessage.MessageNotificationClass = type;
|
||||||
messages.Add(newMessage);
|
messages.Add(newMessage);
|
||||||
newMessage.MessageCore = core;
|
newMessage.MessageCore = core;
|
||||||
|
|||||||
@ -27,7 +27,7 @@ namespace bsmd.database
|
|||||||
public MDH MDH { get; set; }
|
public MDH MDH { get; set; }
|
||||||
|
|
||||||
[ShowReport]
|
[ShowReport]
|
||||||
[MaxLength(255)]
|
[MaxLength(99)]
|
||||||
[ENI2Validation]
|
[ENI2Validation]
|
||||||
public string InfectedAreaPort { get; set; }
|
public string InfectedAreaPort { get; set; }
|
||||||
|
|
||||||
|
|||||||
@ -147,7 +147,8 @@ namespace bsmd.database
|
|||||||
|
|
||||||
[ShowReport]
|
[ShowReport]
|
||||||
[LookupName("MDH.PlaceOfIssue")]
|
[LookupName("MDH.PlaceOfIssue")]
|
||||||
[MaxLength(100)]
|
[MaxLength(99)]
|
||||||
|
[Validation2(ValidationCode.STRING_MAXLEN, 99)]
|
||||||
[ENI2Validation]
|
[ENI2Validation]
|
||||||
public string PlaceOfIssue { get; set; }
|
public string PlaceOfIssue { get; set; }
|
||||||
|
|
||||||
|
|||||||
@ -237,6 +237,7 @@ namespace bsmd.database
|
|||||||
|
|
||||||
public override void Validate(List<MessageError> errors, List<MessageViolation> violations)
|
public override void Validate(List<MessageError> errors, List<MessageViolation> violations)
|
||||||
{
|
{
|
||||||
|
/* Nach RM Christin / Trello vom 27.11.17 auskommentiert
|
||||||
if (this.PassengerPortOfDisembarkation != null)
|
if (this.PassengerPortOfDisembarkation != null)
|
||||||
{
|
{
|
||||||
if (this.PassengerPortOfDisembarkation.Equals("ZZUKN"))
|
if (this.PassengerPortOfDisembarkation.Equals("ZZUKN"))
|
||||||
@ -248,6 +249,7 @@ namespace bsmd.database
|
|||||||
if (this.PassengerPortOfEmbarkation.Equals("ZZUKN"))
|
if (this.PassengerPortOfEmbarkation.Equals("ZZUKN"))
|
||||||
violations.Add(RuleEngine.CreateViolation(ValidationCode.NOT_NULL, "PassengerPortOfEmbarkation", null, this.Title, this.Identifier, this.Tablename));
|
violations.Add(RuleEngine.CreateViolation(ValidationCode.NOT_NULL, "PassengerPortOfEmbarkation", null, this.Title, this.Identifier, this.Tablename));
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|||||||
@ -28,7 +28,7 @@ namespace bsmd.database
|
|||||||
|
|
||||||
[ShowReport]
|
[ShowReport]
|
||||||
[Validation2(ValidationCode.NOT_NULL_MAX_LEN, 99)]
|
[Validation2(ValidationCode.NOT_NULL_MAX_LEN, 99)]
|
||||||
[MaxLength(255)]
|
[MaxLength(99)]
|
||||||
[ENI2Validation]
|
[ENI2Validation]
|
||||||
public string PortOfCallLast30DaysCrewJoinedShipName { get; set; }
|
public string PortOfCallLast30DaysCrewJoinedShipName { get; set; }
|
||||||
|
|
||||||
|
|||||||
@ -2,6 +2,6 @@
|
|||||||
|
|
||||||
[assembly: AssemblyCompany("schick Informatik")]
|
[assembly: AssemblyCompany("schick Informatik")]
|
||||||
[assembly: AssemblyProduct("BSMD NSW interface")]
|
[assembly: AssemblyProduct("BSMD NSW interface")]
|
||||||
[assembly: AssemblyInformationalVersion("3.9.7")]
|
[assembly: AssemblyInformationalVersion("3.9.8")]
|
||||||
[assembly: AssemblyCopyright("Copyright © 2014-2017 schick Informatik")]
|
[assembly: AssemblyCopyright("Copyright © 2014-2017 schick Informatik")]
|
||||||
[assembly: AssemblyTrademark("")]
|
[assembly: AssemblyTrademark("")]
|
||||||
@ -1,4 +1,4 @@
|
|||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
|
|
||||||
[assembly: AssemblyVersion("3.9.7.*")]
|
[assembly: AssemblyVersion("3.9.8.*")]
|
||||||
|
|
||||||
|
|||||||
@ -192,7 +192,8 @@ namespace bsmd.database
|
|||||||
if (Attribute.IsDefined(property, typeof(MaxLengthAttribute)))
|
if (Attribute.IsDefined(property, typeof(MaxLengthAttribute)))
|
||||||
{
|
{
|
||||||
MaxLengthAttribute mla = Attribute.GetCustomAttribute(property, typeof(MaxLengthAttribute)) as MaxLengthAttribute;
|
MaxLengthAttribute mla = Attribute.GetCustomAttribute(property, typeof(MaxLengthAttribute)) as MaxLengthAttribute;
|
||||||
if((value.Length >= 90) && (mla.MaxLength == value.Length))
|
bool isStandardML = ((mla.MaxLength == 99) || (mla.MaxLength == 100));
|
||||||
|
if((value.Length >= 90) && ((mla.MaxLength == value.Length) || isStandardML))
|
||||||
{
|
{
|
||||||
// put out a warning this might be truncated
|
// put out a warning this might be truncated
|
||||||
violations.Add(RuleEngine.CreateViolation(ValidationCode.TRUNCATE, property.Name, value, entity.Title, identifier, entity.Tablename));
|
violations.Add(RuleEngine.CreateViolation(ValidationCode.TRUNCATE, property.Name, value, entity.Title, identifier, entity.Tablename));
|
||||||
|
|||||||
@ -28,13 +28,15 @@ namespace bsmd.database
|
|||||||
public MDH MDH { get; set; }
|
public MDH MDH { get; set; }
|
||||||
|
|
||||||
[ShowReport]
|
[ShowReport]
|
||||||
[MaxLength(255)]
|
[MaxLength(99)]
|
||||||
[ENI2Validation]
|
[ENI2Validation]
|
||||||
|
[Validation2(ValidationCode.STRING_MAXLEN, 99)]
|
||||||
public string SanitaryMeasuresType { get; set; }
|
public string SanitaryMeasuresType { get; set; }
|
||||||
|
|
||||||
[ShowReport]
|
[ShowReport]
|
||||||
[MaxLength(255)]
|
[MaxLength(99)]
|
||||||
[ENI2Validation]
|
[ENI2Validation]
|
||||||
|
[Validation2(ValidationCode.STRING_MAXLEN, 99)]
|
||||||
public string SanitaryMeasuresLocation { get; set; }
|
public string SanitaryMeasuresLocation { get; set; }
|
||||||
|
|
||||||
[ShowReport]
|
[ShowReport]
|
||||||
|
|||||||
@ -28,8 +28,9 @@ namespace bsmd.database
|
|||||||
public MDH MDH { get; set; }
|
public MDH MDH { get; set; }
|
||||||
|
|
||||||
[ShowReport]
|
[ShowReport]
|
||||||
[MaxLength(255)]
|
[MaxLength(99)]
|
||||||
[ENI2Validation]
|
[ENI2Validation]
|
||||||
|
[Validation2(ValidationCode.STRING_MAXLEN, 99)]
|
||||||
public string StowawayJoiningLocation { get; set; }
|
public string StowawayJoiningLocation { get; set; }
|
||||||
|
|
||||||
public string Identifier { get; set; }
|
public string Identifier { get; set; }
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user