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

modified approvals to approval in MeetingsController

このコミットが含まれているのは:
dragon1211 2021-11-16 00:13:18 -08:00
親 786db4f002
コミット 590a56e4a2
8個のファイルの変更、987行の追加、533行の削除
統計情報を表示 Patchファイルをダウンロード Diffファイルをダウンロード すべてのファイルを展開 すべてのファイルを折り畳む

10
backend/app/Http/Controllers/Api/MeetingsController.php
ファイルの表示

@ -513,8 +513,8 @@ class MeetingsController extends Controller {
}
if (request()->route()->action['as'] != 'mdc') {
if (null === ($result->approvals = MeetingApprovals::select($meeting_approvals_select)->where('meeting_id', (int)$result->id)->get())) {
$result->approvals = [];
if (null === ($result->approval = MeetingApprovals::select($meeting_approvals_select)->where('meeting_id', (int)$result->id)->get())) {
$result->approval = [];
}
}
else {
@ -538,9 +538,9 @@ class MeetingsController extends Controller {
}
}
foreach ($result->approvals as $i => $a) {
if (null === ($result->approvals[$i]['child'] = Child::select($child_select)->where('id', (int)$a->child_id)->first())) {
$result->approvals[$i]['child'] = new \stdClass();
foreach ($result->approval as $i => $a) {
if (null === ($result->approval[$i]['child'] = Child::select($child_select)->where('id', (int)$a->child_id)->first())) {
$result->approval[$i]['child'] = new \stdClass();
}
}
}

4
backend/public/css/app.css vendored
ファイルの表示

@ -12328,6 +12328,10 @@ a {
.search-container {
padding-bottom: 50px !important;
}
.p-file-nav figure {
min-width: 100px !important;
}
}
@media (max-width: 575.98px) {
.numerator, .denominator {

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

ファイル差分が大きすぎるため省略します 差分を読み込み

4
backend/resources/js/admin/meeting/detail.jsx
ファイルの表示

@ -155,14 +155,14 @@ const MeetingDetail = (props) => {
<div className="p-file-nav">
{
meeting.meeting_image?.map((x, k)=>
<figure key={k} style={{minWidth:'100px'}}>
<figure key={k}>
<img src={x.image} alt={x.image} onClick={e=>setThumbnail(x.image)}/>
</figure>
)
}
{
[...Array(10-meeting.meeting_image.length)].map((x, k)=>
<figure key={k} style={{minWidth:'100px'}}></figure>
<figure key={k}></figure>
)
}
</div>

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

@ -62,6 +62,7 @@ const MeetingDetail = (props) => {
setSubmitDelete(true);
axios.delete(`/api/fathers/meetings/delete/${props.match.params?.meeting_id}`)
.then(response => {
setNotice(response.data.notice);
setSubmitDelete(false);
setShowDelete(false);
switch(response.data.status_code){
@ -112,6 +113,7 @@ const MeetingDetail = (props) => {
}
})
}
setNotice(response.data.notice);
});
}

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

@ -1,171 +1,388 @@
import React, { useEffect, useState } from 'react';
import { useHistory } from 'react-router-dom';
import axios from 'axios';
import { CircularProgress } from '@material-ui/core';
import { LoadingButton } from '@material-ui/lab';
import IconButton from '@mui/material/IconButton';
import RemoveIcon from '@mui/icons-material/Remove';
import { ToastContainer, toast } from 'react-toastify';
import 'react-toastify/dist/ReactToastify.css';
import Alert from '../../component/alert';
import Notification from '../notification';
const MeetingEdit = (props) => {
const [meeting, setMeeting] = useState(null);
const [title, setTitle] = useState(null);
const [memo, setMemo] = useState(null);
const [text, setText] = useState(null);
const fatherId = document.getElementById('father_id').value;
useEffect(() => {
axios.get(`/api/meetings/detail/${props.match.params?.id}`, {params: { father_id: 1 }}).then((response) => {
if(response.data.status_code==200){
console.log(response.data.params[0]);
setMeeting(response.data.params[0]);
setTitle(response.data.params[0]?.title);
setMemo(response.data.params[0]?.memo);
setText(response.data.params[0]?.text);
} else if(response.data.status_code==400){
//TODO
}
});
}, []);
async function handleClick() {
// setErrors({
// title:'',
// memo:'',
// text:'',
// pdf:'',
// images:''
// });
const history = useHistory();
const father_id = document.getElementById('father_id').value;
const meeting_id = props.match.params.meeting_id;
const [notice, setNotice] = useState(localStorage.getItem('notice'));
const [title, setTitle] = useState('');
const [memo, setMemo] = useState('');
const [text, setText] = useState('');
const [pdf, setPdf] = useState('');
const [meeting_image, setMeetingImages] = useState([]);
const [approval_list, setApproval] = useState([]);
const [children_list, setChildren] = useState([]);
const [_422errors, set422Errors] = useState({title:'', text:'', memo:'', pdf:'', image:''})
const [_400error, set400Error] = useState('');
const [_success, setSuccess] = useState('');
const [loaded, setLoaded] = useState(false);
const [submit, setSubmit] = useState(false);
const [check_radio, setCheckRadio] = useState(null);
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);
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){
console.log(response.data.params);
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?.approvals);
setPdf(response.data.params?.pdf);
setChildren(response.data.params?.children);
var list = [...response.data.params?.children];
var approval = [...response.data.params?.approvals];
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});
}
setChildrenTemp(arr);
}
});
}, []);
const handleSubmit = (e) => {
e.preventDefault();
set422Errors({title:'',memo:'',text:'',pdf:'',image:''});
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].child_id) < 0)
approval_registerIndexes.push(children_temp[i].child_id);
}
}
for(let i=0; i<approval_list.length; i++){
if(children_temp.findIndex(ele=> ele.checked && ele.child_id == approval_list[i].child_id) < 0)
approval_deleteIndexes.push(approval_list[i].child_id);
}
console.log(approval_registerIndexes, approval_deleteIndexes);
const formdata = new FormData();
formdata.append('children', JSON.stringify(approval_registerIndexes));
axios.post('/api/fathers/meeting/approvals/register',formdata, {params:{meeting_id: props.match.params.meeting_id}})
axios.delete('/api/fathers/meeting/approvals/delete',{params:{children: approval_deleteIndexes, meeting_id: props.match.params.meeting_id}})
try {
const formdata = new FormData();
formdata.append('father_id', fatherId);
formdata.append('title', title);
formdata.append('memo', memo);
formdata.append('text', text);
// formdata.append('pdf', pdf);
// formdata.append('images', images);
// axios.post('/api/meetings/register', formdata)
// .then(response => {
// if(response.data.status_code==200){
// history.push({
// pathname: "/p-account/meetings/detail/1",
// state: {message : "ミーティングを作成しました！"}
// });
// } else {
// setMessageAlert('error');
// setShowAlert(true);
// }
// });
const request = { title: title, text: text, memo: memo, pdf: pdf };
setSubmit(true);
axios.put(`/api/fathers/meetings/update/${props.match.params?.meeting_id}`, request)
.then(response => {
setSubmit(false);
switch(response.data.status_code){
case 200: setSuccess("更新成功しました!"); break;
case 400: set400Error("更新失敗しました。"); break;
case 422: set422Errors(response.data.error_messages); break;
}
});
} catch (error) {
console.log('error', error);
}
}
if (!meeting) return null;
}
const handleImageChange = (e) => {
e.preventDefault();
let reader = new FileReader();
let _file = e.target.files[0];
if(!_file) return;
reader.readAsDataURL(_file);
reader.onloadend = () => {
const formdata = new FormData();
formdata.append('image', reader.result);
axios.post(`/api/fathers/meeting/images/register`, formdata, {params:{meeting_id: props.match.params.meeting_id}})
.then(response => {
switch(response.data.status_code){
case 200: setMeetingImages(response.data.params); notify_save(); break;
case 400: set400Error(response.data.error_messages); break;
case 422: set422Errors(response.data.error_messages); break;
}
});
};
};
const handlePDFChange = (e) => {
e.preventDefault();
let reader = new FileReader();
let _file = e.target.files[0];
if(!_file) return;
reader.readAsDataURL(_file);
reader.onloadend = () => {
setPdf(reader.result);
}
}
const handleDeleteImage = (image_id) => {
axios.delete(`/api/fathers/meeting/images/delete/${props.match.params?.meeting_id}`, {params:{image_id: image_id}})
.then(response=>{
switch(response.data.status_code){
case 200: setMeetingImages(response.data.params); notify_delete(); break;
case 400: set400Error("画像の削除に失敗しました。");
}
})
}
const handleCheck = (e, index) => {
var list = [...children_temp];
list[index].checked = e.target.checked;
setChildrenTemp(list);
}
const notify_delete = () =>
toast.success("削除成功しました。", {
position: "top-right",
autoClose: 5000,
className:"bg-danger",
hideProgressBar: true,
closeOnClick: true,
pauseOnHover: true,
draggable: false,
progress: undefined,
style:{ color: '#ffffff'}
});
const notify_save = () =>
toast.success("更新が成功しました。", {
position: "top-right",
autoClose: 5000,
className:"bg-danger",
hideProgressBar: true,
closeOnClick: true,
pauseOnHover: true,
draggable: false,
progress: undefined,
style:{ color: '#ffffff'}
});
return (
<div className="l-content">
<div className="l-content__ttl">
<div className="l-content__ttl__left">
<h2>ミーティング作成</h2>
<div className="l-content-w560">
<div className="l-content__ttl">
<div className="l-content__ttl__left">
<h2>ミーティング編集</h2>
</div>
<Notification notice={notice}/>
</div>
<div className="p-notification">
<div className="p-notification-icon">
<div className="p-notification-icon-wrap">
<div className="count">1</div>
<div className="p-notification-icon-bg"></div>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22.742 19.855" className="icon svg-icon svg-fill svg-y50" ><g fill="none" stroke="#080808" strokeLinecap="round" strokeLinejoin="round" strokeWidth="1.5" data-name="Icon feather-alert-triangle" transform="translate(0.777 0.75)"><path d="M11.188,5.322,2.6,19.659A2.028,2.028,0,0,0,4.334,22.7H21.51a2.028,2.028,0,0,0,1.734-3.042L14.656,5.322a2.028,2.028,0,0,0-3.468,0Z" data-name="パス 3" transform="translate(-2.328 -4.346)"/><path d="M18,13.5v6.91" data-name="パス 4" transform="translate(-7.406 -8.547)"/><path d="M18,25.5h0" data-name="パス 5" transform="translate(-7.406 -11.2)"/></g></svg>
<div className="l-content-wrap">
<div className="p-article">
<div className="p-article-wrap position-relative" style={{ minHeight:'500px'}}>
{
!loaded &&
<CircularProgress color="secondary" style={{top:'150px', left:'calc(50% - 22px)', color:'green', position:'absolute'}}/>
}
{
loaded &&
<article className="p-article__body">
<div className="p-article__content">
<div className="p-article__context">
<form className="edit-form" onSubmit={handleSubmit}>
<div className="edit-set">
<label className="control-label" htmlFor="title">タイトル</label>
<input type="text" name="title" value={ title } onChange={e=>setTitle(e.target.value)} className={`input-default input-title input-h60 input-w480 ${ _422errors.title && 'is-invalid c-input__target'} `} id="title" />
{
_422errors.title &&
<span className="l-alert__text--error ft-16 ft-md-14">
{_422errors.title}
</span>
}
</div>
<div className="edit-set">
<label className="control-label" htmlFor="meeting_textarea">本文</label>
<textarea value={ text } onChange={e=>setText(e.target.value)} rows="8" className={`textarea-default ${ _422errors.text && 'is-invalid c-input__target'} `} id="meeting_textarea" />
{
_422errors.text &&
<span className="l-alert__text--error ft-16 ft-md-14">
{_422errors.text}
</span>
}
</div>
<div className="edit-set">
<label className="control-label" htmlFor="meeting_textarea">メモ</label>
<textarea value={ memo } onChange={e=>setMemo(e.target.value)} rows="8" className={`textarea-default ${ _422errors.memo && 'is-invalid c-input__target'} `} id="meeting_textarea" />
{
_422errors.memo &&
<span className="l-alert__text--error ft-16 ft-md-14">
{_422errors.memo}
</span>
}
</div>
<div className="edit-set edit-set-mt15">
<label className="edit-set-file-label" htmlFor="file_pdf">
PDFアップロード
<input type="file" name="file_pdf" accept=".pdf" id="file_pdf" onChange={handlePDFChange} />
</label>
{
_422errors.pdf &&
<span className="l-alert__text--error ft-16 ft-md-14">
{_422errors.pdf}
</span>
}
</div>
<div className="edit-set edit-set-mt15">
<label className="edit-set-file-label" htmlFor="file_image">
画像アップロード
<input type="file" name="file_image" accept=".png, .jpg, .jpeg" id="file_image" onChange={handleImageChange}/>
</label>
{
_422errors.image &&
<span className="l-alert__text--error ft-16 ft-md-14">
{_422errors.image}
</span>
}
</div>
<div className="p-file-image justify-content-start">
{
meeting_image?.map((x, k)=>
<figure className="image-upload" key={k}>
<img src={x.image} alt={x.image} />
<IconButton
onClick={e=>handleDeleteImage(x.id)}
style={{position: 'absolute',
bottom: '-6px',
right: '-6px'}}>
<RemoveIcon
style={{width:'22px', height:'22px',
color: 'white',
background: '#dd0000',
borderRadius: '50%'}}/>
</IconButton>
</figure>
)
}
{
[...Array(10-meeting_image.length)]?.map((x, k)=>
<figure className="image-upload" key={k}></figure>
)
}
</div>
<div className="edit-set edit-set-send">
<label htmlFor="allmember_send">
<input className="boolean optional"
type="radio"
id="allmember_send"
name="check_radio"
value={false}
onClick={e=>setCheckRadio(e.target.value)}
/>
<span>全員に送信</span>
</label>
</div>
<div className="edit-set-mt5 edit-set-send">
<label htmlFor="pickup_send">
<input className="boolean optional"
type="radio"
id="pickup_send"
name="check_radio"
value={true}
onClick={e=>setCheckRadio(e.target.value)}
/>
<span>選んで送信</span>
</label>
</div>
<div className={`checkbox-wrap edit-bg ${check_radio!="true" && 'd-none'}`}>
{
children_list.length != 0 ?
children_temp?.map((item, k)=>
<div className="checkbox" key={k}>
<label htmlFor={`user_name${k}`}>
<input className="boolean optional"
type="checkbox"
id={`user_name${k}`}
checked = {item.checked}
onChange={e=>handleCheck(e, k)}/>
{`${item.first_name} ${item.last_name}`}
</label>
</div>
)
: <p className="text-center">子はありません。</p>
}
</div>
<LoadingButton
type="submit" fullWidth
loading={submit}
className="btn-edit btn-default btn-h75 bg-yellow rounded-15">
<span className={`ft-20 ft-xs-16 font-weight-bold ${!submit && 'text-black'}`}>ミーティングを更新</span>
</LoadingButton>
{
_400error && <Alert type="fail" hide={()=>set400Error('')}>{_400error}</Alert>
}
{
_success &&
<Alert type="success"
hide={()=>
history.push({
pathname: `/p-account/meeting/detail/${props.match.params?.meeting_id}`,
state: {}
})}>{_success}</Alert>
}
</form>
</div>
</div>
</article>
}
</div>
</div>
</div>
</div>
</div>
<div className="l-content-wrap">
<div className="p-article">
<div className="p-article-wrap">
<article className="p-article__body">
<div className="p-article__content">
<div className="p-article__context">
<form action="" className="edit-form">
<div className="edit-set">
<label className="control-label" htmlFor="title">タイトル</label>
<input type="text" name="title" value={ title } onChange={e=>setTitle(e.target.value)} className="input-default input-title input-h60 input-w480" id="title" />
</div>
<div className="edit-set">
<label className="control-label" htmlFor="meeting_textarea">本文</label>
<textarea value={ text } onChange={e=>setText(e.target.value)} rows="8" className="textarea-default" id="meeting_textarea" />
</div>
<div className="edit-set">
<label className="control-label" htmlFor="meeting_textarea">メモ</label>
<textarea value={ memo } onChange={e=>setMemo(e.target.value)} rows="8" className="textarea-default" id="meeting_textarea" />
</div>
<div className="edit-set edit-set-mt15">
<label className="edit-set-file-label" htmlFor="file_pdf">
PDFアップロード
<input type="file" name="file_pdf" accept=".pdf" id="file_pdf" />
</label>
</div>
<div className="edit-set edit-set-mt15">
<label className="edit-set-file-label" htmlFor="file_image">
画像アップロード
<input type="file" name="file_image" accept=".png, .jpg, .jpeg" id="file_image" />
</label>
</div>
<div className="p-file-image">
<figure className="image-upload"><img src="../../../assets/img/dummy/post-dummy01.jpg" alt="" /></figure>
<figure className="image-upload"><img src="../../../assets/img/dummy/post-dummy02.jpg" alt="" /></figure>
<figure className="image-upload"><img src="../../../assets/img/dummy/post-dummy03.jpg" alt="" /></figure>
<figure className="image-upload"><img src="../../../assets/img/dummy/post-dummy04.jpg" alt="" /></figure>
<figure className="image-upload"><img src="../../../assets/img/dummy/post-dummy05.jpg" alt="" /></figure>
<figure className="image-upload"><img src="../../../assets/img/dummy/post-dummy01.jpg" alt="" /></figure>
<figure className="image-upload"><img src="../../../assets/img/dummy/post-dummy02.jpg" alt="" /></figure>
<figure className="image-upload"><img src="../../../assets/img/dummy/post-dummy03.jpg" alt="" /></figure>
<figure className="image-upload"><img src="../../../assets/img/dummy/post-dummy04.jpg" alt="" /></figure>
<figure className="image-upload"><img src="../../../assets/img/dummy/post-dummy05.jpg" alt="" /></figure>
</div>
<div className="edit-set edit-set-send">
<label htmlFor="allmember_send">
<input className="boolean optional" type="checkbox" name="allmember_send" id="allmember_send" />全員に送信</label>
</div>
<div className="edit-set-mt5 edit-set-send">
<label htmlFor="pickup_send">
<input className="boolean optional" type="checkbox" name="pickup_send" id="pickup_send" />選んで送信</label>
</div>
<div className="checkbox-wrap edit-bg">
<div className="checkbox">
<label htmlFor="user_name01">
<input className="boolean optional" type="checkbox" name="chk[]" id="user_name01" />田中 達也</label>
</div>
<div className="checkbox">
<label htmlFor="user_name02">
<input className="boolean optional" type="checkbox" name="chk[]" id="user_name02" />田中 達也</label>
</div>
<div className="checkbox">
<label htmlFor="user_name03">
<input className="boolean optional" type="checkbox" name="chk[]" id="user_name03" />田中 達也</label>
</div>
<div className="checkbox">
<label htmlFor="user_name04">
<input className="boolean optional" type="checkbox" name="chk[]" id="user_name04" />田中 達也</label>
</div>
<div className="checkbox">
<label htmlFor="user_name05">
<input className="boolean optional" type="checkbox" name="chk[]" id="user_name05" />田中 達也</label>
</div>
</div>
<button
type="button"
onClick={e => {
e.preventDefault();
handleClick();
}}
className="btn-edit btn-default btn-h70 btn-r14 btn-yellow">ミーティングを更新</button>
</form>
</div>
</div>
</article>
</div>
</div>
</div>
<ToastContainer />
</div>
)
}

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

@ -119,6 +119,7 @@ const Meeting = () => {
formdata.append('is_favorite', currentFavorite == 1 ? 0 : 1);
axios.post('/api/fathers/meetings/registerFavorite', formdata)
.then(response=>{
setNotice(response.data.notice);
if(response.data.status_code==200){
if(stateName == "inCompleteOfFather") {
const newList = meeting_list_incomplete.map((item) => {

6
backend/resources/sass/layouts/_main.scss vendored
ファイルの表示

@ -211,6 +211,9 @@ a{
.search-container {
padding-bottom: 50px !important;
}
.p-file-nav figure{
min-width: 100px !important;
}
}
@ -231,4 +234,5 @@ a{
#SettingNotifyModal .css-1t1j96h-MuiPaper-root-MuiDialog-paper{
min-height: 70%;
}
}