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

bugfixed p_account meeting_add

このコミットが含まれているのは:
dragon1211 2021-11-16 17:20:50 -08:00
親 21e7cfc605
コミット a3d97fe2f4
3個のファイルの変更、94行の追加、120行の削除
統計情報を表示 Patchファイルをダウンロード Diffファイルをダウンロード すべてのファイルを展開 すべてのファイルを折り畳む

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

@ -47499,79 +47499,68 @@ var MeetingAdd = function MeetingAdd(props) {
_400error = _useState18[0], _400error = _useState18[0],
set400Error = _useState18[1]; set400Error = _useState18[1];
var _useState19 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''), var _useState19 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
_useState20 = _slicedToArray(_useState19, 2), _useState20 = _slicedToArray(_useState19, 2),
_success = _useState20[0], loaded = _useState20[0],
setSuccess = _useState20[1]; setLoaded = _useState20[1];
var _useState21 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false), var _useState21 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
_useState22 = _slicedToArray(_useState21, 2), _useState22 = _slicedToArray(_useState21, 2),
loaded = _useState22[0], submit = _useState22[0],
setLoaded = _useState22[1]; setSubmit = _useState22[1];
var _useState23 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false), var _useState23 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''),
_useState24 = _slicedToArray(_useState23, 2), _useState24 = _slicedToArray(_useState23, 2),
submit = _useState24[0], check_radio = _useState24[0],
setSubmit = _useState24[1]; setCheckRadio = _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 () { (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
setLoaded(false);
setCheckRadio('false'); setCheckRadio('false');
axios__WEBPACK_IMPORTED_MODULE_1___default().get('/api/fathers/children/listOfFather', { setLoaded(false);
params: { var state = props.history.location.state;
father_id: father_id console.log(state);
}
}).then(function (response) { if (state) {
setLoaded(true); setLoaded(true);
setNotice(response.data.notice); setTitle(state === null || state === void 0 ? void 0 : state.title);
console.log(response.data); setMemo(state === null || state === void 0 ? void 0 : state.memo);
setText(state === null || state === void 0 ? void 0 : state.text);
setMeetingImages(state === null || state === void 0 ? void 0 : state.meeting_image);
setPdf(state === null || state === void 0 ? void 0 : state.pdf);
var list = state.children;
var arr = [];
if (response.data.status_code == 200) { for (var i in list) {
var list = response.data.params; arr.push(_objectSpread(_objectSpread({}, list[i]), {}, {
var arr = []; checked: false
}));
for (var i in list) {
arr.push(_objectSpread(_objectSpread({}, list[i]), {}, {
checked: false
}));
}
setChildrenList(arr);
console.log(arr);
} }
});
}, []); // useEffect(() => { setChildrenList(arr);
// setLoaded(false); } else {
// axios.get(`/api/fathers/meetings/detail/${meeting_id}`, {params: { father_id: father_id}}) axios__WEBPACK_IMPORTED_MODULE_1___default().get('/api/fathers/children/listOfFather', {
// .then(response => { params: {
// setLoaded(true); father_id: father_id
// setNotice(response.data.notice) }
// if(response.data.status_code==200){ }).then(function (response) {
// setTitle(response.data.params?.title); setLoaded(true);
// setMemo(response.data.params?.memo); setNotice(response.data.notice);
// setText(response.data.params?.text);
// setMeetingImages(response.data.params?.meeting_image); if (response.data.status_code == 200) {
// setApproval(response.data.params?.approval); var list = response.data.params;
// setPdf(response.data.params?.pdf); var arr = [];
// setChildren(response.data.params?.children);
// var list = [...response.data.params?.children]; for (var i in list) {
// var approval = [...response.data.params?.approval]; arr.push(_objectSpread(_objectSpread({}, list[i]), {}, {
// var arr = []; checked: false
// for(var i=0; i<list.length; i++){ }));
// if(approval.findIndex(ele=>ele.child_id == list[i].child_id) >= 0) }
// arr.push({...list[i], checked: true});
// else arr.push({...list[i], checked: false}); setChildrenList(arr);
// } }
// setChildrenList(arr); });
// } }
// }); }, []); //--------------------------------------------------------
// }, []);
//--------------------------------------------------------
(0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () { (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
if (!loaded) return; //if dont load data if (!loaded) return; //if dont load data
@ -48271,10 +48260,6 @@ var MeetingDetail = function MeetingDetail(props) {
}); });
}; };
var handleCopy = function handleCopy() {// const data = {
// }
};
return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsxs)("div", { return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsxs)("div", {
className: "l-content", className: "l-content",
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsxs)("div", { children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsxs)("div", {
@ -48369,8 +48354,13 @@ var MeetingDetail = function MeetingDetail(props) {
}) })
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("li", { }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("li", {
className: "p-article-btn__item", className: "p-article-btn__item",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_14__.Link, { children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("a", {
onClick: handleCopy, onClick: function onClick() {
return history.push({
pathname: "/p-account/meeting/new",
state: meeting
});
},
className: "btn-default btn-yellow btn-pdf btn-r8 btn-h48", className: "btn-default btn-yellow btn-pdf btn-r8 btn-h48",
children: "\u8907\u88FD" children: "\u8907\u88FD"
}) })

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

@ -28,7 +28,6 @@ const MeetingAdd = (props) => {
const [_422errors, set422Errors] = useState({title:'', text:'', memo:'', pdf:'', image:''}) const [_422errors, set422Errors] = useState({title:'', text:'', memo:'', pdf:'', image:''})
const [_400error, set400Error] = useState(''); const [_400error, set400Error] = useState('');
const [_success, setSuccess] = useState('');
const [loaded, setLoaded] = useState(false); const [loaded, setLoaded] = useState(false);
const [submit, setSubmit] = useState(false); const [submit, setSubmit] = useState(false);
@ -37,54 +36,40 @@ const MeetingAdd = (props) => {
useEffect(()=>{ useEffect(()=>{
setLoaded(false); setCheckRadio('false');
setCheckRadio('false'); setLoaded(false);
axios.get('/api/fathers/children/listOfFather', {params:{father_id: father_id}}) const state = props.history.location.state;
.then(response=>{ console.log(state);
setLoaded(true); if(state){
setNotice(response.data.notice); setLoaded(true);
console.log(response.data) setTitle(state?.title);
if(response.data.status_code == 200){ setMemo(state?.memo);
var list = response.data.params; setText(state?.text);
var arr = []; setMeetingImages(state?.meeting_image);
for(var i in list){ setPdf(state?.pdf);
arr.push({...list[i], checked: false}) var list = state.children;
} var arr = [];
setChildrenList(arr); for(var i in list){
console.log(arr) arr.push({...list[i], checked: false})
}
setChildrenList(arr);
}
else{
axios.get('/api/fathers/children/listOfFather', {params:{father_id: father_id}})
.then(response=>{
setLoaded(true);
setNotice(response.data.notice);
if(response.data.status_code == 200){
var list = response.data.params;
var arr = [];
for(var i in list){
arr.push({...list[i], checked: false})
}
setChildrenList(arr);
}})
} }
})
},[]) },[])
// useEffect(() => {
// setLoaded(false);
// axios.get(`/api/fathers/meetings/detail/${meeting_id}`, {params: { father_id: father_id}})
// .then(response => {
// setLoaded(true);
// setNotice(response.data.notice)
// if(response.data.status_code==200){
// setTitle(response.data.params?.title);
// setMemo(response.data.params?.memo);
// setText(response.data.params?.text);
// 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 = [];
// for(var i=0; i<list.length; i++){
// if(approval.findIndex(ele=>ele.child_id == list[i].child_id) >= 0)
// arr.push({...list[i], checked: true});
// else arr.push({...list[i], checked: false});
// }
// setChildrenList(arr);
// }
// });
// }, []);
//-------------------------------------------------------- //--------------------------------------------------------
useEffect(()=>{ useEffect(()=>{
if(!loaded) return; //if dont load data if(!loaded) return; //if dont load data

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

@ -118,11 +118,6 @@ const MeetingDetail = (props) => {
}); });
} }
const handleCopy = () => {
// const data = {
// }
}
return ( return (
<div className="l-content"> <div className="l-content">
@ -179,8 +174,12 @@ const MeetingDetail = (props) => {
<a onClick={()=>setShowDelete(true)} className="btn-default btn-yellow btn-pdf btn-r8 btn-h48">削除</a> <a onClick={()=>setShowDelete(true)} className="btn-default btn-yellow btn-pdf btn-r8 btn-h48">削除</a>
</li> </li>
<li className="p-article-btn__item"> <li className="p-article-btn__item">
<Link onClick={handleCopy} <a onClick={()=>
className="btn-default btn-yellow btn-pdf btn-r8 btn-h48">複製</Link> history.push({
pathname: "/p-account/meeting/new",
state: meeting
})}
className="btn-default btn-yellow btn-pdf btn-r8 btn-h48">複製</a>
</li> </li>
<li className="p-article-btn__item"> <li className="p-article-btn__item">
<a onClick={()=>setShowNotify(true)} className="btn-default btn-yellow btn-pdf btn-r8 btn-h48">再通知</a> <a onClick={()=>setShowNotify(true)} className="btn-default btn-yellow btn-pdf btn-r8 btn-h48">再通知</a>