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-31 16:12:13 +07:00
parent f7680ffb3e
commit da3c9bf314
15 changed files with 52 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Controllers/project_principle_rationale.Controller.cs
View File

@@ -174,6 +174,21 @@ namespace rmutr_report.Controllers
} }
} }
if (project.twenty_fifth != null)
{
foreach (var fifthData in project.twenty_fifth)
{
foreach (var acti in fifthData.activity)
{
fifthData.activitys = acti;
}
foreach (var locat in fifthData.location)
{
fifthData.locations = locat;
}
}
}
var _project = new List<project_principle_rationale>() { project }; var _project = new List<project_principle_rationale>() { project };
Report report = new Report(); Report report = new Report();
@@ -371,6 +386,20 @@ namespace rmutr_report.Controllers
project.twenty_one = null; project.twenty_one = null;
} }
} }
if (project.twenty_fifth != null)
{
foreach (var fifthData in project.twenty_fifth)
{
foreach (var acti in fifthData.activity)
{
fifthData.activitys = acti;
}
foreach (var locat in fifthData.location)
{
fifthData.locations = locat;
}
}
}
var _project = new List<project_principle_rationale>() { project }; var _project = new List<project_principle_rationale>() { project };

6
Models/budget/project_principle_rationale.cs
View File

@@ -501,10 +501,12 @@ namespace rmutr_report.Models
public class twenty_fifth_data public class twenty_fifth_data
{ {
public string activity { get; set; } public List<string> activity { get; set; }
public string activitys { get; set; }
public string activity_display_name { get; set; } public string activity_display_name { get; set; }
public string dates { get; set; } public string dates { get; set; }
public string location { get; set; } public List<string> location { get; set; }
public string locations { get; set; }
public List<twenty_fifth_data_details> twenty_fifth_data_detail { get; set; } public List<twenty_fifth_data_details> twenty_fifth_data_detail { get; set; }
} }

BIN
bin/Debug/net5.0/rmutr_report.dll
View File

Binary file not shown.

BIN
bin/Debug/net5.0/rmutr_report.pdb
View File

Binary file not shown.

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/net5.0/ref/rmutr_report.dll
View File

Binary file not shown.

BIN
obj/Debug/net5.0/refint/rmutr_report.dll
View File

Binary file not shown.

BIN
obj/Debug/net5.0/rmutr_report.dll
View File

Binary file not shown.

BIN
obj/Debug/net5.0/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 @@
16933908491121003 16934730478373239

