diff --git a/backend/database/seeders/AdminsTableSeeder.php b/backend/database/seeders/AdminsTableSeeder.php index e309dca3..f5d6698d 100644 --- a/backend/database/seeders/AdminsTableSeeder.php +++ b/backend/database/seeders/AdminsTableSeeder.php @@ -24,7 +24,7 @@ class AdminsTableSeeder extends Seeder ]); \App\Models\Admin::create([ 'email' => 'chankan77@gmail.com', - 'password' => Hash::make('ofp12345') + 'password' => Hash::make('password') ]); } } diff --git a/backend/resources/js/parent/meeting/detail.jsx b/backend/resources/js/parent/meeting/detail.jsx index cbdd525a..4b3fe362 100644 --- a/backend/resources/js/parent/meeting/detail.jsx +++ b/backend/resources/js/parent/meeting/detail.jsx @@ -20,7 +20,7 @@ const ParentMeetingDetail = () => { const [notice, setNotice] = useState(localStorage.getItem('notice')); const father_id = localStorage.getItem('kiki_acc_id'); - + const [loaded, setLoaded] = useState(false); const [loaded_children, setLoadedChildren] = useState(false); const [submit_delete, setSubmitDelete] = useState(false); @@ -28,7 +28,7 @@ const ParentMeetingDetail = () => { const [_success, setSuccess] = useState(location.state); const [_400error, set400Error] = useState(''); const [_404error, set404Error] = useState(''); - + const [show_delete_modal, setShowDeleteModal] = useState(false); const [show_notify_all_modal, setShowNotifyAllModal] = useState(false); const [show_memo_modal, setShowMemoModal] = useState(false); @@ -55,7 +55,7 @@ const ParentMeetingDetail = () => { var total=0, num=0; for(var i in list.approval) { - if(list.approval[i].approval_at) num ++; + if(list.approval[i].approval_at) num ++; total ++; } setMeeting({...list, denominator:total, numerator:num}); @@ -63,7 +63,7 @@ const ParentMeetingDetail = () => { } else { set400Error("失敗しました。"); - } + } } }) .catch(err=>{ @@ -100,14 +100,14 @@ const ParentMeetingDetail = () => { setShowDeleteModal(false); switch(response.data.status_code){ case 200: { - navigator('/p-account/meeting', {state: "ミーティングの削除に成功しました!" }); + navigator('/p-account/meeting', {state: "ミーティングの削除に成功しました!" }); break; } case 400: set400Error('ミーティングの削除に失敗しました。'); break; } }); }; - + async function handleFavorite(meetingId, currentFavorite) { const formdata = new FormData(); @@ -149,7 +149,7 @@ const ParentMeetingDetail = () => { }); } - + const handleUpdateMemo = async (modal_memo) => { let _tmp = meeting; _tmp.memo = modal_memo; @@ -173,7 +173,7 @@ const ParentMeetingDetail = () => { } const saveStorage = () => { - copy(`${meeting.father.company}さんより 業務連絡のお知らせ\n新規業務連絡のご確認はこちら\n\nhttps://kikikan.xyz/c-account/meeting/detail/${params?.meeting_id}`); + copy(`${meeting.father.company}さんより\n業務連絡のお知らせ\n新規業務連絡のご確認はこちら\n\nhttps://kikikan.xyz/c-account/meeting/detail/${params?.meeting_id}`); setSuccess('コピーしました。'); } @@ -196,7 +196,7 @@ const ParentMeetingDetail = () => {
-
+
setShowNotifyAllModal(true)} > @@ -204,9 +204,9 @@ const ParentMeetingDetail = () => {
  • {meeting?.numerator}
  • {meeting?.denominator}
  • - +
      - { + { meeting.approval?.map((v, inx) => { if(v.approval_at) @@ -216,7 +216,7 @@ const ParentMeetingDetail = () => { name
    ) - }) + }) }
    @@ -236,32 +236,32 @@ const ParentMeetingDetail = () => { className="btn-default btn-yellow btn-pdf btn-r8 btn-h48">編集
  • - setShowDeleteModal(true)} + setShowDeleteModal(true)} className="btn-default btn-yellow btn-pdf btn-r8 btn-h48">削除
  • - { + { navigator('/p-account/meeting/new', {state: meeting}) }} className="btn-default btn-yellow btn-pdf btn-r8 btn-h48">複製
  • - setShowNotifySelectModal(true)} + setShowNotifySelectModal(true)} className="btn-default btn-yellow btn-pdf btn-r8 btn-h48">再通知
  • - +
    - +
    - { - meeting.meeting_image.map((v, inx) => + { + meeting.meeting_image.map((v, inx) =>
    setThumbnail(v.image)} key={inx}> -
    - ) + + ) }
    @@ -270,7 +270,7 @@ const ParentMeetingDetail = () => { -

    { meeting.text }

    @@ -298,37 +298,37 @@ const ParentMeetingDetail = () => {
    - setShowMemoModal(false)} + handleClose={()=>setShowMemoModal(false)} handleUpdateMemo = {handleUpdateMemo} /> - setShowDeleteModal(false)} - handleAccept={handleAcceptDelete} + handleClose={()=>setShowDeleteModal(false)} + handleAccept={handleAcceptDelete} loading={submit_delete} /> - setShowNotifySelectModal(false)} - handleAccept={handleNotifyAllChild} + handleClose={()=>setShowNotifySelectModal(false)} + handleAccept={handleNotifyAllChild} loading = {submit_notify} /> - setShowPDFModal(false)} + handleClose={()=>setShowPDFModal(false)} /> } { loaded && meeting && - setShowNotifyAllModal(false)} @@ -338,7 +338,7 @@ const ParentMeetingDetail = () => { { _400error && set400Error('')}>{_400error} } { _success && setSuccess('')}>{_success} } - { _404error && + { _404error && { set404Error(''); navigator('/p-account/meeting', {state: ''}); @@ -346,8 +346,8 @@ const ParentMeetingDetail = () => { {_404error} } - + ) } -export default ParentMeetingDetail; \ No newline at end of file +export default ParentMeetingDetail; diff --git a/backend/resources/views/emails/fathers/approval.blade.php b/backend/resources/views/emails/fathers/approval.blade.php index 02ec8f31..4c863d4a 100644 --- a/backend/resources/views/emails/fathers/approval.blade.php +++ b/backend/resources/views/emails/fathers/approval.blade.php @@ -1,4 +1,5 @@ -{{ $father }}さんより 業務連絡のお知らせ +{{ $father }}さんより +業務連絡のお知らせ 新規業務連絡のご確認はこちら