Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
rubenvdlinde committed Sep 15, 2023
2 parents d85744a + 5e7a834 commit c94e1b2
Show file tree
Hide file tree
Showing 6 changed files with 107 additions and 25 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/product-page-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ env: # Change these to your preferences any image url can also be a base encoded
GITHUB_REPOSITORY_NAME: ${{ github.event.repository.name }}
GITHUB_REPOSITORY_URL: ${{ github.event.repository.url }}
GITHUB_API_BASE_URL: https://api.github.com/repos/${{ github.repository }}/contents
GITHUB_DOCS_DIRECTORY_PATHS: '[{"name": "Features", "location": "/docs/features"},{"name": "Roadmap", "location": "/docs/roadmap"}]'
GITHUB_DOCS_DIRECTORY_PATHS: '[{"name": "Documentatie", "location": "/docs"}]'

# Links
SLACK_URL: "https://join.slack.com/t/conductionworkspace/shared_invite/zt-1y5kerime-amWEvljvnLvo5S3YfU_jzg"
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/woo-page-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ name: Deploy the Product Page to GitHub Pages

env: # Change these to your preferences any image url can also be a base encoded image
GITHUB_PAGES_BRANCH: gh-pages

# options: "true" | "false"
USE_GITHUB_REPOSITORY_NAME_AS_PATH_PREFIX: "true"

GITHUB_REPOSITORY_NAME: ${{ github.event.repository.name }}
API_BASE_URL: "https://api.gateway.commonground.nu/api"
NL_DESIGN_THEME_CLASSNAME: "conduction-theme"
Expand Down Expand Up @@ -34,6 +38,7 @@ jobs:
uses: SpicyPizza/[email protected]
with:
envkey_GITHUB_REPOSITORY_NAME: ${{ env.GITHUB_REPOSITORY_NAME }}
envkey_USE_GITHUB_REPOSITORY_NAME_AS_PATH_PREFIX: ${{ env.USE_GITHUB_REPOSITORY_NAME_AS_PATH_PREFIX }}
envkey_GATSBY_API_BASE_URL: ${{ env.API_BASE_URL }}
envkey_GATSBY_NL_DESIGN_THEME_CLASSNAME: ${{ env.NL_DESIGN_THEME_CLASSNAME }}
envkey_GATSBY_FAVICON_URL: ${{ env.FAVICON_URL }}
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@ Geen handwerk: Door directe bron integratie is het niet nodig WOO-verzoeken etc

