Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Development to main #132

Merged
merged 116 commits into from
Jan 6, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
116 commits
Select commit Hold shift + click to select a range
335ff4d
PC108-73: person widget is by default empty
Sudo-Thijn Dec 4, 2024
d9dbbef
PC108-72: persoon widget gebruik geavanceerde zoek dialog
Sudo-Thijn Dec 4, 2024
8eb999c
renamed klantRegister to just klant
Sudo-Thijn Dec 16, 2024
53c68f9
finished frontend resultaten
Sudo-Thijn Dec 17, 2024
43fda4d
WIP - working on besluit for zaken
Sudo-Thijn Dec 17, 2024
04b56b4
Objecten controller
rubenvdlinde Dec 18, 2024
badd7ff
Objects controleler
rubenvdlinde Dec 18, 2024
788ced3
added view contactmoment
remko48 Dec 18, 2024
9a7baed
Operationalise objects controller
rjzondervan Dec 18, 2024
bc42bd0
Add producten to settings
rjzondervan Dec 18, 2024
1ba4e29
Merge pull request #111 from ConductionNL/feature/PC108-125/ObjectsCo…
rjzondervan Dec 18, 2024
261d6b1
fixed a bug while loading data in parralel if the result is 500
Sudo-Thijn Dec 18, 2024
726524e
Merge remote-tracking branch 'origin/development' into feature/PC108-…
remko48 Dec 18, 2024
7a33d15
lint-fix
remko48 Dec 18, 2024
d102f0c
cleanup
remko48 Dec 18, 2024
5784cfe
Merge pull request #112 from ConductionNL/styling-fix
remko48 Dec 18, 2024
5f288a4
Merge remote-tracking branch 'origin/development' into feature/PC108-…
remko48 Dec 18, 2024
3c780d3
lint
remko48 Dec 18, 2024
56b09b8
requested changes
remko48 Dec 18, 2024
695119c
Merge pull request #110 from ConductionNL/feature/PC108-108/multiple-…
remko48 Dec 18, 2024
f2c3fac
Merge remote-tracking branch 'origin/development' into feature/PC108-…
Sudo-Thijn Dec 18, 2024
4a05f81
Added tooltip
remko48 Dec 18, 2024
3880269
Added contactmoment to taak
remko48 Dec 18, 2024
1787aab
cleanup
remko48 Dec 18, 2024
da12c0d
added zaak feedback
remko48 Dec 18, 2024
c656348
cleanup
remko48 Dec 18, 2024
e57197b
WIP - Besluiten has re-rendering bug
Sudo-Thijn Dec 18, 2024
4a68daf
fixed bug with non-re-rendering page
Sudo-Thijn Dec 18, 2024
9fd4965
Added select contactmoment
remko48 Dec 18, 2024
f67e5ee
Merge pull request #113 from ConductionNL/feature/PC108-108/multiple-…
remko48 Dec 18, 2024
75ab26f
Merge remote-tracking branch 'origin/development' into feature/PC108-…
remko48 Dec 18, 2024
1c64cbf
lint
remko48 Dec 18, 2024
6436d3b
Merge pull request #114 from ConductionNL/feature/PC108-108/add-conta…
remko48 Dec 18, 2024
8544dbf
Merge remote-tracking branch 'origin/development' into feature/PC108-…
remko48 Dec 18, 2024
7d914e1
Added button
remko48 Dec 18, 2024
0d8e17c
finished taak type
Sudo-Thijn Dec 18, 2024
21ca551
Merge pull request #115 from ConductionNL/feature/PC108-135/taak-drop…
Sudo-Thijn Dec 18, 2024
2168562
Added initials
remko48 Dec 18, 2024
4d455ed
fixed multi overlay of modals with multiple tabs
remko48 Dec 18, 2024
5f1b213
cleanup
remko48 Dec 18, 2024
24d18be
Merge pull request #116 from ConductionNL/feature/PC108-134/add-conta…
remko48 Dec 18, 2024
79ce246
made tab active
remko48 Dec 18, 2024
19839a0
edit fix
remko48 Dec 18, 2024
cda0a93
Merge pull request #117 from ConductionNL/feature/PC108-130/new-activ…
remko48 Dec 18, 2024
572da09
WIP - small part of routing is functional as proof of concept
Sudo-Thijn Dec 19, 2024
2fd637e
finished routing for zaken
Sudo-Thijn Dec 20, 2024
d34e57e
Send email on creating a task or updating the 'medewerker' field
rjzondervan Dec 20, 2024
609607f
Added PC108-138
remko48 Dec 20, 2024
7a1d30a
finished taken routes
Sudo-Thijn Dec 20, 2024
0aa1135
fixed zaken store regarding router
Sudo-Thijn Dec 20, 2024
c73ff16
Add docblocks
rjzondervan Dec 20, 2024
3fe9a60
Merge pull request #118 from ConductionNL/feature/PC108-140/e-mail
rjzondervan Dec 20, 2024
1e8269d
finished klanten routes
Sudo-Thijn Dec 20, 2024
649fc34
finished medewerker routes
Sudo-Thijn Dec 20, 2024
504cd1e
finished contactmomenten routes
Sudo-Thijn Dec 20, 2024
07bafa5
finished berichten routes
Sudo-Thijn Dec 20, 2024
d93ca91
finished search routers + fixed sidebars
Sudo-Thijn Dec 20, 2024
00e56be
finished zaaktype routes
Sudo-Thijn Dec 20, 2024
2d9999d
Merge remote-tracking branch 'origin/development' into feature/PC108-…
Sudo-Thijn Dec 20, 2024
f2b021d
fixed modal closing when multiple tabs open in app
Sudo-Thijn Dec 20, 2024
3d45f1b
removed redundant hostname and fixed bug with nullish email
Sudo-Thijn Dec 20, 2024
437cbc3
Merge pull request #119 from ConductionNL/feature/PC108-130/new-activ…
remko48 Dec 20, 2024
49edb86
Merge remote-tracking branch 'origin/development' into feature/PC108-…
remko48 Dec 20, 2024
e7d9d32
Merge pull request #120 from ConductionNL/feature/PC108-141/deeplinken
remko48 Dec 20, 2024
a64ceef
created initial fix
Sudo-Thijn Dec 24, 2024
1b4bad3
fixed all item indexes
Sudo-Thijn Dec 24, 2024
68dd8b0
Changed button name
Sudo-Thijn Dec 24, 2024
8650363
added view option to other items
Sudo-Thijn Dec 24, 2024
4d34279
Merge pull request #121 from ConductionNL/feature/PC108-142/fix-list-…
Sudo-Thijn Dec 24, 2024
3ebe707
Merge pull request #122 from ConductionNL/feature/PC108-127/go-to-button
Sudo-Thijn Dec 24, 2024
63c5e95
Merge remote-tracking branch 'origin/development' into feature/PC108-…
Sudo-Thijn Dec 24, 2024
2b70fd0
fixed endpoint and accidental edit modal bug
Sudo-Thijn Dec 24, 2024
0b36ecb
Merge branch 'feature/PC108-119/resultaten' into feature/PC108-118/be…
Sudo-Thijn Dec 24, 2024
77a3d42
removed secondary action item
Sudo-Thijn Dec 24, 2024
10f9c91
fixed icon
Sudo-Thijn Dec 24, 2024
826b199
Better object controller and routing
rubenvdlinde Dec 27, 2024
de9f67a
Better object controller and service
rubenvdlinde Dec 27, 2024
718883a
finished document
Sudo-Thijn Dec 27, 2024
9d3b771
fixed close contactmoment on edit
Sudo-Thijn Dec 30, 2024
bcd6391
fixed rollen endpoint
Sudo-Thijn Dec 30, 2024
fc9189c
Merge pull request #126 from ConductionNL/feature/PC108-114/rollen
Sudo-Thijn Dec 30, 2024
03898dc
added view zaaktype button
Sudo-Thijn Dec 30, 2024
4ec66ee
Merge remote-tracking branch 'origin/development' into feature/PC108-…
Sudo-Thijn Dec 31, 2024
6e6bf35
Merge pull request #103 from ConductionNL/feature/PC108-119/resultaten
Sudo-Thijn Dec 31, 2024
508ca13
Merge pull request #123 from ConductionNL/feature/PC108-118/besluit
Sudo-Thijn Dec 31, 2024
9593228
added ZakenList subname changes from old pr
Sudo-Thijn Dec 31, 2024
d80627c
Merge pull request #124 from ConductionNL/feature/PC108-115/documenten
Sudo-Thijn Dec 31, 2024
119213a
Merge branch 'development' into feature/PC108-90/zaaktype-zaak-fix
Sudo-Thijn Dec 31, 2024
ab784ee
Merge pull request #127 from ConductionNL/feature/PC108-90/zaaktype-z…
Sudo-Thijn Dec 31, 2024
f564027
Merge remote-tracking branch 'origin/development' into feature/PC108-…
Sudo-Thijn Dec 31, 2024
ceabe49
finished "see only my contactmoments"
Sudo-Thijn Dec 31, 2024
1077beb
added channel to contactmoment
Sudo-Thijn Dec 31, 2024
3be652b
added dashboard icons
Sudo-Thijn Dec 31, 2024
b015145
Merge remote-tracking branch 'origin/development' into feature/PC108-…
Sudo-Thijn Jan 2, 2025
eb6ccf7
Merge pull request #125 from ConductionNL/feature/PC108-99/contactmom…
Sudo-Thijn Jan 2, 2025
546b6f2
Merge remote-tracking branch 'origin/development' into feature/PC108-…
Sudo-Thijn Jan 2, 2025
e2df94d
Merge remote-tracking branch 'origin/development' into feature/PC108-…
Sudo-Thijn Jan 2, 2025
ae7f78e
Merge remote-tracking branch 'origin/development' into feature/PC108-…
Sudo-Thijn Jan 2, 2025
df7010c
Merge remote-tracking branch 'origin/development' into feature/PC108-…
Sudo-Thijn Jan 2, 2025
ff62150
fixed search customer modal not opening
Sudo-Thijn Jan 2, 2025
076f0a3
Merge pull request #82 from ConductionNL/feature/PC108-73/no-customer…
Sudo-Thijn Jan 3, 2025
1d96f8e
origin/development to feature/PC108-74/klant-register-rename merge
Sudo-Thijn Jan 3, 2025
672151e
Merge pull request #101 from ConductionNL/feature/PC108-74/klant-regi…
Sudo-Thijn Jan 3, 2025
515aae1
Merge remote-tracking branch 'origin/development' into feature/PC108-…
Sudo-Thijn Jan 3, 2025
e225e48
Merge pull request #128 from ConductionNL/feature/PC108-101/contactmo…
Sudo-Thijn Jan 3, 2025
7f314f0
Merge remote-tracking branch 'origin/development' into feature/PC108-…
Sudo-Thijn Jan 3, 2025
d82ed2e
Merge pull request #129 from ConductionNL/feature/PC108-129/contactmo…
Sudo-Thijn Jan 3, 2025
068b751
Merge remote-tracking branch 'origin/development' into feature/PC108-…
Sudo-Thijn Jan 3, 2025
f305259
fixed weird alignment of input fields on klant search
Sudo-Thijn Jan 3, 2025
2137849
added new medewerker endpoint
Sudo-Thijn Jan 3, 2025
eaf2cd6
Merge pull request #131 from ConductionNL/feature/PC108-144/bugfix
Sudo-Thijn Jan 3, 2025
13e565e
Merge remote-tracking branch 'origin/development' into feature/PC108-…
Sudo-Thijn Jan 6, 2025
ceb9a8c
Add klant with disabled button if employe or channel is not selected
remko48 Jan 6, 2025
8948a0a
fixed viewing of contactmoment
remko48 Jan 6, 2025
3971e12
Merge pull request #130 from ConductionNL/feature/PC108-131/cannot-op…
remko48 Jan 6, 2025
3ba5a18
Merge branch 'main' into development
remko48 Jan 6, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
442 changes: 221 additions & 221 deletions .github/workflows/release-workflow.yaml

