From d47e5c1167d28e81a45fb1a23878c8e3b7c28554 Mon Sep 17 00:00:00 2001 From: Ziad-I <68874104+Ziad-I@users.noreply.github.com> Date: Thu, 8 Aug 2024 17:41:36 +0300 Subject: [PATCH] move outdated gantt warning into connected list --- .../bim/data/webui/static/css/gantt.css | 6 ++-- .../bonsai/bim/data/webui/static/js/gantt.js | 33 +++++++++++++------ 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/src/bonsai/bonsai/bim/data/webui/static/css/gantt.css b/src/bonsai/bonsai/bim/data/webui/static/css/gantt.css index d2ab12f6b0..5f4e8b01c5 100644 --- a/src/bonsai/bonsai/bim/data/webui/static/css/gantt.css +++ b/src/bonsai/bonsai/bim/data/webui/static/css/gantt.css @@ -119,11 +119,9 @@ nav ul li a.active { color: var(--blender-selected-object, var(--nav-link-hover-color)); } -.warning { +.warning, +.warning-icon { color: var(--blender-info-warning, var(--warning-color)); - margin-bottom: var(--margin-small); - padding: var(--padding-tiny); - display: none; } .table-description { diff --git a/src/bonsai/bonsai/bim/data/webui/static/js/gantt.js b/src/bonsai/bonsai/bim/data/webui/static/js/gantt.js index 2ce617fc24..9c81bf4791 100644 --- a/src/bonsai/bonsai/bim/data/webui/static/js/gantt.js +++ b/src/bonsai/bonsai/bim/data/webui/static/js/gantt.js @@ -1,5 +1,5 @@ // keeps track of blenders connected in form of -// shown:bool, workSchedule: {}, ganttTasks: {}, +// shown:bool, workSchedule: {}, ganttTasks: {}, warning: bool const connectedClients = {}; let socket; @@ -135,12 +135,14 @@ function handleGanttData(data) { ifc_file: filename, ganttTasks: ganttTasks, workSchedule: ganttWorkSched, + warning: false, }; addGanttElement(blenderId, ganttTasks, ganttWorkSched, filename); } else { updateGanttElement(blenderId, ganttTasks, ganttWorkSched, filename); connectedClients[blenderId].workSchedule = ganttWorkSched; connectedClients[blenderId].ganttTasks = ganttTasks; + connectedClients[blenderId].warning = false; } } else { connectedClients[blenderId] = { @@ -148,6 +150,7 @@ function handleGanttData(data) { ifc_file: filename, ganttTasks: ganttTasks, workSchedule: ganttWorkSched, + warning: false, }; addGanttElement(blenderId, ganttTasks, ganttWorkSched, filename); } @@ -172,13 +175,6 @@ function addGanttElement(blenderId, tasks, workSched, filename) { .addClass("no-print") .css("margin-bottom", "10px"); - const warning = $("
") - .attr("id", "warning-" + blenderId) - .html( - "⚠ Warning: This Gantt Chart may contain outdated data due to recent changes in Blender." - ) - .addClass("warning no-print"); - const workSchedDiv = $("").attr("id", "workSched" + blenderId); const scheduleTable = $("