Skip to content

Commit 59e4922

Browse files
renemadsenrenemadsen
authored
Merge pull request #203 from Gid733/master
Added report generation functionality
2 parents 0c0c4ec + cea7076 commit 59e4922

33 files changed

+579
-213
lines changed

‎eFormAPI/eFormAPI.Web/Abstractions/Eforms/IEformReportsService.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ namespace eFormAPI.Web.Abstractions.Eforms
77
public interface IEformReportsService
88
{
99
Task<OperationDataResult<EformReportFullModel>> GetEformReport(int templateId);
10-
Task<OperationResult> UpdateEformReport(EformReportModel requestModel);
10+
Task<OperationResult> UpdateEformReport(EformReportFullModel requestModel);
1111
}
1212
}

‎eFormAPI/eFormAPI.Web/Controllers/Eforms/EformReportsController.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public async Task<OperationDataResult<EformReportFullModel>> GetEformReport(int
2727

2828
[HttpPut]
2929
[Route("api/templates/report")]
30-
public async Task<OperationResult> UpdateEformReport([FromBody] EformReportModel eformReportModel)
30+
public async Task<OperationResult> UpdateEformReport([FromBody] EformReportFullModel eformReportModel)
3131
{
3232
return await _eformReportsService.UpdateEformReport(eformReportModel);
3333
}

‎eFormAPI/eFormAPI.Web/Infrastructure/Database/Entities/EformReport.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ public class EformReport : BaseEntity
1414
public bool IsDateVisible { get; set; }
1515
public bool IsWorkerNameVisible { get; set; }
1616

17-
public virtual ICollection<EformReportElement> ReportElements { get; set; }
17+
public virtual ICollection<EformReportElement> ReportElements { get; set; } = new List<EformReportElement>();
1818
}
1919
}

‎eFormAPI/eFormAPI.Web/Infrastructure/Database/Entities/EformReportDataItem.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ public class EformReportDataItem : BaseEntity
1818
public int? ParentId { get; set; }
1919
public virtual EformReportDataItem Parent { get; set; }
2020

21-
public virtual ICollection<EformReportDataItem> NestedDataItems { get; set; }
21+
public virtual ICollection<EformReportDataItem> NestedDataItems { get; set; } = new List<EformReportDataItem>();
2222
}
2323
}

‎eFormAPI/eFormAPI.Web/Infrastructure/Database/Entities/EformReportElement.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public class EformReportElement : BaseEntity
1717
public int? ParentId { get; set; }
1818
public virtual EformReportElement Parent { get; set; }
1919

20-
public virtual ICollection<EformReportElement> NestedElements { get; set; }
21-
public virtual ICollection<EformReportDataItem> DataItems { get; set; }
20+
public virtual ICollection<EformReportElement> NestedElements { get; set; } = new List<EformReportElement>();
21+
public virtual ICollection<EformReportDataItem> DataItems { get; set; } = new List<EformReportDataItem>();
2222
}
2323
}

‎eFormAPI/eFormAPI.Web/Infrastructure/Models/Reports/EformKeyValuePairModel.cs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
namespace eFormAPI.Web.Infrastructure.Models.Reports
2+
{
3+
public class EformKeyValuePairModel
4+
{
5+
public string Key { get; set; }
6+
public string Value { get; set; }
7+
public bool Selected { get; set; }
8+
public string DisplayOrder { get; set; }
9+
}
10+
}

‎eFormAPI/eFormAPI.Web/Infrastructure/Models/Reports/EformReportDataItemModel.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ public class EformReportDataItemModel
1313
public int Position { get; set; }
1414
public bool Visibility { get; set; }
1515

16+
public List<EformKeyValuePairModel> KeyValuePairList { get; set; }
17+
= new List<EformKeyValuePairModel>();
18+
1619
public List<EformReportDataItemModel> DataItemList =
1720
new List<EformReportDataItemModel>();
1821
}

‎eFormAPI/eFormAPI.Web/Resources/SharedResource.da.resx‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -546,4 +546,22 @@
546546
<data name="PluginsSettings" xml:space="preserve">
547547
<value>Plugins Indstillinger</value>
548548
</data>
549+
<data name="EformReportNotFound" xml:space="preserve">
550+
<value>Eform-rapport blev ikke fundet</value>
551+
</data>
552+
<data name="ElementListNotProvided" xml:space="preserve">
553+
<value>ElementList findes ikke</value>
554+
</data>
555+
<data name="ErrorWhileObtainingReportInfo" xml:space="preserve">
556+
<value>Fejl under opnåelse af rapportoplysninger</value>
557+
</data>
558+
<data name="ErrorWhileUpdatingReport" xml:space="preserve">
559+
<value>Fejl under opdatering af rapport</value>
560+
</data>
561+
<data name="ReportUpdatedSuccessfully" xml:space="preserve">
562+
<value>Rapport opdateret med succes</value>
563+
</data>
564+
<data name="TemplateNotFound" xml:space="preserve">
565+
<value>Skabelon blev ikke fundet</value>
566+
</data>
549567
</root>

‎eFormAPI/eFormAPI.Web/Resources/SharedResource.resx‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -546,4 +546,22 @@
546546
<data name="PluginsSettings" xml:space="preserve">
547547
<value>Plugins Settings</value>
548548
</data>
549+
<data name="EformReportNotFound" xml:space="preserve">
550+
<value>Eform report not found</value>
551+
</data>
552+
<data name="ElementListNotProvided" xml:space="preserve">
553+
<value>ElementList not provided</value>
554+
</data>
555+
<data name="ErrorWhileObtainingReportInfo" xml:space="preserve">
556+
<value>Error while obtaining report info</value>
557+
</data>
558+
<data name="ErrorWhileUpdatingReport" xml:space="preserve">
559+
<value>Error while updating report</value>
560+
</data>
561+
<data name="ReportUpdatedSuccessfully" xml:space="preserve">
562+
<value>Report updated successfully</value>
563+
</data>
564+
<data name="TemplateNotFound" xml:space="preserve">
565+
<value>Template not found</value>
566+
</data>
549567
</root>

0 commit comments

Comments
 (0)