diff --git a/datapoint.go b/datapoint.go index a4b556b..9e925ad 100644 --- a/datapoint.go +++ b/datapoint.go @@ -233,10 +233,3 @@ func DatapointRetrieve(id int, name string) (dp Datapoint, err error) { // {{{ return } // }}} -func DatapointDelete(id int) (err error) {// {{{ - _, err = service.Db.Conn.Exec(`DELETE FROM datapoint WHERE id=$1`, id) - if err != nil { - err = we.Wrap(err).WithData(id) - } - return -}// }}} diff --git a/main.go b/main.go index 086797f..bc8aaeb 100644 --- a/main.go +++ b/main.go @@ -23,7 +23,7 @@ import ( "time" ) -const VERSION = "v5" +const VERSION = "v4" var ( logger *slog.Logger @@ -111,7 +111,6 @@ func main() { // {{{ service.Register("/datapoints", false, false, pageDatapoints) service.Register("/datapoint/edit/{id}", false, false, pageDatapointEdit) service.Register("/datapoint/update/{id}", false, false, pageDatapointUpdate) - service.Register("/datapoint/delete/{id}", false, false, pageDatapointDelete) service.Register("/triggers", false, false, pageTriggers) service.Register("/trigger/edit/{id}", false, false, pageTriggerEdit) @@ -492,23 +491,6 @@ func pageDatapointUpdate(w http.ResponseWriter, r *http.Request, _ *session.T) { w.Header().Add("Location", "/datapoints") w.WriteHeader(302) } // }}} -func pageDatapointDelete(w http.ResponseWriter, r *http.Request, _ *session.T) { // {{{ - idStr := r.PathValue("id") - id, err := strconv.Atoi(idStr) - if err != nil { - httpError(w, we.Wrap(err).Log()) - return - } - - err = DatapointDelete(id) - if err != nil { - httpError(w, we.Wrap(err).Log()) - return - } - - w.Header().Add("Location", "/datapoints") - w.WriteHeader(302) -} // }}} func pageTriggers(w http.ResponseWriter, _ *http.Request, _ *session.T) { // {{{ areas, err := TriggersRetrieve() diff --git a/static/css/datapoints.css b/static/css/datapoints.css index 0713253..35f613e 100644 --- a/static/css/datapoints.css +++ b/static/css/datapoints.css @@ -99,7 +99,7 @@ label { } #datapoints { display: grid; - grid-template-columns: repeat(5, min-content); + grid-template-columns: repeat(4, min-content); grid-gap: 8px 16px; margin-top: 16px; } diff --git a/static/images/delete.svg b/static/images/delete.svg deleted file mode 100644 index 23ba519..0000000 --- a/static/images/delete.svg +++ /dev/null @@ -1,67 +0,0 @@ - - - - diff --git a/static/less/datapoints.less b/static/less/datapoints.less index 7483cc9..2bffef9 100644 --- a/static/less/datapoints.less +++ b/static/less/datapoints.less @@ -2,7 +2,7 @@ #datapoints { display: grid; - grid-template-columns: repeat(5, min-content); + grid-template-columns: repeat(4, min-content); grid-gap: 8px 16px; margin-top: 16px; diff --git a/views/pages/datapoints.gotmpl b/views/pages/datapoints.gotmpl index 50e3727..a3c073f 100644 --- a/views/pages/datapoints.gotmpl +++ b/views/pages/datapoints.gotmpl @@ -1,6 +1,5 @@ {{ define "page" }} - {{ $version := .VERSION }} - + {{ block "page_label" . }}{{end}} @@ -11,7 +10,6 @@