major changes for new modal - tests

src/components/CustomModal.vue

@@ -11,8 +11,8 @@
         
         </slot>    
         <div class="answers-div">
-          <button class="btn btn-outline-primary btn-ans" @click="postAnswear(ansOne, event.id)"><span>{{leftBtn}}</span></button>
-          <button class="btn btn-outline-primary btn-ans" @click="postAnswear(ansTwo, event.id)"><span>{{rightBtn}} </span></button>
+          <button class="btn btn-outline-primary btn-left" @click="leftClick()"><span>{{leftButton}}</span></button>
+          <button class="btn btn-outline-primary btn-right" @click="rightClick()"><span>{{rightButton}} </span></button>
         </div>
       </div>
     </div>
@@ -22,16 +22,11 @@
 <script>
 
   export default {
-    props: ['boxText','leftBtn','rightBtn'],
+    props: ['boxText','leftButton','rightButton', 'leftClick', 'rightClick'],
 
     mounted(){
       
     },
-
-    methods: {
-      
-
-    }
 }
 
 </script>
@@ -68,11 +63,16 @@
     margin-top: 60px
   }
 
-  .btn-ans{
+  .btn-left{
     margin-top: 10px;
-    width: 100%;
+    width: 40%;
     height: 50px;
-    vertical-align: middle  
+  }
+
+  .btn-right{
+    margin-top: 10px;
+    width: 40%;
+    height: 50px;  
   }
 
   .event-txt{

src/components/DaySchedule.vue

@@ -43,6 +43,8 @@
 import _ from "underscore"
 import ActivityInput from '../components/ActivityInput'
 import { getAll as getActivities } from '../services/activity'
+import CustomModal from '../components/CustomModal'
+import {bus} from '../main.js'
 
 export default {
 
@@ -70,12 +72,13 @@ export default {
   
   components: {
     ActivityInput,
+    'custom-modal': CustomModal
   },
 
   data: () => {
     return {
       activityList: [],
-      allChecked: false
+      allChecked: false,
     }
   },
 
@@ -92,6 +95,14 @@ export default {
     if(this.hasPreviousWeek){
       this.allChecked = true
     }
+    // this.checkRepeatedDay()
+    try{
+      bus.$on('checkDayCompletition', this.checkDayCompletition)
+      bus.$on('checkDayCompletition', this.delayedScroll)
+    } catch(err){
+      console.log('no need for checking')
+    }
+   //bus.$on('checkDayCompletition', this.pageScroll)
   },
 
   methods: {
@@ -128,6 +139,10 @@ export default {
       elem.scrollTop = elem.scrollHeight;
     },
 
+    delayedScroll(){
+      setTimeout(this.pageScroll,10)
+    },
+
     removeActivity(index){
       if(this.activities.length == 1){
         alert("Os dias precisam ter pelo menos uma atividade!");
@@ -142,9 +157,7 @@ export default {
     },
 
     copyPreviousDay(){
-      this.$emit("copyPreviousDay", this.dayIndex);
-      this.checkDayCompletition();
-      setTimeout(this.pageScroll, 5);
+      this.$emit("copyPreviousDay", this.dayIndex)
     },
 
     verifyAllInputs(){

src/main.js

@@ -17,3 +17,5 @@ new Vue({
   components: { App },
   template: '<App/>'
 })
+
+export const bus = new Vue()

src/pages/Schedule.vue

@@ -11,9 +11,7 @@
         <p v-if="alert" class="alert alert-warning">{{alert}}</p>
       </div>
       <div class="col-md-1">
-        <router-link to="/fim">
-            <button class="btn btn-outline-danger">DESISTIR</button>
-        </router-link>
+        <button class="btn btn-outline-danger" @click="confirmExit()">DESISTIR</button>
       </div>
     </div>
     <!-- SCHEDULE -->
@@ -38,6 +36,19 @@
         <button type="button" @click="adaptAndCreateWeek()" class="btn btn-primary btn-week" >Iniciar simulação</button>
       </div>
     </div>
+
+    <custom-modal
+    v-if="showModal"
+    :boxText="textMessage"
+    :rightButton="rightButton"
+    :leftButton="leftButton"
+    :rightClick="rightButtonFunction"
+    :leftClick="leftButtonFunction"
+    @hideModal="hideModal()"
+    @copyActivities="copyAllActivities($event)"
+    >
+    </custom-modal>
+
   </div>
 </template>
 
@@ -48,19 +59,28 @@ import { getAll as getActivities } from '../services/activity'
 import { create } from '../services/week'
 import DaySchedule from '../components/DaySchedule'
 import _ from "underscore"
+import CustomModal from '../components/CustomModal'
+import {bus} from '../main.js'
 
 export default {
   name: 'Schedule',
   components: {
     DaySchedule,
     Carousel,
-    Slide
+    Slide,
+    'custom-modal': CustomModal
   },
   
   data: () => {
     return {
       isSunday: false,
       days: ['Segunda-Feira','Terça-Feira','Quarta-Feira','Quinta-Feira','Sexta-Feira','Sábado','Domingo'],
+      showModal: false,
+      textMessage:"Mensagem de teste",
+      rightButton: "Ok",
+      leftButton: "Cancelar",
+      rightButtonFunction: Function,
+      leftButtonFunction: Function,
       validDays: [false, false, false, false, false, false, false],
       validWeek: false,
       activitiesByDay: new Array(7),
@@ -76,6 +96,7 @@ export default {
       countHoursInDay: {},
       canStart: false,
       alert: "",
+      parentCheck: true,
       activities:[[{
                 activity: "Atividade",
                 id: 0,
@@ -249,13 +270,26 @@ export default {
     //allows user to copy his previous day, so he can adjust it faster
     copyPreviousDay(dayIndex){
       if(this.activities[dayIndex-1]){
-        if(confirm("Tem certeza que deseja copiar a agenda de " + this.days[dayIndex-1])){
-          this.copyAllActivities(dayIndex, dayIndex - 1)          
+        this.textMessage = "Você gostaria de copiar a sua agenda de " + this.days[dayIndex] + "?"
+        this.rightButton = "Sim"
+        this.leftButton = "Não"
+        this.rightButtonFunction =  function(){
+          this.$emit('hideModal')
+          this.$emit('copyActivities',dayIndex)
+          bus.$emit('checkDayCompletition')
+        }
+        this.leftButtonFunction = function(){
+          this.$emit('hideModal')
         }
+        this.showModal = true
+        // if(confirm("Tem certeza que deseja copiar a agenda de " + this.days[dayIndex-1])){
+        //   this.copyAllActivities(dayIndex, dayIndex - 1)          
+        // }
       }
     },
 
-    copyAllActivities(currentDayIndex, previousDayIndex){
+    copyAllActivities(currentDayIndex){
+      let previousDayIndex = currentDayIndex -1
       let activitiesLength = this.activities[currentDayIndex].length
       this.activities[currentDayIndex].splice(0,activitiesLength)  
       for(let i = 0; i < this.activities[previousDayIndex].length; i++){
@@ -268,6 +302,7 @@ export default {
         }    
         this.addActivity(activityToAdd)
       }
+      this.parentCheck = !this.parentCheck
      },
 
     validDay(index){
@@ -290,6 +325,27 @@ export default {
     this.validWeek = true
 
     },
+
+    testButton(){
+      alert("button clicked")
+    },
+    hideModal(){
+      this.showModal = false
+    },
+
+    confirmExit(){
+      this.textMessage = "Tem certeza que deseja sair da sessão?"
+      this.rightButton = "Sim"
+      this.leftButton = "Não"
+      this.rightButtonFunction =  function(){
+        this.$emit('hideModal')
+        this.$router.push('/fim')
+      }
+      this.leftButtonFunction = function(){
+        this.$emit('hideModal')
+      }
+      this.showModal = true
+    }
   }
 }
 </script>