Skip to content

Commit 2e42ca7

Browse files
5Amogh5Amogh
authored
Merge pull request #107 from PSMRI/release-3.8.0
Release 3.8.0
2 parents c3538b0 + 07cba55 commit 2e42ca7

47 files changed

Lines changed: 362 additions & 140 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<modelVersion>4.0.0</modelVersion>
77
<groupId>com.iemr.aam-inventory-ui</groupId>
88
<artifactId>aam-inventory-ui</artifactId>
9-
<version>3.4.1</version>
9+
<version>3.6.0</version>
1010
<name>AAM-Inventory-UI</name>
1111
<description>Piramal - inventory: Module ui</description>
1212
<packaging>war</packaging>

‎scripts/ci-prebuild.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@ const defaultEnvValues = {
4747
SITE_KEY:'',
4848
CAPTCHA_CHALLENGE_URL:'',
4949
ENABLE_CAPTCHA: false,
50+
SITE_ID: '2',
51+
TRACKER_URL: 'https://matomo.piramalswasthya.org/',
52+
TRACKING_PLATFORM: 'ci',
53+
TRACKING_ENABLED: 'true',
5054
};
5155

5256
// Generate output data

‎src/app/app-modules/inventory/indent/indent-order-worklist/sub-store-indent-order-worklist/indent-request/indent-request.component.html‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ <h4>{{ currentLanguageSet?.inventory?.indentRequest }}</h4>
2020
id="requestDate"
2121
formControlName="requestDate"
2222
[disabled]="true"
23+
(focus)="trackFieldInteraction('Indent Date')"
2324
/>
2425
<mat-datepicker-toggle
2526
matPrefix
@@ -39,6 +40,7 @@ <h4>{{ currentLanguageSet?.inventory?.indentRequest }}</h4>
3940
allowText="alphanumeric"
4041
maxlength="20"
4142
formControlName="referenceNumber"
43+
(focus)="trackFieldInteraction('Reference No')"
4244
/>
4345
</mat-form-field>
4446
</div>
@@ -53,6 +55,7 @@ <h4>{{ currentLanguageSet?.inventory?.indentRequest }}</h4>
5355
allowText="alphanumericspace"
5456
maxlength="250"
5557
formControlName="indentReason"
58+
(focus)="trackFieldInteraction('Reason')"
5659
/>
5760
</mat-form-field>
5861
</div>
@@ -101,6 +104,7 @@ <h4>{{ currentLanguageSet?.inventory?.indentRequest }}</h4>
101104
"
102105
[itemListForm]="element"
103106
required
107+
(focus)="trackFieldInteraction('Item Name')"
104108
/>
105109
<!-- *ngIf="!element.itemNameView.disabled" -->
106110
<mat-icon
@@ -138,6 +142,7 @@ <h4>{{ currentLanguageSet?.inventory?.indentRequest }}</h4>
138142
name="qOH"
139143
formControlName="qOH"
140144
required
145+
(focus)="trackFieldInteraction('Quantity On Hand')"
141146
/>
142147
</mat-form-field>
143148
</td>
@@ -165,6 +170,7 @@ <h4>{{ currentLanguageSet?.inventory?.indentRequest }}</h4>
165170
[attr.maxlength]="('' + element.qOH).length"
166171
(blur)="checkQuantity(element)"
167172
required
173+
(focus)="trackFieldInteraction('Required Quantity')"
168174
/>
169175
<!-- -->
170176
</mat-form-field>
@@ -189,6 +195,7 @@ <h4>{{ currentLanguageSet?.inventory?.indentRequest }}</h4>
189195
name="remarks"
190196
formControlName="remarks"
191197
allowText="alphanumericspace"
198+
(focus)="trackFieldInteraction('Remarks')"
192199
/>
193200
</mat-form-field>
194201
</td>
@@ -224,7 +231,7 @@ <h4>{{ currentLanguageSet?.inventory?.indentRequest }}</h4>
224231
<button
225232
mat-mini-fab
226233
color="primary"
227-
(click)="addToindentItemList()"
234+
(click)="addToindentItemList(); trackFieldInteraction('Add Button')"
228235
>
229236
<mat-icon>add</mat-icon>
230237
</button>
@@ -245,7 +252,7 @@ <h4>{{ currentLanguageSet?.inventory?.indentRequest }}</h4>
245252
mat-raised-button
246253
matTooltip="{{ currentLanguageSet?.inventory?.back }}"
247254
matTooltipPosition="right"
248-
(click)="goBack()"
255+
(click)="goBack(); trackFieldInteraction('Back Button')"
249256
>
250257
{{ currentLanguageSet?.inventory?.back }}
251258
</button>
@@ -259,7 +266,7 @@ <h4>{{ currentLanguageSet?.inventory?.indentRequest }}</h4>
259266
class="pull-right m-r-5 mat_green"
260267
*ngIf="!editMode"
261268
[disabled]="indentRequestForm.invalid"
262-
(click)="submitIndentRequest(indentRequestForm)"
269+
(click)="submitIndentRequest(indentRequestForm); trackFieldInteraction('Save Button')"
263270
>
264271
{{ currentLanguageSet?.common?.save }}
265272
</button>
@@ -270,7 +277,7 @@ <h4>{{ currentLanguageSet?.inventory?.indentRequest }}</h4>
270277
*ngIf="editMode"
271278
class="pull-right m-r-5 mat_green"
272279
[disabled]="indentRequestForm.invalid"
273-
(click)="updateIndentRequest(indentRequestForm)"
280+
(click)="updateIndentRequest(indentRequestForm); trackFieldInteraction('Update Button')"
274281
>
275282
{{ currentLanguageSet?.inventory?.update }}
276283
</button>
@@ -281,7 +288,7 @@ <h4>{{ currentLanguageSet?.inventory?.indentRequest }}</h4>
281288
color="primary"
282289
class="pull-right m-r-5"
283290
[disabled]="indentRequestForm.pristine"
284-
(click)="resetIndentRequestForm()"
291+
(click)="resetIndentRequestForm(); trackFieldInteraction('Clear Button')"
285292
>
286293
{{ currentLanguageSet?.inventory?.clear }}
287294
</button>

