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

Merge branch 'develop' of github.com:nakazawakan/kikikanri into backend

このコミットが含まれているのは:
守矢諏訪子 2021-11-30 19:20:37 +09:00
親 3716ba7846 a2d2dc8acc
コミット cdc8a9174d
18個のファイルの変更、144行の追加、93行の削除
統計情報を表示 Patchファイルをダウンロード Diffファイルをダウンロード すべてのファイルを展開 すべてのファイルを折り畳む

12
backend/.env.example
ファイルの表示

@ -27,12 +27,12 @@ REDIS_PASSWORD=null
REDIS_PORT=6379
MAIL_MAILER=smtp
MAIL_HOST=mailhog
MAIL_PORT=1025
MAIL_USERNAME=null
MAIL_PASSWORD=null
MAIL_ENCRYPTION=null
MAIL_FROM_ADDRESS=null
MAIL_HOST=mail28.conoha.ne.jp
MAIL_PORT=587
MAIL_USERNAME="info@kikikan.xyz"
MAIL_PASSWORD="*44(2HBddVEX"
MAIL_ENCRYPTION=tls
MAIL_FROM_ADDRESS="info@kikikan.xyz"
MAIL_FROM_NAME="${APP_NAME}"
MAIL_OWNER_ADDRESS=""
MAIL_OWNER_NAME=""

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

