kamonwantaengsuk/rmutr_report
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Bug Fixed
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
kamonwan taengsuk
2024-09-04 15:27:55 +07:00
parent fe5bea66d7
commit 438286ba8b
14 changed files with 58 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
Controllers/Budget.Controller.cs
View File

@@ -3921,7 +3921,7 @@ namespace rmutr_report.Controllers
foreach (var detail2 in detail.data_2)
{
if (detail2.color=="1" && detail2.is_bold==true)
if (detail2.color=="1" && detail2.is_bold==true)//ฟ้า
{
ws.Cell(row, 1).Value = detail2.list;
@@ -3952,7 +3952,7 @@ namespace rmutr_report.Controllers
row++;
}
if (detail2.color=="2" && detail2.is_bold==null)
if (detail2.color=="2" && detail2.is_bold==null)//ส้ม
{
ws.Cell(row, 1).Value = detail2.list;
ws.Range(ws.Cell(row, 1),ws.Cell(row,2)).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Left;
@@ -3982,36 +3982,36 @@ namespace rmutr_report.Controllers
row++;
}
// if (detail2.color=="3" && detail2.is_bold==null)
// {
// ws.Cell(row, 1).Value = detail2.rowno + detail2.list;
// ws.Range(ws.Cell(row, 1),ws.Cell(row,2)).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Left;
// ws.Range(ws.Cell(row, 1),ws.Cell(row,2)).Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
// ws.Range(ws.Cell(row, 1),ws.Cell(row,2)).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
// ws.Range(ws.Cell(row, 1),ws.Cell(row,2)).Style.Font.FontName = "TH SarabunPSK";
// ws.Range(ws.Cell(row, 1),ws.Cell(row,2)).Style.Font.FontSize = 10;
// ws.Range(ws.Cell(row, 1),ws.Cell(row,2)).Style.Fill.BackgroundColor = XLColor.FromArgb(255, 255, 204);
// ws.Cell(row, 1).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
// ws.Cell(row, 1).Style.Alignment.WrapText =true;
// col2 = 2;
// foreach (var budgetPlan in detail2.plans)
// {
// ws.Cell(row, col2).Value = budgetPlan.value??0;
// ws.Cell(row, col2).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
// ws.Cell(row, col2).Style.Fill.BackgroundColor = XLColor.FromArgb(255, 255, 204);
// ws.Cell(row, col2).Style.Font.FontName = "TH SarabunPSK";
// ws.Cell(row, col2).Style.Font.FontSize = 10;
// ws.Cell(row, col2).Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
// ws.Cell(row, col2).Style.NumberFormat.SetFormat("#,#0");
// ws.Cell(row, col2).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
// ws.Cell(row, col2).Style.Alignment.WrapText = true;
// col2++;
//
// }
// // col2++;
// row++;
//
// }
if (detail2.color=="3" && detail2.is_bold==null)//เหลือง
{
ws.Cell(row, 1).Value = detail2.rowno + detail2.list;
ws.Range(ws.Cell(row, 1),ws.Cell(row,2)).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Left;
ws.Range(ws.Cell(row, 1),ws.Cell(row,2)).Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
ws.Range(ws.Cell(row, 1),ws.Cell(row,2)).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
ws.Range(ws.Cell(row, 1),ws.Cell(row,2)).Style.Font.FontName = "TH SarabunPSK";
ws.Range(ws.Cell(row, 1),ws.Cell(row,2)).Style.Font.FontSize = 10;
ws.Range(ws.Cell(row, 1),ws.Cell(row,2)).Style.Fill.BackgroundColor = XLColor.FromArgb(255, 255, 204);
ws.Cell(row, 1).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
ws.Cell(row, 1).Style.Alignment.WrapText =true;
col2 = 2;
foreach (var budgetPlan in detail2.plans)
{
ws.Cell(row, col2).Value = budgetPlan.value??0;
ws.Cell(row, col2).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
ws.Cell(row, col2).Style.Fill.BackgroundColor = XLColor.FromArgb(255, 255, 204);
ws.Cell(row, col2).Style.Font.FontName = "TH SarabunPSK";
ws.Cell(row, col2).Style.Font.FontSize = 10;
ws.Cell(row, col2).Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
ws.Cell(row, col2).Style.NumberFormat.SetFormat("#,#0");
ws.Cell(row, col2).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
ws.Cell(row, col2).Style.Alignment.WrapText = true;
col2++;
}
// col2++;
row++;
}
if (detail2.color==null && detail2.is_bold==null)
{
ws.Cell(row, 1).Value = detail2.rowno + detail2.list;
@@ -4020,7 +4020,7 @@ namespace rmutr_report.Controllers
ws.Cell(row,2).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
ws.Range(ws.Cell(row, 1),ws.Cell(row,2)).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
ws.Range(ws.Cell(row, 1),ws.Cell(row,2)).Style.Font.FontName = "TH SarabunPSK";
ws.Range(ws.Cell(row, 1),ws.Cell(row,2)).Style.Font.FontSize = 10;
ws.Range(ws.Cell(row, 1),ws.Cell(row,2)).Style.Font.SetBold().Font.FontSize = 10;
ws.Cell(row, 1).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
ws.Cell(row, col2).Style.NumberFormat.SetFormat("#,#0");
ws.Cell(row, 1).Style.Alignment.WrapText = true;
@@ -4030,7 +4030,7 @@ namespace rmutr_report.Controllers
ws.Cell(row, col2).Value = budgetPlan.value??0;
ws.Cell(row, col2).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
ws.Cell(row, col2).Style.Font.FontName = "TH SarabunPSK";
ws.Cell(row, col2).Style.Font.FontSize = 10;
ws.Cell(row, col2).Style.Font.SetBold().Font.FontSize = 10;
ws.Cell(row, col2).Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
ws.Cell(row, col2).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
ws.Cell(row, col2).Style.Alignment.WrapText = true;
@@ -4050,7 +4050,7 @@ namespace rmutr_report.Controllers
ws.Cell(row,2).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
ws.Range(ws.Cell(row, 1),ws.Cell(row,2)).Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
ws.Range(ws.Cell(row, 1),ws.Cell(row,2)).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
ws.Range(ws.Cell(row, 1),ws.Cell(row,2)).Style.Font.SetBold().Font.FontName = "TH SarabunPSK";
ws.Range(ws.Cell(row, 1),ws.Cell(row,2)).Style.Font.FontName = "TH SarabunPSK";
ws.Range(ws.Cell(row, 1),ws.Cell(row,2)).Style.Font.FontSize = 10;
ws.Cell(row, 1).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
ws.Cell(row, 1).Style.Alignment.WrapText = true;
@@ -4060,7 +4060,7 @@ namespace rmutr_report.Controllers
ws.Cell(row, col2).Value = budgetPlan.value??0;
ws.Cell(row, col2).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
ws.Cell(row, col2).Style.Font.FontName = "TH SarabunPSK";
ws.Cell(row, col2).Style.Font.SetBold().Font.FontSize = 10;
ws.Cell(row, col2).Style.Font.FontSize = 10;
ws.Cell(row, col2).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
ws.Cell(row, col2).Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
ws.Cell(row, col2).Style.NumberFormat.SetFormat("#,#0");

1
Folder.DotSettings.user
View File

@@ -1,2 +1,3 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=4EC9BE8E_002D1881_002D95C9_002D9F3E_002D1B17D679F3EC_002Fd_003AControllers_002Ff_003ABudget_002EController_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=4EC9BE8E_002D1881_002D95C9_002D9F3E_002D1B17D679F3EC_002Fd_003AControllers_002Ff_003APersonnel_002EController_002Ecs/@EntryIndexedValue">ForceIncluded</s:String></wpf:ResourceDictionary>

BIN
bin/Debug/net5.0/rmutr_report.dll
View File

Binary file not shown.

BIN
bin/Debug/net5.0/rmutr_report.pdb
View File

Binary file not shown.

BIN
obj/Debug/net5.0/ref/rmutr_report.dll
View File

Binary file not shown.

BIN
obj/Debug/net5.0/refint/rmutr_report.dll
View File

Binary file not shown.

2
obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs
View File

@@ -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+b009389dc0708df31994b749d03145a84b87e6a7")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+fe5bea66d79e8a2ba245bcbaf09a0fae47656731")]
[assembly: System.Reflection.AssemblyProductAttribute("rmutr_report")]
[assembly: System.Reflection.AssemblyTitleAttribute("rmutr_report")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

2
obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache
View File

@@ -1 +1 @@
f6b8428931236a455056fe3f165c6926bfa81e848064c3251c7fa774e28e0711
4c615bb9605489e6775696d6efe64333ac45f5ef2a3a4321b8081d650d7ad32e

2
obj/Debug/net5.0/rmutr_report.RazorTargetAssemblyInfo.cache
View File

@@ -1 +1 @@
6e1921a497d6bfa5a344720c448a8ff8bc8e02e2633ceeb78c84c1f8725d3b8f
fb57b358bbbbd91d012c2bcf5f603d483e0ec95f2dfadfa3496a2bd582a113e3

BIN
obj/Debug/net5.0/rmutr_report.dll
View File

Binary file not shown.

BIN
obj/Debug/net5.0/rmutr_report.pdb
View File

Binary file not shown.

16
obj/Debug/net5.0/staticwebassets/msbuild.rmutr_report.Microsoft.AspNetCore.StaticWebAssets.props
View File

@@ -112,6 +112,22 @@
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
<OriginalItemSpec>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\budget_expenditure_report_from_revenue.frx))</OriginalItemSpec>
</StaticWebAsset>
<StaticWebAsset Include="$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\budget_expenditure_report_from_revenue_v1.frx))">
<SourceType>Package</SourceType>
<SourceId>rmutr_report</SourceId>
<ContentRoot>$(MSBuildThisFileDirectory)..\staticwebassets\</ContentRoot>
<BasePath>_content/rmutr_report</BasePath>
<RelativePath>reports\budget_expenditure_report_from_revenue_v1.frx</RelativePath>
<AssetKind></AssetKind>
<AssetMode></AssetMode>
<AssetRole></AssetRole>
<RelatedAsset></RelatedAsset>
<AssetTraitName></AssetTraitName>
<AssetTraitValue></AssetTraitValue>
<CopyToOutputDirectory></CopyToOutputDirectory>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
<OriginalItemSpec>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\budget_expenditure_report_from_revenue_v1.frx))</OriginalItemSpec>
</StaticWebAsset>
<StaticWebAsset Include="$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\budget_expenditure_report_from_revenue_v2.frx))">
<SourceType>Package</SourceType>
<SourceId>rmutr_report</SourceId>

2
obj/Debug/net5.0/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache
View File

@@ -1 +1 @@
b77baecdf45cb80236438e8a223568cbd6e07fc272289f2130dc9e2d455d9160
1e00466f0b88109f048610c7645c46c929b7a4dd3b6d32b115f372c65af39b3a

2
obj/rider.project.model.nuget.info
View File

@@ -1 +1 @@
17254282354108198
17254343416267455