geolba/tethys
6
0
Fork 0
Code Issues 2 Pull Requests Packages Projects 1 Releases 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/Http/Controllers/Publish/IndexController.php
View File

@ -349,14 +349,14 @@ class IndexController extends Controller
} }
//store submitters //store submitters
if (isset($data['submitters'])) { // if (isset($data['submitters'])) {
//$data_to_sync = []; // //$data_to_sync = [];
foreach ($request->get('submitters') as $key => $submitter_id) { // foreach ($request->get('submitters') as $key => $submitter_id) {
$pivot_data = ['role' => 'submitter', 'sort_order' => $key + 1]; // $pivot_data = ['role' => 'submitter', 'sort_order' => $key + 1];
$data_to_sync[$submitter_id] = $pivot_data; // $data_to_sync[$submitter_id] = $pivot_data;
} // }
//$dataset->persons()->sync($data_to_sync); // //$dataset->persons()->sync($data_to_sync);
} // }
$dataset->persons()->sync($data_to_sync); $dataset->persons()->sync($data_to_sync);

5
app/Models/Dataset.php
View File

@ -14,7 +14,7 @@ use App\Models\XmlCache;
use App\Models\File; use App\Models\File;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Carbon\Carbon; use Carbon\Carbon;
use App\Models\GeolocationBox; // use App\Models\GeolocationBox;
use App\Models\Coverage; use App\Models\Coverage;
class Dataset extends Model class Dataset extends Model
@ -37,7 +37,8 @@ class Dataset extends Model
'embargo_date', 'embargo_date',
'belongs_to_bibliography', 'belongs_to_bibliography',
'editor_id', 'editor_id',
'preferred_editor', 'preferred_reviewer',
'preferred_reviewer_email',
'reviewer_id' 'reviewer_id'
]; ];
//protected $guarded = []; //protected $guarded = [];

99
composer.lock generated
View File

