From e67b108cccc26a1b2caecc5d379635ade04c7010 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Mon, 13 Jan 2020 12:51:34 +0000 Subject: [PATCH 01/12] Initial Bitbucket Pipelines configuration --- bitbucket-pipelines.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 bitbucket-pipelines.yml diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml new file mode 100644 index 000000000..6d6d35bd1 --- /dev/null +++ b/bitbucket-pipelines.yml @@ -0,0 +1,28 @@ +# 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 + script: # Modify the commands below to build your repository. + - cd ng6-seed + - npm install + - npm install -g @angular/cli + - ng build + - 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) + \ No newline at end of file From cdccb2448a738e386d83158fd65616b11c8b3b42 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Mon, 13 Jan 2020 13:07:43 +0000 Subject: [PATCH 02/12] Delete Flag added and build script added --- bitbucket-pipelines.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml index 6d6d35bd1..dcc46a56f 100644 --- a/bitbucket-pipelines.yml +++ b/bitbucket-pipelines.yml @@ -15,7 +15,7 @@ pipelines: - cd ng6-seed - npm install - npm install -g @angular/cli - - ng build + - npm run staging - ls -ltr - cd dist - pipe: atlassian/aws-s3-deploy:0.3.8 @@ -25,4 +25,5 @@ pipelines: AWS_DEFAULT_REGION: 'ap-south-1' S3_BUCKET: 'autodeploy001' LOCAL_PATH: $(pwd) + DELETE_FLAG: 'true' \ No newline at end of file From 9ff7b9365764868db25252e9cfd9f7feef743ca7 Mon Sep 17 00:00:00 2001 From: sriram-at-840620226347 Date: Mon, 13 Jan 2020 19:02:15 +0530 Subject: [PATCH 03/12] applicant changes done --- ng6-seed/src/app/dashboard/dashboard.component.ts | 4 ++-- ng6-seed/src/app/layouts/admin/admin-layout.component.ts | 4 ++-- ng6-seed/src/app/layouts/role-menu-items.pipe.ts | 4 ++-- .../other-applicant-details.component.ts | 7 +++++-- .../start-pd/forms/general-info/general-info.component.ts | 1 + 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ng6-seed/src/app/dashboard/dashboard.component.ts b/ng6-seed/src/app/dashboard/dashboard.component.ts index 39a41f6c2..65ea7a4b2 100755 --- a/ng6-seed/src/app/dashboard/dashboard.component.ts +++ b/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(); } diff --git a/ng6-seed/src/app/layouts/admin/admin-layout.component.ts b/ng6-seed/src/app/layouts/admin/admin-layout.component.ts index 05883422f..b2c6f805c 100755 --- a/ng6-seed/src/app/layouts/admin/admin-layout.component.ts +++ b/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 = document.querySelector('.sidebar-container '); diff --git a/ng6-seed/src/app/layouts/role-menu-items.pipe.ts b/ng6-seed/src/app/layouts/role-menu-items.pipe.ts index 28d68c4a0..c3de8c320 100644 --- a/ng6-seed/src/app/layouts/role-menu-items.pipe.ts +++ b/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"); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/other-applicant-details/other-applicant-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/other-applicant-details/other-applicant-details.component.ts index 8cac3dc77..084d54ce4 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/other-applicant-details/other-applicant-details.component.ts +++ b/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 || ''], diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts index 0652066ba..69755025b 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts +++ b/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 ****************/ From ccc1513f403ec89f1238e695edb23aaf7b79cbf6 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Mon, 13 Jan 2020 13:36:39 +0000 Subject: [PATCH 04/12] package.json edited online with Bitbucket --- ng6-seed/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ng6-seed/package.json b/ng6-seed/package.json index de62716fa..e76be839e 100755 --- a/ng6-seed/package.json +++ b/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 node_modules/@angular/cli/bin/ng build --configuration=staging", "ng": "ng", "start": "ng serve", "build": "ng build", From 46d89a98bdad8a6170a5e121d7b7f1cebf47e2ff Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Mon, 13 Jan 2020 13:46:35 +0000 Subject: [PATCH 05/12] Docker memory size increased on edited online with Bitbucket --- bitbucket-pipelines.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml index dcc46a56f..42e4fea44 100644 --- a/bitbucket-pipelines.yml +++ b/bitbucket-pipelines.yml @@ -26,4 +26,10 @@ pipelines: S3_BUCKET: 'autodeploy001' LOCAL_PATH: $(pwd) DELETE_FLAG: 'true' + services: + - docker +definitions: + services: + docker: + memory: 2048 \ No newline at end of file From 6d5bb12e083f239808964f7f2b086c1df8df7d02 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Tue, 14 Jan 2020 04:59:04 +0000 Subject: [PATCH 06/12] Node Memory size decreased in bitbucket --- bitbucket-pipelines.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml index 42e4fea44..04faa0c22 100644 --- a/bitbucket-pipelines.yml +++ b/bitbucket-pipelines.yml @@ -15,7 +15,7 @@ pipelines: - cd ng6-seed - npm install - npm install -g @angular/cli - - npm run staging + - node --max_old_space_size=4000 node_modules/@angular/cli/bin/ng build --configuration=staging - ls -ltr - cd dist - pipe: atlassian/aws-s3-deploy:0.3.8 @@ -26,10 +26,4 @@ pipelines: S3_BUCKET: 'autodeploy001' LOCAL_PATH: $(pwd) DELETE_FLAG: 'true' - services: - - docker -definitions: - services: - docker: - memory: 2048 \ No newline at end of file From b2a96df9d43c2a109ce16708af7b577fcf14e158 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Tue, 14 Jan 2020 05:03:31 +0000 Subject: [PATCH 07/12] Node memory size decreased edited online with Bitbucket --- bitbucket-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml index 04faa0c22..05de41e0e 100644 --- a/bitbucket-pipelines.yml +++ b/bitbucket-pipelines.yml @@ -15,7 +15,7 @@ pipelines: - cd ng6-seed - npm install - npm install -g @angular/cli - - node --max_old_space_size=4000 node_modules/@angular/cli/bin/ng build --configuration=staging + - 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 From 866ebce95b2b43ca21d095c4af7f46d41a2a03d3 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Tue, 14 Jan 2020 05:24:24 +0000 Subject: [PATCH 08/12] Double the pipelines in yml file edited online with Bitbucket --- bitbucket-pipelines.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml index 05de41e0e..72393e026 100644 --- a/bitbucket-pipelines.yml +++ b/bitbucket-pipelines.yml @@ -11,6 +11,7 @@ pipelines: - 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 From 3ef69b60f3f9b37289bb7c57e85ca4968165e05d Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Tue, 14 Jan 2020 07:42:13 +0000 Subject: [PATCH 09/12] Node Memory size is setted in package.json via bitbucket --- ng6-seed/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ng6-seed/package.json b/ng6-seed/package.json index e76be839e..d5bf40831 100755 --- a/ng6-seed/package.json +++ b/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 node_modules/@angular/cli/bin/ng build --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", From 8737b76866013cfd51e0467706e750688bd8aa2a Mon Sep 17 00:00:00 2001 From: sriram-at-840620226347 Date: Tue, 14 Jan 2020 18:23:10 +0530 Subject: [PATCH 10/12] Include Archived added in filter --- .../manage-pd/list-pd/all-pd/all-pd.component.html | 5 +++++ .../manage-pd/list-pd/all-pd/all-pd.component.ts | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html index c7bfec3d0..96f03bcc5 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html @@ -56,6 +56,11 @@ +
+
+ Include Archived +
+