From f250a306e269e903ac1df4060381809e8e70ed85 Mon Sep 17 00:00:00 2001
From: Karl Lum <klum@labkey.com>
Date: Mon, 8 Sep 2025 09:49:33 -0700
Subject: [PATCH] Updates to the vendor views (#175)

---
 OConnor/module.properties                     |   2 +-
 .../queries/oconnor/vendors.query.xml         |  87 +++--
 .../vendors/dashboard_vendors.qview.xml       |  32 +-
 .../postgresql/oconnor-25.000-25.001.sql      |   2 +
 OConnor/resources/schemas/oconnor.xml         |   2 +-
 OConnor/resources/views/enabled_vendors.html  | 307 ++++++------------
 .../resources/views/enabled_vendors.view.xml  |   1 +
 7 files changed, 166 insertions(+), 267 deletions(-)
 create mode 100644 OConnor/resources/schemas/dbscripts/postgresql/oconnor-25.000-25.001.sql

diff --git a/OConnor/module.properties b/OConnor/module.properties
index 98e38f0e..89d405f4 100644
--- a/OConnor/module.properties
+++ b/OConnor/module.properties
@@ -1,4 +1,4 @@
 Name: OConnor
-SchemaVersion: 25.000
+SchemaVersion: 25.001
 RequiredServerVersion: 16.30
 ManageVersion: true
diff --git a/OConnor/resources/queries/oconnor/vendors.query.xml b/OConnor/resources/queries/oconnor/vendors.query.xml
index 5effa07c..462729f1 100644
--- a/OConnor/resources/queries/oconnor/vendors.query.xml
+++ b/OConnor/resources/queries/oconnor/vendors.query.xml
@@ -1,47 +1,44 @@
 <query xmlns="http://labkey.org/data/xml/query">
-  <metadata>
-    <tables xmlns="http://labkey.org/data/xml">
-      <table tableName="vendors" tableDbType="TABLE">
-        <titleColumn>vendor</titleColumn>
-        <columns>
-          <column columnName="key">
-            <shownInInsertView>false</shownInInsertView>
-            <shownInUpdateView>false</shownInUpdateView>
-          </column>
-          <column columnName="enabled">
-            <defaultValue>true</defaultValue>
-          </column>
-          <column columnName="url">
-            <columnTitle>URL</columnTitle>
-          </column>
-          <column columnName="po">
-            <columnTitle>Purchase order number</columnTitle>
-<displayWidth>50</displayWidth>
-
-          </column>
-          <column columnName="vendor">
-            <displayWidth>50</displayWidth>
-          </column>
-          <column columnName="phone">
-            <displayWidth>125</displayWidth>
-          </column>
-              <column columnName="fax">
-            <displayWidth>125</displayWidth>
-          </column>
-          <column columnName="email">
-            <displayWidth>50</displayWidth>
-          </column>
-          <column columnName="url">
-            <displayWidth>50</displayWidth>
-          </column>
-          <column columnName="comments">
-            <displayWidth>50</displayWidth>
-          </column>
-          <column columnName="account_number">
-            <displayWidth>50</displayWidth>
-          </column>
-        </columns>
-      </table>
-    </tables>
-  </metadata>
+    <metadata>
+        <tables xmlns="http://labkey.org/data/xml">
+            <table tableName="vendors" tableDbType="TABLE">
+                <titleColumn>vendor</titleColumn>
+                <columns>
+                    <column columnName="key">
+                        <shownInInsertView>false</shownInInsertView>
+                        <shownInUpdateView>false</shownInUpdateView>
+                    </column>
+                    <column columnName="enabled">
+                        <defaultValue>true</defaultValue>
+                    </column>
+                    <column columnName="url">
+                        <columnTitle>URL</columnTitle>
+                    </column>
+                    <column columnName="po">
+                        <columnTitle>Purchase order number</columnTitle>
+                        <displayWidth>50</displayWidth>
+                    </column>
+                    <column columnName="vendor">
+                        <displayWidth>50</displayWidth>
+                    </column>
+                    <column columnName="shopUW"/>
+                    <column columnName="phone">
+                        <displayWidth>125</displayWidth>
+                    </column>
+                    <column columnName="email">
+                        <displayWidth>50</displayWidth>
+                    </column>
+                    <column columnName="url">
+                        <displayWidth>50</displayWidth>
+                    </column>
+                    <column columnName="comments">
+                        <displayWidth>50</displayWidth>
+                    </column>
+                    <column columnName="account_number">
+                        <displayWidth>50</displayWidth>
+                    </column>
+                </columns>
+            </table>
+        </tables>
+    </metadata>
 </query>
diff --git a/OConnor/resources/queries/oconnor/vendors/dashboard_vendors.qview.xml b/OConnor/resources/queries/oconnor/vendors/dashboard_vendors.qview.xml
index 7df53d8d..3e3acf6e 100644
--- a/OConnor/resources/queries/oconnor/vendors/dashboard_vendors.qview.xml
+++ b/OConnor/resources/queries/oconnor/vendors/dashboard_vendors.qview.xml
@@ -1,23 +1,15 @@
 <!-- show only those vendors that are enabled in the dashboard -->
-
 <customView xmlns="http://labkey.org/data/xml/queryCustomView">
-   <columns>
-    <column name="vendor">
-    </column>
-	<column name="phone">
-	</column>
-	<column name="fax">
-	</column>
-	<column name="email">
-	</column>
-   </columns>
-   
-   <sorts>
-       <sort column="created" descending="true"/>
-   </sorts>
-   
-	<filters>
-       <filter column="enabled" operator="eq" value="TRUE"/>
-   </filters>
-   
+    <columns>
+        <column name="vendor"/>
+        <column name="shopUW"/>
+        <column name="phone"/>
+        <column name="email"/>
+    </columns>
+    <sorts>
+        <sort column="created" descending="true"/>
+    </sorts>
+    <filters>
+        <filter column="enabled" operator="eq" value="TRUE"/>
+    </filters>
 </customView>
\ No newline at end of file
diff --git a/OConnor/resources/schemas/dbscripts/postgresql/oconnor-25.000-25.001.sql b/OConnor/resources/schemas/dbscripts/postgresql/oconnor-25.000-25.001.sql
new file mode 100644
index 00000000..d0417c93
--- /dev/null
+++ b/OConnor/resources/schemas/dbscripts/postgresql/oconnor-25.000-25.001.sql
@@ -0,0 +1,2 @@
+ALTER TABLE oconnor.vendors ADD COLUMN shopUW BOOLEAN;
+ALTER TABLE oconnor.vendors DROP COLUMN fax;
diff --git a/OConnor/resources/schemas/oconnor.xml b/OConnor/resources/schemas/oconnor.xml
index 61d222ae..bbb5c0b3 100644
--- a/OConnor/resources/schemas/oconnor.xml
+++ b/OConnor/resources/schemas/oconnor.xml
@@ -739,7 +739,7 @@
             <column columnName="vendor"/>
             <column columnName="enabled"/>
             <column columnName="phone"/>
-            <column columnName="fax"/>
+            <column columnName="shopUW"/>
             <column columnName="email"/>
             <column columnName="url"/>
             <column columnName="address"/>
diff --git a/OConnor/resources/views/enabled_vendors.html b/OConnor/resources/views/enabled_vendors.html
index 9263f673..d006490e 100644
--- a/OConnor/resources/views/enabled_vendors.html
+++ b/OConnor/resources/views/enabled_vendors.html
@@ -1,211 +1,118 @@
 <html>
 <head>
-<script type="text/javascript" nonce="<%=scriptNonce%>">
-Ext.onReady(function(){
-//draw grid for all vendors
+    <script type="text/javascript" nonce="<%=scriptNonce%>">
+        Ext4.onReady(function () {
+            var pageButtons = [{ text: 'Add New Vendor', handler: addVendor }];
+            createGrid(dbSchemaName, 'vendors', 'dashboard_vendors', '', 'a', 'b', pageButtons);
 
-var pageButtons = [{text: 'Add New Vendor', handler: addVendor}];
-createGrid(dbSchemaName, 'vendors', 'dashboard_vendors', '', 'a', 'b',pageButtons);
+            function addVendor() {
+                //construct form
+                var theForm = new Ext4.FormPanel({
+                    xtype: 'form',
+                    width: 300,
+                    bodyStyle: 'background-color:#fff;padding: 10px',
+                    border: false,
+                    labelWidth: 130,
+                    items: [{
+                        xtype: 'textfield',
+                        name: 'vendor',
+                        fieldLabel: 'Vendor',
+                        allowBlank: false
+                    }, {
+                        xtype: 'checkbox',
+                        name: 'shopUW',
+                        fieldLabel: 'Shop UW'
+                    }, {
+                        xtype: 'textfield',
+                        name: 'phone',
+                        fieldLabel: 'Phone Number'
+                    }, {
+                        xtype: 'textfield',
+                        name: 'email',
+                        fieldLabel: 'Email Address'
+                    }, {
+                        xtype: 'textfield',
+                        name: 'url',
+                        fieldLabel: 'URL'
+                    }, {
+                        xtype: 'textfield',
+                        name: 'address',
+                        fieldLabel: 'Mailing Address'
+                    }, {
+                        xtype: 'textfield',
+                        name: 'city',
+                        fieldLabel: 'City'
+                    }, {
+                        xtype: 'textfield',
+                        name: 'state',
+                        fieldLabel: 'State'
+                    }, {
+                        xtype: 'textfield',
+                        name: 'zip',
+                        fieldLabel: 'Zip code'
+                    }, {
+                        xtype: 'textfield',
+                        name: 'po',
+                        fieldLabel: 'Purchase Order Number'
+                    }, {
+                        xtype: 'textfield',
+                        name: 'comments',
+                        fieldLabel: 'Comments'
+                    }, {
+                        xtype: 'textfield',
+                        name: 'account_number',
+                        fieldLabel: 'Account Number'
+                    }, {
+                        xtype: 'checkbox',
+                        name: 'enabled',
+                        fieldLabel: 'Enabled',
+                        checked: 'true',
+                        uncheckedValue: 'false'
+                    }]
+                });
 
-//generate form to add new vendor	
-function addVendor(data)
-{
-//form fields. for some reason that i can't figure out, the checkbox I tried to create to select 'enabled' kept breaking the entire form. I defaulted to adding new vendors as 'enabled'. This is almost certainly the most common usage case.
-	var vendor = new Ext.form.TextField({
-			xtype: 'textfield',
-			ref: 'vendor',
-			fieldLabel: 'Vendor',
-			allowBlank: false,
-			triggerAction: 'all',
-			mode: 'local'
-	});
+                var theWindow = new Ext4.Window({
+                    title: 'Add new vendor',
+                    width: 320,
+                    bodyStyle: 'background-color:#fff',
+                    autoHeight: true,
+                    items: theForm,
+                    buttonAlign: 'center',
+                    buttons: [{
+                        text: 'Submit',
+                        formBind: true,
+                        scope: this,
+                        handler: function () {
+                            theWindow.hide();
 
-	var phone = new Ext.form.TextField({
-			xtype: 'textfield',
-			ref: 'phone',
-			fieldLabel: 'Phone Number',
-			allowBlank: true,
-			triggerAction: 'all',
-			mode: 'local'
-	});
-	
-	var fax = new Ext.form.TextField({
-			xtype: 'textfield',
-			ref: 'fax',
-			fieldLabel: 'Fax Number',
-			allowBlank: true,
-			triggerAction: 'all',
-			mode: 'local'
-	});
-	
-	var email = new Ext.form.TextField({
-			xtype: 'textfield',
-			ref: 'email',
-			fieldLabel: 'Email Address',
-			allowBlank: true,
-			triggerAction: 'all',
-			mode: 'local'
-	});
+                            //insert record into labkey
+                            LABKEY.Query.insertRows({
+                                schemaName: dbSchemaName,
+                                queryName: 'vendors',
+                                successCallback: function (d) {
+                                    onSuccess(d);
+                                },
+                                rowDataArray: [theForm.getValues()]
+                            });
+                        }
+                    },
+                        {
+                            text: 'Cancel',
+                            scope: this,
+                            handler: function () {
+                                theWindow.hide();
+                            }
+                        }]
+                });
 
-	var url = new Ext.form.TextField({
-			xtype: 'textfield',
-			ref: 'url',
-			fieldLabel: 'URL',
-			allowBlank: true,
-			triggerAction: 'all',
-			mode: 'local'
-	});
-
-	var address = new Ext.form.TextField({
-			xtype: 'textfield',
-			ref: 'address',
-			fieldLabel: 'Mailing Address',
-			allowBlank: true,
-			triggerAction: 'all',
-			mode: 'local'
-	});
-	
-	var city = new Ext.form.TextField({
-			xtype: 'textfield',
-			ref: 'city',
-			fieldLabel: 'City',
-			allowBlank: true,
-			triggerAction: 'all',
-			mode: 'local'
-	});
-	
-	var state = new Ext.form.TextField({
-			xtype: 'textfield',
-			ref: 'state',
-			fieldLabel: 'State',
-			allowBlank: true,
-			triggerAction: 'all',
-			mode: 'local'
-	});
-	
-	var zip = new Ext.form.TextField({
-			xtype: 'textfield',
-			ref: 'zip',
-			fieldLabel: 'Zip code',
-			allowBlank: true,
-			triggerAction: 'all',
-			mode: 'local'
-	});
-	
-	var po = new Ext.form.TextField({
-			xtype: 'textfield',
-			ref: 'po',
-			fieldLabel: 'Purchase Order Number',
-			allowBlank: true,
-			triggerAction: 'all',
-			mode: 'local'
-	});
-	
-	var comments = new Ext.form.TextField({
-			xtype: 'textfield',
-			ref: 'comments',
-			fieldLabel: 'Comments',
-			allowBlank: true,
-			triggerAction: 'all',
-			mode: 'local'
-	});
-	
-	var account_number = new Ext.form.TextField({
-			xtype: 'textfield',
-			ref: 'account_number',
-			fieldLabel: 'Account Number',
-			allowBlank: true,
-			triggerAction: 'all',
-			mode: 'local'
-	});
-console.log(account_number);
-//construct form
-	var theForm = new Ext.FormPanel({
-			xtype: 'form',
-			layout: 'form',
-			width: 300,
-			bodyStyle: 'background-color:#fff;padding: 10px',
-			monitorValid: true,
-			ref: 'theForm',
-			border: false,
-			labelWidth: 130,
-			items: [vendor,phone,fax,email,url,address,city,state,zip,po,comments,account_number]
-		});		
-
-console.log(theForm);
-	var theWindow = new Ext.Window({
-		title: 'Add new vendor',
-		width: 320,
-		bodyStyle: 'background-color:#fff',
-		autoHeight: true,
-		items: theForm,
-		buttonAlign: 'center',
-		buttons: [{
-				text: 'Submit',
-				formBind: true,
-				scope: this,
-				handler: function()
-				{
-					//hide window
-					theWindow.hide();
-
-					//communicate with labkey/db to add new vendor
-
-						//set parameters for inserting new row
-						var now = new Date();
-						var user = LABKEY.Security.currentUser.displayName;
-						
-						//get other details from previous order
-						var rowData = {
-								"vendor" : theWindow.theForm.vendor.getValue(),
-								"enabled": 'true',
-								"phone" : theWindow.theForm.phone.getValue(),
-								"fax" : theWindow.theForm.fax.getValue(),
-								"email" : theWindow.theForm.email.getValue(),
-								"url" : theWindow.theForm.url.getValue(),
-								"address" : theWindow.theForm.address.getValue(),
-								"city" : theWindow.theForm.city.getValue(),
-								"state" : theWindow.theForm.state.getValue(),
-								"zip" : theWindow.theForm.zip.getValue(),
-								"po" : theWindow.theForm.po.getValue(),
-								"comments" : theWindow.theForm.comments.getValue(),
-								"account_number" : theWindow.theForm.account_number.getValue(),
-								modifiedBy: LABKEY.Security.currentUser.id,
-								createdBy: LABKEY.Security.currentUser.id
-						};
-						//insert record into labkey
-						LABKEY.Query.insertRows({
-							schemaName: dbSchemaName,
-							queryName: 'vendors',
-							successCallback: function(d){
-								var currentTime = new Date();
-								var date = currentTime.format('Y-m-d');
-		                    	onSuccess(d);
-							},
-							rowDataArray:[rowData]
-						});
-				}
-			},
-			{
-				text: 'Cancel',
-				scope: this,
-				handler: function()
-				{
-					theWindow.hide();
-				}
-			}]
-					
-	});
-	
-	theWindow.show();
-};
-
-});
-</script>
+                theWindow.show();
+            };
 
+        });
+    </script>
 </head>
-<body>
-<div id="a"></div>
 
+<body>
+    <div id="a"></div>
 </body>
 </html>
\ No newline at end of file
diff --git a/OConnor/resources/views/enabled_vendors.view.xml b/OConnor/resources/views/enabled_vendors.view.xml
index 5f7d8f99..d19c5e4f 100644
--- a/OConnor/resources/views/enabled_vendors.view.xml
+++ b/OConnor/resources/views/enabled_vendors.view.xml
@@ -1,5 +1,6 @@
 <view xmlns="http://labkey.org/data/xml/view" frame="none">
     <dependencies>
+        <dependency path="Ext4"/>
         <dependency path="oconnor/oconnorAlabrityConfig.js" />
         <dependency path="oconnor/oconnorPurchaseCommon.js" />
     </dependencies>