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

Merge pull request #131 from nakazawakan/fe_fix 

ミーティングについて子リスト画像表示機能を修正しました。
このコミットが含まれているのは:
chankan77 2021-12-01 08:14:58 +09:00 committed by GitHub
親 002757a7c8 4bbad2f40c
コミット 32c65783ab
この署名に対応する既知のキーがデータベースに存在しません
GPGキーID: 4AEE18F83AFDEB23
11個のファイルの変更、106行の追加、67行の削除
統計情報を表示 Patchファイルをダウンロード Diffファイルをダウンロード すべてのファイルを展開 すべてのファイルを折り畳む

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

@ -36122,7 +36122,7 @@ var MeetingDetail = function MeetingDetail(props) {
className: "meeting-member-list",
role: "list",
children: (_meeting$approval = meeting.approval) === null || _meeting$approval === void 0 ? void 0 : _meeting$approval.map(function (x, k) {
return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("li", {
if (x.approval_at) return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("li", {
className: "meeting-member__item",
role: "listitem",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("div", {
@ -36449,6 +36449,7 @@ var MeetingEdit = function MeetingEdit(props) {
}
}
console.log('sd');
setChildrenList(list);
}, [check_radio]);
(0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
@ -36485,7 +36486,7 @@ var MeetingEdit = function MeetingEdit(props) {
}
setChildrenList(arr);
approval.length == list.length ? setCheckRadio("all_send") : setCheckRadio("pickup_send");
approval.length == list.length && list.length > 0 ? setCheckRadio("all_send") : setCheckRadio("pickup_send");
} else {
set400Error("失敗しました。");
}
@ -36842,7 +36843,8 @@ var MeetingEdit = function MeetingEdit(props) {
onClick: function onClick(e) {
return setCheckRadio(e.target.id);
},
defaultChecked: meeting.approval.length == meeting.children.length ? true : false
defaultChecked: meeting.approval.length == meeting.children.length && meeting.children.length > 0 ? true : false,
disabled: meeting.children.length == 0 ? true : false
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("span", {
className: "lbl padding-16",
children: "\u5168\u54E1\u306B\u9001\u4FE1"
@ -36860,14 +36862,15 @@ var MeetingEdit = function MeetingEdit(props) {
onClick: function onClick(e) {
return setCheckRadio(e.target.id);
},
defaultChecked: meeting.approval.length != meeting.children.length ? true : false
defaultChecked: meeting.approval.length != meeting.children.length && meeting.children.length > 0 ? true : false,
disabled: meeting.children.length == 0 ? true : false
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("span", {
className: "lbl padding-16",
children: "\u9078\u3093\u3067\u9001\u4FE1"
})]
})
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("div", {
className: "checkbox-wrap edit-bg ".concat(check_radio != "pickup_send" && 'd-none'),
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) {
return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("div", {
className: "checkbox",
@ -37228,7 +37231,7 @@ var Meeting = function Meeting(props) {
className: "meeting-member-list",
role: "list",
children: (_item$approval = item.approval) === null || _item$approval === void 0 ? void 0 : _item$approval.map(function (x, kj) {
return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("li", {
if (x.approval_at) return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("li", {
className: "meeting-member__item",
role: "listitem",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("div", {
@ -45109,7 +45112,7 @@ var ParentAuth = /*#__PURE__*/function (_Component) {
if (document.getElementById('p-auth')) {
console.log("v1: 2021/11/30");
console.log("v1: 2021/11/30 21h");
react_dom__WEBPACK_IMPORTED_MODULE_1__.render( /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)(ParentAuth, {}), document.getElementById('p-auth'));
}
@ -47186,7 +47189,7 @@ var Favorite = function Favorite(props) {
className: "meeting-member-list",
role: "list",
children: (_item$approvals = item.approvals) === null || _item$approvals === void 0 ? void 0 : _item$approvals.map(function (v, inx1) {
return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("li", {
if (v.approval_at) return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("li", {
className: "meeting-member__item",
role: "listitem",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("div", {
@ -47273,7 +47276,7 @@ var Favorite = function Favorite(props) {
className: "meeting-member-list",
role: "list",
children: (_item$approvals2 = item.approvals) === null || _item$approvals2 === void 0 ? void 0 : _item$approvals2.map(function (v, inx1) {
return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("li", {
if (v.approval_at) return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("li", {
className: "meeting-member__item",
role: "listitem",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("div", {
@ -47578,7 +47581,6 @@ 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) {
@ -47844,7 +47846,8 @@ var MeetingAdd = function MeetingAdd(props) {
onClick: function onClick(e) {
return setCheckRadio(e.target.id);
},
defaultChecked: state.children.length == state.approval.length ? true : false
defaultChecked: (state === null || state === void 0 ? void 0 : state.children.length) == (state === null || state === void 0 ? void 0 : state.approval.length) ? true : false,
disabled: children_list.length == 0 ? true : false
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", {
className: "lbl padding-16",
children: "\u5168\u54E1\u306B\u9001\u4FE1"
@ -47862,14 +47865,15 @@ var MeetingAdd = function MeetingAdd(props) {
onClick: function onClick(e) {
return setCheckRadio(e.target.id);
},
defaultChecked: state.children.length != state.approval.length ? true : false
defaultChecked: (state === null || state === void 0 ? void 0 : state.children.length) != (state === null || state === void 0 ? void 0 : state.approval.length) ? true : false,
disabled: children_list.length == 0 ? true : false
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", {
className: "lbl padding-16",
children: "\u9078\u3093\u3067\u9001\u4FE1"
})]
})
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", {
className: "checkbox-wrap edit-bg ".concat(check_radio != "pickup_send" && 'd-none'),
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) {
return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", {
className: "checkbox",
@ -48250,6 +48254,9 @@ var MeetingDetail = function MeetingDetail(props) {
className: "meeting-member-wrap",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsxs)("div", {
className: "meeting-member-link",
onClick: function onClick() {
return setShowNotifyAllModal(true);
},
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsxs)("ul", {
className: "meeting-member-count",
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)("li", {
@ -48262,11 +48269,8 @@ var MeetingDetail = function MeetingDetail(props) {
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)("ul", {
className: "meeting-member-list",
role: "list",
onClick: function onClick() {
return setShowNotifyAllModal(true);
},
children: (_meeting$approval = meeting.approval) === null || _meeting$approval === void 0 ? void 0 : _meeting$approval.map(function (v, inx) {
return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)("li", {
if (v.approval_at) return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)("li", {
className: "meeting-member__item",
role: "listitem",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)("div", {
@ -48676,7 +48680,7 @@ var MeetingEdit = function MeetingEdit(props) {
}
setChildrenList(arr);
approval.length == list.length ? setCheckRadio("all_send") : setCheckRadio("pickup_send");
approval.length == list.length && list.length > 0 ? setCheckRadio("all_send") : setCheckRadio("pickup_send");
} else {
set400Error("失敗しました。");
}
@ -49082,7 +49086,8 @@ var MeetingEdit = function MeetingEdit(props) {
onClick: function onClick(e) {
return setCheckRadio(e.target.id);
},
defaultChecked: meeting.approval.length == meeting.children.length ? true : false
defaultChecked: meeting.approval.length == meeting.children.length && meeting.children.length > 0 ? true : false,
disabled: meeting.children.length == 0 ? true : false
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("span", {
className: "lbl padding-16",
children: "\u5168\u54E1\u306B\u9001\u4FE1"
@ -49100,14 +49105,15 @@ var MeetingEdit = function MeetingEdit(props) {
onClick: function onClick(e) {
return setCheckRadio(e.target.id);
},
defaultChecked: meeting.approval.length != meeting.children.length ? true : false
defaultChecked: meeting.approval.length != meeting.children.length && meeting.children.length > 0 ? true : false,
disabled: meeting.children.length == 0 ? true : false
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("span", {
className: "lbl padding-16",
children: "\u9078\u3093\u3067\u9001\u4FE1"
})]
})
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("div", {
className: "checkbox-wrap edit-bg ".concat(check_radio != "pickup_send" && 'd-none'),
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) {
return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("div", {
className: "checkbox",
@ -49572,7 +49578,7 @@ var Meeting = function Meeting(props) {
className: "meeting-member-list",
role: "list",
children: (_item$approvals = item.approvals) === null || _item$approvals === void 0 ? void 0 : _item$approvals.map(function (v, inx1) {
return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)("li", {
if (v.approval_at) return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)("li", {
className: "meeting-member__item",
role: "listitem",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)("div", {
@ -49659,7 +49665,7 @@ var Meeting = function Meeting(props) {
className: "meeting-member-list",
role: "list",
children: (_item$approvals2 = item.approvals) === null || _item$approvals2 === void 0 ? void 0 : _item$approvals2.map(function (v, inx1) {
return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)("li", {
if (v.approval_at) return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)("li", {
className: "meeting-member__item",
role: "listitem",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)("div", {
@ -51277,7 +51283,7 @@ var Search = function Search(props) {
className: "meeting-member-list",
role: "list",
children: (_item$approvals = item.approvals) === null || _item$approvals === void 0 ? void 0 : _item$approvals.map(function (v, inx1) {
return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("li", {
if (v.approval_at) return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("li", {
className: "meeting-member__item",
role: "listitem",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("div", {
@ -51365,7 +51371,7 @@ var Search = function Search(props) {
className: "meeting-member-list",
role: "list",
children: (_item$approvals2 = item.approvals) === null || _item$approvals2 === void 0 ? void 0 : _item$approvals2.map(function (v, inx1) {
return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("li", {
if (v.approval_at) return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("li", {
className: "meeting-member__item",
role: "listitem",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("div", {

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

@ -99,12 +99,15 @@ const MeetingDetail = (props) => {
<ul className="meeting-member-list" role="list">
{
meeting.approval?.map((x, k)=>
{
if(x.approval_at)
return(
<li className="meeting-member__item" role="listitem" key={k}>
<div className="avatar">
<img alt="name" className="avatar-img" src={x.child.image} />
</div>
</li>
)
</li>)
})
}
</ul>
</div>

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

@ -50,6 +50,7 @@ const MeetingEdit = (props) => {
else list[i].checked = false;
}
}
console.log('sd')
setChildrenList(list);
},[check_radio])
@ -77,7 +78,7 @@ const MeetingEdit = (props) => {
else arr.push({...list[i], checked: false});
}
setChildrenList(arr);
(approval.length == list.length) ? setCheckRadio("all_send") : setCheckRadio("pickup_send");
(approval.length == list.length) && (list.length > 0) ? setCheckRadio("all_send") : setCheckRadio("pickup_send");
}
else {
set400Error("失敗しました。");
@ -322,7 +323,8 @@ const MeetingEdit = (props) => {
id="all_send"
name="check_radio"
onClick={e=>setCheckRadio(e.target.id)}
defaultChecked = {(meeting.approval.length == meeting.children.length) ? true : false}
defaultChecked = {(meeting.approval.length == meeting.children.length) && meeting.children.length > 0 ? true : false}
disabled = {meeting.children.length == 0 ? true:false}
/>
<span className="lbl padding-16">全員に送信</span>
</label>
@ -335,13 +337,14 @@ const MeetingEdit = (props) => {
id="pickup_send"
name="check_radio"
onClick={e=>setCheckRadio(e.target.id)}
defaultChecked = {(meeting.approval.length != meeting.children.length) ? true : false}
defaultChecked = {(meeting.approval.length != meeting.children.length) && meeting.children.length > 0 ? 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!="pickup_send" && 'd-none'}`}>
<div className={`checkbox-wrap edit-bg ${(check_radio == "all_send" && meeting.children.length > 0) && 'd-none'}`}>
{
children_list.length != 0 ?
children_list?.map((item, k)=>

15
backend/resources/js/admin/meeting/index.jsx
ファイルの表示

@ -175,12 +175,15 @@ const Meeting = (props) => {
<ul className="meeting-member-list" role="list">
{
item.approval?.map((x, kj)=>
<li className="meeting-member__item" role="listitem" key={kj}>
<div className="avatar">
<img alt="name" className="avatar-img" src={x.child.image} alt={x.child.image} />
</div>
</li>
)
{
if(x.approval_at)
return(
<li className="meeting-member__item" role="listitem" key={kj}>
<div className="avatar">
<img alt="name" className="avatar-img" src={x.child.image} alt={x.child.image} />
</div>
</li>)
})
}
</ul>
</div>

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")
console.log("v1: 2021/11/30 21h")
ReactDOM.render(
<ParentAuth />,
document.getElementById('p-auth')

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

@ -224,12 +224,15 @@ const Favorite = (props) => {
<ul className="meeting-member-list" role="list">
{
item.approvals?.map((v, inx1) =>
{
if(v.approval_at)
return(
<li className="meeting-member__item" role="listitem" key={inx1}>
<div className="avatar">
<img alt="name" className="avatar-img" src={v?.child.image} />
</div>
</li>
)
</li>)
})
}
</ul>
</div>
@ -285,12 +288,15 @@ const Favorite = (props) => {
<ul className="meeting-member-list" role="list">
{
item.approvals?.map((v, inx1) =>
{
if(v.approval_at)
return(
<li className="meeting-member__item" role="listitem" key={inx1}>
<div className="avatar">
<img alt="name" className="avatar-img" src={v?.child.image} />
</div>
</li>
)
</li>)
})
}
</ul>
</div>

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

@ -117,7 +117,6 @@ 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);
@ -314,7 +313,8 @@ const MeetingAdd = (props) => {
name="check_radio"
value={false}
onClick={e=>setCheckRadio(e.target.id)}
defaultChecked = {(state.children.length == state.approval.length)? true:false}
defaultChecked = {(state?.children.length == state?.approval.length)? true:false}
disabled = {children_list.length == 0 ? true:false}
/>
<span className="lbl padding-16">全員に送信</span>
</label>
@ -327,13 +327,14 @@ const MeetingAdd = (props) => {
id="pickup_send"
name="check_radio"
onClick={e=>setCheckRadio(e.target.id)}
defaultChecked = {(state.children.length != state.approval.length)? true:false}
defaultChecked = {(state?.children.length != state?.approval.length)? 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!="pickup_send" && 'd-none'}`}>
<div className={`checkbox-wrap edit-bg ${(check_radio == "all_send" && children_list.length > 0) && 'd-none'}`}>
{
children_list.length != 0 ?
children_list?.map((item, k)=>

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

@ -154,21 +154,24 @@ const MeetingDetail = (props) => {
<div className="p-article__content">
<div className="meeting-member">
<div className="meeting-member-wrap">
<div className="meeting-member-link">
<div className="meeting-member-link" onClick={()=>setShowNotifyAllModal(true)} >
<ul className="meeting-member-count">
<li className="numerator">{meeting?.numerator}</li>
<li className="denominator">{meeting?.denominator}</li>
</ul>
<ul className="meeting-member-list" role="list" onClick={()=>setShowNotifyAllModal(true)} >
<ul className="meeting-member-list" role="list">
{
meeting.approval?.map((v, inx) =>
{
if(v.approval_at)
return(
<li className="meeting-member__item" role="listitem" key={inx}>
<div className="avatar">
<img alt="name" className="avatar-img" src={v?.child.image} />
</div>
</li>
)
</li>)
})
}
</ul>
</div>

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

@ -64,7 +64,7 @@ const MeetingEdit = (props) => {
else arr.push({...list[i], checked: false});
}
setChildrenList(arr);
(approval.length == list.length) ? setCheckRadio("all_send") : setCheckRadio("pickup_send");
(approval.length == list.length) && (list.length > 0) ? setCheckRadio("all_send") : setCheckRadio("pickup_send");
}
else{
set400Error("失敗しました。");
@ -348,7 +348,8 @@ useEffect(()=>{
id="all_send"
name="check_radio"
onClick={e=>setCheckRadio(e.target.id)}
defaultChecked = {(meeting.approval.length == meeting.children.length) ? true : false}
defaultChecked = {(meeting.approval.length == meeting.children.length) && meeting.children.length > 0 ? true : false}
disabled = {meeting.children.length == 0 ? true:false}
/>
<span className="lbl padding-16">全員に送信</span>
</label>
@ -361,13 +362,14 @@ useEffect(()=>{
id="pickup_send"
name="check_radio"
onClick={e=>setCheckRadio(e.target.id)}
defaultChecked = {(meeting.approval.length != meeting.children.length) ? true : false}
defaultChecked = {(meeting.approval.length != meeting.children.length) && meeting.children.length > 0 ? 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!="pickup_send" && 'd-none'}`}>
<div className={`checkbox-wrap edit-bg ${(check_radio == "all_send" && meeting.children.length > 0) && 'd-none'}`}>
{
children_list.length != 0 ?
children_list?.map((item, k)=>

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

@ -231,12 +231,15 @@ const Meeting = (props) => {
<ul className="meeting-member-list" role="list">
{
item.approvals?.map((v, inx1) =>
{
if(v.approval_at)
return(
<li className="meeting-member__item" role="listitem" key={inx1}>
<div className="avatar">
<img alt="name" className="avatar-img" src={v?.child.image} />
</div>
</li>
)
</li>)
})
}
</ul>
</div>
@ -291,12 +294,15 @@ const Meeting = (props) => {
<ul className="meeting-member-list" role="list">
{
item.approvals?.map((v, inx1) =>
{
if(v.approval_at)
return(
<li className="meeting-member__item" role="listitem" key={inx1}>
<div className="avatar">
<img alt="name" className="avatar-img" src={v?.child.image} />
</div>
</li>
)
</li>)
})
}
</ul>
</div>

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

@ -233,13 +233,16 @@ const Search = (props) => {
<ul className="meeting-member-list" role="list">
{
item.approvals?.map((v, inx1) =>
<li className="meeting-member__item" role="listitem" key={inx1}>
<div className="avatar">
<img alt="name" className="avatar-img" src={v?.child.image} />
</div>
</li>
)
item.approvals?.map((v, inx1) =>
{
if(v.approval_at)
return(
<li className="meeting-member__item" role="listitem" key={inx1}>
<div className="avatar">
<img alt="name" className="avatar-img" src={v?.child.image} />
</div>
</li>)
})
}
</ul>
</div>
@ -297,12 +300,15 @@ const Search = (props) => {
<ul className="meeting-member-list" role="list">
{
item.approvals?.map((v, inx1) =>
{
if(v.approval_at)
return(
<li className="meeting-member__item" role="listitem" key={inx1}>
<div className="avatar">
<img alt="name" className="avatar-img" src={v?.child.image} />
</div>
</li>
)
</li>)
})
}
</ul>
</div>