Merge branch 'master' of https://bitbucket.org/sriramv18/sparqsineedge

bitbucket-pipelines.yml

@@ -0,0 +1,30 @@
+# This is a sample build configuration for JavaScript.
+# Check our guides at https://confluence.atlassian.com/x/14UWN for more examples.
+# Only use spaces to indent your .yml configuration.
+# -----
+# You can specify a custom docker image from Docker Hub as your build environment.
+image: node:10.15.3
+
+pipelines:
+   branches:
+       master:
+        - step:
+            caches:
+             - node
+            size: 2x # Double resources available for this step.
+            script: # Modify the commands below to build your repository.
+            - cd ng6-seed
+            - npm install
+            - npm install -g @angular/cli
+            - node --max_old_space_size=2046 node_modules/@angular/cli/bin/ng build --configuration=staging
+            - ls -ltr
+            - cd dist
+            - pipe: atlassian/aws-s3-deploy:0.3.8
+              variables:
+                AWS_ACCESS_KEY_ID: $AWS_ACCESS_KEY_ID
+                AWS_SECRET_ACCESS_KEY: $AWS_SECRET_ACCESS_KEY
+                AWS_DEFAULT_REGION: 'ap-south-1'
+                S3_BUCKET:  'autodeploy001'
+                LOCAL_PATH: $(pwd)
+                DELETE_FLAG: 'true'
+              

ng6-seed/package.json

