From 6aa6abff90c7ca1336ae4c2a309df19741fcf6ca Mon Sep 17 00:00:00 2001
From: Kris Jordan <kris@cs.unc.edu>
Date: Mon, 12 Aug 2024 12:22:51 -0400
Subject: [PATCH] Clean up onboarding page for HR staff (#580)

---
 .../hiring/hiring_assignment_entity.py        |  2 +-
 .../academics/hiring/hiring_assignment.py     |  3 +-
 .../hiring-summary.component.css              | 36 +++++++++++--------
 .../hiring-summary.component.html             | 17 ++++-----
 .../hiring-summary.component.ts               |  9 +++--
 5 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/backend/entities/academics/hiring/hiring_assignment_entity.py b/backend/entities/academics/hiring/hiring_assignment_entity.py
index 5299fc5e4..83aaebba5 100644
--- a/backend/entities/academics/hiring/hiring_assignment_entity.py
+++ b/backend/entities/academics/hiring/hiring_assignment_entity.py
@@ -147,7 +147,7 @@ def to_summary_overview_model(self) -> HiringAssignmentSummaryOverview:
             id=self.id,
             application_review_id=self.application_review_id,
             course_site_id=self.course_site_id,
-            user=self.user.to_public_model(),
+            user=self.user.to_model(),
             instructors=", ".join(map(str, list(set(instructors)))),
             level=self.hiring_level.to_model(),
             status=self.status,
diff --git a/backend/models/academics/hiring/hiring_assignment.py b/backend/models/academics/hiring/hiring_assignment.py
index 912bfa4f5..8cdc65f1f 100644
--- a/backend/models/academics/hiring/hiring_assignment.py
+++ b/backend/models/academics/hiring/hiring_assignment.py
@@ -3,6 +3,7 @@
 from datetime import datetime
 
 from ... import PublicUser
+from ... import User
 from ...academics import CatalogSectionIdentity
 from .hiring_level import HiringLevel
 from .application_review import ApplicationReviewOverview
@@ -51,7 +52,7 @@ class HiringAssignmentSummaryOverview(BaseModel):
     id: int | None = None
     application_review_id: int | None = None
     course_site_id: int | None = None
-    user: PublicUser
+    user: User
     instructors: str
     level: HiringLevel
     status: HiringAssignmentStatus
diff --git a/frontend/src/app/hiring/hiring-summary/hiring-summary.component.css b/frontend/src/app/hiring/hiring-summary/hiring-summary.component.css
index f910bcc17..cdf48fcdf 100644
--- a/frontend/src/app/hiring/hiring-summary/hiring-summary.component.css
+++ b/frontend/src/app/hiring/hiring-summary/hiring-summary.component.css
@@ -1,31 +1,37 @@
 .mat-mdc-card-outlined {
-    border-color: transparent !important;
-    margin-right: 32px !important;
-    max-width: 100% !important;
-    min-height: calc(100vh - 112px);
-    height: 100%;
-    margin-bottom: 32px !important;
+  border-color: transparent !important;
+  margin-right: 32px !important;
+  max-width: 100% !important;
+  min-height: calc(100vh - 112px);
+  height: 100%;
+  margin-bottom: 32px !important;
 }
 
 mat-card-header {
-    flex-direction: row;
-    align-items: center;
+  flex-direction: row;
+  align-items: center;
 }
 
 .header-actions {
-    margin-left: auto;
+  margin-left: auto;
 }
 
 .term-selector {
-    margin-bottom: -1.25em;
-    margin-left: 16px;
+  margin-bottom: -1.25em;
+  margin-left: 16px;
 }
 
 .input-field {
-    margin-top: 4px;
-    margin-bottom: -1.25em;
+  margin-top: 4px;
+  margin-bottom: -1.25em;
 }
 
 p {
-    margin-bottom: 0;
-}
\ No newline at end of file
+  margin-bottom: 0;
+}
+
+mat-form-field.epar,
+mat-form-field.pos_number {
+  width: 100px;
+  font-size: 16px;
+}
diff --git a/frontend/src/app/hiring/hiring-summary/hiring-summary.component.html b/frontend/src/app/hiring/hiring-summary/hiring-summary.component.html
index 5c40d54e1..447b84ccc 100644
--- a/frontend/src/app/hiring/hiring-summary/hiring-summary.component.html
+++ b/frontend/src/app/hiring/hiring-summary/hiring-summary.component.html
@@ -1,6 +1,6 @@
 <mat-card appearance="outlined">
   <mat-card-header>
-    <mat-card-title>{{ selectedTerm().name }} Hiring Summary</mat-card-title>
+    <mat-card-title>{{ selectedTerm().name }} Onboarding</mat-card-title>
     <div class="header-actions">
       <button mat-stroked-button (click)="exportCsv()">Download CSV</button>
       <mat-form-field class="term-selector" appearance="outline">
@@ -28,13 +28,13 @@
             </div>
           </td>
         </ng-container>
-        <ng-container matColumnDef="onyen">
+        <ng-container matColumnDef="pid">
           <th mat-header-cell *matHeaderCellDef>
-            <div class="header">Onyen</div>
+            <div class="header">PID</div>
           </th>
           <td mat-cell *matCellDef="let element">
             <div class="row">
-              <p>{{ element.user.onyen }}</p>
+              <p>{{ element.user.pid }}</p>
             </div>
           </td>
         </ng-container>
@@ -55,9 +55,9 @@
           <td mat-cell *matCellDef="let element">
             <div class="row">
               <p>
-                {{ element.level.title }} (${{
+                ${{
                   element.level.salary.toFixed(2)
-                }})
+                }}
               </p>
             </div>
           </td>
@@ -68,7 +68,7 @@
           </th>
           <td mat-cell *matCellDef="let element; let i = index">
             <div class="row">
-              <mat-form-field class="input-field" appearance="outline">
+              <mat-form-field class="input-field epar" appearance="outline">
                 <input
                   matInput
                   [(ngModel)]="(assignmentsPage()?.items ?? [])[i].epar"
@@ -84,7 +84,7 @@
           </th>
           <td mat-cell *matCellDef="let element; let i = index">
             <div class="row">
-              <mat-form-field class="input-field" appearance="outline">
+              <mat-form-field class="input-field pos_number" appearance="outline">
                 <input
                   matInput
                   [(ngModel)]="
@@ -104,6 +104,7 @@
             <div class="row">
               <mat-form-field class="input-field" appearance="outline">
                 <textarea
+                  rows="1"
                   matInput
                   [(ngModel)]="(assignmentsPage()?.items ?? [])[i].notes"
                   (change)="updateAssignment(i)"></textarea>
diff --git a/frontend/src/app/hiring/hiring-summary/hiring-summary.component.ts b/frontend/src/app/hiring/hiring-summary/hiring-summary.component.ts
index fe62e2af1..2f1736832 100644
--- a/frontend/src/app/hiring/hiring-summary/hiring-summary.component.ts
+++ b/frontend/src/app/hiring/hiring-summary/hiring-summary.component.ts
@@ -35,7 +35,7 @@ export class HiringSummaryComponent {
   /** Route for the routing module */
   public static Route = {
     path: 'summary',
-    title: 'Hiring Summary',
+    title: 'Hiring Onboarding',
     component: HiringSummaryComponent,
     resolve: {
       terms: termsResolver,
@@ -80,13 +80,12 @@ export class HiringSummaryComponent {
 
   public displayedColumns: string[] = [
     'name',
-    'onyen',
-    'instructors',
+    'pid',
     'level',
-    'epar',
+    'i9',
     'position_number',
+    'epar',
     'notes',
-    'i9',
     'status'
   ];