Merging pull request #223 from fga-gpp-mds/issue_183_validacao_periodos

falko-org · Dec 8, 2017 · 130beb1 · 130beb1
2 parents a063aa2 + e173c36
commit 130beb1
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 23 deletions.
diff --git a/src/components/Releases/AddRelease.vue b/src/components/Releases/AddRelease.vue
@@ -26,7 +26,7 @@
               <p><label>Initial Date</label></p>
               <p><input type="date" v-model="initialDate"></input><br></p>
               <p><label>Final Date</label></p>
-              <p><input type="date" v-model="finalDate"></input><br></p>
+              <p><input type="date" v-model="finalDate" v-bind:min="this.initialDate"></input><br></p>
             </div>
           </div>
           <div class="modal-footer">

diff --git a/src/components/Releases/EditRelease.vue b/src/components/Releases/EditRelease.vue
@@ -24,7 +24,7 @@
               <p><label>Initial Date</label></p>
               <p><input type="date" v-model="initialDate"></input><br></p>
               <p><label>Final Date</label></p>
-              <p><input type="date" v-model="finalDate"></input><br></p>
+              <p><input type="date" v-model="finalDate" v-bind:min="this.initialDate"></input><br></p>
             </div>
           </div>
           <div class="modal-footer">

diff --git a/src/components/Releases/Release.vue b/src/components/Releases/Release.vue
@@ -8,9 +8,9 @@
           </li>
           <li class="list-inline-item vertical-center small-float-right">
             <h5 class="float-left">
-              {{release.initial_date}}
+              {{dateConvert(release.initial_date)}}
               |
-              {{release.final_date}}
+              {{dateConvert(release.final_date)}}
             </h5>
           </li>
           <p class="text-justify text-muted">
@@ -57,6 +57,7 @@ export default {
       release: {},
     };
   },
