Use new interface for loading batch data in batch details window

config/Reports/dailyproductiondetail.xml

@@ -58,7 +58,7 @@
 				output.writeTextElement("h1", TTR("dailyproduction", "Daily Production Report: ") + dateString);
 				output.writeTextElement("h2", TTR("dailyproduction", "Batches Roasted"));
 				var query = new QSqlQuery();
-				var q = "SELECT time, machine, (SELECT name FROM machine WHERE id = machine), (SELECT name FROM items WHERE id = roasted_id), unroasted_id, unroasted_quantity, unroasted_total_quantity, roasted_id, roasted_quantity, annotation, duration, files, (SELECT loss FROM roasting_specification WHERE item = roasted_id AND time = (SELECT max(time) FROM roasting_specification WHERE time <= roasting_log.time AND item = roasted_id)), (SELECT tolerance FROM roasting_specification WHERE item = roasted_id AND time = (SELECT max(time) FROM roasting_specification WHERE time <= roasting_log.time AND item = roasted_id)), (SELECT notes FROM roasting_specification WHERE item = roasted_id AND time = (SELECT max(time) FROM roasting_specification WHERE time <= roasting_log.time AND item = roasted_id)), approval FROM roasting_log WHERE time > '" + dateString + "' AND time < ('" + dateString + "'::date + integer '1') ORDER BY time";
+				var q = "SELECT time, machine, (SELECT name FROM machine WHERE id = machine), (SELECT name FROM items WHERE id = roasted_id), unroasted_id, unroasted_quantity, unroasted_total_quantity, roasted_id, roasted_quantity, annotation, duration, files, (SELECT loss FROM roasting_specification WHERE item = roasted_id AND time = (SELECT max(time) FROM roasting_specification WHERE time <= roasting_log.time AND item = roasted_id)), (SELECT tolerance FROM roasting_specification WHERE item = roasted_id AND time = (SELECT max(time) FROM roasting_specification WHERE time <= roasting_log.time AND item = roasted_id)), (SELECT notes FROM roasting_specification WHERE item = roasted_id AND time = (SELECT max(time) FROM roasting_specification WHERE time <= roasting_log.time AND item = roasted_id)), approval, machine || '@' || time AS link FROM roasting_log WHERE time > '" + dateString + "' AND time < ('" + dateString + "'::date + integer '1') ORDER BY time";
 				query.exec(q);
 				var times = new Array();
 				var machines = new Array();
@@ -106,7 +106,7 @@
 					output.writeTextElement("td", query.value(2));
 					output.writeStartElement("td");
 					output.writeStartElement("a");
-					output.writeAttribute("href", "typica://script/p" + query.value(11).slice(1,-1));
+					output.writeAttribute("href", "typica://script/b/" + query.value(16));
 					output.writeCDATA(query.value(11));
 					output.writeEndElement();
 					output.writeEndElement();
@@ -475,21 +475,10 @@
             });
 			
 			view.scriptLinkClicked.connect(function(url) {
-				var arg = url.slice(1, url.length);
-				var details = createWindow("batchDetails");
-				var fakeTable = new Object;
-				fakeTable.holding = new Array(7);
-				fakeTable.data = function(r, c) {
-					return this.holding[c];
-				};
-				var query = new QSqlQuery();
-				query.exec("SELECT time, machine, (SELECT name FROM items WHERE id = roasted_id) AS name, unroasted_total_quantity AS green, roasted_quantity AS roasted, ((unroasted_total_quantity - roasted_quantity) / unroasted_total_quantity * 100::numeric)::numeric(12,2) AS weight_loss, duration, annotation FROM roasting_log WHERE files = '{" + arg + "}'");
-				query.next();
-				for(var i = 0; i < 8; i++) {
-					fakeTable.holding[i] = query.value(i);
-				}
-				query = query.invalidate();
-				details.loadData(fakeTable, 0);
+                var arg = decodeURI(url.slice(2, url.length));
+                var key = arg.split("@");
+                var details = createWindow("batchDetails");
+                details.loadBatch(key[0], key[1]);
 			});
 		]]>
 	</program>

