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

code for review update

Browse source
This commit is contained in:
Arno Kaimbacher 2019-04-17 16:01:38 +02:00
parent 53e43b7bbf
commit 5193e4f5b5
15 changed files with 262 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -38,7 +38,7 @@
<div class="pure-controls">
<button :disabled="errors.any()" type="submit" class="pure-button">
<i class="fa fa-share"></i>
<span>Approve</span>
<span>Set Approved</span>
</button>
</div>

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

@ -52,14 +52,14 @@
<td>
@if ($dataset->server_state == "released")
<a href="{{ URL::route('publish.workflow.accept', $dataset->id) }}" class="pure-button">
<a href="{{ URL::route('publish.workflow.receive', $dataset->id) }}" class="pure-button">
<i class="fa fa-check"></i>
<span>Accept editor task</span>
<span>Receive editor task</span>
</a>
@elseif ($dataset->server_state == "editor_accepted")
<a href="{{ URL::route('publish.workflow.editor.edit', $dataset->id) }}" class="pure-button">
<i class="fa fa-edit"></i>
<span>Improve/Edit</span>
<span>Edit</span>
</a>
<a href="{{ URL::route('publish.workflow.editor.approve', $dataset->id) }}" class="pure-button">
<i class="fa fa-share"></i>

12
resources/views/workflow/editor/accept.blade.php → resources/views/workflow/editor/receive.blade.php
View file

@ -2,13 +2,7 @@
@section('content')
<div class="header">
<h3 class="header-title">
<i class="fa fa-share"></i> Accept released dataset
</h3>
</div>
<div class="header">
<h3 class="header-title">
Release your dataset for Editor
<i class="fa fa-share"></i> Receive released dataset
</h3>
</div>
@ -32,7 +26,7 @@
$message = 'If you are not the desired editor, you can still accept the dataset!!';
@endphp
{!! Form::model($dataset, [ 'method' => 'POST', 'route' => ['publish.workflow.acceptUpdate', $dataset->id], 'id' => 'acceptForm',
{!! Form::model($dataset, [ 'method' => 'POST', 'route' => ['publish.workflow.receiveUpdate', $dataset->id], 'id' => 'acceptForm',
'class' => 'pure-form', 'enctype' => 'multipart/form-data', 'v-on:submit.prevent' => 'checkForm']) !!}
<fieldset id="fieldset-General">
<legend>General</legend>
@ -66,7 +60,7 @@
<div class="pure-controls">
<button type="submit" class="pure-button">
<i class="fa fa-share"></i>
<span>Accept</span>
<span>Set Received</span>
</button>
</div>

2
resources/views/workflow/review/index.blade.php
View file

@ -49,7 +49,7 @@
<td>
@if ($dataset->server_state == "approved")
<a class="pure-button">
<a href="{{ URL::route('publish.workflow.review.review', $dataset->id) }}" class="pure-button">
<i class="fa fa-check"></i>
<span>Review</span>
</a>

77
resources/views/workflow/review/review.blade.php Normal file
View file

@ -0,0 +1,77 @@
@extends('settings.layouts.app')
@section('content')
<div class="header">
<h3 class="header-title">
<i class="fa fa-share"></i> Review approved dataset
</h3>
</div>
<div class="pure-g box-content">
<div class="pure-u-1 pure-u-md-1">
<div>
<a href="{{ route('publish.workflow.editor.index') }}" class="pure-button button-small">
<i class="fa fa-chevron-left"></i>
<span>BACK</span>
</a>
</div>
<div id="app1">
@php
// if ($dataset->editor->id == Auth::user()->id) {
// $userIsDesiredEditor = true;
// } else {
// $userIsDesiredEditor = false;
// $message = 'you are not the desired editor, but you can still accept the dataset';
// }
$message = 'If you are not the desired editor, you can still accept the dataset!!';
@endphp
{!! Form::model($dataset, [ 'method' => 'POST', 'route' => ['publish.workflow.review.reviewUpdate', $dataset->id], 'id' => 'reviewForm',
'class' => 'pure-form', 'enctype' => 'multipart/form-data', 'v-on:submit.prevent' => 'checkForm']) !!}
<fieldset id="fieldset-General">
<legend>Values</legend>
<div class="pure-g">
{{-- <div class="pure-u-1 pure-u-md-1-1 pure-div">
{!! Form::label('title', 'dataset title:') !!}
@if ($dataset->titles()->first())
{{ $dataset->titles()->first()->value }}
@endif
</div>
<div class="pure-u-1 pure-u-md-1-1 pure-div">
{!! Form::label('editor', 'editor:') !!}
{!! $dataset->editor->login !!}
</div>
<div class="pure-u-1 pure-u-md-1-1 pure-div">
{!! Form::label('owner', 'dataset owner:') !!}
{!! $dataset->user->login !!}
</div> --}}
@foreach($fields as $field => $fieldValue)
<div class="pure-u-1 pure-u-md-1-1 pure-div">
{{ Form::label($field, $field . ": ") }}
<span class="help is-info"> {!! $fieldValue !!} </span>
</div>
@endforeach
</div>
</fieldset>
<br />
<div class="pure-controls">
<button type="submit" class="pure-button">
<i class="fa fa-share"></i>
<span>Set reviewed</span>
</button>
</div>
{!! Form::close() !!}
</div>
</div>
</div>
@stop
@section('after-scripts')
@stop

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

@ -31,7 +31,9 @@
$rowclass = 'editor_accepted';
} elseif ($dataset->server_state == 'approved') {
$rowclass = 'approved';
}
} elseif ($dataset->server_state == 'reviewed') {
$rowclass = 'reviewed';
}
@endphp
<tr class="{{ $rowclass }}">
<td>