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

add p-meeting-edit

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

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

@ -47733,7 +47733,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
var MeetingDetail = function MeetingDetail(props) {
var _meeting$approvals, _props$match$params4, _meeting$pdf;
var _meeting$approval, _props$match$params4, _meeting$pdf;
var history = (0,react_router_dom__WEBPACK_IMPORTED_MODULE_12__.useHistory)();
@ -47828,11 +47828,9 @@ var MeetingDetail = function MeetingDetail(props) {
var total = 0,
num = 0;
if (list.approvals) {
for (var i in list.approvals) {
if (list.approvals[i].approval_at) num++;
total++;
}
for (var i in list.approval) {
if (list.approval[i].approval_at) num++;
total++;
}
setMeeting(_objectSpread(_objectSpread({}, list), {}, {
@ -47992,7 +47990,7 @@ var MeetingDetail = function MeetingDetail(props) {
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("ul", {
className: "meeting-member-list",
role: "list",
children: (_meeting$approvals = meeting.approvals) === null || _meeting$approvals === void 0 ? void 0 : _meeting$approvals.map(function (v, inx) {
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_11__.jsx)("li", {
className: "meeting-member__item",
role: "listitem",
@ -48381,13 +48379,13 @@ var MeetingEdit = function MeetingEdit(props) {
setMemo((_response$data$params2 = response.data.params) === null || _response$data$params2 === void 0 ? void 0 : _response$data$params2.memo);
setText((_response$data$params3 = response.data.params) === null || _response$data$params3 === void 0 ? void 0 : _response$data$params3.text);
setMeetingImages((_response$data$params4 = response.data.params) === null || _response$data$params4 === void 0 ? void 0 : _response$data$params4.meeting_image);
setApproval((_response$data$params5 = response.data.params) === null || _response$data$params5 === void 0 ? void 0 : _response$data$params5.approvals);
setApproval((_response$data$params5 = response.data.params) === null || _response$data$params5 === void 0 ? void 0 : _response$data$params5.approval);
setPdf((_response$data$params6 = response.data.params) === null || _response$data$params6 === void 0 ? void 0 : _response$data$params6.pdf);
setChildren((_response$data$params7 = response.data.params) === null || _response$data$params7 === void 0 ? void 0 : _response$data$params7.children);
var list = _toConsumableArray((_response$data$params8 = response.data.params) === null || _response$data$params8 === void 0 ? void 0 : _response$data$params8.children);
var approval = _toConsumableArray((_response$data$params9 = response.data.params) === null || _response$data$params9 === void 0 ? void 0 : _response$data$params9.approvals);
var approval = _toConsumableArray((_response$data$params9 = response.data.params) === null || _response$data$params9 === void 0 ? void 0 : _response$data$params9.approval);
var arr = [];

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

@ -44,12 +44,10 @@ const MeetingDetail = (props) => {
if(response.data.status_code==200){
var list = response.data.params;
var total=0, num=0;
if(list.approvals){
for(var i in list.approvals)
{
if(list.approvals[i].approval_at) num ++;
total ++;
}
for(var i in list.approval)
{
if(list.approval[i].approval_at) num ++;
total ++;
}
setMeeting({...list, denominator:total, numerator:num});
setThumbnail(response.data.params.meeting_image[0]?.image);
@ -146,7 +144,7 @@ const MeetingDetail = (props) => {
</ul>
<ul className="meeting-member-list" role="list">
{ meeting.approvals?.map((v, inx) =>
{ meeting.approval?.map((v, inx) =>
<li className="meeting-member__item" role="listitem" key={inx}>
<div className="avatar">
<img alt="name" className="avatar-img" src={v?.child.image} />

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

@ -71,11 +71,11 @@ const MeetingEdit = (props) => {
setMemo(response.data.params?.memo);
setText(response.data.params?.text);
setMeetingImages(response.data.params?.meeting_image);
setApproval(response.data.params?.approvals);
setApproval(response.data.params?.approval);
setPdf(response.data.params?.pdf);
setChildren(response.data.params?.children);
var list = [...response.data.params?.children];
var approval = [...response.data.params?.approvals];
var approval = [...response.data.params?.approval];
var arr = [];
for(var i=0; i<list.length; i++){
if(approval.findIndex(ele=>ele.child_id == list[i].child_id) >= 0)