Forráskód Böngészése

Removed coalescing from the If condition for COmplexFormulae

Kenric Nugteren 3 hete
szülő
commit
46e7b89cb6

+ 1 - 2
prs.classes/Entities/Job/Materials/JobMaterials.cs

@@ -184,8 +184,7 @@ namespace Comal.Classes
                     If<JobMaterial, string, decimal>(
                         Property<JobMaterial, string>(x => x.Dimensions.Unit.Conversion),
                         Condition.Equals,
-                        Constant<JobMaterial, string>(""),
-                        "")
+                        Constant<JobMaterial, string>(""))
                     .Then(TotalExplodedAllocations())
                     .Else(Formula(FormulaOperator.Divide,
                         TotalExplodedAllocations(),

+ 9 - 18
prs.classes/Entities/Job/Requisitions/JobRequisitionItem.cs

@@ -93,16 +93,14 @@ namespace Comal.Classes
                 If<JobRequisitionItem, DateTime, JobRequisitionItemStatus>(
                     Property<JobRequisitionItem,DateTime>(x => x.Cancelled),
                     Condition.NotEqual,
-                    Constant<JobRequisitionItem,DateTime>(DateTime.MinValue),
-                    DateTime.MinValue
+                    Constant<JobRequisitionItem,DateTime>(DateTime.MinValue)
                 ).Then(
                     Constant(JobRequisitionItemStatus.Cancelled)
                 ).Else(
                     If<JobRequisitionItem, DateTime, JobRequisitionItemStatus>(
                         Property<JobRequisitionItem,DateTime>(x => x.Archived),
                         Condition.NotEqual,
-                        Constant<JobRequisitionItem,DateTime>(DateTime.MinValue),
-                        DateTime.MinValue
+                        Constant<JobRequisitionItem,DateTime>(DateTime.MinValue)
                     ).Then(
                         Constant(JobRequisitionItemStatus.Archived)
                     ).Else(
@@ -155,8 +153,7 @@ namespace Comal.Classes
                 If<JobRequisitionItem, string, decimal>(
                     Property<JobRequisitionItem, string>(x => x.Dimensions.Unit.Conversion),
                     Condition.Equals,
-                    Constant<JobRequisitionItem, string>(""),
-                    ""
+                    Constant<JobRequisitionItem, string>("")
                 ).Then(
                     Aggregate<StockMovement>(AggregateCalculation.Sum, x => x.Property(x => x.Units))
                         .WithLink(x => x.JobRequisitionItem.ID, x => x.ID)
@@ -183,8 +180,7 @@ namespace Comal.Classes
                 If<JobRequisitionItem, string, decimal>(
                     Property<JobRequisitionItem, string>(x => x.Dimensions.Unit.Conversion),
                     Condition.Equals,
-                    Constant<JobRequisitionItem, string>(""),
-                    ""
+                    Constant<JobRequisitionItem, string>("")
                 ).Then(
                     Aggregate(
                             AggregateCalculation.Sum,
@@ -226,8 +222,7 @@ namespace Comal.Classes
                     If<JobRequisitionItem, string, decimal>(
                         Property<JobRequisitionItem, string>(x => x.Dimensions.Unit.Conversion),
                         Condition.Equals,
-                        Constant<JobRequisitionItem, string>(""),
-                        ""
+                        Constant<JobRequisitionItem, string>("")
                     )
                     .Then(
                         
@@ -266,8 +261,7 @@ namespace Comal.Classes
                 If<JobRequisitionItem, string, decimal>(
                     Property<JobRequisitionItem, string>(x => x.Dimensions.Unit.Conversion),
                     Condition.Equals,
-                    Constant<JobRequisitionItem, string>(""),
-                    ""
+                    Constant<JobRequisitionItem, string>("")
                 ).Then(
                     Aggregate(
                             AggregateCalculation.Sum,
@@ -330,8 +324,7 @@ namespace Comal.Classes
                         If<JobRequisitionItem, string, decimal>(
                             Property<JobRequisitionItem, string>(x => x.Dimensions.Unit.Conversion),
                             Condition.Equals,
-                            Constant<JobRequisitionItem, string>(""),
-                            ""
+                            Constant<JobRequisitionItem, string>("")
                         ).Then(
                             Aggregate<StockMovement>(
                                     AggregateCalculation.Sum,
@@ -364,8 +357,7 @@ namespace Comal.Classes
                 If<JobRequisitionItem, string, decimal>(
                     Property<JobRequisitionItem, string>(x => x.Dimensions.Unit.Conversion),
                     Condition.Equals,
-                    Constant<JobRequisitionItem, string>(""),
-                    ""
+                    Constant<JobRequisitionItem, string>("")
                 ).Then(
                     Aggregate<RequisitionItem>(
                             AggregateCalculation.Sum,
@@ -398,8 +390,7 @@ namespace Comal.Classes
                 If<JobRequisitionItem, string, decimal>(
                     Property<JobRequisitionItem, string>(x => x.Dimensions.Unit.Conversion),
                     Condition.Equals,
-                    Constant<JobRequisitionItem, string>(""),
-                    ""
+                    Constant<JobRequisitionItem, string>("")
                 ).Then(
                     Aggregate<StockMovement>(
                             AggregateCalculation.Sum,

+ 1 - 2
prs.classes/Entities/PurchaseOrder/ConsolidatedPurchaseOrderItem.cs

@@ -69,8 +69,7 @@ namespace Comal.Classes
                     ComplexFormulaGenerator.If<PurchaseOrderItemAllocation, string, decimal>(
                         ComplexFormulaGenerator.Property<PurchaseOrderItemAllocation, string>(x => x.Item.Dimensions.Unit.Conversion),
                         Condition.Equals,
-                        ComplexFormulaGenerator.Constant<PurchaseOrderItemAllocation, string>(""),
-                        "")
+                        ComplexFormulaGenerator.Constant<PurchaseOrderItemAllocation, string>(""))
                     .Then(ComplexFormulaGenerator.Property<PurchaseOrderItemAllocation, decimal>(x => x.Quantity))
                     .Else(ComplexFormulaGenerator.Formula(FormulaOperator.Divide,
                         ComplexFormulaGenerator.Property<PurchaseOrderItemAllocation, decimal>(x => x.Quantity),

+ 1 - 2
prs.classes/Entities/PurchaseOrder/PurchaseOrderItem.cs

@@ -62,8 +62,7 @@ namespace Comal.Classes
                 If<PurchaseOrderItem,string?,decimal>(
                         Property<PurchaseOrderItem,string?>(x=>x.Dimensions.Unit.Conversion),
                         Condition.Equals,
-                        Constant<PurchaseOrderItem,string?>(""),
-                        ""
+                        Constant<PurchaseOrderItem,string?>("")
                     )
                     .Then(
                         Aggregate<PurchaseOrderItem,PurchaseOrderItemAllocation, decimal>(