diff --git a/src/app/dashboard/dashboard.component.html b/src/app/dashboard/dashboard.component.html index 59f76aa..2803856 100644 --- a/src/app/dashboard/dashboard.component.html +++ b/src/app/dashboard/dashboard.component.html @@ -721,6 +721,10 @@

+ +
diff --git a/src/app/dashboard/dashboard.component.ts b/src/app/dashboard/dashboard.component.ts index c3bdd3e..9a784c1 100644 --- a/src/app/dashboard/dashboard.component.ts +++ b/src/app/dashboard/dashboard.component.ts @@ -817,6 +817,7 @@ export class DashboardComponent implements OnInit { r.birth_date = this._common.convertDate(r.birth_date); this.resultNum7 = this.resultData7.length; this.Show7.push(r); + this.Show7Depart.push(r); this.Type7.push(r.type); t7.push(r.type); r.t7 = t7; @@ -894,6 +895,7 @@ export class DashboardComponent implements OnInit { this.resultDataOnHold7[i].link = this._common.decodeURI(this.resultDataOnHold7[i].link); this.resultDataOnHold7[i].birth_date = this._common.convertDate(this.resultDataOnHold7[i].birth_date); this.Show7Onhold.push(this.resultDataOnHold7[i]); + this.Show7DepartOnhold.push(this.resultDataOnHold7[i]); } } else { this.resultDataOnHold7 = []; @@ -1218,6 +1220,7 @@ setInterval(async () => { } + /* getbutton2 */ getButton2(valueN) { console.log(valueN); @@ -1273,6 +1276,7 @@ setInterval(async () => { this.resultDataOnHold2 = resultArray; } + /* getbutton3 */ getButton3(valueN) { console.log(valueN); @@ -1328,6 +1332,7 @@ setInterval(async () => { this.resultDataOnHold3 = resultArray; } + /* getbutton4 */ getButton4(valueN) { console.log(valueN); @@ -1383,6 +1388,7 @@ setInterval(async () => { this.resultDataOnHold4 = resultArray; } + /* getbutton5 */ getButton5(valueN) { console.log(valueN); @@ -1438,6 +1444,7 @@ setInterval(async () => { this.resultDataOnHold5 = resultArray; } + /* getbutton6 */ getButton6(valueN) { console.log(valueN); @@ -1500,6 +1507,7 @@ setInterval(async () => { this.resultDataOnHold6 = resultArray; } + /* getbutton7 */ getButton7(valueN) { console.log(valueN); @@ -1534,6 +1542,41 @@ setInterval(async () => { this.resultData7 = resultArray; } + getButton7Depart(valueN) { + console.log(valueN); + + if (this.Show7Depart.length === 0) { + return this.Show7Depart; + } + + const resultArray = []; + for (const item of this.Show7Depart) { + // 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.resultData7 = resultArray; + + } + /* buttondataOnhold7 */ getButton7Onhold(valueN) { console.log(valueN); @@ -1570,6 +1613,42 @@ setInterval(async () => { } + getButton7DepartOnhold(valueN) { + console.log(valueN); + + if (this.Show7DepartOnhold.length === 0) { + return this.Show7DepartOnhold; + } + + const resultArray = []; + for (const item of this.Show7DepartOnhold) { + // 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.resultDataOnHold7 = resultArray; + + } + + /* getbutton8 */ getButton8(valueN) { console.log(valueN); @@ -1640,6 +1719,7 @@ setInterval(async () => { } +/* getbutton9 */ getButton9(valueN) { console.log(valueN); -- libgit2 0.21.2