an est. time to completion in the progress bar

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fits_web_ql"
-version = "4.1.15"
+version = "4.1.16"
 authors = ["jvo203 <[email protected]>"]
 edition = "2018"
 

htdocs/fitswebql/fitswebql.js

@@ -1,5 +1,5 @@
 function get_js_version() {
-	return "JS2019-04-18.1";
+	return "JS2019-04-24.0";
 }
 
 const wasm_supported = (() => {
@@ -1369,8 +1369,9 @@ function process_progress_event(data, index) {
 		var message = data.message;
 		var running = data.running;
 		var total = data.total;
+		var elapsed = data.elapsed;
 
-		//console.log(data, index) ;
+		//console.log(data, index);
 
 		if (total > 0) {
 			notifications_received[index - 1] = Math.max(running, notifications_received[index - 1]);
@@ -1380,18 +1381,23 @@ function process_progress_event(data, index) {
 			else*/
 			var PROGRESS_VARIABLE = notifications_received[index - 1] / total;
 
-			var progress = Math.round(100 * PROGRESS_VARIABLE);
+			if (PROGRESS_VARIABLE != previous_progress[index - 1]) {
+				previous_progress[index - 1] = PROGRESS_VARIABLE;
 
-			if (progress != previous_progress[index - 1]) {
-				previous_progress[index - 1] = progress;
+				PROGRESS_INFO = " " + numeral(PROGRESS_VARIABLE).format('0.0%');
 
-				PROGRESS_INFO = " " + message + " " + progress + "%";
+				var speed = notifications_received[index - 1] / elapsed;
+				var remaining_time = (total - notifications_received[index - 1]) / speed;//[s]
+
+				//console.log("speed:", speed, "remaining:", remaining_time);
+				if (remaining_time > 1)
+					PROGRESS_INFO += ", " + numeral(remaining_time).format('00:00:00');
 
 				//console.log(PROGRESS_INFO) ;
 
 				d3.select("#progress-bar" + index)
-					.attr("aria-valuenow", progress)
-					.style("width", progress + "%")
+					.attr("aria-valuenow", (100.0 * PROGRESS_VARIABLE))
+					.style("width", (100.0 * PROGRESS_VARIABLE) + "%")
 					.html(PROGRESS_INFO);
 			}
 		}

src/fits.rs

@@ -265,6 +265,7 @@ pub enum Intensity {
 
 #[derive(Debug)]
 pub struct FITS {
+    created: std::time::Instant,
     pub dataset_id: String,
     data_id: String,
     filesize: u64,
@@ -379,6 +380,7 @@ impl FITS {
         };
 
         let fits = FITS {
+            created: std::time::Instant::now(),
             dataset_id: id.clone(),
             data_id: format!("{}_00_00_00", id),
             filesize: 0,
@@ -1894,6 +1896,7 @@ println!("CRITICAL ERROR cannot read from file: {:?}", err);
             notification: String::from(notification),
             total: total,
             running: running,
+            elapsed: std::time::Instant::now().duration_since(self.created),
             dataset_id: self.dataset_id.clone(),
         });
     }

src/main.rs

@@ -2253,8 +2253,8 @@ lazy_static! {
 #[cfg(feature = "jvo")]
 static LOG_DIRECTORY: &'static str = "LOGS";
 
-static SERVER_STRING: &'static str = "FITSWebQL v4.1.15";
-static VERSION_STRING: &'static str = "SV2019-04-19.0";
+static SERVER_STRING: &'static str = "FITSWebQL v4.1.16";
+static VERSION_STRING: &'static str = "SV2019-04-24.0";
 static WASM_STRING: &'static str = "WASM2019-02-08.1";
 
 #[cfg(not(feature = "jvo"))]

src/server.rs

@@ -58,6 +58,7 @@ pub struct WsMessage {
     pub notification: String,
     pub total: i32,
     pub running: i32,
+    pub elapsed: std::time::Duration,
     /// dataset
     pub dataset_id: String,
 }
@@ -323,7 +324,8 @@ impl Handler<WsMessage> for SessionServer {
                         "type" : "progress",
                         "message" : msg.notification,
                         "total" : msg.total,
-                        "running" : msg.running
+                        "running" : msg.running,
+                        "elapsed" : (msg.elapsed.as_millis() as f64) / 1000.0
                     })
                     .to_string();