Sineedge/sparq-lender
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fairoj : SMC Feedback changes

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2021-02-23 14:05:58 +05:30
parent 0ac08f7f9a
commit cfbb93d79d
8 changed files with 33 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ng6-seed/angular.json
View File

@ -45,7 +45,9 @@
"node_modules/hammerjs/hammer.min.js", "node_modules/hammerjs/hammer.min.js",
"node_modules/sortablejs/Sortable.js", "node_modules/sortablejs/Sortable.js",
"node_modules/chart.js/dist/Chart.bundle.min.js", "node_modules/chart.js/dist/Chart.bundle.min.js",
"src/assets/cropper/cropper.js" "src/assets/cropper/cropper.js",
"node_modules/blueimp-canvas-to-blob/js/canvas-to-blob.min.js"
] ]
}, },
"configurations": { "configurations": {

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

@ -2223,6 +2223,11 @@
"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.2.tgz", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.2.tgz",
"integrity": "sha512-dhHTWMI7kMx5whMQntl7Vr9C6BvV10lFXDAasnqnrMYhXVCzzk6IO9Fo2L75jXHT07WrOngL1WDXOp+yYS91Yg==" "integrity": "sha512-dhHTWMI7kMx5whMQntl7Vr9C6BvV10lFXDAasnqnrMYhXVCzzk6IO9Fo2L75jXHT07WrOngL1WDXOp+yYS91Yg=="
}, },
"blueimp-canvas-to-blob": {
"version": "3.28.0",
"resolved": "https://registry.npmjs.org/blueimp-canvas-to-blob/-/blueimp-canvas-to-blob-3.28.0.tgz",
"integrity": "sha512-5q+YHzgGsuHQ01iouGgJaPJXod2AzTxJXmVv90PpGrRxU7G7IqgPqWXz+PBmt3520jKKi6irWbNV87DicEa7wg=="
},
"bn.js": { "bn.js": {
"version": "5.1.3", "version": "5.1.3",
"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.3.tgz", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.3.tgz",
@ -2439,7 +2444,7 @@
}, },
"buffer": { "buffer": {
"version": "4.9.1", "version": "4.9.1",
"resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz", "resolved": "http://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
"integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=", "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
"requires": { "requires": {
"base64-js": "^1.0.2", "base64-js": "^1.0.2",
@ -2570,7 +2575,7 @@
}, },
"calendar-utils": { "calendar-utils": {
"version": "0.1.2", "version": "0.1.2",
"resolved": "https://registry.npmjs.org/calendar-utils/-/calendar-utils-0.1.2.tgz", "resolved": "http://registry.npmjs.org/calendar-utils/-/calendar-utils-0.1.2.tgz",
"integrity": "sha512-9j4Zd1itopNYTSWzFU4MqD2IDHMqznfxsGr8UWGh7hWv+lKzjRJz0LS29iAg5rHtP6+6x3ikQnhoMGqFUzoD2Q==" "integrity": "sha512-9j4Zd1itopNYTSWzFU4MqD2IDHMqznfxsGr8UWGh7hWv+lKzjRJz0LS29iAg5rHtP6+6x3ikQnhoMGqFUzoD2Q=="
}, },
"caller-callsite": { "caller-callsite": {
@ -7303,7 +7308,7 @@
}, },
"lodash": { "lodash": {
"version": "3.10.1", "version": "3.10.1",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", "resolved": "http://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
"integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=", "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=",
"dev": true "dev": true
}, },
@ -7478,7 +7483,7 @@
}, },
"load-json-file": { "load-json-file": {
"version": "1.1.0", "version": "1.1.0",
"resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
"integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
"requires": { "requires": {
"graceful-fs": "^4.1.2", "graceful-fs": "^4.1.2",
@ -7620,7 +7625,7 @@
}, },
"log4js": { "log4js": {
"version": "0.6.38", "version": "0.6.38",
"resolved": "https://registry.npmjs.org/log4js/-/log4js-0.6.38.tgz", "resolved": "http://registry.npmjs.org/log4js/-/log4js-0.6.38.tgz",
"integrity": "sha1-LElBFmldb7JUgJQ9P8hy5mKlIv0=", "integrity": "sha1-LElBFmldb7JUgJQ9P8hy5mKlIv0=",
"dev": true, "dev": true,
"requires": { "requires": {
@ -7941,7 +7946,7 @@
}, },
"meow": { "meow": {
"version": "3.7.0", "version": "3.7.0",
"resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", "resolved": "http://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
"integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
"requires": { "requires": {
"camelcase-keys": "^2.0.0", "camelcase-keys": "^2.0.0",
@ -8456,7 +8461,7 @@
"dependencies": { "dependencies": {
"semver": { "semver": {
"version": "5.3.0", "version": "5.3.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", "resolved": "http://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
"integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=" "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8="
}, },
"tar": { "tar": {
@ -8897,7 +8902,7 @@
"dependencies": { "dependencies": {
"minimist": { "minimist": {
"version": "0.0.10", "version": "0.0.10",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
"integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=", "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=",
"dev": true "dev": true
}, },
@ -12786,7 +12791,7 @@
}, },
"sax": { "sax": {
"version": "0.6.1", "version": "0.6.1",
"resolved": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz", "resolved": "http://registry.npmjs.org/sax/-/sax-0.6.1.tgz",
"integrity": "sha1-VjsZx8HeiS4Jv8Ty/DDjwn8JUrk=", "integrity": "sha1-VjsZx8HeiS4Jv8Ty/DDjwn8JUrk=",
"dev": true "dev": true
}, },

1
ng6-seed/package.json
View File

@ -43,6 +43,7 @@
"angular-sortablejs": "^2.7.0", "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",
"blueimp-canvas-to-blob": "^3.28.0",
"chart.js": "2.6.0", "chart.js": "2.6.0",
"core-js": "^2.6.5", "core-js": "^2.6.5",
"d3": "^4.9.1", "d3": "^4.9.1",

4
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dynamic-form/dynamic-question-template/dynamic-question-template.component.ts
View File

@ -410,8 +410,8 @@ export class DynamicQuestionTemplateComponent implements OnInit {
// }) // })
console.log(expression_value) console.log(expression_value)
let calc_exp=eval(expression_value) let calc_exp=eval(expression_value)
console.log(calc_exp) console.log(calc_exp, (typeof(calc_exp) == 'string' || typeof(calc_exp) == 'number' ))
if(calc_exp){ if( (typeof(calc_exp) == 'string' || typeof(calc_exp) == 'number' ) ){
// if(typeof(calc_exp) == 'number'){ // if(typeof(calc_exp) == 'number'){
// calc_exp = calc_exp.toFixed(2) // calc_exp = calc_exp.toFixed(2)
// } // }

9
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/image-capture/capture-btn/capture-btn.component.ts
View File

@ -1,5 +1,6 @@
import { Component, OnInit, Output, EventEmitter, Input, ElementRef, ViewChild } from '@angular/core'; import { Component, OnInit, Output, EventEmitter, Input, ElementRef, ViewChild } from '@angular/core';
import { CameraService } from 'app/personal-discussion/pd-service/camera.service'; import { CameraService } from 'app/personal-discussion/pd-service/camera.service';
import { LoaderService } from 'app/shared/loaderService/loader.service';
import { Ng2ImgMaxService } from 'ng2-img-max'; import { Ng2ImgMaxService } from 'ng2-img-max';
@Component({ @Component({
@ -11,7 +12,7 @@ export class CaptureBtnComponent implements OnInit {
@ViewChild('input_file') fileBtn :ElementRef @ViewChild('input_file') fileBtn :ElementRef
@Input() addMoreBtn; @Input() addMoreBtn;
@Output() imageDataEmitter = new EventEmitter @Output() imageDataEmitter = new EventEmitter
constructor(private ng2ImgMax:Ng2ImgMaxService,private cameraService:CameraService) { } constructor(private ng2ImgMax:Ng2ImgMaxService,private loaderService:LoaderService) { }
ngOnInit(): void { ngOnInit(): void {
console.log(this.addMoreBtn) console.log(this.addMoreBtn)
@ -20,12 +21,16 @@ export class CaptureBtnComponent implements OnInit {
// event.stopPropagation() // event.stopPropagation()
console.log(event); console.log(event);
let imageData= event.target.files[0] let imageData= event.target.files[0]
this.ng2ImgMax.resizeImage(imageData, 450, 650).subscribe( this.loaderService.showMatSpinnerDialog("Optimizing image..")
this.ng2ImgMax.resizeImage(imageData, 450, 650,true).subscribe(
result => { result => {
this.loaderService.closeMatSpinnerDialog();
this.imageDataEmitter.emit(result) this.imageDataEmitter.emit(result)
}, },
error => { error => {
this.loaderService.closeMatSpinnerDialog();
console.log('😢 Oh no!', error); console.log('😢 Oh no!', error);
alert(JSON.stringify(error))
} }
); );

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

@ -97,7 +97,7 @@ export class ImageCaptureComponent implements OnInit {
// this.router.navigateByUrl('error'); // this.router.navigateByUrl('error');
// } // }
addImage(event,index){ addImage(event,index){
this.loaderService.showMatSpinnerDialog(''); this.loaderService.showMatSpinnerDialog('Processing watermark..');
console.log(event,index); console.log(event,index);
var reader = new FileReader(); var reader = new FileReader();
// let imagePath = event; // let imagePath = event;

2
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html
View File

@ -21,7 +21,7 @@
<mat-icon>videocam</mat-icon>&nbsp; <mat-icon>videocam</mat-icon>&nbsp;
<strong>Call</strong> <strong>Call</strong>
</button> </button>
<button mat-stroked-button class="mr-1 mb-1" color="primary" (click)="openExcelUpload()" *ngIf="master.lender_short_name == 'MWISE' && LenderRoleID != '26' && currentPDStatus!=pdStatusCheck.INPROGRESS" > <button mat-stroked-button class="mr-1 mb-1" color="primary" (click)="openExcelUpload()" *ngIf="master.lender_short_name == 'MWISE' &&(LenderRoleID == '25' || LenderRoleID == '26' || LenderRoleID == '27') && currentPDStatus!=pdStatusCheck.INPROGRESS && currentPDStatus!=pdStatusCheck.COMPLETED" >
<mat-icon>upload_file</mat-icon>&nbsp; <mat-icon>upload_file</mat-icon>&nbsp;
<strong>Upload Excel</strong> <strong>Upload Excel</strong>
</button> </button>

8
ng6-seed/src/assets/data/SMC_CREDIT_TEMPLATES/LFMP/10.json
View File

@ -3,7 +3,7 @@
"section_name": "Financial Information", "section_name": "Financial Information",
"onsubmit": [ "onsubmit": [
{ {
"expression": "(function (){let sum_val=null;let ques_key=[];control.forEach(ques_obj=>{ques_key.push(ques_obj[submitProperty.key_name])});console.log('none',ques_key);return new Set(ques_key).size === ques_key.length}())", "expression": "(function (){let sum_val=null;let ques_key=[];if(!control || control == undefined || control == null){return true};control.forEach(ques_obj=>{ques_key.push(ques_obj[submitProperty.key_name])});console.log('none',ques_key);return new Set(ques_key).size === ques_key.length}())",
"group_key": "financial_info", "group_key": "financial_info",
"key_name": "fy", "key_name": "fy",
"msg": "Financial Year already entered earlier" "msg": "Financial Year already entered earlier"
@ -541,7 +541,7 @@
] ]
}, },
{ {
"question": "% (? /?) in Sales over PY", "question": "% Variation in Sales over PY",
"question_key": "sales_py", "question_key": "sales_py",
"type": "1", "type": "1",
"is_disabled": "1", "is_disabled": "1",
@ -556,7 +556,7 @@
] ]
}, },
{ {
"question": "% (? /?) in Net Profit over PY", "question": "% Variation in Net Profit over PY",
"question_key": "netprofit_py", "question_key": "netprofit_py",
"type": "1", "type": "1",
"is_disabled": "1", "is_disabled": "1",
@ -571,7 +571,7 @@
] ]
}, },
{ {
"question": "% (? /?) in Net Profit % over PY", "question": "Variation in Net Profit % over PY",
"question_key": "netprofit_py_percent", "question_key": "netprofit_py_percent",
"type": "1", "type": "1",
"is_disabled": "1", "is_disabled": "1",