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

bugfixed p_account meeting add

このコミットが含まれているのは:
dragon1211 2021-11-17 23:38:41 -08:00
親 4d1c1594b9
コミット 8773c282df
9個のファイルの変更、69行の追加、54行の削除
統計情報を表示 Patchファイルをダウンロード Diffファイルをダウンロード すべてのファイルを展開 すべてのファイルを折り畳む

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

@ -12314,6 +12314,10 @@ a {
}
}
.meeting-member-count .numerator:after {
display: inline !important;
}
@media screen and (min-width: 1068px) {
.p-meetingAdd-btn {
width: 200px !important;

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

@ -36422,16 +36422,16 @@ var MeetingEdit = function MeetingEdit(props) {
//send all children
list = _toConsumableArray(children_temp);
for (var i = 0; i < list.length; i++) {
for (var i in list) {
list[i].checked = true;
}
} else if (check_radio == "true") {
//send pickup
list = _toConsumableArray(children_temp);
for (var i = 0; i < list.length; i++) {
for (var i in list) {
if (approval_list.findIndex(function (ele) {
return ele.child_id == list[i].child_id;
return ele.child_id == list[i].id;
}) >= 0) list[i].checked = true;else list[i].checked = false;
}
}
@ -36462,9 +36462,9 @@ var MeetingEdit = function MeetingEdit(props) {
var arr = [];
for (var i = 0; i < list.length; i++) {
for (var i in list) {
if (approval.findIndex(function (ele) {
return ele.child_id == list[i].child_id;
return ele.child_id == list[i].id;
}) >= 0) arr.push(_objectSpread(_objectSpread({}, list[i]), {}, {
checked: true
}));else arr.push(_objectSpread(_objectSpread({}, list[i]), {}, {
@ -36496,8 +36496,8 @@ var MeetingEdit = function MeetingEdit(props) {
var _loop = function _loop(i) {
if (children_temp[i].checked) {
if (approval_list.findIndex(function (ele) {
return ele.child_id == children_temp[i].child_id;
}) < 0) approval_registerIndexes.push(children_temp[i].child_id);
return ele.child_id == children_temp[i].id;
}) < 0) approval_registerIndexes.push(children_temp[i].id);
}
};
@ -36507,7 +36507,7 @@ var MeetingEdit = function MeetingEdit(props) {
var _loop2 = function _loop2(_i2) {
if (children_temp.findIndex(function (ele) {
return ele.checked && ele.child_id == approval_list[_i2].child_id;
return ele.checked && ele.id == approval_list[_i2].child_id;
}) < 0) approval_deleteIndexes.push(approval_list[_i2].child_id);
};
@ -42168,6 +42168,7 @@ var Profile = function Profile(props) {
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", {
className: "p-profile-txtLink",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("a", {
className: "btn-default btn-password btn-r8 btn-h30",
onClick: handleLogout,
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", {
className: "ft-xs-16",
@ -42178,6 +42179,7 @@ var Profile = function Profile(props) {
className: "p-profile-txtLink",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_8__.Link, {
to: "/c-account/profile/withdrawal",
className: "btn-default btn-password btn-r8 btn-h30",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", {
className: "ft-xs-16",
children: "\u9000\u4F1A\u3059\u308B"
@ -46080,13 +46082,15 @@ var ChildDetail = function ChildDetail(props) {
})
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("div", {
className: "p-profile-txtLink",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("button", {
type: "button",
className: "a-icon txt-link",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("a", {
className: "btn-default btn-password btn-r8 btn-h30",
onClick: function onClick(e) {
return setShowDelete(true);
},
children: "\u524A\u9664\u3059\u308B"
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("span", {
className: "ft-xs-16",
children: "\u524A\u9664\u3059\u308B"
})
})
})]
})
@ -47293,7 +47297,6 @@ var MeetingAdd = function MeetingAdd(props) {
}
setChildrenList(arr);
console.log(state, arr);
} else {
axios__WEBPACK_IMPORTED_MODULE_1___default().get('/api/fathers/children/listOfFather', {
params: {
@ -47368,7 +47371,7 @@ var MeetingAdd = function MeetingAdd(props) {
var c_arr = [];
for (var i in children_list) {
if (children_list[i].checked) c_arr.push(children_list[i].child_id);
if (children_list[i].checked) c_arr.push(children_list[i].id);
}
formdata.append('children', JSON.stringify(c_arr));
@ -48406,9 +48409,9 @@ var MeetingEdit = function MeetingEdit(props) {
var arr = [];
for (var i = 0; i < list.length; i++) {
for (var i in list) {
if (approval.findIndex(function (ele) {
return ele.child_id == list[i].child_id;
return ele.child_id == list[i].id;
}) >= 0) arr.push(_objectSpread(_objectSpread({}, list[i]), {}, {
checked: true
}));else arr.push(_objectSpread(_objectSpread({}, list[i]), {}, {
@ -48449,9 +48452,9 @@ var MeetingEdit = function MeetingEdit(props) {
//send pickup
list = _toConsumableArray(children_list);
for (var i = 0; i < list.length; i++) {
for (var i in list) {
if (approval_list.findIndex(function (ele) {
return ele.child_id == list[i].child_id;
return ele.child_id == list[i].id;
}) >= 0) list[i].checked = true;else list[i].checked = false;
}
}
@ -48474,22 +48477,22 @@ var MeetingEdit = function MeetingEdit(props) {
var _loop = function _loop(i) {
if (children_list[i].checked) {
if (approval_list.findIndex(function (ele) {
return ele.child_id == children_list[i].child_id;
}) < 0) approval_registerIndexes.push(children_list[i].child_id);
return ele.child_id == children_list[i].id;
}) < 0) approval_registerIndexes.push(children_list[i].id);
}
};
for (var i = 0; i < children_list.length; i++) {
for (var i in children_list) {
_loop(i);
}
var _loop2 = function _loop2(_i2) {
if (children_list.findIndex(function (ele) {
return ele.checked && ele.child_id == approval_list[_i2].child_id;
return ele.checked && ele.id == approval_list[_i2].child_id;
}) < 0) approval_deleteIndexes.push(approval_list[_i2].child_id);
};
for (var _i2 = 0; _i2 < approval_list.length; _i2++) {
for (var _i2 in approval_list) {
_loop2(_i2);
}
@ -50138,6 +50141,7 @@ var Profile = function Profile(props) {
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", {
className: "p-profile-txtLink",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("a", {
className: "btn-default btn-password btn-r8 btn-h30",
onClick: handleLogout,
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", {
className: "ft-xs-16",
@ -50148,6 +50152,7 @@ var Profile = function Profile(props) {
className: "p-profile-txtLink",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_8__.Link, {
to: "/p-account/profile/withdrawal",
className: "btn-default btn-password btn-r8 btn-h30",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", {
className: "ft-xs-16",
children: "\u9000\u4F1A\u3059\u308B"

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

@ -39,13 +39,13 @@ const MeetingEdit = (props) => {
var list = [];
if(check_radio=="false"){ //send all children
list = [...children_temp];
for(var i=0; i<list.length; i++)
for(var i in list)
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)
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;
}
@ -70,8 +70,8 @@ const MeetingEdit = (props) => {
var list = [...response.data.params?.children];
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)
for(var i in list){
if(approval.findIndex(ele=>ele.child_id == list[i].id) >= 0)
arr.push({...list[i], checked: true});
else arr.push({...list[i], checked: false});
}
@ -92,12 +92,12 @@ const MeetingEdit = (props) => {
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);
if(approval_list.findIndex(ele=>ele.child_id == children_temp[i].id) < 0)
approval_registerIndexes.push(children_temp[i].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)
if(children_temp.findIndex(ele=> ele.checked && ele.id == approval_list[i].child_id) < 0)
approval_deleteIndexes.push(approval_list[i].child_id);
}

9
backend/resources/js/child/profile/index.jsx
ファイルの表示

@ -153,13 +153,16 @@ const Profile = (props) => {
</div>
<div className="p-profile-txtLink">
<a onClick={handleLogout}>
<a className="btn-default btn-password btn-r8 btn-h30"
onClick={handleLogout}
>
<span className="ft-xs-16">ログアウト</span>
</a>
</div>
<div className="p-profile-txtLink">
<Link to={`/c-account/profile/withdrawal`}>
<Link to="/c-account/profile/withdrawal"
className="btn-default btn-password btn-r8 btn-h30"
>
<span className="ft-xs-16">退会する</span>
</Link>
</div>

9
backend/resources/js/parent/child/detail.jsx
ファイルの表示

@ -124,12 +124,11 @@ const ChildDetail = (props) => {
<span>入社日を変更</span>
</Link>
</div>
<div className="p-profile-txtLink">
<button type="button" className="a-icon txt-link"
onClick={e=>setShowDelete(true)}>
削除する
</button>
<a className="btn-default btn-password btn-r8 btn-h30"
onClick={e=>setShowDelete(true)}>
<span className="ft-xs-16">削除する</span>
</a>
</div>
</div>
</div>

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

@ -49,7 +49,6 @@ const MeetingAdd = (props) => {
arr.push({...state.children[i], checked: false})
}
setChildrenList(arr);
console.log(state, arr);
}
else{
axios.get('/api/fathers/children/listOfFather', {params:{father_id: father_id}})
@ -105,7 +104,7 @@ const MeetingAdd = (props) => {
formdata.append('image', JSON.stringify(meeting_image));
let c_arr = [];
for(let i in children_list){
if(children_list[i].checked) c_arr.push(children_list[i].child_id);
if(children_list[i].checked) c_arr.push(children_list[i].id);
}
formdata.append('children', JSON.stringify(c_arr));

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

@ -54,8 +54,8 @@ const MeetingEdit = (props) => {
var list = [...response.data.params?.children];
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)
for(var i in list){
if(approval.findIndex(ele=>ele.child_id == list[i].id) >= 0)
arr.push({...list[i], checked: true});
else arr.push({...list[i], checked: false});
}
@ -88,8 +88,8 @@ useEffect(()=>{
}
else if(check_radio=="true"){ //send pickup
list = [...children_list];
for(var i=0; i<list.length; i++){
if(approval_list.findIndex(ele=>ele.child_id == list[i].child_id) >= 0)
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;
}
@ -104,14 +104,14 @@ useEffect(()=>{
var approval_registerIndexes = [];
var approval_deleteIndexes = [];
for(let i=0; i<children_list.length; i++){
for(let i in children_list){
if(children_list[i].checked){
if(approval_list.findIndex(ele=>ele.child_id == children_list[i].child_id) < 0)
approval_registerIndexes.push(children_list[i].child_id);
if(approval_list.findIndex(ele=>ele.child_id == children_list[i].id) < 0)
approval_registerIndexes.push(children_list[i].id);
}
}
for(let i=0; i<approval_list.length; i++){
if(children_list.findIndex(ele=> ele.checked && ele.child_id == approval_list[i].child_id) < 0)
for(let i in approval_list){
if(children_list.findIndex(ele=> ele.checked && ele.id == approval_list[i].child_id) < 0)
approval_deleteIndexes.push(approval_list[i].child_id);
}

9
backend/resources/js/parent/profile/index.jsx
ファイルの表示

@ -147,13 +147,16 @@ const Profile = (props) => {
</div>
<div className="p-profile-txtLink">
<a onClick={handleLogout}>
<a className="btn-default btn-password btn-r8 btn-h30"
onClick={handleLogout}
>
<span className="ft-xs-16">ログアウト</span>
</a>
</div>
<div className="p-profile-txtLink">
<Link to={`/p-account/profile/withdrawal`}>
<Link to="/p-account/profile/withdrawal"
className="btn-default btn-password btn-r8 btn-h30"
>
<span className="ft-xs-16">退会する</span>
</Link>
</div>

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

@ -187,7 +187,9 @@ a{
font-size: 16px !important;
}
}
.meeting-member-count .numerator:after{
display: inline !important;
}
/////////////////////////////////////////////////////////////////////////