@ -13047,6 +13047,7 @@ categories: [project]
min-width: 52px;
height: 52px;
margin-right: 10px;
pointer-events: none;
}
.icon-text-wrap:after {
position: absolute;
@ -17365,6 +17366,7 @@ a {
.btn-disabled {
background-color: #eaeff2;
color: #6f7372;
pointer-events: none;
}
.meeting-item:last-child {

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

@ -34527,32 +34527,37 @@ var ChildDetail = function ChildDetail(props) {
submit = _useState6[0],
setSubmit = _useState6[1];
var _useState7 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(null),
var _useState7 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(false),
_useState8 = _slicedToArray(_useState7, 2),
child = _useState8[0],
setChild = _useState8[1];
submit_image = _useState8[0],
setSubmitImage = _useState8[1];
var _useState9 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(''),
var _useState9 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(null),
_useState10 = _slicedToArray(_useState9, 2),
_400error = _useState10[0],
set400Error = _useState10[1];
child = _useState10[0],
setChild = _useState10[1];
var _useState11 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)({
var _useState11 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(''),
_useState12 = _slicedToArray(_useState11, 2),
_400error = _useState12[0],
set400Error = _useState12[1];
var _useState13 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)({
image: ''
}),
_useState12 = _slicedToArray(_useState11, 2),
_422errors = _useState12[0],
set422Errors = _useState12[1];
var _useState13 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(props.history.location.state),
_useState14 = _slicedToArray(_useState13, 2),
_success = _useState14[0],
setSuccess = _useState14[1];
_422errors = _useState14[0],
set422Errors = _useState14[1];
var _useState15 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(false),
var _useState15 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(props.history.location.state),
_useState16 = _slicedToArray(_useState15, 2),
show_confirm_modal = _useState16[0],
setShowConfirmModal = _useState16[1];
_success = _useState16[0],
setSuccess = _useState16[1];
var _useState17 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(false),
_useState18 = _slicedToArray(_useState17, 2),
show_confirm_modal = _useState18[0],
setShowConfirmModal = _useState18[1];
(0,react__WEBPACK_IMPORTED_MODULE_1__.useEffect)(function () {
var _props$match$params;
@ -34588,9 +34593,12 @@ var ChildDetail = function ChildDetail(props) {
set422Errors({
image: ''
});
setSubmitImage(true);
axios__WEBPACK_IMPORTED_MODULE_2___default().put("/api/admin/children/updateImage/".concat((_props$match$params2 = props.match.params) === null || _props$match$params2 === void 0 ? void 0 : _props$match$params2.child_id), {
image: reader.result
}).then(function (response) {
setSubmitImage(false);
switch (response.data.status_code) {
case 200:
{
@ -34676,7 +34684,7 @@ var ChildDetail = function ChildDetail(props) {
style: {
minHeight: '500px'
},
children: [!loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_7__.default, {
children: [(!loaded || submit_image) && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_7__.default, {
className: "css-loader"
}), loaded && child && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)("div", {
className: "profile-content",
@ -34774,7 +34782,7 @@ var ChildDetail = function ChildDetail(props) {
})
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("p", {
className: "txt",
children: child.company
children: child.company ? child.company : '未入力'
})]
})]
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("div", {
@ -36449,20 +36457,20 @@ var MeetingEdit = function MeetingEdit(props) {
setLoaded(true);
if (response.data.status_code == 200) {
var _response$data$params, _response$data$params2, _response$data$params3, _response$data$params4, _response$data$params5, _response$data$params6, _response$data$params7, _response$data$params8;
var _response$data$params, _response$data$params2, _response$data$params3, _response$data$params4, _response$data$params5, _response$data$params6;
setMeeting(response.data.params); //Success
setTitle((_response$data$params = response.data.params) === null || _response$data$params === void 0 ? void 0 : _response$data$params.title);
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.approval);
setPdf((_response$data$params6 = response.data.params) === null || _response$data$params6 === void 0 ? void 0 : _response$data$params6.pdf);
setMemo(response.data.params.memo ? response.data.params.memo : '');
setText(response.data.params.text ? response.data.params.text : '');
setMeetingImages((_response$data$params2 = response.data.params) === null || _response$data$params2 === void 0 ? void 0 : _response$data$params2.meeting_image);
setApproval((_response$data$params3 = response.data.params) === null || _response$data$params3 === void 0 ? void 0 : _response$data$params3.approval);
setPdf((_response$data$params4 = response.data.params) === null || _response$data$params4 === void 0 ? void 0 : _response$data$params4.pdf);
var list = _toConsumableArray((_response$data$params7 = response.data.params) === null || _response$data$params7 === void 0 ? void 0 : _response$data$params7.children);
var list = _toConsumableArray((_response$data$params5 = response.data.params) === null || _response$data$params5 === void 0 ? void 0 : _response$data$params5.children);
var approval = _toConsumableArray((_response$data$params8 = response.data.params) === null || _response$data$params8 === void 0 ? void 0 : _response$data$params8.approval);
var approval = _toConsumableArray((_response$data$params6 = response.data.params) === null || _response$data$params6 === void 0 ? void 0 : _response$data$params6.approval);
var arr = [];
@ -37352,32 +37360,37 @@ var ParentDetail = function ParentDetail(props) {
submit = _useState6[0],
setSubmit = _useState6[1];
var _useState7 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(null),
var _useState7 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(false),
_useState8 = _slicedToArray(_useState7, 2),
parent = _useState8[0],
setParent = _useState8[1];
submit_image = _useState8[0],
setSubmitImage = _useState8[1];
var _useState9 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(''),
var _useState9 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(null),
_useState10 = _slicedToArray(_useState9, 2),
_400error = _useState10[0],
set400Error = _useState10[1];
parent = _useState10[0],
setParent = _useState10[1];
var _useState11 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)({
var _useState11 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(''),
_useState12 = _slicedToArray(_useState11, 2),
_400error = _useState12[0],
set400Error = _useState12[1];
var _useState13 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)({
image: ''
}),
_useState12 = _slicedToArray(_useState11, 2),
_422errors = _useState12[0],
set422Errors = _useState12[1];
var _useState13 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(props.history.location.state),
_useState14 = _slicedToArray(_useState13, 2),
_success = _useState14[0],
setSuccess = _useState14[1];
_422errors = _useState14[0],
set422Errors = _useState14[1];
var _useState15 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(false),
var _useState15 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(props.history.location.state),
_useState16 = _slicedToArray(_useState15, 2),
show_confirm_modal = _useState16[0],
setShowConfirmModal = _useState16[1];
_success = _useState16[0],
setSuccess = _useState16[1];
var _useState17 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(false),
_useState18 = _slicedToArray(_useState17, 2),
show_confirm_modal = _useState18[0],
setShowConfirmModal = _useState18[1];
(0,react__WEBPACK_IMPORTED_MODULE_1__.useEffect)(function () {
var _props$match$params;
@ -37407,9 +37420,12 @@ var ParentDetail = function ParentDetail(props) {
set422Errors({
image: ''
});
setSubmitImage(true);
axios__WEBPACK_IMPORTED_MODULE_2___default().put("/api/admin/fathers/updateImage/".concat((_props$match$params2 = props.match.params) === null || _props$match$params2 === void 0 ? void 0 : _props$match$params2.father_id), {
image: reader.result
}).then(function (response) {
setSubmitImage(false);
switch (response.data.status_code) {
case 200:
{
@ -37489,7 +37505,7 @@ var ParentDetail = function ParentDetail(props) {
style: {
minHeight: '500px'
},
children: [!loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_7__.default, {
children: [(!loaded || submit_image) && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_7__.default, {
className: "css-loader"
}), loaded && parent && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)("div", {
className: "profile-content",
@ -37569,7 +37585,7 @@ var ParentDetail = function ParentDetail(props) {
className: "profile-info__item",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("p", {
className: "txt",
children: parent.profile
children: parent.profile ? parent.profile : '未入力'
})
})]
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("div", {
@ -37750,7 +37766,7 @@ var ParentEdit = function ParentEdit(props) {
setCompany(parent === null || parent === void 0 ? void 0 : parent.company);
setEmail(parent.email);
setTelephone(parent.tel);
setProfile(parent.profile);
setProfile(parent.profile ? parent.profile : '');
}
} else {
set400Error("失敗しました。");
@ -41338,7 +41354,7 @@ var ParentDetail = function ParentDetail(props) {
className: "profile-info__item txt-long",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("p", {
className: "txt",
children: parent.profile
children: parent.profile ? parent.profile : '未入力'
})
})]
})]
@ -41706,7 +41722,7 @@ var ProfileEdit = function ProfileEdit() {
setEmail(params.email);
setTel(params.tel);
setIdentity(params.identity);
if (params.company) setCompany(params.company);
setCompany(params.company ? params.company : '');
} else {
set400Error("失敗しました。");
}
@ -42046,6 +42062,11 @@ var Profile = function Profile(props) {
_success = _useState16[0],
setSuccess = _useState16[1];
var _useState17 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
_useState18 = _slicedToArray(_useState17, 2),
submit_image = _useState18[0],
setSubmitImage = _useState18[1];
(0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
setLoaded(false);
var child_id = document.getElementById('child_id').value;
@ -42094,10 +42115,12 @@ var Profile = function Profile(props) {
set422Errors({
image: ''
});
setSubmitImage(true);
axios__WEBPACK_IMPORTED_MODULE_1___default().put("/api/children/updateImage/".concat(document.getElementById('child_id').value), {
image: reader.result
}).then(function (response) {
setNotice(response.data.notice);
setSubmitImage(false);
switch (response.data.status_code) {
case 200:
@ -42137,7 +42160,7 @@ var Profile = function Profile(props) {
className: "l-content-wrap",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("section", {
className: "profile-container",
children: [!loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_6__.default, {
children: [(!loaded || submit_image) && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_6__.default, {
className: "css-loader"
}), loaded && profile && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", {
className: "profile-wrap",
@ -45085,7 +45108,7 @@ var ParentAuth = /*#__PURE__*/function (_Component) {
if (document.getElementById('p-auth')) {
console.log("v1: 2021/11/29");
console.log("v1: 2021/11/30");
react_dom__WEBPACK_IMPORTED_MODULE_1__.render( /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)(ParentAuth, {}), document.getElementById('p-auth'));
}
@ -46190,7 +46213,7 @@ var ChildDetail = function ChildDetail(props) {
})
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("p", {
className: "txt",
children: child.company
children: child.company ? child.company : '未入力'
})]
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsxs)("div", {
className: "profile-info__item",
@ -47447,7 +47470,7 @@ var MeetingAdd = function MeetingAdd(props) {
if (state) {
setLoaded(true);
setTitle(state === null || state === void 0 ? void 0 : state.title);
setMemo(state === null || state === void 0 ? void 0 : state.memo);
setMemo(state.memo ? state.memo : '');
setText(state === null || state === void 0 ? void 0 : state.text);
setPdf(state === null || state === void 0 ? void 0 : state.pdf);
var images = [];
@ -48623,19 +48646,19 @@ var MeetingEdit = function MeetingEdit(props) {
setNotice(response.data.notice);
if (response.data.status_code == 200) {
var _response$data$params, _response$data$params2, _response$data$params3, _response$data$params4, _response$data$params5, _response$data$params6, _response$data$params7, _response$data$params8;
var _response$data$params, _response$data$params2, _response$data$params3, _response$data$params4, _response$data$params5, _response$data$params6;
setMeeting(response.data.params);
setTitle((_response$data$params = response.data.params) === null || _response$data$params === void 0 ? void 0 : _response$data$params.title);
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.approval);
setPdf((_response$data$params6 = response.data.params) === null || _response$data$params6 === void 0 ? void 0 : _response$data$params6.pdf);
setMemo(response.data.params.memo ? response.data.params.memo : '');
setText(response.data.params.text ? response.data.params.text : '');
setMeetingImages((_response$data$params2 = response.data.params) === null || _response$data$params2 === void 0 ? void 0 : _response$data$params2.meeting_image);
setApproval((_response$data$params3 = response.data.params) === null || _response$data$params3 === void 0 ? void 0 : _response$data$params3.approval);
setPdf((_response$data$params4 = response.data.params) === null || _response$data$params4 === void 0 ? void 0 : _response$data$params4.pdf);
var list = _toConsumableArray((_response$data$params7 = response.data.params) === null || _response$data$params7 === void 0 ? void 0 : _response$data$params7.children);
var list = _toConsumableArray((_response$data$params5 = response.data.params) === null || _response$data$params5 === void 0 ? void 0 : _response$data$params5.children);
var approval = _toConsumableArray((_response$data$params8 = response.data.params) === null || _response$data$params8 === void 0 ? void 0 : _response$data$params8.approval);
var approval = _toConsumableArray((_response$data$params6 = response.data.params) === null || _response$data$params6 === void 0 ? void 0 : _response$data$params6.approval);
var arr = [];
@ -49890,13 +49913,13 @@ var ProfileEdit = function ProfileEdit() {
setNotice(response.data.notice);
if (response.data.status_code == 200) {
var _response$data$params, _response$data$params2, _response$data$params3, _response$data$params4;
var _response$data$params, _response$data$params2, _response$data$params3;
setParams(response.data.params);
setCompany((_response$data$params = response.data.params) === null || _response$data$params === void 0 ? void 0 : _response$data$params.company);
setEmail((_response$data$params2 = response.data.params) === null || _response$data$params2 === void 0 ? void 0 : _response$data$params2.email);
setTel((_response$data$params3 = response.data.params) === null || _response$data$params3 === void 0 ? void 0 : _response$data$params3.tel);
setProfile((_response$data$params4 = response.data.params) === null || _response$data$params4 === void 0 ? void 0 : _response$data$params4.profile);
setProfile(response.data.params.profile ? response.data.params.profile : '');
} else {
set400Error("失敗しました。");
}
@ -50155,7 +50178,12 @@ var Profile = function Profile(props) {
image = _useState4[0],
setImage = _useState4[1];
var _useState5 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)({}),
var _useState5 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)({
company: '',
email: '',
tel: '',
profile: ''
}),
_useState6 = _slicedToArray(_useState5, 2),
profile = _useState6[0],
setProfile = _useState6[1];
@ -50187,6 +50215,11 @@ var Profile = function Profile(props) {
_success = _useState16[0],
setSuccess = _useState16[1];
var _useState17 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
_useState18 = _slicedToArray(_useState17, 2),
submit_image = _useState18[0],
setSubmitImage = _useState18[1];
var father_id = document.getElementById('father_id').value;
(0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
setLoaded(false);
@ -50235,10 +50268,12 @@ var Profile = function Profile(props) {
set422Errors({
image: ''
});
setSubmitImage(true);
axios__WEBPACK_IMPORTED_MODULE_1___default().put("/api/fathers/updateImage/".concat(father_id), {
image: reader.result
}).then(function (response) {
setNotice(response.data.notice);
setSubmitImage(false);
switch (response.data.status_code) {
case 200:
@ -50278,7 +50313,7 @@ var Profile = function Profile(props) {
className: "l-content-wrap",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("section", {
className: "profile-container",
children: [!loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_6__.default, {
children: [(!loaded || submit_image) && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_6__.default, {
className: "css-loader"
}), loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", {
className: "profile-wrap",
@ -50353,7 +50388,7 @@ var Profile = function Profile(props) {
})
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("p", {
className: "txt",
children: profile.tel
children: profile === null || profile === void 0 ? void 0 : profile.tel
})]
})
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", {

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

@ -18,6 +18,7 @@ const ChildDetail = (props) => {
const [image, setImage] = useState('');
const [loaded, setLoaded] = useState(false);
const [submit, setSubmit] = useState(false);
const [submit_image, setSubmitImage] = useState(false);
const [child, setChild] = useState(null);
const [_400error, set400Error] = useState('');
@ -49,8 +50,10 @@ const ChildDetail = (props) => {
reader.readAsDataURL(_file);
reader.onloadend = () => {
set422Errors({image: ''});
setSubmitImage(true);
axios.put(`/api/admin/children/updateImage/${props.match.params?.child_id}`, {image: reader.result})
.then(response => {
setSubmitImage(false);
switch(response.data.status_code){
case 200: {
setImage(reader.result);
@ -96,7 +99,7 @@ const ChildDetail = (props) => {
<section className="profile-container">
<div className="profile-wrap" style={{ minHeight:'500px'}}>
{
!loaded &&
(!loaded || submit_image) &&
<CircularProgress className="css-loader"/>
}
{
@ -147,7 +150,7 @@ const ChildDetail = (props) => {
<p className="profile-info__icon">
<img src="/assets/img/icon/building.svg" alt="会社名"/>
</p>
<p className="txt">{child.company}</p>
<p className="txt">{child.company ? child.company: '未入力'}</p>
</div>
</div>

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

@ -62,8 +62,8 @@ const MeetingEdit = (props) => {
if(response.data.status_code==200){
setMeeting(response.data.params); //Success
setTitle(response.data.params?.title);
setMemo(response.data.params?.memo);
setText(response.data.params?.text);
setMemo(response.data.params.memo ? response.data.params.memo: '');
setText(response.data.params.text ? response.data.params.text: '');
setMeetingImages(response.data.params?.meeting_image);
setApproval(response.data.params?.approval);
setPdf(response.data.params?.pdf);

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

@ -24,6 +24,7 @@ const ParentDetail = (props) => {
const [image, setImage] = useState('');
const [loaded, setLoaded] = useState(false);
const [submit, setSubmit] = useState(false);
const [submit_image, setSubmitImage] = useState(false);
const [parent, setParent] = useState(null);
const [_400error, set400Error] = useState('');
@ -54,8 +55,10 @@ const ParentDetail = (props) => {
reader.readAsDataURL(_file);
reader.onloadend = () => {
set422Errors({image: ''});
setSubmitImage(true);
axios.put(`/api/admin/fathers/updateImage/${props.match.params?.father_id}`, {image: reader.result})
.then(response => {
setSubmitImage(false);
switch(response.data.status_code){
case 200: {
setImage(reader.result);
@ -101,7 +104,7 @@ const ParentDetail = (props) => {
<section className="profile-container">
<div className="profile-wrap" style={{ minHeight:'500px'}}>
{
!loaded &&
(!loaded || submit_image) &&
<CircularProgress className="css-loader"/>
}
{
@ -143,7 +146,7 @@ const ParentDetail = (props) => {
</a>
</div>
<div className="profile-info__item">
<p className="txt">{parent.profile}</p>
<p className="txt">{parent.profile ? parent.profile: '未入力'}</p>
</div>
</div>

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

@ -39,8 +39,8 @@ const ParentEdit = (props) => {
if(parent){
setCompany(parent?.company);
setEmail(parent.email);
setTelephone(parent.tel)
setProfile(parent.profile);
setTelephone(parent.tel);
setProfile(parent.profile ? parent.profile: '');
}
}
else{

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

@ -90,7 +90,7 @@ const ParentDetail = (props) => {
</a>
</div>
<div className="profile-info__item txt-long">
<p className="txt">{parent.profile}</p>
<p className="txt">{parent.profile ? parent.profile: '未入力'}</p>
</div>
</div>
</div>

2
backend/resources/js/child/profile/edit.jsx
ファイルの表示

@ -52,7 +52,7 @@ const ProfileEdit = () => {
setEmail(params.email);
setTel(params.tel);
setIdentity(params.identity);
if(params.company)setCompany(params.company);
setCompany(params.company? params.company: '');
}else {
set400Error("失敗しました。");
}

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

@ -20,7 +20,8 @@ const Profile = (props) => {
const [_404error, set404Error] = useState('');
const [_422errors, set422Errors] = useState({ image: '' });
const [_success, setSuccess] = useState(props.history.location.state);
const [submit_image, setSubmitImage] = useState(false);
useEffect(() => {
setLoaded(false);
@ -65,9 +66,11 @@ const Profile = (props) => {
reader.readAsDataURL(_file);
reader.onloadend = () => {
set422Errors({image: ''});
setSubmitImage(true);
axios.put(`/api/children/updateImage/${document.getElementById('child_id').value}`, {image: reader.result})
.then(response => {
setNotice(response.data.notice);
setSubmitImage(false);
switch(response.data.status_code){
case 200: {
localStorage.setItem('image_upload_success', response.data.success_messages);
@ -94,7 +97,7 @@ const Profile = (props) => {
<div className="l-content-wrap">
<section className="profile-container">
{
!loaded &&
(!loaded || submit_image) &&
<CircularProgress className="css-loader"/>
}
{

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

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

@ -116,7 +116,7 @@ const ChildDetail = (props) => {
<p className="profile-info__icon">
<img src="/assets/img/icon/building.svg" alt="会社名"/>
</p>
<p className="txt">{child.company}</p>
<p className="txt">{child.company ? child.company: '未入力'}</p>
</div>
<div className="profile-info__item">
<p className="profile-info__icon">

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

@ -37,7 +37,7 @@ const MeetingAdd = (props) => {
if(state){
setLoaded(true);
setTitle(state?.title);
setMemo(state?.memo);
setMemo(state.memo ? state.memo: '');
setText(state?.text);
setPdf(state?.pdf);
let images = [];

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

@ -49,8 +49,8 @@ const MeetingEdit = (props) => {
if(response.data.status_code==200){
setMeeting(response.data.params);
setTitle(response.data.params?.title);
setMemo(response.data.params?.memo);
setText(response.data.params?.text);
setMemo(response.data.params.memo ? response.data.params.memo: '');
setText(response.data.params.text ? response.data.params.text: '');
setMeetingImages(response.data.params?.meeting_image);
setApproval(response.data.params?.approval);
setPdf(response.data.params?.pdf);

2
backend/resources/js/parent/profile/edit.jsx
ファイルの表示

@ -40,7 +40,7 @@ const ProfileEdit = () => {
setCompany(response.data.params?.company);
setEmail(response.data.params?.email);
setTel(response.data.params?.tel);
setProfile(response.data.params?.profile);
setProfile(response.data.params.profile ? response.data.params.profile: '');
}
else {
set400Error("失敗しました。");

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

@ -13,12 +13,13 @@ const Profile = (props) => {
const [notice, setNotice] = useState(localStorage.getItem('notice'));
const [image, setImage] = useState('');
const [profile, setProfile] = useState({});
const [profile, setProfile] = useState({company:'', email:'', tel:'', profile:''});
const [loaded, setLoaded] = useState(false);
const [_400error, set400Error] = useState('');
const [_404error, set404Error] = useState('');
const [_422errors, set422Errors] = useState({ image: '' });
const [_success, setSuccess] = useState(props.history.location.state);
const [submit_image, setSubmitImage] = useState(false);
const father_id = document.getElementById('father_id').value;
@ -65,9 +66,11 @@ const Profile = (props) => {
reader.readAsDataURL(_file);
reader.onloadend = () => {
set422Errors({image: ''});
setSubmitImage(true);
axios.put(`/api/fathers/updateImage/${father_id}`, {image: reader.result})
.then(response => {
setNotice(response.data.notice);
setSubmitImage(false);
switch(response.data.status_code){
case 200: {
localStorage.setItem('image_upload_success', response.data.success_messages);
@ -94,7 +97,7 @@ const Profile = (props) => {
<div className="l-content-wrap">
<section className="profile-container">
{
!loaded &&
(!loaded || submit_image) &&
<CircularProgress className="css-loader"/>
}
{
@ -133,7 +136,7 @@ const Profile = (props) => {
<p className="profile-info__icon">
<img src="/assets/img/icon/phone.svg" alt="電話" />
</p>
<p className="txt">{profile.tel}</p>
<p className="txt">{profile?.tel}</p>
</a>
</div>
<div className="profile-info__item">

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

@ -65,6 +65,7 @@ a{
.btn-disabled{
background-color: #eaeff2;
color: #6f7372;
pointer-events: none;
}

1
backend/resources/sass/scss/object/project/_icon.scss vendored
ファイルの表示

@ -186,6 +186,7 @@ categories: [project]
min-width: 52px;
height: 52px;
margin-right: 10px;
pointer-events: none;
&:after{
position: absolute;
top: 50%;