| Organisatie | WOO Pagina | WOO Bron(en) |
|-------------|------------|-------------------------|
| [Noordwijk](https://conductionnl.github.io/woo-website-noordwijk/) | [Pagina](https://conductionnl.github.io/woo-website-noordwijk/) | Zaaksyteem (acceptatie) |
| [Tubbergen](https://conductionnl.github.io/woo-website-tubbergen/)| [Pagina](https://conductionnl.github.io/woo-website-tubbergen/)| Demo |
|[Epe](https://conductionnl.github.io/woo-website-epe/)| [Pagina](https://conductionnl.github.io/woo-website-epe/)| Demo |
|[Dinkelland](https://conductionnl.github.io/woo-website-dinkelland/)| [Pagina](https://conductionnl.github.io/woo-website-dinkelland/)| Demo |
|[Rotterdam](https://conductionnl.github.io/woo-website-rotterdam/)| [Pagina](https://conductionnl.github.io/woo-website-rotterdam/)| Demo |
|[Noaberkracht](https://conductionnl.github.io/woo-website-noaberkracht/)| [Pagina](https://conductionnl.github.io/woo-website-noaberkracht/)| Demo |
| [Noordwijk](https://conductionnl.github.io/woo-website-noordwijk/) | [Pagina](https://conductionnl.github.io/woo-website-noordwijk/) | Zaaksysteem (acceptatie) |
| [Tubbergen](https://conductionnl.github.io/woo-website-tubbergen/)| [Pagina](https://conductionnl.github.io/woo-website-tubbergen/)| Zaaksysteem (acceptatie) |
|[Epe](https://conductionnl.github.io/woo-website-epe/)| [Pagina](https://conductionnl.github.io/woo-website-epe/)| Zaaksysteem (acceptatie) |
|[Dinkelland](https://conductionnl.github.io/woo-website-dinkelland/)| [Pagina](https://conductionnl.github.io/woo-website-dinkelland/)| Zaaksysteem (acceptatie) |
|[Rotterdam (Alleen vormgeving)](https://conductionnl.github.io/woo-website-rotterdam/)| [Pagina](https://conductionnl.github.io/woo-website-rotterdam/)| Demo |
|[Noaberkracht](https://conductionnl.github.io/woo-website-noaberkracht/)| [Pagina](https://conductionnl.github.io/woo-website-noaberkracht/)| Zaaksysteem (acceptatie) |
|[Leiden (Alleen vormgeving)](https://conductionnl.github.io/woo-website-leiden/)| [Pagina](https://conductionnl.github.io/woo-website-leiden/)| Demo |
|[Xxllnc (Demo omgeving)](https://conductionnl.github.io/woo-website-xxllnc/)| [Pagina](https://conductionnl.github.io/woo-website-xxllnc/)| Demo |

Expand All @@ -78,4 +78,4 @@ Geen handwerk: Door directe bron integratie is het niet nodig WOO-verzoeken etc
- [Roadmap](docs/Roadmap.md)
- [Configuratie](docs/Configuratie.md)
- [Testscenario's](docs/Tests.md)
.
.
42 changes: 42 additions & 0 deletions docs/Configuratie.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,44 @@
# Configuratie

## Mapping van XXLLNC zaken (opgehaald via search endpoint)
Gebaseerd op: https://github.com/CommonGateway/WooBundle/blob/main/Installation/Mapping/woo.xxllncCaseToWoo.mapping.json

| Woo publicatie | Zaaksysteem case |
|-------------------------------|--------------------------------------------------------|
| UUID | case.class_uuid |
| ID | id |
| Object_ID | object_id |
| Portal_url | (Empty) |
| Behandelend_bestuursorgaan | (Empty) |
| Ontvanger_informatieverzoek | (Empty) |
| Volgnummer | (Empty) |
| Titel | values.case.casetype.name |
| Beschrijving | values.case.subject |
| Samenvatting | values.case.subject |
| Categorie | values.attribute.woo_categorie |
| Verzoeker | values.case.requestor.name |
| Ontvangstdatum | values.case.date_of_registration |
| Besluitdatum | values.case.date_target |
| Behandelstatus | values.case.status |
| Besluit | (Empty) |
| Termijnoverschrijding | (Empty) |
| URL_informatieverzoek | (Empty) |
| URL_inventarisatielijst | (Empty) |
| URL_besluit | (Empty) |
| Geografisch_gebied | (Empty) |
| BAG_ID | (Empty) |
| BGT_ID | (Empty) |
| Postcodegebied | (Empty) |
| Adres | (Empty) |
| COORDS | (Empty) |
| Geografische_positie | (Empty) |
| Bijlagen | values.attribute.test_documenten |

| Bijlage | values.attribute.test_documenten |
|------------------------------------|--------------------------------------------------------|
| Type_Bijlage | mimetype |
| Status_Bijlage | accepted |
| Tijdstip_laatste_wijziging_bijlage | (Empty) |
| Titel_Bijlage | filename |
| URL_Bijlage | (Empty) |

4 changes: 3 additions & 1 deletion pwa/gatsby-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ require("dotenv").config({
});

module.exports = {
pathPrefix: `/${process.env.GITHUB_REPOSITORY_NAME}`,
pathPrefix:
process.env.USE_GITHUB_REPOSITORY_NAME_AS_PATH_PREFIX === "true" ??
`$/${process.env.GITHUB_REPOSITORY_NAME}`, // we do NOT want to set the prefix if we're using an DNS
plugins: [
{
resolve: `gatsby-plugin-layout`,
Expand Down
65 changes: 49 additions & 16 deletions pwa/src/data/PublicationType.ts
Original file line number Diff line number Diff line change
@@ -1,38 +1,71 @@
export const TEMP_PUBLICATION_TYPES = [
{
label: "Nieuwsbericht",
value: "nieuwsbericht",
label: "Wetten en algemeen verbindende voorschriften",
value: "wetten en algemeen verbindende voorschriften",
},
{
label: "Toespraak",
value: "toespraak",
label: "Overige besluiten van algemene strekking",
value: "overige besluiten van algemene strekking",
},
{
label: "Ontwerpen van wet- en regelgeving met adviesaanvraag",
value: "ontwerpen van wet- en regelgeving met adviesaanvraag",
},
{
label: "Organisatie en werkwijze",
value: "organisatie en werkwijze",
},
{
label: "Bereikbaarheidsgegevens",
value: "bereikbaarheidsgegevens",
},

{
label: "Bij vertegenwoordigende organen ingekomen stukken",
value: "bij vertegenwoordigende organen ingekomen stukken",
},
{
label: "Vergaderstukken Staten-Generaal",
value: "vergaderstukken Staten-Generaal",
},
{
label: "Vergaderstukken decentrale overheden",
value: "vergaderstukken decentrale overheden",
},
{
label: "Agenda's en besluitenlijsten bestuurscolleges",
value: "agenda's en besluitenlijsten bestuurscolleges",
},
{
label: "Adviezen",
value: "adviezen",
},
{
label: "Convenanten",
value: "convenanten",
},
{
label: "Agenda/besluitenlijst",
value: "agenda/besluitenlijst",
label: "Jaarplannen en jaarverslagen",
value: "jaarplannen en jaarverslagen",
},
{
label: "Convenant",
value: "convenant",
label: "Subsidieverplichtingen anders dan met beschikking",
value: "subsidieverplichtingen anders dan met beschikking",
},
{
label: "Dossier na Woo/Wob-verzoek",
value: "dossier na Woo/Wob-verzoek",
label: "Woo-verzoeken en -besluiten",
value: "woo-verzoeken en -besluiten",
},
{
label: "Onderzoek",
value: "onderzoek",
label: "Onderzoeksrapporten",
value: "onderzoeksrapporten",
},
{
label: "Beschikking",
value: "beschikking",
label: "Beschikkingen",
value: "beschikkingen",
},
{
label: "Klacht",
value: "klacht",
label: "Klachtoordelen",
value: "klachtoordelen",
},
];

0 comments on commit c94e1b2

Please sign in to comment.