Skip to content

Commit 34273d4

Browse files
committed
[BUGFIXED]- Updated timestamps of job history
1 parent 78a25e0 commit 34273d4

File tree

2 files changed

+9
-115
lines changed

2 files changed

+9
-115
lines changed

src/views/AdminJobs.vue

Lines changed: 9 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
transition="scale-transition"
2121
offset-y
2222
min-width="auto"
23+
2324
>
2425
<template v-slot:activator="{ on, attrs }">
2526

@@ -46,63 +47,28 @@
4647
</v-date-picker>
4748
</v-menu>
4849
</v-col>
49-
<!-- <v-col cols="6" sm="4" md="2">
50-
<v-menu
51-
ref="menu"
52-
v-model="menu"
53-
:close-on-content-click="false"
54-
:return-value.sync="filters.start"
55-
transition="scale-transition"
56-
offset-y
57-
min-width="auto"
58-
>
59-
<template v-slot:activator="{ on, attrs }">
60-
61-
<v-text-field
62-
v-model="filters.start"
63-
readonly
64-
label="Start Date" type="string"
65-
prepend-icon="mdi-calendar"
66-
v-bind="attrs"
67-
v-on="on"
68-
></v-text-field>
69-
</template>
70-
<v-date-picker
71-
v-model="filters.start"
72-
no-title
73-
>
74-
<v-spacer></v-spacer>
75-
<v-btn text color="primary" @click="menu = false">
76-
Cancel
77-
</v-btn>
78-
<v-btn text color="primary" @click="$refs.menu.save(filters.start)">
79-
OK
80-
</v-btn>
81-
</v-date-picker>
82-
</v-menu>
83-
</v-col> -->
8450
<v-col cols="6" sm="4" md="2">
8551

8652
<v-text-field
8753
v-model="filters.username"
88-
label="Username" type="string"
54+
label="Username" type="string"
8955
></v-text-field>
9056
</v-col>
9157
<v-col cols="6" sm="4" md="2">
9258
<v-select
9359
:items="jobnames"
9460
v-model="filters.jobname"
9561
label="Job name"
96-
dense
62+
9763
>
98-
</v-select>
64+
</v-select>
9965
</v-col>
10066
<v-col cols="6" sm="4" md="2">
10167
<v-select
10268
:items="statuses"
10369
v-model="filters.status"
10470
label="Job status"
105-
dense
71+
10672
>
10773
</v-select>
10874
</v-col>
@@ -202,16 +168,13 @@
202168
let utcdate = new Date()
203169
utcdate.setTime(ms)
204170
const localTimeString = utcdate.toLocaleString()
205-
206-
//let utcdate = new Date(job.submitted)
207-
//const offsetMinutes = utcdate.getTimezoneOffset();
208-
//let localtime = new Date(utcdate.getTime() - offsetMinutes * 60 * 1000)
209-
//const localTimeString = localtime.toLocaleString()
210-
this.jobs[i].submitted = localTimeString
211-
console.log("job submitted "+ this.jobs[i].submitted)
171+
this.jobs[i].submitted = localTimeString
172+
212173
}
213174
if(job.start) {
175+
214176
let utcdate = new Date(job.start);
177+
215178
let localTimeString = utcdate.toLocaleString();
216179
this.jobs[i].start = localTimeString
217180
console.log(localTimeString);

src/views/WebResources.vue

Lines changed: 0 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -12,75 +12,6 @@
1212
<v-row align="center" justify="center" class="mx-3">
1313
<v-col cols="12" sm="4" md="6" lg="8">
1414

15-
<!-- <v-table fixed-header height="300px" >
16-
17-
<tbody>
18-
<tr v-if="is_admin">
19-
<td></td>
20-
21-
<td >
22-
<v-tooltip bottom>
23-
24-
<template v-slot:activator="{ on, attrs }">
25-
<v-btn class="my-1" @click="add()" v-bind="attrs" v-on="on">
26-
<v-icon >
27-
mdi-plus
28-
</v-icon> Add New
29-
</v-btn>
30-
</template>
31-
<span>Add a new resource</span>
32-
</v-tooltip>
33-
</td>
34-
35-
</tr>
36-
<tr v-if="!links || links.length === 0">
37-
<td> No Resources </td>
38-
39-
</tr>
40-
<tr v-else v-for="link in links"
41-
v-bind:key="link.id">
42-
<td class="text-left" style="padding-right: 100px;">
43-
<v-list-item
44-
:href="link.link"
45-
target="_blank">
46-
<v-list-item-icon>
47-
<v-icon>mdi-file-document</v-icon>
48-
</v-list-item-icon>
49-
<v-list-item-title class="ml-n5" style="padding-right: 30px;" title="Click to open">{{link.title}}</v-list-item-title>
50-
</v-list-item>
51-
</td>
52-
<td v-if="is_admin">
53-
<v-tooltip bottom>
54-
55-
<template v-slot:activator="{ on, attrs }">
56-
<v-btn fab small class="ma-2" color="primary" @click.stop="edit(link.id)" v-bind="attrs" v-on="on" variant="text">
57-
<v-icon >
58-
mdi-pencil
59-
</v-icon>
60-
61-
</v-btn>
62-
</template>
63-
<span>Edit</span>
64-
</v-tooltip>
65-
<v-tooltip bottom>
66-
67-
<template v-slot:activator="{ on, attrs }">
68-
<v-btn fab small class="ma-2" color="error" @click.stop="remove(link.id)" v-bind="attrs" v-on="on">
69-
<v-icon >
70-
mdi-delete
71-
</v-icon>
72-
</v-btn>
73-
</template>
74-
<span>Delete</span>
75-
</v-tooltip>
76-
77-
</td>
78-
79-
</tr>
80-
81-
</tbody>
82-
83-
</v-table> -->
8415
<v-list two-line>
8516
<v-list-item v-if="!links || links.length === 0">
8617
<h5>No Resources</h5>

0 commit comments

Comments
 (0)