diff --git a/Controllers/building_four.Controller.cs b/Controllers/building_four.Controller.cs index 2f55e6b..6f18dbd 100644 --- a/Controllers/building_four.Controller.cs +++ b/Controllers/building_four.Controller.cs @@ -56,32 +56,37 @@ namespace rmutr_report.Controllers } - foreach (var bb in building_fours.material_construction_labor) + foreach (var bb in building_fours.material_construction_labor1) { if (bb != null) { - // var a = building_fours.material_construction_labor.Where(d => d.amount == d.amount) - // .Sum(o => o.amount); - // building_fours.material_amount = a; - // var b = building_fours.material_construction_labor.Where(d => d.material_unit == d.material_unit) - // .Sum(o => o.material_unit); - // building_fours.material_unit = b; - // var c = building_fours.material_construction_labor.Where(d => d.material_cost == d.material_cost) - // .Sum(o => o.material_cost); - // building_fours.material_cost = c; - // var d = building_fours.material_construction_labor.Where(d => d.labor_unit == d.labor_unit) - // .Sum(o => o.labor_unit); - // building_fours.labor_unit = d; - // var e = building_fours.material_construction_labor.Where(d => d.labor_cost == d.labor_cost) - // .Sum(o => o.labor_cost); - // building_fours.labor_cost = e; bb.total_amount = bb.material_cost + bb.labor_unit; - var f = building_fours.material_construction_labor.Where(d => d.total_amount == d.total_amount) + var f = building_fours.material_construction_labor1.Where(d => d.total_amount == d.total_amount) .Sum(o => o.total_amount); - building_fours.material_total_amount = f; + building_fours.material_total_amount1 = f; } - - foreach (var cc in building_fours.budget_limit) + } + foreach (var bb in building_fours.material_construction_labor2) + { + if (bb != null) + { + bb.total_amount = bb.material_cost + bb.labor_unit; + var f = building_fours.material_construction_labor2.Where(d => d.total_amount == d.total_amount) + .Sum(o => o.total_amount); + building_fours.material_total_amount2 = f; + } + } + foreach (var bb in building_fours.material_construction_labor3) + { + if (bb != null) + { + bb.total_amount = bb.material_cost + bb.labor_unit; + var f = building_fours.material_construction_labor3.Where(d => d.total_amount == d.total_amount) + .Sum(o => o.total_amount); + building_fours.material_total_amount3 = f; + } + } + foreach (var cc in building_fours.budget_limit) { if (cc != null) { @@ -106,9 +111,6 @@ namespace rmutr_report.Controllers } } - - } - foreach (var boqPrice in building_fours.boq) { if (boqPrice.is_data == "1") diff --git a/Models/budget/building_four.cs b/Models/budget/building_four.cs index a10a92c..76b6748 100644 --- a/Models/budget/building_four.cs +++ b/Models/budget/building_four.cs @@ -40,9 +40,13 @@ namespace rmutr_report.Models public List spending_plan { get; set; } public string budget_spending_plan_year { get; set; } //public decimal? spending_plan_amount { get; set; } - public List material_construction_labor{ get; set; } + public List material_construction_labor1 { get; set; } + public List material_construction_labor2 { get; set; } + public List material_construction_labor3 { get; set; } public string url_file { get; set; } - public decimal? material_total_amount { get; set; } + public decimal? material_total_amount1 { get; set; } + public decimal? material_total_amount2 { get; set; } + public decimal? material_total_amount3 { get; set; } public decimal? full_limit { get; set; } public decimal? national_budget { get; set; } public decimal? income_budget { get; set; } diff --git a/obj/project.assets.json b/obj/project.assets.json index 5801ce9..156a5b2 100644 --- a/obj/project.assets.json +++ b/obj/project.assets.json @@ -2665,13 +2665,12 @@ "configFilePaths": [ "C:\\Users\\Mercedes Benz\\Documents\\rmutr_report\\NuGet.Config", "C:\\Users\\Mercedes Benz\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" + "C:\\Program Files (x86)\\NuGet\\Config\\nuget.config" ], "originalTargetFrameworks": [ "net5.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, "https://api.nuget.org/v3/index.json": {}, "https://nuget.71dev.com/v3/index.json": {}, "https://nuget.71dev.com/v3/index.json": {} diff --git a/obj/project.packagespec.json b/obj/project.packagespec.json index a929f13..0eb899c 100644 --- a/obj/project.packagespec.json +++ b/obj/project.packagespec.json @@ -1 +1 @@ -"restore":{"projectUniqueName":"C:\\Users\\Mercedes Benz\\Documents\\rmutr_report\\rmutr-report.csproj","projectName":"rmutr-report","projectPath":"C:\\Users\\Mercedes Benz\\Documents\\rmutr_report\\rmutr-report.csproj","outputPath":"C:\\Users\\Mercedes Benz\\Documents\\rmutr_report\\obj\\","projectStyle":"PackageReference","originalTargetFrameworks":["net5.0"],"sources":{"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\":{},"https://api.nuget.org/v3/index.json":{},"https://nuget.71dev.com/v3/index.json":{},"https://nuget.71dev.com/v3/index.json":{}},"frameworks":{"net5.0":{"targetAlias":"net5.0","projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]}}"frameworks":{"net5.0":{"targetAlias":"net5.0","dependencies":{"ClosedXML":{"target":"Package","version":"[0.96.0, )"},"ExcelDataReader":{"target":"Package","version":"[3.7.0-develop00310, )"},"FastReport.Core":{"target":"Package","version":"[2021.3.0, )"},"SeventyOneDev.Utilities":{"target":"Package","version":"[1.10.12, )"},"Swashbuckle.AspNetCore":{"target":"Package","version":"[5.6.3, )"},"Swashbuckle.AspNetCore.Annotations":{"target":"Package","version":"[6.0.7, )"}},"imports":["net461","net462","net47","net471","net472","net48"],"assetTargetFallback":true,"warn":true,"downloadDependencies":[{"name":"Microsoft.NETCore.App.Host.win-x64","version":"[5.0.17, 5.0.17]"}],"frameworkReferences":{"Microsoft.AspNetCore.App":{"privateAssets":"none"},"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\6.0.302\\RuntimeIdentifierGraph.json"}} \ No newline at end of file +"restore":{"projectUniqueName":"C:\\Users\\Mercedes Benz\\Documents\\rmutr_report\\rmutr-report.csproj","projectName":"rmutr-report","projectPath":"C:\\Users\\Mercedes Benz\\Documents\\rmutr_report\\rmutr-report.csproj","outputPath":"C:\\Users\\Mercedes Benz\\Documents\\rmutr_report\\obj\\","projectStyle":"PackageReference","originalTargetFrameworks":["net5.0"],"sources":{"https://api.nuget.org/v3/index.json":{},"https://nuget.71dev.com/v3/index.json":{},"https://nuget.71dev.com/v3/index.json":{}},"frameworks":{"net5.0":{"targetAlias":"net5.0","projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]}}"frameworks":{"net5.0":{"targetAlias":"net5.0","dependencies":{"ClosedXML":{"target":"Package","version":"[0.96.0, )"},"ExcelDataReader":{"target":"Package","version":"[3.7.0-develop00310, )"},"FastReport.Core":{"target":"Package","version":"[2021.3.0, )"},"SeventyOneDev.Utilities":{"target":"Package","version":"[1.10.12, )"},"Swashbuckle.AspNetCore":{"target":"Package","version":"[5.6.3, )"},"Swashbuckle.AspNetCore.Annotations":{"target":"Package","version":"[6.0.7, )"}},"imports":["net461","net462","net47","net471","net472","net48"],"assetTargetFallback":true,"warn":true,"downloadDependencies":[{"name":"Microsoft.NETCore.App.Host.win-x64","version":"[5.0.17, 5.0.17]"}],"frameworkReferences":{"Microsoft.AspNetCore.App":{"privateAssets":"none"},"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\6.0.302\\RuntimeIdentifierGraph.json"}} \ No newline at end of file diff --git a/obj/rider.project.restore.info b/obj/rider.project.restore.info index 069bdc3..513b337 100644 --- a/obj/rider.project.restore.info +++ b/obj/rider.project.restore.info @@ -1 +1 @@ -16762520045325433 \ No newline at end of file +16796226593396122 \ No newline at end of file diff --git a/obj/rmutr-report.csproj.nuget.dgspec.json b/obj/rmutr-report.csproj.nuget.dgspec.json index 275e28a..9a039ba 100644 --- a/obj/rmutr-report.csproj.nuget.dgspec.json +++ b/obj/rmutr-report.csproj.nuget.dgspec.json @@ -16,13 +16,12 @@ "configFilePaths": [ "C:\\Users\\Mercedes Benz\\Documents\\rmutr_report\\NuGet.Config", "C:\\Users\\Mercedes Benz\\AppData\\Roaming\\NuGet\\NuGet.Config", - "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" + "C:\\Program Files (x86)\\NuGet\\Config\\nuget.config" ], "originalTargetFrameworks": [ "net5.0" ], "sources": { - "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, "https://api.nuget.org/v3/index.json": {}, "https://nuget.71dev.com/v3/index.json": {}, "https://nuget.71dev.com/v3/index.json": {} diff --git a/obj/rmutr-report.csproj.nuget.g.props b/obj/rmutr-report.csproj.nuget.g.props index 1d092b7..b9724c9 100644 --- a/obj/rmutr-report.csproj.nuget.g.props +++ b/obj/rmutr-report.csproj.nuget.g.props @@ -7,7 +7,7 @@ $(UserProfile)\.nuget\packages\ C:\Users\Mercedes Benz\.nuget\packages\ PackageReference - 6.3.1 + 6.4.0 diff --git a/wwwroot/reports/building_fours.frx b/wwwroot/reports/building_fours.frx index 52c6a17..c38da1e 100644 --- a/wwwroot/reports/building_fours.frx +++ b/wwwroot/reports/building_fours.frx @@ -1,7 +1,29 @@  - + + using System; +using System.Collections; +using System.Collections.Generic; +using System.ComponentModel; +using System.Windows.Forms; +using System.Drawing; +using System.Data; +using FastReport; +using FastReport.Data; +using FastReport.Dialog; +using FastReport.Barcode; +using FastReport.Table; +using FastReport.Utils; + +namespace FastReport +{ + public class ReportScript + { + + } +} + - + @@ -33,23 +55,25 @@ - + + + - + - + - + @@ -57,7 +81,7 @@ - + @@ -67,22 +91,22 @@ - + - + - + - + - + @@ -90,7 +114,7 @@ - + @@ -106,7 +130,7 @@ - + @@ -121,7 +145,29 @@ - + + + + + + + + + + + + + + + + + + + + + + + @@ -133,11 +179,11 @@ - + - + @@ -532,7 +578,7 @@ - + @@ -546,48 +592,233 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +