Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 467aedf

Browse files
ultra7677ultra7677
committed
version 1.2
1 parent aeea083 commit 467aedf

File tree

4 files changed

+15
-7
lines changed

4 files changed

+15
-7
lines changed

‎src/main/java/com/sapanywhere/app/entity/LeaveType.java

+8
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,14 @@ public LeaveType(long id){
2929
@Column(nullable= false,unique=true)
3030
private String foreignName;
3131

32+
public String getForeignName() {
33+
return foreignName;
34+
}
35+
36+
public void setForeignName(String foreignName) {
37+
this.foreignName = foreignName;
38+
}
39+
3240
public long getId() {
3341
return id;
3442
}

‎src/main/resources/templates/leave/request.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<div class="input-field-group">
4444
<div class="input-label" th:text="#{leave.request.form.leaveType}"></div>
4545
<select class="input-field " th:field="*{leaveType}">
46-
<option th:each="it : ${@leaveTypeService.findAll()}" th:value="${it.id}" th:text="${it.name}"></option>
46+
<option th:each="it : ${@leaveTypeService.findAll()}" th:value="${it.id}" th:text="${it.foreignName}"></option>
4747
</select>
4848
</div>
4949
<div class="input-field-group" >

‎src/main/resources/templates/overview/index.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
<tbody>
9090
<tr th:each="it,iterableObj : *{leaveInfos}">
9191
<td th:text="${iterableObj.index + 1}"></td>
92-
<td th:text="${it.leaveType.name}"></td>
92+
<td th:text="${it.leaveType.foreignName}"></td>
9393
<td th:text="${it.fromDate}"></td>
9494
<td th:text="${it.toDate}"></td>
9595
<td th:text="${@formatterService.formatTotalHours(it.totalHours)}"></td>
@@ -121,7 +121,7 @@
121121
<tr th:each="it,iterableObj : *{approveLeaveTable.leaves}">
122122
<td th:text="${iterableObj.index + 1}"></td>
123123
<td th:text="${it.user.fullName}"></td>
124-
<td th:text="${it.type.name}"></td>
124+
<td th:text="${it.type.foreignName}"></td>
125125
<td th:text="${@formatterService.formatDate(it.startDateTime)}"></td>
126126
<td th:text="${@formatterService.formatDate(it.endDateTime)}"></td>
127127
<td th:text="${@formatterService.formatTotalHours(it.total)}"></td>
@@ -161,7 +161,7 @@
161161
<tr th:each="it,iterableObj : *{myLeaveTable.leaves}">
162162
<td th:text="${iterableObj.index + 1}"></td>
163163
<td th:text="${it.user.fullName}"></td>
164-
<td th:text="${it.type.name}"></td>
164+
<td th:text="${it.type.foreignName}"></td>
165165
<td th:text="${@formatterService.formatDate(it.startDateTime)}"></td>
166166
<td th:text="${@formatterService.formatDate(it.endDateTime)}"></td>
167167
<td th:text="${@formatterService.formatTotalHours(it.total)}"></td>

‎src/main/resources/templates/settings/index.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ <h4 class="modal-title" id="myModalLabel" th:text="#{company.info.editdepartment
354354
<tbody>
355355
<tr class = "leavetyperule-form" th:each="it,iterableObj : *{rules}">
356356
<td th:text="${iterableObj.index + 1}"></td>
357-
<td th:id = "nameField+${iterableObj.index + 1}" th:text="${it.type.name}"></td>
357+
<td th:id = "nameField+${iterableObj.index + 1}" th:text="${it.type.foreignName}"></td>
358358
<td th:id = "baseDays+${iterableObj.index + 1}" th:text="#{setting.leavetyperule.table.days_format(${it.baseDays})}"></td>
359359
<td th:id = "increaseDaysPerYear+${iterableObj.index + 1}" th:text="#{setting.leavetyperule.table.days_format(${it.increaseDaysPerYear})}"></td>
360360
<td th:id = "maxDays+${iterableObj.index + 1}" th:text="#{setting.leavetyperule.table.days_format(${it.maxDays})}"></td>
@@ -432,7 +432,7 @@ <h4 class="modal-title" id="addLeaveTypeRule-title">Add Leave Type Rule</h4>
432432
<div class="input-field-group">
433433
<div class="input-label" th:text="#{setting.leavetyperule.table.column.leavetype}"></div>
434434
<select class="input-field" th:field="*{leaveTypeId}">
435-
<option th:each="it : ${settingPage.leaveTypeRuleForm.getLeaveTypes()}" th:text="${it.getName()}" th:value="${it.getId()}"></option>
435+
<option th:each="it : ${settingPage.leaveTypeRuleForm.getLeaveTypes()}" th:text="${it.getForeignName()}" th:value="${it.getId()}"></option>
436436
</select>
437437
</div>
438438
<div class="input-field-group">
@@ -470,7 +470,7 @@ <h4 class="modal-title" id="editLeaveTypeRule-title">Edit Leave Type Rule</h4>
470470
<div class="input-field-group">
471471
<div class="input-label" th:text="#{setting.leavetyperule.table.column.leavetype}"></div>
472472
<select class="input-field" th:field="*{leaveTypeId}" >
473-
<option class="leavetypes" th:id="${it.getId()}" th:each="it : ${settingPage.leaveTypeRuleForm.getLeaveTypes()}" th:text="${it.getName()}" th:value="${it.getId()}"></option>
473+
<option class="leavetypes" th:id="${it.getId()}" th:each="it : ${settingPage.leaveTypeRuleForm.getLeaveTypes()}" th:text="${it.getForeignName()}" th:value="${it.getId()}"></option>
474474
</select>
475475
</div>
476476
<div class="input-field-group" th:classappend="${#fields.hasErrors('baseDays')}? 'error' : ''">

0 commit comments

Comments
 (0)