diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1d165bb..36af9be 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -43,15 +43,9 @@
android:name=".Maps"
android:exported="false"
android:label="@string/title_activity_maps" />
-
-
diff --git a/app/src/main/java/com/example/oplogy/CreateUUID.java b/app/src/main/java/com/example/oplogy/CreateUUID.java
index c9bbcc8..840a050 100644
--- a/app/src/main/java/com/example/oplogy/CreateUUID.java
+++ b/app/src/main/java/com/example/oplogy/CreateUUID.java
@@ -21,8 +21,6 @@ public class CreateUUID {
//firestoreに挿入処理
InsertClassIdforFirebase insertClassIdforFirebase = new InsertClassIdforFirebase();
insertClassIdforFirebase.insertClassId(uuidInt);
- //テスト用
- uuidInt = 328071;
return uuidInt;
}
}
diff --git a/app/src/main/java/com/example/oplogy/FirestoreReception.java b/app/src/main/java/com/example/oplogy/FirestoreReception.java
index 006c41b..8ef8187 100644
--- a/app/src/main/java/com/example/oplogy/FirestoreReception.java
+++ b/app/src/main/java/com/example/oplogy/FirestoreReception.java
@@ -27,12 +27,9 @@ public class FirestoreReception {
//ClassIdを引数にデータの作成を行う
public void getDocumentsByClassId(int classId) {
myDataList.clear();
- //pixel6a
- CollectionReference collectionRef = db.collection("test0711Data");
+ CollectionReference collectionRef = db.collection("QuestionForm");
+
- //xiaomi
-// CollectionReference collectionRef = db.collection("testDistinct");
- // classIdが引数のものを取得する
collectionRef.whereEqualTo("classId", classId).get()
.addOnCompleteListener(new OnCompleteListener() {
@Override
diff --git a/app/src/main/java/com/example/oplogy/RootSearchActivity.java b/app/src/main/java/com/example/oplogy/RootSearchActivity.java
deleted file mode 100644
index bd1f5b9..0000000
--- a/app/src/main/java/com/example/oplogy/RootSearchActivity.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.example.oplogy;
-
-import android.os.Bundle;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-public class RootSearchActivity extends AppCompatActivity {
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.root_search);
- }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/oplogy/SetUpActivity.java b/app/src/main/java/com/example/oplogy/SetUpActivity.java
index 1b7c837..4d0b410 100644
--- a/app/src/main/java/com/example/oplogy/SetUpActivity.java
+++ b/app/src/main/java/com/example/oplogy/SetUpActivity.java
@@ -104,8 +104,22 @@ public class SetUpActivity extends FragmentActivity
setUp.setOnClickListener(view -> {
teacherNameString = setTeacherName.getText().toString(); //各変数に値を挿入
- Log.d(TAG, "Teacher Name: " + teacherNameString);
startPointString = setStartPoint.getText().toString();
+ firstDayString = setFirstDay.getText().toString();
+ secondDayString = setSecondDay.getText().toString();
+ thirdDayString = setThirdDay.getText().toString();
+ startTimeString = setStartTime.getText().toString();
+ endTimeString = setEndTime.getText().toString();
+ startBreakTimeString = setStartBreakTime.getText().toString();
+ endBreakTimeString = setEndBreakTime.getText().toString();
+
+ try {
+ totalStudentString = Integer.parseInt(setTotalStudent.getText().toString());
+ } catch (NumberFormatException e) {
+ Toast.makeText(SetUpActivity.this, "記入欄にすべて入力を済ませてから押してください", Toast.LENGTH_SHORT).show();
+ return;
+ }
+ Log.d(TAG, "Teacher Name: " + teacherNameString);
Log.d(TAG, "Start Point: " + startPointString);
Log.d(TAG, "First Day:" + firstDayString);
Log.d(TAG, "Second Day:" + secondDayString);
@@ -124,11 +138,9 @@ public class SetUpActivity extends FragmentActivity
Log.d(TAG, "Interval Time" + intervalTimeString);
Log.d(TAG, "Start Break Time" + startBreakTimeString);
Log.d(TAG, "End Break Time" + endBreakTimeString);
- totalStudentString = Integer.parseInt(setTotalStudent.getText().toString()); //数値型に変更
Log.d(TAG, "Total Student" + totalStudentString);
Log.d(TAG, "onClick: できてるよ");
-
// データベースへの登録処理
ExecutorService executor = Executors.newSingleThreadExecutor();
@@ -176,7 +188,6 @@ public class SetUpActivity extends FragmentActivity
});
-
});
setFirstDay.setOnClickListener(v -> {
@@ -235,6 +246,7 @@ public class SetUpActivity extends FragmentActivity
});
}
+
@Override
public void onDateSet(DatePicker datePicker, int year, int month, int dayOfMonth) { //Dateを成形する
// DatePickerDialogで選択された日付を処理する
diff --git a/app/src/main/java/com/example/oplogy/TutorialActivity.java b/app/src/main/java/com/example/oplogy/TutorialActivity.java
deleted file mode 100644
index 85f207c..0000000
--- a/app/src/main/java/com/example/oplogy/TutorialActivity.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.example.oplogy;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-import android.os.Bundle;
-
-public class TutorialActivity extends AppCompatActivity {
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.tutorial);
- }
-}
\ No newline at end of file
diff --git a/app/src/main/res/layout/root_search.xml b/app/src/main/res/layout/root_search.xml
deleted file mode 100644
index 7a3f713..0000000
--- a/app/src/main/res/layout/root_search.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/tutorial.xml b/app/src/main/res/layout/tutorial.xml
deleted file mode 100644
index 46791f9..0000000
--- a/app/src/main/res/layout/tutorial.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 852a990..9cc2447 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,7 +3,7 @@
AIzaSyBqLqPm76UFpwbpU8b3oiH0wbkhosrPWpU
MapsActivity
設定
- リセット
+ データ削除
担任の名前
開始地点
開始時刻