1430: Extend card #1772

seluianova · 2024-11-13T15:05:54Z

Short description

Add the ability to extend the Koblenz Pass in the app.

The card is extendable if its expiry date is earlier than the endDate of the associated user entitlement
The user can see a notification 3 months (90 days) before the current card expires
When the user clicks the “Extend Card” button, he is redirected to the self-service portal

Design: https://www.figma.com/design/SDoGnXIjCCXpE1tAAJkRVc/entitlementcard?node-id=792-3416&t=kUofvHMqh07BbICq-1

Proposed changes

Adjust backend: add the 'extendable' field to the card verification result
Add ExtendCardNotification widget in the app

Not included:

In this PR an empty form to create card is opened (query params are not passed).
Query params will be added in (or after) 1430: Add query params to card self service form #1749
Tests (separate tasks will be created)
I have not implemented a separate view for the case when the card has already expired, as suggested in the design, because I think our current view is fine, but feel free to object.

Side effects

not sure if german translations are correct
not tested on iOS

Testing

Create and activate a KoblenzPass:

Open administration --> login as a koblenz project admin --> go to settings --> create token
Import user entitlements using curl or Postman
curl -H "Authorization: Bearer <my_token>" -F file=@import_testdata_local.csv http://0.0.0.0:8000/users/import

CSV content:

regionKey,userHash,startDate,endDate,revoked
07111,"$argon2id$v=19$m=19456,t=2,p=1$cr3lP9IMUKNz4BLfPGlAOHq1z98G5/2tTbhDIko35tY",01.01.2024,01.01.2025,false

Go to http://localhost:3000/ and select Koblenz
Go to http://localhost:3000/erstellen, create a card with a birthday 10.06.2003 and a reference number 123K
Activate the card in the app

Update endDate of the user entitlement to any future date using POST request or directly in the DB
Open the app again and check the notification

Resolved issues

Part of: #1430

frontend/assets/koblenz/l10n/override_de.json

backend/src/main/kotlin/app/ehrenamtskarte/backend/cards/webservice/schema/CardQueryService.kt

frontend/assets/l10n/app_de.json

backend/src/main/kotlin/app/ehrenamtskarte/backend/cards/webservice/schema/CardQueryService.kt

...tlin/app/ehrenamtskarte/backend/cards/webservice/schema/types/CardVerificationResultModel.kt

f1sh1918 · 2024-11-18T09:24:36Z

@hauf-toni
We should also provide a slightly adjusted message if the card was already expired, since the user may not open the app for 90 days
I also added some comments to the design, since i think there are some pieces missing

Edit: I see there is a design for that but it looks like its not implemented?

seluianova · 2024-11-18T09:46:24Z

We should also provide a slightly adjusted message if the card was already expired

@f1sh1918 currently it looks like this, do you think it requires adjustment? (there was a small discussion in the task regarding that)

Edit: I see there is a design for that but it looks like its not implemented?

Yes, I wrote about that in the PR description

f1sh1918 · 2024-11-18T09:55:31Z

We should also provide a slightly adjusted message if the card was already expired

@f1sh1918 currently it looks like this, do you think it requires adjustment? (there was a small discussion in the task regarding that)

Hm so if you click on "Weitere Aktionen" and click on first Item the link will differ depending on the card can be extended or not?

i think this is missing also?

seluianova · 2024-11-18T10:00:35Z

Hm so if you click on "Weitere Aktionen" and click on first Item the link will differ depending on the card can be extended or not?

That was the idea, yes. Keep the existing menu item (since we have it already, and it says ‘beatragen ODER verlängern’), just add query params if the card is extendable.

i think this is missing also?

It’s not missing, it was intentionally not changed. Because we already have a view for the case when the card has expired and I decided to keep it, to be consistent with other states when card is inactive (card revoked, card not yet valid, etc.)
Do you think it's better to be changed?

UPD. But I think I need to update the text for the expired card message, because for Koblenz there is no ‘Antrag für Verlängerung’ of course. Will do that.

seluianova · 2024-11-18T13:14:33Z

When the pass expired, I adjusted the message to Ihr Pass ist abgelaufen. Unter "Weitere Aktionen" können Sie Ihren Pass verlängern oder einen neuen Pass beantragen. to make it suitable for when the card is expired AND extendable, and for when it is expired but NOT extendable.
I'm not sure if we need different messages (and views) for these two cases. But feel free to object.

f1sh1918 · 2024-11-18T15:12:11Z

When the pass expired, I adjusted the message to Ihr Pass ist abgelaufen. Unter "Weitere Aktionen" können Sie Ihren Pass verlängern oder einen neuen Pass beantragen. to make it suitable for when the card is expired AND extendable, and for when it is expired but NOT extendable. I'm not sure if we need different messages (and views) for these two cases. But feel free to object.

Alright thx. Gonna check your pr.
Sorry for not reading the whole pr description.
I always complain about that if other reviewers don't do that :/

f1sh1918

Looks really good actually. 👍

I couldn't finish the testing, will continue tomorrow. Just left you some comments

Update:
i think the extension container should have a box shadow too

You may use the flutter standard card widget for that which also brings lots of build in features
https://api.flutter.dev/flutter/material/Card-class.html

frontend/lib/identification/card_detail_view/extend_card_notification.dart

