fbsanchez
|
8e09a30a05
|
WIP Networklink POC
|
2020-10-29 17:20:16 +01:00 |
fbsanchez
|
a313f00755
|
First steps VC network link
|
2020-10-09 12:45:10 +02:00 |
daniel
|
709201bf23
|
dashboards
|
2020-03-26 12:29:38 +01:00 |
Daniel Barbero Martin
|
a55e431b46
|
Fixed error cache build link VC
|
2020-02-20 13:25:56 +01:00 |
Daniel Barbero Martin
|
1ab92fe798
|
Fixed error event history VC
|
2020-02-18 08:08:56 +01:00 |
Daniel Barbero Martin
|
3ad9e3c420
|
Fixed error event history VC
|
2020-02-17 08:19:36 +01:00 |
Daniel Barbero Martin
|
f9c944fa8d
|
Fixed error events history VC
|
2020-02-13 10:08:50 +01:00 |
Daniel Barbero Martin
|
c96dd8e930
|
Fix selector modules only string in VC barsgraph and donutgraph
|
2020-02-13 09:55:49 +01:00 |
Daniel Barbero Martin
|
962b3d2248
|
Fix linked ACL another VC
|
2020-02-11 09:45:43 +01:00 |
Daniel Barbero Martin
|
0042f390ef
|
Fixed errors VC
|
2020-02-10 17:31:48 +01:00 |
Daniel Barbero Martin
|
68dd01ba09
|
fixed errors VC
|
2020-02-05 18:56:28 +01:00 |
fbsanchez
|
72d23e5dfa
|
Module graph paint direct
|
2020-02-03 16:32:20 +01:00 |
Daniel Barbero Martin
|
2bbc5d18b5
|
fixed errors VC
|
2020-01-29 10:15:31 +01:00 |
Daniel Barbero Martin
|
e49ed85d03
|
fixed errors VC
|
2020-01-28 18:29:32 +01:00 |
Daniel Barbero Martin
|
5906273271
|
fixed errors VC
|
2020-01-28 17:52:40 +01:00 |
Daniel Barbero Martin
|
73dcabc48d
|
fixed errors VC
|
2020-01-28 12:44:37 +01:00 |
Daniel Barbero Martin
|
6ddb501b08
|
fixed errors VC
|
2020-01-27 16:15:54 +01:00 |
Daniel Barbero Martin
|
570ebd9a0a
|
fixed errors VC
|
2020-01-27 13:16:01 +01:00 |
Daniel Barbero Martin
|
5ff10ac514
|
fixed errors VC
|
2020-01-25 11:57:04 +01:00 |
Daniel Barbero Martin
|
5ec8c68aed
|
fixed errors VC
|
2020-01-24 15:13:42 +01:00 |
Daniel Barbero Martin
|
fe697a98ec
|
fixed errors VC
|
2020-01-23 19:54:47 +01:00 |
Daniel Barbero Martin
|
cd3691ecc3
|
fixed errors VC
|
2020-01-23 17:52:59 +01:00 |
Daniel Barbero Martin
|
481f08bd5f
|
fixed errors VC
|
2020-01-23 16:21:31 +01:00 |
Daniel Barbero
|
203a91f065
|
fixed errors
|
2020-01-22 17:47:47 +01:00 |
Daniel Barbero
|
69e750da13
|
Fixed error Color cloud VC
|
2020-01-22 12:48:31 +01:00 |
Daniel Barbero Martin
|
ac4c091c9e
|
Fixed errors VC
|
2020-01-21 17:43:41 +01:00 |
Daniel Barbero Martin
|
a557c25c31
|
Fixed errors VC
|
2020-01-21 12:55:54 +01:00 |
Daniel Barbero Martin
|
b2f356bd4b
|
Fixed errors VC
|
2020-01-21 10:42:09 +01:00 |
Daniel Barbero Martin
|
8672629dd6
|
Fixed errors VC
|
2020-01-21 10:33:07 +01:00 |
Daniel Barbero Martin
|
98ddf3c6ee
|
Fixed errors VC
|
2020-01-20 17:46:52 +01:00 |
Daniel Barbero Martin
|
3545e28581
|
Fixed errors VC
|
2020-01-20 16:01:53 +01:00 |
Daniel Barbero Martin
|
02199b19b5
|
fixed errors VC
|
2020-01-16 16:55:48 +01:00 |
Daniel Barbero Martin
|
5900e7ba4a
|
fixed errors VC
|
2020-01-16 14:07:35 +01:00 |
Daniel Barbero Martin
|
d8a09bf359
|
Fixed errors VC
|
2020-01-15 17:37:24 +01:00 |
Daniel Barbero Martin
|
c3ae3f08a7
|
Fixed errors VC
|
2020-01-15 14:28:43 +01:00 |
Daniel Barbero Martin
|
602ce39907
|
Fixed clock item VC
|
2020-01-13 17:13:52 +01:00 |
Daniel Barbero Martin
|
e54740ec19
|
fixed parent input
|
2020-01-13 14:19:56 +01:00 |
Daniel Barbero Martin
|
60bd600392
|
module graph convert to image base 64
|
2020-01-13 13:31:23 +01:00 |
Daniel Barbero Martin
|
4f6ed7c39f
|
Fix tinyMCE background grey
|
2020-01-13 10:14:51 +01:00 |
Daniel Barbero Martin
|
09f1e2b733
|
fixed errors in resize and move item percentile and value
|
2020-01-13 09:53:00 +01:00 |
Daniel Barbero Martin
|
d4b92a6913
|
Fixed errors in VC
|
2020-01-10 13:48:07 +01:00 |
Daniel Barbero
|
7e4cb02ceb
|
fixed styles and more
|
2020-01-09 18:05:21 +01:00 |
Daniel Barbero
|
a933a091ea
|
styles fixed
|
2020-01-09 12:07:19 +01:00 |
Daniel Barbero Martin
|
d97cdfbc7a
|
fix element line
|
2020-01-08 17:28:03 +01:00 |
Daniel Barbero Martin
|
da01883902
|
Fixed items vc line
|
2020-01-07 18:07:07 +01:00 |
Daniel Barbero Martin
|
b49dd76ce4
|
Add images input
|
2020-01-07 15:43:44 +01:00 |
Daniel Barbero Martin
|
4813bef53e
|
Add new input linked visual console
|
2020-01-07 12:00:39 +01:00 |
Daniel Barbero
|
d4207ef67c
|
Fixed form php VC
|
2019-12-20 13:58:47 +01:00 |
Daniel Barbero
|
14984faaaa
|
Fixed errors Form VC
|
2019-12-19 20:42:29 +01:00 |
Daniel Barbero
|
9b4f12a875
|
Fixed forms VC
|
2019-12-18 17:36:01 +01:00 |
Daniel Barbero
|
2a92c9d38d
|
Fixed errors VC forms
|
2019-12-17 10:57:19 +01:00 |
fbsanchez
|
2ec659baac
|
avoid 500 if method is not defined
|
2019-10-02 18:43:27 +02:00 |
fbsanchez
|
79dca2fe6b
|
Php OO form load
|
2019-10-02 18:37:50 +02:00 |
Daniel Barbero Martin
|
c5022fc243
|
continue VC
|
2019-10-02 12:28:17 +02:00 |
Daniel Barbero Martin
|
8258e1f446
|
add css form VC
|
2019-09-26 15:26:00 +02:00 |
Daniel Barbero Martin
|
50c37e56c9
|
continue VC
|
2019-09-23 19:16:36 +02:00 |
Daniel Barbero
|
fc024898ef
|
continue VC
|
2019-09-22 20:35:51 +02:00 |
Daniel Barbero
|
034bbff2cf
|
continue VC
|
2019-09-20 15:14:26 +02:00 |
Daniel Barbero Martin
|
716c79fc3e
|
continue VC
|
2019-09-19 17:47:41 +02:00 |
Daniel Barbero Martin
|
a3cdbd2a3a
|
fixed autocomplete agent
|
2019-09-19 13:45:13 +02:00 |
Daniel Barbero Martin
|
0c59c89d8f
|
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
|
2019-09-19 09:35:52 +02:00 |
Daniel Maya
|
f3fe8099bb
|
Fixed last value
|
2019-09-18 11:49:33 +02:00 |
Daniel Barbero Martin
|
46fdfc4445
|
fixed autocomplete agent
|
2019-08-22 10:11:06 +02:00 |
Daniel Barbero Martin
|
e537cd09f4
|
Fixed errors
|
2019-08-19 12:32:38 +02:00 |
Daniel Barbero Martin
|
c6b6566048
|
fixed errors
|
2019-08-14 14:31:41 +02:00 |
Alejandro Gallardo Escobar
|
dbf141d866
|
Improved the movement of the visual console line element
|
2019-08-14 14:24:06 +02:00 |
Daniel Barbero Martin
|
94d6eccb0e
|
add news input groups
|
2019-08-09 15:19:35 +02:00 |
Alejandro Gallardo Escobar
|
91fbe8672b
|
Minor fixes
|
2019-08-08 11:05:21 +02:00 |
Daniel Barbero Martin
|
2697f46424
|
add news input groups
|
2019-08-07 14:33:35 +02:00 |
Daniel Barbero Martin
|
09817311eb
|
Merge branch 'new-vc-line-element' of brutus.artica.lan:artica/pandorafms into new-vc-line-element
|
2019-08-05 14:58:59 +02:00 |
Daniel Barbero Martin
|
0bc8fc72cb
|
add new input group image
|
2019-08-05 14:58:27 +02:00 |
Alejandro Gallardo Escobar
|
3333cb2b59
|
Added the cache expiration to the new visual console
|
2019-08-05 12:58:25 +02:00 |
Daniel Barbero Martin
|
ed2d57aa4e
|
Add new input group visual console linked
|
2019-08-02 12:24:47 +02:00 |
Alejandro Gallardo Escobar
|
69083c42bf
|
Changed the linked visual console data structure and types
|
2019-08-01 11:49:00 +02:00 |
Daniel Maya
|
2030c0beee
|
added copy an item
|
2019-07-31 13:23:25 +02:00 |
Daniel Barbero Martin
|
ade9345a74
|
Add select group form VC
|
2019-07-31 11:03:13 +02:00 |
Daniel Barbero Martin
|
a581a4b1ac
|
add new input group parent linked
|
2019-07-30 14:58:01 +02:00 |
Daniel Maya
|
8845fc9330
|
item deletion improvements
|
2019-07-30 11:20:03 +02:00 |
Alejandro Gallardo Escobar
|
a0a4626793
|
Bugfix
|
2019-07-29 17:45:59 +02:00 |
Alejandro Gallardo Escobar
|
a8ce05d5c3
|
Merge branch 'new-vc-line-element' of https://brutus.artica.lan:8081/artica/pandorafms into new-vc-line-element
|
2019-07-29 11:33:20 +02:00 |
Daniel Maya
|
f7ab47e637
|
Fixed delete item
|
2019-07-26 14:17:14 +02:00 |
Daniel Maya
|
5067462620
|
Added remove item
|
2019-07-25 17:58:37 +02:00 |
Alejandro Gallardo Escobar
|
30491a307c
|
Bugfixes
|
2019-07-24 16:38:00 +02:00 |
Alejandro Gallardo Escobar
|
67b376466b
|
Great improvements into the edition of the visual console items
|
2019-07-16 16:27:23 +02:00 |
Daniel Maya
|
8047bf2c87
|
Added isUpdating
|
2019-07-09 16:43:23 +02:00 |
Daniel Maya
|
aafba795ee
|
Update visual console
|
2019-07-08 17:51:01 +02:00 |
Daniel Maya
|
03842df33e
|
Added mr and uncommented code
|
2019-06-28 11:19:13 +02:00 |
Alejandro Gallardo Escobar
|
f36e7966a1
|
Merge remote-tracking branch 'origin/develop' into ent-4266-eliminar-los-flashes-al-recargar-graficas-en-la-consola-visuall
|
2019-06-26 13:13:36 +02:00 |
Daniel Maya
|
a96b2359ca
|
Fixed getFillColor
|
2019-06-24 18:52:39 +02:00 |
Daniel Maya
|
5ee9c6c536
|
Fixed encoded
|
2019-06-24 18:24:22 +02:00 |
Alejandro Gallardo Escobar
|
94764bf92e
|
Bugfixes
(cherry picked from commit 3421f21cdf71447bf029028c138e203689aa38a2)
|
2019-06-24 17:23:55 +02:00 |
Alejandro Gallardo Escobar
|
d9fee539a8
|
Merge branch 'develop' into 'ent-4258-visual-console-movement-redimension-mode'
# Conflicts:
# pandora_console/include/visual-console-client/vc.main.css
|
2019-06-24 10:31:53 +02:00 |
Daniel Maya
|
71ea94eea3
|
Fixed item save
|
2019-06-20 16:36:24 +02:00 |
Daniel Maya
|
e182997308
|
Merge branch 'ent-3994-Añadir-actualización-de-ciertos-valores-a-la-api-web-de-la-consola-visual' into ent-3997-anadir-posicionamiento-a-los-elementos-de-la-consola-visual
|
2019-06-20 11:40:33 +02:00 |
Daniel Maya
|
ac8efd2bef
|
delete cache item when updating
|
2019-06-19 18:00:53 +02:00 |
fbsanchez
|
24025ebb74
|
Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles
|
2019-06-18 17:48:03 +02:00 |
Daniel Maya
|
649689b1a1
|
Update
|
2019-06-18 17:28:36 +02:00 |
Daniel Maya
|
589000fb6c
|
Added save in onItemMoved
|
2019-06-18 10:13:56 +02:00 |
Daniel Maya
|
e9b4dea6c5
|
update
|
2019-06-13 14:51:27 +02:00 |
Alejandro Fraguas
|
beea6941e5
|
Merge branch 'ent-4200-visual-console-omnipresent-group-summary' into 'develop'
Fixed the omnipresent group summary bug
See merge request artica/pandorafms!2496
|
2019-06-13 13:25:50 +02:00 |
fbsanchez
|
4bb300889d
|
Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles
|
2019-06-12 13:17:36 +02:00 |
Daniel Maya
|
e332c4ffba
|
Merge remote-tracking branch 'origin/ent-3997-anadir-posicionamiento-a-los-elementos-de-la-consola-visual' into ent-3994-Añadir-actualización-de-ciertos-valores-a-la-api-web-de-la-consola-visual
|
2019-06-12 12:23:41 +02:00 |
Alejandro Gallardo Escobar
|
8793e2debd
|
Fixed the omnipresent group summary bug
|
2019-06-12 09:16:47 +02:00 |
Alejandro Gallardo Escobar
|
d3da3747dd
|
Fixed the visualization of the combined graph item from the new visual console
|
2019-06-12 08:48:51 +02:00 |
Daniel Maya
|
4815d73149
|
Update
|
2019-06-11 15:26:10 +02:00 |
Daniel Maya
|
78e01d9c7d
|
Added encode
|
2019-06-10 13:04:52 +02:00 |
fbsanchez
|
2f5265fcbb
|
color updates
|
2019-06-04 14:08:07 +02:00 |
Alejandro Gallardo Escobar
|
5ea79cdfb8
|
Now only the Group item of the VC is cached by user
|
2019-05-28 10:39:34 +02:00 |
Alejandro Gallardo Escobar
|
f8a0fc67f9
|
Minor improvements
|
2019-05-27 12:10:05 +02:00 |
Daniel Maya
|
4c874e152c
|
Merge
|
2019-05-23 10:43:32 +02:00 |
Daniel Maya
|
2de2d1f482
|
Added expiration and deleted old cache data in pandora_db
|
2019-05-23 10:35:03 +02:00 |
Daniel Maya
|
5c0a197b6b
|
Added cache
|
2019-05-20 15:15:54 +02:00 |
Daniel Maya
|
539f416cc4
|
Merge
Former-commit-id: ab93502ce1140ff37c513f2c574b4ca22f552ee9
|
2019-05-13 17:30:35 +02:00 |
Daniel Maya
|
3833eb6463
|
elex's recommendations :D
|
2019-05-08 15:27:22 +02:00 |
Daniel Maya
|
b57adb38a5
|
added graph_precision for the float in static_graph and percentile item
Former-commit-id: 7fda14add9bcb0d9c0a425caad752364e29b309c
|
2019-05-06 17:12:00 +02:00 |
Daniel Maya
|
37d3737f82
|
Fixed number_format in group stadistic
Former-commit-id: 7580be83cce0432ab68e3698813fd7eef079665a
|
2019-04-30 16:23:14 +02:00 |
Daniel Maya
|
61a0528717
|
Fixed EventHistory link
Former-commit-id: 431251e74f419123b4848e10edc5fe472accdf43
|
2019-04-29 17:37:36 +02:00 |
Alejandro Gallardo Escobar
|
5f986e2390
|
Visual Console Refactor: bugfix
Former-commit-id: 2afef18813cc2a2d51a40bdf0a5c619bd0900b59
|
2019-04-29 11:53:21 +02:00 |
Alejandro Gallardo Escobar
|
c09fbf4ddb
|
Visual Console Refactor: fixed the links
Former-commit-id: c37373329350c8b1ed421ae91f2a3c1e7d7f577a
|
2019-04-29 10:45:12 +02:00 |
Alejandro Gallardo Escobar
|
f3f5bcecd8
|
Visual Console Refactor: fixed the module graph element
Former-commit-id: baee256acdbc28c3b2d0364b97f301f776121e36
|
2019-04-25 16:59:24 +02:00 |
Alejandro Gallardo Escobar
|
af69804708
|
Improved the background size and the elements order of the Visual Console
Former-commit-id: 6c6c7f332062dd0b405387730e06f29cf1d328d8
|
2019-04-25 16:36:17 +02:00 |
Alejandro Gallardo Escobar
|
08f9a34f23
|
Visual Console Refactor: bugfix
Former-commit-id: e6bff1d0458ca878cf31661bfcb77d833f5b8093
|
2019-04-25 14:24:19 +02:00 |
Alejandro Gallardo Escobar
|
0bd276bc88
|
Visual Console Refactor: bugfix
Former-commit-id: f7e4f04507695550c96f91a296e316be3c18636d
|
2019-04-25 14:02:30 +02:00 |
Alejandro Gallardo Escobar
|
7d95151a5b
|
Visual Console Refactor: minor fixes
Former-commit-id: ddd06e0f0aa3bf473d370414378cbcc1034d3f93
|
2019-04-25 10:57:25 +02:00 |
Daniel Maya
|
260a149668
|
fixed include_once in items
Former-commit-id: e0a7f89a5ead53c8b5cbc49f66e473fa2f77bffa
|
2019-04-25 10:37:11 +02:00 |
Alejandro Gallardo Escobar
|
35d54a7e79
|
Visual Console Refactor: added missing libs
Former-commit-id: e0564527b93b844c69035f125d9e74e5baa693b7
|
2019-04-25 10:30:24 +02:00 |
Alejandro Gallardo Escobar
|
6a378f664e
|
Merge branch 'visual-console-refactor' of https://brutus.artica.lan:8081/artica/pandorafms into visual-console-refactor
Former-commit-id: 0c2ffa8d51737644ae99eebdaae842af26ba52b8
|
2019-04-25 10:02:38 +02:00 |
Alejandro Gallardo Escobar
|
8ae521b2c4
|
Visual Console Refactor: added missing libraries
Former-commit-id: 02a027fb7f6276c9a59d58cd47fb2736c3878c38
|
2019-04-25 10:02:35 +02:00 |
Daniel Maya
|
3d2bcb3495
|
Fixed include_once in DonutGraph
Former-commit-id: 20c76457cabdc1cf78fc77c2218d025543d4607e
|
2019-04-25 09:25:19 +02:00 |
Alejandro Gallardo Escobar
|
1cb15c9404
|
Visual Console Refactor: fixed the donut graph
Former-commit-id: a59da7d787571779c3dbc1be790855fda83d4b00
|
2019-04-24 16:07:46 +02:00 |
Alejandro Gallardo Escobar
|
3c2e65a8a5
|
Visual Console Refactor: added the missing macros to the label
Former-commit-id: 2e52a35c0f571d6162cbd3fb1188c3f47b77a8a5
|
2019-04-24 15:58:33 +02:00 |
Daniel Maya
|
d541eab986
|
Fixed size in module graph
Former-commit-id: 5afdc41a1a7ec50f16bd39f70af6821505f98946
|
2019-04-24 15:40:07 +02:00 |
Daniel Maya
|
a1dbf7b780
|
Added macro
Former-commit-id: 08c46875bb09eafde6ebc2f4b526fe4c7bbf944e
|
2019-04-24 13:40:37 +02:00 |
Daniel Maya
|
dcdb8c3aa9
|
Fixed default size in EventHistory
Former-commit-id: 287ab0803651b6a417e6e28a948b55b0afe8a352
|
2019-04-24 11:15:11 +02:00 |
Alejandro Gallardo Escobar
|
0a70e49792
|
Visual Console Refactor: finished the default sizing for the elements which use icons
Former-commit-id: b8504d22eecdaeee8ac64a2d008ff847c07aa4d2
|
2019-04-23 17:44:18 +02:00 |
Alejandro Gallardo Escobar
|
c0b324b25a
|
Merge branch 'visual-console-refactor' of https://brutus.artica.lan:8081/artica/pandorafms into visual-console-refactor
Former-commit-id: 7a79252ca00ae8b9c695b4799a365c440b63d574
|
2019-04-23 17:29:59 +02:00 |
Daniel Maya
|
c910c94c7f
|
Fixed height and width in icon, group and staticgraph
Former-commit-id: 03a8147ba5a8897acf91aa9265fb62e7fab7e517
|
2019-04-23 16:53:18 +02:00 |
Alejandro Gallardo Escobar
|
cb6b8531df
|
Visual Console Refactor: minor fix
Former-commit-id: c055042c1cf3b4181a146857f159d656b9c5ed3f
|
2019-04-23 16:23:32 +02:00 |
Daniel Maya
|
5e3f3500c4
|
Added status group in metaconsole
Former-commit-id: cb1dcf221012f25c72ebcc0238475f5db1241835
|
2019-04-23 15:40:54 +02:00 |
Alejandro Gallardo Escobar
|
26b3fd23f5
|
Visual Console Refactor: changed the default size for the items which use icons
Former-commit-id: 689c7e3769ff1554ab2a5c9701d47117a122595a
|
2019-04-23 15:09:23 +02:00 |
Alejandro Gallardo Escobar
|
2f397b16df
|
Visual Console Refactor: minor fix
Former-commit-id: 0cf70df7d8c45285fb612bc09871d52f0dfdcfb7
|
2019-04-23 13:16:33 +02:00 |
Alejandro Gallardo Escobar
|
f4ff73bee1
|
Visual Console Refactor: minor fix
Former-commit-id: cf4201fd61ffb61957b54277d9195bae5935aa3b
|
2019-04-23 13:00:52 +02:00 |
Alejandro Gallardo Escobar
|
f124612ba1
|
Visual Console Refactor: bugfix
Former-commit-id: 698a3aa603ffe93c70edf52517fc5def21da52ba
|
2019-04-23 11:41:50 +02:00 |
Alejandro Gallardo Escobar
|
c461825a27
|
Visual Console Refactor: some parameters aren't required anymore
Former-commit-id: 3788b8dc8c055a04a627bf99e12ab30420d54351
|
2019-04-23 11:40:45 +02:00 |
Alejandro Gallardo Escobar
|
3a3c62a855
|
Visual Console Refactor: added a pair of comment lines
Former-commit-id: dc2237e31753b212ce268d5a6901723ffb5a7528
|
2019-04-23 11:36:46 +02:00 |
Daniel Maya
|
404fb19e35
|
Fixed status of staticgraph in metaconsole
Former-commit-id: cf0b32c2c7cafaca8f4463d46d67c25c7a81fdc2
|
2019-04-23 10:54:43 +02:00 |
Alejandro Gallardo Escobar
|
d6bd44d1c0
|
Visual Console Refactor: bugfixes
Former-commit-id: 09c2b268fd179f81f3041be774f199abe088b4f3
|
2019-04-23 09:56:02 +02:00 |
Alejandro Gallardo Escobar
|
8fc5951209
|
Visual Console Refactor: fixed the group link
Former-commit-id: c3982381f65e2b4e805546c218ef7ec5e83c2685
|
2019-04-23 09:43:44 +02:00 |
Daniel Maya
|
58a601b0f1
|
Fixed id_tagente in metaconsole
Former-commit-id: 72ea89dfe6eff0892adaaa4a077a99ddfa0fa4d4
|
2019-04-22 17:44:27 +02:00 |
Daniel Maya
|
713212a435
|
Fixed html group
Former-commit-id: a7b9fdccad8d62783ef2a547a72cc86d5ebc7f46
|
2019-04-22 17:39:57 +02:00 |