Merge branch 'rifka' into 'master'

managdoc, tp ro, ro

See merge request !1300

src/api/index.js

@@ -249,6 +249,9 @@ const create = (type = "") => {
   const getRollingOutlookLastUpdate = (body) => api.post('transaction/rolling_outlook/get_latest_update', body)
   const getRollingOutlookRevision = (body) => api.post('transaction/rolling_outlook/get_revision', body)
   const getRollingOutlookIsApprover = (body) => api.get('transaction/rolling_outlook/is_approver')
+  const uploadAttachmentRO = (body) => api.post('transaction/rolling_outlook/upload_attachment', body)
+  const deleteAttachmentRO = (id) => api.post(`transaction/rolling_outlook/delete_attachment/${id}`)
+
   const getRollingOutlookBS = (body) => api.post('transaction/balance_sheet/rolling_outlook/get_report_hierarki', body)
   const checkImportRollingOutlookBS = (body) => api.post('transaction/balance_sheet/rolling_outlook/check_import', body)
   const importRollingOutlookBS = (body) => api.post('transaction/balance_sheet/rolling_outlook/import_rolling_outlook', body)
@@ -736,6 +739,8 @@ const create = (type = "") => {
     getRollingOutlookLastUpdate,
     getRollingOutlookRevision,
     getRollingOutlookIsApprover,
+    uploadAttachmentRO,
+    deleteAttachmentRO,
     checkImportRollingOutlookBS,
     importRollingOutlookBS,
     createRollingOutlookPL,

src/container/DocumentManagement/AllDocument.js

@@ -50,7 +50,7 @@ export default class getAllDocument extends Component {
         }
         this.setState({ loading: true })
         api.create().getAllDocument(payload).then(response => {
-            // console.log(response)
+            console.log(response)
             if (response.data) {
                 if (response.ok) {
                     if (response.data.status == 'success') {
@@ -69,6 +69,7 @@ export default class getAllDocument extends Component {
                                     String(Number(item.document_size) / 1000 + ' KB'),
                                     item.created_by,
                                     item.created_at,
+                                    item.values
                                 ])
                             } else {
                                 if (indexId !== -1) {
@@ -83,6 +84,7 @@ export default class getAllDocument extends Component {
                                         String(Number(item.document_size) / 1000 + ' KB'),
                                         item.created_by,
                                         item.created_at,
+                                        item.values
                                     ])
                                 } 
                             }
@@ -121,17 +123,18 @@ export default class getAllDocument extends Component {
     }
 
     openPopUp = async (index, val, type) =>{
+        console.log(index)
         if (type === 'download') {
             let res = await fetch(
                 `${process.env.REACT_APP_URL_MAIN_BE}/public/document/download_document?documentName=`+this.state.docPath[val]+"&&fileType="+index[6]
             )
             res = await res.blob()
-            // console.log(res)
+            console.log(res)
             if (res.size > 0) {
                 let url = window.URL.createObjectURL(res);
                 let a = document.createElement('a');
                 a.href = url;
-                a.download = index[1];
+                a.download = (String(index[3]).includes(":") ? String(index[3]).replace(":", " (") + ` )` : String(index[3])) +" - "+index[4]+" - "+index[5]+" - "+index[10]+"."+index[6];
                 a.click();
             }
         }
@@ -270,7 +273,14 @@ export default class getAllDocument extends Component {
                     );
                 }
             }
-        }, "File Name", "Description",
+        }, 
+        {
+            name: "File Name",
+            options: {
+                display: false
+            }
+        },
+        "Description",
         {
             name: "Company Name",
             options: {
@@ -289,7 +299,13 @@ export default class getAllDocument extends Component {
                 display: String(this.props.data.value).includes('Manual Book TIA') ? false : true
             }
         },
-        "Type", "File Size", "Created By", "Created Date"
+        "Type", "File Size", "Created By", "Created Date",
+        {
+            name: "Category",
+            options: {
+                display: false
+            }
+        },
         ]
 
         const loadingComponent = (

src/container/RollingOutlook.js

@@ -554,14 +554,14 @@ export default class RollingOutlook extends Component {
     }
 
     uploadAttachment(formData) {
-        // var object = {};
-        // formData.forEach(function (value, key) {
-        //     object[key] = value;
-        // });
-        // var json = JSON.stringify(object);
-        // console.log(object)
-        // console.log(json)
-        api.create().uploadAttachment(formData).then(response => {
+        var object = {};
+        formData.forEach(function (value, key) {
+            object[key] = value;
+        });
+        var json = JSON.stringify(object);
+        console.log(object)
+        console.log(json)
+        api.create().uploadAttachmentRO(formData).then(response => {
             console.log(response)
             if (response.data) {
                 if (response.data.status === "success") {
@@ -574,7 +574,7 @@ export default class RollingOutlook extends Component {
     }
 
     deleteAttachment(item) {
-        api.create().deleteAttachment(item.attachment_id).then(response => {
+        api.create().deleteAttachmentRO(item.attachment_id).then(response => {
             if (response.data) {
                 if (response.data.status === "success") {
                     this.getRollingOutlookID()
@@ -612,6 +612,17 @@ export default class RollingOutlook extends Component {
         let length = name.split(".").length
         let fileType = name.split(".")[length - 1]
         console.log(fileType);
+        // console.log(fileurl);
+        let indexStrip = String(fileurl).indexOf("-")
+        let fileName = String(fileurl).substr(indexStrip + 1, String(fileurl).length)
+        let cobaSplit = String(fileName).split("-")
+        let mapSplit = ""
+        cobaSplit.map((item, index) => {
+            if (item != ""){
+                mapSplit+= index == 0 ? `${titleCase(item)}` : ` ${item}`
+            }
+        })
+        // console.log(mapSplit);
         let url = `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/master_budget/download_attachment?fileName=${fileurl}&&fileType=${fileType}`
         // console.log(url);
         let res = await fetch(
@@ -623,7 +634,7 @@ export default class RollingOutlook extends Component {
             let url = window.URL.createObjectURL(res);
             let a = document.createElement('a');
             a.href = url;
-            a.download = 'Rolling Outlook Attachment.xlsx';
+            a.download = "(Rolling Outlook Attachment) - " +mapSplit;
             a.click();
         }
     }