Merge pull request 'employee-detail-english' (#83) from employee-detail-english into main

Reviewed-on: #83
Reviewed-by: Jan Gleytenhoover <jan@kjan.email>

.github/workflows/playwright.yml

@@ -0,0 +1,71 @@
+name: Playwright Tests
+
+on:
+  push:
+    branches: [ main, master ]
+  pull_request:
+    branches: [ main, master ]
+
+jobs:
+  test:
+    timeout-minutes: 60
+    runs-on: ubuntu-latest
+    services:
+      postgres-employee:
+        image: postgres:13.3
+        env:
+          POSTGRES_DB: employee_db
+          POSTGRES_USER: employee
+          POSTGRES_PASSWORD: secret
+
+      employee:
+        image: berndheidemann/employee-management-service:1.1.3
+        # image: berndheidemann/employee-management-service_without_keycloak:1.1
+        env:
+          spring.datasource.url: jdbc:postgresql://postgres-employee:5432/employee_db
+          spring.datasource.username: employee
+          spring.datasource.password: secret
+
+
+    steps:
+      # Checkout the repository
+      - uses: actions/checkout@v4
+
+      # Set up Node.js
+      - uses: actions/setup-node@v4
+        with:
+          node-version: lts/*
+
+      # Install project dependencies
+      - name: Install dependencies
+        run: npm ci
+
+      # Build the Angular project
+      - name: Build Angular Project
+        run: |
+          npm install -g @angular/cli
+          ng build --configuration=pipeline
+
+      # Start Angular development server
+      - name: Start Angular Development Server in Background
+        run: ng serve --configuration=pipeline > angular.log 2>&1 &
+        env:
+          PORT: 4200 # Ensure the server runs on a predictable port
+
+      # Install Playwright and dependencies
+      - name: Install Playwright Browsers
+        run: npx playwright install --with-deps
+
+      # Run Playwright tests
+      - name: Run Playwright Tests
+        run: npx playwright test
+        env:
+          CI: true # Ensures Playwright runs in CI mode
+
+      # Upload Playwright report
+      - uses: actions/upload-artifact@v3
+        if: ${{ !cancelled() }}
+        with:
+          name: playwright-report
+          path: playwright-report/
+          retention-days: 30

.gitignore

@@ -40,3 +40,8 @@ testem.log
 # System files
 .DS_Store
 Thumbs.db
+node_modules/
+/test-results/
+/playwright-report/
+/blob-report/
+/playwright/.cache/

angular.json

@@ -52,6 +52,14 @@
               "optimization": false,
               "extractLicenses": false,
               "sourceMap": true
+            },
+            "pipeline": {
+              "fileReplacements": [
+                {
+                  "replace": "src/app/environments/environment.ts",
+                  "with": "src/app/environments/environment.ci.ts"
+                }
+              ]
             }
           },
           "defaultConfiguration": "production"
@@ -64,6 +72,9 @@
             },
             "development": {
               "buildTarget": "employeeService:build:development"
+            },
+            "pipeline": {
+              "buildTarget": "employeeService:build:pipeline"
             }
           },
           "defaultConfiguration": "development"
@@ -93,5 +104,8 @@
         }
       }
     }
+  },
+  "cli": {
+    "analytics": false
   }
 }

compose.yml

@@ -6,14 +6,10 @@ services:
   postgres-employee:
     container_name: postgres_employee
     image: postgres:13.3
-    volumes:
-      - employee_postgres_data:/var/lib/postgresql/data
     environment:
       POSTGRES_DB: employee_db
       POSTGRES_USER: employee
       POSTGRES_PASSWORD: secret
-    ports:
-      - "5432:5432"
 
   employee:
     container_name: employee

package-lock.json

@@ -17,6 +17,7 @@
         "@angular/platform-browser-dynamic": "^18.2.0",
         "@angular/router": "^18.2.0",
         "bootstrap": "^5.3.3",
+        "keycloak-angular": "^16.1.0",
         "rxjs": "~7.8.0",
         "tslib": "^2.3.0",
         "zone.js": "~0.14.10"
@@ -25,7 +26,9 @@
         "@angular-devkit/build-angular": "^18.2.0",
         "@angular/cli": "^18.2.0",
         "@angular/compiler-cli": "^18.2.0",
+        "@playwright/test": "^1.49.1",
         "@types/jasmine": "~5.1.0",
+        "@types/node": "^22.10.7",
         "jasmine-core": "~5.2.0",
         "karma": "~6.4.0",
         "karma-chrome-launcher": "~3.2.0",
@@ -264,8 +267,6 @@
     },
     "node_modules/@angular/animations": {
       "version": "18.2.13",
-      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-18.2.13.tgz",
-      "integrity": "sha512-rG5J5Ek5Hg+Tz2NjkNOaG6PupiNK/lPfophXpsR1t/nWujqnMWX2krahD/i6kgD+jNWNKCJCYSOVvCx/BHOtKA==",
       "license": "MIT",
       "dependencies": {
         "tslib": "^2.3.0"
@@ -378,8 +379,6 @@
     },
     "node_modules/@angular/common": {
       "version": "18.2.13",
-      "resolved": "https://registry.npmjs.org/@angular/common/-/common-18.2.13.tgz",
-      "integrity": "sha512-4ZqrNp1PoZo7VNvW+sbSc2CB2axP1sCH2wXl8B0wdjsj8JY1hF1OhuugwhpAHtGxqewed2kCXayE+ZJqSTV4jw==",
       "license": "MIT",
       "dependencies": {
         "tslib": "^2.3.0"
@@ -394,8 +393,6 @@
     },
     "node_modules/@angular/compiler": {
       "version": "18.2.13",
-      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-18.2.13.tgz",
-      "integrity": "sha512-TzWcrkopyjFF+WeDr2cRe8CcHjU72KfYV3Sm2TkBkcXrkYX5sDjGWrBGrG3hRB4e4okqchrOCvm1MiTdy2vKMA==",
       "license": "MIT",
       "dependencies": {
         "tslib": "^2.3.0"
@@ -456,13 +453,13 @@
       }
     },
     "node_modules/@angular/compiler-cli/node_modules/readdirp": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.0.2.tgz",
-      "integrity": "sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.1.tgz",
+      "integrity": "sha512-h80JrZu/MHUZCyHu5ciuoI0+WxsCxzxJTILn6Fs8rxSnFPh+UVHYfeIxK1nVGugMqkfC4vJcBOYbkfkwYK0+gw==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">= 14.16.0"
+        "node": ">= 14.18.0"
       },
       "funding": {
         "type": "individual",
@@ -471,8 +468,6 @@
     },
     "node_modules/@angular/core": {
       "version": "18.2.13",
-      "resolved": "https://registry.npmjs.org/@angular/core/-/core-18.2.13.tgz",
-      "integrity": "sha512-8mbWHMgO95OuFV1Ejy4oKmbe9NOJ3WazQf/f7wks8Bck7pcihd0IKhlPBNjFllbF5o+04EYSwFhEtvEgjMDClA==",
       "license": "MIT",
       "dependencies": {
         "tslib": "^2.3.0"
@@ -487,8 +482,6 @@
     },
     "node_modules/@angular/forms": {
       "version": "18.2.13",
-      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-18.2.13.tgz",
-      "integrity": "sha512-A67D867fu3DSBhdLWWZl/F5pr7v2+dRM2u3U7ZJ0ewh4a+sv+0yqWdJW+a8xIoiHxS+btGEJL2qAKJiH+MCFfg==",
       "license": "MIT",
       "dependencies": {
         "tslib": "^2.3.0"
@@ -505,8 +498,6 @@
     },
     "node_modules/@angular/platform-browser": {
       "version": "18.2.13",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-18.2.13.tgz",
-      "integrity": "sha512-tu7ZzY6qD3ATdWFzcTcsAKe7M6cJeWbT/4/bF9unyGO3XBPcNYDKoiz10+7ap2PUd0fmPwvuvTvSNJiFEBnB8Q==",
       "license": "MIT",
       "dependencies": {
         "tslib": "^2.3.0"
@@ -527,8 +518,6 @@
     },
     "node_modules/@angular/platform-browser-dynamic": {
       "version": "18.2.13",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-18.2.13.tgz",
-      "integrity": "sha512-kbQCf9+8EpuJC7buBxhSiwBtXvjAwAKh6MznD6zd2pyCYqfY6gfRCZQRtK59IfgVtKmEONWI9grEyNIRoTmqJg==",
       "license": "MIT",
       "dependencies": {
         "tslib": "^2.3.0"
@@ -545,8 +534,6 @@
     },
     "node_modules/@angular/router": {
       "version": "18.2.13",
-      "resolved": "https://registry.npmjs.org/@angular/router/-/router-18.2.13.tgz",
-      "integrity": "sha512-VKmfgi/r/CkyBq9nChQ/ptmfu0JT/8ONnLVJ5H+SkFLRYJcIRyHLKjRihMCyVm6xM5yktOdCaW73NTQrFz7+bg==",
       "license": "MIT",
       "dependencies": {
         "tslib": "^2.3.0"
@@ -2310,6 +2297,14 @@
         "node": ">=18"
       }
     },
+    "node_modules/@inquirer/core/node_modules/@types/node": {
+      "version": "22.10.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~6.20.0"
+      }
+    },
     "node_modules/@inquirer/core/node_modules/wrap-ansi": {
       "version": "6.2.0",
       "dev": true,
@@ -3037,6 +3032,20 @@
         "node": ">=14"
       }
     },
+    "node_modules/@playwright/test": {
+      "version": "1.49.1",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "playwright": "1.49.1"
+      },
+      "bin": {
+        "playwright": "cli.js"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/@popperjs/core": {
       "version": "2.11.8",
       "license": "MIT",
@@ -3220,6 +3229,14 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/body-parser/node_modules/@types/node": {
+      "version": "22.10.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~6.20.0"
+      }
+    },
     "node_modules/@types/bonjour": {
       "version": "3.5.13",
       "dev": true,
@@ -3228,6 +3245,14 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/bonjour/node_modules/@types/node": {
+      "version": "22.10.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~6.20.0"
+      }
+    },
     "node_modules/@types/connect": {
       "version": "3.4.38",
       "dev": true,
@@ -3245,6 +3270,22 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/connect-history-api-fallback/node_modules/@types/node": {
+      "version": "22.10.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~6.20.0"
+      }
+    },
+    "node_modules/@types/connect/node_modules/@types/node": {
+      "version": "22.10.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~6.20.0"
+      }
+    },
     "node_modules/@types/cookie": {
       "version": "0.4.1",
       "dev": true,
@@ -3258,6 +3299,14 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/cors/node_modules/@types/node": {
+      "version": "22.10.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~6.20.0"
+      }
+    },
     "node_modules/@types/estree": {
       "version": "1.0.5",
       "dev": true,
@@ -3285,6 +3334,14 @@
         "@types/send": "*"
       }
     },
+    "node_modules/@types/express-serve-static-core/node_modules/@types/node": {
+      "version": "22.10.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~6.20.0"
+      }
+    },
     "node_modules/@types/express/node_modules/@types/express-serve-static-core": {
       "version": "4.19.6",
       "dev": true,
@@ -3296,6 +3353,14 @@
         "@types/send": "*"
       }
     },
+    "node_modules/@types/express/node_modules/@types/express-serve-static-core/node_modules/@types/node": {
+      "version": "22.10.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~6.20.0"
+      }
+    },
     "node_modules/@types/http-errors": {
       "version": "2.0.4",
       "dev": true,
@@ -3309,6 +3374,14 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/http-proxy/node_modules/@types/node": {
+      "version": "22.10.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~6.20.0"
+      }
+    },
     "node_modules/@types/jasmine": {
       "version": "5.1.5",
       "dev": true,
@@ -3332,7 +3405,7 @@
         "@types/node": "*"
       }
     },
-    "node_modules/@types/node": {
+    "node_modules/@types/mute-stream/node_modules/@types/node": {
       "version": "22.10.2",
       "dev": true,
       "license": "MIT",
@@ -3340,6 +3413,14 @@
         "undici-types": "~6.20.0"
       }
     },
+    "node_modules/@types/node": {
+      "version": "22.10.7",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~6.20.0"
+      }
+    },
     "node_modules/@types/node-forge": {
       "version": "1.3.11",
       "dev": true,
@@ -3348,6 +3429,14 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/node-forge/node_modules/@types/node": {
+      "version": "22.10.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~6.20.0"
+      }
+    },
     "node_modules/@types/qs": {
       "version": "6.9.17",
       "dev": true,
@@ -3372,6 +3461,14 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/send/node_modules/@types/node": {
+      "version": "22.10.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~6.20.0"
+      }
+    },
     "node_modules/@types/serve-index": {
       "version": "1.9.4",
       "dev": true,
@@ -3390,6 +3487,14 @@
         "@types/send": "*"
       }
     },
+    "node_modules/@types/serve-static/node_modules/@types/node": {
+      "version": "22.10.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~6.20.0"
+      }
+    },
     "node_modules/@types/sockjs": {
       "version": "0.3.36",
       "dev": true,
@@ -3398,6 +3503,14 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/sockjs/node_modules/@types/node": {
+      "version": "22.10.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~6.20.0"
+      }
+    },
     "node_modules/@types/wrap-ansi": {
       "version": "3.0.0",
       "dev": true,
@@ -3411,6 +3524,14 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/ws/node_modules/@types/node": {
+      "version": "22.10.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~6.20.0"
+      }
+    },
     "node_modules/@vitejs/plugin-basic-ssl": {
       "version": "1.1.0",
       "dev": true,
@@ -4825,33 +4946,6 @@
         }
       }
     },
-    "node_modules/css-loader/node_modules/postcss": {
-      "version": "8.4.41",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/postcss"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "nanoid": "^3.3.7",
-        "picocolors": "^1.0.1",
-        "source-map-js": "^1.2.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14"
-      }
-    },
     "node_modules/css-select": {
       "version": "5.1.0",
       "dev": true,
@@ -4994,6 +5088,14 @@
         "npm": "1.2.8000 || >= 1.4.16"
       }
     },
+    "node_modules/detect-libc": {
+      "version": "2.0.3",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/detect-node": {
       "version": "2.1.0",
       "dev": true,
@@ -5175,6 +5277,14 @@
         "node": ">=10.0.0"
       }
     },
+    "node_modules/engine.io/node_modules/@types/node": {
+      "version": "22.10.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~6.20.0"
+      }
+    },
     "node_modules/engine.io/node_modules/cookie": {
       "version": "0.7.2",
       "dev": true,
@@ -5199,26 +5309,6 @@
         }
       }
     },
-    "node_modules/engine.io/node_modules/ws": {
-      "version": "8.17.1",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": ">=5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/enhanced-resolve": {
       "version": "5.17.1",
       "dev": true,
@@ -6721,73 +6811,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/istanbul-lib-instrument/node_modules/@babel/core": {
-      "version": "7.25.2",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.24.7",
-        "@babel/generator": "^7.25.0",
-        "@babel/helper-compilation-targets": "^7.25.2",
-        "@babel/helper-module-transforms": "^7.25.2",
-        "@babel/helpers": "^7.25.0",
-        "@babel/parser": "^7.25.0",
-        "@babel/template": "^7.25.0",
-        "@babel/traverse": "^7.25.2",
-        "@babel/types": "^7.25.2",
-        "convert-source-map": "^2.0.0",
-        "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.3",
-        "semver": "^6.3.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/babel"
-      }
-    },
-    "node_modules/istanbul-lib-instrument/node_modules/@babel/core/node_modules/@babel/generator": {
-      "version": "7.25.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/types": "^7.25.0",
-        "@jridgewell/gen-mapping": "^0.3.5",
-        "@jridgewell/trace-mapping": "^0.3.25",
-        "jsesc": "^2.5.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/istanbul-lib-instrument/node_modules/@babel/core/node_modules/@babel/generator/node_modules/jsesc": {
-      "version": "2.5.2",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "jsesc": "bin/jsesc"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/istanbul-lib-instrument/node_modules/@babel/core/node_modules/convert-source-map": {
-      "version": "2.0.0",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/istanbul-lib-instrument/node_modules/@babel/core/node_modules/semver": {
-      "version": "6.3.1",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
     "node_modules/istanbul-lib-report": {
       "version": "3.0.1",
       "dev": true,
@@ -6864,6 +6887,8 @@
     },
     "node_modules/jasmine-core": {
       "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-5.2.0.tgz",
+      "integrity": "sha512-tSAtdrvWybZkQmmaIoDgnvHG8ORUNw5kEVlO5CvrXj02Jjr9TZrmjFq7FUiOUzJiOP2wLGYT6PgrQgQF4R1xiw==",
       "dev": true,
       "license": "MIT"
     },
@@ -6880,6 +6905,14 @@
         "node": ">= 10.13.0"
       }
     },
+    "node_modules/jest-worker/node_modules/@types/node": {
+      "version": "22.10.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~6.20.0"
+      }
+    },
     "node_modules/jest-worker/node_modules/supports-color": {
       "version": "8.1.1",
       "dev": true,
@@ -7052,73 +7085,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/karma-coverage/node_modules/istanbul-lib-instrument/node_modules/@babel/core": {
-      "version": "7.25.2",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.24.7",
-        "@babel/generator": "^7.25.0",
-        "@babel/helper-compilation-targets": "^7.25.2",
-        "@babel/helper-module-transforms": "^7.25.2",
-        "@babel/helpers": "^7.25.0",
-        "@babel/parser": "^7.25.0",
-        "@babel/template": "^7.25.0",
-        "@babel/traverse": "^7.25.2",
-        "@babel/types": "^7.25.2",
-        "convert-source-map": "^2.0.0",
-        "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.3",
-        "semver": "^6.3.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/babel"
-      }
-    },
-    "node_modules/karma-coverage/node_modules/istanbul-lib-instrument/node_modules/@babel/core/node_modules/@babel/generator": {
-      "version": "7.25.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/types": "^7.25.0",
-        "@jridgewell/gen-mapping": "^0.3.5",
-        "@jridgewell/trace-mapping": "^0.3.25",
-        "jsesc": "^2.5.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/karma-coverage/node_modules/istanbul-lib-instrument/node_modules/@babel/core/node_modules/@babel/generator/node_modules/jsesc": {
-      "version": "2.5.2",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "jsesc": "bin/jsesc"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/karma-coverage/node_modules/istanbul-lib-instrument/node_modules/@babel/core/node_modules/convert-source-map": {
-      "version": "2.0.0",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/karma-coverage/node_modules/istanbul-lib-instrument/node_modules/@babel/core/node_modules/semver": {
-      "version": "6.3.1",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
     "node_modules/karma-coverage/node_modules/istanbul-lib-instrument/node_modules/semver": {
       "version": "6.3.1",
       "dev": true,
@@ -7241,6 +7207,24 @@
         "node": ">=10"
       }
     },
+    "node_modules/keycloak-angular": {
+      "version": "16.1.0",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.3.1"
+      },
+      "peerDependencies": {
+        "@angular/common": "^18",
+        "@angular/core": "^18",
+        "@angular/router": "^18",
+        "keycloak-js": "^18 || ^19 || ^20 || ^21 || ^22 || ^23 || ^24 || ^25 || ^26"
+      }
+    },
+    "node_modules/keycloak-js": {
+      "version": "26.0.7",
+      "license": "Apache-2.0",
+      "peer": true
+    },
     "node_modules/kind-of": {
       "version": "6.0.3",
       "dev": true,
@@ -8227,17 +8211,6 @@
         "node": "^16.14.0 || >=18.0.0"
       }
     },
-    "node_modules/node-gyp-build": {
-      "version": "4.8.4",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "bin": {
-        "node-gyp-build": "bin.js",
-        "node-gyp-build-optional": "optional.js",
-        "node-gyp-build-test": "build-test.js"
-      }
-    },
     "node_modules/node-gyp-build-optional-packages": {
       "version": "5.2.2",
       "dev": true,
@@ -8251,14 +8224,6 @@
         "node-gyp-build-optional-packages-test": "build-test.js"
       }
     },
-    "node_modules/node-gyp-build-optional-packages/node_modules/detect-libc": {
-      "version": "2.0.3",
-      "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/node-gyp/node_modules/glob": {
       "version": "10.4.5",
       "dev": true,
@@ -8871,30 +8836,6 @@
         "nice-napi": "^1.0.2"
       }
     },
-    "node_modules/piscina/node_modules/nice-napi": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz",
-      "integrity": "sha512-px/KnJAJZf5RuBGcfD+Sp2pAKq0ytz8j+1NehvgIGFkvtvFrDM3T8E4x/JJODXK9WZow8RRGrbA9QQ3hs+pDhA==",
-      "dev": true,
-      "hasInstallScript": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "!win32"
-      ],
-      "dependencies": {
-        "node-addon-api": "^3.0.0",
-        "node-gyp-build": "^4.2.2"
-      }
-    },
-    "node_modules/piscina/node_modules/node-addon-api": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
-      "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true
-    },
     "node_modules/pkg-dir": {
       "version": "7.0.0",
       "dev": true,
@@ -8909,6 +8850,49 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/playwright": {
+      "version": "1.49.1",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "playwright-core": "1.49.1"
+      },
+      "bin": {
+        "playwright": "cli.js"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "optionalDependencies": {
+        "fsevents": "2.3.2"
+      }
+    },
+    "node_modules/playwright-core": {
+      "version": "1.49.1",
+      "dev": true,
+      "license": "Apache-2.0",
+      "bin": {
+        "playwright-core": "cli.js"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/playwright/node_modules/fsevents": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
     "node_modules/postcss": {
       "version": "8.4.41",
       "dev": true,
@@ -9267,17 +9251,6 @@
         "@babel/runtime": "^7.8.4"
       }
     },
-    "node_modules/regenerator-transform/node_modules/@babel/runtime": {
-      "version": "7.25.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "regenerator-runtime": "^0.14.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/regex-parser": {
       "version": "2.3.0",
       "dev": true,
@@ -9399,33 +9372,6 @@
         "node": ">=8.9.0"
       }
     },
-    "node_modules/resolve-url-loader/node_modules/postcss": {
-      "version": "8.4.41",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/postcss"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "nanoid": "^3.3.7",
-        "picocolors": "^1.0.1",
-        "source-map-js": "^1.2.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14"
-      }
-    },
     "node_modules/resolve-url-loader/node_modules/source-map": {
       "version": "0.6.1",
       "dev": true,
@@ -10127,26 +10073,6 @@
         }
       }
     },
-    "node_modules/socket.io-adapter/node_modules/ws": {
-      "version": "8.17.1",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": ">=5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/socket.io-parser": {
       "version": "4.2.4",
       "dev": true,
@@ -10535,34 +10461,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/tar/node_modules/minizlib": {
-      "version": "2.1.2",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "minipass": "^3.0.0",
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/tar/node_modules/minizlib/node_modules/minipass": {
-      "version": "3.3.6",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/tar/node_modules/minizlib/node_modules/yallist": {
-      "version": "4.0.0",
-      "dev": true,
-      "license": "ISC"
-    },
     "node_modules/tar/node_modules/mkdirp": {
       "version": "1.0.4",
       "dev": true,
@@ -10624,23 +10522,6 @@
         }
       }
     },
-    "node_modules/terser-webpack-plugin/node_modules/terser": {
-      "version": "5.31.6",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "@jridgewell/source-map": "^0.3.3",
-        "acorn": "^8.8.2",
-        "commander": "^2.20.0",
-        "source-map-support": "~0.5.20"
-      },
-      "bin": {
-        "terser": "bin/terser"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/thingies": {
       "version": "1.21.0",
       "dev": true,
@@ -10754,6 +10635,8 @@
     },
     "node_modules/typescript": {
       "version": "5.5.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz",
+      "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {

package.json

@@ -28,7 +28,9 @@
     "@angular-devkit/build-angular": "^18.2.0",
     "@angular/cli": "^18.2.0",
     "@angular/compiler-cli": "^18.2.0",
+    "@playwright/test": "^1.49.1",
     "@types/jasmine": "~5.1.0",
+    "@types/node": "^22.10.7",
     "jasmine-core": "~5.2.0",
     "karma": "~6.4.0",
     "karma-chrome-launcher": "~3.2.0",

playwright.config.ts

@@ -0,0 +1,69 @@
+import { defineConfig, devices } from '@playwright/test';
+
+/**
+ * Read environment variables from file.
+ * https://github.com/motdotla/dotenv
+ */
+// import dotenv from 'dotenv';
+// import path from 'path';
+// dotenv.config({ path: path.resolve(__dirname, '.env') });
+
+/**
+ * See https://playwright.dev/docs/test-configuration.
+ */
+export default defineConfig({
+  testDir: './tests',
+  /* Run tests in files in parallel */
+  fullyParallel: true,
+  /* Fail the build on CI if you accidentally left test.only in the source code. */
+  forbidOnly: !!process.env.CI,
+  /* Retry on CI only */
+  retries: process.env.CI ? 2 : 0,
+  /* Opt out of parallel tests on CI. */
+  workers: process.env.CI ? 8 : undefined,
+  /* Reporter to use. See https://playwright.dev/docs/test-reporters */
+  reporter: 'html',
+  /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
+  use: {
+    /* Base URL to use in actions like `await page.goto('/')`. */
+    // baseURL: 'http://127.0.0.1:3000',
+
+    /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
+    trace: 'on-first-retry',
+  },
+
+  /* Configure projects for major browsers */
+  projects: [
+    {
+      name: 'chromium',
+      use: { ...devices['Desktop Chrome'] },
+    },
+
+    /* Test against mobile viewports. */
+    // {
+    //   name: 'Mobile Chrome',
+    //   use: { ...devices['Pixel 5'] },
+    // },
+    // {
+    //   name: 'Mobile Safari',
+    //   use: { ...devices['iPhone 12'] },
+    // },
+
+    /* Test against branded browsers. */
+    // {
+    //   name: 'Microsoft Edge',
+    //   use: { ...devices['Desktop Edge'], channel: 'msedge' },
+    // },
+    // {
+    //   name: 'Google Chrome',
+    //   use: { ...devices['Desktop Chrome'], channel: 'chrome' },
+    // },
+  ],
+
+  /* Run your local dev server before starting the tests */
+  // webServer: {
+  //   command: 'npm run start',
+  //   url: 'http://127.0.0.1:3000',
+  //   reuseExistingServer: !process.env.CI,
+  // },
+});

src/app/app.component.ts

@@ -1,23 +1,10 @@
 import { Component } from '@angular/core';
 import { RouterOutlet } from '@angular/router';
-import {LoginViewComponent} from "./components/login-view/login-view.component";
-import {
-  MitarbeiterverwaltungViewComponent
-} from "./components/mitarbeiterverwaltung-view/mitarbeiterverwaltung-view.component";
-
-import { NavigationBarComponent } from './components/navigation-bar/navigation-bar.component';
-import { EmployeeDetailComponent } from './components/employee-detail/employee-detail.component';
-import {
-  MitarbeiterBearbeitenViewComponent
-} from "./components/mitarbeiter-bearbeiten-view/mitarbeiter-bearbeiten-view.component";
-import {
-  QualifikatonBearbeitenViewComponent
-} from "./components/qualifikaton-bearbeiten-view/qualifikaton-bearbeiten-view.component";
 
 @Component({
   selector: 'app-root',
   standalone: true,
-  imports: [RouterOutlet, NavigationBarComponent, EmployeeDetailComponent, LoginViewComponent, MitarbeiterverwaltungViewComponent, MitarbeiterBearbeitenViewComponent, QualifikatonBearbeitenViewComponent],
+  imports: [RouterOutlet],
   templateUrl: './app.component.html',
   styleUrl: './app.component.css'
 })

src/app/app.config.ts

@@ -2,7 +2,7 @@ import { APP_INITIALIZER, ApplicationConfig, provideZoneChangeDetection } from '
 import { provideRouter } from '@angular/router';
 
 import { routes } from './app.routes';
-import {KeycloakAngularModule, KeycloakBearerInterceptor, KeycloakService} from "keycloak-angular";
+import { KeycloakAngularModule, KeycloakBearerInterceptor, KeycloakService } from "keycloak-angular";
 import { HTTP_INTERCEPTORS, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 
 export const initializeKeycloak = (keycloak: KeycloakService) => async () =>
@@ -28,20 +28,20 @@ function initializeApp(keycloak: KeycloakService): () => Promise<boolean> {
 
 export const appConfig: ApplicationConfig = {
   providers: [
-        provideRouter(routes),
-        KeycloakAngularModule,
-        {
-          provide: APP_INITIALIZER,
-          useFactory: initializeApp,
-          multi: true,
-          deps: [KeycloakService]
-        },
-        KeycloakService,
-        provideHttpClient(withInterceptorsFromDi()),
-        {
-          provide: HTTP_INTERCEPTORS,
-          useClass: KeycloakBearerInterceptor,
-          multi: true
-        }
-      ]
+    provideRouter(routes),
+    KeycloakAngularModule,
+    {
+      provide: APP_INITIALIZER,
+      useFactory: initializeApp,
+      multi: true,
+      deps: [KeycloakService]
+    },
+    KeycloakService,
+    provideHttpClient(withInterceptorsFromDi()),
+    {
+      provide: HTTP_INTERCEPTORS,
+      useClass: KeycloakBearerInterceptor,
+      multi: true
+    }
+  ]
 };

src/app/app.routes.ts

@@ -1,10 +1,13 @@
-import { Routes } from '@angular/router';
-import { LoginViewComponent } from './components/login-view/login-view.component';
-import { MitarbeiterverwaltungViewComponent } from './components/mitarbeiterverwaltung-view/mitarbeiterverwaltung-view.component';
-import { EmployeeDetailComponent } from './components/employee-detail/employee-detail.component';
-import { QualifikatonBearbeitenViewComponent } from './components/qualifikaton-bearbeiten-view/qualifikaton-bearbeiten-view.component';
-import { KeycloakAuthGuard } from 'keycloak-angular';
-import { AuthGuard } from './service/auth.service';
+import { Routes } from "@angular/router";
+import { LoginViewComponent } from "./components/login-view/login-view.component";
+import { MitarbeiterverwaltungViewComponent } from "./components/mitarbeiterverwaltung-view/mitarbeiterverwaltung-view.component";
+import { EmployeeDetailComponent } from "./components/employee-detail/employee-detail.component";
+import { QualifikatonBearbeitenViewComponent } from "./components/qualifikaton-bearbeiten-view/qualifikaton-bearbeiten-view.component";
+import { MitarbeiterBearbeitenViewComponent } from "./components/mitarbeiter-bearbeiten-view/mitarbeiter-bearbeiten-view.component";
+import { AuthGuard } from "./service/auth.service";
+import { MitarbeiterErstellenComponent } from "./components/mitarbeiter-erstellen/mitarbeiter-erstellen.component";
+import { QualifikationsverwaltungComponent } from "./components/qualifikationsverwaltung/qualifikationsverwaltung.component";
+import { QulifikationErstellenComponent } from "./components/qualifikation-erstellen/qualifikation-erstellen.component";
 
 export const routes: Routes = [
   {
@@ -17,15 +20,37 @@ export const routes: Routes = [
     canActivate: [AuthGuard],
   },
   {
-    path: "mitarbeiterdetails",
-    component: EmployeeDetailComponent,
+    path: "qualifikationerstellen",
+    component: QulifikationErstellenComponent,
+    canActivate: [AuthGuard],
   },
   {
-    path: "qualifikationbearbeiten",
+    path: "mitarbeitererstellen",
+    component: MitarbeiterErstellenComponent,
+    canActivate: [AuthGuard],
+  },
+  {
+    path: "mitarbeiterbearbeiten/:id",
+    component: MitarbeiterBearbeitenViewComponent,
+    canActivate: [AuthGuard],
+  },
+  {
+    path: "qualifikationsverwaltung",
+    component: QualifikationsverwaltungComponent,
+    canActivate: [AuthGuard],
+  },
+  {
+    path: "mitarbeiterdetails/:id",
+    component: EmployeeDetailComponent,
+    canActivate: [AuthGuard],
+  },
+  {
+    path: "qualifikationbearbeiten/:id",
     component: QualifikatonBearbeitenViewComponent,
+    canActivate: [AuthGuard],
   },
   {
     path: "**",
-    redirectTo: '',
-  }
+    redirectTo: "",
+  },
 ];

src/app/components/employee-detail/employee-detail.component.html

@@ -1,28 +1,29 @@
-<div class="d-flex flex-col" style="height: 100%;">
-  <app-navigation-bar></app-navigation-bar>
-  <div class="p-3" style="width: 100%;">
-    <a href="" class="btn btn-primary">Zurück</a>
-    <div class="row align-items-start pt-3">
-      <div class="col">
-        <h1>Name des Mitarbeiters</h1>
-        <p><strong>Straße: </strong>Straße des Benutzers</p>
-        <p><strong>Postleitzahl: </strong>Postleitzahl des Benutzers</p>
-        <p><strong>Stadt: </strong>Stadt des Benutzers</p>
-        <p><strong>Telefonnummer: </strong>Telefonnummer des Benutzers</p>
-        <button class="btn btn-danger">Löschen</button>
-        <button class="ms-3 btn btn-primary">Bearbeiten</button>
-      </div>
-      <div class="col">
-        <h2>Qualifikationen</h2>
-        <ul class="list-group" style="width: fit-content;">
-          <li class="list-group-item">Qualifikation 1</li>
-          <li class="list-group-item">Qualifikation 2</li>
-          <li class="list-group-item">Qualifikation 3</li>
-          <li class="list-group-item">Qualifikation 4</li>
-          <li class="list-group-item">Qualifikation 5</li>
-        </ul>
-      </div>
-    </div>
+<div class="container">
+  <div class="d-flex flex-col" style="height: 100%;">
+    <div class="p-3" style="width: 100%;">
+      <button class="btn btn-primary" (click)="goToEmployeePage()">Back</button>
+      <div class="row align-items-start pt-3">
+        <div class="col">
+          <h1>{{ employee.firstName }} {{ employee.lastName }} </h1>
+          <p><strong>Street: </strong>{{ employee.street }}</p>
+          <p><strong>Postal Code: </strong>{{ employee.postcode }}</p>
+          <p><strong>City: </strong>{{ employee.city }}</p>
+          <p><strong>Phone number: </strong>{{ employee.phone }}s</p>
+          <button class="btn btn-danger" (click)="deleteEmployee(currentId)">Delete</button>
+          <button class="ms-3 btn btn-primary" (click)="editEmployee(currentId)">Edit</button>
 
+        </div>
+        <div class="col">
+          <h2>Qualifikationen</h2>
+          <ul class="list-group" style="width: fit-content;">
+            @for(skill of skillSet; track skill) {
+            <li class="list-group-item">{{ skill }}</li>
+            }
+
+          </ul>
+        </div>
+      </div>
+
+    </div>
   </div>
 </div>

src/app/components/employee-detail/employee-detail.component.ts

@@ -1,5 +1,11 @@
-import { Component } from '@angular/core';
-import { NavigationBarComponent } from '../navigation-bar/navigation-bar.component';
+import {Component} from '@angular/core';
+import {NavigationBarComponent} from '../navigation-bar/navigation-bar.component';
+import {EmployeeNameAndSkillDataDTO, EmployeeResponseDTO} from "../../models/mitarbeiter";
+import {EmployeeService} from "../../service/employee.service";
+import {ActivatedRoute, Router} from "@angular/router";
+import {Observable} from "rxjs";
+import {QualificationGetDTO} from "../../models/skill";
+import {SkillService} from "../../service/skill.service";
 
 @Component({
   selector: 'app-employee-detail',
@@ -9,5 +15,31 @@ import { NavigationBarComponent } from '../navigation-bar/navigation-bar.compone
   styleUrl: './employee-detail.component.css'
 })
 export class EmployeeDetailComponent {
+  employee!: EmployeeResponseDTO;
+  skillSet: string[] = [];
+  currentId: number = 0;
 
+  constructor(private employeeService: EmployeeService, private router: Router, private route: ActivatedRoute, private skillService: SkillService) {
+    this.currentId = this.route.snapshot.params['id'];
+    this.employeeService.getEmployeeById(this.route.snapshot.params['id']).subscribe(employee => {
+      this.employee = employee;
+      this.skillSet = this.employee.skillSet?.map(skill => skill.skill) || [];
+    });
+  }
+
+  editEmployee(id: number) {
+    this.router.navigate([`/mitarbeiterbearbeiten/${id}`]);
+  }
+
+  goToEmployeePage(){
+    this.router.navigate(['mitarbeiter']);
+  }
+
+  deleteEmployee(id: number) {
+    this.employeeService.deleteEmployee(id);
+    this.router.navigate([`mitarbeiter`]);
+  }
+
+
+  protected readonly EmployeeService = EmployeeService;
 }

src/app/components/login-view/login-view.component.html

@@ -1,15 +1,8 @@
-
-<div class="container" style="width: 100%;">
+<div class="container" style="width: 100%">
   <h1>Hi-Tec GmbH</h1>
-  <img src="img.png" alt="Logout Icon" class="logo-image">
+  <img src="img.png" alt="Logout Icon" class="logo-image" />
 
   <form>
-    <label for="username">Username</label>
-    <input type="text" id="username" name="username"><br>
-
-    <label for="password">Password</label>
-    <input type="password" id="password" name="password"><br><br>
-
-    <button type="submit">Anmelden</button>
+    <button (click)="login()" type="submit">Login with Keycloak</button>
   </form>
 </div>

src/app/components/login-view/login-view.component.ts

@@ -1,12 +1,22 @@
-import { Component } from '@angular/core';
-import { KeycloakService } from 'keycloak-angular';
+import { Component } from "@angular/core";
+import { Router } from "@angular/router";
+import { KeycloakService } from "keycloak-angular";
 
 @Component({
-  selector: 'app-login-view',
+  selector: "app-login-view",
   standalone: true,
   imports: [],
-  templateUrl: './login-view.component.html',
-  styleUrl: './login-view.component.css'
+  templateUrl: "./login-view.component.html",
+  styleUrl: "./login-view.component.css",
 })
 export class LoginViewComponent {
+  constructor(
+    private keyCloak: KeycloakService,
+    private router: Router,
+  ) {}
+
+  login(): void {
+    this.keyCloak.login();
+    this.router.navigate(["/mitarbeiter"]);
+  }
 }

src/app/components/mitarbeiter-bearbeiten-view/mitarbeiter-bearbeiten-view.component.css

@@ -1,120 +0,0 @@
-body {
-  font-family: sans-serif;
-  margin: 0;
-  padding: 20px;
-  background-color: #f0f0f0;
-}
-
-.container {
-  width: 100%;
-  max-width: 800px;
-  margin: 0 auto;
-  padding: 20px;
-  background-color: #fff;
-}
-
-h1, h2 {
-  font-size: 2rem;
-  margin-bottom: 20px;
-}
-
-.back-button {
-  background-color: #ccc;
-  color: #333;
-  border: none;
-  padding: 8px 12px;
-  border-radius: 3px;
-  margin-bottom: 15px;
-}
-
-.user-info {
-  display: grid;
-  grid-template-columns: 1fr 1fr;
-  grid-gap: 20px;
-  margin-bottom: 20px;
-}
-
-.form-group {
-  display: flex;
-  flex-direction: column;
-}
-
-label {
-  margin-bottom: 5px;
-}
-
-input[type="text"] {
-  padding: 10px;
-  border: 1px solid #ddd;
-  border-radius: 3px;
-}
-
-input[type="text"]::placeholder {
-  color: #999;
-}
-
-.save-button {
-  background-color: #007bff;
-  color: #fff;
-  padding: 10px 15px;
-  border: none;
-  border-radius: 3px;
-  cursor: pointer;
-  margin-top: 10px;
-  width: 100%;
-}
-
-.skills-container {
-  border: 1px solid #ccc;
-  padding: 20px;
-  border-radius: 3px;
-}
-
-.skill-controls select {
-  padding: 10px 10px;
-  border: none;
-  border-radius: 3px;
-  background-color: #007bff;
-  color: #fff;
-  cursor: pointer;
-}
-
-.skill-list {
-  list-style: none;
-  padding: 0;
-}
-
-.skill-list li {
-  display: flex;
-  align-items: center;
-  margin-bottom: 5px;
-}
-
-.skill-icon {
-  margin-right: 5px;
-}
-
-.delete-skill-button {
-  color: #fff;
-  padding: 5px 8px;
-  border: none;
-  cursor: pointer;
-  margin-left: 10px;
-  border-radius: 3px;
-}
-
-.delete-skill-button img {
-  width: 15px;
-  height: 15px;
-}
-
-.add-skill-button{
-  background-color: #06a63b;
-  color: #fff;
-  padding: 8px 10px;
-  border: none;
-  border-radius: 3px;
-  cursor: pointer;
-  margin-left: 10px;
-}
-

src/app/components/mitarbeiter-bearbeiten-view/mitarbeiter-bearbeiten-view.component.html

@@ -1,49 +1 @@
-<div class="container">
-  <button class="back-button">Back</button>
-  <div class="user-info">
-    <div class="form-group">
-      <label for="firstName">First Name</label>
-      <input type="text" id="firstName" placeholder="First Name">
-    </div>
-    <div class="form-group">
-      <label for="lastName">Last Name</label>
-      <input type="text" id="lastName" placeholder="Last Name">
-    </div>
-    <div class="form-group">
-      <label for="street">Street</label>
-      <input type="text" id="street" placeholder="Street">
-    </div>
-    <div class="form-group">
-      <label for="postcode">Postcode</label>
-      <input type="text" id="postcode" placeholder="Postcode">
-    </div>
-    <div class="form-group">
-      <label for="city">City</label>
-      <input type="text" id="city" placeholder="City">
-    </div>
-    <div class="form-group">
-      <label for="phone">Phone Number</label>
-      <input type="text" id="phone" placeholder="Phone Number">
-    </div>
-  </div>
-
-  <div class="skills-container">
-    <h2>Skills</h2>
-    <ul class="skill-list">
-      <li>
-        <span class="skill-name">Skill 1</span>
-        <button class="delete-skill-button">
-          <img src="Delete-button.svg" alt="Delete">
-        </button>
-      </li>
-    </ul>
-    <div class="skill-controls">
-      <select>
-        <option value="">Option 1</option>
-        <option value="">Option 2</option>
-      </select>
-      <button class="add-skill-button">Add qualification</button>
-    </div>
-  </div>
-  <button class="save-button">Save</button>
-</div>
+<app-mitarbeiter-form [(mitarbeiter)]="mitarbeiter" (mitarbeiterChange)="submitted($event)"></app-mitarbeiter-form>

src/app/components/mitarbeiter-bearbeiten-view/mitarbeiter-bearbeiten-view.component.ts

@@ -1,12 +1,43 @@
 import { Component } from '@angular/core';
+import { MitarbeiterFormComponent } from '../mitarbeiter-form/mitarbeiter-form.component';
+import { EmployeeResponseDTO } from '../../models/mitarbeiter';
+import { ActivatedRoute, Router } from '@angular/router';
+import { EmployeeService } from '../../service/employee.service';
 
 @Component({
   selector: 'app-mitarbeiter-bearbeiten-view',
   standalone: true,
-  imports: [],
+  imports: [MitarbeiterFormComponent],
   templateUrl: './mitarbeiter-bearbeiten-view.component.html',
   styleUrl: './mitarbeiter-bearbeiten-view.component.css'
 })
 export class MitarbeiterBearbeitenViewComponent {
+  public mitarbeiter!: EmployeeResponseDTO;
 
+  constructor(private employeeService: EmployeeService, private route: ActivatedRoute, private router: Router) { }
+
+  submitted(mitarbeiter: EmployeeResponseDTO) {
+    this.employeeService.updateEmployee(mitarbeiter);
+    this.returnToEmployeeOverview();
+  }
+
+  returnToEmployeeOverview() {
+    this.router.navigate(["mitarbeiter"]);
+  }
+
+  ngOnInit(): void {
+    this.mitarbeiter = {
+      id: 0,
+      firstName: '',
+      lastName: '',
+      street: '',
+      phone: '',
+      skillSet: [],
+      postcode: '',
+      city: '',
+    }
+    this.employeeService.getEmployeeById(this.route.snapshot.params['id']).subscribe(employee => {
+      this.mitarbeiter = employee;
+    });
+  }
 }

src/app/components/mitarbeiter-erstellen/mitarbeiter-erstellen.component.html

@@ -0,0 +1 @@
+<app-mitarbeiter-form [(mitarbeiter)]="mitarbeiter" (mitarbeiterChange)="submitted($event)"></app-mitarbeiter-form>

src/app/components/mitarbeiter-erstellen/mitarbeiter-erstellen.component.spec.ts

@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { MitarbeiterErstellenComponent } from './mitarbeiter-erstellen.component';
+
+describe('MitarbeiterErstellenComponent', () => {
+  let component: MitarbeiterErstellenComponent;
+  let fixture: ComponentFixture<MitarbeiterErstellenComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [MitarbeiterErstellenComponent]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(MitarbeiterErstellenComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/components/mitarbeiter-erstellen/mitarbeiter-erstellen.component.ts

@@ -0,0 +1,44 @@
+import { Component } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { EmployeeResponseDTO } from '../../models/mitarbeiter';
+import { EmployeeService } from '../../service/employee.service';
+import { MitarbeiterFormComponent } from '../mitarbeiter-form/mitarbeiter-form.component';
+
+@Component({
+  selector: 'app-mitarbeiter-erstellen',
+  standalone: true,
+  imports: [MitarbeiterFormComponent],
+  templateUrl: './mitarbeiter-erstellen.component.html',
+  styleUrl: './mitarbeiter-erstellen.component.css'
+})
+export class MitarbeiterErstellenComponent {
+  public mitarbeiter!: EmployeeResponseDTO;
+
+  constructor(private employeeService: EmployeeService, private route: ActivatedRoute, private router: Router) { }
+
+  submitted(mitarbeiter: EmployeeResponseDTO) {
+    console.log(mitarbeiter)
+    this.employeeService.createEmployee(mitarbeiter);
+    this.returnToEmployeeOverview();
+  }
+
+  returnToEmployeeOverview() {
+    this.router.navigate(["mitarbeiter"]);
+  }
+
+  ngOnInit(): void {
+    this.mitarbeiter = {
+      id: 0,
+      firstName: '',
+      lastName: '',
+      street: '',
+      phone: '',
+      skillSet: [],
+      postcode: '',
+      city: '',
+    }
+    this.employeeService.getEmployeeById(this.route.snapshot.params['id']).subscribe(employee => {
+      this.mitarbeiter = employee;
+    });
+  }
+}

src/app/components/mitarbeiter-form/mitarbeiter-form.component.css

@@ -0,0 +1,120 @@
+body {
+  font-family: sans-serif;
+  margin: 0;
+  padding: 20px;
+  background-color: #f0f0f0;
+}
+
+.container {
+  width: 100%;
+  max-width: 800px;
+  margin: 0 auto;
+  padding: 20px;
+  background-color: #fff;
+}
+
+h1, h2 {
+  font-size: 2rem;
+  margin-bottom: 20px;
+}
+
+.back-button {
+  background-color: #ccc;
+  color: #333;
+  border: none;
+  padding: 8px 12px;
+  border-radius: 3px;
+  margin-bottom: 15px;
+}
+
+.user-info {
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  grid-gap: 20px;
+  margin-bottom: 20px;
+}
+
+.form-group {
+  display: flex;
+  flex-direction: column;
+}
+
+label {
+  margin-bottom: 5px;
+}
+
+input[type="text"] {
+  padding: 10px;
+  border: 1px solid #ddd;
+  border-radius: 3px;
+}
+
+input[type="text"]::placeholder {
+  color: #999;
+}
+
+.save-button {
+  background-color: #007bff;
+  color: #fff;
+  padding: 10px 15px;
+  border: none;
+  border-radius: 3px;
+  cursor: pointer;
+  margin-top: 10px;
+  width: 100%;
+}
+
+.skills-container {
+  border: 1px solid #ccc;
+  padding: 20px;
+  border-radius: 3px;
+}
+
+.skill-controls select {
+  padding: 10px 10px;
+  border: none;
+  border-radius: 3px;
+  background-color: #007bff;
+  color: #fff;
+  cursor: pointer;
+}
+
+.skill-list {
+  list-style: none;
+  padding: 0;
+}
+
+.skill-list li {
+  display: flex;
+  align-items: center;
+  margin-bottom: 5px;
+}
+
+.skill-icon {
+  margin-right: 5px;
+}
+
+.delete-skill-button {
+  color: #fff;
+  padding: 5px 8px;
+  border: none;
+  cursor: pointer;
+  margin-left: 10px;
+  border-radius: 3px;
+}
+
+.delete-skill-button img {
+  width: 15px;
+  height: 15px;
+}
+
+.add-skill-button{
+  background-color: #06a63b;
+  color: #fff;
+  padding: 8px 10px;
+  border: none;
+  border-radius: 3px;
+  cursor: pointer;
+  margin-left: 10px;
+}
+

src/app/components/mitarbeiter-form/mitarbeiter-form.component.html

@@ -0,0 +1,78 @@
+<form [formGroup]="mitarbeiterForm">
+
+  <div class="container">
+    <button (click)="returnToEmployeeOverview()" class="back-button">Back</button>
+    <div class="user-info">
+      <div class="form-group">
+        @if (errorMessages['firstName']) {
+        <div class="alert alert-danger">{{errorMessages['firstName']}}</div>
+        }
+        <label for="firstName">First Name</label>
+        <input type="text" id="firstName" placeholder="First Name" formControlName="firstName">
+      </div>
+      <div class="form-group">
+        @if (errorMessages['lastName']) {
+        <div class="alert alert-danger">{{errorMessages['lastName']}}</div>
+        }
+        <label for="lastName">Last Name</label>
+        <input type="text" id="lastName" placeholder="Last Name" formControlName="lastName">
+      </div>
+      <div class="form-group">
+        @if (errorMessages['street']) {
+        <div class="alert alert-danger">{{errorMessages['street']}}</div>
+        }
+        <label for="street">Street</label>
+        <input type="text" id="street" placeholder="Street" formControlName="street">
+      </div>
+      <div class="form-group">
+        @if (errorMessages['postcode']) {
+        <div class="alert alert-danger">{{errorMessages['postcode']}}</div>
+        }
+        <label for="postcode">Postcode</label>
+        <input type="text" id="postcode" placeholder="Postcode" formControlName="postcode">
+      </div>
+      <div class="form-group">
+        @if (errorMessages['city']) {
+        <div class="alert alert-danger">{{errorMessages['city']}}</div>
+        }
+        <label for="city">City</label>
+        <input type="text" id="city" placeholder="City" formControlName="city">
+      </div>
+      <div class="form-group">
+        @if (errorMessages['phone']) {
+        <div class="alert alert-danger">{{errorMessages['phone']}}</div>
+        }
+        <label for="phone">Phone Number</label>
+        <input type="text" id="phone" placeholder="Phone Number" formControlName="phone">
+      </div>
+    </div>
+
+    <div class="skills-container">
+      <h2>Skills</h2>
+      <ul class="skill-list">
+        @for (skill of mitarbeiter.skillSet; track skill) {
+        <li>
+          <span class="skill-name">{{skill.skill}}</span>
+          <button (click)="removeSkill(skill.id)" class="delete-skill-button">
+            <img src="Delete-button.svg" alt="Delete">
+          </button>
+        </li>
+        }
+      </ul>
+      @if (!hasAllSkills) {
+      <div class="skill-controls">
+        <select formControlName="newSkill">
+          @for (skill of allSkills | async; track skill) {
+          @if (!hasSkill(skill.id)) {
+          <option value="{{skill.id}}">{{skill.skill}}</option>
+          }
+          }
+        </select>
+        <button (click)="addSkill()" class="add-skill-button">Add qualification</button>
+      </div>
+      }
+    </div>
+    <button (click)="submit()" class="save-button">Save</button>
+  </div>
+
+</form>

src/app/components/mitarbeiter-form/mitarbeiter-form.component.spec.ts

@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { MitarbeiterFormComponent } from './mitarbeiter-form.component';
+
+describe('MitarbeiterFormComponent', () => {
+  let component: MitarbeiterFormComponent;
+  let fixture: ComponentFixture<MitarbeiterFormComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [MitarbeiterFormComponent]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(MitarbeiterFormComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/components/mitarbeiter-form/mitarbeiter-form.component.ts

@@ -0,0 +1,133 @@
+import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { EmployeeNameAndSkillDataDTO, EmployeeRequestPutDTO, EmployeeResponseDTO } from '../../models/mitarbeiter';
+import { AbstractControl, FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms';
+import { HttpClient } from '@angular/common/http';
+import { Router } from '@angular/router';
+import { AsyncPipe, NgFor, Location } from '@angular/common';
+import { SkillService } from '../../service/skill.service';
+import { QualificationGetDTO } from '../../models/skill';
+import { Observable, of } from 'rxjs';
+
+@Component({
+  selector: 'app-mitarbeiter-form',
+  standalone: true,
+  imports: [ReactiveFormsModule, NgFor, AsyncPipe],
+  templateUrl: './mitarbeiter-form.component.html',
+  styleUrl: './mitarbeiter-form.component.css'
+})
+export class MitarbeiterFormComponent {
+  @Input() mitarbeiter!: EmployeeResponseDTO;
+  @Output() mitarbeiterChange = new EventEmitter<EmployeeResponseDTO>();
+
+  public mitarbeiterForm!: FormGroup;
+  public allSkills: Observable<Array<QualificationGetDTO>> = of([]);
+  public hasAllSkills: boolean = false;
+  errorMessages: Record<string, string> = {};
+
+  constructor(public http: HttpClient, public router: Router, private skillService: SkillService, private location: Location) {}
+
+  returnToEmployeeOverview() {
+    this.location.back();
+  }
+
+  private setupForm() {
+    this.mitarbeiterForm = new FormGroup({
+      lastName: new FormControl(this.mitarbeiter.lastName, Validators.required),
+      firstName: new FormControl(this.mitarbeiter.firstName, Validators.required),
+      street: new FormControl(this.mitarbeiter.street, Validators.required),
+      postcode: new FormControl(this.mitarbeiter.postcode, [Validators.required, Validators.minLength(5), Validators.maxLength(5)]),
+      city: new FormControl(this.mitarbeiter.city, Validators.required),
+      phone: new FormControl(this.mitarbeiter.phone, [Validators.required, Validators.pattern('^[- +()0-9]+$')]),
+      newSkill: new FormControl(null)
+    });
+  }
+
+  ngOnChanges(): void {
+    this.setupForm();
+  }
+
+  skillsChanged() {
+    this.allSkills.subscribe(skills => {
+      this.hasAllSkills = this.checkAllSkills(skills);
+    });
+  }
+
+  ngOnInit(): void {
+    this.allSkills = this.skillService.getAllSkills();
+    this.skillsChanged();
+    this.setupForm();
+  }
+
+  removeSkill(id?: number) {
+    this.mitarbeiter.skillSet = this.mitarbeiter.skillSet?.filter(skill => skill.id !== id);
+    this.skillsChanged();
+  }
+
+  checkAllSkills(skills: Array<QualificationGetDTO>): boolean {
+    const skillSet = this.mitarbeiter.skillSet || [];
+
+    return skills.every(skill =>
+      skillSet.some(givenSkill => skill.id === givenSkill.id)
+    );
+  }
+
+  hasSkill(id: number): boolean {
+    for (const skill of this.mitarbeiter.skillSet || []) {
+      if (skill.id == id) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  addSkill() {
+    const id = Number(this.mitarbeiterForm.get("newSkill")?.value);
+    if (!id) {
+      return;
+    }
+    this.allSkills.subscribe(skills => {
+      const newSkill = skills.filter(skill => skill.id == id)[0];
+      this.mitarbeiter.skillSet?.push(newSkill);
+      this.skillsChanged();
+      this.mitarbeiterForm.get("newSkill")?.reset(null); // Added
+    });
+  }
+
+  private validationErrorMessages: Record<string, string> = {
+    required: "This field is required",
+    minlength: "The value is too short",
+    maxlength: "The value is too long",
+    pattern: "This field must be a valid phone number",
+  };
+
+  updateErrorMessages(): void {
+    this.errorMessages = {};
+
+    Object.keys(this.mitarbeiterForm.controls).forEach(field => {
+      const control = this.mitarbeiterForm.get(field);
+
+      if (control && control.errors) {
+        this.errorMessages[field] = Object.keys(control.errors)
+          .map(errorKey => this.validationErrorMessages[errorKey] || `Unknown error: ${errorKey}`)
+          .join(' ');
+      }
+    });
+  }
+
+
+  submit() {
+    this.updateErrorMessages();
+    if (!this.mitarbeiterForm.valid) {
+      return;
+    }
+
+    this.mitarbeiter.firstName = this.mitarbeiterForm.get("firstName")?.value;
+    this.mitarbeiter.lastName = this.mitarbeiterForm.get("lastName")?.value;
+    this.mitarbeiter.street = this.mitarbeiterForm.get("street")?.value;
+    this.mitarbeiter.postcode = this.mitarbeiterForm.get("postcode")?.value;
+    this.mitarbeiter.city = this.mitarbeiterForm.get("city")?.value;
+    this.mitarbeiter.phone = this.mitarbeiterForm.get("phone")?.value;
+
+    this.mitarbeiterChange.emit(this.mitarbeiter);
+  }
+}

src/app/components/mitarbeiterverwaltung-view/mitarbeiterverwaltung-view.component.css

@@ -19,7 +19,7 @@ h1 {
 
 .search-bar {
   display: flex;
-  margin-bottom: 20px;
+  margin-bottom: 10px;
   align-items: center;
 }
 

src/app/components/mitarbeiterverwaltung-view/mitarbeiterverwaltung-view.component.html

@@ -1,31 +1,52 @@
-<div class="container">
-  <div class="header">
-    <button class="logout-button">
-      <img src="user.svg" alt="User Icon">
-    </button>
-    <h1>Employees</h1>
-  </div>
-  <div class="header-actions">
-    <div class="search-bar">
-      <input type="text" placeholder="Search employee">
-      <button>Search</button>
+<div class="d-flex flex-row">
+  <app-navigation-bar [route]="'employee'" class="row" style="height: 100vh;"></app-navigation-bar>
+  <div class="container">
+    <div class="header">
+      <div class="dropdown position-absolute top-0 end-0 m-3">
+        <button class="btn align-items-center d-flex" type="button" id="userDropdown" data-bs-toggle="dropdown"
+          aria-expanded="false">
+          <img src="user.svg" alt="User Icon" class="rounded-circle" style="width: 30px; height: 30px;">
+        </button>
+        <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="userDropdown">
+          <li><a class="dropdown-item" href="/logout">Log out</a></li>
+        </ul>
+      </div>
+      <h1>Employees</h1>
     </div>
-    <button class="add-button">Add employee</button>
-  </div>
 
-  <table class="employee-table">
-    <thead>
-    <tr>
-      <th><span class="sortable">First Name</span></th>
-      <th><span class="sortable">Last Name</span></th>
-      <th>Street</th>
-      <th>Postcode</th>
-      <th>City</th>
-      <th>Phone</th>
-      <th>Actions</th>
-    </tr>
-    </thead>
-    <tbody>
-    </tbody>
-  </table>
+    <div class="header-actions">
+      <form [formGroup]="searchForm">
+        <div class="search-bar">
+          <input type="text" placeholder="Search employee" formControlName="search">
+          <button (click)="submit()">Search</button>
+        </div>
+        <p class="text-body-tertiary">Search for a propertiy of an Employee. eg. First Name</p>
+      </form>
+      <button (click)="createEmployee()" class="add-button">Add employee</button>
+    </div>
+
+    <table class="employee-table">
+      <thead>
+        <tr>
+          <th><span class="sortable">First Name</span></th>
+          <th><span class="sortable">Last Name</span></th>
+          <th>Actions</th>
+        </tr>
+      </thead>
+      <tbody>
+        @if (employees) {
+        @for (employee of employees; track employee) {
+        <tr>
+          <td>{{ employee.firstName }}</td>
+          <td>{{ employee.lastName }}</td>
+          <td>
+          <button class="btn btn-primary me-2" (click)="goToEmployeeDetailPage(employee.id)">Details</button>
+            <button class="btn btn-danger" (click)="deleteEmployee(employee.id)">Delete</button>
+          </td>
+        </tr>
+        }
+        }
+      </tbody>
+    </table>
+  </div>
 </div>

src/app/components/mitarbeiterverwaltung-view/mitarbeiterverwaltung-view.component.ts

@@ -1,12 +1,75 @@
-import { Component } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { Observable, of } from 'rxjs';
+import { EmployeeResponseDTO } from '../../models/mitarbeiter';
+import { EmployeeService } from '../../service/employee.service';
+import { FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms';
+import { Router } from '@angular/router';
+import { NavigationBarComponent } from '../navigation-bar/navigation-bar.component';
 
 @Component({
   selector: 'app-mitarbeiterverwaltung-view',
-  standalone: true,
-  imports: [],
   templateUrl: './mitarbeiterverwaltung-view.component.html',
-  styleUrl: './mitarbeiterverwaltung-view.component.css'
+  styleUrls: ['./mitarbeiterverwaltung-view.component.css'],
+  standalone: true,
+  imports: [CommonModule, ReactiveFormsModule, NavigationBarComponent]
 })
-export class MitarbeiterverwaltungViewComponent {
+export class MitarbeiterverwaltungViewComponent implements OnInit {
+  employees: Array<EmployeeResponseDTO> = [];
+  searchForm!: FormGroup;
 
+  constructor(private employeeService: EmployeeService, private router: Router) {
+    this.updateEmployees();
+  }
+
+  submit() {
+    const searchTerm = this.searchForm.get("search")?.value || '';
+
+    this.employeeService.getAllEmployees().subscribe(employees => {
+      let foundEmployees: Array<EmployeeResponseDTO> = [];
+      for (const employee of employees) {
+        if (
+          employee.firstName.toLowerCase().includes(searchTerm.toLowerCase()) ||
+          employee.lastName.toLowerCase().includes(searchTerm.toLowerCase()) ||
+          employee.street.toLowerCase().includes(searchTerm.toLowerCase()) ||
+          employee.postcode.toLowerCase().includes(searchTerm.toLowerCase()) ||
+          employee.city.toLowerCase().includes(searchTerm.toLowerCase()) ||
+          employee.phone.toLowerCase().includes(searchTerm.toLowerCase()) ||
+          searchTerm == ''
+        ) {
+          foundEmployees.push(employee);
+        }
+      }
+
+      this.employees = foundEmployees;
+    });
+  }
+
+  editEmployee(id: number) {
+    this.router.navigate([`/mitarbeiterbearbeiten/${id}`]);
+  }
+
+  createEmployee() {
+    this.router.navigate(['/mitarbeitererstellen']);
+  }
+
+  deleteEmployee(id: number) {
+    this.employeeService.deleteEmployee(id);
+    this.employees = this.employees.filter(employee => employee.id != id);
+  }
+
+  goToEmployeeDetailPage(id: number){
+    this.router.navigate([`/mitarbeiterdetails/${id}`]);
+  }
+
+  updateEmployees() {
+    this.employeeService.getAllEmployees().subscribe(employees => this.employees = employees);
+  }
+
+  ngOnInit(): void {
+    this.searchForm = new FormGroup({
+      search: new FormControl(''),
+    });
+    this.updateEmployees();
+  }
 }

src/app/components/navigation-bar/navigation-bar.component.html

@@ -5,18 +5,13 @@
     </a>
     <hr>
     <ul class="nav nav-pills flex-column mb-auto">
-      <li class="nav-item">
-        <a href="#" class="nav-link active text-black" aria-current="page">
-          Dashboard
-        </a>
-      </li>
       <li>
-        <a href="#" class="nav-link text-black">
+        <a [routerLink]="['/mitarbeiter']" (click)="employees()" [class.active]="route == 'employee'" class="nav-link text-black" aria-current="page">
           Mitarbeiterverwaltung
         </a>
       </li>
       <li>
-        <a href="#" class="nav-link text-black">
+        <a [routerLink]="['/qualifikationsverwaltung']" [class.active]="route == 'skill'" class="nav-link text-black">
           Qualifikationsverwaltung
         </a>
       </li>

src/app/components/navigation-bar/navigation-bar.component.ts

@@ -1,12 +1,18 @@
-import { Component } from '@angular/core';
+import { Component, Input } from '@angular/core';
+import { ActivatedRoute, Router, RouterLink } from '@angular/router';
 
 @Component({
   selector: 'app-navigation-bar',
   standalone: true,
-  imports: [],
+  imports: [RouterLink],
   templateUrl: './navigation-bar.component.html',
   styleUrl: './navigation-bar.component.css'
 })
 export class NavigationBarComponent {
+  constructor(private router: Router) { }
+  @Input() route: string = "";
 
+  employees() {
+    this.router.navigate(['mitarbeiter']);
+  }
 }

src/app/components/qualifikation-erstellen/qualifikation-erstellen.component.html

@@ -0,0 +1 @@
+<app-qualifikation-form [(skill)]="skill" (skillChange)="submitted($event)"></app-qualifikation-form>

src/app/components/qualifikation-erstellen/qualifikation-erstellen.component.spec.ts

@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { QulifikationErstellenComponent } from './qulifikation-erstellen.component';
+
+describe('QulifikationErstellenComponent', () => {
+  let component: QulifikationErstellenComponent;
+  let fixture: ComponentFixture<QulifikationErstellenComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [QulifikationErstellenComponent]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(QulifikationErstellenComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/components/qualifikation-erstellen/qualifikation-erstellen.component.ts

@@ -0,0 +1,29 @@
+import { Component } from '@angular/core';
+import { QualifikationFormComponent } from '../qualifikation-form/qualifikation-form.component';
+import { QualificationGetDTO } from '../../models/skill';
+import { SkillService } from '../../service/skill.service';
+
+@Component({
+  selector: 'app-qulifikation-erstellen',
+  standalone: true,
+  imports: [QualifikationFormComponent],
+  templateUrl: './qualifikation-erstellen.component.html',
+  styleUrl: './qualifikation-erstellen.component.css'
+})
+export class QulifikationErstellenComponent {
+  public skill!: QualificationGetDTO;
+
+  constructor(private skillService: SkillService) { }
+
+  submitted(skill: QualificationGetDTO) {
+    console.log(skill);
+    this.skillService.createSkill(skill);
+  }
+
+  ngOnInit(): void {
+    this.skill = {
+      id: 0,
+      skill: '',
+    };
+  }
+}

src/app/components/qualifikation-form/qualifikation-form.component.css

@@ -0,0 +1,131 @@
+body {
+  font-family: sans-serif;
+  margin: 0;
+  padding: 20px;
+  background-color: #f0f0f0;
+}
+
+.container {
+  width: 100%;
+  max-width: 800px;
+  margin: 0 auto;
+  padding: 20px;
+  background-color: #fff;
+}
+
+h1, h2 {
+  font-size: 1.8rem;
+  margin-bottom: 15px;
+}
+
+.back-button {
+  background-color: #ccc;
+  color: #333;
+  border: none;
+  padding: 8px 12px;
+  border-radius: 3px;
+  margin-bottom: 15px;
+}
+
+.form-group {
+  margin-bottom: 15px;
+}
+
+label {
+  display: block;
+  margin-bottom: 5px;
+}
+
+input[type="text"] {
+  width: 100%;
+  padding: 10px;
+  border: 1px solid #ccc;
+  border-radius: 1px;
+}
+
+.employee-list {
+  list-style: none;
+  padding: 0;
+}
+
+.employee-list li {
+  display: flex;
+  align-items: center;
+  margin-bottom: 5px;
+}
+
+.employee-icon {
+  margin-right: 5px;
+}
+
+.add-employee-section {
+  margin-top: 15px;
+}
+
+.add-employee-section select {
+  padding: 10px;
+  border: 1px solid #ddd;
+  border-radius: 3px;
+  margin-right: 10px;
+}
+
+.add-employee-button {
+  background-color: #06a63b;
+  color: #fff;
+  padding: 10px 15px;
+  border: none;
+  border-radius: 3px;
+  cursor: pointer;
+  margin-top: 10px;
+}
+
+.save-button {
+  background-color: #007bff;
+  color: #fff;
+  padding: 10px 15px;
+  border: none;
+  border-radius: 3px;
+  cursor: pointer;
+  margin-top: 20px;
+  display: block;
+  width: 100%;
+}
+
+.delete-skill-button {
+  color: #fff;
+  padding: 5px 8px;
+  border: none;
+  cursor: pointer;
+  margin-left: 4px;
+  margin-right: 4px;
+  border-radius: 3px;
+}
+
+.delete-skill-button img {
+  width: 15px;
+  height: 15px;
+}
+
+.add-employee-section {
+  margin-top: 15px;
+}
+
+.add-employee-section label {
+  display: block;
+  margin-bottom: 5px;
+  font-weight: bold;
+}
+
+.add-employee-section input[type="text"] {
+  width: 100%;
+  padding: 10px;
+  border: 1px solid #ddd;
+  border-radius: 3px;
+}
+
+.employee-container {
+  border: 1px solid #ccc;
+  padding: 20px;
+  border-radius: 1px;
+  margin-bottom: 20px;
+}

src/app/components/qualifikation-form/qualifikation-form.component.html

@@ -0,0 +1,41 @@
+<div class="container">
+  <form [formGroup]="skillForm">
+    <button (click)="returnToSkillList()" class="back-button">Back</button>
+
+    <div class="form-group">
+      @if (errorMessages['name']) {
+      <div class="alert alert-danger">{{errorMessages['name']}}</div>
+      }
+      <label for="name">Name</label>
+      <input type="text" id="name" formControlName="name">
+    </div>
+
+    <div class="employee-container">
+      <h2>Employees possessing the qualification</h2>
+
+      <ul class="employee-list">
+        @for (employee of addedEmployees; track employee) {
+        <li>
+          <button (click)="removeEmployee(employee.id)" class="delete-skill-button">
+            <img src="Delete-button.svg" alt="Delete">
+          </button>
+          <span class="employee-name">{{employee.firstName}} {{employee.lastName}}</span>
+        </li>
+        }
+      </ul>
+
+      @if (addableEmployees.length > 0) {
+      <div class="add-employee-section">
+        <select formControlName="newEmployee">
+          @for (employee of addableEmployees; track employee) {
+          <option value="{{employee.id}}">{{employee.firstName}} {{employee.lastName}}</option>
+          }
+        </select>
+
+        <button (click)="addEmployee()" class="add-employee-button">Add employee</button>
+      </div>
+      }
+    </div>
+    <button (click)="submit()" class="save-button">Save</button>
+  </form>
+</div>

src/app/components/qualifikation-form/qualifikation-form.component.spec.ts

@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { QualifikationFormComponent } from './qualifikation-form.component';
+
+describe('QualifikationFormComponent', () => {
+  let component: QualifikationFormComponent;
+  let fixture: ComponentFixture<QualifikationFormComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [QualifikationFormComponent]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(QualifikationFormComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/components/qualifikation-form/qualifikation-form.component.ts

@@ -0,0 +1,133 @@
+import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { EmployeesForAQualificationDTO, QualificationGetDTO } from '../../models/skill';
+import { FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms';
+import { SkillService } from '../../service/skill.service';
+import { EmployeeService } from '../../service/employee.service';
+import { concatMap, every, from, lastValueFrom, Observable, of, switchMap, take, tap } from 'rxjs';
+import { EmployeeNameDataDTO, EmployeeResponseDTO } from '../../models/mitarbeiter';
+import { AsyncPipe } from '@angular/common';
+import { Router } from '@angular/router';
+
+@Component({
+  selector: 'app-qualifikation-form',
+  standalone: true,
+  imports: [ReactiveFormsModule, AsyncPipe],
+  templateUrl: './qualifikation-form.component.html',
+  styleUrl: './qualifikation-form.component.css'
+})
+export class QualifikationFormComponent {
+  @Input() skill!: QualificationGetDTO;
+  @Output() skillChange = new EventEmitter<QualificationGetDTO>();
+
+  public skillForm!: FormGroup;
+  public addableEmployees: Array<EmployeeResponseDTO> = [];
+  public addedEmployees: Array<EmployeeNameDataDTO> = [];
+  errorMessages: Record<string, string> = {};
+
+
+  constructor(private skillService: SkillService, private employeeService: EmployeeService, private router: Router) { }
+
+  private validationErrorMessages: Record<string, string> = {
+    required: "This field is required",
+  };
+
+  updateErrorMessages(): void {
+    this.errorMessages = {};
+
+    Object.keys(this.skillForm.controls).forEach(field => {
+      const control = this.skillForm.get(field);
+
+      if (control && control.errors) {
+        this.errorMessages[field] = Object.keys(control.errors)
+          .map(errorKey => this.validationErrorMessages[errorKey] || `Unknown error: ${errorKey}`)
+          .join(' ');
+      }
+    });
+  }
+
+  setUpForm() {
+    this.skillForm = new FormGroup({
+      name: new FormControl(this.skill.skill, Validators.required),
+      newEmployee: new FormControl(),
+    });
+  }
+
+
+  addEmployee() {
+    const employeeId = Number(this.skillForm.get("newEmployee")?.value);
+    if (!employeeId) {
+      return;
+    }
+    const employee = this.addableEmployees.find(emp => emp.id === employeeId);
+
+    if (employee) {
+      this.addableEmployees = this.addableEmployees.filter(emp => emp.id !== employeeId);
+
+      this.addedEmployees.push(employee);
+    }
+  }
+
+  removeEmployee(employeeId: number) {
+    const employee = this.addedEmployees.find(emp => emp.id === employeeId);
+
+    if (employee) {
+      this.addedEmployees = this.addedEmployees.filter(emp => emp.id !== employeeId);
+
+      this.employeeService.getEmployeeById(employee.id).subscribe(employeeDto => {
+        this.addableEmployees.push(employeeDto);
+      });
+    }
+  }
+
+  returnToSkillList() {
+    this.router.navigate(["qualifikationsverwaltung"]);
+  }
+
+  updateEmployeeLists() {
+    if (this.skill.id != -1) {
+      this.employeeService.getAllEmployees().subscribe(employees => {
+        this.addableEmployees = employees;
+
+        this.skillService.getEmployeesBySkill(this.skill.id).subscribe(addedEmployeesResponse => {
+          this.addedEmployees = addedEmployeesResponse.employees;
+
+          this.addableEmployees = this.addableEmployees.filter(employee => {
+            return !this.addedEmployees.some(added => added.id === employee.id);
+          });
+        });
+      });
+    }
+  }
+
+  submit() {
+    this.updateErrorMessages();
+    if (!this.skillForm.valid) {
+      return;
+    }
+
+    for (const employee of this.addedEmployees) {
+      this.employeeService.getEmployeeById(employee.id).subscribe(employeeResponse => {
+        this.employeeService.addSkillToEmployee(this.skill.id, employeeResponse);
+      });
+    }
+
+    for (const employee of this.addableEmployees) {
+      this.employeeService.removeSkillFromEmployee(this.skill.id, employee.id);
+    }
+
+    this.skill.skill = this.skillForm.get("name")?.value;
+    this.skillChange.emit(this.skill);
+
+    this.router.navigate(["/qualifikationsverwaltung"]);
+  }
+
+  ngOnChanges(): void {
+    this.setUpForm();
+    this.updateEmployeeLists();
+  }
+
+  ngOnInit() {
+    this.setUpForm();
+    this.updateEmployeeLists();
+  }
+}

src/app/components/qualifikationsverwaltung/qualifikationsverwaltung.component.css

@@ -0,0 +1,90 @@
+body {
+  font-family: sans-serif;
+  margin: 0;
+  padding: 20px;
+  background-color: #f0f0f0;
+}
+
+.container {
+  width: 100%;
+  margin: 0 auto;
+  background-color: #fff;
+  padding: 20px;
+}
+
+h1 {
+  font-size: 2rem;
+  margin-bottom: 20px;
+}
+
+.search-bar {
+  display: flex;
+  margin-bottom: 10px;
+  align-items: center;
+}
+
+.search-bar input[type="text"] {
+  padding: 8px;
+  border: 1px solid #ccc;
+  border-radius: 3px;
+  flex-grow: 1;
+  margin-right: 10px;
+}
+
+.search-bar button {
+  padding: 10px 15px;
+  background-color: #007bff;
+  color: #fff;
+  border: none;
+  border-radius: 3px;
+  cursor: pointer;
+}
+
+.add-button {
+  background-color: #07af16;
+  color: #fff;
+  padding: 10px 15px;
+  border: none;
+  border-radius: 3px;
+  cursor: pointer;
+  float: left;
+  margin-bottom: 10px;
+}
+
+.employee-table {
+  width: 100%;
+  border-collapse: collapse;
+  margin-top: 20px;
+}
+
+.employee-table th,
+.employee-table td {
+  padding: 12px 15px;
+  border: 1px solid #ddd;
+  text-align: left;
+}
+
+.employee-table th {
+  background-color: #f0f0f0;
+  font-weight: bold;
+}
+
+.sortable {
+  cursor: pointer;
+}
+
+.logout-button {
+  background-color: transparent;
+  border: none;
+  cursor: pointer;
+  border-radius: 50%;
+  width: 30px;
+  height: 30px;
+  display: flex;
+  float: right;
+}
+
+.logout-button img {
+  width: 20px;
+  height: 20px;
+}

src/app/components/qualifikationsverwaltung/qualifikationsverwaltung.component.html

@@ -0,0 +1,60 @@
+<div class="d-flex flex-row">
+  <app-navigation-bar [route]="'skill'" class="row" style="height: 100vh;"></app-navigation-bar>
+  <div class="container">
+    <div class="header">
+      <div class="dropdown position-absolute top-0 end-0 m-3">
+        <button class="btn align-items-center d-flex" type="button" id="userDropdown" data-bs-toggle="dropdown"
+          aria-expanded="false">
+          <img src="user.svg" alt="User Icon" class="rounded-circle" style="width: 30px; height: 30px;">
+        </button>
+        <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="userDropdown">
+          <li><a class="dropdown-item" href="/logout">Log out</a></li>
+        </ul>
+      </div>
+      <h1>Qualifications</h1>
+    </div>
+
+    <div class="d-flex flex-column">
+      <div class="row header-actions">
+        <form [formGroup]="searchForm">
+          <div class="search-bar">
+            <input type="text" placeholder="Search employee" formControlName="search">
+            <button (click)="submit()">Search</button>
+          </div>
+          <p class="text-body-tertiary">Search for a propertiy of a Qualification. eg. Name</p>
+        </form>
+        <div class="d-flex">
+          <button (click)="createSkill()" class="add-button me-auto">Add qualification</button>
+        </div>
+      </div>
+
+      @if (errorDeletingSkill) {
+      <div class="row">
+        <p class="alert alert-danger">This Qualification can not be deleted because it still has employees.</p>
+      </div>
+      }
+    </div>
+
+    <table class="employee-table">
+      <thead>
+        <tr>
+          <th><span class="sortable">Name</span></th>
+          <th>Actions</th>
+        </tr>
+      </thead>
+      <tbody>
+        @if (skills) {
+        @for (skill of skills; track skill) {
+        <tr>
+          <td>{{ skill.skill }}</td>
+          <td>
+            <button class="btn btn-primary me-2" (click)="editSkill(skill.id)">Edit</button>
+            <button class="btn btn-danger" (click)="deleteSkill(skill.id)">Delete</button>
+          </td>
+        </tr>
+        }
+        }
+      </tbody>
+    </table>
+  </div>
+</div>

src/app/components/qualifikationsverwaltung/qualifikationsverwaltung.component.spec.ts

@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { QualifikationsverwaltungComponent } from './qualifikationsverwaltung.component';
+
+describe('QualifikationsverwaltungComponent', () => {
+  let component: QualifikationsverwaltungComponent;
+  let fixture: ComponentFixture<QualifikationsverwaltungComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [QualifikationsverwaltungComponent]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(QualifikationsverwaltungComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/components/qualifikationsverwaltung/qualifikationsverwaltung.component.ts

@@ -0,0 +1,66 @@
+import { Component } from '@angular/core';
+import { QualificationGetDTO } from '../../models/skill';
+import { FormControl, FormGroup, ReactiveFormsModule } from '@angular/forms';
+import { SkillService } from '../../service/skill.service';
+import { Router } from '@angular/router';
+import { NavigationBarComponent } from '../navigation-bar/navigation-bar.component';
+
+@Component({
+  selector: 'app-qualifikationsverwaltung',
+  standalone: true,
+  imports: [ReactiveFormsModule, NavigationBarComponent],
+  templateUrl: './qualifikationsverwaltung.component.html',
+  styleUrl: './qualifikationsverwaltung.component.css'
+})
+export class QualifikationsverwaltungComponent {
+  skills: Array<QualificationGetDTO> = [];
+  public searchForm!: FormGroup;
+  public errorDeletingSkill = false;
+
+  constructor(private skillService: SkillService, private router: Router) { }
+
+  submit() {
+    const searchTerm = this.searchForm.get("search")?.value || '';
+
+    this.skillService.getAllSkills().subscribe(skills => {
+      let foundSkills: Array<QualificationGetDTO> = [];
+      for (const skill of skills) {
+        if (
+          skill.skill.toLowerCase().includes(searchTerm.toLowerCase()) ||
+          searchTerm == ''
+        ) {
+          foundSkills.push(skill);
+        }
+      }
+
+      this.skills = foundSkills;
+    });
+  }
+
+  editSkill(id: number) {
+    this.router.navigate([`/qualifikationbearbeiten/${id}`]);
+  }
+
+  createSkill() {
+    this.router.navigate(['/qualifikationerstellen']);
+  }
+
+  deleteSkill(id: number) {
+    this.skillService.getEmployeesBySkill(id).subscribe(employees => {
+      this.errorDeletingSkill = false;
+      if (employees.employees.length == 0) {
+        this.skillService.deleteSkill(id);
+        this.skills = this.skills.filter(skill => skill.id != id);
+      } else {
+        this.errorDeletingSkill = true;
+      }
+    });
+  }
+
+  ngOnInit(): void {
+    this.searchForm = new FormGroup({
+      search: new FormControl(''),
+    });
+    this.skillService.getAllSkills().subscribe(skills => this.skills = skills);
+  }
+}

src/app/components/qualifikaton-bearbeiten-view/qualifikaton-bearbeiten-view.component.css

@@ -1,131 +0,0 @@
-body {
-  font-family: sans-serif;
-  margin: 0;
-  padding: 20px;
-  background-color: #f0f0f0;
-}
-
-.container {
-  width: 100%;
-  max-width: 800px;
-  margin: 0 auto;
-  padding: 20px;
-  background-color: #fff;
-}
-
-h1, h2 {
-  font-size: 1.8rem;
-  margin-bottom: 15px;
-}
-
-.back-button {
-  background-color: #ccc;
-  color: #333;
-  border: none;
-  padding: 8px 12px;
-  border-radius: 3px;
-  margin-bottom: 15px;
-}
-
-.form-group {
-  margin-bottom: 15px;
-}
-
-label {
-  display: block;
-  margin-bottom: 5px;
-}
-
-input[type="text"] {
-  width: 100%;
-  padding: 10px;
-  border: 1px solid #ccc;
-  border-radius: 1px;
-}
-
-.employee-list {
-  list-style: none;
-  padding: 0;
-}
-
-.employee-list li {
-  display: flex;
-  align-items: center;
-  margin-bottom: 5px;
-}
-
-.employee-icon {
-  margin-right: 5px;
-}
-
-.add-employee-section {
-  margin-top: 15px;
-}
-
-.add-employee-section select {
-  padding: 10px;
-  border: 1px solid #ddd;
-  border-radius: 3px;
-  margin-right: 10px;
-}
-
-.add-employee-button {
-  background-color: #06a63b;
-  color: #fff;
-  padding: 10px 15px;
-  border: none;
-  border-radius: 3px;
-  cursor: pointer;
-  margin-top: 10px;
-}
-
-.save-button {
-  background-color: #007bff;
-  color: #fff;
-  padding: 10px 15px;
-  border: none;
-  border-radius: 3px;
-  cursor: pointer;
-  margin-top: 20px;
-  display: block;
-  width: 100%;
-}
-
-.delete-skill-button {
-  color: #fff;
-  padding: 5px 8px;
-  border: none;
-  cursor: pointer;
-  margin-left: 4px;
-  margin-right: 4px;
-  border-radius: 3px;
-}
-
-.delete-skill-button img {
-  width: 15px;
-  height: 15px;
-}
-
-.add-employee-section {
-  margin-top: 15px;
-}
-
-.add-employee-section label {
-  display: block;
-  margin-bottom: 5px;
-  font-weight: bold;
-}
-
-.add-employee-section input[type="text"] {
-  width: 100%;
-  padding: 10px;
-  border: 1px solid #ddd;
-  border-radius: 3px;
-}
-
-.employee-container {
-  border: 1px solid #ccc;
-  padding: 20px;
-  border-radius: 1px;
-  margin-bottom: 20px;
-}

src/app/components/qualifikaton-bearbeiten-view/qualifikaton-bearbeiten-view.component.html

@@ -1,36 +1 @@
-<div class="container">
-  <button class="back-button">Back</button>
-
-  <div class="form-group">
-    <label for="name">Name</label>
-    <input type="text" id="name" value="(Hier kommt name der gewählten qualification hin)">
-  </div>
-
-  <div class="employee-container">
-    <h2>Employees possessing the qualification</h2>
-
-    <ul class="employee-list">
-      <li>
-        <button class="delete-skill-button">
-          <img src="Delete-button.svg" alt="Delete">
-        </button>
-        <span class="employee-name">Max Mustermann</span>
-      </li>
-      <li>
-        <button class="delete-skill-button">
-          <img src="Delete-button.svg" alt="Delete">
-        </button>
-        <span class="employee-name">Mehdi Boudjoudi</span>
-      </li>
-    </ul>
-
-    <div class="add-employee-section">
-      <label for="employeeSearch">Search for employee</label>
-      <input type="text" id="employeeSearch" placeholder="Last name of employee">
-      <button class="add-employee-button">Add employee</button>
-    </div>
-  </div>
-
-  <button class="save-button">Save</button>
-</div>
-
+<app-qualifikation-form [(skill)]="skill" (skillChange)="submitted($event)"></app-qualifikation-form>

src/app/components/qualifikaton-bearbeiten-view/qualifikaton-bearbeiten-view.component.ts

@@ -1,12 +1,38 @@
 import { Component } from '@angular/core';
+import { QualifikationFormComponent } from '../qualifikation-form/qualifikation-form.component';
+import { SkillService } from '../../service/skill.service';
+import { FormGroup } from '@angular/forms';
+import { QualificationGetDTO } from '../../models/skill';
+import { ActivatedRoute } from '@angular/router';
 
 @Component({
   selector: 'app-qualifikaton-bearbeiten-view',
   standalone: true,
-  imports: [],
+  imports: [QualifikationFormComponent],
   templateUrl: './qualifikaton-bearbeiten-view.component.html',
   styleUrl: './qualifikaton-bearbeiten-view.component.css'
 })
 export class QualifikatonBearbeitenViewComponent {
+  public skill!: QualificationGetDTO;
 
+  constructor(private skillService: SkillService, private route: ActivatedRoute) { }
+
+  submitted(skill: QualificationGetDTO) {
+    this.skillService.updateSkill(skill);
+  }
+
+  ngOnInit(): void {
+    this.skill = {
+      id: -1,
+      skill: '',
+    };
+
+    this.skillService.getAllSkills().subscribe(skills => {
+      for (const skill of skills) {
+        if (skill.id == Number(this.route.snapshot.params['id'])) {
+          this.skill = skill;
+        }
+      }
+    });
+  }
 }

src/app/components/qualifikaton-detail/qualifikaton-detail.component.css

@@ -0,0 +1,13 @@
+.thin-separator {
+  border: none;
+  border-top: 2px solid #aea0a0;
+  margin: 20px 0;
+  width: 20%;
+  text-align: left;
+}
+
+.employee-list-title {
+  margin-bottom: 24px;
+}
+
+

src/app/components/qualifikaton-detail/qualifikaton-detail.component.html

@@ -0,0 +1,20 @@
+<div class="d-flex flex-col" style="height: 100%;">
+  <app-navigation-bar></app-navigation-bar>
+  <div class="p-3" style="width: 100%;">
+    <a href="" class="btn btn-primary">Zurück</a>
+    <div class="row align-items-start pt-3">
+      <div class="col">
+        <h1>Name of qualification</h1>
+        <h4 class="employee-list-title">List of employees possessing the qualification</h4>
+        <p>Max Mustermann</p>
+        <hr class="thin-separator">
+        <p>Mehdi Boudjoudi</p>
+        <hr class="thin-separator">
+        <p>Random Random</p>
+        <hr class="thin-separator">
+        <button class="btn btn-danger">Löschen</button>
+        <button class="ms-3 btn btn-primary">Bearbeiten</button>
+      </div>
+    </div>
+  </div>
+</div>

src/app/components/qualifikaton-detail/qualifikaton-detail.component.spec.ts

@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { QualifikatonDetailComponent } from './qualifikaton-detail.component';
+
+describe('QualifikatonDetailComponent', () => {
+  let component: QualifikatonDetailComponent;
+  let fixture: ComponentFixture<QualifikatonDetailComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [QualifikatonDetailComponent]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(QualifikatonDetailComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/components/qualifikaton-detail/qualifikaton-detail.component.ts

@@ -0,0 +1,15 @@
+import { Component } from '@angular/core';
+import {NavigationBarComponent} from "../navigation-bar/navigation-bar.component";
+
+@Component({
+  selector: 'app-qualifikaton-detail',
+  standalone: true,
+  imports: [
+    NavigationBarComponent
+  ],
+  templateUrl: './qualifikaton-detail.component.html',
+  styleUrl: './qualifikaton-detail.component.css'
+})
+export class QualifikatonDetailComponent {
+
+}

src/app/environments/environment.ci.ts

@@ -0,0 +1,4 @@
+
+export class Environment {
+  public static readonly BASE_URL = "http://employee:8089";
+}

src/app/environments/environment.ts

@@ -0,0 +1,4 @@
+
+export class Environment {
+  public static readonly BASE_URL = "http://127.0.0.1:8089";
+}

src/app/models/mitarbeiter.ts

@@ -0,0 +1,47 @@
+import { QualificationGetDTO, QualificationPostDTO } from "./skill";
+
+export interface EmployeeRequestPutDTO {
+  lastName: string,
+  firstName: string,
+  street: string,
+  postcode: string,
+  city: string,
+  phone: string,
+  skillSet: Array<number>,
+}
+
+export interface EmployeeResponseDTO {
+  id: number,
+  lastName: string,
+  firstName: string,
+  street: string,
+  postcode: string,
+  city: string,
+  phone: string,
+  skillSet?: Array<QualificationGetDTO>,
+}
+
+export interface EmployeeRequestDTO {
+  lastName: string,
+  firstName: string,
+  street: string,
+  postcode: string,
+  city: string,
+  phone: string,
+  skillSet?: Array<number>,
+}
+
+export interface EmployeeNameAndSkillDataDTO {
+  id: number,
+  lastName: string,
+  firstName: string,
+  skillSet: Array<QualificationPostDTO>,
+}
+
+export interface EmployeeNameDataDTO {
+  id: number,
+  lastName: string,
+  firstName: string,
+}
+
+

src/app/models/skill.ts

@@ -0,0 +1,15 @@
+import { EmployeeNameDataDTO } from "./mitarbeiter";
+
+export interface QualificationGetDTO {
+  id: number,
+  skill: string,
+}
+
+export interface QualificationPostDTO {
+  skill: string,
+}
+
+export interface EmployeesForAQualificationDTO {
+  qualification: QualificationGetDTO,
+  employees: Array<EmployeeNameDataDTO>,
+}

src/app/service/employee.service.ts

@@ -0,0 +1,76 @@
+import { Injectable } from "@angular/core";
+import { EmployeeRequestDTO, EmployeeRequestPutDTO, EmployeeResponseDTO } from "../models/mitarbeiter";
+import { HttpClient } from "@angular/common/http";
+import { Observable } from "rxjs";
+import { SkillService } from "./skill.service";
+
+@Injectable({
+  providedIn: 'root'
+})
+export class EmployeeService {
+  constructor(private http: HttpClient) { }
+
+  responseToRequestDto(employee: EmployeeResponseDTO): EmployeeRequestDTO {
+    return {
+      firstName: employee.firstName,
+      lastName: employee.lastName,
+      street: employee.street,
+      postcode: employee.postcode,
+      city: employee.city,
+      phone: employee.phone,
+      skillSet: employee.skillSet?.map(skill => skill.id) || [],
+    }
+  }
+
+  responseDtoToPutDto(employee: EmployeeResponseDTO): EmployeeRequestPutDTO {
+    return {
+      firstName: employee.firstName,
+      lastName: employee.lastName,
+      street: employee.street,
+      postcode: employee.postcode,
+      city: employee.city,
+      phone: employee.phone,
+      skillSet: employee.skillSet?.map(skill => skill.id) || [],
+    }
+  }
+
+  createEmployee(employee: EmployeeResponseDTO) {
+    this.http.post(`${SkillService.BASE_URL}/employees`, this.responseToRequestDto(employee)).subscribe();
+  }
+
+  updateEmployee(employee: EmployeeResponseDTO) {
+    this.http.put(`${SkillService.BASE_URL}/employees/${employee.id}`, this.responseDtoToPutDto(employee)).subscribe();
+  }
+
+  getAllEmployees(): Observable<Array<EmployeeResponseDTO>> {
+    return this.http.get<Array<EmployeeResponseDTO>>(`${SkillService.BASE_URL}/employees`);
+  }
+
+  deleteEmployee(id: number) {
+    this.http.delete(`${SkillService.BASE_URL}/employees/${id}`).subscribe();
+  }
+
+  getEmployeeById(id: number): Observable<EmployeeResponseDTO> {
+    return this.http.get<EmployeeResponseDTO>(`${SkillService.BASE_URL}/employees/${id}`);
+  }
+
+  removeSkillFromEmployee(skillId: number, employeeId: number) {
+    this.getEmployeeById(employeeId).subscribe(employee => {
+      let employeePut = this.responseDtoToPutDto(employee);
+      if (employeePut.skillSet.indexOf(skillId) != 1) {
+        employeePut.skillSet = employeePut.skillSet.filter(skill => skill != skillId);
+      }
+
+      this.http.put(`${SkillService.BASE_URL}/employees/${employee.id}`, employeePut).subscribe();
+    });
+  }
+
+  addSkillToEmployee(skillId: number, employee: EmployeeResponseDTO) {
+    let employeePut = this.responseDtoToPutDto(employee);
+    if (employeePut.skillSet.indexOf(skillId) == -1) {
+      employeePut.skillSet.push(skillId);
+    }
+
+    this.http.put(`${SkillService.BASE_URL}/employees/${employee.id}`, employeePut).subscribe();
+  }
+}

src/app/service/skill.service.ts

@@ -0,0 +1,55 @@
+import {HttpClient} from "@angular/common/http";
+import {Injectable} from "@angular/core";
+import {EmployeesForAQualificationDTO, QualificationGetDTO, QualificationPostDTO} from "../models/skill";
+import {Observable} from "rxjs";
+import {EmployeeNameAndSkillDataDTO, EmployeeNameDataDTO} from "../models/mitarbeiter";
+import {EmployeeService} from "./employee.service";
+import {Environment} from "../environments/environment";
+
+@Injectable({
+  providedIn: 'root'
+})
+export class SkillService {
+  deleteSkill(id: number) {
+    this.getEmployeesBySkill(id).subscribe(employees => {
+      for (let employee of employees.employees) {
+        this.employeeService.removeSkillFromEmployee(id, employee.id);
+      }
+    });
+
+    this.http.delete(`${SkillService.BASE_URL}/qualifications/${id}`).subscribe();
+  }
+
+  public static readonly BASE_URL = Environment.BASE_URL;
+
+  getToPutDto(skill: QualificationGetDTO): QualificationPostDTO {
+    return {
+      skill: skill.skill,
+    }
+  }
+
+  createSkill(skill: QualificationGetDTO) {
+    this.http.post(`${SkillService.BASE_URL}/qualifications`, this.getToPutDto(skill)).subscribe();
+  }
+
+  constructor(private http: HttpClient, private employeeService: EmployeeService) {
+
+  }
+
+  updateSkill(skill: QualificationGetDTO) {
+    this.http.put(`${SkillService.BASE_URL}/qualifications/${skill.id}`, this.getToPutDto(skill)).subscribe();
+  }
+
+  getAllSkills(): Observable<Array<QualificationGetDTO>> {
+    return this.http.get<Array<QualificationGetDTO>>(`${SkillService.BASE_URL}/qualifications`);
+  }
+
+  getEmployeesBySkill(id: number): Observable<EmployeesForAQualificationDTO> {
+    return this.http.get<EmployeesForAQualificationDTO>(`${SkillService.BASE_URL}/qualifications/${id}/employees`);
+  }
+
+  getSkillsOfEmployee(id: number): Observable<EmployeeNameAndSkillDataDTO> {
+    return this.http.get<EmployeeNameAndSkillDataDTO>(`${SkillService.BASE_URL}/employees/${id}/qualifications`);
+  }
+
+}

src/main.ts

@@ -1,6 +1,7 @@
+import { HttpClientModule } from '@angular/common/http';
 import { bootstrapApplication } from '@angular/platform-browser';
 import { appConfig } from './app/app.config';
 import { AppComponent } from './app/app.component';
 
-bootstrapApplication(AppComponent, appConfig)
+bootstrapApplication(AppComponent , appConfig,)
   .catch((err) => console.error(err));

tests/login.spec.ts

@@ -0,0 +1,46 @@
+import { test, expect } from '@playwright/test';
+import { async } from 'rxjs';
+
+test('LoginPageShouldRender', async ({ page }) => {
+  await page.goto('http://localhost:4200');
+
+  // Expect a title "to contain" a substring.
+  await expect(page).toHaveTitle(/EmployeeService/);
+});
+
+test('LoginPageShouldHaveCorrectHeading', async ({ page }) => {
+  await page.goto('http://localhost:4200');
+
+  const heading = page.getByRole('heading');
+  await expect(heading).toHaveText('Hi-Tec GmbH');
+});
+
+test('LoginPageShouldHaveLoginButton', async ({ page }) => {
+  await page.goto('http://localhost:4200');
+
+  const button = page.getByRole('button');
+  await expect(button).toHaveText('Login with Keycloak');
+});
+
+test('LoginPageButtonShouldRedirectToKeycloak', async ({ page }) => {
+  await page.goto('http://localhost:4200');
+
+  const button = page.getByText("Login with Keycloak");
+  await button.click();
+  await page.waitForFunction(() => window.location.href.includes('keycloak'));
+  expect(page.url()).toContain("keycloak.szut.dev");
+});
+
+test('AfterLoginUserShouldBeRedirectedToEmployees', async ({ page }) => {
+  await page.goto('http://localhost:4200');
+
+  await page.getByRole('button').click();
+  await page.waitForFunction(() => window.location.href.includes('keycloak'));
+  await page.getByLabel('Username or email').fill('user');
+  await page.getByLabel('Password').fill('test');
+  await page.click('#kc-login');
+
+  expect(page.url()).toContain('localhost');
+  expect(page.url()).toContain('mitarbeiter');
+});
+

tests/mitarbeiter.spec.ts

@@ -0,0 +1,50 @@
+import { test, expect } from "@playwright/test";
+
+test.describe('mitarbeiter', () => {
+  test.beforeEach(async ({ page }) => {
+    await page.goto('http://localhost:4200');
+
+    await page.getByRole('button').click();
+    await page.waitForFunction(() => window.location.href.includes('keycloak'));
+    await page.getByLabel('Username or email').fill('user');
+    await page.getByLabel('Password').fill('test');
+    await page.click('#kc-login');
+
+    await page.goto('http://localhost:4200/mitarbeiter');
+  });
+
+  test('ShouldLoad', async ({ page }) => {
+    await expect(page.getByRole('heading')).toHaveText("Employees");
+  });
+
+  test('ShouldLoadEmployees', async ({ page }) => {
+    expect(page.getByText('Max')).toBeTruthy();
+  });
+
+  test('AddEmployeeShouldRedirect', async ({ page }) => {
+    await page.getByText('Add employee').click();
+
+    expect(page.url()).toContain('mitarbeitererstellen');
+  });
+
+  test('DeleteShouldBeThere', async ({ page }) => {
+    const button = page.getByText('Delete').first();
+
+    const users = page.getByText('Delete');
+    await users.first().waitFor({ state: "visible" });
+    expect(await users.count()).toBeGreaterThan(1);
+    expect(button).toBeTruthy();
+  });
+
+  test('SearchShouldWork', async ({ page }) => {
+    const searchField = page.getByRole('textbox');
+    const searchButton = page.getByText('Search').first();
+
+    await searchField.fill('Max');
+    await searchButton.click();
+
+    const hiddenItem = page.getByText('MusterFrau');
+    await expect(hiddenItem).toHaveCount(0);
+  });
+});
+

tests/mitarbeiterErstellen.spec.ts

@@ -0,0 +1,61 @@
+import { test, expect } from "@playwright/test";
+
+test.describe('mitarbeiter', () => {
+  test.beforeEach(async ({ page }) => {
+    await page.goto('http://localhost:4200');
+
+    await page.getByRole('button').click();
+    await page.waitForFunction(() => window.location.href.includes('keycloak'));
+    await page.getByLabel('Username or email').fill('user');
+    await page.getByLabel('Password').fill('test');
+    await page.click('#kc-login');
+
+    await page.goto('http://localhost:4200/mitarbeitererstellen');
+  });
+
+  test('pageShouldLoad', async ({ page }) => {
+    await expect(page.getByText('Save')).toHaveCount(1);
+  });
+
+  test('backButtonShouldGoBack', async ({ page }) => {
+    await page.getByText('Back').click();
+
+    expect(page.url().includes('erstellen')).toBeFalsy();
+  });
+
+  test('EveryFieldShouldValidateEmptiness', async ({ page }) => {
+    await page.getByText('Save').click();
+
+    const errors = page.getByText('This field is required');
+
+    await expect(errors).toHaveCount(6);
+  });
+
+  test('PhoneNumberShouldBeValidated', async ({ page }) => {
+    await page.getByLabel('Phone').fill("asd");
+    await page.getByText('Save').click();
+
+    const error = page.getByText('This field must be a valid phone number');
+
+    await expect(error).toHaveCount(1);
+  });
+
+  test('PostCodeShouldValidateTooShort', async ({ page }) => {
+    await page.getByLabel('Postcode').fill("1");
+    await page.getByText('Save').click();
+
+    const error = page.getByText('The value is too short');
+
+    await expect(error).toHaveCount(1);
+  });
+
+  test('PostCodeShouldValidateTooLong', async ({ page }) => {
+    await page.getByLabel('Postcode').fill("123456");
+    await page.getByText('Save').click();
+
+    const error = page.getByText('The value is too long');
+
+    await expect(error).toHaveCount(1);
+  });
+});
+

tests/mitarbeiterbearbeiten.spec.ts

@@ -0,0 +1,24 @@
+import { test, expect } from "@playwright/test";
+
+test.describe('mitarbeiterbearbeiten', () => {
+  test.beforeEach(async ({ page }) => {
+    await page.goto('http://localhost:4200');
+
+    await page.getByRole('button').click();
+    await page.waitForFunction(() => window.location.href.includes('keycloak'));
+    await page.getByLabel('Username or email').fill('user');
+    await page.getByLabel('Password').fill('test');
+    await page.click('#kc-login');
+
+    await page.goto('http://localhost:4200/mitarbeiterbearbeiten/1');
+  });
+
+  test('ShouldLoad', async ({ page }) => {
+    expect(page.getByText("Save")).toBeTruthy();
+  });
+
+  test('FieldsShouldHaveValues', async ({page}) => {
+    await expect(page.getByLabel('First Name')).toHaveValue('Max');
+  });
+});
+

tests/qualifikationbearbeiten.spec.ts

@@ -0,0 +1,23 @@
+import { test, expect } from "@playwright/test";
+
+test.describe('qualifikationbearbeiten', () => {
+  test.beforeEach(async ({ page }) => {
+    await page.goto('http://localhost:4200');
+
+    await page.getByRole('button').click();
+    await page.waitForFunction(() => window.location.href.includes('keycloak'));
+    await page.getByLabel('Username or email').fill('user');
+    await page.getByLabel('Password').fill('test');
+    await page.click('#kc-login');
+
+    await page.goto('http://localhost:4200/qualifikationbearbeiten/1');
+  });
+
+  test('ShouldLoad', async ({ page }) => {
+    expect(page.getByText("Save")).toBeTruthy();
+  });
+
+  test('FieldsShouldHaveValues', async ({page}) => {
+    await expect(page.getByLabel('Name')).toHaveValue('Java');
+  });
+});

tests/qualifikationsverwaltung.spec.ts

@@ -0,0 +1,58 @@
+import { test, expect } from "@playwright/test";
+
+test.describe('qualifikationen', () => {
+  test.beforeEach(async ({ page }) => {
+    await page.goto('http://localhost:4200');
+
+    await page.getByRole('button').click();
+    await page.waitForFunction(() => window.location.href.includes('keycloak'));
+    await page.getByLabel('Username or email').fill('user');
+    await page.getByLabel('Password').fill('test');
+    await page.click('#kc-login');
+
+    await page.goto('http://localhost:4200/qualifikationsverwaltung');
+  });
+
+  test('ShouldLoad', async ({ page }) => {
+    await expect(page.getByRole('heading')).toHaveText("Qualifications");
+  });
+
+  test('ShouldLoadQualifications', async ({ page }) => {
+    expect(page.getByText('Java')).toBeTruthy();
+  });
+
+  // TODO
+  // test('AddQualificationShouldRedirect', async ({ page }) => {
+  //   await page.getByText('Add qualification').click();
+
+  //   expect(page.url()).toContain('mitarbeitererstellen');
+  // });
+
+  test('EditShouldRedirectToCorrespondingPage', async ({ page }) => {
+    const button = page.getByText('Edit').first();
+    await button.click();
+
+    expect(page.url()).toContain('qualifikationbearbeiten');
+    expect(page.url()).toContain('1');
+  });
+
+  test('DeleteShouldBeThere', async ({ page }) => {
+    const button = page.getByText('Delete').first();
+
+    const users = page.getByText('Delete');
+    await users.first().waitFor({ state: "visible" });
+    expect(await users.count()).toBe(2);
+    expect(button).toBeTruthy();
+  });
+
+  test('SearchShouldWork', async ({ page }) => {
+    const searchField = page.getByRole('textbox');
+    const searchButton = page.getByText('Search').first();
+
+    await searchField.fill('Java');
+    await searchButton.click();
+
+    const hiddenItem = page.getByText('Angular');
+    await expect(hiddenItem).toHaveCount(0);
+  });
+});