Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate existing datepickers to Vuetify #388

Open
wants to merge 6 commits into
base: devel
Choose a base branch
from
Open

Migrate existing datepickers to Vuetify #388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7197fae
Changed datepicker of AddRelease
rossicler Oct 15, 2019
cc53f89
Removed buttons and fixed conflict on closing different modals
rossicler Oct 15, 2019
e5f8b7b
Migrated the existing input type date to vuetify datepicker
rossicler Oct 15, 2019
aa90ef8
Merge branch 'devel' into issue-381-vuetify-datepicker
rossicler Oct 22, 2019
8ec348d
Changed datepicker dialog to menu
rossicler Oct 24, 2019
adb6ce3
Merge branch 'issue-381-vuetify-datepicker' of https://github.com/GCE…
rossicler Oct 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 37 additions & 7 deletions src/components/Releases/AddRelease.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,43 @@
<br>
</div>
<div class="col-6">

<label>Initial Date</label>
<input type="date" v-model="initialDate" name="Initial Date" ref="Initial Date" min="2" v-validate="'date_format:YYYY-MM-DD'"/><br>

<label>Final Date</label>
<input type="date" v-model="finalDate" v-bind:min="this.initialDate" name="Final Date" v-validate="'date_format:YYYY-MM-DD|after:Initial Date'">
<v-menu
v-model="menu2Initial"
:close-on-content-click="false"
attach
min-width="290px"
>
<template v-slot:activator="{ on }">
<v-text-field
v-model="initialDate"
label="Initial Date"
prepend-icon="event"
readonly
v-on="on"
></v-text-field>
</template>
<v-date-picker v-model="initialDate" @input="menu2Initial = false"></v-date-picker>
</v-menu>
<br>
<v-menu
v-model="menu2Final"
:close-on-content-click="false"
attach
min-width="290px"
>
<template v-slot:activator="{ on }">
<v-text-field
v-model="finalDate"
label="Final Date"
prepend-icon="event"
readonly
v-on="on"
></v-text-field>
</template>
<v-date-picker v-model="finalDate" :min="this.initialDate" @input="menu2Final = false"></v-date-picker>
</v-menu>
<p class="text-danger" v-if="errors.has('Final Date')">{{ errors.first('Final Date') }}</p>
</input><br>
<br>
</div>
</div>
<div class="modal-footer">
Expand All @@ -73,6 +102,7 @@ export default {
description: '',
initialDate: '',
finalDate: '',
date: '',
amount_of_sprints: 0,
rules: {
required: value => !!value || 'Required.',
Expand Down
40 changes: 35 additions & 5 deletions src/components/Releases/EditRelease.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,41 @@
<br>
</div>
<div class="col-6">

<label>Initial Date</label>
<input type="date" v-model="initialDate" name="Initial Date" ref="Initial Date" min="2" v-validate="'date_format:YYYY-MM-DD'"/><br>
<label>Final Date</label>
<input type="date" v-model="finalDate" v-bind:min="this.initialDate" name="Final Date" v-validate="'date_format:YYYY-MM-DD|after:Initial Date'">
<v-menu
v-model="menu2Initial"
:close-on-content-click="false"
attach
min-width="290px"
>
<template v-slot:activator="{ on }">
<v-text-field
v-model="initialDate"
label="Initial Date"
prepend-icon="event"
readonly
v-on="on"
></v-text-field>
</template>
<v-date-picker v-model="initialDate" @input="menu2Initial = false"></v-date-picker>
</v-menu>
<br>
<v-menu
v-model="menu2Final"
:close-on-content-click="false"
attach
min-width="290px"
>
<template v-slot:activator="{ on }">
<v-text-field
v-model="finalDate"
label="Final Date"
prepend-icon="event"
readonly
v-on="on"
></v-text-field>
</template>
<v-date-picker v-model="finalDate" :min="this.initialDate" @input="menu2Final = false"></v-date-picker>
</v-menu>
<p class="text-danger" v-if="errors.has('Final Date')">{{ errors.first('Final Date') }}</p>
</input><br>
</div>
Expand Down
63 changes: 39 additions & 24 deletions src/components/Sprints/AddSprint.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,31 +27,46 @@
</div>

<div class="col-6">
<label>Initial Date</label>
<input
type="date"
name="Initial Date"
ref="Initial Date"
v-model="sprintInitialDate"
v-bind:min="this.releaseInitialDate"
v-bind:max="this.releaseFinalDate"
v-validate="'required|date_format:YYYY-MM-DD|'"
/>
<v-menu
v-model="menu2Initial"
:close-on-content-click="false"
attach
min-width="290px"
>
<template v-slot:activator="{ on }">
<v-text-field
v-model="sprintInitialDate"
label="Initial Date"
prepend-icon="event"
readonly
v-on="on"
></v-text-field>
</template>
<v-date-picker v-model="sprintInitialDate" :min="this.releaseInitialDate"
:max="this.releaseFinalDate" @input="menu2Initial = false">
</v-date-picker>
</v-menu>

<label>Final Date</label>
<input
type="date"
name="Final Date"
v-model="sprintFinalDate"
v-bind:min="this.sprintInitialDate"
v-bind:max="this.releaseFinalDate"
required
v-validate="'date_format:YYYY-MM-DD|after:Initial Date'"
/>
<p
class="text-danger"
v-if="errors.has('Final Date')"
>{{ errors.first('Final Date') }}</p>
<v-menu
v-model="menu2Final"
:close-on-content-click="false"
attach
min-width="290px"
>
<template v-slot:activator="{ on }">
<v-text-field
v-model="sprintFinalDate"
label="Final Date"
prepend-icon="event"
readonly
v-on="on"
></v-text-field>
</template>
<v-date-picker v-model="sprintFinalDate" :min="this.sprintInitialDate"
:max="this.releaseFinalDate" @input="menu2Final = false">
</v-date-picker>
</v-menu>
<p class="text-danger" v-if="errors.has('Final Date')">{{ errors.first('Final Date') }}</p>
</div>
</div>
<div class="modal-footer">
Expand Down
63 changes: 39 additions & 24 deletions src/components/Sprints/EditSprint.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,31 +31,46 @@
</div>

<div class="col-6">
<label>Initial Date</label>
<input
type="date"
name="Initial Date"
ref="Initial Date"
v-model="sprintInitialDate"
v-bind:min="this.releaseInitialDate"
v-bind:max="this.releaseFinalDate"
v-validate="'required|date_format:YYYY-MM-DD|'"
/>
<v-menu
v-model="menu2Initial"
:close-on-content-click="false"
attach
min-width="290px"
>
<template v-slot:activator="{ on }">
<v-text-field
v-model="sprintInitialDate"
label="Initial Date"
prepend-icon="event"
readonly
v-on="on"
></v-text-field>
</template>
<v-date-picker v-model="sprintInitialDate" :min="this.releaseInitialDate"
:max="this.releaseFinalDate" @input="menu2Initial = false">
</v-date-picker>
</v-menu>

<label>Final Date</label>
<input
type="date"
name="Final Date"
v-model="sprintFinalDate"
v-bind:min="this.sprintInitialDate"
v-bind:max="this.releaseFinalDate"
required
v-validate="'date_format:YYYY-MM-DD|after:Initial Date'"
/>
<p
class="text-danger"
v-if="errors.has('Final Date')"
>{{ errors.first('Final Date') }}</p>
<v-menu
v-model="menu2Final"
:close-on-content-click="false"
attach
min-width="290px"
>
<template v-slot:activator="{ on }">
<v-text-field
v-model="sprintFinalDate"
label="Final Date"
prepend-icon="event"
readonly
v-on="on"
></v-text-field>
</template>
<v-date-picker v-model="sprintFinalDate" :min="this.sprintInitialDate"
:max="this.releaseFinalDate" @input="menu2Final = false">
</v-date-picker>
</v-menu>
<p class="text-danger" v-if="errors.has('Final Date')">{{ errors.first('Final Date') }}</p>
</div>
</div>
<div class="modal-footer">
Expand Down