diff --git a/view-mode/function/overlaySCurve.js b/view-mode/function/overlaySCurve.js index bac7636..9b41082 100644 --- a/view-mode/function/overlaySCurve.js +++ b/view-mode/function/overlaySCurve.js @@ -17,12 +17,9 @@ function messageListener(event) { if (event.data && event.data.action === 'sendUrl') { const parentUrl = event.data.url; - // Remove the base URL and hash - const path = parentUrl.replace("https://adw.ospro.id/#/dashboard-project/", ""); - // Split the remaining path by "/" - parts = path.split("/"); - if (parts[2] && parts[2] == "1") { + parts = parentUrl.split("/"); + if (parts[7] && parts[7] == "1") { $.ajax({ headers: { "Content-Type": "application/json", diff --git a/view-mode/function/restActivityLink.js b/view-mode/function/restActivityLink.js index d16c69d..21bc736 100644 --- a/view-mode/function/restActivityLink.js +++ b/view-mode/function/restActivityLink.js @@ -6,11 +6,8 @@ window.addEventListener('message', function(event) { if (event.data && event.data.action === 'sendUrl') { const parentUrl = event.data.url; - // Remove the base URL and hash - const path = parentUrl.replace("https://adw.ospro.id/#/dashboard-project/", ""); - // Split the remaining path by "/" - parts = path.split("/"); + parts = parentUrl.split("/"); } }); gantt.ajax.get({ @@ -39,7 +36,7 @@ gantt.ajax.get({ } } - if(!parts[2]){ + if(!parts[7]){ gantt.silent(function () { gantt.parse(data); earliest = getEarliestTaskDate(); @@ -63,7 +60,7 @@ function refresData(id){ data['data'] = obj.data.data; data['links'] = obj.data.links; // console.log("data parse wrong", data); - if(!parts[2]){ + if(!parts[7]){ gantt.silent(function () { gantt.parse(data); earliest = getEarliestTaskDate();