george/borg-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Colour repo div based on archives/errors

Browse Source
This commit is contained in:
George Lacey 2021-05-09 05:07:44 +01:00
parent cf099292fe
commit 820e0b391f
4 changed files with 39 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
borgweb/borg/models/repo.py
View File

@ -11,6 +11,16 @@ class Repo(models.Model):
last_modified = models.DateTimeField() last_modified = models.DateTimeField()
label = models.OneToOneField(Label, on_delete=models.CASCADE, unique=True) label = models.OneToOneField(Label, on_delete=models.CASCADE, unique=True)
def archive_after_latest_error(self):
latest_archive = self.latest_archive()
latest_error = self.latest_error()
if latest_archive is None:
return False
elif latest_error is None:
return True
else:
return latest_archive.start > latest_error.time
def last_backup(self): def last_backup(self):
if self.archive_set.all().exists(): if self.archive_set.all().exists():
latest = self.latest_archive().start.replace(tzinfo=None) latest = self.latest_archive().start.replace(tzinfo=None)
@ -20,7 +30,18 @@ class Repo(models.Model):
return "No archives stored" return "No archives stored"
def latest_archive(self): def latest_archive(self):
return self.archive_set.order_by('-start')[0] archives = self.archive_set.order_by('-start')
if len(archives) > 0:
return archives[0]
else:
return None
def latest_error(self):
errors = self.label.errors.all().order_by('-time')
if len(errors) > 0:
return errors[0]
else:
return None
def size(self): def size(self):
if self.archive_set.all().exists(): if self.archive_set.all().exists():
@ -35,9 +56,6 @@ class Repo(models.Model):
errors = self.label.errors.all().filter(time__gt=days_ago) errors = self.label.errors.all().filter(time__gt=days_ago)
return errors return errors
def archive_dates(self):
days = self.get_archive_days()
def get_archive_days(self): def get_archive_days(self):
current_day = datetime.utcnow().day current_day = datetime.utcnow().day
days = [] days = []

1
borgweb/borg/static/css/index.css
View File

@ -1,7 +1,6 @@
div { div {
padding: 8px; padding: 8px;
margin: 8px; margin: 8px;
background: lightskyblue;
} }
dl { dl {

6
borgweb/borg/static/js/index.js
View File

@ -1,7 +1,7 @@
window.addEventListener("DOMContentLoaded", function () {
window.addEventListener("DOMContentLoaded", function() {
const hour_json = JSON.parse(document.getElementById('hour_list').textContent); const hour_json = JSON.parse(document.getElementById('hour_list').textContent);
hour_json.forEach(function(repo) { hour_json.forEach(function (repo) {
console.log(repo.hours); console.log(repo.hours);
}) })
}, false); }, false);

14
borgweb/borg/templates/borg/index.html
View File

@ -4,20 +4,26 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<title>Borg Summary</title> <title>Borg Summary</title>
{% load static %} {% load static %}
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.0/dist/css/bootstrap.min.css" integrity="sha384-B0vP5xmATw1+K9KRQjQERJvTumQW0nPEzvF6L/Z6nronJ3oUOFUFpCjEUQouq2+l" crossorigin="anonymous"> <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.0/dist/css/bootstrap.min.css" integrity="sha384-B0vP5xmATw1+K9KRQjQERJvTumQW0nPEzvF6L/Z6nronJ3oUOFUFpCjEUQouq2+l" crossorigin="anonymous">
<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.0/dist/js/bootstrap.bundle.min.js" integrity="sha384-Piv4xVNRyMGpqkS2by6br4gNJ7DXjqk09RmUpJ8jgGtD7zP9yug3goQfGII0yAns" crossorigin="anonymous"></script> <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.0/dist/js/bootstrap.bundle.min.js" integrity="sha384-Piv4xVNRyMGpqkS2by6br4gNJ7DXjqk09RmUpJ8jgGtD7zP9yug3goQfGII0yAns" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
<link rel="stylesheet" type="text/css" href="{% static 'css/index.css' %}"> <link rel="stylesheet" type="text/css" href="{% static 'css/index.css' %}">
{{ hour_list|json_script:"hour_list" }} {{ hour_list|json_script:"hour_list" }}
<script src="{% static 'js/index.js' %}"></script>
</head> </head>
<body> <body>
<p id="hours"></p> <p id="hours"></p>
{% if repo_list %} {% if repo_list %}
{% for repo in repo_list %} {% for repo in repo_list %}
<div class="col-md-4 rounded float-xl-left"> {% if repo.archive_after_latest_error %}
<div class="col-md-4 rounded float-xl-left bg-success">
{% else %}
<div class="col-md-4 rounded float-xl-left bg-danger">
{% endif %}
<h3 class="repo_label">{{ repo.label }}<small class="text-muted"> {{ repo.location }}</small></h3> <h3 class="repo_label">{{ repo.label }}<small class="text-muted"> {{ repo.location }}</small></h3>
<dl class="row"> <dl class="row">
<dt class="col-sm-3">Latest backup:</dt> <dt class="col-sm-3">Latest backup:</dt>
@ -44,9 +50,11 @@
</dl> </dl>
</div> </div>
{% endfor %} {% endfor %}
<canvas id="daily_backup_graphic" width="200" height="100"></canvas>
{% else %} {% else %}
<p>No repos found.</p> <p>No repos found.</p>
{% endif %} {% endif %}
<div class="col-md-4 rounded float-xl-left">
<canvas id="myChart"></canvas>
</div>
</body> </body>
</html> </html>