@ -1696,7 +1696,7 @@
}, },
{ {
"name": "symfony/console", "name": "symfony/console",
"version": "v4.2.7", "version": "v4.2.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/console.git", "url": "https://github.com/symfony/console.git",
@ -1768,16 +1768,16 @@
}, },
{ {
"name": "symfony/contracts", "name": "symfony/contracts",
"version": "v1.0.2", "version": "v1.1.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/contracts.git", "url": "https://github.com/symfony/contracts.git",
"reference": "1aa7ab2429c3d594dd70689604b5cf7421254cdf" "reference": "d3636025e8253c6144358ec0a62773cae588395b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/contracts/zipball/1aa7ab2429c3d594dd70689604b5cf7421254cdf", "url": "https://api.github.com/repos/symfony/contracts/zipball/d3636025e8253c6144358ec0a62773cae588395b",
"reference": "1aa7ab2429c3d594dd70689604b5cf7421254cdf", "reference": "d3636025e8253c6144358ec0a62773cae588395b",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1785,19 +1785,22 @@
}, },
"require-dev": { "require-dev": {
"psr/cache": "^1.0", "psr/cache": "^1.0",
"psr/container": "^1.0" "psr/container": "^1.0",
"symfony/polyfill-intl-idn": "^1.10"
}, },
"suggest": { "suggest": {
"psr/cache": "When using the Cache contracts", "psr/cache": "When using the Cache contracts",
"psr/container": "When using the Service contracts", "psr/container": "When using the Service contracts",
"symfony/cache-contracts-implementation": "", "symfony/cache-contracts-implementation": "",
"symfony/event-dispatcher-implementation": "",
"symfony/http-client-contracts-implementation": "",
"symfony/service-contracts-implementation": "", "symfony/service-contracts-implementation": "",
"symfony/translation-contracts-implementation": "" "symfony/translation-contracts-implementation": ""
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.0-dev" "dev-master": "1.1-dev"
} }
}, },
"autoload": { "autoload": {
@ -1832,11 +1835,11 @@
"interoperability", "interoperability",
"standards" "standards"
], ],
"time": "2018-12-05T08:06:11+00:00" "time": "2019-04-27T14:29:50+00:00"
}, },
{ {
"name": "symfony/css-selector", "name": "symfony/css-selector",
"version": "v4.2.7", "version": "v4.2.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/css-selector.git", "url": "https://github.com/symfony/css-selector.git",
@ -1889,7 +1892,7 @@
}, },
{ {
"name": "symfony/debug", "name": "symfony/debug",
"version": "v4.2.7", "version": "v4.2.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/debug.git", "url": "https://github.com/symfony/debug.git",
@ -1945,7 +1948,7 @@
}, },
{ {
"name": "symfony/event-dispatcher", "name": "symfony/event-dispatcher",
"version": "v3.4.26", "version": "v3.4.27",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/event-dispatcher.git", "url": "https://github.com/symfony/event-dispatcher.git",
@ -2008,7 +2011,7 @@
}, },
{ {
"name": "symfony/finder", "name": "symfony/finder",
"version": "v4.2.7", "version": "v4.2.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/finder.git", "url": "https://github.com/symfony/finder.git",
@ -2057,16 +2060,16 @@
}, },
{ {
"name": "symfony/http-foundation", "name": "symfony/http-foundation",
"version": "v4.2.7", "version": "v4.2.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/http-foundation.git", "url": "https://github.com/symfony/http-foundation.git",
"reference": "6ebbe61f48069033225c9d3fa7eb5ed116d766d6" "reference": "1ea878bd3af18f934dedb8c0de60656a9a31a718"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/6ebbe61f48069033225c9d3fa7eb5ed116d766d6", "url": "https://api.github.com/repos/symfony/http-foundation/zipball/1ea878bd3af18f934dedb8c0de60656a9a31a718",
"reference": "6ebbe61f48069033225c9d3fa7eb5ed116d766d6", "reference": "1ea878bd3af18f934dedb8c0de60656a9a31a718",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2107,7 +2110,7 @@
], ],
"description": "Symfony HttpFoundation Component", "description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2019-04-17T14:56:00+00:00" "time": "2019-05-01T08:36:31+00:00"
}, },
{ {
"name": "symfony/http-kernel", "name": "symfony/http-kernel",
@ -2491,7 +2494,7 @@
}, },
{ {
"name": "symfony/process", "name": "symfony/process",
"version": "v4.2.7", "version": "v4.2.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/process.git", "url": "https://github.com/symfony/process.git",
@ -2540,16 +2543,16 @@
}, },
{ {
"name": "symfony/routing", "name": "symfony/routing",
"version": "v4.2.7", "version": "v4.2.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/routing.git", "url": "https://github.com/symfony/routing.git",
"reference": "0e5719d216017b1a0342fa48e86467cedca1c954" "reference": "f4e43bb0dff56f0f62fa056c82d7eadcdb391bab"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/routing/zipball/0e5719d216017b1a0342fa48e86467cedca1c954", "url": "https://api.github.com/repos/symfony/routing/zipball/f4e43bb0dff56f0f62fa056c82d7eadcdb391bab",
"reference": "0e5719d216017b1a0342fa48e86467cedca1c954", "reference": "f4e43bb0dff56f0f62fa056c82d7eadcdb391bab",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2612,20 +2615,20 @@
"uri", "uri",
"url" "url"
], ],
"time": "2019-04-14T18:04:59+00:00" "time": "2019-04-27T09:38:08+00:00"
}, },
{ {
"name": "symfony/translation", "name": "symfony/translation",
"version": "v4.2.7", "version": "v4.2.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/translation.git", "url": "https://github.com/symfony/translation.git",
"reference": "46c0dede1f925383d13dc783857be2c41efd0b24" "reference": "181a426dd129cb496f12d7e7555f6d0b37a7615b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/translation/zipball/46c0dede1f925383d13dc783857be2c41efd0b24", "url": "https://api.github.com/repos/symfony/translation/zipball/181a426dd129cb496f12d7e7555f6d0b37a7615b",
"reference": "46c0dede1f925383d13dc783857be2c41efd0b24", "reference": "181a426dd129cb496f12d7e7555f6d0b37a7615b",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2687,20 +2690,20 @@
], ],
"description": "Symfony Translation Component", "description": "Symfony Translation Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2019-04-10T16:20:36+00:00" "time": "2019-05-01T12:55:36+00:00"
}, },
{ {
"name": "symfony/var-dumper", "name": "symfony/var-dumper",
"version": "v4.2.7", "version": "v4.2.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/var-dumper.git", "url": "https://github.com/symfony/var-dumper.git",
"reference": "e760a38e12b15032325e64be63f7ffc1817af617" "reference": "3c4084cb1537c0e2ad41aad622bbf55a44a5c9ce"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/e760a38e12b15032325e64be63f7ffc1817af617", "url": "https://api.github.com/repos/symfony/var-dumper/zipball/3c4084cb1537c0e2ad41aad622bbf55a44a5c9ce",
"reference": "e760a38e12b15032325e64be63f7ffc1817af617", "reference": "3c4084cb1537c0e2ad41aad622bbf55a44a5c9ce",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2763,7 +2766,7 @@
"debug", "debug",
"dump" "dump"
], ],
"time": "2019-04-17T14:57:01+00:00" "time": "2019-05-01T12:55:36+00:00"
}, },
{ {
"name": "tijsverkoyen/css-to-inline-styles", "name": "tijsverkoyen/css-to-inline-styles",
@ -3326,16 +3329,16 @@
}, },
{ {
"name": "phpdocumentor/reflection-docblock", "name": "phpdocumentor/reflection-docblock",
"version": "4.3.0", "version": "4.3.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
"reference": "94fd0001232e47129dd3504189fa1c7225010d08" "reference": "bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/94fd0001232e47129dd3504189fa1c7225010d08", "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c",
"reference": "94fd0001232e47129dd3504189fa1c7225010d08", "reference": "bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -3373,7 +3376,7 @@
} }
], ],
"description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
"time": "2017-11-30T07:14:17+00:00" "time": "2019-04-30T17:48:53+00:00"
}, },
{ {
"name": "phpdocumentor/type-resolver", "name": "phpdocumentor/type-resolver",
@ -3739,16 +3742,16 @@
}, },
{ {
"name": "phpunit/phpunit", "name": "phpunit/phpunit",
"version": "7.5.9", "version": "7.5.11",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git", "url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "134669cf0eeac3f79bc7f0c793efbc158bffc160" "reference": "64cb33f5b520da490a7b13149d39b43cf3c890c6"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/134669cf0eeac3f79bc7f0c793efbc158bffc160", "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/64cb33f5b520da490a7b13149d39b43cf3c890c6",
"reference": "134669cf0eeac3f79bc7f0c793efbc158bffc160", "reference": "64cb33f5b520da490a7b13149d39b43cf3c890c6",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -3819,7 +3822,7 @@
"testing", "testing",
"xunit" "xunit"
], ],
"time": "2019-04-19T15:50:46+00:00" "time": "2019-05-14T04:53:02+00:00"
}, },
{ {
"name": "sebastian/code-unit-reverse-lookup", "name": "sebastian/code-unit-reverse-lookup",
@ -3988,16 +3991,16 @@
}, },
{ {
"name": "sebastian/environment", "name": "sebastian/environment",
"version": "4.2.1", "version": "4.2.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/environment.git", "url": "https://github.com/sebastianbergmann/environment.git",
"reference": "3095910f0f0fb155ac4021fc51a4a7a39ac04e8a" "reference": "f2a2c8e1c97c11ace607a7a667d73d47c19fe404"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/3095910f0f0fb155ac4021fc51a4a7a39ac04e8a", "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/f2a2c8e1c97c11ace607a7a667d73d47c19fe404",
"reference": "3095910f0f0fb155ac4021fc51a4a7a39ac04e8a", "reference": "f2a2c8e1c97c11ace607a7a667d73d47c19fe404",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -4037,7 +4040,7 @@
"environment", "environment",
"hhvm" "hhvm"
], ],
"time": "2019-04-25T07:55:20+00:00" "time": "2019-05-05T09:05:15+00:00"
}, },
{ {
"name": "sebastian/exporter", "name": "sebastian/exporter",

2
public/backend/publish/datasetPublish.js
View File

File diff suppressed because one or more lines are too long

2
public/backend/publish/releaseDataset.js
View File

File diff suppressed because one or more lines are too long

4
resources/assets/js/components/Dataset.vue
View File

@ -51,11 +51,11 @@ function initialState() {
titles: [], titles: [],
descriptions: [], descriptions: [],
checkedContributors: [], checkedContributors: [],
checkedSubmitters: [], // checkedSubmitters: [],
persons: [], persons: [],
contributors: [], contributors: [],
submitters: [] // submitters: []
}; };
} }

