fix tests, city state zip

datamade · May 30, 2024 · f69d910 · f69d910
1 parent 6b89164
commit f69d910
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -23,6 +23,7 @@ jobs:
           ${{ runner.os }}-pip-
     - name: Install dependencies
       run: |
+        pip install https://github.com/fgregg/datasette/archive/refs/heads/no_limit_csv_publish.zip
         pip install -e '.[test]'
     - name: Run tests
       run: |

diff --git a/example/index.html b/example/index.html
@@ -39,14 +39,13 @@
             { data: "name" },
             { data: "occupation" },
             { data: "employer" },
-            { data: "city" },
-            { data: "state" },
+            { data: "city_state_zip" }
           ],
           order: [[1, "desc"]],
           processing: true,
           serverSide: true,
           searching: true,
-          ajax: "https://puddle.bunkum.us/il_campaign_disclosure.datatable?sql=select%0D%0A++committees.name+as+committee_name%2C%0D%0A++strftime(%27%25Y-%25m-%25d%27%2C+received_date)+as+received_date%2C%0D%0A++amount%2C%0D%0A++case%0D%0A++++when+first_name+is+not+null+then+first_name+||+%27+%27+||+last_name%0D%0A++++else+last_name%0D%0A++end+as+name%2C%0D%0A++occupation%2C%0D%0A++employer%2C%0D%0A++receipts.city%2C%0D%0A++receipts.state%2C%0D%0A++*%0D%0Afrom%0D%0A++receipts%0D%0A++inner+join+committees+on+committee_id+%3D+committees.id%0D%0Awhere%0D%0A++received_date+%3E%3D+%272023-01-01%27%0D%0A++and+archived+%3D+0",
+          ajax: "https://puddle.bunkum.us/il_campaign_disclosure.datatable?sql=select%0D%0A++committees.name+as+committee_name%2C%0D%0A++strftime(%27%25Y-%25m-%25d%27%2C+received_date)+as+received_date%2C%0D%0A++amount%2C%0D%0A++case%0D%0A++++when+first_name+is+not+null+then+first_name+||+%27+%27+||+last_name%0D%0A++++else+last_name%0D%0A++end+as+name%2C%0D%0A++occupation%2C%0D%0A++employer%2C%0D%0A++receipts.city+||+%27%2C+%27+||+receipts.state+||+%27+%27+||+receipts.zipcode+as+city_state_zip%0D%0Afrom%0D%0A++receipts%0D%0A++inner+join+committees+on+committee_id+%3D+committees.id%0D%0Awhere%0D%0A++received_date+%3E%3D+%272023-01-01%27%0D%0A++and+archived+%3D+0",
           initComplete: function () {
             // Apply the search
             this.api()
@@ -77,8 +76,7 @@
             <th>Donor Name</th>
             <th>Occupation</th>
             <th>Employer</th>
-            <th>City</th>
-            <th>State</th>
+            <th>City, State Zip</th>
           </tr>
         </thead>
         <tfoot>
@@ -89,8 +87,7 @@
             <th>Donor Name</th>
             <th>Occupation</th>
             <th>Employer</th>
-            <th>City</th>
-            <th>State</th>
+            <th>City, State Zip</th>
           </tr>
         </tfoot>
       </table>