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.

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

fix: minor bugs #573

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
+9 −7
Open

fix: minor bugs #573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
89f4f4b
fix(TaskSpecial): update iozRatio color to improve visibility
jalezi Mar 10, 2025
9ffb349
fix(TaskD): update dropdown label for improved localization
jalezi Mar 10, 2025
103d8c8
refactorNavLinks): reorder nav links
jalezi Mar 10, 2025
627d943
fix: locale json indent
jalezi Mar 11, 2025
9b6d75a
fix: json indent in sl.json
jalezi Mar 11, 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
3 changes: 1 addition & 2 deletions src/components/Header/NavLinks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,9 @@ const NavLinks = function NavLinks() {
<Styled.NavMenuLink ref={homeLinkRef} to={`/${lng}/`} end onClick={goHome}>
{t('header.home')}
</Styled.NavMenuLink>

<Styled.NavMenuLink to={`/${lng}/analytics`}>{t('header.analytics')}</Styled.NavMenuLink>
<Styled.NavMenuLink to={`/${lng}/faq`}>{t('header.faq')}</Styled.NavMenuLink>
<Styled.NavMenuLink to={`/${lng}/about`}>{t('header.about')}</Styled.NavMenuLink>
<Styled.NavMenuLink to={`/${lng}/analytics`}>{t('header.analytics')}</Styled.NavMenuLink>
<SledilnikOrgLinks />
</>
);
Expand Down
5 changes: 3 additions & 2 deletions src/locales/sl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,8 @@
"popup": {
"private": "Zasebni izvajalci so zdravstvene ustanove ali posamezniki, ki samostojno opravljajo zdravstvene storitve (npr.zasebniki s koncesijo) s sklenjeno pogodbo z ZZZS.",
"public": "Javni izvajalci so zdravstvene ustanove v lasti države, občin ali drugih javnih institucij s sklenjeno pogodbo z ZZZS (npr. javni zavodi - zdravstveni dom, bolnica)"
}
},
"dropdownLabel": "Izberi primerjavo"
},
"taskSpecial": {
"title": "Gibanje števila neopredeljenih skozi čas",
Expand Down Expand Up @@ -266,4 +267,4 @@
"doctors": "Zdravniki"
}
}
}
}
4 changes: 3 additions & 1 deletion src/pages/Analytics/Cards/TaskD/FilterForm.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ function formatGroupLabel(data) {
*/
const FilterForm = function FilterForm({ filterState, onChange }) {
const tCommon = t('analytics.common', { returnObjects: true });
const tDropdownLabel = t('analytics.taskD.dropdownLabel');

const { data: tData } = tCommon;

// eslint-disable-next-line no-shadow
Expand Down Expand Up @@ -59,7 +61,7 @@ const FilterForm = function FilterForm({ filterState, onChange }) {

return (
<form>
<Label htmlFor="data">Data</Label>
<Label htmlFor="data">{tDropdownLabel}</Label>
<CustomReactSelect
id="data"
name="data"
Expand Down
4 changes: 2 additions & 2 deletions src/pages/Analytics/Cards/TaskSpecial/chart-options.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ export const COLORS = {
insuredPeopleCount: 'rgba(75, 20, 20, 1)',
insuredPeopleCountWithIOZ: 'rgba(40,167,69,0.31)',
insuredPeopleCountWithoutIOZ: '#DC3545',
iozRatio: '#DC3545',
iozRatio: '#FFC107',
borderColors: {
insuredPeopleCount: 'rgba(75, 20, 20, 1)',
insuredPeopleCountWithIOZ: 'rgba(40,167,69,1)',
insuredPeopleCountWithoutIOZ: '#C62F3F',
iozRatio: '#DC3545',
iozRatio: '#FFC107',
},
};

Expand Down
Loading