Commit Graph

431 Commits

Author SHA1 Message Date
Philipp Fromme 4714a7279d fix(replace-menu-provider): fix property name
* fix property name in order to ensure correct behavior
* adjust unit tests in order to ensure correct assertions
closes #571
2016-08-08 13:52:21 +02:00
Ricardo Matias 0f4dbb32bd feat(preview-support): decouple the shared preview logic 2016-08-08 11:26:20 +02:00
Philipp Fromme 73487358a9 feat(replace-preview): rename moveVisuals to movePreview
related to bpmn-io/diagram-js#182 and bpmn-io/diagram-js#184
2016-08-08 11:23:49 +02:00
Philipp Fromme 7fdd9bc611 fix(snapping): snap sequence flows mid -> mid
With the latest version of bpmn-js it is possible to draw point
top point connections between elements.

This restores the mid -> mid connection snapping for sequence flows.

Closes #588
2016-07-18 12:59:06 +02:00
Jan Stümmel b881ca8086 fix(modeling): handle non-integer waypoints in LabelBehavior
* verify space tool / label layouting behavior

Closes #590
2016-07-14 08:54:45 +02:00
Jan Stümmel 6c77e23692 fix(modeling): do not layout hidden labels
closes #587
2016-07-05 17:19:13 +02:00
Jan Stümmel fd198b6059 feat(modeling): move labels with connections
* move on segment dragging
* move on reconnect
* move on bendpoint add / remove

Closes #331
2016-07-05 12:01:08 +02:00
Adam Brengesjö 91dd1b696c fix(replace):ComplexGateway can have default sequence flows
The BPMN 2.0 specification[1] states "a Sequence Flow that has an
Exclusive, Inclusive or Complex Gateway or an Activity as its source
can also be defined with as default."

This commit will honor that statement by allowing sequence flows from
Complex Gateway to be defined as default.

  [1] = http://www.omg.org/spec/BPMN/2.0/
2016-06-30 14:43:29 +02:00
Nico Rehwaldt df54005cfa feat(modeling): repair broken connection dockings on import
Closes #479
2016-06-27 00:32:17 +02:00
Nico Rehwaldt f5f05ac011 chore(layouting): account for connection(Start|End) hints
Related to bpmn-io/diagram-js#167
2016-06-27 00:32:16 +02:00
Nico Rehwaldt 1743c63d91 style(snapping): use constant instead of magic number 2016-06-22 18:15:20 +02:00
Nico Rehwaldt db53608b3d feat(connect): support point to point connection
Closes #578
2016-06-22 15:52:50 +02:00
Nico Rehwaldt fcf2bbd9aa feat(modeling/layout): improve MessageFlow layout on SubProcesses
Related to #574
2016-06-22 15:52:31 +02:00
Ricardo Matias 6549af7aca feat(modeling/layout): improve message flow layout on Participants
Closes #574
2016-06-22 15:52:06 +02:00
Nico Rehwaldt e99214bb6a chore(editor-actions): factor out into own component
Related to bpmn-io/diagram-js#177
2016-06-21 15:29:03 +02:00
Ricardo Matias 224fa6da61 feat(align-elements): elements can be aligned
Related to bpmn-io/bpmn-js#177
2016-06-21 15:29:03 +02:00
Philipp Fromme e157f1c82f fix(bpmn-updater): keep conditions on element replace
Closes camunda/camunda-modeler#318
2016-06-21 14:01:41 +02:00
Ricardo Matias b43cff1ec2 feat(copy-paste): copy Event Sub Process / Non-Interrupting Boundary
Closes #556, #555
2016-06-21 13:39:37 +02:00
Philipp Fromme 1b17d45260 fix(replace-menu): add sub process to event sub process replace menu
Closes camunda/camunda-modeler#310
2016-06-16 15:18:51 +02:00
pedesen e3144f8ad7 chore(auto-resize): migrate to diagram-js infrastucture
Closes #569
2016-06-15 20:32:40 +02:00
Ricardo Matias cf108a9233 feat(distribute-elememts): add element distribution
This allows the distribution of elements evenly.

Related to bpmn-io/diagram-js#172
2016-06-15 14:01:57 +02:00
Philipp Fromme 6da1a0cb63 feat(replace): keep element ID on replace
Closes #513
2016-06-13 16:53:13 +02:00
Nico Rehwaldt 0ba239bbce chore(project): switch to eslint
Use eslint instead of jshint for linting.

