Merge branch 'master' of https://git.rubenvandeven.com/r/guest_worker
This commit is contained in:
commit
1bc8d09df6
3 changed files with 9 additions and 4 deletions
|
@ -134,6 +134,7 @@ class HIT(Base):
|
||||||
session = object_session(self)
|
session = object_session(self)
|
||||||
q = session.query(Assignment).\
|
q = session.query(Assignment).\
|
||||||
filter(Assignment.submit_page_at < self.created_at).\
|
filter(Assignment.submit_page_at < self.created_at).\
|
||||||
|
filter(Assignment.worker_id != None).\
|
||||||
group_by(Assignment.worker_id).\
|
group_by(Assignment.worker_id).\
|
||||||
order_by(Assignment.created_at.desc())
|
order_by(Assignment.created_at.desc())
|
||||||
if assignment and assignment.worker_id:
|
if assignment and assignment.worker_id:
|
||||||
|
|
|
@ -81,7 +81,7 @@
|
||||||
<div class='state' v-if="hit.assignment.submit_page_at">
|
<div class='state' v-if="hit.assignment.submit_page_at">
|
||||||
<h2>worker input</h2>
|
<h2>worker input</h2>
|
||||||
<div class="svgcrop" style="height: 110px; overflow: hidden">
|
<div class="svgcrop" style="height: 110px; overflow: hidden">
|
||||||
<object :data="hit.svg_image" style="margin-top: -60px" type="image/svg+xml"></object>
|
<img :src="hit.svg_image" style="margin-top: -60px">
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class='columns'>
|
<div class='columns'>
|
||||||
|
@ -105,11 +105,11 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<div class='state' v-if="hit.scanned_at">
|
<div class='state scan' v-if="hit.scanned_at">
|
||||||
<!-- <h2>analog drawing</h2> -->
|
<!-- <h2>analog drawing</h2> -->
|
||||||
<!-- <div class="statebox"> -->
|
<!-- <div class="statebox"> -->
|
||||||
<img src="fake_scan.jpg">
|
<!-- <img src="fake_scan.jpg">-->
|
||||||
<!-- <img :src="hit.scan_image"> -->
|
<img :src="hit.scan_image">
|
||||||
<!-- </div> -->
|
<!-- </div> -->
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
@ -203,3 +203,7 @@ html, body{
|
||||||
.columns .column{
|
.columns .column{
|
||||||
flex-grow: 1;
|
flex-grow: 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.scan img{
|
||||||
|
vertical-align:bottom;
|
||||||
|
}
|
Loading…
Reference in a new issue