config/Reports/itemtransactions.xml

@@ -224,7 +224,7 @@
                     }, 0));
                     output.writeEndElement();
                     output.writeEndElement();
-                    query.prepare("SELECT time::date, type, quantity / :c1, balance / :c2, (SELECT files FROM roasting_log WHERE roasting_log.time = item_history.time AND item = ANY(unroasted_id)), (SELECT invoice_id FROM invoice_items WHERE item = item_id AND item_history.type = 'PURCHASE'), (SELECT vendor || ' ' || invoice FROM invoices WHERE id = (SELECT invoice_id FROM invoice_items WHERE item = item_id AND item_history.type = 'PURCHASE')), (SELECT name FROM items WHERE id = (SELECT roasted_id FROM roasting_log WHERE roasting_log.time = item_history.time AND item = ANY(unroasted_id))), customer, reason, (SELECT person FROM transactions WHERE time = item_history.time AND item = item_history.item) FROM item_history(:item) WHERE time >= :sd AND time < :ed ::date + interval '1 day'");
+                    query.prepare("SELECT time::date, type, quantity / :c1, balance / :c2, (SELECT files FROM roasting_log WHERE roasting_log.time = item_history.time AND item = ANY(unroasted_id)), (SELECT invoice_id FROM invoice_items WHERE item = item_id AND item_history.type = 'PURCHASE'), (SELECT vendor || ' ' || invoice FROM invoices WHERE id = (SELECT invoice_id FROM invoice_items WHERE item = item_id AND item_history.type = 'PURCHASE')), (SELECT name FROM items WHERE id = (SELECT roasted_id FROM roasting_log WHERE roasting_log.time = item_history.time AND item = ANY(unroasted_id))), customer, reason, (SELECT person FROM transactions WHERE time = item_history.time AND item = item_history.item), (SELECT machine || '@' || time FROM roasting_log WHERE roasting_log.time = item_history.time AND item = ANY(unroasted_id)) AS link FROM item_history(:item) WHERE time >= :sd AND time < :ed ::date + interval '1 day'");
                     query.bind(":sd", startDate);
                     query.bind(":ed", endDate);
                     switch(unitBox.currentIndex)
@@ -289,7 +289,7 @@
                         } else if(query.value(1) == "USE") {
                             output.writeStartElement("td");
                             output.writeStartElement("a");
-                            output.writeAttribute("href", "typica://script/p" + query.value(4).slice(1,-1));
+                            output.writeAttribute("href", "typica://script/b/" + query.value(11));
                             output.writeCDATA(query.value(7) + " " + query.value(4));
                             output.writeEndElement();
                             output.writeEndElement();
@@ -345,21 +345,10 @@
             };
             /* Open batch data */
             var openProfile = function(url) {
-                var arg = url.slice(1, url.length);
+                var arg = decodeURI(url.slice(2, url.length));
+                var key = arg.split("@");
                 var details = createWindow("batchDetails");
-                var fakeTable = new Object;
-                fakeTable.holding = new Array(7);
-                fakeTable.data = function(r, c) {
-                    return this.holding[c];
-                };
-                var query = new QSqlQuery();
-                query.exec("SELECT time, machine, (SELECT name FROM items WHERE id = roasted_id) AS name, unroasted_total_quantity AS green, roasted_quantity AS roasted, ((unroasted_total_quantity - roasted_quantity) / unroasted_total_quantity * 100::numeric)::numeric(12,2) AS weight_loss, duration, annotation FROM roasting_log WHERE files = '{" + arg + "}'");
-                query.next();
-                for(var i = 0; i < 8; i++) {
-                    fakeTable.holding[i] = query.value(i);
-                }
-                query = query.invalidate();
-                details.loadData(fakeTable, 0);
+                details.loadBatch(key[0], key[1]);
             };
             view.scriptLinkClicked.connect(function(url) {
                 var linkType = url[0];
@@ -367,7 +356,7 @@
                     case 'i':
                         openInvoice(url);
                         break;
-                    case 'p':
+                    case 'b':
                         openProfile(url);
                         break;
                 }