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

fixed fe

このコミットが含まれているのは:
dragon1211 2022-02-02 14:19:43 -08:00
親 85b1a9d0f8
コミット 9682c88e65
10個のファイルの変更、107行の追加、128行の削除
統計情報を表示 Patchファイルをダウンロード Diffファイルをダウンロード すべてのファイルを展開 すべてのファイルを折り畳む

7
backend/resources/js/child/profile/edit.jsx
ファイルの表示

@ -41,9 +41,9 @@ const ChildProfileEdit = () => {
const isMountedRef = useRef(true);
useEffect(() => {
isMountedRef.current = false;
if(isAuthenticate()){
setLoaded(false);
@ -76,7 +76,6 @@ const ChildProfileEdit = () => {
}
})
}
return () => {
isMountedRef.current = true
}
@ -85,7 +84,6 @@ const ChildProfileEdit = () => {
const handleSubmit = (e) => {
e.preventDefault();
if(isAuthenticate()){
set422Errors({
first_name:'',
@ -95,7 +93,6 @@ const ChildProfileEdit = () => {
tel:'',
company:''
});
const formdata = new FormData();
formdata.append('first_name', first_name);
formdata.append('last_name', last_name);
@ -103,7 +100,6 @@ const ChildProfileEdit = () => {
formdata.append('email', email);
formdata.append('tel', tel);
formdata.append('company', company);
const post = {
first_name: first_name,
last_name: last_name,
@ -113,7 +109,6 @@ const ChildProfileEdit = () => {
company: company
}
setSubmit(true);
axios.put('/api/children/updateProfile/'+ child_id, post)
.then(response => {
if(isMountedRef.current) return;

2
backend/resources/js/child/profile/index.jsx
ファイルの表示

@ -32,7 +32,6 @@ const ChildProfileDetail = () => {
isMountedRef.current = false;
if(isAuthenticate()){
setLoaded(false);
axios.get('/api/children/detail/'+ child_id)
.then(response => {
if(isMountedRef.current) return;
@ -56,7 +55,6 @@ const ChildProfileDetail = () => {
}
})
}
return () => {
isMountedRef.current = true;
}

1
backend/resources/js/child/profile/password_edit.jsx
ファイルの表示

@ -38,7 +38,6 @@ const ChildProfilePasswordEdit = () => {
const handleSubmit = (e) => {
e.preventDefault();
if(isAuthenticate()){
set422Errors({
password:'',

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

@ -31,7 +31,6 @@ export default function ModalSettingNotify({show, handleClose, meetingId, handle
useEffect(() => {
isMountedRef.current = false;
if(isAuthenticate()){
setLoaded1(false);
axios.get('/api/fathers/meeting/approvals/listChildrenOfApprovel', {params: { meeting_id: meetingId }})

6
backend/resources/js/component/withdrawal_complete.jsx
ファイルの表示

@ -3,10 +3,6 @@ import { Link, useLocation } from 'react-router-dom';
const WithdrawalComplete = () => {
const { pathname } = useLocation();
var url;
if(pathname.includes('c-account')) url = '/c-account/login';
else if(pathname.includes('p-account')) url = '/p-account/login';
return (
<div className="l-single-container">
@ -17,7 +13,7 @@ const WithdrawalComplete = () => {
今後とも、KIKI管理をよろしくお願いいたします。
</div>
<div className="text-center">
<Link to={url} className="ft-xs-16">トップページへ戻る</Link>
<Link to={`/${pathname.split('/')[1]}/login`} className="ft-xs-16">トップページへ戻る</Link>
</div>
</div>
</div>

35
backend/resources/js/parent/child/index.jsx
ファイルの表示

@ -26,30 +26,27 @@ const ParentChilds = () => {
useEffect(() => {
isMountedRef.current = false;
if(isAuthenticate()){
setLoaded(false);
axios.get('/api/fathers/children/listOfFather', {params: {father_id: father_id}})
.then(response => {
if(isMountedRef.current) return;
setLoaded(true);
setNotice(response.data.notice);
if(response.data.status_code==200){
setChildrenList(response.data.params);
var len = response.data.params.length;
if(len > INFINITE)
setFetchChildrenList(response.data.params.slice(0, INFINITE));
else setFetchChildrenList(response.data.params.slice(0, len));
}
else {
set400Error("失敗しました。");
}
})
}
.then(response => {
if(isMountedRef.current) return;
setLoaded(true);
setNotice(response.data.notice);
if(response.data.status_code==200){
setChildrenList(response.data.params);
var len = response.data.params.length;
if(len > INFINITE)
setFetchChildrenList(response.data.params.slice(0, INFINITE));
else setFetchChildrenList(response.data.params.slice(0, len));
}
else {
set400Error("失敗しました。");
}
})
}
return () => {
isMountedRef.current = true;
}

117
backend/resources/js/parent/favorite/index.jsx
ファイルの表示

@ -38,45 +38,15 @@ const ParentFavorite = () => {
useEffect(() => {
isMountedRef.current = false;
isMountedRef.current = false;
if(isAuthenticate()){
setLoaded(false);
if(isAuthenticate()){
setLoaded(false);
axios.get('/api/fathers/meetings/listOfNonFavoriteOfFather', {params:{father_id: father_id}})
.then(response => {
if(isMountedRef.current) return;
setLoaded1(true);
setNotice(response.data.notice);
if(response.data.status_code==200){
var list = response.data.params;
var arr = [];
for(var i in list){
var total=0, num=0;
for(var j in list[i].approvals)
{
if(list[i].approvals[j].approval_at) num ++;
total ++;
}
arr.push({...list[i], denominator:total, numerator:num})
}
setMeetingListOfNonFavorite(arr);
var len = arr.length;
if(len > INFINITE)
setFetchMeetingListOfNonFavorite(arr.slice(0, INFINITE));
else setFetchMeetingListOfNonFavorite(arr.slice(0, len));
}
else {
set400Error("失敗しました。");
}
})
axios.get('/api/fathers/meetings/listOfFavoriteOfFather', {params:{father_id: father_id}})
.then(response => {
axios.get('/api/fathers/meetings/listOfNonFavoriteOfFather', {params:{father_id: father_id}})
.then(response => {
if(isMountedRef.current) return;
setLoaded2(true);
setLoaded1(true);
setNotice(response.data.notice);
if(response.data.status_code==200){
var list = response.data.params;
@ -90,17 +60,46 @@ const ParentFavorite = () => {
}
arr.push({...list[i], denominator:total, numerator:num})
}
setMeetingListOfFavorite(arr);
setMeetingListOfNonFavorite(arr);
var len = arr.length;
if(len > INFINITE)
setFetchMeetingListOfFavorite(arr.slice(0, INFINITE));
else setFetchMeetingListOfFavorite(arr.slice(0, len));
setFetchMeetingListOfNonFavorite(arr.slice(0, INFINITE));
else setFetchMeetingListOfNonFavorite(arr.slice(0, len));
}
else {
set400Error("失敗しました。");
}
})
}
})
axios.get('/api/fathers/meetings/listOfFavoriteOfFather', {params:{father_id: father_id}})
.then(response => {
if(isMountedRef.current) return;
setLoaded2(true);
setNotice(response.data.notice);
if(response.data.status_code==200){
var list = response.data.params;
var arr = [];
for(var i in list){
var total=0, num=0;
for(var j in list[i].approvals)
{
if(list[i].approvals[j].approval_at) num ++;
total ++;
}
arr.push({...list[i], denominator:total, numerator:num})
}
setMeetingListOfFavorite(arr);
var len = arr.length;
if(len > INFINITE)
setFetchMeetingListOfFavorite(arr.slice(0, INFINITE));
else setFetchMeetingListOfFavorite(arr.slice(0, len));
}
else {
set400Error("失敗しました。");
}
})
}
return () => {
isMountedRef.current = true;
@ -108,29 +107,28 @@ const ParentFavorite = () => {
},[]);
const fetchMoreListOfNonFavorite = () => {
setTimeout(() => {
var x = fetch_meeting_list_non_favorite.length;
var y = meeting_list_non_favorite.length;
var c = 0;
if(x+INFINITE < y) c = INFINITE;
else c = y - x;
setFetchMeetingListOfNonFavorite(meeting_list_non_favorite.slice(0, x+c));
}, SCROLL_DELAY_TIME);
setTimeout(() => {
var x = fetch_meeting_list_non_favorite.length;
var y = meeting_list_non_favorite.length;
var c = 0;
if(x+INFINITE < y) c = INFINITE;
else c = y - x;
setFetchMeetingListOfNonFavorite(meeting_list_non_favorite.slice(0, x+c));
}, SCROLL_DELAY_TIME);
};
const fetchMoreListOfFavorite = () => {
setTimeout(() => {
var x = fetch_meeting_list_favorite.length;
var y = meeting_list_favorite.length;
var c = 0;
if(x+INFINITE < y) c = INFINITE;
else c = y - x;
setFetchMeetingListOfFavorite(meeting_list_favorite.slice(0, x+c));
}, SCROLL_DELAY_TIME);
setTimeout(() => {
var x = fetch_meeting_list_favorite.length;
var y = meeting_list_favorite.length;
var c = 0;
if(x+INFINITE < y) c = INFINITE;
else c = y - x;
setFetchMeetingListOfFavorite(meeting_list_favorite.slice(0, x+c));
}, SCROLL_DELAY_TIME);
};
function handleFavorite(meetingId, currentFavorite, stateName) {
if(isAuthenticate()){
const formdata = new FormData();
formdata.append('meeting_id', meetingId);
@ -165,7 +163,6 @@ const ParentFavorite = () => {
setFetchMeetingListOfFavorite(newList.slice(0, fetch_meeting_list_favorite.length));
}
}
};

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

@ -125,7 +125,6 @@ const ParentMeetingAdd = () => {
//----------------------------------------------------------------------
const handleSubmit = (e) => {
e.preventDefault();
if(isAuthenticate()){
set422Errors({title:'',memo:'',text:'',pdf:'',image:''});
@ -166,7 +165,6 @@ const ParentMeetingAdd = () => {
const handleImageChange = (e) => {
e.preventDefault();
if(isAuthenticate()){
const files = Array.from(e.target.files);
if(e.target.files.length + meeting_image.length > 10)

32
backend/resources/js/parent/meeting/index.jsx
ファイルの表示

@ -103,25 +103,25 @@ const ParentMeetings = () => {
},[]);
const fetchMoreListNonApproval = () => {
setTimeout(() => {
var x = fetch_meeting_list_incomplete.length;
var y = meeting_list_incomplete.length;
var c = 0;
if(x+INFINITE < y) c = INFINITE;
else c = y - x;
setFetchMeetingListOfIncomplete(meeting_list_incomplete.slice(0, x+c));
}, SCROLL_DELAY_TIME);
setTimeout(() => {
var x = fetch_meeting_list_incomplete.length;
var y = meeting_list_incomplete.length;
var c = 0;
if(x+INFINITE < y) c = INFINITE;
else c = y - x;
setFetchMeetingListOfIncomplete(meeting_list_incomplete.slice(0, x+c));
}, SCROLL_DELAY_TIME);
};
const fetchMoreListApproval = () => {
setTimeout(() => {
var x = fetch_meeting_list_complete.length;
var y = meeting_list_complete.length;
var c = 0;
if(x+INFINITE < y) c = INFINITE;
else c = y - x;
setFetchMeetingListOfComplete(meeting_list_complete.slice(0, x+c));
}, SCROLL_DELAY_TIME);
setTimeout(() => {
var x = fetch_meeting_list_complete.length;
var y = meeting_list_complete.length;
var c = 0;
if(x+INFINITE < y) c = INFINITE;
else c = y - x;
setFetchMeetingListOfComplete(meeting_list_complete.slice(0, x+c));
}, SCROLL_DELAY_TIME);
};
const handleFavorite = (meetingId, currentFavorite, stateName) => {

32
backend/resources/js/parent/search/index.jsx
ファイルの表示

@ -117,25 +117,25 @@ const ParentSearch = () => {
const fetchMoreListNonApproval = () => {
setTimeout(() => {
var x = fetch_meeting_list_incomplete.length;
var y = meeting_list_incomplete.length;
var c = 0;
if(x+INFINITE < y) c = INFINITE;
else c = y - x;
setFetchMeetingListOfIncomplete(meeting_list_incomplete.slice(0, x+c));
}, SCROLL_DELAY_TIME);
setTimeout(() => {
var x = fetch_meeting_list_incomplete.length;
var y = meeting_list_incomplete.length;
var c = 0;
if(x+INFINITE < y) c = INFINITE;
else c = y - x;
setFetchMeetingListOfIncomplete(meeting_list_incomplete.slice(0, x+c));
}, SCROLL_DELAY_TIME);
};
const fetchMoreListApproval = () => {
setTimeout(() => {
var x = fetch_meeting_list_complete.length;
var y = meeting_list_complete.length;
var c = 0;
if(x+INFINITE < y) c = INFINITE;
else c = y - x;
setFetchMeetingListOfComplete(meeting_list_complete.slice(0, x+c));
}, SCROLL_DELAY_TIME);
setTimeout(() => {
var x = fetch_meeting_list_complete.length;
var y = meeting_list_complete.length;
var c = 0;
if(x+INFINITE < y) c = INFINITE;
else c = y - x;
setFetchMeetingListOfComplete(meeting_list_complete.slice(0, x+c));
}, SCROLL_DELAY_TIME);
};
function handleFavorite(meetingId, currentFavorite, stateName) {