diff --git a/app/src/main/java/com/example/citrusclient/rest/TodosRest.java b/app/src/main/java/com/example/citrusclient/rest/TodosRest.java index a23a4f3..ec2b842 100644 --- a/app/src/main/java/com/example/citrusclient/rest/TodosRest.java +++ b/app/src/main/java/com/example/citrusclient/rest/TodosRest.java @@ -90,6 +90,7 @@ @Path("day") Integer day, @Path("todo_id") Integer todoId, @Field("title") String title, + @Field("new_book_id") Integer newBookId, @Field("new_year") Integer newYear, @Field("new_month") Integer newMonth, @Field("new_day") Integer newDay, diff --git a/app/src/main/java/com/example/citrusclient/viewmodels/TodosViewModel.java b/app/src/main/java/com/example/citrusclient/viewmodels/TodosViewModel.java index 857f912..9d97b44 100644 --- a/app/src/main/java/com/example/citrusclient/viewmodels/TodosViewModel.java +++ b/app/src/main/java/com/example/citrusclient/viewmodels/TodosViewModel.java @@ -201,9 +201,9 @@ } public void setTodo(String accountId, Integer BookId, Integer year, Integer month, Integer day, - Integer todoId, String title, Integer newYear,Integer newMonth,Integer newDay, String token) + Integer todoId, String title, Integer newBookId, Integer newYear,Integer newMonth,Integer newDay, String token) { - Call call = todosRest.setTodo(accountId, BookId, year, month, day, todoId, title, newYear, newMonth, newDay, token); + Call call = todosRest.setTodo(accountId, BookId, year, month, day, todoId, title, newBookId, newYear, newMonth, newDay, token); call.enqueue(new Callback() { @Override public void onResponse(Call call, Response response) { diff --git a/app/src/main/java/com/example/citrusclient/views/CreateTodoFragment.java b/app/src/main/java/com/example/citrusclient/views/CreateTodoFragment.java index 5aef3d3..250cbe2 100644 --- a/app/src/main/java/com/example/citrusclient/views/CreateTodoFragment.java +++ b/app/src/main/java/com/example/citrusclient/views/CreateTodoFragment.java @@ -246,8 +246,8 @@ } if(isEdit){ //編集時 - todosViewModel.setTodo(accountId,spinner.getSelectedItemPosition(),editTodo.getYear(),editTodo.getMonth(), - editTodo.getDay(), editTodo.getTodoId(), title, year, month, day, token); + todosViewModel.setTodo(accountId,editBook.getBookId() ,editTodo.getYear(),editTodo.getMonth(), + editTodo.getDay(), editTodo.getTodoId(), title,spinner.getSelectedItemPosition(), year, month, day, token); ((MainActivity)getActivity()).backFragment(); }else{ //追加時