Commit Graph

508 Commits

Author SHA1 Message Date
c15313ea5f add purchaseOrder store FK 2026-04-06 20:26:42 -06:00
b2ddea8794 add storeLocation imageUrl 2026-04-06 20:25:33 -06:00
6682cdc047 add store dimension to inventory 2026-04-06 20:24:23 -06:00
beff4c5297 simplify appointment to single pet 2026-04-06 20:22:26 -06:00
0570758b07 merge customer/employee into users 2026-04-06 20:17:27 -06:00
a36dee75af expand User entity fields 2026-04-06 19:49:38 -06:00
48f1a9c1ba switch to target DB config 2026-04-06 19:47:18 -06:00
f3a611ad60 Add target DB setup 2026-04-06 19:37:15 -06:00
Alex
4725e11b89 Merge branch 'main' into AttachmentsToChat 2026-04-06 16:29:10 -06:00
d8704c38f1 Fix brittle migrations by replacing hardcoded IDs with robust subqueries 2026-04-06 16:25:45 -06:00
Alex
90628b37d9 Merge branch 'main' into AttachmentsToChat 2026-04-06 16:13:50 -06:00
d839081112 Merge pull request #139 from RecentRunner/pet-owner-store
Pet owner store
2026-04-06 16:12:09 -06:00
9e3e8c835e Seed pets and appointments 2026-04-06 15:50:52 -06:00
35640a1a39 Update pet desktop 2026-04-06 15:50:49 -06:00
9655a77972 Pet owner and store 2026-04-06 15:50:45 -06:00
Alex
6a515f0edc Merge branch 'main' into AttachmentsToChat 2026-04-06 15:39:38 -06:00
d3754c8018 Merge pull request #138 from RecentRunner/employee-phase
Employee phase
2026-04-06 13:37:38 -06:00
6f8c0674c2 Update Postman collection 2026-04-06 13:35:01 -06:00
18407f8328 Fix Flyway migration 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
d51b1b0ab7 Fix availability checks 2026-04-06 01:51:58 -06:00
d8e2c8c95d Add Missed status 2026-04-06 00:39:37 -06:00
6d4c9a5e65 Fix employee time conflicts 2026-04-06 00:18:49 -06:00
706cd94d14 Allow cross-store staff selection 2026-04-05 23:58:21 -06:00
8d3430bd75 Enforce pet ownership rules 2026-04-05 23:35:05 -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
bdd5566493 Enforce staff-only assignments 2026-04-05 16:17:58 -06:00
8f635116df Restrict assignments to staff 2026-04-05 16:03:29 -06:00
c84d817810 Allow admin ownership bypass 2026-04-05 16:01:46 -06:00
30b5041ae5 Harden assignment rules 2026-04-05 15:51:11 -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
b7d85053bc Merge pull request #135 from RecentRunner/clean-demo-branch
Protect appointment visibility
2026-04-04 16:28:34 -06:00
dd373d3800 Harden appointment dialog 2026-04-04 16:24:09 -06:00
259770ce69 Fix appointment ownership 2026-04-04 16:24:09 -06:00
ca06f6c8b3 Hide adopted pets 2026-04-04 16:24:09 -06:00
83a0448219 Merge pull request #134 from RecentRunner/main
Update branch
2026-04-04 16:11:26 -06:00