latest change by tamil

ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-pd-report.component.html

@@ -52,8 +52,39 @@
                             
                             <button *ngIf="pdReportRecords.pd_status!='QC_COMPLETED'" mat-raised-button mat-icon-button class="mr-1 ml-1 hover-icon" type="button" matTooltip="Re-generate Report" matTooltipPosition="above" (click)="reGeneratePFReport()"><mat-icon>autorenew</mat-icon></button>                           
                             <button mat-raised-button mat-icon-button class="mr-1 ml-1 hover-icon" type="button" matTooltip="Download PD Report" matTooltipPosition="above" (click)="downloadPDReport()"><mat-icon>get_app</mat-icon></button>
-                            <button mat-raised-button mat-icon-button class="mr-1 ml-1 hover-icon" type="button" matTooltip="Download PD Pictures" matTooltipPosition="above" (click)="archivePDImages()"><mat-icon>save_alt</mat-icon></button>
+
-                            <button  *ngIf="!spinner_access" mat-raised-button mat-icon-button class="mr-1 ml-1 hover-icon" type="button" matTooltip="Download PD Pictures (PDF)" matTooltipPosition="above" (click)="downloadPDImagesPDF()"><mat-icon>picture_as_pdf</mat-icon></button>
+
+                           <!-- <button mat-raised-button mat-icon-button class="mr-1 ml-1 hover-icon" type="button" matTooltip="Download PD Pictures" matTooltipPosition="above" (click)="archivePDImages()"><mat-icon>save_alt</mat-icon></button>-->
+                           <button mat-raised-button mat-icon-button class="mr-1 ml-1 hover-icon" type="button" matTooltip="Download PD Pictures" matTooltipPosition="above" [matMenuTriggerFor]="menu">
+                            
+                            <mat-icon>broken_image</mat-icon>
+                          </button>
+                          <mat-menu #menu="matMenu">
+                            <button mat-menu-item (click)="archivePDImages(1)">
+                              <mat-icon>donut_large</mat-icon>
+                              <span>Re-Generate</span>
+                            </button>
+                           
+                            <button mat-menu-item (click)="archivePDImages(0)">
+                              <mat-icon>cloud_download</mat-icon>
+                              <span>Download</span>
+                            </button>
+                          </mat-menu>
+
+                            <button  *ngIf="!spinner_access" mat-raised-button mat-icon-button class="mr-1 ml-1 hover-icon" type="button" matTooltip="Download PD Pictures (PDF)" matTooltipPosition="above" [matMenuTriggerFor]="menu">
+                                <mat-icon>picture_as_pdf</mat-icon></button>
+                                <mat-menu #menu="matMenu">
+                                    <button mat-menu-item (click)="downloadPDImagesPDF(1)">
+                                      <mat-icon>donut_large</mat-icon>
+                                      <span>Re-Generate</span>
+                                    </button>
+                                   
+                                    <button mat-menu-item (click)="downloadPDImagesPDF(0)">
+                                      <mat-icon>cloud_download</mat-icon>
+                                      <span>Download</span>
+                                    </button>
+                                  </mat-menu>
+
                             <button mat-raised-button mat-icon-button class="mr-1 ml-1 hover-icon" type="button" matTooltip="Close" matTooltipPosition="above" (click)="loadPdViewCompoent()" style="margin-right: 2px;"><mat-icon>close</mat-icon></button>
                      </mat-toolbar>
                      <mat-progress-bar  *ngIf="spinner_access" mode="indeterminate" color="primary"></mat-progress-bar>

ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-pd-report.component.ts

@@ -72,6 +72,11 @@ export class QcPdReportComponent implements OnInit {
   spinner_access:boolean=false;
 
   private notifier: NotifierService;
+
+//   Menu: any[] =  [
+//       {state:'reports',name:'Re-Generate'},
+//       {state:'sales-pd-list/reports',name:'Download'}
+// ];
   constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute,
     private router: Router, public pdTrigerService: QcService, private listPDComponent: QcListComponent,
     private dialog: MatDialog, private sanitizer: DomSanitizer) {
@@ -243,10 +248,11 @@ export class QcPdReportComponent implements OnInit {
         // alert(err.html_format);   
     });
   }
-  downloadPDImagesPDF(){
+  downloadPDImagesPDF(a){
     this.spinner_access=true
     let data = {
       "pd_id": this.startPD,
+      "regenerate":a,
       "random_string":atob(this.route.snapshot.params['string'])
     };
     this.notifier.notify("info","Processing please wait..")
@@ -265,10 +271,12 @@ export class QcPdReportComponent implements OnInit {
     });
   }
 
