Skip to content

Prefill bsn api records with criteria rules #812

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.

Sign up for GitHub

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

Draft
ateamcms wants to merge 8 commits into
base: develop
Choose a base branch
from
Draft

Prefill bsn api records with criteria rules #812

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3cbf473
prefill bsn api records, add criteria groups
ateamcms Dec 16, 2025
2298fb2
criteria group refactoring
dev-rminds Dec 19, 2025
31db2da
add children age groups, add prefill errors
ateamcms Dec 25, 2025
2a06f72
Merge remote-tracking branch 'origin/develop' into feature.prefill-bs…
ateamcms Dec 29, 2025
20059cf
show only criteria records in fund request on webshop
ateamcms Dec 29, 2025
fa59224
new file-uploader template for fund-criteria-groups
dev-rminds Dec 31, 2025
49d6df7
Merge pull request #909 from teamforus/feature.prefill-bsn-api-record…
ateamcms Jan 5, 2026
2e91231
translations for error pages
RobinMeles Jan 7, 2026
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
150 changes: 150 additions & 0 deletions react/assets/forus-webshop/scss/includes/blocks/block-file-uploader.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,140 @@
}
}

&.block-file-uploader-group {
flex-direction: column-reverse;
gap: 16px;
padding: 18px 20px;
border: 1px solid var(--border-color);
border-radius: var(--border-radius);
box-shadow: var(--box-shadow);
background: #fbfbfb;

.droparea-icon,
.droparea-title,
.droparea-hidden-input {
display: none;
}

.uploader-droparea {
display: flex;
padding: 0;
background: none;
border: none;
flex-direction: row;
justify-content: flex-start;
align-items: center;
gap: 18px;

.droparea-button {
.button {
padding: 10px 20px;
gap: 10px;
font: 600 15px/22px var(--base-font);
border-radius: var(--button-border-radius);
}
}

.droparea-max-limit {
color: #5c6170;
font-size: 14px;
font-weight: 500;
line-height: 20px;
font-family: var(--base-font), serif;
}
}

.uploader-files {
gap: 10px;

.uploader-files-title {
display: flex;
align-items: center;
font: 700 18px/24px var(--base-font);
gap: 10px;

.uploader-files-title-count {
padding: 2px 10px;
background: #ffffff;
border: 1px solid var(--border-color);
border-radius: var(--border-radius);
font: 600 14px/20px var(--base-font);
color: #222633;
}
}

.file-item {
.file-item-container {
padding: 9px 12px;
border: 1px solid var(--border-color);
border-radius: var(--border-radius);
box-shadow: var(--box-shadow);
align-items: center;
background: #fff;
}

.file-item-name {
font: 600 13px/22px var(--base-font);
color: #2a2f3a;
width: auto;
flex: 1 1 auto;
}

.file-item-progress {
flex: 1 1 35%;
padding-left: 12px;
align-items: center;
gap: 10px;
flex-direction: row;
min-width: 160px;

.file-item-progress-container {
background-color: var(--border-color);
flex: 1 1 auto;
border-radius: 999px;

progress[value] {
height: 6px;
width: 100%;
display: block;
border-radius: 999px;

&::-webkit-progress-bar {
background-color: var(--border-color);
border-radius: 999px;
}

&::-webkit-progress-value {
background-color: var(--color-primary);
border-radius: 999px;
}

&::-moz-progress-bar {
background-color: var(--color-primary);
border-radius: 999px;
}
}
}

.file-item-progress-value {
font: 600 13px/20px var(--base-font);
color: #5c6170;
}
}

.file-item-action {
display: flex;
align-items: center;
padding-left: 12px;

.mdi {
font-size: 18px;
}
}
}
}
}

@media (max-width: 991px) {
.uploader-droparea {
border: none;
Expand All @@ -337,5 +471,21 @@
display: none;
}
}

&.block-file-uploader-group {
.uploader-droparea {
flex-direction: column;
align-items: stretch;

.droparea-button {
width: 100%;

.button {
width: 100%;
justify-content: center;
}
}
}
}
}
}
170 changes: 103 additions & 67 deletions react/assets/forus-webshop/scss/includes/blocks/block-sign_up.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
.sign_up-step {
flex-grow: 1;
text-align: right;
font: 500 14px/30px var(--base-font);
font: 600 14px/30px var(--base-font);
color: #525252;
border: none;
margin-left: 1px;
Expand Down Expand Up @@ -130,18 +130,20 @@
}

