Skip to content

Commit 64944d4

Browse files
asoftwareworldasoftwareworld
committed
upgrade angular version and added new feature for qr code
1 parent 22ad77f commit 64944d4

File tree

11 files changed

+397
-206
lines changed

11 files changed

+397
-206
lines changed

‎package.json

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,56 @@
11
{
2-
"name": "@asoftwareworld/form-builder",
3-
"version": "5.0.8",
4-
"author": "Anish Sharma",
5-
"license": "MIT",
6-
"scripts": {
7-
"ng": "ng",
8-
"start": "ng serve",
9-
"build": "ng build",
10-
"test": "ng test",
11-
"lint": "ng lint",
12-
"e2e": "ng e2e",
13-
"gulp": "gulp build-assets",
14-
"build-lib": "ng build form-builder && gulp build-assets"
15-
},
16-
"private": true,
17-
"dependencies": {
18-
"@angular/animations": "^15.0.4",
19-
"@angular/cdk": "~15.0.4",
20-
"@angular/common": "^15.0.4",
21-
"@angular/compiler": "^15.0.4",
22-
"@angular/core": "^15.0.4",
23-
"@angular/forms": "^15.0.4",
24-
"@angular/material": "~15.0.4",
25-
"@angular/platform-browser": "^15.0.4",
26-
"@angular/platform-browser-dynamic": "^15.0.4",
27-
"@angular/router": "^15.0.4",
28-
"@angular/google-maps": "^15.0.4",
29-
"@asoftwareworld/qrcode": "^1.2.0",
30-
"@types/fabric": "^4.2.5",
31-
"fabric": "^4.4.0",
32-
"bootstrap": "^5.1.3",
33-
"gulp": "^4.0.2",
34-
"gulp-concat": "^2.6.1",
35-
"gulp-dart-sass": "^1.0.2",
36-
"gulp-rename": "^2.0.0",
37-
"gulp-uglifycss": "^1.1.0",
38-
"ng-packagr": "^15.0.0",
39-
"rxjs": "~7.5.0",
40-
"tslib": "^2.3.0",
41-
"zone.js": "~0.11.4"
42-
},
43-
"devDependencies": {
44-
"@angular-devkit/build-angular": "^15.0.5",
45-
"@angular/cli": "~15.0.5",
46-
"@angular/compiler-cli": "^15.0.4",
47-
"@types/jasmine": "~4.3.0",
48-
"jasmine-core": "~4.5.0",
49-
"karma": "~6.4.0",
50-
"karma-chrome-launcher": "~3.1.0",
51-
"karma-coverage": "~2.2.0",
52-
"karma-jasmine": "~5.1.0",
53-
"karma-jasmine-html-reporter": "~2.0.0",
54-
"typescript": "~4.8.2"
55-
}
56-
}
2+
"name": "@asoftwareworld/form-builder",
3+
"version": "5.1.0",
4+
"author": "Anish Sharma",
5+
"license": "MIT",
6+
"scripts": {
7+
"ng": "ng",
8+
"start": "ng serve",
9+
"build": "ng build",
10+
"test": "ng test",
11+
"lint": "ng lint",
12+
"e2e": "ng e2e",
13+
"gulp": "gulp build-assets",
14+
"build-lib": "ng build form-builder && gulp build-assets"
15+
},
16+
"private": true,
17+
"dependencies": {
18+
"@angular/animations": "^15.2.3",
19+
"@angular/cdk": "~15.2.3",
20+
"@angular/common": "^15.2.3",
21+
"@angular/compiler": "^15.2.3",
22+
"@angular/core": "^15.2.3",
23+
"@angular/forms": "^15.2.3",
24+
"@angular/google-maps": "^15.0.4",
25+
"@angular/material": "~15.2.3",
26+
"@angular/platform-browser": "^15.2.3",
27+
"@angular/platform-browser-dynamic": "^15.2.3",
28+
"@angular/router": "^15.2.3",
29+
"@asoftwareworld/qrcode": "^2.0.0",
30+
"@types/fabric": "^4.2.5",
31+
"bootstrap": "^5.1.3",
32+
"fabric": "^4.4.0",
33+
"gulp": "^4.0.2",
34+
"gulp-concat": "^2.6.1",
35+
"gulp-dart-sass": "^1.0.2",
36+
"gulp-rename": "^2.0.0",
37+
"gulp-uglifycss": "^1.1.0",
38+
"ng-packagr": "^15.0.0",
39+
"rxjs": "~7.5.0",
40+
"tslib": "^2.3.0",
41+
"zone.js": "~0.11.4"
42+
},
43+
"devDependencies": {
44+
"@angular-devkit/build-angular": "^15.2.4",
45+
"@angular/cli": "~15.2.4",
46+
"@angular/compiler-cli": "^15.2.3",
47+
"@types/jasmine": "~4.3.0",
48+
"jasmine-core": "~4.5.0",
49+
"karma": "~6.4.0",
50+
"karma-chrome-launcher": "~3.1.0",
51+
"karma-coverage": "~2.2.0",
52+
"karma-jasmine": "~5.1.0",
53+
"karma-jasmine-html-reporter": "~2.0.0",
54+
"typescript": "~4.8.2"
55+
}
56+
}

‎src/components/form-builder/default-controls.ts

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -274,25 +274,27 @@ export const DIGITAL_CONTROLS = [
274274
];
275275

