Conversation
…ing ServiceReservationScreen
…y for use in other layers of the app
…h a company for use in other layers of the app
…ompany into the CompanyDetailsContent so a user can choose which service he wants to book
…ompany into the CompanyDetailsContent so a user can choose which service he wants to book
…ement and fixed grammar mistakes
… of all it's dependencies
…an be referenced when needed
…e in order to be shown to user
…ame-to-service-name
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. |
mpuskadij
approved these changes
Jan 15, 2025
Owner
mpuskadij
left a comment
There was a problem hiding this comment.
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)
app/src/main/java/hr/foi/air/servicesync/backend/FirestoreCompanyDetails.kt
Show resolved
Hide resolved
app/src/main/java/hr/foi/air/servicesync/backend/FirestoreCompanyDetails.kt
Show resolved
Hide resolved
app/src/main/java/hr/foi/air/servicesync/backend/FirestoreCompanyDetails.kt
Show resolved
Hide resolved
app/src/main/java/hr/foi/air/servicesync/business/CompanyDetailsHandler.kt
Show resolved
Hide resolved
Owner
There was a problem hiding this comment.
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") |
Owner
There was a problem hiding this comment.
Croatian with english? Doesnt matter, it is logging
Collaborator
Author
There was a problem hiding this comment.
Night shift does wonders!
app/src/main/java/hr/foi/air/servicesync/ui/contents/CompanyDetailsContent.kt
Show resolved
Hide resolved
dblazevic21
approved these changes
Jan 16, 2025
Collaborator
dblazevic21
left a comment
There was a problem hiding this comment.
Good layering, usage and string editing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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.