From 626bc987644d672cd20ff3d89fe48edf88027fa9 Mon Sep 17 00:00:00 2001 From: it232115 Date: Mon, 8 Jul 2024 10:21:43 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=BB=E3=82=B3=E3=83=BC=E3=83=89=E6=95=B4?= =?UTF-8?q?=E5=BD=A2=20=E3=83=BB=E3=82=BB=E3=83=83=E3=83=88=E3=82=A2?= =?UTF-8?q?=E3=83=83=E3=83=97=E3=81=AB=E8=A8=AD=E5=AE=9A=E3=81=97=E3=81=9F?= =?UTF-8?q?=E5=88=9D=E6=9C=9F=E5=9C=B0=E7=82=B9=E3=81=AE=E7=B7=AF=E5=BA=A6?= =?UTF-8?q?=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 myDataList, Context context) { + public String receiveData(List 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 myDataList, Context context) { + private String geocodeAddress(List 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 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 classIdList= new ArrayList<>(); + private List 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 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 myDataList;; + private ArrayList 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 myDataList=getMyDataList(); + + // startPointLatLngStringの取得 + String startPointLatLngString = getIntent().getStringExtra("startPointLatLngString"); + //MyDataListの取得 + List 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>() {}.getType(); + Type type = new TypeToken>() { + }.getType(); List 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 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 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 { 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