suwako
/
kikikan
アーカイブ
1
0
フォーク 0
コード イシュー プルリクエスト プロジェクト リリース Wiki アクティビティ

complete p-meeting-edit

このコミットが含まれているのは:
dragon1211 2021-11-16 03:08:46 -08:00
親 353401cd0e
コミット 140b660fed
5個のファイルの変更、481行の追加、371行の削除
統計情報を表示 Patchファイルをダウンロード Diffファイルをダウンロード すべてのファイルを展開 すべてのファイルを折り畳む

716
backend/composer.lock generated
ファイルの表示

ファイル差分が大きすぎるため省略します 差分を読み込み

91
backend/public/js/app.js vendored
ファイルの表示

@ -43693,9 +43693,15 @@ function ModalSettingNotify(_ref) {
})
}), _400error && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_2__.default, {
type: "fail",
hide: function hide() {
return set400Error('');
},
children: _400error
}), _success && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_2__.default, {
type: "success",
hide: function hide() {
return setSuccess('');
},
children: _success
})]
})]
@ -48162,9 +48168,15 @@ var MeetingDetail = function MeetingDetail(props) {
})]
}), _400error && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_10__.default, {
type: "fail",
hide: function hide() {
return set400Error('');
},
children: _400error
}), _success_notify && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_10__.default, {
type: "success",
hide: function hide() {
return setSuccessNotify('');
},
children: _success_notify
}), _success_delete && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_10__.default, {
type: "success",
@ -48317,48 +48329,37 @@ var MeetingEdit = function MeetingEdit(props) {
var _useState23 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
_useState24 = _slicedToArray(_useState23, 2),
loaded1 = _useState24[0],
setLoaded1 = _useState24[1];
loaded = _useState24[0],
setLoaded = _useState24[1];
var _useState25 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
_useState26 = _slicedToArray(_useState25, 2),
loaded2 = _useState26[0],
setLoaded2 = _useState26[1];
submit = _useState26[0],
setSubmit = _useState26[1];
var _useState27 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
var _useState27 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(null),
_useState28 = _slicedToArray(_useState27, 2),
loaded = _useState28[0],
setLoaded = _useState28[1];
check_radio = _useState28[0],
setCheckRadio = _useState28[1];
var _useState29 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
var _useState29 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)([]),
_useState30 = _slicedToArray(_useState29, 2),
submit = _useState30[0],
setSubmit = _useState30[1];
var _useState31 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(null),
_useState32 = _slicedToArray(_useState31, 2),
check_radio = _useState32[0],
setCheckRadio = _useState32[1];
var _useState33 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)([]),
_useState34 = _slicedToArray(_useState33, 2),
children_temp = _useState34[0],
setChildrenTemp = _useState34[1];
children_temp = _useState30[0],
setChildrenTemp = _useState30[1];
(0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
setLoaded1(false);
setLoaded(false);
axios__WEBPACK_IMPORTED_MODULE_1___default().get("/api/fathers/meetings/detail/".concat(meeting_id), {
params: {
father_id: father_id
}
}).then(function (response) {
setLoaded1(true);
setLoaded(true);
setNotice(response.data.notice);
if (response.data.status_code == 200) {
var _response$data$params, _response$data$params2, _response$data$params3, _response$data$params4, _response$data$params5, _response$data$params6, _response$data$params7, _response$data$params8, _response$data$params9;
console.log(response.data.params);
setTitle((_response$data$params = response.data.params) === null || _response$data$params === void 0 ? void 0 : _response$data$params.title);
setMemo((_response$data$params2 = response.data.params) === null || _response$data$params2 === void 0 ? void 0 : _response$data$params2.memo);
setText((_response$data$params3 = response.data.params) === null || _response$data$params3 === void 0 ? void 0 : _response$data$params3.text);
@ -48386,24 +48387,7 @@ var MeetingEdit = function MeetingEdit(props) {
setChildrenTemp(arr);
}
});
}, []); //-------------------------------------------------------------
(0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
setLoaded2(false);
axios__WEBPACK_IMPORTED_MODULE_1___default().get('/api/fathers/children/listOfFather', {
params: {
father_id: father_id
}
}).then(function (response) {
setLoaded2(true);
setNotice(response.data.notice);
console.log(response.data.params);
});
}, []); //----------------------------------------------------------
(0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
setLoaded(loaded1 && loaded2);
}, [loaded1, loaded2]); //--------------------------------------------------------
}, []); //--------------------------------------------------------
(0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
if (!loaded) return; //if dont load data
@ -48428,7 +48412,6 @@ var MeetingEdit = function MeetingEdit(props) {
}
}
console.log(children_temp, children_list);
setChildrenTemp(list);
}, [check_radio]); //----------------------------------------------------------------------
@ -48466,24 +48449,21 @@ var MeetingEdit = function MeetingEdit(props) {
_loop2(_i2);
}
console.log(approval_registerIndexes, approval_deleteIndexes);
var formdata = new FormData();
formdata.append('children', JSON.stringify(approval_registerIndexes));
axios__WEBPACK_IMPORTED_MODULE_1___default().post('/api/fathers/meeting/approvals/register', formdata, {
params: {
meeting_id: props.match.params.meeting_id
meeting_id: meeting_id
}
});
axios__WEBPACK_IMPORTED_MODULE_1___default().delete('/api/fathers/meeting/approvals/delete', {
params: {
children: approval_deleteIndexes,
meeting_id: props.match.params.meeting_id
meeting_id: meeting_id
}
});
try {
var _props$match$params;
var request = {
title: title,
text: text,
@ -48491,7 +48471,8 @@ var MeetingEdit = function MeetingEdit(props) {
pdf: pdf
};
setSubmit(true);
axios__WEBPACK_IMPORTED_MODULE_1___default().put("/api/fathers/meetings/update/".concat((_props$match$params = props.match.params) === null || _props$match$params === void 0 ? void 0 : _props$match$params.meeting_id), request).then(function (response) {
axios__WEBPACK_IMPORTED_MODULE_1___default().put("/api/fathers/meetings/update/".concat(meeting_id), request).then(function (response) {
setNotice(response.data.notice);
setSubmit(false);
switch (response.data.status_code) {
@ -48525,9 +48506,11 @@ var MeetingEdit = function MeetingEdit(props) {
formdata.append('image', reader.result);
axios__WEBPACK_IMPORTED_MODULE_1___default().post("/api/fathers/meeting/images/register", formdata, {
params: {
meeting_id: props.match.params.meeting_id
meeting_id: meeting_id
}
}).then(function (response) {
setNotice(response.data.notice);
switch (response.data.status_code) {
case 200:
setMeetingImages(response.data.params);
@ -48559,13 +48542,13 @@ var MeetingEdit = function MeetingEdit(props) {
};
var handleDeleteImage = function handleDeleteImage(image_id) {
var _props$match$params2;
axios__WEBPACK_IMPORTED_MODULE_1___default().delete("/api/fathers/meeting/images/delete/".concat((_props$match$params2 = props.match.params) === null || _props$match$params2 === void 0 ? void 0 : _props$match$params2.meeting_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 200:
setMeetingImages(response.data.params);
@ -48851,10 +48834,10 @@ var MeetingEdit = function MeetingEdit(props) {
}), _success && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_4__.default, {
type: "success",
hide: function hide() {
var _props$match$params3;
var _props$match$params;
return history.push({
pathname: "/p-account/meeting/detail/".concat((_props$match$params3 = props.match.params) === null || _props$match$params3 === void 0 ? void 0 : _props$match$params3.meeting_id),
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),
state: {}
});
},

4
backend/resources/js/component/modal_setting_notify.jsx
ファイルの表示

@ -133,8 +133,8 @@ export default function ModalSettingNotify({show, handleClose, meetingId}){
: <p className="text-center py-2 ft-xs-15">データはありません。</p>
}
</div>
{ _400error && <Alert type="fail">{_400error}</Alert> }
{ _success && <Alert type="success">{_success}</Alert>}
{ _400error && <Alert type="fail" hide={()=>set400Error('')}>{_400error}</Alert> }
{ _success && <Alert type="success" hide={()=>setSuccess('')}>{_success}</Alert>}
</>
}
</DialogContent>

4
backend/resources/js/parent/meeting/detail.jsx
ファイルの表示

@ -257,8 +257,8 @@ const MeetingDetail = (props) => {
</div>
}
</div>
{ _400error && <Alert type="fail">{_400error}</Alert> }
{ _success_notify && <Alert type="success">{_success_notify}</Alert> }
{ _400error && <Alert type="fail" hide={()=>set400Error('')}>{_400error}</Alert> }
{ _success_notify && <Alert type="success" hide={()=>setSuccessNotify('')}>{_success_notify}</Alert> }
{
_success_delete &&
<Alert type="success"

37
backend/resources/js/parent/meeting/edit.jsx
ファイルの表示

@ -31,8 +31,6 @@ const MeetingEdit = (props) => {
const [_400error, set400Error] = useState('');
const [_success, setSuccess] = useState('');
const [loaded1, setLoaded1] = useState(false);
const [loaded2, setLoaded2] = useState(false);
const [loaded, setLoaded] = useState(false);
const [submit, setSubmit] = useState(false);
@ -41,13 +39,12 @@ const MeetingEdit = (props) => {
useEffect(() => {
setLoaded1(false);
setLoaded(false);
axios.get(`/api/fathers/meetings/detail/${meeting_id}`, {params: { father_id: father_id}})
.then(response => {
setLoaded1(true);
setLoaded(true);
setNotice(response.data.notice)
if(response.data.status_code==200){
console.log(response.data.params);
setTitle(response.data.params?.title);
setMemo(response.data.params?.memo);
setText(response.data.params?.text);
@ -68,21 +65,6 @@ const MeetingEdit = (props) => {
});
}, []);
//-------------------------------------------------------------
useEffect(()=>{
setLoaded2(false);
axios.get('/api/fathers/children/listOfFather',{params:{father_id: father_id}})
.then(response=>{
setLoaded2(true);
setNotice(response.data.notice);
console.log(response.data.params)
})
}, [])
//----------------------------------------------------------
useEffect(()=>{
setLoaded(loaded1 && loaded2);
},[loaded1, loaded2])
//--------------------------------------------------------
useEffect(()=>{
@ -101,7 +83,6 @@ const MeetingEdit = (props) => {
else list[i].checked = false;
}
}
console.log(children_temp, children_list)
setChildrenTemp(list);
},[check_radio])
@ -122,18 +103,18 @@ const MeetingEdit = (props) => {
if(children_temp.findIndex(ele=> ele.checked && ele.child_id == approval_list[i].child_id) < 0)
approval_deleteIndexes.push(approval_list[i].child_id);
}
console.log(approval_registerIndexes, approval_deleteIndexes);
const formdata = new FormData();
formdata.append('children', JSON.stringify(approval_registerIndexes));
axios.post('/api/fathers/meeting/approvals/register',formdata, {params:{meeting_id: props.match.params.meeting_id}})
axios.delete('/api/fathers/meeting/approvals/delete',{params:{children: approval_deleteIndexes, meeting_id: props.match.params.meeting_id}})
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}})
try {
const request = { title: title, text: text, memo: memo, pdf: pdf };
setSubmit(true);
axios.put(`/api/fathers/meetings/update/${props.match.params?.meeting_id}`, request)
axios.put(`/api/fathers/meetings/update/${meeting_id}`, request)
.then(response => {
setNotice(response.data.notice);
setSubmit(false);
switch(response.data.status_code){
case 200: setSuccess("更新成功しました!"); break;
@ -156,8 +137,9 @@ const MeetingEdit = (props) => {
reader.onloadend = () => {
const formdata = new FormData();
formdata.append('image', reader.result);
axios.post(`/api/fathers/meeting/images/register`, formdata, {params:{meeting_id: props.match.params.meeting_id}})
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); notify_save(); break;
case 400: set400Error(response.data.error_messages); break;
@ -180,8 +162,9 @@ const MeetingEdit = (props) => {
}
const handleDeleteImage = (image_id) => {
axios.delete(`/api/fathers/meeting/images/delete/${props.match.params?.meeting_id}`, {params:{image_id: 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("画像の削除に失敗しました。");