From 500f24f4f5eb246d984c67d8306931672b0b0d6f Mon Sep 17 00:00:00 2001
From: Ekamo-11 <148836598+Ekamo-11@users.noreply.github.com>
Date: Wed, 3 Jul 2024 16:18:04 +0900
Subject: [PATCH 01/17] =?UTF-8?q?String=E3=81=AE=E3=83=AA=E3=82=BD?=
 =?UTF-8?q?=E3=83=BC=E3=82=B9=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=81=AB?=
 =?UTF-8?q?DatePicker=E3=81=AE=E8=A1=A8=E7=A4=BA=E5=BD=A2=E5=BC=8F?=
 =?UTF-8?q?=E3=82=92=E6=97=A5=E6=9C=AC=E8=AA=9E=E3=81=AB=E3=81=99=E3=82=8B?=
 =?UTF-8?q?=E3=81=9F=E3=82=81=E3=81=AE=E3=83=AA=E3=82=BD=E3=83=BC=E3=82=B9?=
 =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/values/strings.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7d0fc4a..588fadf 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -16,4 +16,18 @@
     <string name="tenMinute">10分</string>
     <string name="fifteenMinute">15分</string>
     <string name="thirtyMinute">30分</string>
+    <string-array name="months_array">
+        <item>1月</item>
+        <item>2月</item>
+        <item>3月</item>
+        <item>4月</item>
+        <item>5月</item>
+        <item>6月</item>
+        <item>7月</item>
+        <item>8月</item>
+        <item>9月</item>
+        <item>10月</item>
+        <item>11月</item>
+        <item>12月</item>
+    </string-array>
 </resources>
\ No newline at end of file

From 0e40dea54c67047504643775d309b16e55df2e5f Mon Sep 17 00:00:00 2001
From: Ekamo-11 <148836598+Ekamo-11@users.noreply.github.com>
Date: Wed, 3 Jul 2024 16:35:33 +0900
Subject: [PATCH 02/17] =?UTF-8?q?setUpActivity=E3=81=AE=E6=8B=85=E4=BB=BB?=
 =?UTF-8?q?=E3=81=AE=E5=90=8D=E5=89=8D=E3=81=A8=E9=96=8B=E5=A7=8B=E5=9C=B0?=
 =?UTF-8?q?=E7=82=B9=E3=82=92=E6=97=A5=E6=9C=AC=E8=AA=9E=E3=82=AD=E3=83=BC?=
 =?UTF-8?q?=E3=83=9C=E3=83=BC=E3=83=89=E3=81=A7=E5=85=A5=E5=8A=9B=E3=81=99?=
 =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=BE=E3=81=97?=
 =?UTF-8?q?=E3=81=9F=E3=80=82=E5=A4=9A=E5=88=86=E7=AB=AF=E6=9C=AB=E3=81=94?=
 =?UTF-8?q?=E3=81=A8=E3=81=AE=E8=A8=AD=E5=AE=9A=E3=81=AA=E6=B0=97=E3=81=8C?=
 =?UTF-8?q?=E3=81=99=E3=82=8B=E3=81=91=E3=81=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/activity_set_up.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/activity_set_up.xml b/app/src/main/res/layout/activity_set_up.xml
index 84bc0c8..d693ab8 100644
--- a/app/src/main/res/layout/activity_set_up.xml
+++ b/app/src/main/res/layout/activity_set_up.xml
@@ -52,7 +52,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:autofillHints=""
-            android:inputType=""
+            android:inputType="text"
             tools:ignore="LabelFor" />
 
     </LinearLayout>
@@ -76,7 +76,7 @@
             android:layout_height="wrap_content"
             android:hint="@string/startpoint"
             android:autofillHints=""
-            android:inputType=""
+            android:inputType="text"
             tools:ignore="LabelFor" />
 
     </LinearLayout>

From 036352858fb53dbfe1bcdeb29e8a957a99b1eb47 Mon Sep 17 00:00:00 2001
From: Ekamo-11 <148836598+Ekamo-11@users.noreply.github.com>
Date: Wed, 3 Jul 2024 16:46:22 +0900
Subject: [PATCH 03/17] =?UTF-8?q?=E8=AD=A6=E5=91=8A=E3=82=92=E6=B6=88?=
 =?UTF-8?q?=E3=81=99=E3=81=9F=E3=82=81=E3=81=AB=E3=83=AA=E3=82=BD=E3=83=BC?=
 =?UTF-8?q?=E3=82=B9=E3=82=92=E8=BF=BD=E5=8A=A0=E3=81=97=E3=81=BE=E3=81=97?=
 =?UTF-8?q?=E3=81=9F=E3=80=81=E3=81=9D=E3=81=AE=E4=BB=96=E3=81=AE=E8=AD=A6?=
 =?UTF-8?q?=E5=91=8A=E3=82=82=E6=B6=88=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/activity_set_up.xml | 20 ++++++++++----------
 app/src/main/res/values/strings.xml         |  6 ++++++
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/app/src/main/res/layout/activity_set_up.xml b/app/src/main/res/layout/activity_set_up.xml
index d693ab8..966ccbc 100644
--- a/app/src/main/res/layout/activity_set_up.xml
+++ b/app/src/main/res/layout/activity_set_up.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -23,9 +22,10 @@
         android:id="@+id/toMain"
         android:layout_width="60dp"
         android:layout_height="60dp"
-        android:layout_gravity="left"
-        android:layout_marginLeft="10dp"
-        android:src="@drawable/back_button"/>
+        android:layout_gravity="start"
+        android:layout_marginStart="10dp"
+        android:src="@drawable/back_button"
+        android:contentDescription="@string/todo" />
 
 
     <TextView
@@ -91,7 +91,7 @@
         <TextView
             android:layout_width="90sp"
             android:layout_height="wrap_content"
-            android:text="日付設定"
+            android:text="@string/setUpDate"
             android:gravity="center"/>
 
 <!--        <TextView-->
@@ -109,7 +109,7 @@
             android:id="@+id/setFirstDayButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="1日目"
+            android:text="@string/firstDay"
             android:layout_marginStart="7sp"
             android:layout_marginEnd="7sp"
             tools:ignore="DuplicateIds" />
@@ -118,7 +118,7 @@
             android:id="@+id/setSecondDayButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="2日目"
+            android:text="@string/secondDay"
             android:layout_marginStart="7sp"
             android:layout_marginEnd="7sp"
             tools:ignore="DuplicateIds" />
@@ -127,7 +127,7 @@
             android:id="@+id/setThirdDayButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="3日目"
+            android:text="@string/threeDay"
             android:layout_marginStart="7sp"
             android:layout_marginEnd="7sp"
             tools:ignore="DuplicateIds" />
@@ -151,7 +151,7 @@
             android:id="@+id/startTime"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:hint="未設定"
+            android:hint="@string/notSetUp"
             android:textSize="20sp"
             android:textAlignment="center"
             android:autofillHints=""
@@ -186,7 +186,7 @@
             android:id="@+id/endTime"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:hint="未設定"
+            android:hint="@string/notSetUp"
             android:textSize="20sp"
             android:textAlignment="center"
             android:autofillHints=""
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 588fadf..639e09a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -16,6 +16,12 @@
     <string name="tenMinute">10分</string>
     <string name="fifteenMinute">15分</string>
     <string name="thirtyMinute">30分</string>
+    <string name="todo">TODO</string>
+    <string name="setUpDate">日付設定</string>
+    <string name="firstDay">1日目</string>
+    <string name="secondDay">2日目</string>
+    <string name="threeDay">3日目</string>
+    <string name="notSetUp">未設定</string>
     <string-array name="months_array">
         <item>1月</item>
         <item>2月</item>

From 1dac13279973aeeb9b1f9267a5eb974d404b9856 Mon Sep 17 00:00:00 2001
From: it232115 <it232115@trident.ac.jp>
Date: Fri, 5 Jul 2024 10:26:54 +0900
Subject: [PATCH 04/17] =?UTF-8?q?CreateRoot=E3=82=92Createschedule?=
 =?UTF-8?q?=E3=81=AB=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/gradle.xml                              |   2 +-
 app/src/main/AndroidManifest.xml              |   3 -
 .../com/example/oplogy/CreateSchedule.java    | 378 ++++++++++++++++++
 .../java/com/example/oplogy/MainActivity.java |   4 +-
 4 files changed, 381 insertions(+), 6 deletions(-)
 create mode 100644 app/src/main/java/com/example/oplogy/CreateSchedule.java

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 59b02ee..9f47dfb 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -6,7 +6,7 @@
       <GradleProjectSettings>
         <option name="testRunner" value="GRADLE" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="Embedded JDK" />
+        <option name="gradleJvm" value="jbr-17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index cf7d92a..353e652 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -46,9 +46,6 @@
         <activity
             android:name=".RootSearchActivity"
             android:exported="false" />
-        <activity
-            android:name=".CreateUUID"
-            android:exported="false" />
         <activity
             android:name=".DialogFragment"
             android:exported="false" />
