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

- composer updates

Browse source 
- no submitters for dataset
- preferred reviewer instead of preferred editor
This commit is contained in:
Arno Kaimbacher 2019-05-14 18:02:25 +02:00
parent 2d483f686e
commit aac9196650
13 changed files with 127 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

11
resources/views/workflow/editor/approve.blade.php
View file

@ -22,6 +22,17 @@
<legend>General</legend>
<div class="pure-g">
<div class="pure-u-1 pure-u-md-1-1 pure-div">
{!! Form::label('reviewer_id', 'preferred reviewer from the submitter:') !!}
<p>
{!! $dataset->preferred_reviewer !!}<br>
{!! $dataset->preferred_reviewer_email !!}
</p>
<p>
</p>
{{-- <span class="help is-danger"> {!! $message !!}</span> --}}
</div>
<div class="pure-u-1 pure-u-md-1-2 pure-div">
{!! Form::label('reviewer_id', 'reviewer:') !!}
<div class="select pure-u-23-24">

4
resources/views/workflow/editor/index.blade.php
View file

@ -44,8 +44,8 @@
{{ $dataset->server_state }}
</td>
@if ($dataset->server_state == "released")
{{-- <td>Preferred editor: {{ optional($dataset->editor)->login }} </td> --}}
<td>Preferred editor: {{ $dataset->preferred_editor }} </td>
{{-- <td>Preferred reviewer: {{ optional($dataset->reviewer)->login }} </td> --}}
<td>Preferred reviewer: {{ $dataset->preferred_reviewer }} </td>
@elseif ($dataset->server_state == "editor_accepted")
<td>in approvement by {{ optional($dataset->editor)->login }} </td>
@endif

11
resources/views/workflow/editor/receive.blade.php
View file

@ -33,14 +33,11 @@
<div class="pure-g">
<div class="pure-u-1 pure-u-md-1-1 pure-div">
{!! Form::label('editor_id', 'preferred editor:') !!}
{!! $dataset->preferred_editor !!}
<span class="help is-danger"> {!! $message !!}</span>
{{-- <span class="help is-danger" v-if="errors.has('editor_id')" v-text="errors.first('editor_id')"></span> --}}
{{-- {!! Form::label('editor_id', 'preferred editor:') !!}
{!! $dataset->preferred_editor !!}
<span class="help is-danger"> {!! $message !!}</span> --}}
</div>
<div class="pure-u-1 pure-u-md-1-1 pure-div">
{!! Form::label('owner', 'dataset owner:') !!}
{!! $dataset->user->login !!}