「全員に送信」及び「選んで送信」は初期値として「全員に返信」を設定しました。
このコミットが含まれているのは:
dragon1211
コミット
b4169e9caa
|
|
@ -17401,8 +17401,8 @@ a {
|
|||
.css-loader {
|
||||
width: 40px !important;
|
||||
height: 40px !important;
|
||||
top: calc(45vh - 22px);
|
||||
left: calc(50vw + 120px - 22px);
|
||||
top: calc(45vh - 20px);
|
||||
left: calc(50vw + 120px - 20px);
|
||||
}
|
||||
}
|
||||
@media screen and (max-width: 1068px) {
|
||||
|
|
@ -17414,6 +17414,26 @@ a {
|
|||
}
|
||||
}
|
||||
|
||||
.modal-css-loader {
|
||||
color: green !important;
|
||||
position: fixed;
|
||||
z-index: 10;
|
||||
width: 30px !important;
|
||||
height: 30px !important;
|
||||
}
|
||||
@media screen and (min-width: 1068px) {
|
||||
.modal-css-loader {
|
||||
top: calc(45vh - 15px);
|
||||
left: calc(50vw - 25px);
|
||||
}
|
||||
}
|
||||
@media screen and (max-width: 1068px) {
|
||||
.modal-css-loader {
|
||||
top: calc(45vh - 15px);
|
||||
left: calc(50vw - 15px);
|
||||
}
|
||||
}
|
||||
|
||||
.p-article .meeting-member-count {
|
||||
display: block !important;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36363,7 +36363,7 @@ var MeetingEdit = function MeetingEdit(props) {
|
|||
var _useState15 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)([]),
|
||||
_useState16 = _slicedToArray(_useState15, 2),
|
||||
children_list = _useState16[0],
|
||||
setChildren = _useState16[1];
|
||||
setChildrenList = _useState16[1];
|
||||
|
||||
var _useState17 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)({
|
||||
title: '',
|
||||
|
|
@ -36401,31 +36401,26 @@ var MeetingEdit = function MeetingEdit(props) {
|
|||
check_radio = _useState28[0],
|
||||
setCheckRadio = _useState28[1];
|
||||
|
||||
var _useState29 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)([]),
|
||||
var _useState29 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
|
||||
_useState30 = _slicedToArray(_useState29, 2),
|
||||
children_temp = _useState30[0],
|
||||
setChildrenTemp = _useState30[1];
|
||||
|
||||
var _useState31 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
|
||||
_useState32 = _slicedToArray(_useState31, 2),
|
||||
image_sending = _useState32[0],
|
||||
setImageSending = _useState32[1];
|
||||
image_sending = _useState30[0],
|
||||
setImageSending = _useState30[1];
|
||||
|
||||
(0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
|
||||
if (!loaded) return; //if dont load data
|
||||
|
||||
var list = [];
|
||||
|
||||
if (check_radio == "false") {
|
||||
if (check_radio == "all_send") {
|
||||
//send all children
|
||||
list = _toConsumableArray(children_temp);
|
||||
list = _toConsumableArray(children_list);
|
||||
|
||||
for (var i in list) {
|
||||
list[i].checked = true;
|
||||
}
|
||||
} else if (check_radio == "true") {
|
||||
} else if (check_radio == "pickup_send") {
|
||||
//send pickup
|
||||
list = _toConsumableArray(children_temp);
|
||||
list = _toConsumableArray(children_list);
|
||||
|
||||
for (var i in list) {
|
||||
if (approval_list.findIndex(function (ele) {
|
||||
|
|
@ -36434,7 +36429,7 @@ var MeetingEdit = function MeetingEdit(props) {
|
|||
}
|
||||
}
|
||||
|
||||
setChildrenTemp(list);
|
||||
setChildrenList(list);
|
||||
}, [check_radio]);
|
||||
(0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
|
||||
setLoaded(false);
|
||||
|
|
@ -36442,7 +36437,7 @@ var MeetingEdit = function MeetingEdit(props) {
|
|||
setLoaded(true);
|
||||
|
||||
if (response.data.status_code == 200) {
|
||||
var _response$data$params, _response$data$params2, _response$data$params3, _response$data$params4, _response$data$params5, _response$data$params6, _response$data$params7, _response$data$params8, _response$data$params9;
|
||||
var _response$data$params, _response$data$params2, _response$data$params3, _response$data$params4, _response$data$params5, _response$data$params6, _response$data$params7, _response$data$params8;
|
||||
|
||||
setMeeting(response.data.params); //Success
|
||||
|
||||
|
|
@ -36452,11 +36447,10 @@ var MeetingEdit = function MeetingEdit(props) {
|
|||
setMeetingImages((_response$data$params4 = response.data.params) === null || _response$data$params4 === void 0 ? void 0 : _response$data$params4.meeting_image);
|
||||
setApproval((_response$data$params5 = response.data.params) === null || _response$data$params5 === void 0 ? void 0 : _response$data$params5.approval);
|
||||
setPdf((_response$data$params6 = response.data.params) === null || _response$data$params6 === void 0 ? void 0 : _response$data$params6.pdf);
|
||||
setChildren((_response$data$params7 = response.data.params) === null || _response$data$params7 === void 0 ? void 0 : _response$data$params7.children);
|
||||
|
||||
var list = _toConsumableArray((_response$data$params8 = response.data.params) === null || _response$data$params8 === void 0 ? void 0 : _response$data$params8.children);
|
||||
var list = _toConsumableArray((_response$data$params7 = response.data.params) === null || _response$data$params7 === void 0 ? void 0 : _response$data$params7.children);
|
||||
|
||||
var approval = _toConsumableArray((_response$data$params9 = response.data.params) === null || _response$data$params9 === void 0 ? void 0 : _response$data$params9.approval);
|
||||
var approval = _toConsumableArray((_response$data$params8 = response.data.params) === null || _response$data$params8 === void 0 ? void 0 : _response$data$params8.approval);
|
||||
|
||||
var arr = [];
|
||||
|
||||
|
|
@ -36470,7 +36464,8 @@ var MeetingEdit = function MeetingEdit(props) {
|
|||
}));
|
||||
}
|
||||
|
||||
setChildrenTemp(arr);
|
||||
setChildrenList(arr);
|
||||
setCheckRadio("all_send");
|
||||
} else {
|
||||
set400Error("失敗しました。");
|
||||
}
|
||||
|
|
@ -36490,19 +36485,19 @@ var MeetingEdit = function MeetingEdit(props) {
|
|||
var approval_deleteIndexes = [];
|
||||
|
||||
var _loop = function _loop(i) {
|
||||
if (children_temp[i].checked) {
|
||||
if (children_list[i].checked) {
|
||||
if (approval_list.findIndex(function (ele) {
|
||||
return ele.child_id == children_temp[i].id;
|
||||
}) < 0) approval_registerIndexes.push(children_temp[i].id);
|
||||
return ele.child_id == children_list[i].id;
|
||||
}) < 0) approval_registerIndexes.push(children_list[i].id);
|
||||
}
|
||||
};
|
||||
|
||||
for (var i = 0; i < children_temp.length; i++) {
|
||||
for (var i = 0; i < children_list.length; i++) {
|
||||
_loop(i);
|
||||
}
|
||||
|
||||
var _loop2 = function _loop2(_i2) {
|
||||
if (children_temp.findIndex(function (ele) {
|
||||
if (children_list.findIndex(function (ele) {
|
||||
return ele.checked && ele.id == approval_list[_i2].child_id;
|
||||
}) < 0) approval_deleteIndexes.push(approval_list[_i2].child_id);
|
||||
};
|
||||
|
|
@ -36626,10 +36621,10 @@ var MeetingEdit = function MeetingEdit(props) {
|
|||
};
|
||||
|
||||
var handleCheck = function handleCheck(e, index) {
|
||||
var list = _toConsumableArray(children_temp);
|
||||
var list = _toConsumableArray(children_list);
|
||||
|
||||
list[index].checked = e.target.checked;
|
||||
setChildrenTemp(list);
|
||||
setChildrenList(list);
|
||||
};
|
||||
|
||||
var handlePDFChange = function handlePDFChange(e) {
|
||||
|
|
@ -36818,16 +36813,16 @@ var MeetingEdit = function MeetingEdit(props) {
|
|||
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("div", {
|
||||
className: "edit-set edit-set-send",
|
||||
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)("label", {
|
||||
htmlFor: "allmember_send",
|
||||
htmlFor: "all_send",
|
||||
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("input", {
|
||||
className: "boolean optional",
|
||||
type: "radio",
|
||||
id: "allmember_send",
|
||||
id: "all_send",
|
||||
name: "check_radio",
|
||||
value: false,
|
||||
onClick: function onClick(e) {
|
||||
return setCheckRadio(e.target.value);
|
||||
}
|
||||
return setCheckRadio(e.target.id);
|
||||
},
|
||||
defaultChecked: true
|
||||
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("span", {
|
||||
className: "lbl padding-16",
|
||||
children: "\u5168\u54E1\u306B\u9001\u4FE1"
|
||||
|
|
@ -36842,9 +36837,8 @@ var MeetingEdit = function MeetingEdit(props) {
|
|||
type: "radio",
|
||||
id: "pickup_send",
|
||||
name: "check_radio",
|
||||
value: true,
|
||||
onClick: function onClick(e) {
|
||||
return setCheckRadio(e.target.value);
|
||||
return setCheckRadio(e.target.id);
|
||||
}
|
||||
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("span", {
|
||||
className: "lbl padding-16",
|
||||
|
|
@ -36852,8 +36846,8 @@ var MeetingEdit = function MeetingEdit(props) {
|
|||
})]
|
||||
})
|
||||
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("div", {
|
||||
className: "checkbox-wrap edit-bg ".concat(check_radio != "true" && 'd-none'),
|
||||
children: children_list.length != 0 ? children_temp === null || children_temp === void 0 ? void 0 : children_temp.map(function (item, k) {
|
||||
className: "checkbox-wrap edit-bg ".concat(check_radio != "pickup_send" && '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",
|
||||
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)("label", {
|
||||
|
|
@ -43549,7 +43543,7 @@ function ModalSettingNotify(_ref) {
|
|||
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)(_mui_material_DialogContent__WEBPACK_IMPORTED_MODULE_7__.default, {
|
||||
className: "position-relative",
|
||||
children: [!loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_8__.default, {
|
||||
className: "css-loader"
|
||||
className: "modal-css-loader"
|
||||
}), loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)(react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.Fragment, {
|
||||
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("div", {
|
||||
className: "modal-content border-0 ".concat(!isApproval ? "is-active" : ""),
|
||||
|
|
@ -46518,6 +46512,7 @@ var Child = function Child(props) {
|
|||
"data-v-ade1d018": "kikikanri",
|
||||
className: "btn-default btn-yellow btn-meeting btn-shadow btn-r8 btn-h48 btn-fz14",
|
||||
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("span", {
|
||||
className: "ft-16",
|
||||
children: "\u5B50\u8FFD\u52A0"
|
||||
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("svg", {
|
||||
version: "1.1",
|
||||
|
|
@ -47261,45 +47256,51 @@ var MeetingAdd = function MeetingAdd(props) {
|
|||
|
||||
var _useState13 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)([]),
|
||||
_useState14 = _slicedToArray(_useState13, 2),
|
||||
children_list = _useState14[0],
|
||||
setChildrenList = _useState14[1];
|
||||
approval_list = _useState14[0],
|
||||
setApprovalList = _useState14[1];
|
||||
|
||||
var _useState15 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)({
|
||||
var _useState15 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)([]),
|
||||
_useState16 = _slicedToArray(_useState15, 2),
|
||||
children_list = _useState16[0],
|
||||
setChildrenList = _useState16[1];
|
||||
|
||||
var _useState17 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)({
|
||||
title: '',
|
||||
text: '',
|
||||
memo: '',
|
||||
pdf: '',
|
||||
image: ''
|
||||
}),
|
||||
_useState16 = _slicedToArray(_useState15, 2),
|
||||
_422errors = _useState16[0],
|
||||
set422Errors = _useState16[1];
|
||||
|
||||
var _useState17 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''),
|
||||
_useState18 = _slicedToArray(_useState17, 2),
|
||||
_400error = _useState18[0],
|
||||
set400Error = _useState18[1];
|
||||
_422errors = _useState18[0],
|
||||
set422Errors = _useState18[1];
|
||||
|
||||
var _useState19 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
|
||||
var _useState19 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''),
|
||||
_useState20 = _slicedToArray(_useState19, 2),
|
||||
loaded = _useState20[0],
|
||||
setLoaded = _useState20[1];
|
||||
_400error = _useState20[0],
|
||||
set400Error = _useState20[1];
|
||||
|
||||
var _useState21 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
|
||||
_useState22 = _slicedToArray(_useState21, 2),
|
||||
submit = _useState22[0],
|
||||
setSubmit = _useState22[1];
|
||||
loaded = _useState22[0],
|
||||
setLoaded = _useState22[1];
|
||||
|
||||
var _useState23 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''),
|
||||
var _useState23 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
|
||||
_useState24 = _slicedToArray(_useState23, 2),
|
||||
check_radio = _useState24[0],
|
||||
setCheckRadio = _useState24[1];
|
||||
submit = _useState24[0],
|
||||
setSubmit = _useState24[1];
|
||||
|
||||
var _useState25 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''),
|
||||
_useState26 = _slicedToArray(_useState25, 2),
|
||||
check_radio = _useState26[0],
|
||||
setCheckRadio = _useState26[1];
|
||||
|
||||
(0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
|
||||
setLoaded(false);
|
||||
var state = props.history.location.state;
|
||||
|
||||
if (state) {
|
||||
console.log(state);
|
||||
setLoaded(true);
|
||||
setTitle(state === null || state === void 0 ? void 0 : state.title);
|
||||
setMemo(state === null || state === void 0 ? void 0 : state.memo);
|
||||
|
|
@ -47312,6 +47313,7 @@ var MeetingAdd = function MeetingAdd(props) {
|
|||
}
|
||||
|
||||
setMeetingImages(images);
|
||||
setApprovalList(state.approval);
|
||||
var arr = [];
|
||||
|
||||
for (var _i2 in state.children) {
|
||||
|
|
@ -47321,6 +47323,7 @@ var MeetingAdd = function MeetingAdd(props) {
|
|||
}
|
||||
|
||||
setChildrenList(arr);
|
||||
setCheckRadio("all_send");
|
||||
} else {
|
||||
axios__WEBPACK_IMPORTED_MODULE_1___default().get('/api/fathers/children/listOfFather', {
|
||||
params: {
|
||||
|
|
@ -47341,6 +47344,7 @@ var MeetingAdd = function MeetingAdd(props) {
|
|||
}
|
||||
|
||||
setChildrenList(arr);
|
||||
setCheckRadio("all_send");
|
||||
} else {
|
||||
set400Error("失敗しました。");
|
||||
}
|
||||
|
|
@ -47361,10 +47365,24 @@ var MeetingAdd = function MeetingAdd(props) {
|
|||
(0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
|
||||
if (!loaded) return; //if dont load data
|
||||
|
||||
var list = _toConsumableArray(children_list);
|
||||
var list = [];
|
||||
|
||||
for (var i in list) {
|
||||
if (check_radio == 'false') list[i].checked = true;else list[i].checked = false;
|
||||
if (check_radio == "all_send") {
|
||||
//send all children
|
||||
list = _toConsumableArray(children_list);
|
||||
|
||||
for (var i = 0; i < list.length; i++) {
|
||||
list[i].checked = true;
|
||||
}
|
||||
} else if (check_radio == "pickup_send") {
|
||||
//send pickup
|
||||
list = _toConsumableArray(children_list);
|
||||
|
||||
for (var i in list) {
|
||||
if (approval_list.findIndex(function (ele) {
|
||||
return ele.child_id == list[i].id;
|
||||
}) >= 0) list[i].checked = true;else list[i].checked = false;
|
||||
}
|
||||
}
|
||||
|
||||
setChildrenList(list);
|
||||
|
|
@ -47379,12 +47397,6 @@ var MeetingAdd = function MeetingAdd(props) {
|
|||
pdf: '',
|
||||
image: ''
|
||||
});
|
||||
var request = {
|
||||
title: title,
|
||||
text: text,
|
||||
memo: memo,
|
||||
pdf: pdf
|
||||
};
|
||||
var formdata = new FormData();
|
||||
formdata.append('father_id', father_id);
|
||||
formdata.append('title', title);
|
||||
|
|
@ -47653,16 +47665,17 @@ var MeetingAdd = function MeetingAdd(props) {
|
|||
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", {
|
||||
className: "edit-set edit-set-send",
|
||||
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("label", {
|
||||
htmlFor: "allmember_send",
|
||||
htmlFor: "all_send",
|
||||
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("input", {
|
||||
className: "boolean optional",
|
||||
type: "radio",
|
||||
id: "allmember_send",
|
||||
id: "all_send",
|
||||
name: "check_radio",
|
||||
value: false,
|
||||
onClick: function onClick(e) {
|
||||
return setCheckRadio(e.target.value);
|
||||
}
|
||||
return setCheckRadio(e.target.id);
|
||||
},
|
||||
defaultChecked: true
|
||||
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", {
|
||||
className: "lbl padding-16",
|
||||
children: "\u5168\u54E1\u306B\u9001\u4FE1"
|
||||
|
|
@ -47677,9 +47690,8 @@ var MeetingAdd = function MeetingAdd(props) {
|
|||
type: "radio",
|
||||
id: "pickup_send",
|
||||
name: "check_radio",
|
||||
value: true,
|
||||
onClick: function onClick(e) {
|
||||
return setCheckRadio(e.target.value);
|
||||
return setCheckRadio(e.target.id);
|
||||
}
|
||||
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", {
|
||||
className: "lbl padding-16",
|
||||
|
|
@ -47687,7 +47699,7 @@ var MeetingAdd = function MeetingAdd(props) {
|
|||
})]
|
||||
})
|
||||
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", {
|
||||
className: "checkbox-wrap edit-bg ".concat(check_radio != "true" && 'd-none'),
|
||||
className: "checkbox-wrap edit-bg ".concat(check_radio != "pickup_send" && '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",
|
||||
|
|
@ -48457,6 +48469,7 @@ var MeetingEdit = function MeetingEdit(props) {
|
|||
}
|
||||
|
||||
setChildrenList(arr);
|
||||
setCheckRadio("all_send");
|
||||
} else {
|
||||
set400Error("失敗しました。");
|
||||
}
|
||||
|
|
@ -48478,14 +48491,14 @@ var MeetingEdit = function MeetingEdit(props) {
|
|||
|
||||
var list = [];
|
||||
|
||||
if (check_radio == "false") {
|
||||
if (check_radio == "all_send") {
|
||||
//send all children
|
||||
list = _toConsumableArray(children_list);
|
||||
|
||||
for (var i = 0; i < list.length; i++) {
|
||||
list[i].checked = true;
|
||||
}
|
||||
} else if (check_radio == "true") {
|
||||
} else if (check_radio == "pickup_send") {
|
||||
//send pickup
|
||||
list = _toConsumableArray(children_list);
|
||||
|
||||
|
|
@ -48846,16 +48859,16 @@ var MeetingEdit = function MeetingEdit(props) {
|
|||
}), /*#__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_5__.jsxs)("label", {
|
||||
htmlFor: "allmember_send",
|
||||
htmlFor: "all_send",
|
||||
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("input", {
|
||||
className: "boolean optional",
|
||||
type: "radio",
|
||||
id: "allmember_send",
|
||||
id: "all_send",
|
||||
name: "check_radio",
|
||||
value: false,
|
||||
onClick: function onClick(e) {
|
||||
return setCheckRadio(e.target.value);
|
||||
}
|
||||
return setCheckRadio(e.target.id);
|
||||
},
|
||||
defaultChecked: true
|
||||
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("span", {
|
||||
className: "lbl padding-16",
|
||||
children: "\u5168\u54E1\u306B\u9001\u4FE1"
|
||||
|
|
@ -48870,9 +48883,8 @@ var MeetingEdit = function MeetingEdit(props) {
|
|||
type: "radio",
|
||||
id: "pickup_send",
|
||||
name: "check_radio",
|
||||
value: true,
|
||||
onClick: function onClick(e) {
|
||||
return setCheckRadio(e.target.value);
|
||||
return setCheckRadio(e.target.id);
|
||||
}
|
||||
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("span", {
|
||||
className: "lbl padding-16",
|
||||
|
|
@ -48880,7 +48892,7 @@ var MeetingEdit = function MeetingEdit(props) {
|
|||
})]
|
||||
})
|
||||
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("div", {
|
||||
className: "checkbox-wrap edit-bg ".concat(check_radio != "true" && 'd-none'),
|
||||
className: "checkbox-wrap edit-bg ".concat(check_radio != "pickup_send" && '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",
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ const MeetingEdit = (props) => {
|
|||
const [pdf, setPdf] = useState('');
|
||||
const [meeting_image, setMeetingImages] = useState([]);
|
||||
const [approval_list, setApproval] = useState([]);
|
||||
const [children_list, setChildren] = useState([]);
|
||||
const [children_list, setChildrenList] = useState([]);
|
||||
|
||||
const [_422errors, set422Errors] = useState({title:'', text:'', memo:'', pdf:'', image:''})
|
||||
const [_400error, set400Error] = useState('');
|
||||
|
|
@ -31,30 +31,29 @@ const MeetingEdit = (props) => {
|
|||
const [submit, setSubmit] = useState(false);
|
||||
|
||||
const [check_radio, setCheckRadio] = useState(null);
|
||||
const [children_temp, setChildrenTemp] = useState([]);
|
||||
const [image_sending, setImageSending] = useState(false);
|
||||
|
||||
|
||||
useEffect(()=>{
|
||||
if(!loaded) return; //if dont load data
|
||||
var list = [];
|
||||
if(check_radio=="false"){ //send all children
|
||||
list = [...children_temp];
|
||||
if(check_radio=="all_send"){ //send all children
|
||||
list = [...children_list];
|
||||
for(var i in list)
|
||||
list[i].checked = true;
|
||||
}
|
||||
else if(check_radio=="true"){ //send pickup
|
||||
list = [...children_temp];
|
||||
else if(check_radio=="pickup_send"){ //send pickup
|
||||
list = [...children_list];
|
||||
for(var i in list){
|
||||
if(approval_list.findIndex(ele=>ele.child_id == list[i].id) >= 0)
|
||||
list[i].checked = true;
|
||||
else list[i].checked = false;
|
||||
}
|
||||
}
|
||||
setChildrenTemp(list);
|
||||
setChildrenList(list);
|
||||
},[check_radio])
|
||||
|
||||
|
||||
|
||||
useEffect(() => {
|
||||
setLoaded(false);
|
||||
axios.get(`/api/admin/meetings/detail/${meeting_id}`)
|
||||
|
|
@ -68,7 +67,7 @@ const MeetingEdit = (props) => {
|
|||
setMeetingImages(response.data.params?.meeting_image);
|
||||
setApproval(response.data.params?.approval);
|
||||
setPdf(response.data.params?.pdf);
|
||||
setChildren(response.data.params?.children);
|
||||
|
||||
var list = [...response.data.params?.children];
|
||||
var approval = [...response.data.params?.approval];
|
||||
var arr = [];
|
||||
|
|
@ -77,7 +76,8 @@ const MeetingEdit = (props) => {
|
|||
arr.push({...list[i], checked: true});
|
||||
else arr.push({...list[i], checked: false});
|
||||
}
|
||||
setChildrenTemp(arr);
|
||||
setChildrenList(arr);
|
||||
setCheckRadio("all_send");
|
||||
}
|
||||
else {
|
||||
set400Error("失敗しました。");
|
||||
|
|
@ -92,14 +92,14 @@ const MeetingEdit = (props) => {
|
|||
|
||||
var approval_registerIndexes = [];
|
||||
var approval_deleteIndexes = [];
|
||||
for(let i=0; i<children_temp.length; i++){
|
||||
if(children_temp[i].checked){
|
||||
if(approval_list.findIndex(ele=>ele.child_id == children_temp[i].id) < 0)
|
||||
approval_registerIndexes.push(children_temp[i].id);
|
||||
for(let i=0; i<children_list.length; i++){
|
||||
if(children_list[i].checked){
|
||||
if(approval_list.findIndex(ele=>ele.child_id == children_list[i].id) < 0)
|
||||
approval_registerIndexes.push(children_list[i].id);
|
||||
}
|
||||
}
|
||||
for(let i=0; i<approval_list.length; i++){
|
||||
if(children_temp.findIndex(ele=> ele.checked && ele.id == approval_list[i].child_id) < 0)
|
||||
if(children_list.findIndex(ele=> ele.checked && ele.id == approval_list[i].child_id) < 0)
|
||||
approval_deleteIndexes.push(approval_list[i].child_id);
|
||||
}
|
||||
|
||||
|
|
@ -180,9 +180,9 @@ const MeetingEdit = (props) => {
|
|||
|
||||
|
||||
const handleCheck = (e, index) => {
|
||||
var list = [...children_temp];
|
||||
var list = [...children_list];
|
||||
list[index].checked = e.target.checked;
|
||||
setChildrenTemp(list);
|
||||
setChildrenList(list);
|
||||
}
|
||||
|
||||
const handlePDFChange = (e) => {
|
||||
|
|
@ -316,13 +316,13 @@ const MeetingEdit = (props) => {
|
|||
</div>
|
||||
|
||||
<div className="edit-set edit-set-send">
|
||||
<label htmlFor="allmember_send">
|
||||
<label htmlFor="all_send">
|
||||
<input className="boolean optional"
|
||||
type="radio"
|
||||
id="allmember_send"
|
||||
id="all_send"
|
||||
name="check_radio"
|
||||
value={false}
|
||||
onClick={e=>setCheckRadio(e.target.value)}
|
||||
onClick={e=>setCheckRadio(e.target.id)}
|
||||
defaultChecked
|
||||
/>
|
||||
<span className="lbl padding-16">全員に送信</span>
|
||||
</label>
|
||||
|
|
@ -334,17 +334,16 @@ const MeetingEdit = (props) => {
|
|||
type="radio"
|
||||
id="pickup_send"
|
||||
name="check_radio"
|
||||
value={true}
|
||||
onClick={e=>setCheckRadio(e.target.value)}
|
||||
onClick={e=>setCheckRadio(e.target.id)}
|
||||
/>
|
||||
<span className="lbl padding-16">選んで送信</span>
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<div className={`checkbox-wrap edit-bg ${check_radio!="true" && 'd-none'}`}>
|
||||
<div className={`checkbox-wrap edit-bg ${check_radio!="pickup_send" && 'd-none'}`}>
|
||||
{
|
||||
children_list.length != 0 ?
|
||||
children_temp?.map((item, k)=>
|
||||
children_list?.map((item, k)=>
|
||||
<div className="checkbox" key={k}>
|
||||
<label htmlFor={`user_name${k}`}>
|
||||
<input className="boolean optional"
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@ export default function ModalSettingNotify({show, handleClose, meetingId}){
|
|||
</DialogTitle>
|
||||
<DialogContent className="position-relative">
|
||||
{
|
||||
!loaded && <CircularProgress className="css-loader"/>
|
||||
!loaded && <CircularProgress className="modal-css-loader"/>
|
||||
}
|
||||
{
|
||||
loaded &&
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ const Child = (props) => {
|
|||
<div className="p-meetingAdd-btn">
|
||||
<Link to = '/p-account/child/add' data-v-ade1d018="kikikanri"
|
||||
className="btn-default btn-yellow btn-meeting btn-shadow btn-r8 btn-h48 btn-fz14">
|
||||
<span>子追加</span>
|
||||
<span className="ft-16">子追加</span>
|
||||
<svg version="1.1" viewBox="0 0 500 500" className="icon svg-icon svg-fill svg-up">
|
||||
<path fill="#000" stroke="none" pid="0" d="M250 437.6c-16.5 0-30-13.5-30-30V280.1H92.5c-16.5 0-30-13.5-30-30s13.5-30 30-30H220V92.6c0-16.5 13.5-30 30-30s30 13.5 30 30v127.5h127.5c16.5 0 30 13.5 30 30s-13.5 30-30 30H280v127.5c0 16.5-13.5 30-30 30z"></path>
|
||||
</svg>
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@ const MeetingAdd = (props) => {
|
|||
const [text, setText] = useState('');
|
||||
const [pdf, setPdf] = useState('');
|
||||
const [meeting_image, setMeetingImages] = useState([]);
|
||||
const [approval_list, setApprovalList] = useState([]);
|
||||
const [children_list, setChildrenList] = useState([]);
|
||||
|
||||
const [_422errors, set422Errors] = useState({title:'', text:'', memo:'', pdf:'', image:''})
|
||||
|
|
@ -34,6 +35,7 @@ const MeetingAdd = (props) => {
|
|||
setLoaded(false);
|
||||
const state = props.history.location.state;
|
||||
if(state){
|
||||
console.log(state);
|
||||
setLoaded(true);
|
||||
setTitle(state?.title);
|
||||
setMemo(state?.memo);
|
||||
|
|
@ -44,11 +46,13 @@ const MeetingAdd = (props) => {
|
|||
images.push(state.meeting_image[i].image);
|
||||
}
|
||||
setMeetingImages(images);
|
||||
setApprovalList(state.approval);
|
||||
var arr = [];
|
||||
for(let i in state.children){
|
||||
arr.push({...state.children[i], checked: false})
|
||||
}
|
||||
setChildrenList(arr);
|
||||
setCheckRadio("all_send");
|
||||
}
|
||||
else{
|
||||
axios.get('/api/fathers/children/listOfFather', {params:{father_id: father_id}})
|
||||
|
|
@ -61,6 +65,7 @@ const MeetingAdd = (props) => {
|
|||
for(var i in list)
|
||||
arr.push({...list[i], checked: false})
|
||||
setChildrenList(arr);
|
||||
setCheckRadio("all_send");
|
||||
}
|
||||
else {
|
||||
set400Error("失敗しました。");
|
||||
|
|
@ -79,21 +84,28 @@ const MeetingAdd = (props) => {
|
|||
|
||||
//--------------------------------------------------------
|
||||
useEffect(()=>{
|
||||
if(!loaded) return; //if dont load data
|
||||
var list = [...children_list];
|
||||
for(var i in list){
|
||||
if(check_radio == 'false')
|
||||
list[i].checked = true;
|
||||
else list[i].checked = false;
|
||||
}
|
||||
setChildrenList(list);
|
||||
if(!loaded) return; //if dont load data
|
||||
var list = [];
|
||||
if(check_radio=="all_send"){ //send all children
|
||||
list = [...children_list];
|
||||
for(var i=0; i<list.length; i++)
|
||||
list[i].checked = true;
|
||||
}
|
||||
else if(check_radio=="pickup_send"){ //send pickup
|
||||
list = [...children_list];
|
||||
for(var i in list){
|
||||
if(approval_list.findIndex(ele=>ele.child_id == list[i].id) >= 0)
|
||||
list[i].checked = true;
|
||||
else list[i].checked = false;
|
||||
}
|
||||
}
|
||||
setChildrenList(list);
|
||||
},[check_radio])
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
const handleSubmit = (e) => {
|
||||
e.preventDefault();
|
||||
set422Errors({title:'',memo:'',text:'',pdf:'',image:''});
|
||||
const request = { title: title, text: text, memo: memo, pdf: pdf };
|
||||
|
||||
const formdata = new FormData();
|
||||
formdata.append('father_id', father_id);
|
||||
|
|
@ -295,13 +307,14 @@ const MeetingAdd = (props) => {
|
|||
</div>
|
||||
|
||||
<div className="edit-set edit-set-send">
|
||||
<label htmlFor="allmember_send">
|
||||
<label htmlFor="all_send">
|
||||
<input className="boolean optional"
|
||||
type="radio"
|
||||
id="allmember_send"
|
||||
id="all_send"
|
||||
name="check_radio"
|
||||
value={false}
|
||||
onClick={e=>setCheckRadio(e.target.value)}
|
||||
onClick={e=>setCheckRadio(e.target.id)}
|
||||
defaultChecked
|
||||
/>
|
||||
<span className="lbl padding-16">全員に送信</span>
|
||||
</label>
|
||||
|
|
@ -313,14 +326,13 @@ const MeetingAdd = (props) => {
|
|||
type="radio"
|
||||
id="pickup_send"
|
||||
name="check_radio"
|
||||
value={true}
|
||||
onClick={e=>setCheckRadio(e.target.value)}
|
||||
onClick={e=>setCheckRadio(e.target.id)}
|
||||
/>
|
||||
<span className="lbl padding-16">選んで送信</span>
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<div className={`checkbox-wrap edit-bg ${check_radio!="true" && 'd-none'}`}>
|
||||
<div className={`checkbox-wrap edit-bg ${check_radio!="pickup_send" && 'd-none'}`}>
|
||||
{
|
||||
children_list.length != 0 ?
|
||||
children_list?.map((item, k)=>
|
||||
|
|
|
|||
|
|
@ -63,6 +63,7 @@ const MeetingEdit = (props) => {
|
|||
else arr.push({...list[i], checked: false});
|
||||
}
|
||||
setChildrenList(arr);
|
||||
setCheckRadio("all_send");
|
||||
}
|
||||
else{
|
||||
set400Error("失敗しました。");
|
||||
|
|
@ -84,12 +85,12 @@ useEffect(()=>{
|
|||
useEffect(()=>{
|
||||
if(!loaded) return; //if dont load data
|
||||
var list = [];
|
||||
if(check_radio=="false"){ //send all children
|
||||
if(check_radio=="all_send"){ //send all children
|
||||
list = [...children_list];
|
||||
for(var i=0; i<list.length; i++)
|
||||
list[i].checked = true;
|
||||
}
|
||||
else if(check_radio=="true"){ //send pickup
|
||||
else if(check_radio=="pickup_send"){ //send pickup
|
||||
list = [...children_list];
|
||||
for(var i in list){
|
||||
if(approval_list.findIndex(ele=>ele.child_id == list[i].id) >= 0)
|
||||
|
|
@ -333,13 +334,13 @@ useEffect(()=>{
|
|||
</div>
|
||||
|
||||
<div className="edit-set edit-set-send">
|
||||
<label htmlFor="allmember_send">
|
||||
<label htmlFor="all_send">
|
||||
<input className="boolean optional"
|
||||
type="radio"
|
||||
id="allmember_send"
|
||||
id="all_send"
|
||||
name="check_radio"
|
||||
value={false}
|
||||
onClick={e=>setCheckRadio(e.target.value)}
|
||||
onClick={e=>setCheckRadio(e.target.id)}
|
||||
defaultChecked
|
||||
/>
|
||||
<span className="lbl padding-16">全員に送信</span>
|
||||
</label>
|
||||
|
|
@ -351,14 +352,13 @@ useEffect(()=>{
|
|||
type="radio"
|
||||
id="pickup_send"
|
||||
name="check_radio"
|
||||
value={true}
|
||||
onClick={e=>setCheckRadio(e.target.value)}
|
||||
onClick={e=>setCheckRadio(e.target.id)}
|
||||
/>
|
||||
<span className="lbl padding-16">選んで送信</span>
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<div className={`checkbox-wrap edit-bg ${check_radio!="true" && 'd-none'}`}>
|
||||
<div className={`checkbox-wrap edit-bg ${check_radio!="pickup_send" && 'd-none'}`}>
|
||||
{
|
||||
children_list.length != 0 ?
|
||||
children_list?.map((item, k)=>
|
||||
|
|
|
|||
|
|
@ -120,8 +120,8 @@ a{
|
|||
@media screen and (min-width:1068px){
|
||||
width: 40px !important;
|
||||
height: 40px !important;
|
||||
top: calc(45vh - 22px);
|
||||
left: calc( 50vw + 240px / 2 - 22px);
|
||||
top: calc(45vh - 20px);
|
||||
left: calc( 50vw + 240px / 2 - 20px);
|
||||
}
|
||||
@media screen and (max-width:1068px){
|
||||
width: 30px !important;
|
||||
|
|
@ -131,6 +131,22 @@ a{
|
|||
}
|
||||
}
|
||||
|
||||
.modal-css-loader{
|
||||
color: green !important;
|
||||
position: fixed;
|
||||
z-index: 10;
|
||||
width: 30px !important;
|
||||
height: 30px !important;
|
||||
@media screen and (min-width:1068px){
|
||||
top: calc(45vh - 15px);
|
||||
left: calc( 50vw - 25px);
|
||||
}
|
||||
@media screen and (max-width:1068px){
|
||||
top: calc(45vh - 15px);
|
||||
left: calc(50vw - 15px);
|
||||
}
|
||||
}
|
||||
|
||||
.p-article .meeting-member-count {
|
||||
display: block !important;
|
||||
}
|
||||
|
|
|
|||
新しいイシューから参照