@@ -4,7 +4,7 @@
   "license": "MIT",
   "scripts": {
     "production": "node --max_old_space_size=8192 node_modules/@angular/cli/bin/ng build --prod ",
-    "staging": "node --max_old_space_size=8192 node_modules/@angular/cli/bin/ng build --prod  --configuration=staging",
+    "staging": "node --max_old_space_size=6144 node_modules/@angular/cli/bin/ng build --configuration=staging",
     "ng": "ng",
     "start": "ng serve",
     "build": "ng build",

ng6-seed/src/app/dashboard/dashboard.component.ts

@@ -16,7 +16,7 @@ import { BaseChartDirective }   from 'ng2-charts/ng2-charts';
 export class DashboardComponent { 
   
   dashboardTitle : any = 'PD Status';
-  access : boolean;
+  access : boolean = true;
 
   /** Declaration Part Of Doughnut Chart */
   doughnutChartLabels: string[] = ['Triggered','Allocated','Scheduled','InProgress','Completed','QC Completed'];
@@ -46,7 +46,7 @@ export class DashboardComponent {
  ngOnInit(){
   // console.clear();
   //  this.access = this.userRoleID == 3 || this.userRoleID == 4 || this.userRoleID == 6 ? false : true;
-  this.access = this.userRoleID == 4 || this.userRoleID == 6 ? false : true;
+  // this.access = this.userRoleID == 4 || this.userRoleID == 6 ? false : true;
    this.getDoughnutChartData();
 }
  

ng6-seed/src/app/layouts/admin/admin-layout.component.ts

@@ -55,7 +55,7 @@ export class AdminLayoutComponent implements OnInit, OnDestroy {
   alertMsgAllocateType : any[];
   alertCount: any;
   userRoleType: String;
-  permissionDeined : boolean; 
+  permissionDeined : boolean = true; 
   alertTAT: any;
   countTAT: number;
   
@@ -115,7 +115,7 @@ export class AdminLayoutComponent implements OnInit, OnDestroy {
 
   ngOnInit(): void {
     this.userRoleType=localStorage.getItem('user_role');
-    this.permissionDeined =  this.userRoleType == '4' || this.userRoleType == '6' ? false : true;
+    // this.permissionDeined =  this.userRoleType == '4' || this.userRoleType == '6' ? false : true;
     // console.clear();
     const elemSidebar = <HTMLElement>document.querySelector('.sidebar-container ');
 

ng6-seed/src/app/layouts/role-menu-items.pipe.ts

@@ -12,9 +12,9 @@ export class RoleMenuItemsPipe implements PipeTransform {
         case '1': return value.filter(val=>val.state!="settings" && val.state!="quality_check_discussion"); 
         case '2': return value.filter(val=>val.state!="settings" && val.state!="quality_check_discussion");
         case '3': return value.filter(val=>val.state!="settings");
-        case '4': return; 
+        case '4': return value.filter(val=>val.state!="settings" && val.state!="quality_check_discussion" && val.state!="reports");
         case '5': return value.filter(val=>val.state!="settings" && val.state!="quality_check_discussion" && val.state!="reports"); 
-        case '6': return; 
+        case '6': return value.filter(val=>val.state!="settings" && val.state!="personal_discussion" && val.state!="reports");
         case '7': return value.filter(val=>val.state!="settings" && val.state!="personal_discussion" && val.state!="reports"); 
         case '8': return value.filter(val=>val.state!="settings" && val.state!="quality_check_discussion");
         case '9': return value.filter(val=>val.state!="settings" && val.state!="quality_check_discussion");

ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html

@@ -56,6 +56,11 @@
                         <mat-form-field style="width: 30%">
                         <input matInput type="text" formControlName="pd_officer" placeholder="PD Officer Name" >
                     </mat-form-field>
+                    <div fxLayout="row wrap">
+                        <div fxFlex.xs="100%" fxFlex.sm="100%" fxFlex="45%">
+                            <mat-checkbox class="example-margin" color="primary" formControlName="is_include_archived">Include Archived</mat-checkbox>
+                        </div>
+                    </div>
                         <div align="right">
 
                             <button type="button" mat-raised-button mat-icon-button (click)="onReset()" 

ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.ts

@@ -60,7 +60,8 @@ export class AllPdComponent implements OnInit, OnChanges {
             pd_lender:[null],
             pd_name:[null],
             pd_applicant_id:[null],
-            pd_officer:[null]
+            pd_officer:[null],
+            is_include_archived: [false]
           });
           this.getcommonDropDown();
     }
@@ -188,7 +189,7 @@ export class AllPdComponent implements OnInit, OnChanges {
     {
       this.searchForm.value.pd_status = [];
     }
-
+     this.searchForm.get('is_include_archived').setValue(this.searchForm.value.is_include_archived == true ? 1 : 0)
     this.searchForm.value.pd_from_date = this.pipe.transform(this.searchForm.value.pd_from_date,'yyyy-MM-dd');
     this.searchForm.value.pd_to_date = this.pipe.transform(this.searchForm.value.pd_to_date,'yyyy-MM-dd');
     // console.log(JSON.stringify(this.searchForm.value));

ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.html

@@ -44,7 +44,7 @@
                                         <!-- Position2 Column -->
                                         <ng-container matColumnDef="position_3">
                                         <th mat-header-cell *matHeaderCellDef> As Derived from Item Wise Sales </th>
-                                        <td mat-cell *matCellDef="let element;let i = index">{{ i==7 ? element.derived_item_wise : i==10 ? element.derived_item_wise : element.derived_item_wise | rupeeCurrencyFormat}} </td>
+                                        <td mat-cell *matCellDef="let element;let i = index">{{ i==7 ? element.derived_item_wise : i==8 ? element.derived_item_wise : i==9 ? element.derived_item_wise : i==10 ? element.derived_item_wise : element.derived_item_wise | rupeeCurrencyFormat}} </td>
                                         </ng-container>
 
                                    <!-- | rupeeCurrencyFormat -->

ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/other-applicant-details/other-applicant-details.component.ts

@@ -16,6 +16,7 @@ export class OtherApplicantDetailsComponent implements OnInit {
   titleList: any = [];
   qualificationList: any = [];
   individuals_order_id: any;
+  role_id: string;
   //EditGeneralFormData: any=[];
   //EditFlag: boolean = false;
 
@@ -34,7 +35,9 @@ export class OtherApplicantDetailsComponent implements OnInit {
     else{
       this.pageTitle="Add Name of Person(s) Met and Individual Loan Applicant(s) "
     }
-    }
+    this.role_id=localStorage.getItem('user_role')
+    console.log('User Role',this.role_id);   
+   }
 
   ngOnInit() {
     if(this.data.edit_data){
@@ -82,7 +85,7 @@ export class OtherApplicantDetailsComponent implements OnInit {
     return this._fb.group({
       pd_co_applicant_id: [elementValue.pd_co_applicant_id],
       applicant_title_name: [elementValue.applicant_title_name, Validators.required], 
-      applicant_name: [{value:elementValue.applicant_name, disabled : elementValue.individuals_order_id == 1 ? true : false} || '', Validators.required],
+      applicant_name: [{value:elementValue.applicant_name, disabled : elementValue.individuals_order_id == 1 && this.role_id != '10' && this.role_id != '3' && this.role_id != '7' && this.role_id != '6' ? true : false} || '', Validators.required],
       is_applicant: [elementValue.is_applicant || false],
       is_person_met: [elementValue.is_person_met || false],
       age: [elementValue.age || ''],

ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html

@@ -224,7 +224,7 @@
                                                     OnlyNumber type="text" autocomplete="off" required>
                                                         <mat-hint align="start" style="font-size:90%" *ngIf="employmentForm.controls['net_monthly_salary'].value != ''">{{"&#8377;"}} {{employmentForm.controls['net_monthly_salary'].value | numberToWords}} Only</mat-hint>
                                                         <mat-error *ngIf="employmentForm.controls['net_monthly_salary'].hasError('required')">Net Monthly Salary Required</mat-error>
-                                                        <mat-error *ngIf="employmentForm.controls['net_monthly_salary'].hasError('max')">Given value is More than Gross Monthly Salary</mat-error>
+                                                        <mat-error *ngIf="employmentForm.controls['net_monthly_salary'].hasError('max')">Net Month Salary is greater than Gross monthly Salary</mat-error>
                                                     <!-- <input matInput placeholder="Net Take Home"
                                                     formControlName="net_take_home"> -->
                                                 </mat-form-field>

ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts

@@ -109,6 +109,7 @@ export class GeneralInfoComponent implements OnInit {
     }
     this.disableAfterSubmit = false;
     this.role_id=localStorage.getItem('user_role')
+    console.log('User Role',this.role_id);
      this.image_doc_params={pdid:this.pdid,form_id:this.form_id,company_id:''}
   }
   /********************** Constructor Section  Ends Here ****************/

ng6-seed/src/app/personal-discussion/pd-pipes/rupee-currency-format.pipe.ts

@@ -6,6 +6,7 @@ import { Pipe, PipeTransform } from '@angular/core';
 export class RupeeCurrencyFormatPipe implements PipeTransform {
 
   transform(value: any): any {
+    var currencySymbol = '₹';
     if (!isNaN(value) && value) {
       var currencySymbol = '₹';
       //var output = Number(input).toLocaleString('en-IN');   <-- This method is not working fine in all browsers!           
@@ -23,6 +24,10 @@ export class RupeeCurrencyFormatPipe implements PipeTransform {
 
       return currencySymbol + output;
   }
+  else if(value == 0)
+  {
+    return currencySymbol + value;
+  }
 }
 
 }