Commit Graph

80 Commits

Author SHA1 Message Date
Alex
4fc33fedf4 fix minor bugs and UI inconsistancy 2026-04-08 00:22:25 -06:00
d1e77f8ef3 revert adoption fragment 2026-04-07 22:17:15 -06:00
888591c970 finish android merge wiring 2026-04-07 21:15:31 -06:00
507314b7e3 merge origin/main into morefiles, resolve all conflicts 2026-04-07 20:29:54 -06:00
Alex
9498128ab1 added helper method for filter spinners to maintain code 2026-04-07 18:12:02 -06:00
Alex
492591752d added adoption search and filter andriod and backend 2026-04-07 18:06:07 -06:00
Alex
31df67ef33 fixed purchase order for android on new backend 2026-04-07 17:31:43 -06:00
Alex
ce5adccdfe Merge branch 'main' into AttachmentsToChat 2026-04-07 16:24:17 -06:00
Alex
01f5efa991 added bulk delete for ProductSupplier, appointments, and adoptions 2026-04-07 16:20:51 -06:00
2f369c0b17 fix audit report mismatches across backend and android 2026-04-07 16:06:44 -06:00
Alex
713e919c10 bluk delete added for Service and suppliers on andriod 2026-04-07 15:24:25 -06:00
Alex
93b4ad8c50 added helper class for bulk delete and mad pets have bulk delete 2026-04-07 15:13:15 -06:00
Alex
0813bb4b44 Did the same to inventory 2026-04-07 14:55:43 -06:00
Alex
679c451c04 updard Adoptions in andriod for new backend 2026-04-07 14:35:57 -06:00
Alex
baa143ff00 edited adapters in andriod to use viewbinding 2026-04-07 14:17:24 -06:00
Nikitha
d3b9d28513 loading employee in appointments and adoptions
changes in backend and android
2026-04-07 08:43:49 -06:00
Alex
8261cdfc2d 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
b4c1175ee1 fixed creating adoption for the backend and implemented adoption to andriod for changes 2026-04-07 07:27:37 -06:00
Alex
0a55014f21 added my appointments button for logged in user on andriod 2026-04-07 06:48:36 -06:00
Alex
094c2d4a48 added filter options to appointments in the backend and andriod 2026-04-07 06:34:28 -06:00
Alex
9bab45f04b updated Appointments on andriod for new backend 2026-04-07 06:14:17 -06:00
Alex
195c4605f0 changed backend so can sortBy productName and added search to productSupplier 2026-04-07 05:48:24 -06:00
Alex
1990022c1e Added filter by store for inventory in back end and added search to inventory 2026-04-07 05:24:25 -06:00
Alex
ef5651d468 updated inventory backend to have filter by store and added more search features to andriod 2026-04-07 05:09:48 -06:00
Alex
863a85472f updated search to call api for supplier 2026-04-07 04:19:51 -06:00
Alex
37bd69c6f1 updated search for service to call api 2026-04-07 04:12:29 -06:00
Alex
d37202edae Updated Filterdropdown design for pets 2026-04-07 03:51:09 -06:00
Alex
0086bb4a5e added more filter options to pets 2026-04-07 03:24:55 -06:00
Alex
6164a8746d changed filtering and search in pets to use api calls 2026-04-07 02:46:00 -06:00
Alex
867322b462 changed petDetailFragment to support new backend 2026-04-07 02:23:58 -06:00
Alex
fdc6f62441 fixed pet DTO and how it interacts with new backend 2026-04-07 00:27:17 -06:00
Nikitha
ff53e4a1ec Employee files
Add, edit employee (staff and admin)
2026-04-06 22:56:40 -06:00
Nikitha
74472976d5 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
7673504d9e Merge branch 'main' into AttachmentsToChat 2026-04-06 15:39:38 -06:00
cd5dd32c73 Update Postman collection 2026-04-06 13:35:01 -06:00
Alex
23d765c6b5 changed detailed fragment to fill data from the backend 2026-04-06 03:12:42 -06:00
Alex
d62113c0f5 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
1137688d60 Edited RetrofitUtils to also call enqueue to reduce code in repository 2026-04-05 21:57:53 -06:00
Alex
b14e318df2 Fixed bug where it navigates back to petprofile after deleting the pet 2026-04-05 21:40:43 -06:00
Alex
3555b3d2a1 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
c99d9d21f0 Created help class for displaying diolog and removed redundent code 2026-04-05 18:38:46 -06:00
Alex
6d990fbc63 Created Spinner Helper class and removed reducdent code 2026-04-05 18:15:36 -06:00
Alex
e354592c47 remove dead code 2026-04-05 17:48:14 -06:00
Alex
768103cbac Added Helper class and commented most fragments 2026-04-05 17:16:40 -06:00
5d95613786 Harden staff assignment 2026-04-05 12:17:37 -06:00
Alex
453cb54f19 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
44877cd4ad fix photo loading issue on pets and products 2026-04-04 21:21:25 -06:00
Alex
f59624f9c3 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
eee724d4f5 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
1516b92a6c integrated hilt so we dont have to manually pass context and inject retrofit in andriod 2026-04-04 18:15:05 -06:00