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
2023-08-22 12:27:04 +07:00
parent 80bbf8ca17
commit edf731702c
7 changed files with 57 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
Controllers/Budget.Controller.cs
View File

@@ -2489,7 +2489,7 @@ namespace rmutr_report.Controllers
[FromBody] budget_expenditure_report_from_revenue budget) [FromBody] budget_expenditure_report_from_revenue budget)
{ {
int no = 1; int no = 1;
var b = budget.budgets.ToArray(); var b = budget.budgets.ToArray();
foreach (var bb in b) foreach (var bb in b)
{ {
@@ -2504,8 +2504,8 @@ namespace rmutr_report.Controllers
} }
var cperson = detail.budget_personnel_lists.Count(); var cperson = detail.budget_personnel_lists.Count();
if (cperson ==1) if (cperson == 1)
{ {
detail.budget_personnel_lists[0].topic = "งบบุคลากร"; detail.budget_personnel_lists[0].topic = "งบบุคลากร";
} }
@@ -2553,22 +2553,6 @@ namespace rmutr_report.Controllers
no3++; no3++;
} }
if (cperson == 2)
{
detail.budget_personnel_lists[0].topic = "งบบุคลากร";
detail.budget_personnel_lists[1].topic = "งบดําเนินงาน";
detail.budget_personnel_lists[1].text1 = null;
detail.budget_personnel_lists[1].budget_personnel_lists_2[0].text1 = null;
detail.budget_personnel_lists[1].budget_personnel_lists_2[0].row_no = null;
detail.budget_personnel_lists[1].budget_personnel_lists_2[0].budget_rates[0]
.row_no = null;
detail.budget_personnel_lists[1].budget_personnel_lists_2[0].budget_rates[0]
.text1 = null;
detail.budget_personnel_lists[1].budget_personnel_lists_2[0].budget_rates[0]
.details[0].text1 = null;
}
if (detail5.details2 != null) if (detail5.details2 != null)
{ {
foreach (var detail6 in detail5.details2) foreach (var detail6 in detail5.details2)
@@ -2581,10 +2565,48 @@ namespace rmutr_report.Controllers
} }
} }
} }
if (detail5.details2.Any())
{
if (detail5.details2==null)
{
foreach (var detail6 in detail5.details2)
{
detail6.topic = null;
detail6.total = null;
detail6.row_no = null;
detail6.text1 = null;
}
}
}
else
{
detail5.details2.Add(new details2()
{
topic = "",total = 999999999
});
}
} }
} }
} }
if (cperson == 2)
{
detail.budget_personnel_lists[0].topic = "งบบุคลากร";
detail.budget_personnel_lists[1].topic = "งบดําเนินงาน";
detail.budget_personnel_lists[1].text1 = null;
detail.budget_personnel_lists[1].budget_personnel_lists_2[0].text1 = null;
detail.budget_personnel_lists[1].budget_personnel_lists_2[0].row_no = null;
detail.budget_personnel_lists[1].budget_personnel_lists_2[0].budget_rates[0]
.row_no = null;
detail.budget_personnel_lists[1].budget_personnel_lists_2[0].budget_rates[0]
.text1 = null;
detail.budget_personnel_lists[1].budget_personnel_lists_2[0].budget_rates[0]
.details[0].text1 = null;
}
} }
} }
} }

BIN
bin/Debug/netcoreapp3.1/rmutr_report.dll
View File

Binary file not shown.

BIN
bin/Debug/netcoreapp3.1/rmutr_report.pdb
View File

Binary file not shown.

BIN
obj/Debug/netcoreapp3.1/rmutr_report.dll
View File

Binary file not shown.

BIN
obj/Debug/netcoreapp3.1/rmutr_report.pdb
View File

Binary file not shown.

2
obj/rider.project.restore.info
View File

@@ -1 +1 @@
16926773444616640 16926820101922101

