chankan77
GitHub
コミット
7b3930dbb7
|
|
@ -24,7 +24,7 @@ class AdminsTableSeeder extends Seeder
|
|||
]);
|
||||
\App\Models\Admin::create([
|
||||
'email' => 'chankan77@gmail.com',
|
||||
'password' => Hash::make('ofp12345')
|
||||
'password' => Hash::make('password')
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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 = () => {
|
|||
<div className="p-article">
|
||||
<div className="p-article-wrap">
|
||||
<article className="p-article__body">
|
||||
<div className="p-article__content">
|
||||
<div className="p-article__content">
|
||||
<div className="meeting-member">
|
||||
<div className="meeting-member-wrap">
|
||||
<div className="meeting-member-link" onClick={()=>setShowNotifyAllModal(true)} >
|
||||
|
|
@ -204,9 +204,9 @@ const ParentMeetingDetail = () => {
|
|||
<li className="numerator">{meeting?.numerator}</li>
|
||||
<li className="denominator">{meeting?.denominator}</li>
|
||||
</ul>
|
||||
|
||||
|
||||
<ul className="meeting-member-list" role="list">
|
||||
{
|
||||
{
|
||||
meeting.approval?.map((v, inx) =>
|
||||
{
|
||||
if(v.approval_at)
|
||||
|
|
@ -216,7 +216,7 @@ const ParentMeetingDetail = () => {
|
|||
<img alt="name" className="avatar-img" src={v?.child.image} />
|
||||
</div>
|
||||
</li>)
|
||||
})
|
||||
})
|
||||
}
|
||||
</ul>
|
||||
</div>
|
||||
|
|
@ -236,32 +236,32 @@ const ParentMeetingDetail = () => {
|
|||
className="btn-default btn-yellow btn-pdf btn-r8 btn-h48">編集</Link>
|
||||
</li>
|
||||
<li className="p-article-btn__item">
|
||||
<a onClick={()=>setShowDeleteModal(true)}
|
||||
<a onClick={()=>setShowDeleteModal(true)}
|
||||
className="btn-default btn-yellow btn-pdf btn-r8 btn-h48">削除</a>
|
||||
</li>
|
||||
<li className="p-article-btn__item">
|
||||
<a onClick={()=>{
|
||||
<a onClick={()=>{
|
||||
navigator('/p-account/meeting/new', {state: meeting})
|
||||
}}
|
||||
className="btn-default btn-yellow btn-pdf btn-r8 btn-h48">複製</a>
|
||||
</li>
|
||||
<li className="p-article-btn__item">
|
||||
<a onClick={()=>setShowNotifySelectModal(true)}
|
||||
<a onClick={()=>setShowNotifySelectModal(true)}
|
||||
className="btn-default btn-yellow btn-pdf btn-r8 btn-h48">再通知</a>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
|
||||
<div className="p-article__context">
|
||||
|
||||
|
||||
<div className="p-file-list">
|
||||
<Thumbnail image={thumbnail}/>
|
||||
<div className="p-file-nav">
|
||||
{
|
||||
meeting.meeting_image.map((v, inx) =>
|
||||
{
|
||||
meeting.meeting_image.map((v, inx) =>
|
||||
<figure onClick={() => setThumbnail(v.image)} key={inx}>
|
||||
<img src={v.image} alt="" />
|
||||
</figure>
|
||||
)
|
||||
</figure>
|
||||
)
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -270,7 +270,7 @@ const ParentMeetingDetail = () => {
|
|||
<div className="p-article__pdf__btn">
|
||||
{
|
||||
meeting.pdf ?
|
||||
<a data-v-ade1d018="" className="btn-default btn-yellow btn-pdf btn-r8 btn-h52"
|
||||
<a data-v-ade1d018="" className="btn-default btn-yellow btn-pdf btn-r8 btn-h52"
|
||||
href={meeting.pdf}
|
||||
target='_blank'
|
||||
// onClick={()=>handlePDFOpen(meeting.pdf)}
|
||||
|
|
@ -283,13 +283,13 @@ const ParentMeetingDetail = () => {
|
|||
</a>
|
||||
}
|
||||
</div>
|
||||
<button type="button"
|
||||
aria-label="お気に入り" data-tooltip="お気に入り"
|
||||
aria-pressed="false"
|
||||
<button type="button"
|
||||
aria-label="お気に入り" data-tooltip="お気に入り"
|
||||
aria-pressed="false"
|
||||
className="icon a-icon like-icon icon-textFill icon-textFill-wrap a-icon-size_medium"
|
||||
onClick = {()=>setShowMemoModal(true)} />
|
||||
<button type="button"
|
||||
onClick={e => handleFavorite(meeting.id, meeting.is_favorite)}
|
||||
<button type="button"
|
||||
onClick={e => handleFavorite(meeting.id, meeting.is_favorite)}
|
||||
aria-label="お気に入り" data-tooltip="お気に入り" aria-pressed="false" className={`icon a-icon like-icon ${meeting.is_favorite == 1 ? "icon-starFill icon-starFill-wrap" : "icon-star icon-star-wrap"} a-icon-size_medium`}></button>
|
||||
</div>
|
||||
<p className="p-article__txt">{ meeting.text }</p>
|
||||
|
|
@ -298,37 +298,37 @@ const ParentMeetingDetail = () => {
|
|||
</article>
|
||||
</div>
|
||||
</div>
|
||||
<ModalEditMemo
|
||||
<ModalEditMemo
|
||||
show={show_memo_modal}
|
||||
title={"メモ"}
|
||||
content={meeting.memo}
|
||||
handleClose={()=>setShowMemoModal(false)}
|
||||
handleClose={()=>setShowMemoModal(false)}
|
||||
handleUpdateMemo = {handleUpdateMemo}
|
||||
/>
|
||||
<ModalConfirm
|
||||
show={show_delete_modal}
|
||||
<ModalConfirm
|
||||
show={show_delete_modal}
|
||||
message={"本当に削除しても\nよろしいでしょうか？"}
|
||||
handleClose={()=>setShowDeleteModal(false)}
|
||||
handleAccept={handleAcceptDelete}
|
||||
handleClose={()=>setShowDeleteModal(false)}
|
||||
handleAccept={handleAcceptDelete}
|
||||
loading={submit_delete}
|
||||
/>
|
||||
<ModalConfirm
|
||||
<ModalConfirm
|
||||
show={show_notify_pickup_modal}
|
||||
message={"未承知の方に再通知しますが\nよろしいでしょうか？"}
|
||||
handleClose={()=>setShowNotifySelectModal(false)}
|
||||
handleAccept={handleNotifyAllChild}
|
||||
handleClose={()=>setShowNotifySelectModal(false)}
|
||||
handleAccept={handleNotifyAllChild}
|
||||
loading = {submit_notify}
|
||||
/>
|
||||
<ModalPdf
|
||||
<ModalPdf
|
||||
show={show_pdf_modal}
|
||||
pdfPath={meeting.pdf}
|
||||
handleClose={()=>setShowPDFModal(false)}
|
||||
handleClose={()=>setShowPDFModal(false)}
|
||||
/>
|
||||
</div>
|
||||
}
|
||||
{
|
||||
loaded && meeting &&
|
||||
<ModalSettingNotify
|
||||
<ModalSettingNotify
|
||||
show={show_notify_all_modal}
|
||||
meetingId={meeting.id}
|
||||
handleClose={()=>setShowNotifyAllModal(false)}
|
||||
|
|
@ -338,7 +338,7 @@ const ParentMeetingDetail = () => {
|
|||
</div>
|
||||
{ _400error && <Alert type="fail" hide={()=>set400Error('')}>{_400error}</Alert> }
|
||||
{ _success && <Alert type="success" hide={()=>setSuccess('')}>{_success}</Alert> }
|
||||
{ _404error &&
|
||||
{ _404error &&
|
||||
<Alert type="fail" hide={()=>{
|
||||
set404Error('');
|
||||
navigator('/p-account/meeting', {state: ''});
|
||||
|
|
@ -346,8 +346,8 @@ const ParentMeetingDetail = () => {
|
|||
{_404error}
|
||||
</Alert>
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
export default ParentMeetingDetail;
|
||||
export default ParentMeetingDetail;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{{ $father }}さんより 業務連絡のお知らせ
|
||||
{{ $father }}さんより
|
||||
業務連絡のお知らせ
|
||||
|
||||
新規業務連絡のご確認はこちら
|
||||
|
||||
|
|
|
|||
新しいイシューから参照