diff --git a/Order/OrderVM.vb b/Order/OrderVM.vb index 8a1ed35..8d46136 100644 --- a/Order/OrderVM.vb +++ b/Order/OrderVM.vb @@ -66,10 +66,18 @@ Public Class OrderVM End Get End Property + Private Function VerifyNotIsNothing() As Boolean + If IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName) OrElse + IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.SelAssembly) OrElse + Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.SelAssembly.ListPartDoor.Count > 0 Then + Return False + End If + Return True + End Function + Public Property Customer As String Get - If IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName) AndAlso - Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.SelAssembly.ListPartDoor.Count > 0 Then Return Nothing + If Not VerifyNotIsNothing() Then Return Nothing Return Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.SelAssembly.ListPartDoor(0).Door.Customer End Get Set(value As String) @@ -83,8 +91,7 @@ Public Class OrderVM Public Property Elevation As String Get - If IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName) AndAlso - Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.SelAssembly.ListPartDoor.Count > 0 Then Return Nothing + If Not VerifyNotIsNothing() Then Return Nothing Return Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.SelAssembly.ListPartDoor(0).Door.Elevation End Get Set(value As String) @@ -98,8 +105,7 @@ Public Class OrderVM Public Property Project As String Get - If IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName) AndAlso - Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.SelAssembly.ListPartDoor.Count > 0 Then Return Nothing + If Not VerifyNotIsNothing() Then Return Nothing Return Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.SelAssembly.ListPartDoor(0).Door.Project End Get Set(value As String) @@ -113,8 +119,7 @@ Public Class OrderVM Public Property PO As String Get - If IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName) AndAlso - Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.SelAssembly.ListPartDoor.Count > 0 Then Return Nothing + If Not VerifyNotIsNothing() Then Return Nothing Return Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.SelAssembly.ListPartDoor(0).Door.PO End Get Set(value As String) @@ -128,8 +133,7 @@ Public Class OrderVM Public Property Line As String Get - If IsNothing(Map.refAssemblyManagerVM.CurrProject.SelAssemblyName) AndAlso - Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.SelAssembly.ListPartDoor.Count > 0 Then Return Nothing + If Not VerifyNotIsNothing() Then Return Nothing Return Map.refAssemblyManagerVM.CurrProject.SelAssemblyName.SelAssembly.ListPartDoor(0).Door.Line End Get Set(value As String)