diff --git a/.idea/gradle.xml b/.idea/gradle.xml index a2d7c21..ae388c2 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -7,6 +7,7 @@ + diff --git a/.idea/misc.xml b/.idea/misc.xml index 773fe0f..8978d23 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/java/com/example/oplogy/FirestoreReception.java b/app/src/main/java/com/example/oplogy/FirestoreReception.java index f8a71aa..a270c94 100644 --- a/app/src/main/java/com/example/oplogy/FirestoreReception.java +++ b/app/src/main/java/com/example/oplogy/FirestoreReception.java @@ -4,11 +4,15 @@ import android.util.Log; import com.google.android.gms.tasks.OnCompleteListener; import com.google.android.gms.tasks.Task; +import com.google.firebase.Timestamp; import com.google.firebase.firestore.CollectionReference; import com.google.firebase.firestore.FirebaseFirestore; import com.google.firebase.firestore.QueryDocumentSnapshot; import com.google.firebase.firestore.QuerySnapshot; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; import java.util.Map; public class FirestoreReception { @@ -19,6 +23,9 @@ public class FirestoreReception { db = FirebaseFirestore.getInstance(); } + //firestoreから受け取ったデータを束ねるためのマップ + public ListmyDataList = new ArrayList<>(); + //ClassIdを引数にデータの作成を行う public void getDocumentsByClassId(int classId, MainActivity context) { CollectionReference collectionRef = db.collection("QuestionnaireForms"); @@ -33,14 +40,33 @@ public class FirestoreReception { for (QueryDocumentSnapshot document : task.getResult()) { Map data = document.getData(); - // CreateRootクラスのインスタンスを作成し、dataを引数として渡す - GeoCoder geoCoder = new GeoCoder(); - geoCoder.processData(data, context); + //CreateRootクラスのインスタンスを生成、dataを渡す +// GeoCoder geoCoder = new GeoCoder(); +// geoCoder.processData(data, context); + + // ドキュメントのデータをMyDataClassのインスタンスにマッピング + MyDataClass myData = new MyDataClass( + (String) data.get("patronName"), + ((Long) data.get("classId")).intValue(), + (List) data.get("address"), + (List) data.get("firstDay"), + ((Long) data.get("studentNumber")).intValue(), + (String) data.get("childName"), + (List) data.get("thirdDay"), + (List) data.get("secondDay") + ); + //リストに追加 + myDataList.add(myData); + } + //取得したデータをログ表示 + for(MyDataClass data :myDataList){ + Log.i("FirestoreReceptiond", "data: " + data.toString()); } } else { - Log.w("FirestoreReception", "Error getting documents.", task.getException()); + Log.w("FirestoreReceptiond", "Error getting documents.", task.getException()); } } }); + } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/example/oplogy/MyDataClass.java b/app/src/main/java/com/example/oplogy/MyDataClass.java new file mode 100644 index 0000000..3080d0f --- /dev/null +++ b/app/src/main/java/com/example/oplogy/MyDataClass.java @@ -0,0 +1,42 @@ +package com.example.oplogy; + +import com.google.firebase.Timestamp; + +import java.util.List; + +public class MyDataClass { + String patronName; + int classId; + List address; + List firstDay; + int studentNumber; + String childName; + List thirdDay; + List secondDay; + double latitude; + + public MyDataClass(String patronName, int classId, List address, List firstDay, int studentNumber, String childName, List thirdDay, List secondDay) { + this.patronName = patronName; + this.classId = classId; + this.address = address; + this.firstDay = firstDay; + this.studentNumber = studentNumber; + this.childName = childName; + this.thirdDay = thirdDay; + this.secondDay = secondDay; + } + + @Override + public String toString() { + return "MyDataClass{" + + "patronName='" + patronName + '\'' + + ", classId=" + classId + + ", address=" + address + + ", firstDay=" + firstDay + + ", studentNumber=" + studentNumber + + ", childName='" + childName + '\'' + + ", thirdDay=" + thirdDay + + ", secondDay=" + secondDay + + '}'; + } +} diff --git a/app/src/main/java/com/example/oplogy/SetupActivity.java b/app/src/main/java/com/example/oplogy/SetUpActivity.java similarity index 100% rename from app/src/main/java/com/example/oplogy/SetupActivity.java rename to app/src/main/java/com/example/oplogy/SetUpActivity.java