Skip to content

Commit fd578a2

Browse files
windybirthwindybirth
committed
complete new stuff skill add function
1 parent ec59ee3 commit fd578a2

File tree

4 files changed

+67
-74
lines changed

4 files changed

+67
-74
lines changed

‎skill/src/main/resources/templates/new.html‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ <h2 class="col-sm-offset-4 col-sm-8">スキル情報新規</h2>
7373
</div>
7474
</div>
7575
</div>
76+
<!-- select area -->
7677
<div class="selectList">
7778
<div class="form-group" th:each="row,rowStat : ${skillSelectInfo.lsSkill}">
7879
<label for="inputName" class="col-sm-4 control-label">スキル</label>
@@ -102,6 +103,12 @@ <h2 class="col-sm-offset-4 col-sm-8">スキル情報新規</h2>
102103
</select>
103104
</div>
104105
</div>
106+
<div class="form-group">
107+
<label id="addSelector" class="btn btn-primary col-sm-offset-4">
108+
<span class="glyphicon glyphicon-plus"></span> 検索条件追加
109+
</label>
110+
</div>
111+
105112
<div class="form-group">
106113
<div class="col-sm-offset-4 col-sm-4">
107114
<button type="submit" class="btn btn-success">新規</button>
@@ -113,7 +120,38 @@ <h2 class="col-sm-offset-4 col-sm-8">スキル情報新規</h2>
113120
<div th:include="include :: footer"></div>
114121

115122
<script type="text/javascript">
123+
$(document).ready(function() {
124+
// add row
125+
$("#addSelector").on("click",function(){
116126

127+
$.ajax({
128+
type : "POST",
129+
url : "/search_addSelect",
130+
data: {
131+
"index": $("select.dynamic-select").length
132+
},
133+
dataType : 'html',
134+
cache: false,
135+
timeout : 10000,
136+
success : function(data) {
137+
console.log();
138+
var select = $('.selectList:last');
139+
console.log("SUCCESS: ", data);
140+
141+
select.after(data);
142+
$('.selectpicker').selectpicker('render');
143+
},
144+
error : function(e) {
145+
console.log("ERROR: ", e);
146+
alert('サーバーとの通信で問題が発生しました。 後でもう一度お試しください。');
147+
},
148+
done : function(e) {
149+
console.log("DONE");
150+
}
151+
});
152+
153+
});
154+
});
117155
</script>
118156
</body>
119157
</html>

