diff --git a/backend/public/js/app.js b/backend/public/js/app.js index a95d020f..279566bd 100644 --- a/backend/public/js/app.js +++ b/backend/public/js/app.js @@ -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", @@ -47843,7 +47846,8 @@ var MeetingAdd = function MeetingAdd(props) { onClick: function onClick(e) { return setCheckRadio(e.target.id); }, - defaultChecked: (state === null || state === void 0 ? void 0 : state.children.length) == (state === null || state === void 0 ? void 0 : 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" @@ -47861,14 +47865,15 @@ var MeetingAdd = function MeetingAdd(props) { onClick: function onClick(e) { return setCheckRadio(e.target.id); }, - defaultChecked: (state === null || state === void 0 ? void 0 : state.children.length) != (state === null || state === void 0 ? void 0 : 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", @@ -48675,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("失敗しました。"); } @@ -49081,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" @@ -49099,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", diff --git a/backend/resources/js/admin/meeting/edit.jsx b/backend/resources/js/admin/meeting/edit.jsx index f1009bd7..bdcceac8 100644 --- a/backend/resources/js/admin/meeting/edit.jsx +++ b/backend/resources/js/admin/meeting/edit.jsx @@ -50,6 +50,7 @@ const MeetingEdit = (props) => { else list[i].checked = false; } } + console.log('sd') setChildrenList(list); },[check_radio]) @@ -77,7 +78,7 @@ const MeetingEdit = (props) => { else arr.push({...list[i], checked: false}); } 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("失敗しました。"); @@ -322,7 +323,8 @@ const MeetingEdit = (props) => { id="all_send" name="check_radio" onClick={e=>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} /> 全員に送信 @@ -335,13 +337,14 @@ const MeetingEdit = (props) => { id="pickup_send" name="check_radio" onClick={e=>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} /> 選んで送信 -
+
0) && 'd-none'}`}> { children_list.length != 0 ? children_list?.map((item, k)=> diff --git a/backend/resources/js/parent/meeting/add.jsx b/backend/resources/js/parent/meeting/add.jsx index b2855a9f..5eb000c0 100644 --- a/backend/resources/js/parent/meeting/add.jsx +++ b/backend/resources/js/parent/meeting/add.jsx @@ -314,6 +314,7 @@ const MeetingAdd = (props) => { value={false} onClick={e=>setCheckRadio(e.target.id)} defaultChecked = {(state?.children.length == state?.approval.length)? true:false} + disabled = {children_list.length == 0 ? true:false} /> 全員に送信 @@ -327,12 +328,13 @@ const MeetingAdd = (props) => { name="check_radio" onClick={e=>setCheckRadio(e.target.id)} defaultChecked = {(state?.children.length != state?.approval.length)? true:false} + disabled = {children_list.length == 0 ? true:false} /> 選んで送信
-
+
0) && 'd-none'}`}> { children_list.length != 0 ? children_list?.map((item, k)=> diff --git a/backend/resources/js/parent/meeting/edit.jsx b/backend/resources/js/parent/meeting/edit.jsx index c17d4614..1e73efab 100644 --- a/backend/resources/js/parent/meeting/edit.jsx +++ b/backend/resources/js/parent/meeting/edit.jsx @@ -64,7 +64,7 @@ const MeetingEdit = (props) => { else arr.push({...list[i], checked: false}); } 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("失敗しました。"); @@ -348,7 +348,8 @@ useEffect(()=>{ id="all_send" name="check_radio" onClick={e=>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} /> 全員に送信 @@ -361,13 +362,14 @@ useEffect(()=>{ id="pickup_send" name="check_radio" onClick={e=>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} /> 選んで送信
-
+
0) && 'd-none'}`}> { children_list.length != 0 ? children_list?.map((item, k)=>