Skip to content

Commit 60cc247

Browse files
ultra7677ultra7677
committed
version 1.0
1 parent c2279fd commit 60cc247

File tree

10 files changed

+287
-22
lines changed

10 files changed

+287
-22
lines changed

‎src/main/java/com/sapanywhere/app/controller/CompanyController.java

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import com.sapanywhere.app.entity.Files;
3131
import com.sapanywhere.app.model.CompanyInfoForm;
3232
import com.sapanywhere.app.model.DepartmentInfoForm;
33+
import com.sapanywhere.app.model.setting.SettingPage;
3334
import com.sapanywhere.app.service.CompanyService;
3435
import com.sapanywhere.app.service.DepartmentService;
3536
import com.sapanywhere.app.service.FileService;
@@ -118,33 +119,35 @@ void addImage(@AuthenticationPrincipal UserInfo userInfo,@RequestParam("filename
118119
}
119120

120121
@RequestMapping(value = "/editCompanyInfoForm", method = RequestMethod.POST)
121-
public String editCompanyInfo(@AuthenticationPrincipal UserInfo userInfo,CompanyInfoForm companyInfoForm, BindingResult result) {
122+
public String editCompanyInfo(@AuthenticationPrincipal UserInfo userInfo,SettingPage settingPage, BindingResult result) {
122123
if (result.hasErrors()) {
123124
return "/company/companyinfo";
124125
}
126+
CompanyInfoForm companyInfoForm = settingPage.getCompanyInfoForm();
125127
Company company = this.companyService.findById((long) 1);
126128
// company.setLogoId(companyInfoForm.getAvatarId());
127129
company.setName(companyInfoForm.getName());
128130
this.companyService.save(company);
129-
return "redirect:/companyinfo.html";
131+
return "redirect:/setting.html";
130132
}
131133

132134
@RequestMapping(value = "/addDepartment", method = RequestMethod.POST)
133-
public String addDepartment(DepartmentInfoForm departmentInfoForm){
135+
public String addDepartment(SettingPage settingPage){
136+
DepartmentInfoForm departmentInfoForm = settingPage.getDepartmentInfoForm();
134137
System.out.println(departmentInfoForm.getName());
135138
Department department = new Department();
136139
department.setName(departmentInfoForm.getName());
137140
this.departmentService.create(department);
138-
return "redirect:/companyinfo.html";
141+
return "redirect:/setting.html";
139142
}
140143

141144
@RequestMapping(value = "/editDepartment", method = RequestMethod.POST)
142-
public String editDepartment(DepartmentInfoForm departmentInfoForm){
143-
145+
public String editDepartment(SettingPage settingPage){
146+
DepartmentInfoForm departmentInfoForm = settingPage.getDepartmentInfoForm();
144147
Department department = this.departmentService.findById((long) departmentInfoForm.getId());
145148
department.setName(departmentInfoForm.getName());
146149
this.departmentService.save(department);
147-
return "redirect:/companyinfo.html";
150+
return "redirect:/setting.html";
148151
}
149152

150153
}

‎src/main/java/com/sapanywhere/app/controller/SettingController.java

Lines changed: 41 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,20 @@
1010
import org.springframework.stereotype.Controller;
1111
import org.springframework.ui.Model;
1212
import org.springframework.validation.BindingResult;
13+
import org.springframework.web.bind.annotation.ModelAttribute;
1314
import org.springframework.web.bind.annotation.RequestBody;
1415
import org.springframework.web.bind.annotation.RequestMapping;
1516
import org.springframework.web.bind.annotation.RequestMethod;
1617
import org.springframework.web.bind.annotation.ResponseBody;
1718

1819
import com.sapanywhere.app.dto.ApproverDTO;
20+
import com.sapanywhere.app.entity.Company;
21+
import com.sapanywhere.app.entity.Department;
1922
import com.sapanywhere.app.entity.LeaveType;
2023
import com.sapanywhere.app.entity.LeaveTypeRule;
2124
import com.sapanywhere.app.entity.User;
25+
import com.sapanywhere.app.model.CompanyInfoForm;
26+
import com.sapanywhere.app.model.DepartmentInfoForm;
2227
import com.sapanywhere.app.model.LeaveTypeRuleForm;
2328
import com.sapanywhere.app.model.setting.ApproverListView;
2429
import com.sapanywhere.app.model.setting.LeaveTypeRuleListView;
@@ -27,13 +32,17 @@
2732
import com.sapanywhere.app.repository.LeaveTypeRepository;
2833
import com.sapanywhere.app.repository.LeaveTypeRuleRepository;
2934
import com.sapanywhere.app.service.ApproverService;
35+
import com.sapanywhere.app.service.CompanyService;
36+
import com.sapanywhere.app.service.DepartmentService;
37+
import com.sapanywhere.app.service.FileService;
3038
import com.sapanywhere.app.service.LeaveDaysInfoService;
3139
import com.sapanywhere.app.service.UserService;
3240
import com.sapanywhere.app.service.WorkHoursService;
3341

3442
@Controller
3543
public class SettingController {
36-
44+
private static String fileUrl = "/Users/ultra/Documents/images";
45+
3746
@Autowired
3847
private UserService userService;
3948

@@ -51,7 +60,20 @@ public class SettingController {
5160

5261
@Autowired
5362
private LeaveTypeRepository leaveTypeRepository;
63+
64+
@Autowired
65+
private CompanyService companyService;
66+
67+
@Autowired
68+
private FileService fileService;
69+
70+
@Autowired
71+
private DepartmentService departmentService;
5472

73+
@ModelAttribute("myDepartment")
74+
public Department getDepartment(){
75+
return this.departmentService.findById((long)1);
76+
}
5577

5678
@RequestMapping(value = "/setting.html", method = RequestMethod.GET)
5779
public String loadLeaveIndexPage(SettingPage settingPage, Model model) {
@@ -71,11 +93,28 @@ public String loadLeaveIndexPage(SettingPage settingPage, Model model) {
7193
//for(int i=0;i<leaveTypes.size();i++)
7294
//System.out.println(leaveTypes.get(i).getName());
7395

96+
CompanyInfoForm companyInfoForm = new CompanyInfoForm();
97+
Company company = this.companyService.findById((long) 1);
98+
companyInfoForm.setName(company.getName());
99+
companyInfoForm.setAvatarId(company.getLogoId());
100+
101+
Iterator<Department> departmentIterator = this.departmentService.findAll().iterator();
102+
List<Department> departments = new ArrayList<Department>();
103+
while (departmentIterator.hasNext())
104+
departments.add( departmentIterator.next());
105+
DepartmentInfoForm departmentInfoForm = new DepartmentInfoForm();
106+
if(null != departments && departments.size() != 0 ){
107+
departmentInfoForm.setDepartments(departments);
108+
//for(int i=0;i<departmentInfoForm.getDepartments().size();i++)
109+
//System.out.println(departmentInfoForm.getDepartments());
110+
}
111+
74112
settingPage.setWorkHoursForm(workHoursForm);
75113
settingPage.setApproverListView(approverListView);
76114
settingPage.setLeaveTypeRuleListView(new LeaveTypeRuleListView(this.leaveTypeRuleRepository.findAll()));
77115
settingPage.setLeaveTypeRuleForm(leaveTypeRuleForm);
78-
116+
settingPage.setCompanyInfoForm(companyInfoForm);
117+
settingPage.setDepartmentInfoForm(departmentInfoForm);
79118
return "/settings/index";
80119
}
81120

‎src/main/java/com/sapanywhere/app/model/setting/SettingPage.java

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.sapanywhere.app.model.setting;
22

3+
import com.sapanywhere.app.model.CompanyInfoForm;
4+
import com.sapanywhere.app.model.DepartmentInfoForm;
35
import com.sapanywhere.app.model.LeaveTypeRuleForm;
46

57
public class SettingPage {
@@ -11,17 +13,23 @@ public SettingPage() {
1113
public SettingPage(WorkHoursForm workHoursForm,
1214
ApproverListView approverListView,
1315
LeaveTypeRuleListView leaveTypeRuleListView,
14-
LeaveTypeRuleForm leaveTypeRuleForm) {
16+
LeaveTypeRuleForm leaveTypeRuleForm,
17+
CompanyInfoForm companyInfoForm,
18+
DepartmentInfoForm departmentInfoForm) {
1519
this.workHoursForm = workHoursForm;
1620
this.approverListView = approverListView;
1721
this.leaveTypeRuleListView = leaveTypeRuleListView;
1822
this.leaveTypeRuleForm = leaveTypeRuleForm;
23+
this.companyInfoForm = companyInfoForm;
24+
this.departmentInfoForm = departmentInfoForm;
1925
}
2026

2127
private WorkHoursForm workHoursForm;
2228
private ApproverListView approverListView;
2329
private LeaveTypeRuleListView leaveTypeRuleListView;
2430
private LeaveTypeRuleForm leaveTypeRuleForm;
31+
private CompanyInfoForm companyInfoForm;
32+
private DepartmentInfoForm departmentInfoForm;
2533

2634
public ApproverListView getApproverListView() {
2735
return approverListView;
@@ -56,4 +64,20 @@ public void setLeaveTypeRuleForm(LeaveTypeRuleForm leaveTypeRuleForm) {
5664
this.leaveTypeRuleForm = leaveTypeRuleForm;
5765
}
5866

67+
public DepartmentInfoForm getDepartmentInfoForm() {
68+
return departmentInfoForm;
69+
}
70+
71+
public void setDepartmentInfoForm(DepartmentInfoForm departmentInfoForm) {
72+
this.departmentInfoForm = departmentInfoForm;
73+
}
74+
75+
public CompanyInfoForm getCompanyInfoForm() {
76+
return companyInfoForm;
77+
}
78+
79+
public void setCompanyInfoForm(CompanyInfoForm companyInfoForm) {
80+
this.companyInfoForm = companyInfoForm;
81+
}
82+
5983
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<nav class="navbar navbar-default">
1414
<div class="container-fluid">
1515
<div class="navbar-header">
16-
<a class="navbar-brand" href="#" th:href="@{/companyinfo.html}" th:text="${companyInfo.name}"></a>
16+
<a class="navbar-brand" href="#">Leave System</a>
1717
</div>
1818

1919
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">

‎src/main/resources/templates/employee/edit.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<nav class="navbar navbar-default">
4545
<div class="container-fluid">
4646
<div class="navbar-header">
47-
<a class="navbar-brand" href="#" th:href="@{/companyinfo.html}" th:text="${companyInfo.name}"></a>
47+
<a class="navbar-brand" href="#">Leave System</a>
4848
</div>
4949

5050
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">

‎src/main/resources/templates/employee/information.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<nav class="navbar navbar-default">
3939
<div class="container-fluid">
4040
<div class="navbar-header">
41-
<a class="navbar-brand" href="#" th:href="@{/companyinfo.html}" th:text="${companyInfo.name}"></a>
41+
<a class="navbar-brand" href="#">Leave System</a>
4242
</div>
4343
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
4444
<ul class="nav navbar-nav">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<nav class="navbar navbar-default">
1212
<div class="container-fluid">
1313
<div class="navbar-header">
14-
<a class="navbar-brand" href="#" th:href="@{/companyinfo.html}" th:text="${companyInfo.name}"></a>
14+
<a class="navbar-brand" href="#">Leave System</a>
1515
</div>
1616

1717
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<nav class="navbar navbar-default">
1313
<div class="container-fluid">
1414
<div class="navbar-header">
15-
<a class="navbar-brand" href="#" th:href="@{/companyinfo.html}" th:text="${companyInfo.name}"></a>
15+
<a class="navbar-brand" href="#">Leave System</a>
1616
</div>
1717
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
1818
<ul class="nav navbar-nav">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<nav class="navbar navbar-default">
5151
<div class="container-fluid">
5252
<div class="navbar-header">
53-
<a class="navbar-brand" href="#" th:href="@{/companyinfo.html}" th:text="${companyInfo.name}"></a>
53+
<a class="navbar-brand" href="#">Leave System</a>
5454
</div>
5555

5656
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">

0 commit comments

Comments
 (0)