18
wwwroot/reports/project_principle_rationale.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/30/2023 17:20:14" ReportInfo.CreatorVersion="2021.1.0.0"> <Report ScriptLanguage="CSharp" ReportInfo.Created="09/14/2021 15:20:39" ReportInfo.Modified="08/31/2023 16:04:33" ReportInfo.CreatorVersion="2021.1.0.0">
<Dictionary> <Dictionary>
<BusinessObjectDataSource Name="project_principle_rationale" ReferenceName="project_principle_rationale" DataType="null" Enabled="true"> <BusinessObjectDataSource Name="project_principle_rationale" ReferenceName="project_principle_rationale" DataType="null" Enabled="true">
<Column Name="faculty" DataType="System.String"/> <Column Name="faculty" DataType="System.String"/>
@@ -270,10 +270,10 @@
<Column Name="email" DataType="System.String"/> <Column Name="email" DataType="System.String"/>
</BusinessObjectDataSource> </BusinessObjectDataSource>
<BusinessObjectDataSource Name="twenty_fifth" DataType="null" Enabled="true"> <BusinessObjectDataSource Name="twenty_fifth" DataType="null" Enabled="true">
<Column Name="activity" DataType="System.String"/> <Column Name="activitys" DataType="System.String"/>
<Column Name="activity_display_name" DataType="System.String"/> <Column Name="activity_display_name" DataType="System.String"/>
<Column Name="dates" DataType="System.String"/> <Column Name="dates" DataType="System.String"/>
<Column Name="location" DataType="System.String"/> <Column Name="locations" DataType="System.String"/>
<BusinessObjectDataSource Name="twenty_fifth_data_detail" DataType="null" Enabled="true"> <BusinessObjectDataSource Name="twenty_fifth_data_detail" DataType="null" Enabled="true">
<Column Name="dates" DataType="System.String"/> <Column Name="dates" DataType="System.String"/>
<Column Name="times" DataType="System.String"/> <Column Name="times" DataType="System.String"/>
@@ -895,12 +895,12 @@
<ReportPage Name="Page3" PaperWidth="225" Watermark.Font="Arial, 60pt"> <ReportPage Name="Page3" PaperWidth="225" Watermark.Font="Arial, 60pt">
<DataBand Name="Data57" Width="774.9" Height="37.8"> <DataBand Name="Data57" Width="774.9" Height="37.8">
<TextObject Name="Text166" Width="774.9" Height="37.8" Text="25. ตารางกำหนดการดำเนินโครงการ" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/> <TextObject Name="Text166" Width="774.9" Height="37.8" Text="25. ตารางกำหนดการดำเนินโครงการ" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
<DataBand Name="Data58" Top="42.51" Width="774.9" Height="141.75" DataSource="twenty_fifth"> <DataBand Name="Data58" Top="44.15" Width="774.9" Height="160.65" DataSource="twenty_fifth">
<TextObject Name="Text167" Top="9.45" Width="869.4" Height="28.35" Text="[project_principle_rationale.twenty_fifth.activity_display_name]" Font="TH Sarabun New, 14pt, style=Bold"/> <TextObject Name="Text167" Top="9.45" Width="869.4" Height="28.35" Text="[project_principle_rationale.twenty_fifth.activity_display_name]" Font="TH Sarabun New, 14pt, style=Bold"/>
<TextObject Name="Text168" Top="37.8" Width="869.4" Height="28.35" Text="[project_principle_rationale.twenty_fifth.activity]" HorzAlign="Center" Font="TH Sarabun New, 14pt"/> <TextObject Name="Text168" Top="37.8" Width="869.4" Height="47.25" Text="[project_principle_rationale.twenty_fifth.activitys]" AutoShrink="FontSize" AutoShrinkMinSize="11" HorzAlign="Center" Font="TH Sarabun New, 14pt"/>
<TextObject Name="Text169" Top="66.15" Width="869.4" Height="28.35" Text="[project_principle_rationale.twenty_fifth.dates]" HorzAlign="Center" Font="TH Sarabun New, 14pt"/> <TextObject Name="Text169" Top="85.05" Width="869.4" Height="28.35" Text="[project_principle_rationale.twenty_fifth.dates]" HorzAlign="Center" Font="TH Sarabun New, 14pt"/>
<TextObject Name="Text170" Top="94.5" Width="869.4" Height="47.25" Text="[project_principle_rationale.twenty_fifth.location]" AutoWidth="true" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Center" Font="TH Sarabun New, 14pt"/> <TextObject Name="Text170" Top="113.4" Width="869.4" Height="47.25" Text="[project_principle_rationale.twenty_fifth.locations]" AutoWidth="true" AutoShrink="FontSize" AutoShrinkMinSize="11" HorzAlign="Center" Font="TH Sarabun New, 14pt"/>
<DataBand Name="Data59" Top="231.47" Width="774.9" Height="47.25" DataSource="twenty_fifth_data_detail"> <DataBand Name="Data59" Top="255.3" Width="774.9" Height="47.25" DataSource="twenty_fifth_data_detail">
<TableObject Name="Table20" Width="774.9" Height="47.25"> <TableObject Name="Table20" Width="774.9" Height="47.25">
<TableColumn Name="Column95" Width="132.3"/> <TableColumn Name="Column95" Width="132.3"/>
<TableColumn Name="Column96" Width="189"/> <TableColumn Name="Column96" Width="189"/>
@@ -913,7 +913,7 @@
<TableCell Name="Cell148" Border.Lines="All" Text="[project_principle_rationale.twenty_fifth.twenty_fifth_data_detail.lecturer]" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 13pt"/> <TableCell Name="Cell148" Border.Lines="All" Text="[project_principle_rationale.twenty_fifth.twenty_fifth_data_detail.lecturer]" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 13pt"/>
</TableRow> </TableRow>
</TableObject> </TableObject>
<DataHeaderBand Name="DataHeader2" Top="188.96" Width="774.9" Height="37.8"> <DataHeaderBand Name="DataHeader2" Top="211.15" Width="774.9" Height="37.8">
<TableObject Name="Table19" Width="774.9" Height="37.8"> <TableObject Name="Table19" Width="774.9" Height="37.8">
<TableColumn Name="Column91" Width="132.3"/> <TableColumn Name="Column91" Width="132.3"/>
<TableColumn Name="Column92" Width="189"/> <TableColumn Name="Column92" Width="189"/>

