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

Merge pull request #242 from nakazawakan/fe_fix 

p-account/meeting/edit , p-account/meeting/detailで一部修正しました。
このコミットが含まれているのは:
chankan77 2022-01-05 10:17:22 +09:00 committed by GitHub
親 0af229a137 578a383502
コミット 0ef79dfca2
この署名に対応する既知のキーがデータベースに存在しません
GPGキーID: 4AEE18F83AFDEB23
4個のファイルの変更、74行の追加、54行の削除
統計情報を表示 Patchファイルをダウンロード Diffファイルをダウンロード すべてのファイルを展開 すべてのファイルを折り畳む

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

@ -35779,7 +35779,8 @@ var Transition = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1__.forwardRef(func
function ModalSettingNotify(_ref) {
var show = _ref.show,
handleClose = _ref.handleClose,
meetingId = _ref.meetingId;
meetingId = _ref.meetingId,
handleLoadedChildren = _ref.handleLoadedChildren;
var _useState = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)([]),
_useState2 = _slicedToArray(_useState, 2),
@ -35890,6 +35891,7 @@ function ModalSettingNotify(_ref) {
})), []);
(0,react__WEBPACK_IMPORTED_MODULE_1__.useEffect)(function () {
setLoaded(loaded1 && loaded2);
handleLoadedChildren(loaded1 && loaded2);
}, [loaded1, loaded2]);
var settingNotify = /*#__PURE__*/function () {
@ -41343,63 +41345,68 @@ var ParentMeetingDetail = function ParentMeetingDetail() {
var _useState5 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(false),
_useState6 = _slicedToArray(_useState5, 2),
submit_delete = _useState6[0],
setSubmitDelete = _useState6[1];
loaded_children = _useState6[0],
setLoadedChildren = _useState6[1];
var _useState7 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(false),
_useState8 = _slicedToArray(_useState7, 2),
submit_notify = _useState8[0],
setSubmitNotify = _useState8[1];
submit_delete = _useState8[0],
setSubmitDelete = _useState8[1];
var _useState9 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(location.state),
var _useState9 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(false),
_useState10 = _slicedToArray(_useState9, 2),
_success = _useState10[0],
setSuccess = _useState10[1];
submit_notify = _useState10[0],
setSubmitNotify = _useState10[1];
var _useState11 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(''),
var _useState11 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(location.state),
_useState12 = _slicedToArray(_useState11, 2),
_400error = _useState12[0],
set400Error = _useState12[1];
_success = _useState12[0],
setSuccess = _useState12[1];
var _useState13 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(''),
_useState14 = _slicedToArray(_useState13, 2),
_404error = _useState14[0],
set404Error = _useState14[1];
_400error = _useState14[0],
set400Error = _useState14[1];
var _useState15 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(false),
var _useState15 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(''),
_useState16 = _slicedToArray(_useState15, 2),
show_delete_modal = _useState16[0],
setShowDeleteModal = _useState16[1];
_404error = _useState16[0],
set404Error = _useState16[1];
var _useState17 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(false),
_useState18 = _slicedToArray(_useState17, 2),
show_notify_all_modal = _useState18[0],
setShowNotifyAllModal = _useState18[1];
show_delete_modal = _useState18[0],
setShowDeleteModal = _useState18[1];
var _useState19 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(false),
_useState20 = _slicedToArray(_useState19, 2),
show_memo_modal = _useState20[0],
setShowMemoModal = _useState20[1];
show_notify_all_modal = _useState20[0],
setShowNotifyAllModal = _useState20[1];
var _useState21 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(false),
_useState22 = _slicedToArray(_useState21, 2),
show_notify_pickup_modal = _useState22[0],
setShowNotifySelectModal = _useState22[1];
show_memo_modal = _useState22[0],
setShowMemoModal = _useState22[1];
var _useState23 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(false),
_useState24 = _slicedToArray(_useState23, 2),
show_pdf_modal = _useState24[0],
setShowPDFModal = _useState24[1];
show_notify_pickup_modal = _useState24[0],
setShowNotifySelectModal = _useState24[1];
var _useState25 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(null),
var _useState25 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(false),
_useState26 = _slicedToArray(_useState25, 2),
meeting = _useState26[0],
setMeeting = _useState26[1];
show_pdf_modal = _useState26[0],
setShowPDFModal = _useState26[1];
var _useState27 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(null),
_useState28 = _slicedToArray(_useState27, 2),
thumbnail = _useState28[0],
setThumbnail = _useState28[1];
meeting = _useState28[0],
setMeeting = _useState28[1];
var _useState29 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(null),
_useState30 = _slicedToArray(_useState29, 2),
thumbnail = _useState30[0],
setThumbnail = _useState30[1];
var isMountedRef = (0,react__WEBPACK_IMPORTED_MODULE_1__.useRef)(false);
(0,react__WEBPACK_IMPORTED_MODULE_1__.useEffect)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_0___default().mark(function _callee() {
@ -41652,6 +41659,10 @@ var ParentMeetingDetail = function ParentMeetingDetail() {
window.open("/pdf/".concat(file_name), '_blank');
};
var handleLoadedChildren = function handleLoadedChildren(flag) {
setLoadedChildren(flag);
};
return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsxs)("div", {
className: "l-content",
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsxs)("div", {
@ -41666,7 +41677,7 @@ var ParentMeetingDetail = function ParentMeetingDetail() {
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(_component_notification__WEBPACK_IMPORTED_MODULE_6__["default"], {
notice: notice
})]
}), !loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(_component_page_loader__WEBPACK_IMPORTED_MODULE_10__["default"], {}), loaded && meeting && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsxs)("div", {
}), !(loaded && loaded_children) && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(_component_page_loader__WEBPACK_IMPORTED_MODULE_10__["default"], {}), loaded && loaded_children && meeting && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsxs)("div", {
className: "l-content-wrap",
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("div", {
className: "p-article",
@ -41830,12 +41841,6 @@ var ParentMeetingDetail = function ParentMeetingDetail() {
})
})
})
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(_component_modal_setting_notify__WEBPACK_IMPORTED_MODULE_7__["default"], {
show: show_notify_all_modal,
meetingId: meeting.id,
handleClose: function handleClose() {
return setShowNotifyAllModal(false);
}
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(_component_modal_edit_memo__WEBPACK_IMPORTED_MODULE_3__["default"], {
show: show_memo_modal,
title: "メモ",
@ -41867,6 +41872,13 @@ var ParentMeetingDetail = function ParentMeetingDetail() {
return setShowPDFModal(false);
}
})]
}), loaded && meeting && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(_component_modal_setting_notify__WEBPACK_IMPORTED_MODULE_7__["default"], {
show: show_notify_all_modal,
meetingId: meeting.id,
handleClose: function handleClose() {
return setShowNotifyAllModal(false);
},
handleLoadedChildren: handleLoadedChildren
})]
}), _400error && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_8__["default"], {
type: "fail",
@ -42354,7 +42366,10 @@ var ParentMeetingEdit = function ParentMeetingEdit() {
while (1) {
switch (_context4.prev = _context4.next) {
case 0:
_context4.next = 2;
list = _toConsumableArray(meeting_image);
list.splice(index, 1);
setMeetingImages(list);
_context4.next = 5;
return axios["delete"]("/api/fathers/meeting/images/delete/".concat(meeting_id), {
params: {
image_id: image_id
@ -42368,11 +42383,6 @@ var ParentMeetingEdit = function ParentMeetingEdit() {
}
});
case 2:
list = _toConsumableArray(meeting_image);
list.splice(index, 1);
setMeetingImages(list);
case 5:
case "end":
return _context4.stop();

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

@ -14,7 +14,7 @@ const Transition = React.forwardRef(function Transition(props, ref) {
});
export default function ModalSettingNotify({show, handleClose, meetingId}){
export default function ModalSettingNotify({show, handleClose, meetingId, handleLoadedChildren}){
const [unapproval, setUnapproval ] = useState([]);
const [approval, setApproval ] = useState([]);
@ -66,6 +66,7 @@ export default function ModalSettingNotify({show, handleClose, meetingId}){
useEffect(()=>{
setLoaded(loaded1 && loaded2);
handleLoadedChildren(loaded1 && loaded2);
},[loaded1, loaded2]);

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

@ -21,6 +21,7 @@ const ParentMeetingDetail = () => {
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);
const [submit_notify, setSubmitNotify] = useState(false);
const [_success, setSuccess] = useState(location.state);
@ -166,6 +167,10 @@ const ParentMeetingDetail = () => {
window.open(`/pdf/${file_name}`, '_blank');
}
const handleLoadedChildren = (flag) => {
setLoadedChildren(flag);
}
return (
<div className="l-content">
@ -177,10 +182,10 @@ const ParentMeetingDetail = () => {
<Notification notice={notice}/>
</div>
{
!loaded && <PageLoader />
!(loaded && loaded_children) && <PageLoader />
}
{
loaded && meeting &&
(loaded && loaded_children) && meeting &&
<div className="l-content-wrap">
<div className="p-article">
<div className="p-article-wrap">
@ -283,11 +288,6 @@ const ParentMeetingDetail = () => {
</article>
</div>
</div>
<ModalSettingNotify
show={show_notify_all_modal}
meetingId={meeting.id}
handleClose={()=>setShowNotifyAllModal(false)}
/>
<ModalEditMemo
show={show_memo_modal}
title={"メモ"}
@ -316,6 +316,15 @@ const ParentMeetingDetail = () => {
/>
</div>
}
{
loaded && meeting &&
<ModalSettingNotify
show={show_notify_all_modal}
meetingId={meeting.id}
handleClose={()=>setShowNotifyAllModal(false)}
handleLoadedChildren = {handleLoadedChildren}
/>
}
</div>
{ _400error && <Alert type="fail" hide={()=>set400Error('')}>{_400error}</Alert> }
{ _success && <Alert type="success" hide={()=>setSuccess('')}>{_success}</Alert> }

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

@ -201,7 +201,10 @@ useEffect(()=>{
const handleDeleteImage = async (index, image_id) => {
let list = [...meeting_image];
list.splice(index, 1);
setMeetingImages(list);
await axios.delete(`/api/fathers/meeting/images/delete/${meeting_id}`, {params:{image_id: image_id}})
.then(response=>{
setNotice(response.data.notice);
@ -209,9 +212,6 @@ useEffect(()=>{
case 400: set400Error("画像の削除に失敗しました。");
}
})
let list = [...meeting_image];
list.splice(index, 1);
setMeetingImages(list);
}
const handlePDFChange = (e) => {