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

edit references in editor edit view

Browse source
This commit is contained in:
Arno Kaimbacher 2019-05-28 19:02:21 +02:00
parent 4d6664ce3a
commit 03bcbab560
12 changed files with 191 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

10
resources/views/settings/layouts/app.blade.php
View file

@ -113,17 +113,11 @@
<a class="pure-menu-link" href="{{ URL::route('publish.workflow.review.index') }}"><i class="fas fa-list"></i> REVIEW PAGE: Approved datasets</a>
</li>
@endpermission
@permission('dataset-publish-list')
{{-- @permission('dataset-publish-list')
<li class="pure-menu-item {{ Route::is('publish.workflow.publish*') ? 'active' : '' }}">
<a class="pure-menu-link" href="{{ URL::route('publish.workflow.publish.index') }}"><i class="fas fa-list"></i> Publish PAGE: Reviewed datasets</a>
</li>
@endpermission
{{-- <li class="pure-menu-item {{ Route::is('publish.workflow.release') ? 'active' : '' }}">
<a class="pure-menu-link" href="{{ URL::route('publish.workflow.release') }}"><i class="fa fa-upload"></i> Release pending datasets</a>
</li>
<li class="pure-menu-item {{ Route::is('publish.workflow.review') ? 'active' : '' }}">
<a class="pure-menu-link" href="{{ URL::route('publish.workflow.review') }}"><i class="fa fa-upload"></i> Review/Publish unpublished datasets</a>
</li> --}}
@endpermission --}}
</ul>
</li>
@endrole

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

@ -186,6 +186,50 @@
</div>
</fieldset>
<fieldset id="fieldset-references">
<legend>Dataset References</legend>
{{-- <table class="table table-hover" v-if="dataset.keywords.length"> --}}
@if ($dataset->references->count() > 0)
<table id="references" class="pure-table pure-table-horizontal">
<thead>
<tr>
<th style="width: 20px;">Reference value</th>
<th style="width: 20px;">Label</th>
<th>Type</th>
<th>Relation</th>
<th style="width: 130px;"></th>
</tr>
</thead>
<tbody>
{{-- <tr v-for="(item, index) in dataset.keywords"> --}}
@foreach($dataset->references as $key => $reference)
<tr>
<td>
{{ Form::text('references['.$reference->id.'][value]', $reference->value, ['class' => 'form-control', 'placeholder' => '[REFERENCE VALUE]']) }}
</td>
<td>
{{ Form::text('references['.$reference->id.'][label]', $reference->label, ['class' => 'form-control', 'placeholder' => '[REFERENCE LABEL]']) }}
</td>
<td>
{!! Form::select('references['.$reference->id.'][type]', $referenceTypes, $reference->type, ['placeholder' => '[reference type]', 'v-model' =>
'item.type', "v-validate" => "'required'", 'data-vv-scope' => 'step-2']) !!}
</td>
<td>
{!! Form::select('references['.$reference->id.'][relation]', $relationTypes, $reference->relation, ['placeholder' => '[relation type]', 'v-model' =>
'item.relation', "v-validate" => "'required'", 'data-vv-scope' => 'step-2']) !!}
</td>
<td>
</td>
</tr>
@endforeach
</tbody>
</table>
@else
<span>...there are no references</span>
@endif
</fieldset>
<fieldset id="fieldset-keywords">
<legend>Dataset Keywords</legend>
{{-- <table class="table table-hover" v-if="dataset.keywords.length"> --}}
@ -219,7 +263,7 @@
</tbody>
</table>
@else
<span>...ther are no keywords</span>
<span>...there are no keywords</span>
@endif
</fieldset>

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

@ -40,7 +40,7 @@
{{ $dataset->titles()->first()->value }}
@else
no title
@endif
@endif
</td>
<td>
{{ $dataset->id }}
@ -77,7 +77,7 @@
<span>Reject</span>
</a>
@elseif ($dataset->server_state == "reviewed")
<a href="{{ URL::route('publish.workflow.publish.publishUpdate', $dataset->id) }}" class="pure-button">
<a href="{{ URL::route('publish.workflow.editor.publishUpdate', $dataset->id) }}" class="pure-button">
<i class="fa fa-edit"></i>
<span>Publish</span>
</a>

6
resources/views/workflow/publish/publish.blade.php → resources/views/workflow/editor/publish.blade.php
View file

@ -2,7 +2,7 @@
@section('content')
<div class="header">
<h3 class="header-title">
<i class="fa fa-share"></i> Review approved dataset
<i class="fa fa-share"></i> Publish reviewed dataset
</h3>
</div>
@ -17,7 +17,7 @@
</div>
<div id="app1">
{!! Form::model($dataset, [ 'method' => 'POST', 'route' => ['publish.workflow.publish.publishUpdate', $dataset->id],
{!! Form::model($dataset, [ 'method' => 'POST', 'route' => ['publish.workflow.editor.publishUpdate', $dataset->id],
'id' => 'publishForm', 'class' => 'pure-form', 'enctype' => 'multipart/form-data', 'v-on:submit.prevent' => 'checkForm'])
!!}
<fieldset id="fieldset-General">
@ -47,7 +47,7 @@
</tbody>
</table>
<div class="instruction">
Are you sure you want to accept the selected dataset?
Are you sure you want to publish the selected dataset?
</div>
<table>
<tbody><tr>

35
resources/views/workflow/editor/reject.blade.php
View file

@ -35,21 +35,36 @@
<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>
{!! 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>
<em>*</em>
<span class="help is-danger" v-if="errors.has('reject_editor_note')" v-text="errors.first('reject_editor_note')"></span>
</div>
@if ($dataset->reject_reviewer_note != null)
<div class="pure-u-1 pure-u-md-1-1">
{!! Form::label('reject_reviewer_note', 'Reviewer reject note..') !!}
{!! Form::text('reject_reviewer_note', null, ['class'=>'pure-u-23-24','readonly']) !!}
</div>
<div class="pure-u-1 pure-u-md-1-1">
<label for="BelongsToBibliography" class="pure-checkbox">
<input type="hidden" name="reviewer_note_visible" value="0">
<input name="reviewer_note_visible" value="1" type="checkbox" class="form-check-input">
should reviewer note be visible to submitter?
</label>
</div>
@else
<div class="pure-u-1 pure-u-md-1-1">
<span class="help is-info">There is no reject note from the reviewer</span>
</div>
@endif
</div>
</fieldset>

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

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

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

@ -14,7 +14,8 @@
<th>Dataset Title</th>
<th>ID</th>
<th>Server State</th>
<th>Editor</th>
<th>Editor</th>
<th>remaining time</th>
<th></th>
</thead>
@ -42,10 +43,16 @@
</td>
<td>
{{ $dataset->server_state }}
</td>
@if ($dataset->server_state == "approved")
</td>
<td>editor: {{ optional($dataset->editor)->login }}</td>
@endif
<td>
{{-- @php
$dateDiff = $dataset['server_date_modified']->addDays(14);
$remainingDays = Carbon\Carbon::now()->diffInDays($dateDiff, false);
@endphp --}}
{{ $dataset->remaining_time . ' days' }}
</td>
<td>
@if ($dataset->server_state == "approved")