Removed mark as others and resolved from junck tab of nodal officer

src/app/modules/grievance-modules/components/grievance-details/grievance-details.component.html

@@ -156,7 +156,7 @@
       <div class="user-container">
         <h2 class="user-text-heading">{{currentTabName}}</h2>
         <div class="action-btns">
-          <button mat-raised-button class="MR15" *ngIf="userRole === 'Nodal Officer' && currentTabName !== 'Resolved'"
+          <button mat-raised-button class="MR15" *ngIf="(userRole === 'Nodal Officer' && currentTabName !== 'Resolved' && currentTabName !== 'Junk') || userRole === 'Grievance Nodal' && currentTabName === 'Junk'"
             (click)="handleClick('markothers')">Mark As Others</button>
           <button mat-raised-button class="MR15" *ngIf="!(currentTabName == 'Resolved' || currentTabName == 'Junk')"
             (click)="handleClick('markjunk')">Mark As Junk</button>
@@ -174,7 +174,7 @@
               *ngIf="(currentTabName == 'Escalated to me' || currentTabName == 'Not Assigned' || currentTabName == 'Pending' || currentTabName === 'Nudged')"
               (click)="handleClick('nudge')">Send Reminder</button>
           </span>
-          <button type="submit" *ngIf="userRole === 'Nodal Officer' && currentTabName !== 'Resolved'"
+          <button type="submit" *ngIf="userRole === 'Nodal Officer' && currentTabName !== 'Resolved' && currentTabName !== 'Junk'"
             [disabled]="!grievanceResolutionForm.valid" (click)="handleClick('resolved',grievanceResolutionForm.value)"
             mat-raised-button color="primary">
             Mark as resolved
@@ -281,7 +281,7 @@
             <mat-divider *ngIf="userRole === 'Nodal Officer' || 'Grievance Nodal' && currentTabName !== 'Resolved'"
               style="margin-top:1rem !important"></mat-divider>
             <form [formGroup]="grievanceResolutionForm">
-              <div *ngIf="userRole === 'Nodal Officer' && currentTabName !== 'Resolved'" id="nodal"
+              <div *ngIf="userRole === 'Nodal Officer' && currentTabName !== 'Resolved' && currentTabName !== 'Junk'" id="nodal"
                 class="resolution-class">
                 <!-- <mat-form-field> -->
                 <mat-grid-list cols="6" rowHeight="10rem" [gutterSize]="'100px'">

src/app/modules/grievance-modules/components/grievance-details/grievance-details.component.ts

@@ -397,6 +397,11 @@ export class GrievanceDetailsComponent {
         ...this.ticketUpdateRequest,
         "cc":-1,
         isJunk: this.ticketDetails.junk,
+
+      }
+      if (this.userRole === 'Grievance Nodal') {
+        this.ticketUpdateRequest['status'] = 'OPEN';
+        this.ticketUpdateRequest['isJunk'] = false;
       }
       const otherDialogData = {
         header: `Enter reason to mark as 'Other'`,
@@ -513,9 +518,10 @@ export class GrievanceDetailsComponent {
         this.getTicketById();
         this.toastrService.showToastr("Ticket updated successfully!", 'Success', 'success', '');
         this.router.navigate(['/grievance/manage-tickets/'],{ queryParams: {tabName: this.currentTabName}});
-      },error: (err) =>{
+      },error: (error) =>{
         this.isDataLoading = false;
-        this.toastrService.showToastr(err, 'Error', 'error', '');
+        const errorMessage = error.error.error_message ? error.error.error_message : error.error.error;
+        this.toastrService.showToastr(errorMessage, 'Error', 'error', '');
       }
     });
   }

src/app/modules/grievance-modules/components/grievance-raiser-form/grievance-raiser-form.component.html

@@ -149,7 +149,7 @@
                                                     <!-- if no files are available -->
                                                     <mat-card-content class="empty-content-class" *ngIf="files.length == 0">Supports
                                                         only PDF, JPEG, PNG. with maximum
-                                                        size of 5 MB/Attachment.</mat-card-content>
+                                                        size of 5 MB per Attachment.</mat-card-content>
                                                     <mat-card-content *ngIf="files.length > 0" class="file-list-container">
                                                         <div *ngFor="let file of files; let i = index" class="preview">
                                                             <div class="layout">