From 7d46f926cb5e7c39789a0cd1bb46e9963b70a418 Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Mon, 4 Dec 2023 16:55:23 +0100 Subject: [PATCH 1/5] Changed PAX violation message --- bsmd.database/PAS.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bsmd.database/PAS.cs b/bsmd.database/PAS.cs index bddd83ad..cd247fa4 100644 --- a/bsmd.database/PAS.cs +++ b/bsmd.database/PAS.cs @@ -128,7 +128,7 @@ namespace bsmd.database [ENI2Validation] public string PassengerIdentityDocumentIssuingState { get; set; } - + [Validation(ValidationCode.PAST_DATE)] [ENI2Validation] public DateTime? PassengerIdentityDocumentExpiryDate { get; set; } @@ -388,7 +388,7 @@ namespace bsmd.database violations.Add(RuleEngine.CreateViolation(ValidationCode.TIME_IMPLAUSIBLE, "Check date of birth", null, this.Title, this.Identifier, this.IsDeparture ? "PASD" : "PASA")); } - // NSW 7.2 rules + // NSW 7.2 rules if ((this.NotificationSchengen ?? false) && (!this.HasSchengenDetails)) { @@ -402,7 +402,7 @@ namespace bsmd.database if ((this.NotificationPAX ?? false) && (!this.HasPAXDetails)) { - errors.Add(RuleEngine.CreateError(ValidationCode.V203, "PAX flag set but no data", null, this.Title, null, this.IsDeparture ? "PASD" : "PASA")); + errors.Add(RuleEngine.CreateError(ValidationCode.V203, "PAX flag set but no data - emergency details", null, this.Title, null, this.IsDeparture ? "PASD" : "PASA")); } if (!(this.NotificationPAX ?? false) && (this.HasPAXDetails)) From a974cf79a75a776a3ca16e5eca8e2c79cf66e918 Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Thu, 7 Dec 2023 09:16:46 +0100 Subject: [PATCH 2/5] =?UTF-8?q?Optionaler=20Parameter=20f=C3=BCr=20maximal?= =?UTF-8?q?e=20L=C3=A4nge=20eines=20einzulesenden=20String=20von=20Excel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ENI2/Excel/ExcelReader.cs | 8 ++++- ENI2/Excel/ExcelUtil.cs | 62 ++++++++++++++++++--------------------- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/ENI2/Excel/ExcelReader.cs b/ENI2/Excel/ExcelReader.cs index 07aa71fc..b170c136 100644 --- a/ENI2/Excel/ExcelReader.cs +++ b/ENI2/Excel/ExcelReader.cs @@ -636,14 +636,20 @@ namespace ENI2.Excel } } - internal string ReadCellAsText(string sheetName, string range) + internal string ReadCellAsText(string sheetName, string range, int? maxLength = null) { try { Worksheet workSheet = (Worksheet)_workBook.Worksheets[sheetName]; string result = workSheet.Range[range].Text.ToString(); if (!result.IsNullOrEmpty()) + { result = result.Trim().Clean(); + if(maxLength.HasValue && result.Length > maxLength.Value) + { + result = result.Substring(0, maxLength.Value); + } + } return result; } catch (Exception e) diff --git a/ENI2/Excel/ExcelUtil.cs b/ENI2/Excel/ExcelUtil.cs index a0fbcabb..2404453e 100644 --- a/ENI2/Excel/ExcelUtil.cs +++ b/ENI2/Excel/ExcelUtil.cs @@ -2091,8 +2091,8 @@ namespace ENI2.Excel for (int i = 0; i < 5000; i++) { - string lastName = reader.ReadCellAsText(sheetTitle, string.Format("C{0}", i + 18)); - string firstName = reader.ReadCellAsText(sheetTitle, string.Format("D{0}", i + 18)); + string lastName = reader.ReadCellAsText(sheetTitle, string.Format("C{0}", i + 18), 100); + string firstName = reader.ReadCellAsText(sheetTitle, string.Format("D{0}", i + 18), 100); if (lastName.IsNullOrEmpty() && firstName.IsNullOrEmpty()) break; if (!(crewMessage.GetSublistElementWithIdentifier((i + 1).ToString()) is CREW crew)) @@ -2111,10 +2111,10 @@ namespace ENI2.Excel crew.CrewMemberGender = ReadGender(reader.ReadCellAsText(sheetTitle, string.Format("E{0}", i + 18)), out bool canceled); if (canceled) return true; - crew.CrewMemberDuty = reader.ReadCellAsText(sheetTitle, string.Format("F{0}", i + 18)); + crew.CrewMemberDuty = reader.ReadCellAsText(sheetTitle, string.Format("F{0}", i + 18), 100); crew.CrewMemberNationality = ReadNationality(reader.ReadCellAsText(sheetTitle, string.Format("G{0}", i + 18)), out canceled); if (canceled) return true; - crew.CrewMemberPlaceOfBirth = reader.ReadCellAsText(sheetTitle, string.Format("H{0}", i + 18)); + crew.CrewMemberPlaceOfBirth = reader.ReadCellAsText(sheetTitle, string.Format("H{0}", i + 18), 100); crew.CrewMemberCountryOfBirth = ReadNationality(reader.ReadCellAsText(sheetTitle, string.Format("I{0}", i + 18)), out _); crew.CrewMemberDateOfBirth = reader.ReadCellAsDateTime(sheetTitle, string.Format("J{0}", i + 18)); @@ -2122,8 +2122,8 @@ namespace ENI2.Excel crew.CrewMemberIdentityDocumentType = ReadDocumentType(reader.ReadCellAsText(sheetTitle, string.Format("K{0}", i + 18)), out canceled); if (canceled) return true; - crew.CrewMemberIdentityDocumentId = reader.ReadCellAsText(sheetTitle, string.Format("L{0}", i + 18)); - crew.CrewMemberVisaNumber = reader.ReadCellAsText(sheetTitle, string.Format("O{0}", i + 18)); + crew.CrewMemberIdentityDocumentId = reader.ReadCellAsText(sheetTitle, string.Format("L{0}", i + 18), 100); + crew.CrewMemberVisaNumber = reader.ReadCellAsText(sheetTitle, string.Format("O{0}", i + 18), 100); crew.CrewMemberIdentityDocumentIssuingState = ReadNationality(reader.ReadCellAsText(sheetTitle, string.Format("M{0}", i + 18)), out canceled); if (canceled) return true; if (crew.CrewMemberIdentityDocumentIssuingState.IsNullOrEmpty() && isOldVersion) @@ -2132,11 +2132,7 @@ namespace ENI2.Excel if (!crew.CrewMemberIdentityDocumentExpiryDate.HasValue && isOldVersion) crew.CrewMemberIdentityDocumentExpiryDate = new DateTime(2100, 12, 31); - crew.Effects = reader.ReadCellAsText("2. PORT", string.Format("C{0}", i + 142)); - if (crew.Effects.Length > 256) - crew.Effects = crew.Effects.Substring(0, 256); - - // crew.NotificationSchengen = crew.HasSchengenDetails; + crew.Effects = reader.ReadCellAsText("2. PORT", string.Format("C{0}", i + 142), 256); Util.UIHelper.SetBusyState(); // dialog might reset busy state } @@ -2208,7 +2204,7 @@ namespace ENI2.Excel for (int i = 0; i < 5000; i++) { - string lastName = reader.ReadCellAsText(sheetTitle, string.Format("C{0}", i + 18)); + string lastName = reader.ReadCellAsText(sheetTitle, string.Format("C{0}", i + 18), 100); if (lastName.IsNullOrEmpty()) break; if (!(crewdMessage.GetSublistElementWithIdentifier((i + 1).ToString()) is CREWD crewd)) @@ -2223,32 +2219,30 @@ namespace ENI2.Excel crewd.NotificationSchengen = true; crewd.NotificationPAX = notificationPax ?? false; crewd.CrewMemberLastName = lastName; - crewd.CrewMemberFirstName = reader.ReadCellAsText(sheetTitle, string.Format("D{0}", i + 18)); + crewd.CrewMemberFirstName = reader.ReadCellAsText(sheetTitle, string.Format("D{0}", i + 18), 100); crewd.CrewMemberGender = ReadGender(reader.ReadCellAsText(sheetTitle, string.Format("E{0}", i + 18)), out bool canceled); if (canceled) return true; - crewd.CrewMemberDuty = reader.ReadCellAsText(sheetTitle, string.Format("F{0}", i + 18)); + crewd.CrewMemberDuty = reader.ReadCellAsText(sheetTitle, string.Format("F{0}", i + 18), 100); crewd.CrewMemberNationality = ReadNationality(reader.ReadCellAsText(sheetTitle, string.Format("G{0}", i + 18)), out canceled); if (canceled) return true; - crewd.CrewMemberPlaceOfBirth = reader.ReadCellAsText(sheetTitle, string.Format("H{0}", i + 18)); + crewd.CrewMemberPlaceOfBirth = reader.ReadCellAsText(sheetTitle, string.Format("H{0}", i + 18), 100); crewd.CrewMemberCountryOfBirth = ReadNationality(reader.ReadCellAsText(sheetTitle, string.Format("I{0}", i + 18)), out _); crewd.CrewMemberDateOfBirth = reader.ReadCellAsDateTime(sheetTitle, string.Format("J{0}", i + 18)); crewd.CrewMemberIdentityDocumentType = ReadDocumentType(reader.ReadCellAsText(sheetTitle, string.Format("K{0}", i + 18)), out canceled); if (canceled) return true; - crewd.CrewMemberIdentityDocumentId = reader.ReadCellAsText(sheetTitle, string.Format("L{0}", i + 18)); - crewd.CrewMemberVisaNumber = reader.ReadCellAsText(sheetTitle, string.Format("O{0}", i + 18)); + crewd.CrewMemberIdentityDocumentId = reader.ReadCellAsText(sheetTitle, string.Format("L{0}", i + 18), 100); + crewd.CrewMemberVisaNumber = reader.ReadCellAsText(sheetTitle, string.Format("O{0}", i + 18), 100); crewd.CrewMemberIdentityDocumentIssuingState = ReadNationality(reader.ReadCellAsText(sheetTitle, string.Format("M{0}", i + 18)), out canceled); if (canceled) return true; if (crewd.CrewMemberIdentityDocumentIssuingState.IsNullOrEmpty()) crewd.CrewMemberIdentityDocumentIssuingState = "XX"; crewd.CrewMemberIdentityDocumentExpiryDate = reader.ReadCellAsDateTime(sheetTitle, string.Format("N{0}", i + 18)) ?? (DateTime?)new DateTime(2100, 12, 31); - crewd.Effects = reader.ReadCellAsText("2. PORT", string.Format("C{0}", i + 142)); - - // crewd.NotificationSchengen = crewd.HasSchengenDetails; + crewd.Effects = reader.ReadCellAsText("2. PORT", string.Format("C{0}", i + 142), 256); Util.UIHelper.SetBusyState(); // dialog might reset busy state } @@ -2321,8 +2315,8 @@ namespace ENI2.Excel for (int i = 0; i < 5000; i++) { - string lastName = reader.ReadCellAsText(sheetTitle, string.Format("C{0}", i + 17)); - string firstName = reader.ReadCellAsText(sheetTitle, string.Format("D{0}", i + 17)); + string lastName = reader.ReadCellAsText(sheetTitle, string.Format("C{0}", i + 17), 100); + string firstName = reader.ReadCellAsText(sheetTitle, string.Format("D{0}", i + 17), 100); if (lastName.IsNullOrEmpty() && firstName.IsNullOrEmpty()) break; // finish after reading last row PAS pas = new PAS(); @@ -2351,7 +2345,7 @@ namespace ENI2.Excel pas.PassengerInTransit = reader.ReadCellAsBool(sheetTitle, string.Format("H{0}", i + 17)); - pas.PassengerPlaceOfBirth = reader.ReadCellAsText(sheetTitle, string.Format("J{0}", i + 17)); + pas.PassengerPlaceOfBirth = reader.ReadCellAsText(sheetTitle, string.Format("J{0}", i + 17), 100); pas.PassengerCountryOfBirth = ReadNationality(reader.ReadCellAsText(sheetTitle, string.Format("K{0}", i + 17)), out _); if (canceled) return true; @@ -2360,13 +2354,13 @@ namespace ENI2.Excel pas.PassengerIdentityDocumentType = ReadDocumentType(reader.ReadCellAsText(sheetTitle, string.Format("M{0}", i + 17)), out canceled); if (canceled) return true; - pas.PassengerIdentityDocumentId = reader.ReadCellAsText(sheetTitle, string.Format("N{0}", i + 17)); + pas.PassengerIdentityDocumentId = reader.ReadCellAsText(sheetTitle, string.Format("N{0}", i + 17), 100); pas.PassengerIdentityDocumentExpiryDate = reader.ReadCellAsDateTime(sheetTitle, string.Format("P{0}", i + 17)) ?? (DateTime?)new DateTime(2100, 12, 31); - pas.PassengerVisaNumber = reader.ReadCellAsText(sheetTitle, string.Format("Q{0}", i + 17)); - pas.EmergencyCare = reader.ReadCellAsText(sheetTitle, string.Format("R{0}", i + 17)); - pas.EmergencyContactNumber = reader.ReadCellAsText(sheetTitle, string.Format("S{0}", i + 17)); + pas.PassengerVisaNumber = reader.ReadCellAsText(sheetTitle, string.Format("Q{0}", i + 17), 100); + pas.EmergencyCare = reader.ReadCellAsText(sheetTitle, string.Format("R{0}", i + 17), 255); + pas.EmergencyContactNumber = reader.ReadCellAsText(sheetTitle, string.Format("S{0}", i + 17), 99); // pas.NotificationSchengen = pas.HasSchengenDetails; @@ -2458,8 +2452,8 @@ namespace ENI2.Excel for (int i = 0; i < 5000; i++) { - string lastName = reader.ReadCellAsText(sheetTitle, string.Format("C{0}", i + 18)); - string firstName = reader.ReadCellAsText(sheetTitle, string.Format("D{0}", i + 18)); + string lastName = reader.ReadCellAsText(sheetTitle, string.Format("C{0}", i + 18), 100); + string firstName = reader.ReadCellAsText(sheetTitle, string.Format("D{0}", i + 18), 100); if (lastName.IsNullOrEmpty() && firstName.IsNullOrEmpty()) break; // finish after reading last row PASD pas = new PASD(); @@ -2489,7 +2483,7 @@ namespace ENI2.Excel pas.PassengerInTransit = reader.ReadCellAsBool(sheetTitle, string.Format("H{0}", i + 18)); - pas.PassengerPlaceOfBirth = reader.ReadCellAsText(sheetTitle, string.Format("J{0}", i + 18)); + pas.PassengerPlaceOfBirth = reader.ReadCellAsText(sheetTitle, string.Format("J{0}", i + 18), 100); pas.PassengerCountryOfBirth = ReadNationality(reader.ReadCellAsText(sheetTitle, string.Format("K{0}", i + 18)), out _); if (canceled) return true; @@ -2498,13 +2492,13 @@ namespace ENI2.Excel pas.PassengerIdentityDocumentType = ReadDocumentType(reader.ReadCellAsText(sheetTitle, string.Format("M{0}", i + 18)), out canceled); if (canceled) return true; - pas.PassengerIdentityDocumentId = reader.ReadCellAsText(sheetTitle, string.Format("N{0}", i + 18)); + pas.PassengerIdentityDocumentId = reader.ReadCellAsText(sheetTitle, string.Format("N{0}", i + 18), 100); pas.PassengerIdentityDocumentExpiryDate = reader.ReadCellAsDateTime(sheetTitle, string.Format("P{0}", i + 18)) ?? (DateTime?)new DateTime(2100, 12, 31); - pas.PassengerVisaNumber = reader.ReadCellAsText(sheetTitle, string.Format("Q{0}", i + 18)); - pas.EmergencyCare = reader.ReadCellAsText(sheetTitle, string.Format("R{0}", i + 18)); - pas.EmergencyContactNumber = reader.ReadCellAsText(sheetTitle, string.Format("S{0}", i + 18)); + pas.PassengerVisaNumber = reader.ReadCellAsText(sheetTitle, string.Format("Q{0}", i + 18), 100); + pas.EmergencyCare = reader.ReadCellAsText(sheetTitle, string.Format("R{0}", i + 18), 255); + pas.EmergencyContactNumber = reader.ReadCellAsText(sheetTitle, string.Format("S{0}", i + 18), 99); // pas.NotificationSchengen = pas.HasSchengenDetails; From 932be48c24a7c28c99042bf457b115a2499a1577 Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Thu, 7 Dec 2023 09:32:36 +0100 Subject: [PATCH 3/5] Fixed counting of message classes --- bsmd.database/DBManager.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bsmd.database/DBManager.cs b/bsmd.database/DBManager.cs index 37ffa73f..b13f2a8e 100644 --- a/bsmd.database/DBManager.cs +++ b/bsmd.database/DBManager.cs @@ -1526,11 +1526,12 @@ namespace bsmd.database if (core == null) return; using (SqlCommand cmd = new SqlCommand()) { - cmd.CommandText = "SELECT COUNT(*) FROM MessageHeader WHERE MessageHeader.MessageCoreId = @ID AND ((MessageHeader.NotificationClass > 1 AND MessageHeader.NotificationClass < 28) OR MessageHeader.NotificationClass > 30)"; + // count all message classes except VISIT, TRANSIT and STO + cmd.CommandText = "SELECT COUNT(*) FROM MessageHeader WHERE MessageHeader.MessageCoreId = @ID AND (MessageHeader.NotificationClass > 1 AND MessageHeader.NotificationClass != 28)"; cmd.Parameters.AddWithValue("@ID", core.Id); int total = this.PerformReadIntQuery(cmd) ?? 0; - cmd.CommandText = "SELECT COUNT(*) FROM MessageHeader WHERE MessageHeader.MessageCoreId = @ID AND MessageHeader.BSMDStatus = 5 AND ((MessageHeader.NotificationClass > 1 AND MessageHeader.NotificationClass < 28) OR MessageHeader.NotificationClass > 30)"; // compare "CONFIRMED" + cmd.CommandText = "SELECT COUNT(*) FROM MessageHeader WHERE MessageHeader.MessageCoreId = @ID AND MessageHeader.BSMDStatus = 5 AND (MessageHeader.NotificationClass > 1 AND MessageHeader.NotificationClass != 28)"; // compare "CONFIRMED" int sent = this.PerformReadIntQuery(cmd) ?? 0; core.NumberSentDisplay = string.Format("{0}/{1}", sent, total); From f9ddd2c48edd3825a3f5b4d14d726d0cec8fb08c Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Thu, 7 Dec 2023 09:36:08 +0100 Subject: [PATCH 4/5] increased deployment version --- ENI2/ENI2.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj index 3d9a1615..bd141e09 100644 --- a/ENI2/ENI2.csproj +++ b/ENI2/ENI2.csproj @@ -36,8 +36,8 @@ 5.4.0.0 true publish.html - 9 - 7.2.0.9 + 0 + 7.2.1.0 false true true From 6c0353741c31dec9e0fa7e0059aba9876248c248 Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Mon, 11 Dec 2023 08:56:04 +0100 Subject: [PATCH 5/5] Release changes --- ENI2/App.config | 9 ++---- ENI2/ENI2.csproj | 8 +++--- ENI2/EditControls/CompareExcelDialog.xaml | 4 +-- ENI2/EditControls/CopyDeclarationDialog.xaml | 23 ++++++++-------- ENI2/EditControls/CoreStatusInfoDialog.xaml | 4 +-- ENI2/EditControls/EditRulesDialog.xaml | 6 ++-- ENI2/EditControls/ErrorListDialog.xaml | 2 +- ENI2/EditControls/MessageHistoryDialog.xaml | 6 ++-- ENI2/EditControls/NewDGItemDialog.xaml | 6 ++-- ENI2/EditControls/NewWithIdDialog.xaml | 26 +++++++++--------- ENI2/EditControls/SelectPortAreaDialog.xaml | 4 +-- ENI2/EditControls/ViolationListDialog.xaml | 4 +-- ENI2/EditControls/VisitIdDialog.xaml | 24 ++++++++-------- ENI2/MainWindow.xaml | 2 +- ENI2/Resources/EUREPORT.png | Bin 42234 -> 39708 bytes .../bsmd.LockingService.csproj.user | 2 +- .../Properties/AssemblyProductInfo.cs | 2 +- .../Properties/AssemblyProjectInfo.cs | 2 +- 18 files changed, 65 insertions(+), 69 deletions(-) diff --git a/ENI2/App.config b/ENI2/App.config index c4795a17..4c7c4bc1 100644 --- a/ENI2/App.config +++ b/ENI2/App.config @@ -26,20 +26,17 @@ 1000 - http://192.168.2.24/LockingService/LockingService.svc - - - BSMD ReportGenerator + http://192.168.2.24/LockingService/LockingService.svc - Initial Catalog=nswtest;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false + Initial Catalog=nsw;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false - + diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj index bd141e09..f00bde73 100644 --- a/ENI2/ENI2.csproj +++ b/ENI2/ENI2.csproj @@ -8,7 +8,7 @@ WinExe Properties ENI2 - ENI2Test + ENI2 v4.8 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} @@ -18,7 +18,7 @@ - eni_test\ + eni2.publish\ true Web true @@ -28,9 +28,9 @@ false false true - http://192.168.2.24/eni_test/ + http://192.168.2.24/eni2.publish/ http://www.textbausteine.net/ - ENI Testversion + ENI Informatikbüro Daniel Schick NSW 5.4.0.0 diff --git a/ENI2/EditControls/CompareExcelDialog.xaml b/ENI2/EditControls/CompareExcelDialog.xaml index e77d7a89..c789a0dc 100644 --- a/ENI2/EditControls/CompareExcelDialog.xaml +++ b/ENI2/EditControls/CompareExcelDialog.xaml @@ -4,11 +4,11 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:ENI2.EditControls" - xmlns:enictrl="clr-namespace:ENI2.Controls" + xmlns:enictrl="clr-namespace:ENI2.Controls" xmlns:p="clr-namespace:ENI2.Properties" xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit" mc:Ignorable="d" - Title="{x:Static p:Resources.textCompareExcel}" Height="260" Width="600" Background="AliceBlue" Icon="/ENI2Test;component/Resources/bullet_ball_grey.ico"> + Title="{x:Static p:Resources.textCompareExcel}" Height="260" Width="600" Background="AliceBlue" Icon="/ENI2;component/Resources/bullet_ball_grey.ico"> diff --git a/ENI2/EditControls/CopyDeclarationDialog.xaml b/ENI2/EditControls/CopyDeclarationDialog.xaml index d6e59748..b1ef8f29 100644 --- a/ENI2/EditControls/CopyDeclarationDialog.xaml +++ b/ENI2/EditControls/CopyDeclarationDialog.xaml @@ -4,11 +4,11 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:ENI2.EditControls" - xmlns:enictrl="clr-namespace:ENI2.Controls" + xmlns:enictrl="clr-namespace:ENI2.Controls" xmlns:p="clr-namespace:ENI2.Properties" xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit" mc:Ignorable="d" - Title="{x:Static p:Resources.textCopyDeclaration}" Height="326" Width="440" WindowStyle="SingleBorderWindow" Background="AliceBlue" ResizeMode="NoResize" Icon="/ENI2Test;component/Resources/id_cards.ico"> + Title="{x:Static p:Resources.textCopyDeclaration}" Height="326" Width="440" WindowStyle="SingleBorderWindow" Background="AliceBlue" ResizeMode="NoResize" Icon="/ENI2;component/Resources/id_cards.ico"> @@ -34,28 +34,28 @@ - \ No newline at end of file diff --git a/ENI2/EditControls/CoreStatusInfoDialog.xaml b/ENI2/EditControls/CoreStatusInfoDialog.xaml index b09b092d..8dc5339f 100644 --- a/ENI2/EditControls/CoreStatusInfoDialog.xaml +++ b/ENI2/EditControls/CoreStatusInfoDialog.xaml @@ -8,7 +8,7 @@ xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit" xmlns:p="clr-namespace:ENI2.Properties" mc:Ignorable="d" - Title="{x:Static p:Resources.textCoreStatus}" Height="436" Width="600" WindowStyle="SingleBorderWindow" Background="AliceBlue" Icon="/ENI2Test;component/Resources/bullet_ball_grey.ico" > + Title="{x:Static p:Resources.textCoreStatus}" Height="436" Width="600" WindowStyle="SingleBorderWindow" Background="AliceBlue" Icon="/ENI2;component/Resources/bullet_ball_grey.ico" > @@ -22,7 +22,7 @@ - +