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

feature updates 21.05.2019

Browse source
This commit is contained in:
Arno Kaimbacher 2019-05-21 18:28:18 +02:00
parent ec4ffbdcee
commit 178d0e7f6b
15 changed files with 271 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

6
resources/views/workflow/submitter/index.blade.php
View file

@ -33,7 +33,9 @@
$rowclass = 'approved';
} elseif ($dataset->server_state == 'reviewed') {
$rowclass = 'reviewed';
}
} elseif ($dataset->server_state == 'rejected_editor') {
$rowclass = 'rejected_editor';
}
@endphp
<tr class="{{ $rowclass }}">
<td>
@ -54,7 +56,7 @@
</td>
<td>
@if ($dataset->server_state == "inprogress")
@if ($dataset->server_state == "inprogress" || $dataset->server_state == "rejected_editor")
<a href="{{ URL::route('publish.workflow.submit.release', $dataset->id) }}" class="pure-button">
<i class="fa fa-share"></i>
<span>Release</span>

65
resources/views/workflow/submitter/release.blade.php
View file

@ -28,29 +28,52 @@
<legend>General</legend>
<div class="pure-g">
<div class="pure-u-1 pure-u-md-1-1 pure-div">
{!! Form::label('preferred_reviewer', 'name of preferred reviewer:') !!}
{{-- {!! Form::select('editor_id', $editors, null, ['id' => 'editor_id', 'placeholder' => '-- select editor --', 'v-model' =>
'dataset.editor_id', "v-validate" => "'required'"]) !!} --}}
{!! Form::text('preferred_reviewer', null, ['id' => 'preferred_reviewer', 'class'=>'pure-u-23-24',
'placeholder' => '-- enter name of preferred reviewer --',
'v-model' => 'dataset.preferred_reviewer', "v-validate" => "'required|min:3|max:20'"]) !!}
<em>*</em>
<span class="help is-danger" v-if="errors.has('preferred_reviewer')" v-text="errors.first('preferred_reviewer')"></span>
<div class="pure-u-1 pure-u-md-1-1">
<div class="pure-u-1 pure-u-md-1">
<label for="preferred-option-one" class="pure-radio">
<input id="preferred-option-one" type="radio" v-model="preferation" value="yes_preferation">
preferred reviewer
</label>
<label for="elevation-option-two" class="pure-radio">
<input id="elevation-option-two" type="radio" v-model="preferation" value="no_preferation">
no preferred reviewer
</label>
</div>
<div v-show="preferation === 'yes_preferation'" class="pure-u-1 pure-u-md-1">
<div class="pure-u-1 pure-u-md-1-1 pure-div">
{!! Form::label('preferred_reviewer', 'name of preferred reviewer:') !!}
{{-- {!! Form::select('editor_id', $editors, null, ['id' => 'editor_id', 'placeholder' => '-- select editor --', 'v-model' =>
'dataset.editor_id', "v-validate" => "'required'"]) !!} --}}
{!! Form::text('preferred_reviewer', null, ['id' => 'preferred_reviewer', 'class'=>'pure-u-23-24',
'placeholder' => '-- enter name of preferred reviewer --',
'v-model' => 'dataset.preferred_reviewer',
"v-validate" => "this.isPreferationRequired ? 'required|min:3|max:20' : ''"]) !!}
<em>*</em>
<span class="help is-danger" v-if="errors.has('preferred_reviewer')" v-text="errors.first('preferred_reviewer')"></span>
</div>
<div class="pure-u-1 pure-u-md-1-1 pure-div">
{!! Form::label('preferred_reviewer_email', 'email of preferred reviewer:') !!}
{!! Form::text('preferred_reviewer_email', null, array(
'placeholder' => 'Email', 'id' => 'preferred_reviewer_email', 'class' => 'pure-u-23-24',
'v-model' => 'dataset.preferred_reviewer_email',
"v-validate" => "this.isPreferationRequired ? 'required|mail' : ''")) !!}
<em>*</em>
<span class="help is-danger" v-if="errors.has('preferred_reviewer_email')" v-text="errors.first('preferred_reviewer_email')"></span>
</div>
</div>
</div>
</div>
<div class="pure-u-1 pure-u-md-1-1 pure-div">
{!! Form::label('preferred_reviewer_email', 'email of preferred reviewer:') !!}
{!! Form::text('preferred_reviewer_email', null, array(
'placeholder' => 'Email', 'id' => 'preferred_reviewer_email', 'class' => 'pure-u-23-24',
'v-model' => 'dataset.preferred_reviewer_email', "v-validate" => "'required|email'"
)) !!}
<em>*</em>
<span class="help is-danger" v-if="errors.has('preferred_reviewer_email')" v-text="errors.first('preferred_reviewer_email')"></span>
</div>
</div>
</fieldset>