Skip to content

FTR-103-Saved-reservation-saves-company-name-to-service-name-added authentic timeslots#24

Merged
ibeusan20 merged 12 commits intodevelopfrom
FTR-103-Saved-reservation-saves-company-name-to-service-name
Jan 16, 2025
Merged

FTR-103-Saved-reservation-saves-company-name-to-service-name-added authentic timeslots#24
ibeusan20 merged 12 commits intodevelopfrom
FTR-103-Saved-reservation-saves-company-name-to-service-name

Conversation

@ibeusan20
Copy link
Copy Markdown
Collaborator

FTR-103:
corrected name of the string that should be loaded while opening ServiceReservationScreen
added a function that loads services associated with a company for use in other layers of the app
added a function that handles loading services associated with a company for use in other layers of the app
added a functionality that loads services associated with a company into the CompanyDetailsContent so a user can choose which service he wants to book
added necessary strings
removed unnecessary imports
added function to load services durations for time slot management and fixed grammar mistakes
refactored getAvailableTimeSlotsAndRange for optimal handling of all it's dependencies
refactored fetchAvailableSlots to include serviceName so it can be referenced when needed
refactored getting available time slots to include serviceName in order to be shown to userrefactored getting available time slots to include serviceName in order to be shown to user

I used to fetch company name/id (same thing). So I altered the code and some fields and values in the database in order to match document id for each company with the companyId.
I took extra care not to interfere with the code from my colleagues and I succeeded.

@ibeusan20 ibeusan20 added documentation Improvements or additions to documentation bug fix A bug is fixed labels Jan 14, 2025
@ibeusan20 ibeusan20 self-assigned this Jan 14, 2025
@ibeusan20
Copy link
Copy Markdown
Collaborator Author

Resolved some conflicts that were present in strings.xml, someone probably added them directly to develop branch or something... nevermind everything is okay.

Copy link
Copy Markdown
Owner

@mpuskadij mpuskadij left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Like I said previously, this affects the core of reservation user story, but you have already tested everything and I agree with changes. Stay slaying (and pls don't commit no more to this PR, pretty please)

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice usage of passing navigation parameters to functions! No cap

userId = userId,
onSuccess = {
println("Reservation saved successfully.")
println("Spremanje rezervacije: companyId=$companyId, serviceName=$serviceName, reservationDate=$selectedSlot, userId=$userId")
Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Croatian with english? Doesnt matter, it is logging

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Night shift does wonders!

@ibeusan20 ibeusan20 requested review from dblazevic21 and removed request for dblazevic21, dpetek21 and mmarkoovin21 January 16, 2025 02:18
Copy link
Copy Markdown
Collaborator

@dblazevic21 dblazevic21 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good layering, usage and string editing

@ibeusan20 ibeusan20 merged commit 8a5e3ea into develop Jan 16, 2025
@ibeusan20 ibeusan20 deleted the FTR-103-Saved-reservation-saves-company-name-to-service-name branch January 16, 2025 12:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug fix A bug is fixed documentation Improvements or additions to documentation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants