ITHD スケジューラ対応
会議室属性をチェックするように修正
@@ -12,6 +12,6 @@ | ||
12 | 12 | } |
13 | 13 | |
14 | 14 | private static final String version = "1"; |
15 | - private static final String revision = "12.4"; | |
15 | + private static final String revision = "12.5"; | |
16 | 16 | |
17 | 17 | } |
@@ -38,6 +38,7 @@ | ||
38 | 38 | d.addBeanPropertySetter("*/user_index/busho"); |
39 | 39 | d.addBeanPropertySetter("*/user_index/cAkubun"); |
40 | 40 | d.addBeanPropertySetter("*/user_index/cSite"); |
41 | + d.addBeanPropertySetter("*/user_index/isConferenceRoom"); | |
41 | 42 | |
42 | 43 | logger.info("====> " + fileName); |
43 | 44 |
@@ -44,7 +44,15 @@ | ||
44 | 44 | public void setCSite(String site) { |
45 | 45 | cSite = site; |
46 | 46 | } |
47 | + | |
48 | + public String getIsConferenceRoom() { | |
49 | + return isConferenceRoom; | |
50 | + } | |
47 | 51 | |
52 | + public void setIsConferenceRoom(String isConferenceRoom) { | |
53 | + this.isConferenceRoom = isConferenceRoom; | |
54 | + } | |
55 | + | |
48 | 56 | // for digester |
49 | 57 | public void setcAkubun(String akubun) { |
50 | 58 | cAkubun = akubun; |
@@ -57,8 +65,8 @@ | ||
57 | 65 | public void set_ithd_scheduler_user_index(IthdSchedulerUserIndex isui){ |
58 | 66 | this.add(isui); |
59 | 67 | } |
68 | + | |
60 | 69 | |
61 | - | |
62 | 70 | // |
63 | 71 | private String user_name; |
64 | 72 | private String user_id; |
@@ -66,5 +74,6 @@ | ||
66 | 74 | private String busho; |
67 | 75 | private String cAkubun; |
68 | 76 | private String cSite; |
77 | + private String isConferenceRoom; | |
69 | 78 | |
70 | 79 | } |
@@ -102,12 +102,18 @@ | ||
102 | 102 | |
103 | 103 | // isuiからユーザ情報を作成する |
104 | 104 | UserInfo mySelfUserInfo = new UserInfo(isui.getUser_id(), isui.getUser_name(), false, true, true); |
105 | - mySelfUserInfo.setIthsSchedulerUser(true); | |
105 | + mySelfUserInfo.setIthdSchedulerUser(true); | |
106 | 106 | mySelfUserInfo.setIthdUserid(isui.getUser_id()); |
107 | 107 | mySelfUserInfo.setIthdCompany(isui.getCompany()); |
108 | 108 | mySelfUserInfo.setIthdBusho(isui.getBusho()); |
109 | 109 | mySelfUserInfo.setIthdCAkubun(isui.getCAkubun()); |
110 | 110 | mySelfUserInfo.setIthdCSite(isui.getCSite()); |
111 | + | |
112 | + // 20100829 mn 3 add 会議室へのスケジュール追加対応 | |
113 | + if (isui.getIsConferenceRoom() != null && isui.getIsConferenceRoom().equals("true")){ | |
114 | + mySelfUserInfo.setConferenceRoom(true); | |
115 | + mySelfUserInfo.setEditMode(true); | |
116 | + } | |
111 | 117 | |
112 | 118 | currentUserInfo.add(mySelfUserInfo); |
113 | 119 |
@@ -14,6 +14,7 @@ | ||
14 | 14 | this.editMode = false; |
15 | 15 | |
16 | 16 | this.hasScheduleData = false; |
17 | + this.isConferenceRoom = false; | |
17 | 18 | } |
18 | 19 | |
19 | 20 | /** |
@@ -30,6 +31,7 @@ | ||
30 | 31 | this.setEditMode(editEnable); |
31 | 32 | this.setImportMode(importAble); |
32 | 33 | this.setHasScheduleData(hasScheduleData); |
34 | + this.setConferenceRoom(false); | |
33 | 35 | } |
34 | 36 | |
35 | 37 | public String getUserId() { |
@@ -104,12 +106,12 @@ | ||
104 | 106 | this.notesRoom = notesRoom; |
105 | 107 | } |
106 | 108 | |
107 | - public boolean isIthsSchedulerUser() { | |
108 | - return ithsSchedulerUser; | |
109 | + public boolean isIthdSchedulerUser() { | |
110 | + return ithdSchedulerUser; | |
109 | 111 | } |
110 | 112 | |
111 | - public void setIthsSchedulerUser(boolean ithsSchedulerUser) { | |
112 | - this.ithsSchedulerUser = ithsSchedulerUser; | |
113 | + public void setIthdSchedulerUser(boolean ithsSchedulerUser) { | |
114 | + this.ithdSchedulerUser = ithsSchedulerUser; | |
113 | 115 | } |
114 | 116 | |
115 | 117 | public String getIthdUserid() { |
@@ -151,7 +153,15 @@ | ||
151 | 153 | public void setIthdCSite(String site) { |
152 | 154 | ithdCSite = site; |
153 | 155 | } |
156 | + | |
157 | + public boolean isConferenceRoom() { | |
158 | + return isConferenceRoom; | |
159 | + } | |
154 | 160 | |
161 | + public void setConferenceRoom(boolean isConferenceRoom) { | |
162 | + this.isConferenceRoom = isConferenceRoom; | |
163 | + } | |
164 | + | |
155 | 165 | /** |
156 | 166 | * ユーザIDを比較する |
157 | 167 | */ |
@@ -265,7 +275,7 @@ | ||
265 | 275 | private boolean notesRoom; |
266 | 276 | |
267 | 277 | // 20100807 mn 6 add |
268 | - private boolean ithsSchedulerUser; | |
278 | + private boolean ithdSchedulerUser; | |
269 | 279 | private String ithdUserid; |
270 | 280 | private String ithdCompany; |
271 | 281 | private String ithdBusho; |
@@ -275,6 +285,7 @@ | ||
275 | 285 | |
276 | 286 | // |
277 | 287 | private boolean hasScheduleData; |
288 | + private boolean isConferenceRoom; | |
278 | 289 | |
279 | 290 | |
280 | 291 | } |
@@ -249,7 +249,9 @@ | ||
249 | 249 | UserInfo userInfo = i.next(); |
250 | 250 | |
251 | 251 | // ユーザが選択されている場合だけ、追加を許可する |
252 | - if (isThereInUserInfoList(userInfo)){ | |
252 | + // 20100829 mn 1 mod | |
253 | + // 会議室属性がtrueの場合だけ、追加を許可する | |
254 | + if (isThereInUserInfoList(userInfo) && userInfo.isConferenceRoom()){ | |
253 | 255 | |
254 | 256 | // 前回選択があれば、それをコピーする |
255 | 257 | if (selectedScheduleData2 != null && selectedUserInfo2 != null){ |
@@ -164,7 +164,7 @@ | ||
164 | 164 | // ユーザ情報がITHDスケジューラか? |
165 | 165 | String result = ""; |
166 | 166 | |
167 | - if (userInfo.isIthsSchedulerUser()){ | |
167 | + if (userInfo.isIthdSchedulerUser()){ | |
168 | 168 | result = |
169 | 169 | urlName + |
170 | 170 | userInfo.getIthdCompany() + "," + |
@@ -49,7 +49,7 @@ | ||
49 | 49 | }else if (userInfo.isNotesRoom()){ |
50 | 50 | userKind = JScheduleDataKind.NOTES; |
51 | 51 | // 20100811 mn 2 add |
52 | - }else if (userInfo.isIthsSchedulerUser()){ | |
52 | + }else if (userInfo.isIthdSchedulerUser()){ | |
53 | 53 | userKind = JScheduleDataKind.ITHD; |
54 | 54 | }else { |
55 | 55 | userKind = JScheduleDataKind.JSM; |