- messages also in edit forms of submitter and editor

- help texts on click event in create form
This commit is contained in:
Arno Kaimbacher 2020-01-28 17:59:52 +01:00
parent 619a37e246
commit e0dcffdf00
19 changed files with 850 additions and 765 deletions

View File

@ -108,6 +108,10 @@ class EditorController extends Controller
$languages = DB::table('languages')
->where('active', true)
->pluck('part1', 'part1');
$messages = DB::table('messages')
->pluck('help_text', 'metadata_element');
$projects = Project::pluck('label', 'id');
$datum = date('Y-m-d');
@ -144,6 +148,7 @@ class EditorController extends Controller
'titleTypes',
'descriptionTypes',
'languages',
'messages',
'projects',
'licenses',
'checkeds',

View File

@ -70,6 +70,9 @@ class SubmitController extends Controller
->where('active', true)
->pluck('part1', 'part1');
$messages = DB::table('messages')
->pluck('help_text', 'metadata_element');
$projects = Project::pluck('label', 'id');
$datum = date('Y-m-d');
@ -105,6 +108,7 @@ class SubmitController extends Controller
'titleTypes',
'descriptionTypes',
'languages',
'messages',
'projects',
'licenses',
'checkeds',

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1021,3 +1021,7 @@ textarea.large, input.large {
color: #4dc0b5;
}
i {
cursor: pointer;
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -113,6 +113,7 @@ export default class EditDataset extends Vue {
this.titleTypes = window.Laravel.titleTypes;
this.descriptionTypes = window.Laravel.descriptionTypes;
this.languages = window.Laravel.languages;
this.messages = window.Laravel.messages;
this.projects = window.Laravel.projects;
this.licenses = window.Laravel.licenses;
this.checkeds = window.Laravel.checkeds;

View File

@ -104,6 +104,9 @@
<script lang="ts">
import draggable from "vuedraggable";
import { Component, Inject, Vue, Prop, Watch } from "vue-property-decorator";
import Tooltip from 'vue-directive-tooltip';
import 'vue-directive-tooltip/dist/vueDirectiveTooltip.css';
Vue.use(Tooltip);
@Component({
components: { draggable }

View File

@ -151,7 +151,6 @@ const app = new Vue({
mounted() {
//this.step = 2;
this.reset();
console.log(this.messages);
},
beforeMount() {
this.messages = window.Laravel.messages;

View File

@ -8,6 +8,7 @@
background-color: #00a9d8;
z-index: 9999;
}
.vue-tooltip.tooltip-custom .tooltip-content {
z-index: 9999;
}
@ -41,12 +42,14 @@
<label for="language">
<span>
Language..
<i v-tooltip="{ content: messages.dataset_language, class: 'tooltip-custom tooltip-other-custom' }"
<i @click.prevent
v-tooltip.click.manual="{ content: messages.dataset_language, class: 'tooltip-custom tooltip-other-custom' }"
class="far fa-lg fa-question-circle"></i>
</span>
</label>
<div class="select pure-u-23-24">
{!! Form::select('language', $languages, null, ['placeholder' => '[language]', 'v-model' => 'dataset.language', "v-validate"
{!! Form::select('language', $languages, null, ['placeholder' => '[language]', 'v-model' =>
'dataset.language', "v-validate"
=> "'required'", 'data-vv-scope' => 'step-0']) !!}
</div>
<small id="languageHelp" class="pure-form-message-inline">select dataset main language</small>
@ -73,7 +76,7 @@
<div v-if="step === 1 && isInitial" data-vv-scope="step-1">
<h1>Step One: Mandatory Elements</h1>
<div class="form-group">
<fieldset class="fieldset-general">
<legend>General</legend>
<div class="description hint">
<p>Bitte wählen Sie einen Datensatztyp aus der Liste aus.</p>
@ -87,18 +90,22 @@
</div>
</div> --}}
<div class="pure-u-1 pure-u-md-1-2 pure-div">
<label for="documentType">Dataset Type<span class="required" title="Dieses Feld muss ausgefüllt werden.">
* <i v-tooltip="{ content: messages.dataset_type, class: 'tooltip-custom tooltip-other-custom' }" class="far fa-lg fa-question-circle"></i>
<label for="documentType">Dataset Type<span class="required"
title="Dieses Feld muss ausgefüllt werden.">
* <i @click.prevent
v-tooltip.click="{ content: messages.dataset_type, class: 'tooltip-custom tooltip-other-custom' }"
class="far fa-lg fa-question-circle"></i>
</span>
</label>
<div class="select pure-u-23-24" title="Bitte wählen Sie einen Datensatztyp aus der Liste aus.">
{!! Form::select('Type', Lang::get('doctypes'), null, ['id' => 'type', 'placeholder' => '-- select type --', 'v-model' =>
{!! Form::select('Type', Lang::get('doctypes'), null, ['id' => 'type', 'placeholder' => '--
select type --', 'v-model' =>
'dataset.type', "v-validate" => "'required'", 'data-vv-scope' => 'step-1']) !!}
</div>
</div>
</div>
</fieldset>
<fieldset id="fieldset-titles">
<legend>
@ -110,12 +117,14 @@
<label for="TitleMain">
<span>
Main Title
<i v-tooltip="{ content: messages.main_title, class: 'tooltip-custom tooltip-other-custom' }"
<i @click.prevent
v-tooltip.click="{ content: messages.main_title, class: 'tooltip-custom tooltip-other-custom' }"
class="far fa-lg fa-question-circle"></i>
</span>
</label>
{!! Form::text('TitleMain[Value]', null, ['class' => 'pure-u-23-24', 'v-model'
=> 'dataset.title_main.value', "v-validate" => "'required|min:4|max:255'", "data-vv-as" => "Main Title", 'data-vv-scope' => 'step-1']) !!}
=> 'dataset.title_main.value', "v-validate" => "'required|min:4|max:255'", "data-vv-as" => "Main
Title", 'data-vv-scope' => 'step-1']) !!}
</div>
<div class="pure-u-1 pure-u-md-1-2 pure-div">
{!! Form::label('TitleLanguage', 'Title Language..') !!}
@ -123,14 +132,15 @@
{!! Form::select('TitleMain[Language]', $languages, null, ['placeholder' => '--no language--', 'v-model' => 'dataset.title_main.language',
"v-validate" => "'required'", "data-vv-as" => "Title Language", 'data-vv-scope' => 'step-1']) !!}
</div> --}}
{!! Form::text('TitleMain[Language]', null, ['class' => 'pure-u-23-24', 'v-model' => 'dataset.title_main.language', 'readonly']) !!}
{!! Form::text('TitleMain[Language]', null, ['class' => 'pure-u-23-24', 'v-model' =>
'dataset.title_main.language', 'readonly']) !!}
</div>
</div>
<div class="pure-u-1 pure-u-md-1-2 pure-div">
<label>
<span>
Add additional title(s) <i
v-tooltip="{ content: messages.additional_titles, class: 'tooltip-custom tooltip-other-custom' }"
Add additional title(s) <i @click.prevent
v-tooltip.click="{ content: messages.additional_titles, class: 'tooltip-custom tooltip-other-custom' }"
class="far fa-lg fa-question-circle"></i>
</span>
</label>
@ -148,20 +158,25 @@
<tbody>
<tr v-for="(item, index) in dataset.titles">
<td>
<input name="Title" class="form-control" placeholder="[TITLE]" v-model="item.value" data-vv-as="Additional Title" v-validate="'required|min:4|max:255'" data-vv-scope="step-1" />
<input name="Title" class="form-control" placeholder="[TITLE]" v-model="item.value"
data-vv-as="Additional Title" v-validate="'required|min:4|max:255'"
data-vv-scope="step-1" />
</td>
<td>
{!! Form::select('Title[Type]', $titleTypes, null,
['placeholder' => '[titleType]', 'v-model' => 'item.type', "v-validate" => "'required'", 'data-vv-scope' => 'step-1']) !!}
['placeholder' => '[titleType]', 'v-model' => 'item.type', "v-validate" => "'required'",
'data-vv-scope' => 'step-1']) !!}
</td>
<td>
{!! Form::select('Title[Language]', $languages, null,
['placeholder' => '[language]', 'v-model' => 'item.language', "data-vv-as" => "Additional Title Language",
['placeholder' => '[language]', 'v-model' => 'item.language', "data-vv-as" =>
"Additional Title Language",
"v-validate" => "{required: true, translatedLanguage: [dataset.language, item.type]}",
'data-vv-scope' => 'step-1']) !!}
</td>
<td>
<button class="pure-button button-small is-warning" @click.prevent="removeTitle(index)"> <i class="fa fa-trash"></i> </button>
<button class="pure-button button-small is-warning" @click.prevent="removeTitle(index)">
<i class="fa fa-trash"></i> </button>
</td>
</tr>
</tbody>
@ -175,7 +190,8 @@
<label for="TitleAbstract">
<span>
Main Abstract
<i v-tooltip="{ content: messages.main_abstract, class: 'tooltip-custom tooltip-other-custom' }"
<i @click.prevent
v-tooltip.click="{ content: messages.main_abstract, class: 'tooltip-custom tooltip-other-custom' }"
class="far fa-lg fa-question-circle"></i>
</span>
</label>
@ -189,13 +205,14 @@
{!! Form::select('TitleAbstract[Language]', $languages, null, ['placeholder' => '--no language--', 'v-model' => 'dataset.abstract_main.language',
"v-validate" => "'required'", "data-vv-as" => "Abstract Language", 'data-vv-scope' => 'step-1']) !!}
</div> --}}
{!! Form::text('TitleAbstract[Language]', null, ['class' => 'pure-u-23-24', 'v-model' => 'dataset.abstract_main.language', 'readonly']) !!}
{!! Form::text('TitleAbstract[Language]', null, ['class' => 'pure-u-23-24', 'v-model' =>
'dataset.abstract_main.language', 'readonly']) !!}
</div>
<div class="pure-u-1 pure-u-md-1-2 pure-div">
<label>
<span>
Add additional descriptions(s) <i
v-tooltip="{ content: messages.additional_descriptions, class: 'tooltip-custom tooltip-other-custom' }"
Add additional descriptions(s) <i @click.prevent
v-tooltip.click="{ content: messages.additional_descriptions, class: 'tooltip-custom tooltip-other-custom' }"
class="far fa-lg fa-question-circle"></i>
</span>
</label>
@ -214,11 +231,14 @@
<tbody>
<tr v-for="(item, index) in dataset.abstracts">
<td>
<textarea rows="3" cols="40" name="Description[Value]" class="form-control" placeholder="[DESCRIPTION]" v-model="item.value" data-vv-as="Additional Description" v-validate="'required|min:4|max:2500'" data-vv-scope="step-1"></textarea>
<textarea rows="3" cols="40" name="Description[Value]" class="form-control"
placeholder="[DESCRIPTION]" v-model="item.value" data-vv-as="Additional Description"
v-validate="'required|min:4|max:2500'" data-vv-scope="step-1"></textarea>
</td>
<td>
{!! Form::select('Description[Type]', $descriptionTypes, null,
['placeholder' => '[descriptionType]', 'v-model' => 'item.type', "v-validate" => "'required'", 'data-vv-scope' => 'step-1']) !!}
['placeholder' => '[descriptionType]', 'v-model' => 'item.type', "v-validate" =>
"'required'", 'data-vv-scope' => 'step-1']) !!}
</td>
<td>
{!! Form::select('Description[Language]', $languages, null,
@ -229,7 +249,8 @@
'data-vv-scope' => 'step-1']) !!}
</td>
<td>
<button class="pure-button button-small is-warning" @click.prevent="removeDescription(index)"> <i class="fa fa-trash"></i> </button>
<button class="pure-button button-small is-warning"
@click.prevent="removeDescription(index)"> <i class="fa fa-trash"></i> </button>
</td>
</tr>
</tbody>
@ -240,11 +261,14 @@
<fieldset id="fieldset-creator">
<legend>
Creator
<i v-tooltip="{ content: messages.creator, class: 'tooltip-custom tooltip-other-custom' }" class="far fa-lg fa-question-circle"></i>
<i @click.prevent
v-tooltip.click="{ content: messages.creator, class: 'tooltip-custom tooltip-other-custom' }"
class="far fa-lg fa-question-circle"></i>
</legend>
<div class="pure-g">
<div class="pure-u-1 pure-u-md-1-2 pure-div">
<my-autocomplete title="searching active person table" v-on:person="onAddAuthor"></my-autocomplete>
<my-autocomplete title="searching active person table" v-on:person="onAddAuthor">
</my-autocomplete>
{{--
<my-autocomplete :items="[ 'Apple', 'Banana', 'Orange', 'Mango', 'Pear', 'Peach', 'Grape', 'Tangerine', 'Pineapple']"></my-autocomplete> --}}
</div>
@ -263,14 +287,18 @@
{!! Form::label('additionalCreators', 'Add additional creator(s) if creator is not in database') !!}
<button class="pure-button button-small" @click.prevent="addNewAuthor()">+</button>
</div>
<input name="persons" v-model="dataset.persons" type="hidden" class="form-check-input" v-validate="'required'" data-vv-as="Creator" data-vv-scope="step-1">
<person-table name="persons" v-bind:messages="messages" v-bind:heading="'creator table'" v-bind:personlist="dataset.persons"></person-table>
<input name="persons" v-model="dataset.persons" type="hidden" class="form-check-input" v-validate="'required'"
data-vv-as="Creator" data-vv-scope="step-1">
<person-table name="persons" v-bind:messages="messages" v-bind:heading="'creator table'"
v-bind:personlist="dataset.persons"></person-table>
</fieldset>
<fieldset id="fieldset-contributors">
<legend>
Contributor
<i v-tooltip="{ content: messages.contributor, class: 'tooltip-custom tooltip-other-custom' }" class="far fa-lg fa-question-circle"></i>
<i @click.prevent
v-tooltip.click="{ content: messages.contributor, class: 'tooltip-custom tooltip-other-custom' }"
class="far fa-lg fa-question-circle"></i>
</legend>
<div class="pure-g">
<div class="pure-u-1 pure-u-md-1-2 pure-div">
@ -292,7 +320,8 @@
<button class="pure-button button-small" @click.prevent="addNewContributor()">+</button>
</div>
{{-- <h3>contributor table</h3> --}}
<person-table name="contributors" v-bind:messages="messages" v-bind:heading="'contributor table'" v-bind:personlist="dataset.contributors"></person-table>
<person-table name="contributors" v-bind:messages="messages" v-bind:heading="'contributor table'"
v-bind:personlist="dataset.contributors"></person-table>
</fieldset>
<fieldset id="fieldset-publisher">
@ -301,18 +330,21 @@
<label for="CreatingCorporation">
<span>
Corporation Name
<i v-tooltip="{ content: messages.corporate_name, class: 'tooltip-custom tooltip-other-custom' }"
<i @click.prevent
v-tooltip.click="{ content: messages.corporate_name, class: 'tooltip-custom tooltip-other-custom' }"
class="far fa-lg fa-question-circle"></i>
</span>
</label>
{!! Form::text('CreatingCorporation', null, ['readonly', 'class' =>
'pure-u-23-24', 'v-model' => 'dataset.creating_corporation', "v-validate" => "'required'", 'data-vv-scope' => 'step-1']) !!}
'pure-u-23-24', 'v-model' => 'dataset.creating_corporation', "v-validate" => "'required'", 'data-vv-scope' =>
'step-1']) !!}
</div>
</fieldset>
<div :class="{'form-group':true, 'has-error':errors.has('step-1.rights')}">
<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">
terms and conditions
</label>
@ -322,7 +354,9 @@
{!! trans('validation.attributes.backend.create-dataset.terms_and_conditions').'*' !!}
</template>
<template slot="body">
Die im GBA-RDR veröffentlichten Informationen und Metadaten unterliegen grundsätzlich den Open-Access-Bedingungen, wenn nicht anders angegeben. Die publizierten Datensets unterliegen einem definierten Zugriffs- sowie Nutzungsrecht welche in den Metadaten eindeutig beschrieben sind.
Die im GBA-RDR veröffentlichten Informationen und Metadaten unterliegen grundsätzlich den
Open-Access-Bedingungen, wenn nicht anders angegeben. Die publizierten Datensets unterliegen einem
definierten Zugriffs- sowie Nutzungsrecht welche in den Metadaten eindeutig beschrieben sind.
</template>
</Modal>
@ -364,12 +398,14 @@
<label for="project_id">
<span>
Project..
<i v-tooltip="{ content: messages.project, class: 'tooltip-custom tooltip-other-custom' }"
<i @click.prevent
v-tooltip.click="{ content: messages.project, class: 'tooltip-custom tooltip-other-custom' }"
class="far fa-lg fa-question-circle"></i>
</span>
</label>
<div class="select pure-u-23-24">
{!! Form::select('project_id', $projects, null, ['id' => 'project_id', 'placeholder' => '--no project--', 'v-model' => 'dataset.project_id', 'data-vv-scope' => 'step-2'])
{!! Form::select('project_id', $projects, null, ['id' => 'project_id', 'placeholder' => '--no
project--', 'v-model' => 'dataset.project_id', 'data-vv-scope' => 'step-2'])
!!}
</div>
<small id="projectHelp" class="pure-form-message-inline">project is optional</small>
@ -384,7 +420,8 @@
<label for="EmbargoDate">
<span>
Embargo Date..
<i v-tooltip="{ content: messages.embargo_date, class: 'tooltip-custom tooltip-other-custom' }"
<i @click.prevent
v-tooltip.click="{ content: messages.embargo_date, class: 'tooltip-custom tooltip-other-custom' }"
class="far fa-lg fa-question-circle"></i>
</span>
</label>
@ -397,7 +434,9 @@
<fieldset id="fieldset-geolocation">
<legend>
Geo Location
<i v-tooltip="{ content: messages.geolocation, class: 'tooltip-custom tooltip-other-custom' }" class="far fa-lg fa-question-circle"></i>
<i @click.prevent
v-tooltip.click="{ content: messages.geolocation, class: 'tooltip-custom tooltip-other-custom' }"
class="far fa-lg fa-question-circle"></i>
</legend>
<div class="pure-g">
<div class="pure-u-1 pure-u-md-1 pure-u-lg-1 pure-div">
@ -431,7 +470,9 @@
<fieldset id="fieldset-coverage">
<legend>
Coverage
<i v-tooltip="{ content: messages.coverage, class: 'tooltip-custom tooltip-other-custom' }" class="far fa-lg fa-question-circle"></i>
<i @click.prevent
v-tooltip.click="{ content: messages.coverage, class: 'tooltip-custom tooltip-other-custom' }"
class="far fa-lg fa-question-circle"></i>
</legend>
<div class="pure-g">
@ -453,17 +494,22 @@
<div v-show="elevation === 'absolut'" class="pure-u-1 pure-u-md-1">
{!! Form::label('elevation_absolut', 'elevation absolut: ') !!}
{!! Form::text('elevation_absolut', null,
['class' => 'pure-u-23-24', 'v-model' => 'dataset.coverage.elevation_absolut', 'data-vv-scope' => 'step-2', "v-validate" => "this.isElevationAbsolut ? 'required|integer' : '' " ]) !!}
['class' => 'pure-u-23-24', 'v-model' => 'dataset.coverage.elevation_absolut', 'data-vv-scope' =>
'step-2', "v-validate" => "this.isElevationAbsolut ? 'required|integer' : '' " ]) !!}
</div>
<div v-show="elevation === 'range'" class="pure-u-1 pure-u-md-1">
{!! Form::label('elevation_min', 'elevation min: ') !!}
{!! Form::text('elevation_min', null,
['class' => 'pure-u-23-24', 'v-model' => 'dataset.coverage.elevation_min', 'data-vv-scope' => 'step-2', "v-validate" => "this.isElevationRange ? 'required|integer' : '' "]) !!}
['class' => 'pure-u-23-24', 'v-model' => 'dataset.coverage.elevation_min', 'data-vv-scope' =>
'step-2',
"v-validate" => "this.isElevationRange ? 'required|integer' : '' "]) !!}
</div>
<div v-show="elevation === 'range'" class="pure-u-1 pure-u-md-1">
{!! Form::label('elevation_max', 'elevation max: ') !!}
{!! Form::text('elevation_max', null,
['class' => 'pure-u-23-24', 'v-model' => 'dataset.coverage.elevation_max', 'data-vv-scope' => 'step-2', "v-validate" => "this.isElevationRange ? 'required|integer' : '' "]) !!}
['class' => 'pure-u-23-24', 'v-model' => 'dataset.coverage.elevation_max', 'data-vv-scope' =>
'step-2',
"v-validate" => "this.isElevationRange ? 'required|integer' : '' "]) !!}
</div>
</div>
@ -484,18 +530,25 @@
</div>
<div v-show="depth === 'absolut'" class="pure-u-1 pure-u-md-1">
{!! Form::label('depth_absolut', 'depth absolut: ') !!} {!! Form::text('depth_absolut', null, ['class' => 'pure-u-23-24',
'v-model' => 'dataset.coverage.depth_absolut', 'data-vv-scope' => 'step-2', "v-validate" => "this.isDepthAbsolut
{!! Form::label('depth_absolut', 'depth absolut: ') !!} {!! Form::text('depth_absolut', null,
['class'
=> 'pure-u-23-24',
'v-model' => 'dataset.coverage.depth_absolut', 'data-vv-scope' => 'step-2', "v-validate" =>
"this.isDepthAbsolut
? 'required|integer' : '' " ]) !!}
</div>
<div v-show="depth === 'range'" class="pure-u-1 pure-u-md-1">
{!! Form::label('depth_min', 'depth min: ') !!} {!! Form::text('depth_min', null, ['class' => 'pure-u-23-24', 'v-model' =>
'dataset.coverage.depth_min', 'data-vv-scope' => 'step-2', "v-validate" => "this.isDepthRange ? 'required|integer'
{!! Form::label('depth_min', 'depth min: ') !!} {!! Form::text('depth_min', null, ['class' =>
'pure-u-23-24', 'v-model' =>
'dataset.coverage.depth_min', 'data-vv-scope' => 'step-2', "v-validate" => "this.isDepthRange ?
'required|integer'
: '' "]) !!}
</div>
<div v-show="depth === 'range'" class="pure-u-1 pure-u-md-1">
{!! Form::label('depth_max', 'depth max: ') !!} {!! Form::text('depth_max', null, ['class' => 'pure-u-23-24', 'v-model' =>
'dataset.coverage.depth_max', 'data-vv-scope' => 'step-2', "v-validate" => "this.isDepthRange ? 'required|integer'
{!! Form::label('depth_max', 'depth max: ') !!} {!! Form::text('depth_max', null, ['class' =>
'pure-u-23-24', 'v-model' =>
'dataset.coverage.depth_max', 'data-vv-scope' => 'step-2', "v-validate" => "this.isDepthRange ?
'required|integer'
: '' "]) !!}
</div>
</div>
@ -521,7 +574,10 @@
{{-- {!! Form::datetime('time_absolut', null, ['class' => 'pure-u-23-24', 'placeholder' => 'dd.MM.yyyy HH:mm',
'v-model' => 'dataset.coverage.time_absolut', 'data-vv-scope' => 'step-2', 'format' => 'yyyy-MM-dd HH:mm',
"v-validate" => "this.isTimeAbsolut ? 'required|date_format:dd.MM.yyyy HH:mm:ss' : '' " ]) !!} --}}
<datetime name="time_absolut" v-validate="this.isTimeAbsolut ? 'required|date_format:yyyy-MM-dd HH:mm:ss' : '' " data-vv-scope="step-2" format="YYYY-MM-DD h:i:s" v-model='dataset.coverage.time_absolut' ></datetime>
<datetime name="time_absolut"
v-validate="this.isTimeAbsolut ? 'required|date_format:yyyy-MM-dd HH:mm:ss' : '' "
data-vv-scope="step-2" format="YYYY-MM-DD h:i:s" v-model='dataset.coverage.time_absolut'>
</datetime>
{{-- <datetime name="time_absolut" format="MM-DD-YYYY H:i:s" width="300px" v-model="dataset.coverage.time_absolut"></datetime> --}}
</div>
<div v-show="time === 'range'" class="pure-u-1 pure-u-md-1">
@ -529,14 +585,18 @@
{{-- {!! Form::datetimelocal('time_min', null, ['class' => 'pure-u-23-24', 'placeholder' => 'dd.MM.yyyy HH:mm:ss',
'v-model' => 'dataset.coverage.time_min', 'data-vv-scope' => 'step-2', 'step' => 1,
"v-validate" => "this.isTimeRange ? 'required|date_format:dd.MM.yyyy HH:mm:ss' : '' "]) !!} --}}
<datetime name="time_min" v-validate="this.isTimeRange ? 'required|date_format:dd-MM-yyyy HH:mm:ss' : '' " data-vv-scope="step-2" format="YYYY-MM-DD h:i:s" v-model='dataset.coverage.time_min' ></datetime>
<datetime name="time_min"
v-validate="this.isTimeRange ? 'required|date_format:dd-MM-yyyy HH:mm:ss' : '' "
data-vv-scope="step-2" format="YYYY-MM-DD h:i:s" v-model='dataset.coverage.time_min'></datetime>
</div>
<div v-show="time === 'range'" class="pure-u-1 pure-u-md-1">
{!! Form::label('timemax', 'time max: ') !!}
{{-- {!! Form::datetimelocal('time_max', null, ['class' => 'pure-u-23-24', 'placeholder' => 'dd.MM.yyyy HH:mm:ss',
'v-model' => 'dataset.coverage.time_max', 'data-vv-scope' => 'step-2', 'step' => 1,
"v-validate" => "this.isTimeRange ? 'required|date_format:dd.MM.yyyy HH:mm:ss' : '' "]) !!} --}}
<datetime name="time_max" v-validate="this.isTimeRange ? 'required|date_format:dd-MM-yyyy HH:mm:ss' : '' " data-vv-scope="step-2" format="YYYY-MM-DD h:i:s" v-model='dataset.coverage.time_max' ></datetime>
<datetime name="time_max"
v-validate="this.isTimeRange ? 'required|date_format:dd-MM-yyyy HH:mm:ss' : '' "
data-vv-scope="step-2" format="YYYY-MM-DD h:i:s" v-model='dataset.coverage.time_max'></datetime>
</div>
</div>
@ -546,7 +606,8 @@
<fieldset id="fieldset-references">
<legend>
Dataset References
<i v-tooltip="{ content: messages.dataset_references, class: 'tooltip-custom tooltip-other-custom' }" class="far fa-lg fa-question-circle"></i>
<i @click.prevent v-tooltip.click="{ content: messages.dataset_references, class: 'tooltip-custom tooltip-other-custom' }"
class="far fa-lg fa-question-circle"></i>
</legend>
<button class="pure-button button-small" @click.prevent="addReference()">Add Reference</button>
<table class="table table-hover" v-if="dataset.references.length">
@ -555,26 +616,23 @@
<th style="width: 20px;">
<span>
Value of the identifier <i
v-tooltip="{ content: messages.reference_value, class: 'tooltip-custom tooltip-other-custom' }"
class="far fa-lg fa-question-circle"
></i>
@click.prevent v-tooltip.click="{ content: messages.reference_value, class: 'tooltip-custom tooltip-other-custom' }"
class="far fa-lg fa-question-circle"></i>
</span>
</th>
<th>
<span>
Type <i
v-tooltip="{ content: messages.reference_type, class: 'tooltip-custom tooltip-other-custom' }"
class="far fa-lg fa-question-circle"
></i>
@click.prevent v-tooltip.click="{ content: messages.reference_type, class: 'tooltip-custom tooltip-other-custom' }"
class="far fa-lg fa-question-circle"></i>
</span>
</th>
<th>Relation</th>
<th>
<span>
Label <i
v-tooltip="{ content: messages.reference_label, class: 'tooltip-custom tooltip-other-custom' }"
class="far fa-lg fa-question-circle"
></i>
@click.prevent v-tooltip.click="{ content: messages.reference_label, class: 'tooltip-custom tooltip-other-custom' }"
class="far fa-lg fa-question-circle"></i>
</span>
</th>
<th style="width: 130px;"></th>
@ -583,21 +641,26 @@
<tbody>
<tr v-for="(item, index) in dataset.references">
<td>
<input name="Reference Value" class="form-control" placeholder="[RELATED IDENTIFIER]" v-model="item.value" v-validate="'required'" data-vv-scope="step-2" />
<input name="Reference Value" class="form-control" placeholder="[RELATED IDENTIFIER]"
v-model="item.value" v-validate="'required'" data-vv-scope="step-2" />
</td>
<td>
{!! Form::select('Reference[Type]', $relatedIdentifierTypes, null,
['placeholder' => '[relatedIdentifierType]', 'v-model' => 'item.type', "v-validate" => "'required'", 'data-vv-scope' => 'step-2']) !!}
['placeholder' => '[relatedIdentifierType]', 'v-model' => 'item.type', "v-validate" =>
"'required'", 'data-vv-scope' => 'step-2']) !!}
</td>
<td>
{!! Form::select('Reference[Relation]', $relationTypes, null,
['placeholder' => '[relationType]', 'v-model' => 'item.relation', 'data-vv-scope' => 'step-2']) !!}
['placeholder' => '[relationType]', 'v-model' => 'item.relation', 'data-vv-scope' => 'step-2'])
!!}
</td>
<td>
<input name="Reference Label" class="form-control" v-model="item.label" v-validate="'required'" data-vv-scope="step-2" />
<input name="Reference Label" class="form-control" v-model="item.label" v-validate="'required'"
data-vv-scope="step-2" />
</td>
<td>
<button class="pure-button button-small is-warning" @click.prevent="removeReference(index)"> <i class="fa fa-trash"></i> </button>
<button class="pure-button button-small is-warning" @click.prevent="removeReference(index)"> <i
class="fa fa-trash"></i> </button>
</td>
</tr>
</tbody>
@ -608,9 +671,11 @@
<fieldset id="fieldset-keywords">
<legend>
Dataset Keywords
<i v-tooltip="{ content: messages.dataset_keywords, class: 'tooltip-custom tooltip-other-custom' }" class="far fa-lg fa-question-circle"></i>
<i @click.prevent v-tooltip.click="{ content: messages.dataset_keywords, class: 'tooltip-custom tooltip-other-custom' }"
class="far fa-lg fa-question-circle"></i>
</legend>
<input type="hidden" v-validate:keywords_length="'min_value:3'" data-vv-scope="step-2" data-vv-as="keyword list" name="keywords_list">
<input type="hidden" v-validate:keywords_length="'min_value:3'" data-vv-scope="step-2" data-vv-as="keyword list"
name="keywords_list">
<button class="pure-button button-small" @click.prevent="addKeyword()">Add Keyword</button>
<table class="table table-hover" v-if="dataset.subjects.length">
<thead>
@ -618,16 +683,15 @@
<th style="width: 20px;">
<span>
Keyword Value <i
v-tooltip="{ content: messages.keyword_value, class: 'tooltip-custom tooltip-other-custom' }"
@click.prevent v-tooltip.click="{ content: messages.keyword_value, class: 'tooltip-custom tooltip-other-custom' }"
class="far fa-lg fa-question-circle"></i>
</span>
</th>
<th>
<span>
Keyword Type <i
v-tooltip="{ content: messages.keyword_type, class: 'tooltip-custom tooltip-other-custom' }"
class="far fa-lg fa-question-circle"
></i>
@click.prevent v-tooltip.click="{ content: messages.keyword_type, class: 'tooltip-custom tooltip-other-custom' }"
class="far fa-lg fa-question-circle"></i>
</span>
</th>
<th>Language</th>
@ -637,21 +701,24 @@
<tbody>
<tr v-for="(item, index) in dataset.subjects">
<td>
<input name="Keyword Value" class="form-control" placeholder="[KEYWORD VALUE]" v-model="item.value" v-validate="{required: true, unique: [dataset.subjects, index, 'value']}"
<input name="Keyword Value" class="form-control" placeholder="[KEYWORD VALUE]"
v-model="item.value"
v-validate="{required: true, unique: [dataset.subjects, index, 'value']}"
data-vv-scope="step-2" />
</td>
<td>
{{-- {!! Form::select('Keyword[Type]', $keywordTypes, null, ['placeholder' => '[keyword type]', 'v-model' =>
'item.type', "v-validate" => "'required'", 'data-vv-scope' => 'step-2']) !!} --}}
<input name="Keyword Type" readonly class="form-control" placeholder="[KEYWORD TYPE]" v-model="item.type" v-validate="'required'"
data-vv-scope="step-2" />
<input name="Keyword Type" readonly class="form-control" placeholder="[KEYWORD TYPE]"
v-model="item.type" v-validate="'required'" data-vv-scope="step-2" />
</td>
<td>
<input name="Keyword Language" readonly class="form-control" placeholder="[KEYWORD LANGUAGE]" v-model="item.language" v-validate="'required'"
data-vv-scope="step-2" />
<input name="Keyword Language" readonly class="form-control" placeholder="[KEYWORD LANGUAGE]"
v-model="item.language" v-validate="'required'" data-vv-scope="step-2" />
</td>
<td>
<button class="pure-button button-small is-warning" @click.prevent="removeKeyword(index)"> <i class="fa fa-trash"></i> </button>
<button class="pure-button button-small is-warning" @click.prevent="removeKeyword(index)"> <i
class="fa fa-trash"></i> </button>
</td>
</tr>
</tbody>
@ -685,18 +752,20 @@
<fieldset id="fieldset-licenses">
<legend>
Rights List
<i v-tooltip="{ content: messages.rights_list, class: 'tooltip-custom tooltip-other-custom' }" class="far fa-lg fa-question-circle"></i>
<i @click.prevent v-tooltip.click="{ content: messages.rights_list, class: 'tooltip-custom tooltip-other-custom' }"
class="far fa-lg fa-question-circle"></i>
</legend>
<div class="pure-control-group checkboxlist">
@foreach ($licenses as $indexKey => $license)
<label for={{ "license". $license->id }} class="pure-checkbox">
@if ($loop->first)
<input name="licenses" value={{ $license->id }} v-model="dataset.checkedLicenses" type="radio" class="form-check-input" v-validate="'required'"
data-vv-as="Licence" data-vv-scope="step-3">
<input name="licenses" value={{ $license->id }} v-model="dataset.checkedLicenses" type="radio"
class="form-check-input" v-validate="'required'" data-vv-as="Licence" data-vv-scope="step-3">
<a href="{{ $license->link_licence }}" target="_blank">{{ $license->name_long }}</a>
@else
<input name="licenses" value={{ $license->id }} v-model="dataset.checkedLicenses" type="radio" class="form-check-input" data-vv-scope="step-3">
<input name="licenses" value={{ $license->id }} v-model="dataset.checkedLicenses" type="radio"
class="form-check-input" data-vv-scope="step-3">
<a href="{{ $license->link_licence }}" target="_blank">{{ $license->name_long }}</a>
@endif
</label>
@ -729,13 +798,15 @@
<div v-if="step === 4 && (isInitial || isSaving)" data-vv-scope="step-4">
<h1>
File Upload
<i v-tooltip="{ content: messages.file_upload, class: 'tooltip-custom tooltip-other-custom' }" class="far fa-lg fa-question-circle"></i>
<i @click.prevent v-tooltip.click="{ content: messages.file_upload, class: 'tooltip-custom tooltip-other-custom' }"
class="far fa-lg fa-question-circle"></i>
</h1>
<div class="dropbox">
<input type="hidden" v-validate:files_length="'min_value:1'" data-vv-scope="step-4" data-vv-as="files list" name="files_list">
<input type="file" multiple name="files" v-bind:disabled="isSaving" @change="filesChange($event.target.name, $event.target.files)"
class="input-file" data-vv-scope="step-4">
<input type="hidden" v-validate:files_length="'min_value:1'" data-vv-scope="step-4" data-vv-as="files list"
name="files_list">
<input type="file" multiple name="files" v-bind:disabled="isSaving"
@change="filesChange($event.target.name, $event.target.files)" class="input-file" data-vv-scope="step-4">
<p v-if="isInitial">
Drag your file(s) here to begin<br> or click to browse
</p>
@ -753,9 +824,8 @@
<th>
<span>
Label <i
v-tooltip="{ content: messages.file_label, class: 'tooltip-custom tooltip-other-custom' }"
class="far fa-lg fa-question-circle"
></i>
@click.prevent v-tooltip.click="{ content: messages.file_label, class: 'tooltip-custom tooltip-other-custom' }"
class="far fa-lg fa-question-circle"></i>
</span>
</th>
<th style="width: 130px;"></th>
@ -773,7 +843,8 @@
<input class="form-control" v-model="item.label" />
</td>
<td>
<button class="pure-button button-small is-warning" @click.prevent="removeFile(index)"> <i class="fa fa-trash"></i> </button>
<button class="pure-button button-small is-warning" @click.prevent="removeFile(index)"> <i
class="fa fa-trash"></i> </button>
</td>
</tr>
</tbody>
@ -806,7 +877,8 @@
<a href="javascript:void(0)" @click="reset()" class="pure-button button-small">Upload new Dataset</a>
</p> --}}
<p>
{{-- <a href="javascript:void(0)" @click="editNewDataset()" class="pure-button button-small">@{{ redirectLink }}</a> --}}
{{-- <a href="javascript:void(0)" @click="editNewDataset()" class="pure-button button-small">@{{ redirectLink }}</a>
--}}
<a href="javascript:void(0)" @click="editNewDataset()" class="pure-button button-small">
<i class="fa fa-edit"></i>
<span>Edit</span>
@ -815,7 +887,8 @@
<i class="fa fa-share"></i>
<span>Release</span>
</a>
<i v-tooltip="{ content: messages.upload_successfull_release, class: 'tooltip-custom tooltip-other-custom' }" class="far fa-lg fa-question-circle"></i>
<i @click.prevent v-tooltip.click="{ content: messages.upload_successfull_release, class: 'tooltip-custom tooltip-other-custom' }"
class="far fa-lg fa-question-circle"></i>
<a href="javascript:void(0)" @click="deleteNewDataset()" class="pure-button button-small">
<i class="fa fa-trash"></i>
<span>Delete</span>

View File

@ -77,8 +77,8 @@
</div>
<input name="authors" v-model="form.authors" type="hidden" class="form-check-input" v-validate="'required'"
data-vv-as="Author">
<person-table name="authors" v-bind:heading="'authors'" v-bind:personlist="form.authors"></person-table>
<person-table name="contributors" v-bind:heading="'contributors'" v-bind:personlist="form.contributors">
<person-table name="authors" v-bind:messages="messages" v-bind:heading="'authors'" v-bind:personlist="form.authors"></person-table>
<person-table name="contributors" v-bind:messages="messages" v-bind:heading="'contributors'" v-bind:personlist="form.contributors">
</person-table>
</fieldset>
@ -456,8 +456,6 @@
{{-- <span>old checkeds: @{{ checkeds }}</span> --}}
</div>
</fieldset>
<fieldset id="fieldset-references">

View File

@ -55,6 +55,7 @@
'titleTypes' => $titleTypes,
'descriptionTypes' => $descriptionTypes,
'languages' => $languages,
'messages' => $messages,
'projects' => $projects,
'licenses' => $licenses,
'checkeds' => $checkeds,

View File

@ -74,10 +74,9 @@
{{-- {!! Form::label('additionalCreators', 'Add additional creator(s) if creator is not in database') !!}
<button class="pure-button button-small" @click.prevent="addNewAuthor()">+</button> --}}
</div>
<input name="authors" v-model="form.authors" type="hidden" class="form-check-input" v-validate="'required'"
data-vv-as="Author">
<person-table name="authors" v-bind:heading="'authors'" v-bind:personlist="form.authors"></person-table>
<person-table name="contributors" v-bind:heading="'contributors'" v-bind:personlist="form.contributors">
<input name="authors" v-model="form.authors" type="hidden" class="form-check-input" v-validate="'required'" data-vv-as="Author">
<person-table name="authors" v-bind:messages="messages" v-bind:heading="'authors'" v-bind:personlist="form.authors"></person-table>
<person-table name="contributors" v-bind:messages="messages" v-bind:heading="'contributors'" v-bind:personlist="form.contributors">
</person-table>
</fieldset>
@ -453,10 +452,7 @@
</label>
</template>
{{-- <span>old checkeds: @{{ checkeds }}</span> --}}
</div>
</fieldset>
<fieldset id="fieldset-references">

View File

@ -66,6 +66,7 @@
'titleTypes' => $titleTypes,
'descriptionTypes' => $descriptionTypes,
'languages' => $languages,
'messages' => $messages,
'projects' => $projects,
'licenses' => $licenses,
'checkeds' => $checkeds,