feat(stoptb): bulk user upload fixes, Stop TB team in Work Location Mapping and Min Stock in Item Master

pom.xml

@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.iemr.admin-ui</groupId>
   <artifactId>admin-ui</artifactId>
-  <version>3.8.2</version>
+  <version>3.12.0</version>
   <name>Admin-UI</name>
   <description>Piramal - admin: Module ui</description>
 

src/app/app-provider-admin/provider-admin/activities/activities.module.ts

@@ -1,5 +1,6 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { ScrollingModule } from '@angular/cdk/scrolling';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { ProviderAdminRoleService } from './services/state-serviceline-role.service';
 import { MaterialModule } from 'src/app/core/material.module';
@@ -25,6 +26,7 @@ import { RoleMasterComponent } from './role-master/provider-admin-role-master.co
 import { ServicelineCdssMappingComponent } from './serviceline-cdss-mapping/servicelineCdssMapping.component';
 import { SpecialistMappingComponent } from './specialist-mapping/specialist-mapping.component';
 import { WorkLocationMappingComponent } from './work-location-mapping/work-location-mapping.component';
+import { FastBulkSelectDirective } from './work-location-mapping/fast-bulk-select.directive';
 import { UserFacilityMappingComponent } from './work-location-mapping/user-facility-mapping/user-facility-mapping.component';
 import { VillageMasterService } from 'src/app/core/services/adminServices/AdminVillage/village-master-service.service';
 import { CommonServices } from 'src/app/core/services/inventory-services/commonServices';
@@ -123,6 +125,7 @@ import { CoreModule } from 'src/app/core/core.module';
     InstituteDirectoryMasterComponent,
     EditInstituteDirectoryComponent,
     WorkLocationMappingComponent,
+    FastBulkSelectDirective,
     FeedbackComplaintNatureMasterComponent,
     EditFeedbackNatureModalComponent,
     NatureOfComplaintCategoryMappingComponent,
@@ -161,6 +164,7 @@ import { CoreModule } from 'src/app/core/core.module';
   ],
   imports: [
     CommonModule,
+    ScrollingModule,
     MaterialModule,
     FormsModule,
     ReactiveFormsModule,

src/app/app-provider-admin/provider-admin/activities/employee-master-bulk-upload/employee-master-bulk-upload.component.html

@@ -56,6 +56,12 @@ <h4>Bulk User Upload</h4>
         <span class="help-block" *ngIf="error2"
           >File size should not exceed {{ maxFileSize }}MB</span
         >
+        <div class="m-t-10" style="margin-left: 60px" *ngIf="pendingXml">
+          <span
+            >{{ pendingFileName }}: {{ pendingRowCount }} user(s) ready.
+            Click Submit to upload.</span
+          >
+        </div>
       </div>
       <div class="m-t-20" style="margin-left: 60px; margin-bottom: 20px">
         <span class="help-block" *ngIf="successcount" style="color: green"
@@ -76,6 +82,17 @@ <h4>Bulk User Upload</h4>
           Back
         </button>
       </div>
+      <div class="col-md-3" *ngIf="showUpload">
+        <button
+          mat-raised-button
+          color="primary"
+          class="mat_blue"
+          [disabled]="!pendingXml || showProgressBar"
+          (click)="submitUpload()"
+        >
+          Submit
+        </button>
+      </div>
     </div>
   </div>
 </div>

src/app/app-provider-admin/provider-admin/activities/employee-master-bulk-upload/employee-master-bulk-upload.component.ts

@@ -22,6 +22,8 @@
 })
 export class EmployeeMasterBulkUploadComponent {
   @Output() closeUpload = new EventEmitter<void>();
+  // Emitted after users are created, so the user list can reload.
+  @Output() usersUploaded = new EventEmitter<void>();
   objs = new MatTableDataSource<any>();
 
   paginator!: MatPaginator;
@@ -56,6 +58,10 @@
   fileuploadedCount = 0;
   filetotalCount = 0;
   errorloglist: any;
+  // File checked and ready, waiting for Submit.
+  pendingXml: string | null = null;
+  pendingFileName = '';
+  pendingRowCount = 0;
 
   tableMode = true;
   editMode = false;
@@ -68,7 +74,7 @@
     private location: Location,
   ) {}
 
   ngOnInit() {
     this.userID = this.dataService.uid;
     const servicelines = this.dataService.userPriveliges;
 
@@ -128,57 +134,85 @@
       const wb: XLSX.WorkBook = XLSX.read(binarystr, { type: 'binary' });
       const wsname: string = wb.SheetNames[0];
       const ws: XLSX.WorkSheet = wb.Sheets[wsname];
+      const header: any[] =
+        (XLSX.utils.sheet_to_json(ws, { header: 1 })[0] as any[]) || [];
+      if (!header.includes('EmployeeId')) {
+        this.alertService.alert(
+          'Employee Id column is missing. Download the latest Bulk User Template and fill Employee Id for every user.',
+          'error',
+        );
+        this.clearSelection();
+        return;
+      }
       const data = XLSX.utils.sheet_to_json(ws);
+      if (!data.length) {
+        this.alertService.alert('The file has no users to upload', 'error');
+        this.clearSelection();
+        return;
+      }
+      // Checked and ready; the upload starts on Submit.
+      this.pendingXml = this.convertJsonToXml(data);
+      this.pendingFileName = file.name;
+      this.pendingRowCount = data.length;
+      this.successcount = false;
+      this.errorloglist = null;
+    };
+  }
 
