impaktapps-ui-builder 0.0.382-alpha.5 → 0.0.382-alpha.550

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (17) hide show
  1. package/dist/impaktapps-ui-builder.es.js +1052 -617
  2. package/dist/impaktapps-ui-builder.es.js.map +1 -1
  3. package/dist/impaktapps-ui-builder.umd.js +11 -11
  4. package/dist/impaktapps-ui-builder.umd.js.map +1 -1
  5. package/dist/src/impaktapps-ui-builder/builder/services/component.d.ts +4 -2
  6. package/dist/src/impaktapps-ui-builder/builder/services/event.d.ts +2 -1
  7. package/dist/src/impaktapps-ui-builder/builder/services/pageMaster.d.ts +3 -1
  8. package/package.json +1 -1
  9. package/src/impaktapps-ui-builder/builder/build/uischema/eventSection.ts +1 -1
  10. package/src/impaktapps-ui-builder/builder/build/uischema/tableSection.ts +4 -2
  11. package/src/impaktapps-ui-builder/builder/elements/UiSchema/Component/uiSchema.ts +464 -321
  12. package/src/impaktapps-ui-builder/builder/elements/UiSchema/PageMaster/uiSchema.ts +504 -340
  13. package/src/impaktapps-ui-builder/builder/elements/UiSchema/event/uiSchema.ts +87 -1
  14. package/src/impaktapps-ui-builder/builder/services/component.ts +23 -5
  15. package/src/impaktapps-ui-builder/builder/services/event.ts +9 -1
  16. package/src/impaktapps-ui-builder/builder/services/pageMaster.ts +19 -3
  17. package/src/impaktapps-ui-builder/runtime/services/service.ts +11 -0