seluianova · 2024-11-19T15:02:34Z

I think I have addressed all the comments, @f1sh1918 pls take a look

seluianova · 2024-11-19T20:30:09Z

I removed my previous comment and added a minimal elevation to the notification to add some volume (I feel like the shadow shouldn't be the same as for the card...)

I also accidentally messed up the commits a bit and did rebase, sorry if you have to reset the branch locally because of that 🙄 (not sure)

f1sh1918

Works fine on ios 👍.
Just one small thing commented

If you don't want to wait until the url is final (your other pr) then please create another ticket and add a ticket nr to the todo

f1sh1918 · 2024-11-20T10:51:37Z

frontend/lib/identification/card_detail_view/extend_card_notification.dart

+              ),
+              SizedBox(height: 8),
+              FilledButton(
+                style: FilledButton.styleFrom(


i think the style should be defined in themes.dart to be able to reuse it easily without adding any styles
Elevation and shape shouldn't change for this CTA-button.
For backgroundColor we can even define color primary as default. If we need a secondary action button we can just override the color then.

seluianova · 2024-11-20T11:29:16Z

If you don't want to wait until the url is final (your other pr) then please create another ticket

@f1sh1918 I was not going to close the current task, untill everything is done. I find it convenient, but maybe we should discuss this topic in the team, if task splitting is more preferable in such cases 🙈

seluianova requested review from steffenkleinle, f1sh1918 and ztefanie as code owners November 13, 2024 15:05

seluianova linked an issue Nov 13, 2024 that may be closed by this pull request

Extend card #1430

Open

seluianova commented Nov 14, 2024

View reviewed changes

frontend/assets/koblenz/l10n/override_de.json Outdated Show resolved Hide resolved

seluianova commented Nov 14, 2024

View reviewed changes

backend/src/main/kotlin/app/ehrenamtskarte/backend/cards/webservice/schema/CardQueryService.kt Outdated Show resolved Hide resolved

michael-markl reviewed Nov 17, 2024

View reviewed changes

seluianova force-pushed the 1430-extend-card branch from fc80287 to bdac697 Compare November 18, 2024 12:52

f1sh1918 reviewed Nov 18, 2024

View reviewed changes

seluianova requested a review from f1sh1918 November 19, 2024 15:02

seluianova added 8 commits November 19, 2024 21:19

1430: Add extendable field to the card verification result

7301b8f

1430: Extend card notification

5221fd8

1430: Refactor CardQueryService

53e9c0f

1430: Adjust translations

947edf9

1430: Adjust translations and text style

323b540

1430: Use FilledButton instead of ElevatedButton

80989d2

Remove extra line break in the Koblenz publisher text

652d2dd

1430: Add elevation to the extend card notification

ceb2d57

seluianova force-pushed the 1430-extend-card branch from 02e5557 to ceb2d57 Compare November 19, 2024 20:20

f1sh1918 approved these changes Nov 20, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

1430: Extend card #1772

1430: Extend card #1772

seluianova commented Nov 13, 2024 •

edited

Loading

f1sh1918 commented Nov 18, 2024 •

edited

Loading

seluianova commented Nov 18, 2024 •

edited

Loading

f1sh1918 commented Nov 18, 2024 •

edited

Loading

seluianova commented Nov 18, 2024 •

edited

Loading

seluianova commented Nov 18, 2024

f1sh1918 commented Nov 18, 2024 •

edited

Loading

f1sh1918 left a comment •

edited

Loading

seluianova commented Nov 19, 2024

seluianova commented Nov 19, 2024 •

edited

Loading

f1sh1918 left a comment

f1sh1918 Nov 20, 2024

seluianova commented Nov 20, 2024 •

edited

Loading

1430: Extend card #1772

Are you sure you want to change the base?

1430: Extend card #1772

Conversation

seluianova commented Nov 13, 2024 • edited Loading

Short description

Proposed changes

Side effects

Testing

Resolved issues

f1sh1918 commented Nov 18, 2024 • edited Loading

seluianova commented Nov 18, 2024 • edited Loading

f1sh1918 commented Nov 18, 2024 • edited Loading

seluianova commented Nov 18, 2024 • edited Loading

seluianova commented Nov 18, 2024

f1sh1918 commented Nov 18, 2024 • edited Loading

f1sh1918 left a comment • edited Loading

Choose a reason for hiding this comment

seluianova commented Nov 19, 2024

seluianova commented Nov 19, 2024 • edited Loading

f1sh1918 left a comment

Choose a reason for hiding this comment

f1sh1918 Nov 20, 2024

Choose a reason for hiding this comment

seluianova commented Nov 20, 2024 • edited Loading

seluianova commented Nov 13, 2024 •

edited

Loading

f1sh1918 commented Nov 18, 2024 •

edited

Loading

seluianova commented Nov 18, 2024 •

edited

Loading

f1sh1918 commented Nov 18, 2024 •

edited

Loading

seluianova commented Nov 18, 2024 •

edited

Loading

f1sh1918 commented Nov 18, 2024 •

edited

Loading

f1sh1918 left a comment •

edited

Loading

seluianova commented Nov 19, 2024 •

edited

Loading

seluianova commented Nov 20, 2024 •

edited

Loading