diff --git a/app/src/main/java/com/example/oplogy/CreateSchedule.java b/app/src/main/java/com/example/oplogy/CreateSchedule.java
new file mode 100644
index 0000000..e730b51
--- /dev/null
+++ b/app/src/main/java/com/example/oplogy/CreateSchedule.java
@@ -0,0 +1,378 @@
+package com.example.oplogy;
+
+import android.content.Context;
+import android.location.Address;
+import android.location.Geocoder;
+import android.util.Log;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.room.Room;
+
+import com.google.android.gms.maps.model.LatLng;
+import com.google.firebase.Timestamp;
+
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+import java.util.TimeZone;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+//保護者の希望とSetUpActivityによって設定された情報をもとにスケジュールとルートを作成する
+public class CreateSchedule {
+    MyDataClass data;//Firestoreから受け取ったdataを入れる変数
+    String startTimeHomeVisitString;//家庭訪問の開始時間
+    String endTimeHomeVisitString;//家庭訪問の終了時間
+    String intervalTimeString;//家庭訪問の一家庭当たりの時間
+    String startBreakTimeString;//家庭訪問の休憩の開始時間
+    String endBreakTimeString;//家庭訪問の休憩の終了時間
+
+
+    int intervalInt;//家庭訪問の一家庭当たりの時間と移動時間の合計
+    int startBreakTimeMinutesInt;//家庭訪問の開始時間から休憩時間までの時間
+    int endBreakTimeMinutesInt;//家庭訪問の休憩終了時間から終了時間までの時間
+
+    private final AppDatabase db;
+    private int arraySizeInt;
+
+    boolean notSecondDuplicatesBoolean = true;//スケジュールの重複の有無(第一希望日のみで通った場合も考えて初期はtrue)
+
+    String[] testdata = {"20240604", "20240605", "20240606"};
+
+    public CreateSchedule(AppCompatActivity activity) {
+        this.db = Room.databaseBuilder(activity.getApplicationContext(), AppDatabase.class, "SetUpTable").build();
+    }
+
+    //MainActivityからデータを受け取る
+    public Boolean receiveData(List<MyDataClass> myDataList, Context context) {
+
+        //myDataListの要素data第一希望日と第二希望日に以下を追加する
+        //・保護者の希望時間帯の長さ
+        //・家庭訪問の日付
+        //・保護者の希望時間帯の開始と終了時間
+        setData(myDataList);
+        //希望時間帯の長さ順に並び替える前のログ
+        outPutLogSort(myDataList);
+        //保護者の希望時間帯が短い順にmyDataListのDataを並び替える
+        timeZoneSort(myDataList);
+        //希望時間帯の長さ順に並び替えたあとのログ
+        outPutLogSort(myDataList);
+
+
+        ExecutorService executor = Executors.newSingleThreadExecutor();
+        executor.execute(() -> {
+            //Roomから以下の情報を取得
+            //・家庭訪問全体の開始時間
+            //・家庭訪問全体の終了時間
+            //・一家庭あたりの家庭訪問の時間
+            //・家庭訪問の休憩開始時間
+            //・家庭訪問の休憩終了時間
+            getRoomData();
+
+            //Roomから取得した情報のログ
+            outPutLogRoomData();
+
+            //以下の情報を計算
+            //・家庭訪問の合計時間
+            //・家庭訪問の開始時間から休憩時間までの分数
+            //・家庭訪問の休憩終了時間から終了時間までの分数
+            timeCalculation(endTimeHomeVisitString, startBreakTimeString, endBreakTimeString);
+
+            //家庭訪問全体のスケジュールの開始時間を要素とした配列の作成(例:1200,1220,1240のように各家庭への到着時間となる区切り)とログ表示
+            int[][][] intervalArrayInt = homeVisitSchedule();
+            outPutLogIntervalArray(intervalArrayInt);
+
+            //スケジュール作成
+            boolean notDuplicatesBoolean = createSchedule(myDataList, intervalArrayInt);
+
+            //スケジュールの重複の確認
+            if (!notDuplicatesBoolean) {
+                //第二希望日で同じ処理を行う
+                Log.d("CreateSchedule", "第二希望");
+                secondSetData(myDataList);
+                secondTimeZoneSort(myDataList);
+                notSecondDuplicatesBoolean = secondCreateSchedule(myDataList, intervalArrayInt);
+            }
+        });
+        if (notSecondDuplicatesBoolean) {
+            sortSchedule(myDataList);
+            geocodeAddress(myDataList, context);
+            outPutLogSchedule(myDataList);
+            return notSecondDuplicatesBoolean;
+        }
+        Log.d("CreateSchedule", "重複によるエラー");
+        return !notSecondDuplicatesBoolean;
+    }
+
+
+    private void setData(List<MyDataClass> myDataList) {
+        for (int i = 0; i < myDataList.size(); i++) {
+            // 希望時間帯の終了時刻から開始時刻を引いて希望時間帯の長さ(timezone)に入れる
+            data = myDataList.get(i);
+            //保護者の第一希望日
+            List<Timestamp> firstDayList = data.getFirstDay();
+
+            //保護者の第一希望日の開始時間
+            Timestamp parentStartTimestamp = firstDayList.get(0);
+            //保護者の第一希望日の終了時間
+            Timestamp parentEndTimestamp = firstDayList.get(1);
+            //保護者の第一希望日の希望時間帯の長さ
+            Long timezoneLong = parentEndTimestamp.getSeconds() - parentStartTimestamp.getSeconds();
+            data.setTimezone(timezoneLong);
+
+            // TimeStampを日付に変換
+            Date startDate = new Date(parentStartTimestamp.getSeconds() * 1000);
+            Date endDate = new Date(parentEndTimestamp.getSeconds() * 1000);
+            SimpleDateFormat sdfDateData = new SimpleDateFormat("yyyyMMdd");
+            sdfDateData.setTimeZone(TimeZone.getTimeZone("Asia/Tokyo"));
+            //第一希望日の日付
+            String startDateString = sdfDateData.format(startDate);
+            String endDateString = sdfDateData.format(endDate);
+
+
+            SimpleDateFormat sdfMinutes = new SimpleDateFormat("HHmm");
+            sdfMinutes.setTimeZone(TimeZone.getTimeZone("Asia/Tokyo"));
+            //保護者の希望開始時間を時間表記にしたもの
+            String parentStartTimeString = sdfMinutes.format(parentStartTimestamp.toDate());
+            //保護者の希望終了時間を時間表記にしたもの
+            String parentEndTimeString = sdfMinutes.format(parentEndTimestamp.toDate());
+
+
+            // myDataList の中の data に追加する処理
+            myDataList.get(i).setTimezone(timezoneLong);
+            myDataList.get(i).setStartDateString(startDateString);
+            myDataList.get(i).setEndDateString(endDateString);
+            myDataList.get(i).setParentStartTimeString(parentStartTimeString);
+            myDataList.get(i).setParentEndTimeString(parentEndTimeString);
+        }
+    }
+
+    //setDataと処理は同じ(第二希望は任意なのでその点だけ確認)
+    private void secondSetData(List<MyDataClass> myDataList) {
+        for (int i = 0; i < myDataList.size(); i++) {
+            // 希望時間帯の終了時刻から開始時刻を引いて希望時間帯の長さ(timezone)に入れる
+            data = myDataList.get(i);
+            if (myDataList.get(i).getSecondDay() != null) {
+                //保護者の第二希望日
+                List<Timestamp> secondDayList = data.getSecondDay();
+                //保護者の第二希望日の開始時間
+                Timestamp parentStartTimestamp = secondDayList.get(0);
+                //保護者の第二希望日の終了時間
+                Timestamp parentEndTimestamp = secondDayList.get(1);
+                //保護者の第二希望日の希望時間帯の長さ
+                Long secondDayTimezoneLong = parentEndTimestamp.getSeconds() - parentStartTimestamp.getSeconds();
+                data.setTimezone(secondDayTimezoneLong);
+
+                // TimeStampを日付に変換
+                Date startDate = new Date(parentStartTimestamp.getSeconds() * 1000);
+                Date endDate = new Date(parentEndTimestamp.getSeconds() * 1000);
+                SimpleDateFormat sdfDateData = new SimpleDateFormat("yyyyMMdd");
+                sdfDateData.setTimeZone(TimeZone.getTimeZone("Asia/Tokyo"));
+                //第二希望日の日付
+                String secondDayStartDateString = sdfDateData.format(startDate);
+                String secondDaySndDateString = sdfDateData.format(endDate);
+
+
+                SimpleDateFormat sdfMinutes = new SimpleDateFormat("HHmm");
+                sdfMinutes.setTimeZone(TimeZone.getTimeZone("Asia/Tokyo"));
+                //保護者の希望開始時間を時間表記にしたもの
+                String secondDayParentStartTimeString = sdfMinutes.format(parentStartTimestamp.toDate());
+                //保護者の希望終了時間を時間表記にしたもの
+                String secondDayParentEndTimeString = sdfMinutes.format(parentEndTimestamp.toDate());
+
+
+                // myDataList の中の data に追加する処理
+                myDataList.get(i).setSecondDayTimezone(secondDayTimezoneLong);
+                myDataList.get(i).setSecondDayStartDateString(secondDayStartDateString);
+                myDataList.get(i).setSecondDayEndDateString(secondDaySndDateString);
+                myDataList.get(i).setSecondDayParentStartTimeString(secondDayParentStartTimeString);
+                myDataList.get(i).setSecondDayParentEndTimeString(secondDayParentEndTimeString);
+            }
+        }
+    }
+
+    private void timeZoneSort(List<MyDataClass> myDataList) {
+        // timezoneを比較するComparator→timezoneが短い順に並べる
+        Comparator<MyDataClass> comparator = Comparator.comparing(MyDataClass::getTimezone);
+        // myDataListをtimezoneの値でソート
+        myDataList.sort(comparator);
+    }
+
+    private void secondTimeZoneSort(List<MyDataClass> myDataList) {
+        // timezoneを比較するComparator→timezoneが短い順に並べる
+        Comparator<MyDataClass> comparator = Comparator.comparing(MyDataClass::getSecondDayTimezone);
+        // myDataListをtimezoneの値でソート
+        myDataList.sort(comparator);
+    }
+
+    private void outPutLogSort(List<MyDataClass> myDataList) {
+        for (int i = 0; i < myDataList.size(); i++) {
+            Log.d("CreateSchedule", "(index: " + i + ") data: " + myDataList.get(i).getPatronName());
+            Log.d("CreateSchedule", "(index: " + i + ") data: " + myDataList.get(i).getClass());
+            Log.d("CreateSchedule", "(index: " + i + ") timezone: " + myDataList.get(i).getTimezone());
+            Log.d("CreateSchedule", "(index: " + i + ") startDate: " + myDataList.get(i).getStartDateString());
+            Log.d("CreateSchedule:outPutLogBeforeSort", "parentStartTimeString: " + myDataList.get(i).getParentStartTimeString());
+            Log.d("CreateSchedule:outPutLogBeforeSort", "parentEndTimeString: " + myDataList.get(i).getParentEndTimeString());
+
+        }
+    }
+
+    private void getRoomData() {
+        // setUpActivityによって入力され、Roomに保存された値を取り出す処理
+        //Roomの操作の定義
+        SetUpTableDao setUpTableDao = db.setUpTableDao();
+        startTimeHomeVisitString = setUpTableDao.getStartTime();
+        endTimeHomeVisitString = setUpTableDao.getEndTime();
+        intervalTimeString = setUpTableDao.getIntervalTime();
+        startBreakTimeString = setUpTableDao.getStartBreakTime();
+        endBreakTimeString = setUpTableDao.getEndBreakTime();
+    }
+
+    //Roomからのデータ取得に関するログ
+    void outPutLogRoomData() {
+        Log.d("CreateSchedule:outPutLogRoomData", "開始時間" + startTimeHomeVisitString);
+        Log.d("CreateSchedule:outPutLogRoomData", "終了時刻" + endTimeHomeVisitString);
+        Log.d("CreateSchedule:outPutLogRoomData", "一家庭当たりの所要時間" + intervalTimeString);
+        Log.d("CreateSchedule:outPutLogRoomData", "休憩開始時刻" + startBreakTimeString);
+        Log.d("CreateSchedule:outPutLogRoomData", "休憩終了時刻" + endBreakTimeString);
+    }
+
+    private void timeCalculation(String endTimeHomeVisitString, String startBreakTime, String endBreakTime) {
+        //家庭訪問の合計時間を計算するため、家庭訪問の終了時間から開始時間を引いた数を求めている。但し、(0,2)によって先に１時間単位の差を求めた後に、(2,4)によって分単位の差を求めている
+        int totalTimeInt = ((Integer.parseInt(endTimeHomeVisitString.substring(0, 2)) - (Integer.parseInt(startTimeHomeVisitString.substring(0, 2)))) * 60 + ((Integer.parseInt(endTimeHomeVisitString.substring(2, 4)))) - (Integer.parseInt(startTimeHomeVisitString.substring(2, 4))));
+        //家庭訪問の休憩開始時間から家庭訪問の開始時間を引くことで家庭訪問の開始から休憩時間までの分数を計算
+        startBreakTimeMinutesInt = ((Integer.parseInt(startBreakTime.substring(0, 2))) - (Integer.parseInt(startTimeHomeVisitString.substring(0, 2)))) * 60 + ((Integer.parseInt(startBreakTime.substring(2, 4))) - (Integer.parseInt(startTimeHomeVisitString.substring(2, 4))));
+        //家庭訪問の休憩終了時間から家庭訪問の終了時間を引くことで休憩の終わりから家庭訪問の終了時間までの分数を計算
+        endBreakTimeMinutesInt = ((Integer.parseInt(endBreakTime.substring(0, 2))) - (Integer.parseInt(startTimeHomeVisitString.substring(0, 2)))) * 60 + ((Integer.parseInt(endBreakTime.substring(2, 4))) - (Integer.parseInt(startTimeHomeVisitString.substring(2, 4))));
+        intervalInt = Integer.parseInt(intervalTimeString) + 10;//移動時間込みの1家庭当たりの所要時間
+        arraySizeInt = totalTimeInt / intervalInt;//家庭訪問の合計時間から移動時間込みの1家庭当たりの所要時間を割ることで配列の数を求めている
+    }
+
+    private int[][][] homeVisitSchedule() {
+        //家庭訪問の開始時間からの経過分数を入れる配列
+        List<Integer> intervalList = new ArrayList<>();
+        startBreakTimeMinutesInt = (((Integer.parseInt(startTimeHomeVisitString.substring(0, 2))) + (startBreakTimeMinutesInt + (Integer.parseInt(startTimeHomeVisitString.substring(0, 2)))) / 60) % 24) * 100 + (startBreakTimeMinutesInt + (Integer.parseInt(startTimeHomeVisitString.substring(2, 4)))) % 60;
+        endBreakTimeMinutesInt = (((Integer.parseInt(startTimeHomeVisitString.substring(0, 2))) + (endBreakTimeMinutesInt + (Integer.parseInt(startTimeHomeVisitString.substring(0, 2)))) / 60) % 24) * 100 + (endBreakTimeMinutesInt + (Integer.parseInt(startTimeHomeVisitString.substring(2, 4)))) % 60;
+
+        //休憩時間を除いた家庭訪問の開始時間からの経過分数+家庭訪問の開始時間=家庭訪問のスケジュール区切りをintervalArrayに入れる処理
+        for (int i = 0; i < arraySizeInt; i++) {
+            int intervalMinutesInt = (((Integer.parseInt(startTimeHomeVisitString.substring(0, 2))) + (intervalInt * i) / 60) % 24) * 100 + (intervalInt * i) % 60;
+            if (intervalMinutesInt % 100 >= 60) {
+                intervalMinutesInt += 40; // 下2桁が60以上の場合は繰り上げる
+            }
+            //教師の休憩時間を除く処理
+            if (intervalMinutesInt < startBreakTimeMinutesInt || intervalMinutesInt >= endBreakTimeMinutesInt) {
+                intervalList.add(intervalMinutesInt);
+            }
+        }
+
+        //[3]は家庭訪問の〇日目
+        int[][][] intervalArrayInt = new int[3][intervalList.size()][2];
+        for (int i = 0; i < intervalList.size(); i++) {
+            for (int j = 0; j < 3; j++) {
+                intervalArrayInt[j][i][0] = intervalList.get(i);//家庭訪問のスケジュール区切りの時間を要素に入れる
+                intervalArrayInt[j][i][1] = 0;//家庭訪問のスケジュールにまだ保護者が割り当てられていないことを表す
+            }
+        }
+
+        return intervalArrayInt;
+    }
+
+    private void outPutLogIntervalArray(int[][][] intervalArrayInt) {
+        for (int i = 0; i < intervalArrayInt[0].length; i++) {
+            Log.d("CreateSchedule", "inteintervalArray:(intex:" + i + ") :" + intervalArrayInt[0][i][0]);
+        }
+    }
+
+
+    private Boolean createSchedule(List<MyDataClass> myDataList, int[][][] intervalArrayInt) {
+
+        for (int i = 0; i < myDataList.size(); i++) {
+            for (int j = 0; j < intervalArrayInt[0].length - 1; j++) {
+                for (int x = 0; x < 3; x++) {
+                    //家庭訪問の●日目が保護者の第一希望日かを判定する
+                    //まだスケジュールを割り当てていない保護者かを判定する
+                    if (testdata[x].equals(myDataList.get(i).getStartDateString()) && myDataList.get(i).getSchedule() == 0) {
+                        checkSchedule(myDataList, intervalArrayInt, i, j, x, myDataList.get(i).getStartDateString());
+                        break;
+                    }
+                }
+            }
+
+        }
+
+        for (int i = 0; i < myDataList.size(); i++) {
+            if (myDataList.get(i).getSchedule() == 0) {//重複により割り当てがされていない保護者がいないかの確認
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private boolean secondCreateSchedule(List<MyDataClass> myDataList, int[][][] intervalArrayInt) {
+        for (int i = 0; i < myDataList.size(); i++) {
+            for (int j = 0; j < intervalArrayInt[0].length - 1; j++) {
+                for (int x = 0; x < 3; x++) {
+                    //家庭訪問の●日目が保護者の第一希望日かを判定する
+                    //まだスケジュールを割り当てていない保護者かを判定する
+                    if (testdata[x].equals(myDataList.get(i).getSecondDayStartDateString()) && myDataList.get(i).getSchedule() == 0) {
+                        checkSchedule(myDataList, intervalArrayInt, i, j, x, myDataList.get(i).getSecondDayStartDateString());
+                    }
+                }
+            }
+        }
+
+        for (int i = 0; i < myDataList.size(); i++) {
+            if (myDataList.get(i).getSchedule() == 0) {//重複により割り当てがされていない保護者がいないかの確認
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private void checkSchedule(List<MyDataClass> myDataList, int[][][] intervalArrayInt, int i, int j, int x, String desiredDateString) {
+        //保護者の希望時間の開始と終了の間にまだ保護者の割り当てがされていないスケジュールの空き時間があるかの判定
+        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分))
+        }
+    }
+
+    private void sortSchedule(List<MyDataClass> myDataList) {
+        Comparator<MyDataClass> comparator = Comparator.comparing(MyDataClass::getSchedule);
+        //スケジュールを元にmyDataListをソートする
+        myDataList.sort(comparator);
+    }
+
+
+    private void geocodeAddress(List<MyDataClass> myDataList, Context context) {
+        try {
+            Geocoder geocoder = new Geocoder(context, Locale.getDefault());
+            for (int i = 0; i < myDataList.size(); i++) {
+                List<Address> addressesList = geocoder.getFromLocationName(myDataList.get(i).getAddress().toString(), 1);
+                if (addressesList != null && !addressesList.isEmpty()) {
+                    Address addressResult = addressesList.get(0);
+                    //保護者の住所を緯度経度に変換する
+                    double latitudeDouble = addressResult.getLatitude();
+                    double longitudeDouble = addressResult.getLongitude();
+                    //保護者の住所の緯度経度をmyDataListに追加する
+                    myDataList.get(i).setLatLng(new LatLng(latitudeDouble, longitudeDouble));
+                }
+            }
+        } catch (IOException e) {
+            Log.e("CreateSchedule", "緯度経度の取得に失敗: " + e);
+        }
+    }
+
+    private void outPutLogSchedule(List<MyDataClass> myDataList) {
+        for (int i = 0; i < myDataList.size(); i++) {
+            Log.d("CreateSchedule:outPutLogSchedule", "(index: " + i + ") data: " + myDataList.get(i));
+            Log.d("CreateSchedule:outPutLogSchedule", "(index: " + i + ") Schedule: " + myDataList.get(i).getSchedule());
+            Log.d("CreateSchedule", "(index: " + i + ") LatLng" + myDataList.get(i).getLatLng());
+        }
+    }
+}
diff --git a/app/src/main/java/com/example/oplogy/MainActivity.java b/app/src/main/java/com/example/oplogy/MainActivity.java
index 241b490..55505b9 100644
--- a/app/src/main/java/com/example/oplogy/MainActivity.java
+++ b/app/src/main/java/com/example/oplogy/MainActivity.java
@@ -227,8 +227,8 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
                 }
             }
             Log.d("MainActivity", "myDataList" + myDataList.size());
-            CreateRoot createRoot = new CreateRoot(MainActivity.this);
-            Boolean notDuplicates = createRoot.receiveData(myDataList,getApplicationContext());
+            CreateSchedule createSchedule = new CreateSchedule(MainActivity.this);
+            Boolean notDuplicates = createSchedule.receiveData(myDataList,getApplicationContext());
             latch.countDown();
 
             if (notDuplicates) {

From 4bf097c04dbc86958f945262972ba408819bdc2c Mon Sep 17 00:00:00 2001
From: nemukemo <hiroaka201432@gmail.com>
Date: Fri, 5 Jul 2024 11:30:52 +0900
Subject: [PATCH 05/17] =?UTF-8?q?ID=E4=BD=9C=E6=88=90=E3=81=AE=E5=87=A6?=
 =?UTF-8?q?=E7=90=86=E3=82=92=E4=BD=9C=E6=88=90=E3=80=81=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E3=81=AB=E5=88=87=E3=82=8A=E6=9B=BF=E3=81=88=E3=81=A6=E3=80=81?=
 =?UTF-8?q?=E3=81=9D=E3=82=8C=E3=81=AB=E5=90=88=E3=82=8F=E3=81=9B=E3=81=A6?=
 =?UTF-8?q?=E5=87=A6=E7=90=86=E3=82=92=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/example/oplogy/MainActivity.java | 45 ++++++++++++++++---
 1 file changed, 39 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/example/oplogy/MainActivity.java b/app/src/main/java/com/example/oplogy/MainActivity.java
index 91988a5..51615f4 100644
--- a/app/src/main/java/com/example/oplogy/MainActivity.java
+++ b/app/src/main/java/com/example/oplogy/MainActivity.java
@@ -157,7 +157,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
         }
     }
 
