admin、parentのmeeting/editを修正しました。
このコミットが含まれているのは:
コミット
f4bd90a063
|
@ -36406,11 +36406,6 @@ var MeetingEdit = function MeetingEdit(props) {
|
|||
children_temp = _useState30[0],
|
||||
setChildrenTemp = _useState30[1];
|
||||
|
||||
var _useState31 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)([]),
|
||||
_useState32 = _slicedToArray(_useState31, 2),
|
||||
deleted_image_id = _useState32[0],
|
||||
setDeletedImageID = _useState32[1];
|
||||
|
||||
(0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
|
||||
if (!loaded) return; //if dont load data
|
||||
|
||||
|
@ -36437,10 +36432,8 @@ var MeetingEdit = function MeetingEdit(props) {
|
|||
setChildrenTemp(list);
|
||||
}, [check_radio]);
|
||||
(0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
|
||||
var _props$match$params;
|
||||
|
||||
setLoaded(false);
|
||||
axios__WEBPACK_IMPORTED_MODULE_1___default().get("/api/admin/meetings/detail/".concat((_props$match$params = props.match.params) === null || _props$match$params === void 0 ? void 0 : _props$match$params.meeting_id)).then(function (response) {
|
||||
axios__WEBPACK_IMPORTED_MODULE_1___default().get("/api/admin/meetings/detail/".concat(meeting_id)).then(function (response) {
|
||||
setLoaded(true);
|
||||
|
||||
if (response.data.status_code == 200) {
|
||||
|
@ -36480,8 +36473,6 @@ var MeetingEdit = function MeetingEdit(props) {
|
|||
}, []);
|
||||
|
||||
var handleSubmit = function handleSubmit(e) {
|
||||
var _props$match$params2;
|
||||
|
||||
e.preventDefault();
|
||||
set422Errors({
|
||||
title: '',
|
||||
|
@ -36527,30 +36518,7 @@ var MeetingEdit = function MeetingEdit(props) {
|
|||
children: approval_deleteIndexes,
|
||||
meeting_id: meeting_id
|
||||
}
|
||||
}); //---------------------------------------
|
||||
|
||||
deleted_image_id.map(function (image_id) {
|
||||
if (image_id != REGISTED_IMAGE_ID) axios__WEBPACK_IMPORTED_MODULE_1___default().delete("/api/admin/meeting/images/delete/".concat(meeting_id), {
|
||||
params: {
|
||||
image_id: image_id
|
||||
}
|
||||
});
|
||||
});
|
||||
setDeletedImageID([]);
|
||||
meeting_image.map(function (item) {
|
||||
if (item.id == REGISTED_IMAGE_ID) {
|
||||
var _formdata = new FormData();
|
||||
|
||||
_formdata.append('image', item.image);
|
||||
|
||||
axios__WEBPACK_IMPORTED_MODULE_1___default().post("/api/admin/meeting/images/register", _formdata, {
|
||||
params: {
|
||||
meeting_id: meeting_id
|
||||
}
|
||||
});
|
||||
}
|
||||
}); //----------------------------------------
|
||||
|
||||
var request = {
|
||||
title: title,
|
||||
text: text,
|
||||
|
@ -36558,16 +36526,14 @@ var MeetingEdit = function MeetingEdit(props) {
|
|||
pdf: pdf
|
||||
};
|
||||
setSubmit(true);
|
||||
axios__WEBPACK_IMPORTED_MODULE_1___default().put("/api/admin/meetings/update/".concat((_props$match$params2 = props.match.params) === null || _props$match$params2 === void 0 ? void 0 : _props$match$params2.meeting_id), request).then(function (response) {
|
||||
axios__WEBPACK_IMPORTED_MODULE_1___default().put("/api/admin/meetings/update/".concat(meeting_id), request).then(function (response) {
|
||||
setSubmit(false);
|
||||
|
||||
switch (response.data.status_code) {
|
||||
case 200:
|
||||
{
|
||||
var _props$match$params3;
|
||||
|
||||
history.push({
|
||||
pathname: "/admin/meeting/detail/".concat((_props$match$params3 = props.match.params) === null || _props$match$params3 === void 0 ? void 0 : _props$match$params3.meeting_id),
|
||||
pathname: "/admin/meeting/detail/".concat(meeting_id),
|
||||
state: "更新成功しました!"
|
||||
});
|
||||
break;
|
||||
|
@ -36604,16 +36570,27 @@ var MeetingEdit = function MeetingEdit(props) {
|
|||
});
|
||||
});
|
||||
Promise.all(promises).then(function (images) {
|
||||
var temp = [];
|
||||
|
||||
for (var i in images) {
|
||||
temp.push({
|
||||
id: REGISTED_IMAGE_ID,
|
||||
image: images[i]
|
||||
});
|
||||
var formdata = new FormData();
|
||||
formdata.append('image', JSON.stringify(images));
|
||||
axios__WEBPACK_IMPORTED_MODULE_1___default().post("/api/admin/meeting/images/register", formdata, {
|
||||
params: {
|
||||
meeting_id: meeting_id
|
||||
}
|
||||
}).then(function (response) {
|
||||
switch (response.data.status_code) {
|
||||
case 200:
|
||||
setMeetingImages(response.data.params);
|
||||
break;
|
||||
|
||||
setMeetingImages([].concat(_toConsumableArray(meeting_image), temp));
|
||||
case 400:
|
||||
set400Error(response.data.error_messages);
|
||||
break;
|
||||
|
||||
case 422:
|
||||
set422Errors(response.data.error_messages);
|
||||
break;
|
||||
}
|
||||
});
|
||||
}, function (error) {
|
||||
console.error(error);
|
||||
});
|
||||
|
@ -36631,12 +36608,26 @@ var MeetingEdit = function MeetingEdit(props) {
|
|||
};
|
||||
};
|
||||
|
||||
var handleRemoveImage = function handleRemoveImage(index, image_id) {
|
||||
var handleDeleteImage = function handleDeleteImage(index, image_id) {
|
||||
axios__WEBPACK_IMPORTED_MODULE_1___default().delete("/api/admin/meeting/images/delete/".concat(meeting_id), {
|
||||
params: {
|
||||
image_id: image_id
|
||||
}
|
||||
}).then(function (response) {
|
||||
switch (response.data.status_code) {
|
||||
case 200:
|
||||
setMeetingImages(response.data.params);
|
||||
break;
|
||||
|
||||
case 400:
|
||||
set400Error("画像の削除に失敗しました。");
|
||||
}
|
||||
});
|
||||
|
||||
var list = _toConsumableArray(meeting_image);
|
||||
|
||||
list.splice(index, 1);
|
||||
setMeetingImages(list);
|
||||
setDeletedImageID([].concat(_toConsumableArray(deleted_image_id), [image_id])); //削除した画像IDを登録します。
|
||||
setMeetingImages(list); //削除した画像IDを登録します。
|
||||
};
|
||||
|
||||
var handleCheck = function handleCheck(e, index) {
|
||||
|
@ -36794,7 +36785,7 @@ var MeetingEdit = function MeetingEdit(props) {
|
|||
alt: x.image
|
||||
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_mui_material_IconButton__WEBPACK_IMPORTED_MODULE_6__.default, {
|
||||
onClick: function onClick(e) {
|
||||
return handleRemoveImage(k, x.id);
|
||||
return handleDeleteImage(k, x.id);
|
||||
},
|
||||
style: {
|
||||
position: 'absolute',
|
||||
|
@ -48414,11 +48405,6 @@ var MeetingEdit = function MeetingEdit(props) {
|
|||
check_radio = _useState30[0],
|
||||
setCheckRadio = _useState30[1];
|
||||
|
||||
var _useState31 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)([]),
|
||||
_useState32 = _slicedToArray(_useState31, 2),
|
||||
deleted_image_id = _useState32[0],
|
||||
setDeletedImageID = _useState32[1];
|
||||
|
||||
(0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
|
||||
setLoaded(false);
|
||||
axios__WEBPACK_IMPORTED_MODULE_1___default().get("/api/fathers/meetings/detail/".concat(meeting_id), {
|
||||
|
@ -48546,27 +48532,6 @@ var MeetingEdit = function MeetingEdit(props) {
|
|||
meeting_id: meeting_id
|
||||
}
|
||||
});
|
||||
deleted_image_id.map(function (image_id) {
|
||||
if (image_id != REGISTED_IMAGE_ID) axios__WEBPACK_IMPORTED_MODULE_1___default().delete("/api/fathers/meeting/images/delete/".concat(meeting_id), {
|
||||
params: {
|
||||
image_id: image_id
|
||||
}
|
||||
});
|
||||
});
|
||||
setDeletedImageID([]);
|
||||
meeting_image.map(function (item) {
|
||||
if (item.id == REGISTED_IMAGE_ID) {
|
||||
var _formdata = new FormData();
|
||||
|
||||
_formdata.append('image', item.image);
|
||||
|
||||
axios__WEBPACK_IMPORTED_MODULE_1___default().post("/api/fathers/meeting/images/register", _formdata, {
|
||||
params: {
|
||||
meeting_id: meeting_id
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
var request = {
|
||||
title: title,
|
||||
text: text,
|
||||
|
@ -48581,10 +48546,8 @@ var MeetingEdit = function MeetingEdit(props) {
|
|||
switch (response.data.status_code) {
|
||||
case 200:
|
||||
{
|
||||
var _props$match$params;
|
||||
|
||||
history.push({
|
||||
pathname: "/p-account/meeting/detail/".concat((_props$match$params = props.match.params) === null || _props$match$params === void 0 ? void 0 : _props$match$params.meeting_id),
|
||||
pathname: "/p-account/meeting/detail/".concat(meeting_id),
|
||||
state: "編集が完了しました!"
|
||||
});
|
||||
break;
|
||||
|
@ -48621,27 +48584,54 @@ var MeetingEdit = function MeetingEdit(props) {
|
|||
});
|
||||
});
|
||||
Promise.all(promises).then(function (images) {
|
||||
var temp = [];
|
||||
|
||||
for (var i in images) {
|
||||
temp.push({
|
||||
id: REGISTED_IMAGE_ID,
|
||||
image: images[i]
|
||||
});
|
||||
var formdata = new FormData();
|
||||
formdata.append('image', JSON.stringify(images));
|
||||
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);
|
||||
|
||||
setMeetingImages([].concat(_toConsumableArray(meeting_image), temp));
|
||||
switch (response.data.status_code) {
|
||||
case 400:
|
||||
set400Error("編集が失敗しました。");
|
||||
break;
|
||||
|
||||
case 422:
|
||||
set422Errors(response.data.error_messages);
|
||||
break;
|
||||
|
||||
case 200:
|
||||
{
|
||||
setMeetingImages(response.data.params);
|
||||
break;
|
||||
}
|
||||
}
|
||||
});
|
||||
}, function (error) {
|
||||
console.error(error);
|
||||
});
|
||||
};
|
||||
|
||||
var handleRemoveImage = function handleRemoveImage(index, image_id) {
|
||||
var handleDeleteImage = function handleDeleteImage(index, 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);
|
||||
|
||||
switch (response.data.status_code) {
|
||||
case 400:
|
||||
set400Error("画像の削除に失敗しました。");
|
||||
}
|
||||
});
|
||||
|
||||
var list = _toConsumableArray(meeting_image);
|
||||
|
||||
list.splice(index, 1);
|
||||
setMeetingImages(list);
|
||||
setDeletedImageID([].concat(_toConsumableArray(deleted_image_id), [image_id])); //削除した画像IDを登録します。
|
||||
};
|
||||
|
||||
var handleChangePDF = function handleChangePDF(e) {
|
||||
|
@ -48813,7 +48803,7 @@ var MeetingEdit = function MeetingEdit(props) {
|
|||
alt: x.image
|
||||
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_mui_material_IconButton__WEBPACK_IMPORTED_MODULE_8__.default, {
|
||||
onClick: function onClick(e) {
|
||||
return handleRemoveImage(k, x.id);
|
||||
return handleDeleteImage(k, x.id);
|
||||
},
|
||||
style: {
|
||||
position: 'absolute',
|
||||
|
|
|
@ -32,7 +32,6 @@ const MeetingEdit = (props) => {
|
|||
|
||||
const [check_radio, setCheckRadio] = useState(null);
|
||||
const [children_temp, setChildrenTemp] = useState([]);
|
||||
const [deleted_image_id, setDeletedImageID] = useState([]);
|
||||
|
||||
|
||||
useEffect(()=>{
|
||||
|
@ -57,7 +56,7 @@ const MeetingEdit = (props) => {
|
|||
|
||||
useEffect(() => {
|
||||
setLoaded(false);
|
||||
axios.get(`/api/admin/meetings/detail/${props.match.params?.meeting_id}`)
|
||||
axios.get(`/api/admin/meetings/detail/${meeting_id}`)
|
||||
.then(response => {
|
||||
setLoaded(true);
|
||||
if(response.data.status_code==200){
|
||||
|
@ -107,29 +106,16 @@ const MeetingEdit = (props) => {
|
|||
formdata.append('children', JSON.stringify(approval_registerIndexes));
|
||||
axios.post('/api/admin/meeting/approvals/register',formdata, {params:{meeting_id: meeting_id}})
|
||||
axios.delete('/api/admin/meeting/approvals/delete',{params:{children: approval_deleteIndexes, meeting_id: meeting_id}})
|
||||
//---------------------------------------
|
||||
deleted_image_id.map(image_id=>{
|
||||
if(image_id != REGISTED_IMAGE_ID)
|
||||
axios.delete(`/api/admin/meeting/images/delete/${meeting_id}`, {params:{image_id: image_id}})
|
||||
})
|
||||
setDeletedImageID([]);
|
||||
meeting_image.map(item=>{
|
||||
if(item.id == REGISTED_IMAGE_ID){
|
||||
const formdata = new FormData();
|
||||
formdata.append('image', item.image);
|
||||
axios.post(`/api/admin/meeting/images/register`, formdata, {params:{meeting_id: meeting_id}})
|
||||
}
|
||||
})
|
||||
//----------------------------------------
|
||||
|
||||
const request = { title: title, text: text, memo: memo, pdf: pdf };
|
||||
setSubmit(true);
|
||||
axios.put(`/api/admin/meetings/update/${props.match.params?.meeting_id}`, request)
|
||||
axios.put(`/api/admin/meetings/update/${meeting_id}`, request)
|
||||
.then(response => {
|
||||
setSubmit(false);
|
||||
switch(response.data.status_code){
|
||||
case 200: {
|
||||
history.push({
|
||||
pathname: `/admin/meeting/detail/${props.match.params?.meeting_id}`,
|
||||
pathname: `/admin/meeting/detail/${meeting_id}`,
|
||||
state: "更新成功しました!"});
|
||||
break;
|
||||
}
|
||||
|
@ -160,11 +146,16 @@ const MeetingEdit = (props) => {
|
|||
});
|
||||
|
||||
Promise.all(promises).then(images => {
|
||||
var temp = [];
|
||||
for(let i in images){
|
||||
temp.push({id: REGISTED_IMAGE_ID, image: images[i]});
|
||||
const formdata = new FormData();
|
||||
formdata.append('image', JSON.stringify(images));
|
||||
axios.post(`/api/admin/meeting/images/register`, formdata, {params:{meeting_id: meeting_id}})
|
||||
.then(response => {
|
||||
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, ...temp]);
|
||||
});
|
||||
},
|
||||
error => { console.error(error); });
|
||||
};
|
||||
|
@ -180,11 +171,17 @@ const MeetingEdit = (props) => {
|
|||
}
|
||||
}
|
||||
|
||||
const handleRemoveImage = (index, image_id) => {
|
||||
const handleDeleteImage = (index, image_id) => {
|
||||
axios.delete(`/api/admin/meeting/images/delete/${meeting_id}`, {params:{image_id: image_id}})
|
||||
.then(response=>{
|
||||
switch(response.data.status_code){
|
||||
case 200: setMeetingImages(response.data.params); break;
|
||||
case 400: set400Error("画像の削除に失敗しました。");
|
||||
}
|
||||
})
|
||||
let list = [...meeting_image];
|
||||
list.splice(index, 1);
|
||||
setMeetingImages(list);
|
||||
setDeletedImageID([...deleted_image_id, image_id]) //削除した画像IDを登録します。
|
||||
setMeetingImages(list); //削除した画像IDを登録します。
|
||||
}
|
||||
|
||||
const handleCheck = (e, index) => {
|
||||
|
@ -290,7 +287,7 @@ const MeetingEdit = (props) => {
|
|||
<figure className="image-upload" key={k}>
|
||||
<img src={x.image} alt={x.image} />
|
||||
<IconButton
|
||||
onClick={e=>handleRemoveImage(k, x.id)}
|
||||
onClick={e=>handleDeleteImage(k, x.id)}
|
||||
style={{position: 'absolute',
|
||||
bottom: '-6px',
|
||||
right: '-6px'}}>
|
||||
|
|
|
@ -37,8 +37,6 @@ const MeetingEdit = (props) => {
|
|||
|
||||
const [check_radio, setCheckRadio] = useState(null);
|
||||
|
||||
const [deleted_image_id, setDeletedImageID] = useState([]);
|
||||
|
||||
|
||||
useEffect(() => {
|
||||
setLoaded(false);
|
||||
|
@ -124,19 +122,6 @@ useEffect(()=>{
|
|||
axios.post('/api/fathers/meeting/approvals/register', formdata, {params:{meeting_id: meeting_id}})
|
||||
axios.delete('/api/fathers/meeting/approvals/delete', {params:{children: approval_deleteIndexes, meeting_id: meeting_id}})
|
||||
|
||||
deleted_image_id.map(image_id=>{
|
||||
if(image_id != REGISTED_IMAGE_ID)
|
||||
axios.delete(`/api/fathers/meeting/images/delete/${meeting_id}`, {params:{image_id: image_id}})
|
||||
})
|
||||
setDeletedImageID([]);
|
||||
meeting_image.map(item=>{
|
||||
if(item.id == REGISTED_IMAGE_ID){
|
||||
const formdata = new FormData();
|
||||
formdata.append('image', item.image);
|
||||
axios.post(`/api/fathers/meeting/images/register`, formdata, {params:{meeting_id: meeting_id}})
|
||||
}
|
||||
})
|
||||
|
||||
const request = { title: title, text: text, memo: memo, pdf: pdf };
|
||||
setSubmit(true);
|
||||
axios.put(`/api/fathers/meetings/update/${meeting_id}`, request)
|
||||
|
@ -146,7 +131,7 @@ useEffect(()=>{
|
|||
switch(response.data.status_code){
|
||||
case 200: {
|
||||
history.push({
|
||||
pathname: `/p-account/meeting/detail/${props.match.params?.meeting_id}`,
|
||||
pathname: `/p-account/meeting/detail/${meeting_id}`,
|
||||
state: "編集が完了しました!"
|
||||
});
|
||||
break;
|
||||
|
@ -178,21 +163,35 @@ useEffect(()=>{
|
|||
});
|
||||
|
||||
Promise.all(promises).then(images => {
|
||||
var temp = [];
|
||||
for(let i in images){
|
||||
temp.push({id: REGISTED_IMAGE_ID, image: images[i]});
|
||||
const formdata = new FormData();
|
||||
formdata.append('image', JSON.stringify(images));
|
||||
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 400: set400Error("編集が失敗しました。"); break;
|
||||
case 422: set422Errors(response.data.error_messages); break;
|
||||
case 200: {
|
||||
setMeetingImages(response.data.params); break;
|
||||
}
|
||||
setMeetingImages([...meeting_image, ...temp]);
|
||||
}
|
||||
})
|
||||
},
|
||||
error => { console.error(error); });
|
||||
};
|
||||
|
||||
|
||||
const handleRemoveImage = (index, image_id) => {
|
||||
const handleDeleteImage = (index, 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 400: set400Error("画像の削除に失敗しました。");
|
||||
}
|
||||
})
|
||||
let list = [...meeting_image];
|
||||
list.splice(index, 1);
|
||||
setMeetingImages(list);
|
||||
setDeletedImageID([...deleted_image_id, image_id]) //削除した画像IDを登録します。
|
||||
}
|
||||
|
||||
const handleChangePDF = (e) => {
|
||||
|
@ -311,7 +310,7 @@ useEffect(()=>{
|
|||
<figure className="image-upload" key={k}>
|
||||
<img src={x.image} alt={x.image} />
|
||||
<IconButton
|
||||
onClick={e=>handleRemoveImage(k, x.id)}
|
||||
onClick={e=>handleDeleteImage(k, x.id)}
|
||||
style={{position: 'absolute',
|
||||
bottom: '-6px',
|
||||
right: '-6px'}}>
|
||||
|
|
新しいイシューから参照