Diamantis Tziotzios
|
2ebd3f1cb8
|
Refactors Single DMP Enpoint to support different formats (JSON, XML, DOCX)
|
2019-02-06 12:46:14 +02:00 |
Diamantis Tziotzios
|
5f2646c98f
|
Add Validator to Id on DatasetProfile
Fix DafaultValue on WordListComponent
set On DeleteDataset To Return Back
|
2019-02-04 18:10:22 +02:00 |
Diamantis Tziotzios
|
8a07e98d9e
|
Merge branch 'ui-refactoring' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into ui-refactoring
|
2019-02-04 15:42:08 +02:00 |
Diamantis Tziotzios
|
8e0b869a80
|
Fix Multiplicity Back And Ftrond New Ids
Create DeleteButon To RadioBox AndWordList
Try To fix ProgressBar
|
2019-02-04 15:41:54 +02:00 |
Diamantis Tziotzios
|
632577b171
|
Removes obsolete methods and changes url names on frontend services and backend controllers.
|
2019-02-01 18:56:55 +02:00 |
Diamantis Tziotzios
|
0b171bc67d
|
Merge branch 'ui-refactoring' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into ui-refactoring
|
2019-02-01 10:29:11 +02:00 |
Diamantis Tziotzios
|
853be683a8
|
Delete buttons
LogIn Page Fix
fix Multiplisity Ids
fixVizibility to Child Items
|
2019-02-01 10:29:00 +02:00 |
Diamantis Tziotzios
|
a6a7b2bdce
|
Refactor the Datasets endpoint
|
2019-01-31 17:53:37 +02:00 |
Diamantis Tziotzios
|
8b77ab759a
|
Small fixes on Project's endpoint listing.
|
2019-01-31 16:06:43 +02:00 |
Diamantis Tziotzios
|
e829c5e6f0
|
Parameterizes DMPs query endpoint for more efficient listing
|
2019-01-31 15:56:53 +02:00 |
Diamantis Tziotzios
|
6a7c1b6e9d
|
Parameterizes Project's query endpoint for more efficient listing.
|
2019-01-31 13:24:11 +02:00 |
Diamantis Tziotzios
|
498f690f22
|
Merge branch 'ui-refactoring' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into ui-refactoring
|
2019-01-31 12:31:02 +02:00 |
Diamantis Tziotzios
|
52f7c6dc0c
|
visibility create function scanIfChildsOfCompositeFieldHasVisibleItems
fix style delete buttons
fix AutoComplete copnonnent get from Url to external resorsis
multiplisity model clone for mulitiplicity
|
2019-01-31 12:29:35 +02:00 |
Diamantis Tziotzios
|
5d514d6610
|
One more file for the refactor on endpoint for Project
|
2019-01-31 12:16:09 +02:00 |
Diamantis Tziotzios
|
0552870362
|
Removes and refactors endpoints from Project.
|
2019-01-30 18:37:49 +02:00 |
Diamantis Tziotzios
|
ce223994ae
|
Merge branch 'ui-refactoring' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into ui-refactoring
|
2019-01-29 18:34:50 +02:00 |
Diamantis Tziotzios
|
8b45ee5548
|
Validation to Ids and
New Component Component-Profile-Editor-default-value
delete row in radioBox
add To i18.enJson
|
2019-01-29 18:34:19 +02:00 |
Diamantis Tziotzios
|
68610bda1b
|
Merge branch 'ui-refactoring' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into ui-refactoring
|
2019-01-29 18:33:23 +02:00 |
Diamantis Tziotzios
|
528e5279c8
|
dataset draft save without validation
|
2019-01-29 18:33:17 +02:00 |
Diamantis Tziotzios
|
d5740a560c
|
Removes and refactors endpoints from DMPs
|
2019-01-29 18:25:40 +02:00 |
Diamantis Tziotzios
|
339f65f499
|
Dependency injection applied on DMPs and some API route name changes.
|
2019-01-29 13:05:36 +02:00 |
Diamantis Tziotzios
|
2bb18786b3
|
Merge branch 'ui-refactoring' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into ui-refactoring
|
2019-01-29 09:56:53 +02:00 |
Diamantis Tziotzios
|
e10179d042
|
Fixed the dmp delete function
|
2019-01-29 09:56:46 +02:00 |
Diamantis Tziotzios
|
b460d35f7e
|
visibillity rule changes
|
2019-01-29 09:47:50 +02:00 |
Diamantis Tziotzios
|
245f533a98
|
page Id fix Id_to Guid
fix icon to add radio button
comment the Visibility rule frome admin editor
fix delete plice for selection
|
2019-01-28 18:26:46 +02:00 |
Diamantis Tziotzios
|
fd809ab361
|
dataset admin combobox fix
|
2019-01-28 17:47:12 +02:00 |
Diamantis Tziotzios
|
196435d069
|
Merge branch 'ui-refactoring' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into ui-refactoring
# Conflicts:
# dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.html
# dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-composite-field/form-composite-field.component.html
# dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-composite-field/form-composite-field.component.ts
# dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-field/form-field.component.ts
# dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section.component.html
# dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-section/form-section.component.ts
# dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description-form.component.html
# dmp-frontend/src/app/ui/misc/dataset-description-form/dataset-description-form.component.ts
# dmp-frontend/src/app/ui/misc/dataset-description-form/visibility-rules/visibility-rules.service.ts
|
2019-01-28 15:51:33 +02:00 |
Diamantis Tziotzios
|
cdba456c1d
|
dataset dynamic form visibility service changes
|
2019-01-28 15:47:31 +02:00 |
Diamantis Tziotzios
|
df51afe833
|
try to fix the ComboBox
|
2019-01-28 15:05:19 +02:00 |
Diamantis Tziotzios
|
7a60c3a435
|
dataset profile editor fix delete section in section
dataset profile fix validation for save
|
2019-01-28 14:18:48 +02:00 |
Diamantis Tziotzios
|
8c5c57375a
|
validator to external datases tipe requierd, Space in to Dataset Fields Titles, AutoComplete Fix option selection
|
2019-01-25 15:54:14 +02:00 |
Diamantis Tziotzios
|
c991da090b
|
Dmp Editor Delete Fix , project editor & Critiria Start End Date validator
|
2019-01-24 17:30:23 +02:00 |
Diamantis Tziotzios
|
5ff63f3ce9
|
Add functionality create DMP from project list Panel
|
2019-01-24 12:46:29 +02:00 |
Diamantis Tziotzios
|
9d11adbcbd
|
error models and profile pages bug fixes
|
2019-01-21 13:14:20 +02:00 |
Diamantis Tziotzios
|
41fb94eee9
|
ui resrtucturing
|
2019-01-18 19:03:45 +02:00 |
Ioannis Kalyvas
|
4845ba84a7
|
Added Delete action on Projects , Datasets and Datamanagement Plans
|
2018-11-30 16:57:20 +02:00 |
Diamantis Tziotzios
|
68559314f3
|
fixed popup style
|
2018-11-29 16:19:08 +02:00 |
Diamantis Tziotzios
|
89e4babf9d
|
edit button fix
|
2018-11-29 15:51:21 +02:00 |
Diamantis Tziotzios
|
592fc44025
|
various style fixes
|
2018-11-29 14:26:18 +02:00 |
Diamantis Tziotzios
|
92d9c2cf03
|
rxjs refactor
|
2018-11-27 19:33:17 +02:00 |
Diamantis Tziotzios
|
05a6ddd90f
|
conf refactor
|
2018-11-27 16:13:56 +02:00 |
Diamantis Tziotzios
|
68dddddf45
|
Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development
# Conflicts:
# dmp-frontend/src/app/app.module.ts
# dmp-frontend/src/app/services/data-management-plan/data-management-plan.service.ts
|
2018-11-27 16:04:53 +02:00 |
Diamantis Tziotzios
|
1d7ff00c5d
|
conf moved to environment
|
2018-11-27 16:03:57 +02:00 |
Ioannis Kalyvas
|
01afdabb21
|
Added Navigation to next question by pressing on a button. Introduces MarkForConsideration Component
|
2018-11-01 18:02:15 +02:00 |
Ioannis Kalyvas
|
bdcc628862
|
Introducing component for showing pending and unanswered questions
|
2018-10-30 13:03:02 +02:00 |
Ioannis Kalyvas
|
38d356703a
|
Fixed Issue With Visibility Service on initial values
|
2018-10-22 12:37:55 +03:00 |
Ioannis Kalyvas
|
7cc9854f11
|
Fixed Issues With Progress Bar inflicted by changes in visibility service
|
2018-10-22 10:48:56 +03:00 |
Ioannis Kalyvas
|
2c2133bb28
|
Changes to support better data extraction from answers when generating OpenXML document
|
2018-10-19 12:59:54 +03:00 |
Ioannis Kalyvas
|
b7193d2dda
|
Implemented Preview Step in Admin Dataset Profile Definition
|
2018-10-19 10:35:35 +03:00 |
Ioannis Kalyvas
|
c5b6b218b5
|
Fixed Issue with BreadCrumb Service
|
2018-10-18 13:21:56 +03:00 |
Ioannis Kalyvas
|
ed46666a4f
|
Implemented Fixed Dataset Description Field Numbering
|
2018-10-18 12:34:11 +03:00 |
Ioannis Kalyvas
|
01de2754e5
|
Implemented Frontend Editor And Action Listing For Cloning Dataset Profiles (Ticket #50 - Cloning dataset profiles)
|
2018-10-16 14:11:15 +03:00 |
Ioannis Kalyvas
|
85c5a6bf2e
|
Renamed Dataset Admin Listing To Dataset Profile Admin Listing
|
2018-10-16 10:06:43 +03:00 |
Ioannis Kalyvas
|
5d6ba74d61
|
Enabled Public Dataset Description Search for authenticated Users (#Task38 - Exploring dataset descriptions by authenticated users)
|
2018-10-15 15:58:30 +03:00 |
Ioannis Kalyvas
|
f1ff0ebf0b
|
Implemented Publishing Datasets in finalised DMP's (Ticket #47 - Publishing Datasets - DMP Finalisation)
|
2018-10-15 15:50:01 +03:00 |
Ioannis Kalyvas
|
d07c06df87
|
Fixed CSS issue for Dataset Criteria
|
2018-10-15 13:19:56 +03:00 |
Ioannis Kalyvas
|
6a52950e1d
|
Changed Published dataset descriptions page to include Datatable Criteria in Facet Search Component
|
2018-10-15 13:17:54 +03:00 |
Ioannis Kalyvas
|
099a839e80
|
Enhanced the behaviour of finalising DMP's with Dataset withdrawal
|
2018-10-15 12:04:20 +03:00 |
Ioannis Kalyvas
|
b660176534
|
Fixed some issues with actions on Datasets on different Dataset States
|
2018-10-15 11:16:04 +03:00 |
Ioannis Kalyvas
|
ae618c3e29
|
Updated dependencies to resolve npm packages vulnerabilities
|
2018-10-12 18:17:31 +03:00 |
Ioannis Kalyvas
|
31fd9b8b14
|
Completed Dataset Editing/Viewing alongside DMP finalisation (Ticket #45 - Dataset editing / viewing modes)
|
2018-10-12 11:22:23 +03:00 |
Ioannis Kalyvas
|
c33d5ea50a
|
Fixed Bugs With Some Search Fields and Dataset Locking
|
2018-10-11 14:22:49 +03:00 |
Ioannis Kalyvas
|
2ca29e303b
|
Implementation of DMP finalisation with option to finalise Datasets that belong to the DMP (Ticket #46 - Finalization of DMPs)
|
2018-10-11 14:22:03 +03:00 |
Ioannis Kalyvas
|
1d4eb0128e
|
Implemented Simple Locking Mechanism for Editing/Viewing Datasets - (Ticket #45 - Dataset editing / viewing modes)
|
2018-10-10 10:48:41 +03:00 |
Ioannis Kalyvas
|
99588ef126
|
Fixed Bug For Facet Search not applying the right Project State (Active, Finished)
|
2018-10-09 13:58:36 +03:00 |
Ioannis Kalyvas
|
6e69c4b518
|
no message
|
2018-10-09 13:17:32 +03:00 |
Ioannis Kalyvas
|
66e66be4a1
|
Improved Performance For Invitations
Fixed Email Template To support dynamic domains
|
2018-10-09 13:04:03 +03:00 |
Ioannis Kalyvas
|
b112748ba4
|
Added Option To Download DMP as XML
|
2018-10-09 11:28:44 +03:00 |
Ioannis Kalyvas
|
919acff3ae
|
Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development
# Conflicts:
# dmp-frontend/src/app/shared/components/facets/facet-search-component/facet-search-section.component.ts
|
2018-10-08 18:20:16 +03:00 |
Ioannis Kalyvas
|
aa04f65d84
|
fixed bugs for Facet Search
|
2018-10-08 18:14:27 +03:00 |
Diamantis Tziotzios
|
1661286f85
|
added help content configuration, fixed facets option height bug
|
2018-10-08 17:58:52 +03:00 |
Diamantis Tziotzios
|
af99c1f418
|
Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development
|
2018-10-08 10:05:06 +03:00 |
Diamantis Tziotzios
|
9444d07833
|
production configuration changes
|
2018-10-08 10:04:59 +03:00 |
Ioannis Kalyvas
|
aa58b26723
|
no message
|
2018-10-05 18:12:19 +03:00 |
Ioannis Kalyvas
|
510384cdb7
|
Fixed Formatting in files
|
2018-10-05 18:00:54 +03:00 |
Ioannis Kalyvas
|
6ace88ecda
|
Fixed Bugs for Facet Search on Public Dataset Page
|
2018-10-05 14:23:59 +03:00 |
Ioannis Kalyvas
|
6a72f8dbba
|
no message
|
2018-10-05 13:03:22 +03:00 |
Ioannis Kalyvas
|
b8c78e7135
|
Introduced Facet Search Component On Dataset Public Listing
|
2018-10-05 09:56:50 +03:00 |
Ioannis Kalyvas
|
e0c302e67e
|
no message
|
2018-10-02 17:33:58 +03:00 |
Ioannis Kalyvas
|
a5160738eb
|
no message
|
2018-09-18 15:41:24 +03:00 |
Ioannis Kalyvas
|
8c7d505178
|
no message
|
2018-09-06 15:50:38 +03:00 |
Ioannis Kalyvas
|
bfdcdff33a
|
no message
|
2018-09-04 12:36:18 +03:00 |
Ioannis Kalyvas
|
d5a677184f
|
no message
|
2018-08-31 11:14:56 +03:00 |
Ioannis Kalyvas
|
b34c96b264
|
no message
|
2018-08-30 14:09:36 +03:00 |
Ioannis Kalyvas
|
f8c3ce4362
|
no message
|
2018-08-27 18:09:33 +03:00 |
Ioannis Kalyvas
|
555f8fb1e7
|
no message
|
2018-08-27 12:00:09 +03:00 |
Ioannis Kalyvas
|
3ad1c1c8f2
|
no message
|
2018-08-24 18:21:02 +03:00 |
Ioannis Kalyvas
|
46db0d4184
|
no message
|
2018-07-24 15:53:34 +03:00 |
Ioannis Kalyvas
|
32eff9b523
|
no message
|
2018-07-24 14:19:52 +03:00 |
Ioannis Kalyvas
|
14f9be46f0
|
no message
|
2018-07-24 12:04:12 +03:00 |
Diamantis Tziotzios
|
518a2ffd3c
|
no message
|
2018-07-24 10:58:55 +03:00 |
Diamantis Tziotzios
|
22582676a3
|
Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot
# Conflicts:
# dmp-backend/src/test/resources/applicationContextTEST.xml
|
2018-07-23 18:56:09 +03:00 |
Ioannis Kalyvas
|
29884ab016
|
no message
|
2018-07-23 17:01:27 +03:00 |
Ioannis Kalyvas
|
c25c9d72cf
|
no message
|
2018-07-23 16:09:19 +03:00 |
Ioannis Kalyvas
|
78b91ee3e0
|
no message
|
2018-07-11 16:47:36 +03:00 |
Ioannis Kalyvas
|
efb7af10b5
|
no message
|
2018-06-29 11:29:43 +03:00 |
Ioannis Kalyvas
|
8eb3632fd2
|
no message
|
2018-06-28 12:28:16 +03:00 |
Ioannis Kalyvas
|
92ddb33eb8
|
no message
|
2018-06-27 18:37:26 +03:00 |
Ioannis Kalyvas
|
b7d5dfb198
|
no message
|
2018-06-27 13:29:21 +03:00 |
Ioannis Kalyvas
|
5de4c1ada0
|
no message
|
2018-06-05 11:18:01 +03:00 |
Ioannis Kalyvas
|
af8991b97a
|
no message
|
2018-05-28 12:50:42 +03:00 |
Ioannis Kalyvas
|
cc5e080219
|
no message
|
2018-05-14 09:44:35 +03:00 |
Ioannis Kalyvas
|
651c7bb0f5
|
no message
|
2018-03-28 16:24:47 +03:00 |
Diamantis Tziotzios
|
86e54c40bb
|
no message
|
2018-03-28 14:34:55 +03:00 |
Ioannis Kalyvas
|
bdf4a76a21
|
no message
|
2018-03-21 15:15:06 +02:00 |
Ioannis Kalyvas
|
376ceb5cb8
|
no message
|
2018-03-08 12:54:56 +02:00 |
Ioannis Kalyvas
|
e835c35c7c
|
no message
|
2018-03-06 16:58:38 +02:00 |
Ioannis Kalyvas
|
8cb464c1e9
|
no message
|
2018-03-05 18:18:45 +02:00 |
Ioannis Kalyvas
|
52bceed971
|
no message
|
2018-03-01 11:14:10 +02:00 |
annampak
|
1715e8629f
|
name & version field diasabled in new version dmp
|
2018-02-28 16:59:41 +02:00 |
annampak
|
7c6815fef0
|
organisations without chips
|
2018-02-23 14:12:58 +02:00 |
annampak
|
5d635d0bb5
|
login eudat
|
2018-02-23 13:09:25 +02:00 |
annampak
|
c2f5c4123b
|
login button eudat
|
2018-02-23 13:08:24 +02:00 |
annampak
|
643793889d
|
eudat button
|
2018-02-23 12:41:39 +02:00 |
Ioannis Kalyvas
|
4948737142
|
no message
|
2018-02-23 12:36:51 +02:00 |
Ioannis Kalyvas
|
70db1b2894
|
no message
|
2018-02-21 12:07:31 +02:00 |
annampak
|
ca19d29ab7
|
no message
|
2018-02-16 18:50:50 +02:00 |
annampak
|
8b7df4d324
|
no message
|
2018-02-16 18:49:04 +02:00 |
annampak
|
bff6cf57fe
|
autocopmlete with chips
|
2018-02-16 18:48:23 +02:00 |
Ioannis Kalyvas
|
bf10c0c31c
|
no message
|
2018-02-16 12:34:02 +02:00 |
Ioannis Kalyvas
|
8892c62791
|
no message
|
2018-02-16 09:45:18 +02:00 |
annampak
|
eb62c65272
|
Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development
|
2018-02-14 12:38:39 +02:00 |
annampak
|
451ec28bda
|
autocomplete chips component
|
2018-02-14 12:38:19 +02:00 |
Ioannis Kalyvas
|
49fa6609ea
|
no message
|
2018-02-12 10:17:21 +02:00 |
annampak
|
edde3cb050
|
no message
|
2018-02-09 18:50:43 +02:00 |
Ioannis Kalyvas
|
db72ca982d
|
Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development
|
2018-02-09 17:56:12 +02:00 |
Ioannis Kalyvas
|
4fade0d9b0
|
no message
|
2018-02-09 17:54:41 +02:00 |
annampak
|
6548220469
|
no message
|
2018-02-09 17:54:37 +02:00 |
annampak
|
a7baad7322
|
dmp actions icons- language- dataset title
|
2018-02-09 17:05:01 +02:00 |
annampak
|
9558be7e1d
|
radio buttons inline
|
2018-02-09 13:38:03 +02:00 |
annampak
|
ba8e64c3d6
|
Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development
|
2018-02-09 11:02:07 +02:00 |
annampak
|
bb60873046
|
no message
|
2018-02-09 11:01:59 +02:00 |
Ioannis Kalyvas
|
c8d43a3bed
|
Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development
|
2018-02-08 17:54:42 +02:00 |
Ioannis Kalyvas
|
d44052299a
|
no message
|
2018-02-08 17:54:31 +02:00 |
annampak
|
33701ac3cb
|
available profiles dialog window
|
2018-02-08 17:32:23 +02:00 |
annampak
|
04389b0613
|
no message
|
2018-02-08 10:52:57 +02:00 |
annampak
|
6efe95614e
|
available profiles
|
2018-02-08 10:50:39 +02:00 |
Ioannis Kalyvas
|
b4f59b0ce6
|
no message
|
2018-02-08 10:42:02 +02:00 |
Ioannis Kalyvas
|
ca1593d5a7
|
Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development
# Conflicts:
# dmp-frontend/src/app/dmps/dmps.module.ts
|
2018-02-07 12:00:33 +02:00 |
Ioannis Kalyvas
|
5692b2072f
|
no message
|
2018-02-07 11:56:30 +02:00 |
annampak
|
3df3ed15ce
|
Dataset Profile Datatable Admin- material was implemented
|
2018-02-06 15:56:33 +02:00 |
annampak
|
b3bf19be0b
|
dmp delete
|
2018-02-05 13:26:23 +02:00 |
annampak
|
18a6c7cc85
|
rename column version --> latest version
|
2018-02-05 12:38:11 +02:00 |
annampak
|
2fb06c63d0
|
Confirmation message dmp delete
|
2018-02-05 12:34:25 +02:00 |
annampak
|
49fe557fdc
|
Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development
|
2018-02-05 11:44:50 +02:00 |
annampak
|
72cad823fb
|
add researcher from dmp editor
|
2018-02-05 11:44:40 +02:00 |
Ioannis Kalyvas
|
c36fa5e6f8
|
no message
|
2018-02-02 17:24:30 +02:00 |
Ioannis Kalyvas
|
9d0c4a4a85
|
Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development
|
2018-02-02 17:24:22 +02:00 |
Ioannis Kalyvas
|
5340e90c65
|
no message
|
2018-02-02 17:24:06 +02:00 |
annampak
|
47629c9e2b
|
welcome page statistics
|
2018-02-02 16:07:25 +02:00 |