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

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 10:53:06 +07:00
parent 8ade6577aa
commit 48f918060d
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Controllers/Budget.Controller.cs
View File

@@ -2491,7 +2491,6 @@ namespace rmutr_report.Controllers
int no = 1; int no = 1;
var b = budget.budgets.ToArray(); var b = budget.budgets.ToArray();
var budgets1 = budget.budgets.ToList();
foreach (var bb in b) foreach (var bb in b)
{ {
bb.personnel_list_s = new List<personnel_list> { bb.personnel_lists }; bb.personnel_list_s = new List<personnel_list> { bb.personnel_lists };
@@ -2504,10 +2503,12 @@ namespace rmutr_report.Controllers
detail2.text1 = "อัตรา"; detail2.text1 = "อัตรา";
} }
if (detail.budget_personnel_lists.Count() == 1) // var cperson = detail.budget_personnel_lists.Count();
{ //
detail.budget_personnel_lists[0].topic = "งบบุคลากร"; // if (cperson ==1)
} // {
// detail.budget_personnel_lists[0].topic = "งบบุคลากร";
// }
foreach (var detail3 in detail2.budget_personnel_lists_2) foreach (var detail3 in detail2.budget_personnel_lists_2)
{ {
@@ -2552,10 +2553,10 @@ namespace rmutr_report.Controllers
no3++; no3++;
} }
if (detail.budget_personnel_lists.Count() == 2) // if (cperson == 2)
{ // {
detail.budget_personnel_lists[0].topic = "งบบุคลากร"; // detail.budget_personnel_lists[0].topic = "งบบุคลากร";
detail.budget_personnel_lists[1].topic = "งบดําเนินงาน"; // detail.budget_personnel_lists[1].topic = "งบดําเนินงาน";
// detail.budget_personnel_lists[1].text1 = null; // 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].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].row_no = null;
@@ -2565,7 +2566,7 @@ namespace rmutr_report.Controllers
// .text1 = null; // .text1 = null;
// detail.budget_personnel_lists[1].budget_personnel_lists_2[0].budget_rates[0] // detail.budget_personnel_lists[1].budget_personnel_lists_2[0].budget_rates[0]
// .details[0].text1 = null; // .details[0].text1 = null;
} //}
foreach (var detail6 in detail5.details2) foreach (var detail6 in detail5.details2)
{ {

6
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/21/2023 18:04:00" ReportInfo.CreatorVersion="2021.1.0.0"> <Report ScriptLanguage="CSharp" ReportInfo.Created="07/13/2023 16:12:54" ReportInfo.Modified="08/22/2023 10:49:37" 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"/>
@@ -73,13 +73,13 @@
<TextObject Name="Text1" Width="945" Height="37.8" Text="งบประมาณรายจ่ายจากเงินรายได้ ประจำปีงบประมาณ พ.ศ. [budget_expenditure_report_from_revenue.academic_year_name_th]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/> <TextObject Name="Text1" Width="945" Height="37.8" Text="งบประมาณรายจ่ายจากเงินรายได้ ประจำปีงบประมาณ พ.ศ. [budget_expenditure_report_from_revenue.academic_year_name_th]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/>
<DataBand Name="Data3" Top="214.25" Width="945" Height="28.35" CanShrink="true" DataSource="budgets"> <DataBand Name="Data3" Top="214.25" Width="945" Height="28.35" CanShrink="true" DataSource="budgets">
<LineObject Name="Line5" Left="727.65" Top="28.35" Width="141.75" Diagonal="true"/> <LineObject Name="Line5" Left="727.65" Top="28.35" Width="141.75" Diagonal="true"/>
<TextObject Name="Text11" Width="510.3" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.topic]" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/> <TextObject Name="Text11" Width="510.3" Height="28.35" Text="แผนงานบุคลากรภาครัฐ" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/>
<TextObject Name="Text12" Left="727.65" Width="141.75" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.total]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/> <TextObject Name="Text12" Left="727.65" Width="141.75" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.total]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/>
<TextObject Name="Text13" Left="869.4" Width="47.25" Height="28.35" Text="บาท" VertAlign="Center" Font="TH Sarabun New, 18pt"/> <TextObject Name="Text13" Left="869.4" Width="47.25" Height="28.35" Text="บาท" VertAlign="Center" Font="TH Sarabun New, 18pt"/>
<DataBand Name="Data4" Top="248.95" Width="945" Height="28.35" DataSource="personnel_list_s"> <DataBand Name="Data4" Top="248.95" Width="945" Height="28.35" DataSource="personnel_list_s">
<LineObject Name="Line6" Left="699.3" Top="28.35" Width="141.75" Diagonal="true"/> <LineObject Name="Line6" Left="699.3" Top="28.35" Width="141.75" Diagonal="true"/>
<TextObject Name="Text16" Left="841.05" Width="47.25" Height="28.35" Text="บาท" VertAlign="Center" Font="TH Sarabun New, 16pt"/> <TextObject Name="Text16" Left="841.05" Width="47.25" Height="28.35" Text="บาท" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
<TextObject Name="Text14" Left="18.9" Width="491.4" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.topic]" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Underline"/> <TextObject Name="Text14" Left="18.9" Width="491.4" Height="28.35" Text="รายการบุคลากร" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Underline"/>
<TextObject Name="Text15" Left="699.3" Width="141.75" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.total]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt"/> <TextObject Name="Text15" Left="699.3" Width="141.75" Height="28.35" Text="[budget_expenditure_report_from_revenue.budgets.personnel_list_s.total]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
<DataBand Name="Data5" Top="283.65" Width="945" Height="28.35" DataSource="budget_personnel_lists"> <DataBand Name="Data5" Top="283.65" Width="945" Height="28.35" DataSource="budget_personnel_lists">
<LineObject Name="Line7" Left="689.85" Top="28.35" Width="122.85" Diagonal="true"/> <LineObject Name="Line7" Left="689.85" Top="28.35" Width="122.85" Diagonal="true"/>