Commit 53b131c6 authored by Jarod Owen's avatar Jarod Owen
Browse files

Resynchronize

Some changes were not committed at the merge of JDO_Main
parent b3f885c8
Pipeline #1168 passed with stages
in 1 minute and 35 seconds
Vue.component('log-entry', {
data: function () {
return {
count: 0
}
},
template: '<button v-on:click="count++">You clicked me {{ count }} times.</button>'
})
/* Vue.component('log-entry', {
data: function () {
return {
tater: "Whee!"
}
},
template: '<tr>\n<td>Kill Me!</td>\n</tr>'
}) */
//'<tr>\n<td>{{ code }}</td>\n<td>{{ door }}</td>\n<td>{{ ok }}</td>\n<td>{{ time }}</td>\n<td>{{ day }}</td>\n<td>{{ id }}</td>\n<td>{{ ug }}</td>\n<td>{{ dg }}</td>\n</tr>'
\ No newline at end of file
table {
border-collapse: collapse;
}
tr {
border-width: 3px;
border-style: solid;
border-color: black;
}
th, td {
border-left-width: 3px;
border-right-width: 3px;
border-left-style: solid;
border-right-style: solid;
border-left-color: black;
border-right-color: black;
text-align: center;
padding-left: 3px;
padding-right: 3px;
}
\ No newline at end of file
......@@ -4,6 +4,7 @@
<meta charset="utf-8">
<title>Doorcode</title>
<script src="vue.js"></script>
<link rel="stylesheet" type="text/css" href="log.css">
</head>
<body>
<header>
......@@ -17,21 +18,37 @@
<a href="map.html">Map</a>
<a href="index.html">Logout</a>
</header>
<table id="log">
<tr>
<th>Code</th>
<th>Door</th>
<th>OK?</th>
<th>Time</th>
<th>Date</th>
<th>User</th>
<th>UGroup</th>
<th>DGroup</th>
</tr>
<table>
<thead>
<tr class="head">
<th>Code</th>
<th>Door</th>
<th>DGroup</th>
<th>OK?</th>
<th>Time</th>
<th>Date</th>
<th>User</th>
<th>UGroup</th>
</tr>
</thead>
<tbody id="log">
<tr is="log-entry"
class="body"
v-for="row in rows"
:key="row.id"
:code="row.code"
:door="row.door"
:ok="row.ok"
:time="row.time"
:day="row.day"
:uid="row.uid"
:ug="row.ug"
:dg="row.dg"
></tr>
</tbody id="log">
</table>
<log-entry></log-entry>
</body>
<script type='module' src="log-entry.js"></script>
<!-- <script src="log.js"></script> -->
<!-- <script type='module' src="log-entry.js"></script> -->
<script src="log.js"></script>
</html>
\ No newline at end of file
/* import LogEntry from './log-entry.js'
Vue.component('log-entry', {
props: ['code', 'door', 'dg', 'ok', 'time', 'day', 'uid', 'ug'],
template: '<tr>\n<td>{{ code }}</td>\n<td>{{ door }}</td>\n<td>{{ dg }}</td>\n<td>{{ ok }}</td>\n<td>{{ time }}</td>\n<td>{{ day }}</td>\n<td>{{ uid }}</td>\n<td>{{ ug }}</td>\n</tr>'
})
export default {
new Vue ({
el: "#log",
components: {LogEntry}
} */
\ No newline at end of file
data: {
rows: [
{id: 0, code: "OOOOOOO", door: "001", ok: "", time: "08:00", day: "5 February 2020", uid: "0000000", ug: "Test0", dg: "A"},
{id: 1, code: "00800001", door: "001", ok: "X", time: "09:00", day: "5 February 2020", uid: "N/A", ug: "N/A", dg: "A"}
],
},
methods: {
}
})
\ No newline at end of file
import Multiselect from 'node_modules/vue-multiselect/src/vue-multiselect'
Vue.component('multiselect', Multiselect)
\ No newline at end of file
......@@ -32,13 +32,12 @@
<input type="button" value="Delete" name="del"><br/>
<input type="button" value="Update" name="up"><br/>
<input type="button" value="New" name="new"><br/>
<!-- <multiselect>
<!-- <multiselect>
<option value="A">A</option>
<option value="B">B</option>
<option value="C">C</option>
</multiselect> -->
</form id="usr">
<script src="user.js"></script>
<!-- <script src="mSel.js" type="module"></script> -->
</body>
</html>
\ No newline at end of file
/* import Multiselect from 'vue-multiselect'
Vue.component('multiselect', Multiselect) */
var usr = new Vue({
el: '#usr',
data: {
......@@ -25,4 +28,4 @@ var usr = new Vue({
}
}
}
})
\ No newline at end of file
})
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment