Skip to content

Commit

Permalink
Merge pull request #73 from Amsterdam/improvement/update-css
Browse files Browse the repository at this point in the history 
Enhance styling for better text wrapping and alignment in various com…
  • Loading branch information
@remyvdwereld
remyvdwereld authored Jan 2, 2025
2 parents b6a4868 + f7619a2 commit 8c40ef0
Show file tree
Hide file tree
Showing 7 changed files with 634 additions and 472 deletions.
4 changes: 2 additions & 2 deletions app/assets/js/vue/CaseStatus.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</header>
<div class="status--wrapper">
<div>
<span v-html="getSvg(currentCaseStatus.status)" v-bind:class="setHistoryClass(currentCaseStatus.status)"></span>
<span class="button-span-svg" v-html="getSvg(currentCaseStatus.status)" v-bind:class="setHistoryClass(currentCaseStatus.status)"></span>
<span>{{ caseStatusPrefix }}{{ caseStatusOptions[currentCaseStatus.status].current }}</span>
<div class="status-container">
<div class="facts">
Expand All @@ -17,7 +17,7 @@
</div>
<div class="form-field u-margin-bottom-none screen-only">
<button v-for="(value, id) in currentCaseStatusOptions" v-bind:key="id" v-on:click="setNextStatus(id)" v-bind:class="setButtonClass(id)">
<span v-html="getSvg(id)"></span>
<span class="button-span-svg" v-html="getSvg(id)"></span>
{{ value.verb }}
</button>
</div>
Expand Down
897 changes: 526 additions & 371 deletions app/package-lock.json
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions app/static_src/sass/basics/_06_site-layout.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ body {
margin-top: 1rem;
grid-column: span 2;
max-width: 260px;
overflow-wrap: break-word;

p {
margin-bottom: 0;
Expand Down
5 changes: 5 additions & 0 deletions app/static_src/sass/basics/_07_forms.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -968,4 +968,9 @@ select {
justify-content: space-between;
padding: 0 16px;
margin-top: 28px;
}

.button-span-svg {
display: inline-flex;
margin-right: .3rem;
}
2 changes: 2 additions & 0 deletions app/static_src/sass/basics/_08_tables.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,8 @@ table table {

td {
max-width: 200px;
overflow-wrap: break-word;
word-break: break-word;
}
}
.moment-list {
Expand Down
4 changes: 3 additions & 1 deletion app/static_src/sass/sections/_client.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -483,19 +483,21 @@
padding: 5px;
margin: -5px;
min-width: 125px;
text-align: center;
font-size: .9rem;
&--status-approved {
background-color: $supplement-darkgreen;
color: $primary-white;
text-align: center;
}
&--status-disapproved {
background-color: $support-invalid;
color: $primary-white;
text-align: center;
}
&--status-pending {
background-color: $supplement-orange;
color: $primary-black;
text-align: center;
}
}

Expand Down
193 changes: 95 additions & 98 deletions app/web/cases/statics.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,34 +2,34 @@
from web.organizations.statics import *

GESLACHT = (
(1, 'Man'),
(2, 'Vrouw'),
(3, 'Overig'),
(1, "Man"),
(2, "Vrouw"),
(3, "Overig"),
)

CENTRALE_TOEGANG = (
(1, 'CTBW (Centrale Toegang Begeleid Wonen)'),
(2, 'CTMO (Centrale Toegang Maatschappelijke Opvang)'),
(3, 'CTMOJ (Centrale Toegang Maatschappelijke Opvang Jeugd)'),
(4, 'CTMOG (Centrale Toegang Maatschappelijke Opvang Gezin)'),
(5, 'Jeugdhulp'),
(6, 'CTBWLvB (Centrale Toegang Begeleid Wonen Licht Verstandelijke Beperking)'),
(1, "CTBW (Centrale Toegang Begeleid Wonen)"),
(2, "CTMO (Centrale Toegang Maatschappelijke Opvang)"),
(3, "CTMOJ (Centrale Toegang Maatschappelijke Opvang Jeugd)"),
(4, "CTMOG (Centrale Toegang Maatschappelijke Opvang Gezin)"),
(5, "Jeugdhulp"),
(6, "CTBWLvB (Centrale Toegang Begeleid Wonen Licht Verstandelijke Beperking)"),
)

JONGER_DAN_26 = (
(1, 'Nee'),
(2, 'Ja: standaard plaatsing jongerenwoning (5 jaar contract bij omklap)'),
(3, 'Ja: plaatsing reguliere woning noodzakelijk (onbepaalde tijd bij omklap)'),
(4, 'Ja: Plaatsing in een project'),
(1, "Nee"),
(2, "Ja: standaard plaatsing jongerenwoning (5 jaar contract bij omklap)"),
(3, "Ja: plaatsing reguliere woning noodzakelijk (onbepaalde tijd bij omklap)"),
(4, "Ja: Plaatsing in een project"),
)

DEFAULT_YES_OR_NO = (
(1, 'Ja'),
(2, 'Nee'),
(1, "Ja"),
(2, "Nee"),
)
DEFAULT_NO_OR_YES = (
(2, 'Nee'),
(1, 'Ja'),
(2, "Nee"),
(1, "Ja"),
)

GESLACHT_DICT = dict((s[0], s[1]) for s in GESLACHT)
Expand All @@ -39,10 +39,7 @@
DEFAULT_NO_OR_YES_DICT = dict((s[0], s[1]) for s in DEFAULT_NO_OR_YES)





# case status
# case status
CASE_STATUS_INGEDIEND = 1
CASE_STATUS_AFGEKEURD = 2
CASE_STATUS_GOEDGEKEURD = 3
Expand All @@ -55,81 +52,83 @@

CASE_STATUS = (
(
CASE_STATUS_INGEDIEND,
'Ingediend',
'Indienen',
'icon-circle',
'',
'ingediend.html',
CASE_STATUS_INGEDIEND,
"Ingediend",
"Indienen",
"icon-circle",
"",
"ingediend.html",
),
(
CASE_STATUS_AFGEKEURD,
'Afgekeurd',
'Afkeuren',
'disapproved',
'close',
'afgekeurd.html',
CASE_STATUS_AFGEKEURD,
"Afgekeurd",
"Afkeuren",
"disapproved",
"close",
"afgekeurd.html",
),
(
CASE_STATUS_GOEDGEKEURD,
'Goedgekeurd',
'Goedkeuren',
'approved',
'check',
'goedgekeurd.html',
CASE_STATUS_GOEDGEKEURD,
"Goedgekeurd",
"Goedkeuren",
"approved",
"check",
"goedgekeurd.html",
),
(
CASE_STATUS_IN_BEHANDELING,
'In behandeling',
'In behandeling nemen',
'pending',
'pause',
'in_behandeling.html',
CASE_STATUS_IN_BEHANDELING,
"In behandeling",
"In behandeling nemen",
"pending",
"pause",
"in_behandeling.html",
),
(
CASE_STATUS_WONINGCORPORATIE_AFGEKEURD,
'Afgekeurd',
'Afkeuren',
'disapproved',
'close',
'afgekeurd.html',
CASE_STATUS_WONINGCORPORATIE_AFGEKEURD,
"Afgekeurd",
"Afkeuren",
"disapproved",
"close",
"afgekeurd.html",
),
(
CASE_STATUS_WONINGCORPORATIE_GOEDGEKEURD,
'Goedgekeurd',
'Goedkeuren',
'approved',
'check',
'goedgekeurd.html',
CASE_STATUS_WONINGCORPORATIE_GOEDGEKEURD,
"Goedgekeurd",
"Goedkeuren",
"approved",
"check",
"goedgekeurd.html",
),
(
CASE_STATUS_WONINGCORPORATIE_IN_BEHANDELING,
'In behandeling',
'In behandeling nemen',
'pending',
'pause',
'in_behandeling.html',
CASE_STATUS_WONINGCORPORATIE_IN_BEHANDELING,
"In behandeling",
"In behandeling nemen",
"pending",
"pause",
"in_behandeling.html",
),
(
CASE_STATUS_AFGESLOTEN,
'In concept',
'In concept zetten',
'pending',
'pause',
'afgesloten.html',
CASE_STATUS_AFGESLOTEN,
"In concept",
"In concept zetten",
"pending",
"pause",
"afgesloten.html",
),
)


def map_case_status_keys(f):
return {
'id': f[0],
'current': f[1],
'verb': f[2],
'status_class': f[3],
'icon_name': f[4],
'template': f[5]
"id": f[0],
"current": f[1],
"verb": f[2],
"status_class": f[3],
"icon_name": f[4],
"template": f[5],
}


CASE_STATUS_CHOICES = list((s[0], s[1]) for s in CASE_STATUS)
CASE_STATUS_DICT = dict((s[0], map_case_status_keys(s)) for s in CASE_STATUS)
CASE_STATUS_DICT_JSON = json.dumps(CASE_STATUS_DICT)
Expand All @@ -146,47 +145,45 @@ def map_case_status_keys(f):
CASE_STATUS_WONINGCORPORATIE_GOEDGEKEURD,
CASE_STATUS_WONINGCORPORATIE_AFGEKEURD,
CASE_STATUS_WONINGCORPORATIE_IN_BEHANDELING,
]
],
}