-  archivePDImages(){
+  archivePDImages(a){
+   
     let data = {
       "pd_id": this.startPD,
       "form_id":"",
+      "regenerate":a,
       "random_string":atob(this.route.snapshot.params['string'])
     };
     this.pdTrigerService.archivePDImages(data).subscribe(data => {

ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.html

@@ -200,7 +200,7 @@
                                         </div>
                                         <div fxFlex="60" align="right">
                                           <button *ngIf="addresses.assigned_pd==null || addresses.assigned_pd==''" mat-raised-button mat-button-md  mat-icon-button class="mr-1 mb-1 hover-icon" type="button" [matTooltip]="master.fk_primary_address_id ? 'Initiate Address for Additional PD Process' : 'Initiate Address for PD Process'" matTooltipPosition="above" (click)="initiateAddtionalPD(master,addresses,master.fk_primary_address_id ? true : false)"><mat-icon>where_to_vote</mat-icon></button>
-                                          <span><button *ngIf="currentPDStatus!=pdStatusCheck.QC_COMPLETED && currentPDStatus==pdStatusCheck.COMPLETED" mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="PD Visit Time" matTooltipPosition="above" (click)="pdVisitTime(master,addresses)"><mat-icon>more_time</mat-icon></button></span>
+                                          <span><button *ngIf="currentPDStatus!=pdStatusCheck.QC_COMPLETED && currentPDStatus==pdStatusCheck.COMPLETED" mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="PD Visit Time" matTooltipPosition="above" (click)="pdVisitTime(master,addresses)"><mat-icon>watch</mat-icon></button></span>
                                           <span *ngIf="userRoleID == 3 || userRoleID == 4 || userRoleID == 5 || userRoleID == 10"><button *ngIf="addresses.assigned_pd && master.pd_type_name && currentPDStatus!=pdStatusCheck.DRAFT && currentPDStatus!=pdStatusCheck.QC_COMPLETED" mat-raised-button mat-button-md  mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Allocate" matTooltipPosition="above" (click)="pdAllocationTo(master,addresses)"><mat-icon>verified_user</mat-icon></button></span>
                                           <span *ngIf="userRoleID == 3 || userRoleID == 4 || userRoleID == 5 || userRoleID == 10"><button *ngIf="addresses.assigned_pd && master.pd_type_name && currentPDStatus!=pdStatusCheck.DRAFT && currentPDStatus!=pdStatusCheck.QC_COMPLETED" mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Schedule" matTooltipPosition="above" (click)="scheduleDetails(master,addresses)"><mat-icon>schedule</mat-icon></button></span>
                                           <span *ngIf="userRoleID == 3 || userRoleID == 4 || userRoleID == 5 || userRoleID == 6 || userRoleID == 7 || userRoleID == 10"><button *ngIf="addresses.assigned_pd && master.pd_type_name && currentPDStatus!=pdStatusCheck.DRAFT && currentPDStatus!=pdStatusCheck.QC_COMPLETED" mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Discussion" matTooltipPosition="above" (click)="getPDStart(master.pd_id)"><mat-icon>question_answer</mat-icon></button></span>

ng6-seed/src/app/settings/service/user.service.ts

@@ -173,7 +173,7 @@ export class UserService {
       "mobile_no": users.phone,
       "email": users.email,
       "isactive":users.isactive,
-
+      "designation":users.designation,
       "fk_entity_type_id":users.type.entity_type_id,
       "fk_entity_id":enities,
       "fk_city":users.city.city_id,

ng6-seed/src/app/settings/users/register/register.component.html

@@ -140,6 +140,7 @@
                                     <mat-error *ngIf="regForm.controls['role'].hasError('required') && regForm.controls['role'].touched" class="mat-text-warn">User Role Required</mat-error>
                                     <mat-error *ngIf="regForm.controls['role'].errors?.phone && regForm.controls['role'].touched" class="mat-text-warn">User Role Required</mat-error>
                                 </mat-form-field>
+                                
                                 <mat-form-field dividerColor="primary" class="ml-xs mr-xs"  *ngIf="enableBranch">
                                     <mat-select matInput placeholder="Branch"  [formControl]="regForm.controls['fk_lender_branch_id']" >
                                         <mat-option *ngFor="let branch of branchList" [value]="branch.entity_lender_branch_id" >
@@ -148,6 +149,15 @@
                                     </mat-select>
                                     <mat-error *ngIf="regForm.controls['fk_lender_branch_id'].hasError('required')" class="mat-text-warn">Branch is Required</mat-error>
                                 </mat-form-field>
+                               <!--*ngIf="entities.short_name ==='MWISE'"--> 
+                               <mat-form-field dividerColor="primary" class="ml-xs mr-xs"  *ngIf="regForm.controls['designation']">
+                                <mat-select matInput placeholder="Designation"  [formControl]="regForm.controls['designation']" >
+                                    <mat-option *ngFor="let des of Designation" [value]="des.designation_id">
+                                        {{des.designation}}
+                                    </mat-option>
+                                </mat-select>
+                                <mat-error *ngIf="regForm.controls['designation'].hasError('required')" class="mat-text-warn">Designation is Required</mat-error>
+                            </mat-form-field>
 
                                 <mat-form-field dividerColor="primary" class="ml-xs mr-xs"  *ngIf="roleAccess">
                                     <mat-select matInput placeholder="PD Team" [formControl]="regForm.controls['pdteam']"  >

ng6-seed/src/app/settings/users/register/register.component.ts

@@ -8,6 +8,7 @@ import { FileUploader } from 'ng2-file-upload/ng2-file-upload';
 // import { SharedService } from '../../shared.service';
 import { MatOption } from '@angular/material';
 import { UserService } from '../../service/user.service';
+
 import { ifStmt } from '@angular/compiler/src/output/output_ast';
  /**sweet alert */
 import Swal from 'sweetalert2';
@@ -35,6 +36,7 @@ export class RegisterComponent implements OnInit {
   product: any = [];
   img: any;
   roles: any;
+  
   types: any = [];
   loader:boolean = false;
   roleAccess:boolean = false;
@@ -47,7 +49,7 @@ export class RegisterComponent implements OnInit {
   entityType: any;
   City: any = [];
   State: any;
-  designation: any;
+  
   hierarchy:any=[];
   files: File = null
   usersData: any;
@@ -64,6 +66,7 @@ export class RegisterComponent implements OnInit {
   branchList: any;
   enableBranch: boolean=false;
   productsList: any = [];
+  Designation: any= [];
   constructor(
     private router: Router, public fb: FormBuilder, public AWS: AwsService, private cd: ChangeDetectorRef
     ,private elementRef: ElementRef,public users:UserService,notifier:NotifierService) {
@@ -74,7 +77,6 @@ export class RegisterComponent implements OnInit {
     if (this.users.localUserId != '' && this.users.localUserId != null && this.users.localUserId !== undefined) {
      
     } else {
-     
       this.regdata();
     }
     
@@ -139,6 +141,7 @@ export class RegisterComponent implements OnInit {
         this.Cities = this.Cities.records.filter(City=>City.isactive ==1);
       }
     });
+    
     this.users.State().subscribe(res => {
       this.State = res;
       if (this.State.status == 200) {
@@ -146,6 +149,8 @@ export class RegisterComponent implements OnInit {
       }
     });
    
+   
+    
     this.users.pdTeam().subscribe(res=>{
      
       this.pdTeam = res;
@@ -189,6 +194,8 @@ export class RegisterComponent implements OnInit {
   
   register(userData) {
     if(this.regForm.invalid){
+      //console.log(this.regForm.value);
+      //return;
       // this.notifier.notify('success','Please Fill all the Fields')
       Swal('Please Fill all the Fields');
       const invalid = [];
@@ -312,33 +319,45 @@ getBranch(flag?){
 
 }
   getcity(e){
-    // console.log(e);
-    // console.log(this.Cities);
-    
    
       this.City = this.Cities.filter(city=>city.fk_state_id == e.value.state_id);
     
-    
   }
   checkUserConfigAvail() {
     console.log(this.types[0].entity_type_id,this.regForm.value.lenVenName)
     if(this.types[0].entity_type_id == '2' && this.regForm.value.lenVenName.short_name == 'MWISE') {
       this.regForm.addControl('user_config',this.addUserConfigControls())
+      this.regForm.addControl('designation',new FormControl('',Validators.required))
     this.users.getEntityPreferences(this.regForm.value.lenVenName.entity_id).subscribe(res=>{
       if(res['dataStatus']) {
       this.productsList = res['records'].salespd_products
       if (this.users.localUserId != '' && this.users.localUserId != null && this.users.localUserId !== undefined && this.users.localUserId.user_config) {
         this.regForm.get('user_config')['controls']['salespd_products'].setValue(this.users.localUserId.user_config.salespd_products)
+        
+        //this.regForm.get('designation').setValue(this.users.localUserId.designation)
       }
+     
       else {
         this.regForm.get('user_config')['controls']['salespd_products'].setValue(this.productsList.map(item=>item.product_id))
       }
       }
     })
       console.log(this.regForm.value)
+      this.users.designation().subscribe(res=>{
+        if(res['dataStatus']) {
+        this.Designation = res['records'];
+        if (this.users.localUserId != '' && this.users.localUserId != null && this.users.localUserId !== undefined && this.users.localUserId.user_config) {
+         // this.regForm.get('user_config')['controls']['salespd_products'].setValue(this.users.localUserId.user_config.salespd_products)
+          
+          this.regForm.get('designation').setValue(this.users.localUserId.designation)
+        }
+      
+        }
+      })
     }
     else {
       this.regForm.removeControl('user_config')
+      this.regForm.removeControl('designation')
     }
   }
   userupdate() {