From a846032499e837352a4c240d2c78c9c480b959cf Mon Sep 17 00:00:00 2001 From: dragon1211 Date: Mon, 1 Nov 2021 12:04:37 +0900 Subject: [PATCH] bugfixed admin-meeting-edit.jsx --- backend/public/js/app.js | 42 +++++++++++++++----- backend/public/{pdf => }/test.pdf | Bin backend/resources/js/admin/meeting/edit.jsx | 32 ++++++++++----- 3 files changed, 53 insertions(+), 21 deletions(-) rename backend/public/{pdf => }/test.pdf (100%) diff --git a/backend/public/js/app.js b/backend/public/js/app.js index f1d17b86..75fb07dc 100644 --- a/backend/public/js/app.js +++ b/backend/public/js/app.js @@ -37777,6 +37777,14 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var react_toastify_dist_ReactToastify_css__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! react-toastify/dist/ReactToastify.css */ "./node_modules/react-toastify/dist/ReactToastify.css"); /* harmony import */ var _component_alert__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../../component/alert */ "./resources/js/component/alert.jsx"); /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! react/jsx-runtime */ "./node_modules/react/jsx-runtime.js"); +function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); } + +function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } + +function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); } + +function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); } + function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); } function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } @@ -37803,6 +37811,8 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; } var MeetingEdit = function MeetingEdit(props) { + var _ref; + var history = (0,react_router_dom__WEBPACK_IMPORTED_MODULE_6__.useHistory)(); var _useState = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''), @@ -37874,10 +37884,12 @@ var MeetingEdit = function MeetingEdit(props) { var _useState25 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false), _useState26 = _slicedToArray(_useState25, 2), check_some = _useState26[0], - setCheckSome = _useState26[1]; // useEffect(()=>{ - // check_some = !check_all; - // }, [check_all]) + setCheckSome = _useState26[1]; + var _useState27 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)([]), + _useState28 = _slicedToArray(_useState27, 2), + selectedIndex = _useState28[0], + setSelectedIndex = _useState28[1]; (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () { var _props$match$params; @@ -37900,6 +37912,12 @@ var MeetingEdit = function MeetingEdit(props) { } }); }, []); + (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () { + if (check_all) setCheckSome(false); + }, [check_all]); + (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () { + if (check_some) setCheckAll(false); + }, [check_some]); var handleSubmit = function handleSubmit(e) { e.preventDefault(); @@ -37992,7 +38010,6 @@ var MeetingEdit = function MeetingEdit(props) { var handleDeleteImage = function handleDeleteImage(image_id) { var _props$match$params3; - console.log(image_id); axios__WEBPACK_IMPORTED_MODULE_1___default().delete("/api/admin/meeting/images/delete/".concat((_props$match$params3 = props.match.params) === null || _props$match$params3 === void 0 ? void 0 : _props$match$params3.meeting_id), { params: { image_id: image_id @@ -38171,9 +38188,9 @@ var MeetingEdit = function MeetingEdit(props) { className: "l-alert__text--error ft-16 ft-md-14", children: _422errors.image })] - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("div", { + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)("div", { className: "p-file-image justify-content-start", - children: meeting_image === null || meeting_image === void 0 ? void 0 : meeting_image.map(function (x, k) { + children: [meeting_image === null || meeting_image === void 0 ? void 0 : meeting_image.map(function (x, k) { return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)("figure", { className: "image-upload", children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("img", { @@ -38199,9 +38216,13 @@ var MeetingEdit = function MeetingEdit(props) { }) })] }, k); - }) + }), (_ref = _toConsumableArray(Array(10 - meeting_image.length))) === null || _ref === void 0 ? void 0 : _ref.map(function (x, k) { + return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("figure", { + className: "image-upload" + }, k); + })] }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("div", { - className: "edit-set edit-set-send", + className: "edit-set edit-set-send ".concat(approval_list.length == 0 && 'd-none'), children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)("label", { htmlFor: "allmember_send", children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("input", { @@ -38218,7 +38239,7 @@ var MeetingEdit = function MeetingEdit(props) { })] }) }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("div", { - className: "edit-set-mt5 edit-set-send", + className: "edit-set-mt5 edit-set-send ".concat(approval_list.length == 0 && 'd-none'), children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)("label", { htmlFor: "pickup_send", children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("input", { @@ -38235,7 +38256,7 @@ var MeetingEdit = function MeetingEdit(props) { })] }) }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("div", { - className: "checkbox-wrap edit-bg", + className: "checkbox-wrap edit-bg ".concat(approval_list.length == 0 && 'd-none'), children: approval_list === null || approval_list === void 0 ? void 0 : approval_list.map(function (item, k) { return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("div", { className: "checkbox", @@ -38245,6 +38266,7 @@ var MeetingEdit = function MeetingEdit(props) { className: "boolean optional", type: "checkbox", id: "user_name".concat(k), + disabled: !check_some, onChange: handleApproval }), "".concat(item.child.first_name, " ").concat(item.child.last_name)] }) diff --git a/backend/public/pdf/test.pdf b/backend/public/test.pdf similarity index 100% rename from backend/public/pdf/test.pdf rename to backend/public/test.pdf diff --git a/backend/resources/js/admin/meeting/edit.jsx b/backend/resources/js/admin/meeting/edit.jsx index 0734de67..0b9bd5e6 100644 --- a/backend/resources/js/admin/meeting/edit.jsx +++ b/backend/resources/js/admin/meeting/edit.jsx @@ -31,10 +31,7 @@ const MeetingEdit = (props) => { const [check_all, setCheckAll] = useState(false); const [check_some, setCheckSome] = useState(false); - - // useEffect(()=>{ - // check_some = !check_all; - // }, [check_all]) + const [selectedIndex, setSelectedIndex] = useState([]); useEffect(() => { @@ -58,6 +55,14 @@ const MeetingEdit = (props) => { }, []); + useEffect(()=>{ + if(check_all) setCheckSome(false); + }, [check_all]) + + useEffect(()=>{ + if(check_some) setCheckAll(false); + }, [check_some]) + const handleSubmit = (e) => { e.preventDefault(); @@ -113,7 +118,6 @@ const MeetingEdit = (props) => { } const handleDeleteImage = (image_id) => { - console.log(image_id); axios.delete(`/api/admin/meeting/images/delete/${props.match.params?.meeting_id}`, {params:{image_id: image_id}}) .then(response=>{ switch(response.data.status_code){ @@ -251,9 +255,14 @@ const MeetingEdit = (props) => { ) } + { + [...Array(10-meeting_image.length)]?.map((x, k)=> +
+ ) + } -
+
-
+
- -
+ +
{ approval_list?.map((item, k)=>
@@ -285,6 +294,7 @@ const MeetingEdit = (props) => { {`${item.child.first_name} ${item.child.last_name}`} @@ -292,7 +302,7 @@ const MeetingEdit = (props) => { ) }
- +