geolba/tethys
6
0
Fork 0
Code Issues 2 Pull requests Projects 1 Releases Packages Wiki Activity

add workflow actions for manipulating server_state

Browse source
This commit is contained in:
Arno Kaimbacher 2019-02-21 14:07:00 +01:00
parent b7b04a61d6
commit c86c9fe9f4
14 changed files with 141 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

7
resources/assets/js/datasetPublish.js
View file

@ -152,7 +152,7 @@ const app = new Vue({
this.currentStatus = STATUS_INITIAL;
this.dataset.files = [];
},
save() {
save(status) {
// upload data to the server
var _this = this;
this.currentStatus = STATUS_SAVING;
@ -177,6 +177,7 @@ const app = new Vue({
/*
Additional POST Data
*/
formData.append('server_state', status);
formData.append('type', this.dataset.type);
// formData.append('server_state', this.dataset.state);
formData.append('rights', Number(this.dataset.rights));
@ -395,10 +396,10 @@ const app = new Vue({
}
return true;
},
submit() {
submit(status) {
// alert('Submit to blah and show blah and etc.');
// save it
this.save();
this.save(status);
}
}
});

8
resources/views/publish/create-step1.blade.php
View file

@ -487,10 +487,14 @@
<i class="fa fa-arrow-left"></i>
<span>Zurück</span>
</button>
<button @click.prevent="submit()" class="pure-button button-small">
<button @click.prevent="submit('inprogress')" class="pure-button button-small">
<i class="fa fa-save"></i>
<span>Create Dataset</span>
<span>Save Dataset</span>
</button>
<button @click.prevent="submit('unpublished')" class="pure-button button-small">
<i class="fa fa-upload"></i>
<span>Release Dataset</span>
</button>
</div>

7
resources/views/settings/layouts/app.blade.php
View file

@ -95,8 +95,11 @@
<li class="pure-menu-item {{ Route::is('publish.dataset.create') ? 'active' : '' }}">
<a class="pure-menu-link" href="{{ URL::route('publish.dataset.create') }}"><i class="fa fa-upload"></i> Create</a>
</li>
<li class="pure-menu-item {{ Route::is('settings.review') ? 'active' : '' }}">
<a class="pure-menu-link" href="{{ URL::route('settings.review.index') }}"><i class="fa fa-upload"></i> Release unpublished datasets</a>
<li class="pure-menu-item {{ Route::is('settings.workflow.release') ? 'active' : '' }}">
<a class="pure-menu-link" href="{{ URL::route('settings.workflow.release') }}"><i class="fa fa-upload"></i> Release pending datasets</a>
</li>
<li class="pure-menu-item {{ Route::is('settings.workflow.review') ? 'active' : '' }}">
<a class="pure-menu-link" href="{{ URL::route('settings.workflow.review') }}"><i class="fa fa-upload"></i> Review/Publish unpublished datasets</a>
</li>
</ul>
</li>

51
resources/views/workflow/release.blade.php Normal file
View file

@ -0,0 +1,51 @@
@extends('settings.layouts.app')
@section('content')
<div class="header">
<h3 class="header-title">
<i class="fa fa-file"></i> Release saved datasets
</h3>
</div>
<div class="pure-g box-content">
<div class="pure-u-1">
<table class="pure-table pure-table-horizontal">
<thead>
<th>Dataset Title</th>
<th>ID</th>
<th>Server State</th>
<th></th>
</thead>
<tbody>
@foreach($datasets as $dataset)
<tr>
<td>
@if ($dataset->titles()->first())
{{ $dataset->titles()->first()->value }}
@else
no title
@endif
</td>
<td>
{{ $dataset->id }}
</td>
<td>
{{ $dataset->server_state }}
</td>
<td>
@if ($dataset->server_state == "inprogress")
<a href="{{ URL::route('settings.review.changestate',['id' => $dataset->id, 'targetState' => 'unpublished']) }}" class="pure-button button-small is-success">Release</a>
{{-- <a href="" class="pure-button button-small is-success">Restrict</a> --}}
@endif
</td>
</tr>
@endforeach
</tbody>
</table>
</div>
</div>
@stop

3
resources/views/workflow/index.blade.php → resources/views/workflow/review.blade.php
View file

@ -2,7 +2,7 @@
@section('content')
<div class="header">
<h3 class="header-title">
<i class="fa fa-file"></i> Datasets to be processed
<i class="fa fa-file"></i> Review unpblished datasets
</h3>
</div>
@ -14,6 +14,7 @@
<th>Dataset Title</th>
<th>ID</th>
<th>Server State</th>
<th></th>
</thead>
<tbody>