unfeature: Remove mail
parent
eb12628995
commit
a7b7c58753
Binary file not shown.
|
@ -34,12 +34,6 @@ public class DefaultValueLoader implements CommandLineRunner {
|
|||
@Autowired
|
||||
private FormOfAddressRepository formOfAddressRepository;
|
||||
|
||||
@Autowired
|
||||
private EmployeeSecondarySkillRepository employeeSecondarySkillRepository;
|
||||
|
||||
@Autowired
|
||||
private ProjectRepository projectRepository;
|
||||
|
||||
@Override
|
||||
public void run(String... args) throws Exception {
|
||||
// Create form of addresses
|
||||
|
@ -85,24 +79,13 @@ public class DefaultValueLoader implements CommandLineRunner {
|
|||
// Create employees
|
||||
Employee employee1 = new Employee();
|
||||
employee1.setEmployeeNr(1);
|
||||
employee1.setFirstName("John");
|
||||
employee1.setLastName("Doe");
|
||||
employee1.setMail("john.doe@example.com");
|
||||
employee1.setFirstName("Jane");
|
||||
employee1.setLastName("Smith");
|
||||
employee1.setDStart(LocalTime.of(9, 0));
|
||||
employee1.setDEnd(LocalTime.of(17, 0));
|
||||
employee1.setFormOfAddress(formOfAddress1);
|
||||
|
||||
Employee employee2 = new Employee();
|
||||
employee2.setEmployeeNr(2);
|
||||
employee2.setFirstName("Jane");
|
||||
employee2.setLastName("Smith");
|
||||
employee2.setMail("jane.smith@example.com");
|
||||
employee2.setDStart(LocalTime.of(9, 0));
|
||||
employee2.setDEnd(LocalTime.of(17, 0));
|
||||
employee2.setFormOfAddress(formOfAddress2);
|
||||
employee1.setFormOfAddress(formOfAddress2);
|
||||
|
||||
employeeRepository.save(employee1);
|
||||
employeeRepository.save(employee2);
|
||||
|
||||
// Assign secondary skills to employees
|
||||
EmployeeSecondarySkill employeeSecondarySkill1 = new EmployeeSecondarySkill();
|
||||
|
@ -115,21 +98,11 @@ public class DefaultValueLoader implements CommandLineRunner {
|
|||
employeeSecondarySkill2.setSecondarySkill(secondarySkill2);
|
||||
employeeSecondarySkill2.setLevel(3);
|
||||
|
||||
EmployeeSecondarySkill employeeSecondarySkill3 = new EmployeeSecondarySkill();
|
||||
employeeSecondarySkill3.setEmployee(employee2);
|
||||
employeeSecondarySkill3.setSecondarySkill(secondarySkill3);
|
||||
employeeSecondarySkill3.setLevel(5);
|
||||
|
||||
List<EmployeeSecondarySkill> employee1Skills = new ArrayList<>();
|
||||
employee1Skills.add(employeeSecondarySkill1);
|
||||
employee1Skills.add(employeeSecondarySkill2);
|
||||
employee1.setSecondarySkills(employee1Skills);
|
||||
|
||||
List<EmployeeSecondarySkill> employee2Skills = new ArrayList<>();
|
||||
employee2Skills.add(employeeSecondarySkill3);
|
||||
employee2.setSecondarySkills(employee2Skills);
|
||||
|
||||
employeeRepository.save(employee1);
|
||||
employeeRepository.save(employee2);
|
||||
}
|
||||
}
|
|
@ -27,9 +27,6 @@ public class Employee {
|
|||
@JoinColumn(name = "AID")
|
||||
private FormOfAddress formOfAddress;
|
||||
|
||||
@Column(length = 150)
|
||||
private String mail;
|
||||
|
||||
private LocalTime dStart;
|
||||
private LocalTime dEnd;
|
||||
|
||||
|
@ -68,14 +65,6 @@ public class Employee {
|
|||
return formOfAddress;
|
||||
}
|
||||
|
||||
public void setMail(String mail) {
|
||||
this.mail = mail;
|
||||
}
|
||||
|
||||
public String getMail() {
|
||||
return mail;
|
||||
}
|
||||
|
||||
public void setDStart(LocalTime dStart) {
|
||||
this.dStart = dStart;
|
||||
}
|
||||
|
|
|
@ -1,14 +1,12 @@
|
|||
.project-card {
|
||||
background-color: var(--cosmic-dark-dark);
|
||||
color: var(--starlight-white-lighter);
|
||||
border: 1px solid var(--cosmic-dark-medium);
|
||||
border-radius: 5px;
|
||||
box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
|
||||
}
|
||||
|
||||
.project-card .card-title {
|
||||
color: var(--starlight-white-lighter);
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
|
||||
.project-card .card-text {
|
||||
|
@ -32,7 +30,6 @@
|
|||
background-color: var(--aurora-yellowgreen-lighter);
|
||||
border: none;
|
||||
border-radius: 4px;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
.btn-create-project:hover {
|
||||
|
|
|
@ -13,14 +13,13 @@
|
|||
<h2 class="mb-4">Profile</h2>
|
||||
<div class="project-card mb-4">
|
||||
<div class="card-body">
|
||||
<ul>
|
||||
<li th:text="${employee.formOfAddress.description}">
|
||||
Form of Address
|
||||
</li>
|
||||
<li th:text="${employee.firstName}">First Name</li>
|
||||
<li th:text="${employee.lastName}">Last Name</li>
|
||||
<li th:text="${employee.mail}">Email</li>
|
||||
</ul>
|
||||
<p>
|
||||
<span th:text="${employee.formOfAddress.description}"
|
||||
>Form of Address</span
|
||||
>
|
||||
<span th:text="${employee.firstName}">First Name</span>
|
||||
<span th:text="${employee.lastName}">Last Name</span>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="d-flex justify-content-between align-items-center mb-4">
|
||||
|
|
Loading…
Reference in New Issue