Skip to content

Commit 8e7e46d

Browse files
committed
Merge remote-tracking branch 'origin/parity/round2' into feat/decision-outcomes-on-the-case
# Conflicts: # lib/Service/BeschikkingService.php # lib/Service/Lifecycle/CaseActs.php # tests/Unit/Service/BeschikkingServiceTest.php
2 parents ddc114f + 75d5c33 commit 8e7e46d

58 files changed

Lines changed: 5125 additions & 228 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎appinfo/info.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ Vrij en open source onder de EUPL-1.2-licentie.
6868
6969
**Ondersteuning:** Voor ondersteuning, neem contact op via support@conduction.nl. Voor een Service Level Agreement (SLA), neem contact op via sales@conduction.nl.
7070
]]></description>
71-
<version>0.4.26-unstable.20260916093000</version>
71+
<version>0.4.26-unstable.20260918101349</version>
7272
<licence>EUPL-1.2</licence>
7373
<author mail="info@conduction.nl" homepage="https://www.conduction.nl/">Conduction</author>
7474
<namespace>Dossiq</namespace>

‎appinfo/routes.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -421,6 +421,7 @@
421421
['name' => 'caseActs#finish', 'url' => '/api/case/{caseId}/finish', 'verb' => 'POST'],
422422
['name' => 'caseActs#abort', 'url' => '/api/case/{caseId}/abort', 'verb' => 'POST'],
423423
['name' => 'caseActs#archive', 'url' => '/api/case/{caseId}/archive', 'verb' => 'POST'],
424+
['name' => 'caseActs#unarchive', 'url' => '/api/case/{caseId}/unarchive', 'verb' => 'POST'],
424425
['name' => 'caseActs#hold', 'url' => '/api/case/{caseId}/hold', 'verb' => 'POST'],
425426
['name' => 'caseActs#releaseHold', 'url' => '/api/case/{caseId}/release-hold', 'verb' => 'POST'],
426427
['name' => 'caseActs#draft', 'url' => '/api/case/{caseId}/draft', 'verb' => 'POST'],

