diff --git a/backend/public/js/app.js b/backend/public/js/app.js index bfe20498..361786a2 100644 --- a/backend/public/js/app.js +++ b/backend/public/js/app.js @@ -36122,7 +36122,7 @@ var MeetingDetail = function MeetingDetail(props) { className: "meeting-member-list", role: "list", children: (_meeting$approval = meeting.approval) === null || _meeting$approval === void 0 ? void 0 : _meeting$approval.map(function (x, k) { - return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("li", { + if (x.approval_at) return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("li", { className: "meeting-member__item", role: "listitem", children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("div", { @@ -36449,6 +36449,7 @@ var MeetingEdit = function MeetingEdit(props) { } } + console.log('sd'); setChildrenList(list); }, [check_radio]); (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () { @@ -36485,7 +36486,7 @@ var MeetingEdit = function MeetingEdit(props) { } setChildrenList(arr); - approval.length == list.length ? setCheckRadio("all_send") : setCheckRadio("pickup_send"); + approval.length == list.length && list.length > 0 ? setCheckRadio("all_send") : setCheckRadio("pickup_send"); } else { set400Error("失敗しました。"); } @@ -36842,7 +36843,8 @@ var MeetingEdit = function MeetingEdit(props) { onClick: function onClick(e) { return setCheckRadio(e.target.id); }, - defaultChecked: meeting.approval.length == meeting.children.length ? true : false + defaultChecked: meeting.approval.length == meeting.children.length && meeting.children.length > 0 ? true : false, + disabled: meeting.children.length == 0 ? true : false }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("span", { className: "lbl padding-16", children: "\u5168\u54E1\u306B\u9001\u4FE1" @@ -36860,14 +36862,15 @@ var MeetingEdit = function MeetingEdit(props) { onClick: function onClick(e) { return setCheckRadio(e.target.id); }, - defaultChecked: meeting.approval.length != meeting.children.length ? true : false + defaultChecked: meeting.approval.length != meeting.children.length && meeting.children.length > 0 ? true : false, + disabled: meeting.children.length == 0 ? true : false }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("span", { className: "lbl padding-16", children: "\u9078\u3093\u3067\u9001\u4FE1" })] }) }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("div", { - className: "checkbox-wrap edit-bg ".concat(check_radio != "pickup_send" && 'd-none'), + className: "checkbox-wrap edit-bg ".concat(check_radio == "all_send" && meeting.children.length > 0 && 'd-none'), children: children_list.length != 0 ? children_list === null || children_list === void 0 ? void 0 : children_list.map(function (item, k) { return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("div", { className: "checkbox", @@ -37228,7 +37231,7 @@ var Meeting = function Meeting(props) { className: "meeting-member-list", role: "list", children: (_item$approval = item.approval) === null || _item$approval === void 0 ? void 0 : _item$approval.map(function (x, kj) { - return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("li", { + if (x.approval_at) return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("li", { className: "meeting-member__item", role: "listitem", children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("div", { @@ -45109,7 +45112,7 @@ var ParentAuth = /*#__PURE__*/function (_Component) { if (document.getElementById('p-auth')) { - console.log("v1: 2021/11/30"); + console.log("v1: 2021/11/30 21h"); react_dom__WEBPACK_IMPORTED_MODULE_1__.render( /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)(ParentAuth, {}), document.getElementById('p-auth')); } @@ -47186,7 +47189,7 @@ var Favorite = function Favorite(props) { className: "meeting-member-list", role: "list", children: (_item$approvals = item.approvals) === null || _item$approvals === void 0 ? void 0 : _item$approvals.map(function (v, inx1) { - return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("li", { + if (v.approval_at) return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("li", { className: "meeting-member__item", role: "listitem", children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("div", { @@ -47273,7 +47276,7 @@ var Favorite = function Favorite(props) { className: "meeting-member-list", role: "list", children: (_item$approvals2 = item.approvals) === null || _item$approvals2 === void 0 ? void 0 : _item$approvals2.map(function (v, inx1) { - return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("li", { + if (v.approval_at) return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("li", { className: "meeting-member__item", role: "listitem", children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("div", { @@ -47578,7 +47581,6 @@ var MeetingAdd = function MeetingAdd(props) { if (children_list[i].checked) c_arr.push(children_list[i].id); } - console.log(c_arr); formdata.append('children', JSON.stringify(c_arr)); setSubmit(true); axios__WEBPACK_IMPORTED_MODULE_1___default().post('/api/fathers/meetings/register', formdata).then(function (response) { @@ -47844,7 +47846,8 @@ var MeetingAdd = function MeetingAdd(props) { onClick: function onClick(e) { return setCheckRadio(e.target.id); }, - defaultChecked: state.children.length == state.approval.length ? true : false + defaultChecked: (state === null || state === void 0 ? void 0 : state.children.length) == (state === null || state === void 0 ? void 0 : state.approval.length) ? true : false, + disabled: children_list.length == 0 ? true : false }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", { className: "lbl padding-16", children: "\u5168\u54E1\u306B\u9001\u4FE1" @@ -47862,14 +47865,15 @@ var MeetingAdd = function MeetingAdd(props) { onClick: function onClick(e) { return setCheckRadio(e.target.id); }, - defaultChecked: state.children.length != state.approval.length ? true : false + defaultChecked: (state === null || state === void 0 ? void 0 : state.children.length) != (state === null || state === void 0 ? void 0 : state.approval.length) ? true : false, + disabled: children_list.length == 0 ? true : false }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", { className: "lbl padding-16", children: "\u9078\u3093\u3067\u9001\u4FE1" })] }) }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", { - className: "checkbox-wrap edit-bg ".concat(check_radio != "pickup_send" && 'd-none'), + className: "checkbox-wrap edit-bg ".concat(check_radio == "all_send" && children_list.length > 0 && 'd-none'), children: children_list.length != 0 ? children_list === null || children_list === void 0 ? void 0 : children_list.map(function (item, k) { return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", { className: "checkbox", @@ -48250,6 +48254,9 @@ var MeetingDetail = function MeetingDetail(props) { className: "meeting-member-wrap", children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsxs)("div", { className: "meeting-member-link", + onClick: function onClick() { + return setShowNotifyAllModal(true); + }, children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsxs)("ul", { className: "meeting-member-count", children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)("li", { @@ -48262,11 +48269,8 @@ var MeetingDetail = function MeetingDetail(props) { }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)("ul", { className: "meeting-member-list", role: "list", - onClick: function onClick() { - return setShowNotifyAllModal(true); - }, children: (_meeting$approval = meeting.approval) === null || _meeting$approval === void 0 ? void 0 : _meeting$approval.map(function (v, inx) { - return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)("li", { + if (v.approval_at) return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)("li", { className: "meeting-member__item", role: "listitem", children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)("div", { @@ -48676,7 +48680,7 @@ var MeetingEdit = function MeetingEdit(props) { } setChildrenList(arr); - approval.length == list.length ? setCheckRadio("all_send") : setCheckRadio("pickup_send"); + approval.length == list.length && list.length > 0 ? setCheckRadio("all_send") : setCheckRadio("pickup_send"); } else { set400Error("失敗しました。"); } @@ -49082,7 +49086,8 @@ var MeetingEdit = function MeetingEdit(props) { onClick: function onClick(e) { return setCheckRadio(e.target.id); }, - defaultChecked: meeting.approval.length == meeting.children.length ? true : false + defaultChecked: meeting.approval.length == meeting.children.length && meeting.children.length > 0 ? true : false, + disabled: meeting.children.length == 0 ? true : false }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("span", { className: "lbl padding-16", children: "\u5168\u54E1\u306B\u9001\u4FE1" @@ -49100,14 +49105,15 @@ var MeetingEdit = function MeetingEdit(props) { onClick: function onClick(e) { return setCheckRadio(e.target.id); }, - defaultChecked: meeting.approval.length != meeting.children.length ? true : false + defaultChecked: meeting.approval.length != meeting.children.length && meeting.children.length > 0 ? true : false, + disabled: meeting.children.length == 0 ? true : false }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("span", { className: "lbl padding-16", children: "\u9078\u3093\u3067\u9001\u4FE1" })] }) }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("div", { - className: "checkbox-wrap edit-bg ".concat(check_radio != "pickup_send" && 'd-none'), + className: "checkbox-wrap edit-bg ".concat(check_radio == "all_send" && meeting.children.length > 0 && 'd-none'), children: children_list.length != 0 ? children_list === null || children_list === void 0 ? void 0 : children_list.map(function (item, k) { return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("div", { className: "checkbox", @@ -49572,7 +49578,7 @@ var Meeting = function Meeting(props) { className: "meeting-member-list", role: "list", children: (_item$approvals = item.approvals) === null || _item$approvals === void 0 ? void 0 : _item$approvals.map(function (v, inx1) { - return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)("li", { + if (v.approval_at) return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)("li", { className: "meeting-member__item", role: "listitem", children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)("div", { @@ -49659,7 +49665,7 @@ var Meeting = function Meeting(props) { className: "meeting-member-list", role: "list", children: (_item$approvals2 = item.approvals) === null || _item$approvals2 === void 0 ? void 0 : _item$approvals2.map(function (v, inx1) { - return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)("li", { + if (v.approval_at) return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)("li", { className: "meeting-member__item", role: "listitem", children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)("div", { @@ -51277,7 +51283,7 @@ var Search = function Search(props) { className: "meeting-member-list", role: "list", children: (_item$approvals = item.approvals) === null || _item$approvals === void 0 ? void 0 : _item$approvals.map(function (v, inx1) { - return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("li", { + if (v.approval_at) return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("li", { className: "meeting-member__item", role: "listitem", children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("div", { @@ -51365,7 +51371,7 @@ var Search = function Search(props) { className: "meeting-member-list", role: "list", children: (_item$approvals2 = item.approvals) === null || _item$approvals2 === void 0 ? void 0 : _item$approvals2.map(function (v, inx1) { - return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("li", { + if (v.approval_at) return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("li", { className: "meeting-member__item", role: "listitem", children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("div", { diff --git a/backend/resources/js/admin/meeting/detail.jsx b/backend/resources/js/admin/meeting/detail.jsx index d18dc4cb..8df068d3 100644 --- a/backend/resources/js/admin/meeting/detail.jsx +++ b/backend/resources/js/admin/meeting/detail.jsx @@ -99,12 +99,15 @@ const MeetingDetail = (props) => {