Andras/BoundlessFlowCampus2K
3
6
Fork 0
Code Issues 143 Pull requests 14 Projects Releases Packages Wiki Activity Actions 2

Update error messages in temperature views #849

Merged
a24julot merged 2 commits from 837-temperature-error-messages-team1 into team_1_week_5 2026-05-11 07:33:16 +00:00
Conversation 5 Commits 2 Files changed 2 +4 -2
b25marem commented 2026-05-08 11:30:32 +00:00
Collaborator
Copy link

Recreated the solution from the correct team branch (team_1_week_5) to avoid future merge conflicts.

Changes:

Moved the implementation to a branch based on team 1’s weekly branch
Resolved merge conflicts with team 1’s latest temperature card functionality
Updated error and empty-state messages to use the selected month/year variables
Preserved the new navigation functionality for changing month and year

Recreated the solution from the correct team branch (team_1_week_5) to avoid future merge conflicts. Changes: Moved the implementation to a branch based on team 1’s weekly branch Resolved merge conflicts with team 1’s latest temperature card functionality Updated error and empty-state messages to use the selected month/year variables Preserved the new navigation functionality for changing month and year
a24sakma approved these changes 2026-05-08 11:51:34 +00:00
a24sakma left a comment
Collaborator
Copy link

As this was reviewed in the previous branch I approve this changes.

As this was reviewed in the previous branch I approve this changes.
a24julot commented 2026-05-08 12:22:17 +00:00
Collaborator
Copy link

The only thing that should change is the error message in the p tag. But it seems there is a lot of changes. If statements that were removed from our branch is on this branch, did you pull the latest version from our branch @b25marem ?

The only thing that should change is the error message in the p tag. But it seems there is a lot of changes. If statements that were removed from our branch is on this branch, did you pull the latest version from our branch @b25marem ?
image.png
64 KiB
image.png
3.3 KiB
image.png image.png
b25marem commented 2026-05-08 14:33:22 +00:00
Author
Collaborator
Copy link

You’re right, more changes than intended were carried over when I recreated the branch, which made the diff larger than expected. I’ll clean up the PR so it only contains the intended error message updates.

You’re right, more changes than intended were carried over when I recreated the branch, which made the diff larger than expected. I’ll clean up the PR so it only contains the intended error message updates.
b25marem commented 2026-05-08 15:34:24 +00:00
Author
Collaborator
Copy link

I cleaned up the PR and removed the unrelated changes.
Now the PR only contains the updated error messages in the temperature views.

#833 (comment)

I cleaned up the PR and removed the unrelated changes. Now the PR only contains the updated error messages in the temperature views. https://git.webug.se/Andras/BoundlessFlowCampus2K/issues/833#issuecomment-8942
a24julot commented 2026-05-11 07:33:00 +00:00
Collaborator
Copy link

Good job, the code does what it is supposed to do, ready to be merged.

Good job, the code does what it is supposed to do, ready to be merged.
👍 1
a24julot merged commit a405a2a671 into team_1_week_5 2026-05-11 07:33:16 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
a24sakma
Labels
Clear labels   
_CRITICAL_

Only use this label for critical tasks that are project-scope,and must be addressed ASAP.

  
API

   
app

   
backEnd

   
Blocked-waiting-for-further-changes

   
bug

Something is not working

  
bug-only-on-server-for-mobile-not-webpage

   
Bug-Report-After-Merge

   
cleanup

Issues to cleanup the codebase (restructure folders, remove deprecated or smelly code)

  
close

Issue to close

  
design

   
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
feature request

   
frontEnd

   
further-changes-needed

   
future-problem-not-fixint-this-period

   
help wanted

Need some help

  
invalid

Something is wrong

  
last-week-issue-to-fix

   
library

   
low-priority

   
needs input

Issue needs input from product owner or customer

  
needs review

issue is in need of review

  
not-implemented.

   
project documentation

   
question

More information is needed

  
research

   
reviewed

This Issue has been reviewed

  
Script

   
security

use this for security-related issues

  
SQL

  
style

   
Team 1

Team 1 is responsible for this issue

  
Team 2

Team 2 is responsible for this issue

  
team leaders

   
test-creation

   
testing

   
topLevel

Reserved for top-level, project-wide issues.

  
unassigned

   
Under-review

   
wontfix

This won't be fixed

No labels
_CRITICAL_
API
app
backEnd
Blocked-waiting-for-further-changes
bug
bug-only-on-server-for-mobile-not-webpage
Bug-Report-After-Merge
cleanup
close
design
duplicate
enhancement
feature request
frontEnd
further-changes-needed
future-problem-not-fixint-this-period
help wanted
invalid
last-week-issue-to-fix
library
low-priority
needs input
needs review
not-implemented.
project documentation
question
research
reviewed
Script
security
SQL
style
Team 1
Team 2
team leaders
test-creation
testing
topLevel
unassigned
Under-review
wontfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
3 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
Andras/BoundlessFlowCampus2K!849
No description provided.