&.sign_up-step-active {
color: var(--color-primary);
color: #000;
font-weight: 700;

.sign_up-step-border:before {
content: '';
display: block;
@include fill_parent();
background-color: var(--color-primary);
background-color: #9E9E9E;
}
}

&.sign_up-step-done {
color: var(--sign_up_accent_color);
font-weight: 700;

.sign_up-step-border:before {
background-color: var(--sign_up_accent_color);
Expand Down Expand Up @@ -489,71 +491,104 @@
}
}

.sign_up-request-preview {
.preview-item-info {
display: flex;
flex-direction: column;
flex-direction: row;
gap: 10px;
align-items: flex-start;

.preview-item {
.preview-item-icon {
display: flex;
flex: 0 0 26px;
font: 600 14px/20px var(--base-font);
border: 1px solid #9e9e9e;
border-radius: 10px;
flex-direction: row;
justify-content: center;
padding: 0 5px;
}

.preview-item-title {
display: flex;
flex: 1 1 auto;
font: 700 18px/20px var(--base-font);
padding: 1px 0;
}

.preview-item-subtitle {
display: flex;
flex: 1 1 auto;
font: 700 16px/20px var(--base-font);
}

.preview-item-description {
font: 400 16px/20px var(--base-font);
margin-bottom: 0;
}

&.preview-item-info-vertical {
flex-direction: column;
gap: 15px;
padding: 20px 25px;
border-bottom: 1px solid var(--border-color);
}
}

.preview-item-info {
display: flex;
flex-direction: row;
gap: 10px;
align-items: flex-start;
.preview-item-panel {
border: 1px solid var(--border-color);
border-radius: var(--border-radius);
background-color: #fbfbfb;
margin-bottom: 10px;

.preview-item-icon {
display: flex;
flex: 0 0 26px;
font: 600 14px/20px var(--base-font);
border: 1px solid #9e9e9e;
border-radius: 10px;
flex-direction: row;
justify-content: center;
padding: 0 5px;
}
&:last-child {
margin-bottom: 0;
}
}

.preview-item-title {
display: flex;
flex: 1 1 auto;
font: 700 18px/20px var(--base-font);
padding: 1px 0;
}
.preview-item-values {
padding: 15px 20px;
display: flex;
flex-direction: column;
gap: 10px;

.preview-item-values-item {
display: flex;
flex-direction: row;
justify-content: flex-start;
gap: 20px;

.preview-item-values-item-title,
.preview-item-values-item-label {
display: flex;
flex: 0 0 250px;
font: 500 13px/20px var(--base-font);
}

.preview-item-panel {
border: 1px solid var(--border-color);
border-radius: var(--border-radius);
background-color: #fbfbfb;
.preview-item-values-item-title {
font: 700 14px/20px var(--base-font);
}

.preview-item-values {
padding: 15px 20px;
.preview-item-values-item-value {
display: flex;
flex-direction: column;
gap: 10px;
flex: 1 1 auto;
font: 700 13px/20px var(--base-font);
}
}
}

.preview-item-values-item {
display: flex;
flex-direction: row;
justify-content: flex-start;
gap: 20px;
.sign_up-request-preview {
display: flex;
flex-direction: column;

.preview-item-values-item-label {
display: flex;
flex: 0 0 250px;
font: 500 13px/20px var(--base-font);
}
.preview-item {
display: flex;
flex-direction: column;
gap: 15px;
padding: 20px 25px;
border-bottom: 1px solid var(--border-color);

.preview-item-values-item-value {
display: flex;
flex: 1 1 auto;
font: 700 13px/20px var(--base-font);
}
.preview-item-panel {
margin-bottom: 5px;

&:last-child {
margin-bottom: 0;
}
}

Expand Down Expand Up @@ -1110,23 +1145,24 @@
}
}

.sign_up-request-preview {
.preview-item {
padding: 15px 15px;

.preview-item-values {
gap: 15px;
.preview-item-values {
gap: 15px;

.preview-item-values-item {
flex-direction: column;
gap: 5px;
.preview-item-values-item {
flex-direction: column;
gap: 5px;

.preview-item-values-item-label {
flex: 0 0 auto;
color: #595959;
}
}
.preview-item-values-item-label,
.preview-item-values-item-title {
flex: 0 0 auto;
color: #595959;
}
}
}

.sign_up-request-preview {
.preview-item {
padding: 15px 15px;

.preview-item-files {
.preview-item-files-title {
Expand Down
7 changes: 7 additions & 0 deletions react/src/dashboard/props/models/FundCriteriaGroup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
export default interface FundCriteriaGroup {
id?: number;
title: string;
description_html?: string;
order: number;
required: boolean;
}
Loading