package/src/impaktapps-ui-builder/builder/elements/UiSchema/PageMaster/uiSchema.ts CHANGED
@@ -1,317 +1,392 @@
1
- export const PageMasterUiSchema: any = (theme) => {
2
- const uiSchema = {
3
- type: "HorizontalLayout",
4
- heading: "Page Master",
5
- elements: [
6
- {
7
- type: "WrapperLayout",
8
- config: {
9
- main: {
10
- label: "Page Template",
11
- isAccordion: true,
12
- },
13
- wrapperStyle: {
14
- marginTop: '-6px',
15
- marginBottom: '-8px',
1
+ import { EventUiSchema } from "../event/uiSchema"
2
+ export const PageMasterUiSchema: any = {
3
+ type: "HorizontalLayout",
4
+ elements: [
5
+ {
6
+ type: "WrapperLayout",
7
+ config: {
8
+ main: {
9
+ rowSpacing: 1,
10
+ header: true,
11
+ },
12
+ defaultStyle: true,
13
+ },
14
+ elements: [
15
+ {
16
+ type: "Control",
17
+ scope: "#/properties/pageMaster",
18
+
19
+ options: {
20
+ widget: "Box",
16
21
  },
17
- componentsBoxStyle: {
18
- marginLeft: "24px",
22
+ config: {
23
+ layout: 8,
24
+ main: {
25
+ heading: "Page Master",
26
+ },
19
27
  },
20
- defaultStyle: true,
21
28
  },
22
- elements: [
23
- {
24
- type: "Control",
25
- scope: "#/properties/name",
29
+ {
30
+ type: "Control",
31
+ scope: "#/properties/Back_Button",
26
32
 
27
- options: {
28
- widget: "InputField",
33
+ options: {
34
+ widget: "IconButton",
35
+ },
36
+ config: {
37
+ layout: 3,
38
+ main: {
39
+ icon: "BackIcon",
40
+ styleDefault: true,
41
+ size: "small",
42
+ onClick: "backHandler",
43
+ tooltipMessage: "Back",
29
44
  },
30
- config: {
31
- layout: { xs: 11, sm: 4, md: 4, lg: 4 },
32
- main: {
33
- label: "Name",
34
- options: [],
35
- color: "secondary",
36
- errorMessage: "Name should be start with 'page_'",
37
- helperText: 'Name should be start with "page_"',
38
- required: true,
39
- },
45
+ style: {
46
+ float: "right",
40
47
  },
41
48
  },
42
- {
43
- type: "Control",
44
- scope: "#/properties/label",
49
+ },
50
+ ],
51
+ },
52
+ {
53
+ type: "WrapperLayout",
54
+ config: {
55
+ main: {
56
+ label: "Page Template",
57
+ divider: true,
58
+ },
59
+ defaultStyle: true,
60
+ },
61
+ elements: [
62
+ {
63
+ type: "Control",
64
+ scope: "#/properties/name",
45
65
 
46
- options: {
47
- widget: "InputField",
48
- },
49
- config: {
50
- layout: { xs: 11, sm: 4, md: 4, lg: 4 },
51
- main: {
52
- label: "Label",
53
- options: [],
54
- color: "secondary",
55
- required: true,
56
- },
66
+ options: {
67
+ widget: "InputField",
68
+ },
69
+ config: {
70
+ layout: { xs: 11, sm: 11, md: 5.5, lg: 5.5 },
71
+ main: {
72
+ label: "Name",
73
+ options: [],
74
+ color: "secondary",
75
+ errorMessage:"Name should be start with 'page_'",
76
+ helperText:'Name should be start with "page_"',
77
+ required: true,
57
78
  },
58
79
  },
59
- {
60
- type: "Control",
61
- scope: "#/properties/emptyBox",
62
- options: {
63
- widget: "EmptyBox"
80
+ },
81
+ {
82
+ type: "Control",
83
+ scope: "#/properties/label",
84
+
85
+ options: {
86
+ widget: "InputField",
87
+ },
88
+ config: {
89
+ layout: { xs: 11, sm: 11, md: 5.5, lg: 5.5 },
90
+ main: {
91
+ label: "Label",
92
+ options: [],
93
+ color: "secondary",
94
+ required: true,
64
95
  },
65
- config: {
66
- layout: { xs: 0, sm: 4 }
67
- }
68
- }
69
- ],
70
- },
71
- {
72
- type: "TabLayout",
73
- config: {
74
- main: {
75
- tabLabels: ["Components", "events"],
76
- divider: true,
77
96
  },
78
- defaultStyle: true,
97
+ }
98
+ ],
99
+ },
100
+ {
101
+ type: "TabLayout",
102
+ config: {
103
+ main: {
104
+ tabLabels: ["Components", "events"],
105
+ divider: true,
79
106
  },
80
- elements: [
81
- {
82
- type: "Control",
83
- scope: "#/properties/elements",
84
- options: {
85
- widget: "Table",
107
+ defaultStyle: true,
108
+ },
109
+ elements: [
110
+ {
111
+ type: "WrapperLayout",
112
+ config: {
113
+ main: {
114
+ // label: "Success Case Event",
115
+ divider: true,
86
116
  },
87
- config: {
88
- main: {
89
- headerIcons: {
90
- elements: [
91
- {
92
- widget: {
93
- type: "Control",
94
- scope: "#/properties/New_Record",
95
-
96
- options: {
97
- widget: "IconButton",
98
- },
99
- config: {
100
- main: {
101
- color: "info",
102
- onClick: "onAddClickHandler",
103
- size: "small",
104
- icon: "AddIcon",
105
- iconLabel: "Add New",
106
- styleDefault: true,
107
- },
108
- style: {
109
- mt: "6px",
110
- },
111
- },
112
- }
113
- },
114
- ]
117
+ wrapperStyle: {
118
+ border: "1px solid gray"
119
+ },
120
+ },
121
+ elements: [
122
+ {
123
+ type: "Control",
124
+ scope: "#/properties/heading",
125
+
126
+ options: {
127
+ widget: "Box",
128
+ },
129
+ config: {
130
+ layout: 8,
131
+ main: {
132
+ heading: "Components Table",
115
133
  },
116
- disableAction: true,
117
- disableSelection: true,
118
- enableDrag: true,
119
- }
134
+ style: {
135
+ fontFamily: "Roboto",
136
+ fontWeight: "500",
137
+ paddingLeft: "-10px",
138
+ fontSize: "20px",
139
+ },
140
+ },
120
141
  },
121
- elements: [
122
- {
123
- accessorKey: "name",
124
-
125
- header: "Name",
142
+ {
143
+ type: "Control",
144
+ scope: "#/properties/AddButton",
145
+ options: {
146
+ widget: "IconButton",
126
147
  },
127
- {
128
- accessorKey: "type",
129
-
130
- header: "Type",
148
+ config: {
149
+ layout: 3,
150
+ main: {
151
+ icon: "AddIcon",
152
+ styleDefault: true,
153
+ size: "small",
154
+ onClick: "onAddClickHandler",
155
+ tooltipMessage: "Add New",
156
+ },
157
+ style: {
158
+ float: "right",
159
+ },
131
160
  },
132
- {
133
- header: "Edit",
134
- field: "Reject_Records",
135
- flex: 1,
136
- widget: {
137
- type: "Control",
138
- scope: "#/properties/RejectButton",
139
- options: {
140
- widget: "IconButton",
141
- },
142
- config: {
143
- main: {
144
- icon: "EditIcon",
145
- color: "primary",
146
- onClick: "Edit_Components",
147
- tooltipMessage: "Edit This Record",
161
+ },
162
+ {
163
+ type: "Control",
164
+ scope: "#/properties/elements",
165
+ options: {
166
+ widget: "Table",
167
+ },
168
+ config: {
169
+ main: {
170
+ disableAction: true,
171
+ disableSelection: true,
172
+ enableDrag: true,
173
+ }
174
+ },
175
+ elements: [
176
+ {
177
+ accessorKey: "name",
178
+
179
+ header: "Name",
180
+ },
181
+ {
182
+ accessorKey: "type",
183
+
184
+ header: "Type",
185
+ },
186
+ {
187
+ header: "Edit",
188
+ field: "Reject_Records",
189
+ flex: 1,
190
+ widget: {
191
+ type: "Control",
192
+ scope: "#/properties/RejectButton",
193
+ options: {
194
+ widget: "IconButton",
195
+ },
196
+ config: {
197
+ main: {
198
+ icon: "EditIcon",
199
+ color: "primary",
200
+ onClick: "Edit_Components",
201
+ tooltipMessage: "Edit This Record",
202
+ },
148
203
  },
149
204
  },
150
205
  },
151
- },
152
- {
153
- header: "Delete",
154
- field: "Reject_Records",
155
- flex: 1,
156
- widget: {
157
- type: "Control",
158
- scope: "#/properties/RejectButton",
159
- options: {
160
- widget: "IconButton",
161
- },
162
- config: {
163
- main: {
164
- icon: "RejectIcon",
165
- color: "error",
166
- onClick: "Delete_Components",
167
- tooltipMessage: "Reject This Record",
206
+ {
207
+ header: "Delete",
208
+ field: "Reject_Records",
209
+ flex: 1,
210
+ widget: {
211
+ type: "Control",
212
+ scope: "#/properties/RejectButton",
213
+ options: {
214
+ widget: "IconButton",
215
+ },
216
+ config: {
217
+ main: {
218
+ icon: "RejectIcon",
219
+ color: "error",
220
+ onClick: "deletePopUpComponent",
221
+ tooltipMessage: "Reject This Record",
222
+ },
168
223
  },
169
224
  },
170
- },
171
- }]
225
+ }
226
+ ]
227
+ },
228
+ ]
229
+ },
230
+ {
231
+ type: "WrapperLayout",
232
+ config: {
233
+ main: {
234
+ // label: "Success Case Event",
235
+ divider: true,
236
+ },
237
+ wrapperStyle: {
238
+ border: "1px solid gray"
239
+ },
172
240
  },
173
- {
174
- type: "Control",
175
- scope: "#/properties/events",
176
- options: {
177
- widget: "Table",
241
+ elements: [
242
+ {
243
+ type: "Control",
244
+ scope: "#/properties/heading",
245
+
246
+ options: {
247
+ widget: "Box",
248
+ },
249
+ config: {
250
+ layout: 8,
251
+ main: {
252
+ heading: "Event Table",
253
+ },
254
+ style: {
255
+ fontFamily: "Roboto",
256
+ fontWeight: "500",
257
+ paddingLeft: "-10px",
258
+ fontSize: "20px",
259
+ },
260
+ },
178
261
  },
179
- config: {
180
- main: {
181
- headerIcons: {
182
- elements: [
183
- {
184
- widget: {
185
- type: "Control",
186
- scope: "#/properties/New_Record",
187
-
188
- options: {
189
- widget: "IconButton",
190
- },
191
- config: {
192
- main: {
193
- color: "info",
194
- onClick: "eventAddHandler",
195
- size: "small",
196
- icon: "AddIcon",
197
- iconLabel: "Add New",
198
- styleDefault: true,
199
- },
200
- style: {
201
- mt: "6px",
202
- },
203
- },
204
- }
205
- },
206
- ]
262
+ {
263
+ type: "Control",
264
+ scope: "#/properties/AddButton",
265
+ options: {
266
+ widget: "IconButton",
267
+ },
268
+ config: {
269
+ layout: 3,
270
+ main: {
271
+ icon: "AddIcon",
272
+ styleDefault: true,
273
+ size: "small",
274
+ onClick: "eventAddHandler",
275
+ tooltipMessage: "Back",
276
+ },
277
+ style: {
278
+ float: "right",
207
279
  },
208
- disableAction: true,
209
- disableSelection: true,
210
- enableDrag: true,
211
-
212
280
  },
213
281
  },
214
- elements: [
215
-
216
- {
217
- accessorKey: "eventType",
218
- header: "Event Type",
282
+
283
+ {
284
+ type: "Control",
285
+ scope: "#/properties/events",
286
+ options: {
287
+ widget: "Table",
219
288
  },
220
- {
221
- accessorKey: "Handler",
222
- header: "Handler",
289
+ config: {
290
+ main: {
291
+ disableAction: true,
292
+ disableSelection: true,
293
+ enableDrag: true,
294
+
295
+ },
223
296
  },
224
- {
225
- accessorKey: "Edit_Approve_Records",
226
- header: "Edit Widget",
227
- widget: {
228
- type: "Control",
229
- scope: "#/properties/Edit_Records",
230
- options: {
231
- widget: "IconButton",
232
- },
233
- config: {
234
- main: {
235
- color: "info",
236
- size: "small",
237
- icon: "EditIcon",
238
- tooltipMessage: "Edit This Record",
239
- onClick: "editEvent",
297
+ elements: [
298
+
299
+ {
300
+ accessorKey: "eventType",
301
+ header: "Event Type",
302
+ },
303
+ {
304
+ accessorKey: "Handler",
305
+ header: "Handler",
306
+ },
307
+ {
308
+ accessorKey: "Edit_Approve_Records",
309
+ header: "Edit Widget",
310
+ widget: {
311
+ type: "Control",
312
+ scope: "#/properties/Edit_Records",
313
+ options: {
314
+ widget: "IconButton",
240
315
  },
241
- style: {
242
- color: "#3949ab",
316
+ config: {
317
+ main: {
318
+ color: "info",
319
+ size: "small",
320
+ icon: "EditIcon",
321
+ tooltipMessage: "Edit This Record",
322
+ onClick: "editEvent",
323
+ },
324
+ style: {
325
+ color: "#3949ab",
326
+ },
243
327
  },
244
328
  },
245
329
  },
246
- },
247
- {
248
- accessorKey: "Reject_Records",
249
- header: "Delete",
250
- widget: {
251
- type: "Control",
252
- scope: "#/properties/RejectButton",
253
- options: {
254
- widget: "IconButton",
255
- },
256
- config: {
257
- main: {
258
- icon: "RejectIcon",
259
- color: "error",
260
- tooltipMessage: "Reject This Record",
261
- onClick: "deleteEvent",
330
+ {
331
+ accessorKey: "Reject_Records",
332
+ header: "Delete",
333
+ widget: {
334
+ type: "Control",
335
+ scope: "#/properties/RejectButton",
336
+ options: {
337
+ widget: "IconButton",
338
+ },
339
+ config: {
340
+ main: {
341
+ icon: "RejectIcon",
342
+ color: "error",
343
+ tooltipMessage: "Reject This Record",
344
+ onClick: "deletePopUpEvent",
345
+ },
262
346
  },
263
347
  },
264
348
  },
265
- },
266
- ]
267
- },
268
-
269
- ],
270
- },
271
- {
272
- type: "Control",
273
- scope: "#/properties/btn",
274
- options: {
275
- widget: "Button",
349
+ ]
350
+ }]
276
351
  },
352
+
353
+ ],
354
+ },
277
355
 
278
- config: {
279
- layout: 11.9,
280
- main: {
281
- name: "Save",
282
- startIcon: "ApproveIcon",
283
- variant: "contained",
284
- color: "info",
285
- type: "text",
286
- onClick: "saveHandler",
287
- size: "medium",
288
- },
289
- style: {
290
- width: { xs: "90%", sm: "90%", md: "20%", lg: "10%" },
291
- float: "right",
292
- },
293
- },
356
+ {
357
+ type: "Control",
358
+ scope: "#/properties/popUpPageMasterEvent",
359
+ options: {
360
+ widget: "PopUp"
294
361
  },
295
- {
296
- type: "Control",
297
- scope: "#/properties/notify",
298
- options: {
299
- widget: "Notify",
362
+ config: {
363
+ layout: {
364
+ xs: 12,
365
+ sm: 12,
366
+ md: 12,
367
+ lg: 12,
300
368
  },
301
- layout: 6,
302
- },
303
- {
304
- type: "HorizontalLayout",
305
- config: {
306
- style: {
307
- position: "fixed",
308
- bottom: 5,
309
- overflow: 'visible',
310
- margin: "0",
311
- width: "100vw",
312
- }
369
+ main: {
313
370
  },
314
- elements: [
371
+ },
372
+ elements:
373
+ [
374
+ {
375
+ type: "Control",
376
+ scope: "#/properties/label",
377
+ options: {
378
+ widget: "Box",
379
+ },
380
+ config: {
381
+ layout: 12,
382
+ main: {
383
+ heading: "Are you sure you want to delete ?",
384
+ },
385
+ style:{
386
+ marginTop: "-40px"
387
+ }
388
+ },
389
+ },
315
390
  {
316
391
  type: "Control",
317
392
  scope: "#/properties/EmptyBox",
@@ -319,93 +394,182 @@ export const PageMasterUiSchema: any = (theme) => {
319
394
  widget: "EmptyBox",
320
395
  },
321
396
  config: {
322
- layout: { xs: 0, sm: 4, md: 4, lg: 4 },
397
+ main:{},
398
+ layout: { xs: 11, sm: 5.5, md: 5.5, lg: 5.5 },
399
+ },
400
+ },
401
+ {
402
+ type: "Control",
403
+ scope: "#/properties/ConfirmDeleteEventButton",
404
+ options: {
405
+ widget: "Button",
406
+ },
407
+ config: {
408
+ layout: 3,
409
+ main: {
410
+ name: "Yes",
411
+ startIcon: "ApproveIcon",
412
+ variant: "contained",
413
+ color: "info",
414
+ type: "text",
415
+ onClick: "deleteEvent",
416
+ size: "small",
417
+ },
323
418
  },
324
419
  },
325
420
  {
421
+ type: "Control",
422
+ scope: "#/properties/CancelDeleteEventButton",
423
+ options: {
424
+ widget: "Button",
425
+ },
426
+ config: {
427
+ layout: 3,
428
+ main: {
429
+ name: "No",
430
+ startIcon: "ApproveIcon",
431
+ variant: "contained",
432
+ color: "info",
433
+ type: "text",
434
+ onClick: "deletePopUpEvent",
435
+ size: "small",
436
+ },
437
+ },
438
+ },
439
+ ]
440
+ },
326
441
 
442
+ {
443
+ type: "Control",
444
+ scope: "#/properties/popUpPageMasterComponent",
445
+ options: {
446
+ widget: "PopUp"
447
+ },
448
+ config: {
449
+ layout: {
450
+ xs: 12,
451
+ sm: 12,
452
+ md: 12,
453
+ lg: 12,
454
+ },
455
+ main: {
456
+ },
457
+ },
458
+ elements:
459
+ [
460
+ {
327
461
  type: "Control",
328
- scope: "#/properties/FooterText",
462
+ scope: "#/properties/label",
329
463
  options: {
330
464
  widget: "Box",
331
465
  },
332
466
  config: {
333
- layout: { xs: 11, sm: 4, md: 4, lg: 4 },
467
+ layout: 12,
334
468
  main: {
335
- heading: "Copywriter@ACT21.IO"
469
+ heading: "Are you sure you want to delete ?",
336
470
  },
337
- style: {
338
- color: theme?.palette?.text.disabled || "#AFAFAF",
339
- fontSize: '12px',
471
+ style:{
472
+ marginTop: "-40px"
340
473
  }
341
474
  },
342
475
  },
343
476
  {
344
- type: "HorizontalLayout",
477
+ type: "Control",
478
+ scope: "#/properties/EmptyBox",
479
+ options: {
480
+ widget: "EmptyBox",
481
+ },
345
482
  config: {
346
- layout: { xs: 11, sm: 4, md: 4, lg: 4 },
483
+ main:{},
484
+ layout: { xs: 11, sm: 5.5, md: 5.5, lg: 5.5 },
347
485
  },
348
- elements: [
349
- {
350
- type: "Control",
351
- scope: "#/properties/EmptyBox",
352
- options: {
353
- widget: "EmptyBox",
354
- },
355
- config: {
356
- layout: 2,
357
- },
358
- },
359
- {
360
- type: "Control",
361
- scope: "#/properties/backIcon",
362
- options: {
363
- widget: "Box",
364
- },
365
- config: {
366
- layout: 1,
367
- main: {
368
- iconName: 'PrevIcon',
369
- onClick: "backHandler"
370
- },
371
- style: {
372
- fill: theme.palette.primary.dark,
373
- width: 20,
374
- height: 20,
375
- display: 'flex',
376
- alignItems: 'center',
377
- justifyContent: 'center',
378
- marginRight: '-8px',
379
- cursor: 'pointer'
380
- }
381
- }
486
+ },
487
+ {
488
+ type: "Control",
489
+ scope: "#/properties/ConfirmDeleteCompButton",
490
+ options: {
491
+ widget: "Button",
492
+ },
493
+ config: {
494
+ layout: 3,
495
+ main: {
496
+ name: "Yes",
497
+ startIcon: "ApproveIcon",
498
+ variant: "contained",
499
+ color: "info",
500
+ type: "text",
501
+ onClick: "Delete_Components",
502
+ size: "small",
382
503
  },
383
- {
384
- type: "Control",
385
- scope: "#/properties/text",
386
-
387
- options: {
388
- widget: "Box",
389
- },
390
- config: {
391
- layout: 9,
392
- main: {
393
- heading: "Previous Page",
394
- onClick: "backHandler"
395
- },
396
- style: {
397
- color: theme.palette.primary.dark,
398
- fontSize: "12px",
399
- cursor: 'pointer',
400
- marginLeft: '-6px'
401
- }
402
- },
504
+ },
505
+ },
506
+ {
507
+ type: "Control",
508
+ scope: "#/properties/CancelDeleteCompButton",
509
+ options: {
510
+ widget: "Button",
511
+ },
512
+ config: {
513
+ layout: 3,
514
+ main: {
515
+ name: "No",
516
+ startIcon: "ApproveIcon",
517
+ variant: "contained",
518
+ color: "info",
519
+ type: "text",
520
+ onClick: "deletePopUpComponent",
521
+ size: "small",
403
522
  },
404
- ],
523
+ },
405
524
  },
406
525
  ]
526
+ },
527
+
528
+
529
+
530
+ {
531
+ type: "Control",
532
+ scope: "#/properties/btn",
533
+ options: {
534
+ widget: "EmptyBox",
535
+ },
536
+ config: {
537
+ layout: { xs: 0, sm: 0, md: 8, lg: 7 },
407
538
  }
408
- ]
409
- };
410
- return uiSchema
411
- }
539
+ },
540
+ {
541
+ type: "Control",
542
+ scope: "#/properties/btn",
543
+ options: {
544
+ widget: "Button",
545
+ },
546
+
547
+ config: {
548
+ layout: 11.7,
549
+ main: {
550
+ name: "Save",
551
+ startIcon: "ApproveIcon",
552
+ variant: "contained",
553
+ color: "info",
554
+ type: "text",
555
+ onClick: "saveHandler",
556
+ size: "small",
557
+ },
558
+ style: {
559
+ marginBottom: "8px",
560
+ width:{xs:"100%",sm:"100%",md:"25%",lg:"20%"},
561
+ float: "right",
562
+ },
563
+ },
564
+ },
565
+ {
566
+ type: "Control",
567
+ scope: "#/properties/notify",
568
+ options: {
569
+ widget: "Notify",
570
+ },
571
+ layout: 6,
572
+ }
573
+ ]
574
+ }
575
+