* better linting results
* test files linted, too
* consistent code style checks

Closes #568
2016-06-07 09:55:32 +02:00
Nico Rehwaldt 7e93759a0d fix(modeling/BpmnUpdater): ignore custom elements on canvas.updateRoot
Closes #559
2016-06-01 09:43:02 +02:00
pedesen f15647edfd feat(context-pad): add text annotation option for data objects/stores
Closes #564
2016-05-31 11:04:55 +02:00
Vladimirs Katusenoks 839ed0b8e8 fix(paste): copy process with participant
Closes camunda/camunda-modeler#297
2016-05-20 15:55:04 +02:00
Vladimirs Katusenoks 80d62b9873 fix(paste): set correct parent on data associations
Closes camunda/camunda-modeler#296
2016-05-20 12:40:15 +02:00
Vladimirs Katusenoks a1ab8f9e7d fix(search): do not include root element in results
Closes camunda/camunda-modeler#280
2016-05-18 10:42:38 +02:00
Ricardo Matias 6e8962574b revert(textarea): support automatic-resizing textarea
This reverts commit 11165e2c21.
2016-05-18 08:17:03 +02:00
Vladimirs Katusenoks 006be69d63 fix(associations): always show full data association
Closes #506
2016-05-09 14:36:06 +02:00
Vladimirs Katusenoks 5a02923a61 fix(connections): fix update logic on reconnecting elements
Closes #534
2016-05-06 16:26:02 +02:00
Ricardo Matias 30e3fdd81c fix(copy-paste): allow pasting of elements onto lanes
Closes #532
2016-05-03 17:27:25 +02:00
Nico Rehwaldt 35ca66e48a feat(auto-resize): do not expand on child element create
Closes #531
2016-05-03 16:56:02 +02:00
Ricardo Matias 612b93db2e feat(copy-paste): disallow pasting of participants on some scenarios
Participants are not allowed to be pasted onto a Process,
if the Process already has other elements.

Closes #526
2016-05-03 15:23:45 +02:00
Ricardo Matias 3f04e18398 fix(copy-paste): correctly paste on lanes
Closes #516
2016-05-02 14:38:42 +02:00
hoferch91 11165e2c21 fix(textarea): support automatic-resizing textarea
Closes #472
2016-05-02 11:26:19 +02:00
Ricardo Matias c586c908b2 feat(ModelingFeedback): add tooltip when pasting is disallowed
Only in the case of pasting outside of collaboration.

Closes camunda/camunda-modeler#252
2016-04-29 16:19:09 +02:00
Ricardo Matias e3f27ea1d5 feat(palette): move tool's separator
Closes #502
2016-04-29 11:38:04 +02:00
Nico Rehwaldt b0eea3dbef fix(search): correct minification meta-data
Closes #521
2016-04-28 20:43:58 +02:00
Philipp Fromme b86f923fe5 fix(palette): change intermediate/boundary event palette label
Closes #519
2016-04-27 11:13:24 +02:00
Jan Stümmel 0731c9888b feat(modeling): I can morph tasks to expanded sub processes
* from expanded subprocesses to tasks or collapsed sub processes is not supported

Closes #247
2016-04-22 13:23:25 +02:00
Ricardo Matias 1b9ebfc993 feat(copy-paste): allow copying & pasting of elements
Closes #391
2016-04-22 09:34:53 +02:00
Jan Stümmel 489a6af3b2 fix(modeling): collapsed subprocess dont shows itself on the replace-menu
Solved with #247

Closes #509
2016-04-21 16:06:18 +02:00
Vladimirs Katusenoks 07a1ef29b6 fix(morphing): release id on element replace
Closes camunda/camunda-modeler#97
2016-04-21 11:50:36 +02:00
Vladimirs Katusenoks bc53dc98db fix(id): unclaim id on element remove
Closes #421

