diff --git a/src/app/services/websocket/ws-requests.service.ts b/src/app/services/websocket/ws-requests.service.ts index 9fd15f335553..69583a910afe 100755 --- a/src/app/services/websocket/ws-requests.service.ts +++ b/src/app/services/websocket/ws-requests.service.ts @@ -10,6 +10,7 @@ import { AppConfigService } from '../../services/app-config.service'; import { LoggerService } from '../../services/logger/logger.service'; import { LocalDbService } from '../users-local-db.service'; import { map } from 'rxjs/operators'; +import { CodeInstallationModule } from 'app/components/widget-installations/code-installation/code-installation.module'; export interface Message { action: string; payload: { @@ -1250,38 +1251,44 @@ export class WsRequestsService implements OnDestroy { // WS Requests NO-RT & HISTORY // ------------------------------------------------------------- public getHistoryAndNortRequests(operator: string, status: string, statuses, _preflight, querystring: string, pagenumber: number) { - this.logger.log('[WS-REQUESTS-SERV][HISTORY & NORT-CONVS] - *** REQUESTS SERVICE Get REQUESTS - operator ', operator); - this.logger.log('[WS-REQUESTS-SERV][HISTORY & NORT-CONVS] - *** REQUESTS SERVICE Get REQUEST - status ', status); + console.log('[WS-REQUESTS-SERV][HISTORY & NORT-CONVS] - *** REQUESTS SERVICE Get REQUESTS - operator ', operator); + console.log('[WS-REQUESTS-SERV][HISTORY & NORT-CONVS] - *** REQUESTS SERVICE Get REQUEST - status ', status); this.logger.log('[WS-REQUESTS-SERV][HISTORY & NORT-CONVS] - *** REQUESTS SERVICE Get REQUEST - statuses ', statuses); this.logger.log('[WS-REQUESTS-SERV][HISTORY & NORT-CONVS] - *** REQUESTS SERVICE Get REQUEST - statuses length ', statuses?.length); this.logger.log('[WS-REQUESTS-SERV][HISTORY & NORT-CONVS] - *** REQUESTS SERVICE Get REQUEST - querystring ', querystring); this.logger.log('[WS-REQUESTS-SERV][HISTORY & NORT-CONVS] - *** REQUESTS SERVICE Get REQUEST - _preflight ', _preflight); this.logger.log('[WS-REQUESTS-SERV][HISTORY & NORT-CONVS] - *** REQUESTS SERVICE Get REQUEST - pagenumber ', pagenumber); + if (status === 'all') { + status = '100,150,200' + operator = '=' + } + let _querystring = '' if (querystring && querystring !== undefined) { - if (status === '100' || status === '200' || status === '1000' || status === '50' || status ==="1000,100,200" || statuses?.length>0) { + if (status === '100' || status === '200' || status === '1000' || status === '50' || status ==="1000,100,200" || status ==="100,150,200" || statuses?.length>0) { _querystring = '&' + querystring - this.logger.log('[WS-REQUESTS-SERV][HISTORY & NORT-CONVS] - *** REQUESTS SERVICE HERE 1'); + console.log('[WS-REQUESTS-SERV][HISTORY & NORT-CONVS] - *** REQUESTS SERVICE HERE 1'); } else if (status === 'all') { _querystring = querystring + '&' - this.logger.log('[WS-REQUESTS-SERV][HISTORY & NORT-CONVS] - *** REQUESTS SERVICE HERE 2'); + + console.log('[WS-REQUESTS-SERV][HISTORY & NORT-CONVS] - *** REQUESTS SERVICE HERE 2', _querystring); } else { - this.logger.log('[WS-REQUESTS-SERV][HISTORY & NORT-CONVS] - *** REQUESTS SERVICE HERE 3'); + console.log('[WS-REQUESTS-SERV][HISTORY & NORT-CONVS] - *** REQUESTS SERVICE HERE 3'); } } else { _querystring = '' - this.logger.log('[WS-REQUESTS-SERV][HISTORY & NORT-CONVS] - *** REQUESTS SERVICE HERE 4'); + console.log('[WS-REQUESTS-SERV][HISTORY & NORT-CONVS] - *** REQUESTS SERVICE HERE 4'); } let url = ''; if (status !== 'all') { url = this.SERVER_BASE_PATH + this.project_id + '/requests?status' + operator + status + _querystring + '&page=' + pagenumber + '&no_populate=true&no_textscore=true&preflight='+ _preflight; - this.logger.log('url status != all ' ,url ) + console.log('url status != all ' ,url ) } else { url = this.SERVER_BASE_PATH + this.project_id + '/requests?' + _querystring + 'page=' + pagenumber + '&no_populate=true&no_textscore=true&preflight='+ _preflight; - this.logger.log('url status all ' ,url ) + console.log('url status all ' ,url ) } // console.log('[WS-REQUESTS-SERV][HISTORY & NORT-CONVS] - GET REQUESTS URL ', url); diff --git a/src/app/ws_requests/history-and-nort-convs/history-and-nort-convs.component.html b/src/app/ws_requests/history-and-nort-convs/history-and-nort-convs.component.html index 2d03069282cd..4bfeb2cdc69b 100755 --- a/src/app/ws_requests/history-and-nort-convs/history-and-nort-convs.component.html +++ b/src/app/ws_requests/history-and-nort-convs/history-and-nort-convs.component.html @@ -44,8 +44,13 @@ - {{ "Unserved" | translate }} + {{ "Unserved" | translate }} + + + Abandoned + +
@@ -1270,6 +1286,17 @@ + + + + +