Skip to content

E
esi-table-data
Commit e70e6260 authored by Vasyl Bodnaruk's avatar Vasyl Bodnaruk
Browse files
Options

Replace uuid on spider name

parent bcdbee56
Show whitespace changes
Inline Side-by-side
Showing with 13 additions and 13 deletions
esi/scraper/models.py
View file @ e70e6260
...@@ -75,7 +75,7 @@ class Job(models.Model): ...@@ -75,7 +75,7 @@ class Job(models.Model):
return { return {
'id': self.pk, 'id': self.pk,
'name': self.name, 'name': self.name,
'uuid': self.job_uuid, 'spider': self.spider.name,
'create_time': self.create_time, 'create_time': self.create_time,
'start_time': self.start_time, 'start_time': self.start_time,
'end_time': self.end_time, 'end_time': self.end_time,
......
esi/static/js/tables.js
View file @ e70e6260
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
return ` return `
<tr id="${data.id}"> <tr id="${data.id}">
<td data-col="job">${data.name}</td> <td data-col="job">${data.name}</td>
<td data-col="uuid">${data.uuid}</td> <td data-col="spider">${data.spider}</td>
<td data-col="created-date">${new Date(data.create_time).format('dd.mm.yyyy HH:MM')}</td> <td data-col="created-date">${new Date(data.create_time).format('dd.mm.yyyy HH:MM')}</td>
<td data-col="status" class="text-success">${data.status}</td> <td data-col="status" class="text-success">${data.status}</td>
<td data-col="action"> <td data-col="action">
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
return ` return `
<tr id="${data.id}"> <tr id="${data.id}">
<td data-col="job">${data.name}</td> <td data-col="job">${data.name}</td>
<td data-col="uuid">${data.uuid}</td> <td data-col="spider">${data.spider}</td>
<td data-col="created-date">${data.create_time ? new Date(data.create_time).format('dd.mm.yyyy HH:MM') : 'No date'}</td> <td data-col="created-date">${data.create_time ? new Date(data.create_time).format('dd.mm.yyyy HH:MM') : 'No date'}</td>
<td data-col="start-date">${data.start_time ? new Date(data.start_time).format('dd.mm.yyyy HH:MM') : 'No date'}</td> <td data-col="start-date">${data.start_time ? new Date(data.start_time).format('dd.mm.yyyy HH:MM') : 'No date'}</td>
<td data-col="status" class="text-success">${data.status}</td> <td data-col="status" class="text-success">${data.status}</td>
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
return ` return `
<tr id="${data.id}"> <tr id="${data.id}">
<td data-col="job">${data.name}</td> <td data-col="job">${data.name}</td>
<td data-col="uuid">${data.uuid}</td> <td data-col="spider">${data.spider}</td>
<td data-col="created-date">${data.create_time ? new Date(data.create_time).format('dd.mm.yyyy HH:MM') : 'No date'}</td> <td data-col="created-date">${data.create_time ? new Date(data.create_time).format('dd.mm.yyyy HH:MM') : 'No date'}</td>
<td data-col="start-date">${data.start_time ? new Date(data.start_time).format('dd.mm.yyyy HH:MM') : 'No date'}</td> <td data-col="start-date">${data.start_time ? new Date(data.start_time).format('dd.mm.yyyy HH:MM') : 'No date'}</td>
<td data-col="finished-date">${data.end_time ? new Date(data.end_time).format('dd.mm.yyyy HH:MM') : 'No date'}</td> <td data-col="finished-date">${data.end_time ? new Date(data.end_time).format('dd.mm.yyyy HH:MM') : 'No date'}</td>
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
return ` return `
<tr id="${data.id}"> <tr id="${data.id}">
<td data-col="job">${data.name}</td> <td data-col="job">${data.name}</td>
<td data-col="uuid">${data.uuid}</td> <td data-col="spider">${data.spider}</td>
<td data-col="created-date">${new Date(data.create_time).format('dd.mm.yyyy HH:MM')}</td> <td data-col="created-date">${new Date(data.create_time).format('dd.mm.yyyy HH:MM')}</td>
<td data-col="start-date">${new Date(data.create_time).format('dd.mm.yyyy HH:MM')}</td> <td data-col="start-date">${new Date(data.create_time).format('dd.mm.yyyy HH:MM')}</td>
<td data-col="finished-date">${new Date(data.create_time).format('dd.mm.yyyy HH:MM')}</td> <td data-col="finished-date">${new Date(data.create_time).format('dd.mm.yyyy HH:MM')}</td>
......
esi/templates/job_list.html
View file @ e70e6260
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<table data-table="pending" class="table table-sm table-custom"> <table data-table="pending" class="table table-sm table-custom">
<thead class="thead-inverse"> <thead class="thead-inverse">
<th>Job</th> <th>Job</th>
<th>Uuid</th> <th>Spider</th>
<th>Created date</th> <th>Created date</th>
<th>Status</th> <th>Status</th>
<th style="width: 250px">Actions</th> <th style="width: 250px">Actions</th>
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
{% for i in jobs.pending %} {% for i in jobs.pending %}
<tr id="{{ i.pk }}"> <tr id="{{ i.pk }}">
<td data-col="job">{{ i.name }}</td> <td data-col="job">{{ i.name }}</td>
<td data-col="uuid">{{ i.job_uuid }}</td> <td data-col="spider">{{ i.spider }}</td>
<td data-col="created-date">{{ i.create_time }}</td> <td data-col="created-date">{{ i.create_time }}</td>
<td data-col="status" class="text-success">{{ i.status }}</td> <td data-col="status" class="text-success">{{ i.status }}</td>
<td data-col="action"> <td data-col="action">
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
<table data-table="running" class="table table-sm table-custom"> <table data-table="running" class="table table-sm table-custom">
<thead class="thead-inverse"> <thead class="thead-inverse">
<th>Job</th> <th>Job</th>
<th>Uuid</th> <th>Spider</th>
<th>Created date</th> <th>Created date</th>
<th>Start date</th> <th>Start date</th>
<th>Status</th> <th>Status</th>
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
{% for i in jobs.running %} {% for i in jobs.running %}
<tr id="{{ i.pk }}"> <tr id="{{ i.pk }}">
<td data-col="job">{{ i.name }}</td> <td data-col="job">{{ i.name }}</td>
<td data-col="uuid">{{ i.job_uuid }}</td> <td data-col="spider">{{ i.spider }}</td>
<td data-col="created-date">{{ i.create_time }}</td> <td data-col="created-date">{{ i.create_time }}</td>
<td data-col="start-date">{{ i.start_time }}</td> <td data-col="start-date">{{ i.start_time }}</td>
<td data-col="status" class="text-success">{{ i.status }}</td> <td data-col="status" class="text-success">{{ i.status }}</td>
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
<table data-table="finished" class="table table-sm table-custom"> <table data-table="finished" class="table table-sm table-custom">
<thead class="thead-inverse"> <thead class="thead-inverse">
<th>Job</th> <th>Job</th>
<th>Uuid</th> <th>Spider</th>
<th>Created date</th> <th>Created date</th>
<th>Started date</th> <th>Started date</th>
<th>Finished date</th> <th>Finished date</th>
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
{% for i in jobs.finished %} {% for i in jobs.finished %}
<tr id="{{ i.pk }}"> <tr id="{{ i.pk }}">
<td data-col="job">{{ i.name }}</td> <td data-col="job">{{ i.name }}</td>
<td data-col="uuid">{{ i.job_uuid }}</td> <td data-col="spider">{{ i.spider }}</td>
<td data-col="created-date">{{ i.create_time }}</td> <td data-col="created-date">{{ i.create_time }}</td>
<td data-col="start-date">{{ i.start_time }}</td> <td data-col="start-date">{{ i.start_time }}</td>
<td data-col="finished-date">{{ i.finish_time }}</td> <td data-col="finished-date">{{ i.finish_time }}</td>
...@@ -159,7 +159,7 @@ ...@@ -159,7 +159,7 @@
<table data-table="deleted" class="table table-sm table-custom"> <table data-table="deleted" class="table table-sm table-custom">
<thead class="thead-inverse"> <thead class="thead-inverse">
<th>Job</th> <th>Job</th>
<th>Uuid</th> <th>Spider</th>
<th>Created date</th> <th>Created date</th>
<th>Started date</th> <th>Started date</th>
<th style="width: 200px;">Finished date</th> <th style="width: 200px;">Finished date</th>
...@@ -172,7 +172,7 @@ ...@@ -172,7 +172,7 @@
{% for i in jobs.deleted %} {% for i in jobs.deleted %}
<tr id="{{ i.pk }}"> <tr id="{{ i.pk }}">
<td data-col="job">{{ i.name }}</td> <td data-col="job">{{ i.name }}</td>
<td data-col="uuid">{{ i.job_uuid }}</td> <td data-col="spider">{{ i.spider }}</td>
<td data-col="created-date">{{ i.create_time }}</td> <td data-col="created-date">{{ i.create_time }}</td>
<td data-col="start-date">{{ i.start_time }}</td> <td data-col="start-date">{{ i.start_time }}</td>
<td data-col="finished-date">{{ i.finish_time }}</td> <td data-col="finished-date">{{ i.finish_time }}</td>
......
Markdown is supported
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