Ns1-j/oplogy
5
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

api #48

Merged
Utahshi merged 2 commits from api into master 2024-07-09 10:45:07 +00:00
Conversation 0 Commits 2 Files Changed 2 +4 -2
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0534bc75d4 - Show all commits

4
app/src/main/java/com/example/oplogy/CreateSchedule.java
View File

@ -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分))
}
}

2
app/src/main/java/com/example/oplogy/FirestoreReception.java
View File

@ -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()