Ns1-j/oplogy
5
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request 'classIdの表示する時、0になる問題を解決' (#51) from murakumo_classIdが0になる問題 into master

Browse Source 
Reviewed-on: #51
This commit is contained in:
murakumo 2024-07-12 01:16:34 +00:00
commit 2f2c99cf6f
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/com/example/oplogy/MainActivity.java
View File

@ -20,7 +20,6 @@ import com.google.gson.Gson;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
@ -190,9 +189,13 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
executor.execute(() -> { executor.execute(() -> {
// 現在のクラスIDを取得 // 現在のクラスIDを取得
int currentClassId = getCurrentClassIdFromRoom(); int currentClassId = getCurrentClassIdFromRoom();
if (currentClassId == 0) {
currentClassId = classId;
}
final int showDialogClassId = currentClassId;
runOnUiThread(() -> { runOnUiThread(() -> {
// 現在のクラスIDを表示するダイアログ // 現在のクラスIDを表示するダイアログ
showClassIdDialog("現在のID", currentClassId); showClassIdDialog("現在のID", showDialogClassId);
}); });
}); });
executor.shutdown(); executor.shutdown();
@ -389,14 +392,14 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
for (int i = 0; i < studentNumbers.size(); i++) { for (int i = 0; i < studentNumbers.size(); i++) {
message.append("出席番号:" + studentNumbers.get(i)); message.append("出席番号:" + studentNumbers.get(i));
message.append("\n保護者名:" + myDataList.get(i).getPatronName()); message.append("\n保護者名:" + myDataList.get(i).getPatronName());
message.append("\n第一希望 " + myDataList.get(i).getStartDateString().substring(4,6)+"月"); message.append("\n第一希望 " + myDataList.get(i).getStartDateString().substring(4, 6) + "月");
message.append(myDataList.get(i).getStartDateString().substring(6,8)+"日"); message.append(myDataList.get(i).getStartDateString().substring(6, 8) + "日");
message.append(" " + myDataList.get(i).getParentStartTimeString().substring(0, 2)); message.append(" " + myDataList.get(i).getParentStartTimeString().substring(0, 2));
message.append(":" + myDataList.get(i).getParentStartTimeString().substring(2, 4)); message.append(":" + myDataList.get(i).getParentStartTimeString().substring(2, 4));
message.append("～" + myDataList.get(i).getParentEndTimeString().substring(0, 2)); message.append("～" + myDataList.get(i).getParentEndTimeString().substring(0, 2));
message.append(":" + myDataList.get(i).getParentEndTimeString().substring(2, 4)); message.append(":" + myDataList.get(i).getParentEndTimeString().substring(2, 4));
message.append("\n第二希望 " + myDataList.get(i).getSecondDayStartDateString().substring(4,6)+"月"); message.append("\n第二希望 " + myDataList.get(i).getSecondDayStartDateString().substring(4, 6) + "月");
message.append(myDataList.get(i).getSecondDayStartDateString().substring(6,8)+"日"); message.append(myDataList.get(i).getSecondDayStartDateString().substring(6, 8) + "日");
message.append(" " + myDataList.get(i).getSecondDayParentStartTimeString().substring(0, 2)); message.append(" " + myDataList.get(i).getSecondDayParentStartTimeString().substring(0, 2));
message.append(":" + myDataList.get(i).getSecondDayParentStartTimeString().substring(2, 4)); message.append(":" + myDataList.get(i).getSecondDayParentStartTimeString().substring(2, 4));
message.append("～" + myDataList.get(i).getSecondDayParentEndTimeString().substring(0, 2)); message.append("～" + myDataList.get(i).getSecondDayParentEndTimeString().substring(0, 2));