nouffer/FBSAdminTool
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update upload function

Browse Source
This commit is contained in:
Mohamed Nouffer
2021-09-13 12:46:52 +05:30
parent dae426eefa
commit 77cef6d5e9
3 changed files with 114 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
server.js
View File

@ -16,13 +16,42 @@ app.use(bodyParser.json());
app.use(bodyParser.urlencoded({ extended: true }));
app.use(cors(corsOptions));
function callInitFileMover(re) {
function callLoadInitializeData(projectid, construction_id, username, sheetname, filename){
https.get('https://natnats.mobilous.com/loadInitializeData?projectid=23&construction_id=1&username=1&sheetname=dataSheet&filename=ini_データ入力シート.xlsx', (resp) => {
let data = '';
// A chunk of data has been received.
resp.on('data', (chunk) => {
data += chunk;
});
// The whole response has been received. Print out the result.
resp.on('end', () => {
if(data !== 'no match'){
resdata = JSON.parse(data);
console.log(resdata);
}
});
}).on("error", (err) => {
console.log("Error: " + err.message);
});
}
function callInitFileMover(re) {
https.get('https://natnats.mobilous.com/iniFileMover', (resp) => {
let data = '';
// A chunk of data has been received.
resp.on('data', (chunk) => {
//debug
data = "{
"construction_id": 3,
"file_name": "ini_データ入力シート.xlsx",
"file_type": "dataSheet"
}"
data += chunk;
});
@ -55,6 +84,8 @@ var upload = multer({ storage: storage }).single('file')
app.post('/upload', function(req, res, next) {
console.log(req.body.email);
upload(req, res, function(err) {
if (err instanceof multer.MulterError) {
return res.status(500).json(err)

88
src/containers/TheContent.js
View File

@ -28,11 +28,11 @@ const TheContent = () => {
async function fetchSession() {
//setSsoSession('{ "expiration": 468, "client_address": "111.223.144.163", "protocol": "urn:oasis:names:tc:SAML:2.0:protocol", "identity_provider": "https://sso.ts.bizside.biz/idp/shibboleth", "authn_instant": "2021-09-03T08:26:41.248Z", "authncontext_class": "urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport", "attributes": [ { "name": "mail", "values": [ "akira.miyata@mobilous.com" ] } ] }')
const result = await axios('https://fsbsso.sumasen.net/Shibboleth.sso/Session');
if(JSON.stringify(SsoSession) !== JSON.stringify(result.data)) {
setSsoSession(result.data);
}
setSsoSession('{ "expiration": 468, "client_address": "111.223.144.163", "protocol": "urn:oasis:names:tc:SAML:2.0:protocol", "identity_provider": "https://sso.ts.bizside.biz/idp/shibboleth", "authn_instant": "2021-09-03T08:26:41.248Z", "authncontext_class": "urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport", "attributes": [ { "name": "mail", "values": [ "akira.miyata@mobilous.com" ] } ] }')
// const result = await axios('https://fsbsso.sumasen.net/Shibboleth.sso/Session');
// if(JSON.stringify(SsoSession) !== JSON.stringify(result.data)) {
// setSsoSession(result.data);
// }
}
useEffect(() => {
@ -93,47 +93,47 @@ const TheContent = () => {
function get_token_from_storage_or_cookie() {
//return true;
const cookies = new Cookies();
const shib = cookies.get('_shibsession_64656661756c7468747470733a2f2f66736273736f2e73756d6173656e2e6e65742f73686962626f6c657468')
if (shib !== undefined) {
fetchSession().then(() => {
if (SsoSession !== null) {
console.log(shib);
fetchUser().then(() => {
if(UserId === ''){
let id = Math.floor(100000 + Math.random() * 900000)
setUserId(id);
}
const _firstname = UserData.firstname;
const _lastname = UserData.lastname;
const _email = UserData.email;
const _empcode = UserData.employee_code;
// const cookies = new Cookies();
// const shib = cookies.get('_shibsession_64656661756c7468747470733a2f2f66736273736f2e73756d6173656e2e6e65742f73686962626f6c657468')
// if (shib !== undefined) {
// fetchSession().then(() => {
// if (SsoSession !== null) {
// console.log(shib);
// fetchUser().then(() => {
// if(UserId === ''){
// let id = Math.floor(100000 + Math.random() * 900000)
// setUserId(id);
// }
// const _firstname = UserData.firstname;
// const _lastname = UserData.lastname;
// const _email = UserData.email;
// const _empcode = UserData.employee_code;
const json_str = `[
{
"mailadress": "${_email}",
"name": "${_lastname} ${_firstname}",
"jsessionid": ${UserId},
"_idp_session": "",
"_opensaml_key": "_shibsession_64656661756c7468747470733a2f2f66736273736f2e73756d6173656e2e6e65742f73686962626f6c657468",
"_opensaml_value": "${shib}"
}
]`;
// const json_str = `[
// {
// "mailadress": "${_email}",
// "name": "${_lastname} ${_firstname}",
// "jsessionid": ${UserId},
// "_idp_session": "",
// "_opensaml_key": "_shibsession_64656661756c7468747470733a2f2f66736273736f2e73756d6173656e2e6e65742f73686962626f6c657468",
// "_opensaml_value": "${shib}"
// }
// ]`;
//const json_str = '[{"jsessonid": "' + UserId + '" , "name": "' + _firstname + ' ' +_lastname+ '", "mailadress":" ' + _email + '", "empcode": "' + _empcode + '"}]';
if(_empcode !== null && _empcode !== undefined){
if(isCSVPath()){
postUserData(json_str);
}
}
return true;
});
}
});
} else {
return null;
}
// //const json_str = '[{"jsessonid": "' + UserId + '" , "name": "' + _firstname + ' ' +_lastname+ '", "mailadress":" ' + _email + '", "empcode": "' + _empcode + '"}]';
// if(_empcode !== null && _empcode !== undefined){
// if(isCSVPath()){
// postUserData(json_str);
// }
// }
// return true;
// });
// }
// });
// } else {
// return null;
// }
}
@ -151,7 +151,7 @@ const TheContent = () => {
render = {
props =>
get_token_from_storage_or_cookie() !== null ?
( <route.component {...props} userid={UserId}/>
( <route.component {...props} userid={UserId} email={"test@test.com"}/>
) : ( <Redirect to = {
{ pathname: "/sso" }
}

50
src/views/Uploader/index.js
View File

@ -1,4 +1,4 @@
import React, { useState } from 'react';
import React, { useState, useEffect } from 'react';
import axios from 'axios';
import {
CCol,
@ -15,7 +15,7 @@ import {
import CIcon from '@coreui/icons-react'
function Uploader() {
function Uploader(props) {
const [file, setFile] = useState(null);
@ -26,6 +26,7 @@ function Uploader() {
function onClickHandler(e) {
const data = new FormData()
data.append('file', file);
data.append('email', props.email);
const chk = file.name.trim();
const collator = new Intl.Collator('ja');
const order1 = collator.compare('ini_工程内検査票.xlsx', chk);
@ -50,38 +51,27 @@ function Uploader() {
}
return ( <
div >
<
CCard >
<
CCardHeader >
アップロード <
/CCardHeader> <
CCardBody >
<
CFormGroup row >
<
CCol md = "3" >
<
CLabel htmlFor = "date-input" > アップロードするファイルを選んでください < /CLabel> < /
CCol > <
CCol xs = "12"
md = "9" >
<
CInputFile type = "file"
onChange = { onChangeHandler }
id = "file-input"
name = "file-input" / >
<
/CCol> < /
CFormGroup >
return (
<div>
<CCard >
<CCardHeader>
アップロード
</CCardHeader>
<CCardBody >
<CFormGroup row>
<CCol md = "3">
<CLabel htmlFor = "date-input" > アップロードするファイルを選んでください < /CLabel>
</CCol >
<CCol xs = "12"md = "9" >
<CInputFile type = "file"onChange = { onChangeHandler } id = "file-input" name = "file-input" / >
</CCol>
</CFormGroup >
<CCardFooter >
<CButton type = "submit"
onClick = { onClickHandler }
size = "sm"
color = "primary" > < CIcon name = "cil-scrubber" / > アップロード < /CButton> < /
CCardFooter>
color = "primary" > < CIcon name = "cil-scrubber" / > アップロード </CButton>
</CCardFooter>
</CCardBody>
</CCard>
</div>