Update INSERTs and trigger functions to propagate Typica users

config/Windows/greeninventory.xml

@@ -65,8 +65,8 @@
             button.clicked.connect(function() {
                 q = "INSERT INTO ";
                 q += (types.currentIndex == 0 ?
-                    "inventory (time, item, quantity)" :
-                    "loss (time, item, quantity, reason)");
+                    "inventory (time, item, quantity, person)" :
+                    "loss (time, item, quantity, reason, person)");
                 q += " VALUES ('now', ";
                 q = q + items.currentData();
                 q = q + ", ";
@@ -82,10 +82,12 @@
                     q = q + ")";
                 }
                 q += (types.currentIndex == 0 ?
-                    ")" :
-                    ", '" + reason.text + "')");
+                    ", :user)" :
+                    ", '" + reason.text + "', :user)");
                 query = new QSqlQuery();
-                query.exec(q);
+                query.prepare(q);
+				query.bind(":user", Application.currentTypicaUser());
+				query.exec();
                 updateStatus();
             });
             items['currentIndexChanged(int)'].connect(updateStatus);

config/Windows/greensales.xml

@@ -53,7 +53,7 @@
 			var submit = findChildObject(this, 'submit');
 			submit.clicked.connect(function() {
 				var query = new QSqlQuery();
-				query.prepare("INSERT INTO sale (time, item, quantity, customer) VALUES(:time, :item, :quantity, :customer)");
+				query.prepare("INSERT INTO sale (time, item, quantity, customer, person) VALUES(:time, :item, :quantity, :customer, :user)");
 				query.bind(":time", dateField.text);
 				if(customerField.text == "") {
 					query.bind(":customer", null);
@@ -62,6 +62,7 @@
 					query.bind(":customer", customerField.text);
 				}
 				var coffeesArray = sqlToArray(items.columnArray(0, 32));
+				query.bind(":user", Application.currentTypicaUser());
 				if(coffeesArray.length > 0)
 				{
 					for(var i = 0; i < coffeesArray.length; i++)

config/Windows/manuallogentry.xml

@@ -405,7 +405,7 @@
 				query.exec();
 				query.next();
 				var roastedId = query.value(0);
-				query.prepare("INSERT INTO roasting_log (time, unroasted_id, unroasted_quantity, unroasted_total_quantity, roasted_id, roasted_quantity, transaction_type, annotation, machine, duration, approval, humidity, barometric, indoor_air, outdoor_air, files) VALUES (:time, :unroastedids, :greens, :green, :roastedid, :roasted, 'SAMPLEROAST', :note, :machine, :duration, TRUE, NULL, NULL, NULL, NULL, :files)");
+				query.prepare("INSERT INTO roasting_log (time, unroasted_id, unroasted_quantity, unroasted_total_quantity, roasted_id, roasted_quantity, transaction_type, annotation, machine, duration, approval, humidity, barometric, indoor_air, outdoor_air, files, person) VALUES (:time, :unroastedids, :greens, :green, :roastedid, :roasted, 'SAMPLEROAST', :note, :machine, :duration, TRUE, NULL, NULL, NULL, NULL, :files, :user)");
 				query.bind(":time", roastTime.text);
 				query.bind(":unroastedids", "{" + greenId + "}");
 				query.bind(":greens", "{" + convertToPounds(parseFloat(sampleGreenWeight.text), sampleGreenUnit.currentText) + "}");
@@ -416,9 +416,10 @@
 				query.bind(":machine", Number(selectedRoasterID));
 				query.bind(":duration", roastDuration.text);
 				query.bind(":files", "{" + fileID + "}");
+				query.bind(":user", Application.currentTypicaUser());
 				query.exec();
 			} else {
-				var q = "INSERT INTO roasting_log (time, unroasted_id, unroasted_quantity, unroasted_total_quantity, roasted_id, roasted_quantity, transaction_type, annotation, machine, duration, approval, humidity, barometric, indoor_air, outdoor_air, files) VALUES (:time, ";
+				var q = "INSERT INTO roasting_log (time, unroasted_id, unroasted_quantity, unroasted_total_quantity, roasted_id, roasted_quantity, transaction_type, annotation, machine, duration, approval, humidity, barometric, indoor_air, outdoor_air, files, person) VALUES (:time, ";
 				q += productionGreenTable.columnArray(0, 32);
 				q += ", ";
 				for(var i = 0; i < productionGreenTable.data(i, 1, 0).value != ""; i++) {
@@ -433,11 +434,12 @@
 				q += selectedRoasterID;
 				q += ", :duration, TRUE, NULL, NULL, NULL, NULL, '{";
 				q += fileID;
-				q += "}')";
+				q += "}', :user)";
 				query.prepare(q);
 				query.bind(":time", roastTime.text);
 				query.bind(":annotation", notes.plainText);
 				query.bind(":duration", roastDuration.text);
+				query.bind(":user", Application.currentTypicaUser());
 				query.exec();
 			}
 			query = query.invalidate();

config/Windows/navigation.xml

@@ -285,9 +285,7 @@
 		/* Update trigger functions to make column names explicit */
 		var DBUpdateTriggers = function() {
 			var query = new QSqlQuery;
-			query.exec("CREATE OR REPLACE FUNCTION log_make() RETURNS trigger AS $$ BEGIN IF NEW.roasted_quantity IS NOT NULL THEN INSERT INTO make (time, item, quantity) VALUES(NEW.time, NEW.roasted_id, NEW.roasted_quantity); END IF; RETURN NEW; END; $$ LANGUAGE plpgsql");
 			query.exec("CREATE OR REPLACE FUNCTION log_make_update() RETURNS trigger AS $$ BEGIN IF NEW.roasted_quantity <> OLD.roasted_quantity AND NEW.roasted_quantity IS NOT NULL THEN INSERT INTO make (time, item, quantity) VALUES(NEW.time, NEW.roasted_id, NEW.roasted_quantity); END IF; RETURN NEW; END; $$ LANGUAGE plpgsql");
-			query.exec("CREATE OR REPLACE FUNCTION log_use() RETURNS trigger AS $$ DECLARE i integer := array_lower(NEW.unroasted_id, 1); u integer := array_upper(NEW.unroasted_id, 1); BEGIN IF NEW.transaction_type = 'ROAST' THEN WHILE i <= u LOOP INSERT INTO use (time, item, quantity) VALUES(NEW.time, NEW.unroasted_id[i], NEW.unroasted_quantity[i]); i := i + 1; END LOOP; END IF; RETURN NEW; END; $$ LANGUAGE plpgsql");
 			query.exec("UPDATE TypicaFeatures SET version = 4 WHERE feature = 'base-features'");
 		};
         var DBUpdateReminders = function() {
@@ -310,6 +308,8 @@
 			query.exec("CREATE TABLE IF NOT EXISTS typica_users(name TEXT PRIMARY KEY NOT NULL, password TEXT, active boolean NOT NULL, auto_login boolean NOT NULL)");
 			/* Update session user logging to only use the database user when a Typica user is not explicitly provided. This maintains compatibility for mixed version use. */
 			query.exec("CREATE OR REPLACE FUNCTION log_session_user() RETURNS trigger AS $$ BEGIN IF NEW.person IS NULL THEN NEW.person := session_user; END IF; RETURN NEW; END; $$ LANGUAGE plpgsql");
+			query.exec("CREATE OR REPLACE FUNCTION log_use() RETURNS trigger AS $$ DECLARE i integer := array_lower(NEW.unroasted_id, 1); u integer := array_upper(NEW.unroasted_id, 1); BEGIN IF NEW.transaction_type = 'ROAST' THEN WHILE i <= u LOOP INSERT INTO use (time, item, quantity, person) VALUES(NEW.time, NEW.unroasted_id[i], NEW.unroasted_quantity[i], NEW.person); i := i + 1; END LOOP; END IF; RETURN NEW; END; $$ LANGUAGE plpgsql");
+			query.exec("CREATE OR REPLACE FUNCTION log_make() RETURNS trigger AS $$ BEGIN IF NEW.roasted_quantity IS NOT NULL THEN INSERT INTO make (time, item, quantity, person) VALUES(NEW.time, NEW.roasted_id, NEW.roasted_quantity, NEW.person); END IF; RETURN NEW; END; $$ LANGUAGE plpgsql");
 			
 			/* Uncomment before release */
 			// query.exec("UPDATE TypicaFeatures SET version = 7 WHERE feature = 'base-features'");

config/Windows/newbatch.xml

@@ -585,7 +585,7 @@
                 checkQuery = checkQuery.invalidate();
                 query = new QSqlQuery();
                 var fileno = Number(filenofield.text);
-                var q2 = "INSERT INTO roasting_log (time, unroasted_id, unroasted_quantity, unroasted_total_quantity, roasted_id, roasted_quantity, transaction_type, annotation, machine, duration, approval, humidity, barometric, indoor_air, outdoor_air, files) VALUES(:time, ";
+                var q2 = "INSERT INTO roasting_log (time, unroasted_id, unroasted_quantity, unroasted_total_quantity, roasted_id, roasted_quantity, transaction_type, annotation, machine, duration, approval, humidity, barometric, indoor_air, outdoor_air, files, person) VALUES(:time, ";
                 q2 = q2 + table.columnArray(0, 32);
                 q2 = q2 + ", ";
                 for(var i = 0; table.data(i, 1, 0).value != ""; i++)
@@ -603,13 +603,14 @@
                 q2 = q2 + selectedRoasterID;
                 q2 = q2 + ", :duration, :approval, NULL, NULL, NULL, NULL, '{";
                 q2 = q2 + fileno;
-                q2 = q2 + "}') RETURNING time";
+                q2 = q2 + "}', :user) RETURNING time";
                 query2 = new QSqlQuery();
                 query2.prepare(q2);
                 query2.bind(":time", timefield.text);
                 query2.bind(":annotation", notes.plainText);
                 query2.bind(":duration", duration.text);
                 query2.bind(":approval", approval.checked);
+				query2.bind(":user", Application.currentTypicaUser());
                 query2.exec();
                 if(!query2.next()) {
                     displayError(TTR("batchWindow", "Database Insert Failed"), TTR("batchWindow", "Failed to save batch to database. Please check inputs and connection and try again."));

config/Windows/newsamplebatch.xml

@@ -347,7 +347,7 @@
 				query.exec();
 				query.next();
 				var roastedId = query.value(0);
-				query.prepare("INSERT INTO roasting_log (time, unroasted_id, unroasted_quantity, unroasted_total_quantity, roasted_id, roasted_quantity, transaction_type, annotation, machine, duration, approval, humidity, barometric, indoor_air, outdoor_air, files) VALUES(:time, :unroastedids, :greens, :green, :roastedid, :roasted, 'SAMPLEROAST', :note, :machine, :duration, TRUE, NULL, NULL, NULL, NULL, :files)");
+				query.prepare("INSERT INTO roasting_log (time, unroasted_id, unroasted_quantity, unroasted_total_quantity, roasted_id, roasted_quantity, transaction_type, annotation, machine, duration, approval, humidity, barometric, indoor_air, outdoor_air, files, person) VALUES(:time, :unroastedids, :greens, :green, :roastedid, :roasted, 'SAMPLEROAST', :note, :machine, :duration, TRUE, NULL, NULL, NULL, NULL, :files, :user)");
 				query.bind(":time", timefield.text);
 				query.bind(":unroastedids", "{" + greenId + "}");
                                 query.bind(":greens", "{" + convertToPounds(parseFloat(green.text), GunitBox.currentText) + "}");
@@ -358,6 +358,7 @@
 				query.bind(":machine", Number(selectedRoasterID));
 				query.bind(":duration", duration.text);
 				query.bind(":files", "{" + fileno + "}");
+				query.bind(":user", Application.currentTypicaUser());
 				query.exec();
 				query = query.invalidate();
 				batch.close();

config/Windows/purchase.xml

@@ -317,7 +317,7 @@
                     query.exec();
                     query.next();
                     var item_id = query.value(0);
-                    q = "INSERT INTO purchase (time, item, quantity, cost, vendor) VALUES(:time, :item, :quantity, :cost, :vendor)";
+                    q = "INSERT INTO purchase (time, item, quantity, cost, vendor, person) VALUES(:time, :item, :quantity, :cost, :vendor, :user)";
                     query.prepare(q);
                     query.bind(":time", dateField.date);
                     query.bind(":item", item_id);
@@ -332,6 +332,7 @@
                         query.bind(":cost", Number(costEntry.text) / convertToPounds(parseFloat(quantityEntry.text), unitEntry.currentText));
                     }
                     query.bind(":vendor", vendorField.currentText);
+					query.bind(":user", Application.currentTypicaUser());
                     query.exec();
                     q = "INSERT INTO lb_bag_conversion (item, conversion) VALUES(:item, :conversion)";
                     query.prepare(q);