api: Skills

src/main/java/com/maradona/backend/controllers/PageController.java

@@ -34,8 +34,8 @@ public class PageController {
 
   @GetMapping("/")
   public String index(Model model) {
-    var projects = projectService.getAllProjects();
-    model.addAttribute("projects", projects);
+    var projectData = projectService.getAllProjects();
+    model.addAttribute("projectData", projectData);
     return "index";
   }
 
@@ -51,7 +51,7 @@ public class PageController {
       var primarySkill = skill.getPrimarySkill();
       System.out.println(primarySkill.getPsid() + " " + primarySkill.getDescription());
     }
-    model.addAttribute("skills", skillData);
+    model.addAttribute("skillData", skillData);
 
     return "profile";
   }

src/main/resources/templates/index.html

@@ -9,7 +9,7 @@
     <div>
       <h2>Projects</h2>
       <ul>
-        <li th:each="project : ${projects}">
+        <li th:each="project : ${projectData}">
           <span th:text="${project.name}">Project Name</span> -
           <span th:text="${project.startDate}">Start Date</span> to
           <span th:text="${project.endDate}">End Date</span>

src/main/resources/templates/profile.html

@@ -14,21 +14,19 @@
         <li th:text="${employee.firstName}">First Name</li> 
         <li th:text="${employee.lastName}">Last Name</li>
         <li th:text="${employee.mail}">Email</li>
-        <li <p>6969420</p></li>  
-        <!-- TODO: Add Profile Phonenumber -->
+        <li <p>6969420</p></li>
       </ul>
     </div>
     <div>
       <h2>Skills</h2>
       <ul>
-        <li th:each="skills : ${primarySkills}">
-          <span th:text="${primarySkill.name}">Skill Name</span>
-          <!-- Unterliste für sekundäre Skills -->
+        <li th:each="skill : ${skillData}">
+          <span th:text="${skill.primarySkill.description}">Skill Name</span>
           <ul>
-            <li th:each="secondarySkill : ${primarySkill.secondarySkills}">
-              <span th:text="${secondarySkill.name}">Skill Name</span>
+            <li th:each="secondarySkill : ${skill.secondarySkills}">
+              <span th:text="${secondarySkill.description}">Skill Name</span>
             </li>
-          </ul>
+          </ul> 
         </li>
       </ul>