Fixing incorrect test+implementation for ID property update
2016-04-21 11:50:36 +02:00
Philipp Fromme ec159381ce fix(replace): preserve label position on element replace
closes #235
2016-04-20 16:13:02 +02:00
Philipp Fromme 7de043ab9d fix(modeling): adjust position of hidden label on waypoints change
closes bpmn-io/diagram-js#158
2016-04-20 16:00:14 +02:00
Vladimirs Katusenoks 1923a6bdda feat(global-connect): connect distant elements
Closes #474, #394
2016-04-14 17:03:58 +02:00
Jan Stümmel bb06a0386d feat(modeling): combining two sequence flows when removing an element
combines only if removed element has one outgoing and one incoming sequence flow

Closes #433
2016-04-13 14:38:38 +02:00
Vladimirs Katusenoks bff19786b4 feat(search): be able to search bpmn elements
Closes #500
2016-04-12 16:50:23 +02:00
Vladimirs Katusenoks 60720c8ae7 fix(modeling): unset gateway default on default flow delete
Closes #505
2016-04-04 17:24:01 +02:00
Nico Rehwaldt 9bcdd3b958 fix(rules): do not allow deletion of labels
Closes #499
2016-03-23 15:32:10 +01:00
Nico Rehwaldt 13be55dca1 fix(ordering): correctly treat transactions / ad-hoc sub-processes 2016-03-16 11:26:41 +01:00
Jan Stümmel 4732dcfc74 feat(modeling): create collapsed pools via morph menu
You are now able to morph between collapsed and expanded pools

* Not possible to drop elements in a collapsed pool
* if a expanded pool collapses, the children are deleted

Closes #365
2016-03-14 16:28:23 +01:00
davcs86 49173abdad feat(i18n): add localization
* Palette, ContextPad, Errors...

Closes #491
2016-03-11 20:10:10 +01:00
Nico Rehwaldt 85f50ff907 fix(replace): require correct dependency modules 2016-03-11 16:59:07 +01:00
Jan Stümmel 9582a68faf fix(textarea-size-zoom): fixes the size of a label textbox on low zoom levels
Closes #477
2016-03-09 14:39:52 +01:00
Nico Rehwaldt 7ad9c7106e fix(label-editing): complete editing operation on drag init
Make sure the direct editing results are applied (not discarded)
when the user starts a drag operation with direct editing active.

Closes #490
2016-03-08 14:41:32 +01:00
Nico Rehwaldt 1bceaaa229 chore(modeling): move BpmnLabelSupport to behavior
* Make sure the label support is part of our
behavior definitions.
* Adjust test cases accordingly.
2016-03-08 14:12:52 +01:00
hoferch91 0393d51893 chore(modeling): set minimum height to one line
Closes #402
2016-03-07 09:11:45 +01:00
pedesen 37353c4f60 fix(modeling): mark elements as changed during label update
Closes #484
2016-03-03 17:27:57 +01:00
pedesen e568312a68 fix(util): fix isExpanded check
DiUtil/isExpanded now returns either true or false instead of
'undefined' in some cases.

Closes #458
2016-01-27 15:18:54 +01:00
Nico Rehwaldt c3da49b4e5 feat(palette): show hand-tool on top 2016-01-27 13:52:31 +01:00
Nico Rehwaldt 82073f2d38 feat(keyboard): key bindings toggle tools
Closes #459
2016-01-27 13:31:17 +01:00
Nico Rehwaldt ca979b4c05 feat(palette): add DataStore entry
Related to #345
2016-01-27 12:33:44 +01:00
Nico Rehwaldt 6b27ee4301 feat(context-pad): integrate DataStore pad
Related to #345
2016-01-27 12:01:16 +01:00
Nico Rehwaldt 4f28d14cbc feat(rules): add DataStore rules
Related to #345
2016-01-27 11:56:05 +01:00
Nico Rehwaldt cc2cf3f561 chore(modeling/behavior): cleanup code 2016-01-27 11:56:05 +01:00
Nico Rehwaldt cc142d8fd5 chore(modeling/ElementFactory): use is helper 2016-01-27 11:56:05 +01:00
Nico Rehwaldt 206daa1154 fix(modeling): manhattan layout compensation association
Related to #291
2016-01-27 09:45:05 +01:00
Nico Rehwaldt 5ab0db65a5 fix(rules): allow TextAnnotation inside SubProcesses 2016-01-26 18:24:05 +01:00
Nico Rehwaldt 12bb7d3c55 fix(replace): allow morph into compensation SubProcess, too
Closes #461
2016-01-26 16:35:08 +01:00
Ricardo Matias fd2230a8fa feat(hand-tool): add hand-tool
Closes #412
2016-01-25 21:43:13 +01:00
Nico Rehwaldt eddd90727f fix(rules): allow data associations to be moved
Closes #454
2016-01-25 16:02:59 +01:00
Nico Rehwaldt acf9013bcb feat(context-pad): add compensation pad
Related to #291
2016-01-25 16:02:59 +01:00
Nico Rehwaldt d8ace12308 fix(rules): always allow associations from/to TextAnnotation 2016-01-25 16:02:59 +01:00
Nico Rehwaldt 7190f8bef8 feat(rules): implement compensation rules
Related to #291
2016-01-25 16:02:58 +01:00
Nico Rehwaldt d7834e9bee feat(replace): add compensation morph options
* compensation boundary
* compensation activity

