Skip to content

Commit f250a30

Browse files
labkey-klumlabkey-klum
authored
Updates to the vendor views (#175)
1 parent 1790087 commit f250a30

7 files changed

Lines changed: 166 additions & 267 deletions

File tree

‎OConnor/module.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
Name: OConnor
2-
SchemaVersion: 25.000
2+
SchemaVersion: 25.001
33
RequiredServerVersion: 16.30
44
ManageVersion: true

‎OConnor/resources/queries/oconnor/vendors.query.xml‎

Lines changed: 42 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,44 @@
11
<query xmlns="http://labkey.org/data/xml/query">
2-
<metadata>
3-
<tables xmlns="http://labkey.org/data/xml">
4-
<table tableName="vendors" tableDbType="TABLE">
5-
<titleColumn>vendor</titleColumn>
6-
<columns>
7-
<column columnName="key">
8-
<shownInInsertView>false</shownInInsertView>
9-
<shownInUpdateView>false</shownInUpdateView>
10-
</column>
11-
<column columnName="enabled">
12-
<defaultValue>true</defaultValue>
13-
</column>
14-
<column columnName="url">
15-
<columnTitle>URL</columnTitle>
16-
</column>
17-
<column columnName="po">
18-
<columnTitle>Purchase order number</columnTitle>
19-
<displayWidth>50</displayWidth>
20-
21-
</column>
22-
<column columnName="vendor">
23-
<displayWidth>50</displayWidth>
24-
</column>
25-
<column columnName="phone">
26-
<displayWidth>125</displayWidth>
27-
</column>
28-
<column columnName="fax">
29-
<displayWidth>125</displayWidth>
30-
</column>
31-
<column columnName="email">
32-
<displayWidth>50</displayWidth>
33-
</column>
34-
<column columnName="url">
35-
<displayWidth>50</displayWidth>
36-
</column>
37-
<column columnName="comments">
38-
<displayWidth>50</displayWidth>
39-
</column>
40-
<column columnName="account_number">
41-
<displayWidth>50</displayWidth>
42-
</column>
43-
</columns>
44-
</table>
45-
</tables>
46-
</metadata>
2+
<metadata>
3+
<tables xmlns="http://labkey.org/data/xml">
4+
<table tableName="vendors" tableDbType="TABLE">
5+
<titleColumn>vendor</titleColumn>
6+
<columns>
7+
<column columnName="key">
8+
<shownInInsertView>false</shownInInsertView>
9+
<shownInUpdateView>false</shownInUpdateView>
10+
</column>
11+
<column columnName="enabled">
12+
<defaultValue>true</defaultValue>
13+
</column>
14+
<column columnName="url">
15+
<columnTitle>URL</columnTitle>
16+
</column>
17+
<column columnName="po">
18+
<columnTitle>Purchase order number</columnTitle>
19+
<displayWidth>50</displayWidth>
20+
</column>
21+
<column columnName="vendor">
22+
<displayWidth>50</displayWidth>
23+
</column>
24+
<column columnName="shopUW"/>
25+
<column columnName="phone">
26+
<displayWidth>125</displayWidth>
27+
</column>
28+
<column columnName="email">
29+
<displayWidth>50</displayWidth>
30+
</column>
31+
<column columnName="url">
32+
<displayWidth>50</displayWidth>
33+
</column>
34+
<column columnName="comments">
35+
<displayWidth>50</displayWidth>
36+
</column>
37+
<column columnName="account_number">
38+
<displayWidth>50</displayWidth>
39+
</column>
40+
</columns>
41+
</table>
42+
</tables>
43+
</metadata>
4744
</query>

‎OConnor/resources/queries/oconnor/vendors/dashboard_vendors.qview.xml‎

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,15 @@
11
<!-- show only those vendors that are enabled in the dashboard -->
2-
32
<customView xmlns="http://labkey.org/data/xml/queryCustomView">
4-
<columns>
5-
<column name="vendor">
6-
</column>
7-
<column name="phone">
8-
</column>
9-
<column name="fax">
10-
</column>
11-
<column name="email">
12-
</column>
13-
</columns>
14-
15-
<sorts>
16-
<sort column="created" descending="true"/>
17-
</sorts>
18-
19-
<filters>
20-
<filter column="enabled" operator="eq" value="TRUE"/>
21-
</filters>
22-
3+
<columns>
4+
<column name="vendor"/>
5+
<column name="shopUW"/>
6+
<column name="phone"/>
7+
<column name="email"/>
8+
</columns>
9+
<sorts>
10+
<sort column="created" descending="true"/>
11+
</sorts>
12+
<filters>
13+
<filter column="enabled" operator="eq" value="TRUE"/>
14+
</filters>
2315
</customView>

‎OConnor/resources/schemas/dbscripts/postgresql/oconnor-25.000-25.001.sql‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
ALTER TABLE oconnor.vendors ADD COLUMN shopUW BOOLEAN;
2+
ALTER TABLE oconnor.vendors DROP COLUMN fax;

‎OConnor/resources/schemas/oconnor.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -739,7 +739,7 @@
739739
<column columnName="vendor"/>
740740
<column columnName="enabled"/>
741741
<column columnName="phone"/>
742-
<column columnName="fax"/>
742+
<column columnName="shopUW"/>
743743
<column columnName="email"/>
744744
<column columnName="url"/>
745745
<column columnName="address"/>

0 commit comments

Comments
 (0)