From 42aadd216ec61a414dfd0b0d5e6e76321b713f3e Mon Sep 17 00:00:00 2001 From: DESKTOP-D5ILJ4S\flr_3 Date: Fri, 20 Jul 2018 17:54:45 +0700 Subject: [PATCH] โชวเลขตามจำนวน type ต้องกด type นั้นๆเอา แต่!!!!!!! มันผิดดดด มันบัคคค มันเจ๊งงงงงง --- .vscode/launch.json | 33 +++++++++++++++++++++++++++++++++ src/app/dashboard/dashboard.component.html | 36 ++++++++++++++++++++++++++++++++++-- src/app/dashboard/dashboard.component.scss | 18 ++++++++++++++++++ src/app/dashboard/dashboard.component.ts | 79 ++++++++++++++++++++++++++++++++++++++++++------------------------------------- 4 files changed, 127 insertions(+), 39 deletions(-) create mode 100644 .vscode/launch.json diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..565e870 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,33 @@ +{ + "version": "0.2.0", + "configurations": [ + { + "name": "ng serve", + "type": "chrome", + "request": "launch", + "url": "http://localhost:4200/#", + "webRoot": "${workspaceFolder}"//, + // "sourceMapPathOverrides": { + // "webpack:/./*": "${webRoot}/*", + // "webpack:/src/*": "${webRoot}/src/*", + // "webpack:/*": "*", + // "webpack:/./~/*": "${webRoot}/node_modules/*" + // } + }, + { + "name": "ng test", + "type": "chrome", + "request": "launch", + "url": "http://localhost:9876/debug.html", + "webRoot": "${workspaceFolder}" + }, + { + "name": "ng e2e", + "type": "node", + "request": "launch", + "program": "${workspaceFolder}/node_modules/protractor/bin/protractor", + "protocol": "inspector", + "args": ["${workspaceFolder}/protractor.conf.js"] + } + ] + } \ No newline at end of file diff --git a/src/app/dashboard/dashboard.component.html b/src/app/dashboard/dashboard.component.html index 10e99d8..1a6366c 100644 --- a/src/app/dashboard/dashboard.component.html +++ b/src/app/dashboard/dashboard.component.html @@ -46,6 +46,11 @@ {{resultNum9}} +
  • + +
    • @@ -930,12 +935,15 @@


    + + style="margin-left: 5px; margin-top: 2px;">
    {{NumType9}}
    {{ name.name }} +
    -

    0 Tricket

    +

    0 Tricket

    +
    @@ -1127,6 +1135,30 @@ ------ // coment end-------
    --> +
    +
    +

    + Active +

    +
    +
    + + + +
    +
    +
    +
    +
    +
    +
    +
    +
    {{item.type}}
    +
    {{item.type.length}}
    +
    +
    +
    +
    \ No newline at end of file diff --git a/src/app/dashboard/dashboard.component.scss b/src/app/dashboard/dashboard.component.scss index 2a95658..465434b 100644 --- a/src/app/dashboard/dashboard.component.scss +++ b/src/app/dashboard/dashboard.component.scss @@ -76,6 +76,24 @@ btn.active { right: 0px; } +.badge2 { + font-size: 11px!important; + font-weight: 300; + height: 18px; + color: #fff; + background-color:#32c5d2; + padding: 3px 6px; + -webkit-border-radius: 12px!important; + -moz-border-radius: 12px!important; + border-radius: 12px!important; + text-shadow: none!important; + text-align: center; + vertical-align: middle; + position: absolute; + top: 160px; + left: 400px; +} + .button { background-color: white; border-color: #32c5d2; diff --git a/src/app/dashboard/dashboard.component.ts b/src/app/dashboard/dashboard.component.ts index dd22577..fada06a 100644 --- a/src/app/dashboard/dashboard.component.ts +++ b/src/app/dashboard/dashboard.component.ts @@ -15,13 +15,7 @@ export class DashboardComponent implements OnInit { FilterSearchOnHold = ''; FilterSearchButton = ''; - - - - getColorDay(days) { - // console.log(days) - if (days >= 0 && days <= 7) { return '#32c5d2'; } @@ -77,6 +71,8 @@ export class DashboardComponent implements OnInit { resultData9: any; resultNum9: number = 0; resultDataOnHold9: any; + Type9: any = []; + NumType9: number = 0; Show1: any = []; Show1Onhold: any = []; @@ -265,7 +261,7 @@ export class DashboardComponent implements OnInit { valueN: 'web' } ]; - + showSecret: boolean = false; showSecret1: boolean = false; showSecret2: boolean = false; @@ -298,7 +294,7 @@ export class DashboardComponent implements OnInit { this.resultNum = this.resultData.length; this.Show1.push(this.resultData[i]); } - + } else { this.resultData = []; this.showSecret = !this.showSecret; @@ -707,7 +703,7 @@ export class DashboardComponent implements OnInit { setInterval(async () => { await this.getDataOnHold7(); }, 600000); - + // ----------------------------8------------------------ try { @@ -789,9 +785,28 @@ setInterval(async () => { this.resultData9[i].birth_date = this._common.convertDate(this.resultData9[i].birth_date); this.resultNum9 = this.resultData9.length; this.Show9.push(this.resultData9[i]); + console.log('show',this.Show9); + // this.Type9.push(this.resultData9[i].type); } - // this.Show = Object.assign(this.resultData7); + // for (const item of this.Show9) { + // // console.log('item: ', item); + + // var st = ''; + // if (item['type']) { + // st = item['type'].toLowerCase(); + // this.Type9.push(st); + // console.log('st: ', this.Type9); + // // this.NumType9 = this.Type9.lent; + // } + + // // var string2 = valueN.toLowerCase(); + // // if (st.startsWith(string2)) { + // // resultArray.push(item); + + // // } + // } + // console.log('type',this.Type9); } else { this.resultData9 = []; @@ -835,19 +850,6 @@ setInterval(async () => { }, 600000); } - // btnSelect(selVal) { - // // console.log(selVal); - // let arr = []; - // for (let i in selVal) { - // arr.push(selVal); - // } - - // // console.log('select1 : ', arr); - - // this.Namebtn = arr; - - // console.log('select : ', this.Namebtn); - // } getButton1(valueN) { // console.log(valueN); @@ -855,7 +857,7 @@ setInterval(async () => { if (this.Show1.length === 0) { return this.Show1; } - + const resultArray = []; for (const item of this.Show1) { console.log('item: ', item); @@ -1138,7 +1140,7 @@ setInterval(async () => { getButton6(valueN) { console.log(valueN); - + if (this.Show6.length === 0) { return this.Show6; } @@ -1220,7 +1222,7 @@ setInterval(async () => { if (st.startsWith(string2)) { // console.log(st); resultArray.push(item); - } + } } if (resultArray.length === 0) { if (valueN !== "") { @@ -1229,7 +1231,7 @@ setInterval(async () => { }else if(resultArray.length > 0) { this.showSecret1 = false; } - + this.resultData7 = resultArray; } @@ -1266,7 +1268,7 @@ setInterval(async () => { this.showSecret2 = false; } this.resultDataOnHold7 = resultArray; - + } getButton8(valueN) { @@ -1290,7 +1292,7 @@ setInterval(async () => { if (st.indexOf(string2) > -1) { // console.log(st); resultArray.push(item); - } + } } if (resultArray.length === 0) { if (valueN !== "") { @@ -1299,7 +1301,7 @@ setInterval(async () => { }else if(resultArray.length > 0) { this.showSecret1 = false; } - + this.resultData8 = resultArray; } @@ -1336,7 +1338,7 @@ setInterval(async () => { this.showSecret2 = false; } this.resultDataOnHold8 = resultArray; - + } getButton9(valueN) { @@ -1351,16 +1353,18 @@ setInterval(async () => { // console.log('item: ', item); var st = ''; - // st = item['team'].toLowerCase() + item['COMMENT'].toLowerCase() + item['custgroupName'].toLowerCase() + item['STATUS'].toLowerCase() ; if (item['type']) { st = item['type'].toLowerCase(); + this.Type9.push(st); + console.log('st: ', this.Type9); + // this.NumType9 = this.Type9.lent; } - + var string2 = valueN.toLowerCase(); if (st.startsWith(string2)) { - // console.log(st); resultArray.push(item); - } + + } } if (resultArray.length === 0) { if (valueN !== "") { @@ -1369,8 +1373,9 @@ setInterval(async () => { }else if(resultArray.length > 0) { this.showSecret1 = false; } - + this.resultData9 = resultArray; + this.NumType9 = resultArray.length; } /* buttondataOnhold9 */ @@ -1406,7 +1411,7 @@ setInterval(async () => { this.showSecret2 = false; } this.resultDataOnHold9 = resultArray; - + } /////////////Get data come to use////////////////////// -- libgit2 0.21.2