Merge remote-tracking branch 'origin/dev' into dev

src/app/tasks/checker-inbox-and-tasks-tabs/share-withdrawal-requests/share-withdrawal-requests.component.html

@@ -0,0 +1,86 @@
+<!--
+  Copyright since 2025 Mifos Initiative
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-->
+
+<div class="pg-card">
+  <div class="pos-section-label">Share Withdrawal Requests — Review, Approve or Reject</div>
+  <div class="inv-form-grid" style="padding: 12px 16px">
+    <label class="inv-form-field">
+      <span>Status</span>
+      <select [(ngModel)]="filterStatus" (change)="onFilterChange()">
+        @for (opt of statusOptions; track opt.value) {
+          <option [value]="opt.value">{{ opt.label }}</option>
+        }
+      </select>
+    </label>
+    <label class="inv-form-field" style="align-self: end">
+      <button type="button" class="pg-btn pg-btn--ghost" [disabled]="loading" (click)="load()">Refresh</button>
+    </label>
+  </div>
+  <table class="pg-table">
+    <thead>
+      <tr>
+        <th>Account No</th>
+        <th>Client</th>
+        <th class="num">Shares</th>
+        <th>Resolution No.</th>
+        <th>Meeting Date</th>
+        <th>Clerk</th>
+        <th>Manager</th>
+        <th>Submitted At</th>
+        <th>Status</th>
+        <th></th>
+      </tr>
+    </thead>
+    <tbody>
+      @if (loading) {
+        <tr>
+          <td colspan="10" class="pg-empty">Loading…</td>
+        </tr>
+      } @else if (loaded && requests.length === 0) {
+        <tr>
+          <td colspan="10" class="pg-empty">No {{ filterStatus | lowercase }} share withdrawal requests.</td>
+        </tr>
+      } @else {
+        @for (r of requests; track r.id) {
+          <tr>
+            <td>
+              <span class="pg-chip">{{ r.account_no }}</span>
+            </td>
+            <td>{{ r.client_name }}</td>
+            <td class="num">{{ r.requested_shares }}</td>
+            <td>{{ r.resolution_number }}</td>
+            <td>{{ formatDateTime(r.meeting_date) }}</td>
+            <td>{{ r.clerk_name }}</td>
+            <td>{{ r.manager_name || r.manager_username || '—' }}</td>
+            <td>{{ formatDateTime(r.submitted_at) }}</td>
+            <td>
+              <span [class]="statusClass(r.status)">{{ statusLabel(r.status) }}</span>
+            </td>
+            <td>
+              <button type="button" class="pg-btn pg-btn--ghost" (click)="review(r)">Review</button>
+            </td>
+          </tr>
+        }
+      }
+    </tbody>
+  </table>
+</div>
+
+@if (showReviewModal && reviewRequestId) {
+  <div class="swr-list-popup-backdrop" (click)="closeReviewModal()">
+    <div class="swr-list-popup-panel" (click)="$event.stopPropagation()">
+      <mifosx-share-withdrawal-request
+        [embedded]="true"
+        [overrideMode]="'review'"
+        [overrideRequestId]="reviewRequestId"
+        (closeRequested)="closeReviewModal()"
+        (actionCompleted)="onReviewActionCompleted()"
+      ></mifosx-share-withdrawal-request>
+    </div>
+  </div>
+}

src/app/tasks/checker-inbox-and-tasks-tabs/share-withdrawal-requests/share-withdrawal-requests.component.scss