‎src/app/app-modules/inventory/indent/indent-order-worklist/sub-store-indent-order-worklist/indent-request/indent-request.component.ts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ import { LanguageService } from 'src/app/app-modules/core/services/language.serv
3939
import { MatTableDataSource } from '@angular/material/table';
4040
import { Subscription } from 'rxjs';
4141
import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service';
42+
import { AmritTrackingService } from 'Common-UI/src/tracking';
4243

4344
@Component({
4445
selector: 'app-indent-request',
@@ -77,6 +78,7 @@ export class IndentRequestComponent implements OnInit, DoCheck {
7778
private confirmationService: ConfirmationService,
7879
private dataStorageService: DataStorageService,
7980
readonly sessionstorage:SessionStorageService,
81+
private trackingService: AmritTrackingService
8082
) {
8183
this.subs = this.inventoryService
8284
.getDialogClosedObservable()
@@ -402,4 +404,8 @@ export class IndentRequestComponent implements OnInit, DoCheck {
402404
this.currentLanguageSet = this.languageComponent.currentLanguageObject;
403405
}
404406
// -----End------
407+
408+
trackFieldInteraction(fieldName: string) {
409+
this.trackingService.trackFieldInteraction(fieldName, 'Indent Request');
410+
}
405411
}

‎src/app/app-modules/inventory/indent/indent-order-worklist/sub-store-indent-order-worklist/sub-store-indent-order-worklist.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ <h4>{{ currentLanguageSet?.inventory?.subStoreIndentOrderWorklist }}</h4>
99
class="pull-right button-full-width"
1010
type="button"
1111
color="primary"
12-
(click)="routeToRaiseRequest()"
12+
(click)="routeToRaiseRequest(); trackFieldInteraction('Raise Request Button')"
1313
>
1414
{{ currentLanguageSet?.inventory?.raiseRequest }}
1515
</button>

‎src/app/app-modules/inventory/indent/indent-order-worklist/sub-store-indent-order-worklist/sub-store-indent-order-worklist.component.ts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import { LanguageService } from 'src/app/app-modules/core/services/language.serv
3131
import { MatPaginator } from '@angular/material/paginator';
3232
import { MatTableDataSource } from '@angular/material/table';
3333
import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service';
34+
import { AmritTrackingService } from 'Common-UI/src/tracking';
3435

3536
@Component({
3637
selector: 'app-sub-store-indent-order-worklist',
@@ -60,6 +61,7 @@ export class SubStoreIndentOrderWorklistComponent implements OnInit, DoCheck {
6061
private confirmationService: ConfirmationService,
6162
private dataStorageService: DataStorageService,
6263
readonly sessionstorage:SessionStorageService,
64+
private trackingService: AmritTrackingService
6365
) {}
6466

6567
ngOnInit() {
@@ -141,4 +143,8 @@ export class SubStoreIndentOrderWorklistComponent implements OnInit, DoCheck {
141143
this.currentLanguageSet = this.languageComponent.currentLanguageObject;
142144
}
143145
// -----End------
146+
147+
trackFieldInteraction(fieldName: string) {
148+
this.trackingService.trackFieldInteraction(fieldName, 'Sub Store Indent Order Worklist');
149+
}
144150
}

‎src/app/app-modules/inventory/medicine-dispense/medicine-dispense.component.html‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ <h4 class="inline-block" style="font-size: larger">
1111
class="pull-right button-full-width m-l-5"
1212
type="button"
1313
color="primary"
14-
(click)="openSearchDialog()"
14+
(click)="openSearchDialog(); trackFieldInteraction('Advance Search Button')"
1515
>
1616
{{ currentLanguageSet?.bendetails?.advanceSearch }}
1717
</button>
@@ -21,6 +21,7 @@ <h4 class="inline-block" style="font-size: larger">
2121
type="button"
2222
color="primary"
2323
routerLink="View"
24+
(click)="trackFieldInteraction('Previous Records Button')"
2425
>
2526
{{ currentLanguageSet?.inventory?.previousRecords }}
2627
</button>
@@ -44,6 +45,7 @@ <h4 class="inline-block" style="font-size: larger">
4445
id="beneficiaryID"
4546
formControlName="beneficiaryID"
4647
(keyup)="checkBeneficiary()"
48+
(focus)="trackFieldInteraction('Beneficiary ID')"
4749
/>
4850
</mat-form-field>
4951
</div>
@@ -61,6 +63,9 @@ <h4 class="inline-block" style="font-size: larger">
6163
!beneficiaryDetailForm.get('beneficiaryID')?.value
6264
"
6365
(selectionChange)="getVisitDetail()"
66+
(selectionChange)="
67+
trackFieldInteraction('Visit Code')
68+
"
6469
>
6570
<mat-option
6671
*ngFor="let visit of beneficiaryDetail"
@@ -83,6 +88,7 @@ <h4 class="inline-block" style="font-size: larger">
8388
autocomplete="off"
8489
formControlName="visitDate"
8590
[readonly]="true"
91+
(focus)="trackFieldInteraction('Visit Date')"
8692
/>
8793
<mat-datepicker-toggle
8894
matPrefix
@@ -104,6 +110,7 @@ <h4 class="inline-block" style="font-size: larger">
104110
id="beneficiaryName"
105111
formControlName="beneficiaryName"
106112
[readonly]="true"
113+
(focus)="trackFieldInteraction('Patient Name')"
107114
/>
108115
</mat-form-field>
109116
</div>
@@ -118,6 +125,7 @@ <h4 class="inline-block" style="font-size: larger">
118125
id="beneficiaryAge"
119126
formControlName="beneficiaryAge"
120127
[readonly]="true"
128+
(focus)="trackFieldInteraction('Age')"
121129
/>
122130
</mat-form-field>
123131
</div>
@@ -134,6 +142,7 @@ <h4 class="inline-block" style="font-size: larger">
134142
id="genderName"
135143
formControlName="genderName"
136144
[readonly]="true"
145+
(focus)="trackFieldInteraction('Gender')"
137146
/>
138147
</mat-form-field>
139148
</div>
@@ -150,6 +159,7 @@ <h4 class="inline-block" style="font-size: larger">
150159
id="doctorName"
151160
formControlName="doctorName"
152161
[readonly]="true"
162+
(focus)="trackFieldInteraction('Doctor Name')"
153163
/>
154164
</mat-form-field>
155165
</div>
@@ -167,6 +177,7 @@ <h4 class="inline-block" style="font-size: larger">
167177
formControlName="reference"
168178
maxlength="50"
169179
[readonly]="!dateBool"
180+
(focus)="trackFieldInteraction('Remarks')"
170181
/>
171182
</mat-form-field>
172183
</div>
@@ -182,6 +193,7 @@ <h4 class="inline-block" style="font-size: larger">
182193
formControlName="medicineDispenseType"
183194
[disabled]="!beneficiaryDetailForm.get('visitCode')?.value"
184195
(change)="getBeneficiaryDetail()"
196+
(change)="trackFieldInteraction('Type of Dispense')"
185197
>
186198
<mat-radio-button
187199
color="primary"

‎src/app/app-modules/inventory/medicine-dispense/medicine-dispense.component.ts‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import { LanguageService } from '../../core/services/language.service';
2828
import { MatDialog, MatDialogRef } from '@angular/material/dialog';
2929
import { SearchComponent } from '../../core/components/search/search.component';
3030
import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service';
31+
import { AmritTrackingService } from 'Common-UI/src/tracking';
3132

3233
@Component({
3334
selector: 'app-medicine-dispense',
@@ -49,7 +50,8 @@ export class MedicineDispenseComponent implements OnInit, OnDestroy, DoCheck {
4950
private inventoryService: InventoryService,
5051
public http_service: LanguageService,
5152
private dialog: MatDialog,
52-
readonly sessionstorage:SessionStorageService,
53+
readonly sessionstorage: SessionStorageService,
54+
private trackingService: AmritTrackingService
5355
) {}
5456

5557
ngOnInit() {
@@ -316,4 +318,8 @@ export class MedicineDispenseComponent implements OnInit, OnDestroy, DoCheck {
316318
this.currentLanguageSet = this.languageComponent.currentLanguageObject;
317319
}
318320
// -----End------
321+
322+
trackFieldInteraction(fieldName: string) {
323+
this.trackingService.trackFieldInteraction(fieldName, 'Medicine Dispense');
324+
}
319325
}

‎src/app/app-modules/inventory/patient-return/patient-return.component.html‎

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ <h4 style="font-size: larger">
1616
type="button"
1717
color="primary"
1818
routerLink="previousRecord"
19+
(click)="trackFieldInteraction('Previous Records Button')"
1920
>
2021
{{ currentLanguageSet?.inventory?.previousRecords }}
2122
</button>
@@ -24,9 +25,7 @@ <h4 style="font-size: larger">
2425

2526
<div class="row m-t-10">
2627
<div class="col-xs-12 col-sm-6 col-md-4 col-lg-3" *ngIf="!benSelected">
27-
<mat-form-field
28-
class="input-full-width "
29-
>
28+
<mat-form-field class="input-full-width">
3029
<mat-label>{{
3130
currentLanguageSet?.inventory?.beneficiaryIDPhoneNumber
3231
}}</mat-label>
@@ -38,6 +37,7 @@ <h4 style="font-size: larger">
3837
name="beneficiaryIDOrPhoneNumber"
3938
formControlName="beneficiaryIDOrPhoneNumber"
4039
(keyup.enter)="identityQuickSearch(beneficiaryIDOrPhoneNumber)"
40+
(focus)="trackFieldInteraction('Beneficiary ID / Phone Number')"
4141
/>
4242
<mat-icon
4343
class="search-btn"
@@ -54,9 +54,7 @@ <h4 style="font-size: larger">
5454
style="display: flex; gap: 10px; margin-top: 30px"
5555
>
5656
<div class="col-xs-12 col-sm-4 col-md-4 col-lg-3 box">
57-
<mat-form-field
58-
class="input-full-width "
59-
>
57+
<mat-form-field class="input-full-width">
6058
<mat-label>{{
6159
currentLanguageSet?.bendetails?.beneficiaryID
6260
}}</mat-label>
@@ -71,9 +69,7 @@ <h4 style="font-size: larger">
7169
</mat-form-field>
7270
</div>
7371
<div class="col-xs-12 col-sm-4 col-md-4 col-lg-3 box">
74-
<mat-form-field
75-
class="input-full-width "
76-
>
72+
<mat-form-field class="input-full-width">
7773
<mat-label>{{
7874
currentLanguageSet?.bendetails?.beneficiaryName
7975
}}</mat-label>
@@ -88,9 +84,7 @@ <h4 style="font-size: larger">
8884
</mat-form-field>
8985
</div>
9086
<div class="col-xs-12 col-sm-4 col-md-4 col-lg-3 box">
91-
<mat-form-field
92-
class="input-full-width "
93-
>
87+
<mat-form-field class="input-full-width">
9488
<mat-label>
9589
{{ currentLanguageSet?.bendetails?.age }}
9690
</mat-label>
@@ -105,9 +99,7 @@ <h4 style="font-size: larger">
10599
</mat-form-field>
106100
</div>
107101
<div class="col-xs-12 col-sm-4 col-md-4 col-lg-3 box">
108-
<mat-form-field
109-
class="input-full-width "
110-
>
102+
<mat-form-field class="input-full-width">
111103
<mat-label>{{ currentLanguageSet?.bendetails?.gender }}</mat-label>
112104
<input
113105
autocomplete="off"

‎src/app/app-modules/inventory/patient-return/patient-return.component.ts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import { MatDialog, MatDialogRef } from '@angular/material/dialog';
2828
import { LanguageService } from '../../core/services/language.service';
2929
import { BenificiaryDetailsComponent } from './benificiary-details/benificiary-details.component';
3030
import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service';
31+
import { AmritTrackingService } from 'Common-UI/src/tracking';
3132

3233
@Component({
3334
selector: 'app-patient-return',
@@ -53,6 +54,7 @@ export class PatientReturnComponent implements OnInit, DoCheck {
5354
private inventoryService: InventoryService,
5455
private confirmationService: ConfirmationService,
5556
readonly sessionstorage:SessionStorageService,
57+
private trackingService: AmritTrackingService
5658
) {}
5759

5860
ngOnInit() {
@@ -216,4 +218,8 @@ export class PatientReturnComponent implements OnInit, DoCheck {
216218
this.currentLanguageSet = this.languageComponent.currentLanguageObject;
217219
}
218220
//--End--
221+
222+
trackFieldInteraction(fieldName: string) {
223+
this.trackingService.trackFieldInteraction(fieldName, 'Patient Return');
224+
}
219225
}

0 commit comments

Comments
 (0)