OSDN > Find Software > Office/Business > Scheduling > mScheduler > SCM > SVN > Commit

mScheduler
Fork

mscheduler: Commit

ITHD　スケジューラ対応
仮の予定を登録対象から除外

--- mScheduler/src/mScheduler/GoogleCalendarSyncProcessCtl.java (revision 118)

+++ mScheduler/src/mScheduler/GoogleCalendarSyncProcessCtl.java (revision 119)

		@@ -57,6 +57,11 @@
57	57	System.out.printf("add start ... ");
58	58	for (Iterator<ScheduleData> m=this.jScheduleData.getScheduleListAfterDateInfo(nowDate).iterator(); m.hasNext();){
59	59	ScheduleData addSd = m.next();
	60	+
	61	+ // 20100829 mn 3 add
	62	+ if (addSd.isUnFixed()){
	63	+ continue;
	64	+ }
60	65
61	66	boolean notFound = true;
62	67	for (Iterator<ScheduleData> n=this.googleCalendarScheduleData.getDayScheduleList(addSd.getS_date().getYyyy(), addSd.getS_date().getMm(), addSd.getS_date().getDd()).iterator(); n.hasNext();){

--- mScheduler/src/mScheduler/IthdSchedulerSyncProcessCtl.java (revision 118)

+++ mScheduler/src/mScheduler/IthdSchedulerSyncProcessCtl.java (revision 119)

		@@ -63,6 +63,11 @@
63	63
64	64	//System.out.println("addsd :"+addSd.createScheduleDataKey());
65	65
	66	+ // 20100829 mn 3 add
	67	+ if (addSd.isUnFixed()){
	68	+ continue;
	69	+ }
	70	+
66	71	boolean notFound = true;
67	72	for (Iterator<ScheduleData> n=this.jsdis.getDayScheduleList(addSd.getS_date().getYyyy(), addSd.getS_date().getMm(), addSd.getS_date().getDd()).iterator(); n.hasNext();){
68	73	ScheduleData sd = n.next();