From 7d0501823d5a44cd97619d5e607c71f08f3a6968 Mon Sep 17 00:00:00 2001
From: hunterlong <info@socialeck.com>
Date: Thu, 20 Feb 2020 23:15:48 -0800
Subject: [PATCH] ye

---
 core/services.go                              |  4 +-
 frontend/src/assets/scss/base.scss            | 18 +++++++
 frontend/src/components/Index/Group.vue       |  6 +--
 .../components/Index/GroupServiceFailures.vue | 22 +++++---
 handlers/services.go                          |  4 +-
 types/gorm.go                                 | 53 ++++++++++++++++---
 6 files changed, 88 insertions(+), 19 deletions(-)

diff --git a/core/services.go b/core/services.go
index 1b5109ca..d3f32fd7 100644
--- a/core/services.go
+++ b/core/services.go
@@ -283,7 +283,7 @@ func GraphHitsDataRaw(service types.ServiceInterface, start, end time.Time, grou
 }
 
 // GraphDataRaw will return all the hits between 2 times for a Service
-func GraphFailuresDataRaw(service types.ServiceInterface, start, end time.Time, group string) []types.TimeValue {
+func GraphFailuresDataRaw(service types.ServiceInterface, start, end time.Time, group string) []*types.TimeValue {
 	srv := service.(*Service)
 
 	query := Database(&types.Failure{}).
@@ -292,7 +292,7 @@ func GraphFailuresDataRaw(service types.ServiceInterface, start, end time.Time,
 		MultipleSelects(types.SelectByTime(group), types.CountAmount()).
 		GroupByTimeframe().Debug()
 
-	outgoing, err := query.ToTimeValue()
+	outgoing, err := query.ToTimeValue(start, end)
 	if err != nil {
 		log.Error(err)
 	}
diff --git a/frontend/src/assets/scss/base.scss b/frontend/src/assets/scss/base.scss
index 925def8a..0cd79339 100644
--- a/frontend/src/assets/scss/base.scss
+++ b/frontend/src/assets/scss/base.scss
@@ -133,6 +133,24 @@ HTML,BODY {
     border-radius: $global-border-radius;
 }
 
+.mini_success {
+  background-color: #f3f3f3;
+}
+
+.no-decoration {
+  color: black;
+  text-decoration: none;
+}
+
+.no-decoration:HOVER {
+  color: #2b2b2b;
+  text-decoration: none;
+}
+
+.mini_error {
+  background-color: #ffbbbb;
+}
+
 .card {
     background-color: $service-background;
     border: $service-border;
diff --git a/frontend/src/components/Index/Group.vue b/frontend/src/components/Index/Group.vue
index 1e98769f..4d0ea786 100644
--- a/frontend/src/components/Index/Group.vue
+++ b/frontend/src/components/Index/Group.vue
@@ -1,10 +1,10 @@
 <template>
     <div class="col-12 full-col-12">
-        <h4 v-if="group.name !== 'Empty Group'" class="group_header">{{group.name}}</h4>
-        <div class="list-group online_list mb-3">
+        <h4 v-if="group.name !== 'Empty Group'" class="group_header mb-2 mt-4">{{group.name}}</h4>
+        <div class="list-group online_list mb-4">
 
             <a v-for="(service, index) in $store.getters.servicesInGroup(group.id)" v-bind:key="index" class="service_li list-group-item list-group-item-action">
-                {{service.name}}
+                <router-link class="no-decoration" :to="serviceLink(service)">{{service.name}}</router-link>
                 <span class="badge bg-success float-right pulse-glow">{{service.online ? "ONLINE" : "OFFLINE"}}</span>
 
                 <GroupServiceFailures :service="service"/>
diff --git a/frontend/src/components/Index/GroupServiceFailures.vue b/frontend/src/components/Index/GroupServiceFailures.vue
index bf5385ce..0c289165 100644
--- a/frontend/src/components/Index/GroupServiceFailures.vue
+++ b/frontend/src/components/Index/GroupServiceFailures.vue
@@ -1,8 +1,12 @@
 <template>
-    <div class="row">
-
-        <span class="bg-danger">o</span>
-
+    <div>
+        <div class="d-flex mt-3 mb-2">
+            <div class="flex-fill service_day" v-for="(d, index) in failureData" :class="{'mini_error': d.amount > 0, 'mini_success': d.amount === 0}"></div>
+        </div>
+        <div class="row mt-2">
+            <div class="col-6 text-left font-2 text-muted">30 Days Ago</div>
+            <div class="col-6 text-right font-2 text-muted">Today</div>
+        </div>
     </div>
 </template>
 
@@ -16,7 +20,7 @@ export default {
   },
     data() {
         return {
-            failureData: null
+            failureData: null,
         }
     },
   props: {
@@ -30,7 +34,7 @@ export default {
     },
     methods: {
       async lastDaysFailures() {
-          const start = this.nowSubtract((3600 * 24) * 30)
+          const start = this.nowSubtract(86400 * 30)
         this.failureData = await Api.service_failures_data(this.service.id, this.toUnix(start), this.toUnix(this.now()), "day")
       }
     }
@@ -39,6 +43,12 @@ export default {
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style scoped>
+    .service_day {
+        height: 20px;
+        margin-right: 2px;
+        border-radius: 4px;
+    }
+
     @keyframes pulse_animation {
         0% { transform: scale(1); }
         30% { transform: scale(1); }
diff --git a/handlers/services.go b/handlers/services.go
index 4ae1f785..9290a71e 100644
--- a/handlers/services.go
+++ b/handlers/services.go
@@ -235,8 +235,8 @@ func apiServiceFailureDataHandler(w http.ResponseWriter, r *http.Request) {
 	startField := utils.ToInt(fields.Get("start"))
 	endField := utils.ToInt(fields.Get("end"))
 
-	start := time.Unix(startField, 0)
-	end := time.Unix(endField, 0)
+	start := time.Unix(startField, 0).UTC()
+	end := time.Unix(endField, 0).UTC()
 
 	obj := core.GraphFailuresDataRaw(service, start, end, grouping)
 	returnJson(obj, w, r)
diff --git a/types/gorm.go b/types/gorm.go
index 8cf7f34a..2e298568 100644
--- a/types/gorm.go
+++ b/types/gorm.go
@@ -111,7 +111,7 @@ type Database interface {
 	ToChart() ([]*DateScan, error)
 
 	GroupByTimeframe() Database
-	ToTimeValue() ([]TimeValue, error)
+	ToTimeValue(time.Time, time.Time) ([]*TimeValue, error)
 
 	MultipleSelects(args ...string) Database
 
@@ -509,12 +509,12 @@ type TimeValue struct {
 	Amount    int64     `json:"amount"`
 }
 
-func (it *Db) ToTimeValue() ([]TimeValue, error) {
+func (it *Db) ToTimeValue(start, end time.Time) ([]*TimeValue, error) {
 	rows, err := it.Database.Rows()
 	if err != nil {
 		return nil, err
 	}
-	var data []TimeValue
+	var data []*TimeValue
 	for rows.Next() {
 		var timeframe string
 		var amount int64
@@ -522,12 +522,53 @@ func (it *Db) ToTimeValue() ([]TimeValue, error) {
 			return nil, err
 		}
 		createdTime, _ := time.Parse(TIME, timeframe)
-		data = append(data, TimeValue{
-			Timeframe: createdTime,
+		fmt.Println("got: ", createdTime.UTC(), amount)
+		data = append(data, &TimeValue{
+			Timeframe: createdTime.UTC(),
 			Amount:    amount,
 		})
 	}
-	return data, nil
+	return fillMissing(data, start, end), nil
+}
+
+func parseTime(t time.Time) string {
+	return t.Format("2006-01-02T00:00:00Z")
+}
+
+func reparseTime(t string) time.Time {
+	re, _ := time.Parse("2006-01-02T00:00:00Z", t)
+	return re.UTC()
+}
+
+func fillMissing(vals []*TimeValue, start, end time.Time) []*TimeValue {
+	timeMap := make(map[string]*TimeValue)
+	var validSet []*TimeValue
+
+	for _, v := range vals {
+		timeMap[parseTime(v.Timeframe)] = v
+	}
+
+	current := start.UTC()
+	maxTime := end
+	for {
+		amount := int64(0)
+		currentStr := parseTime(current)
+		if timeMap[currentStr] != nil {
+			amount = timeMap[currentStr].Amount
+		}
+
+		validSet = append(validSet, &TimeValue{
+			Timeframe: reparseTime(currentStr),
+			Amount:    amount,
+		})
+
+		if current.After(maxTime) {
+			break
+		}
+		current = current.Add(24 * time.Hour)
+	}
+
+	return validSet
 }
 
 func (it *Db) ToChart() ([]*DateScan, error) {