diff --git a/html/template/sync/upload-by-id.html b/html/template/sync/upload-by-id.html index d779a6be..6598b1a5 100644 --- a/html/template/sync/upload-by-id.html +++ b/html/template/sync/upload-by-id.html @@ -182,32 +182,14 @@ document.addEventListener('DOMContentLoaded', onLoad); {{ .Street }} {{ .City }} {{ .PostalCode }} - {{ if eq .Status "new" }} - - New - - {{ else if eq .Status "existing" }} - - Existing - - {{ else if eq .Status "outside" }} - - Outside - - {{ else }} - - {{ .Status }} - - {{ end }} - {{ .Condition }}{{ .Status|title }} + + + {{ .Condition|title }} {{ len .Tags }} diff --git a/html/template/sync/upload-csv-pool.html b/html/template/sync/upload-csv-pool.html index 7af46820..3434bc31 100644 --- a/html/template/sync/upload-csv-pool.html +++ b/html/template/sync/upload-csv-pool.html @@ -58,7 +58,7 @@ Pool Condition The condition of the pool when it was last inspected Text - "blue", "dry", "green", or "murky" + "blue", "dry", "false pool", "green", or "murky" Property Owner Name diff --git a/scss/custom.scss b/scss/custom.scss index 2b3c1610..a152cfb4 100644 --- a/scss/custom.scss +++ b/scss/custom.scss @@ -54,7 +54,7 @@ $theme-colors: map-merge( @import "./sync/dashboard.scss"; @import "./sync/notification.scss"; @import "./sync/pool-csv-upload.scss"; -@import "./sync/pool-by-id.scss"; @import "./sync/settings.scss"; @import "./sync/settings-user-list.scss"; +@import "./sync/upload-by-id.scss"; @import "./sync/upload-list.scss"; diff --git a/scss/sync/pool-by-id.scss b/scss/sync/pool-by-id.scss deleted file mode 100644 index 31222409..00000000 --- a/scss/sync/pool-by-id.scss +++ /dev/null @@ -1,24 +0,0 @@ -.bg-empty { - background-color: #9C9BC0; -} -.bg-green { - background-color: #7AAB5F; -} -.bg-murky { - background-color: #D2E3CA; -} -.bg-unknown { - background-color: #F7CBA1; -} -.summary-card { - transition: transform 0.2s; -} -.summary-card:hover { - transform: translateY(-5px); -} -.status-badge { - font-size: 0.85rem; -} -tr.has-error { - background-color: rgba(255, 193, 7, 0.15) !important; -} diff --git a/scss/sync/upload-by-id.scss b/scss/sync/upload-by-id.scss new file mode 100644 index 00000000..176f379e --- /dev/null +++ b/scss/sync/upload-by-id.scss @@ -0,0 +1,39 @@ +.badge.dry { + background-color: $info; +} +.badge.empty { + background-color: #9C9BC0; +} +.badge.green { + background-color: #7AAB5F; +} +.badge.murky { + background-color: #D2E3CA; +} +.badge.unknown { + background-color: gray; +} +.summary-card { + transition: transform 0.2s; +} +.summary-card:hover { + transform: translateY(-5px); +} +.badge.status{ + font-size: 0.85rem; +} +.badge.status.existing { + background-color: $secondary; +} +.badge.status.new { + background-color: $success; +} +.badge.status.outside { + background-color: $warning; +} +.badge.status.unknown { + background-color: gray; +} +tr.has-error { + background-color: rgba(255, 193, 7, 0.15) !important; +}