|
|
9ca647f0cc
|
merge origin/main into morefiles, resolve all conflicts
|
2026-04-07 20:29:54 -06:00 |
|
Alex
|
54ab737e2d
|
added helper method for filter spinners to maintain code
|
2026-04-07 18:12:02 -06:00 |
|
Alex
|
155c64a729
|
added adoption search and filter andriod and backend
|
2026-04-07 18:06:07 -06:00 |
|
Alex
|
538b4440d8
|
fixed purchase order for android on new backend
|
2026-04-07 17:31:43 -06:00 |
|
Alex
|
5a3229eb19
|
Merge branch 'main' into AttachmentsToChat
|
2026-04-07 16:24:17 -06:00 |
|
Alex
|
c232f193d1
|
added bulk delete for ProductSupplier, appointments, and adoptions
|
2026-04-07 16:20:51 -06:00 |
|
|
|
4500b213c6
|
fix audit report mismatches across backend and android
|
2026-04-07 16:06:44 -06:00 |
|
Alex
|
4ccfe55174
|
bluk delete added for Service and suppliers on andriod
|
2026-04-07 15:24:25 -06:00 |
|
Alex
|
9eaf64c7a9
|
added helper class for bulk delete and mad pets have bulk delete
|
2026-04-07 15:13:15 -06:00 |
|
Alex
|
aa30efd3b6
|
Did the same to inventory
|
2026-04-07 14:55:43 -06:00 |
|
Alex
|
4e887c1a73
|
updard Adoptions in andriod for new backend
|
2026-04-07 14:35:57 -06:00 |
|
Alex
|
108de589bc
|
edited adapters in andriod to use viewbinding
|
2026-04-07 14:17:24 -06:00 |
|
Nikitha
|
c61f71d226
|
loading employee in appointments and adoptions
changes in backend and android
|
2026-04-07 08:43:49 -06:00 |
|
Alex
|
7c0ab0bfae
|
added an api connection to Users in Andriod
NOTE Will have to change backend so staffs can access other staffs
|
2026-04-07 07:46:22 -06:00 |
|
Alex
|
8c5348dbb6
|
fixed creating adoption for the backend and implemented adoption to andriod for changes
|
2026-04-07 07:27:37 -06:00 |
|
Alex
|
77e93a38b7
|
added my appointments button for logged in user on andriod
|
2026-04-07 06:48:36 -06:00 |
|
Alex
|
6f646a7cf0
|
added filter options to appointments in the backend and andriod
|
2026-04-07 06:34:28 -06:00 |
|
Alex
|
b7f97c45a5
|
updated Appointments on andriod for new backend
|
2026-04-07 06:14:17 -06:00 |
|
Alex
|
5c9d04fc88
|
changed backend so can sortBy productName and added search to productSupplier
|
2026-04-07 05:48:24 -06:00 |
|
Alex
|
cbd038d8fb
|
Added filter by store for inventory in back end and added search to inventory
|
2026-04-07 05:24:25 -06:00 |
|
Alex
|
6c832e01f3
|
updated inventory backend to have filter by store and added more search features to andriod
|
2026-04-07 05:09:48 -06:00 |
|
Alex
|
1d00a3b55c
|
updated search to call api for supplier
|
2026-04-07 04:19:51 -06:00 |
|
Alex
|
5823152c56
|
updated search for service to call api
|
2026-04-07 04:12:29 -06:00 |
|
Alex
|
3d403ee35e
|
Updated Filterdropdown design for pets
|
2026-04-07 03:51:09 -06:00 |
|
Alex
|
230f2715ca
|
added more filter options to pets
|
2026-04-07 03:24:55 -06:00 |
|
Alex
|
6b3979c68f
|
changed filtering and search in pets to use api calls
|
2026-04-07 02:46:00 -06:00 |
|
Alex
|
003c7ec58a
|
changed petDetailFragment to support new backend
|
2026-04-07 02:23:58 -06:00 |
|
Alex
|
5cb625a710
|
fixed pet DTO and how it interacts with new backend
|
2026-04-07 00:27:17 -06:00 |
|
Nikitha
|
bb7fbf9f78
|
Employee files
Add, edit employee (staff and admin)
|
2026-04-06 22:56:40 -06:00 |
|
Nikitha
|
53246a78c6
|
Sale, refund and analytics documents
view sale history and refund for sales
analytics of sale , employee and store performances
|
2026-04-06 22:55:45 -06:00 |
|
Alex
|
6a515f0edc
|
Merge branch 'main' into AttachmentsToChat
|
2026-04-06 15:39:38 -06:00 |
|
|
|
6f8c0674c2
|
Update Postman collection
|
2026-04-06 13:35:01 -06:00 |
|
Alex
|
4f0abd2f26
|
changed detailed fragment to fill data from the backend
|
2026-04-06 03:12:42 -06:00 |
|
Alex
|
4b9bf4dff4
|
Implemented View Binding to reduce code
- project uses view binding now so we don have to do
getViewbyId to refer to the xml
|
2026-04-05 22:50:25 -06:00 |
|
Alex
|
124a10c619
|
Edited RetrofitUtils to also call enqueue to reduce code in repository
|
2026-04-05 21:57:53 -06:00 |
|
Alex
|
eecb695b87
|
Fixed bug where it navigates back to petprofile after deleting the pet
|
2026-04-05 21:40:43 -06:00 |
|
Alex
|
38a0242264
|
Refactored more of the project to MVVM and created helper class RetrofitUtil to reduce redundent code
|
2026-04-05 21:27:32 -06:00 |
|
Alex
|
693829ce42
|
Created help class for displaying diolog and removed redundent code
|
2026-04-05 18:38:46 -06:00 |
|
Alex
|
defd851dbd
|
Created Spinner Helper class and removed reducdent code
|
2026-04-05 18:15:36 -06:00 |
|
Alex
|
8b2d406433
|
remove dead code
|
2026-04-05 17:48:14 -06:00 |
|
Alex
|
65a8475e47
|
Added Helper class and commented most fragments
|
2026-04-05 17:16:40 -06:00 |
|
|
|
0294f078f9
|
Harden staff assignment
|
2026-04-05 12:17:37 -06:00 |
|
Alex
|
0c75ffbf35
|
Refactored Andriod project to use MVVM structure (Need to apply this so sales too after merge)
- Used MVVM structure so fragments are not doing all the operation from views to data and calls
- organized the structure of our proejct
|
2026-04-04 23:35:38 -06:00 |
|
Alex
|
47bd755e72
|
fix photo loading issue on pets and products
|
2026-04-04 21:21:25 -06:00 |
|
Alex
|
be79de7c82
|
integrated Jetpack navigation to project so we dont have to manually code the functionallities of loading to different fragments
|
2026-04-04 20:08:40 -06:00 |
|
Alex
|
e25a02fe1f
|
fixed retrofit client, but will delete this file after merges
- kept class so nothing will break when merge
- then delete after merge buy making other files use Hilt
|
2026-04-04 18:23:15 -06:00 |
|
Alex
|
ddc8e98c19
|
integrated hilt so we dont have to manually pass context and inject retrofit in andriod
|
2026-04-04 18:15:05 -06:00 |
|
Alex
|
4ea76ddab5
|
Added calendar view to adoptions in andriod
|
2026-04-04 17:16:44 -06:00 |
|
Alex
|
7bb2d98639
|
Added enter send message and login for andriod feilds
|
2026-04-04 16:54:29 -06:00 |
|
Alex
|
3cc1e93c5b
|
added calendar view to appointments
- NOTE: may have to change appointments abit after backend is updated
|
2026-04-03 19:37:43 -06:00 |
|
