From 31131cbf55d824e97f6b3fed98ef490bc00a1107 Mon Sep 17 00:00:00 2001 From: dragon1211 Date: Tue, 30 Nov 2021 18:49:03 -0800 Subject: [PATCH 1/2] fixed line message --- backend/public/js/app.js | 2 +- backend/resources/js/parent/child/add.jsx | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/public/js/app.js b/backend/public/js/app.js index 378cabee..fdb37842 100644 --- a/backend/public/js/app.js +++ b/backend/public/js/app.js @@ -45873,7 +45873,7 @@ var ChildAdd = function ChildAdd() { }; var copyLineText = function copyLineText() { - var lineText = "「KIKI」の招待が届いています。\n" + "まずは以下より仮登録を行なってください。\n" + "https://kikikan.xyz/c-account/register-temporary\n" + "▼ 公式サイトはこちら\n" + "https://kikikan.xyz\n"; + var lineText = "「KIKI」の招待が届いています。%0A" + "まずは以下より仮登録を行なってください。%0A" + "https://kikikan.xyz/c-account/register-temporary %0A" + "▼ 公式サイトはこちら %0A" + "https://kikikan.xyz %0A"; clipboard_copy__WEBPACK_IMPORTED_MODULE_4___default()(lineText); setSuccess('招待用URLをLINEで追信しました。'); window.open('http://line.me/R/msg/text/?' + lineText); diff --git a/backend/resources/js/parent/child/add.jsx b/backend/resources/js/parent/child/add.jsx index d7f8cc65..251d3a5f 100644 --- a/backend/resources/js/parent/child/add.jsx +++ b/backend/resources/js/parent/child/add.jsx @@ -42,11 +42,11 @@ const ChildAdd = () => { } const copyLineText = () => { - const lineText = "「KIKI」の招待が届いています。\n"+ - "まずは以下より仮登録を行なってください。\n"+ - "https://kikikan.xyz/c-account/register-temporary\n"+ - "▼ 公式サイトはこちら\n"+ - "https://kikikan.xyz\n"; + const lineText = "「KIKI」の招待が届いています。%0A"+ + "まずは以下より仮登録を行なってください。%0A"+ + "https://kikikan.xyz/c-account/register-temporary %0A"+ + "▼ 公式サイトはこちら %0A"+ + "https://kikikan.xyz %0A"; copy(lineText); setSuccess('招待用URLをLINEで追信しました。'); window.open('http://line.me/R/msg/text/?'+lineText); From 45c48a53dfc4efad468dde3036beced7403f526f Mon Sep 17 00:00:00 2001 From: dragon1211 Date: Tue, 30 Nov 2021 19:40:27 -0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=9A=E8=AD=B0=E3=81=AE=E8=A4=87?= =?UTF-8?q?=E8=A3=BD=E3=81=A8=E7=B7=A8=E9=9B=86=E3=81=A7=E3=83=81=E3=82=A7?= =?UTF-8?q?=E3=83=83=E3=82=AF=E6=A9=9F=E8=83=BD=E3=82=92=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/public/js/app.js | 24 ++++++++++++-------- backend/resources/js/admin/meeting/edit.jsx | 5 ++-- backend/resources/js/parent/meeting/add.jsx | 8 ++++--- backend/resources/js/parent/meeting/edit.jsx | 5 ++-- 4 files changed, 25 insertions(+), 17 deletions(-) diff --git a/backend/public/js/app.js b/backend/public/js/app.js index fdb37842..bfe20498 100644 --- a/backend/public/js/app.js +++ b/backend/public/js/app.js @@ -36485,7 +36485,7 @@ var MeetingEdit = function MeetingEdit(props) { } setChildrenList(arr); - setCheckRadio("all_send"); + approval.length == list.length ? setCheckRadio("all_send") : setCheckRadio("pickup_send"); } else { set400Error("失敗しました。"); } @@ -36842,7 +36842,7 @@ var MeetingEdit = function MeetingEdit(props) { onClick: function onClick(e) { return setCheckRadio(e.target.id); }, - defaultChecked: true + defaultChecked: meeting.approval.length == meeting.children.length ? true : false }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("span", { className: "lbl padding-16", children: "\u5168\u54E1\u306B\u9001\u4FE1" @@ -36859,7 +36859,8 @@ var MeetingEdit = function MeetingEdit(props) { name: "check_radio", onClick: function onClick(e) { return setCheckRadio(e.target.id); - } + }, + defaultChecked: meeting.approval.length != meeting.children.length ? true : false }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("span", { className: "lbl padding-16", children: "\u9078\u3093\u3067\u9001\u4FE1" @@ -47463,9 +47464,9 @@ var MeetingAdd = function MeetingAdd(props) { check_radio = _useState26[0], setCheckRadio = _useState26[1]; + var state = props.history.location.state; (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () { setLoaded(false); - var state = props.history.location.state; if (state) { setLoaded(true); @@ -47490,7 +47491,7 @@ var MeetingAdd = function MeetingAdd(props) { } setChildrenList(arr); - setCheckRadio("all_send"); + state.children.length == state.approval.length ? setCheckRadio("all_send") : setCheckRadio("pickup_send"); } else { axios__WEBPACK_IMPORTED_MODULE_1___default().get('/api/fathers/children/listOfFather', { params: { @@ -47577,6 +47578,7 @@ var MeetingAdd = function MeetingAdd(props) { if (children_list[i].checked) c_arr.push(children_list[i].id); } + console.log(c_arr); formdata.append('children', JSON.stringify(c_arr)); setSubmit(true); axios__WEBPACK_IMPORTED_MODULE_1___default().post('/api/fathers/meetings/register', formdata).then(function (response) { @@ -47842,7 +47844,7 @@ var MeetingAdd = function MeetingAdd(props) { onClick: function onClick(e) { return setCheckRadio(e.target.id); }, - defaultChecked: true + defaultChecked: state.children.length == state.approval.length ? true : false }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", { className: "lbl padding-16", children: "\u5168\u54E1\u306B\u9001\u4FE1" @@ -47859,7 +47861,8 @@ var MeetingAdd = function MeetingAdd(props) { name: "check_radio", onClick: function onClick(e) { return setCheckRadio(e.target.id); - } + }, + defaultChecked: state.children.length != state.approval.length ? true : false }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", { className: "lbl padding-16", children: "\u9078\u3093\u3067\u9001\u4FE1" @@ -48673,7 +48676,7 @@ var MeetingEdit = function MeetingEdit(props) { } setChildrenList(arr); - setCheckRadio("all_send"); + approval.length == list.length ? setCheckRadio("all_send") : setCheckRadio("pickup_send"); } else { set400Error("失敗しました。"); } @@ -49079,7 +49082,7 @@ var MeetingEdit = function MeetingEdit(props) { onClick: function onClick(e) { return setCheckRadio(e.target.id); }, - defaultChecked: true + defaultChecked: meeting.approval.length == meeting.children.length ? true : false }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("span", { className: "lbl padding-16", children: "\u5168\u54E1\u306B\u9001\u4FE1" @@ -49096,7 +49099,8 @@ var MeetingEdit = function MeetingEdit(props) { name: "check_radio", onClick: function onClick(e) { return setCheckRadio(e.target.id); - } + }, + defaultChecked: meeting.approval.length != meeting.children.length ? true : false }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("span", { className: "lbl padding-16", children: "\u9078\u3093\u3067\u9001\u4FE1" diff --git a/backend/resources/js/admin/meeting/edit.jsx b/backend/resources/js/admin/meeting/edit.jsx index f08a1b9b..f1009bd7 100644 --- a/backend/resources/js/admin/meeting/edit.jsx +++ b/backend/resources/js/admin/meeting/edit.jsx @@ -77,7 +77,7 @@ const MeetingEdit = (props) => { else arr.push({...list[i], checked: false}); } setChildrenList(arr); - setCheckRadio("all_send"); + (approval.length == list.length) ? setCheckRadio("all_send") : setCheckRadio("pickup_send"); } else { set400Error("失敗しました。"); @@ -322,7 +322,7 @@ const MeetingEdit = (props) => { id="all_send" name="check_radio" onClick={e=>setCheckRadio(e.target.id)} - defaultChecked + defaultChecked = {(meeting.approval.length == meeting.children.length) ? true : false} /> 全員に送信 @@ -335,6 +335,7 @@ const MeetingEdit = (props) => { id="pickup_send" name="check_radio" onClick={e=>setCheckRadio(e.target.id)} + defaultChecked = {(meeting.approval.length != meeting.children.length) ? true : false} /> 選んで送信 diff --git a/backend/resources/js/parent/meeting/add.jsx b/backend/resources/js/parent/meeting/add.jsx index 5f12e71a..e36974de 100644 --- a/backend/resources/js/parent/meeting/add.jsx +++ b/backend/resources/js/parent/meeting/add.jsx @@ -30,10 +30,10 @@ const MeetingAdd = (props) => { const [submit, setSubmit] = useState(false); const [check_radio, setCheckRadio] = useState(''); + const state = props.history.location.state; useEffect(()=>{ setLoaded(false); - const state = props.history.location.state; if(state){ setLoaded(true); setTitle(state?.title); @@ -51,7 +51,7 @@ const MeetingAdd = (props) => { arr.push({...state.children[i], checked: false}) } setChildrenList(arr); - setCheckRadio("all_send"); + (state.children.length == state.approval.length) ? setCheckRadio("all_send") : setCheckRadio("pickup_send"); } else{ axios.get('/api/fathers/children/listOfFather', {params:{father_id: father_id}}) @@ -117,6 +117,7 @@ const MeetingAdd = (props) => { for(let i in children_list){ if(children_list[i].checked) c_arr.push(children_list[i].id); } + console.log(c_arr); formdata.append('children', JSON.stringify(c_arr)); setSubmit(true); @@ -313,7 +314,7 @@ const MeetingAdd = (props) => { name="check_radio" value={false} onClick={e=>setCheckRadio(e.target.id)} - defaultChecked + defaultChecked = {(state.children.length == state.approval.length)? true:false} /> 全員に送信 @@ -326,6 +327,7 @@ const MeetingAdd = (props) => { id="pickup_send" name="check_radio" onClick={e=>setCheckRadio(e.target.id)} + defaultChecked = {(state.children.length != state.approval.length)? true:false} /> 選んで送信 diff --git a/backend/resources/js/parent/meeting/edit.jsx b/backend/resources/js/parent/meeting/edit.jsx index 836981ad..c17d4614 100644 --- a/backend/resources/js/parent/meeting/edit.jsx +++ b/backend/resources/js/parent/meeting/edit.jsx @@ -64,7 +64,7 @@ const MeetingEdit = (props) => { else arr.push({...list[i], checked: false}); } setChildrenList(arr); - setCheckRadio("all_send"); + (approval.length == list.length) ? setCheckRadio("all_send") : setCheckRadio("pickup_send"); } else{ set400Error("失敗しました。"); @@ -348,7 +348,7 @@ useEffect(()=>{ id="all_send" name="check_radio" onClick={e=>setCheckRadio(e.target.id)} - defaultChecked + defaultChecked = {(meeting.approval.length == meeting.children.length) ? true : false} /> 全員に送信 @@ -361,6 +361,7 @@ useEffect(()=>{ id="pickup_send" name="check_radio" onClick={e=>setCheckRadio(e.target.id)} + defaultChecked = {(meeting.approval.length != meeting.children.length) ? true : false} /> 選んで送信