Release 3.8.2 to main

pom.xml

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

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

@@ -89,7 +89,7 @@ <h4>Employee Master</h4>
             <th mat-header-cell *matHeaderCellDef>Lock/Unlock</th>
             <td mat-cell *matCellDef="let element">
               <button
-                *ngIf="element.lockedDueToFailedAttempts && element.deleted !== true"
+                *ngIf="element.lockedDueToFailedAttempts"
                 mat-raised-button
                 color="accent"
                 class="mat_green"
@@ -109,14 +109,14 @@ <h4>Employee Master</h4>
                 Lock
               </button>
               <button
-                *ngIf="element.deleted === true"
+                *ngIf="element.deleted === true && !element.lockedDueToFailedAttempts"
                 mat-raised-button
                 class="mat_blue"
                 color="primary"
                 disabled
                 matTooltip="Activate the account before changing lock status"
               >
-                {{ element.lockedDueToFailedAttempts ? 'Unlock' : 'Lock' }}
+                Lock
               </button>
             </td>
           </ng-container>

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

@@ -127,4 +127,43 @@ export class WorkLocationMapping {
   getTaluks(districtId: number) {
     return this.http.get(environment._getTalukListURL + districtId);
   }
+
+  // Nikshay location master (Stop TB) — read-only cascading lookups
+  getNikshayStates() {
+    return this.http.get(environment.nikshayStates_url);
+  }
+
+  getNikshayDistricts(stateID: any) {
+    return this.http.get(
+      `${environment.nikshayDistricts_url}?stateID=${stateID}`,
+    );
+  }
+
+  getNikshayTUs(districtID: any) {
+    return this.http.get(
+      `${environment.nikshayTUs_url}?districtID=${districtID}`,
+    );
+  }
+
+  getNikshayFacilities(tuIDs: any[]) {
+    return this.http.get(
+      `${environment.nikshayFacilities_url}?tuIDs=${tuIDs.join(',')}`,
+    );
+  }
+
+  getNikshayVillages(facilityIDs: any[]) {
+    return this.http.get(
+      `${environment.nikshayVillages_url}?facilityIDs=${facilityIDs.join(',')}`,
+    );
+  }
+
+  // Stop TB Edit: v_userservicerolemapping (backing mappedWorkLocationsList)
+  // never exposes DistrictID/NikshayTUID/NikshayFacilityID, so Edit can't
+  // read back what was saved from that list alone — this reads the raw
+  // table directly for just those fields, by USRMappingID.
+  getNikshayUserMappingData(usrMappingID: any) {
+    return this.http.get(
+      `${environment.nikshayUserMapping_url}?usrMappingID=${usrMappingID}`,
+    );
+  }
 }

src/app/app-provider-admin/provider-admin/activities/work-location-mapping/work-location-mapping.component.css

@@ -6,6 +6,21 @@
     }
 }
 
+/* Village list cell in the mapping tables — long comma-joined village
+   lists (esp. Stop TB's) get their own fixed-width horizontal scroll
+   instead of stretching the row height or the whole table width, so the
+   rest of the columns (Edit/Deactivate etc.) stay on screen. */
+.village-cell-scroll {
+  max-width: 260px;
+  overflow-x: auto;
+  white-space: nowrap;
+  cursor: grab;
+}
+
+.village-cell-scroll:active {
+  cursor: grabbing;
+}
+
 .role-chip {
   display: inline-block;
   padding: 2px 10px;