@bennerinformatics/ember-fw-table 2.0.16 → 2.0.18

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 (16) hide show
  1. package/addon/components/fw-cell-permission-icon.js +11 -0
  2. package/addon/components/fw-column-sortable.js +1 -1
  3. package/addon/components/fw-pagination-wrapper.js +470 -470
  4. package/addon/components/fw-row-toggle.js +1 -1
  5. package/addon/components/fw-table-sortable.js +390 -390
  6. package/addon/templates/components/fw-cell-action.hbs +2 -2
  7. package/addon/templates/components/fw-cell-permission-icon.hbs +9 -0
  8. package/addon/templates/components/fw-delete-modal.hbs +12 -12
  9. package/addon/templates/components/fw-pagination-wrapper.hbs +74 -74
  10. package/addon/templates/components/fw-table-expanded-row.hbs +23 -23
  11. package/addon/templates/components/fw-table-resort.hbs +4 -4
  12. package/addon/templates/components/fw-table-sortable.hbs +76 -76
  13. package/app/breakpoints.js +1 -0
  14. package/app/components/fw-cell-permission-icon.js +1 -0
  15. package/app/initializers/responsive.js +1 -0
  16. package/package.json +63 -63
package/addon/templates/components/fw-cell-action.hbs CHANGED
@@ -1,12 +1,12 @@
1
1
  {{#if tableActions.edit}}
2
2
  <button class='btn btn-sm btn-primary' title='Edit' {{action tableActions.edit row.content bubbles=false}}>
3
- <i class='fas fa-pencil-alt'/>
3
+ <i class='fa-solid fa-pencil'/>
4
4
  {{unless column.small 'Edit'}}
5
5
  </button>
6
6
  {{/if}}
7
7
  {{#if tableActions.delete}}
8
8
  <button class='btn btn-sm btn-danger' title='Delete' {{action tableActions.delete row.content bubbles=false}}>
9
- <i class='far fa-trash-alt'/>
9
+ <i class='fa-regular fa-trash-can'/>
10
10
  {{unless column.small 'Delete'}}
11
11
  </button>
12
12
  {{/if}}
package/addon/templates/components/fw-cell-permission-icon.hbs ADDED
@@ -0,0 +1,9 @@
1
+ {{#if (eq value 2)}}
2
+ <span class="text-success" title="Has Permission"><i class="fa-solid fa-check"></i></span>
3
+ {{/if}}
4
+ {{#if (eq value 1)}}
5
+ <span class="text-primary" title="Permission Determined By Access Control"><i class="fa-solid fa-lock"></i></span>
6
+ {{/if}}
7
+ {{#if (eq value 0)}}
8
+ <span class="text-danger" title="Doesn't Have Permission"><i class="fa-solid fa-xmark"></i></span>
9
+ {{/if}}
package/addon/templates/components/fw-delete-modal.hbs CHANGED
@@ -1,12 +1,12 @@
1
- {{fw-fullscreen-modal "confirm-choice"
2
- size="md"
3
- model=(hash
4
- confirmButtonText="Delete"
5
- confirmButtonStyle="danger"
6
- confirmButtonIcon="far fa-trash-alt"
7
- onconfirm=(action 'deleteModel')
8
- message=_message
9
- )
10
- close=close
11
- scrollTop=scrollTop
12
- }}
1
+ {{fw-fullscreen-modal "confirm-choice"
2
+ size="md"
3
+ model=(hash
4
+ confirmButtonText="Delete"
5
+ confirmButtonStyle="danger"
6
+ confirmButtonIcon="fa-regular fa-trash-can"
7
+ onconfirm=(action 'deleteModel')
8
+ message=_message
9
+ )
10
+ close=close
11
+ scrollTop=scrollTop
12
+ }}
package/addon/templates/components/fw-pagination-wrapper.hbs CHANGED
@@ -1,74 +1,74 @@
1
- {{!-- Search buttons, whole search component is in block --}}
2
- {{yield (hash
3
- search=(action 'search')
4
- export=(action 'export')
5
- ) false}}
6
-
7
- {{!-- Table contents, show loading spinner if in progress --}}
8
- <div class={{tableWrapperClass}}>
9
- {{#if searchingTable}}
10
- {{fw-loading-spinner}}
11
- {{else if pageEntries}}
12
- {{!-- Page numbers --}}
13
- {{#if showPages}}
14
- <div class="text-center" style="overflow:auto">
15
- {{page-numbers
16
- content=(hash)
17
- showFL=true
18
- currentPage=page
19
- numPagesToShow=maxPageButtons
20
- totalPages=totalPages
21
- action=(action 'setPage')
22
- }}
23
- </div>
24
- {{/if}}
25
- {{!-- If we are searching a page, show its loading spinner --}}
26
- {{#if pagesSearching}}
27
- {{fw-loading-spinner}}
28
- {{else}}
29
- {{!-- If given a column getter, use that for columns --}}
30
- {{#if tableColumns}}
31
- {{fw-table-sortable
32
- filteredEntries
33
- tableColumns
34
- title=fullTableTitle
35
- class='sticky-table'
36
- defaultSort=(array tableSortKey defaultSortKey)
37
- responsive=true
38
- empty=emptyText
39
- hideEmpty=hideEmpty
40
- canExport=(if showExport 'Export Page' false)
41
- deleteTable=deletePage
42
- deleteTablePermission=deletePagePermission
43
- deleteOverrideTitle='Delete Page'
44
- onSort=(action 'sortColumn')
45
- tableActions=tableActions
46
- }}
47
- {{else}}
48
- {{!-- Let the user provide the table --}}
49
- {{yield (hash
50
- sort=(action 'sortColumn')
51
- ) (hash
52
- title=fullTableTitle
53
- suffix=tableSuffix
54
- entries=filteredEntries
55
- sortKey=tableSortKey
56
- )}}
57
- {{/if}}
58
-
59
- {{!-- Second page numbers --}}
60
- {{#if showPages}}
61
- <div class="text-center" style="overflow:auto">
62
- {{page-numbers
63
- content=(hash)
64
- showFL=true
65
- currentPage=page
66
- numPagesToShow=maxPageButtons
67
- totalPages=totalPages
68
- action=(action 'setPage')
69
- }}
70
- </div>
71
- {{/if}}
72
- {{/if}}
73
- {{/if}}
74
- </div>
1
+ {{!-- Search buttons, whole search component is in block --}}
2
+ {{yield (hash
3
+ search=(action 'search')
4
+ export=(action 'export')
5
+ ) false}}
6
+
7
+ {{!-- Table contents, show loading spinner if in progress --}}
8
+ <div class={{tableWrapperClass}}>
9
+ {{#if searchingTable}}
10
+ {{fw-loading-spinner}}
11
+ {{else if pageEntries}}
12
+ {{!-- Page numbers --}}
13
+ {{#if showPages}}
14
+ <div class="text-center" style="overflow:auto">
15
+ {{page-numbers
16
+ content=(hash)
17
+ showFL=true
18
+ currentPage=page
19
+ numPagesToShow=maxPageButtons
20
+ totalPages=totalPages
21
+ action=(action 'setPage')
22
+ }}
23
+ </div>
24
+ {{/if}}
25
+ {{!-- If we are searching a page, show its loading spinner --}}
26
+ {{#if pagesSearching}}
27
+ {{fw-loading-spinner}}
28
+ {{else}}
29
+ {{!-- If given a column getter, use that for columns --}}
30
+ {{#if tableColumns}}
31
+ {{fw-table-sortable
32
+ filteredEntries
33
+ tableColumns
34
+ title=fullTableTitle
35
+ class='sticky-table'
36
+ defaultSort=(array tableSortKey defaultSortKey)
37
+ responsive=true
38
+ empty=emptyText
39
+ hideEmpty=hideEmpty
40
+ canExport=(if showExport 'Export Page' false)
41
+ deleteTable=deletePage
42
+ deleteTablePermission=deletePagePermission
43
+ deleteOverrideTitle='Delete Page'
44
+ onSort=(action 'sortColumn')
45
+ tableActions=tableActions
46
+ }}
47
+ {{else}}
48
+ {{!-- Let the user provide the table --}}
49
+ {{yield (hash
50
+ sort=(action 'sortColumn')
51
+ ) (hash
52
+ title=fullTableTitle
53
+ suffix=tableSuffix
54
+ entries=filteredEntries
55
+ sortKey=tableSortKey
56
+ )}}
57
+ {{/if}}
58
+
59
+ {{!-- Second page numbers --}}
60
+ {{#if showPages}}
61
+ <div class="text-center" style="overflow:auto">
62
+ {{page-numbers
63
+ content=(hash)
64
+ showFL=true
65
+ currentPage=page
66
+ numPagesToShow=maxPageButtons
67
+ totalPages=totalPages
68
+ action=(action 'setPage')
69
+ }}
70
+ </div>
71
+ {{/if}}
72
+ {{/if}}
73
+ {{/if}}
74
+ </div>
package/addon/templates/components/fw-table-expanded-row.hbs CHANGED
@@ -1,23 +1,23 @@
1
- {{!-- If column has a hideLabel set to true, just spit back the value of whatever the user gave it --}}
2
- {{#if column.hideLabel}}
3
- {{#if column.cellComponent}}
4
- {{!-- Pass in all the normal component values, but add an extra boolean so they know it is a hidden row --}}
5
- {{component column.cellComponent tableActions=tableActions table=table column=column row=row value=value rawValue=rawValue isExpandedRow=true}}
6
- {{else}}
7
- {{value}}
8
- {{/if}}
9
- {{else}}
10
- {{!-- Only print the cell if the column label is defined--}}
11
- {{#if column.label}}
12
- <dt class="{{column.classNames}}" title="{{column.label}}">{{column.label}}:</dt>
13
- <dd class="{{column.cellClassNames}}">
14
- {{!-- If the cell has a custom component, use that --}}
15
- {{#if column.cellComponent}}
16
- {{!-- Pass in all the normal component values, but add an extra boolean so they know it is a hidden row --}}
17
- {{component column.cellComponent tableActions=tableActions table=table column=column row=row value=value rawValue=rawValue isExpandedRow=true}}
18
- {{else}}
19
- {{value}}
20
- {{/if}}
21
- </dd>
22
- {{/if}}
23
- {{/if}}
1
+ {{!-- If column has a hideLabel set to true, just spit back the value of whatever the user gave it --}}
2
+ {{#if column.hideLabel}}
3
+ {{#if column.cellComponent}}
4
+ {{!-- Pass in all the normal component values, but add an extra boolean so they know it is a hidden row --}}
5
+ {{component column.cellComponent tableActions=tableActions table=table column=column row=row value=value rawValue=rawValue isExpandedRow=true}}
6
+ {{else}}
7
+ {{value}}
8
+ {{/if}}
9
+ {{else}}
10
+ {{!-- Only print the cell if the column label is defined--}}
11
+ {{#if column.label}}
12
+ <dt class="{{column.classNames}}" title="{{column.label}}">{{column.label}}:</dt>
13
+ <dd class="{{column.cellClassNames}}">
14
+ {{!-- If the cell has a custom component, use that --}}
15
+ {{#if column.cellComponent}}
16
+ {{!-- Pass in all the normal component values, but add an extra boolean so they know it is a hidden row --}}
17
+ {{component column.cellComponent tableActions=tableActions table=table column=column row=row value=value rawValue=rawValue isExpandedRow=true}}
18
+ {{else}}
19
+ {{value}}
20
+ {{/if}}
21
+ </dd>
22
+ {{/if}}
23
+ {{/if}}
package/addon/templates/components/fw-table-resort.hbs CHANGED
@@ -3,17 +3,17 @@
3
3
  {{#sortable-item tagName="li" model=item group=group handle=".handle" spacing=spacing}}
4
4
  <div class="input-group">
5
5
  <span class="input-group-addon handle draggable">
6
- <i class="fas fa-ellipsis-v fa-2"></i>
6
+ <i class="fa-solid fa-ellipsis-vertical fa-2"></i>
7
7
  </span>
8
8
  {{#if hasBlock}}
9
9
  {{#if allowExpand}}
10
10
  {{#if item.unexpandable}}
11
11
  <span class="input-group-addon">
12
- <i class="fas fa-chevron-right faded"></i>
12
+ <i class="fa-solid fa-chevron-right faded"></i>
13
13
  </span>
14
14
  {{else}}
15
15
  <span class="input-group-addon clickable" {{action "toggleExpanded" item}}>
16
- <i class={{if item.expanded "fas fa-chevron-down" "fas fa-chevron-right"}}></i>
16
+ <i class={{if item.expanded "fa-solid fa-chevron-down" "fa-solid fa-chevron-right"}}></i>
17
17
  </span>
18
18
  {{/if}}
19
19
  {{/if}}
@@ -28,7 +28,7 @@
28
28
  <span class="input-group-addon">&nbsp;&nbsp;&nbsp;</span>
29
29
  {{else}}
30
30
  <span class="input-group-addon clickable" {{action "deleteItem" item}}>
31
- <i class="far fa-trash-alt fa-2"></i>
31
+ <i class="fa-regular fa-trash-can fa-2"></i>
32
32
  </span>
33
33
  {{/if}}
34
34
  {{else}}
package/addon/templates/components/fw-table-sortable.hbs CHANGED
@@ -1,76 +1,76 @@
1
- {{#if (or (and hasBlock showHeader) title canExport)}}
2
- <header class="panel-heading">
3
- {{#if (and hasBlock showHeader)}}
4
- {{yield (action 'export') true}}
5
- {{else}}
6
- <strong class="panel-title">{{or title 'Table'}}</strong>
7
- {{#if (and deleteTable deleteTablePermission)}}
8
- {{fw-promise-button
9
- class="btn btn-xs pull-right"
10
- buttonIcon='far fa-trash-alt'
11
- buttonText=deleteTitle
12
- buttonStyle='danger'
13
- promise=(action deleteTable data)
14
- type='submit'
15
- }}
16
- {{/if}}
17
- {{#if canExport}}
18
- <button class="btn btn-xs btn-primary pull-right" {{action 'export'}}>
19
- <i class="far fa-file-excel"/>
20
- {{exportTitle}}
21
- </button>
22
- {{/if}}
23
- {{/if}}
24
- <div class="clearfix"/>
25
- </header>
26
- {{/if}}
27
- <section class="panel-body table-body">
28
- {{#if (and table.isEmpty (not headerEmpty))}}
29
- {{empty}}
30
- {{else}}
31
- {{#light-table
32
- table
33
- height=fixedHeight
34
- tableClassNames=(concat "table table-striped table-bordered " tableClassNames)
35
- tableActions=tableActions
36
- responsive=responsive
37
- breakpoints=breakpoints
38
- as |t|
39
- }}
40
- {{t.head
41
- onColumnClick=(action 'sort')
42
- iconAscending='fas fa-sort-up'
43
- iconDescending='fas fa-sort-down'
44
- iconSortable='fas fa-sort'
45
- sortOnClick=false
46
- fixed=(if fixedHeight true false)
47
- }}
48
- {{#t.body
49
- canExpand=hasExpandedColumns
50
- onRowClick=(action 'expand')
51
- expandOnClick=false
52
- multiRowExpansion=false
53
- rowComponent=(component 'fw-expandable-row')
54
- canSelect=false
55
- as |body|
56
- }}
57
- {{#if table.hasExpandedColumns}}
58
- {{#body.expanded-row as |row|}}
59
- {{fw-table-expanded-rows tableActions=tableActions table=table row=row}}
60
- {{/body.expanded-row}}
61
- {{/if}}
62
-
63
- {{#if table.isEmpty}}
64
- {{#body.no-data}}
65
- {{empty}}
66
- {{/body.no-data}}
67
- {{/if}}
68
- {{/t.body}}
69
- {{/light-table}}
70
- {{/if}}
71
- </section>
72
- {{#if (and hasBlock showFooter)}}
73
- <footer class="panel-footer clearfix">
74
- {{yield (action 'export') false}}
75
- </footer>
76
- {{/if}}
1
+ {{#if (or (and hasBlock showHeader) title canExport)}}
2
+ <header class="panel-heading">
3
+ {{#if (and hasBlock showHeader)}}
4
+ {{yield (action 'export') true}}
5
+ {{else}}
6
+ <strong class="panel-title">{{or title 'Table'}}</strong>
7
+ {{#if (and deleteTable deleteTablePermission)}}
8
+ {{fw-promise-button
9
+ class="btn btn-xs pull-right"
10
+ buttonIcon='fa-regular fa-trash-can'
11
+ buttonText=deleteTitle
12
+ buttonStyle='danger'
13
+ promise=(action deleteTable data)
14
+ type='submit'
15
+ }}
16
+ {{/if}}
17
+ {{#if canExport}}
18
+ <button class="btn btn-xs btn-primary pull-right" {{action 'export'}}>
19
+ <i class="fa-regular fa-file-excel"/>
20
+ {{exportTitle}}
21
+ </button>
22
+ {{/if}}
23
+ {{/if}}
24
+ <div class="clearfix"/>
25
+ </header>
26
+ {{/if}}
27
+ <section class="panel-body table-body">
28
+ {{#if (and table.isEmpty (not headerEmpty))}}
29
+ {{empty}}
30
+ {{else}}
31
+ {{#light-table
32
+ table
33
+ height=fixedHeight
34
+ tableClassNames=(concat "table table-striped table-bordered " tableClassNames)
35
+ tableActions=tableActions
36
+ responsive=responsive
37
+ breakpoints=breakpoints
38
+ as |t|
39
+ }}
40
+ {{t.head
41
+ onColumnClick=(action 'sort')
42
+ iconAscending='fa-solid fa-sort-up'
43
+ iconDescending='fa-solid fa-sort-down'
44
+ iconSortable='fa-solid fa-sort'
45
+ sortOnClick=false
46
+ fixed=(if fixedHeight true false)
47
+ }}
48
+ {{#t.body
49
+ canExpand=hasExpandedColumns
50
+ onRowClick=(action 'expand')
51
+ expandOnClick=false
52
+ multiRowExpansion=false
53
+ rowComponent=(component 'fw-expandable-row')
54
+ canSelect=false
55
+ as |body|
56
+ }}
57
+ {{#if table.hasExpandedColumns}}
58
+ {{#body.expanded-row as |row|}}
59
+ {{fw-table-expanded-rows tableActions=tableActions table=table row=row}}
60
+ {{/body.expanded-row}}
61
+ {{/if}}
62
+
63
+ {{#if table.isEmpty}}
64
+ {{#body.no-data}}
65
+ {{empty}}
66
+ {{/body.no-data}}
67
+ {{/if}}
68
+ {{/t.body}}
69
+ {{/light-table}}
70
+ {{/if}}
71
+ </section>
72
+ {{#if (and hasBlock showFooter)}}
73
+ <footer class="panel-footer clearfix">
74
+ {{yield (action 'export') false}}
75
+ </footer>
76
+ {{/if}}
package/app/breakpoints.js ADDED
@@ -0,0 +1 @@
1
+ export {default} from '@bennerinformatics/ember-fw-table/breakpoints';
package/app/components/fw-cell-permission-icon.js ADDED
@@ -0,0 +1 @@
1
+ export {default} from '@bennerinformatics/ember-fw-table/components/fw-cell-permission-icon';
package/app/initializers/responsive.js ADDED
@@ -0,0 +1 @@
1
+ export {default} from '@bennerinformatics/ember-fw-table/initializers/responsive';
package/package.json CHANGED
@@ -1,63 +1,63 @@
1
- {
2
- "name": "@bennerinformatics/ember-fw-table",
3
- "version": "2.0.16",
4
- "description": "Additional resources related to tables for the Ember FW App System.",
5
- "keywords": [
6
- "ember-addon",
7
- "fw"
8
- ],
9
- "license": "MIT",
10
- "author": "David Burnett <djburnett@olivet.edu>",
11
- "directories": {
12
- "doc": "doc",
13
- "test": "tests"
14
- },
15
- "repository": "",
16
- "scripts": {
17
- "build": "ember build",
18
- "start": "ember server",
19
- "test": "npm run lint && ember try:each",
20
- "lint": "ember test --launch phantomjs --filter=\"ESLint\""
21
- },
22
- "dependencies": {
23
- "ember-cli-babel": "~7.10.0",
24
- "ember-cli-htmlbars": "^3.1.0",
25
- "ember-light-table": "^1.13.2",
26
- "ember-papaparse": "^1.0.0",
27
- "ember-truth-helpers": "^2.1.0",
28
- "node-sass": "^4.12.0",
29
- "papaparse": "^5.0.2"
30
- },
31
- "devDependencies": {
32
- "@bennerinformatics/ember-fw": "^2.0.12",
33
- "broccoli-asset-rev": "^3.0.0",
34
- "ember-ajax": "^5.0.0",
35
- "ember-cli": "~3.10.0",
36
- "ember-cli-app-version": "^3.2.0",
37
- "ember-cli-dependency-checker": "^3.2.0",
38
- "ember-cli-eslint": "^5.1.0",
39
- "ember-cli-htmlbars-inline-precompile": "^2.1.0",
40
- "ember-cli-inject-live-reload": "^2.0.1",
41
- "ember-cli-qunit": "^4.4.0",
42
- "ember-cli-shims": "^1.2.0",
43
- "ember-cli-sri": "^2.1.0",
44
- "ember-cli-uglify": "^3.0.0",
45
- "ember-disable-prototype-extensions": "^1.1.3",
46
- "ember-export-application-global": "^2.0.0",
47
- "ember-load-initializers": "^2.0.0",
48
- "ember-resolver": "^5.2.1",
49
- "ember-responsive": "^3.0.5",
50
- "ember-sortable": "1.12.9",
51
- "ember-source": "~3.10.0",
52
- "eslint-plugin-ember": "^6.9.1",
53
- "eslint-plugin-ember-suave": "^1.0.0",
54
- "loader.js": "^4.7.0",
55
- "moment": "^2.24.0"
56
- },
57
- "engines": {
58
- "node": ">= 0.10.0"
59
- },
60
- "ember-addon": {
61
- "configPath": "tests/dummy/config"
62
- }
63
- }
1
+ {
2
+ "name": "@bennerinformatics/ember-fw-table",
3
+ "version": "2.0.18",
4
+ "description": "Additional resources related to tables for the Ember FW App System.",
5
+ "keywords": [
6
+ "ember-addon",
7
+ "fw"
8
+ ],
9
+ "license": "MIT",
10
+ "author": "David Burnett <djburnett@olivet.edu>",
11
+ "directories": {
12
+ "doc": "doc",
13
+ "test": "tests"
14
+ },
15
+ "repository": "",
16
+ "scripts": {
17
+ "build": "ember build",
18
+ "start": "ember server",
19
+ "test": "npm run lint && ember try:each",
20
+ "lint": "ember test --launch phantomjs --filter=\"ESLint\""
21
+ },
22
+ "dependencies": {
23
+ "ember-cli-babel": "~7.10.0",
24
+ "ember-cli-htmlbars": "^3.1.0",
25
+ "ember-light-table": "^1.13.2",
26
+ "ember-papaparse": "^1.0.0",
27
+ "ember-truth-helpers": "^2.1.0",
28
+ "node-sass": "^4.12.0",
29
+ "papaparse": "^5.0.2"
30
+ },
31
+ "devDependencies": {
32
+ "@bennerinformatics/ember-fw": "^2.0.24",
33
+ "broccoli-asset-rev": "^3.0.0",
34
+ "ember-ajax": "^5.0.0",
35
+ "ember-cli": "~3.10.0",
36
+ "ember-cli-app-version": "^3.2.0",
37
+ "ember-cli-dependency-checker": "^3.2.0",
38
+ "ember-cli-eslint": "^5.1.0",
39
+ "ember-cli-htmlbars-inline-precompile": "^2.1.0",
40
+ "ember-cli-inject-live-reload": "^2.0.1",
41
+ "ember-cli-qunit": "^4.4.0",
42
+ "ember-cli-shims": "^1.2.0",
43
+ "ember-cli-sri": "^2.1.0",
44
+ "ember-cli-uglify": "^3.0.0",
45
+ "ember-disable-prototype-extensions": "^1.1.3",
46
+ "ember-export-application-global": "^2.0.0",
47
+ "ember-load-initializers": "^2.0.0",
48
+ "ember-resolver": "^5.2.1",
49
+ "ember-responsive": "^3.0.5",
50
+ "ember-sortable": "1.12.9",
51
+ "ember-source": "~3.10.0",
52
+ "eslint-plugin-ember": "^6.9.1",
53
+ "eslint-plugin-ember-suave": "^1.0.0",
54
+ "loader.js": "^4.7.0",
55
+ "moment": "^2.24.0"
56
+ },
57
+ "engines": {
58
+ "node": ">= 0.10.0"
59
+ },
60
+ "ember-addon": {
61
+ "configPath": "tests/dummy/config"
62
+ }
63
+ }