diff --git a/dfa-public/src/API/EMBC.ESS.Shared.Contracts/EMBC.ESS.Shared.Contracts.csproj b/dfa-public/src/API/EMBC.ESS.Shared.Contracts/EMBC.ESS.Shared.Contracts.csproj index a46d9acb7..28a54e6b6 100644 --- a/dfa-public/src/API/EMBC.ESS.Shared.Contracts/EMBC.ESS.Shared.Contracts.csproj +++ b/dfa-public/src/API/EMBC.ESS.Shared.Contracts/EMBC.ESS.Shared.Contracts.csproj @@ -31,6 +31,6 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + \ No newline at end of file diff --git a/dfa-public/src/API/EMBC.Utilities.Hosting/EMBC.Utilities.Hosting.csproj b/dfa-public/src/API/EMBC.Utilities.Hosting/EMBC.Utilities.Hosting.csproj index 86a7651a9..dd503b75a 100644 --- a/dfa-public/src/API/EMBC.Utilities.Hosting/EMBC.Utilities.Hosting.csproj +++ b/dfa-public/src/API/EMBC.Utilities.Hosting/EMBC.Utilities.Hosting.csproj @@ -41,7 +41,7 @@ - + diff --git a/dfa-public/src/API/EMBC.Utilities.Hosting/Logging.cs b/dfa-public/src/API/EMBC.Utilities.Hosting/Logging.cs index b797cf486..376886fb3 100644 --- a/dfa-public/src/API/EMBC.Utilities.Hosting/Logging.cs +++ b/dfa-public/src/API/EMBC.Utilities.Hosting/Logging.cs @@ -31,7 +31,7 @@ public static void ConfigureSerilog(HostBuilderContext hostBuilderContext, IServ .Enrich.WithEnvironmentUserName() .Enrich.WithCorrelationId() .Enrich.WithCorrelationIdHeader() - .Enrich.WithClientAgent() + //.Enrich.WithClientAgent() .Enrich.WithClientIp() .Enrich.WithSpan() .WriteTo.Console(outputTemplate: LogOutputTemplate) diff --git a/dfa-public/src/API/EMBC.Utilities/EMBC.Utilities.csproj b/dfa-public/src/API/EMBC.Utilities/EMBC.Utilities.csproj index f1ce68a18..4150fc87d 100644 --- a/dfa-public/src/API/EMBC.Utilities/EMBC.Utilities.csproj +++ b/dfa-public/src/API/EMBC.Utilities/EMBC.Utilities.csproj @@ -38,7 +38,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/dfa-public/src/UI/embc-dfa/src/app/sharedModules/project-dashboard-components/project/project.component.html b/dfa-public/src/UI/embc-dfa/src/app/sharedModules/project-dashboard-components/project/project.component.html index 46e285fcb..e9f7d251e 100644 --- a/dfa-public/src/UI/embc-dfa/src/app/sharedModules/project-dashboard-components/project/project.component.html +++ b/dfa-public/src/UI/embc-dfa/src/app/sharedModules/project-dashboard-components/project/project.component.html @@ -150,23 +150,24 @@ + + @if(applItem.stage == 'Approved' || applItem.stage == 'Approved with Exclusions') {
- -
- Site Location - -
-
- {{applItem.siteLocation }} -
-
- Estimated Completion Date - -
-
- {{ applItem.estimatedCompletionDate }} -
- +
+ Site Location - +
+
+ {{applItem.siteLocation }} +
+
+ Estimated Completion Date - +
+
+ {{ applItem.estimatedCompletionDate }} +
+
EMCR Approved Amount -
@@ -180,6 +181,7 @@ {{ applItem.deadline18Month }}
+ }
Error in displaying status
diff --git a/dfa-public/src/UI/embc-dfa/src/app/sharedModules/project-dashboard-components/project/project.component.ts b/dfa-public/src/UI/embc-dfa/src/app/sharedModules/project-dashboard-components/project/project.component.ts index 280f13559..cadad91db 100644 --- a/dfa-public/src/UI/embc-dfa/src/app/sharedModules/project-dashboard-components/project/project.component.ts +++ b/dfa-public/src/UI/embc-dfa/src/app/sharedModules/project-dashboard-components/project/project.component.ts @@ -87,6 +87,7 @@ export class DfaDashProjectComponent implements OnInit { var initialList = lstData; lstDataUnModified.push(initialList); lstData.forEach(objApp => { + objApp.isHidden = false; var isFound = false; var jsonVal = JSON.stringify(this.items); objApp.isErrorInStatus = false;