Skip to content

fix(time log diagram): made time log diagram responsive #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 66 additions & 15 deletions script.js
Original file line number Diff line number Diff line change
Expand Up @@ -576,16 +576,13 @@ function toggleTimeLogArrowColor(timeLog, color) {

function nextTimeLog(timeLog) {
let timeLogTableDiv = document.getElementById("time-log-table-div");
timeLogTableDiv.innerHTML = '';

let arrowHTML = `
<p id = "remain-ready" class = "arrow">&rarr;</p>
<p id = "ready-running" class = "arrow">&#10554;</p>
<p id = "running-ready" class = "arrow">&#10554;</p>
<p id = "running-terminate" class = "arrow">&rarr;</p>
<p id = "running-block" class = "arrow">&rarr;</p>
<p id = "block-ready" class = "arrow">&rarr;</p>
`;
timeLogTableDiv.innerHTML = arrowHTML;
let remainReady = `<p id = "remain-ready" class = "arrow">&rarr;</p>`
let readyRunning = `<div><p id = "running-ready" class = "arrow">&#10554;</p><p id = "ready-running" class = "arrow">&#10554;</p></div>`
let runningTerminate = `<p id = "running-terminate" class = "arrow">&rarr;</p>`
let runningBlock = `<p id = "running-block" class = "arrow">&rarr;</p>`
let blockReady = `<p id = "block-ready" class = "arrow">&rarr;</p>`

let remainTable = document.createElement("table");
remainTable.id = "remain-table";
Expand All @@ -600,7 +597,6 @@ function nextTimeLog(timeLog) {
let remainTableValue = remainTableBodyRow.insertCell(0);
remainTableValue.innerHTML = 'P' + (timeLog.remain[i] + 1);
}
timeLogTableDiv.appendChild(remainTable);

let readyTable = document.createElement("table");
readyTable.id = "ready-table";
Expand All @@ -615,7 +611,6 @@ function nextTimeLog(timeLog) {
let readyTableValue = readyTableBodyRow.insertCell(0);
readyTableValue.innerHTML = 'P' + (timeLog.ready[i] + 1);
}
timeLogTableDiv.appendChild(readyTable);

let runningTable = document.createElement("table");
runningTable.id = "running-table";
Expand All @@ -630,7 +625,6 @@ function nextTimeLog(timeLog) {
let runningTableValue = runningTableBodyRow.insertCell(0);
runningTableValue.innerHTML = 'P' + (timeLog.running[i] + 1);
}
timeLogTableDiv.appendChild(runningTable);

let blockTable = document.createElement("table");
blockTable.id = "block-table";
Expand All @@ -645,7 +639,6 @@ function nextTimeLog(timeLog) {
let blockTableValue = blockTableBodyRow.insertCell(0);
blockTableValue.innerHTML = 'P' + (timeLog.block[i] + 1);
}
timeLogTableDiv.appendChild(blockTable);

let terminateTable = document.createElement("table");
terminateTable.id = "terminate-table";
Expand All @@ -660,15 +653,73 @@ function nextTimeLog(timeLog) {
let terminateTableValue = terminateTableBodyRow.insertCell(0);
terminateTableValue.innerHTML = 'P' + (timeLog.terminate[i] + 1);
}
timeLogTableDiv.appendChild(terminateTable);

const timeLogSkeletonTableConfig = [
[
{type: "blank", content: ''},
{type: "blank", content: ''},
{type: "blank", content: ''},
{type: "element", content: terminateTable},
{type: "blank", content: ''},
{type: "blank", content: ''},
{type: "blank", content: ''},
],
[
{type: "blank", content: ''},
{type: "blank", content: ''},
{type: "html", content: runningBlock, className: 'southwest-arrow'},
{type: "blank", content: ''},
{type: "html", content: blockReady, className: 'northwest-arrow'},
{type: "blank", content: ''},
{type: "blank", content: ''},
],
[
{type: "element", content: blockTable},
{type: "html", content: runningTerminate},
{type: "element", content: runningTable},
{type: "html", content: readyRunning},
{type: "element", content: readyTable},
{type: "html", content: remainReady},
{type: "element", content: remainTable},
],
];

let timeLogSkeletonTable = document.createElement("table");
timeLogSkeletonTable.id = "diagram-skeleton";

timeLogSkeletonTableConfig.forEach((row) => {
let skeletonTableRow = timeLogSkeletonTable.insertRow(0);
(row || [])?.forEach(({type = 'blank', content = '', className = ''}) => {
let skeletonTableCell = skeletonTableRow.insertCell(0);
let skeletonTableCellDiv = document.createElement("div");

skeletonTableCellDiv.className = `diagram-cell ${className && className}`

skeletonTableCell.appendChild(skeletonTableCellDiv);
switch(type){
case 'element':
skeletonTableCellDiv.appendChild(content);
break;
case 'html':
skeletonTableCellDiv.innerHTML = content;
break;
default: {
skeletonTableCellDiv.innerHTML = '';
}

}
})
})
timeLogTableDiv.appendChild(timeLogSkeletonTable);

document.getElementById("time-log-time").innerHTML = "Time : " + timeLog.time;
}

function showTimeLog(output, outputDiv) {
reduceTimeLog(output.timeLog);
let timeLogDiv = document.createElement("div");
timeLogDiv.id = "time-log-div";
timeLogDiv.style.height = (15 * process) + 300 + "px";
timeLogDiv.style.height = (20 * process) + 300 + "px";
let startTimeLogButton = document.createElement("button");
startTimeLogButton.id = "start-time-log";
startTimeLogButton.innerHTML = "Start Time Log";
Expand Down
79 changes: 28 additions & 51 deletions style.css
Original file line number Diff line number Diff line change
Expand Up @@ -112,73 +112,50 @@ thead {
font-weight: bold;
}

#time-log-table-div {
margin-top: 10vh;
position: relative;
}

.time-log-table {
width: 10%;
position: absolute;
}

#remain-table {
left: 7.5%;
}

#ready-table {
left: 32.5%;
}

#running-table {
right: 32.5%;
}

#block-table {
left: 45%;
top: 8vw;
}

#terminate-table {
right: 7.5%;
}

.arrow {
position: absolute;
font-size: 100px;
}

#remain-ready {
left: 20.5%;
top: -62px;
font-size: 70px;
}

#ready-running {
transform: rotate(180deg);
left: 47%;
top: -15px;
font-size: 80px;

}

#running-ready {
left: 47%;
top: -60px;
font-size: 80px;
}

#running-terminate {
right: 20.5%;
top: -62px;
height: 30px;
}

#running-block {
transform: rotate(135deg);
left: 52%;
top: 20px;
font-size: 60px;
}

#block-ready {
font-size: 60px;
transform: rotate(225deg);
left: 40%;
top: 20px;
}

#diagram-skeleton {
width: 100%;
border: 0;
}

#diagram-skeleton td {
border: 0;
}

.diagram-cell{
border: 0;
display: flex;
justify-content: center;
align-items: center;
}
.northwest-arrow{
justify-content: flex-end;
}

.southwest-arrow{
justify-content: flex-start;
}