Large diffs are not rendered by default.

23 changes: 21 additions & 2 deletions appinfo/routes.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,18 +45,37 @@
['name' => 'dashboard#page', 'url' => '/', 'verb' => 'GET'],
['name' => 'configuration#index', 'url' => '/api/configuration', 'verb' => 'GET'],
['name' => 'configuration#create', 'url' => '/api/configuration', 'verb' => 'POST'],
['name' => 'contactMomenten#page', 'url' => '/contactmomenten', 'verb' => 'GET'],
['name' => 'contactMomenten#page', 'postfix' => 'details', 'url' => '/contactmomenten/{id}', 'verb' => 'GET'],
['name' => 'zaken#page', 'url' => '/zaken', 'verb' => 'GET'],
['name' => 'zaken#page', 'postfix' => 'details', 'url' => '/zaken/{id}', 'verb' => 'GET'],
['name' => 'rollen#page', 'url' => '/rollen', 'verb' => 'GET'],
['name' => 'statussen#page', 'url' => '/statussen', 'verb' => 'GET'],
['name' => 'zaakinformatieobjecten#page', 'url' => '/zaakinformatieobjecten', 'verb' => 'GET'],
['name' => 'zaakTypen#page','url' => '/zaak_typen', 'verb' => 'GET'],
['name' => 'zaakTypen#page','url' => '/zaaktypen', 'verb' => 'GET'],
['name' => 'zaakTypen#page','postfix' => 'details', 'url' => '/zaaktypen/{id}', 'verb' => 'GET'],
['name' => 'taken#page','url' => '/taken', 'verb' => 'GET'],
['name' => 'taken#page','postfix' => 'details', 'url' => '/taken/{id}', 'verb' => 'GET'],
['name' => 'klanten#page','url' => '/klanten', 'verb' => 'GET'],
['name' => 'berichten#index','url' => '/berichten', 'verb' => 'GET'],
['name' => 'klanten#page','postfix' => 'details', 'url' => '/klanten/{id}', 'verb' => 'GET'],
['name' => 'medewerkers#page','url' => '/medewerkers', 'verb' => 'GET'],
['name' => 'medewerkers#page','postfix' => 'details', 'url' => '/medewerkers/{id}', 'verb' => 'GET'],
['name' => 'berichten#page','url' => '/berichten', 'verb' => 'GET'],
['name' => 'berichten#page','postfix' => 'details', 'url' => '/berichten/{id}', 'verb' => 'GET'],
['name' => 'dashboard#page', 'postfix' => 'search', 'url' => '/zoeken', 'verb' => 'GET'],
// user Settings
['name' => 'settings#index','url' => '/settings', 'verb' => 'GET'],
['name' => 'settings#create', 'url' => '/settings', 'verb' => 'POST'],
// User
['name' => 'users#me', 'url' => '/me', 'verb' => 'GET'],
// Object API routes
['name' => 'objects#index', 'url' => 'api/objects/{objectType}', 'verb' => 'GET'],
['name' => 'objects#create', 'url' => 'api/objects/{objectType}', 'verb' => 'POST'],
['name' => 'objects#show', 'url' => 'api/objects/{objectType}/{id}', 'verb' => 'GET'],
['name' => 'objects#update', 'url' => 'api/objects/{objectType}/{id}', 'verb' => 'PUT'],
['name' => 'objects#delete', 'url' => 'api/objects/{objectType}/{id}', 'verb' => 'DELETE'],
['name' => 'objects#getAuditTrail', 'url' => 'api/objects/{objectType}/{id}/audit', 'verb' => 'GET'],
['name' => 'objects#getRelations', 'url' => 'api/objects/{objectType}/{id}/relations', 'verb' => 'GET'],
['name' => 'objects#getUses', 'url' => 'api/objects/{objectType}/{id}/uses', 'verb' => 'GET']
]
];
8 changes: 4 additions & 4 deletions css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,12 @@
}

