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

7
resources/views/workflow/editor/_form.blade.php
View file

@ -16,6 +16,13 @@
</div>
<div class="pure-u-1 pure-u-md-1-2 pure-div">
{!! Form::label('reject_reviewer_note', 'reviewer note..') !!}
{{-- {!! Form::select('server_state', Config::get('enums.server_states'), null, ['id' => 'server_state', 'placeholder' => '-- select server state --']) !!} --}}
{!! Form::textarea('reject_reviewer_note', null, ['class'=>'pure-u-23-24','readonly']) !!}
</div>
<div class="pure-u-1 pure-u-md-1-2 pure-div">
{!! Form::label('project_id', 'Project..') !!}
<div class="select pure-u-23-24">

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

@ -15,7 +15,7 @@
<th>ID</th>
<th>Server State</th>
<th>Editor</th>
<th>Date of submission</th>
<th>Date of last modification</th>
<th></th>
</thead>
@ -26,7 +26,11 @@
// $lastid = $detail->payment->userid;
if ($dataset->server_state == 'editor_accepted') {
$rowclass = 'editor_accepted';
} elseif ($dataset->server_state == 'released') {
} elseif ($dataset->server_state == 'rejected_reviewer') {
$rowclass = 'rejected_reviewer';
} elseif ($dataset->server_state == 'reviewed') {
$rowclass = 'reviewed';
}elseif ($dataset->server_state == 'released') {
$rowclass = 'released';
}
@endphp
@ -47,13 +51,11 @@
@if ($dataset->server_state == "released")
{{-- <td>Preferred reviewer: {{ optional($dataset->reviewer)->login }} </td> --}}
<td>Preferred reviewer: {{ $dataset->preferred_reviewer }} </td>
@elseif ($dataset->server_state == "editor_accepted")
@elseif ($dataset->server_state == "editor_accepted" || $dataset->server_state == "rejected_reviewer")
<td>in approvement by {{ optional($dataset->editor)->login }} </td>
@endif
<td>
@if ($dataset->server_state == 'released')
{{ $dataset->server_date_modified }}
@endif
<td>
{{ $dataset->server_date_modified }}
</td>
<td>
@if ($dataset->server_state == "released")
@ -61,7 +63,7 @@
<i class="fa fa-check"></i>
<span>Receive editor task</span>
</a>
@elseif ($dataset->server_state == "editor_accepted")
@elseif ($dataset->server_state == "editor_accepted" || $dataset->server_state == "rejected_reviewer")
<a href="{{ URL::route('publish.workflow.editor.edit', $dataset->id) }}" class="pure-button">
<i class="fa fa-edit"></i>
<span>Edit</span>
@ -69,7 +71,16 @@
<a href="{{ URL::route('publish.workflow.editor.approve', $dataset->id) }}" class="pure-button">
<i class="fa fa-share"></i>
<span>Approve</span>
</a>
</a>
<a href="{{ URL::route('publish.workflow.editor.reject', $dataset->id) }}" class="pure-button">
<i class="fas fa-undo"></i>
<span>Reject</span>
</a>
@elseif ($dataset->server_state == "reviewed")
<a href="{{ URL::route('publish.workflow.publish.publishUpdate', $dataset->id) }}" class="pure-button">
<i class="fa fa-edit"></i>
<span>Publish</span>
</a>
@endif
</td>
{{-- <td>

74
resources/views/workflow/editor/reject.blade.php Normal file
View file

@ -0,0 +1,74 @@
@extends('settings.layouts.app')
@section('content')
<div class="header">
<h3 class="header-title">
<i class="fa fa-share"></i> Reject submitted dataset
</h3>
</div>
@if (count($errors) > 0)
<div class="alert alert-danger">
<strong>Whoops!</strong> There were some problems with your input.<br><br>
<ul>
@foreach ($errors->all() as $error)
<li>{{ $error }}</li>
@endforeach
</ul>
</div>
@endif
<div class="pure-g box-content">
<div class="pure-u-1 pure-u-md-1">
<div>
<a href="{{ route('publish.workflow.review.index') }}" class="pure-button button-small">
<i class="fa fa-chevron-left"></i>
<span>BACK</span>
</a>
</div>
<div id="app1">
{!! Form::model($dataset, [ 'method' => 'POST', 'route' => ['publish.workflow.editor.rejectUpdate', $dataset->id], 'id' => 'rejectForm',
'class' => 'pure-form', 'enctype' => 'multipart/form-data', 'v-on:submit.prevent' => 'checkForm']) !!}
<fieldset id="fieldset-General">
<legend>General</legend>
<div class="pure-g">
<div class="pure-u-1 pure-u-md-1-1 pure-div">
{!! Form::label('server_state', 'Status..') !!}
{!! Form::text('server_state', 'rejected_editor', ['class'=>'pure-u-23-24','readonly']) !!}
</div>
<div class="pure-u-1 pure-u-md-1-1 pure-div">
{!! Form::label('reject_editor_note', 'reject note:') !!}
{!! Form::textarea('reject_editor_note',null, ['id' => 'reject_editor_note', 'class'=>'pure-u-23-24',
'placeholder' => '-- reject note for submitter --', 'size' => '70x6',
'v-model' => 'dataset.reject_editor_note', "v-validate" => "'required|min:10|max:255'"]) !!}
<em>*</em>
<span class="help is-danger" v-if="errors.has('reject_editor_note')" v-text="errors.first('reject_editor_note')"></span>
</div>
</div>
</fieldset>
<br />
<div class="pure-controls">
<button type="submit" class="pure-button">
<i class="fas fa-undo"></i>
<span>Reject to submitter</span>
</button>
{{-- <span class="help is-danger">..to do: write code for setting state 'rejected_reviewer' in database</span> --}}
</div>
{!! Form::close() !!}
</div>
</div>
</div>
@stop
@section('after-scripts')
@stop

33
resources/views/workflow/review/reject.blade.php
View file

@ -6,6 +6,17 @@
</h3>
</div>
@if (count($errors) > 0)
<div class="alert alert-danger">
<strong>Whoops!</strong> There were some problems with your input.<br><br>
<ul>
@foreach ($errors->all() as $error)
<li>{{ $error }}</li>
@endforeach
</ul>
</div>
@endif
<div class="pure-g box-content">
<div class="pure-u-1 pure-u-md-1">
@ -22,15 +33,21 @@
<fieldset id="fieldset-General">
<legend>General</legend>
<div class="pure-g">
<div class="pure-u-1 pure-u-md-1-1 pure-div">
{!! Form::label('server_state', 'Status..') !!}
{!! Form::text('server_state', 'rejected_reviewer', ['class'=>'pure-u-23-24','readonly']) !!}
</div>
<div class="pure-u-1 pure-u-md-1-1 pure-div">
{!! Form::label('owner', 'reject note:') !!}
{!! Form::text('reject_reviewer_note', null, ['id' => 'reject_reviewer_note', 'class'=>'pure-u-23-24',
'placeholder' => '-- reject note for editor --',
{!! Form::label('reject_reviewer_note', 'reject note:') !!}
{!! Form::textarea('reject_reviewer_note',null, ['id' => 'reject_reviewer_note', 'class'=>'pure-u-23-24',
'placeholder' => '-- reject note for editor --', 'size' => '70x6',
'v-model' => 'dataset.reject_reviewer_note', "v-validate" => "'required|min:10|max:255'"]) !!}
<em>*</em>
<span class="help is-danger" v-if="errors.has('preferred_reviewer')" v-text="errors.first('preferred_reviewer')"></span>
<span class="help is-danger" v-if="errors.has('reject_reviewer_note')" v-text="errors.first('reject_reviewer_note')"></span>
</div>
</div>
@ -38,11 +55,11 @@
<br />
<div class="pure-controls">
{{-- <button type="submit" class="pure-button">
<button type="submit" class="pure-button">
<i class="fas fa-undo"></i>
<span>Reject</span>
</button> --}}
<span class="help is-danger">..to do: write code for setting state 'rejected_reviewer' in database</span>
<span>Reject to editor</span>
</button>
{{-- <span class="help is-danger">..to do: write code for setting state 'rejected_reviewer' in database</span> --}}
</div>
{!! Form::close() !!}

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>