From 28424ff48f6f7de5feb1a47b298e8133b99ec3ae Mon Sep 17 00:00:00 2001
From: sanjayk03-dev <imsanjay003@gmail.com>
Date: Mon, 25 Mar 2024 11:31:05 +0530
Subject: [PATCH] changed current time to line

---
 src/js/control-view.js             |  1 +
 src/pug/templates/control-view.pug | 17 ++++++++++-------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/js/control-view.js b/src/js/control-view.js
index b9d8e97..19a7f08 100644
--- a/src/js/control-view.js
+++ b/src/js/control-view.js
@@ -546,6 +546,7 @@ module.exports = {
         }
         try {
           this.load();
+          console.log("selected", this.state.selected);
           if (this.config.macros[id].alert == true) {
             this.macrosLoading = true;
           } else {
diff --git a/src/pug/templates/control-view.pug b/src/pug/templates/control-view.pug
index 0aa0148..4352154 100644
--- a/src/pug/templates/control-view.pug
+++ b/src/pug/templates/control-view.pug
@@ -19,9 +19,9 @@ script#control-view-template(type="text/x-template")
           button.pure-button(@click="showNoGcodeMessage=false") OK
 
     message(:show.sync="macrosLoading")
-        h3(slot="header") Run Macros?
+        h3(slot="header") Run Macro?
         div(slot="body")
-            p The selected macros is being loaded.
+            p The selected macro is being loaded.
             
         div(slot="footer")
           button.pure-button(@click="macrosLoading=false") Cancel
@@ -204,20 +204,23 @@ script#control-view-template(type="text/x-template")
 
               td
                 table.info
-                  tr
-                    th Current Time
-                    td
-                      span {{current_time}}
-
                   tr
                     th Remaining
                     td(title="Total run time (days:hours:mins:secs)").
                       #[span(v-if="plan_time_remaining") {{plan_time_remaining | time}} of]
                       {{toolpath.time | time}}
+
                   tr
                     th ETA
                     td.eta {{eta}}
 
+                   tr
+                    th Line
+                    td
+                      | {{0 <= state.line ? state.line : 0 | number}}
+                      span(v-if="toolpath.lines")
+                        | &nbsp;of {{toolpath.lines | number}}
+                        
                   tr
                     th Progress
                     td.progress