‎skill/src/main/resources/templates/search.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ <h2 class="col-sm-offset-4 col-sm-8">スキル情報検索</h2>
5555
</div>
5656
</div>
5757
<div class="form-group">
58-
<label id="addCondition" class="btn btn-primary col-sm-offset-4">
58+
<label id="addSelector" class="btn btn-primary col-sm-offset-4">
5959
<span class="glyphicon glyphicon-plus"></span> 検索条件追加
6060
</label>
6161
</div>
@@ -72,7 +72,7 @@ <h2 class="col-sm-offset-4 col-sm-8">スキル情報検索</h2>
7272
<script type="text/javascript">
7373
$(document).ready(function() {
7474
// add row
75-
$("#addCondition").on("click",function(){
75+
$("#addSelector").on("click",function(){
7676

7777
// $.ajax({
7878
// type : "POST",

‎skill_db/src/main/java/jp/wicresoft/domain/StuffSkill.java‎

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package jp.wicresoft.domain;
22

3-
import javax.persistence.Entity;
4-
import javax.persistence.Id;
5-
import javax.persistence.IdClass;
3+
import java.io.Serializable;
64

5+
import javax.persistence.Embeddable;
6+
import javax.persistence.EmbeddedId;
7+
import javax.persistence.Entity;
78
import lombok.AllArgsConstructor;
89
import lombok.Data;
910
import lombok.NoArgsConstructor;
@@ -12,20 +13,30 @@
1213
@NoArgsConstructor
1314
@AllArgsConstructor
1415
@Entity
15-
@IdClass(StuffSkill.StuffId.class)
16+
//@IdClass(StuffSkill.StuffId.class)
1617
public class StuffSkill {
1718

18-
@Id
19-
int stuffId;
20-
21-
@Id
22-
int skillId;
19+
@EmbeddedId
20+
private PkMapping pk;
2321

24-
static class StuffId {
25-
26-
int stuffId;
27-
28-
int skillId;
29-
22+
public StuffSkill(int stuffId, int skillId) {
23+
this.pk = new PkMapping(stuffId, skillId);
3024
}
3125
}
26+
27+
@Embeddable
28+
@Data
29+
@AllArgsConstructor
30+
@NoArgsConstructor
31+
class PkMapping implements Serializable{
32+
33+
/**
34+
*
35+
*/
36+
private static final long serialVersionUID = -523753799587581317L;
37+
38+
private int stuffId;
39+
40+
private int skillId;
41+
42+
}

‎sql/skill_db.sql‎

Lines changed: 1 addition & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -75,21 +75,6 @@ CREATE TABLE `stuff_db` (
7575
) ENGINE=MyISAM;
7676

7777

78-
-- Dumping structure for テーブル skill.stuff_db_back
79-
DROP TABLE IF EXISTS `stuff_db_back`;
80-
CREATE TABLE IF NOT EXISTS `stuff_db_back` (
81-
`id` int(11) NOT NULL AUTO_INCREMENT,
82-
`stuff_id` int(11) NOT NULL COMMENT '社員ナンバー',
83-
`db_name` varchar(50) NOT NULL COMMENT 'DB名称',
84-
`note` varchar(50) NOT NULL COMMENT '備考',
85-
PRIMARY KEY (`id`),
86-
KEY `stuff_id` (`stuff_id`),
87-
CONSTRAINT `STUFF_DB_STUFF_ID_FK` FOREIGN KEY (`stuff_id`) REFERENCES `stuff_meta` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
88-
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
89-
90-
-- エクスポートするデータが選択されていません
91-
92-
9378
-- Dumping structure for ビュー skill.stuff_develop_language
9479
DROP VIEW IF EXISTS `stuff_develop_language`;
9580
-- Creating temporary table to overcome VIEW dependency errors
@@ -100,20 +85,6 @@ CREATE TABLE `stuff_develop_language` (
10085
) ENGINE=MyISAM;
10186

10287

103-
-- Dumping structure for テーブル skill.stuff_develop_language_back
104-
DROP TABLE IF EXISTS `stuff_develop_language_back`;
105-
CREATE TABLE IF NOT EXISTS `stuff_develop_language_back` (
106-
`id` int(11) NOT NULL AUTO_INCREMENT,
107-
`stuff_id` int(11) NOT NULL COMMENT '社員ナンバー',
108-
`develop_language_name` varchar(50) NOT NULL COMMENT '言語名称',
109-
PRIMARY KEY (`id`),
110-
KEY `stuff_id` (`stuff_id`),
111-
CONSTRAINT `STUFF_DEVELOP_LANGUAGE_STUFF_ID_FK` FOREIGN KEY (`stuff_id`) REFERENCES `stuff_meta` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
112-
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
113-
114-
-- エクスポートするデータが選択されていません
115-
116-
11788
-- Dumping structure for ビュー skill.stuff_license
11889
DROP VIEW IF EXISTS `stuff_license`;
11990
-- Creating temporary table to overcome VIEW dependency errors
@@ -124,20 +95,6 @@ CREATE TABLE `stuff_license` (
12495
) ENGINE=MyISAM;
12596

12697

127-
-- Dumping structure for テーブル skill.stuff_license_back
128-
DROP TABLE IF EXISTS `stuff_license_back`;
129-
CREATE TABLE IF NOT EXISTS `stuff_license_back` (
130-
`id` int(11) NOT NULL AUTO_INCREMENT,
131-
`stuff_id` int(11) NOT NULL COMMENT '社員ナンバー',
132-
`license_name` varchar(50) NOT NULL COMMENT '資格名称',
133-
PRIMARY KEY (`id`),
134-
KEY `stuff_id` (`stuff_id`),
135-
CONSTRAINT `STUFF_LICENSE_STUFF_ID_FK` FOREIGN KEY (`stuff_id`) REFERENCES `stuff_meta` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
136-
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
137-
138-
-- エクスポートするデータが選択されていません
139-
140-
14198
-- Dumping structure for テーブル skill.stuff_meta
14299
DROP TABLE IF EXISTS `stuff_meta`;
143100
CREATE TABLE IF NOT EXISTS `stuff_meta` (
@@ -165,25 +122,12 @@ CREATE TABLE `stuff_os` (
165122
) ENGINE=MyISAM;
166123

167124

168-
-- Dumping structure for テーブル skill.stuff_os_back
169-
DROP TABLE IF EXISTS `stuff_os_back`;
170-
CREATE TABLE IF NOT EXISTS `stuff_os_back` (
171-
`id` int(11) NOT NULL AUTO_INCREMENT,
172-
`stuff_id` int(11) NOT NULL COMMENT '社員ナンバー',
173-
`os_name` varchar(50) NOT NULL COMMENT '環境(OS)名称',
174-
PRIMARY KEY (`id`),
175-
KEY `stuff_id` (`stuff_id`),
176-
CONSTRAINT `STUFF_OS_STUFF_ID_FK` FOREIGN KEY (`stuff_id`) REFERENCES `stuff_meta` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
177-
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
178-
179-
-- エクスポートするデータが選択されていません
180-
181-
182125
-- Dumping structure for テーブル skill.stuff_skill
183126
DROP TABLE IF EXISTS `stuff_skill`;
184127
CREATE TABLE IF NOT EXISTS `stuff_skill` (
185128
`stuff_id` int(11) NOT NULL,
186129
`skill_id` int(11) NOT NULL,
130+
PRIMARY KEY (`stuff_id`,`skill_id`),
187131
KEY `STUFF_SKILL_STUFF_ID_FK1` (`stuff_id`),
188132
KEY `STUFF_SKILL_SKILL_ID_FK1` (`skill_id`),
189133
CONSTRAINT `STUFF_SKILL_SKILL_ID_FK1` FOREIGN KEY (`skill_id`) REFERENCES `skill_version_mst` (`skill_id`),

0 commit comments

Comments
 (0)