-      const xmlData = this.convertJsonToXml(data);
-
-      this.showProgressBar = true;
-      this.blockSubcenterMappingService.memberBulkUploadXML(xmlData).subscribe(
+  submitUpload() {
+    if (!this.pendingXml || this.showProgressBar) return;
+    this.showProgressBar = true;
+    this.blockSubcenterMappingService
+      .memberBulkUploadXML(this.pendingXml)
+      .subscribe(
         (response: any) => {
-          if (response) {
-            this.fileuploadedCount = response.registeredUser;
-            this.filetotalCount = response.totalUser;
-
-            if (
-              Number(this.fileuploadedCount) !== Number(this.filetotalCount)
-            ) {
-              this.downloadFile();
-            }
-            this.showProgressBar = false;
-            this.alertService.alert('File Uploaded', 'success');
-
-            this.resetFileInput();
-            this.file = undefined;
-            this.successcount = true;
-
-            this.errorloglist = response.error;
-          } else {
-            this.showProgressBar = false;
-            this.alertService.alert(response.errorMessage, 'error');
+          this.showProgressBar = false;
+          if (!response || response.totalUser === undefined) {
+            this.alertService.alert(
+              response?.errorMessage || 'Upload failed',
+              'error',
+            );
+            return;
+          }
+          this.fileuploadedCount = response.registeredUser;
+          this.filetotalCount = response.totalUser;
+          if (Number(this.fileuploadedCount) !== Number(this.filetotalCount)) {
+            this.downloadFile();
+          }
+          this.alertService.alert('File Uploaded', 'success');
+          this.successcount = true;
+          this.errorloglist = response.error;
+          this.clearSelection();
+          if (Number(this.fileuploadedCount) > 0) {
+            this.usersUploaded.emit();
           }
         },
         (error: HttpErrorResponse) => {
+          this.showProgressBar = false;
           if (
             !navigator.onLine ||
             (error.status === 0 && error.error instanceof ProgressEvent)
           ) {
-            this.showProgressBar = false;
             this.alertService.alert(
               'Internet connection not available!',
               'error',
             );
+          } else {
+            this.alertService.alert(
+              error?.error?.errorMessage || 'Upload failed',
+              'error',
+            );
           }
         },
       );
-      (err: any) => {
-        this.showProgressBar = false;
-        this.alertService.alert(err.errorMessage, 'error');
-        this.resetFileInput();
-        this.file = undefined;
-        this.fileContent = null;
-        this.disableUpload = true;
-      };
-    };
+  }
+
+  clearSelection() {
+    this.pendingXml = null;
+    this.pendingFileName = '';
+    this.pendingRowCount = 0;
+    this.file = undefined;
+    this.resetFileInput();
   }
 
   convertJsonToXml(json: any): string {
@@ -231,6 +265,10 @@
   }
 
   back() {
+    if (!this.pendingXml) {
+      this.closeUpload.emit();
+      return;
+    }
     this.alertService
       .confirm(
         'confirm',

src/app/app-provider-admin/provider-admin/activities/employee-master-new/employee-master-new.component.html

@@ -1219,6 +1219,9 @@ <h4 class="pull-left">Permanent Address</h4>
     </div>
   </div>
   <div *ngIf="employeeMasterUpload">
-    <app-employee-master-bulk-upload (closeUpload)="closeBulkUpload()"></app-employee-master-bulk-upload>
+    <app-employee-master-bulk-upload
+      (closeUpload)="closeBulkUpload()"
+      (usersUploaded)="getAllUserDetails()"
+    ></app-employee-master-bulk-upload>
   </div>
 </div>

src/app/app-provider-admin/provider-admin/activities/employee-master-new/employee-master-new.component.ts

@@ -1616,16 +1616,34 @@ export class EmployeeMasterNewComponent implements OnInit {
             this.employeeMasterNewService
               .userActivationDeactivation(obj)
               .subscribe(
-                (res) => {
-                  console.log('Activation or deactivation response', res.data);
+                (res: any) => {
+                  if (res?.statusCode !== 200) {
+                    this.dialogService.alert(
+                      res?.errorMessage ||
+                        'Failed to ' +
+                          this.confirmMessage.toLowerCase() +
+                          ' the user',
+                      'error',
+                    );
+                    return;
+                  }
                   this.dialogService.alert(
                     this.confirmMessage + 'd successfully',
                     'success',
                   );
                   this.getAllUserDetails();
                   this.searchTerm = null;
                 },
-                (err) => console.log('error', err),
+                (err: any) => {
+                  console.log('error', err);
+                  this.dialogService.alert(
+                    err?.errorMessage ||
+                      'Failed to ' +
+                        this.confirmMessage.toLowerCase() +
+                        ' the user',
+                    'error',
+                  );
+                },
               );
           }
         },
@@ -1770,6 +1788,8 @@ export class EmployeeMasterNewComponent implements OnInit {
     this.employeeMasterUpload = false;
     this.tableMode = true;
     this.formMode = false;
+    // Show users created by the upload.
+    this.getAllUserDetails();
   }
 
   private refreshFilteredData(rows: any[]) {

src/app/app-provider-admin/provider-admin/activities/services/work-location-mapping.service.ts

@@ -21,9 +21,18 @@
  */
 import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
+import { forkJoin, of } from 'rxjs';
+import { map } from 'rxjs/operators';
 import { ConfigService } from 'src/app/core/services/config/config.service';
 import { environment } from 'src/environments/environment';
 
+// A "select all" facility pick (e.g. every facility under several Nikshay
+// TUs) can put 1000+ IDs on this GET's query string, which blows past the
+// server/proxy request-line limit (~8KB) and comes back as a 400. The
+// backend only exposes a comma-separated-param GET (no POST/body variant),
+// so batch client-side instead of widening a single request.
+const NIKSHAY_VILLAGES_BATCH_SIZE = 200;
+
 /**
  * Author: krishna Gunti ( 378952 )
  * Date: 05-03-2018
@@ -152,8 +161,29 @@ export class WorkLocationMapping {
   }
 
   getNikshayVillages(facilityIDs: any[]) {
-    return this.http.get(
-      `${environment.nikshayVillages_url}?facilityIDs=${facilityIDs.join(',')}`,
+    const ids = (facilityIDs || []).filter(
+      (id) => id !== null && id !== undefined,
+    );
+    if (!ids.length) {
+      return of({ data: [] });
+    }
+    const chunks: any[][] = [];
+    for (let i = 0; i < ids.length; i += NIKSHAY_VILLAGES_BATCH_SIZE) {
+      chunks.push(ids.slice(i, i + NIKSHAY_VILLAGES_BATCH_SIZE));
+    }
+    return forkJoin(
+      chunks.map((chunk) =>
+        this.http.get(
+          `${environment.nikshayVillages_url}?facilityIDs=${chunk.join(',')}`,
+        ),
+      ),
+    ).pipe(
+      map((responses: any[]) => ({
+        data: responses.reduce(
+          (acc: any[], r: any) => acc.concat(r?.data || []),
+          [],
+        ),
+      })),
     );
   }
 
@@ -166,4 +196,23 @@ export class WorkLocationMapping {
       `${environment.nikshayUserMapping_url}?usrMappingID=${usrMappingID}`,
     );
   }
+
+  // Stop TB teams are the MMU vans of the user's state (AMM-2496).
+  getStopTBTeams(stateID: any, serviceProviderID: any) {
+    return this.http.get(
+      `${environment.stopTBTeams_url}?stateID=${stateID}&serviceProviderID=${serviceProviderID}`,
+    );
+  }
+
+  getStopTBUserTeam(userID: any, providerServiceMapID: any) {
+    return this.http.get(
+      `${environment.stopTBUserTeam_url}?userID=${userID}&providerServiceMapID=${providerServiceMapID}`,
+    );
+  }
+
+  getStopTBTeamMembers(vanID: any, providerServiceMapID: any) {
+    return this.http.get(
+      `${environment.stopTBTeamMembers_url}?vanID=${vanID}&providerServiceMapID=${providerServiceMapID}`,
+    );
+  }
 }