added formatted table for es - some scss tweaks

4 files changed, 31 insertions, 21 deletions

diff --git a/ctrack/caf/templates/caf/essentialservice_list.html b/ctrack/caf/templates/caf/essentialservice_list.html
index 35f0aa5..16bbfba 100644
--- a/ctrack/caf/templates/caf/essentialservice_list.html
+++ b/ctrack/caf/templates/caf/essentialservice_list.html
@@ -7,13 +7,16 @@
 <div class="container">
 	<div class="row">
 		<div class="col-sm-12">
-		<h1>Essential Services</h1>
+		<h3>Essential Services</h3>
 	
-		<table class="table table-striped">
+		<table class="table-sm table-striped table-bordered">
 			<thead>
 			<tr>
 				<th>Organisation</th>
 				<th>Essential Service</th>
+				<th>Sub Mode</th>
+				<th class="tabaligncenter">Confidence Grade</th>
+				<th>Triage Review Date</th>
 				<th>Review Inspector</th>
 			</tr>
 			</thead>
@@ -21,6 +24,9 @@
 			<tr>
 				<td>{{ es.organisation.name }}</td>
 				<td>{{ es.name }}</td>
+				<td>{{ es.organisation.submode.descriptor }}</td>
+				<td class="tabaligncenter">{{ es.caf.confidence_grading.descriptor }}</td>
+				<td>{{ es.caf.triage_review_date }}</td>
 				<td>{{ es.caf.triage_review_inspector.name }}</td>
 			</tr>
 			{% endfor %}
diff --git a/ctrack/static/css/project.css b/ctrack/static/css/project.css
index dfcbc99..ceefa8a 100644
--- a/ctrack/static/css/project.css
+++ b/ctrack/static/css/project.css
@@ -1,50 +1,44 @@
 .alert-debug {
   background-color: #fff;
   border-color: #d6e9c6;
-  color: #000;
-}
+  color: #000; }
 
 .alert-error {
   background-color: #f2dede;
   border-color: #eed3d7;
-  color: #b94a48;
-}
+  color: #b94a48; }
 
 .bg-light {
-  background-color: green;
-}
+  background-color: green; }
 
 .btn:hover {
   background-color: red;
-  border-color: orange;
-}
+  border-color: orange; }
 
 .container a {
   color: darkslategrey;
   background-color: yellowgreen;
-  font-size: large;
-}
+  font-size: large; }
 
 #chunky {
   border: 8px dashed yellowgreen;
   border-radius: 10px;
-  box-shadow: 3px 10px 12px lightgray;
-}
+  box-shadow: 3px 10px 12px lightgray; }
+
+.tabaligncenter {
+  text-align: center; }
 
 .table-sm tr {
   font-size: 0.75rem;
   line-height: 10px;
-  min-height: 10px;
-}
+  min-height: 10px; }
 
 .textinput {
   background-color: lightgoldenrodyellow;
   box-shadow: 2px 10px 15px lightgray;
-  height: 49px;
-}
+  height: 49px; }
 
 #_title {
-  color: orangered;
-}
+  color: orangered; }
 
 /*# sourceMappingURL=project.css.map */
diff --git a/ctrack/static/css/project.css.map b/ctrack/static/css/project.css.map
index cee13e7..2a1418f 100644
--- a/ctrack/static/css/project.css.map
+++ b/ctrack/static/css/project.css.map
@@ -1 +1,7 @@
-{"version":3,"sourceRoot":"","sources":["../sass/project.scss"],"names":[],"mappings":"AA2BA;EACE,kBAhBM;EAiBN,cAhBW;EAiBX,OAhBM;;;AAmBR;EACE,kBAnBK;EAoBL,cAnBU;EAoBV,OAnBI;;;AAsBN;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;EACA;EACA,QAnDa;;;AAsDf;EACE","file":"project.css"}
\ No newline at end of file
+{
+"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;;AAGtB,YAAa;EACX,KAAK,EAAE,aAAa;EACpB,gBAAgB,EAAE,WAAW;EAC7B,SAAS,EAAE,KAAK;;AAGlB,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;;AAGlB,UAAW;EACT,gBAAgB,EAAE,oBAAoB;EACtC,UAAU,EAAE,uBAAuB;EACnC,MAAM,EAvDO,IAAI;;AA0DnB,OAAQ;EACN,KAAK,EAAE,SAAS",
+"sources": ["../sass/project.scss"],
+"names": [],
+"file": "project.css"
+}
diff --git a/ctrack/static/sass/project.scss b/ctrack/static/sass/project.scss
index 5980b48..36b9525 100644
--- a/ctrack/static/sass/project.scss
+++ b/ctrack/static/sass/project.scss
@@ -58,6 +58,10 @@ $input-height: 49px;
   box-shadow: 3px 10px 12px lightgray;
 }
 
+.tabaligncenter {
+  text-align: center;
+}
+
 .table-sm tr {
   font-size: 0.75rem;
   line-height: 10px;