Compare commits

..

No commits in common. 'cbdc34f0630c69ed6be02dd4caef5835e47ea6c3' and '63bf4c30de5c00aed8fed73a7bae773ace7789ab' have entirely different histories.

  1. 2
      edit-mode/function/ganttConfig.js
  2. 7
      edit-mode/function/ganttSettings.js

2
edit-mode/function/ganttConfig.js

@ -5,7 +5,7 @@ const timestamp = getUrlParameter("timestamp");
let base_url = getUrlParameter("base_url"); let base_url = getUrlParameter("base_url");
const role_name = getUrlParameter("role_name"); const role_name = getUrlParameter("role_name");
const company_name = getUrlParameter("company_name"); const company_name = getUrlParameter("company_name");
const base_url_image = `https://si-api.ospro.id/assets/${company_name}/`; const base_url_image = `https://project-api.ospro.id/assets/${company_name}/`;
const ganttName = getUrlParameter("gantt_name"); const ganttName = getUrlParameter("gantt_name");
// const base_url_image = `http://localhost:8444/generic-ospro-backend/assets/${company_name}/`; // const base_url_image = `http://localhost:8444/generic-ospro-backend/assets/${company_name}/`;
const adwIntegrationUrl = "https://adw-api.ospro.id/api"; const adwIntegrationUrl = "https://adw-api.ospro.id/api";

7
edit-mode/function/ganttSettings.js

@ -196,7 +196,6 @@ async function initGanttSettings() {
$("#scale1").attr('checked', true); $("#scale1").attr('checked', true);
// init to gantt chart view (holidays) // init to gantt chart view (holidays)
B
const result = await axiosInstance const result = await axiosInstance
.get(VERSION_GANTT_EDIT_URL, HEADER) .get(VERSION_GANTT_EDIT_URL, HEADER)
.then(res => res) .then(res => res)
@ -226,7 +225,6 @@ async function initGanttSettings() {
} }
} }
} }
B
function expandTask() { function expandTask() {
gantt.eachTask(function (task) { gantt.eachTask(function (task) {
@ -236,7 +234,6 @@ function expandTask() {
toggleTasks = "Collapse"; toggleTasks = "Collapse";
$("#gantt_toggle_task_btn").prop('title', 'Collapse Activities'); $("#gantt_toggle_task_btn").prop('title', 'Collapse Activities');
$("#gantt_toggle_task_btn").children().removeClass('fa-expand-alt'); $("#gantt_toggle_task_btn").children().removeClass('fa-expand-alt');
B
$("#gantt_toggle_task_btn").children().addClass('fa-compress-alt'); $("#gantt_toggle_task_btn").children().addClass('fa-compress-alt');
gantt.render(); gantt.render();
} }
@ -256,7 +253,6 @@ function toggleCollapseTasks() {
updateProperty({ task_open: false }) updateProperty({ task_open: false })
toggleTasks = "Expand"; toggleTasks = "Expand";
$("#gantt_toggle_task_btn").prop('title', 'Expand Activities'); $("#gantt_toggle_task_btn").prop('title', 'Expand Activities');
B
$("#gantt_toggle_task_btn").children().removeClass('fa-compress-alt'); $("#gantt_toggle_task_btn").children().removeClass('fa-compress-alt');
$("#gantt_toggle_task_btn").children().addClass('fa-expand-alt'); // change icon to expand $("#gantt_toggle_task_btn").children().addClass('fa-expand-alt'); // change icon to expand
} }
@ -266,11 +262,9 @@ function toggleCollapseTasks() {
// Function Show / Hide Columns // Function Show / Hide Columns
B
function getColumnsSelection(node) { function getColumnsSelection(node) {
var selectedColumns = node.querySelectorAll(":checked"); var selectedColumns = node.querySelectorAll(":checked");
var unselectedColumn = node.querySelectorAll('input[type="checkbox"]:not(:checked)'); var unselectedColumn = node.querySelectorAll('input[type="checkbox"]:not(:checked)');
// B
// var allSelected = node.querySelector("#check-all").prop('checked'); // var allSelected = node.querySelector("#check-all").prop('checked');
var checkedColumns = {}; var checkedColumns = {};
selectedColumns.forEach(function (node) { selectedColumns.forEach(function (node) {
@ -515,4 +509,3 @@ async function setSynchronizeAPI() {
} }
gantt.render(); gantt.render();
} }

Loading…
Cancel
Save