-    //UUIDを表示するかのダイアログ
+    //IDに関する処理
     private void showUUIDYesNoDialog() {
         firestoreReception_classIdDatabase = new FirestoreReception_classIdDatabase();
         List<Integer> classIdList = firestoreReception_classIdDatabase.getAllDocumentsFromClassIdDatabase();
@@ -165,19 +165,30 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
 
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
         builder.setTitle("クラスID");
-        builder.setMessage("あなたのクラスIDを表示しますか？");
+        builder.setMessage("あなたのクラスIDを表示/もしくは新規で作成しますか？");
 
-        builder.setPositiveButton("Yes", new DialogInterface.OnClickListener() {
+        builder.setPositiveButton("作成", new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {
                 classId = CreateUUID.generateUUID(classIdList);
-                Toast.makeText(MainActivity.this, "クラスID: " + classId, Toast.LENGTH_SHORT).show();
+                // 生成されたクラスIDを表示するメソッド
+                showClassIdDialog("生成されたクラスID",classId);
             }
         });
-        builder.setNegativeButton("No", new DialogInterface.OnClickListener() {
+        builder.setNegativeButton("表示", new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {
-                Log.d("DialogNO", "DialogでNoが選ばれました");
+                //roomを扱うため非同期処理
+                ExecutorService executor = Executors.newSingleThreadExecutor();
+                executor.execute(() -> {
+                    // 現在のクラスIDを取得
+                    int currentClassId = getCurrentClassIdFromRoom();
+                    runOnUiThread(() -> {
+                        // 現在のクラスIDを表示するダイアログ
+                        showClassIdDialog("現在のクラスID",currentClassId);
+                    });
+                });
+                executor.shutdown();
             }
         });
 
@@ -185,6 +196,28 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
         alertDialog.show();
 
     }
+    private int getCurrentClassIdFromRoom() {
+        AppDatabase db = getDatabaseInstance();
+        SetUpTableDao setUpTableDao = db.setUpTableDao();
+
+        // 現在のクラスIDを取得
+        return setUpTableDao.getClassId();
+    }
+    //クラスIDを表示するダイアログ
+    private void showClassIdDialog(String title, int classId) {
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        builder.setTitle(title);
+        builder.setMessage("クラスID: " + classId);
+        builder.setPositiveButton("OK", new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                dialog.dismiss();
+            }
+        });
+        AlertDialog dialog = builder.create();
+        dialog.show();
+    }
+
 
     //ルート作成の非同期処理
     private void fetchDataAndCreateRoute() {

From 3109d9666d950966d615413706ca2c17c1e3295f Mon Sep 17 00:00:00 2001
From: Ekamo-11 <148836598+Ekamo-11@users.noreply.github.com>
Date: Fri, 5 Jul 2024 11:45:23 +0900
Subject: [PATCH 06/17] =?UTF-8?q?=E5=A4=89=E6=95=B0=E5=90=8D=E3=82=92?=
 =?UTF-8?q?=E5=9E=8B=E3=81=8C=E5=88=86=E3=81=8B=E3=82=8B=E3=82=88=E3=81=86?=
 =?UTF-8?q?=E3=81=AB=E4=B8=80=E9=83=A8=E5=A4=89=E6=9B=B4=E3=81=97=E3=81=BE?=
 =?UTF-8?q?=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/example/oplogy/SetUpActivity.java     | 60 +++++++++----------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/app/src/main/java/com/example/oplogy/SetUpActivity.java b/app/src/main/java/com/example/oplogy/SetUpActivity.java
index d533095..ab4f1c8 100644
--- a/app/src/main/java/com/example/oplogy/SetUpActivity.java
+++ b/app/src/main/java/com/example/oplogy/SetUpActivity.java
@@ -42,13 +42,13 @@ public class SetUpActivity extends FragmentActivity
     String startBreakTime;
     String endBreakTime;
     int totalStudent;
-    private TextView setTeacherName;
-    private TextView setStartPoint;
-    private TextView setStartTime;
-    private TextView setEndTime;
-    private TextView setStartBreakTime;
-    private TextView setEndBreakTime;
-    private TextView setTotalStudent;
+    private TextView textViewTeacherName;
+    private TextView textViewStartPoint;
+    private TextView textViewStartTime;
+    private TextView textViewEndTime;
+    private TextView textViewStartBreakTime;
+    private TextView textViewEndBreakTime;
+    private TextView textViewTotalStudent;
     private int isDateSelected;
     private int isStartTimeSelected;
 
@@ -76,28 +76,28 @@ public class SetUpActivity extends FragmentActivity
 
         int classId= getIntent().getIntExtra("classId", 100000);
 
-        setTeacherName = findViewById(R.id.teacherName);                    //先生の名前
-        setStartPoint = findViewById(R.id.startPoint);                      //開始地点
+        textViewTeacherName = findViewById(R.id.teacherName);                    //先生の名前
+        textViewStartPoint = findViewById(R.id.startPoint);                      //開始地点
 
         setFirstDay = findViewById(R.id.setFirstDayButton);                    //1日目の日付
         setSecondDay = findViewById(R.id.setSecondDayButton);                  //2日目の日付
         setThirdDay = findViewById(R.id.setThirdDayButton);                    //3日目の日付
 
         setStartTimeButton = findViewById(R.id.startTimeSetButton);         //開始時刻を設定するボタン
-        setStartTime = findViewById(R.id.startTime);                        //開始時刻を出力するTextView
+        textViewStartTime = findViewById(R.id.startTime);                        //開始時刻を出力するTextView
         setEndTimeButton = findViewById(R.id.endTimeSetButton);             //終了時刻を設定するボタン
-        setEndTime = findViewById(R.id.endTime);                            //終了時刻を出力するTextView
+        textViewEndTime = findViewById(R.id.endTime);                            //終了時刻を出力するTextView
 
         RadioButton setTenMinute = findViewById(R.id.tenMinute);            //訪問間隔（10分）
         RadioButton setFifteenMinute = findViewById(R.id.fifteenMinute);    //訪問間隔（15分）
         RadioButton setThirtyMinute = findViewById(R.id.thirtyMinute);      //訪問間隔（30分）
 
-        setStartBreakTime = findViewById(R.id.startBreakTime);              //休憩開始時刻
-        setStartBreakTime.setPaintFlags(Paint.UNDERLINE_TEXT_FLAG);
-        setEndBreakTime = findViewById(R.id.endBreakTime);                  //休憩終了時刻
-        setEndBreakTime.setPaintFlags(Paint.UNDERLINE_TEXT_FLAG);
+        textViewStartBreakTime = findViewById(R.id.startBreakTime);              //休憩開始時刻
+        textViewStartBreakTime.setPaintFlags(Paint.UNDERLINE_TEXT_FLAG);
+        textViewEndBreakTime = findViewById(R.id.endBreakTime);                  //休憩終了時刻
+        textViewEndBreakTime.setPaintFlags(Paint.UNDERLINE_TEXT_FLAG);
 
-        setTotalStudent = findViewById(R.id.totalStudent);                  //クラスの人数
+        textViewTotalStudent = findViewById(R.id.totalStudent);                  //クラスの人数
 
         ImageView toMain = findViewById(R.id.toMain);
         Button setUp = findViewById(R.id.setUpButton);                      //画面下の設定ボタン
@@ -110,9 +110,9 @@ public class SetUpActivity extends FragmentActivity
 
         setUp.setOnClickListener(view -> {
 
-            teacherName = setTeacherName.getText().toString(); //各変数に値を挿入
+            teacherName = textViewTeacherName.getText().toString(); //各変数に値を挿入
             Log.d(TAG, "Teacher Name: " + teacherName);
-            startPoint = setStartPoint.getText().toString();
+            startPoint = textViewStartPoint.getText().toString();
             Log.d(TAG, "Start Point: " + startPoint);
             Log.d(TAG, "First Day:" + firstDay);
             Log.d(TAG, "Second Day:" + secondDay);
@@ -131,7 +131,7 @@ public class SetUpActivity extends FragmentActivity
             Log.d(TAG, "Interval Time" + intervalTime);
             Log.d(TAG, "Start Break Time" + startBreakTime);
             Log.d(TAG, "End Break Time" + endBreakTime);
-            totalStudent = Integer.parseInt(setTotalStudent.getText().toString()); //数値型に変更
+            totalStudent = Integer.parseInt(textViewTotalStudent.getText().toString()); //数値型に変更
             Log.d(TAG, "Total Student" + totalStudent);
             Log.d(TAG, "onClick: できてるよ");
 
@@ -211,12 +211,12 @@ public class SetUpActivity extends FragmentActivity
             showTimePickerDialog();
         });
 
-        setStartBreakTime.setOnClickListener(v -> {
+        textViewStartBreakTime.setOnClickListener(v -> {
             isStartTimeSelected = 3;
             showTimePickerDialog();
         });
 
-        setEndBreakTime.setOnClickListener(v -> {
+        textViewEndBreakTime.setOnClickListener(v -> {
             isStartTimeSelected = 4;
             showTimePickerDialog();
         });
@@ -224,14 +224,14 @@ public class SetUpActivity extends FragmentActivity
         //リセットボタンの処理
 
         reset.setOnClickListener(v -> { //テキストとラジオボタンの選択を消去
-            setTeacherName.setText("");
-            setStartPoint.setText("");
+            textViewTeacherName.setText("");
+            textViewStartPoint.setText("");
             setTenMinute.setChecked(false);
             setFifteenMinute.setChecked(false);
             setThirtyMinute.setChecked(false);
-            setStartBreakTime.setText("");
-            setEndBreakTime.setText("");
-            setTotalStudent.setText("");
+            textViewStartBreakTime.setText("");
+            textViewEndBreakTime.setText("");
+            textViewTotalStudent.setText("");
 
             ExecutorService executor = Executors.newSingleThreadExecutor();
             executor.execute(() -> {
@@ -280,25 +280,25 @@ public class SetUpActivity extends FragmentActivity
             stringHourOfDay = String.format("%02d", hourOfDay);
             stringMinute = String.format("%02d", minute);
             startTime = stringHourOfDay + stringMinute;
-            setStartTime.setText(str);
+            textViewStartTime.setText(str);
 
         } else if (isStartTimeSelected == 2) {
             stringHourOfDay = String.format("%02d", hourOfDay);
             stringMinute = String.format("%02d", minute);
             endTime = stringHourOfDay + stringMinute;
-            setEndTime.setText(str);
+            textViewEndTime.setText(str);
 
         } else if (isStartTimeSelected == 3) {
             stringHourOfDay = String.format("%02d", hourOfDay);
             stringMinute = String.format("%02d", minute);
             startBreakTime =stringHourOfDay + stringMinute;
-            setStartBreakTime.setText("　" + str + "　");
+            textViewStartBreakTime.setText("　" + str + "　");
 
         } else if (isStartTimeSelected == 4) {
             stringHourOfDay = String.format("%02d", hourOfDay);
             stringMinute = String.format("%02d", minute);
             endBreakTime = stringHourOfDay + stringMinute;
-            setEndBreakTime.setText("　" + str + "　");
+            textViewEndBreakTime.setText("　" + str + "　");
         }
     }
 

From 34bbf40951faa312cbc3e922cedd2365f6e23737 Mon Sep 17 00:00:00 2001
From: Ekamo-11 <148836598+Ekamo-11@users.noreply.github.com>
Date: Fri, 5 Jul 2024 11:50:08 +0900
Subject: [PATCH 07/17] =?UTF-8?q?=E5=A4=89=E6=95=B0=E5=90=8D=E3=82=92?=
 =?UTF-8?q?=E5=9E=8B=E3=81=8C=E5=88=86=E3=81=8B=E3=82=8B=E3=82=88=E3=81=86?=
 =?UTF-8?q?=E3=81=AB=E3=81=95=E3=82=89=E3=81=AB=E4=B8=80=E9=83=A8=E5=A4=89?=
 =?UTF-8?q?=E6=9B=B4=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/example/oplogy/SetUpActivity.java     | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/com/example/oplogy/SetUpActivity.java b/app/src/main/java/com/example/oplogy/SetUpActivity.java
index ab4f1c8..adc4511 100644
--- a/app/src/main/java/com/example/oplogy/SetUpActivity.java
+++ b/app/src/main/java/com/example/oplogy/SetUpActivity.java
@@ -49,8 +49,8 @@ public class SetUpActivity extends FragmentActivity
     private TextView textViewStartBreakTime;
     private TextView textViewEndBreakTime;
     private TextView textViewTotalStudent;
-    private int isDateSelected;
-    private int isStartTimeSelected;
+    private int intIsDateSelected;
+    private int intIsStartTimeSelected;
 
     String stringYear;
     String stringMonth;
@@ -187,37 +187,37 @@ public class SetUpActivity extends FragmentActivity
         });
 
         setFirstDay.setOnClickListener(v ->{
-            isDateSelected = 1;
+            intIsDateSelected = 1;
             showDatePickerDialog(); //DatePickerの表示
         });
 
         setSecondDay.setOnClickListener(v ->{
-            isDateSelected = 2;
+            intIsDateSelected = 2;
             showDatePickerDialog();
         });
 
         setThirdDay.setOnClickListener(v ->{
-            isDateSelected = 3;
+            intIsDateSelected = 3;
             showDatePickerDialog();
         });
 
         setStartTimeButton.setOnClickListener(v -> {
-            isStartTimeSelected = 1; //ボタンの判別
+            intIsStartTimeSelected = 1; //ボタンの判別
             showTimePickerDialog(); //TimePickerの表示
         });
 
         setEndTimeButton.setOnClickListener(v -> {
-            isStartTimeSelected = 2;
+            intIsStartTimeSelected = 2;
             showTimePickerDialog();
         });
 
         textViewStartBreakTime.setOnClickListener(v -> {
-            isStartTimeSelected = 3;
+            intIsStartTimeSelected = 3;
             showTimePickerDialog();
         });
 
         textViewEndBreakTime.setOnClickListener(v -> {
-            isStartTimeSelected = 4;
+            intIsStartTimeSelected = 4;
             showTimePickerDialog();
         });
 
@@ -247,13 +247,13 @@ public class SetUpActivity extends FragmentActivity
         // DatePickerDialogで選択された日付を処理する
         String str = String.format(Locale.JAPAN, "%02d/%02d",  month + 1, dayOfMonth); // TextViewに表示する日付の形式を設定
 
-        if (isDateSelected == 1) {
+        if (intIsDateSelected == 1) {
             stringYear = String.valueOf(year);                                          //年
             stringMonth = String.format(Locale.JAPAN, "%02d", month + 1); //月
             stringDayOfMonth = String.format(Locale.JAPAN, "%02d", dayOfMonth);  //日
             firstDay = stringYear + stringMonth + stringDayOfMonth;
             setFirstDay.setText(str);
-        } else if (isDateSelected == 2) {
+        } else if (intIsDateSelected == 2) {
             stringYear = String.valueOf(year);
             stringMonth = String.format(Locale.JAPAN, "%02d", month + 1);
             stringDayOfMonth = String.format(Locale.JAPAN, "%02d", dayOfMonth);
@@ -261,7 +261,7 @@ public class SetUpActivity extends FragmentActivity
             setSecondDay.setText(str);
 
 
-        } else if (isDateSelected == 3) {
+        } else if (intIsDateSelected == 3) {
             stringYear = String.valueOf(year);
             stringMonth = String.format(Locale.JAPAN, "%02d", month + 1);
             stringDayOfMonth = String.format(Locale.JAPAN, "%02d", dayOfMonth);
@@ -276,25 +276,25 @@ public class SetUpActivity extends FragmentActivity
     public void onTimeSet(TimePicker view, int hourOfDay, int minute) {
         String str = String.format(Locale.JAPAN, "%02d:%02d", hourOfDay, minute); // Textviewに保存する形式を設定
 
-        if (isStartTimeSelected == 1) {
+        if (intIsStartTimeSelected == 1) {
             stringHourOfDay = String.format("%02d", hourOfDay);
             stringMinute = String.format("%02d", minute);
             startTime = stringHourOfDay + stringMinute;
             textViewStartTime.setText(str);
 
-        } else if (isStartTimeSelected == 2) {
+        } else if (intIsStartTimeSelected == 2) {
             stringHourOfDay = String.format("%02d", hourOfDay);
             stringMinute = String.format("%02d", minute);
             endTime = stringHourOfDay + stringMinute;
             textViewEndTime.setText(str);
 
-        } else if (isStartTimeSelected == 3) {
+        } else if (intIsStartTimeSelected == 3) {
             stringHourOfDay = String.format("%02d", hourOfDay);
             stringMinute = String.format("%02d", minute);
             startBreakTime =stringHourOfDay + stringMinute;
             textViewStartBreakTime.setText("　" + str + "　");
 
-        } else if (isStartTimeSelected == 4) {
+        } else if (intIsStartTimeSelected == 4) {
             stringHourOfDay = String.format("%02d", hourOfDay);
             stringMinute = String.format("%02d", minute);
             endBreakTime = stringHourOfDay + stringMinute;

From 55f5033fc6552d4c5dbc6129a6114286a87cf6ba Mon Sep 17 00:00:00 2001
From: Ekamo-11 <148836598+Ekamo-11@users.noreply.github.com>
Date: Fri, 5 Jul 2024 11:53:29 +0900
Subject: [PATCH 08/17] =?UTF-8?q?=E5=A4=89=E6=95=B0=E5=90=8D=E3=82=92?=
 =?UTF-8?q?=E5=9E=8B=E3=81=8C=E5=88=86=E3=81=8B=E3=82=8B=E3=82=88=E3=81=86?=
 =?UTF-8?q?=E3=81=AB=E3=81=95=E3=82=89=E3=81=AB=E3=81=95=E3=82=89=E3=81=AB?=
 =?UTF-8?q?=E4=B8=80=E9=83=A8=E5=A4=89=E6=9B=B4=E3=81=97=E3=81=BE=E3=81=97?=
 =?UTF-8?q?=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/example/oplogy/SetUpActivity.java     | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/com/example/oplogy/SetUpActivity.java b/app/src/main/java/com/example/oplogy/SetUpActivity.java
index adc4511..313cfb2 100644
--- a/app/src/main/java/com/example/oplogy/SetUpActivity.java
+++ b/app/src/main/java/com/example/oplogy/SetUpActivity.java
@@ -60,11 +60,11 @@ public class SetUpActivity extends FragmentActivity
     String stringHourOfDay;
     String stringMinute;
 
-    Button setFirstDay;
-    Button setSecondDay;
-    Button setThirdDay;
-    Button setStartTimeButton;
-    Button setEndTimeButton;
+    Button buttonFirstDay;
+    Button buttonSecondDay;
+    Button buttonThirdDay;
+    Button buttonStartTimeButton;
+    Button buttonEndTimeButton;
 
 
 
@@ -79,13 +79,13 @@ public class SetUpActivity extends FragmentActivity
         textViewTeacherName = findViewById(R.id.teacherName);                    //先生の名前
         textViewStartPoint = findViewById(R.id.startPoint);                      //開始地点
 
-        setFirstDay = findViewById(R.id.setFirstDayButton);                    //1日目の日付
-        setSecondDay = findViewById(R.id.setSecondDayButton);                  //2日目の日付
-        setThirdDay = findViewById(R.id.setThirdDayButton);                    //3日目の日付
+        buttonFirstDay = findViewById(R.id.setFirstDayButton);                    //1日目の日付
+        buttonSecondDay = findViewById(R.id.setSecondDayButton);                  //2日目の日付
+        buttonThirdDay = findViewById(R.id.setThirdDayButton);                    //3日目の日付
 
-        setStartTimeButton = findViewById(R.id.startTimeSetButton);         //開始時刻を設定するボタン
+        buttonStartTimeButton = findViewById(R.id.startTimeSetButton);         //開始時刻を設定するボタン
         textViewStartTime = findViewById(R.id.startTime);                        //開始時刻を出力するTextView
-        setEndTimeButton = findViewById(R.id.endTimeSetButton);             //終了時刻を設定するボタン
+        buttonEndTimeButton = findViewById(R.id.endTimeSetButton);             //終了時刻を設定するボタン
         textViewEndTime = findViewById(R.id.endTime);                            //終了時刻を出力するTextView
 
         RadioButton setTenMinute = findViewById(R.id.tenMinute);            //訪問間隔（10分）
@@ -186,27 +186,27 @@ public class SetUpActivity extends FragmentActivity
 
         });
 
-        setFirstDay.setOnClickListener(v ->{
+        buttonFirstDay.setOnClickListener(v ->{
             intIsDateSelected = 1;
             showDatePickerDialog(); //DatePickerの表示
         });
 
-        setSecondDay.setOnClickListener(v ->{
+        buttonSecondDay.setOnClickListener(v ->{
             intIsDateSelected = 2;
             showDatePickerDialog();
         });
 
-        setThirdDay.setOnClickListener(v ->{
+        buttonThirdDay.setOnClickListener(v ->{
             intIsDateSelected = 3;
             showDatePickerDialog();
         });
 
-        setStartTimeButton.setOnClickListener(v -> {
+        buttonStartTimeButton.setOnClickListener(v -> {
             intIsStartTimeSelected = 1; //ボタンの判別
             showTimePickerDialog(); //TimePickerの表示
         });
 
-        setEndTimeButton.setOnClickListener(v -> {
+        buttonEndTimeButton.setOnClickListener(v -> {
             intIsStartTimeSelected = 2;
             showTimePickerDialog();
         });
@@ -252,13 +252,13 @@ public class SetUpActivity extends FragmentActivity
             stringMonth = String.format(Locale.JAPAN, "%02d", month + 1); //月
             stringDayOfMonth = String.format(Locale.JAPAN, "%02d", dayOfMonth);  //日
             firstDay = stringYear + stringMonth + stringDayOfMonth;
-            setFirstDay.setText(str);
+            buttonFirstDay.setText(str);
         } else if (intIsDateSelected == 2) {
             stringYear = String.valueOf(year);
             stringMonth = String.format(Locale.JAPAN, "%02d", month + 1);
             stringDayOfMonth = String.format(Locale.JAPAN, "%02d", dayOfMonth);
             secondDay = stringYear + stringMonth + stringDayOfMonth;
-            setSecondDay.setText(str);
+            buttonSecondDay.setText(str);
 
 
         } else if (intIsDateSelected == 3) {
@@ -266,7 +266,7 @@ public class SetUpActivity extends FragmentActivity
             stringMonth = String.format(Locale.JAPAN, "%02d", month + 1);
             stringDayOfMonth = String.format(Locale.JAPAN, "%02d", dayOfMonth);
             thirdDay = stringYear + stringMonth + stringDayOfMonth;
-            setThirdDay.setText(str);
+            buttonThirdDay.setText(str);
 
         }
     }

From 2bb15876686185f1685b43a09d9787afa24c61b1 Mon Sep 17 00:00:00 2001
From: Ekamo-11 <148836598+Ekamo-11@users.noreply.github.com>
Date: Fri, 5 Jul 2024 11:56:09 +0900
Subject: [PATCH 09/17] =?UTF-8?q?=E5=A4=89=E6=95=B0=E5=90=8D=E3=82=92?=
 =?UTF-8?q?=E5=9E=8B=E3=81=8C=E5=88=86=E3=81=8B=E3=82=8B=E3=82=88=E3=81=86?=
 =?UTF-8?q?=E3=81=AB=E3=81=95=E3=82=89=E3=81=AB=E3=81=95=E3=82=89=E3=81=AB?=
 =?UTF-8?q?=E3=81=95=E3=82=89=E3=81=AB=E4=B8=80=E9=83=A8=E5=A4=89=E6=9B=B4?=
 =?UTF-8?q?=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/example/oplogy/SetUpActivity.java | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/example/oplogy/SetUpActivity.java b/app/src/main/java/com/example/oplogy/SetUpActivity.java
index 313cfb2..8b5a419 100644
--- a/app/src/main/java/com/example/oplogy/SetUpActivity.java
+++ b/app/src/main/java/com/example/oplogy/SetUpActivity.java
@@ -88,9 +88,9 @@ public class SetUpActivity extends FragmentActivity
         buttonEndTimeButton = findViewById(R.id.endTimeSetButton);             //終了時刻を設定するボタン
         textViewEndTime = findViewById(R.id.endTime);                            //終了時刻を出力するTextView
 
-        RadioButton setTenMinute = findViewById(R.id.tenMinute);            //訪問間隔（10分）
-        RadioButton setFifteenMinute = findViewById(R.id.fifteenMinute);    //訪問間隔（15分）
-        RadioButton setThirtyMinute = findViewById(R.id.thirtyMinute);      //訪問間隔（30分）
+        RadioButton radioButtonTenMinute = findViewById(R.id.tenMinute);            //訪問間隔（10分）
+        RadioButton radioButtonFifteenMinute = findViewById(R.id.fifteenMinute);    //訪問間隔（15分）
+        RadioButton radioButtonThirtyMinute = findViewById(R.id.thirtyMinute);      //訪問間隔（30分）
 
         textViewStartBreakTime = findViewById(R.id.startBreakTime);              //休憩開始時刻
         textViewStartBreakTime.setPaintFlags(Paint.UNDERLINE_TEXT_FLAG);
@@ -119,11 +119,11 @@ public class SetUpActivity extends FragmentActivity
             Log.d(TAG, "Third Day:" + thirdDay);
             Log.d(TAG, "Start Time" + startTime);
             Log.d(TAG, "End Time" + endTime);
-            if (setTenMinute.isChecked()){                    //ラジオボタンの状態を取得
+            if (radioButtonTenMinute.isChecked()){                    //ラジオボタンの状態を取得
                 intervalTime = "10";
-            } else if (setFifteenMinute.isChecked()) {
+            } else if (radioButtonFifteenMinute.isChecked()) {
                 intervalTime = "15";
-            } else if (setThirtyMinute.isChecked()) {
+            } else if (radioButtonThirtyMinute.isChecked()) {
                 intervalTime = "30";
             } else {
                 intervalTime = "0";
@@ -226,9 +226,9 @@ public class SetUpActivity extends FragmentActivity
         reset.setOnClickListener(v -> { //テキストとラジオボタンの選択を消去
             textViewTeacherName.setText("");
             textViewStartPoint.setText("");
-            setTenMinute.setChecked(false);
-            setFifteenMinute.setChecked(false);
-            setThirtyMinute.setChecked(false);
+            radioButtonTenMinute.setChecked(false);
+            radioButtonFifteenMinute.setChecked(false);
+            radioButtonThirtyMinute.setChecked(false);
             textViewStartBreakTime.setText("");
             textViewEndBreakTime.setText("");
             textViewTotalStudent.setText("");

From de77c75b0b7d0678c0377419a209fd34ed1a36a0 Mon Sep 17 00:00:00 2001
From: it232115 <it232115@trident.ac.jp>
Date: Fri, 5 Jul 2024 11:56:47 +0900
Subject: [PATCH 10/17] =?UTF-8?q?CreateSchedule=E3=81=AB=E3=82=88=E3=81=A3?=
 =?UTF-8?q?=E3=81=A6=E7=B7=AF=E5=BA=A6=E7=B5=8C=E5=BA=A6=E3=81=AB=E5=A4=89?=
 =?UTF-8?q?=E6=8F=9B=E3=81=97=E3=81=9F=E4=BD=8F=E6=89=80=E3=82=92=E5=85=83?=
 =?UTF-8?q?=E3=81=AB=E3=83=AB=E3=83=BC=E3=83=88=E4=BD=9C=E6=88=90=E3=81=AE?=
 =?UTF-8?q?=E6=88=90=E5=8A=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/example/oplogy/CreateRoot.java   | 378 ------------------
 .../com/example/oplogy/CreateSchedule.java    |   4 +-
 .../java/com/example/oplogy/MainActivity.java |  42 +-
 .../main/java/com/example/oplogy/Maps.java    |  42 +-
 .../java/com/example/oplogy/MyDataClass.java  |  11 +-
 5 files changed, 69 insertions(+), 408 deletions(-)
 delete mode 100644 app/src/main/java/com/example/oplogy/CreateRoot.java

diff --git a/app/src/main/java/com/example/oplogy/CreateRoot.java b/app/src/main/java/com/example/oplogy/CreateRoot.java
deleted file mode 100644
index d19d17e..0000000
--- a/app/src/main/java/com/example/oplogy/CreateRoot.java
+++ /dev/null
@@ -1,378 +0,0 @@
-package com.example.oplogy;
-
-import android.content.Context;
-import android.location.Address;
-import android.location.Geocoder;
-import android.util.Log;
-
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.room.Room;
-
-import com.google.android.gms.maps.model.LatLng;
-import com.google.firebase.Timestamp;
-
-import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.List;
-import java.util.Locale;
-import java.util.TimeZone;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-//保護者の希望とSetUpActivityによって設定された情報をもとにスケジュールとルートを作成する
-public class CreateRoot {
-    MyDataClass data;//Firestoreから受け取ったdataを入れる変数
-    String startTimeHomeVisitString;//家庭訪問の開始時間
-    String endTimeHomeVisitString;//家庭訪問の終了時間
-    String intervalTimeString;//家庭訪問の一家庭当たりの時間
-    String startBreakTimeString;//家庭訪問の休憩の開始時間
-    String endBreakTimeString;//家庭訪問の休憩の終了時間
-
-
-    int intervalInt;//家庭訪問の一家庭当たりの時間と移動時間の合計
-    int startBreakTimeMinutesInt;//家庭訪問の開始時間から休憩時間までの時間
-    int endBreakTimeMinutesInt;//家庭訪問の休憩終了時間から終了時間までの時間
-
-    private final AppDatabase db;
-    private int arraySizeInt;
-
-    boolean notSecondDuplicatesBoolean = true;//スケジュールの重複の有無(第一希望日のみで通った場合も考えて初期はtrue)
-
-    String[] testdata = {"20240604", "20240605", "20240606"};
-
-    public CreateRoot(AppCompatActivity activity) {
-        this.db = Room.databaseBuilder(activity.getApplicationContext(), AppDatabase.class, "SetUpTable").build();
-    }
-
-    //MainActivityからデータを受け取る
-    public Boolean receiveData(List<MyDataClass> myDataList, Context context) {
-
-        //myDataListの要素data第一希望日と第二希望日に以下を追加する
-        //・保護者の希望時間帯の長さ
-        //・家庭訪問の日付
-        //・保護者の希望時間帯の開始と終了時間
-        setData(myDataList);
-        //希望時間帯の長さ順に並び替える前のログ
-        outPutLogSort(myDataList);
-        //保護者の希望時間帯が短い順にmyDataListのDataを並び替える
-        timeZoneSort(myDataList);
-        //希望時間帯の長さ順に並び替えたあとのログ
-        outPutLogSort(myDataList);
-
-
-        ExecutorService executor = Executors.newSingleThreadExecutor();
-        executor.execute(() -> {
-            //Roomから以下の情報を取得
-            //・家庭訪問全体の開始時間
-            //・家庭訪問全体の終了時間
-            //・一家庭あたりの家庭訪問の時間
-            //・家庭訪問の休憩開始時間
-            //・家庭訪問の休憩終了時間
-            getRoomData();
-
-            //Roomから取得した情報のログ
-            outPutLogRoomData();
-
-            //以下の情報を計算
-            //・家庭訪問の合計時間
-            //・家庭訪問の開始時間から休憩時間までの分数
-            //・家庭訪問の休憩終了時間から終了時間までの分数
-            timeCalculation(endTimeHomeVisitString, startBreakTimeString, endBreakTimeString);
-
-            //家庭訪問全体のスケジュールの開始時間を要素とした配列の作成(例:1200,1220,1240のように各家庭への到着時間となる区切り)とログ表示
-            int[][][] intervalArrayInt = homeVisitSchedule();
-            outPutLogIntervalArray(intervalArrayInt);
-
-            //スケジュール作成
-            boolean notDuplicatesBoolean = createSchedule(myDataList, intervalArrayInt);
-
-            //スケジュールの重複の確認
-            if (!notDuplicatesBoolean) {
-                //第二希望日で同じ処理を行う
-                Log.d("CreateRoot", "第二希望");
-                secondSetData(myDataList);
-                secondTimeZoneSort(myDataList);
-                notSecondDuplicatesBoolean = secondCreateSchedule(myDataList, intervalArrayInt);
-            }
-        });
-        if (notSecondDuplicatesBoolean) {
-            sortSchedule(myDataList);
-            geocodeAddress(myDataList, context);
-            outPutLogSchedule(myDataList);
-            return notSecondDuplicatesBoolean;
-        }
-        Log.d("CreateRoot", "重複によるエラー");
-        return !notSecondDuplicatesBoolean;
-    }
-
-
-    private void setData(List<MyDataClass> myDataList) {
-        for (int i = 0; i < myDataList.size(); i++) {
-            // 希望時間帯の終了時刻から開始時刻を引いて希望時間帯の長さ(timezone)に入れる
-            data = myDataList.get(i);
-            //保護者の第一希望日
-            List<Timestamp> firstDayList = data.getFirstDay();
-
-            //保護者の第一希望日の開始時間
-            Timestamp parentStartTimestamp = firstDayList.get(0);
-            //保護者の第一希望日の終了時間
-            Timestamp parentEndTimestamp = firstDayList.get(1);
-            //保護者の第一希望日の希望時間帯の長さ
-            Long timezoneLong = parentEndTimestamp.getSeconds() - parentStartTimestamp.getSeconds();
-            data.setTimezone(timezoneLong);
-
-            // TimeStampを日付に変換
-            Date startDate = new Date(parentStartTimestamp.getSeconds() * 1000);
-            Date endDate = new Date(parentEndTimestamp.getSeconds() * 1000);
-            SimpleDateFormat sdfDateData = new SimpleDateFormat("yyyyMMdd");
-            sdfDateData.setTimeZone(TimeZone.getTimeZone("Asia/Tokyo"));
-            //第一希望日の日付
-            String startDateString = sdfDateData.format(startDate);
-            String endDateString = sdfDateData.format(endDate);
-
-
-            SimpleDateFormat sdfMinutes = new SimpleDateFormat("HHmm");
-            sdfMinutes.setTimeZone(TimeZone.getTimeZone("Asia/Tokyo"));
-            //保護者の希望開始時間を時間表記にしたもの
-            String parentStartTimeString = sdfMinutes.format(parentStartTimestamp.toDate());
-            //保護者の希望終了時間を時間表記にしたもの
-            String parentEndTimeString = sdfMinutes.format(parentEndTimestamp.toDate());
-
-
-            // myDataList の中の data に追加する処理
-            myDataList.get(i).setTimezone(timezoneLong);
-            myDataList.get(i).setStartDateString(startDateString);
-            myDataList.get(i).setEndDateString(endDateString);
-            myDataList.get(i).setParentStartTimeString(parentStartTimeString);
-            myDataList.get(i).setParentEndTimeString(parentEndTimeString);
-        }
-    }
-
-    //setDataと処理は同じ(第二希望は任意なのでその点だけ確認)
-    private void secondSetData(List<MyDataClass> myDataList) {
-        for (int i = 0; i < myDataList.size(); i++) {
-            // 希望時間帯の終了時刻から開始時刻を引いて希望時間帯の長さ(timezone)に入れる
-            data = myDataList.get(i);
-            if (myDataList.get(i).getSecondDay() != null) {
-                //保護者の第二希望日
-                List<Timestamp> secondDayList = data.getSecondDay();
-                //保護者の第二希望日の開始時間
-                Timestamp parentStartTimestamp = secondDayList.get(0);
-                //保護者の第二希望日の終了時間
-                Timestamp parentEndTimestamp = secondDayList.get(1);
-                //保護者の第二希望日の希望時間帯の長さ
-                Long secondDayTimezoneLong = parentEndTimestamp.getSeconds() - parentStartTimestamp.getSeconds();
-                data.setTimezone(secondDayTimezoneLong);
-
-                // TimeStampを日付に変換
-                Date startDate = new Date(parentStartTimestamp.getSeconds() * 1000);
-                Date endDate = new Date(parentEndTimestamp.getSeconds() * 1000);
-                SimpleDateFormat sdfDateData = new SimpleDateFormat("yyyyMMdd");
-                sdfDateData.setTimeZone(TimeZone.getTimeZone("Asia/Tokyo"));
-                //第二希望日の日付
-                String secondDayStartDateString = sdfDateData.format(startDate);
-                String secondDaySndDateString = sdfDateData.format(endDate);
-
-
-                SimpleDateFormat sdfMinutes = new SimpleDateFormat("HHmm");
-                sdfMinutes.setTimeZone(TimeZone.getTimeZone("Asia/Tokyo"));
-                //保護者の希望開始時間を時間表記にしたもの
-                String secondDayParentStartTimeString = sdfMinutes.format(parentStartTimestamp.toDate());
-                //保護者の希望終了時間を時間表記にしたもの
-                String secondDayParentEndTimeString = sdfMinutes.format(parentEndTimestamp.toDate());
-
-
-                // myDataList の中の data に追加する処理
-                myDataList.get(i).setSecondDayTimezone(secondDayTimezoneLong);
-                myDataList.get(i).setSecondDayStartDateString(secondDayStartDateString);
-                myDataList.get(i).setSecondDayEndDateString(secondDaySndDateString);
-                myDataList.get(i).setSecondDayParentStartTimeString(secondDayParentStartTimeString);
-                myDataList.get(i).setSecondDayParentEndTimeString(secondDayParentEndTimeString);
-            }
-        }
-    }
-
-    private void timeZoneSort(List<MyDataClass> myDataList) {
-        // timezoneを比較するComparator→timezoneが短い順に並べる
-        Comparator<MyDataClass> comparator = Comparator.comparing(MyDataClass::getTimezone);
-        // myDataListをtimezoneの値でソート
-        myDataList.sort(comparator);
-    }
-
-    private void secondTimeZoneSort(List<MyDataClass> myDataList) {
-        // timezoneを比較するComparator→timezoneが短い順に並べる
-        Comparator<MyDataClass> comparator = Comparator.comparing(MyDataClass::getSecondDayTimezone);
-        // myDataListをtimezoneの値でソート
-        myDataList.sort(comparator);
-    }
-
-    private void outPutLogSort(List<MyDataClass> myDataList) {
-        for (int i = 0; i < myDataList.size(); i++) {
-            Log.d("CreateRoot", "(index: " + i + ") data: " + myDataList.get(i).getPatronName());
-            Log.d("CreateRoot", "(index: " + i + ") data: " + myDataList.get(i).getClass());
-            Log.d("CreateRoot", "(index: " + i + ") timezone: " + myDataList.get(i).getTimezone());
-            Log.d("CreateRoot", "(index: " + i + ") startDate: " + myDataList.get(i).getStartDateString());
-            Log.d("CreateRoot:outPutLogBeforeSort", "parentStartTimeString: " + myDataList.get(i).getParentStartTimeString());
-            Log.d("CreateRoot:outPutLogBeforeSort", "parentEndTimeString: " + myDataList.get(i).getParentEndTimeString());
-
-        }
-    }
-
-    private void getRoomData() {
-        // setUpActivityによって入力され、Roomに保存された値を取り出す処理
-        //Roomの操作の定義
-        SetUpTableDao setUpTableDao = db.setUpTableDao();
-        startTimeHomeVisitString = setUpTableDao.getStartTime();
-        endTimeHomeVisitString = setUpTableDao.getEndTime();
-        intervalTimeString = setUpTableDao.getIntervalTime();
-        startBreakTimeString = setUpTableDao.getStartBreakTime();
-        endBreakTimeString = setUpTableDao.getEndBreakTime();
-    }
-
-    //Roomからのデータ取得に関するログ
-    void outPutLogRoomData() {
-        Log.d("CreateRoot:outPutLogRoomData", "開始時間" + startTimeHomeVisitString);
-        Log.d("CreateRoot:outPutLogRoomData", "終了時刻" + endTimeHomeVisitString);
-        Log.d("CreateRoot:outPutLogRoomData", "一家庭当たりの所要時間" + intervalTimeString);
-        Log.d("CreateRoot:outPutLogRoomData", "休憩開始時刻" + startBreakTimeString);
-        Log.d("CreateRoot:outPutLogRoomData", "休憩終了時刻" + endBreakTimeString);
-    }
-
-    private void timeCalculation(String endTimeHomeVisitString, String startBreakTime, String endBreakTime) {
-        //家庭訪問の合計時間を計算するため、家庭訪問の終了時間から開始時間を引いた数を求めている。但し、(0,2)によって先に１時間単位の差を求めた後に、(2,4)によって分単位の差を求めている
-        int totalTimeInt = ((Integer.parseInt(endTimeHomeVisitString.substring(0, 2)) - (Integer.parseInt(startTimeHomeVisitString.substring(0, 2)))) * 60 + ((Integer.parseInt(endTimeHomeVisitString.substring(2, 4)))) - (Integer.parseInt(startTimeHomeVisitString.substring(2, 4))));
-        //家庭訪問の休憩開始時間から家庭訪問の開始時間を引くことで家庭訪問の開始から休憩時間までの分数を計算
-        startBreakTimeMinutesInt = ((Integer.parseInt(startBreakTime.substring(0, 2))) - (Integer.parseInt(startTimeHomeVisitString.substring(0, 2)))) * 60 + ((Integer.parseInt(startBreakTime.substring(2, 4))) - (Integer.parseInt(startTimeHomeVisitString.substring(2, 4))));
-        //家庭訪問の休憩終了時間から家庭訪問の終了時間を引くことで休憩の終わりから家庭訪問の終了時間までの分数を計算
-        endBreakTimeMinutesInt = ((Integer.parseInt(endBreakTime.substring(0, 2))) - (Integer.parseInt(startTimeHomeVisitString.substring(0, 2)))) * 60 + ((Integer.parseInt(endBreakTime.substring(2, 4))) - (Integer.parseInt(startTimeHomeVisitString.substring(2, 4))));
-        intervalInt = Integer.parseInt(intervalTimeString) + 10;//移動時間込みの1家庭当たりの所要時間
-        arraySizeInt = totalTimeInt / intervalInt;//家庭訪問の合計時間から移動時間込みの1家庭当たりの所要時間を割ることで配列の数を求めている
-    }
-
-    private int[][][] homeVisitSchedule() {
-        //家庭訪問の開始時間からの経過分数を入れる配列
-        List<Integer> intervalList = new ArrayList<>();
-        startBreakTimeMinutesInt = (((Integer.parseInt(startTimeHomeVisitString.substring(0, 2))) + (startBreakTimeMinutesInt + (Integer.parseInt(startTimeHomeVisitString.substring(0, 2)))) / 60) % 24) * 100 + (startBreakTimeMinutesInt + (Integer.parseInt(startTimeHomeVisitString.substring(2, 4)))) % 60;
-        endBreakTimeMinutesInt = (((Integer.parseInt(startTimeHomeVisitString.substring(0, 2))) + (endBreakTimeMinutesInt + (Integer.parseInt(startTimeHomeVisitString.substring(0, 2)))) / 60) % 24) * 100 + (endBreakTimeMinutesInt + (Integer.parseInt(startTimeHomeVisitString.substring(2, 4)))) % 60;
-
-        //休憩時間を除いた家庭訪問の開始時間からの経過分数+家庭訪問の開始時間=家庭訪問のスケジュール区切りをintervalArrayに入れる処理
-        for (int i = 0; i < arraySizeInt; i++) {
-            int intervalMinutesInt = (((Integer.parseInt(startTimeHomeVisitString.substring(0, 2))) + (intervalInt * i) / 60) % 24) * 100 + (intervalInt * i) % 60;
-            if (intervalMinutesInt % 100 >= 60) {
-                intervalMinutesInt += 40; // 下2桁が60以上の場合は繰り上げる
-            }
-            //教師の休憩時間を除く処理
-            if (intervalMinutesInt < startBreakTimeMinutesInt || intervalMinutesInt >= endBreakTimeMinutesInt) {
-                intervalList.add(intervalMinutesInt);
-            }
-        }
-
-        //[3]は家庭訪問の〇日目
-        int[][][] intervalArrayInt = new int[3][intervalList.size()][2];
-        for (int i = 0; i < intervalList.size(); i++) {
-            for (int j = 0; j < 3; j++) {
-                intervalArrayInt[j][i][0] = intervalList.get(i);//家庭訪問のスケジュール区切りの時間を要素に入れる
-                intervalArrayInt[j][i][1] = 0;//家庭訪問のスケジュールにまだ保護者が割り当てられていないことを表す
-            }
-        }
-
-        return intervalArrayInt;
-    }
-
-    private void outPutLogIntervalArray(int[][][] intervalArrayInt) {
-        for (int i = 0; i < intervalArrayInt[0].length; i++) {
-            Log.d("CreateRoot", "inteintervalArray:(intex:" + i + ") :" + intervalArrayInt[0][i][0]);
-        }
-    }
-
-
-    private Boolean createSchedule(List<MyDataClass> myDataList, int[][][] intervalArrayInt) {
-
-        for (int i = 0; i < myDataList.size(); i++) {
-            for (int j = 0; j < intervalArrayInt[0].length - 1; j++) {
-                for (int x = 0; x < 3; x++) {
-                    //家庭訪問の●日目が保護者の第一希望日かを判定する
-                    //まだスケジュールを割り当てていない保護者かを判定する
-                    if (testdata[x].equals(myDataList.get(i).getStartDateString()) && myDataList.get(i).getSchedule() == 0) {
-                        checkSchedule(myDataList, intervalArrayInt, i, j, x, myDataList.get(i).getStartDateString());
-                        break;
-                    }
-                }
-            }
-
-        }
-
-        for (int i = 0; i < myDataList.size(); i++) {
-            if (myDataList.get(i).getSchedule() == 0) {//重複により割り当てがされていない保護者がいないかの確認
-                return false;
-            }
-        }
-        return true;
-    }
-
-    private boolean secondCreateSchedule(List<MyDataClass> myDataList, int[][][] intervalArrayInt) {
-        for (int i = 0; i < myDataList.size(); i++) {
-            for (int j = 0; j < intervalArrayInt[0].length - 1; j++) {
-                for (int x = 0; x < 3; x++) {
-                    //家庭訪問の●日目が保護者の第一希望日かを判定する
-                    //まだスケジュールを割り当てていない保護者かを判定する
-                    if (testdata[x].equals(myDataList.get(i).getSecondDayStartDateString()) && myDataList.get(i).getSchedule() == 0) {
-                        checkSchedule(myDataList, intervalArrayInt, i, j, x, myDataList.get(i).getSecondDayStartDateString());
-                    }
-                }
-            }
-        }
-
-        for (int i = 0; i < myDataList.size(); i++) {
-            if (myDataList.get(i).getSchedule() == 0) {//重複により割り当てがされていない保護者がいないかの確認
-                return false;
-            }
-        }
-        return true;
-    }
-
-    private void checkSchedule(List<MyDataClass> myDataList, int[][][] intervalArrayInt, int i, int j, int x, String desiredDateString) {
-        //保護者の希望時間の開始と終了の間にまだ保護者の割り当てがされていないスケジュールの空き時間があるかの判定
-        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分))
-        }
-    }
-
-    private void sortSchedule(List<MyDataClass> myDataList) {
-        Comparator<MyDataClass> comparator = Comparator.comparing(MyDataClass::getSchedule);
-        //スケジュールを元にmyDataListをソートする
-        myDataList.sort(comparator);
-    }
-
-
-    private void geocodeAddress(List<MyDataClass> myDataList, Context context) {
-        try {
-            Geocoder geocoder = new Geocoder(context, Locale.getDefault());
-            for (int i = 0; i < myDataList.size(); i++) {
-                List<Address> addressesList = geocoder.getFromLocationName(myDataList.get(i).getAddress().toString(), 1);
-                if (addressesList != null && !addressesList.isEmpty()) {
-                    Address addressResult = addressesList.get(0);
-                    //保護者の住所を緯度経度に変換する
-                    double latitudeDouble = addressResult.getLatitude();
-                    double longitudeDouble = addressResult.getLongitude();
-                    //保護者の住所の緯度経度をmyDataListに追加する
-                    myDataList.get(i).setLatLng(new LatLng(latitudeDouble, longitudeDouble));
-                }
-            }
-        } catch (IOException e) {
-            Log.e("CreateRoot", "緯度経度の取得に失敗: " + e);
-        }
-    }
-
-    private void outPutLogSchedule(List<MyDataClass> myDataList) {
-        for (int i = 0; i < myDataList.size(); i++) {
-            Log.d("CreateRoot:outPutLogSchedule", "(index: " + i + ") data: " + myDataList.get(i));
-            Log.d("CreateRoot:outPutLogSchedule", "(index: " + i + ") Schedule: " + myDataList.get(i).getSchedule());
-            Log.d("CreateRoot", "(index: " + i + ") LatLng" + myDataList.get(i).getLatLng());
-        }
-    }
-}
diff --git a/app/src/main/java/com/example/oplogy/CreateSchedule.java b/app/src/main/java/com/example/oplogy/CreateSchedule.java
index e730b51..eb9310d 100644
--- a/app/src/main/java/com/example/oplogy/CreateSchedule.java
+++ b/app/src/main/java/com/example/oplogy/CreateSchedule.java
@@ -360,7 +360,7 @@ public class CreateSchedule {
                     double latitudeDouble = addressResult.getLatitude();
                     double longitudeDouble = addressResult.getLongitude();
                     //保護者の住所の緯度経度をmyDataListに追加する
-                    myDataList.get(i).setLatLng(new LatLng(latitudeDouble, longitudeDouble));
+                    myDataList.get(i).setLatLngString(String.valueOf(new LatLng(latitudeDouble, longitudeDouble)));
                 }
             }
         } catch (IOException e) {
@@ -372,7 +372,7 @@ public class CreateSchedule {
         for (int i = 0; i < myDataList.size(); i++) {
             Log.d("CreateSchedule:outPutLogSchedule", "(index: " + i + ") data: " + myDataList.get(i));
             Log.d("CreateSchedule:outPutLogSchedule", "(index: " + i + ") Schedule: " + myDataList.get(i).getSchedule());
-            Log.d("CreateSchedule", "(index: " + i + ") LatLng" + myDataList.get(i).getLatLng());
+            Log.d("CreateSchedule", "(index: " + i + ") LatLng" + myDataList.get(i).getLatLngString());
         }
     }
 }
diff --git a/app/src/main/java/com/example/oplogy/MainActivity.java b/app/src/main/java/com/example/oplogy/MainActivity.java
index 55505b9..eb14d0d 100644
--- a/app/src/main/java/com/example/oplogy/MainActivity.java
+++ b/app/src/main/java/com/example/oplogy/MainActivity.java
@@ -2,6 +2,7 @@ package com.example.oplogy;
 
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
@@ -14,6 +15,7 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.room.Room;
 
 import com.google.firebase.firestore.FirebaseFirestore;
+import com.google.gson.Gson;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -50,6 +52,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
     //取得するためのクラスID
     private int classId;
     private String address;
+    private Object finalMyDataList;
 
 
     @Override
@@ -84,7 +87,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
 //      firestoreの受信関連
         db = FirebaseFirestore.getInstance();
         firestoreReception = new FirestoreReception();
-        Log.d("MainActivity","geocodeAddress");
+        Log.d("MainActivity", "geocodeAddress");
 
 
         //TODO:classIdの初期値を取得
@@ -106,7 +109,6 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
     }
 
 
-
     //    クリック処理
     @Override
     public void onClick(View view) {
@@ -228,30 +230,17 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
             }
             Log.d("MainActivity", "myDataList" + myDataList.size());
             CreateSchedule createSchedule = new CreateSchedule(MainActivity.this);
-            Boolean notDuplicates = createSchedule.receiveData(myDataList,getApplicationContext());
+            Boolean notDuplicates = createSchedule.receiveData(myDataList, getApplicationContext());
             latch.countDown();
-
             if (notDuplicates) {
                 Log.d("MainActivity", "スケジュール作成成功");
+                saveMyDataList(myDataList);
+                Intent toRoot = new Intent(MainActivity.this, Maps.class);
+                startActivity(toRoot);
             } else {
                 showErrorDialog(latch, myDataList);
             }
         });
-
-        new Thread(() -> {
-            List<MyDataClass> myDataList = firestoreReception.getMyDataList();
-            try {
-                latch.await();  // Both tasks must call countDown() before this returns
-                runOnUiThread(() -> {
-                    Intent toRoot = new Intent(MainActivity.this, Maps.class);
-                    startActivity(toRoot);
-                });
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-        }).start();
-
-        executor.shutdown();
     }
 
     //ルート作成のダイアログ
@@ -274,6 +263,21 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
                 .show();
     }
 
+    // MyDataListを共有プリファレンスに保存するメソッド
+    private void saveMyDataList(List<MyDataClass> myDataList) {
+        // 共有プリファレンスのインスタンスを取得
+        SharedPreferences sharedPreferences = getSharedPreferences("MyDataList", MODE_PRIVATE);
+        SharedPreferences.Editor editor = sharedPreferences.edit();
+
+        // MyDataListをJSON形式に変換
+        Gson gson = new Gson();
+        String json = gson.toJson(myDataList);
+
+        // JSON形式のデータを共有プリファレンスに保存
+        editor.putString("myDataList", json);
+        editor.apply();
+    }
+
     public void showErrorDialog(CountDownLatch latch, List<MyDataClass> myDataList) {
         List<Integer> studentNumbers = new ArrayList<>();
         for (int i = 0; i < myDataList.size(); i++) {
diff --git a/app/src/main/java/com/example/oplogy/Maps.java b/app/src/main/java/com/example/oplogy/Maps.java
index 48c827b..1006007 100644
--- a/app/src/main/java/com/example/oplogy/Maps.java
+++ b/app/src/main/java/com/example/oplogy/Maps.java
@@ -1,7 +1,10 @@
 package com.example.oplogy;
 
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.os.Bundle;
+import android.os.Parcelable;
+import android.util.Log;
 import android.view.View;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
@@ -11,13 +14,19 @@ import android.widget.ImageView;
 import androidx.fragment.app.FragmentActivity;
 
 import com.example.oplogy.databinding.MapsBinding;
+import com.google.common.reflect.TypeToken;
+import com.google.gson.Gson;
+
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.List;
 
 public class Maps extends FragmentActivity implements View.OnClickListener {
 
     private WebView webView;
     ImageView backMain;
     private MapsBinding binding;
-
+    private ArrayList<Parcelable> myDataList;;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -32,9 +41,36 @@ public class Maps extends FragmentActivity implements View.OnClickListener {
         WebSettings webSettings = webView.getSettings();
         webSettings.setJavaScriptEnabled(true);
         webView.setWebViewClient(new WebViewClient());
+        List<MyDataClass> myDataList=getMyDataList();
+        String latlngString = "";
+        for (int i = 0; i < myDataList.size(); i++) {
+            String latlng = myDataList.get(i).getLatLngString();
+            int startIndex = latlng.indexOf("(") + 1;
+            int endIndex = latlng.indexOf(")");
+            String latlngOnly = latlng.substring(startIndex, endIndex);
+            latlngString += latlngOnly;
+            if (i < myDataList.size() - 1) {
+                latlngString += "/";
+            }
+        }
+        Log.d("Maps","latlngString"+latlngString);
+        loadMapInWebView(latlngString);
+    }
 
-//        ここにデータを入れておいてください、処理は[/]で区切っています
-        loadMapInWebView("35.09050879999539,136.87845379325216/35.09284820618655,136.88165119390393/35.09364708442631,136.88171563326418");
+    // 共有プリファレンスからMyDataListを取得するメソッド
+    private List<MyDataClass> getMyDataList() {
+        // 共有プリファレンスのインスタンスを取得
+        SharedPreferences sharedPreferences = getSharedPreferences("MyDataList", MODE_PRIVATE);
+
+        // 共有プリファレンスからJSON形式のデータを取得
+        String json = sharedPreferences.getString("myDataList", "");
+
+        // JSON形式のデータをMyDataListに変換
+        Gson gson = new Gson();
+        Type type = new TypeToken<List<MyDataClass>>() {}.getType();
+        List<MyDataClass> myDataList = gson.fromJson(json, type);
+
+        return myDataList;
     }
 
 //    WebViewの処理です（Mapの中の処理をやっています）
diff --git a/app/src/main/java/com/example/oplogy/MyDataClass.java b/app/src/main/java/com/example/oplogy/MyDataClass.java
index 12fd719..d045142 100644
--- a/app/src/main/java/com/example/oplogy/MyDataClass.java
+++ b/app/src/main/java/com/example/oplogy/MyDataClass.java
@@ -1,6 +1,5 @@
 package com.example.oplogy;
 
-import com.google.android.gms.maps.model.LatLng;
 import com.google.firebase.Timestamp;
 
 import java.util.List;
@@ -30,7 +29,7 @@ public class MyDataClass {
     private Long secondDayTimezoneLong;
     private String secondDayParentStartTimeString;
     private String secondDayParentEndTimeString;
-    private LatLng latLng;
+    private String latLngString;
 
 
     public MyDataClass(String patronName, int classId, List<String> address, List<Timestamp> firstDay, int studentNumber, String childName, List<Timestamp> thirdDay, List<Timestamp> secondDay) {
@@ -239,11 +238,11 @@ public class MyDataClass {
         return secondDayStartDateString;
     }
 
-    public void setLatLng(LatLng latLng) {
-        this.latLng=latLng;
+    public void setLatLngString(String latLng) {
+        this.latLngString=latLng;
     }
 
-    public LatLng getLatLng() {
-        return latLng;
+    public String getLatLngString() {
+        return latLngString;
     }
 }
\ No newline at end of file

From be1b09b4a031768dd177e51652ae8c02da02ff0c Mon Sep 17 00:00:00 2001
From: it232115 <it232115@trident.ac.jp>
Date: Fri, 5 Jul 2024 12:04:19 +0900
Subject: [PATCH 11/17] =?UTF-8?q?=E3=82=B3=E3=83=B3=E3=83=95=E3=83=AA?=
 =?UTF-8?q?=E3=82=AF=E3=83=88=E8=A7=A3=E6=B6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/example/oplogy/MainActivity.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/src/main/java/com/example/oplogy/MainActivity.java b/app/src/main/java/com/example/oplogy/MainActivity.java
index f227b59..fa7b8f5 100644
--- a/app/src/main/java/com/example/oplogy/MainActivity.java
+++ b/app/src/main/java/com/example/oplogy/MainActivity.java
@@ -8,7 +8,6 @@ import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
@@ -283,7 +282,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
             runOnUiThread(() -> {
                 if (notDuplicates) {
                     Log.d("MainActivity", "スケジュール作成成功");
-                    saveMyDataList(myDataList);
+                    saveMyDataList(finalMyDataList);
                     Intent toRoot = new Intent(MainActivity.this, Maps.class);
                     startActivity(toRoot);
                 } else {

From 01c3a27930b22fb765a14d640751c30f308d0231 Mon Sep 17 00:00:00 2001
From: Ekamo-11 <148836598+Ekamo-11@users.noreply.github.com>
Date: Fri, 5 Jul 2024 12:06:06 +0900
Subject: [PATCH 12/17] =?UTF-8?q?=E6=A9=9F=E8=83=BD=E3=82=92=E8=AA=AC?=
 =?UTF-8?q?=E6=98=8E=E3=81=99=E3=82=8B=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?=
 =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/example/oplogy/SetUpActivity.java     | 32 +++++++++++--------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/com/example/oplogy/SetUpActivity.java b/app/src/main/java/com/example/oplogy/SetUpActivity.java
index 8b5a419..12060e4 100644
--- a/app/src/main/java/com/example/oplogy/SetUpActivity.java
+++ b/app/src/main/java/com/example/oplogy/SetUpActivity.java
@@ -175,9 +175,10 @@ public class SetUpActivity extends FragmentActivity
                 SharedPreferences sharedPreferences=getSharedPreferences("visitingDate",MODE_PRIVATE);
                 SharedPreferences.Editor editor= sharedPreferences.edit();
 
-                editor.putString("day1",firstDay);
-                editor.putString("day2",secondDay);
-                editor.putString("day3",thirdDay);
+                //editorに値を渡す
+                editor.putString("day1",firstDay);  //1日目
+                editor.putString("day2",secondDay); //2日目
+                editor.putString("day3",thirdDay);  //3日目
 
                 editor.apply();
 
@@ -186,8 +187,9 @@ public class SetUpActivity extends FragmentActivity
 
         });
 
+        //DatePicker用
         buttonFirstDay.setOnClickListener(v ->{
-            intIsDateSelected = 1;
+            intIsDateSelected = 1;  //ボタンの判別（Date）
             showDatePickerDialog(); //DatePickerの表示
         });
 
@@ -201,9 +203,10 @@ public class SetUpActivity extends FragmentActivity
             showDatePickerDialog();
         });
 
+        //TimePicker用
         buttonStartTimeButton.setOnClickListener(v -> {
-            intIsStartTimeSelected = 1; //ボタンの判別
-            showTimePickerDialog(); //TimePickerの表示
+            intIsStartTimeSelected = 1; //ボタンの判別（Time）
+            showTimePickerDialog();     //TimePickerの表示
         });
 
         buttonEndTimeButton.setOnClickListener(v -> {
@@ -251,8 +254,9 @@ public class SetUpActivity extends FragmentActivity
             stringYear = String.valueOf(year);                                          //年
             stringMonth = String.format(Locale.JAPAN, "%02d", month + 1); //月
             stringDayOfMonth = String.format(Locale.JAPAN, "%02d", dayOfMonth);  //日
-            firstDay = stringYear + stringMonth + stringDayOfMonth;
-            buttonFirstDay.setText(str);
+            firstDay = stringYear + stringMonth + stringDayOfMonth;                     //8桁の文字列を作成 例)20240604
+            buttonFirstDay.setText(str);                                                //buttonにformatされた文字列を挿入
+
         } else if (intIsDateSelected == 2) {
             stringYear = String.valueOf(year);
             stringMonth = String.format(Locale.JAPAN, "%02d", month + 1);
@@ -277,10 +281,10 @@ public class SetUpActivity extends FragmentActivity
         String str = String.format(Locale.JAPAN, "%02d:%02d", hourOfDay, minute); // Textviewに保存する形式を設定
 
         if (intIsStartTimeSelected == 1) {
-            stringHourOfDay = String.format("%02d", hourOfDay);
-            stringMinute = String.format("%02d", minute);
-            startTime = stringHourOfDay + stringMinute;
-            textViewStartTime.setText(str);
+            stringHourOfDay = String.format("%02d", hourOfDay); //時
+            stringMinute = String.format("%02d", minute);       //分
+            startTime = stringHourOfDay + stringMinute;         //4桁の文字列を作成 例）0930
+            textViewStartTime.setText(str);                     //textViewにformatされている文字列を挿入
 
         } else if (intIsStartTimeSelected == 2) {
             stringHourOfDay = String.format("%02d", hourOfDay);
@@ -302,12 +306,12 @@ public class SetUpActivity extends FragmentActivity
         }
     }
 
-    private void showDatePickerDialog() {
+    private void showDatePickerDialog() { //DatePickerDialogを表示する
         DialogFragment newFragment = new DatePick();
         newFragment.show(getSupportFragmentManager(), "datePicker");
     }
 
-    private void showTimePickerDialog() { // Dialogを表示する
+    private void showTimePickerDialog() { // TimePickerDialogを表示する
         DialogFragment newFragment = new TimePick();
         newFragment.show(getSupportFragmentManager(), "timePicker");
     }

From 3300713e5408cbe1a0e20f3891c0ebda077f1f52 Mon Sep 17 00:00:00 2001
From: it232115 <it232115@trident.ac.jp>
Date: Fri, 5 Jul 2024 12:28:18 +0900
Subject: [PATCH 13/17] =?UTF-8?q?=E7=8F=BE=E5=9C=A8=E3=81=AE=E6=9C=80?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/example/oplogy/CreateSchedule.java   | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/example/oplogy/CreateSchedule.java b/app/src/main/java/com/example/oplogy/CreateSchedule.java
index eb9310d..e854468 100644
--- a/app/src/main/java/com/example/oplogy/CreateSchedule.java
+++ b/app/src/main/java/com/example/oplogy/CreateSchedule.java
@@ -1,6 +1,7 @@
 package com.example.oplogy;
 
 import android.content.Context;
+import android.content.SharedPreferences;
 import android.location.Address;
 import android.location.Geocoder;
 import android.util.Log;
@@ -41,10 +42,18 @@ public class CreateSchedule {
 
     boolean notSecondDuplicatesBoolean = true;//スケジュールの重複の有無(第一希望日のみで通った場合も考えて初期はtrue)
 
-    String[] testdata = {"20240604", "20240605", "20240606"};
+    String[] testdate;
 
     public CreateSchedule(AppCompatActivity activity) {
         this.db = Room.databaseBuilder(activity.getApplicationContext(), AppDatabase.class, "SetUpTable").build();
+        SharedPreferences sharedPreferences= activity.getSharedPreferences("visitingDate",Context.MODE_PRIVATE);
+
+        String firstDay=sharedPreferences.getString("day1",null);
+        String secondDay=sharedPreferences.getString("day2",null);
+        String thirdDay=sharedPreferences.getString("day3",null);
+
+        testdate=new String[]{firstDay,secondDay,thirdDay};
+
     }
 
     //MainActivityからデータを受け取る
@@ -296,7 +305,7 @@ public class CreateSchedule {
                 for (int x = 0; x < 3; x++) {
                     //家庭訪問の●日目が保護者の第一希望日かを判定する
                     //まだスケジュールを割り当てていない保護者かを判定する
-                    if (testdata[x].equals(myDataList.get(i).getStartDateString()) && myDataList.get(i).getSchedule() == 0) {
+                    if (testdate[x].equals(myDataList.get(i).getStartDateString()) && myDataList.get(i).getSchedule() == 0) {
                         checkSchedule(myDataList, intervalArrayInt, i, j, x, myDataList.get(i).getStartDateString());
                         break;
                     }
@@ -319,7 +328,7 @@ public class CreateSchedule {
                 for (int x = 0; x < 3; x++) {
                     //家庭訪問の●日目が保護者の第一希望日かを判定する
                     //まだスケジュールを割り当てていない保護者かを判定する
-                    if (testdata[x].equals(myDataList.get(i).getSecondDayStartDateString()) && myDataList.get(i).getSchedule() == 0) {
+                    if (testdate[x].equals(myDataList.get(i).getSecondDayStartDateString()) && myDataList.get(i).getSchedule() == 0) {
                         checkSchedule(myDataList, intervalArrayInt, i, j, x, myDataList.get(i).getSecondDayStartDateString());
                     }
                 }

From 4808e7a761217d4b4ea949ecf27b1dfc9546ec54 Mon Sep 17 00:00:00 2001
From: Ekamo-11 <148836598+Ekamo-11@users.noreply.github.com>
Date: Fri, 5 Jul 2024 12:50:53 +0900
Subject: [PATCH 14/17] =?UTF-8?q?=E5=BF=85=E9=A0=88=E9=A0=85=E7=9B=AE?=
 =?UTF-8?q?=E3=81=8C=E8=A8=98=E5=85=A5=E3=81=95=E3=82=8C=E3=81=A6=E3=81=84?=
 =?UTF-8?q?=E3=81=AA=E3=81=8B=E3=81=A3=E3=81=9F=E3=82=89=E3=80=82Toast?=
 =?UTF-8?q?=E3=81=A7=E3=81=9D=E3=81=AE=E7=8A=B6=E6=85=8B=E3=82=92=E7=9F=A5?=
 =?UTF-8?q?=E3=82=89=E3=81=9B=E3=82=8B=E3=83=97=E3=83=AD=E3=82=B0=E3=83=A9?=
 =?UTF-8?q?=E3=83=A0=E3=82=92=E4=BD=9C=E6=88=90=E3=81=97=E3=81=BE=E3=81=97?=
 =?UTF-8?q?=E3=81=9F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/example/oplogy/SetUpActivity.java     | 23 ++++++++++++++++++-
 app/src/main/res/layout/activity_set_up.xml   |  6 ++---
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/example/oplogy/SetUpActivity.java b/app/src/main/java/com/example/oplogy/SetUpActivity.java
index 12060e4..24dcdd9 100644
--- a/app/src/main/java/com/example/oplogy/SetUpActivity.java
+++ b/app/src/main/java/com/example/oplogy/SetUpActivity.java
@@ -10,6 +10,7 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.graphics.Paint;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.util.Log;
 import android.widget.Button;
 import android.widget.DatePicker;
@@ -131,10 +132,25 @@ public class SetUpActivity extends FragmentActivity
             Log.d(TAG, "Interval Time" + intervalTime);
             Log.d(TAG, "Start Break Time" + startBreakTime);
             Log.d(TAG, "End Break Time" + endBreakTime);
-            totalStudent = Integer.parseInt(textViewTotalStudent.getText().toString()); //数値型に変更
             Log.d(TAG, "Total Student" + totalStudent);
             Log.d(TAG, "onClick: できてるよ");
 
+            // クラスの人数を数値に変換して取得
+            try {
+                totalStudent = Integer.parseInt(textViewTotalStudent.getText().toString());
+            } catch (NumberFormatException e) {
+                totalStudent = 0; // デフォルト値を設定するか、エラー処理を追加することも考慮する必要があります
+            }
+
+            // 入力データのバリデーション
+            if (TextUtils.isEmpty(teacherName) || TextUtils.isEmpty(startPoint) || TextUtils.isEmpty(startTime)
+                    || TextUtils.isEmpty(firstDay) || TextUtils.isEmpty(secondDay) || TextUtils.isEmpty(thirdDay)
+                    || TextUtils.isEmpty(endTime) || TextUtils.isEmpty(intervalTime) || TextUtils.isEmpty(startBreakTime)
+                    || TextUtils.isEmpty(endBreakTime) || totalStudent <= 0) {
+                Toast.makeText(SetUpActivity.this, "必須項目を入力してください", Toast.LENGTH_SHORT).show();
+                return;
+            }
+
 
             // データベースへの登録処理
             ExecutorService executor = Executors.newSingleThreadExecutor();
@@ -229,9 +245,14 @@ public class SetUpActivity extends FragmentActivity
         reset.setOnClickListener(v -> { //テキストとラジオボタンの選択を消去
             textViewTeacherName.setText("");
             textViewStartPoint.setText("");
+            buttonFirstDay.setText("");
+            buttonSecondDay.setText("");
+            buttonThirdDay.setText("");
             radioButtonTenMinute.setChecked(false);
             radioButtonFifteenMinute.setChecked(false);
             radioButtonThirtyMinute.setChecked(false);
+            textViewStartTime.setText("");
+            textViewEndTime.setText("");
             textViewStartBreakTime.setText("");
             textViewEndBreakTime.setText("");
             textViewTotalStudent.setText("");
diff --git a/app/src/main/res/layout/activity_set_up.xml b/app/src/main/res/layout/activity_set_up.xml
index 966ccbc..bc037db 100644
--- a/app/src/main/res/layout/activity_set_up.xml
+++ b/app/src/main/res/layout/activity_set_up.xml
@@ -109,7 +109,7 @@
             android:id="@+id/setFirstDayButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/firstDay"
+            android:hint="@string/firstDay"
             android:layout_marginStart="7sp"
             android:layout_marginEnd="7sp"
             tools:ignore="DuplicateIds" />
@@ -118,7 +118,7 @@
             android:id="@+id/setSecondDayButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/secondDay"
+            android:hint="@string/secondDay"
             android:layout_marginStart="7sp"
             android:layout_marginEnd="7sp"
             tools:ignore="DuplicateIds" />
@@ -127,7 +127,7 @@
             android:id="@+id/setThirdDayButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/threeDay"
+            android:hint="@string/threeDay"
             android:layout_marginStart="7sp"
             android:layout_marginEnd="7sp"
             tools:ignore="DuplicateIds" />

From 6f9f4bce7534363c89998c393a53c469395c24fa Mon Sep 17 00:00:00 2001
From: Ekamo-11 <148836598+Ekamo-11@users.noreply.github.com>
Date: Fri, 5 Jul 2024 13:11:12 +0900
Subject: [PATCH 15/17] =?UTF-8?q?=E5=BF=85=E9=A0=88=E9=A0=85=E7=9B=AE?=
 =?UTF-8?q?=E3=81=8C=E8=A8=98=E5=85=A5=E3=81=95=E3=82=8C=E3=81=A6=E3=81=84?=
 =?UTF-8?q?=E3=81=AA=E3=81=84=E3=82=92=E7=94=BB=E9=9D=A2=E3=81=AB=E8=A1=A8?=
 =?UTF-8?q?=E7=A4=BA=E3=81=99=E3=82=8B=E6=9D=A1=E4=BB=B6=E3=82=92=E5=A4=89?=
 =?UTF-8?q?=E6=9B=B4=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/example/oplogy/SetUpActivity.java    | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/example/oplogy/SetUpActivity.java b/app/src/main/java/com/example/oplogy/SetUpActivity.java
index 24dcdd9..d982431 100644
--- a/app/src/main/java/com/example/oplogy/SetUpActivity.java
+++ b/app/src/main/java/com/example/oplogy/SetUpActivity.java
@@ -25,6 +25,7 @@ import androidx.fragment.app.FragmentActivity;
 import androidx.room.Room;
 
 import java.util.Locale;
+import java.util.Objects;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
@@ -145,7 +146,7 @@ public class SetUpActivity extends FragmentActivity
             // 入力データのバリデーション
             if (TextUtils.isEmpty(teacherName) || TextUtils.isEmpty(startPoint) || TextUtils.isEmpty(startTime)
                     || TextUtils.isEmpty(firstDay) || TextUtils.isEmpty(secondDay) || TextUtils.isEmpty(thirdDay)
-                    || TextUtils.isEmpty(endTime) || TextUtils.isEmpty(intervalTime) || TextUtils.isEmpty(startBreakTime)
+                    || TextUtils.isEmpty(endTime) || Objects.equals(intervalTime, "0") || TextUtils.isEmpty(startBreakTime)
                     || TextUtils.isEmpty(endBreakTime) || totalStudent <= 0) {
                 Toast.makeText(SetUpActivity.this, "必須項目を入力してください", Toast.LENGTH_SHORT).show();
                 return;
@@ -257,6 +258,18 @@ public class SetUpActivity extends FragmentActivity
             textViewEndBreakTime.setText("");
             textViewTotalStudent.setText("");
 
+            teacherName = "";
+            startPoint = "";
+            firstDay = "";
+            secondDay = "";
+            thirdDay = "";
+            startTime = "";
+            endTime = "";
+            intervalTime = "";
+            startBreakTime = "";
+            endBreakTime ="" ;
+
+
             ExecutorService executor = Executors.newSingleThreadExecutor();
             executor.execute(() -> {
                 AppDatabase db = Room.databaseBuilder(getApplicationContext(), AppDatabase.class, "SetUpTable").build();

From 02b96cb10fa59e4a19b04ca3252487df002376bb Mon Sep 17 00:00:00 2001
From: nemukemo <hiroaka201432@gmail.com>
Date: Mon, 8 Jul 2024 09:21:00 +0900
Subject: [PATCH 16/17] =?UTF-8?q?ID=E4=BD=9C=E6=88=90=E3=80=81=E3=82=BB?=
 =?UTF-8?q?=E3=83=83=E3=83=88=E3=82=A2=E3=83=83=E3=83=97=E3=81=AE=E5=87=A6?=
 =?UTF-8?q?=E7=90=86=E3=82=92=E3=81=97=E3=81=AA=E3=81=8B=E3=81=A3=E3=81=9F?=
 =?UTF-8?q?=E5=A0=B4=E5=90=88=E3=81=AB=E3=83=AB=E3=83=BC=E3=83=88=E8=A1=A8?=
 =?UTF-8?q?=E7=A4=BA=E3=82=92=E6=8A=BC=E3=81=97=E3=81=9F=E3=81=A8=E3=81=8D?=
 =?UTF-8?q?=E3=81=AB=E5=85=A5=E5=8A=9B=E3=82=92=E4=BF=83=E3=81=99=E3=83=80?=
 =?UTF-8?q?=E3=82=A4=E3=82=A2=E3=83=AD=E3=82=B0=E3=81=AE=E8=A1=A8=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/example/oplogy/MainActivity.java | 50 +++++++++++++++++--
 1 file changed, 46 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/example/oplogy/MainActivity.java b/app/src/main/java/com/example/oplogy/MainActivity.java
index fa7b8f5..1062542 100644
--- a/app/src/main/java/com/example/oplogy/MainActivity.java
+++ b/app/src/main/java/com/example/oplogy/MainActivity.java
@@ -8,6 +8,7 @@ import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
@@ -18,9 +19,13 @@ import com.google.gson.Gson;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
 
 public class MainActivity extends AppCompatActivity implements View.OnClickListener {
 
@@ -88,7 +93,6 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
         Log.d("MainActivity", "geocodeAddress");
 
 
-        //TODO:classIdの初期値を取得
         ExecutorService executor = Executors.newSingleThreadExecutor();
         executor.execute(() -> {
             try {
@@ -137,9 +141,28 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
 //        ルート作成のクリック処理
         if (view == root) {
             imageRoot.setImageResource(R.drawable.pin);
-            fetchDataAndCreateRoute();
-
+            if (isClassIdSet()) {
+                isSetupExists(classId).thenAccept(setupExists -> {
+                    if (setupExists) {
+                        fetchDataAndCreateRoute();
+                    } else {
+                        runOnUiThread(() -> {
+                            Toast.makeText(this, "セットアップが設定されていません", Toast.LENGTH_SHORT).show();
+                        });
+                    }
+                }).exceptionally(ex -> {
+                    ex.printStackTrace();
+                    runOnUiThread(() -> {
+                        Toast.makeText(this, "エラーが発生しました", Toast.LENGTH_SHORT).show();
+                    });
+                    return null;
+                });
+            } else {
+                Toast.makeText(this, "クラスIDが設定されていません", Toast.LENGTH_SHORT).show();
+            }
         }
+
+
         if (view == imageRoot) {
             imageRoot.setImageResource(R.drawable.pin);
             fetchDataAndCreateRoute();
@@ -220,6 +243,25 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
         dialog.show();
     }
 
+    private boolean isClassIdSet() {
+    // classIdが0より大きい場合、trueを返す
+    return classId > 0;
+    }
+
+    private CompletableFuture<Boolean> isSetupExists(int classId) {
+        final ExecutorService executorService = Executors.newSingleThreadExecutor();
+        return CompletableFuture.supplyAsync(() -> {
+            AppDatabase db = getDatabaseInstance();
+            SetUpTableDao setUpTableDao = db.setUpTableDao();
+            List<SetUpTable> checkData = setUpTableDao.getAll();
+            for (SetUpTable setUpTable : checkData) {
+                if (setUpTable.classId == classId) {
+                    return true;
+                }
+            }
+            return false;
+        }, executorService).whenComplete((result, throwable) -> executorService.shutdown());
+    }
 
     //ルート作成の非同期処理
     private void fetchDataAndCreateRoute() {
@@ -334,7 +376,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
 
 
     private AppDatabase getDatabaseInstance() {
-        return Room.databaseBuilder(getApplicationContext(), AppDatabase.class, "SetUpTable").build();
+        return Room.databaseBuilder(getApplicationContext(), AppDatabase.class, "SetUpTable").fallbackToDestructiveMigration().build();
     }
 
 

From 626bc987644d672cd20ff3d89fe48edf88027fa9 Mon Sep 17 00:00:00 2001
From: it232115 <it232115@trident.ac.jp>
Date: Mon, 8 Jul 2024 10:21:43 +0900
Subject: [PATCH 17/17] =?UTF-8?q?=E3=83=BB=E3=82=B3=E3=83=BC=E3=83=89?=
 =?UTF-8?q?=E6=95=B4=E5=BD=A2=20=E3=83=BB=E3=82=BB=E3=83=83=E3=83=88?=
 =?UTF-8?q?=E3=82=A2=E3=83=83=E3=83=97=E3=81=AB=E8=A8=AD=E5=AE=9A=E3=81=97?=
 =?UTF-8?q?=E3=81=9F=E5=88=9D=E6=9C=9F=E5=9C=B0=E7=82=B9=E3=81=AE=E7=B7=AF?=
 =?UTF-8?q?=E5=BA=A6=E7=B5=8C=E5=BA=A6=E5=8C=96(=E6=9C=AA=E9=81=94)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/example/oplogy/Converters.java   |  1 +
 .../com/example/oplogy/CreateSchedule.java    | 39 ++++++++++++------
 .../java/com/example/oplogy/CreateUUID.java   |  2 +-
 .../java/com/example/oplogy/DatePick.java     |  2 +-
 .../com/example/oplogy/DialogFragment.java    |  3 +-
 .../FirestoreReception_classIdDatabase.java   |  6 +--
 .../java/com/example/oplogy/MainActivity.java |  8 ++--
 .../main/java/com/example/oplogy/Maps.java    | 40 +++++++++++++------
 .../java/com/example/oplogy/MyDataClass.java  |  2 +-
 .../com/example/oplogy/SetUpActivity.java     | 27 ++++++-------
 .../java/com/example/oplogy/SetUpTable.java   | 15 ++++++-
 .../com/example/oplogy/SetUpTableDao.java     | 14 +++++++
 .../example/oplogy/SubmissionActivity.java    | 11 +++--
 .../com/example/oplogy/SubmissionAdapter.java |  2 +
 .../com/example/oplogy/SubmissionStudent.java |  1 +
 .../java/com/example/oplogy/TimePick.java     |  2 +-
 16 files changed, 115 insertions(+), 60 deletions(-)

diff --git a/app/src/main/java/com/example/oplogy/Converters.java b/app/src/main/java/com/example/oplogy/Converters.java
index 945d54d..3fc73b4 100644
--- a/app/src/main/java/com/example/oplogy/Converters.java
+++ b/app/src/main/java/com/example/oplogy/Converters.java
@@ -1,4 +1,5 @@
 package com.example.oplogy;
+
 import androidx.room.TypeConverter;
 
 import com.google.firebase.Timestamp;
diff --git a/app/src/main/java/com/example/oplogy/CreateSchedule.java b/app/src/main/java/com/example/oplogy/CreateSchedule.java
index e854468..ea3bc92 100644
--- a/app/src/main/java/com/example/oplogy/CreateSchedule.java
+++ b/app/src/main/java/com/example/oplogy/CreateSchedule.java
@@ -26,6 +26,8 @@ import java.util.concurrent.Executors;
 //保護者の希望とSetUpActivityによって設定された情報をもとにスケジュールとルートを作成する
 public class CreateSchedule {
     MyDataClass data;//Firestoreから受け取ったdataを入れる変数
+
+    String startPointString;//家庭訪問の開始地点
     String startTimeHomeVisitString;//家庭訪問の開始時間
     String endTimeHomeVisitString;//家庭訪問の終了時間
     String intervalTimeString;//家庭訪問の一家庭当たりの時間
@@ -42,22 +44,23 @@ public class CreateSchedule {
 
     boolean notSecondDuplicatesBoolean = true;//スケジュールの重複の有無(第一希望日のみで通った場合も考えて初期はtrue)
 
-    String[] testdate;
+    String[] date;
+
 
     public CreateSchedule(AppCompatActivity activity) {
         this.db = Room.databaseBuilder(activity.getApplicationContext(), AppDatabase.class, "SetUpTable").build();
-        SharedPreferences sharedPreferences= activity.getSharedPreferences("visitingDate",Context.MODE_PRIVATE);
+        SharedPreferences sharedPreferences = activity.getSharedPreferences("visitingDate", Context.MODE_PRIVATE);
 
-        String firstDay=sharedPreferences.getString("day1",null);
-        String secondDay=sharedPreferences.getString("day2",null);
-        String thirdDay=sharedPreferences.getString("day3",null);
+        String firstDay = sharedPreferences.getString("day1", null);
+        String secondDay = sharedPreferences.getString("day2", null);
+        String thirdDay = sharedPreferences.getString("day3", null);
 
-        testdate=new String[]{firstDay,secondDay,thirdDay};
+        date = new String[]{firstDay, secondDay, thirdDay};
 
     }
 
     //MainActivityからデータを受け取る
-    public Boolean receiveData(List<MyDataClass> myDataList, Context context) {
+    public String receiveData(List<MyDataClass> myDataList, Context context) {
 
         //myDataListの要素data第一希望日と第二希望日に以下を追加する
         //・保護者の希望時間帯の長さ
@@ -107,14 +110,18 @@ public class CreateSchedule {
                 notSecondDuplicatesBoolean = secondCreateSchedule(myDataList, intervalArrayInt);
             }
         });
+        //重複がなければ開始地点の緯度経度を返す
         if (notSecondDuplicatesBoolean) {
+            //スケジュールを基準にソートする
             sortSchedule(myDataList);
-            geocodeAddress(myDataList, context);
+            String startPointLatLngString = geocodeAddress(myDataList, context);
+            Log.d("CreateSchedule", "startPointLatLngString" + startPointLatLngString);
             outPutLogSchedule(myDataList);
-            return notSecondDuplicatesBoolean;
+            return startPointLatLngString;
         }
+        //重複があるときは""を返す
         Log.d("CreateSchedule", "重複によるエラー");
-        return !notSecondDuplicatesBoolean;
+        return "";
     }
 
 
@@ -234,6 +241,7 @@ public class CreateSchedule {
         // setUpActivityによって入力され、Roomに保存された値を取り出す処理
         //Roomの操作の定義
         SetUpTableDao setUpTableDao = db.setUpTableDao();
+        startPointString = setUpTableDao.getStartPoint();
         startTimeHomeVisitString = setUpTableDao.getStartTime();
         endTimeHomeVisitString = setUpTableDao.getEndTime();
         intervalTimeString = setUpTableDao.getIntervalTime();
@@ -305,7 +313,7 @@ public class CreateSchedule {
                 for (int x = 0; x < 3; x++) {
                     //家庭訪問の●日目が保護者の第一希望日かを判定する
                     //まだスケジュールを割り当てていない保護者かを判定する
-                    if (testdate[x].equals(myDataList.get(i).getStartDateString()) && myDataList.get(i).getSchedule() == 0) {
+                    if (date[x].equals(myDataList.get(i).getStartDateString()) && myDataList.get(i).getSchedule() == 0) {
                         checkSchedule(myDataList, intervalArrayInt, i, j, x, myDataList.get(i).getStartDateString());
                         break;
                     }
@@ -328,7 +336,7 @@ public class CreateSchedule {
                 for (int x = 0; x < 3; x++) {
                     //家庭訪問の●日目が保護者の第一希望日かを判定する
                     //まだスケジュールを割り当てていない保護者かを判定する
-                    if (testdate[x].equals(myDataList.get(i).getSecondDayStartDateString()) && myDataList.get(i).getSchedule() == 0) {
+                    if (date[x].equals(myDataList.get(i).getSecondDayStartDateString()) && myDataList.get(i).getSchedule() == 0) {
                         checkSchedule(myDataList, intervalArrayInt, i, j, x, myDataList.get(i).getSecondDayStartDateString());
                     }
                 }
@@ -358,7 +366,7 @@ public class CreateSchedule {
     }
 
 
-    private void geocodeAddress(List<MyDataClass> myDataList, Context context) {
+    private String geocodeAddress(List<MyDataClass> myDataList, Context context) {
         try {
             Geocoder geocoder = new Geocoder(context, Locale.getDefault());
             for (int i = 0; i < myDataList.size(); i++) {
@@ -372,9 +380,14 @@ public class CreateSchedule {
                     myDataList.get(i).setLatLngString(String.valueOf(new LatLng(latitudeDouble, longitudeDouble)));
                 }
             }
+            //SetUpで設定した家庭訪問の開始地点を緯度経度に変換
+            String startPointLatLngString = String.valueOf(geocoder.getFromLocationName(startPointString, 1));
+            Log.d("CreateSchedule", "startPointLatLngString" + startPointLatLngString);
+            return startPointLatLngString;
         } catch (IOException e) {
             Log.e("CreateSchedule", "緯度経度の取得に失敗: " + e);
         }
+        return null;
     }
 
     private void outPutLogSchedule(List<MyDataClass> myDataList) {
diff --git a/app/src/main/java/com/example/oplogy/CreateUUID.java b/app/src/main/java/com/example/oplogy/CreateUUID.java
index 3b0b188..a94d3dc 100644
--- a/app/src/main/java/com/example/oplogy/CreateUUID.java
+++ b/app/src/main/java/com/example/oplogy/CreateUUID.java
@@ -22,7 +22,7 @@ public class CreateUUID {
                 InsertClassIdforFirebase insertClassIdforFirebase = new InsertClassIdforFirebase();
                 insertClassIdforFirebase.insertClassId(uuid);
                 //テスト用
-                uuid=100;
+                uuid = 100;
                 return uuid;
             }
         }
diff --git a/app/src/main/java/com/example/oplogy/DatePick.java b/app/src/main/java/com/example/oplogy/DatePick.java
index 6250664..f7a8399 100644
--- a/app/src/main/java/com/example/oplogy/DatePick.java
+++ b/app/src/main/java/com/example/oplogy/DatePick.java
@@ -7,8 +7,8 @@ import android.widget.DatePicker;
 
 import androidx.annotation.NonNull;
 import androidx.fragment.app.DialogFragment;
+
 import java.util.Calendar;
-import java.util.Objects;
 
 public class DatePick extends DialogFragment implements
         DatePickerDialog.OnDateSetListener {
diff --git a/app/src/main/java/com/example/oplogy/DialogFragment.java b/app/src/main/java/com/example/oplogy/DialogFragment.java
index 530fd14..c398435 100644
--- a/app/src/main/java/com/example/oplogy/DialogFragment.java
+++ b/app/src/main/java/com/example/oplogy/DialogFragment.java
@@ -1,8 +1,9 @@
 package com.example.oplogy;
 
-import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 public class DialogFragment extends AppCompatActivity {
 
     @Override
diff --git a/app/src/main/java/com/example/oplogy/FirestoreReception_classIdDatabase.java b/app/src/main/java/com/example/oplogy/FirestoreReception_classIdDatabase.java
index a88ea67..7f9635f 100644
--- a/app/src/main/java/com/example/oplogy/FirestoreReception_classIdDatabase.java
+++ b/app/src/main/java/com/example/oplogy/FirestoreReception_classIdDatabase.java
@@ -4,8 +4,6 @@ import android.util.Log;
 
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.Task;
-import com.google.firebase.firestore.CollectionReference;
-import com.google.firebase.firestore.DocumentSnapshot;
 import com.google.firebase.firestore.FirebaseFirestore;
 import com.google.firebase.firestore.QueryDocumentSnapshot;
 import com.google.firebase.firestore.QuerySnapshot;
@@ -14,10 +12,10 @@ import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
+
 public class FirestoreReception_classIdDatabase {
     private FirebaseFirestore db;
-    private List<Integer> classIdList= new ArrayList<>();
+    private List<Integer> classIdList = new ArrayList<>();
 
     public FirestoreReception_classIdDatabase() {
         db = FirebaseFirestore.getInstance();
diff --git a/app/src/main/java/com/example/oplogy/MainActivity.java b/app/src/main/java/com/example/oplogy/MainActivity.java
index fa7b8f5..698d530 100644
--- a/app/src/main/java/com/example/oplogy/MainActivity.java
+++ b/app/src/main/java/com/example/oplogy/MainActivity.java
@@ -50,8 +50,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
 
     //取得するためのクラスID
     private int classId;
-    private String address;
-
+    private final AppDatabase appDatabase = null;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -277,13 +276,14 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
             //final宣言することによって、スレッドセーフになる(ラムダ式内で使えるようにする)
             final List<MyDataClass> finalMyDataList = myDataList;
             CreateSchedule createSchedule = new CreateSchedule(MainActivity.this);
-            Boolean notDuplicates = createSchedule.receiveData(myDataList, getApplicationContext());
+            String  startPointLatLngString = createSchedule.receiveData(myDataList, getApplicationContext());
 
             runOnUiThread(() -> {
-                if (notDuplicates) {
+                if ( !startPointLatLngString.equals("")) {
                     Log.d("MainActivity", "スケジュール作成成功");
                     saveMyDataList(finalMyDataList);
                     Intent toRoot = new Intent(MainActivity.this, Maps.class);
+                    toRoot.putExtra("startPointLatLngString", startPointLatLngString);
                     startActivity(toRoot);
                 } else {
                     //保護者の重複による警告ダイアログ
diff --git a/app/src/main/java/com/example/oplogy/Maps.java b/app/src/main/java/com/example/oplogy/Maps.java
index 1006007..722af2e 100644
--- a/app/src/main/java/com/example/oplogy/Maps.java
+++ b/app/src/main/java/com/example/oplogy/Maps.java
@@ -26,7 +26,8 @@ public class Maps extends FragmentActivity implements View.OnClickListener {
     private WebView webView;
     ImageView backMain;
     private MapsBinding binding;
-    private ArrayList<Parcelable> myDataList;;
+    private ArrayList<Parcelable> myDataList;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -41,19 +42,31 @@ public class Maps extends FragmentActivity implements View.OnClickListener {
         WebSettings webSettings = webView.getSettings();
         webSettings.setJavaScriptEnabled(true);
         webView.setWebViewClient(new WebViewClient());
-        List<MyDataClass> myDataList=getMyDataList();
+
+        // startPointLatLngStringの取得
+        String startPointLatLngString = getIntent().getStringExtra("startPointLatLngString");
+        //MyDataListの取得
+        List<MyDataClass> myDataList = getMyDataList();
+
         String latlngString = "";
-        for (int i = 0; i < myDataList.size(); i++) {
-            String latlng = myDataList.get(i).getLatLngString();
-            int startIndex = latlng.indexOf("(") + 1;
-            int endIndex = latlng.indexOf(")");
-            String latlngOnly = latlng.substring(startIndex, endIndex);
-            latlngString += latlngOnly;
-            if (i < myDataList.size() - 1) {
-                latlngString += "/";
+        for (int i = -1; i < myDataList.size(); i++) {
+            if (i < 0) {
+                //家庭訪問の開始地点の緯度経度
+                latlngString += startPointLatLngString + "/";
+            } else {
+                //各家庭の緯度経度
+                String latlng = myDataList.get(i).getLatLngString();
+                int startIndex = latlng.indexOf("(") + 1;
+                int endIndex = latlng.indexOf(")");
+                String latlngOnly = latlng.substring(startIndex, endIndex);
+                latlngString += latlngOnly;
+                if (i < myDataList.size() - 1) {
+                    latlngString += "/";
+                }
             }
         }
-        Log.d("Maps","latlngString"+latlngString);
+        Log.d("Maps", "startPointLatLngString" + startPointLatLngString);
+        Log.d("Maps", "latlngString" + latlngString);
         loadMapInWebView(latlngString);
     }
 
@@ -67,13 +80,14 @@ public class Maps extends FragmentActivity implements View.OnClickListener {
 
         // JSON形式のデータをMyDataListに変換
         Gson gson = new Gson();
-        Type type = new TypeToken<List<MyDataClass>>() {}.getType();
+        Type type = new TypeToken<List<MyDataClass>>() {
+        }.getType();
         List<MyDataClass> myDataList = gson.fromJson(json, type);
 
         return myDataList;
     }
 
-//    WebViewの処理です（Mapの中の処理をやっています）
+    //    WebViewの処理です（Mapの中の処理をやっています）
     private void loadMapInWebView(String locations) {
 //        区切ることで、追加の地点を入れて、最終地点にピンを打ってある状態です
         String[] locArray = locations.split("/");
diff --git a/app/src/main/java/com/example/oplogy/MyDataClass.java b/app/src/main/java/com/example/oplogy/MyDataClass.java
index d045142..3633d9f 100644
--- a/app/src/main/java/com/example/oplogy/MyDataClass.java
+++ b/app/src/main/java/com/example/oplogy/MyDataClass.java
@@ -239,7 +239,7 @@ public class MyDataClass {
     }
 
     public void setLatLngString(String latLng) {
-        this.latLngString=latLng;
+        this.latLngString = latLng;
     }
 
     public String getLatLngString() {
diff --git a/app/src/main/java/com/example/oplogy/SetUpActivity.java b/app/src/main/java/com/example/oplogy/SetUpActivity.java
index d533095..97a2a95 100644
--- a/app/src/main/java/com/example/oplogy/SetUpActivity.java
+++ b/app/src/main/java/com/example/oplogy/SetUpActivity.java
@@ -67,14 +67,13 @@ public class SetUpActivity extends FragmentActivity
     Button setEndTimeButton;
 
 
-
     @SuppressLint("MissingInflatedId")
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_set_up);
 
-        int classId= getIntent().getIntExtra("classId", 100000);
+        int classId = getIntent().getIntExtra("classId", 100000);
 
         setTeacherName = findViewById(R.id.teacherName);                    //先生の名前
         setStartPoint = findViewById(R.id.startPoint);                      //開始地点
@@ -104,7 +103,7 @@ public class SetUpActivity extends FragmentActivity
         Button reset = findViewById(R.id.resetButton);
 
         toMain.setOnClickListener(view -> {
-            Intent intent = new Intent(SetUpActivity.this,MainActivity.class); //main画面へ戻る処理
+            Intent intent = new Intent(SetUpActivity.this, MainActivity.class); //main画面へ戻る処理
             startActivity(intent);
         });
 
@@ -119,7 +118,7 @@ public class SetUpActivity extends FragmentActivity
             Log.d(TAG, "Third Day:" + thirdDay);
             Log.d(TAG, "Start Time" + startTime);
             Log.d(TAG, "End Time" + endTime);
-            if (setTenMinute.isChecked()){                    //ラジオボタンの状態を取得
+            if (setTenMinute.isChecked()) {                    //ラジオボタンの状態を取得
                 intervalTime = "10";
             } else if (setFifteenMinute.isChecked()) {
                 intervalTime = "15";
@@ -172,12 +171,12 @@ public class SetUpActivity extends FragmentActivity
                     runOnUiThread(() -> Toast.makeText(SetUpActivity.this, "登録しました", Toast.LENGTH_SHORT).show());
                 }
                 //家庭訪問日を保存する共有プリファレンス
-                SharedPreferences sharedPreferences=getSharedPreferences("visitingDate",MODE_PRIVATE);
-                SharedPreferences.Editor editor= sharedPreferences.edit();
+                SharedPreferences sharedPreferences = getSharedPreferences("visitingDate", MODE_PRIVATE);
+                SharedPreferences.Editor editor = sharedPreferences.edit();
 
-                editor.putString("day1",firstDay);
-                editor.putString("day2",secondDay);
-                editor.putString("day3",thirdDay);
+                editor.putString("day1", firstDay);
+                editor.putString("day2", secondDay);
+                editor.putString("day3", thirdDay);
 
                 editor.apply();
 
@@ -186,17 +185,17 @@ public class SetUpActivity extends FragmentActivity
 
         });
 
-        setFirstDay.setOnClickListener(v ->{
+        setFirstDay.setOnClickListener(v -> {
             isDateSelected = 1;
             showDatePickerDialog(); //DatePickerの表示
         });
 
-        setSecondDay.setOnClickListener(v ->{
+        setSecondDay.setOnClickListener(v -> {
             isDateSelected = 2;
             showDatePickerDialog();
         });
 
-        setThirdDay.setOnClickListener(v ->{
+        setThirdDay.setOnClickListener(v -> {
             isDateSelected = 3;
             showDatePickerDialog();
         });
@@ -245,7 +244,7 @@ public class SetUpActivity extends FragmentActivity
     @Override
     public void onDateSet(DatePicker datePicker, int year, int month, int dayOfMonth) { //Dateを成形する
         // DatePickerDialogで選択された日付を処理する
-        String str = String.format(Locale.JAPAN, "%02d/%02d",  month + 1, dayOfMonth); // TextViewに表示する日付の形式を設定
+        String str = String.format(Locale.JAPAN, "%02d/%02d", month + 1, dayOfMonth); // TextViewに表示する日付の形式を設定
 
         if (isDateSelected == 1) {
             stringYear = String.valueOf(year);                                          //年
@@ -291,7 +290,7 @@ public class SetUpActivity extends FragmentActivity
         } else if (isStartTimeSelected == 3) {
             stringHourOfDay = String.format("%02d", hourOfDay);
             stringMinute = String.format("%02d", minute);
-            startBreakTime =stringHourOfDay + stringMinute;
+            startBreakTime = stringHourOfDay + stringMinute;
             setStartBreakTime.setText("　" + str + "　");
 
         } else if (isStartTimeSelected == 4) {
diff --git a/app/src/main/java/com/example/oplogy/SetUpTable.java b/app/src/main/java/com/example/oplogy/SetUpTable.java
index dfb21ad..669bde5 100644
--- a/app/src/main/java/com/example/oplogy/SetUpTable.java
+++ b/app/src/main/java/com/example/oplogy/SetUpTable.java
@@ -1,4 +1,5 @@
 package com.example.oplogy;
+
 import androidx.room.Entity;
 import androidx.room.PrimaryKey;
 
@@ -21,7 +22,7 @@ public class SetUpTable {
 
     //コンストラクタ
     public SetUpTable(String teacherName, String startPoint, String startTime, String endTime,
-                        String intervalTime, String startBreakTime, String endBreakTime, int totalStudent,int classId) {
+                      String intervalTime, String startBreakTime, String endBreakTime, int totalStudent, int classId) {
         this.teacherName = teacherName;
         this.startPoint = startPoint;
         this.startTime = startTime;
@@ -32,41 +33,53 @@ public class SetUpTable {
         this.totalStudent = totalStudent;
         this.classId = classId;
     }
+
     //getter
     public int getId() {
         return id;
     }
+
     public String getTeacherName() {
         return teacherName;
     }
+
     public String getStartPoint() {
         return startPoint;
     }
+
     public String getStartTime() {
         return startTime;
     }
+
     public String getEndTime() {
         return endTime;
     }
+
     public int getTotalStudent() {
         return totalStudent;
     }
+
     //setter
     public void setId(int id) {
         this.id = id;
     }
+
     public void setTeacherName(String teacherName) {
         this.teacherName = teacherName;
     }
+
     public void setStartPoint(String startPoint) {
         this.startPoint = startPoint;
     }
+
     public void setStartTime(String startTime) {
         this.startTime = startTime;
     }
+
     public void setEndTime(String endTime) {
         this.endTime = endTime;
     }
+
     public void setTotalStudent(int totalStudent) {
         this.totalStudent = totalStudent;
     }
diff --git a/app/src/main/java/com/example/oplogy/SetUpTableDao.java b/app/src/main/java/com/example/oplogy/SetUpTableDao.java
index 5c21478..8b69443 100644
--- a/app/src/main/java/com/example/oplogy/SetUpTableDao.java
+++ b/app/src/main/java/com/example/oplogy/SetUpTableDao.java
@@ -1,4 +1,5 @@
 package com.example.oplogy;
+
 import androidx.room.Dao;
 import androidx.room.Insert;
 import androidx.room.Query;
@@ -10,6 +11,7 @@ import java.util.List;
 public interface SetUpTableDao {
     @Insert
     void insertAll(SetUpTable... setUpTables);
+
     //更新処理
     @Update
     void update(SetUpTable setUpTable);
@@ -18,6 +20,7 @@ public interface SetUpTableDao {
     //削除処理
     @Query("DELETE FROM SetUpTable")
     void deleteAll();
+
     //全件取得
     @Query("SELECT * FROM SetUpTable")
     List<SetUpTable> getAll();
@@ -27,19 +30,30 @@ public interface SetUpTableDao {
 
     @Query("SELECT totalStudent FROM SetUpTable")
     int getTotalStudent();
+
     //開始時間と終了時間の取得
     @Query("SELECT startTime FROM SetUpTable")
     String getStartTime();
+
     @Query("SELECT endTime FROM SetUpTable")
     String getEndTime();
+
     //教師名の取得
     @Query("SELECT intervalTime FROM SetUpTable")
     String getIntervalTime();
+
     @Query("SELECT StartBreakTime FROM SetUpTable")
     String getStartBreakTime();
+
     @Query("SELECT EndBreakTime FROM SetUpTable")
     String getEndBreakTime();
+
     //クラスIDの取得
     @Query("SELECT classId FROM SetUpTable")
     int getClassId();
+
+    @Query("SELECT startPoint FROM setuptable")
+    String getStartPoint();
+
+
 }
diff --git a/app/src/main/java/com/example/oplogy/SubmissionActivity.java b/app/src/main/java/com/example/oplogy/SubmissionActivity.java
index 089c81a..8b9aa40 100644
--- a/app/src/main/java/com/example/oplogy/SubmissionActivity.java
+++ b/app/src/main/java/com/example/oplogy/SubmissionActivity.java
@@ -1,13 +1,11 @@
 package com.example.oplogy;
 
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
 import android.os.Bundle;
 import android.widget.ImageView;
 
-import com.example.oplogy.databinding.SubmissionBinding;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -32,7 +30,7 @@ public class SubmissionActivity extends AppCompatActivity {
 
 
         // インテントから提出状況の生徒の数を取得
-        studentNumbers=getIntent().getIntegerArrayListExtra("submissionStudents");
+        studentNumbers = getIntent().getIntegerArrayListExtra("submissionStudents");
 
         recyclerView = findViewById(R.id.recyclerView);
         recyclerView.setLayoutManager(new LinearLayoutManager(this));
@@ -42,6 +40,7 @@ public class SubmissionActivity extends AppCompatActivity {
         // 生徒のリストを取得
         fetchStudents();
     }
+
     private void fetchStudents() {
         // インテントから生徒のリストを取得
         ArrayList<SubmissionStudent> submissionStudents = getIntent().getParcelableArrayListExtra("submissionStudents");
diff --git a/app/src/main/java/com/example/oplogy/SubmissionAdapter.java b/app/src/main/java/com/example/oplogy/SubmissionAdapter.java
index dd121b6..bd67f41 100644
--- a/app/src/main/java/com/example/oplogy/SubmissionAdapter.java
+++ b/app/src/main/java/com/example/oplogy/SubmissionAdapter.java
@@ -5,7 +5,9 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
+
 import androidx.recyclerview.widget.RecyclerView;
+
 import java.util.List;
 
 public class SubmissionAdapter extends RecyclerView.Adapter<SubmissionAdapter.StudentViewHolder> {
diff --git a/app/src/main/java/com/example/oplogy/SubmissionStudent.java b/app/src/main/java/com/example/oplogy/SubmissionStudent.java
index 8ca3f6c..142d996 100644
--- a/app/src/main/java/com/example/oplogy/SubmissionStudent.java
+++ b/app/src/main/java/com/example/oplogy/SubmissionStudent.java
@@ -1,4 +1,5 @@
 package com.example.oplogy;
+
 import android.os.Parcel;
 import android.os.Parcelable;
 
diff --git a/app/src/main/java/com/example/oplogy/TimePick.java b/app/src/main/java/com/example/oplogy/TimePick.java
index 1bcba1a..54e0de5 100644
--- a/app/src/main/java/com/example/oplogy/TimePick.java
+++ b/app/src/main/java/com/example/oplogy/TimePick.java
@@ -12,7 +12,7 @@ import androidx.fragment.app.DialogFragment;
 import java.util.Calendar;
 
 public class TimePick extends DialogFragment implements
-        TimePickerDialog.OnTimeSetListener{
+        TimePickerDialog.OnTimeSetListener {
 
     @NonNull
     @Override