geolba/tethys
6
0
Fork 0
Code Issues 2 Pull requests Projects 1 Releases Packages 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
Download patch file Download diff file Expand all files Collapse all files

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

@ -51,11 +51,11 @@ function initialState() {
titles: [],
descriptions: [],
checkedContributors: [],
checkedSubmitters: [],
// checkedSubmitters: [],
persons: [],
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++) {
formData.append('contributors[' + i + ']', this.dataset.checkedContributors[i]);
}
for (var i = 0; i < this.dataset.checkedSubmitters.length; i++) {
formData.append('submitters[' + i + ']', this.dataset.checkedSubmitters[i]);
}
// for (var i = 0; i < this.dataset.checkedSubmitters.length; i++) {
// formData.append('submitters[' + i + ']', this.dataset.checkedSubmitters[i]);
// }
for (var i = 0; i < this.dataset.references.length; i++) {
let reference = this.dataset.references[i];
@ -438,14 +438,14 @@ const app = new Vue({
this.dataset.checkedContributors.push(person.id);
}
},
onAddSubmitter(person) {
//if person is not in submitters array
//if (this.submitters.includes(person) == false) {
if (this.dataset.submitters.filter(e => e.id === person.id).length == 0) {
this.dataset.submitters.push(person);
this.dataset.checkedSubmitters.push(person.id);
}
},
// onAddSubmitter(person) {
// //if person is not in submitters array
// //if (this.submitters.includes(person) == false) {
// if (this.dataset.submitters.filter(e => e.id === person.id).length == 0) {
// this.dataset.submitters.push(person);
// this.dataset.checkedSubmitters.push(person.id);
// }
// },
/*
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 {
dataset: {
firstName: '',
preferred_editor: ''
preferred_reviewer: '',
preferred_reviewer_email: ''
},
submitted: false
}

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

@ -210,16 +210,19 @@
</div>
</fieldset>
<div :class="{'form-group':true, 'has-error':errors.has('rights')}">
<legend>Einräumung eines einfachen Nutzungsrechts</legend>
<div :class="{'form-group':true, 'has-error':errors.has('step-1.rights')}">
{{-- <legend>Einräumung eines einfachen Nutzungsrechts</legend> --}}
<label for="rights" class="pure-checkbox">
<input class="form-checkbox" name="rights" id="rights" type="checkbox" v-model="dataset.rights" v-validate="'required'" data-vv-scope="step-1">
I accept
</label>
<button @click="showModal" class="pure-button button-small is-success">
<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">
terms and conditions
</label>
<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').'*' !!}
</button>
</button> --}}
<!-- use the modal component, pass in the prop -->
{{-- <button type="button" class="btn" @click="showModal">
@ -238,7 +241,7 @@
<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>
@ -565,7 +568,7 @@
</div>
</fieldset>
<fieldset id="fieldset-submitters">
{{-- <fieldset id="fieldset-submitters">
<legend>Submitters</legend>
<div class="pure-g">
<div class="pure-u-1 pure-u-md-1-2 pure-div">
@ -582,7 +585,7 @@
</div>
</div>
</div>
</fieldset>
</fieldset> --}}
<br />
<div class="pure-controls">
<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>
<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">
{!! Form::label('reviewer_id', 'reviewer:') !!}
<div class="select pure-u-23-24">

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

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

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

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

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

@ -28,18 +28,29 @@
<legend>General</legend>
<div class="pure-g">
<div class="pure-u-1 pure-u-md-1-2 pure-div">
{!! Form::label('preferred_editor', 'preferred editor:') !!}
<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_editor', null, ['id' => 'preferred_editor', 'class'=>'pure-u-23-24',
'placeholder' => '-- enter name of preferred editor --',
'v-model' => 'dataset.preferred_editor', "v-validate" => "'required|min:3|max:20'"]) !!}
{!! 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_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 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>