diff --git a/Controllers/kpi_performance_result.Controller.cs b/Controllers/kpi_performance_result.Controller.cs index 28f21de..e6e1def 100644 --- a/Controllers/kpi_performance_result.Controller.cs +++ b/Controllers/kpi_performance_result.Controller.cs @@ -46,7 +46,7 @@ namespace rmutr_report.Controllers ws.Cell("F2").Value = "ผู้รวบรวมและรายงาน"; ws.Cell("F2").Style.Font.Bold = true; ws.Cell("F2").Style.Border.OutsideBorder = XLBorderStyleValues.Thin; - ws.Cell("G2").Value = "แผนปี" + _kpi.plan_year.Substring(2,2); + ws.Cell("G2").Value = "แผนปี" + _kpi.plan_year;//.Substring(2,2); ws.Cell("G2").Style.Font.Bold = true; ws.Cell("G2").Style.Border.OutsideBorder = XLBorderStyleValues.Thin; ws.Cell("H2").Value = "ผลลัพธ์"; diff --git a/bin/Debug/net5.0/rmutr_report.dll b/bin/Debug/net5.0/rmutr_report.dll index 0644bac..236f85f 100644 Binary files a/bin/Debug/net5.0/rmutr_report.dll and b/bin/Debug/net5.0/rmutr_report.dll differ diff --git a/bin/Debug/net5.0/rmutr_report.pdb b/bin/Debug/net5.0/rmutr_report.pdb index 8a2c195..edf6ffe 100644 Binary files a/bin/Debug/net5.0/rmutr_report.pdb and b/bin/Debug/net5.0/rmutr_report.pdb differ diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.dll b/bin/Debug/netcoreapp3.1/rmutr_report.dll index ec6b373..1aebb18 100644 Binary files a/bin/Debug/netcoreapp3.1/rmutr_report.dll and b/bin/Debug/netcoreapp3.1/rmutr_report.dll differ diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.pdb b/bin/Debug/netcoreapp3.1/rmutr_report.pdb index 161db93..f38120a 100644 Binary files a/bin/Debug/netcoreapp3.1/rmutr_report.pdb and b/bin/Debug/netcoreapp3.1/rmutr_report.pdb differ diff --git a/obj/Debug/net5.0/ref/rmutr_report.dll b/obj/Debug/net5.0/ref/rmutr_report.dll index 9ad1157..6211224 100644 Binary files a/obj/Debug/net5.0/ref/rmutr_report.dll and b/obj/Debug/net5.0/ref/rmutr_report.dll differ diff --git a/obj/Debug/net5.0/refint/rmutr_report.dll b/obj/Debug/net5.0/refint/rmutr_report.dll index 9ad1157..6211224 100644 Binary files a/obj/Debug/net5.0/refint/rmutr_report.dll and b/obj/Debug/net5.0/refint/rmutr_report.dll differ diff --git a/obj/Debug/net5.0/rmutr_report.RazorTargetAssemblyInfo.cache b/obj/Debug/net5.0/rmutr_report.RazorTargetAssemblyInfo.cache index fb560e9..cbe55bb 100644 --- a/obj/Debug/net5.0/rmutr_report.RazorTargetAssemblyInfo.cache +++ b/obj/Debug/net5.0/rmutr_report.RazorTargetAssemblyInfo.cache @@ -1 +1 @@ -b75da1d35a4ca649b17d81186a0cb0b6010aa3ac +e70085a502f543e6f865dcae5f1f26615f0a238b62a14648a1d38a607a23489d diff --git a/obj/Debug/net5.0/rmutr_report.csproj.CoreCompileInputs.cache b/obj/Debug/net5.0/rmutr_report.csproj.CoreCompileInputs.cache index 204ba5d..fdfd4a9 100644 --- a/obj/Debug/net5.0/rmutr_report.csproj.CoreCompileInputs.cache +++ b/obj/Debug/net5.0/rmutr_report.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -01adf9e42f9a5cd189d448e7f6b6719026d916f6 +151a50b1ee190d1aeaee2cba3f62986c63ace172165d58d9d44da5f25e02d993 diff --git a/obj/Debug/net5.0/rmutr_report.dll b/obj/Debug/net5.0/rmutr_report.dll index 0644bac..236f85f 100644 Binary files a/obj/Debug/net5.0/rmutr_report.dll and b/obj/Debug/net5.0/rmutr_report.dll differ diff --git a/obj/Debug/net5.0/rmutr_report.genruntimeconfig.cache b/obj/Debug/net5.0/rmutr_report.genruntimeconfig.cache index cb0391e..aec23d8 100644 --- a/obj/Debug/net5.0/rmutr_report.genruntimeconfig.cache +++ b/obj/Debug/net5.0/rmutr_report.genruntimeconfig.cache @@ -1 +1 @@ -1d39a36735b2d72fa7731390686302bd2991a9b8 +7fbffe610e4933d17629d872cd661838bac95725f539e92f735cab904b788195 diff --git a/obj/Debug/net5.0/rmutr_report.pdb b/obj/Debug/net5.0/rmutr_report.pdb index 8a2c195..edf6ffe 100644 Binary files a/obj/Debug/net5.0/rmutr_report.pdb and b/obj/Debug/net5.0/rmutr_report.pdb differ diff --git a/obj/Debug/net5.0/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache b/obj/Debug/net5.0/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache index f204b69..8917d82 100644 --- a/obj/Debug/net5.0/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache +++ b/obj/Debug/net5.0/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache @@ -1 +1 @@ -dea208d6dcf8aff820dcbc6409c4fd9e41c662bb +afb6f617d95b29ee880532b701a9799251d507fdef2496d78da72cd05409100e diff --git a/obj/Debug/netcoreapp3.1/.NETCoreApp,Version=v3.1.AssemblyAttributes.cs b/obj/Debug/netcoreapp3.1/.NETCoreApp,Version=v3.1.AssemblyAttributes.cs index ad8dfe1..1b9b2f8 100644 --- a/obj/Debug/netcoreapp3.1/.NETCoreApp,Version=v3.1.AssemblyAttributes.cs +++ b/obj/Debug/netcoreapp3.1/.NETCoreApp,Version=v3.1.AssemblyAttributes.cs @@ -1,4 +1,4 @@ // using System; using System.Reflection; -[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v3.1", FrameworkDisplayName = "")] +[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v3.1", FrameworkDisplayName = ".NET Core 3.1")] diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs b/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs index 39daae7..773657c 100644 --- a/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs +++ b/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("rmutr_report")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+ca12ecf690165da4200e0b4f724709e6a4358ec2")] [assembly: System.Reflection.AssemblyProductAttribute("rmutr_report")] [assembly: System.Reflection.AssemblyTitleAttribute("rmutr_report")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache b/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache index 337d668..851afa5 100644 --- a/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache +++ b/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache @@ -1 +1 @@ -b48f1bd72c29690b00599a37fe20d70100e422f1 +5bcb0645a46d5b2ae84fd794dd3c603837c4839ee4e2cd7c21a7c994a5058a2d diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.GeneratedMSBuildEditorConfig.editorconfig b/obj/Debug/netcoreapp3.1/rmutr_report.GeneratedMSBuildEditorConfig.editorconfig index 090ae21..5539f44 100644 --- a/obj/Debug/netcoreapp3.1/rmutr_report.GeneratedMSBuildEditorConfig.editorconfig +++ b/obj/Debug/netcoreapp3.1/rmutr_report.GeneratedMSBuildEditorConfig.editorconfig @@ -1,3 +1,5 @@ is_global = true build_property.RootNamespace = rmutr_report build_property.ProjectDir = C:\Users\USER\Documents\rmutr_report\ +build_property.EnableComHosting = +build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache b/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache index fb560e9..cbe55bb 100644 --- a/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache +++ b/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache @@ -1 +1 @@ -b75da1d35a4ca649b17d81186a0cb0b6010aa3ac +e70085a502f543e6f865dcae5f1f26615f0a238b62a14648a1d38a607a23489d diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.assets.cache b/obj/Debug/netcoreapp3.1/rmutr_report.assets.cache index 87a42d8..6446abd 100644 Binary files a/obj/Debug/netcoreapp3.1/rmutr_report.assets.cache and b/obj/Debug/netcoreapp3.1/rmutr_report.assets.cache differ diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.csproj.AssemblyReference.cache b/obj/Debug/netcoreapp3.1/rmutr_report.csproj.AssemblyReference.cache index c494559..ab463e7 100644 Binary files a/obj/Debug/netcoreapp3.1/rmutr_report.csproj.AssemblyReference.cache and b/obj/Debug/netcoreapp3.1/rmutr_report.csproj.AssemblyReference.cache differ diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.csproj.CoreCompileInputs.cache b/obj/Debug/netcoreapp3.1/rmutr_report.csproj.CoreCompileInputs.cache index 8518aca..8829694 100644 --- a/obj/Debug/netcoreapp3.1/rmutr_report.csproj.CoreCompileInputs.cache +++ b/obj/Debug/netcoreapp3.1/rmutr_report.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -5291f10d567e56972d289a7eb4de1376c3f1680a +33fc03236a4722f554f10fac37fe989dc73f2aafe8cf22c724021db85b56c8dd diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.dll b/obj/Debug/netcoreapp3.1/rmutr_report.dll index ec6b373..1aebb18 100644 Binary files a/obj/Debug/netcoreapp3.1/rmutr_report.dll and b/obj/Debug/netcoreapp3.1/rmutr_report.dll differ diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.genruntimeconfig.cache b/obj/Debug/netcoreapp3.1/rmutr_report.genruntimeconfig.cache index 572029b..29a0fc8 100644 --- a/obj/Debug/netcoreapp3.1/rmutr_report.genruntimeconfig.cache +++ b/obj/Debug/netcoreapp3.1/rmutr_report.genruntimeconfig.cache @@ -1 +1 @@ -f530878fb081af78ff5e77410efde9fbbaab91cc +ca711009e2e2dba58c1b6eb5113bdab6ea15153c71afb320690fda9321e8edef diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.pdb b/obj/Debug/netcoreapp3.1/rmutr_report.pdb index 161db93..f38120a 100644 Binary files a/obj/Debug/netcoreapp3.1/rmutr_report.pdb and b/obj/Debug/netcoreapp3.1/rmutr_report.pdb differ diff --git a/obj/Debug/netcoreapp3.1/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache b/obj/Debug/netcoreapp3.1/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache index f204b69..8917d82 100644 --- a/obj/Debug/netcoreapp3.1/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache +++ b/obj/Debug/netcoreapp3.1/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache @@ -1 +1 @@ -dea208d6dcf8aff820dcbc6409c4fd9e41c662bb +afb6f617d95b29ee880532b701a9799251d507fdef2496d78da72cd05409100e diff --git a/obj/rider.project.restore.info b/obj/rider.project.restore.info index ae38e6d..81920f2 100644 --- a/obj/rider.project.restore.info +++ b/obj/rider.project.restore.info @@ -1 +1 @@ -17019436011989991 \ No newline at end of file +17024426939418254 \ No newline at end of file