From 599d1325c2921815bfd0a7a2a2af82239cffb2d7 Mon Sep 17 00:00:00 2001
From: Mohamed Nouffer <mohamednouffer@Mohameds-MacBook-Pro.local>
Date: Fri, 3 Sep 2021 17:53:54 +0530
Subject: [PATCH] update date selection

---
 src/containers/TheContent.js      |  2 +-
 src/views/BoxDisplacemen/index.js | 55 +++++++++++++++++++++----------
 2 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/src/containers/TheContent.js b/src/containers/TheContent.js
index c2122fd..cf6f0ae 100644
--- a/src/containers/TheContent.js
+++ b/src/containers/TheContent.js
@@ -28,7 +28,6 @@ const TheContent = () => {
 
     async function fetchSession() {
 
-        // You can await here
         //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)) {
@@ -93,6 +92,7 @@ const TheContent = () => {
     }
 
     function get_token_from_storage_or_cookie() {
+      //return true;
         const cookies = new Cookies();
         const shib = cookies.get('_shibsession_64656661756c7468747470733a2f2f66736273736f2e73756d6173656e2e6e65742f73686962626f6c657468')
         if (shib !== undefined) {
diff --git a/src/views/BoxDisplacemen/index.js b/src/views/BoxDisplacemen/index.js
index 96a5b54..ff9e6d9 100644
--- a/src/views/BoxDisplacemen/index.js
+++ b/src/views/BoxDisplacemen/index.js
@@ -56,7 +56,7 @@ function Index() {
   useEffect(() => {
     async function fetchData() {
       // You can await here
-      if(selectedcons !== "" && report !== "") {
+      if(selectedcons !== "" && report !== "" && isDate() == true) {
         const result = await axios('https://fsbsso.sumasen.net/getDateToHaveData?construction_id=' + selectedcons + '&sheetname=' + report);
         setValidDates(result.data.record);
       }
@@ -132,10 +132,27 @@ function Index() {
     }
   };
 
-  function isDateEnable() {
+  function isDownload() {
+    if(isDate() === false && report !== '') {
+      return true;
+    }
+    else{
+      if(startDate !== null) {
+        return true;
+      }
+    }
     return false;
   }
 
+  function isDate() {
+    if(report === 'BoxDisplacement' || report === 'MachineControl' || report === 'MachineSheet'){
+      return true;
+    }
+    else {
+      return false;
+    }
+  }
+
   return (
     <CRow>
       <CCol xs="12" sm="12" md="12">
@@ -175,22 +192,24 @@ function Index() {
                     </CSelect>
                   </CCol>
                 </CFormGroup>
+                {isDate() === true ? 
                 <CFormGroup row>
-                  <CCol md="3">
-                    <CLabel htmlFor="select">報告日</CLabel>
-                  </CCol>
-                  <CCol xs="12" md="9">
-                  
-                  <DatePicker
-                    dateFormat="yyyy/MM/dd"
-                    selected={startDate}
-                    onChange={(date) => setStartDate(date)}
-                    filterDate={checkAvilable}
-                    placeholderText='日付を選択'
-                    />
-                  </CCol>
-                </CFormGroup>
-
+                <CCol md="3">
+                  <CLabel htmlFor="select">報告日</CLabel>
+                </CCol>
+                <CCol xs="12" md="9">
+                <DatePicker
+                  dateFormat="yyyy/MM/dd"
+                  selected={startDate}
+                  onChange={(date) => setStartDate(date)}
+                  filterDate={checkAvilable}
+                  placeholderText='日付を選択'
+                  />
+                </CCol>
+              </CFormGroup>
+              :
+              <div></div>
+                }
 
   {report == 'MachineControl' ?
     <CFormGroup variant="checkbox" className="checkbox">
@@ -209,7 +228,7 @@ function Index() {
               </CForm>
             </CCardBody>
             <CCardFooter>
-            {startDate != null ?
+            {isDownload() === true ?
             <CButton type="submit" size="sm" color="primary"  onClick={doGetReport}><CIcon name="cil-scrubber" /> ダウンロード</CButton>
             :
               <CButton disabled type="submit" size="sm" color="primary"  onClick={doGetReport}><CIcon name="cil-scrubber" /> ダウンロード</CButton>