.detailGrid {
display: grid;
grid-template-columns: 1fr 1fr;
display: grid;
grid-template-columns: 1fr 1fr;
}

/* Modals */
.form-group > * {
.form-group > * {
margin-block-end: 10px;
}

Expand All @@ -103,4 +103,4 @@
.modalContent {
margin: var(--zaa-margin-50);
text-align: center;
}
}
1 change: 1 addition & 0 deletions img/email-outline-dark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions img/email-outline.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions img/face-agent-dark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions img/face-agent.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions img/mailbox-open-outline-dark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions img/mailbox-open-outline.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions img/phone-dark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions img/phone.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
38 changes: 38 additions & 0 deletions lib/Controller/BerichtenController.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\JSONResponse;
use OCP\IRequest;
use OCP\AppFramework\Http\TemplateResponse;
use OCP\AppFramework\Http\ContentSecurityPolicy;

class BerichtenController extends Controller
{
Expand Down Expand Up @@ -39,6 +41,42 @@ public function index(): JSONResponse
return new JSONResponse($data);
}

/**
* Render no page.
*
* @param string|null $getParameter Optional GET parameter
* @return TemplateResponse The rendered template response
*
* @NoAdminRequired
* @NoCSRFRequired
*/
public function page(?string $getParameter): TemplateResponse
{
try {
// Create a new TemplateResponse for the index page
$response = new TemplateResponse(
$this->appName,
'index',
[]
);

// Set up Content Security Policy
$csp = new ContentSecurityPolicy();
$csp->addAllowedConnectDomain('*');
$response->setContentSecurityPolicy($csp);

return $response;
} catch (\Exception $e) {
// Return an error template response if an exception occurs
return new TemplateResponse(
$this->appName,
'error',
['error' => $e->getMessage()],
'500'
);
}
}

/**
* Read a single object
*
Expand Down
Loading
Loading