tango-app-ui-manage-tickets 3.7.0-beta.69 → 3.7.0-beta.70
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.eslintrc.json +37 -0
- package/ng-package.json +7 -0
- package/package.json +12 -25
- package/src/lib/components/add-csm-modal/add-csm-modal.component.html +32 -0
- package/src/lib/components/add-csm-modal/add-csm-modal.component.scss +14 -0
- package/src/lib/components/add-csm-modal/add-csm-modal.component.spec.ts +23 -0
- package/src/lib/components/add-csm-modal/add-csm-modal.component.ts +94 -0
- package/src/lib/components/audit-log/audit-log.component.html +1 -0
- package/src/lib/components/audit-log/audit-log.component.scss +0 -0
- package/src/lib/components/audit-log/audit-log.component.spec.ts +23 -0
- package/src/lib/components/audit-log/audit-log.component.ts +10 -0
- package/src/lib/components/audit-mapping-list/audit-mapping-list.component.html +234 -0
- package/src/lib/components/audit-mapping-list/audit-mapping-list.component.scss +186 -0
- package/src/lib/components/audit-mapping-list/audit-mapping-list.component.spec.ts +23 -0
- package/src/lib/components/audit-mapping-list/audit-mapping-list.component.ts +536 -0
- package/src/lib/components/audit-metrics/audit-metrics.component.html +345 -0
- package/src/lib/components/audit-metrics/audit-metrics.component.scss +34 -0
- package/src/lib/components/audit-metrics/audit-metrics.component.spec.ts +23 -0
- package/src/lib/components/audit-metrics/audit-metrics.component.ts +292 -0
- package/src/lib/components/audit-report-popup/audit-report-popup.component.html +111 -0
- package/src/lib/components/audit-report-popup/audit-report-popup.component.scss +101 -0
- package/src/lib/components/audit-report-popup/audit-report-popup.component.spec.ts +23 -0
- package/src/lib/components/audit-report-popup/audit-report-popup.component.ts +397 -0
- package/src/lib/components/audit-retag/audit-retag.component.html +129 -0
- package/src/lib/components/audit-retag/audit-retag.component.scss +146 -0
- package/src/lib/components/audit-retag/audit-retag.component.spec.ts +23 -0
- package/src/lib/components/audit-retag/audit-retag.component.ts +497 -0
- package/src/lib/components/comment-model/comment-model.component.html +24 -0
- package/src/lib/components/comment-model/comment-model.component.scss +20 -0
- package/src/lib/components/comment-model/comment-model.component.spec.ts +23 -0
- package/src/lib/components/comment-model/comment-model.component.ts +53 -0
- package/src/lib/components/count/count.component.html +54 -0
- package/src/lib/components/count/count.component.scss +14 -0
- package/src/lib/components/count/count.component.spec.ts +23 -0
- package/src/lib/components/count/count.component.ts +82 -0
- package/src/lib/components/custom-select/custom-select.component.html +134 -0
- package/src/lib/components/custom-select/custom-select.component.scss +204 -0
- package/src/lib/components/custom-select/custom-select.component.spec.ts +23 -0
- package/src/lib/components/custom-select/custom-select.component.ts +189 -0
- package/src/lib/components/filter-options/filter-options.component.html +51 -0
- package/src/lib/components/filter-options/filter-options.component.scss +102 -0
- package/src/lib/components/filter-options/filter-options.component.spec.ts +23 -0
- package/src/lib/components/filter-options/filter-options.component.ts +38 -0
- package/src/lib/components/footfall-dic/footfall-dic.component.html +1275 -0
- package/src/lib/components/footfall-dic/footfall-dic.component.scss +273 -0
- package/src/lib/components/footfall-dic/footfall-dic.component.spec.ts +23 -0
- package/src/lib/components/footfall-dic/footfall-dic.component.ts +1206 -0
- package/src/lib/components/footfall-dicview/footfall-dicview.component.html +1136 -0
- package/src/lib/components/footfall-dicview/footfall-dicview.component.scss +416 -0
- package/src/lib/components/footfall-dicview/footfall-dicview.component.spec.ts +23 -0
- package/src/lib/components/footfall-dicview/footfall-dicview.component.ts +1168 -0
- package/src/lib/components/footfall-popup/footfall-popup.component.html +61 -0
- package/src/lib/components/footfall-popup/footfall-popup.component.scss +20 -0
- package/src/lib/components/footfall-popup/footfall-popup.component.spec.ts +23 -0
- package/src/lib/components/footfall-popup/footfall-popup.component.ts +12 -0
- package/src/lib/components/group-select/group-select.component.html +44 -0
- package/src/lib/components/group-select/group-select.component.scss +144 -0
- package/src/lib/components/group-select/group-select.component.spec.ts +23 -0
- package/src/lib/components/group-select/group-select.component.ts +145 -0
- package/src/lib/components/re-trigger/re-trigger.component.html +53 -0
- package/src/lib/components/re-trigger/re-trigger.component.scss +16 -0
- package/src/lib/components/re-trigger/re-trigger.component.spec.ts +23 -0
- package/src/lib/components/re-trigger/re-trigger.component.ts +96 -0
- package/src/lib/components/reactive-select/reactive-select.component.html +18 -0
- package/src/lib/components/reactive-select/reactive-select.component.scss +52 -0
- package/src/lib/components/reactive-select/reactive-select.component.spec.ts +23 -0
- package/src/lib/components/reactive-select/reactive-select.component.ts +104 -0
- package/src/lib/components/remove-audit/remove-audit.component.html +38 -0
- package/src/lib/components/remove-audit/remove-audit.component.scss +27 -0
- package/src/lib/components/remove-audit/remove-audit.component.spec.ts +23 -0
- package/src/lib/components/remove-audit/remove-audit.component.ts +81 -0
- package/src/lib/components/start-audit/start-audit.component.html +174 -0
- package/src/lib/components/start-audit/start-audit.component.scss +185 -0
- package/src/lib/components/start-audit/start-audit.component.spec.ts +23 -0
- package/src/lib/components/start-audit/start-audit.component.ts +772 -0
- package/src/lib/components/tango-manage-tickets/tango-manage-tickets.component.html +43 -0
- package/src/lib/components/tango-manage-tickets/tango-manage-tickets.component.scss +35 -0
- package/src/lib/components/tango-manage-tickets/tango-manage-tickets.component.spec.ts +23 -0
- package/src/lib/components/tango-manage-tickets/tango-manage-tickets.component.ts +118 -0
- package/src/lib/components/ticket-filter-panel/ticket-filter-panel.component.html +386 -0
- package/src/lib/components/ticket-filter-panel/ticket-filter-panel.component.scss +87 -0
- package/src/lib/components/ticket-filter-panel/ticket-filter-panel.component.spec.ts +23 -0
- package/src/lib/components/ticket-filter-panel/ticket-filter-panel.component.ts +493 -0
- package/src/lib/components/ticket-footfall-new/ticket-footfall-new.component.html +3751 -0
- package/src/lib/components/ticket-footfall-new/ticket-footfall-new.component.scss +1240 -0
- package/src/lib/components/ticket-footfall-new/ticket-footfall-new.component.spec.ts +23 -0
- package/src/lib/components/ticket-footfall-new/ticket-footfall-new.component.ts +2863 -0
- package/src/lib/components/ticketclosepopup/ticketclosepopup.component.html +100 -0
- package/src/lib/components/ticketclosepopup/ticketclosepopup.component.scss +34 -0
- package/src/lib/components/ticketclosepopup/ticketclosepopup.component.spec.ts +23 -0
- package/src/lib/components/ticketclosepopup/ticketclosepopup.component.ts +48 -0
- package/src/lib/components/tickets/tickets.component.html +451 -0
- package/src/lib/components/tickets/tickets.component.scss +131 -0
- package/src/lib/components/tickets/tickets.component.spec.ts +23 -0
- package/src/lib/components/tickets/tickets.component.ts +809 -0
- package/src/lib/components/viewcategory/viewcategory.component.html +38 -0
- package/src/lib/components/viewcategory/viewcategory.component.scss +29 -0
- package/src/lib/components/viewcategory/viewcategory.component.spec.ts +23 -0
- package/src/lib/components/viewcategory/viewcategory.component.ts +79 -0
- package/src/lib/services/audit.service.spec.ts +16 -0
- package/src/lib/services/audit.service.ts +98 -0
- package/src/lib/services/excel.service.ts +48 -0
- package/src/lib/services/ticket.service.spec.ts +16 -0
- package/src/lib/services/ticket.service.ts +501 -0
- package/src/lib/services/timer.service.spec.ts +16 -0
- package/src/lib/services/timer.service.ts +92 -0
- package/src/lib/tango-manage-tickets-routing.module.ts +37 -0
- package/src/lib/tango-manage-tickets.module.ts +68 -0
- package/{public-api.d.ts → src/public-api.ts} +8 -2
- package/tsconfig.lib.json +14 -0
- package/tsconfig.lib.prod.json +10 -0
- package/tsconfig.spec.json +14 -0
- package/esm2022/lib/components/add-csm-modal/add-csm-modal.component.mjs +0 -98
- package/esm2022/lib/components/audit-log/audit-log.component.mjs +0 -11
- package/esm2022/lib/components/audit-mapping-list/audit-mapping-list.component.mjs +0 -498
- package/esm2022/lib/components/audit-metrics/audit-metrics.component.mjs +0 -298
- package/esm2022/lib/components/audit-report-popup/audit-report-popup.component.mjs +0 -389
- package/esm2022/lib/components/audit-retag/audit-retag.component.mjs +0 -480
- package/esm2022/lib/components/comment-model/comment-model.component.mjs +0 -58
- package/esm2022/lib/components/count/count.component.mjs +0 -89
- package/esm2022/lib/components/custom-select/custom-select.component.mjs +0 -187
- package/esm2022/lib/components/filter-options/filter-options.component.mjs +0 -41
- package/esm2022/lib/components/footfall-dic/footfall-dic.component.mjs +0 -1061
- package/esm2022/lib/components/footfall-dicview/footfall-dicview.component.mjs +0 -1014
- package/esm2022/lib/components/footfall-popup/footfall-popup.component.mjs +0 -15
- package/esm2022/lib/components/group-select/group-select.component.mjs +0 -155
- package/esm2022/lib/components/re-trigger/re-trigger.component.mjs +0 -96
- package/esm2022/lib/components/reactive-select/reactive-select.component.mjs +0 -108
- package/esm2022/lib/components/remove-audit/remove-audit.component.mjs +0 -81
- package/esm2022/lib/components/start-audit/start-audit.component.mjs +0 -758
- package/esm2022/lib/components/tango-manage-tickets/tango-manage-tickets.component.mjs +0 -131
- package/esm2022/lib/components/ticket-filter-panel/ticket-filter-panel.component.mjs +0 -435
- package/esm2022/lib/components/ticket-footfall-new/ticket-footfall-new.component.mjs +0 -2414
- package/esm2022/lib/components/ticketclosepopup/ticketclosepopup.component.mjs +0 -43
- package/esm2022/lib/components/tickets/tickets.component.mjs +0 -847
- package/esm2022/lib/components/viewcategory/viewcategory.component.mjs +0 -89
- package/esm2022/lib/services/audit.service.mjs +0 -88
- package/esm2022/lib/services/excel.service.mjs +0 -45
- package/esm2022/lib/services/ticket.service.mjs +0 -319
- package/esm2022/lib/services/timer.service.mjs +0 -84
- package/esm2022/lib/tango-manage-tickets-routing.module.mjs +0 -44
- package/esm2022/lib/tango-manage-tickets.module.mjs +0 -109
- package/esm2022/public-api.mjs +0 -6
- package/esm2022/tango-app-ui-manage-tickets.mjs +0 -5
- package/fesm2022/tango-app-ui-manage-tickets.mjs +0 -9848
- package/fesm2022/tango-app-ui-manage-tickets.mjs.map +0 -1
- package/index.d.ts +0 -5
- package/lib/components/add-csm-modal/add-csm-modal.component.d.ts +0 -30
- package/lib/components/audit-log/audit-log.component.d.ts +0 -5
- package/lib/components/audit-mapping-list/audit-mapping-list.component.d.ts +0 -73
- package/lib/components/audit-metrics/audit-metrics.component.d.ts +0 -59
- package/lib/components/audit-report-popup/audit-report-popup.component.d.ts +0 -52
- package/lib/components/audit-retag/audit-retag.component.d.ts +0 -59
- package/lib/components/comment-model/comment-model.component.d.ts +0 -17
- package/lib/components/count/count.component.d.ts +0 -23
- package/lib/components/custom-select/custom-select.component.d.ts +0 -35
- package/lib/components/filter-options/filter-options.component.d.ts +0 -15
- package/lib/components/footfall-dic/footfall-dic.component.d.ts +0 -143
- package/lib/components/footfall-dicview/footfall-dicview.component.d.ts +0 -132
- package/lib/components/footfall-popup/footfall-popup.component.d.ts +0 -8
- package/lib/components/group-select/group-select.component.d.ts +0 -33
- package/lib/components/re-trigger/re-trigger.component.d.ts +0 -32
- package/lib/components/reactive-select/reactive-select.component.d.ts +0 -32
- package/lib/components/remove-audit/remove-audit.component.d.ts +0 -16
- package/lib/components/start-audit/start-audit.component.d.ts +0 -86
- package/lib/components/tango-manage-tickets/tango-manage-tickets.component.d.ts +0 -28
- package/lib/components/ticket-filter-panel/ticket-filter-panel.component.d.ts +0 -79
- package/lib/components/ticket-footfall-new/ticket-footfall-new.component.d.ts +0 -291
- package/lib/components/ticketclosepopup/ticketclosepopup.component.d.ts +0 -15
- package/lib/components/tickets/tickets.component.d.ts +0 -88
- package/lib/components/viewcategory/viewcategory.component.d.ts +0 -16
- package/lib/services/audit.service.d.ts +0 -36
- package/lib/services/excel.service.d.ts +0 -10
- package/lib/services/ticket.service.d.ts +0 -87
- package/lib/services/timer.service.d.ts +0 -22
- package/lib/tango-manage-tickets-routing.module.d.ts +0 -7
- package/lib/tango-manage-tickets.module.d.ts +0 -38
|
@@ -0,0 +1,100 @@
|
|
|
1
|
+
<div class="modal fade show d-block" tabindex="-1" role="dialog">
|
|
2
|
+
<div class="modal-dialog modal-dialog-centered" role="document">
|
|
3
|
+
<div class="modal-content merge-ticket-modal">
|
|
4
|
+
|
|
5
|
+
<!-- Header -->
|
|
6
|
+
<div class="modal-header border-0 pb-0">
|
|
7
|
+
<h5 class="modal-title">Merge ticket</h5>
|
|
8
|
+
<button type="button" class="btn-close" aria-label="Close" (click)="closepopup()"></button>
|
|
9
|
+
</div>
|
|
10
|
+
|
|
11
|
+
<!-- Body -->
|
|
12
|
+
<div class="modal-body">
|
|
13
|
+
|
|
14
|
+
<!-- Info banner -->
|
|
15
|
+
<div class="alert merge-info d-flex">
|
|
16
|
+
<div class="me-3 mt-1">
|
|
17
|
+
<i class="bi bi-info-circle"></i>
|
|
18
|
+
</div>
|
|
19
|
+
<div>
|
|
20
|
+
<p class="mb-1">
|
|
21
|
+
This ticket has already been audited internally by Tango.
|
|
22
|
+
</p>
|
|
23
|
+
<p class="mb-0">
|
|
24
|
+
Clicking <b>‘Merge’</b> will merge the Tango audit with this ticket.
|
|
25
|
+
If needed, you can perform a new audit by clicking
|
|
26
|
+
<b>‘Start Audit’</b>.
|
|
27
|
+
</p>
|
|
28
|
+
</div>
|
|
29
|
+
</div>
|
|
30
|
+
|
|
31
|
+
<!-- Cards -->
|
|
32
|
+
<div class="row g-3 mt-2">
|
|
33
|
+
<!-- Central Ops -->
|
|
34
|
+
<div class="col-12 col-md-6">
|
|
35
|
+
<div class="card h-100">
|
|
36
|
+
<div class="card-body">
|
|
37
|
+
<div class="card-title mb-3 fw-semibold">Central Ops</div>
|
|
38
|
+
<div class="d-flex justify-content-between align-items-end mb-1">
|
|
39
|
+
<div>
|
|
40
|
+
<div class="value">{{centralOpsData?.revicedFootfall}}</div>
|
|
41
|
+
<div class="label">Footfall</div>
|
|
42
|
+
</div>
|
|
43
|
+
<div class="text-end">
|
|
44
|
+
<div class="value text-primary">
|
|
45
|
+
{{centralOpsData?.revicedPerc}}
|
|
46
|
+
<span class="arrow" *ngIf="centralOpsData?.revicedFootfall<tangoData?.revicedFootfall" >
|
|
47
|
+
↓
|
|
48
|
+
</span>
|
|
49
|
+
<span class="arrow" *ngIf="centralOpsData?.revicedFootfall>tangoData?.revicedFootfall">
|
|
50
|
+
↑
|
|
51
|
+
</span>
|
|
52
|
+
</div>
|
|
53
|
+
<div class="label">Accuracy</div>
|
|
54
|
+
</div>
|
|
55
|
+
</div>
|
|
56
|
+
</div>
|
|
57
|
+
</div>
|
|
58
|
+
</div>
|
|
59
|
+
|
|
60
|
+
<!-- Tango -->
|
|
61
|
+
<div class="col-12 col-md-6">
|
|
62
|
+
<div class="card h-100">
|
|
63
|
+
<div class="card-body">
|
|
64
|
+
<div class="card-title mb-3 fw-semibold">Tango</div>
|
|
65
|
+
<div class="d-flex justify-content-between align-items-end mb-1">
|
|
66
|
+
<div>
|
|
67
|
+
<div class="value">{{tangoData?.revicedFootfall}}</div>
|
|
68
|
+
<div class="label">Footfall</div>
|
|
69
|
+
</div>
|
|
70
|
+
<div class="text-end">
|
|
71
|
+
<div class="value text-primary">
|
|
72
|
+
{{tangoData?.revicedPerc}}
|
|
73
|
+
<span class="arrow" *ngIf="centralOpsData?.revicedFootfall>tangoData?.revicedFootfall" >
|
|
74
|
+
↓
|
|
75
|
+
</span>
|
|
76
|
+
<span class="arrow" *ngIf="centralOpsData?.revicedFootfall<tangoData?.revicedFootfall">
|
|
77
|
+
↑
|
|
78
|
+
</span>
|
|
79
|
+
</div>
|
|
80
|
+
<div class="label">Accuracy</div>
|
|
81
|
+
</div>
|
|
82
|
+
</div>
|
|
83
|
+
</div>
|
|
84
|
+
</div>
|
|
85
|
+
</div>
|
|
86
|
+
</div>
|
|
87
|
+
</div>
|
|
88
|
+
|
|
89
|
+
<!-- Footer -->
|
|
90
|
+
<div class="modal-footer border-0 pt-0">
|
|
91
|
+
<button type="button" class="btn btn-outline-secondary" (click)="submit('start')">
|
|
92
|
+
Start Audit
|
|
93
|
+
</button>
|
|
94
|
+
<button type="button" class="btn btn-primary" (click)="submit('merge')">
|
|
95
|
+
Merge
|
|
96
|
+
</button>
|
|
97
|
+
</div>
|
|
98
|
+
</div>
|
|
99
|
+
</div>
|
|
100
|
+
</div>
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
.merge-ticket-modal {
|
|
2
|
+
border-radius: 16px;
|
|
3
|
+
}
|
|
4
|
+
|
|
5
|
+
.merge-info {
|
|
6
|
+
border: 1px dashed #a9c4ff;
|
|
7
|
+
background: #f5f9ff;
|
|
8
|
+
border-radius: 10px;
|
|
9
|
+
font-size: 13px;
|
|
10
|
+
color: #008EDF;
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
.merge-info i {
|
|
14
|
+
font-size: 18px;
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
.card {
|
|
18
|
+
border-radius: 12px;
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
.card .value {
|
|
22
|
+
font-size: 24px;
|
|
23
|
+
font-weight: 600;
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
.card .label {
|
|
27
|
+
font-size: 12px;
|
|
28
|
+
color: #6c757d;
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
.arrow {
|
|
32
|
+
font-size: 16px;
|
|
33
|
+
margin-left: 4px;
|
|
34
|
+
}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
|
2
|
+
|
|
3
|
+
import { TicketclosepopupComponent } from './ticketclosepopup.component';
|
|
4
|
+
|
|
5
|
+
describe('TicketclosepopupComponent', () => {
|
|
6
|
+
let component: TicketclosepopupComponent;
|
|
7
|
+
let fixture: ComponentFixture<TicketclosepopupComponent>;
|
|
8
|
+
|
|
9
|
+
beforeEach(async () => {
|
|
10
|
+
await TestBed.configureTestingModule({
|
|
11
|
+
declarations: [TicketclosepopupComponent]
|
|
12
|
+
})
|
|
13
|
+
.compileComponents();
|
|
14
|
+
|
|
15
|
+
fixture = TestBed.createComponent(TicketclosepopupComponent);
|
|
16
|
+
component = fixture.componentInstance;
|
|
17
|
+
fixture.detectChanges();
|
|
18
|
+
});
|
|
19
|
+
|
|
20
|
+
it('should create', () => {
|
|
21
|
+
expect(component).toBeTruthy();
|
|
22
|
+
});
|
|
23
|
+
});
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
import { Component, Input } from '@angular/core';
|
|
2
|
+
|
|
3
|
+
import { NgbModal, NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
|
|
4
|
+
@Component({
|
|
5
|
+
selector: 'lib-ticketclosepopup',
|
|
6
|
+
templateUrl: './ticketclosepopup.component.html',
|
|
7
|
+
styleUrl: './ticketclosepopup.component.scss'
|
|
8
|
+
})
|
|
9
|
+
export class TicketclosepopupComponent {
|
|
10
|
+
|
|
11
|
+
@Input() tangoTicket: any;
|
|
12
|
+
@Input() storeTicket: any;
|
|
13
|
+
centralOpsData: any
|
|
14
|
+
tangoData: any
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
constructor(public activeModal: NgbActiveModal) {
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
|
|
23
|
+
ngOnInit(): void {
|
|
24
|
+
console.log("🚀 ~ TicketclosepopupComponent ~ tangoTicket:", this.tangoTicket)
|
|
25
|
+
console.log("🚀 ~ TicketclosepopupComponent ~ storeTicket:", this.storeTicket)
|
|
26
|
+
if (this.storeTicket && this.storeTicket?.mappingInfo.length > 0) {
|
|
27
|
+
this.centralOpsData = this.storeTicket.mappingInfo.filter((data: any) => data.type != "tangoreview")[0]
|
|
28
|
+
console.log("🚀 ~ TicketclosepopupComponent ~ ngOnInit ~ this.centralOpsData:", this.centralOpsData)
|
|
29
|
+
}
|
|
30
|
+
if (this.tangoTicket && this.tangoTicket?.mappingInfo.length > 0) {
|
|
31
|
+
this.tangoData = this.tangoTicket.mappingInfo.filter((data: any) => data.type === "tangoreview")[0]
|
|
32
|
+
console.log("🚀 ~ TicketclosepopupComponent ~ ngOnInit ~ this.tangoData:", this.tangoData)
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
|
|
36
|
+
|
|
37
|
+
}
|
|
38
|
+
submit(type: any) {
|
|
39
|
+
this.activeModal.close({ type: type });
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
closepopup() {
|
|
43
|
+
this.activeModal.close({ type: 'close' });
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
|
|
47
|
+
|
|
48
|
+
}
|