Related to #291
2016-01-25 16:02:58 +01:00
Nico Rehwaldt 305b59e1f3 fix(replace): allow morphing SubProcess -> EventSubProcess
Closes #451
2016-01-20 11:22:16 +01:00
Ricardo Matias 694d52d6bb fix(ReplaceMenuProvider): handle condition/default when morphing flows
* Remove conditionExpression when morphing to default flow
 * Remove default property when morphing to conditional flow

Closes #441, closes #442
2016-01-08 12:01:01 +01:00
Ricardo Matias 0feebe0b0c feat(DefaultFlows): allow default flows going out of tasks
Closes #425
2016-01-07 16:29:30 +01:00
Ricardo Matias b233e7f6ed feat(context-pad): pass mouse position to the popup menu
Closes #414
2016-01-06 18:22:12 +01:00
pedesen eb7b5d7bb4 chore(replace): separate popup menu from replace logic
This commit makes use of the provider concept introduced
in diagram-js. The replace menu entries are now created
in the replace menu provider. This separates BpmnReplace
from the entry creation in the popup menu.

Closes #428
2016-01-06 16:37:17 +01:00
Adam Brengesjö 93d4bade22 feat(replace): let rules disallow replacement operations 2016-01-06 16:37:17 +01:00
Nico Rehwaldt 9ac0a9a957 fix(modeling): correctly populate DataInputAssociation#targetRef
Closes #431
2016-01-06 11:57:52 +01:00
Nico Rehwaldt f89fd529de fix(ordering): correctly attach boundary element in front of task
The way we create labels during import (right after the respective
element) interfered with the ordering during boundary attach.

This commit fixes the behavior.

Closes #437
2016-01-04 16:10:55 +01:00
Ricardo Matias d344e679fd fix(BpmnLabelSupport): fix hidden property assignment
Closes #401
2016-01-04 15:19:08 +01:00
Nico Rehwaldt a046b14d6f feat(modeling): allow passing shapes to modeling#updateProperties
Closes #430
2015-12-08 15:18:13 +01:00
Adam Brengesjö 9322a6a1e6 feat(context-pad): show delete only if allowed by rules
Related to bpmn-io/diagram-js#131
2015-12-02 15:56:09 +01:00
Nico Rehwaldt 283ddae6d3 fix(modeling/cmd): do not fail updating non-changed id
Closes #420
2015-11-25 21:53:02 +01:00
pedesen acb3716716 fix(replace): properly set parent of event definitions
Related to bpmn-io/bpmn-js-properties-panel#82
2015-11-19 13:28:39 +01:00
Nico Rehwaldt a0d4b7807c chore(project): migrate to bpmn-icon prefixed font
Related to bpmn-io/bpmn-font#12
2015-11-16 15:28:21 +01:00
pedesen 80d1969274 fix(replace): change escalation event from catching to throwing
Closes #411
2015-11-16 13:29:07 +01:00
Adam Brengesjö 0a33d7c2b4 fix(replace): do NOT show current sequence flow type for OR-gateways
Closes #410
2015-11-12 17:22:25 +01:00
Nico Rehwaldt 4ea70a05de fix(snapping): remove prev/next resize constraints for unbalanced resize 2015-10-22 20:35:34 +02:00
Nico Rehwaldt de35cdc6a0 chore(modeling): switch to primary modifier for lane expanding 2015-10-22 20:28:08 +02:00
pedesen 8704d5d5a0 fix(auto-resize): expand non-primary parents in multi select move
Closes #397
2015-10-22 18:20:35 +02:00
Nico Rehwaldt f68054295b feat(modeling): allow data associations from and to events
Closes #384
2015-10-22 08:21:01 +02:00
pedesen 4019d529ad feat(replace): add default and conditional flow icons
Closes #370
2015-10-21 12:33:24 +02:00
Nico Rehwaldt fbcb8a92b5 fix(context-pad): disable split for small lanes 2015-10-20 17:57:41 +02:00
Nico Rehwaldt e79e70acb4 fix(context-pad): reopen after Lane split
Closes #392
2015-10-20 16:29:13 +02:00
Nico Rehwaldt e1cd32fa91 fix(auto-resize): correctly auto-resize participant
Closes #390
2015-10-20 16:09:14 +02:00
Nico Rehwaldt d789342b10 feat(modeling): update Lane#flowNodeRefs while modeling
Closes #387
2015-10-20 16:05:24 +02:00
Nico Rehwaldt 7af6d916ce feat(context-pad): use #removeElements when deleting 2015-10-20 16:05:24 +02:00
Nico Rehwaldt 90067aba03 docs(modeling/util): fix LaneUtil docs 2015-10-20 16:05:24 +02:00
Nico Rehwaldt 6a3bdd32ea chore(context-pad): make lane actions available
Lanes are going to be modeled via the parents context-pad only.

