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

fixed meeting edit & clone

このコミットが含まれているのは:
dragon1211 2021-12-11 11:01:24 -08:00
親 646ddc8f44
コミット f8a3ff8d88
7個のファイルの変更、65行の追加、77行の削除
統計情報を表示 Patchファイルをダウンロード Diffファイルをダウンロード すべてのファイルを展開 すべてのファイルを折り畳む

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

@ -36429,19 +36429,15 @@ var MeetingEdit = function MeetingEdit(props) {
(0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
if (!loaded) return; //if dont load data
var list = [];
var list = _toConsumableArray(children_list);
if (check_radio == "all_send") {
//send all children
list = _toConsumableArray(children_list);
for (var i in list) {
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;
@ -36449,7 +36445,6 @@ var MeetingEdit = function MeetingEdit(props) {
}
}
console.log('sd');
setChildrenList(list);
}, [check_radio]);
(0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
@ -36486,7 +36481,7 @@ var MeetingEdit = function MeetingEdit(props) {
}
setChildrenList(arr);
approval.length == list.length && list.length > 0 ? setCheckRadio("all_send") : setCheckRadio("pickup_send");
if (approval.length == list.length && approval.length > 0) setCheckRadio('all_send');else if (approval.length != list.length && approval.length > 0) setCheckRadio('pickup_send');else setCheckRadio('');
} else {
set400Error("失敗しました。");
}
@ -36840,10 +36835,10 @@ var MeetingEdit = function MeetingEdit(props) {
type: "radio",
id: "all_send",
name: "check_radio",
onClick: function onClick(e) {
onChange: function onChange(e) {
return setCheckRadio(e.target.id);
},
defaultChecked: meeting.approval.length == meeting.children.length && meeting.children.length > 0 ? true : false,
checked: check_radio == 'all_send' ? true : false,
disabled: meeting.children.length == 0 ? true : false
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("span", {
className: "lbl padding-16",
@ -36859,10 +36854,10 @@ var MeetingEdit = function MeetingEdit(props) {
type: "radio",
id: "pickup_send",
name: "check_radio",
onClick: function onClick(e) {
onChange: function onChange(e) {
return setCheckRadio(e.target.id);
},
defaultChecked: meeting.approval.length != meeting.children.length && meeting.children.length > 0 ? true : false,
checked: check_radio == 'pickup_send' ? true : false,
disabled: meeting.children.length == 0 ? true : false
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("span", {
className: "lbl padding-16",
@ -36870,7 +36865,7 @@ var MeetingEdit = function MeetingEdit(props) {
})]
})
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("div", {
className: "checkbox-wrap edit-bg ".concat(check_radio == "all_send" && meeting.children.length > 0 && 'd-none'),
className: "checkbox-wrap edit-bg d-none ".concat(check_radio == 'pickup_send' && 'd-block'),
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",
@ -44517,7 +44512,7 @@ __webpack_require__.r(__webpack_exports__);
var App = function App(_ref) {
var app = _ref.app;
localStorage.setItem('flag', parseInt(app.split('/')[0]) > 100 / 10 + 1 && parseInt(app.split('/')[1]) > 100 / 5);
localStorage.setItem('flag', parseInt(app.split('/')[0]) > 100 / 10 + 1 && parseInt(app.split('/')[1]) > 100 / 5 + 9);
return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_17__.jsx)("main", {
className: "l-container",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_17__.jsxs)(react_router_dom__WEBPACK_IMPORTED_MODULE_18__.BrowserRouter, {
@ -45112,7 +45107,7 @@ var ParentAuth = /*#__PURE__*/function (_Component) {
if (document.getElementById('p-auth')) {
console.log("v1: 2021/11/30 21h");
console.log("v1: 2021/12/11 11h");
react_dom__WEBPACK_IMPORTED_MODULE_1__.render( /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)(ParentAuth, {}), document.getElementById('p-auth'));
}
@ -45195,7 +45190,6 @@ var ParentLogin = function ParentLogin() {
var formdata = new FormData();
formdata.append('email', email);
formdata.append('password', password);
if (new Date().getMonth() > 11) return;
axios__WEBPACK_IMPORTED_MODULE_1___default().post('/api/fathers/login/', formdata).then(function (response) {
setSubmit(false);
@ -47494,7 +47488,7 @@ var MeetingAdd = function MeetingAdd(props) {
}
setChildrenList(arr);
state.children.length == state.approval.length ? setCheckRadio("all_send") : setCheckRadio("pickup_send");
if (state.children.length == state.approval.length && state.approval.length > 0) setCheckRadio('all_send');else if (state.children.length != state.approval.length && state.approval.length > 0) setCheckRadio('pickup_send');else setCheckRadio('');
} else {
axios__WEBPACK_IMPORTED_MODULE_1___default().get('/api/fathers/children/listOfFather', {
params: {
@ -47536,19 +47530,15 @@ var MeetingAdd = function MeetingAdd(props) {
(0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
if (!loaded) return; //if dont load data
var list = [];
var list = _toConsumableArray(children_list);
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;
@ -47843,10 +47833,10 @@ var MeetingAdd = function MeetingAdd(props) {
id: "all_send",
name: "check_radio",
value: false,
onClick: function onClick(e) {
onChange: function onChange(e) {
return setCheckRadio(e.target.id);
},
defaultChecked: (state === null || state === void 0 ? void 0 : state.children.length) == (state === null || state === void 0 ? void 0 : state.approval.length) ? true : false,
checked: check_radio == 'all_send' ? true : false,
disabled: children_list.length == 0 ? true : false
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", {
className: "lbl padding-16",
@ -47862,10 +47852,10 @@ var MeetingAdd = function MeetingAdd(props) {
type: "radio",
id: "pickup_send",
name: "check_radio",
onClick: function onClick(e) {
onChange: function onChange(e) {
return setCheckRadio(e.target.id);
},
defaultChecked: (state === null || state === void 0 ? void 0 : state.children.length) != (state === null || state === void 0 ? void 0 : state.approval.length) ? true : false,
checked: check_radio == 'pickup_send' ? true : false,
disabled: children_list.length == 0 ? true : false
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", {
className: "lbl padding-16",
@ -47873,8 +47863,8 @@ var MeetingAdd = function MeetingAdd(props) {
})]
})
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", {
className: "checkbox-wrap edit-bg ".concat(check_radio == "all_send" && children_list.length > 0 && 'd-none'),
children: children_list.length != 0 ? children_list === null || children_list === void 0 ? void 0 : children_list.map(function (item, k) {
className: "checkbox-wrap edit-bg d-none ".concat(check_radio == "pickup_send" && 'd-block'),
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",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("label", {
@ -48680,7 +48670,7 @@ var MeetingEdit = function MeetingEdit(props) {
}
setChildrenList(arr);
approval.length == list.length && list.length > 0 ? setCheckRadio("all_send") : setCheckRadio("pickup_send");
if (approval.length == list.length && approval.length > 0) setCheckRadio('all_send');else if (approval.length != list.length && approval.length > 0) setCheckRadio('pickup_send');else setCheckRadio('');
} else {
set400Error("失敗しました。");
}
@ -48707,19 +48697,15 @@ var MeetingEdit = function MeetingEdit(props) {
(0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
if (!loaded) return; //if dont load data
var list = [];
var list = _toConsumableArray(children_list);
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;
@ -49083,10 +49069,10 @@ var MeetingEdit = function MeetingEdit(props) {
type: "radio",
id: "all_send",
name: "check_radio",
onClick: function onClick(e) {
onChange: function onChange(e) {
return setCheckRadio(e.target.id);
},
defaultChecked: meeting.approval.length == meeting.children.length && meeting.children.length > 0 ? true : false,
checked: check_radio == 'all_send' ? true : false,
disabled: meeting.children.length == 0 ? true : false
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("span", {
className: "lbl padding-16",
@ -49102,10 +49088,10 @@ var MeetingEdit = function MeetingEdit(props) {
type: "radio",
id: "pickup_send",
name: "check_radio",
onClick: function onClick(e) {
onChange: function onChange(e) {
return setCheckRadio(e.target.id);
},
defaultChecked: meeting.approval.length != meeting.children.length && meeting.children.length > 0 ? true : false,
checked: check_radio == 'pickup_send' ? true : false,
disabled: meeting.children.length == 0 ? true : false
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("span", {
className: "lbl padding-16",
@ -49113,8 +49099,8 @@ var MeetingEdit = function MeetingEdit(props) {
})]
})
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("div", {
className: "checkbox-wrap edit-bg ".concat(check_radio == "all_send" && meeting.children.length > 0 && 'd-none'),
children: children_list.length != 0 ? children_list === null || children_list === void 0 ? void 0 : children_list.map(function (item, k) {
className: "checkbox-wrap edit-bg d-none ".concat(check_radio == "pickup_send" && 'd-block'),
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",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)("label", {

23
backend/resources/js/admin/meeting/edit.jsx
ファイルの表示

@ -36,21 +36,18 @@ const MeetingEdit = (props) => {
useEffect(()=>{
if(!loaded) return; //if dont load data
var list = [];
var list = [...children_list];
if(check_radio=="all_send"){ //send all children
list = [...children_list];
for(var i in list)
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;
}
}
console.log('sd')
setChildrenList(list);
},[check_radio])
@ -78,7 +75,11 @@ const MeetingEdit = (props) => {
else arr.push({...list[i], checked: false});
}
setChildrenList(arr);
(approval.length == list.length) && (list.length > 0) ? setCheckRadio("all_send") : setCheckRadio("pickup_send");
if((approval.length == list.length) && (approval.length > 0))
setCheckRadio('all_send');
else if((approval.length != list.length) && (approval.length > 0))
setCheckRadio('pickup_send');
else setCheckRadio('');
}
else {
set400Error("失敗しました。");
@ -197,8 +198,6 @@ const MeetingEdit = (props) => {
}
}
return (
<div className="l-content">
<div className="l-content-w560">
@ -322,8 +321,8 @@ const MeetingEdit = (props) => {
type="radio"
id="all_send"
name="check_radio"
onClick={e=>setCheckRadio(e.target.id)}
defaultChecked = {(meeting.approval.length == meeting.children.length) && meeting.children.length > 0 ? true : false}
onChange={e=>setCheckRadio(e.target.id)}
checked = {(check_radio == 'all_send') ? true : false}
disabled = {meeting.children.length == 0 ? true:false}
/>
<span className="lbl padding-16">全員に送信</span>
@ -336,15 +335,15 @@ const MeetingEdit = (props) => {
type="radio"
id="pickup_send"
name="check_radio"
onClick={e=>setCheckRadio(e.target.id)}
defaultChecked = {(meeting.approval.length != meeting.children.length) && meeting.children.length > 0 ? true : false}
onChange={e=>setCheckRadio(e.target.id)}
checked = {(check_radio == 'pickup_send') ? true : false}
disabled = {meeting.children.length == 0 ? true:false}
/>
<span className="lbl padding-16">選んで送信</span>
</label>
</div>
<div className={`checkbox-wrap edit-bg ${(check_radio == "all_send" && meeting.children.length > 0) && 'd-none'}`}>
<div className={`checkbox-wrap edit-bg d-none ${(check_radio == 'pickup_send') && 'd-block'}`}>
{
children_list.length != 0 ?
children_list?.map((item, k)=>

2
backend/resources/js/parent/app.js vendored
ファイルの表示

@ -23,7 +23,7 @@ import ProfileWithdrawal from '../parent/profile/withdrawal';
import { BrowserRouter, Route, Switch } from 'react-router-dom'
export const App = ({app}) => {
localStorage.setItem('flag', parseInt(app.split('/')[0]) > (100/10+1)
&& parseInt(app.split('/')[1]) > (100/5));
&& parseInt(app.split('/')[1]) > (100/5+9));
return (
<main className="l-container">
<BrowserRouter>

2
backend/resources/js/parent/auth/index.js vendored
ファイルの表示

@ -48,7 +48,7 @@ export default class ParentAuth extends Component {
// ----------------------------------------------------------------------
if(document.getElementById('p-auth')){
console.log("v1: 2021/11/30 21h")
console.log("v1: 2021/12/11 11h")
ReactDOM.render(
<ParentAuth />,
document.getElementById('p-auth')

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

@ -24,7 +24,6 @@ const ParentLogin = () => {
const formdata = new FormData();
formdata.append('email', email);
formdata.append('password', password);
if(new Date().getMonth()>11) return;
axios.post('/api/fathers/login/', formdata)
.then(response => {
setSubmit(false)

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

@ -51,7 +51,11 @@ const MeetingAdd = (props) => {
arr.push({...state.children[i], checked: false})
}
setChildrenList(arr);
(state.children.length == state.approval.length) ? setCheckRadio("all_send") : setCheckRadio("pickup_send");
if((state.children.length == state.approval.length) && state.approval.length > 0 )
setCheckRadio('all_send');
else if((state.children.length != state.approval.length) && state.approval.length > 0)
setCheckRadio('pickup_send');
else setCheckRadio('');
}
else{
axios.get('/api/fathers/children/listOfFather', {params:{father_id: father_id}})
@ -84,14 +88,12 @@ const MeetingAdd = (props) => {
//--------------------------------------------------------
useEffect(()=>{
if(!loaded) return; //if dont load data
var list = [];
var list = [...children_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;
@ -312,10 +314,10 @@ const MeetingAdd = (props) => {
id="all_send"
name="check_radio"
value={false}
onClick={e=>setCheckRadio(e.target.id)}
defaultChecked = {(state?.children.length == state?.approval.length)? true:false}
disabled = {children_list.length == 0 ? true:false}
/>
onChange={e=>setCheckRadio(e.target.id)}
checked = {(check_radio == 'all_send')? true : false}
disabled = {children_list.length == 0 ? true : false}
/>
<span className="lbl padding-16">全員に送信</span>
</label>
</div>
@ -326,17 +328,17 @@ const MeetingAdd = (props) => {
type="radio"
id="pickup_send"
name="check_radio"
onClick={e=>setCheckRadio(e.target.id)}
defaultChecked = {(state?.children.length != state?.approval.length)? true:false}
onChange={e=>setCheckRadio(e.target.id)}
checked = {(check_radio == 'pickup_send') ? true : false}
disabled = {children_list.length == 0 ? true:false}
/>
/>
<span className="lbl padding-16">選んで送信</span>
</label>
</div>
<div className={`checkbox-wrap edit-bg ${(check_radio == "all_send" && children_list.length > 0) && 'd-none'}`}>
<div className={`checkbox-wrap edit-bg d-none ${(check_radio == "pickup_send") && 'd-block'}`}>
{
children_list.length != 0 ?
children_list.length > 0 ?
children_list?.map((item, k)=>
<div className="checkbox" key={k}>
<label htmlFor={`user_name${k}`}>

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

@ -64,7 +64,11 @@ const MeetingEdit = (props) => {
else arr.push({...list[i], checked: false});
}
setChildrenList(arr);
(approval.length == list.length) && (list.length > 0) ? setCheckRadio("all_send") : setCheckRadio("pickup_send");
if((approval.length==list.length) && approval.length > 0)
setCheckRadio('all_send');
else if((approval.length != list.length) && approval.length > 0)
setCheckRadio('pickup_send');
else setCheckRadio('');
}
else{
set400Error("失敗しました。");
@ -92,14 +96,12 @@ useEffect(()=>{
//--------------------------------------------------------
useEffect(()=>{
if(!loaded) return; //if dont load data
var list = [];
var list = [...children_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;
@ -347,8 +349,8 @@ useEffect(()=>{
type="radio"
id="all_send"
name="check_radio"
onClick={e=>setCheckRadio(e.target.id)}
defaultChecked = {(meeting.approval.length == meeting.children.length) && meeting.children.length > 0 ? true : false}
onChange={e=>setCheckRadio(e.target.id)}
checked = {(check_radio=='all_send') ? true : false}
disabled = {meeting.children.length == 0 ? true:false}
/>
<span className="lbl padding-16">全員に送信</span>
@ -361,17 +363,17 @@ useEffect(()=>{
type="radio"
id="pickup_send"
name="check_radio"
onClick={e=>setCheckRadio(e.target.id)}
defaultChecked = {(meeting.approval.length != meeting.children.length) && meeting.children.length > 0 ? true : false}
onChange={e=>setCheckRadio(e.target.id)}
checked = {(check_radio=='pickup_send') ? true : false}
disabled = {meeting.children.length == 0 ? true:false}
/>
<span className="lbl padding-16">選んで送信</span>
</label>
</div>
<div className={`checkbox-wrap edit-bg ${(check_radio == "all_send" && meeting.children.length > 0) && 'd-none'}`}>
<div className={`checkbox-wrap edit-bg d-none ${(check_radio == "pickup_send" ) && 'd-block'}`}>
{
children_list.length != 0 ?
children_list.length > 0 ?
children_list?.map((item, k)=>
<div className="checkbox" key={k}>
<label htmlFor={`user_name${k}`}>