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

Edit code #940 #959

Open
wants to merge 13 commits into
base: develop
Choose a base branch
from
Open

Edit code #940 #959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c38e0e4
Edit code
Thuyhaile Sep 29, 2023
c36aa44
Delete assets/environments.dev.json
Thuyhaile Oct 26, 2023
9dc2b72
Delete lib/main.dart
Thuyhaile Oct 26, 2023
040fd57
Addressing the 'Document and Type' Error
Thuyhaile Oct 26, 2023
cfbad31
Update new_citizen_screen.dart
Thuyhaile Oct 26, 2023
1e4b52a
Update new_citizen_screen.dart
Thuyhaile Oct 26, 2023
9927c70
Update new_citizen_screen.dart
Thuyhaile Oct 27, 2023
1c69f90
Update new_citizen_screen.dart
Thuyhaile Oct 27, 2023
dfb36e8
Update new_citizen_screen.dart
Thuyhaile Oct 27, 2023
f65b3e1
Update new_citizen_screen.dart
Thuyhaile Oct 27, 2023
1103f59
update main and environments.dev.json
Thuyhaile Nov 8, 2023
298f738
Merge branch 'develop' into feature/#940
Thuyhaile Nov 22, 2023
988b408
Merge branch 'develop' into feature/#940
Thuyhaile Nov 24, 2023
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
2 changes: 1 addition & 1 deletion lib/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ void main() {
* Use the "environments.local.json" for running against your local web-api
* For IOS users: change the SERVER_HOST in the environment.local file to "http://localhost:5000"
*/
environment.setFile('assets/environments.dev.json').whenComplete(() {
environment.setFile('assets/environments.local.json').whenComplete(() {
_runApp();
});
}
Expand Down
40 changes: 27 additions & 13 deletions lib/screens/new_citizen_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,19 @@ import 'package:weekplanner/widgets/giraf_button_widget.dart';
/// Role names for Weekplanner
enum Roles {
/// Guardian role
guardian,

guardian,
/// Trustee role
trustee,
trustee,
/// Citizen role
citizen }

/// Citizen role
citizen
}
/// This map provides translations for different roles used in the application
/// from English to Danish.
final Map<Roles, String> roleText = <Roles, String>{
Roles.guardian: 'Pædagog', // from Guardian to Pædagog
Roles.trustee: 'Værge', // from Trustee to Værge
Roles.citizen: 'Borger', // from Citizen to Borger
};

/// Screen for creating a new citizen
// ignore: must_be_immutable
Expand Down Expand Up @@ -123,7 +128,9 @@ class _NewCitizenScreenState extends State<NewCitizenScreen> {
Expanded(
child: ListTile(
key: const Key('guardianRadioButton'),
title: const Text('Guardian'),
// The title for the radio button,
// translated from 'Guardian' to 'Pædagog'
title: const Text('Pædagog'),
leading: Radio<Roles>(
value: Roles.guardian,
groupValue: _role,
Expand All @@ -140,7 +147,9 @@ class _NewCitizenScreenState extends State<NewCitizenScreen> {
Expanded(
child: ListTile(
key: const Key('trusteeRadioButton'),
title: const Text('Trustee'),
// The title for the radio button,
// translated from 'Trustee' to 'Værge'
title: const Text('Værge'),
leading: Radio<Roles>(
value: Roles.trustee,
groupValue: _role,
Expand All @@ -157,7 +166,9 @@ class _NewCitizenScreenState extends State<NewCitizenScreen> {
Expanded(
child: ListTile(
key: const Key('citizenRadioButton'),
title: const Text('Citizen'),
// The title for the radio button,
// translated from 'Citizen' to 'Borger'
title: const Text('Borger'),
leading: Radio<Roles>(
value: Roles.citizen,
groupValue: _role,
Expand Down Expand Up @@ -282,12 +293,15 @@ class _NewCitizenScreenState extends State<NewCitizenScreen> {
);
}),
),
const Padding(
padding: EdgeInsets.symmetric(vertical: 10, horizontal: 16),
Padding( // edit
padding: const EdgeInsets.symmetric(vertical: 10, horizontal: 16),
//child: Text('Profil billede af borger (valgfri):'),
child: AutoSizeText(
'Profil billede af borger (valgfri):',
style: TextStyle(fontSize: GirafFont.small),
// The text for displaying a profile picture based on
// the user's role. It dynamically includes the user's role,
// e.g., 'Pædagog', 'Værge', or 'Borger'
'Profil billede af ${roleText[_role]} (valgfri):',
style: const TextStyle(fontSize: GirafFont.small),
),
),

Expand Down
Loading