‎l10n/en.js‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -381,6 +381,7 @@ OC.L10N.register(
381381
"An advice request is still open": "An advice request is still open",
382382
"An intrekking. There is a result, and it is not a besluit.": "An intrekking. There is a result, and it is not a besluit.",
383383
"An ISO 8601 duration, for example P7D for every seven days.": "An ISO 8601 duration, for example P7D for every seven days.",
384+
"An object type is an OpenRegister schema. Add one, or change its fields, on the register page.": "An object type is an OpenRegister schema. Add one, or change its fields, on the register page.",
384385
"Analytics": "Analytics",
385386
"And finding this value": "And finding this value",
386387
"Annual dwangsom audit": "Annual dwangsom audit",
@@ -1132,6 +1133,7 @@ OC.L10N.register(
11321133
"Dashboard": "Dashboard",
11331134
"Data": "Data",
11341135
"Data extraction": "Data extraction",
1136+
"Data model": "Data model",
11351137
"Data subject access export": "Data subject access export",
11361138
"Date": "Date",
11371139
"Date & Time": "Date & Time",
@@ -1362,6 +1364,7 @@ OC.L10N.register(
13621364
"DT-advies": "DT advice",
13631365
"Dubbel betaald": "Paid twice",
13641366
"Due": "Due",
1367+
"Due between": "Due between",
13651368
"Due date": "Due date",
13661369
"Due for review": "Due for review",
13671370
"Due soon": "Due soon",
@@ -1964,6 +1967,7 @@ OC.L10N.register(
19641967
"How soon this case matters. The other half of the pair the case type's matrix reads. A case type may declare a default for a new case, and an intake channel that creates cases takes that default rather than inventing one.": "How soon this case matters. The other half of the pair the case type's matrix reads. A case type may declare a default for a new case, and an intake channel that creates cases takes that default rather than inventing one.",
19651968
"How this endpoint authenticates. WSSE UsernameToken is the StUF default.": "How this endpoint authenticates. WSSE UsernameToken is the StUF default.",
19661969
"How this party is reached. Each address carries a kind: correspondence is what outbound mail picks, case is the address the case is about, location is a point on the map. Inbound mail from any of them resolves to this party, so a second record is never created.": "How this party is reached. Each address carries a kind: correspondence is what outbound mail picks, case is the address the case is about, location is a point on the map. Inbound mail from any of them resolves to this party, so a second record is never created.",
1970+
"How urgent the task is.": "How urgent the task is.",
19671971
"HTTP": "HTTP",
19681972
"HTTP status": "HTTP status",
19691973
"https://...": "https://...",
@@ -2295,6 +2299,7 @@ OC.L10N.register(
22952299
"Major declared by": "Major declared by",
22962300
"Major responders": "Major responders",
22972301
"Manage case types and their configurations": "Manage case types and their configurations",
2302+
"Manage object types": "Manage object types",
22982303
"Manage objections, appeals, decisions and BAC advice from a single overview.": "Manage objections, appeals, decisions and BAC advice from a single overview.",
22992304
"Management team advice": "Management team advice",
23002305
"Manager": "Manager",
@@ -2784,6 +2789,7 @@ OC.L10N.register(
27842789
"Object linked to this case.": "Object linked to this case.",
27852790
"Object status": "Object status",
27862791
"Object type": "Object type",
2792+
"Object types": "Object types",
27872793
"Objection": "Objection",
27882794
"Objection & Appeal": "Objection & Appeal",
27892795
"Objection Advisory Committee": "Objection Advisory Committee",
@@ -3770,6 +3776,7 @@ OC.L10N.register(
37703776
"Show completed": "Show completed",
37713777
"Show less": "Show less",
37723778
"Show more": "Show more",
3779+
"Show only the tasks on one case.": "Show only the tasks on one case.",
37733780
"Show substituted work": "Show substituted work",
37743781
"Show the settings as they apply to": "Show the settings as they apply to",
37753782
"Show {group} again": "Show {group} again",
@@ -4067,6 +4074,7 @@ OC.L10N.register(
40674074
"Task {title} is yours": "Task {title} is yours",
40684075
"Tasks": "Tasks",
40694076
"tasks": "tasks",
4077+
"Tasks with a deadline inside this window.": "Tasks with a deadline inside this window.",
40704078
"tasks · {n} due today": "tasks · {n} due today",
40714079
"Team": "Team",
40724080
"Team leader": "Team leader",
@@ -5005,6 +5013,7 @@ OC.L10N.register(
50055013
"Where the duty stands: not owed, still being sent, met, or spent every retry without going out.": "Where the duty stands: not owed, still being sent, met, or spent every retry without going out.",
50065014
"Where the file can be opened.": "Where the file can be opened.",
50075015
"Where the request stands. A request that was never answered becomes expired and stays: it is the evidence that the applicant was given the chance, which Awb 4:5 requires before an application can be refused for incompleteness.": "Where the request stands. A request that was never answered becomes expired and stays: it is the evidence that the applicant was given the chance, which Awb 4:5 requires before an application can be refused for incompleteness.",
5016+
"Where the task is in its lifecycle.": "Where the task is in its lifecycle.",
50085017
"Where this obligation stands. Met and withdrawn both release the case and are never recorded as each other: an inspection nobody carried out is not an inspection that passed, and six months later that difference is the whole record.": "Where this obligation stands. Met and withdrawn both release the case and are never recorded as each other: an inspection nobody carried out is not an inspection that passed, and six months later that difference is the whole record.",
50095018
"Whether a case of this type needs a coordinator named before its besluit is signed. The Awb answer is signed by the second seat, and a case type that leaves this off never asks for one: most cases have a handler and nobody else.": "Whether a case of this type needs a coordinator named before its besluit is signed. The Awb answer is signed by the second seat, and a case type that leaves this off never asks for one: most cases have a handler and nobody else.",
50105019
"Whether a handover of this case is waiting for the receiving team to accept it. A projection of the open casetransfer record and never a second custody trail: it exists so the sending team's list can show what it handed on and nobody picked up.": "Whether a handover of this case is waiting for the receiving team to accept it. A projection of the open casetransfer record and never a second custody trail: it exists so the sending team's list can show what it handed on and nobody picked up.",

‎l10n/en.json‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -398,6 +398,7 @@
398398
"An advice request is still open": "An advice request is still open",
399399
"An intrekking. There is a result, and it is not a besluit.": "An intrekking. There is a result, and it is not a besluit.",
400400
"An ISO 8601 duration, for example P7D for every seven days.": "An ISO 8601 duration, for example P7D for every seven days.",
401+
"An object type is an OpenRegister schema. Add one, or change its fields, on the register page.": "An object type is an OpenRegister schema. Add one, or change its fields, on the register page.",
401402
"Analytics": "Analytics",
402403
"And finding this value": "And finding this value",
403404
"Annual dwangsom audit": "Annual dwangsom audit",
@@ -1151,6 +1152,7 @@
11511152
"Dashboard": "Dashboard",
11521153
"Data": "Data",
11531154
"Data extraction": "Data extraction",
1155+
"Data model": "Data model",
11541156
"Data subject access export": "Data subject access export",
11551157
"Date": "Date",
11561158
"Date & Time": "Date & Time",
@@ -1381,6 +1383,7 @@
13811383
"DT-advies": "DT advice",
13821384
"Dubbel betaald": "Paid twice",
13831385
"Due": "Due",
1386+
"Due between": "Due between",
13841387
"Due date": "Due date",
13851388
"Due for review": "Due for review",
13861389
"Due soon": "Due soon",
@@ -1985,6 +1988,7 @@
19851988
"How soon this case matters. The other half of the pair the case type's matrix reads. A case type may declare a default for a new case, and an intake channel that creates cases takes that default rather than inventing one.": "How soon this case matters. The other half of the pair the case type's matrix reads. A case type may declare a default for a new case, and an intake channel that creates cases takes that default rather than inventing one.",
19861989
"How this endpoint authenticates. WSSE UsernameToken is the StUF default.": "How this endpoint authenticates. WSSE UsernameToken is the StUF default.",
19871990
"How this party is reached. Each address carries a kind: correspondence is what outbound mail picks, case is the address the case is about, location is a point on the map. Inbound mail from any of them resolves to this party, so a second record is never created.": "How this party is reached. Each address carries a kind: correspondence is what outbound mail picks, case is the address the case is about, location is a point on the map. Inbound mail from any of them resolves to this party, so a second record is never created.",
1991+
"How urgent the task is.": "How urgent the task is.",
19881992
"HTTP": "HTTP",
19891993
"HTTP status": "HTTP status",
19901994
"https://...": "https://...",
@@ -2316,6 +2320,7 @@
23162320
"Major declared by": "Major declared by",
23172321
"Major responders": "Major responders",
23182322
"Manage case types and their configurations": "Manage case types and their configurations",
2323+
"Manage object types": "Manage object types",
23192324
"Manage objections, appeals, decisions and BAC advice from a single overview.": "Manage objections, appeals, decisions and BAC advice from a single overview.",
23202325
"Management team advice": "Management team advice",
23212326
"Manager": "Manager",
@@ -2807,6 +2812,7 @@
28072812
"Object linked to this case.": "Object linked to this case.",
28082813
"Object status": "Object status",
28092814
"Object type": "Object type",
2815+
"Object types": "Object types",
28102816
"Objection": "Objection",
28112817
"Objection & Appeal": "Objection & Appeal",
28122818
"Objection Advisory Committee": "Objection Advisory Committee",
@@ -3796,6 +3802,7 @@
37963802
"Show completed": "Show completed",
37973803
"Show less": "Show less",
37983804
"Show more": "Show more",
3805+
"Show only the tasks on one case.": "Show only the tasks on one case.",
37993806
"Show substituted work": "Show substituted work",
38003807
"Show the settings as they apply to": "Show the settings as they apply to",
38013808
"Show {group} again": "Show {group} again",
@@ -4097,6 +4104,7 @@
40974104
"Task {title} is yours": "Task {title} is yours",
40984105
"Tasks": "Tasks",
40994106
"tasks": "tasks",
4107+
"Tasks with a deadline inside this window.": "Tasks with a deadline inside this window.",
41004108
"tasks · {n} due today": "tasks · {n} due today",
41014109
"Team": "Team",
41024110
"Team leader": "Team leader",
@@ -5046,6 +5054,7 @@
50465054
"Where the duty stands: not owed, still being sent, met, or spent every retry without going out.": "Where the duty stands: not owed, still being sent, met, or spent every retry without going out.",
50475055
"Where the file can be opened.": "Where the file can be opened.",
50485056
"Where the request stands. A request that was never answered becomes expired and stays: it is the evidence that the applicant was given the chance, which Awb 4:5 requires before an application can be refused for incompleteness.": "Where the request stands. A request that was never answered becomes expired and stays: it is the evidence that the applicant was given the chance, which Awb 4:5 requires before an application can be refused for incompleteness.",
5057+
"Where the task is in its lifecycle.": "Where the task is in its lifecycle.",
50495058
"Where this obligation stands. Met and withdrawn both release the case and are never recorded as each other: an inspection nobody carried out is not an inspection that passed, and six months later that difference is the whole record.": "Where this obligation stands. Met and withdrawn both release the case and are never recorded as each other: an inspection nobody carried out is not an inspection that passed, and six months later that difference is the whole record.",
50505059
"Whether a case of this type needs a coordinator named before its besluit is signed. The Awb answer is signed by the second seat, and a case type that leaves this off never asks for one: most cases have a handler and nobody else.": "Whether a case of this type needs a coordinator named before its besluit is signed. The Awb answer is signed by the second seat, and a case type that leaves this off never asks for one: most cases have a handler and nobody else.",
50515060
"Whether a handover of this case is waiting for the receiving team to accept it. A projection of the open casetransfer record and never a second custody trail: it exists so the sending team's list can show what it handed on and nobody picked up.": "Whether a handover of this case is waiting for the receiving team to accept it. A projection of the open casetransfer record and never a second custody trail: it exists so the sending team's list can show what it handed on and nobody picked up.",

0 commit comments

Comments
 (0)