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-10-10 17:32:01 +07:00
parent dc23d87855
commit 7b946457ee
2 changed files with 8 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Controllers/RoFive.Controller.cs
View File

@@ -4400,33 +4400,16 @@ namespace rmutr_report.Controllers
public IActionResult GetCooperativeReport([FromRoute] string type,
[FromBody] summary_income_cooperative cooperative)
{
var sum1 = cooperative.data.Where(j=>j.topic_type==3).Sum(d => d.revenue_estimates);
/*var sum1 = cooperative.data.Where(j=>j.topic_type==3).Sum(d => d.revenue_estimates);
var sum2 = cooperative.data.Where(j=>j.topic_type==3).Sum(d => d.deduct_expenses_percent60);
var sum3 = cooperative.data.Where(j=>j.topic_type==3).Sum(d => d.deduct_expenses_percent10);
var sum4 = cooperative.data.Where(j=>j.topic_type==3).Sum(d => d.balance);
var sum5 = cooperative.data.Where(j=>j.topic_type==3).Sum(d => d.deduct_tuition_fees);
var sum6 = cooperative.data.Where(j=>j.topic_type==3).Sum(d => d.balance_university);
var sum6 = cooperative.data.Where(j=>j.topic_type==3).Sum(d => d.balance_university);*/
foreach (var detail in cooperative.data)
{
if (detail.topic_type == 1)
{
detail.revenue_estimates = sum1;
detail.deduct_expenses_percent60 = sum2;
detail.deduct_expenses_percent10 = sum3;
detail.balance = sum4;
detail.deduct_tuition_fees = sum5;
detail.balance_university = sum6;
}
if (detail.topic_type == 2)
{
detail.revenue_estimates = sum1;
detail.deduct_expenses_percent60 = sum2;
detail.deduct_expenses_percent10 = sum3;
detail.balance = sum4;
detail.deduct_tuition_fees = sum5;
detail.balance_university = sum6;
}
if (detail.topic_type == 4)
{
string myStr = detail.topic;
@@ -4435,12 +4418,7 @@ namespace rmutr_report.Controllers
{
detail.topic = "รวม "+ projectnames;
}
detail.revenue_estimates = sum1;
detail.deduct_expenses_percent60 = sum2;
detail.deduct_expenses_percent10 = sum3;
detail.balance = sum4;
detail.deduct_tuition_fees = sum5;
detail.balance_university = sum6;
}
}

13
wwwroot/reports/project_request_thailands.frx
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Report ScriptLanguage="CSharp" ReportInfo.Created="09/14/2021 15:20:39" ReportInfo.Modified="10/06/2023 10:58:08" ReportInfo.CreatorVersion="2021.1.0.0">
<Report ScriptLanguage="CSharp" ReportInfo.Created="09/14/2021 15:20:39" ReportInfo.Modified="10/10/2023 12:59:05" ReportInfo.CreatorVersion="2021.1.0.0">
<Dictionary>
<BusinessObjectDataSource Name="project_principle_rationale" ReferenceName="project_principle_rationale" DataType="null" Enabled="true">
<Column Name="faculty" DataType="System.String"/>
@@ -26,9 +26,9 @@
<Column Name="description2" DataType="System.String"/>
<Column Name="durable_articles" DataType="System.Decimal"/>
<Column Name="land_building" DataType="System.Decimal"/>
<Column Name="url_file1" DataType="System.String"/>
<Column Name="url_file2" DataType="System.String"/>
<Column Name="url_file3" DataType="System.String"/>
<Column Name="url_file1" DataType="System.String"/>
<Column Name="url_file2" DataType="System.String"/>
<Column Name="url_file3" DataType="System.String"/>
<BusinessObjectDataSource Name="sixth" DataType="null" Enabled="true">
<Column Name="objective" DataType="System.String"/>
</BusinessObjectDataSource>
@@ -994,10 +994,5 @@
</DataBand>
</DataBand>
</DataBand>
<DataBand Name="Data33" Top="314.87" Width="756" Height="66.15">
<TextObject Name="Text235" Top="9.45" Width="661.5" Height="28.35" Text="21. แนบรายละเอียดการดำเนินโครงการกิจกรรมย่อย" Font="TH Sarabun New, 14pt, style=Bold"/>
<TextObject Name="Text236" Left="28.35" Top="37.8" Width="151.2" Height="28.35" Text="กรุณาคลิกลิงค์เพื่อเปิดไฟล์" Font="TH Sarabun New, 14pt, style=Bold"/>
<TextObject Name="Text237" Left="179.55" Top="37.8" Width="567" Height="28.35" Hyperlink.Expression="[project_principle_rationale.url_file3]" Text="[project_principle_rationale.url_file3]" Font="TH Sarabun New, 14pt"/>
</DataBand>
</ReportPage>
</Report>