@@ -0,0 +1,64 @@
+/**
+ * Copyright since 2025 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+@keyframes swr-list-popup-fade {
+  from {
+    opacity: 0;
+  }
+
+  to {
+    opacity: 1;
+  }
+}
+
+@keyframes swr-list-popup-zoom {
+  from {
+    opacity: 0;
+    transform: scale(0.97) translateY(10px);
+  }
+
+  to {
+    opacity: 1;
+    transform: scale(1) translateY(0);
+  }
+}
+
+.swr-list-popup-backdrop {
+  position: fixed;
+  inset: 0;
+  // No backdrop-filter here: filter/backdrop-filter on an ancestor makes browsers treat it as a new
+  // containing block for `position: fixed` descendants — the embedded review screen inside this popup
+  // renders its OWN fixed-position dialogs (Validate, Reject, Confirm-Submit), which would then be
+  // confined to this backdrop's box instead of the real viewport. Extra opacity on the background
+  // color compensates for the loss of the blur look.
+  background: rgb(15 25 45 / 65%);
+  z-index: 1100;
+  display: flex;
+  align-items: flex-start;
+  justify-content: center;
+  padding: 32px 20px;
+  overflow-y: auto;
+  animation: swr-list-popup-fade 0.2s ease-out;
+}
+
+.swr-list-popup-panel {
+  background: #f7f9fc;
+  border-radius: 16px;
+  width: 100%;
+  max-width: 1100px;
+  box-shadow: 0 24px 60px rgb(0 0 0 / 25%);
+  animation: swr-list-popup-zoom 0.25s ease-out;
+  padding: 4px;
+}
+
+@media (prefers-reduced-motion: reduce) {
+  .swr-list-popup-backdrop,
+  .swr-list-popup-panel {
+    animation: none;
+  }
+}

src/app/tasks/checker-inbox-and-tasks-tabs/share-withdrawal-requests/share-withdrawal-requests.component.ts

@@ -0,0 +1,128 @@
+/**
+ * Copyright since 2025 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+import { Component, OnInit, inject } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+import { catchError } from 'rxjs/operators';
+import { of } from 'rxjs';
+
+import { ClerkShareWithdrawalService } from '../../../cashier/clerk-share-withdrawal.service';
+import { ShareWithdrawalRequestComponent } from '../../../clerk/share-withdrawal-request/share-withdrawal-request.component';
+
+/** Approval Center — Share Withdrawal Requests tab. A Bank Manager (checker) reviews, approves
+ *  or rejects share withdrawal requests submitted from the Clerk Dashboard. Mirrors
+ *  WithdrawalRequestsComponent (cash withdrawal), adapted for shares. Clicking "Review" opens the
+ *  review screen in a popup on top of this list, rather than navigating away, so approving/rejecting
+ *  drops the manager straight back into the (now refreshed) list. */
+@Component({
+  selector: 'mifosx-share-withdrawal-requests',
+  templateUrl: './share-withdrawal-requests.component.html',
+  styleUrls: [
+    '../../../cashier/cashier-shared.scss',
+    '../../../clerk/clerk-shared.scss',
+    './share-withdrawal-requests.component.scss'
+  ],
+  standalone: true,
+  imports: [
+    CommonModule,
+    FormsModule,
+    ShareWithdrawalRequestComponent
+  ]
+})
+export class ShareWithdrawalRequestsComponent implements OnInit {
+  private service = inject(ClerkShareWithdrawalService);
+
+  requests: any[] = [];
+  totalRecords = 0;
+  loading = false;
+  loaded = false;
+
+  filterStatus = 'PENDING';
+
+  showReviewModal = false;
+  reviewRequestId: number | null = null;
+
+  get statusOptions(): { value: string; label: string }[] {
+    return [
+      { value: 'PENDING', label: 'Pending' },
+      { value: 'APPROVED', label: 'Approved' },
+      { value: 'REJECTED', label: 'Rejected' }
+    ];
+  }
+
+  ngOnInit(): void {
+    this.load();
+  }
+
+  load(): void {
+    this.loading = true;
+    this.service
+      .getPendingRequests(this.filterStatus, 0, 50)
+      .pipe(catchError(() => of({ pageItems: [], totalFilteredRecords: 0 })))
+      .subscribe((res: any) => {
+        this.requests = res?.pageItems ?? [];
+        this.totalRecords = Number(res?.totalFilteredRecords ?? 0);
+        this.loading = false;
+        this.loaded = true;
+      });
+  }
+
+  onFilterChange(): void {
+    this.load();
+  }
+
+  review(req: any): void {
+    this.reviewRequestId = req.id;
+    this.showReviewModal = true;
+  }
+
+  closeReviewModal(): void {
+    this.showReviewModal = false;
+    this.reviewRequestId = null;
+  }
+
+  onReviewActionCompleted(): void {
+    this.closeReviewModal();
+    this.load();
+  }
+
+  statusClass(status: string): string {
+    const map: Record<string, string> = {
+      PENDING: 'inv-badge--active',
+      APPROVED: 'inv-badge--matured',
+      REJECTED: 'inv-badge--written_off'
+    };
+    return `inv-badge ${map[status] ?? ''}`;
+  }
+
+  statusLabel(status: string): string {
+    const map: Record<string, string> = {
+      PENDING: 'Pending',
+      APPROVED: 'Approved',
+      REJECTED: 'Rejected'
+    };
+    return map[status] ?? status;
+  }
+
+  formatDateTime(val: any): string {
+    if (!val) return '—';
+    try {
+      const d = new Date(val);
+      return d.toLocaleString('en-IN', {
+        day: '2-digit',
+        month: 'short',
+        year: 'numeric',
+        hour: '2-digit',
+        minute: '2-digit'
+      });
+    } catch {
+      return String(val);
+    }
+  }
+}

