Areas/section view for problems

This commit is contained in:
Magnus Åhall 2024-05-28 12:56:35 +02:00
parent db21b01589
commit e2f888f160
13 changed files with 182 additions and 83 deletions

17
main.go
View File

@ -443,8 +443,25 @@ func pageProblems(w http.ResponseWriter, _ *http.Request, _ *session.T) { // {{{
return
}
var found bool
problemsGrouped := make(map[string]map[string][]Problem)
for _, problem := range problems {
if _, found = problemsGrouped[problem.AreaName]; !found {
problemsGrouped[problem.AreaName] = make(map[string][]Problem)
}
if _, found = problemsGrouped[problem.AreaName][problem.SectionName]; !found {
problemsGrouped[problem.AreaName][problem.SectionName] = []Problem{}
}
problemsGrouped[problem.AreaName][problem.SectionName] = append(
problemsGrouped[problem.AreaName][problem.SectionName],
problem,
)
}
page.Data = map[string]any{
"Problems": problems,
"ProblemsGrouped": problemsGrouped,
}
page.Render(w)
return

View File

@ -35,12 +35,12 @@ h2:first-child {
h1 {
font-size: 1.5em;
color: #fb4934;
font-weight: 500;
font-weight: 800;
}
h2 {
font-size: 1.25em;
color: #b8bb26;
font-weight: 500;
font-weight: 800;
}
a {
color: #3f9da1;
@ -50,7 +50,7 @@ a:hover {
text-decoration: underline;
}
b {
font-weight: 500;
font-weight: 800;
}
input[type="text"],
textarea,
@ -80,7 +80,7 @@ button:focus {
}
span.date {
color: #d5c4a1;
font-weight: 500;
font-weight: 800;
}
span.time {
font-size: 0.9em;
@ -119,7 +119,7 @@ label {
border-bottom: unset;
}
#datapoints .header {
font-weight: 500;
font-weight: 800;
font-size: 0.85em;
color: #d5c4a1;
}

View File

@ -35,12 +35,12 @@ h2:first-child {
h1 {
font-size: 1.5em;
color: #fb4934;
font-weight: 500;
font-weight: 800;
}
h2 {
font-size: 1.25em;
color: #b8bb26;
font-weight: 500;
font-weight: 800;
}
a {
color: #3f9da1;
@ -50,7 +50,7 @@ a:hover {
text-decoration: underline;
}
b {
font-weight: 500;
font-weight: 800;
}
input[type="text"],
textarea,
@ -80,7 +80,7 @@ button:focus {
}
span.date {
color: #d5c4a1;
font-weight: 500;
font-weight: 800;
}
span.time {
font-size: 0.9em;

View File

@ -35,12 +35,12 @@ h2:first-child {
h1 {
font-size: 1.5em;
color: #fb4934;
font-weight: 500;
font-weight: 800;
}
h2 {
font-size: 1.25em;
color: #b8bb26;
font-weight: 500;
font-weight: 800;
}
a {
color: #3f9da1;
@ -50,7 +50,7 @@ a:hover {
text-decoration: underline;
}
b {
font-weight: 500;
font-weight: 800;
}
input[type="text"],
textarea,
@ -80,7 +80,7 @@ button:focus {
}
span.date {
color: #d5c4a1;
font-weight: 500;
font-weight: 800;
}
span.time {
font-size: 0.9em;
@ -152,7 +152,7 @@ label {
margin-bottom: 32px;
}
#page .page-label div {
font-weight: 500;
font-weight: 800;
font-size: 1.5em;
color: #fb4934;
}
@ -172,7 +172,7 @@ label {
#areas .area > .name {
background: #fb4934;
color: #fff;
font-weight: 500;
font-weight: 800;
padding: 4px 16px;
border-top-left-radius: 4px;
border-top-right-radius: 4px;
@ -196,10 +196,10 @@ label {
white-space: nowrap;
}
#areas .area .section .create .new {
font-weight: 500;
font-weight: 800;
}
#areas .area .section > .name {
font-weight: 500;
font-weight: 800;
}
#areas .area .section .triggers .trigger {
display: grid;

View File

@ -35,12 +35,12 @@ h2:first-child {
h1 {
font-size: 1.5em;
color: #fb4934;
font-weight: 500;
font-weight: 800;
}
h2 {
font-size: 1.25em;
color: #b8bb26;
font-weight: 500;
font-weight: 800;
}
a {
color: #3f9da1;
@ -50,7 +50,7 @@ a:hover {
text-decoration: underline;
}
b {
font-weight: 500;
font-weight: 800;
}
input[type="text"],
textarea,
@ -80,7 +80,7 @@ button:focus {
}
span.date {
color: #d5c4a1;
font-weight: 500;
font-weight: 800;
}
span.time {
font-size: 0.9em;
@ -116,12 +116,12 @@ label {
}
#problems-list .header,
#acknowledged-list .header {
font-weight: 500;
font-weight: 800;
}
#problems-list .trigger,
#acknowledged-list .trigger {
color: #fb4934;
font-weight: 500;
font-weight: 800;
}
#problems-list .acknowledge img,
#acknowledged-list .acknowledge img {
@ -130,3 +130,26 @@ label {
#acknowledged-list.hidden {
display: none;
}
#areas {
display: flex;
flex-wrap: wrap;
gap: 12px;
margin-top: 16px;
}
#areas .area .section {
display: grid;
grid-template-columns: repeat(2, min-content);
grid-gap: 8px 12px;
}
#areas .area .section .name {
color: #f7edd7;
grid-column: 1 / -1;
font-weight: bold !important;
line-height: 24px;
}
#areas .area .section div {
white-space: nowrap;
}
.hidden {
display: none;
}

View File

@ -35,12 +35,12 @@ h2:first-child {
h1 {
font-size: 1.5em;
color: #fb4934;
font-weight: 500;
font-weight: 800;
}
h2 {
font-size: 1.25em;
color: #b8bb26;
font-weight: 500;
font-weight: 800;
}
a {
color: #3f9da1;
@ -50,7 +50,7 @@ a:hover {
text-decoration: underline;
}
b {
font-weight: 500;
font-weight: 800;
}
input[type="text"],
textarea,
@ -80,7 +80,7 @@ button:focus {
}
span.date {
color: #d5c4a1;
font-weight: 500;
font-weight: 800;
}
span.time {
font-size: 0.9em;

View File

@ -35,12 +35,12 @@ h2:first-child {
h1 {
font-size: 1.5em;
color: #fb4934;
font-weight: 500;
font-weight: 800;
}
h2 {
font-size: 1.25em;
color: #b8bb26;
font-weight: 500;
font-weight: 800;
}
a {
color: #3f9da1;
@ -50,7 +50,7 @@ a:hover {
text-decoration: underline;
}
b {
font-weight: 500;
font-weight: 800;
}
input[type="text"],
textarea,
@ -80,7 +80,7 @@ button:focus {
}
span.date {
color: #d5c4a1;
font-weight: 500;
font-weight: 800;
}
span.time {
font-size: 0.9em;

View File

@ -20,4 +20,13 @@ export class UI {
localStorage.setItem('show_acknowledged', false)
}
}
displayList() {
document.querySelector('.display-list').classList.remove('hidden')
document.querySelector('.display-areas').classList.add('hidden')
}
displayAreas() {
document.querySelector('.display-list').classList.add('hidden')
document.querySelector('.display-areas').classList.remove('hidden')
}
}

View File

@ -83,7 +83,7 @@
&>.name {
background: @color1;
color: #fff;
font-weight: 500;
font-weight: @bold;
padding: 4px 16px;
border-top-left-radius: 4px;
border-top-right-radius: 4px;

View File

@ -30,3 +30,33 @@
#acknowledged-list.hidden{
display: none;
}
#areas {
display: flex;
flex-wrap: wrap;
gap: 12px;
margin-top: 16px;
.area {
.section {
display: grid;
grid-template-columns: repeat(2, min-content);
grid-gap: 8px 12px;
.name {
color: @text2;
grid-column: 1 / -1;
font-weight: bold !important;
line-height: 24px;
}
div {
white-space: nowrap;
}
}
}
}
.hidden {
display: none;
}

View File

@ -12,7 +12,7 @@
@color4: #3f9da1;
@color5: #fe8019;
@bold: 500;
@bold: 800;
.lighterOrDarker(@color, @amount) {
@result: lighten(@color, @amount);

View File

@ -9,8 +9,12 @@
{{ block "page_label" . }}{{end}}
<input type="checkbox" id="show-acked" onclick="_ui.toggleAcknowledged(event)"> <label for="show-acked">Show acknowledged</label>
<div>
<input type="radio" name="display" id="display-table" onclick="_ui.displayAreas()" checked> <label for="display-table">Areas</label>
<input type="radio" name="display" id="display-list" onclick="_ui.displayList()"> <label for="display-list">List</label>
</div>
<div class="display-list hidden">
<div id="problems-list">
<div style="grid-column: 1/-1; margin-top: 32px;"><h2>Current</h2></div>
@ -40,6 +44,8 @@
{{ end }}
</div>
<input type="checkbox" id="show-acked" onclick="_ui.toggleAcknowledged(event)"> <label for="show-acked">Show acknowledged</label>
<div id="acknowledged-list" class="hidden">
<div style="grid-column: 1/-1; margin-top: 32px;"><h2>Acknowledged</h2></div>
<div class="header">Trigger</div>
@ -59,18 +65,32 @@
<div class="acknowledge"><a href="/problem/unacknowledge/{{ .ID }}"><img src="/images/{{ $version }}/acknowledge-outline.svg"></a></div>
{{ end }}
</div>
</div>
<div class="display-areas">
<div id="areas">
{{ range .Data.Areas }}
{{ range $areaName, $sections := .Data.ProblemsGrouped }}
<div class="area">
<div class="name">{{ .Name }}</div>
{{ range .SortedSections }}
<div class="section">
<div class="name">{{ .Name }}</div>
</div>
<div class="name">{{ $areaName }}</div>
{{ range $sectionName, $problems := $sections }}
<div class="section problems">
<div class="name">{{ $sectionName }}</div>
{{ range $problems }}
<div class="trigger">{{ .TriggerName }}</div>
{{ if eq (.Start | html) "0001-01-01 00:00:00 +0000 UTC" }}
<div class="since"></div>
{{ else }}
<div class="since">{{ format_time .Start }}</div>
{{ end }}
{{ end }}
</div>
{{ end }}
</div>
{{ end }}
</div>
</div>
{{ end }}