aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore3
-rw-r--r--config/ctrack.dbbin536576 -> 0 bytes
-rw-r--r--config/settings/gcloud_settings.py4
-rw-r--r--ctrack/caf/templates/caf/applicablesystem_list.html7
-rw-r--r--ctrack/caf/templates/caf/caf_list.html6
-rw-r--r--ctrack/static/css/project.css45
-rw-r--r--ctrack/static/css/project.css.map7
-rw-r--r--ctrack/static/sass/project.css.map7
-rw-r--r--ctrack/static/sass/project.scss4
-rw-r--r--ctrack/templates/base.html8
10 files changed, 25 insertions, 66 deletions
diff --git a/.gitignore b/.gitignore
index 31ed3b0..18bf420 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,7 +62,8 @@ target/
# pyenv
.python-version
-
+# local database
+ctrack.db
# Environments
.venv
diff --git a/config/ctrack.db b/config/ctrack.db
deleted file mode 100644
index 4c139dc..0000000
--- a/config/ctrack.db
+++ /dev/null
Binary files differ
diff --git a/config/settings/gcloud_settings.py b/config/settings/gcloud_settings.py
index c7c2680..8bb7574 100644
--- a/config/settings/gcloud_settings.py
+++ b/config/settings/gcloud_settings.py
@@ -209,7 +209,7 @@ else:
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.sqlite3',
- 'NAME': os.path.join(BASE_DIR, 'ctrack.db'),
+ 'NAME': os.path.join(ROOT_DIR, 'ctrack.db'),
}
}
# [END db_setup]
@@ -219,7 +219,7 @@ if os.getenv('TRAMPOLINE_CI', None):
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.sqlite3',
- 'NAME': os.path.join(BASE_DIR, 'db.sqlite3')
+ 'NAME': os.path.join(ROOT_DIR, 'db.sqlite3')
}
}
diff --git a/ctrack/caf/templates/caf/applicablesystem_list.html b/ctrack/caf/templates/caf/applicablesystem_list.html
index b34fa33..6552f45 100644
--- a/ctrack/caf/templates/caf/applicablesystem_list.html
+++ b/ctrack/caf/templates/caf/applicablesystem_list.html
@@ -5,11 +5,16 @@
{% block title %}Systems in Scope{% endblock %}
{% block content %}
+ <script>$(document).ready(function() {
+ $('#datatable').DataTable();
+ } );
+ </script>
+
<div class="col-md-12">
<div class="row">
<div class="col-sm-12">
<h3>Systems in Scope</h3>
- <table id="datatable" class="display compact cell-border" style="width:100%">
+ <table id="datatable" class="table table-striped table-bordered compact cell-border" style="width:100%">
<thead>
<tr>
<th>Organisation</th>
diff --git a/ctrack/caf/templates/caf/caf_list.html b/ctrack/caf/templates/caf/caf_list.html
index b7433c7..d82a709 100644
--- a/ctrack/caf/templates/caf/caf_list.html
+++ b/ctrack/caf/templates/caf/caf_list.html
@@ -3,13 +3,17 @@
{% load static %}
{% block title %} CAF - All CAF Summary {% endblock %}
+{% block css %}
+ <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.5.2/css/bootstrap.css">
+ <link rel="stylesheet" href="https://cdn.datatables.net/1.10.22/css/dataTables.bootstrap4.min.css">
+{% endblock %}
{% block content %}
<div class="col-md-12">
<h4>CAF List</h4>
<div class="row">
<div class="col-md-12 bg-light my-2 py-2">
- <table id="datatable" class="display compact cell-border" style="width:100%">
+ <table id="datatable" class="table table-bordered compact cell-border" style="width:100%">
<thead>
<tr>
<th>Organisation</th>
diff --git a/ctrack/static/css/project.css b/ctrack/static/css/project.css
deleted file mode 100644
index f4f8ce6..0000000
--- a/ctrack/static/css/project.css
+++ /dev/null
@@ -1,45 +0,0 @@
-.alert-debug {
- background-color: #fff;
- border-color: #d6e9c6;
- color: #000; }
-
-.alert-error {
- background-color: #f2dede;
- border-color: #eed3d7;
- color: #b94a48; }
-
-.bg-light {
- background-color: green; }
-
-.lemon-bar {
- box-shadow: 0 4px 5px rgba(0, 0, 0, 0.3); }
-
-#chunky {
- border: 8px dashed yellowgreen;
- border-radius: 10px;
- box-shadow: 3px 10px 12px lightgray; }
-
-.tabaligncenter {
- text-align: center; }
-
-.table-sm tr {
- font-size: 0.85rem;
- line-height: 15px;
- min-height: 10px; }
-
-#partially-achieved-cell {
- background-color: #f79400;
- color: white; }
-
-#achieved-cell {
- background-color: green;
- color: white; }
-
-#not-achieved-cell {
- background-color: red;
- color: white; }
-
-#_title {
- color: orangered; }
-
-/*# sourceMappingURL=project.css.map */
diff --git a/ctrack/static/css/project.css.map b/ctrack/static/css/project.css.map
deleted file mode 100644
index cac9465..0000000
--- a/ctrack/static/css/project.css.map
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-"version": 3,
-"mappings": "AA2BA,YAAa;EACX,gBAAgB,EAhBV,IAAI;EAiBV,YAAY,EAhBD,OAAO;EAiBlB,KAAK,EAhBC,IAAI;;AAmBZ,YAAa;EACX,gBAAgB,EAnBX,OAAO;EAoBZ,YAAY,EAnBF,OAAO;EAoBjB,KAAK,EAnBD,OAAO;;AAsBb,SAAU;EACR,gBAAgB,EAAE,KAAK;;AAGzB,UAAW;EACT,UAAU,EAAE,4BACd;;AAaA,OAAQ;EACN,MAAM,EAAE,sBAAsB;EAC9B,aAAa,EAAE,IAAI;EACnB,UAAU,EAAE,uBAAuB;;AAGrC,eAAgB;EACd,UAAU,EAAE,MAAM;;AAGpB,YAAa;EACX,SAAS,EAAE,OAAO;EAClB,WAAW,EAAE,IAAI;EACjB,UAAU,EAAE,IAAI;;AAIlB,wBAAyB;EACvB,gBAAgB,EAAE,OAAgB;EAClC,KAAK,EAAE,KAAK;;AAGd,cAAe;EACb,gBAAgB,EAAE,KAAK;EACvB,KAAK,EAAE,KAAK;;AAGd,kBAAmB;EACjB,gBAAgB,EAAE,GAAG;EACrB,KAAK,EAAE,KAAK;;AASd,OAAQ;EACN,KAAK,EAAE,SAAS",
-"sources": ["../sass/project.scss"],
-"names": [],
-"file": "project.css"
-}
diff --git a/ctrack/static/sass/project.css.map b/ctrack/static/sass/project.css.map
deleted file mode 100644
index a014d64..0000000
--- a/ctrack/static/sass/project.css.map
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-"version": 3,
-"mappings": "AA2BA,YAAa;EACX,gBAAgB,EAhBV,IAAI;EAiBV,YAAY,EAhBD,OAAO;EAiBlB,KAAK,EAhBC,IAAI;;AAmBZ,YAAa;EACX,gBAAgB,EAnBX,OAAO;EAoBZ,YAAY,EAnBF,OAAO;EAoBjB,KAAK,EAnBD,OAAO;;AAsBb,SAAU;EACR,gBAAgB,EAAE,KAAK;;AAGzB,UAAW;EACT,gBAAgB,EAAE,GAAG;EACrB,YAAY,EAAE,MAAM;;AAStB,OAAQ;EACN,MAAM,EAAE,sBAAsB;EAC9B,aAAa,EAAE,IAAI;EACnB,UAAU,EAAE,uBAAuB;;AAGrC,eAAgB;EACd,UAAU,EAAE,MAAM;;AAGpB,YAAa;EACX,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,IAAI;EACjB,UAAU,EAAE,IAAI;;AAGlB,UAAW;EACT,gBAAgB,EAAE,oBAAoB;EACtC,UAAU,EAAE,uBAAuB;EACnC,MAAM,EAvDO,IAAI;;AA0DnB,OAAQ;EACN,KAAK,EAAE,SAAS",
-"sources": ["project.scss"],
-"names": [],
-"file": "project.css"
-}
diff --git a/ctrack/static/sass/project.scss b/ctrack/static/sass/project.scss
index b391b3d..1c9249c 100644
--- a/ctrack/static/sass/project.scss
+++ b/ctrack/static/sass/project.scss
@@ -41,6 +41,10 @@ $input-height: 49px;
background-color: green;
}
+body {
+ padding-top: 70px;
+}
+
.lemon-bar {
box-shadow: 0 4px 5px rgba(0, 0, 0, .3)
}
diff --git a/ctrack/templates/base.html b/ctrack/templates/base.html
index 533938a..32ec1b3 100644
--- a/ctrack/templates/base.html
+++ b/ctrack/templates/base.html
@@ -25,11 +25,15 @@
{# <link href="jumbotron.css" rel="stylesheet">#}
<!-- This file stores project-specific CSS -->
- <link href="{% static 'css/project.css' %}" rel="stylesheet">
{# <link rel="stylesheet" type="text/css" href="css/DataTables/datatables.min.css"/>#}
- {# <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}/css/bootstrap.css" />#}
<link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/v/dt/dt-1.10.20/af-2.3.4/b-1.6.1/b-print-1.6.1/cr-1.5.2/r-2.2.3/datatables.min.css"/>
+ <link href="{% static 'css/project.css' %}" rel="stylesheet">
{% endblock %}
+ <style>
+ body {
+ padding-top: 70px;
+ }
+ </style>
</head>
<body>
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-08 21:32:37 +0000