Skip to content

N
nobu-web-v2
Commit 36ac5efa authored by ari_darmawan's avatar ari_darmawan
Browse files
Options

khusus login service report

parent 357ceffd
Hide whitespace changes
Inline Side-by-side
Showing with 98 additions and 50 deletions
src/app/admin/admin-dashboard/admin-dashboard-logboook/admin-dashboard-logboook.component.html
View file @ 36ac5efa
......@@ -16,13 +16,14 @@
<div class="col-12 col-sm-12 Table-Background" *ngIf="isTicketReportLoading == false && isTicketReportEmpty == false">
<span
class="downloadExportReport"
*ngIf="RoleID == _SP.PARAM_SPV || RoleID == _SP.PARAM_SERVICEDESK || (TeamID == Env.Team.CsCabangBranchAgent || TeamID == Env.Team.SociomileStaff)"
*ngIf="RoleID == _SP.PARAM_SPV || RoleID == _SP.PARAM_SERVICEDESK ||
(TeamID == Env.Team.CsCabangBranchAgent || TeamID == Env.Team.SociomileStaff || TeamID == Env.Team.ServiceReport || TeamID == Env.Team.ServiceReport)"
(click)="ReportExportToExcel()">
Download Excel <i class="fas fa-download"></i>
</span>
<!-- Role SPV and SD Only -->
<div class="table-responsive mt-4" *ngIf="RoleID == _SP.PARAM_SPV || RoleID == _SP.PARAM_SERVICEDESK">
<div class="table-responsive mt-4" *ngIf="RoleID == _SP.PARAM_SPV || RoleID == _SP.PARAM_SERVICEDESK || TeamID == Env.Team.ServiceReport">
<table class="table table-bordered table-striped table-sm">
<thead>
<ng-container *ngIf="TicketReportRequest.servicefamily_name == 'Pengaduan Dashboard SD'">
......
src/app/admin/admin-dashboard/admin-dashboard-logboook/admin-dashboard-logboook.component.ts
View file @ 36ac5efa
......@@ -86,6 +86,7 @@ export class AdminDashboardLogboookComponent implements OnInit, OnChanges {
ngOnInitAfter(_RequestList, _Model){
this.TicketReportRequest =_RequestList;
if (this._SP.getUserInformation.values.team_id == this.Env.Team.ServiceReport) this.TicketReportRequest.user_id = null;
let start_date_ticket = '';
let deskripsi = '';
let status= '';
......@@ -145,7 +146,8 @@ export class AdminDashboardLogboookComponent implements OnInit, OnChanges {
{"name": 'resolve_date', "value": false, "field": "Tanggal & Waktu Resolved"},
{"name": 'cscabang', "value": false, "field": "Nama Staff"},
]
} else if (_RequestList.servicefamily_id[0] == 2 || _RequestList.servicefamily_id[0] == 4) {
} else if (_RequestList.servicefamily_id[0] == 2 || _RequestList.servicefamily_id[0] == 4
|| this._SP.getUserInformation.values.team_id == this.Env.Team.ServiceReport) {
this.fieldExport = [
{"name": 'ref', "value": false, "field": "No Ticket CRM"},
{"name": 'createdby_name', "value": false, "field": "Nama User"},
......@@ -241,8 +243,8 @@ export class AdminDashboardLogboookComponent implements OnInit, OnChanges {
servicefamily_id : this.TicketReportRequest.servicefamily_id,
servicefamily_name : this.TicketReportRequest.servicefamily_name,
is_export : 'excel',
team_id : this.TicketReportRequest.team_id,
user_id : this.TicketReportRequest.user_id,
team_id : this._SP.getUserInformation.values.team_id == this.Env.Team.ServiceReport ? null : this.TicketReportRequest.team_id,
user_id : this._SP.getUserInformation.values.team_id == this.Env.Team.ServiceReport ? null : this.TicketReportRequest.user_id,
})
}
......@@ -269,6 +271,7 @@ export class AdminDashboardLogboookComponent implements OnInit, OnChanges {
//Functional API------------------------------------------------------------------------------------------------------
GettingTicketReportDataAPI(_Request){
if(this._SP.getUserInformation.values.team_id == this.Env.Team.ServiceReport) _Request.user_id = null;
this.TicketReportData = undefined
this.isTicketReportLoading = true
this.isTicketReportEmpty = false
......
src/app/admin/admin-dashboard/admin-dashboard-report/admin-dashboard-report.component.html
View file @ 36ac5efa
......@@ -11,7 +11,7 @@
<p style="font-size:18px;" class="text-muted"><i class="fas fa-spinner fa-spin"></i> Retrieving data</p>
</div>
<div class="col-12 col-sm-12 Table-Background" *ngIf="isTicketReportLoading == false && isTicketReportEmpty == false">
<span class="downloadExportReport" *ngIf="(ModelReportCategory.Count != 0) && (RoleID == _SP.PARAM_SPV || RoleID == _SP.PARAM_SERVICEDESK)" (click)="ReportExportToExcel()">Download Excel <i class="fas fa-download"></i></span>
<span class="downloadExportReport" *ngIf="(ModelReportCategory.Count != 0) && (RoleID == _SP.PARAM_SPV || RoleID == _SP.PARAM_SERVICEDESK || TeamID == Env.Team.ServiceReport)" (click)="ReportExportToExcel()">Download Excel <i class="fas fa-download"></i></span>
<div class="table-responsive mt-4">
<table class="table table-bordered table-striped table-sm">
<thead>
......
src/app/admin/admin-dashboard/admin-dashboard-report/admin-dashboard-report.component.ts
View file @ 36ac5efa
......@@ -106,6 +106,7 @@ export class AdminDashboardReportComponent implements OnInit {
this.TicketReportData = [];
this.TicketReportRequest.page = 1;
this.TicketReportRequest.perpage = 10;
if(this._SP.getUserInformation.values.team_id == this.Env.Team.ServiceReport) this.TicketReportRequest.user_id = null;
// this.GettingTicketReportDataAPI(this.TicketReportRequest)
}
......@@ -120,7 +121,8 @@ export class AdminDashboardReportComponent implements OnInit {
}
ReportExportToExcel(){
let UserID = this._SP.getUserInformation.values.user_id;
let UserID = this._SP.getUserInformation.values.team_id == this.Env.Team.ServiceReport ? null : this._SP.getUserInformation.values.user_id;
// let UserID = this._SP.getUserInformation.values.user_id;
if(this.RoleID == this._SP.PARAM_SPV){
UserID = null;
}
......
src/app/admin/admin-dashboard/admin-dashboard.component.html
View file @ 36ac5efa
......@@ -9,7 +9,9 @@
<div class="col-12 col-sm-6 col-md-4 col-lg-8">
<p style="font-size: 15px;">DASHBOARD</p>
</div>
<div class="col-12 col-sm-6 col-md-4 col-lg-2" [ngClass]="{'d-none': (RoleID != _SP.PARAM_SERVICEDESK && RoleID != _SP.PARAM_SPV && (TeamID != Env.Team.SociomileStaff && TeamID != Env.Team.CsCabangBranchAgent) )}">
<div class="col-12 col-sm-6 col-md-4 col-lg-2"
[ngClass]="{'d-none': (RoleID != _SP.PARAM_SERVICEDESK && RoleID != _SP.PARAM_SPV &&
(TeamID != Env.Team.SociomileStaff && TeamID != Env.Team.CsCabangBranchAgent) && TeamID != Env.Team.ServiceReport )}">
<div class="form-group" >
<label class="text-muted"><small>Start Date </small></label>
<div class="input-group date" id="StartDate" data-target-input="nearest">
......@@ -22,7 +24,9 @@
</div>
</div>
</div>
<div class="col-12 col-sm-6 col-md-4 col-lg-2" [ngClass]="{'d-none': (RoleID != _SP.PARAM_SERVICEDESK && RoleID != _SP.PARAM_SPV && (TeamID != Env.Team.SociomileStaff && TeamID != Env.Team.CsCabangBranchAgent) )}">
<div class="col-12 col-sm-6 col-md-4 col-lg-2"
[ngClass]="{'d-none': (RoleID != _SP.PARAM_SERVICEDESK && RoleID != _SP.PARAM_SPV
&& (TeamID != Env.Team.SociomileStaff && TeamID != Env.Team.CsCabangBranchAgent) && TeamID != Env.Team.ServiceReport )}">
<div class="form-group">
<label class="text-muted"><small>End Date </small></label>
<div class="input-group date" id="EndDate" data-target-input="nearest">
......@@ -74,7 +78,7 @@
</p>
<!--Region Report Category-->
<ng-container *ngIf="TicketTabsCategoryData[0].selected">
<ng-container *ngIf="TicketTabsCategoryData[2]?.selected">
<p *ngIf="isDashboardCardColorsEmpty" style="font-size:18px;" class="text-muted text-center">
<i class="fas fa-columns fa-3x"></i> <br>
There is no Dashboard
......@@ -98,9 +102,16 @@
<!--End Region Report Category-->
<!--Region Report Category-->
<ng-container *ngIf="TicketTabsCategoryData[1].selected">
<p *ngIf="isTicketCategoryEmpty == true" style="font-size:18px;" class="text-muted text-center"><i class="fas fa-columns fa-3x"></i> <br> There is no Report category</p>
<p *ngIf="isTicketCategoryLoading == true" style="font-size:18px;" class="text-muted text-center"><i class="fas fa-spinner fa-spin"></i> Retrieving data</p>
<ng-container *ngIf="TicketTabsCategoryData[0].selected">
<p *ngIf="isTicketCategoryEmpty == true" style="font-size:18px;" class="text-muted text-center">
<i class="fas fa-columns fa-3x"></i>
<br>
There is no Report category
</p>
<p *ngIf="isTicketCategoryLoading == true" style="font-size:18px;" class="text-muted text-center">
<i class="fas fa-spinner fa-spin"></i>
Retrieving data
</p>
<p *ngIf="TicketCategory != undefined">
<ng-container *ngFor="let data of TicketCategory; let i = index">
......@@ -116,8 +127,8 @@
<!--End Region Report Category-->
<!--Region Report Category LogBooks-->
<ng-container *ngIf="RoleID == _SP.PARAM_SERVICEDESK || RoleID == _SP.PARAM_SPV || (TeamID == Env.Team.CsCabangBranchAgent || TeamID == Env.Team.SociomileStaff)">
<ng-container *ngIf="TicketTabsCategoryData[2].selected">
<ng-container *ngIf="TeamID == Env.Team.ServiceReport || RoleID == _SP.PARAM_SERVICEDESK || RoleID == _SP.PARAM_SPV || (TeamID == Env.Team.CsCabangBranchAgent || TeamID == Env.Team.SociomileStaff)">
<ng-container *ngIf="TicketTabsCategoryData[1].selected">
<p *ngIf="isTicketCategoryLogBookEmpty == true" style="font-size:18px;" class="text-muted text-center"><i class="fas fa-columns fa-3x"></i> <br> There is no Report category</p>
<p *ngIf="isTicketCategoryLogBookLoading == true" style="font-size:18px;" class="text-muted text-center"><i class="fas fa-spinner fa-spin"></i> Retrieving data</p>
......@@ -176,17 +187,13 @@
<!--Region Report Pagination-->
<ng-container *ngIf="TicketTabsCategoryData[0].selected">
<app-admin-dashboard-ticket [requestTicket] = "requestTicket">
</app-admin-dashboard-ticket>
</ng-container>
<ng-container *ngIf="TicketTabsCategoryData[1].selected">
<app-admin-dashboard-report
#_AdminDashboardReportComponent
(ChildEvent)="FromChildReportComponent($event)">
</app-admin-dashboard-report>
</ng-container>
<ng-container *ngIf="RoleID == _SP.PARAM_SERVICEDESK || RoleID == _SP.PARAM_SPV || (TeamID == Env.Team.CsCabangBranchAgent || TeamID == Env.Team.SociomileStaff)">
<ng-container *ngIf="TicketTabsCategoryData[2].selected">
<ng-container *ngIf="TeamID == Env.Team.ServiceReport || RoleID == _SP.PARAM_SERVICEDESK || RoleID == _SP.PARAM_SPV || (TeamID == Env.Team.CsCabangBranchAgent || TeamID == Env.Team.SociomileStaff)">
<ng-container *ngIf="TicketTabsCategoryData[1].selected">
<app-admin-dashboard-logboook
#_AdminDashboardLogboookComponent
(ChildEvent)="FromChildReportLogBookComponent($event)"
......@@ -194,6 +201,10 @@
</app-admin-dashboard-logboook>
</ng-container>
</ng-container>
<ng-container *ngIf="TicketTabsCategoryData[2]?.selected">
<app-admin-dashboard-ticket [requestTicket] = "requestTicket">
</app-admin-dashboard-ticket>
</ng-container>
<!--End Region Report Pagination-->
......
src/app/admin/admin-dashboard/admin-dashboard.component.ts
View file @ 36ac5efa
......@@ -172,13 +172,8 @@ export class AdminDashboardComponent implements OnInit {
//Take By User -----------------------------------------------------------------------------------------------
TabsSelection(){
if(this.RoleID == this._SP.PARAM_SERVICEDESK || this.RoleID == this._SP.PARAM_SPV || (this.TeamID == this.Env.Team.CsCabangBranchAgent || this.TeamID == this.Env.Team.SociomileStaff)){
if(this.RoleID == this._SP.PARAM_SERVICEDESK || this.RoleID == this._SP.PARAM_SPV || (this.TeamID == this.Env.Team.CsCabangBranchAgent || this.TeamID == this.Env.Team.SociomileStaff || this.TeamID == this.Env.Team.ServiceReport)){
this. TicketTabsCategoryData = [
{
ID : 0,
Name : "Dashboard",
selected : false
},
{
ID : 1,
Name : "Report",
......@@ -191,13 +186,18 @@ export class AdminDashboardComponent implements OnInit {
},
// {
// ID : 3,
// Name : "Dashboard",
// selected : false
// },
// {
// ID : 3,
// Name : "Top Category",
// selected : false
// }
]
}
else{
this. TicketTabsCategoryData = [
this.TicketTabsCategoryData = [
{
ID : 1,
Name : "Report",
......@@ -205,6 +205,7 @@ export class AdminDashboardComponent implements OnInit {
}
]
}
console.log(this.TicketTabsCategoryData)
}
ChartDateTimePickerChange(){
......@@ -393,6 +394,7 @@ export class AdminDashboardComponent implements OnInit {
// }
GettingDashboardCardColorsDataAPI(_Request){
if(this._SP.getUserInformation.values.team_id == this.Env.Team.ServiceReport) _Request.user_id = null;
this.DashboardCardColorsData = []
this.isDashboardCardColorsLoading = true
this.isDashboardCardColorsEmpty = false
......@@ -429,10 +431,11 @@ export class AdminDashboardComponent implements OnInit {
}
GettingTicketReportCateogryLogBookDataAPI(){
console.log("==== loggbok")
this.TicketCategoryLogBook = undefined
this.isTicketCategoryLogBookLoading = true
this.isTicketCategoryLogBookEmpty = false
const team = this._SP.getUserInformation.values.team_id != this.Env.Team.ServiceReport ? this.TeamID : null;
this.Subscribtion = this._DashboardService.ReportTicketCategoryLogBook(this.TeamID)
.subscribe((result: any) => {
//console.log("Response count Log BOOK", JSON.stringify(result))
......@@ -463,10 +466,7 @@ export class AdminDashboardComponent implements OnInit {
this.TicketReportLogBookRequest.servicefamily_id = this.TicketCategoryLogBook[0].id
this.TicketReportLogBookRequest.servicefamily_name = this.TicketCategoryLogBook[0].name
this.TicketReportLogBookRequest.is_export = null
this.SelectReportLogBookComponentClick(this.TicketReportLogBookRequest, this.ModelReportCategoryLogBook)
}else{
this.isTicketCategoryLogBookEmpty = true
}
......
src/app/admin/admin-ticket/admin-ticket-detail/admin-ticket-detail.component.html
View file @ 36ac5efa
......@@ -2,15 +2,25 @@
<div class="row">
<div class="col-12 col-sm-12 col-md-3 col-lg-3 mb-1">
<p class="text-muted"><i class="fas fa-ticket-alt"></i> Ticket Detail <span class="text-dark"><b>#{{RefNumber}}</b></span></p>
<button class="btn btn-sm btn-block arataka-btn-primary" *ngIf="RoleID == _SP.PARAM_AGENT" routerLink="/admin/ticket/create"><i class="fas fa-plus-circle"></i> Add New Ticket</button>
<button class="btn btn-sm btn-block arataka-btn-primary" *ngIf="RoleID == _SP.PARAM_AGENT && TeamID != Env.Team.ServiceReport" routerLink="/admin/ticket/create">
<i class="fas fa-plus-circle"></i>
Add New Ticket
</button>
</div>
<div class="col-12 col-sm-12 col-md-3 col-lg-3 mb-1"></div>
<div class="col-12 col-sm-12 col-md-3 col-lg-3 mb-1"></div>
<div class="col-12 col-sm-12 col-md-3 col-lg-3 mb-1">
<!-- Topic_ID == '4' To Topic_ID == '6' Topic_ID == Env.Topic.PermintaanKeNobuCall.toString() -->
<ng-container
*ngIf="(Topic_ID == Env.Topic.Informasi.toString() || Topic_ID == Env.Topic.TelponTerputus.toString() || Topic_ID == Env.Topic.PermintaanKeNobuCall.toString()) && (TeamID == Env.Team.AgentCallCenter || TeamID == Env.Team.SociomileStaff) && (StatusTicket == 'new' || StatusTicket == 'assigned' || StatusTicket == 'escalated_ttr')">
<button class="btn btn-sm btn-block arataka-btn-primary" (click)="ResolveTicketClick()"><i class="far fa-check-circle"></i>&nbsp; RESOLVE TICKET</button>
*ngIf="(Topic_ID == Env.Topic.Informasi.toString() || Topic_ID == Env.Topic.TelponTerputus.toString() && TeamID != Env.Team.ServiceReport
|| Topic_ID == Env.Topic.PermintaanKeNobuCall.toString()) && (TeamID == Env.Team.AgentCallCenter
|| TeamID == Env.Team.SociomileStaff) && (StatusTicket == 'new' || StatusTicket == 'assigned'
|| StatusTicket == 'escalated_ttr')">
<button class="btn btn-sm btn-block arataka-btn-primary" (click)="ResolveTicketClick()">
<i class="far fa-check-circle"></i>
&nbsp;
RESOLVE TICKET
</button>
</ng-container>
</div>
</div>
......@@ -344,16 +354,22 @@
</select>
</div>
<div
*ngIf="(StatusTicket != 'closed' && StatusTicket != 'resolved' && StatusTicket != 'rejected')"
*ngIf="(TeamID != Env.Team.ServiceReport && StatusTicket != 'closed' && StatusTicket != 'resolved' && StatusTicket != 'rejected')"
class="form-group"
[ngClass]="{'d-block': ConversationReplyNote[0].Selected == true, 'd-none': ConversationReplyNote[0].Selected == false}">
<button class="btn btn-block arataka-btn-primary" (click)="SubmitPublicReplyClick()"><i class="far fa-paper-plane"></i> SUBMIT PUBLIC REPLY</button>
<button class="btn btn-block arataka-btn-primary" (click)="SubmitPublicReplyClick()">
<i class="far fa-paper-plane"></i>
SUBMIT PUBLIC REPLY
</button>
</div>
<div
*ngIf="(StatusTicket == 'closed' || StatusTicket == 'resolved' || StatusTicket == 'rejected')"
*ngIf="TeamID != Env.Team.ServiceReport && (StatusTicket == 'closed' || StatusTicket == 'resolved' || StatusTicket == 'rejected')"
class="form-group"
[ngClass]="{'d-block': ConversationReplyNote[0].Selected == true, 'd-none': ConversationReplyNote[0].Selected == false}">
<button class="btn btn-block arataka-btn-primary" disabled="" style="cursor: no-drop;"><i class="far fa-paper-plane"></i> SUBMIT PUBLIC REPLY</button>
<button class="btn btn-block arataka-btn-primary" disabled="" style="cursor: no-drop;">
<i class="far fa-paper-plane"></i>
SUBMIT PUBLIC REPLY
</button>
</div>
<!--/End Public Reply-->
......@@ -415,15 +431,21 @@
</div>
<button class="btn btn-block arataka-btn-primary" (click)="SubmitInternalNoteClick()"><i class="far fa-paper-plane"></i> SUBMIT INTERNAL NOTE</button>
<button class="btn btn-block arataka-btn-primary" *ngIf="TeamID != Env.Team.ServiceReport" (click)="SubmitInternalNoteClick()">
<i class="far fa-paper-plane"></i>
SUBMIT INTERNAL NOTE
</button>
</div>
<div
*ngIf="(RoleID == _SP.PARAM_SPV) || (StatusTicket == 'closed' || StatusTicket == 'resolved' || StatusTicket == 'rejected')"
*ngIf=" (RoleID == _SP.PARAM_SPV) || (StatusTicket == 'closed' || StatusTicket == 'resolved' || StatusTicket == 'rejected')"
class="form-group"
[ngClass]="{'d-block': ConversationReplyNote[1].Selected == true, 'd-none':ConversationReplyNote[1].Selected == false}">
<button class="btn btn-block arataka-btn-primary" disabled="" style="cursor: no-drop;"><i class="far fa-paper-plane"></i> SUBMIT INTERNAL NOTE</button>
<button class="btn btn-block arataka-btn-primary" *ngIf="TeamID != Env.Team.ServiceReport" disabled="" style="cursor: no-drop;">
<i class="far fa-paper-plane"></i>
SUBMIT INTERNAL NOTE
</button>
</div>
<!--/ End Internal Note-->
......
src/app/admin/admin-ticket/admin-ticket.component.html
View file @ 36ac5efa
......@@ -4,7 +4,8 @@
<h6 class="text-muted"><i class="fas fa-ticket-alt"></i> Ticket</h6>
</div>
<div class="col-sm-2 mb-3">
<button routerLink="/admin/ticket/create" class="btn btn-sm btn-block arataka-btn-primary" *ngIf="RoleID == _SP.PARAM_AGENT">
<button routerLink="/admin/ticket/create" class="btn btn-sm btn-block arataka-btn-primary"
*ngIf="RoleID == _SP.PARAM_AGENT && TeamID != Env.Team.ServiceReport">
<i class="fas fa-plus-circle"></i>
Add New Ticket
</button>
......
src/app/admin/admin-ticket/admin-ticket.component.ts
View file @ 36ac5efa
......@@ -209,9 +209,11 @@ export class AdminTicketComponent implements OnInit {
//Funtion Engine to API---------------------------------------------------------------------------------------
GettingListTicketDataAPI(_Request) {
if(this.TeamID == this.Env.Team.ServiceReport) _Request.TeamID = 0;
this.ListData = []
this.isTicketListLoading = true
this.isTicketListEmpty = false
console.log(_Request.TeamID)
this.Subscribtion = this._TicketService.List(_Request)
.subscribe((result: any) => {
if(result.values != undefined) {
......
src/assets/configAPI.json
View file @ 36ac5efa
{
"APIBASEURL" : "http://localhost:9825/",
"APIBASEURL" : "http://innodev.vnetcloud.com/nobucall-api-v2/",
"MICROSERVICEURL" : "hhttp://innodev.vnetcloud.com/nobu-history-login/api/v1/",
"SITE_NAME" : "Visionet Helpdesk System",
"SITE_LOGO" : "https://i0.wp.com/jogorogo.info/wp-content/uploads/2017/07/logo_visionet.png?fit=879%2C227",
......@@ -44,7 +44,8 @@
"ProductInovationAndBusinessSupport" : 30397,
"ITRM" : 30393,
"SupervisorNobu" : 42931,
"MerchantBusiness": 66798
"MerchantBusiness": 66798,
"ServiceReport": 97408
},
"Agent" : {
"NobuCall" : 42,
......
src/environments/environment.prod.ts
View file @ 36ac5efa
......@@ -45,7 +45,8 @@ export const environment = {
"ProductInovationAndBusinessSupport" : 30397,
"ITRM" : 30393,
"SupervisorNobu" : 42931,
"MerchantBusiness": 66798
"MerchantBusiness": 66798,
"ServiceReport": 97408
},
"Agent" : {
"NobuCall" : 42,
......
src/environments/environment.ts
View file @ 36ac5efa
......@@ -49,7 +49,8 @@ export const environment = {
"ProductInovationAndBusinessSupport" : 30397,
"ITRM" : 30393,
"SupervisorNobu" : 42931,
"MerchantBusiness": 66798
"MerchantBusiness": 66798,
"ServiceReport": 97408
},
"Agent" : {
"NobuCall" : 42,
......
src/shared/serviceproxy/service-proxy.service.ts
View file @ 36ac5efa
......@@ -226,6 +226,9 @@ export class TicketService {
'Authorization' : 'Bearer '+ service.getUserInformation.values.access_token
});
let options = { headers: headers };
let Team = 0;
if (service.getUserInformation.values.team_id == environment.Team.ServiceReport) Team = 0;
else Team = service.getUserInformation.values.team_id;
if(data.FilterByContact == 'true'){
if(data.search != ""){
......@@ -237,7 +240,7 @@ export class TicketService {
if(data.search != ""){
searchQ = '?search=' + data.Search
}
return this.http.get(API_URL +'v3/tickets/bycontactteam/' + service.getUserInformation.values.team_id + '/'+data.FilterTicket+'/'+data.Page+'/'+data.PerPage+''+searchQ, options);
return this.http.get(API_URL +'v3/tickets/bycontactteam/' + Team + '/'+data.FilterTicket+'/'+data.Page+'/'+data.PerPage+''+searchQ, options);
}else{
if(data.Search != ""){
......@@ -248,7 +251,7 @@ export class TicketService {
return this.http.get(API_URL +'v3/nobutickets/0/'+data.FilterTicket+'/0/0/0/'+data.Page+'/'+data.PerPage+'?search=' + data.Search, options);
}
else{
return this.http.get(API_URL +'v3/nobutickets/0/'+data.FilterTicket+'/0/0/' + service.getUserInformation.values.team_id + '/'+data.Page+'/'+data.PerPage+'?search=' + data.Search, options);
return this.http.get(API_URL +'v3/nobutickets/0/'+data.FilterTicket+'/0/0/' + Team + '/'+data.Page+'/'+data.PerPage+'?search=' + data.Search, options);
}
}else{
if(service.getUserInformation.values.team_id == environment.Team.CsCabangBranchAgent){
......@@ -257,7 +260,7 @@ export class TicketService {
return this.http.get(API_URL +'v3/nobutickets/0/'+data.FilterTicket+'/0/0/0/'+data.Page+'/'+data.PerPage+'', options);
}
else{
return this.http.get(API_URL +'v3/nobutickets/0/'+data.FilterTicket+'/0/0/' + service.getUserInformation.values.team_id + '/'+data.Page+'/'+data.PerPage+'', options);
return this.http.get(API_URL +'v3/nobutickets/0/'+data.FilterTicket+'/0/0/' + Team+ '/'+data.Page+'/'+data.PerPage+'', options);
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment