Skip to content

Commit

Permalink
fix(client): fix current operations sorting
Browse files Browse the repository at this point in the history 
Current operations file was been loaded with the events manager, this is loaded before the DOM

Closes: #1218
  • Loading branch information
@NotExpectedYet
NotExpectedYet committed Oct 1, 2022
1 parent ef022a0 commit 4ee3517
Show file tree
Hide file tree
Showing 3 changed files with 133 additions and 129 deletions.
131 changes: 131 additions & 0 deletions client/js/pages/monitoring/monitoring-view.state.js
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
// Store the current active view type like camera, panel, location map or list
import OctoFarmClient from "../../services/octofarm-client.service";

let currentViewType = "none";
const viewTypes = [
"panel",
Expand Down Expand Up @@ -45,3 +47,132 @@ export function getPrinterInfo() {
export function getControlList() {
return printerControlList;
}


const currentOperationsSorting = document.getElementById(
"currentOperationsChangeSortOrder"
);
console.log(currentOperationsSorting)
if (currentOperationsSorting) {
OctoFarmClient.getCurrentOpState()
.then((res) => {
// Apply state
const { currentIterie, currentOrder } = res;
console.log("HLLO")
if (currentIterie === "progress" && currentOrder === "desc") {
currentOperationsSorting.innerHTML =
document.getElementById("ci-progress-down").innerHTML;
}
if (currentIterie === "progress" && currentOrder === "asc") {
currentOperationsSorting.innerHTML =
document.getElementById("ci-progress-up").innerHTML;
}
if (currentIterie === "timeRemaining" && currentOrder === "desc") {
currentOperationsSorting.innerHTML =
document.getElementById("ci-time-down").innerHTML;
}
if (currentIterie === "timeRemaining" && currentOrder === "asc") {
currentOperationsSorting.innerHTML =
document.getElementById("ci-time-up").innerHTML;
}
if (currentIterie === "fileName" && currentOrder === "desc") {
currentOperationsSorting.innerHTML =
document.getElementById("ci-file-down").innerHTML;
}
if (currentIterie === "fileName" && currentOrder === "asc") {
currentOperationsSorting.innerHTML =
document.getElementById("ci-file-up").innerHTML;
}
if (currentIterie === "sortIndex" && currentOrder === "desc") {
currentOperationsSorting.innerHTML =
document.getElementById("ci-index-down").innerHTML;
}
if (currentIterie === "sortIndex" && currentOrder === "asc") {
currentOperationsSorting.innerHTML =
document.getElementById("ci-index-up").innerHTML;
}
document
.getElementById("ci-progress-up")
.addEventListener("click", async () => {
currentOperationsSorting.innerHTML =
document.getElementById("ci-progress-up").innerHTML;
await OctoFarmClient.updateCurrentOpState({
iterie: "progress",
order: "asc",
});
});
document
.getElementById("ci-progress-down")
.addEventListener("click", async () => {
currentOperationsSorting.innerHTML =
document.getElementById("ci-progress-down").innerHTML;
await OctoFarmClient.updateCurrentOpState({
iterie: "progress",
order: "desc",
});
});
document
.getElementById("ci-time-up")
.addEventListener("click", async () => {
currentOperationsSorting.innerHTML =
document.getElementById("ci-time-up").innerHTML;
await OctoFarmClient.updateCurrentOpState({
iterie: "timeRemaining",
order: "asc",
});
});
document
.getElementById("ci-time-down")
.addEventListener("click", async () => {
currentOperationsSorting.innerHTML =
document.getElementById("ci-time-down").innerHTML;
await OctoFarmClient.updateCurrentOpState({
iterie: "timeRemaining",
order: "desc",
});
});
document
.getElementById("ci-file-up")
.addEventListener("click", async () => {
currentOperationsSorting.innerHTML =
document.getElementById("ci-file-up").innerHTML;
await OctoFarmClient.updateCurrentOpState({
iterie: "fileName",
order: "asc",
});
});
document
.getElementById("ci-file-down")
.addEventListener("click", async () => {
currentOperationsSorting.innerHTML =
document.getElementById("ci-file-down").innerHTML;
await OctoFarmClient.updateCurrentOpState({
iterie: "fileName",
order: "desc",
});
});
document
.getElementById("ci-index-up")
.addEventListener("click", async () => {
currentOperationsSorting.innerHTML =
document.getElementById("ci-index-up").innerHTML;
await OctoFarmClient.updateCurrentOpState({
iterie: "sortIndex",
order: "asc",
});
});
document
.getElementById("ci-index-down")
.addEventListener("click", async () => {
currentOperationsSorting.innerHTML =
document.getElementById("ci-index-down").innerHTML;
await OctoFarmClient.updateCurrentOpState({
iterie: "sortIndex",
order: "desc",
});
});
})
.catch((e) => {
console.error("Current Operations error!", e.toString())
});
}
129 changes: 1 addition & 128 deletions client/js/services/current-operations-panel.service.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,136 +10,9 @@ const rePrint = async function (id) {
const printer = await OctoFarmClient.getPrinter(id);
await OctoPrintClient.file(printer, printer.currentJob.filePath, "print");
};
const currentOperationsSorting = document.getElementById(
"currentOperationsSort"
);

const currentOperationsPage = window.location.pathname === "/mon/currentOp"


if (currentOperationsSorting) {
OctoFarmClient.getCurrentOpState()
.then((res) => {
// Apply state
const { currentIterie, currentOrder } = res;
if (currentIterie === "progress" && currentOrder === "desc") {
currentOperationsSorting.innerHTML =
document.getElementById("ci-progress-down").innerHTML;
}
if (currentIterie === "progress" && currentOrder === "asc") {
currentOperationsSorting.innerHTML =
document.getElementById("ci-progress-up").innerHTML;
}
if (currentIterie === "timeRemaining" && currentOrder === "desc") {
currentOperationsSorting.innerHTML =
document.getElementById("ci-time-down").innerHTML;
}
if (currentIterie === "timeRemaining" && currentOrder === "asc") {
currentOperationsSorting.innerHTML =
document.getElementById("ci-time-up").innerHTML;
}
if (currentIterie === "fileName" && currentOrder === "desc") {
currentOperationsSorting.innerHTML =
document.getElementById("ci-file-down").innerHTML;
}
if (currentIterie === "fileName" && currentOrder === "asc") {
currentOperationsSorting.innerHTML =
document.getElementById("ci-file-up").innerHTML;
}
if (currentIterie === "sortIndex" && currentOrder === "desc") {
currentOperationsSorting.innerHTML =
document.getElementById("ci-index-down").innerHTML;
}
if (currentIterie === "sortIndex" && currentOrder === "asc") {
currentOperationsSorting.innerHTML =
document.getElementById("ci-index-up").innerHTML;
}
document
.getElementById("ci-progress-up")
.addEventListener("click", async () => {
currentOperationsSorting.innerHTML =
document.getElementById("ci-progress-up").innerHTML;
await OctoFarmClient.updateCurrentOpState({
iterie: "progress",
order: "asc",
});
});
document
.getElementById("ci-progress-down")
.addEventListener("click", async () => {
currentOperationsSorting.innerHTML =
document.getElementById("ci-progress-down").innerHTML;
await OctoFarmClient.updateCurrentOpState({
iterie: "progress",
order: "desc",
});
});
document
.getElementById("ci-time-up")
.addEventListener("click", async () => {
currentOperationsSorting.innerHTML =
document.getElementById("ci-time-up").innerHTML;
await OctoFarmClient.updateCurrentOpState({
iterie: "timeRemaining",
order: "asc",
});
});
document
.getElementById("ci-time-down")
.addEventListener("click", async () => {
currentOperationsSorting.innerHTML =
document.getElementById("ci-time-down").innerHTML;
await OctoFarmClient.updateCurrentOpState({
iterie: "timeRemaining",
order: "desc",
});
});
document
.getElementById("ci-file-up")
.addEventListener("click", async () => {
currentOperationsSorting.innerHTML =
document.getElementById("ci-file-up").innerHTML;
await OctoFarmClient.updateCurrentOpState({
iterie: "fileName",
order: "asc",
});
});
document
.getElementById("ci-file-down")
.addEventListener("click", async () => {
currentOperationsSorting.innerHTML =
document.getElementById("ci-file-down").innerHTML;
await OctoFarmClient.updateCurrentOpState({
iterie: "fileName",
order: "desc",
});
});
document
.getElementById("ci-index-up")
.addEventListener("click", async () => {
currentOperationsSorting.innerHTML =
document.getElementById("ci-index-up").innerHTML;
await OctoFarmClient.updateCurrentOpState({
iterie: "sortIndex",
order: "asc",
});
});
document
.getElementById("ci-index-down")
.addEventListener("click", async () => {
currentOperationsSorting.innerHTML =
document.getElementById("ci-index-down").innerHTML;
await OctoFarmClient.updateCurrentOpState({
iterie: "sortIndex",
order: "desc",
});
});
})
.catch((e) => {
console.error("Current Operations error!", e.toString())
});
}

export default function currentOperationsPanelService(
currentOperations,
currentOperationsCount
Expand Down Expand Up @@ -332,4 +205,4 @@ export default function currentOperationsPanelService(
});
}

}
}
2 changes: 1 addition & 1 deletion server/templates/partials/currentOperations.ejs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</div>
<div class="col-sm-6 col-md-6 col-lg-6 p-0">
<div class="btn-group float-right ml-1">
<div id="currentOperationsSort" class="badge badge-dark float-right ml-1 p-0 py-1 px-1" disabled >
<div id="currentOperationsChangeSortOrder" class="badge badge-dark float-right ml-1 p-0 py-1 px-1" disabled >
<i class="fas fa-sort-numeric-down"></i> Progress</a>
</div>
<button type="button" class="btn btn-sm btn-dark dropdown-toggle dropdown-toggle-split p-0 py-auto px-2" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" data-offset="-200">
Expand Down

0 comments on commit 4ee3517

Please sign in to comment.