This commit

* removes lanes from the palette
* adds lane actions to the context-pad

Related to #379
2015-10-20 16:04:23 +02:00
Nico Rehwaldt 0831cae843 feat(rules): add lane rules 2015-10-20 15:47:12 +02:00
Nico Rehwaldt fefc748a9a feat(snapping): add lane snapping 2015-10-20 15:47:12 +02:00
Nico Rehwaldt 5e26068f99 feat(modeling): add lane modeling operations
This commit adds the functionality to

* add a lane (above/below an existing one)
* split a lane into sub lanes
* remove a lane
* resize a lane

Closes #379
Closes #338
2015-10-20 15:47:12 +02:00
Nico Rehwaldt 21d68799ad chore(replace): directly expose #getReplaceOptions 2015-10-20 15:47:12 +02:00
Nico Rehwaldt 6f3dadd403 chore(ordering): use existing isAny impl 2015-10-20 15:47:12 +02:00
Ricardo Matias 03b4a59f84 feat(keyboard): use editor actions
Related to bpmn-io/diagram-js#116
2015-10-20 15:34:40 +02:00
Nico Rehwaldt 5d5683ff64 chore(project): update didi dependency 2015-10-20 15:34:16 +02:00
pedesen a77796b271 fix(modeling): retain connection layout for (data-)associations
Closes #380
2015-10-13 11:11:44 +02:00
Ricardo Matias a0bfc29482 fix(modeling): hide labels on element create 2015-10-07 15:19:55 +02:00
pedesen 08c2ebc78f feat(modeling): add data objects
Closes #344
2015-10-07 15:15:57 +02:00
Ricardo Matias 534061d821 feat(replace): update bpmn when reconnecting flows
When reconnecting the source and end waypoints of a conditional
or default flow, the bpmn tree should be updated to reflect
these changes.

