Commit Graph

275 Commits

Author SHA1 Message Date
Nikitha
862ece691a purchaseorder view
Purchase Order view only so changes only to view
2026-03-29 16:33:27 -06:00
Nikitha
13916236eb connected files
files connected to load
2026-03-29 16:32:25 -06:00
Nikitha
2ad097413b Product files
loads details of product, categories and cost of it
2026-03-29 16:29:40 -06:00
Nikitha
653ae3f233 ProductSupplier
prodcutSupllier -loads all product supplier details and  with cost details
2026-03-29 16:28:19 -06:00
Nikitha
87a4404c20 Inventory
Inventory- details of product loads with id and described with filter, and categories selection
2026-03-29 16:26:21 -06:00
Nikitha
55f40572de Adoption files
adoption
2026-03-29 16:24:14 -06:00
Nikitha
7e832a139f Appointments
validation, time slots for booking appointment , date, store. connected to service Type, pet name, customer name. Loads from database
2026-03-29 16:20:38 -06:00
79f8514f3e Tighten reset cleanup 2026-03-18 20:28:55 -06:00
bbc7fa3aa8 Clean backend reset flow 2026-03-18 20:21:55 -06:00
2b616b8306 Remove Android VCS mapping 2026-03-18 19:46:15 -06:00
7e39925bcb Share IDE project settings 2026-03-18 19:40:43 -06:00
85839cbc4f Add empty web folder 2026-03-18 19:23:31 -06:00
66395139e0 Add 'android/' from commit '4e3261e9879f36679271f2dbdf6023ad01334265'
git-subtree-dir: android
git-subtree-mainline: 58b37b52384ca0a702c23297a2cd9bdad595c660
git-subtree-split: 4e3261e987
2026-03-18 19:23:20 -06:00
29c4afcfec Add 'desktop/' from commit 'bc9a54b29a8a8c8272609082438f36b92de7f4d1'
git-subtree-dir: desktop
git-subtree-mainline: 737028e06d5207fc69425cf4431b7d047cf3110f
git-subtree-split: bc9a54b29a
2026-03-18 19:23:20 -06:00
d0c06226f7 Add 'backend/' from commit '51bf07d5e16469036a8363e6b9d53616cbed643f'
git-subtree-dir: backend
git-subtree-mainline: 6dc2b48035ed90480e499efdb4513dff7b566616
git-subtree-split: 51bf07d5e1
2026-03-18 19:23:20 -06:00
1d7aa5ee42 Initial commit 2026-03-18 18:14:39 -06:00
Alex
4e3261e987 Added chat implementation with websockets 2026-03-15 17:41:42 -06:00
bc9a54b29a fix staff account loading 2026-03-15 12:22:23 -06:00
51bf07d5e1 Merge remote-tracking branch 'origin/main' 2026-03-15 12:16:28 -06:00
c1d78a69fd Merge remote-tracking branch 'origin/main' 2026-03-15 12:16:28 -06:00
43886ea01f Merge remote-tracking branch 'origin/fixes' into tmp-merge-main 2026-03-15 12:11:13 -06:00
826798d976 harden endpoint errors 2026-03-15 11:32:26 -06:00
75642fc751 merge fixes into main 2026-03-14 22:15:24 -06:00
12e5a3272b merge fixes into main 2026-03-14 22:15:24 -06:00
972c090b41 harden user filters 2026-03-14 22:06:49 -06:00
Alex
7b8b75cd82 Converted recylerview for Pet, Service, supplier to use DTOs
- swapped Pet,Service,Suppliers to use DTOs instead of the model when loading the list from the backend to advoid conversion of DTO -> models when displaying the list
- Added a drawer menu to chatFragment to display a list of conversations the staff can choose to open chat
2026-03-14 22:06:45 -06:00
9d48692857 fix user api validation 2026-03-14 21:56:02 -06:00
8c673fd66f add user filter requests 2026-03-14 21:45:20 -06:00
5b3a91ada0 filter users by role 2026-03-14 21:38:42 -06:00
730d39c63e edit staff accounts 2026-03-14 21:35:38 -06:00
4b4f4b087e cut over employee phones 2026-03-14 20:22:14 -06:00
4b024984cd use employee api 2026-03-14 20:22:14 -06:00
4fd2041fbb sync customer phone 2026-03-14 20:13:48 -06:00
42f8f568ae use user phone 2026-03-14 20:12:48 -06:00
efc9836c11 add user phone 2026-03-14 20:12:48 -06:00
Alex
7acefd4848 Updated project to use Gradle Daemon toolchain 2026-03-14 18:43:58 -06:00
Alex
e49ea61e5b Added CRUD to Pet, Service, Supplier
- Made Pet, Service, supplier CRUD by calling the backend apiendpoints
2026-03-14 03:56:16 -06:00
Alex
025e749ce3 Edited the views so application looks consistant
-edited appointment, adoption, product, inventory xmls to look consistant
- added search feature to Pets, services, and suppliers
- made it so the application will resume where you left off when the application is switched to the background and back
2026-03-14 03:02:18 -06:00
Alex
cf0329e0a5 Fixed login issue where token was not being cleared before loggin in again 2026-03-13 22:14:19 -06:00
Nikitha
4a1f3f2284 Merge branch 'master' into store 2026-03-13 19:08:25 -06:00
Nikitha
e8a5bd9eae Update build.gradle.kts in store branch 2026-03-13 19:06:20 -06:00
bc9bd09d24 Keep original startup error message 2026-03-13 18:09:03 -06:00
82d35feb9a Add avatar controls 2026-03-13 18:01:56 -06:00
819bd92492 Fix refund flow 2026-03-13 18:01:56 -06:00
99fe718d2c Polish chat ui 2026-03-13 18:01:56 -06:00
e27758c204 Ignore tmp folder 2026-03-13 14:42:33 -06:00
1e381d59c6 Keep startup errors 2026-03-13 14:18:34 -06:00
462e37a443 Improve docker errors 2026-03-13 14:16:21 -06:00
885d968978 Find docker on windows 2026-03-13 14:13:31 -06:00
3cabc7b8ff Add startup checks 2026-03-13 10:25:50 -06:00