24
wwwroot/reports/budget_expenditure_report_from_revenue.frx
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Report ScriptLanguage="CSharp" ReportInfo.Created="07/13/2023 16:12:54" ReportInfo.Modified="08/22/2023 11:08:21" ReportInfo.CreatorVersion="2021.1.0.0"> <Report ScriptLanguage="CSharp" ReportInfo.Created="07/13/2023 16:12:54" ReportInfo.Modified="08/22/2023 12:26:05" ReportInfo.CreatorVersion="2021.1.0.0">
<Dictionary> <Dictionary>
<BusinessObjectDataSource Name="budget_expenditure_report_from_revenue" ReferenceName="budget_expenditure_report_from_revenue" DataType="null" Enabled="true"> <BusinessObjectDataSource Name="budget_expenditure_report_from_revenue" ReferenceName="budget_expenditure_report_from_revenue" DataType="null" Enabled="true">
<Column Name="academic_year_name_th" DataType="System.String"/> <Column Name="academic_year_name_th" DataType="System.String"/>
@@ -56,7 +56,7 @@
</BusinessObjectDataSource> </BusinessObjectDataSource>
</Dictionary> </Dictionary>
<ReportPage Name="Page1" Landscape="true" PaperWidth="270" PaperHeight="450" Watermark.Font="Arial, 60pt"> <ReportPage Name="Page1" Landscape="true" PaperWidth="270" PaperHeight="450" Watermark.Font="Arial, 60pt">
<DataBand Name="Data2" Width="945" Height="207.9" StartNewPage="true" DataSource="budget_expenditure_report_from_revenue"> <DataBand Name="Data2" Width="945" Height="207.9" StartNewPage="true">
<LineObject Name="Line1" Left="85.05" Top="198.45" Width="425.25" Diagonal="true"/> <LineObject Name="Line1" Left="85.05" Top="198.45" Width="425.25" Diagonal="true"/>
<LineObject Name="Line4" Left="765.45" Top="198.45" Width="132.3" Diagonal="true"/> <LineObject Name="Line4" Left="765.45" Top="198.45" Width="132.3" Diagonal="true"/>
<TextObject Name="Text5" Top="170.1" Width="75.6" Height="37.8" Text="ภาค :" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/> <TextObject Name="Text5" Top="170.1" Width="75.6" Height="37.8" Text="ภาค :" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/>
@@ -91,14 +91,14 @@
<DataBand Name="Data6" Top="318.35" Width="945" Height="28.35" DataSource="budget_personnel_lists_2"> <DataBand Name="Data6" Top="318.35" Width="945" Height="28.35" DataSource="budget_personnel_lists_2">
<LineObject Name="Line8" Left="661.5" Top="28.35" Width="122.85" Diagonal="true"/> <LineObject Name="Line8" Left="661.5" Top="28.35" Width="122.85" Diagonal="true"/>
<TextObject Name="Text22" Left="47.25" Width="37.8" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.row_no]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/> <TextObject Name="Text22" Left="47.25" Width="37.8" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.row_no]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
<TextObject Name="Text23" Left="85.05" Width="340.2" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.topic]" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold, Underline"/> <TextObject Name="Text23" Left="85.05" Width="472.5" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.topic]" AutoShrink="FontSize" AutoShrinkMinSize="14" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold, Underline"/>
<TextObject Name="Text24" Left="576.45" Width="47.25" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.rate]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt"/> <TextObject Name="Text24" Left="576.45" Width="47.25" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.rate]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
<TextObject Name="Text25" Left="614.25" Width="47.25" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.text1]" VertAlign="Center" Font="TH Sarabun New, 16pt"/> <TextObject Name="Text25" Left="614.25" Width="47.25" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.text1]" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
<TextObject Name="Text26" Left="661.5" Width="122.85" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.total]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt"/> <TextObject Name="Text26" Left="661.5" Width="122.85" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.total]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
<TextObject Name="Text27" Left="784.35" Width="47.25" Height="28.35" Text="บาท" VertAlign="Center" Font="TH Sarabun New, 16pt"/> <TextObject Name="Text27" Left="784.35" Width="47.25" Height="28.35" Text="บาท" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
<DataBand Name="Data7" Top="353.05" Width="945" Height="28.35" DataSource="budget_rates"> <DataBand Name="Data7" Top="353.05" Width="945" Height="28.35" DataSource="budget_rates">
<TextObject Name="Text28" Left="85.05" Width="37.8" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.row_no]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/> <TextObject Name="Text28" Left="85.05" Width="37.8" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.row_no]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
<TextObject Name="Text29" Left="122.85" Width="302.4" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.topic]" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold, Underline"/> <TextObject Name="Text29" Left="122.85" Width="415.8" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.topic]" AutoShrink="FontSize" AutoShrinkMinSize="14" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold, Underline"/>
<TextObject Name="Text30" Left="538.65" Width="28.35" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.rate]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/> <TextObject Name="Text30" Left="538.65" Width="28.35" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.rate]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
<TextObject Name="Text31" Left="567" Width="47.25" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.text1]" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/> <TextObject Name="Text31" Left="567" Width="47.25" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.text1]" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
<TextObject Name="Text32" Left="633.15" Width="122.85" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.total]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/> <TextObject Name="Text32" Left="633.15" Width="122.85" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.total]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
@@ -108,16 +108,20 @@
<LineObject Name="Line10" Left="633.15" Top="28.35" Width="94.5" Diagonal="true"/> <LineObject Name="Line10" Left="633.15" Top="28.35" Width="94.5" Diagonal="true"/>
<TextObject Name="Text39" Left="633.15" Width="94.5" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.details.total]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt"/> <TextObject Name="Text39" Left="633.15" Width="94.5" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.details.total]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
<TextObject Name="Text34" Left="122.85" Width="37.8" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.details.row_no]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt"/> <TextObject Name="Text34" Left="122.85" Width="37.8" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.details.row_no]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
<TextObject Name="Text35" Left="160.65" Width="179.55" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.details.position_level]" VertAlign="Center" Font="TH Sarabun New, 16pt"/> <TextObject Name="Text35" Left="160.65" Width="359.1" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.details.position_level]" AutoShrink="FontSize" AutoShrinkMinSize="14" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
<TextObject Name="Text36" Left="340.2" Width="179.55" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.details.qualification]" VertAlign="Center" Font="TH Sarabun New, 16pt"/> <TextObject Name="Text36" Left="340.2" Width="179.55" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.details.qualification]" AutoShrink="FontSize" AutoShrinkMinSize="14" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
<TextObject Name="Text37" Left="538.65" Width="28.35" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.details.rate]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt"/> <TextObject Name="Text37" Left="538.65" Width="28.35" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.details.rate]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
<TextObject Name="Text38" Left="567" Width="47.25" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.details.text1]" VertAlign="Center" Font="TH Sarabun New, 16pt"/> <TextObject Name="Text38" Left="567" Width="47.25" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.details.text1]" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
<TextObject Name="Text40" Left="727.65" Width="47.25" Height="28.35" Text="บาท" VertAlign="Center" Font="TH Sarabun New, 16pt"/> <TextObject Name="Text40" Left="727.65" Width="47.25" Height="28.35" Text="บาท" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
<DataBand Name="Data8" Top="422.44" Width="945" Height="28.35" DataSource="details2"> <DataBand Name="Data8" Top="422.44" Width="945" Height="28.35" DataSource="details2">
<TextObject Name="Text41" Left="160.65" Width="37.8" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.details.details2.row_no]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 15pt, style=Bold"/> <TextObject Name="Text41" Left="160.65" Width="37.8" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.details.details2.row_no]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 15pt"/>
<TextObject Name="Text42" Left="198.45" Width="321.3" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.details.details2.topic]" VertAlign="Center" Font="TH Sarabun New, 15pt, style=Bold"/> <TextObject Name="Text42" Left="198.45" Width="321.3" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.details.details2.topic]" AutoShrink="FontSize" AutoShrinkMinSize="14" VertAlign="Center" Font="TH Sarabun New, 15pt"/>
<TextObject Name="Text43" Left="538.65" Width="94.5" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.details.details2.total]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 15pt, style=Bold"/> <TextObject Name="Text43" Left="538.65" Width="94.5" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.details.details2.total]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 15pt">
<TextObject Name="Text44" Left="633.15" Width="47.25" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.details.details2.text1]" VertAlign="Center" Font="TH Sarabun New, 15pt, style=Bold"/> <Highlight>
<Condition Expression="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.details.details2.total]== 999999999" TextFill.Color="White" Font="Arial, 10pt"/>
</Highlight>
</TextObject>
<TextObject Name="Text44" Left="633.15" Width="47.25" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.budget_personnel_lists.budget_personnel_lists_2.budget_rates.details.details2.text1]" VertAlign="Center" Font="TH Sarabun New, 15pt"/>
</DataBand> </DataBand>
</DataBand> </DataBand>
</DataBand> </DataBand>