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

fixed mail notification in FE

このコミットが含まれているのは:
dragon1211 2021-12-15 16:40:24 -08:00
親 97e50ec742
コミット 33b046b445
4個のファイルの変更、189行の追加、112行の削除
統計情報を表示 Patchファイルをダウンロード Diffファイルをダウンロード すべてのファイルを展開 すべてのファイルを折り畳む

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

@ -43902,18 +43902,18 @@ function ModalSettingNotify(_ref) {
setLoaded(loaded1 && loaded2);
}, [loaded1, loaded2]);
var settingNotify = function settingNotify(tel) {
var settingNotify = function settingNotify(email) {
var formdata = new FormData();
formdata.append('tel', JSON.stringify(new Array(tel)));
formdata.append('email', JSON.stringify(new Array(email)));
formdata.append('meeting_id', meetingId);
axios__WEBPACK_IMPORTED_MODULE_1___default().post('/api/fathers/meetingNotification ', formdata).then(function (response) {
switch (response.data.status_code) {
case 200:
setSuccess('SMSの送信に成功しました!');
setSuccess('通知に成功しました!');
break;
case 400:
set400Error('SMSの送信に失敗しました。');
set400Error('通知に失敗しました。');
break;
}
});
@ -43979,7 +43979,7 @@ function ModalSettingNotify(_ref) {
className: "p-notification-btn",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("a", {
onClick: function onClick(e) {
return settingNotify(item.child.tel);
return settingNotify(item.child.email);
},
className: "btn-default btn-yellow btn-notification btn-r3 btn-h30 btn-w100p btn-fz14",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("span", {
@ -47623,16 +47623,17 @@ __webpack_require__.r(__webpack_exports__);
/* harmony export */ "default": () => (__WEBPACK_DEFAULT_EXPORT__)
/* harmony export */ });
/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! react */ "./node_modules/react/index.js");
/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router/esm/react-router.js");
/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router/esm/react-router.js");
/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! axios */ "./node_modules/axios/index.js");
/* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(axios__WEBPACK_IMPORTED_MODULE_1__);
/* harmony import */ var _material_ui_core__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! @material-ui/core */ "./node_modules/@material-ui/core/CircularProgress/CircularProgress.js");
/* harmony import */ var _material_ui_lab__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! @material-ui/lab */ "./node_modules/@material-ui/lab/LoadingButton/LoadingButton.js");
/* harmony import */ var _mui_material_IconButton__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! @mui/material/IconButton */ "./node_modules/@mui/material/IconButton/IconButton.js");
/* harmony import */ var _mui_icons_material_Remove__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! @mui/icons-material/Remove */ "./node_modules/@mui/icons-material/Remove.js");
/* harmony import */ var _material_ui_core__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! @material-ui/core */ "./node_modules/@material-ui/core/CircularProgress/CircularProgress.js");
/* harmony import */ var _material_ui_lab__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! @material-ui/lab */ "./node_modules/@material-ui/lab/LoadingButton/LoadingButton.js");
/* harmony import */ var _mui_material_IconButton__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! @mui/material/IconButton */ "./node_modules/@mui/material/IconButton/IconButton.js");
/* harmony import */ var _mui_icons_material_Remove__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! @mui/icons-material/Remove */ "./node_modules/@mui/icons-material/Remove.js");
/* harmony import */ var _component_alert__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../component/alert */ "./resources/js/component/alert.jsx");
/* harmony import */ var _notification__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../notification */ "./resources/js/parent/notification.jsx");
/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! react/jsx-runtime */ "./node_modules/react/jsx-runtime.js");
/* harmony import */ var react_pdf__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! react-pdf */ "./node_modules/react-pdf/dist/esm/entry.js");
/* 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."); }
@ -47671,10 +47672,12 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
var MeetingAdd = function MeetingAdd(props) {
var _ref;
react_pdf__WEBPACK_IMPORTED_MODULE_4__.pdfjs.GlobalWorkerOptions.workerSrc = "//cdnjs.cloudflare.com/ajax/libs/pdf.js/".concat(react_pdf__WEBPACK_IMPORTED_MODULE_4__.pdfjs.version, "/pdf.worker.min.js");
var history = (0,react_router_dom__WEBPACK_IMPORTED_MODULE_5__.useHistory)();
var MeetingAdd = function MeetingAdd(props) {
var _ref2;
var history = (0,react_router_dom__WEBPACK_IMPORTED_MODULE_6__.useHistory)();
var father_id = document.getElementById('father_id').value;
var _useState = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(localStorage.getItem('notice')),
@ -47702,51 +47705,56 @@ var MeetingAdd = function MeetingAdd(props) {
pdf = _useState10[0],
setPdf = _useState10[1];
var _useState11 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)([]),
var _useState11 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''),
_useState12 = _slicedToArray(_useState11, 2),
meeting_image = _useState12[0],
setMeetingImages = _useState12[1];
pdf_url = _useState12[0],
setPDFURL = _useState12[1];
var _useState13 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)([]),
_useState14 = _slicedToArray(_useState13, 2),
approval_list = _useState14[0],
setApprovalList = _useState14[1];
meeting_image = _useState14[0],
setMeetingImages = _useState14[1];
var _useState15 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)([]),
_useState16 = _slicedToArray(_useState15, 2),
children_list = _useState16[0],
setChildrenList = _useState16[1];
approval_list = _useState16[0],
setApprovalList = _useState16[1];
var _useState17 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)({
var _useState17 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)([]),
_useState18 = _slicedToArray(_useState17, 2),
children_list = _useState18[0],
setChildrenList = _useState18[1];
var _useState19 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)({
title: '',
text: '',
memo: '',
pdf: '',
image: ''
}),
_useState18 = _slicedToArray(_useState17, 2),
_422errors = _useState18[0],
set422Errors = _useState18[1];
var _useState19 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''),
_useState20 = _slicedToArray(_useState19, 2),
_400error = _useState20[0],
set400Error = _useState20[1];
_422errors = _useState20[0],
set422Errors = _useState20[1];
var _useState21 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
var _useState21 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''),
_useState22 = _slicedToArray(_useState21, 2),
loaded = _useState22[0],
setLoaded = _useState22[1];
_400error = _useState22[0],
set400Error = _useState22[1];
var _useState23 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
_useState24 = _slicedToArray(_useState23, 2),
submit = _useState24[0],
setSubmit = _useState24[1];
loaded = _useState24[0],
setLoaded = _useState24[1];
var _useState25 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''),
var _useState25 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
_useState26 = _slicedToArray(_useState25, 2),
check_radio = _useState26[0],
setCheckRadio = _useState26[1];
submit = _useState26[0],
setSubmit = _useState26[1];
var _useState27 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''),
_useState28 = _slicedToArray(_useState27, 2),
check_radio = _useState28[0],
setCheckRadio = _useState28[1];
var state = props.history.location.state;
(0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
@ -47915,6 +47923,7 @@ var MeetingAdd = function MeetingAdd(props) {
e.preventDefault();
var reader = new FileReader();
var _file = e.target.files[0];
setPDFURL(URL.createObjectURL(_file));
if (!_file) return;
reader.readAsDataURL(_file);
@ -47937,47 +47946,78 @@ var MeetingAdd = function MeetingAdd(props) {
setChildrenList(list);
};
return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", {
var _useState29 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(null),
_useState30 = _slicedToArray(_useState29, 2),
numPages = _useState30[0],
setNumPages = _useState30[1];
var _useState31 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(1),
_useState32 = _slicedToArray(_useState31, 2),
pageNumber = _useState32[0],
setPageNumber = _useState32[1]; //default fisrt page
function onDocumentLoadSuccess(_ref) {
var numPages = _ref.numPages;
setNumPages(numPages);
setPageNumber(1);
}
function changePage(offset) {
setPageNumber(function (prevPageNumber) {
return prevPageNumber + offset;
});
}
function previousPage() {
changePage(-1);
}
function nextPage() {
changePage(1);
}
return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("div", {
className: "l-content",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("div", {
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)("div", {
className: "l-content-w560",
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("div", {
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)("div", {
className: "l-content__ttl",
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", {
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("div", {
className: "l-content__ttl__left",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("h2", {
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("h2", {
children: "\u30DF\u30FC\u30C6\u30A3\u30F3\u30B0\u4F5C\u6210"
})
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_notification__WEBPACK_IMPORTED_MODULE_3__.default, {
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_notification__WEBPACK_IMPORTED_MODULE_3__.default, {
notice: notice
})]
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", {
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("div", {
className: "l-content-wrap",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", {
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("div", {
className: "p-article",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("div", {
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)("div", {
className: "p-article-wrap position-relative",
style: {
minHeight: '500px'
},
children: [!loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_6__.default, {
children: [!loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_7__.default, {
className: "css-loader"
}), loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("article", {
}), loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("article", {
className: "p-article__body",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", {
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("div", {
className: "p-article__content",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", {
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("div", {
className: "p-article__context",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("form", {
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)("form", {
className: "edit-form",
onSubmit: handleSubmit,
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("div", {
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)("div", {
className: "edit-set",
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("label", {
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("label", {
className: "control-label",
htmlFor: "title",
children: "\u30BF\u30A4\u30C8\u30EB"
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("input", {
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("input", {
type: "text",
name: "title",
value: title,
@ -47986,17 +48026,17 @@ var MeetingAdd = function MeetingAdd(props) {
},
className: "input-default input-title input-h60 input-w480 ".concat(_422errors.title && 'is-invalid c-input__target', " "),
id: "title"
}), _422errors.title && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", {
}), _422errors.title && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("span", {
className: "l-alert__text--error ft-16 ft-md-14",
children: _422errors.title
})]
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("div", {
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)("div", {
className: "edit-set",
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("label", {
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("label", {
className: "control-label",
htmlFor: "meeting_textarea",
children: "\u672C\u6587"
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("textarea", {
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("textarea", {
value: text,
onChange: function onChange(e) {
return setText(e.target.value);
@ -48004,17 +48044,17 @@ var MeetingAdd = function MeetingAdd(props) {
rows: "8",
className: "textarea-default ".concat(_422errors.text && 'is-invalid c-input__target', " "),
id: "meeting_textarea"
}), _422errors.text && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", {
}), _422errors.text && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("span", {
className: "l-alert__text--error ft-16 ft-md-14",
children: _422errors.text
})]
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("div", {
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)("div", {
className: "edit-set",
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("label", {
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("label", {
className: "control-label",
htmlFor: "meeting_textarea",
children: "\u30E1\u30E2"
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("textarea", {
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("textarea", {
value: memo,
onChange: function onChange(e) {
return setMemo(e.target.value);
@ -48022,23 +48062,23 @@ var MeetingAdd = function MeetingAdd(props) {
rows: "8",
className: "textarea-default ".concat(_422errors.memo && 'is-invalid c-input__target', " "),
id: "meeting_textarea"
}), _422errors.memo && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", {
}), _422errors.memo && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("span", {
className: "l-alert__text--error ft-16 ft-md-14",
children: _422errors.memo
})]
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("div", {
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)("div", {
className: "edit-set edit-set-mt15",
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("label", {
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)("label", {
className: "edit-set-file-label",
htmlFor: "file_pdf",
children: ["PDF\u30A2\u30C3\u30D7\u30ED\u30FC\u30C9", /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("input", {
children: ["PDF\u30A2\u30C3\u30D7\u30ED\u30FC\u30C9", /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("input", {
type: "file",
name: "file_pdf",
accept: ".pdf",
id: "file_pdf",
onChange: handlePDFChange
})]
}), pdf && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_mui_material_IconButton__WEBPACK_IMPORTED_MODULE_7__.default, {
}), pdf && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_mui_material_IconButton__WEBPACK_IMPORTED_MODULE_8__.default, {
onClick: function onClick() {
return setPdf('');
},
@ -48047,7 +48087,7 @@ var MeetingAdd = function MeetingAdd(props) {
top: '-6px',
right: '-6px'
},
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_mui_icons_material_Remove__WEBPACK_IMPORTED_MODULE_8__.default, {
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_mui_icons_material_Remove__WEBPACK_IMPORTED_MODULE_9__.default, {
style: {
width: '22px',
height: '22px',
@ -48056,16 +48096,24 @@ var MeetingAdd = function MeetingAdd(props) {
borderRadius: '50%'
}
})
}), _422errors.pdf && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", {
}), _422errors.pdf && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("span", {
className: "l-alert__text--error ft-16 ft-md-14",
children: _422errors.pdf
}), pdf && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(react_pdf__WEBPACK_IMPORTED_MODULE_4__.Document, {
file: pdf_url,
width: 200,
height: 300,
renderMode: "svg",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(react_pdf__WEBPACK_IMPORTED_MODULE_4__.Page, {
pageNumber: 1
})
})]
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("div", {
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)("div", {
className: "edit-set edit-set-mt15",
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("label", {
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)("label", {
className: "edit-set-file-label",
htmlFor: meeting_image.length < 10 ? 'file_image' : '',
children: ["\u753B\u50CF\u30A2\u30C3\u30D7\u30ED\u30FC\u30C9", /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("input", {
children: ["\u753B\u50CF\u30A2\u30C3\u30D7\u30ED\u30FC\u30C9", /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("input", {
type: "file",
multiple: "multiple",
name: "file_image[]",
@ -48073,19 +48121,19 @@ var MeetingAdd = function MeetingAdd(props) {
id: "file_image",
onChange: handleImageChange
})]
}), _422errors.image && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", {
}), _422errors.image && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("span", {
className: "l-alert__text--error ft-16 ft-md-14",
children: _422errors.image
})]
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("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) {
return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("figure", {
return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)("figure", {
className: "image-upload",
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("img", {
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("img", {
src: x,
alt: x
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_mui_material_IconButton__WEBPACK_IMPORTED_MODULE_7__.default, {
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_mui_material_IconButton__WEBPACK_IMPORTED_MODULE_8__.default, {
onClick: function onClick(e) {
return handleRemoveImage(k);
},
@ -48094,7 +48142,7 @@ var MeetingAdd = function MeetingAdd(props) {
bottom: '-6px',
right: '-6px'
},
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_mui_icons_material_Remove__WEBPACK_IMPORTED_MODULE_8__.default, {
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_mui_icons_material_Remove__WEBPACK_IMPORTED_MODULE_9__.default, {
style: {
width: '22px',
height: '22px',
@ -48105,16 +48153,16 @@ var MeetingAdd = function MeetingAdd(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_4__.jsx)("figure", {
}), (_ref2 = _toConsumableArray(Array(10 - meeting_image.length))) === null || _ref2 === void 0 ? void 0 : _ref2.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_4__.jsx)("div", {
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("div", {
className: "edit-set edit-set-send",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("label", {
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)("label", {
htmlFor: "all_send",
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("input", {
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("input", {
className: "boolean optional",
type: "radio",
id: "all_send",
@ -48125,16 +48173,16 @@ var MeetingAdd = function MeetingAdd(props) {
},
checked: check_radio == 'all_send' ? true : false,
disabled: children_list.length == 0 ? true : false
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", {
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("span", {
className: "lbl padding-16",
children: "\u5168\u54E1\u306B\u9001\u4FE1"
})]
})
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", {
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("div", {
className: "edit-set-mt5 edit-set-send",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("label", {
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)("label", {
htmlFor: "pickup_send",
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("input", {
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("input", {
className: "boolean optional",
type: "radio",
id: "pickup_send",
@ -48144,19 +48192,19 @@ var MeetingAdd = function MeetingAdd(props) {
},
checked: check_radio == 'pickup_send' ? true : false,
disabled: children_list.length == 0 ? true : false
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", {
}), /*#__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_4__.jsx)("div", {
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("div", {
className: "checkbox-wrap edit-bg d-none ".concat(check_radio == "pickup_send" && 'd-block'),
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", {
return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("div", {
className: "checkbox",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("label", {
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)("label", {
htmlFor: "user_name".concat(k),
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("input", {
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("input", {
className: "boolean optional",
type: "checkbox",
id: "user_name".concat(k),
@ -48164,26 +48212,26 @@ var MeetingAdd = function MeetingAdd(props) {
onChange: function onChange(e) {
return handleCheck(e, k);
}
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", {
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("span", {
className: "lbl padding-16",
children: "".concat(item.last_name, " ").concat(item.first_name)
})]
})
}, k);
}) : /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("p", {
}) : /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("p", {
className: "text-center",
children: "\u5B50\u306F\u3042\u308A\u307E\u305B\u3093\u3002"
})
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_material_ui_lab__WEBPACK_IMPORTED_MODULE_9__.default, {
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_material_ui_lab__WEBPACK_IMPORTED_MODULE_10__.default, {
type: "submit",
fullWidth: true,
loading: submit,
className: "btn-edit btn-default btn-h75 bg-yellow rounded-15",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", {
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("span", {
className: "ft-18 ft-xs-16 font-weight-bold ".concat(!submit && 'text-black'),
children: "\u30DF\u30FC\u30C6\u30A3\u30F3\u30B0\u3092\u767B\u9332"
})
}), _400error && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_2__.default, {
}), _400error && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_2__.default, {
type: "fail",
hide: function hide() {
return set400Error('');
@ -48473,14 +48521,14 @@ var MeetingDetail = function MeetingDetail(props) {
if (response.data.status_code == 200) {
var list = response.data.params;
var tel_list = [];
var email_list = [];
for (var i in list) {
tel_list.push(list[i].child.tel);
email_list.push(list[i].child.email);
}
var formdata = new FormData();
formdata.append('tel', JSON.stringify(tel_list));
formdata.append('email', JSON.stringify(email_list));
formdata.append('meeting_id', props.match.params.meeting_id);
axios__WEBPACK_IMPORTED_MODULE_3___default().post('/api/fathers/meetingEditNotification', formdata).then(function (response) {
setSubmitNotify(false);
@ -48488,11 +48536,11 @@ var MeetingDetail = function MeetingDetail(props) {
switch (response.data.status_code) {
case 200:
setSuccess('SMSの送信に成功しました!');
setSuccess('通知に成功しました!');
break;
case 400:
set400Error('SMSの送信に失敗しました。');
set400Error('通知に失敗しました。');
break;
}
});

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

@ -54,15 +54,15 @@ export default function ModalSettingNotify({show, handleClose, meetingId}){
setLoaded(loaded1 && loaded2);
},[loaded1, loaded2]);
const settingNotify = (tel) => {
const settingNotify = (email) => {
const formdata = new FormData();
formdata.append('tel', JSON.stringify(new Array(tel)));
formdata.append('email', JSON.stringify(new Array(email)));
formdata.append('meeting_id', meetingId);
axios.post('/api/fathers/meetingNotification ', formdata)
.then(response=>{
switch(response.data.status_code){
case 200: setSuccess('SMSの送信に成功しました!'); break;
case 400: set400Error('SMSの送信に失敗しました。'); break;
case 200: setSuccess('通知に成功しました!'); break;
case 400: set400Error('通知に失敗しました。'); break;
}
})
}
@ -104,7 +104,7 @@ export default function ModalSettingNotify({show, handleClose, meetingId}){
</Link>
</div>
<div className="p-notification-btn">
<a onClick={e => settingNotify(item.child.tel)} className="btn-default btn-yellow btn-notification btn-r3 btn-h30 btn-w100p btn-fz14">
<a onClick={e => settingNotify(item.child.email)} className="btn-default btn-yellow btn-notification btn-r3 btn-h30 btn-w100p btn-fz14">
<span>通知</span>
</a>
</div>

29
backend/resources/js/parent/meeting/add.jsx
ファイルの表示

@ -7,6 +7,8 @@ import IconButton from '@mui/material/IconButton';
import RemoveIcon from '@mui/icons-material/Remove';
import Alert from '../../component/alert';
import Notification from '../notification';
import { Document, Page, pdfjs } from "react-pdf";
pdfjs.GlobalWorkerOptions.workerSrc = `//cdnjs.cloudflare.com/ajax/libs/pdf.js/${pdfjs.version}/pdf.worker.min.js`;
const MeetingAdd = (props) => {
@ -19,6 +21,7 @@ const MeetingAdd = (props) => {
const [memo, setMemo] = useState('');
const [text, setText] = useState('');
const [pdf, setPdf] = useState('');
const [pdf_url, setPDFURL] = useState('');
const [meeting_image, setMeetingImages] = useState([]);
const [approval_list, setApprovalList] = useState([]);
const [children_list, setChildrenList] = useState([]);
@ -171,6 +174,7 @@ const MeetingAdd = (props) => {
e.preventDefault();
let reader = new FileReader();
let _file = e.target.files[0];
setPDFURL(URL.createObjectURL(_file))
if(!_file) return;
reader.readAsDataURL(_file);
reader.onloadend = () => {
@ -190,6 +194,25 @@ const MeetingAdd = (props) => {
setChildrenList(list);
}
const [numPages, setNumPages] = useState(null);
const [pageNumber, setPageNumber] = useState(1); //default fisrt page
function onDocumentLoadSuccess({ numPages }) {
setNumPages(numPages);
setPageNumber(1);
}
function changePage(offset) {
setPageNumber(prevPageNumber => prevPageNumber + offset);
}
function previousPage() {
changePage(-1);
}
function nextPage() {
changePage(1);
}
return (
<div className="l-content">
@ -269,6 +292,12 @@ const MeetingAdd = (props) => {
{_422errors.pdf}
</span>
}
{
pdf &&
<Document file={pdf_url} width={200} height={300} renderMode='svg'>
<Page pageNumber={1} />
</Document>
}
</div>
<div className="edit-set edit-set-mt15">
<label className="edit-set-file-label" htmlFor={meeting_image.length < 10 ? 'file_image': ''}>

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

@ -112,20 +112,20 @@ const MeetingDetail = (props) => {
setNotice(response.data.notice);
if(response.data.status_code == 200){
var list = response.data.params;
const tel_list = [];
const email_list = [];
for(var i in list){
tel_list.push(list[i].child.tel);
email_list.push(list[i].child.email);
}
const formdata = new FormData();
formdata.append('tel', JSON.stringify(tel_list));
formdata.append('email', JSON.stringify(email_list));
formdata.append('meeting_id', props.match.params.meeting_id);
axios.post('/api/fathers/meetingEditNotification', formdata)
.then(response=>{
setSubmitNotify(false);
setShowNotifySelectModal(false);
switch(response.data.status_code){
case 200: setSuccess('SMSの送信に成功しました!'); break;
case 400: set400Error('SMSの送信に失敗しました。'); break;
case 200: setSuccess('通知に成功しました!'); break;
case 400: set400Error('通知に失敗しました。'); break;
}
})
}