This commit is contained in:
@@ -2709,7 +2709,6 @@ namespace rmutr_report.Controllers
|
||||
bool startNumbering3 = false;
|
||||
bool startNumbering4 = false;
|
||||
bool startNumbering5 = false;
|
||||
var detail = budget.details;
|
||||
foreach (var indetail in budget.details)
|
||||
{
|
||||
|
||||
@@ -2878,18 +2877,8 @@ namespace rmutr_report.Controllers
|
||||
var budgetExpenditure = new List<budget_expenditure_report_from_revenue_v2>() { budget };
|
||||
|
||||
Report report = new Report();
|
||||
foreach (var d in detail)
|
||||
{
|
||||
if (d.row<=120)
|
||||
{
|
||||
report.Load(_setting.report_path + "budget_expenditure_report_from_revenue_v2.frx");
|
||||
}
|
||||
if (d.row>120)
|
||||
{
|
||||
report.Load(_setting.report_path + "budget_expenditure_report_from_revenue_v3.frx");
|
||||
}
|
||||
}
|
||||
// report.Load(_setting.report_path + "budget_expenditure_report_from_revenue_v2.frx");
|
||||
|
||||
report.Load(_setting.report_path + "budget_expenditure_report_from_revenue_v2.frx");
|
||||
report.RegisterData(budgetExpenditure, "budget_expenditure_report_from_revenue_v2");
|
||||
report.Prepare();
|
||||
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@@ -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+3334b4cb0bef998976d0ff9b81e859de6a5d0173")]
|
||||
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+7e05f00fd365c536d3ee467c1f9eb3399596a61b")]
|
||||
[assembly: System.Reflection.AssemblyProductAttribute("rmutr_report")]
|
||||
[assembly: System.Reflection.AssemblyTitleAttribute("rmutr_report")]
|
||||
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
|
||||
|
||||
@@ -1 +1 @@
|
||||
c543fca5e8af01a04f5bd480808850c09fc6b72e2aa871ee0e5bd67db67afa87
|
||||
7ac3f37958a71820e8df5f45b5e179cc281750374662722aed13a4edc0d38b47
|
||||
|
||||
@@ -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+3334b4cb0bef998976d0ff9b81e859de6a5d0173")]
|
||||
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+7e05f00fd365c536d3ee467c1f9eb3399596a61b")]
|
||||
[assembly: System.Reflection.AssemblyProductAttribute("rmutr_report")]
|
||||
[assembly: System.Reflection.AssemblyTitleAttribute("rmutr_report")]
|
||||
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
|
||||
|
||||
@@ -1 +1 @@
|
||||
c543fca5e8af01a04f5bd480808850c09fc6b72e2aa871ee0e5bd67db67afa87
|
||||
7ac3f37958a71820e8df5f45b5e179cc281750374662722aed13a4edc0d38b47
|
||||
|
||||
@@ -1 +1 @@
|
||||
e7d05b2e8e841ba91368833603be5e6447b2221d926b59fbe1f2f511b41fed99
|
||||
1cc1e30a55c8da36681abf907e9ced005ba9121991e772a39f582d11acbda306
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@@ -1 +1 @@
|
||||
17246762284769178
|
||||
17248180168527223
|
||||
@@ -1 +1 @@
|
||||
17247401489493512
|
||||
17248180168527223
|
||||
@@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Report ScriptLanguage="CSharp" ReportInfo.Created="07/13/2023 16:12:54" ReportInfo.Modified="08/27/2024 13:28:11" ReportInfo.CreatorVersion="2021.1.0.0">
|
||||
<Report ScriptLanguage="CSharp" ReportInfo.Created="07/13/2023 16:12:54" ReportInfo.Modified="08/28/2024 11:04:45" ReportInfo.CreatorVersion="2021.1.0.0">
|
||||
<Dictionary>
|
||||
<BusinessObjectDataSource Name="budget_expenditure_report_from_revenue_v2" ReferenceName="budget_expenditure_report_from_revenue_v2" DataType="null" Enabled="true">
|
||||
<Column Name="academic_year_name_th" DataType="System.String"/>
|
||||
@@ -90,7 +90,7 @@
|
||||
</BusinessObjectDataSource>
|
||||
</BusinessObjectDataSource>
|
||||
</Dictionary>
|
||||
<ReportPage Name="Page1" Landscape="true" PaperWidth="270" PaperHeight="1000" Watermark.Font="Arial, 60pt">
|
||||
<ReportPage Name="Page1" Landscape="true" PaperWidth="270" PaperHeight="400" Watermark.Font="Arial, 60pt" UnlimitedHeight="true">
|
||||
<DataBand Name="Data2" Width="945" Height="207.9" StartNewPage="true">
|
||||
<TextObject Name="Text8" Left="85.05" Top="170.1" Width="680.4" Height="37.8" Text="[budget_expenditure_report_from_revenue_v2.sector]" AutoShrink="FontSize" AutoShrinkMinSize="14" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
|
||||
<TextObject Name="Text6" Left="85.05" Top="94.5" Width="859.95" Height="37.8" Text="[budget_expenditure_report_from_revenue_v2.parent_agency_name]" AutoShrink="FontSize" AutoShrinkMinSize="14" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Report ScriptLanguage="CSharp" ReportInfo.Created="07/13/2023 16:12:54" ReportInfo.Modified="08/27/2024 13:18:42" ReportInfo.CreatorVersion="2021.1.0.0">
|
||||
<Report ScriptLanguage="CSharp" ReportInfo.Created="07/13/2023 16:12:54" ReportInfo.Modified="08/28/2024 10:58:12" ReportInfo.CreatorVersion="2021.1.0.0">
|
||||
<Dictionary>
|
||||
<BusinessObjectDataSource Name="budget_expenditure_report_from_revenue_v2" ReferenceName="budget_expenditure_report_from_revenue_v2" DataType="null" Enabled="true">
|
||||
<Column Name="academic_year_name_th" DataType="System.String"/>
|
||||
@@ -90,7 +90,7 @@
|
||||
</BusinessObjectDataSource>
|
||||
</BusinessObjectDataSource>
|
||||
</Dictionary>
|
||||
<ReportPage Name="Page1" Landscape="true" PaperWidth="270" PaperHeight="1150" Watermark.Font="Arial, 60pt">
|
||||
<ReportPage Name="Page1" Landscape="true" PaperWidth="270" PaperHeight="1150" Watermark.Font="Arial, 60pt" UnlimitedHeight="true">
|
||||
<DataBand Name="Data2" Width="945" Height="207.9" StartNewPage="true">
|
||||
<TextObject Name="Text8" Left="85.05" Top="170.1" Width="680.4" Height="37.8" Text="[budget_expenditure_report_from_revenue_v2.sector]" AutoShrink="FontSize" AutoShrinkMinSize="14" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
|
||||
<TextObject Name="Text6" Left="85.05" Top="94.5" Width="859.95" Height="37.8" Text="[budget_expenditure_report_from_revenue_v2.parent_agency_name]" AutoShrink="FontSize" AutoShrinkMinSize="14" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
|
||||
|
||||
Reference in New Issue
Block a user