From 012ae85233400b63fa40b25b4fb9c77f509347c4 Mon Sep 17 00:00:00 2001 From: DESKTOP-P23T5P2\NewTeryEiEi Date: Wed, 15 Aug 2018 16:32:20 +0700 Subject: [PATCH] ปุ่มค้นหา department หน้า follow --- src/app/dashboard/dashboard.component.html | 4 ++++ src/app/dashboard/dashboard.component.ts | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 77 insertions(+), 1 deletion(-) diff --git a/src/app/dashboard/dashboard.component.html b/src/app/dashboard/dashboard.component.html index 2803856..09c3716 100644 --- a/src/app/dashboard/dashboard.component.html +++ b/src/app/dashboard/dashboard.component.html @@ -949,6 +949,10 @@

+ +
diff --git a/src/app/dashboard/dashboard.component.ts b/src/app/dashboard/dashboard.component.ts index 9a784c1..c0ea9ab 100644 --- a/src/app/dashboard/dashboard.component.ts +++ b/src/app/dashboard/dashboard.component.ts @@ -998,6 +998,7 @@ setInterval(async () => { r.birth_date = this._common.convertDate(r.birth_date); this.resultNum9 = this.resultData9.length; this.Show9.push(r); + this.Show9Depart.push(r); this.Type9.push(r.type); t9.push(r.type); r.t9 = t9; @@ -1076,6 +1077,7 @@ try { this.resultDataOnHold9[i].link = this._common.decodeURI(this.resultDataOnHold9[i].link); this.resultDataOnHold9[i].birth_date = this._common.convertDate(this.resultDataOnHold9[i].birth_date); this.Show9Onhold.push(this.resultDataOnHold9[i]); + this.Show9DepartOnhold.push(this.resultDataOnHold9[i]); } } else { this.resultDataOnHold9 = []; @@ -1758,8 +1760,43 @@ setInterval(async () => { // this.Type9.push(this.NumType9); } + getButton9Depart(valueN) { + console.log(valueN); + + if (this.Show9Depart.length === 0) { + return this.Show9Depart; + } + + const resultArray = []; + for (const item of this.Show9Depart) { + // console.log('item: ', item); + + let st = ''; + + if (item['department']) { + st = item['department'].toLowerCase(); + } + + const string2 = valueN.toLowerCase(); + if (st.startsWith(string2)) { + console.log(st); + resultArray.push(item); + } + + } + if (resultArray.length === 0) { + if (valueN !== '') { + this.showSecret1 = true; + } + } else if (resultArray.length > 0) { + this.showSecret1 = false; + } + this.resultData9 = resultArray; + +} + /* buttondataOnhold9 */ - getButton9Onhold(valueN) { + getButton9Onhold(valueN) { console.log(valueN); if (this.Show9Onhold.length === 0) { @@ -1794,6 +1831,41 @@ setInterval(async () => { } +getButton9DepartOnhold(valueN) { + console.log(valueN); + + if (this.Show9DepartOnhold.length === 0) { + return this.Show9DepartOnhold; + } + + const resultArray = []; + for (const item of this.Show9DepartOnhold) { + // console.log('item: ', item); + + let st = ''; + + if (item['department']) { + st = item['department'].toLowerCase(); + } + + const string2 = valueN.toLowerCase(); + if (st.startsWith(string2)) { + console.log(st); + resultArray.push(item); + } + + } + if (resultArray.length === 0) { + if (valueN !== '') { + this.showSecret2 = true; + } + } else if (resultArray.length > 0) { + this.showSecret2 = false; + } + this.resultDataOnHold9 = resultArray; + +} + ///////////// Get data come to use////////////////////// -- libgit2 0.21.2