Thomas Georgios Giannos
|
34ce4f6928
|
Adding export on dmp service and controller (existing service not yet wired up)
|
2023-11-14 11:44:01 +02:00 |
Thomas Georgios Giannos
|
d50a058296
|
Small fix
|
2023-11-13 17:05:25 +02:00 |
Thomas Georgios Giannos
|
5edaf1c74e
|
Adding dmp user association, adding finalization status check on persist workflow
|
2023-11-13 16:46:35 +02:00 |
Thomas Georgios Giannos
|
ff35ad6aab
|
Renames on 'datas'
|
2023-11-13 09:39:31 +02:00 |
Thomas Georgios Giannos
|
1cee5fb49f
|
Various fixes
|
2023-11-10 19:11:15 +02:00 |
Thomas Georgios Giannos
|
0c4cf467d8
|
Adding description cloning method on service, adding missing functionality on dmp new-version and cloning, dmp persist fix
|
2023-11-10 16:13:55 +02:00 |
amentis
|
c2c1d834cc
|
fix reference type persist and editor
|
2023-11-10 13:03:08 +02:00 |
amentis
|
3ecb1ed982
|
rename reference type definition fields and fix listing
|
2023-11-09 18:25:35 +02:00 |
Thomas Georgios Giannos
|
009dad8cba
|
Adding clone dmp persist model, exposing new version and clone methods to the API
|
2023-11-09 14:10:32 +02:00 |
Efstratios Giannopoulos
|
41fc3407eb
|
description refactor
|
2023-11-09 11:29:42 +02:00 |
Efstratios Giannopoulos
|
7ef668eede
|
Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring
# Conflicts:
# dmp-backend/core/src/main/java/eu/eudat/query/DmpUserQuery.java
|
2023-11-08 18:45:01 +02:00 |
Efstratios Giannopoulos
|
c1b9e72c2f
|
query authz first implementation
|
2023-11-08 18:42:52 +02:00 |
Thomas Georgios Giannos
|
dab5986688
|
Adding new version dmp persist model, moving associated users and references to new dmp with new version
|
2023-11-08 17:13:07 +02:00 |
Efstratios Giannopoulos
|
0bbad595f5
|
update logging, db configurations
|
2023-11-08 13:37:16 +02:00 |
Thomas Georgios Giannos
|
e22ba13caf
|
Adding user as owner on new dmp persist
|
2023-11-08 11:45:33 +02:00 |
Efstratios Giannopoulos
|
e81e6dd89a
|
Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring
# Conflicts:
# dmp-backend/core/src/main/java/eu/eudat/model/builder/DmpBuilder.java
|
2023-11-07 17:08:44 +02:00 |
Efstratios Giannopoulos
|
8cd8da6d98
|
add public models
|
2023-11-07 17:07:24 +02:00 |
Thomas Georgios Giannos
|
24aba556ef
|
Small fix
|
2023-11-07 16:34:26 +02:00 |
Thomas Georgios Giannos
|
3e15749b56
|
Added dmp users on dmp builder
|
2023-11-07 16:18:18 +02:00 |
Thomas Georgios Giannos
|
4e99fb08e9
|
merge
|
2023-11-07 16:12:54 +02:00 |
Thomas Georgios Giannos
|
0e6a59ef3d
|
Added dmp users on dmp builder
|
2023-11-07 16:05:12 +02:00 |
Efstratios Giannopoulos
|
0644e61962
|
description refactor
|
2023-11-07 14:53:36 +02:00 |
Thomas Georgios Giannos
|
4a8c3640de
|
Added dmp user censor
|
2023-11-07 14:44:26 +02:00 |
Thomas Georgios Giannos
|
001cd0828b
|
Added dmp description template deletions on description template deleter
|
2023-11-07 14:32:37 +02:00 |
amentis
|
cfb7da7968
|
fix referenceTypePersist
|
2023-11-07 14:02:28 +02:00 |
amentis
|
5001968da7
|
fix issue
|
2023-11-07 13:18:17 +02:00 |
amentis
|
88bf760165
|
create referenceType entity
|
2023-11-07 13:15:25 +02:00 |
Efstratios Giannopoulos
|
df5ae4a278
|
description refactor
|
2023-11-07 13:11:21 +02:00 |
Efstratios Giannopoulos
|
ac8d36d1d5
|
Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring
|
2023-11-07 12:37:02 +02:00 |
Efstratios Giannopoulos
|
1469e22185
|
description refactor
|
2023-11-07 12:36:36 +02:00 |
Thomas Georgios Giannos
|
f878601609
|
Added missing converter annotations on entity enums
|
2023-11-07 12:28:40 +02:00 |
Thomas Georgios Giannos
|
ee68224f58
|
Added DmpUser table and stack
|
2023-11-07 12:12:14 +02:00 |
Thomas Georgios Giannos
|
ea58ed2e44
|
Fix on entity doi entity id, removed reference on Dmps, fix on dmp reference query
|
2023-11-07 11:09:54 +02:00 |
Efstratios Giannopoulos
|
05f73889be
|
Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring
|
2023-11-07 10:32:02 +02:00 |
Efstratios Giannopoulos
|
662c5ad7e8
|
description refactor
|
2023-11-07 10:29:27 +02:00 |
Diamantis Tziotzios
|
a9eb2b4513
|
fix backend build error
|
2023-11-07 10:02:09 +02:00 |
George Kalampokis
|
1ef613c87e
|
Merge remote-tracking branch 'origin/dmp-refactoring' into dmp-refactoring
|
2023-11-06 17:43:24 +02:00 |
George Kalampokis
|
9e27558df7
|
Update some of the queries in the new Deposit mapper
|
2023-11-06 17:43:20 +02:00 |
Thomas Georgios Giannos
|
d3cd37d57a
|
Fix on dmp persist
|
2023-11-06 17:43:03 +02:00 |
Thomas Georgios Giannos
|
a5f46e9328
|
Adding description templates on dmp persist
|
2023-11-06 17:42:12 +02:00 |
George Kalampokis
|
49e34f9abc
|
Merge remote-tracking branch 'origin/dmp-refactoring' into dmp-refactoring
|
2023-11-06 17:25:00 +02:00 |
George Kalampokis
|
5ceed08b9c
|
Add missing apply filter
|
2023-11-06 17:22:36 +02:00 |
Efstratios Giannopoulos
|
20873ca13e
|
Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring
# Conflicts:
# dmp-backend/web/src/main/java/eu/eudat/controllers/Admin.java
|
2023-11-06 17:17:34 +02:00 |
Efstratios Giannopoulos
|
87e22040c5
|
description template migration
|
2023-11-06 17:16:55 +02:00 |
George Kalampokis
|
e42bdcfc0a
|
Code cleanup
|
2023-11-06 16:58:01 +02:00 |
George Kalampokis
|
c6cdcc4b15
|
Apply requested changes to RepositoryDepositService
|
2023-11-06 16:56:59 +02:00 |
Efstratios Giannopoulos
|
d8b1211a12
|
Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring
# Conflicts:
# dmp-backend/web/src/main/java/eu/eudat/controllers/FileController.java
# dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DataManagementPlanOverviewModel.java
|
2023-11-06 16:19:06 +02:00 |
Efstratios Giannopoulos
|
81528dfe55
|
description refactor
|
2023-11-06 16:17:57 +02:00 |
amentis
|
11bb1a3c8c
|
create Supportive Material query public
|
2023-11-06 15:25:04 +02:00 |
Thomas Georgios Giannos
|
9b9cf0de4d
|
Adding dmp-description-template stack
|
2023-11-06 13:31:01 +02:00 |
amentis
|
fda8fcef2c
|
create Supportive Material Entity, (persist in progress)
|
2023-11-03 18:09:19 +02:00 |
George Kalampokis
|
c636b3e6b4
|
Minor query optimization
|
2023-11-03 18:00:06 +02:00 |
George Kalampokis
|
7bb8e850e8
|
Add first implementation of the new Repository Deposit Service
|
2023-11-03 17:54:26 +02:00 |
Thomas Georgios Giannos
|
b389ebf160
|
Fix on dmp references persisting flow
|
2023-11-03 16:47:54 +02:00 |
Thomas Georgios Giannos
|
2f20675348
|
Adding reference persisting on dmp persist (work in progress), adding separate persist models for dmp properties
|
2023-11-03 16:02:47 +02:00 |
Efstratios Giannopoulos
|
9cf91aab50
|
DescriptionTemplate refactor
|
2023-11-03 15:53:18 +02:00 |
Efstratios Giannopoulos
|
08caf64d02
|
DescriptionTemplate refactor
|
2023-11-03 14:53:10 +02:00 |
amentis
|
c37530c022
|
add supportive material editor to UI
|
2023-11-03 13:30:11 +02:00 |
Efstratios Giannopoulos
|
b6278ab1ef
|
DescriptionTemplate refactor
|
2023-11-03 11:55:26 +02:00 |
Efstratios Giannopoulos
|
d38f22ccbf
|
DescriptionTemplate refactor
|
2023-11-02 18:37:12 +02:00 |
Thomas Georgios Giannos
|
e02237e599
|
Adding new version service method for Dmps
|
2023-11-02 18:12:36 +02:00 |
Thomas Georgios Giannos
|
752935f6e5
|
Updating Dmp properties persist
|
2023-11-02 15:55:17 +02:00 |
Efstratios Giannopoulos
|
732dfd9bfb
|
DmpBlueprint feractor
|
2023-11-02 14:13:13 +02:00 |
Thomas Georgios Giannos
|
c3808b5548
|
Updating Dmp Entity fields to reflect the database changes (migration script not yet updated)
|
2023-11-02 13:45:32 +02:00 |
Efstratios Giannopoulos
|
ac15e33a87
|
DescriptionTemplate refactor
|
2023-11-01 18:12:59 +02:00 |
George Kalampokis
|
3c799063cc
|
Fix Deposit Configuration's Authentication system
|
2023-11-01 14:10:35 +02:00 |
Efstratios Giannopoulos
|
4e08d9f073
|
DescriptionTemplate refactor
|
2023-11-01 12:03:23 +02:00 |
amentis
|
be9761b103
|
add more fields to reference-type.yml
|
2023-10-31 17:57:41 +02:00 |
Efstratios Giannopoulos
|
7e391582b5
|
User DescriptionTemplate refactor
|
2023-10-31 17:24:03 +02:00 |
Diamantis Tziotzios
|
c08f05bc04
|
no message
|
2023-10-31 11:19:52 +02:00 |
Efstratios Giannopoulos
|
2b074f268d
|
DescriptionTemplate refactor
|
2023-10-30 18:02:20 +02:00 |
amentis
|
477e4e498e
|
add frontend reference search lookup
|
2023-10-30 17:53:30 +02:00 |
amentis
|
f744573f02
|
add reference search builders, lookup
|
2023-10-30 17:15:40 +02:00 |
Diamantis Tziotzios
|
557c444bc1
|
frontend description template listing component
|
2023-10-30 15:30:46 +02:00 |
Efstratios Giannopoulos
|
c06253bb20
|
DescriptionTemplate refactor
|
2023-10-30 15:07:59 +02:00 |
amentis
|
49d400662b
|
add reference definition censor
|
2023-10-30 10:57:24 +02:00 |
amentis
|
a0ac8df5ba
|
rename sourceType
|
2023-10-30 10:43:50 +02:00 |
Diamantis Tziotzios
|
9201f265d2
|
Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring
# Conflicts:
# dmp-frontend/src/app/core/model/reference/reference.ts
|
2023-10-27 18:59:51 +03:00 |
Diamantis Tziotzios
|
7214745162
|
frontend dmp changes
|
2023-10-27 18:56:19 +03:00 |
Efstratios Giannopoulos
|
bdcaee004d
|
Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring
# Conflicts:
# dmp-backend/core/src/main/java/eu/eudat/audit/AuditableAction.java
# dmp-backend/web/src/main/resources/config/permissions.yml
|
2023-10-27 18:52:34 +03:00 |
Efstratios Giannopoulos
|
57facf98e5
|
DescriptionTemplate refactor
|
2023-10-27 18:46:34 +03:00 |
amentis
|
9d3cc9e3d2
|
rename sourceType to referenceSourceType
|
2023-10-27 18:29:06 +03:00 |
amentis
|
92c165e904
|
add references definition xml,builder, persist
|
2023-10-27 17:35:35 +03:00 |
Thomas Georgios Giannos
|
65e8635c2f
|
Removing unused dataset entity classes
|
2023-10-27 17:32:07 +03:00 |
Thomas Georgios Giannos
|
e31970c7ea
|
Adding migration scripts for Dmp, DmpReference, Description and DescriptionReference entities, other fixes / clear up dmp entity
|
2023-10-27 17:05:48 +03:00 |
Thomas Georgios Giannos
|
8d1c988135
|
Adding DescriptionReference lookup and linking on description entity builder
|
2023-10-27 13:48:17 +03:00 |
Thomas Georgios Giannos
|
60ca51fe00
|
Adding DescriptionReference entity stack (former Dataset*** entities)
|
2023-10-27 11:59:37 +03:00 |
amentis
|
7508cf8698
|
add created, updated in DmpReference
|
2023-10-27 11:41:44 +03:00 |
Diamantis Tziotzios
|
e4203a3bb4
|
backend fixes
|
2023-10-27 09:54:49 +03:00 |
George Kalampokis
|
d983e1e38e
|
Add Deposit Security
|
2023-10-26 18:04:55 +03:00 |
amentis
|
aecac1995d
|
rename External Reference to Reference
|
2023-10-26 14:38:18 +03:00 |
amentis
|
f006587f4a
|
Merge remote-tracking branch 'origin/dmp-refactoring' into dmp-refactoring
|
2023-10-26 12:09:36 +03:00 |
amentis
|
bbb21fadba
|
rename External Reference to Reference
|
2023-10-26 12:07:04 +03:00 |
Diamantis Tziotzios
|
4eca9b32c9
|
various backend fixes
|
2023-10-26 11:21:33 +03:00 |
Diamantis Tziotzios
|
129dbd163a
|
minor fixes dmp blueprints and Dmps.
|
2023-10-25 20:53:47 +03:00 |
amentis
|
45f8f51288
|
Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring
|
2023-10-25 17:38:21 +03:00 |
amentis
|
032b30ed04
|
add DmpExternalReference to DmpBlueprint
|
2023-10-25 17:37:37 +03:00 |
Thomas Georgios Giannos
|
9a78d98751
|
Updating permissions.yml for dmps, entity_dois and descriptions
|
2023-10-25 16:55:10 +03:00 |
Thomas Georgios Giannos
|
c169a103b7
|
Updating censors for dmp and description entities
|
2023-10-25 14:49:37 +03:00 |
amentis
|
7df098a010
|
add more to external reference controller, service
|
2023-10-25 12:42:34 +03:00 |
Thomas Georgios Giannos
|
079382556f
|
Added controller for description entity (former dataset)
|
2023-10-25 11:48:19 +03:00 |
Thomas Georgios Giannos
|
7ab1313b83
|
Updated the dmp builder to be able to populate the associated descriptions on the dmps
|
2023-10-25 11:17:56 +03:00 |
amentis
|
bf8edfad92
|
add ExternalReference, DmpExternalReference entities
|
2023-10-24 18:47:13 +03:00 |
Efstratios Giannopoulos
|
a68ddd42ce
|
Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring
# Conflicts:
# dmp-backend/core/src/main/java/eu/eudat/authorization/Permission.java
|
2023-10-24 18:01:38 +03:00 |
Efstratios Giannopoulos
|
de566729f1
|
DmpBlueprint refactor
|
2023-10-24 18:00:11 +03:00 |
Thomas Georgios Giannos
|
e149b61b58
|
Adding 'dmp' query option on 'description' query
|
2023-10-24 17:24:51 +03:00 |
Thomas Georgios Giannos
|
1e733cf704
|
Connecting 'dmp' entity with 'description' entity (description builder populating dmp data)
|
2023-10-24 17:07:28 +03:00 |
Thomas Georgios Giannos
|
3e7b9ca90b
|
Optimize imports
|
2023-10-24 15:39:11 +03:00 |
Thomas Georgios Giannos
|
e27468b596
|
Adding basic service for 'description' entity
|
2023-10-24 15:38:15 +03:00 |
Thomas Georgios Giannos
|
485f7311cd
|
Adding builder and query for 'description' entity
|
2023-10-24 13:50:53 +03:00 |
Thomas Georgios Giannos
|
e3536285aa
|
Adding 'description' entity (former 'dataset' entity)
|
2023-10-24 12:47:48 +03:00 |
Efstratios Giannopoulos
|
a68668f07e
|
DmpBlueprint refactor
|
2023-10-24 12:13:05 +03:00 |
Thomas Georgios Giannos
|
dc380cdc01
|
Small fix on dmp entity id definition
|
2023-10-24 11:35:19 +03:00 |
Efstratios Giannopoulos
|
167d3d4a4b
|
DmpBlueprint refactor
|
2023-10-23 18:13:34 +03:00 |
amentis
|
10615c6fa9
|
fix front enums
|
2023-10-23 17:58:56 +03:00 |
Efstratios Giannopoulos
|
3b9b348d4d
|
update External Refence
|
2023-10-23 16:53:32 +03:00 |
Efstratios Giannopoulos
|
fe7d6f59b1
|
DmpBlueprint refacto
|
2023-10-23 15:58:33 +03:00 |
Thomas Georgios Giannos
|
f4d84aa807
|
Implemented controller for dmp entity, dmp lookup update
|
2023-10-23 14:45:05 +03:00 |
Thomas Georgios Giannos
|
074ca35970
|
Implemented service for dmp entity
|
2023-10-23 12:51:11 +03:00 |
Thomas Georgios Giannos
|
eeaa35fab5
|
Added censor, deleter and lookup for Dmp entity
|
2023-10-23 12:23:51 +03:00 |
Diamantis Tziotzios
|
172caabcd2
|
Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring
|
2023-10-23 11:58:32 +03:00 |
Diamantis Tziotzios
|
6a8cb2c853
|
more frontend dmp blueprint listing changes
|
2023-10-23 11:58:15 +03:00 |
Thomas Georgios Giannos
|
61f2810fcc
|
Renamed DMP -> Dmp to be consistent with the other entities
|
2023-10-23 11:31:07 +03:00 |
Diamantis Tziotzios
|
6d6a4e0341
|
Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring
|
2023-10-23 11:27:27 +03:00 |
Diamantis Tziotzios
|
0c1509a1a1
|
Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring
# Conflicts:
# dmp-backend/core/src/main/java/eu/eudat/audit/AuditableAction.java
|
2023-10-23 11:27:03 +03:00 |
Thomas Georgios Giannos
|
10df3db7aa
|
Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring
|
2023-10-23 11:17:23 +03:00 |
Thomas Georgios Giannos
|
c338a93d71
|
Implemented builder and query for DMP entity, refactored services package
|
2023-10-23 11:16:58 +03:00 |
Efstratios Giannopoulos
|
6cde8ae2a9
|
add cross origin config
|
2023-10-23 11:15:08 +03:00 |
Efstratios Giannopoulos
|
3ad7441bb5
|
DmpBlueprint refactor
|
2023-10-23 10:21:25 +03:00 |
Diamantis Tziotzios
|
3422b147c8
|
Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring
|
2023-10-22 13:34:12 +03:00 |
Efstratios Giannopoulos
|
30bff76163
|
Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring
# Conflicts:
# dmp-backend/core/src/main/java/eu/eudat/commons/enums/ExternalReferencesType.java
|
2023-10-20 19:17:14 +03:00 |
Efstratios Giannopoulos
|
88088d64fd
|
DmpBlueprint refactor
|
2023-10-20 19:13:57 +03:00 |
Diamantis Tziotzios
|
9ed94450bd
|
Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring
|
2023-10-20 18:01:15 +03:00 |
Diamantis Tziotzios
|
4d3098860d
|
description template type and dmp blueprint frontend changes
|
2023-10-20 18:01:09 +03:00 |
amentis
|
0bd3ff6898
|
fix external references enums
|
2023-10-20 17:44:41 +03:00 |
Thomas Georgios Giannos
|
a94cce47e8
|
Added DMP Entity (not integrated)
|
2023-10-20 16:48:55 +03:00 |
George Kalampokis
|
7d4b4c171b
|
Apply some minor fixes
|
2023-10-20 11:57:25 +03:00 |
Efstratios Giannopoulos
|
0b3178177a
|
changes for remote fetcher
|
2023-10-19 17:56:53 +03:00 |
Thomas Georgios Giannos
|
2a4e61f08f
|
Added controller for EntityDoi entity
|
2023-10-19 17:48:41 +03:00 |
Thomas Georgios Giannos
|
727702023f
|
Reverting changes on join DMP <-> EntityDoiEntity for now in order for the app to be able to run
|
2023-10-19 16:52:41 +03:00 |
Efstratios Giannopoulos
|
16604a8a50
|
bug fixes
|
2023-10-19 13:01:29 +03:00 |
Thomas Georgios Giannos
|
07ff58fbd9
|
Removing joins from DMP <-> EntityDoiEntity
|
2023-10-19 12:41:47 +03:00 |
Efstratios Giannopoulos
|
a235eb98f4
|
task #9088 Authorization model should be changed to be Permission based
|
2023-10-19 10:44:20 +03:00 |
Efstratios Giannopoulos
|
ce8ff28955
|
Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring
# Conflicts:
# dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/EntityDoiDao.java
# dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/EntityDoiDaoImpl.java
# dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
# dmp-backend/web/src/main/java/eu/eudat/logic/managers/DepositManager.java
|
2023-10-18 19:03:35 +03:00 |
Efstratios Giannopoulos
|
52e59ac11c
|
task #9088 Authorization model should be changed to be Permission based
|
2023-10-18 18:52:03 +03:00 |
George Kalampokis
|
dc752f73ca
|
Partially fix Deposit Logic and add support for upcomming micro-services
|
2023-10-18 18:15:52 +03:00 |
amentis
|
7cba7b2346
|
add external references service
|
2023-10-18 18:05:39 +03:00 |
Thomas Georgios Giannos
|
a38342e534
|
Removed EntityDao logic, added template stack, controller not yet implemented, db script not yet run
|
2023-10-18 17:58:36 +03:00 |
Efstratios Giannopoulos
|
941f2d69cc
|
Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring
|
2023-10-18 13:54:47 +03:00 |
Efstratios Giannopoulos
|
5c17027df2
|
fix delete user info additional data
|
2023-10-18 13:54:02 +03:00 |