Skip to content
Snippets Groups Projects
Commit 7e6f14b3 authored by Petar Hristov's avatar Petar Hristov :speech_balloon:
Browse files

Orgas

parent 1ea1a12f
No related branches found
No related tags found
1 merge request!7Update: KPI generator for Project
Pipeline #818593 failed
...@@ -55,7 +55,7 @@ public class ProjectReporting : Reporting<ProjectReportingOptions> ...@@ -55,7 +55,7 @@ public class ProjectReporting : Reporting<ProjectReportingOptions>
{ {
Id = projectReturnObject.Id, Id = projectReturnObject.Id,
DateCreated = projectReturnObject.DateCreated, DateCreated = projectReturnObject.DateCreated,
Organizations = GetOrganizations(projectReturnObject.Id), Organizations = GetOrganizations(projectReturnObject),
Disciplines = projectReturnObject.Disciplines.ToList(), Disciplines = projectReturnObject.Disciplines.ToList(),
Deleted = projectReturnObject.Deleted, Deleted = projectReturnObject.Deleted,
ProjectVisibilityId = projectReturnObject.Visibility.Id, ProjectVisibilityId = projectReturnObject.Visibility.Id,
...@@ -90,25 +90,20 @@ public class ProjectReporting : Reporting<ProjectReportingOptions> ...@@ -90,25 +90,20 @@ public class ProjectReporting : Reporting<ProjectReportingOptions>
return reportingFilesPerOrganization; return reportingFilesPerOrganization;
} }
private IEnumerable<ProjectQuotaReturnObject> GetResourceTypeQuota(Guid projectId) private List<ProjectQuotaReturnObject> GetResourceTypeQuota(Guid projectId)
{ {
var resourceTypes = _resourceTypeModel.GetAllWhere(x => x.Enabled == true); var resourceTypes = _resourceTypeModel.GetAllWhere(x => x.Enabled == true && x.);
return resourceTypes.Select(x => Helpers.CreateProjectQuotaReturnObject(x, projectId)); return resourceTypes.Select(x => Helpers.CreateProjectQuotaReturnObject(x, projectId)).ToList();
} }
private List<Organization> GetOrganizations(Guid projectID) private List<Organization> GetOrganizations(ProjectObject project)
{ {
var result = new List<Organization>(); var result = new List<Organization>();
var projectInstituteModel = new ProjectInstituteModel(); foreach (var entry in project.Organizations)
var organizations = from projectInstitute in projectInstituteModel.GetAllWhere((ProjectInstitute projectInstitute) => projectInstitute.ProjectId == projectID)
select projectInstitute.OrganizationUrl;
foreach (var entry in organizations)
{ {
result.Add(FetchOrganizationByRor(entry)); result.Add(FetchOrganizationByRor(entry.Url));
} }
return result; return result;
} }
} }
\ No newline at end of file
...@@ -16,5 +16,5 @@ public class ReturnObject ...@@ -16,5 +16,5 @@ public class ReturnObject
public Guid ProjectVisibilityId { get; set; } public Guid ProjectVisibilityId { get; set; }
public string? GrantId { get; set; } public string? GrantId { get; set; }
public int? Members { get; set; } = null; public int? Members { get; set; } = null;
public IEnumerable<ProjectQuotaReturnObject> ResourceTypeQuota { get; set; } = null!; public List<ProjectQuotaReturnObject> ResourceTypeQuota { get; set; } = new();
} }
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment