From 9a19f317fac2f9ec980349e8161514de00209642 Mon Sep 17 00:00:00 2001
From: Natalie Hergesheimer <natalie.hergesheimer@inl.gov>
Date: Mon, 30 Sep 2024 13:07:53 -0600
Subject: [PATCH 1/3] Assessment editor/creator logic complete

---
 .../Assessment/AssessmentBusiness.cs          | 11 ++++++++++
 .../Assessment/IAssessmentBusiness.cs         |  2 ++
 .../Controllers/AssessmentController.cs       | 20 +++++++++++++++++++
 .../contact-item/contact-item.component.html  | 14 ++++++++++---
 .../contact-item/contact-item.component.ts    | 12 ++++++++++-
 .../src/app/services/assessment.service.ts    | 12 +++++++++++
 6 files changed, 67 insertions(+), 4 deletions(-)

diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Assessment/AssessmentBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Assessment/AssessmentBusiness.cs
index 8a9d7df746..ca3a829832 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Assessment/AssessmentBusiness.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Assessment/AssessmentBusiness.cs
@@ -961,6 +961,17 @@ public string GetOtherRemarks(int assessmentId)
             return "";
         }
 
+        /// <summary>
+        /// Gets the userID that created the current assessment  
+        /// </summary>
+        /// <returns>userID</returns>
+        public int? GetAssessmentCreator(int assessmentId)
+        {
+            var assessment = _context.ASSESSMENTS.FirstOrDefault(x => x.Assessment_Id == assessmentId);
+            return assessment?.AssessmentCreatorId;
+        }
+        
+
 
         /// <summary>
         /// Persists OTHER-REMARKS.
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Assessment/IAssessmentBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Assessment/IAssessmentBusiness.cs
index 3ff3b9eccb..a04c6c49e5 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Assessment/IAssessmentBusiness.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Assessment/IAssessmentBusiness.cs
@@ -38,6 +38,8 @@ public interface IAssessmentBusiness
         IList<string> GetNames(int id1, int id2, int? id3, int? id4, int? id5, int? id6, int? id7, int? id8, int? id9, int? id10);
 
         string GetOtherRemarks(int assessmentId);
+
+        int? GetAssessmentCreator(int assessmentId);
         void SaveOtherRemarks(int assessmentId, string remark);
         void clearFirstTime(int userid, int assessmentId);
 
diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AssessmentController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AssessmentController.cs
index e29f83156a..a03088aa78 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AssessmentController.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AssessmentController.cs
@@ -488,5 +488,25 @@ public IActionResult GetAssessmentDocuments([FromQuery] int id1, [FromQuery] int
 
             return Ok(this._assessmentBusiness.GetAssessmentDocuments(id1, id2, id3, id4, id5, id6, id7, id8, id9, id10));
         }
+        
+        [HttpGet]
+        [Route("api/assessmentCreator")]
+        public IActionResult AssessmentCreator()
+        {
+            try
+            {
+                int assessmentId = _tokenManager.AssessmentForUser();
+                int? userId = _tokenManager.GetCurrentUserId();
+                var creatorId = this._assessmentBusiness.GetAssessmentCreator((assessmentId));
+
+                return Ok(creatorId);
+            }
+            catch (Exception exc)
+            {
+                NLog.LogManager.GetCurrentClassLogger().Error($"... {exc}");
+            }
+
+            return null;
+        }
     }
 }
diff --git a/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-contacts/contact-item/contact-item.component.html b/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-contacts/contact-item/contact-item.component.html
index 045b82be86..3abcaf7a28 100644
--- a/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-contacts/contact-item/contact-item.component.html
+++ b/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-contacts/contact-item/contact-item.component.html
@@ -53,8 +53,8 @@
       </div>
       <span class="d-flex align-items-center m-3 fw-600" style="text-align: center;"
         *ngIf="contact.isSiteParticipant">Participated<br />in Site Visit</span>
-      <span class="d-flex align-items-center m-3 fw-600" style="text-align: center;"
-        *ngIf="contact.isPrimaryPoc">Primary<br />Point of Contact</span>
+      <span class="d-flex align-items-center m-3 fw-600" style="text-align: center;">
+        </span>
 
       <span *ngIf="showControls()" class="d-flex align-items-center flex-00a">
         <button type="button" class="p-0 m-2 btn icon-button d-flex flex-column align-items-center flex-00a"
@@ -74,7 +74,15 @@
         </button>
       </span>
 
-      <span class="pe-3 fw-600" *ngIf="!showControls()">{{ t('contact.assessment owner') }}</span>
+      <span class="pe-3 fw-600" *ngIf="!showControls()">
+        <ul>
+          <ol *ngIf="contact.isPrimaryPoc">Primary<br />Point of Contact</ol>
+          <ol> <div *ngIf="creatorId == contact.userId; else Editor"> Assessment Creator </div>
+            <ng-template #Editor> Assessment Editor </ng-template>
+          </ol>
+        </ul>
+       
+      </span>
     </div>
 
 
diff --git a/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-contacts/contact-item/contact-item.component.ts b/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-contacts/contact-item/contact-item.component.ts
index c2e49021f2..5e0c07df6a 100644
--- a/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-contacts/contact-item/contact-item.component.ts
+++ b/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-contacts/contact-item/contact-item.component.ts
@@ -33,6 +33,7 @@ import { ConfigService } from "../../../../../services/config.service";
 import { EmailService } from "../../../../../services/email.service";
 import { LayoutService } from "../../../../../services/layout.service";
 import { TranslocoService } from "@ngneat/transloco";
+import { DemographicIodService } from "../../../../../services/demographic-iod.service";
 
 @Component({
   selector: "app-contact-item",
@@ -66,6 +67,7 @@ export class ContactItemComponent implements OnInit {
   results: EditableUser[];
   roles: Role[];
   editMode: boolean;
+  creatorId: any; 
 
 
   constructor(
@@ -75,7 +77,8 @@ export class ContactItemComponent implements OnInit {
     private assessSvc: AssessmentService,
     private dialog: MatDialog,
     public layoutSvc: LayoutService,
-    public tSvc: TranslocoService
+    public tSvc: TranslocoService, 
+    public demoSvc: DemographicIodService
   ) {
     this.editMode = true;
   }
@@ -96,6 +99,7 @@ export class ContactItemComponent implements OnInit {
     if (this.contact.evaluateCanEdit) {
       this.editMode = this.contact.evaluateCanEdit();
     }
+    this.assessmentCreator()
   }
 
   isEmailValid() {
@@ -267,4 +271,10 @@ export class ContactItemComponent implements OnInit {
   scrollToTop() {
     this.topScroll?.nativeElement.scrollIntoView({ behavior: 'smooth', alignToTop: true });
   }
+  // Check if assessment was created by current user 
+  assessmentCreator(){
+    this.assessSvc.getCreator().then((response: any) => {
+      this.creatorId = response
+    })
+  }
 }
diff --git a/CSETWebNg/src/app/services/assessment.service.ts b/CSETWebNg/src/app/services/assessment.service.ts
index bff5f87268..a01dc59907 100644
--- a/CSETWebNg/src/app/services/assessment.service.ts
+++ b/CSETWebNg/src/app/services/assessment.service.ts
@@ -80,6 +80,8 @@ export class AssessmentService {
    */
   public isBrandNew = false;
 
+  public assessmentCreator: any; 
+
   /**
    *
    */
@@ -237,6 +239,16 @@ export class AssessmentService {
       });
   }
 
+   getCreator(){
+    return this.http
+      .get(this.apiUrl + 'assessmentcreator')
+      .toPromise()
+      .then((response: any) => {
+        this.assessmentCreator = response;
+        return response;
+      });
+  }
+
   /**
    * 
    */

From c0122055115f7f3c3d82b10b6a6b185fe133470c Mon Sep 17 00:00:00 2001
From: Natalie Hergesheimer <natalie.hergesheimer@inl.gov>
Date: Tue, 1 Oct 2024 08:29:00 -0600
Subject: [PATCH 2/3] Modified assessment label display

---
 .../contact-item/contact-item.component.html                | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-contacts/contact-item/contact-item.component.html b/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-contacts/contact-item/contact-item.component.html
index 3abcaf7a28..afc7d4b7db 100644
--- a/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-contacts/contact-item/contact-item.component.html
+++ b/CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-contacts/contact-item/contact-item.component.html
@@ -28,7 +28,7 @@
       [ngClass]="!showControls() ? 'bgc-primary-50 c-gray-900 b-primary-200' : 'b-light'"
       style="width: 100%; height: 125px; overflow: hidden;">
       <div class="p-3 d-flex flex-column justify-content-center align-items-start" style="flex: 0 0 25%">
-        <span class="m-0 fs-base-1 fw-600">{{contact.firstName}} {{contact.lastName}}</span>
+        <span class="m-0 text-center fs-base-1 fw-600">{{contact.firstName}} {{contact.lastName}}</span>
         <span class="fs-small fw-400 fst-italic" *ngIf="contact.assessmentRoleId === 2">
           ({{getRoleName(contact.assessmentRoleId)}})
         </span>
@@ -74,9 +74,9 @@
         </button>
       </span>
 
-      <span class="pe-3 fw-600" *ngIf="!showControls()">
+      <span class="pe-4 text-center fw-300" *ngIf="!showControls()">
         <ul>
-          <ol *ngIf="contact.isPrimaryPoc">Primary<br />Point of Contact</ol>
+          <ol *ngIf="contact.isPrimaryPoc">Primary Point of Contact</ol>
           <ol> <div *ngIf="creatorId == contact.userId; else Editor"> Assessment Creator </div>
             <ng-template #Editor> Assessment Editor </ng-template>
           </ol>

From e90f17c0f9d936d22c865c79d1f7fdcd41e8654d Mon Sep 17 00:00:00 2001
From: Natalie Hergesheimer <natalie.hergesheimer@inl.gov>
Date: Tue, 1 Oct 2024 08:33:57 -0600
Subject: [PATCH 3/3] Remove unnecessary userID grab

---
 .../CSETWeb_ApiCore/Controllers/AssessmentController.cs          | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AssessmentController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AssessmentController.cs
index a03088aa78..510ff36c54 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AssessmentController.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/AssessmentController.cs
@@ -496,7 +496,6 @@ public IActionResult AssessmentCreator()
             try
             {
                 int assessmentId = _tokenManager.AssessmentForUser();
-                int? userId = _tokenManager.GetCurrentUserId();
                 var creatorId = this._assessmentBusiness.GetAssessmentCreator((assessmentId));
 
                 return Ok(creatorId);