18
wwwroot/reports/project_principle_rationale_no_activity.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/30/2023 17:20:03" ReportInfo.CreatorVersion="2021.1.0.0"> <Report ScriptLanguage="CSharp" ReportInfo.Created="09/14/2021 15:20:39" ReportInfo.Modified="08/31/2023 16:09:21" ReportInfo.CreatorVersion="2021.1.0.0">
<Dictionary> <Dictionary>
<BusinessObjectDataSource Name="project_principle_rationale" ReferenceName="project_principle_rationale" DataType="null" Enabled="true"> <BusinessObjectDataSource Name="project_principle_rationale" ReferenceName="project_principle_rationale" DataType="null" Enabled="true">
<Column Name="faculty" DataType="System.String"/> <Column Name="faculty" DataType="System.String"/>
@@ -245,10 +245,10 @@
<Column Name="email" DataType="System.String"/> <Column Name="email" DataType="System.String"/>
</BusinessObjectDataSource> </BusinessObjectDataSource>
<BusinessObjectDataSource Name="twenty_fifth" DataType="null" Enabled="true"> <BusinessObjectDataSource Name="twenty_fifth" DataType="null" Enabled="true">
<Column Name="activity" DataType="System.String"/> <Column Name="activitys" DataType="System.String"/>
<Column Name="activity_display_name" DataType="System.String"/> <Column Name="activity_display_name" DataType="System.String"/>
<Column Name="dates" DataType="System.String"/> <Column Name="dates" DataType="System.String"/>
<Column Name="location" DataType="System.String"/> <Column Name="locations" DataType="System.String"/>
<BusinessObjectDataSource Name="twenty_fifth_data_detail" DataType="null" Enabled="true"> <BusinessObjectDataSource Name="twenty_fifth_data_detail" DataType="null" Enabled="true">
<Column Name="dates" DataType="System.String"/> <Column Name="dates" DataType="System.String"/>
<Column Name="times" DataType="System.String"/> <Column Name="times" DataType="System.String"/>
@@ -836,12 +836,12 @@
<ReportPage Name="Page3" PaperWidth="225" Watermark.Font="Arial, 60pt"> <ReportPage Name="Page3" PaperWidth="225" Watermark.Font="Arial, 60pt">
<DataBand Name="Data57" Width="774.9" Height="37.8"> <DataBand Name="Data57" Width="774.9" Height="37.8">
<TextObject Name="Text166" Width="774.9" Height="37.8" Text="25. ตารางกำหนดการดำเนินโครงการ" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/> <TextObject Name="Text166" Width="774.9" Height="37.8" Text="25. ตารางกำหนดการดำเนินโครงการ" VertAlign="Center" Font="TH Sarabun New, 14pt, style=Bold"/>
<DataBand Name="Data58" Top="42.51" Width="774.9" Height="141.75" DataSource="twenty_fifth"> <DataBand Name="Data58" Top="44.15" Width="774.9" Height="160.65" DataSource="twenty_fifth">
<TextObject Name="Text167" Top="9.45" Width="869.4" Height="28.35" Text="[project_principle_rationale.twenty_fifth.activity_display_name]" Font="TH Sarabun New, 14pt, style=Bold"/> <TextObject Name="Text167" Top="9.45" Width="869.4" Height="28.35" Text="[project_principle_rationale.twenty_fifth.activity_display_name]" Font="TH Sarabun New, 14pt, style=Bold"/>
<TextObject Name="Text168" Top="37.8" Width="869.4" Height="28.35" Text="[project_principle_rationale.twenty_fifth.activity]" HorzAlign="Center" Font="TH Sarabun New, 14pt"/> <TextObject Name="Text169" Top="85.05" Width="869.4" Height="28.35" Text="[project_principle_rationale.twenty_fifth.dates]" HorzAlign="Center" Font="TH Sarabun New, 14pt"/>
<TextObject Name="Text169" Top="66.15" Width="869.4" Height="28.35" Text="[project_principle_rationale.twenty_fifth.dates]" HorzAlign="Center" Font="TH Sarabun New, 14pt"/> <TextObject Name="Text170" Top="113.4" Width="869.4" Height="47.25" Text="[project_principle_rationale.twenty_fifth.locations]" AutoWidth="true" AutoShrink="FontSize" AutoShrinkMinSize="11" HorzAlign="Center" Font="TH Sarabun New, 14pt"/>
<TextObject Name="Text170" Top="94.5" Width="869.4" Height="47.25" Text="[project_principle_rationale.twenty_fifth.location]" AutoWidth="true" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Center" Font="TH Sarabun New, 14pt"/> <TextObject Name="Text168" Top="37.8" Width="869.4" Height="47.25" Text="[project_principle_rationale.twenty_fifth.activitys]" AutoShrink="FontSize" AutoShrinkMinSize="11" HorzAlign="Center" Font="TH Sarabun New, 14pt"/>
<DataBand Name="Data59" Top="231.47" Width="774.9" Height="47.25" DataSource="twenty_fifth_data_detail"> <DataBand Name="Data59" Top="255.3" Width="774.9" Height="47.25" DataSource="twenty_fifth_data_detail">
<TableObject Name="Table20" Width="774.9" Height="47.25"> <TableObject Name="Table20" Width="774.9" Height="47.25">
<TableColumn Name="Column95" Width="132.3"/> <TableColumn Name="Column95" Width="132.3"/>
<TableColumn Name="Column96" Width="189"/> <TableColumn Name="Column96" Width="189"/>
@@ -854,7 +854,7 @@
<TableCell Name="Cell148" Border.Lines="All" Text="[project_principle_rationale.twenty_fifth.twenty_fifth_data_detail.lecturer]" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 13pt"/> <TableCell Name="Cell148" Border.Lines="All" Text="[project_principle_rationale.twenty_fifth.twenty_fifth_data_detail.lecturer]" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 13pt"/>
</TableRow> </TableRow>
</TableObject> </TableObject>
<DataHeaderBand Name="DataHeader2" Top="188.96" Width="774.9" Height="37.8"> <DataHeaderBand Name="DataHeader2" Top="211.15" Width="774.9" Height="37.8">
<TableObject Name="Table19" Width="774.9" Height="37.8"> <TableObject Name="Table19" Width="774.9" Height="37.8">
<TableColumn Name="Column91" Width="132.3"/> <TableColumn Name="Column91" Width="132.3"/>
<TableColumn Name="Column92" Width="189"/> <TableColumn Name="Column92" Width="189"/>