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

fixed p-meeting-edit

このコミットが含まれているのは:
dragon1211 2021-11-16 00:46:42 -08:00
親 06a4fd2e86
コミット ef30cc9d24
2個のファイルの変更、108行の追加、62行の削除
統計情報を表示 Patchファイルをダウンロード Diffファイルをダウンロード すべてのファイルを展開 すべてのファイルを折り畳む

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

@ -48317,58 +48317,42 @@ var MeetingEdit = function MeetingEdit(props) {
var _useState23 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
_useState24 = _slicedToArray(_useState23, 2),
loaded = _useState24[0],
setLoaded = _useState24[1];
loaded1 = _useState24[0],
setLoaded1 = _useState24[1];
var _useState25 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
_useState26 = _slicedToArray(_useState25, 2),
submit = _useState26[0],
setSubmit = _useState26[1];
loaded2 = _useState26[0],
setLoaded2 = _useState26[1];
var _useState27 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(null),
var _useState27 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
_useState28 = _slicedToArray(_useState27, 2),
check_radio = _useState28[0],
setCheckRadio = _useState28[1];
loaded = _useState28[0],
setLoaded = _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];
submit = _useState30[0],
setSubmit = _useState30[1];
var _useState31 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(null),
_useState32 = _slicedToArray(_useState31, 2),
check_radio = _useState32[0],
setCheckRadio = _useState32[1];
var _useState33 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)([]),
_useState34 = _slicedToArray(_useState33, 2),
children_temp = _useState34[0],
setChildrenTemp = _useState34[1];
(0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
if (!loaded) return; //if dont load data
var list = [];
if (check_radio == "false") {
//send all children
list = _toConsumableArray(children_temp);
for (var i = 0; i < list.length; i++) {
list[i].checked = true;
}
} else if (check_radio == "true") {
//send pickup
list = _toConsumableArray(children_temp);
for (var i = 0; i < list.length; i++) {
if (approval_list.findIndex(function (ele) {
return ele.child_id == list[i].child_id;
}) >= 0) list[i].checked = true;else list[i].checked = false;
}
}
console.log(children_temp, children_list);
setChildrenTemp(list);
}, [check_radio]);
(0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
setLoaded(false);
setLoaded1(false);
axios__WEBPACK_IMPORTED_MODULE_1___default().get("/api/fathers/meetings/detail/".concat(meeting_id), {
params: {
father_id: father_id
}
}).then(function (response) {
setLoaded(true);
setLoaded1(true);
setNotice(response.data.notice);
if (response.data.status_code == 200) {
@ -48402,7 +48386,51 @@ var MeetingEdit = function MeetingEdit(props) {
setChildrenTemp(arr);
}
});
}, []);
}, []); //-------------------------------------------------------------
(0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
setLoaded2(false);
axios__WEBPACK_IMPORTED_MODULE_1___default().get('/api/fathers/children/listOfFather', {
params: {
father_id: father_id
}
}).then(function (response) {
setLoaded2(true);
setNotice(response.data.notice);
console.log(response.data.params);
});
}, []); //----------------------------------------------------------
(0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
setLoaded(loaded1 && loaded2);
}, [loaded1, loaded2]); //--------------------------------------------------------
(0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
if (!loaded) return; //if dont load data
var list = [];
if (check_radio == "false") {
//send all children
list = _toConsumableArray(children_temp);
for (var i = 0; i < list.length; i++) {
list[i].checked = true;
}
} else if (check_radio == "true") {
//send pickup
list = _toConsumableArray(children_temp);
for (var i = 0; i < list.length; i++) {
if (approval_list.findIndex(function (ele) {
return ele.child_id == list[i].child_id;
}) >= 0) list[i].checked = true;else list[i].checked = false;
}
}
console.log(children_temp, children_list);
setChildrenTemp(list);
}, [check_radio]); //----------------------------------------------------------------------
var handleSubmit = function handleSubmit(e) {
e.preventDefault();

64
backend/resources/js/parent/meeting/edit.jsx
ファイルの表示

@ -31,6 +31,8 @@ const MeetingEdit = (props) => {
const [_400error, set400Error] = useState('');
const [_success, setSuccess] = useState('');
const [loaded1, setLoaded1] = useState(false);
const [loaded2, setLoaded2] = useState(false);
const [loaded, setLoaded] = useState(false);
const [submit, setSubmit] = useState(false);
@ -38,32 +40,11 @@ const MeetingEdit = (props) => {
const [children_temp, setChildrenTemp] = useState([]);
useEffect(()=>{
if(!loaded) return; //if dont load data
var list = [];
if(check_radio=="false"){ //send all children
list = [...children_temp];
for(var i=0; i<list.length; i++)
list[i].checked = true;
}
else if(check_radio=="true"){ //send pickup
list = [...children_temp];
for(var i=0; i<list.length; i++){
if(approval_list.findIndex(ele=>ele.child_id == list[i].child_id) >= 0)
list[i].checked = true;
else list[i].checked = false;
}
}
console.log(children_temp, children_list)
setChildrenTemp(list);
},[check_radio])
useEffect(() => {
setLoaded(false);
setLoaded1(false);
axios.get(`/api/fathers/meetings/detail/${meeting_id}`, {params: { father_id: father_id}})
.then(response => {
setLoaded(true);
setLoaded1(true);
setNotice(response.data.notice)
if(response.data.status_code==200){
console.log(response.data.params);
@ -87,7 +68,44 @@ const MeetingEdit = (props) => {
});
}, []);
//-------------------------------------------------------------
useEffect(()=>{
setLoaded2(false);
axios.get('/api/fathers/children/listOfFather',{params:{father_id: father_id}})
.then(response=>{
setLoaded2(true);
setNotice(response.data.notice);
console.log(response.data.params)
})
}, [])
//----------------------------------------------------------
useEffect(()=>{
setLoaded(loaded1 && loaded2);
},[loaded1, loaded2])
//--------------------------------------------------------
useEffect(()=>{
if(!loaded) return; //if dont load data
var list = [];
if(check_radio=="false"){ //send all children
list = [...children_temp];
for(var i=0; i<list.length; i++)
list[i].checked = true;
}
else if(check_radio=="true"){ //send pickup
list = [...children_temp];
for(var i=0; i<list.length; i++){
if(approval_list.findIndex(ele=>ele.child_id == list[i].child_id) >= 0)
list[i].checked = true;
else list[i].checked = false;
}
}
console.log(children_temp, children_list)
setChildrenTemp(list);
},[check_radio])
//----------------------------------------------------------------------
const handleSubmit = (e) => {
e.preventDefault();
set422Errors({title:'',memo:'',text:'',pdf:'',image:''});