Skip to content

Commit

Permalink
revert degree name changes
Browse files Browse the repository at this point in the history
  • Loading branch information
August Fu committed Apr 12, 2024
1 parent 06803a5 commit 7a9ca6a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
4 changes: 2 additions & 2 deletions frontend/degree-plan/components/FourYearPlan/DegreeModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,9 @@ const DegreeAddInterior = styled.div`
export const createMajorLabel = (degree: DegreeListing) => {
const concentration =
degree.concentration && degree.concentration !== "NONE"
? ` - ${degree.concentration}`
? ` - ${degree.concentration_name}`
: "";
return `${degree.major}${concentration} (${degree.year})`;
return `${degree.major_name}${concentration} (${degree.year})`;
};

interface RemoveDegreeProps {
Expand Down
3 changes: 1 addition & 2 deletions frontend/degree-plan/components/Requirements/ReqPanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,7 @@ interface DegreeHeaderProps {
}

const DegreeHeader = ({ degree, remove, setCollapsed, collapsed, editMode, skeleton }: DegreeHeaderProps) => {
console.log(degree)
const degreeName = !skeleton ? `${degree.degree} in ${degree.major} ${degree.concentration ? `(${degree.concentration})` : ''}` : <DarkBlueBackgroundSkeleton width="10em" />;
const degreeName = !skeleton ? `${degree.degree} in ${degree.major_name} ${degree.concentration ? `(${degree.concentration_name})` : ''}` : <DarkBlueBackgroundSkeleton width="10em" />;
return (
<DegreeHeaderContainer onClick={() => setCollapsed(!collapsed)}>
<DegreeTitleWrapper>
Expand Down

0 comments on commit 7a9ca6a

Please sign in to comment.