diff --git a/backend/public/js/app.js b/backend/public/js/app.js index 4a78d9fc..0f1de50f 100644 --- a/backend/public/js/app.js +++ b/backend/public/js/app.js @@ -47232,7 +47232,6 @@ var MeetingAdd = function MeetingAdd(props) { var history = (0,react_router_dom__WEBPACK_IMPORTED_MODULE_5__.useHistory)(); var father_id = document.getElementById('father_id').value; - var meeting_id = props.match.params.meeting_id; var _useState = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(localStorage.getItem('notice')), _useState2 = _slicedToArray(_useState, 2), @@ -47301,7 +47300,6 @@ var MeetingAdd = function MeetingAdd(props) { setCheckRadio = _useState24[1]; (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () { - setCheckRadio('false'); setLoaded(false); var state = props.history.location.state; @@ -47310,13 +47308,18 @@ var MeetingAdd = function MeetingAdd(props) { setTitle(state === null || state === void 0 ? void 0 : state.title); setMemo(state === null || state === void 0 ? void 0 : state.memo); setText(state === null || state === void 0 ? void 0 : state.text); - setMeetingImages(state === null || state === void 0 ? void 0 : state.meeting_image); setPdf(state === null || state === void 0 ? void 0 : state.pdf); - var list = state.children; + var images = []; + + for (var i in state.meeting_image) { + images.push(state.meeting_image[i].image); + } + + setMeetingImages(images); var arr = []; - for (var i in list) { - arr.push(_objectSpread(_objectSpread({}, list[i]), {}, { + for (var _i2 in state.children) { + arr.push(_objectSpread(_objectSpread({}, state.children[_i2]), {}, { checked: false })); } @@ -47390,6 +47393,15 @@ var MeetingAdd = function MeetingAdd(props) { formdata.append('text', text); formdata.append('memo', memo); formdata.append('pdf', pdf); + formdata.append('image', JSON.stringify(meeting_image)); + var c_arr = []; + + for (var i in children_list) { + if (children_list[i].checked) c_arr.push(children_list[i].id); + } + + formdata.append('children', JSON.stringify(c_arr)); + console.log(c_arr); setSubmit(true); axios__WEBPACK_IMPORTED_MODULE_1___default().post('/api/fathers/meetings/register', formdata).then(function (response) { setSubmit(false); @@ -47426,29 +47438,7 @@ var MeetingAdd = function MeetingAdd(props) { reader.readAsDataURL(_file); reader.onloadend = function () { - var formdata = new FormData(); - formdata.append('image', reader.result); - axios__WEBPACK_IMPORTED_MODULE_1___default().post("/api/fathers/meeting/images/register", formdata, { - params: { - meeting_id: meeting_id - } - }).then(function (response) { - setNotice(response.data.notice); - - switch (response.data.status_code) { - case 200: - setMeetingImages(response.data.params); - break; - - case 400: - set400Error(response.data.error_messages); - break; - - case 422: - set422Errors(response.data.error_messages); - break; - } - }); + setMeetingImages([].concat(_toConsumableArray(meeting_image), [reader.result])); }; }; @@ -47464,24 +47454,11 @@ var MeetingAdd = function MeetingAdd(props) { }; }; - var handleDeleteImage = function handleDeleteImage(image_id) { - axios__WEBPACK_IMPORTED_MODULE_1___default().delete("/api/fathers/meeting/images/delete/".concat(meeting_id), { - params: { - image_id: image_id - } - }).then(function (response) { - setNotice(response.data.notice); + var handleRemoveImage = function handleRemoveImage(image_id) { + var list = _toConsumableArray(meeting_image); - switch (response.data.status_code) { - case 200: - setMeetingImages(response.data.params); - notify_delete(); - break; - - case 400: - set400Error("画像の削除に失敗しました。"); - } - }); + list.splice(image_id, 1); + setMeetingImages(list); }; var handleCheck = function handleCheck(e, index) { @@ -47618,7 +47595,7 @@ var MeetingAdd = function MeetingAdd(props) { className: "edit-set edit-set-mt15", children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("label", { className: "edit-set-file-label", - htmlFor: "file_image", + htmlFor: meeting_image.length < 10 ? 'file_image' : '', children: ["\u753B\u50CF\u30A2\u30C3\u30D7\u30ED\u30FC\u30C9", /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("input", { type: "file", name: "file_image", @@ -47636,11 +47613,11 @@ var MeetingAdd = function MeetingAdd(props) { return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("figure", { className: "image-upload", children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("img", { - src: x.image, - alt: x.image + src: x, + alt: x }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_mui_material_IconButton__WEBPACK_IMPORTED_MODULE_7__.default, { onClick: function onClick(e) { - return handleDeleteImage(x.id); + return handleRemoveImage(k); }, style: { position: 'absolute', diff --git a/backend/resources/js/parent/meeting/add.jsx b/backend/resources/js/parent/meeting/add.jsx index e0da3afd..8ef726f0 100644 --- a/backend/resources/js/parent/meeting/add.jsx +++ b/backend/resources/js/parent/meeting/add.jsx @@ -13,7 +13,6 @@ const MeetingAdd = (props) => { const history = useHistory(); const father_id = document.getElementById('father_id').value; - const meeting_id = props.match.params.meeting_id; const [notice, setNotice] = useState(localStorage.getItem('notice')); const [title, setTitle] = useState(''); @@ -32,7 +31,6 @@ const MeetingAdd = (props) => { useEffect(()=>{ - setCheckRadio('false'); setLoaded(false); const state = props.history.location.state; if(state){ @@ -40,12 +38,15 @@ const MeetingAdd = (props) => { setTitle(state?.title); setMemo(state?.memo); setText(state?.text); - setMeetingImages(state?.meeting_image); setPdf(state?.pdf); - var list = state.children; + let images = []; + for(let i in state.meeting_image){ + images.push(state.meeting_image[i].image); + } + setMeetingImages(images); var arr = []; - for(var i in list){ - arr.push({...list[i], checked: false}) + for(let i in state.children){ + arr.push({...state.children[i], checked: false}) } setChildrenList(arr); } @@ -96,7 +97,14 @@ const MeetingAdd = (props) => { formdata.append('title', title); formdata.append('text', text); formdata.append('memo', memo); - formdata.append('pdf', pdf); + formdata.append('pdf', pdf); + formdata.append('image', JSON.stringify(meeting_image)); + let c_arr = []; + for(let i in children_list){ + if(children_list[i].checked) c_arr.push(children_list[i].id); + } + formdata.append('children', JSON.stringify(c_arr)); + console.log(c_arr); setSubmit(true); axios.post('/api/fathers/meetings/register', formdata) @@ -124,18 +132,7 @@ const MeetingAdd = (props) => { if(!_file) return; reader.readAsDataURL(_file); reader.onloadend = () => { - const formdata = new FormData(); - formdata.append('image', reader.result); - axios.post(`/api/fathers/meeting/images/register`, formdata, {params:{meeting_id: meeting_id}}) - .then(response => { - setNotice(response.data.notice); - switch(response.data.status_code){ - case 200: setMeetingImages(response.data.params); break; - case 400: set400Error(response.data.error_messages); break; - case 422: set422Errors(response.data.error_messages); break; - } - }); - + setMeetingImages([...meeting_image, reader.result]); }; }; @@ -150,15 +147,10 @@ const MeetingAdd = (props) => { } } - const handleDeleteImage = (image_id) => { - axios.delete(`/api/fathers/meeting/images/delete/${meeting_id}`, {params:{image_id: image_id}}) - .then(response=>{ - setNotice(response.data.notice); - switch(response.data.status_code){ - case 200: setMeetingImages(response.data.params); notify_delete(); break; - case 400: set400Error("画像の削除に失敗しました。"); - } - }) + const handleRemoveImage = (image_id) => { + let list = [...meeting_image]; + list.splice(image_id, 1); + setMeetingImages(list); } const handleCheck = (e, index) => { @@ -248,7 +240,7 @@ const MeetingAdd = (props) => { }
-