+
   computed: {
     ...mapState({
       token: state => state.auth.token,
@@ -72,14 +73,19 @@ export default {
       HTTP.get(`releases/${this.$route.params.id}`, { headers })
         .then((response) => {
           this.release = response.data;
-          this.release.initial_date = this.dateConvert(this.release.initial_date);
-          this.release.final_date = this.dateConvert(this.release.final_date);
+
+          this.setReleaseDates();
         })
         .catch((e) => {
           this.errors.push(e);
         });
     },
 
+    setReleaseDates() {
+      this.$store.dispatch('setReleaseInitialDate', this.release.initial_date);
+      this.$store.dispatch('setReleaseFinalDate', this.release.final_date);
+    },
+
     refreshRelease() {
       this.getRelease();
     },

diff --git a/src/components/Sprints/AddSprint.vue b/src/components/Sprints/AddSprint.vue
@@ -24,9 +24,9 @@
             </div>
             <div class="col">
               <p><label>Initial Date</label></p>
-              <p><input type="date" v-model="initialDate"></input><br></p>
+              <p><input type="date" v-model="sprintInitialDate" v-bind:min="this.releaseInitialDate" v-bind:max="this.releaseFinalDate"></input><br></p>
               <p><label>Final Date</label></p>
-              <p><input type="date" v-model="finalDate"></input><br></p>
+              <p><input type="date" v-model="sprintFinalDate" v-bind:min="this.sprintInitialDate" v-bind:max="this.releaseFinalDate"></input><br></p>
             </div>
           </div>
           <div class="modal-footer">
@@ -46,19 +46,24 @@ import { HTTP } from '../../http-common';
 
 export default {
   name: 'addSprintBody',
+
   data() {
     return {
       name: '',
       description: '',
-      initialDate: '',
-      finalDate: '',
+      sprintInitialDate: '',
+      sprintFinalDate: '',
     };
   },
+
   computed: {
     ...mapState({
       token: state => state.auth.token,
+      releaseInitialDate: state => state.clientStatus.releaseInitialDate,
+      releaseFinalDate: state => state.clientStatus.releaseFinalDate,
     }),
   },
+
   methods: {
     addSprint() {
       const headers = { Authorization: this.token };
@@ -67,16 +72,16 @@ export default {
         sprint: {
           name: this.name,
           description: this.description,
-          initial_date: this.initialDate,
-          final_date: this.finalDate,
+          initial_date: this.sprintInitialDate,
+          final_date: this.sprintFinalDate,
           release_id: this.$route.params.id,
         },
       }, { headers })
         .then(() => {
           this.name = '';
           this.description = '';
-          this.initialDate = '';
-          this.finalDate = '';
+          this.sprintInitialDate = '';
+          this.sprintFinalDate = '';
           EventBus.$emit('added-sprint', 1);
         })
         .catch((e) => {

diff --git a/src/components/Sprints/EditSprint.vue b/src/components/Sprints/EditSprint.vue
@@ -21,10 +21,10 @@
               <input type = "text" v-model="description"></input><br>
             </div>
             <div class="col">
-              <p><label>Inital Date</label></p>
-              <p></p><input type = "date" v-model="initialDate"></input><br></p>
+              <p><label>Initial Date</label></p>
+              <p><input type="date" v-model="sprintInitialDate" v-bind:min="this.releaseInitialDate" v-bind:max="this.releaseFinalDate"></input><br></p>
               <p><label>Final Date</label></p>
-              <p></p><input type = "date" v-model="finalDate"></input><br></p>
+              <p><input type="date" v-model="sprintFinalDate" v-bind:min="this.sprintInitialDate" v-bind:max="this.releaseFinalDate"></input><br></p>
             </div>
           </div>
           <div class="modal-footer">
@@ -47,13 +47,15 @@ export default{
     return {
       name: '',
       description: '',
-      initialDate: '',
-      finalDate: '',
+      sprintInitialDate: '',
+      sprintFinalDate: '',
     };
   },
   computed: {
     ...mapState({
       token: state => state.auth.token,
+      releaseInitialDate: state => state.clientStatus.releaseInitialDate,
+      releaseFinalDate: state => state.clientStatus.releaseFinalDate,
     }),
   },
   methods: {
@@ -63,8 +65,8 @@ export default{
       HTTP.put(`sprints/${this.$route.params.id}`, {
         name: this.name,
         description: this.description,
-        initial_date: this.initialDate,
-        final_date: this.finalDate,
+        initial_date: this.sprintInitialDate,
+        final_date: this.sprintFinalDate,
       }, { headers })
         .then(() => {
           this.$emit('edited-sprint');
@@ -81,8 +83,8 @@ export default{
         .then((response) => {
           this.name = response.data.name;
           this.description = response.data.description;
-          this.initialDate = response.data.initial_date;
-          this.finalDate = response.data.final_date;
+          this.sprintInitialDate = response.data.initial_date;
+          this.sprintFinalDate = response.data.final_date;
         })
         .catch((e) => {
           this.errors.push(e);

diff --git a/src/services/clientStatus/index.js b/src/services/clientStatus/index.js
@@ -1,21 +1,43 @@
 const SET_PROJECT = 'SET_PROJECT';
+const SET_RELEASE_INITIAL_DATE = 'SET_RELEASE_INITIAL_DATE';
+const SET_RELEASE_FINAL_DATE = 'SET_RELEASE_FINAL_DATE';
 
 const clientStatus = {
   state() {
     return {
       projectId: null,
+      releaseInitialDate: null,
+      releaseFinalDate: null,
     };
   },
   mutations: {
     [SET_PROJECT](state, id) {
       const localState = state;
       localState.projectId = id;
     },
+
+    [SET_RELEASE_INITIAL_DATE](state, date) {
+      const localState = state;
+      localState.releaseInitialDate = date;
+    },
+
+    [SET_RELEASE_FINAL_DATE](state, date) {
+      const localState = state;
+      localState.releaseFinalDate = date;
+    },
   },
   actions: {
     setProject({ commit }, projectId) {
       commit(SET_PROJECT, projectId);
     },
+
+    setReleaseInitialDate({ commit }, releaseInitialDate) {
+      commit(SET_RELEASE_INITIAL_DATE, releaseInitialDate);
+    },
+
+    setReleaseFinalDate({ commit }, releaseFinalDate) {
+      commit(SET_RELEASE_FINAL_DATE, releaseFinalDate);
+    },
   },
 };
 export default clientStatus;