submissionアクティビティに提出状況を確認するlistの表示の実装完了
This commit is contained in:
nemukemo
parent
e4a4d66237
commit
943b5ebc22
|
|
@ -15,6 +15,9 @@
|
|||
android:theme="@style/Theme.Oplogy"
|
||||
tools:ignore="ExtraText"
|
||||
tools:targetApi="31">
|
||||
<activity
|
||||
android:name=".row_submission"
|
||||
android:exported="false" />
|
||||
<activity
|
||||
android:name=".SetUpActivity"
|
||||
android:exported="false" />
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ package com.example.oplogy;
|
|||
import androidx.room.Database;
|
||||
import androidx.room.RoomDatabase;
|
||||
|
||||
@Database(entities = {SetUpTable.class}, version = 2)
|
||||
@Database(entities = {SetUpTable.class}, version = 2, exportSchema = false)
|
||||
public abstract class AppDatabase extends RoomDatabase {
|
||||
// データベースにアクセスするためのメソッドを提供する
|
||||
public abstract SetUpTableDao setUpTableDao();
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@ import androidx.room.Room;
|
|||
|
||||
import com.google.firebase.firestore.FirebaseFirestore;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.concurrent.CountDownLatch;
|
||||
import java.util.concurrent.ExecutorService;
|
||||
|
|
@ -112,64 +113,29 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
|
|||
// ルート作成のクリック処理
|
||||
if(view == root){
|
||||
imageRoot.setImageResource(R.drawable.pin);
|
||||
ExecutorService executor = Executors.newSingleThreadExecutor();
|
||||
|
||||
CountDownLatch latch = new CountDownLatch(2);
|
||||
|
||||
executor.execute(() -> {
|
||||
AppDatabase db = Room.databaseBuilder(getApplicationContext(), AppDatabase.class, "SetUpTable").build();
|
||||
SetUpTableDao setUpTableDao = db.setUpTableDao();
|
||||
|
||||
Log.d("MainActivity", "db" + setUpTableDao.getAll());
|
||||
|
||||
int totalStudent = setUpTableDao.getTotalStudent();
|
||||
int myDataListSize = firestoreReception.getMyDataListSize();
|
||||
|
||||
runOnUiThread(() -> {
|
||||
if (totalStudent != myDataListSize) {
|
||||
showRouteCreationDialog(latch);
|
||||
} else {
|
||||
latch.countDown();
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
executor.execute(() -> {
|
||||
List<MyDataClass> myDataList = firestoreReception.getMyDataList();
|
||||
CreateRoot createRoot = new CreateRoot(MainActivity.this);
|
||||
createRoot.receiveData(myDataList);
|
||||
latch.countDown();
|
||||
});
|
||||
|
||||
new Thread(() -> {
|
||||
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();
|
||||
fetchDataAndCreateRoute();
|
||||
}
|
||||
if(view == imageRoot){
|
||||
imageRoot.setImageResource(R.drawable.pin);
|
||||
Intent toRoot = new Intent(MainActivity.this,Maps.class);
|
||||
startActivity(toRoot);
|
||||
fetchDataAndCreateRoute();
|
||||
}
|
||||
// 提出状況のクリック処理
|
||||
if(view == submission){
|
||||
Intent toSubmission = new Intent(MainActivity.this,SubmissionActivity.class);
|
||||
ArrayList<SubmissionStudent> submissionStudents = getSubmissionStudents();
|
||||
Intent toSubmission = new Intent(MainActivity.this, SubmissionActivity.class);
|
||||
toSubmission.putParcelableArrayListExtra("submissionStudents", submissionStudents);
|
||||
startActivity(toSubmission);
|
||||
}
|
||||
if(view == imageSubmission){
|
||||
Intent toSubmission = new Intent(MainActivity.this,SubmissionActivity.class);
|
||||
ArrayList<SubmissionStudent> submissionStudents = getSubmissionStudents();
|
||||
Intent toSubmission = new Intent(MainActivity.this, SubmissionActivity.class);
|
||||
toSubmission.putParcelableArrayListExtra("submissionStudents", submissionStudents);
|
||||
startActivity(toSubmission);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
private void showUUIDYesNoDialog() {
|
||||
//ダイアログの表示
|
||||
AlertDialog.Builder builder = new AlertDialog.Builder(this);
|
||||
|
|
@ -193,7 +159,58 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
|
|||
});
|
||||
builder.show();
|
||||
}
|
||||
//ルート作成のダイアログ
|
||||
|
||||
//ルート作成のダイアログ＋ルート作成の処理の非同期処理実装
|
||||
private void fetchDataAndCreateRoute() {
|
||||
//非同期処理の開始
|
||||
ExecutorService executor = Executors.newSingleThreadExecutor();
|
||||
|
||||
// 2つのタスクの完了をカウントする変数
|
||||
CountDownLatch latch = new CountDownLatch(2);
|
||||
|
||||
// タスク1: ローカルDBから生徒数を取得
|
||||
executor.execute(() -> {
|
||||
AppDatabase db = Room.databaseBuilder(getApplicationContext(), AppDatabase.class, "SetUpTable").build();
|
||||
SetUpTableDao setUpTableDao = db.setUpTableDao();
|
||||
|
||||
Log.d("MainActivity", "db" + setUpTableDao.getAll());
|
||||
|
||||
int totalStudent = setUpTableDao.getTotalStudent();
|
||||
int myDataListSize = firestoreReception.getMyDataListSize();
|
||||
|
||||
runOnUiThread(() -> {
|
||||
if (totalStudent != myDataListSize) {
|
||||
showRouteCreationDialog(latch);
|
||||
} else {
|
||||
latch.countDown();
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
// タスク2: Firestoreからデータを取得
|
||||
executor.execute(() -> {
|
||||
List<MyDataClass> myDataList = firestoreReception.getMyDataList();
|
||||
CreateRoot createRoot = new CreateRoot(MainActivity.this);
|
||||
createRoot.receiveData(myDataList);
|
||||
latch.countDown();
|
||||
});
|
||||
|
||||
new Thread(() -> {
|
||||
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();
|
||||
}
|
||||
|
||||
//ルート作成する際の警告のダイアログ
|
||||
private void showRouteCreationDialog(CountDownLatch latch) {
|
||||
new AlertDialog.Builder(MainActivity.this)
|
||||
.setTitle("警告")
|
||||
|
|
@ -212,4 +229,46 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
|
|||
})
|
||||
.show();
|
||||
}
|
||||
//submissionクラスに渡すlistの作成
|
||||
private ArrayList<SubmissionStudent> getSubmissionStudents() {
|
||||
ArrayList<SubmissionStudent> submissionStudents = new ArrayList<>();
|
||||
List<MyDataClass> myDataList = firestoreReception.getMyDataList();
|
||||
|
||||
ExecutorService executor = Executors.newSingleThreadExecutor();
|
||||
CountDownLatch latch = new CountDownLatch(1);
|
||||
|
||||
executor.execute(() -> {
|
||||
// 1. Roomデータベースから全生徒数を取得
|
||||
AppDatabase db = Room.databaseBuilder(getApplicationContext(), AppDatabase.class, "SetUpTable").build();
|
||||
SetUpTableDao setUpTableDao = db.setUpTableDao();
|
||||
int totalStudent = setUpTableDao.getTotalStudent();
|
||||
// 2. Firestoreから生徒番号のリストを取得
|
||||
ArrayList<Integer> firestoreStudentNumbers = new ArrayList<>();
|
||||
for (MyDataClass myData : myDataList) {
|
||||
int studentNumber = myData.getStudentNumber();
|
||||
firestoreStudentNumbers.add(studentNumber);
|
||||
}
|
||||
|
||||
// 3. SubmissionStudentオブジェクトのリストを作成
|
||||
for (int i = 1; i <= totalStudent; i++) {
|
||||
boolean submitted = firestoreStudentNumbers.contains(i);
|
||||
submissionStudents.add(new SubmissionStudent(i, submitted));
|
||||
}
|
||||
|
||||
// 4. データベース操作が完了したことを通知
|
||||
latch.countDown();
|
||||
});
|
||||
|
||||
try {
|
||||
// データベース操作が完了するのを待つ
|
||||
latch.await();
|
||||
} catch (InterruptedException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
executor.shutdown();
|
||||
|
||||
// SubmissionStudentオブジェクトのリストを返す
|
||||
return submissionStudents;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,14 +1,55 @@
|
|||
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 java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class SubmissionActivity extends AppCompatActivity {
|
||||
private RecyclerView recyclerView;
|
||||
private SubmissionAdapter submissionAdapter;
|
||||
private List<SubmissionStudent> students = new ArrayList<>();
|
||||
ArrayList<Integer> studentNumbers = new ArrayList<>();
|
||||
private int totalStudent = 10;
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.submission);
|
||||
|
||||
ImageView backButton = findViewById(R.id.BackMain_fromSubmission);
|
||||
backButton.setOnClickListener(v -> {
|
||||
finish();
|
||||
});
|
||||
|
||||
|
||||
studentNumbers=getIntent().getIntegerArrayListExtra("submissionStudents");
|
||||
|
||||
recyclerView = findViewById(R.id.recyclerView);
|
||||
recyclerView.setLayoutManager(new LinearLayoutManager(this));
|
||||
submissionAdapter = new SubmissionAdapter(students);
|
||||
recyclerView.setAdapter(submissionAdapter);
|
||||
|
||||
fetchStudents();
|
||||
}
|
||||
}
|
||||
private void fetchStudents() {
|
||||
// インテントから生徒のリストを取得
|
||||
ArrayList<SubmissionStudent> submissionStudents = getIntent().getParcelableArrayListExtra("submissionStudents");
|
||||
|
||||
// 生徒のリストを反復処理し、それをRecyclerViewに表示
|
||||
for (SubmissionStudent student : submissionStudents) {
|
||||
students.add(student);
|
||||
}
|
||||
|
||||
// データが変更されたことをアダプターに通知
|
||||
submissionAdapter.notifyDataSetChanged();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
60
app/src/main/java/com/example/oplogy/SubmissionAdapter.java
Normal file
60
app/src/main/java/com/example/oplogy/SubmissionAdapter.java
Normal file
|
|
@ -0,0 +1,60 @@
|
|||
package com.example.oplogy;
|
||||
|
||||
import android.graphics.Color;
|
||||
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> {
|
||||
|
||||
private List<SubmissionStudent> students;
|
||||
|
||||
public static class StudentViewHolder extends RecyclerView.ViewHolder {
|
||||
public TextView studentNumberTextView;
|
||||
public TextView statusTextView;
|
||||
|
||||
public StudentViewHolder(View view) {
|
||||
super(view);
|
||||
studentNumberTextView = view.findViewById(R.id.studentNumberTextView);
|
||||
statusTextView = view.findViewById(R.id.statusTextView);
|
||||
}
|
||||
}
|
||||
|
||||
public SubmissionAdapter(List<SubmissionStudent> students) {
|
||||
this.students = students;
|
||||
}
|
||||
|
||||
@Override
|
||||
public StudentViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
|
||||
View view = LayoutInflater.from(parent.getContext())
|
||||
.inflate(R.layout.row_submission, parent, false);
|
||||
return new StudentViewHolder(view);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBindViewHolder(StudentViewHolder holder, int position) {
|
||||
SubmissionStudent student = students.get(position);
|
||||
holder.studentNumberTextView.setText(String.valueOf(student.getStudentNumber()));
|
||||
if (student.isSubmitted()) {
|
||||
holder.statusTextView.setText("提出済み");
|
||||
holder.statusTextView.setBackgroundColor(Color.BLACK);
|
||||
holder.statusTextView.setTextColor(Color.WHITE);
|
||||
holder.studentNumberTextView.setBackgroundColor(Color.BLACK);
|
||||
holder.studentNumberTextView.setTextColor(Color.WHITE);
|
||||
} else {
|
||||
holder.statusTextView.setText("未提出");
|
||||
holder.statusTextView.setBackgroundColor(Color.RED);
|
||||
holder.statusTextView.setTextColor(Color.WHITE);
|
||||
holder.studentNumberTextView.setBackgroundColor(Color.RED);
|
||||
holder.studentNumberTextView.setTextColor(Color.WHITE);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getItemCount() {
|
||||
return students.size();
|
||||
}
|
||||
}
|
||||
49
app/src/main/java/com/example/oplogy/SubmissionStudent.java
Normal file
49
app/src/main/java/com/example/oplogy/SubmissionStudent.java
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
package com.example.oplogy;
|
||||
import android.os.Parcel;
|
||||
import android.os.Parcelable;
|
||||
|
||||
public class SubmissionStudent implements Parcelable {
|
||||
private int studentNumber;
|
||||
private boolean submitted;
|
||||
|
||||
public SubmissionStudent(int studentNumber, boolean submitted) {
|
||||
this.studentNumber = studentNumber;
|
||||
this.submitted = submitted;
|
||||
}
|
||||
|
||||
protected SubmissionStudent(Parcel in) {
|
||||
studentNumber = in.readInt();
|
||||
submitted = in.readByte() != 0;
|
||||
}
|
||||
|
||||
public static final Creator<SubmissionStudent> CREATOR = new Creator<SubmissionStudent>() {
|
||||
@Override
|
||||
public SubmissionStudent createFromParcel(Parcel in) {
|
||||
return new SubmissionStudent(in);
|
||||
}
|
||||
|
||||
@Override
|
||||
public SubmissionStudent[] newArray(int size) {
|
||||
return new SubmissionStudent[size];
|
||||
}
|
||||
};
|
||||
|
||||
public int getStudentNumber() {
|
||||
return studentNumber;
|
||||
}
|
||||
|
||||
public boolean isSubmitted() {
|
||||
return submitted;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int describeContents() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeToParcel(Parcel parcel, int i) {
|
||||
parcel.writeInt(studentNumber);
|
||||
parcel.writeByte((byte) (submitted ? 1 : 0));
|
||||
}
|
||||
}
|
||||
31
app/src/main/res/layout/row_submission.xml
Normal file
31
app/src/main/res/layout/row_submission.xml
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal">
|
||||
|
||||
|
||||
<TextView
|
||||
android:id="@+id/studentNumberTextView"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:background="@android:color/white"
|
||||
android:gravity="center_vertical"
|
||||
android:text="番号"
|
||||
android:textColor="@android:color/black"
|
||||
android:textSize="36sp"
|
||||
android:textStyle="bold" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/statusTextView"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="3"
|
||||
android:text="提出状況"
|
||||
android:textSize="36sp"
|
||||
android:gravity="center_vertical"
|
||||
android:paddingStart="8dp"
|
||||
android:background="@android:color/white"
|
||||
android:textColor="@android:color/black" />
|
||||
</LinearLayout>
|
||||
|
|
@ -1,9 +1,43 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
<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"
|
||||
android:orientation="vertical"
|
||||
android:weightSum="10"
|
||||
tools:context=".SubmissionActivity">
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center"
|
||||
android:orientation="horizontal"
|
||||
android:weightSum="10">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/BackMain_fromSubmission"
|
||||
android:layout_width="36dp"
|
||||
android:layout_height="74dp"
|
||||
android:layout_weight="2"
|
||||
android:src="@drawable/back_button" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/imageSubmission"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="4"
|
||||
android:hint="提出状況"
|
||||
android:textSize="40dp"
|
||||
android:padding="8dp"
|
||||
/>
|
||||
</LinearLayout>
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/recyclerView"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
/>
|
||||
|
||||
</LinearLayout>
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user