src/app/tasks/checker-inbox-and-tasks/checker-inbox-and-tasks.component.html

@@ -178,6 +178,18 @@
       <fa-icon icon="money-bill-wave" class="ac-tab__ic"></fa-icon>
       <span>Withdrawal Requests</span>
     </a>
+    <a
+      mat-tab-link
+      class="ac-tab"
+      [routerLink]="['./share-withdrawal-requests']"
+      routerLinkActive
+      #shareWithdrawalRequests="routerLinkActive"
+      [active]="shareWithdrawalRequests.isActive"
+      *mifosxHasPermission="'ALL_FUNCTIONS_READ'"
+    >
+      <fa-icon icon="hand-holding-usd" class="ac-tab__ic"></fa-icon>
+      <span>Share Withdrawal Requests</span>
+    </a>
     <a
       mat-tab-link
       class="ac-tab"

src/app/tasks/tasks-routing.module.ts

@@ -17,6 +17,7 @@ import { Route } from '../core/route/route.service';
 import { CheckerInboxAndTasksComponent } from './checker-inbox-and-tasks/checker-inbox-and-tasks.component';
 import { CheckerInboxComponent } from './checker-inbox-and-tasks-tabs/checker-inbox/checker-inbox.component';
 import { WithdrawalRequestsComponent } from './checker-inbox-and-tasks-tabs/withdrawal-requests/withdrawal-requests.component';
+import { ShareWithdrawalRequestsComponent } from './checker-inbox-and-tasks-tabs/share-withdrawal-requests/share-withdrawal-requests.component';
 import { DepositRequestsComponent } from './checker-inbox-and-tasks-tabs/deposit-requests/deposit-requests.component';
 import { DisbursementRequestsComponent } from './checker-inbox-and-tasks-tabs/disbursement-requests/disbursement-requests.component';
 import { ClientApprovalComponent } from './checker-inbox-and-tasks-tabs/client-approval/client-approval.component';
@@ -159,6 +160,11 @@ const routes: Routes = [
           component: WithdrawalRequestsComponent,
           data: { title: 'Withdrawal Requests' }
         },
+        {
+          path: 'share-withdrawal-requests',
+          component: ShareWithdrawalRequestsComponent,
+          data: { title: 'Share Withdrawal Requests' }
+        },
         {
           path: 'deposit-requests',
           component: DepositRequestsComponent,
@@ -200,6 +206,19 @@ const routes: Routes = [
         }
       ]
     },
+    {
+      path: 'checker-inbox-and-tasks/share-withdrawal-requests',
+      children: [
+        {
+          path: ':id/review',
+          loadComponent: () =>
+            import('../clerk/share-withdrawal-request/share-withdrawal-request.component').then(
+              (m) => m.ShareWithdrawalRequestComponent
+            ),
+          data: { title: 'Review Share Withdrawal Request', breadcrumb: 'Review Share Withdrawal', mode: 'review' }
+        }
+      ]
+    },
     {
       path: 'checker-inbox-and-tasks/disbursement-requests',
       children: [