22
resources/assets/js/datasetPublish.js
View File

@ -264,9 +264,9 @@ const app = new Vue({
for (var i = 0; i < this.dataset.checkedContributors.length; i++) { for (var i = 0; i < this.dataset.checkedContributors.length; i++) {
formData.append('contributors[' + i + ']', this.dataset.checkedContributors[i]); formData.append('contributors[' + i + ']', this.dataset.checkedContributors[i]);
} }
for (var i = 0; i < this.dataset.checkedSubmitters.length; i++) { // for (var i = 0; i < this.dataset.checkedSubmitters.length; i++) {
formData.append('submitters[' + i + ']', this.dataset.checkedSubmitters[i]); // formData.append('submitters[' + i + ']', this.dataset.checkedSubmitters[i]);
} // }
for (var i = 0; i < this.dataset.references.length; i++) { for (var i = 0; i < this.dataset.references.length; i++) {
let reference = this.dataset.references[i]; let reference = this.dataset.references[i];
@ -438,14 +438,14 @@ const app = new Vue({
this.dataset.checkedContributors.push(person.id); this.dataset.checkedContributors.push(person.id);
} }
}, },
onAddSubmitter(person) { // onAddSubmitter(person) {
//if person is not in submitters array // //if person is not in submitters array
//if (this.submitters.includes(person) == false) { // //if (this.submitters.includes(person) == false) {
if (this.dataset.submitters.filter(e => e.id === person.id).length == 0) { // if (this.dataset.submitters.filter(e => e.id === person.id).length == 0) {
this.dataset.submitters.push(person); // this.dataset.submitters.push(person);
this.dataset.checkedSubmitters.push(person.id); // this.dataset.checkedSubmitters.push(person.id);
} // }
}, // },
/* /*
Removes a select file the user has uploaded Removes a select file the user has uploaded
*/ */

3
resources/assets/js/releaseDataset.js
View File

@ -10,7 +10,8 @@ const app = new Vue({
return { return {
dataset: { dataset: {
firstName: '', firstName: '',
preferred_editor: '' preferred_reviewer: '',
preferred_reviewer_email: ''
}, },
submitted: false submitted: false
} }

25
resources/views/publish/create-step1.blade.php
View File

@ -210,16 +210,19 @@
</div> </div>
</fieldset> </fieldset>
<div :class="{'form-group':true, 'has-error':errors.has('rights')}"> <div :class="{'form-group':true, 'has-error':errors.has('step-1.rights')}">
<legend>Einräumung eines einfachen Nutzungsrechts</legend> {{-- <legend>Einräumung eines einfachen Nutzungsrechts</legend> --}}
<label for="rights" class="pure-checkbox"> <label for="rights">
<input class="form-checkbox" name="rights" id="rights" type="checkbox" v-model="dataset.rights" v-validate="'required'" data-vv-scope="step-1"> <input class="form-checkbox" name="rights" id="rights" type="checkbox" v-model="dataset.rights" v-validate="'required'" data-vv-scope="step-1">
I accept terms and conditions
</label> </label>
<button @click="showModal" class="pure-button button-small is-success"> <i class="fas fa-info-circle" @click="showModal" style="font-size:24px"></i>
{{-- <button @click="showModal" class="pure-button button-small is-success">
{!! trans('validation.attributes.backend.create-dataset.terms_and_conditions').'*' !!} {!! trans('validation.attributes.backend.create-dataset.terms_and_conditions').'*' !!}
</button> </button> --}}
<!-- use the modal component, pass in the prop --> <!-- use the modal component, pass in the prop -->
{{-- <button type="button" class="btn" @click="showModal"> {{-- <button type="button" class="btn" @click="showModal">
@ -238,7 +241,7 @@
<br /> <br />
<i v-show="errors.has('step-1.rights')" class="fa fa-warning"></i> <i v-show="errors.has('step-1.rights')" class="fas fa-exclamation-circle"></i>
<span v-show="errors.has('step-1.rights')" class="text-danger">@{{ errors.first('step-1.rights') }}</span> <span v-show="errors.has('step-1.rights')" class="text-danger">@{{ errors.first('step-1.rights') }}</span>
@ -565,7 +568,7 @@
</div> </div>
</fieldset> </fieldset>
<fieldset id="fieldset-submitters"> {{-- <fieldset id="fieldset-submitters">
<legend>Submitters</legend> <legend>Submitters</legend>
<div class="pure-g"> <div class="pure-g">
<div class="pure-u-1 pure-u-md-1-2 pure-div"> <div class="pure-u-1 pure-u-md-1-2 pure-div">
@ -582,7 +585,7 @@
</div> </div>
</div> </div>
</div> </div>
</fieldset> </fieldset> --}}
<br /> <br />
<div class="pure-controls"> <div class="pure-controls">
<button @click.prevent="prev()" class="pure-button button-small"> <button @click.prevent="prev()" class="pure-button button-small">

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

@ -22,6 +22,17 @@
<legend>General</legend> <legend>General</legend>
<div class="pure-g"> <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"> <div class="pure-u-1 pure-u-md-1-2 pure-div">
{!! Form::label('reviewer_id', 'reviewer:') !!} {!! Form::label('reviewer_id', 'reviewer:') !!}
<div class="select pure-u-23-24"> <div class="select pure-u-23-24">

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

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

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

@ -33,14 +33,11 @@
<div class="pure-g"> <div class="pure-g">
<div class="pure-u-1 pure-u-md-1-1 pure-div"> <div class="pure-u-1 pure-u-md-1-1 pure-div">
{!! Form::label('editor_id', 'preferred editor:') !!} {{-- {!! Form::label('editor_id', 'preferred editor:') !!}
{!! $dataset->preferred_editor !!} {!! $dataset->preferred_editor !!}
<span class="help is-danger"> {!! $message !!}</span> --}}
<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> --}}
</div> </div>
<div class="pure-u-1 pure-u-md-1-1 pure-div"> <div class="pure-u-1 pure-u-md-1-1 pure-div">
{!! Form::label('owner', 'dataset owner:') !!} {!! Form::label('owner', 'dataset owner:') !!}
{!! $dataset->user->login !!} {!! $dataset->user->login !!}

23
resources/views/workflow/submitter/release.blade.php
View File

@ -28,18 +28,29 @@
<legend>General</legend> <legend>General</legend>
<div class="pure-g"> <div class="pure-g">
<div class="pure-u-1 pure-u-md-1-2 pure-div"> <div class="pure-u-1 pure-u-md-1-1 pure-div">
{!! Form::label('preferred_editor', 'preferred editor:') !!} {!! Form::label('preferred_reviewer', 'name of preferred reviewer:') !!}
{{-- {!! Form::select('editor_id', $editors, null, ['id' => 'editor_id', 'placeholder' => '-- select editor --', 'v-model' => {{-- {!! Form::select('editor_id', $editors, null, ['id' => 'editor_id', 'placeholder' => '-- select editor --', 'v-model' =>
'dataset.editor_id', "v-validate" => "'required'"]) !!} --}} 'dataset.editor_id', "v-validate" => "'required'"]) !!} --}}
{!! Form::text('preferred_editor', null, ['id' => 'preferred_editor', 'class'=>'pure-u-23-24', {!! Form::text('preferred_reviewer', null, ['id' => 'preferred_reviewer', 'class'=>'pure-u-23-24',
'placeholder' => '-- enter name of preferred editor --', 'placeholder' => '-- enter name of preferred reviewer --',
'v-model' => 'dataset.preferred_editor', "v-validate" => "'required|min:3|max:20'"]) !!} 'v-model' => 'dataset.preferred_reviewer', "v-validate" => "'required|min:3|max:20'"]) !!}
<em>*</em>
<span class="help is-danger" v-if="errors.has('preferred_editor')" v-text="errors.first('preferred_editor')"></span> <span class="help is-danger" v-if="errors.has('preferred_reviewer')" v-text="errors.first('preferred_reviewer')"></span>
</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> </div>
</fieldset> </fieldset>