From c8f5408f273516e1c16d8cfccab7e420996b3ea9 Mon Sep 17 00:00:00 2001 From: Eli Ribble Date: Tue, 24 Feb 2026 20:02:44 +0000 Subject: [PATCH] Add link from root upload page to upload pool detail page. --- html/func.go | 4 ++ html/template/sync/pool-list.html | 58 ------------------- ...l-csv-upload.html => upload-csv-pool.html} | 2 +- html/template/sync/upload-list.html | 13 +---- platform/csv/pool.go | 8 +++ sync/routes.go | 3 +- sync/upload.go | 13 +---- sync/url.go | 4 +- 8 files changed, 20 insertions(+), 85 deletions(-) delete mode 100644 html/template/sync/pool-list.html rename html/template/sync/{pool-csv-upload.html => upload-csv-pool.html} (99%) diff --git a/html/func.go b/html/func.go index 63995c9e..d21c96fb 100644 --- a/html/func.go +++ b/html/func.go @@ -61,6 +61,10 @@ func bigNumber(n int) string { } func displayUploadStatus(s string) string { switch s { + case "committed": + return "committed" + case "discarded": + return "Discarded" case "error": return "Bad upload" case "parsed": diff --git a/html/template/sync/pool-list.html b/html/template/sync/pool-list.html deleted file mode 100644 index 0f7b71c4..00000000 --- a/html/template/sync/pool-list.html +++ /dev/null @@ -1,58 +0,0 @@ -{{ template "sync/layout/authenticated.html" . }} - -{{ define "title" }}Pool List{{ end }} -{{ define "extraheader" }} - -{{ end }} -{{ define "content" }} -
-
-
-
-
-

Pool CSV Uploads

-
-
-
- - - - - - - - - {{ range .C.Uploads }} - - - - - {{ end }} - -
StatusUploaded
{{ .Status }}{{ .Created|timeRelative }}
-
-
-
-
-
- Do an upload -
-
-
-{{ end }} diff --git a/html/template/sync/pool-csv-upload.html b/html/template/sync/upload-csv-pool.html similarity index 99% rename from html/template/sync/pool-csv-upload.html rename to html/template/sync/upload-csv-pool.html index 48f37135..7af46820 100644 --- a/html/template/sync/pool-csv-upload.html +++ b/html/template/sync/upload-csv-pool.html @@ -133,7 +133,7 @@
diff --git a/html/template/sync/upload-list.html b/html/template/sync/upload-list.html index ccc57b16..f49f655c 100644 --- a/html/template/sync/upload-list.html +++ b/html/template/sync/upload-list.html @@ -36,16 +36,9 @@ Upload spreadsheets with addresses and contact information of unmaintained pools that may breed mosquitoes.

-

Supported formats: .xlsx, .csv, .xls

-
- - -
- + + Upload Green Pool Data
Last import: 02/15/2023 diff --git a/platform/csv/pool.go b/platform/csv/pool.go index 45449e85..9705dc93 100644 --- a/platform/csv/pool.go +++ b/platform/csv/pool.go @@ -79,6 +79,14 @@ func ProcessJob(ctx context.Context, file_id int32) error { if err != nil { return fmt.Errorf("parse file: %w", err) } + _, err = psql.Update( + um.Table("fileupload.csv"), + um.SetCol("rowcount").ToArg(len(pools)), + um.Where(psql.Quote("id").EQ(psql.Arg(file_id))), + ).Exec(ctx, txn) + if err != nil { + return fmt.Errorf("update csv row: %w", err) + } err = bulkGeocode(ctx, txn, *file, pools) if err != nil { return fmt.Errorf("bulk geocode: %w", err) diff --git a/sync/routes.go b/sync/routes.go index d4e85d78..669c58d0 100644 --- a/sync/routes.go +++ b/sync/routes.go @@ -74,8 +74,7 @@ func Router() chi.Router { r.Method("GET", "/trap/{globalid}", authenticatedHandler(getTrap)) r.Method("GET", "/text/{destination}", authenticatedHandler(getTextMessages)) r.Method("GET", "/upload", authenticatedHandler(getUploadList)) - r.Method("GET", "/upload/pool", authenticatedHandler(getUploadPoolList)) - r.Method("GET", "/upload/pool/create", authenticatedHandler(getUploadPoolCreate)) + r.Method("GET", "/upload/pool", authenticatedHandler(getUploadPoolCreate)) r.Method("POST", "/upload/pool/create", authenticatedHandlerPostMultipart(postUploadPoolCreate)) r.Method("GET", "/upload/{id}", authenticatedHandler(getUploadByID)) r.Method("POST", "/upload/{id}/discard", authenticatedHandlerPost(postUploadDiscard)) diff --git a/sync/upload.go b/sync/upload.go index 5589a480..7683c826 100644 --- a/sync/upload.go +++ b/sync/upload.go @@ -47,20 +47,9 @@ type contentUploadPoolList struct { } type contentUploadPoolCreate struct{} -func getUploadPoolList(ctx context.Context, r *http.Request, org *models.Organization, u *models.User) (*response[contentUploadPoolList], *errorWithStatus) { - uploads, err := platform.PoolUploadList(ctx, u.OrganizationID) - if err != nil { - return nil, newError("Failed to get uploads: %w", err) - } - data := contentUploadPoolList{ - Uploads: uploads, - } - return newResponse("sync/pool-list.html", data), nil -} - func getUploadPoolCreate(ctx context.Context, r *http.Request, org *models.Organization, u *models.User) (*response[contentUploadPoolCreate], *errorWithStatus) { data := contentUploadPoolCreate{} - return newResponse("sync/pool-csv-upload.html", data), nil + return newResponse("sync/upload-csv-pool.html", data), nil } func getUploadByID(ctx context.Context, r *http.Request, org *models.Organization, u *models.User) (*response[contentUploadDetail], *errorWithStatus) { file_id_str := chi.URLParam(r, "id") diff --git a/sync/url.go b/sync/url.go index 4b676666..7ca2bff8 100644 --- a/sync/url.go +++ b/sync/url.go @@ -6,7 +6,6 @@ import ( type ContentURL struct { OAuthRefreshArcGIS string - PoolCSVUpload string Root string Route string SamplePoolCSV string @@ -18,12 +17,12 @@ type ContentURL struct { SettingUser string SettingUserAdd string Tegola string + UploadCSVPool string } func newContentURL() ContentURL { return ContentURL{ OAuthRefreshArcGIS: config.MakeURLNidus("/arcgis/oauth/begin"), - PoolCSVUpload: config.MakeURLNidus("/pool/upload"), Root: config.MakeURLNidus("/"), Route: config.MakeURLNidus("/route"), SamplePoolCSV: config.MakeURLNidus("/static/file/sample-pool.csv"), @@ -35,5 +34,6 @@ func newContentURL() ContentURL { SettingUser: config.MakeURLNidus("/setting/user"), SettingUserAdd: config.MakeURLNidus("/setting/user/add"), Tegola: config.MakeURLTegola("/"), + UploadCSVPool: config.MakeURLNidus("/upload/pool"), } }