From 0534bc75d42e214a2cd0db1246ad8d07ae80d91a Mon Sep 17 00:00:00 2001 From: it232115 Date: Tue, 9 Jul 2024 19:44:12 +0900 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E6=9E=97=E6=9C=80=E7=B5=82=E6=8F=90?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/example/oplogy/CreateSchedule.java | 4 +++- app/src/main/java/com/example/oplogy/FirestoreReception.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/example/oplogy/CreateSchedule.java b/app/src/main/java/com/example/oplogy/CreateSchedule.java index 697671b..627609e 100644 --- a/app/src/main/java/com/example/oplogy/CreateSchedule.java +++ b/app/src/main/java/com/example/oplogy/CreateSchedule.java @@ -55,6 +55,7 @@ public class CreateSchedule { String secondDay = sharedPreferences.getString("day2", null); String thirdDay = sharedPreferences.getString("day3", null); + Log.d("createSchedule","day1"+firstDay+"day2"+secondDay+"thirdday"+thirdDay); homeVisitDaysString = new String[]{firstDay, secondDay, thirdDay}; } @@ -359,8 +360,9 @@ public class CreateSchedule { //保護者の希望時間の開始と終了の間にまだ保護者の割り当てがされていないスケジュールの空き時間があるかの判定 if (intervalArrayInt[x][j][0] >= Integer.parseInt(myDataList.get(i).getParentStartTimeString()) && intervalArrayInt[x][j + 1][0] <= Integer.parseInt(myDataList.get(i).getParentEndTimeString()) && intervalArrayInt[x][j][1] == 0) { intervalArrayInt[x][j][1] += 1;//その時間が割り当て済みでありこと - myDataList.get(i).setSchedule(Integer.parseInt(desiredDateString.substring(4, 8) + intervalArrayInt[x][j][0]));//スケジュールをmyDataListに入れる(例:6041240(6月4日12時40分)) myDataList.get(i).setScheduleDay(homeVisitDaysString[x]); + Log.d("CreateSchedule","getScheduleDay"+myDataList.get(i).getScheduleDay()); + myDataList.get(i).setSchedule(Integer.parseInt(desiredDateString.substring(4, 8) + intervalArrayInt[x][j][0]));//スケジュールをmyDataListに入れる(例:6041240(6月4日12時40分)) } } diff --git a/app/src/main/java/com/example/oplogy/FirestoreReception.java b/app/src/main/java/com/example/oplogy/FirestoreReception.java index 612f6c6..aa0cf68 100644 --- a/app/src/main/java/com/example/oplogy/FirestoreReception.java +++ b/app/src/main/java/com/example/oplogy/FirestoreReception.java @@ -28,7 +28,7 @@ public class FirestoreReception { //ClassIdを引数にデータの作成を行う public void getDocumentsByClassId(int classId) { myDataList.clear(); - CollectionReference collectionRef = db.collection("QuestionnaireForms"); + CollectionReference collectionRef = db.collection("testAddressArray"); // classIdが引数のものを取得する collectionRef.whereEqualTo("classId", classId).get() -- 2.45.1