Release 3.6.0 to main

pom.xml

@@ -4,8 +4,8 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.iemr.mmu-ui</groupId>
-	<artifactId>mmu-ui</artifactId>
-	<version>3.4.0</version>
+  <artifactId>mmu-ui</artifactId>
+	<version>3.6.0</version>
 	<name>MMU-UI</name>
 	<description>Piramal - mmu Module ui</description>
 	<packaging>war</packaging>

scripts/ci-prebuild.js

@@ -56,6 +56,10 @@ const defaultEnvValues = {
   SITE_KEY:'',
   CAPTCHA_CHALLENGE_URL:'',
   ENABLE_CAPTCHA: false,
+  SITE_ID: '3',
+  TRACKER_URL: 'https://matomo.piramalswasthya.org/',
+  TRACKING_PLATFORM: 'ci',
+  TRACKING_ENABLED: 'true',
 
 };
 

src/app/app-modules/core/components/app-footer/app-footer.component.html

@@ -1,6 +1,6 @@
 <footer class="footer container-fluid">
   <div class="row">
-    <div class="col-4 text-left">
+    <div class="col-3 text-left">
       <span
         class="footer-text"
         *ngIf="currentLanguageSet === null || currentLanguageSet === undefined"
@@ -12,7 +12,7 @@
         >{{ currentLanguageSet?.coreComponents?.poweredByWipro }}</span
       >
     </div>
-    <div class="col-4 text-center">
+    <div class="col-3 text-center">
       <p
         class="footer-text"
         *ngIf="currentLanguageSet === null || currentLanguageSet === undefined">
@@ -24,7 +24,20 @@
         {{ year }} © {{ currentLanguageSet?.psmri }}
       </p>
     </div>
-    <div class="col-4 text-end">
+    <div
+      class="col-3 text-end"
+      style="cursor: pointer"
+      [routerLink]="['/feedback']"
+      [queryParams]="{ sl: 'MMU' }"
+      role="link">
+      <mat-icon style="vertical-align: top; font-size: medium; margin-right: 2%"
+        >mail</mat-icon
+      >
+      <span class="footer-text"
+        >{{ currentLanguageSet?.platform_feedback?.feedback ?? 'Feedback' }}
+      </span>
+    </div>
+    <div class="col-3 text-end">
       <p class="footer-text">
         <span
           class="footer-text"

src/app/app-modules/core/components/app-header/app-header.component.ts

