Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Job page clean up #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anthony-chaudhary merged 2 commits into from
May 15, 2021
Merged

Job page clean up #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b4ee04
temporary clean up
anthony-chaudhary May 15, 2021
c259d33
Clean and move data pipeline into folder
anthony-chaudhary May 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 19 additions & 6 deletions frontend/src/components/task/job/job_detail.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
<v-tabs
v-model="tab"
align-with-title
color="white"
dark

color="primary"
>

<v-tab
Expand All @@ -28,13 +26,24 @@
:job_id="job_id">
</v_job_detail_trainer>
</v-tab-item>

<v-tab-item>
<task_template_discussions
:project_string_id="$store.state.project.current.project_string_id"
:task_template_id="job_id"
></task_template_discussions>

</v-tab-item>

<v-tab-item>

<job_pipeline_mxgraph :job_id="job_id"
:show_output_jobs="true"
class="mt-4 mb-4 pb-8 pt-8">
</job_pipeline_mxgraph>

</v-tab-item>

</v-tabs-items>
</v-tabs>

Expand All @@ -46,10 +55,10 @@

<script lang="ts">

import axios from 'axios';
import v_job_detail_builder from './job_detail_builder'
import v_job_detail_trainer from './job_detail_trainer'
import task_template_discussions from '../../discussions/task_template_discussions'
import job_pipeline_mxgraph from './job_pipeline_mxgraph'


import Vue from "vue"; export default Vue.extend( {
Expand All @@ -58,7 +67,8 @@ import Vue from "vue"; export default Vue.extend( {
components: {
v_job_detail_builder,
task_template_discussions,
v_job_detail_trainer
v_job_detail_trainer,
job_pipeline_mxgraph
},

data () {
Expand All @@ -68,7 +78,10 @@ import Vue from "vue"; export default Vue.extend( {
{text: 'Oveview',
icon: 'mdi-view-dashboard'},
{text: 'Discussions',
icon: 'mdi-comment-multiple'}]
icon: 'mdi-comment-multiple'},
{text: 'Data Pipeline',
icon: 'mdi-folder-network'}
]
}
},
created() {
Expand Down
88 changes: 30 additions & 58 deletions frontend/src/components/task/job/job_detail_builder.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,68 +17,42 @@
>
</v_job_info_builder>

<job_pipeline_mxgraph :job_id="job_id" :show_output_jobs="true" class="mt-4 mb-4 pb-8 pt-8"></job_pipeline_mxgraph>

<v-card class="mt-4 mb-4 pa-8">
<v_error_multiple :error="error">
</v_error_multiple>

<!-- TO DO Sample file? Permissions issues... -->
<!-- TO DO Show guides? -->

<br/>

<!-- No hide function yet for release -->
<!--
<v-btn>
Hide
</v-btn>
<!--
<v-btn v-if="!job.user_to_job"
@click="job_apply()"
:loading="loading"
color="primary"
large
>
Start Annotating
</v-btn>

<v-btn v-if="job.user_to_job"
@click="job_annotate()"
:loading="loading"
color="primary"
large
>
Continue Annotating
</v-btn>
-->

<v_error_multiple :error="error">
</v_error_multiple>

<v_stats_task :job_id="job_id">
</v_stats_task>
<v-container>
<v-row>
<v-col cols="12" class="d-flex justify-center">
<v-btn v-if="!job.user_to_job"
@click="job_apply()"
:loading="loading"
color="primary"
large
>
Start Annotating
</v-btn>

<v-btn v-if="job.user_to_job"
@click="job_annotate()"
:loading="loading"
color="primary"
large
>
Continue Annotating
</v-btn>

<v-btn v-if="job.type == 'Exam'"
@click="route_exam_result()"
:loading="loading"
color="primary">
Exam Results
</v-btn>

</v-col>
</v-row>
</v-container>
</v-card>
<v-btn v-if="job.type == 'Exam'"
@click="route_exam_result()"
:loading="loading"
color="primary">
Exam Results
</v-btn>


<!-- What about a preview of guide?
ie so don't have to click into a task
-->




<v_task_list :job_id="job_id"
:job="job"
:project_string_id="project_string_id"
Expand All @@ -87,11 +61,14 @@
:open_read_only_mode="has_external_integration"
:mode_options="'job_detail'"
:mode_view="'list'"
class="mt-4 mb-4"
@task_count_changed="update_job"
>
</v_task_list>


<v_stats_task :job_id="job_id">
</v_stats_task>

<v_credential_list :job_id="job_id"
:mode_options="'job_detail'"
:mode_view="'list'">
Expand All @@ -112,15 +89,13 @@

import axios from 'axios';
import vue_scroll_to from 'vue-scrollto'
import job_pipeline_mxgraph from './job_pipeline_mxgraph'

import Vue from "vue";

export default Vue.extend({
name: 'job_detail_builder',
props: ['job_id'],
components: {
job_pipeline_mxgraph
},
data() {
return {
Expand Down Expand Up @@ -161,9 +136,6 @@
},
computed: {
has_external_integration: function(){
console.log(
'SHOW DETAIL', this.job
)
const external_interfaces_providers = ['labelbox']
return this.job.interface_connection
&& external_interfaces_providers.includes(this.job.interface_connection.integration_name)
Expand Down
12 changes: 11 additions & 1 deletion frontend/src/components/task/task/task_list.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,20 @@
<template>
<div v-cloak>
<v-card class="pa-8">
<v-card>

<v-card-title>
Task List
</v-card-title>

<!-- Temporary button -->
<v-btn @click="$router.push('/task/' + task_list[0].id )"
:loading="loading"
color="primary"
large
>
Start Annotating
</v-btn>

<v-layout v-if="external_interface === 'labelbox' && !pending_initial_dir_sync && task_list.length > 0">
<v-row>
<v-col cols="12" class="d-flex align-center justify-center">
Expand Down