Sineedge/sparqsineedge
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fairoj : Packages updated and address form fetching issue fixed

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2020-01-09 19:19:26 +05:30
parent d71e5f9168
commit 3d7bd1d99f
5 changed files with 2596 additions and 1847 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4349
ng6-seed/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

76
ng6-seed/package.json
View File

@ -15,49 +15,49 @@
"private": true, "private": true,
"dependencies": { "dependencies": {
"@agm/core": "^1.0.0-beta.2", "@agm/core": "^1.0.0-beta.2",
"@angular/animations": "^6.0.0-rc.5", "@angular/animations": "^6.1.10",
"@angular/cdk": "^6.0.0-rc.5", "@angular/cdk": "^6.0.0-rc.5",
"@angular/common": "^6.0.0-rc.5", "@angular/common": "^6.1.10",
"@angular/compiler": "^6.0.0-rc.5", "@angular/compiler": "^6.1.10",
"@angular/core": "^6.0.0-rc.5", "@angular/core": "^6.1.10",
"@angular/fire": "^5.2.1", "@angular/fire": "^5.3.0",
"@angular/flex-layout": "^6.0.0-beta.18", "@angular/flex-layout": "^6.0.0-beta.18",
"@angular/forms": "^6.0.0-rc.5", "@angular/forms": "^6.1.10",
"@angular/http": "^6.0.0-rc.5", "@angular/http": "^6.0.0-rc.6",
"@angular/material": "^6.0.0-rc.5", "@angular/material": "^6.4.7",
"@angular/material-moment-adapter": "^6.0.0-rc.5", "@angular/material-moment-adapter": "^6.4.7",
"@angular/platform-browser": "^6.0.0-rc.5", "@angular/platform-browser": "^6.1.10",
"@angular/platform-browser-dynamic": "^6.0.0-rc.5", "@angular/platform-browser-dynamic": "^6.1.10",
"@angular/router": "^6.0.0-rc.5", "@angular/router": "^6.1.10",
"@ngx-translate/core": "^10.0.2", "@ngx-translate/core": "^10.0.2",
"@ngx-translate/http-loader": "^3.0.1", "@ngx-translate/http-loader": "^3.0.1",
"@swimlane/ngx-charts": "^7.0.1", "@swimlane/ngx-charts": "^7.0.1",
"@swimlane/ngx-datatable": "11.1.5", "@swimlane/ngx-datatable": "11.1.5",
"@types/file-saver": "^2.0.0", "@types/file-saver": "^2.0.1",
"amazon-cognito-identity-js": "^2.0.27", "amazon-cognito-identity-js": "^2.0.30",
"angular-calendar": "0.23.3", "angular-calendar": "0.23.3",
"angular-csv-ext": "^1.0.1", "angular-csv-ext": "^1.0.2",
"angular-notifier": "^4.1.1", "angular-notifier": "^4.1.2",
"angular-sortablejs": "^2.0.6", "angular-sortablejs": "^2.7.0",
"angular-split": "^3.0.2", "angular-split": "^3.0.2",
"angular-tree-component": "6.1.0", "angular-tree-component": "6.1.0",
"chart.js": "2.6.0", "chart.js": "2.6.0",
"core-js": "^2.5.5", "core-js": "^2.6.11",
"d3": "^4.9.1", "d3": "^4.9.1",
"dragula": "3.7.2", "dragula": "3.7.2",
"file-saver": "^2.0.0", "file-saver": "^2.0.2",
"firebase": "^6.2.3", "firebase": "^6.6.2",
"font-awesome": "4.7.0", "font-awesome": "4.7.0",
"hammerjs": "2.0.8", "hammerjs": "2.0.8",
"intl": "^1.2.4", "intl": "^1.2.4",
"jquery": "^3.4.1", "jquery": "^3.4.1",
"karma-jasmine": "^1.1.1", "karma-jasmine": "^1.1.1",
"leaflet": "^1.0.2", "leaflet": "^1.6.0",
"mat-table-exporter": "^1.2.1", "mat-table-exporter": "^1.2.5",
"moment": "^2.15.0", "moment": "^2.24.0",
"ng-pick-datetime": "^6.0.16", "ng-pick-datetime": "^6.0.16",
"ng2-charts": "1.6.0", "ng2-charts": "1.6.0",
"ng2-ckeditor": "^1.2.2", "ng2-ckeditor": "^1.2.6",
"ng2-dragula": "1.3.1", "ng2-dragula": "1.3.1",
"ng2-file-upload": "1.2.1", "ng2-file-upload": "1.2.1",
"ng2-pdf-viewer": "5.2.3", "ng2-pdf-viewer": "5.2.3",
@ -67,30 +67,30 @@
"ngx-mat-daterange-picker": "^1.1.4", "ngx-mat-daterange-picker": "^1.1.4",
"ngx-mat-select-search": "^1.8.0", "ngx-mat-select-search": "^1.8.0",
"ngx-perfect-scrollbar": "5.0.0-7", "ngx-perfect-scrollbar": "5.0.0-7",
"ngx-viewer": "^1.0.1", "ngx-viewer": "^1.0.5",
"node-sass": "^4.12.0", "node-sass": "^4.13.0",
"perfect-scrollbar": "^1.3.0", "perfect-scrollbar": "^1.3.0",
"quill": "^1.2.0", "quill": "^1.3.7",
"rxjs": "^6.3.1", "rxjs": "^6.5.4",
"rxjs-compat": "^6.3.1", "rxjs-compat": "^6.5.4",
"screenfull": "^3.2.2", "screenfull": "^3.2.2",
"simple-line-icons": "^2.4.1", "simple-line-icons": "^2.4.1",
"sortablejs": "^1.6.0", "sortablejs": "^1.10.0",
"sweetalert2": "^7.28.4", "sweetalert2": "^7.33.1",
"tether": "^1.4.0", "tether": "^1.4.7",
"viewerjs": "^1.3.1", "viewerjs": "^1.5.0",
"xlsx": "^0.14.2", "xlsx": "^0.14.5",
"zone.js": "^0.8.26" "zone.js": "^0.8.29"
}, },
"devDependencies": { "devDependencies": {
"@angular-devkit/build-angular": "^0.12.4", "@angular-devkit/build-angular": "^0.12.4",
"@angular/cli": "^6.0.0-rc.5", "@angular/cli": "^6.2.9",
"@angular/compiler-cli": "^6.0.0-rc.5", "@angular/compiler-cli": "^6.0.0-rc.5",
"@types/aws-sdk": "^2.7.0", "@types/aws-sdk": "^2.7.0",
"@types/jasmine": "2.5.52", "@types/jasmine": "2.5.52",
"@types/jquery": "3.2.0", "@types/jquery": "3.2.0",
"@types/node": "^8.10.29", "@types/node": "^8.10.59",
"aws-sdk": "^2.555.0", "aws-sdk": "^2.600.0",
"codelyzer": "~4.1.0", "codelyzer": "~4.1.0",
"jasmine-core": "2.6.3", "jasmine-core": "2.6.3",
"jasmine-spec-reporter": "4.1.0", "jasmine-spec-reporter": "4.1.0",

8
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts
View File

@ -125,7 +125,9 @@ export class AddressComponent implements OnInit {
params.parent_pdid = this.parent_pdid; params.parent_pdid = this.parent_pdid;
params.pd_id = this.pdid; params.pd_id = this.pdid;
params.pd_form_id = '5'; params.pd_form_id = '5';
setTimeout(()=>{
this.setAddressFromDatas(params); this.setAddressFromDatas(params);
},100)
// this.retriveFile(); // this.retriveFile();
} }
@ -169,7 +171,9 @@ export class AddressComponent implements OnInit {
this.addressForm.controls.address_type.setValue(datas.address_type ? datas.address_type : ''); this.addressForm.controls.address_type.setValue(datas.address_type ? datas.address_type : '');
if (datas.address_type) { if (datas.address_type) {
let selectedAddressType = this.addressData.filter(element => element.address_type_id == datas.address_type)[0]; let selectedAddressType = this.addressData.filter(element => element.address_type_id == datas.address_type)[0];
if(selectedAddressType != undefined && selectedAddressType.hasOwnProperty('address_type')){
this.selectedAddressType(selectedAddressType.address_type); this.selectedAddressType(selectedAddressType.address_type);
}
this.setOthers(datas.address_type, '', 3); this.setOthers(datas.address_type, '', 3);
if (datas.address_type == 1) { if (datas.address_type == 1) {
this.addressForm.controls.address_type_others.setValue(datas.address_type_others); this.addressForm.controls.address_type_others.setValue(datas.address_type_others);
@ -735,7 +739,9 @@ export class AddressComponent implements OnInit {
this.addressForm.controls.address_type.setValue(datas.address_type ? datas.address_type : ''); this.addressForm.controls.address_type.setValue(datas.address_type ? datas.address_type : '');
let selectedAddressType = this.addressData.filter(element => element.address_type_id == datas.address_type)[0]; let selectedAddressType = this.addressData.filter(element => element.address_type_id == datas.address_type)[0];
if(selectedAddressType != undefined && selectedAddressType.hasOwnProperty('address_type')){
this.selectedAddressType(selectedAddressType.address_type); this.selectedAddressType(selectedAddressType.address_type);
}
this.setOthers(datas.address_type, '', 3); this.setOthers(datas.address_type, '', 3);
if (datas.address_type == 1) { if (datas.address_type == 1) {
@ -805,7 +811,9 @@ export class AddressComponent implements OnInit {
this.addressForm.controls.address_type.setValue(datas.address_type); this.addressForm.controls.address_type.setValue(datas.address_type);
let selectedAddressType = this.addressData.filter(element => element.address_type_id == datas.address_type)[0]; let selectedAddressType = this.addressData.filter(element => element.address_type_id == datas.address_type)[0];
if(selectedAddressType != undefined && selectedAddressType.hasOwnProperty('address_type')){
this.selectedAddressType(selectedAddressType.address_type); this.selectedAddressType(selectedAddressType.address_type);
}
this.setOthers(datas.address_type, '', 3); this.setOthers(datas.address_type, '', 3);

2
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/image-docs/image-docs.component.html
View File

@ -1,7 +1,7 @@
<!-- <ng-template matTabContent> --> <!-- <ng-template matTabContent> -->
<div ngxViewer *ngIf="documentsAndFilesList.length>0; else noFiles"> <div ngxViewer *ngIf="documentsAndFilesList.length>0; else noFiles">
<!-- {{documentsAndFilesList.length}} --> <!-- {{documentsAndFilesList.length}} -->
<div fxLayout="row wrap" style="padding:20px;"> <div fxLayout="row wrap" style="padding:20px;height:54vh!important">
<div fxFlex="100"> <div fxFlex="100">
<div fxFlex="20" class="m-gap p-gap" *ngFor="let doc of documentsAndFilesList"> <div fxFlex="20" class="m-gap p-gap" *ngFor="let doc of documentsAndFilesList">
<div class="p-list-main mb-2" *ngIf="doc.document_type != 'pdf'"> <div class="p-list-main mb-2" *ngIf="doc.document_type != 'pdf'">

8
ng6-seed/src/assets/styles/scss/material/_dialog.scss
View File

@ -1,4 +1,10 @@
.mat-dialog-container { .mat-dialog-container {
background: mat-color($background, card); background: mat-color($background, card);
border-radius: $border-radius-base; border-radius: $border-radius-base;
} }
.mat-dialog-content{
max-height:63.5vh !important
}
.mat-dialog-actions {
padding: 8px 0!important;
}