Merge pull request #544 from sohailamjad12/bug_fixes_MDO25

Karma Quest : Bug fixes

project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.html

@@ -43,7 +43,7 @@ <h2 class="titleText">{{assignText}}</h2>
                 </ng-container>
 
                 <tr mat-header-row *matHeaderRowDef="displayedColumns" class="table-row-data"></tr>
-                <tr mat-row *matRowDef="let row; columns: displayedColumns"></tr>
+                <tr mat-row *matRowDef="let row; columns: displayedColumns" [ngClass]="{'row-bg':row === this.providerList[0]}"></tr>
               </table>
               <mat-paginator [pageSize]="pageSize" [length]="this.providerCount" [pageSizeOptions]="[5,10,20]"
               (page)="onChangePage($event)"></mat-paginator>

project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.scss

@@ -103,6 +103,11 @@ table tr .cdk-column-details {
   width: 40%;
   padding: 0 10% 0 0px !important
 }
+
+.row-bg {
+  background-color: rgba(0, 0, 0, 0.16) !important;
+  pointer-events: none !important;
+}
 
   .action-btn-view {
     color: #1B4CA1;

project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.ts

@@ -52,9 +52,21 @@ export class AssignListPopupComponent implements OnInit {
       const assignOrgData = this.providerList.find(option =>
         this.data.assignedProvider === option.orgName
       )
-      if (assignOrgData) {
-        this.requestForm.controls['assignee'].setValue(assignOrgData)
+      // if (assignOrgData) {
+      //   this.requestForm.controls['assignee'].setValue(assignOrgData)
+      // }
+
+      // move selected data to first
+      const position = this.providerList.indexOf(assignOrgData)
+       // check if the element exists in the array
+       if (position > -1) {
+        // Remove the element from its position
+        const selectedData = this.providerList.splice(position, 1)[0]
+
+        // Add the removed element to the beginning of the array
+        this.providerList.unshift(selectedData)
       }
+
     }
    }
 

project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.html

@@ -314,7 +314,14 @@
                     </div>
                 </div>
                 <div class="title-name" *ngIf="isBroadCast">
-                    <div class="fonm-element-label label-text">Preffered Providers <span class="required"></span></div>
+                    <div class="fonm-element-label label-text">Preffered Providers <span class="required"></span>
+                      <span class="tooltip-span">
+                        <mat-icon class="info-icon cursor-pointer" [matTooltip]="'You can select upto 5 preferred provider'" 
+                        matTooltipClass="tooltip-sec">info</mat-icon>
+
+                      </span>
+
+                    </div>
                     <div class="">
                         <mat-form-field appearance="outline" class="w-full field-height" fxFlex="40">
                             <mat-select class=" placeholder-text" placeholder="Choose the provider" (openedChange)="openedChange($event,'providerText')" formControlName="providers"  multiple>
@@ -351,7 +358,7 @@
                 </div>
 
                 <div class="flex flex-start margin-top-l" *ngIf="!isHideData">
-                    <button mat-button class="submit-btn margin-right-xs" type="button" (click)="showConformationPopUp()" [disabled]="!requestForm.valid">Submit</button>
+                    <button mat-button class="submit-btn margin-right-xs" type="button" (click)="submit()" [disabled]="!requestForm.valid">Submit</button>
                     <button mat-button class="close-btn" (click)="navigateBack()" type="button" >Cancel</button>
 
                   </div>

project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.scss

@@ -21,6 +21,15 @@
                 font-weight: 700;
                 font-size: 14px;
                 line-height: 21px;
+                .tooltip-span {
+                  position: relative;
+                  padding-left: 7px;
+                  .info-icon {
+                    position: absolute;
+                    font-size: 19px;
+                    top: -1px;
+                  }
+                }
             }
                         .learning-section {
                             padding: 16px;
@@ -166,4 +175,11 @@
         padding: 0 4px;
       }
     }
+  }
+
+  ::ng-deep .tooltip-sec {
+    background-color: 000000 !important;
+    font-size: 12px !important;
+    font-family: 500 !important;
+    color: white !important;
   }

project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts

@@ -582,7 +582,12 @@ this.dialogRefs.afterClosed().subscribe((_res: any) => {
           this.snackBar.open('Request submitted successfully ')
       }
       },         1000)
-    }
+    },
+    (error:any) => {
+      this.dialogRefs.close({ error })
+      this.snackBar.open('Request Failed')
+
+     }
   )
    }
 
@@ -600,11 +605,11 @@ this.dialogRefs.afterClosed().subscribe((_res: any) => {
         dialogData['icon'] = 'accept_icon'
         dialogData['title'] = 'Processing your request'
         dialogData['subTitle'] = `Wait a second , your request is processing………`
-        dialogData['primaryAction'] = 'Redirecting....'
+        dialogData['primaryAction'] = 'Successfully created....'
         break
     }
 
-    this.openDialoagBox(dialogData)
+     this.openDialoagBox(dialogData)
   }
 
   openDialoagBox(dialogData: any) {

project/ws/app/src/lib/routes/home/components/request-list/request-list.component.html

@@ -111,10 +111,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 " mat-menu-item (click)="onClickMenu(element,'reAssignContent')">
+                      <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>
                       <button mat-menu-item (click)="onClickMenu(element,'copyContent')">

project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts

@@ -228,7 +228,9 @@ export class RequestListComponent implements OnInit {
    this.homeService.markAsInvalid(request).subscribe(res => {
      this.invalidRes = res
      if (res) {
-      this.getRequestList()
+      setTimeout(() => {
+        this.getRequestList()
+      },         1000)
      }
 
      this.snackBar.open('Marked as Invalid')