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

delete gen row no
All checks were successful
continuous-integration/drone Build is passing
Details

Browse Source
This commit is contained in:
kamonwan taengsuk
2023-08-07 13:57:25 +07:00
parent fda5ad5da0
commit 358938b6a4
2 changed files with 10 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
Controllers/Budget.Controller.cs
View File

@@ -2537,7 +2537,7 @@ namespace rmutr_report.Controllers
var budget17 = budget2 + budget5 + budget8 + budget11 + budget14; var budget17 = budget2 + budget5 + budget8 + budget11 + budget14;
var budget18 = budget16 + budget17; var budget18 = budget16 + budget17;
int row = 1; int row = 1;
int datarow = 1; //int datarow = 1;
foreach (var datas in government_budget.data) foreach (var datas in government_budget.data)
{ {
@@ -2572,11 +2572,11 @@ namespace rmutr_report.Controllers
government_budget.budget_16 = budget16; government_budget.budget_16 = budget16;
government_budget.budget_17 = budget17; government_budget.budget_17 = budget17;
government_budget.budget_18 = budget18; government_budget.budget_18 = budget18;
if (datas.topic_type == 2) // if (datas.topic_type == 2)
{ // {
datas.row_no = datarow.ToString(); // datas.row_no = datarow.ToString();
datarow++; // datarow++;
} // }
} }
foreach (var notation in government_budget.notations) foreach (var notation in government_budget.notations)
@@ -2662,22 +2662,6 @@ namespace rmutr_report.Controllers
public IActionResult GetBudgetProjectsReport([FromRoute] string type, public IActionResult GetBudgetProjectsReport([FromRoute] string type,
[FromBody] budget_projects budget) [FromBody] budget_projects budget)
{ {
foreach (var detail in budget.data)
{
int row = 1;
foreach (var dataDetail in detail.detail)
{
if (dataDetail.topic_type == 5)
{
dataDetail.row_no = row.ToString();
row++;
}
else
{
dataDetail.row_no = null;
}
}
}
var budgets = new List<budget_projects>() { budget }; var budgets = new List<budget_projects>() { budget };
@@ -2715,19 +2699,6 @@ namespace rmutr_report.Controllers
public IActionResult GetBudgetTotalReport([FromRoute] string type, public IActionResult GetBudgetTotalReport([FromRoute] string type,
[FromBody] total_budget budget) [FromBody] total_budget budget)
{ {
int row = 1;
foreach (var detail2 in budget.data)
{
if (detail2.topic_type == 5)
{
detail2.row_no = row.ToString();
row++;
}
else
{
detail2.row_no = null;
}
}
var summaryBudget = new List<total_budget>() { budget }; var summaryBudget = new List<total_budget>() { budget };

4
wwwroot/reports/summary_government_budget_plan.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="09/14/2021 15:20:39" ReportInfo.Modified="08/07/2023 11:16:02" ReportInfo.CreatorVersion="2021.1.0.0"> <Report ScriptLanguage="CSharp" ReportInfo.Created="09/14/2021 15:20:39" ReportInfo.Modified="08/07/2023 11:59:29" ReportInfo.CreatorVersion="2021.1.0.0">
<Dictionary> <Dictionary>
<BusinessObjectDataSource Name="summary_government_budget_plan" ReferenceName="summary_government_budget_plan" DataType="null" Enabled="true"> <BusinessObjectDataSource Name="summary_government_budget_plan" ReferenceName="summary_government_budget_plan" DataType="null" Enabled="true">
<Column Name="budget_year" DataType="System.String"/> <Column Name="budget_year" DataType="System.String"/>
@@ -130,7 +130,7 @@
<Condition Expression="[summary_government_budget_plan.data.topic_type]== 2" Border.Lines="All" Font="TH Sarabun New, 14.25pt" ApplyBorder="true" ApplyTextFill="false" ApplyFont="true"/> <Condition Expression="[summary_government_budget_plan.data.topic_type]== 2" Border.Lines="All" Font="TH Sarabun New, 14.25pt" ApplyBorder="true" ApplyTextFill="false" ApplyFont="true"/>
</Highlight> </Highlight>
</TableCell> </TableCell>
<TableCell Name="Cell90" Border.Lines="Top, Bottom" Text="[summary_government_budget_plan.data.product]" AutoShrink="FontSize" AutoShrinkMinSize="12" VertAlign="Center" Font="TH Sarabun New, 14pt"> <TableCell Name="Cell90" Border.Lines="Top, Bottom" Text="[summary_government_budget_plan.data.product]" AutoShrink="FontSize" AutoShrinkMinSize="10.5" VertAlign="Center" Font="TH Sarabun New, 14pt">
<Highlight> <Highlight>
<Condition Expression="[summary_government_budget_plan.data.topic_type]== 1" Fill.Color="242, 220, 219" Font="TH Sarabun New, 15pt, style=Bold" ApplyFill="true" ApplyTextFill="false" ApplyFont="true"/> <Condition Expression="[summary_government_budget_plan.data.topic_type]== 1" Fill.Color="242, 220, 219" Font="TH Sarabun New, 15pt, style=Bold" ApplyFill="true" ApplyTextFill="false" ApplyFont="true"/>
<Condition Expression="[summary_government_budget_plan.data.topic_type]== 2" Border.Lines="All" Font="TH Sarabun New, 14.25pt" ApplyBorder="true" ApplyTextFill="false" ApplyFont="true"/> <Condition Expression="[summary_government_budget_plan.data.topic_type]== 2" Border.Lines="All" Font="TH Sarabun New, 14.25pt" ApplyBorder="true" ApplyTextFill="false" ApplyFont="true"/>