IN_CONCEPT = [
CASE_STATUS_AFGESLOTEN,
]






# case version
CASE_VERSION_BASE = 'basis-gegevens'
CASE_VERSION_ADDRESS = 'adres-aanpassen'
CASE_VERSION_FORM_URGENTIE = 'aanvraag-omslag-en-urgentie'
CASE_VERSION_FORM_OMKLAP = 'aanvraag-omklap'
CASE_VERSION_FORM_KENNISMAKING_WONINGCORPORATIE = 'kennismaking-woningcorporatie'
CASE_VERSION_FORM_EVALUATIE_WONEN = 'evaluatie-wonen'
CASE_VERSION_BASE = "basis-gegevens"
CASE_VERSION_ADDRESS = "adres-aanpassen"
CASE_VERSION_FORM_URGENTIE = "aanvraag-omslag-en-urgentie"
CASE_VERSION_FORM_OMKLAP = "aanvraag-omklap"
CASE_VERSION_FORM_KENNISMAKING_WONINGCORPORATIE = "kennismaking-woningcorporatie"
CASE_VERSION_FORM_EVALUATIE_WONEN = "evaluatie-wonen"

CASE_VERSION = (
(CASE_VERSION_BASE, 'Basis gegevens'),
(CASE_VERSION_ADDRESS, 'Adres gegevens'),
(CASE_VERSION_FORM_URGENTIE, 'Aanvraag Urgentie onder voorwaarden'),
(CASE_VERSION_FORM_OMKLAP, 'Aanvraag Voordracht omklap'),
(CASE_VERSION_FORM_KENNISMAKING_WONINGCORPORATIE, 'Kennismaking woningcorporatie'),
(CASE_VERSION_FORM_EVALUATIE_WONEN, 'Evaluatie wonen'),
(CASE_VERSION_BASE, "Basis gegevens"),
(CASE_VERSION_ADDRESS, "Adres gegevens"),
(CASE_VERSION_FORM_URGENTIE, "Aanvraag Urgentie onder voorwaarden"),
(CASE_VERSION_FORM_OMKLAP, "Aanvraag Voordracht omklap"),
(CASE_VERSION_FORM_KENNISMAKING_WONINGCORPORATIE, "Kennismaking woningcorporatie"),
(CASE_VERSION_FORM_EVALUATIE_WONEN, "Evaluatie wonen"),
)


def map_case_version_keys(f):
return {
'form_config_slug': f[0],
'title': f[1],
"form_config_slug": f[0],
"title": f[1],
}


CASE_VERSION_BY_SLUG = dict((s[0], map_case_version_keys(s)) for s in CASE_VERSION)


BASIS_GEGEVENS_FIELDS = [
'client_first_name',
'client_last_name',
'geboortedatum',
'emailadres',
"client_first_name",
"client_last_name",
"geboortedatum",
"emailadres",
]

0 comments on commit 8c40ef0

Please sign in to comment.