Skip to content

Commit

Permalink
Clean up onboarding page for HR staff (#580)
Browse files Browse the repository at this point in the history
  • Loading branch information
KrisJordan authored Aug 12, 2024
1 parent 3d95d9b commit 6aa6abf
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 30 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 2 additions & 1 deletion backend/models/academics/hiring/hiring_assignment.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
36 changes: 21 additions & 15 deletions frontend/src/app/hiring/hiring-summary/hiring-summary.component.css
Original file line number Diff line number Diff line change
@@ -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;
}
margin-bottom: 0;
}

mat-form-field.epar,
mat-form-field.pos_number {
width: 100px;
font-size: 16px;
}
Original file line number Diff line number Diff line change
@@ -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">
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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"
Expand All @@ -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)]="
Expand All @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -80,13 +80,12 @@ export class HiringSummaryComponent {

public displayedColumns: string[] = [
'name',
'onyen',
'instructors',
'pid',
'level',
'epar',
'i9',
'position_number',
'epar',
'notes',
'i9',
'status'
];

Expand Down

0 comments on commit 6aa6abf

Please sign in to comment.