chore: fixes positioning of elements when printing in english

Author: andr9528

src/cv/components/employment-section/employment.tsx

@@ -1,6 +1,8 @@
 import { LabelledTypography } from "@/shared/components/labelled-typography";
+import { PageBreak } from "@/shared/components/page-break";
 import { EmploymentEntity } from "@/shared/entities/employment-entity";
-import { LocalizationService } from "@/shared/services/localization-service";
+import { EntityEmploymentLocalizationKeys } from "@/shared/localization/employment-localization";
+import { Language, LocalizationService } from "@/shared/services/localization-service";
 import { Paper, Typography } from "@mui/material";
 import { ReactNode } from "react";
 
@@ -15,19 +17,22 @@ export function Employment(props: EmploymentProps): JSX.Element {
     const employmentPeriode: string = buildEmploymentPeriodeString()
 
     return (
-        <Paper elevation={1} sx={{padding: '5px', margin: '5px'}}>
-            <Typography color={'Highlight'}>
-                {employedAsAt}
-            </Typography>
-            <Typography>
-                {employmentPeriode}
-            </Typography>
-            <LabelledTypography 
-                labelText={entityLocalizationService.getComponentText("workDescriptionLabel")}
-                labelProps={{color: 'GrayText'}}
-                mainText={entityLocalizationService.getEntityText(props.employmentEntity.workDescriptionKey)}
-                mainProps={{variant: 'body1', style: {whiteSpace: 'pre-line'}}}/>
-        </Paper>
+        <>
+            {insertNewPageInPrint("employerApps4All", Language.ENGLISH)}
+            <Paper elevation={1} sx={{padding: '5px', margin: '5px'}}>
+                <Typography color={'Highlight'}>
+                    {employedAsAt}
+                </Typography>
+                <Typography>
+                    {employmentPeriode}
+                </Typography>
+                <LabelledTypography 
+                    labelText={entityLocalizationService.getComponentText("workDescriptionLabel")}
+                    labelProps={{color: 'GrayText'}}
+                    mainText={entityLocalizationService.getEntityText(props.employmentEntity.workDescriptionKey)}
+                    mainProps={{variant: 'body1', style: {whiteSpace: 'pre-line'}}}/>
+            </Paper>
+        </>
     )
 
     function buildEmployedAsAtString(): string {
@@ -69,4 +74,12 @@ export function Employment(props: EmploymentProps): JSX.Element {
     function getLocalizedDate(date: Date): string {
         return date.toLocaleDateString(localizationService.getCurrentLanguage(), {dateStyle: "medium"})
     }
+
+    function insertNewPageInPrint(employerKey: EntityEmploymentLocalizationKeys, language: Language): ReactNode {
+        if (props.employmentEntity.employerKey === employerKey && localizationService.getCurrentLanguage() === language) {
+            return (<PageBreak/>)
+        }  
+
+        return (<></>)        
+    }
 }

src/cv/components/skills-section/skill.tsx

@@ -1,16 +1,19 @@
 import { PageBreak } from "@/shared/components/page-break";
-import { SkillEntity } from "@/shared/entities/skill-entity";
+import { SkillEntity, SkillName } from "@/shared/entities/skill-entity";
 import { Paper, Rating, Typography } from "@mui/material";
 import { ReactNode } from "react";
+import { Language, LocalizationService } from "@/shared/services/localization-service";
 
 interface SkillProps {
     skillEntity: SkillEntity
 }
 
 export function Skill(props: SkillProps): JSX.Element {
+    const localizationService = LocalizationService.instance 
+    
     return (
         <>
-            {insertNewPageInPrint('Java')}
+            {insertNewPageInPrint(SkillName.JAVA, Language.DANISH)}
             <Paper elevation={1} sx={{padding: '5px', margin: '5px'}}>
                 <Typography>{props.skillEntity.name}</Typography>
                 <Rating value={props.skillEntity.level} readOnly/>
@@ -19,11 +22,11 @@ export function Skill(props: SkillProps): JSX.Element {
 
     )
 
-    function insertNewPageInPrint(skillName: string): ReactNode {
-        if (props.skillEntity.name !== skillName) {
-            return (<></>)
-        } else {        
+    function insertNewPageInPrint(skillName: SkillName, language: Language): ReactNode {
+        if (props.skillEntity.name === skillName && localizationService.getCurrentLanguage() === language) {
             return (<PageBreak/>)
-        }
+        }  
+
+        return (<></>)        
     }
 }

src/shared/entities/skill-entity.ts

@@ -8,7 +8,21 @@ export enum SkillLevel {
     Expert = 5
 }
 
+export enum SkillName {
+    C_SHARP = 'C#',
+    TYPESCRIPT = 'Typescript',
+    SCRUM = 'Scrum',
+    GIT = 'Git',
+    ENTITY_FRAMEWORK_CORE = 'Entity Framework Core',
+    C_PLUS_PLUS = 'C++',
+    JAVA = 'Java',
+    PYTHON = 'Python',
+    SQL = 'SQL',
+    ANGULAR = 'Angular',
+    XAMARIN_FORMS = 'Xamarin Forms'
+}
+
 export interface SkillEntity extends Importance {
     level: SkillLevel
-    name: string
+    name: SkillName
 }

src/shared/services/entity-generation-service.ts

@@ -3,7 +3,7 @@ import { GeneralInformationEntity } from "../entities/general-information-entity
 import { ComponentEmploymentLocalizationKeys, EntityEmploymentLocalizationKeys } from "../localization/employment-localization"
 import { LocalizationService } from "./localization-service"
 import { EntityGeneralInformationLocalizationKeys } from '../localization/general-information-localization';
-import { SkillEntity, SkillLevel } from "../entities/skill-entity";
+import { SkillEntity, SkillLevel, SkillName } from "../entities/skill-entity";
 import { LinkEntity } from "../entities/link-entity";
 import { EntityLinksLocalizationKeys } from "../localization/links-localization";
 import { ReferenceEntity } from "../entities/reference-entity";
@@ -90,57 +90,57 @@ export class EntityGenerationService {
     public getSkillsEntities(): SkillEntity[] {
         const entities: SkillEntity[] = [
             {
-                name: 'C#',
+                name: SkillName.C_SHARP,
                 level: SkillLevel.Experienced,
                 importance: 100
             },
             {
-                name: 'Typescript',
+                name: SkillName.TYPESCRIPT,
                 level: SkillLevel.Skillful,
                 importance: 90
             },
             {
-                name: 'Scrum',
+                name: SkillName.SCRUM,
                 level: SkillLevel.Skillful,
                 importance: 80
             },
             {
-                name: 'Git',
+                name: SkillName.GIT,
                 level: SkillLevel.Skillful,
                 importance: 85
             },
             {
-                name: 'Entity Framework Core',
+                name: SkillName.ENTITY_FRAMEWORK_CORE,
                 level: SkillLevel.Skillful,
                 importance: 84
             },
             {
-                name: 'C++',
+                name: SkillName.C_PLUS_PLUS,
                 level: SkillLevel.Novice,
                 importance: 25
             },
             {
-                name: 'Java',
+                name: SkillName.JAVA,
                 level: SkillLevel.Novice,
                 importance: 20
             },
             {
-                name: 'Python',
+                name: SkillName.PYTHON,
                 level: SkillLevel.Novice,
                 importance: 19
             },
             {
-                name: 'SQL',
+                name: SkillName.SQL,
                 level: SkillLevel.Beginner,
                 importance: 30
             },
             {
-                name: 'Angular',
+                name: SkillName.ANGULAR,
                 level: SkillLevel.Novice,
                 importance: 24
             },
             {
-                name: 'Xamarin Forms',
+                name: SkillName.XAMARIN_FORMS,
                 level: SkillLevel.Beginner,
                 importance: 40
             },

src/shared/services/entity-localization/language-localization-service.ts

@@ -1,9 +1,9 @@
 import { ComponentLanguageLocalizationKeys, EntityLanguageLocalizationKeys } from "@/shared/localization/language-localization";
 import { EntityLocalizationService } from "../value-objects/entity-localization-service";
-import { BaseEntityLocalizationSerive } from "./base-entity-localization-service";
+import { BaseEntityLocalizationSerive as BaseEntityLocalizationService } from "./base-entity-localization-service";
 import { ReactNode } from "react";
 
-export class LanguageLocalizationService extends BaseEntityLocalizationSerive implements EntityLocalizationService<ComponentLanguageLocalizationKeys, EntityLanguageLocalizationKeys> {
+export class LanguageLocalizationService extends BaseEntityLocalizationService implements EntityLocalizationService<ComponentLanguageLocalizationKeys, EntityLanguageLocalizationKeys> {
     public getEntityText(key: EntityLanguageLocalizationKeys): ReactNode {
         return this.getCurrentLocalization().language.entityLocalization[key]
     }