Merge branch 'key-nav' of github.com:agritheory/check_run into key-nav

agritheory · Jul 21, 2022 · 33bc96b · 33bc96b
2 parents 0823fc5 + 0873c5d
commit 33bc96b
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 3 deletions.
diff --git a/check_run/public/js/check_run/ADropdown.vue b/check_run/public/js/check_run/ADropdown.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="autocomplete" :class="{ 'isOpen': isOpen }">
     <input
+      ref="mopInput"
       type="text"
       :id="`mop-input-${transactionIndex}`"
       @input="onChange"
@@ -140,6 +141,11 @@
         this.closeResults()
         this.arrowCounter = 0;
       },
+      openWithSearch() {
+        this.search = ""
+        this.onChange()
+        this.$refs.mopInput.focus()
+      }
     },
   };
 </script>

diff --git a/check_run/public/js/check_run/CheckRun.vue b/check_run/public/js/check_run/CheckRun.vue
@@ -63,7 +63,7 @@
 						:data-mop-index="i"
 					>
 
-						<ADropdown v-model="state.transactions[i].mode_of_payment" :items="modeOfPaymentNames" v-if="state.docstatus < 1" :transactionIndex="i" :isOpen="state.transactions[i].mopIsOpen" @isOpenChanged="val => state.transactions[i].mopIsOpen = val"/>
+						<ADropdown ref="dropdowns" v-model="state.transactions[i].mode_of_payment" :items="modeOfPaymentNames" v-if="state.docstatus < 1" :transactionIndex="i" :isOpen="state.transactions[i].mopIsOpen" @isOpenChanged="val => state.transactions[i].mopIsOpen = val"/>
 
 						<span v-else>{{ transactions[i].mode_of_payment }}</span>
 					</td>
@@ -149,11 +149,28 @@ export default {
 			cur_frm.doc.amount_check_run = cur_frm.check_run_state.check_run_total()
 			cur_frm.refresh_field("amount_check_run")
 			this.markDirty()
+		},
+		checkPay() {
+			if(this.state.docstatus >= 1 || !this.transactions.length) {
+				return
+			}
+			this.transactions[this.state.selectedRow].pay = !this.transactions[this.state.selectedRow].pay
+			this.onPayChange()
+		},
+		openMopWithSearch(keycode) {
+
+			if(!this.transactions.length) {
+				return
+			}
+
+			this.$refs.dropdowns[this.state.selectedRow].openWithSearch()
+
 		}
 	},
 	beforeMount() {
 		this.moment = moment;
 		this.format_currency = format_currency;
+		cur_frm.check_run_component = this;
 	}
 }
 </script>

diff --git a/check_run/public/js/check_run/check_run.js b/check_run/public/js/check_run/check_run.js
@@ -7,6 +7,7 @@ check_run.mount_table = frm => {
 	check_run.frm = frm
 	frm.transactions.forEach(val => {
 		val.mopIsOpen = false
+		val.pay = val.pay ? val.pay : false
 	})
 	frm.check_run_state = Vue.observable({
 		transactions: frm.transactions,
@@ -48,7 +49,6 @@ check_run.keyDownHandler = e => {
 	}
 
 	if(e.keyCode == 40 && check_run.frm.check_run_state.selectedRow < (check_run.frm.check_run_state.transactions.length - 1)){
-		console.log("state", check_run.frm.check_run_state)
 		for(let j=0;j<check_run.frm.check_run_state.transactions.length;j++) {
 			if(check_run.frm.check_run_state.transactions[j].mopIsOpen) {
 				return
@@ -70,8 +70,13 @@ check_run.keyDownHandler = e => {
 
 	if(e.keyCode == 32 && check_run.frm.check_run_state.selectedRow != null && check_run.frm.check_run_state.transactions.length){
 		e.preventDefault()
-		document.getElementById(`mop-input-${check_run.frm.check_run_state.selectedRow}`).focus()
+		if(check_run.frm.check_run_component) {
+			check_run.frm.check_run_component.checkPay();
+		}
+	}
 
+	if(e.keyCode && e.keyCode >= 65 && e.keyCode <= 90 && check_run.frm.check_run_state.selectedRow != null && check_run.frm.check_run_state.transactions.length){
+		check_run.frm.check_run_component.openMopWithSearch(e.keyCode)
 	}
 
 }