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

publication workflow: accept status

Browse source
This commit is contained in:
Arno Kaimbacher 2019-04-10 10:54:15 +02:00
parent 246577b0b0
commit 19fc0fa872
8 changed files with 56 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

12
resources/views/workflow/accept.blade.php
View file

@ -33,7 +33,7 @@
}
@endphp
{!! Form::model($dataset, [ 'method' => 'POST', 'id' => 'acceptForm',
{!! Form::model($dataset, [ 'method' => 'POST', 'route' => ['publish.workflow.acceptUpdate', $dataset->id], 'id' => 'acceptForm',
'class' => 'pure-form', 'enctype' => 'multipart/form-data', 'v-on:submit.prevent' => 'checkForm']) !!}
<fieldset id="fieldset-General">
<legend>General</legend>
@ -65,7 +65,7 @@
<br />
<div class="pure-controls">
<button :disabled="errors.any()" type="submit" class="pure-button">
<button type="submit" class="pure-button">
<i class="fa fa-share"></i>
<span>Accept</span>
</button>
@ -79,11 +79,5 @@
@stop
@section('after-scripts') {{--
<script type="text/javascript" src="{{ asset('js/lib.js') }}"></script> --}} {{--
<script src="https://unpkg.com/axios/dist/axios.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/vue"></script>--}} {{--
<script type="text/javascript" src="{{ resource_path('assets\js\datasetPublish.js') }}"></script> --}}
<script type="text/javascript" src="{{ asset('backend/publish/releaseDataset.js') }}"></script>
@section('after-scripts')
@stop

24
resources/views/workflow/editor_index.blade.php
View file

@ -13,14 +13,23 @@
<thead>
<th>Dataset Title</th>
<th>ID</th>
<th>Server State</th>
<th>Preferred Editor</th>
<th>Server State</th>
<th>Editor</th>
<th></th>
</thead>
<tbody>
@foreach($datasets as $dataset)
<tr>
@foreach($datasets as $dataset)
@php
//if userid changed from last iteration, store new userid and change color
// $lastid = $detail->payment->userid;
if ($dataset->server_state == 'editor_accepted') {
$rowclass = 'editor_accepted';
} elseif ($dataset->server_state == 'released') {
$rowclass = 'released';
}
@endphp
<tr class="{{ $rowclass }}">
<td>
@if ($dataset->titles()->first())
{{ $dataset->titles()->first()->value }}
@ -34,7 +43,12 @@
<td>
{{ $dataset->server_state }}
</td>
<td> {{ optional($dataset->editor)->login }} </td>
@if ($dataset->server_state == "released")
<td>Preferred editor: {{ optional($dataset->editor)->login }} </td>
@elseif ($dataset->server_state == "editor_accepted")
<td>in approvement by {{ optional($dataset->editor)->login }} </td>
@endif
<td>
@if ($dataset->server_state == "released")
<a href="{{ URL::route('publish.workflow.accept', $dataset->id) }}" class="pure-button">

5
resources/views/workflow/index.blade.php
View file

@ -26,7 +26,10 @@
$rowclass = 'inprogress';
} elseif ($dataset->server_state == 'released') {
$rowclass = 'released';
}
}
elseif ($dataset->server_state == 'editor_accepted') {
$rowclass = 'editor_accepted';
}
@endphp
<tr class="{{ $rowclass }}">
<td>