Merge pull request #243 from sohailamjad12/bug_fixes_25

Karma Quest Bug fixes
sunbird-cb · Jun 25, 2024 · 6295844 · 6295844
2 parents 8a3e1ca + f7faa73
commit 6295844
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 7 deletions.
diff --git a/project/ws/app/src/lib/routes/home/home.module.ts b/project/ws/app/src/lib/routes/home/home.module.ts
@@ -185,6 +185,7 @@ import { SingleAssignPopupComponent } from './routes/request/single-assign-popup
     PipePublicURLModule,
     ScrollspyLeftMenuModule,
     MatRadioModule,
+    MatTooltipModule,
     // TO-DO need to enable for image crop
     // ImageCropModule,
     NgMultiSelectDropDownModule.forRoot(),

diff --git a/project/ws/app/src/lib/routes/home/routes/request/all-request/all-request.component.html b/project/ws/app/src/lib/routes/home/routes/request/all-request/all-request.component.html
@@ -2,13 +2,13 @@
         <div class="nav-container">
 
             <div class="dashbord-sidenav">
-               <h2>{{'Content Request'}}</h2>
+               <h2>{{'All Request'}}</h2>
                <div class="status-cards">
                 <mat-card class="status-card" *ngFor="let card of statusCards">
                     <div class="card-content">
                       <div class="status-title">
                       <span class="title-text"> {{ card?.value=== statusKey.fullfill ? 'Fulfilled' : card?.value }}</span> 
-                        <mat-icon class="info-icon cursor-pointer" [matTooltip]="card?.message">info</mat-icon>
+                        <mat-icon class="info-icon cursor-pointer" [matTooltip]="card?.message" matTooltipClass="tooltip-sec">info</mat-icon>
                       </div>
                       <div class="status-value">{{ card?.count ? card?.count : 0 }}</div>
                     </div>
@@ -20,6 +20,7 @@ <h2>{{'Content Request'}}</h2>
           <div class="nav-container">
             <div class="sidenav-content">
               <div class="table-class">
+                <ng-container *ngIf="dataSource?.filteredData?.length > 0">
                 <table mat-table [dataSource]="dataSource">
                   <ng-container matColumnDef="RequestId">
                     <th mat-header-cell *matHeaderCellDef class="row-heading">Request ID </th>
@@ -98,10 +99,10 @@ <h2>{{'Content Request'}}</h2>
                           <button *ngIf="element.status === statusKey.Unassigned && element.status!== statusKey.Inprogress &&  element.status!== statusKey.invalid" mat-menu-item (click)="onClickMenu(element,'invalidContent')">
                             <span>Mark as invalid</span>
                           </button>
-                          <button mat-menu-item *ngIf="element.status!== statusKey.Assigned && element.interestCount >0 && element.status!== statusKey.Inprogress &&  element.status!== statusKey.invalid" (click)="onClickMenu(element,'assignContent')">
+                          <button mat-menu-item *ngIf="element.status!== statusKey.Assigned && element.interestCount >0 && element.status!== statusKey.Inprogress &&  element.status!== statusKey.invalid && element?.status!==statusKey.fullfill" (click)="onClickMenu(element,'assignContent')">
                             <span>Assign</span>
                           </button>
-                          <button *ngIf="element?.status === statusKey.Assigned && element?.status!== statusKey.Inprogress && element?.status!== statusKey.invalid "
+                          <button *ngIf="element?.status === statusKey.Assigned && element?.status!== statusKey.Inprogress && element?.status!== statusKey.invalid && element?.status!== statusKey.fullfill"
                            mat-menu-item (click)="onClickMenu(element,'reAssignContent')">
                             <span> Re-Assign</span>
                           </button>
@@ -120,7 +121,14 @@ <h2>{{'Content Request'}}</h2>
 
 
                 </table>
-
+              </ng-container>
+              <div class="no-cbp-data" *ngIf="dataSource?.filteredData?.length === 0">
+                <div><img src="/spv-assets/icons/no-content-data.svg" alt="No Content Found"></div>
+                <!-- <div class="mat-subheading-1 margin-remove">No CBP plan created yet</div> -->
+                <div>No Content Found</div>
+
+
+            </div>
                 <mat-paginator [pageSize]="pageSize" [length]="this.requestCount" [pageSizeOptions]="[10,20,40]"
                   (page)="onChangePage($event)"></mat-paginator>
 

diff --git a/project/ws/app/src/lib/routes/home/routes/request/all-request/all-request.component.scss b/project/ws/app/src/lib/routes/home/routes/request/all-request/all-request.component.scss
@@ -112,6 +112,20 @@ table tr .row-heading {
   line-height: 16.8px;
   text-decoration: underline !important;
 }
+.no-cbp-data {
+  width: auto;
+  margin: 50px auto;
+  text-align: center;
+
+  img {
+    width: 320px;
+  }
+
+  .small-text {
+    font-size: 14px;
+    color: rgba(0, 0, 0, 0.6);
+  }
+}
 
 .title-class {
   font-family: Lato;
@@ -398,4 +412,11 @@ mat-header-row {
   @include breakpoint-xs {
     flex-direction: column;
   }
+}
+
+::ng-deep .tooltip-sec {
+  background-color: 000000 !important;
+  font-size: 12px !important;
+  font-family: 500 !important;
+  color: white !important;
 }
diff --git a/project/ws/app/src/lib/routes/home/routes/request/all-request/all-request.component.ts b/project/ws/app/src/lib/routes/home/routes/request/all-request/all-request.component.ts
@@ -278,7 +278,9 @@ export class AllRequestComponent implements OnInit {
     this.requestService.markAsInvalid(request).subscribe(res => {
       if(res){
         this.invalidRes = res
-        this.getRequestList()
+        setTimeout(()=>{
+          this.getRequestList()
+        },1000)
         this.snackBar.open('Marked as Invalid')
       }
 
@@ -298,7 +300,9 @@ export class AllRequestComponent implements OnInit {
 
       this.dialogRef.afterClosed().subscribe((_res: any) => {
         if (_res && _res.data === 'confirmed') {
-           this.getRequestList()
+          setTimeout(()=>{
+            this.getRequestList()
+          },1000)
            this.snackBar.open('Assigned submitted Successfully')
         } else {
           // this.snackBar.open('error')

diff --git a/src/spv-assets/icons/no-content-data.svg b/src/spv-assets/icons/no-content-data.svg