@@ -192,13 +192,15 @@ export class AppHeaderComponent implements OnInit {
   }
   logout() {
     this.auth.logout().subscribe(res => {
-      this.router.navigate(['/login']).then(result => {
-        if (result) {
-          this.changeLanguage('English');
-          // this.sessionstorage.clear();
-          sessionStorage.clear();
-        }
-      });
+      this.router
+        .navigate(['/feedback'], { queryParams: { sl: 'MMU' } })
+        .then(result => {
+          if (result) {
+            this.changeLanguage('English');
+            // this.sessionstorage.clear();
+            sessionStorage.clear();
+          }
+        });
     });
   }
   rolenavigation() {

src/app/app-modules/core/services/http-interceptor.service.ts

@@ -45,17 +45,28 @@ export class HttpInterceptorService implements HttpInterceptor {
     const key: any = sessionStorage.getItem('key');
     const serverKey = this.sessionstorage.getItem('serverKey');
     let modifiedReq = req;
-    if (req.body instanceof FormData) {
-      modifiedReq = req.clone({
-        headers: req.headers.set('Authorization', key || ''),
-      });
+    const isPlatformFeedback =
+      req.url && req.url.toLowerCase().includes('/platform-feedback');
+
+    if (isPlatformFeedback) {
+      // For platform-feedback: remove Authorization and force JSON content-type
+      const headers = req.headers
+        .delete('Authorization')
+        .set('Content-Type', 'application/json');
+      modifiedReq = req.clone({ headers });
     } else {
-      modifiedReq = req.clone({
-        headers: req.headers
-          .set('Authorization', key || '')
-          .set('Content-Type', 'application/json')
-          .set('ServerAuthorization', serverKey || ''),
-      });
+      if (req.body instanceof FormData) {
+        modifiedReq = req.clone({
+          headers: req.headers.set('Authorization', key || ''),
+        });
+      } else {
+        modifiedReq = req.clone({
+          headers: req.headers
+            .set('Authorization', key || '')
+            .set('Content-Type', 'application/json')
+            .set('ServerAuthorization', serverKey || ''),
+        });
+      }
     }
     return next.handle(modifiedReq).pipe(
       tap((event: HttpEvent<any>) => {

src/app/app-modules/core/services/http-service.service.ts

@@ -22,7 +22,10 @@ export class HttpServiceService {
   constructor(
     private _http: HttpClient,
     private http: HttpClient
-  ) {}
+  ) {
+    const storedLang = localStorage.getItem('appLanguage');
+    this.language = storedLang ? JSON.parse(storedLang) : null;
+  }
 
   fetchLanguageSet() {
     console.log('Here i come');
@@ -32,10 +35,8 @@ export class HttpServiceService {
     return this._http.get(url);
   }
   getCurrentLanguage(response: any) {
-    console.log('here at one', response);
     this.language = response;
-    console.log('teste', this.language);
+    localStorage.setItem('appLanguage', JSON.stringify(response));
     this.appCurrentLanguge.next(response);
-    console.log('here at two', this.appCurrentLanguge.value);
   }
 }

src/app/app-modules/data-sync/workarea/workarea.component.html

@@ -57,8 +57,10 @@
                         <div
                           [ngClass]="{
                             visitStatus: true,
-                            'p-f-c': syncTableGroup.status === 'pending',
-                            'c-d': syncTableGroup.status === 'success',
+                            'p-f-c': syncTableGroup.status === 'partial' ||
+                              syncTableGroup.status === 'pending',
+                            'c-d': syncTableGroup.status === 'completed' ||
+                              syncTableGroup.status === 'success',
                             't-d': syncTableGroup.status === 'failed'
                           }"></div>
                       </td>
@@ -68,16 +70,25 @@
                       <td>
                         <span
                           class="material-icons"
+                          style="color: #0b69b2;"
                           *ngIf="syncTableGroup.status === 'pending'"
                           >hourglass_empty</span
                         >
                         <span
                           class="material-icons"
-                          *ngIf="syncTableGroup.status === 'success'"
+                          style="color: #eaaa26;"
+                          *ngIf="syncTableGroup.status === 'partial'"
+                          >indeterminate_check_box</span
+                        >
+                        <span
+                          class="material-icons"
+                          style="color: #43760f;"
+                          *ngIf="syncTableGroup.status === 'success' || syncTableGroup.status === 'completed'"
                           >check_circle</span
                         >
                         <span
                           class="material-icons"
+                          style="color: #e44e4f;"
                           *ngIf="syncTableGroup.status === 'failed'"
                           >error</span
                         >
@@ -90,9 +101,10 @@
                     <td colspan="3">
                       <ul
                         class="description"
+                        style="display: flex;justify-content: center;"
                         *ngIf="syncTableGroupList.length > 0">
                         <li>
-                          <div class="marker-p-f-c"></div>
+                          <div class="marker-p-f-c" style="margin-right: 4px; margin-top: 4px;"></div>
                           <p>
                             {{
                               current_language_set?.coreComponents
@@ -101,7 +113,25 @@
                           </p>
                         </li>
                         <li>
-                          <div class="marker-c-d"></div>
+                          <div class="marker-t-d" style="margin-right: 4px; margin-top: 4px;"></div>
+                          <p>
+                            {{
+                              current_language_set?.coreComponents
+                                ?.partialDataSync
+                            }}
+                          </p>
+                        </li>
+                        <li>
+                          <div class="marker-p-f-t" style="margin-right: 4px; margin-top: 4px;"></div>
+                          <p>
+                            {{
+                              current_language_set?.coreComponents
+                                ?.errorForDataSync
+                            }}
+                          </p>
+                        </li>
+                        <li>
+                          <div class="marker-c-d" style="margin-right: 4px; margin-top: 4px;"></div>
                           <p>
                             {{
                               current_language_set?.coreComponents?.dataSynced

src/app/app-modules/data-sync/workarea/workarea.component.ts

@@ -48,8 +48,8 @@ export class WorkareaComponent
   generateBenIDForm!: FormGroup;
   current_language_set: any;
   blankTable: any[] = [];
-  showTable: boolean = false;
-  displaySyncBool: boolean = true;
+  showTable = false;
+  displaySyncBool = true;
 
   constructor(
     private router: Router,
@@ -91,6 +91,8 @@ export class WorkareaComponent
 
   getDataSYNCGroup() {
     this.dataSyncService.getDataSYNCGroup().subscribe((res: any) => {
+      console.clear();
+      console.log(res);
       if (res.statusCode === 200) {
         this.syncTableGroupList = this.createSyncActivity(res.data);
         console.log('syncTableGroupList', this.syncTableGroupList);
@@ -228,10 +230,6 @@ export class WorkareaComponent
           if (res.data.groupsProgress) {
             this.updateGroupStatus(res.data.groupsProgress);
           }
-          // Update group status for all groups as 'success'
-          this.syncTableGroupList.forEach((group: any) => {
-            group.status = 'success';
-          });
           this.confirmationService.alert(res.data.response, 'success');
         } else {
           this.confirmationService.alert(res.data.response, 'error');
@@ -253,13 +251,16 @@ export class WorkareaComponent
   updateGroupStatus(groupsProgress: any[]) {
     this.syncTableGroupList.forEach((group: any) => {
       const progress = groupsProgress.find(
-        (item: any) => item.groupId === group.syncTableGroupID
+        (item: any) => item.syncTableGroupID === group.syncTableGroupID
       );
+
       if (progress) {
         if (progress.status === 'completed') {
           group.status = 'success';
         } else if (progress.status === 'failed') {
           group.status = 'failed';
+        } else if (progress.status === 'partial') {
+          group.status = 'partial';
         } else {
           group.status = 'pending';
         }

src/app/app-modules/login/login.component.ts

@@ -34,6 +34,7 @@ import { MasterDownloadComponent } from '../data-sync/master-download/master-dow
 import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service';
 import { environment } from 'src/environments/environment';
 import { CaptchaComponent } from '../captcha/captcha.component';
+import { AmritTrackingService } from 'Common-UI/src/tracking';
 
 @Component({
   selector: 'app-login-cmp',
@@ -64,7 +65,8 @@ export class LoginComponent implements OnInit {
     private authService: AuthService,
     private confirmationService: ConfirmationService,
     private fb: FormBuilder,
-    readonly sessionstorage: SessionStorageService
+    readonly sessionstorage: SessionStorageService,
+    private trackingService: AmritTrackingService
   ) {
     this._keySize = 256;
     this._ivSize = 128;
@@ -153,6 +155,9 @@ export class LoginComponent implements OnInit {
                                       'loginDataResponse',
                                       JSON.stringify(userLoggedIn.data)
                                     );
+                                    this.trackingService.setUserId(
+                                      userLoggedIn.data.userID
+                                    );
                                     this.getServicesAuthdetails(
                                       userLoggedIn.data
                                     );
@@ -250,15 +255,25 @@ export class LoginComponent implements OnInit {
       loginDataResponse.isAuthenticated
     );
     this.sessionstorage.setItem('userID', loginDataResponse.userID);
+    this.trackingService.setUserId(loginDataResponse.userID);
     this.sessionstorage.setItem('userName', loginDataResponse.userName);
     this.sessionstorage.setItem('username', userName);
     this.sessionstorage.setItem('fullName', loginDataResponse.fullName);
+    this.sessionstorage.setItem(
+      'providerServiceMapID',
+      loginDataResponse.previlegeObj[0].providerServiceMapID
+    );
     const services: any = [];
     loginDataResponse.previlegeObj.map((item: any) => {
       if (
         item.roles[0].serviceRoleScreenMappings[0].providerServiceMapping
           .serviceID === 2
       ) {
+        this.sessionstorage.setItem(
+          'currentServiceID',
+          item.roles[0].serviceRoleScreenMappings[0].providerServiceMapping
+            .serviceID
+        );
         const service = {
           providerServiceID: item.serviceID,
           serviceName: item.serviceName,

src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/general-opd-diagnosis/general-opd-diagnosis.component.html

@@ -22,12 +22,15 @@ <h4>{{ current_language_set?.casesheet?.provisionalDiag }}*</h4>
                         (keyup)="onDiagnosisInputKeyup(diagnosisInput.value, i)" />
                     </mat-form-field>
 
-                    <mat-autocomplete #autoDiagnosis="matAutocomplete" autoActiveFirstOption [displayWith]="displayDiagnosis"
-                      (optionSelected)="onDiagnosisSelected($event.option.value, i)">
-                      <mat-option *ngFor="let diag of suggestedDiagnosisList[i]" [value]="diag">
-                        {{ diag.term }}
-                      </mat-option>
-                    </mat-autocomplete>
+                    <mat-autocomplete #autoDiagnosis="matAutocomplete" appAutocompleteScroller [threshold]="0.6"
+                    (nearEnd)="onAutoNearEnd(i)" (panelReady)="onPanelReady(i, $event)" autoActiveFirstOption
+                    [displayWith]="displayDiagnosis" (optionSelected)="onDiagnosisSelected($event.option.value, i)">
+                    <mat-option *ngFor="let diag of suggestedDiagnosisList[i]" [value]="diag">
+                      {{ diag.term }}
+                    </mat-option>
+                    <mat-option *ngIf="loadingMore[i]" disabled>Loading…</mat-option>
+                    <mat-option *ngIf="noMore[i]" disabled>End of results</mat-option>
+                  </mat-autocomplete>
                   </div>
 
             <div class="col-3 m-t-10" style="text-align: end; margin-top: 15px">