• R/O
  • SSH
  • HTTPS

mscheduler: Commit


Commit MetaInfo

Revision118 (tree)
Time2010-08-28 16:41:33
Authorminorun

Log Message

ITHD スケジューラ対応
会議室属性をチェックするように修正

Change Summary

Incremental Difference

--- mScheduler/src/versionInfo/VersionInfoData.java (revision 117)
+++ mScheduler/src/versionInfo/VersionInfoData.java (revision 118)
@@ -12,6 +12,6 @@
1212 }
1313
1414 private static final String version = "1";
15- private static final String revision = "12.4";
15+ private static final String revision = "12.5";
1616
1717 }
--- mScheduler/src/ithdSchedulerUserInfo/IthdSchedulerUserIndexesDigesterCtl.java (revision 117)
+++ mScheduler/src/ithdSchedulerUserInfo/IthdSchedulerUserIndexesDigesterCtl.java (revision 118)
@@ -38,6 +38,7 @@
3838 d.addBeanPropertySetter("*/user_index/busho");
3939 d.addBeanPropertySetter("*/user_index/cAkubun");
4040 d.addBeanPropertySetter("*/user_index/cSite");
41+ d.addBeanPropertySetter("*/user_index/isConferenceRoom");
4142
4243 logger.info("====> " + fileName);
4344
--- mScheduler/src/ithdSchedulerUserInfo/IthdSchedulerUserIndex.java (revision 117)
+++ mScheduler/src/ithdSchedulerUserInfo/IthdSchedulerUserIndex.java (revision 118)
@@ -44,7 +44,15 @@
4444 public void setCSite(String site) {
4545 cSite = site;
4646 }
47+
48+ public String getIsConferenceRoom() {
49+ return isConferenceRoom;
50+ }
4751
52+ public void setIsConferenceRoom(String isConferenceRoom) {
53+ this.isConferenceRoom = isConferenceRoom;
54+ }
55+
4856 // for digester
4957 public void setcAkubun(String akubun) {
5058 cAkubun = akubun;
@@ -57,8 +65,8 @@
5765 public void set_ithd_scheduler_user_index(IthdSchedulerUserIndex isui){
5866 this.add(isui);
5967 }
68+
6069
61-
6270 //
6371 private String user_name;
6472 private String user_id;
@@ -66,5 +74,6 @@
6674 private String busho;
6775 private String cAkubun;
6876 private String cSite;
77+ private String isConferenceRoom;
6978
7079 }
--- mScheduler/src/ithdSchedulerUserInfo/IthdSchedulerUserIndexCreator.java (revision 117)
+++ mScheduler/src/ithdSchedulerUserInfo/IthdSchedulerUserIndexCreator.java (revision 118)
@@ -102,12 +102,18 @@
102102
103103 // isuiからユーザ情報を作成する
104104 UserInfo mySelfUserInfo = new UserInfo(isui.getUser_id(), isui.getUser_name(), false, true, true);
105- mySelfUserInfo.setIthsSchedulerUser(true);
105+ mySelfUserInfo.setIthdSchedulerUser(true);
106106 mySelfUserInfo.setIthdUserid(isui.getUser_id());
107107 mySelfUserInfo.setIthdCompany(isui.getCompany());
108108 mySelfUserInfo.setIthdBusho(isui.getBusho());
109109 mySelfUserInfo.setIthdCAkubun(isui.getCAkubun());
110110 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+ }
111117
112118 currentUserInfo.add(mySelfUserInfo);
113119
--- mScheduler/src/commonData/UserInfo.java (revision 117)
+++ mScheduler/src/commonData/UserInfo.java (revision 118)
@@ -14,6 +14,7 @@
1414 this.editMode = false;
1515
1616 this.hasScheduleData = false;
17+ this.isConferenceRoom = false;
1718 }
1819
1920 /**
@@ -30,6 +31,7 @@
3031 this.setEditMode(editEnable);
3132 this.setImportMode(importAble);
3233 this.setHasScheduleData(hasScheduleData);
34+ this.setConferenceRoom(false);
3335 }
3436
3537 public String getUserId() {
@@ -104,12 +106,12 @@
104106 this.notesRoom = notesRoom;
105107 }
106108
107- public boolean isIthsSchedulerUser() {
108- return ithsSchedulerUser;
109+ public boolean isIthdSchedulerUser() {
110+ return ithdSchedulerUser;
109111 }
110112
111- public void setIthsSchedulerUser(boolean ithsSchedulerUser) {
112- this.ithsSchedulerUser = ithsSchedulerUser;
113+ public void setIthdSchedulerUser(boolean ithsSchedulerUser) {
114+ this.ithdSchedulerUser = ithsSchedulerUser;
113115 }
114116
115117 public String getIthdUserid() {
@@ -151,7 +153,15 @@
151153 public void setIthdCSite(String site) {
152154 ithdCSite = site;
153155 }
156+
157+ public boolean isConferenceRoom() {
158+ return isConferenceRoom;
159+ }
154160
161+ public void setConferenceRoom(boolean isConferenceRoom) {
162+ this.isConferenceRoom = isConferenceRoom;
163+ }
164+
155165 /**
156166 * ユーザIDを比較する
157167 */
@@ -265,7 +275,7 @@
265275 private boolean notesRoom;
266276
267277 // 20100807 mn 6 add
268- private boolean ithsSchedulerUser;
278+ private boolean ithdSchedulerUser;
269279 private String ithdUserid;
270280 private String ithdCompany;
271281 private String ithdBusho;
@@ -275,6 +285,7 @@
275285
276286 //
277287 private boolean hasScheduleData;
288+ private boolean isConferenceRoom;
278289
279290
280291 }
--- mScheduler/src/mScheduler/MSchedulerFrameImp.java (revision 117)
+++ mScheduler/src/mScheduler/MSchedulerFrameImp.java (revision 118)
@@ -249,7 +249,9 @@
249249 UserInfo userInfo = i.next();
250250
251251 // ユーザが選択されている場合だけ、追加を許可する
252- if (isThereInUserInfoList(userInfo)){
252+ // 20100829 mn 1 mod
253+ // 会議室属性がtrueの場合だけ、追加を許可する
254+ if (isThereInUserInfoList(userInfo) && userInfo.isConferenceRoom()){
253255
254256 // 前回選択があれば、それをコピーする
255257 if (selectedScheduleData2 != null && selectedUserInfo2 != null){
--- mScheduler/src/ithdSession/IthdMonthSchedule.java (revision 117)
+++ mScheduler/src/ithdSession/IthdMonthSchedule.java (revision 118)
@@ -164,7 +164,7 @@
164164 // ユーザ情報がITHDスケジューラか?
165165 String result = "";
166166
167- if (userInfo.isIthsSchedulerUser()){
167+ if (userInfo.isIthdSchedulerUser()){
168168 result =
169169 urlName +
170170 userInfo.getIthdCompany() + "," +
--- mScheduler/src/jScheduleData/AllUserJScheduleData.java (revision 117)
+++ mScheduler/src/jScheduleData/AllUserJScheduleData.java (revision 118)
@@ -49,7 +49,7 @@
4949 }else if (userInfo.isNotesRoom()){
5050 userKind = JScheduleDataKind.NOTES;
5151 // 20100811 mn 2 add
52- }else if (userInfo.isIthsSchedulerUser()){
52+ }else if (userInfo.isIthdSchedulerUser()){
5353 userKind = JScheduleDataKind.ITHD;
5454 }else {
5555 userKind = JScheduleDataKind.JSM;
Show on old repository browser