Skip to content

Updates to the vendor views #175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-klum merged 1 commit into from
Sep 8, 2025
Merged

Updates to the vendor views #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion OConnor/module.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Name: OConnor
SchemaVersion: 25.000
SchemaVersion: 25.001
RequiredServerVersion: 16.30
ManageVersion: true
87 changes: 42 additions & 45 deletions OConnor/resources/queries/oconnor/vendors.query.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
32 changes: 12 additions & 20 deletions OConnor/resources/queries/oconnor/vendors/dashboard_vendors.qview.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 2 additions & 0 deletions OConnor/resources/schemas/dbscripts/postgresql/oconnor-25.000-25.001.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ALTER TABLE oconnor.vendors ADD COLUMN shopUW BOOLEAN;
ALTER TABLE oconnor.vendors DROP COLUMN fax;
2 changes: 1 addition & 1 deletion OConnor/resources/schemas/oconnor.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down
Loading