From 81526d7d6a5f989195b0ca9f3c85716eb414d1b8 Mon Sep 17 00:00:00 2001 From: nakazawakan Date: Tue, 8 Feb 2022 15:54:06 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E5=85=A8=E3=81=A6=E3=81=AE=E6=89=BF?= =?UTF-8?q?=E8=AA=8D=E3=81=AE=E3=83=86=E3=82=AD=E3=82=B9=E3=83=88=E3=82=92?= =?UTF-8?q?=E6=89=BF=E7=9F=A5=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Api/MeetingApprovalsController.php | 22 +++++++++---------- backend/resources/js/child/meeting/detail.jsx | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/backend/app/Http/Controllers/Api/MeetingApprovalsController.php b/backend/app/Http/Controllers/Api/MeetingApprovalsController.php index 3db44210..e9b2b5ca 100644 --- a/backend/app/Http/Controllers/Api/MeetingApprovalsController.php +++ b/backend/app/Http/Controllers/Api/MeetingApprovalsController.php @@ -33,11 +33,11 @@ class MeetingApprovalsController extends Controller { $cnt = MeetingApprovals::select('id')->whereNotNull('approval_at')->where('meeting_id', (int)$l->id)->count(); $apr = count($apr); - + if ($apr != 0 && $apr == $cnt) { continue; } - + $count++; } } @@ -96,19 +96,19 @@ class MeetingApprovalsController extends Controller { public function registerApproval (Request $r) { if (!isset($r->meeting_id) || !isset(session()->get('children')['id'])) { - return ['status_code' => 400, 'error_messages' => ['承認に失敗しました。']]; + return ['status_code' => 400, 'error_messages' => ['承知に失敗しました。']]; } if (null === (MeetingApprovals::where('meeting_id', (int)$r->meeting_id)->where('child_id', (int)session()->get('children')['id'])->first())) { - return ['status_code' => 400, 'error_messages' => ['承認に失敗しました。']]; + return ['status_code' => 400, 'error_messages' => ['承知に失敗しました。']]; } if (null === ($meet = Meeting::where('id', (int)$r->meeting_id)->first())) { - return ['status_code' => 400, 'error_messages' => ['承認に失敗しました。']]; + return ['status_code' => 400, 'error_messages' => ['承知に失敗しました。']]; } if (null === ($father = Father::where('id', (int)$meet->father_id)->first())) { - return ['status_code' => 400, 'error_messages' => ['承認に失敗しました。']]; + return ['status_code' => 400, 'error_messages' => ['承知に失敗しました。']]; } // $update = ['approval_at' => null]; @@ -120,22 +120,22 @@ class MeetingApprovalsController extends Controller { } catch (\Throwable $e) { // 失敗 Log::critical($e->getMessage()); - return ['status_code' => 400, 'error_messages' => ['承認に失敗しました。']]; + return ['status_code' => 400, 'error_messages' => ['承知に失敗しました。']]; } - return ['status_code' => 200, 'success_messages' => ['承認しました。']]; + return ['status_code' => 200, 'success_messages' => ['承知しました。']]; } public function listChildrenOfMeeting (Request $r) { if (!isset($r->meeting_id) || !isset($r->child_id)) { - return ['status_code' => 400, 'error_messages' => ['承認に失敗しました。']]; + return ['status_code' => 400, 'error_messages' => ['承知に失敗しました。']]; } $meeting_approvals_select = ['id', 'child_id', 'approval_at']; $update = ['hire_at' => date('Y-m-d H:i:s', strtotime($r->hire_at))]; if (null === ($params = MeetingApprovals::select($meeting_approvals_select)->where('meeting_id', (int)$r->meeting_id)->where('child_id', (int)$r->child_id)->get())) { - return ['status_code' => 400, 'error_messages' => ['承認に失敗しました。']]; + return ['status_code' => 400, 'error_messages' => ['承知に失敗しました。']]; } try { @@ -146,7 +146,7 @@ class MeetingApprovalsController extends Controller { return ['status_code' => 400, 'error_messages' => ['登録に失敗しました。']]; } - return ['status_code' => 200, 'success_messages' => ['承認しました。']]; + return ['status_code' => 200, 'success_messages' => ['承知しました。']]; } public function listChildrenOfApprovel (Request $r) { diff --git a/backend/resources/js/child/meeting/detail.jsx b/backend/resources/js/child/meeting/detail.jsx index ad8f8c9d..4fb18cb4 100644 --- a/backend/resources/js/child/meeting/detail.jsx +++ b/backend/resources/js/child/meeting/detail.jsx @@ -122,7 +122,7 @@ const ChildMeetingDetail = () => {
} From b54db2309ebf23b99c521181bd35dd4edbb10177 Mon Sep 17 00:00:00 2001 From: nakazawakan Date: Wed, 9 Feb 2022 20:55:18 +0900 Subject: [PATCH 2/2] =?UTF-8?q?LINE=E3=81=A7=E6=8B=9B=E5=BE=85=E6=A9=9F?= =?UTF-8?q?=E8=83=BD=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/resources/js/parent/meeting/detail.jsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/resources/js/parent/meeting/detail.jsx b/backend/resources/js/parent/meeting/detail.jsx index 0df727d1..14027ee8 100644 --- a/backend/resources/js/parent/meeting/detail.jsx +++ b/backend/resources/js/parent/meeting/detail.jsx @@ -52,7 +52,7 @@ const ParentMeetingDetail = () => { if(isAuthenticate()){ setLoaded(false); - + axios.get(`/api/fathers/meetings/detail/${params?.meeting_id}`, {params: { father_id: father_id}}) .then((response) => { if(isMountedRef.current) return; @@ -96,7 +96,7 @@ const ParentMeetingDetail = () => { axios.delete(`/api/fathers/meetings/delete/${params?.meeting_id}`) .then(response => { if(isMountedRef.current) return; - + setNotice(response.data.notice); setSubmitDelete(false); setShowDeleteModal(false); @@ -118,7 +118,7 @@ const ParentMeetingDetail = () => { formdata.append('meeting_id', meetingId); formdata.append('is_favorite', currentFavorite == 1 ? 0 : 1); axios.post('/api/fathers/meetings/registerFavorite', formdata) - + const updatedItem = { ...meeting, is_favorite: currentFavorite == 1 ? 0 : 1, @@ -265,7 +265,7 @@ const ParentMeetingDetail = () => { { moment(meeting?.updated_at).format('YYYY/MM/DD') }
- 招待用URLをLINEで送信 + この案件をLINEに送信する