Merge remote-tracking branch 'origin/nick' into frank

prs.classes/Entities/Job/JobBillOfMaterials.cs

@@ -1,19 +1,24 @@
 using System;
+using System.Linq.Expressions;
 using InABox.Core;
 
 namespace Comal.Classes
 {
-    public class JobBillOfMaterials : Entity, IRemotable, IPersistent, IOneToMany<Job>, ISequenceable, ILicense<ProjectManagementLicense>
+    public class JobBillOfMaterials : Entity, IRemotable, IPersistent, IOneToMany<Job>, ISequenceable, ILicense<ProjectManagementLicense>, INumericAutoIncrement<JobBillOfMaterials>
     {
         [NullEditor]
         [EntityRelationship(DeleteAction.Cascade)]
         public JobLink Job { get; set; }
 
+        [IntegerEditor(Visible = Visible.Default, Editable = Editable.Disabled)]
         [EditorSequence(1)]
+        public int Number { get; set; }
+
+        [EditorSequence(2)]
         public string Description { get; set; }
 
         [TimestampEditor]
-        [EditorSequence(2)]
+        [EditorSequence(3)]
         [LoggableProperty]
         public DateTime Approved { get; set; }
 
@@ -23,6 +28,16 @@ namespace Comal.Classes
         [MemoEditor]
         public string Notes { get; set; }
 
+        public Expression<Func<JobBillOfMaterials, int>> AutoIncrementField()
+        {
+            return x => x.Number;
+        }
+
+        public Filter<JobBillOfMaterials> AutoIncrementFilter()
+        {
+            return new Filter<JobBillOfMaterials>(x => x.Job.ID).IsEqualTo(Job.ID);
+        }
+
         protected override void Init()
         {
             base.Init();

prs.classes/Entities/Job/JobBillOfMaterialsItem.cs

@@ -52,6 +52,8 @@ namespace Comal.Classes
 
         public PurchaseOrderItemLink PurchaseOrderItem { get; set; }
 
+        public ManufacturingPacketLink Packet { get; set; }
+
         protected override void Init()
         {
             base.Init();
@@ -61,6 +63,7 @@ namespace Comal.Classes
             Style = new ProductStyleLink();
             PurchaseOrderItem = new PurchaseOrderItemLink();
             Supplier = new SupplierLink();
+            Packet = new ManufacturingPacketLink();
         }
         
         static JobBillOfMaterialsItem()

prs.mobile.new/PRS.Mobile.sln

@@ -33,7 +33,7 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "InABox.Mobile.Android", "..
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "InABox.Mobile.iOS", "..\..\inabox\InABox.Mobile\InABox.Mobile.iOS\InABox.Mobile.iOS.shproj", "{DAA14944-1DA1-4E7A-B9D2-A6545EBBF2FF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "websocket-sharp", "..\..\3rdpartylibs\websocket-sharp-master\websocket-sharp\websocket-sharp.csproj", "{B357BAC7-529E-4D81-A0D2-71041B19C8DE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "websocket-sharp-standard", "..\..\3rdpartylibs\websocket-sharp-master\websocket-sharp-standard\websocket-sharp-standard.csproj", "{9A7C1E4B-1774-4900-9BCE-9CD7BCF405CF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -239,22 +239,22 @@ Global
 		{C4F5BF06-CAB8-47CF-8B0A-FF3406081781}.Release|iPhone.Build.0 = Release|Any CPU
 		{C4F5BF06-CAB8-47CF-8B0A-FF3406081781}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{C4F5BF06-CAB8-47CF-8B0A-FF3406081781}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{B357BAC7-529E-4D81-A0D2-71041B19C8DE}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{B357BAC7-529E-4D81-A0D2-71041B19C8DE}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{B357BAC7-529E-4D81-A0D2-71041B19C8DE}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{B357BAC7-529E-4D81-A0D2-71041B19C8DE}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{B357BAC7-529E-4D81-A0D2-71041B19C8DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B357BAC7-529E-4D81-A0D2-71041B19C8DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B357BAC7-529E-4D81-A0D2-71041B19C8DE}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{B357BAC7-529E-4D81-A0D2-71041B19C8DE}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{B357BAC7-529E-4D81-A0D2-71041B19C8DE}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{B357BAC7-529E-4D81-A0D2-71041B19C8DE}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{B357BAC7-529E-4D81-A0D2-71041B19C8DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B357BAC7-529E-4D81-A0D2-71041B19C8DE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B357BAC7-529E-4D81-A0D2-71041B19C8DE}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{B357BAC7-529E-4D81-A0D2-71041B19C8DE}.Release|iPhone.Build.0 = Release|Any CPU
-		{B357BAC7-529E-4D81-A0D2-71041B19C8DE}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{B357BAC7-529E-4D81-A0D2-71041B19C8DE}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{9A7C1E4B-1774-4900-9BCE-9CD7BCF405CF}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{9A7C1E4B-1774-4900-9BCE-9CD7BCF405CF}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{9A7C1E4B-1774-4900-9BCE-9CD7BCF405CF}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{9A7C1E4B-1774-4900-9BCE-9CD7BCF405CF}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{9A7C1E4B-1774-4900-9BCE-9CD7BCF405CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9A7C1E4B-1774-4900-9BCE-9CD7BCF405CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9A7C1E4B-1774-4900-9BCE-9CD7BCF405CF}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{9A7C1E4B-1774-4900-9BCE-9CD7BCF405CF}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{9A7C1E4B-1774-4900-9BCE-9CD7BCF405CF}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{9A7C1E4B-1774-4900-9BCE-9CD7BCF405CF}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{9A7C1E4B-1774-4900-9BCE-9CD7BCF405CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9A7C1E4B-1774-4900-9BCE-9CD7BCF405CF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9A7C1E4B-1774-4900-9BCE-9CD7BCF405CF}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{9A7C1E4B-1774-4900-9BCE-9CD7BCF405CF}.Release|iPhone.Build.0 = Release|Any CPU
+		{9A7C1E4B-1774-4900-9BCE-9CD7BCF405CF}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{9A7C1E4B-1774-4900-9BCE-9CD7BCF405CF}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{2E807D8C-659F-464D-89FE-3889019BE8EA} = {45D05CAD-26CA-4F1F-86F1-560B0C7C5177}
@@ -270,6 +270,6 @@ Global
 		{C4F5BF06-CAB8-47CF-8B0A-FF3406081781} = {0FAD249B-2C90-4ABC-B14D-8D1C44D071C2}
 		{DF11E3A5-F670-4B09-AD37-01D9ED5ED3BA} = {0FAD249B-2C90-4ABC-B14D-8D1C44D071C2}
 		{DAA14944-1DA1-4E7A-B9D2-A6545EBBF2FF} = {0FAD249B-2C90-4ABC-B14D-8D1C44D071C2}
-		{B357BAC7-529E-4D81-A0D2-71041B19C8DE} = {D70FB71D-5C9D-44FC-AF66-3B9A23AD7FFD}
+		{9A7C1E4B-1774-4900-9BCE-9CD7BCF405CF} = {D70FB71D-5C9D-44FC-AF66-3B9A23AD7FFD}
 	EndGlobalSection
 EndGlobal