From ffb69c979ba67b92d769933dac1c868652a3d9c6 Mon Sep 17 00:00:00 2001
From: Alessandro Francia <a.francia@teamdev.it>
Date: Wed, 19 Sep 2018 14:33:40 +0200
Subject: [PATCH] fix change reps

---
 .../cards/card-element-queue.vue              |  6 ++--
 .../cards/card-queue-production.vue           | 32 ++++++++++---------
 Step/wwwroot/src/services/fileService.ts      |  2 ++
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/Step/wwwroot/src/modules/base-components/cards/card-element-queue.vue b/Step/wwwroot/src/modules/base-components/cards/card-element-queue.vue
index b942ecfa..6980b247 100644
--- a/Step/wwwroot/src/modules/base-components/cards/card-element-queue.vue
+++ b/Step/wwwroot/src/modules/base-components/cards/card-element-queue.vue
@@ -29,8 +29,7 @@ export default {
         number: { default: 2},
         remainingReps: {default: 0},
         status: { default: 0},
-        selectedProcess: { default: 0},
-        idPartProgram: {default: 0}
+        selectedProcess: { default: 0}
     },
     data: function(){
         return{
@@ -51,8 +50,7 @@ export default {
         },
         clickReps: function(){
             debugger
-            this.enablePopup = true;
-            this.$emit("position", this.$el, this.enablePopup, true);
+            this.$emit("position", this.$el, true);
         }
         // close(){
         //     this.enablePopup = false;
diff --git a/Step/wwwroot/src/modules/base-components/cards/card-queue-production.vue b/Step/wwwroot/src/modules/base-components/cards/card-queue-production.vue
index 599dae41..a211d8d8 100644
--- a/Step/wwwroot/src/modules/base-components/cards/card-queue-production.vue
+++ b/Step/wwwroot/src/modules/base-components/cards/card-queue-production.vue
@@ -28,20 +28,20 @@
                 <Container @drag-start="onDrag" @drag-end="onDragEnd" @drop="changePosition($event)" :get-child-payload="getPayloadForItemQueue">
                     <Draggable v-for="pp in partPrograms" :key="pp.id">
                         <div class="element-queue">
-                            <label class="number">{{pp.id}}</label><card-element-queue @click="deleteItemQueue(selectedProcess, pp)" :selected-process="selectedProcess" :id-part-program="pp.id" :name="pp.partProgramName" :number="pp.reps" :remaining-reps="pp.remainingReps" :status="pp.status" @position="positionBoxReps($event,pp.reps)"></card-element-queue>
+                            <label class="number">{{pp.id}}</label><card-element-queue @click="deleteItemQueue(selectedProcess, pp)" :selected-process="selectedProcess" :id-part-program="pp.id" :name="pp.partProgramName" :number="pp.reps" :remaining-reps="pp.remainingReps" :status="pp.status" @position="positionBoxReps($event,pp.id,pp.reps)"></card-element-queue>
                         </div>
                     </Draggable>
+                    <popup v-if="enablePopup" :style="{top: selectedPositionTop + 'px'}" :arrow="'arrow-top'" :title="'Modifica ripetizioni'">
+                        <button class="close" slot="header-buttons" @click="close()"><i class="fa fa-remove"></i></button>
+                        <div class="edit-reps">
+                            <label>Ripetizioni</label>
+                            <input type="number" v-model.number="numberReps">
+                        </div>
+                        <div class="group-button">
+                            <button class="btn btn-success btn-small" @click="changeReps(numberReps)">Salva</button>
+                        </div>
+                    </popup>
                 </Container>
-                <popup v-if="enablePopup" :style="{top: selectedPositionTop + 'px'}" :arrow="'arrow-top'" :title="'Modifica ripetizioni'">
-                    <button class="close" slot="header-buttons" @click="close()"><i class="fa fa-remove"></i></button>
-                    <div class="edit-reps">
-                        <label>Ripetizioni</label>
-                        <input type="number" v-model.number="numberReps">
-                    </div>
-                    <div class="group-button">
-                        <button class="btn btn-success btn-small" @click="changeReps(numberReps)">Salva</button>
-                    </div>
-                </popup>
             </div>
             <div class="queue-footer">
                 <label>{{partPrograms.length}} elementi in coda</label>
@@ -79,7 +79,8 @@ export default {
             selectedPositionTop: 0,
             selectedTab: "Sinistra",
             enablePopup: false,
-            numberReps: 0
+            numberReps: 0,
+            idPartProgram: 0
         }
     },
     computed: {
@@ -130,7 +131,7 @@ export default {
         async changePosition(event){
             debugger
             var response = false;
-            if(event.payload && event.payload.status != 1 && event.payload.status != 3){
+            if(event.payload && event.payload.status != 1 && event.payload.status != 3 && event.addedIndex != event.removedIndex){
                 this.draggingIn = false;
                 this.draggingItem = null;
                 var itemsPositions = {objectId: event.payload.id, newPosition: event.addedIndex};
@@ -148,10 +149,11 @@ export default {
         getPayloadForItemQueue(index){
             return this.partPrograms[index];
         },
-        positionBoxReps(arg1, reps){
+        positionBoxReps(arg1, id, reps){
             debugger
             this.numberReps = reps;
-            this.selectedPositionTop = (arg1.offsetTop + 164);
+            this.idPartProgram = id;
+            this.selectedPositionTop = (arg1.offsetTop + 78);
             this.enablePopup = true;
         },
         selectTab(value){
diff --git a/Step/wwwroot/src/services/fileService.ts b/Step/wwwroot/src/services/fileService.ts
index 7fdec2d1..435e2af8 100644
--- a/Step/wwwroot/src/services/fileService.ts
+++ b/Step/wwwroot/src/services/fileService.ts
@@ -42,6 +42,7 @@ export class FileService extends baseRestService {
   }
 
   async moveItemsQueue(processId, itemsPositions, model){
+    debugger
     var result = await this.Put<any>(this.BASE_URL + "queue/" + processId + "/move", itemsPositions, true);
     productionActions.movePartPrograms(store,result);
     return result;
@@ -58,6 +59,7 @@ export class FileService extends baseRestService {
   }
 
   async changeReps(processId,id,reps){
+    debugger
     var result = await this.Put<any>(this.BASE_URL + "queue/" + processId + "/edit/" + id, {reps: reps});
     productionActions.updatePartPrograms(store, result);
     return result;