Closes #373
2015-10-06 13:51:01 +02:00
Kristin Polenz 188487ebdc feat(modeling/UpdateProperties): unclaim old business object id 2015-10-05 16:13:46 +02:00
Nico Rehwaldt 8b5572d3c4 fix(draw): hide empty on import + show on property update
Closes #362
2015-10-05 15:40:49 +02:00
Ricardo Matias baab4c6039 feat(replace): add titles to activity markers
Closes #372
2015-09-30 11:49:46 +02:00
Ricardo Matias fe7e8fe6d1 feat(replace): add conditional flows
Closes #369
2015-09-30 11:35:44 +02:00
Ricardo Matias 5a60c370a7 feat(replace): add default flows
Closes #272
2015-09-30 11:35:44 +02:00
Ricardo Matias 8a0f566ee3 feat(replace): add cancel events
Closes #337
2015-09-28 11:35:38 +02:00
pedesen 02af025a2e fix(auto-resize): allow concurrent top/bottom or left/right expanding 2015-09-25 11:44:07 +02:00
pedesen dc78909227 chore(auto-resize): change behavior on multi-selection move
Related to #354
2015-09-25 11:44:07 +02:00
pedesen 52cd71287d fix(replace-preview): change type of visualReplacements from array to object
Closes #368
2015-09-24 16:50:34 +02:00
pedesen 629239f93c feat(auto-resize): recursively expand parent elements
Closes #357
2015-09-21 15:17:29 +02:00
pedesen f29793ed9e feat(auto-resize): add expanding of sub processes and transactions
Closes #356
2015-09-21 14:23:08 +02:00
Nico Rehwaldt 4891eb4f84 fix(draw): show labels with text
Closes #362
2015-09-14 16:20:49 +02:00
pedesen 63d0321210 chore(ordering): modify sub process ordering
Closes #358
2015-09-11 14:43:09 +02:00
Ricardo Matias 1295400fe0 test(custom-elements): add integration tests for custom elements
Closes #352
2015-09-09 16:44:10 +02:00
pedesen 857454bbc1 feat(auto-resize): expand participants when moving multiple elements
Closes #353
2015-09-08 12:40:24 +02:00
pedesen 536eb790a0 fix(snapping): boundary event labels snap to siblings
Closes #327
2015-09-07 15:08:59 +02:00
Ricardo Matias 31f0ea1ec0 feat(modeling): add support for custom elements
This commit adds part of the infrastructure that allows
the coexistence between bpmn elements and custom ones.

Closes #348
2015-09-03 09:57:30 +02:00
Nico Rehwaldt e897c6746d chore(palette): restore lanes 2015-09-02 16:23:47 +02:00
Nico Rehwaldt 7ba323b0a1 chore(palette): temporarily remove lanes
Do not confuse people with the unfinished lane support.
Lanes shall be restored once we have layouting + visual feedback in
place.
2015-09-02 16:03:12 +02:00
pedesen 0b8f0465f0 chore(auto-resize): adjust vertical resizing behavior
The parent participant/lane now expands vertically only if the edge of
an element intersects the collaboration edge, or if the element is
is placed beyond the edge.

Closes #347
2015-09-02 11:50:54 +02:00
pedesen ccf21e2f0c fix(replace-preview): rename canExecute.replace -> canExecute.replacements
Closes #346
2015-09-01 18:04:12 +02:00
Nico Rehwaldt 6bed01e023 fix(auto-resize): do not include labels for resize calculation 2015-09-01 16:20:57 +02:00
Nico Rehwaldt ede384b5ac fix(auto-resize): do not resize on lane create / resize lanes, too
Related to #263
2015-08-31 15:35:32 +02:00
Nico Rehwaldt afa72ad5bd fix(modeling): correctly update Lane#flowNodeRefs
Previously, the bpmn:FlowNode <-> bpmn:Lane relationship was not
properly maintained in the BpmnUpdater.

This commit fixes the behavior.

Closes #341
2015-08-31 15:00:27 +02:00
pedesen 39db57987d feat(auto-resize): add ability to automatically expand parent participants
Closes #263
2015-08-31 12:08:21 +02:00
Ricardo Matias 34bd632544 fix(modeling): add caveat for message flows layouting
related to bpmn-io/diagram-js#110
2015-08-25 11:04:51 +02:00
Nico Rehwaldt 834f1844ec feat(snapping): snap participant to child lane border 2015-08-24 16:59:13 +02:00
Nico Rehwaldt d9788c7f31 feat(ordering): add sequence flow + association to correct parent
* remove ModelUtil#getSharedParent because we do proper ordering
  via BpmnOrderingProvider now.
* Cherio!

Related to #316
2015-08-21 17:34:41 +02:00
Nico Rehwaldt e66f2d92aa fix(rules): adjust participant size + fix test case 2015-08-21 17:34:41 +02:00
Nico Rehwaldt 711a2df758 feat(modeling): wrap existing elements in new lane
Related to #316
2015-08-21 17:34:41 +02:00
Nico Rehwaldt 42b66b1602 chore(project): move {modeling->}/rules
This syncs the bpmn-js structure with diagram-js.
2015-08-21 17:34:41 +02:00
Nico Rehwaldt 4e33f524c7 feat(modeling): add lane default width
Related to #316
2015-08-21 17:34:41 +02:00
Nico Rehwaldt e9a7bfa986 fix(modeling): make sure lanes get ids assigned 2015-08-21 17:34:41 +02:00