276276
export const OTHERS_CONTROLS = [
277-
// {
278-
// id: '1',
279-
// icon: 'cloud_upload',
280-
// displayName: 'File Upload',
281-
// controlType: 'fileupload',
282-
// label: 'File Upload',
283-
// column: 'col-md-12',
284-
// value: [],
285-
// isRequired: false
286-
// },
287277
{
288-
icon: 'qr_code_2',
278+
id: '',
279+
guid: '',
280+
icon: 'qrCode',
289281
displayName: 'QR Code',
290282
controlType: 'qr-code',
291-
centerImageSize: '30',
292-
centerImage: 'https://raw.githubusercontent.com/asoftwareworld/ASW-Form-Builder/master/asw.png',
293-
qrCodeSize: 240,
294-
errorCorrectionLevel: 'M',
283+
density: {
284+
errorCorrectionLevel: 'Q',
285+
mode: 'Byte',
286+
typeNumber: 0
287+
},
288+
logoStyle: {
289+
hideBackgroundCircle: true,
290+
logoSize: 0.3,
291+
logoMargin: 0
292+
},
293+
logo: '',
294+
width: 200,
295+
height: 200,
296+
outerMargin: 0,
297+
value: '',
295298
column: 'col-md-12',
296-
value: 'https://asoftwareworld.github.io/form-builder'
297-
},
299+
}
298300
];

‎src/components/form-control/core/constant/constants.ts

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
* found in the LICENSE file
77
*/
88

9-
import { AswQrcodeErrorCorrectionLevel } from '@asoftwareworld/qrcode';
10-
119
function getConstatnts(): any {
1210

1311
const defaultImage = 'data:image/jpeg;base64,/9j/4AAQSkZJRgABAQAAAQABAAD/4gIoSUNDX1BST0ZJTEUAAQEAAAIYAAAAAAQwAABtbnRyUkdCIFhZWiAAAAAAAAAAAAAAAABhY3NwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAA9tYAAQAAAADTLQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAlkZXNjAAAA8AAAAHRyWFlaAAABZAAAABRnWFlaAAABeAAAABRiWFlaAAABjAAAABRyVFJDAAABoAAAAChnVFJDAAABoAAAAChiVFJDAAABoAAAACh3dHB0AAAByAAAABRjcHJ0AAAB3AAAADxtbHVjAAAAAAAAAAEAAAAMZW5VUwAAAFgAAAAcAHMAUgBHAEIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFhZWiAAAAAAAABvogAAOPUAAAOQWFlaIAAAAAAAAGKZAAC3hQAAGNpYWVogAAAAAAAAJKAAAA+EAAC2z3BhcmEAAAAAAAQAAAACZmYAAPKnAAANWQAAE9AAAApbAAAAAAAAAABYWVogAAAAAAAA9tYAAQAAAADTLW1sdWMAAAAAAAAAAQAAAAxlblVTAAAAIAAAABwARwBvAG8AZwBsAGUAIABJAG4AYwAuACAAMgAwADEANv/bAEMABgQFBgUEBgYFBgcHBggKEAoKCQkKFA4PDBAXFBgYFxQWFhodJR8aGyMcFhYgLCAjJicpKikZHy0wLSgwJSgpKP/bAEMBBwcHCggKEwoKEygaFhooKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKP/AABEIATgDUgMBIgACEQEDEQH/xAAVAAEBAAAAAAAAAAAAAAAAAAAACP/EABQQAQAAAAAAAAAAAAAAAAAAAAD/xAAUAQEAAAAAAAAAAAAAAAAAAAAA/8QAFBEBAAAAAAAAAAAAAAAAAAAAAP/aAAwDAQACEQMRAD8AqkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH//2Q==';
@@ -135,13 +133,6 @@ function getConstatnts(): any {
135133
}
136134
];
137135

138-
const errorCorrectionLevels: AswQrcodeErrorCorrectionLevel[] = [
139-
AswQrcodeErrorCorrectionLevel.LOW,
140-
AswQrcodeErrorCorrectionLevel.MEDIUM,
141-
AswQrcodeErrorCorrectionLevel.HIGH,
142-
AswQrcodeErrorCorrectionLevel.QUARTILE
143-
];
144-
145136
const operations = [
146137
{
147138
value: '+',
@@ -204,7 +195,6 @@ function getConstatnts(): any {
204195
notificationMessage,
205196
messages,
206197
columns,
207-
errorCorrectionLevels,
208198
operations,
209199
defaultImage
210200
};

‎src/components/form-control/qrcode/qrcode-control.ts

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,19 @@
66
* found in the LICENSE file
77
*/
88

9-
import { AswQrcodeErrorCorrectionLevel } from '@asoftwareworld/qrcode';
9+
import { Density, LogoStyle } from '@asoftwareworld/qrcode';
1010

1111
export interface QrCodeControl {
12-
centerImageSize?: string | number;
13-
centerImage?: string;
14-
qrCodeSize?: number;
15-
errorCorrectionLevel: AswQrcodeErrorCorrectionLevel;
12+
id?: string;
13+
guid?: string;
1614
column: string;
1715
value: string;
1816
controlType?: string;
17+
displayName: string;
18+
height?: number;
19+
width?: number;
20+
logo?: string;
21+
outerMargin?: number;
22+
density?: Density;
23+
logoStyle?: LogoStyle;
1924
}

0 commit comments

Comments
 (0)