|
|
07100f658b
|
Resolve stash conflicts and integrate team changes
|
2026-02-25 10:44:10 -07:00 |
|
|
|
844c86bd52
|
Merge main into fix-productsupplier-table-name
|
2026-02-25 10:42:20 -07:00 |
|
|
|
96b50a21be
|
Add multi-row selection and deletion to all tables
|
2026-02-25 10:08:47 -07:00 |
|
|
|
13684f97de
|
Add DELETE key and Enter-to-confirm to all tables
|
2026-02-25 09:42:34 -07:00 |
|
|
|
19593af688
|
Fix sale view loading error
|
2026-02-25 09:38:29 -07:00 |
|
|
|
8077d7729a
|
Fix sale-view loading error by suppressing error dialogs during initialization
|
2026-02-25 09:32:21 -07:00 |
|
|
|
ffa45044e4
|
Add error dialog for view loading failures and fix btnPurchaseOrdersClicked signature
|
2026-02-25 09:21:18 -07:00 |
|
|
|
82bbe79d01
|
Fix productSupplier table name case sensitivity and add run configurations
|
2026-02-25 09:07:59 -07:00 |
|
|
|
2d67dd2d62
|
Merge pull request #30 from RecentRunner/mergefix
Merge conflict resolution and updates
|
2026-02-24 20:28:05 -07:00 |
|
|
|
13e8c01a28
|
Merge conflict resolution and updates
|
2026-02-24 20:27:03 -07:00 |
|
|
|
208aaae652
|
Merge pull request #29 from RecentRunner/AdoptionInventory
Pushing adoption and inventory
|
2026-02-24 16:46:54 -07:00 |
|
|
|
d551289342
|
Merge branch 'main' into AdoptionInventory
|
2026-02-24 16:46:46 -07:00 |
|
|
|
40300d2fc0
|
Merge pull request #28 from RecentRunner/Pets
Dialog view now exists
|
2026-02-24 16:28:14 -07:00 |
|
augmentedpotato
|
dc538776c1
|
Pushing adoption and inventory
|
2026-02-24 16:12:48 -07:00 |
|
|
|
2fe183b18e
|
Merge pull request #27 from RecentRunner/branch3
Branch3
|
2026-02-24 16:02:26 -07:00 |
|
Nikitha
|
de4fcca36f
|
Update ServiceDialogController.java
|
2026-02-24 13:52:21 -07:00 |
|
Nikitha
|
34a0e639da
|
PurchaseOrder Display(Data)
|
2026-02-24 13:52:14 -07:00 |
|
Nikitha
|
98979efd46
|
PurchaseOrder Update
|
2026-02-23 16:31:30 -07:00 |
|
Nikitha
|
0cfb5e3cce
|
Updated service (time validation)
|
2026-02-23 16:11:20 -07:00 |
|
Nikitha
|
c3ed8b0921
|
Customer liked with appointment table
|
2026-02-23 16:10:51 -07:00 |
|
Nikitha
|
287995b22c
|
Adding PurchaseOrder(view only)
|
2026-02-23 16:09:53 -07:00 |
|
Nikitha
|
4fcaa7f2eb
|
Appointment page
|
2026-02-23 16:08:55 -07:00 |
|
Nikitha
|
8bb502c4cc
|
updated service
|
2026-02-23 08:49:12 -07:00 |
|
Nikitha
|
567a77c3a7
|
Update Service
|
2026-02-22 18:30:12 -07:00 |
|
Nikitha
|
1f784f72d1
|
appionmeent,service
|
2026-02-22 18:21:22 -07:00 |
|
|
|
1e22ff972f
|
Merge pull request #26 from RecentRunner/main
Update
|
2026-02-22 18:07:16 -07:00 |
|
|
|
68e482ffa0
|
Merge pull request #25 from RecentRunner/rbac
Rbac
|
2026-02-22 17:41:07 -07:00 |
|
|
|
bbf06456f5
|
comments
|
2026-02-22 17:39:42 -07:00 |
|
|
|
a12af3f0ee
|
Implement RBAC with login screen for admin and staff roles
- Add Role enum (ADMIN, STAFF) and UserSession singleton
- Add User model and UserDB with SHA2-256 authentication
- Add login screen (login-view.fxml + LoginController)
- Update main-layout-view.fxml: dynamic username/role labels, logout button
- Update MainLayoutController: hide Inventory/Suppliers/Product-Suppliers for STAFF, show username/role, handle logout
- Update PetShopApplication to start with login screen and initialize users table
- Update module-info.java to open/export auth package
|
2026-02-21 13:27:50 -07:00 |
|
augmentedpotato
|
168400a6b3
|
Dialog view now exists
|
2026-02-20 20:16:35 -07:00 |
|
Nikitha
|
edf5bb7a7e
|
Appoinment,service,Purchase fxml
|
2026-02-19 19:38:14 -07:00 |
|
|
|
fb16da91e2
|
Merge pull request #24 from RecentRunner/Pets
Pets CRUD
|
2026-02-11 10:10:36 -07:00 |
|
augmentedpotato
|
bcb383c40a
|
Pets CRUD
|
2026-02-11 08:40:31 -07:00 |
|
|
|
12020a2feb
|
Fixed DB connection and java version issue
|
2026-02-10 16:35:49 -07:00 |
|
|
|
a2dd913abd
|
Merge pull request #14 from RecentRunner/fixes
Added an example connection and docker compose for sql and proper error tracking
|
2026-02-10 09:18:41 -07:00 |
|
|
|
c2294d2faa
|
Added an example connection file and also added proper error tracing
|
2026-02-10 09:15:20 -07:00 |
|
|
|
e8322cb8f5
|
Added docker compose for consistent MySQL setup
|
2026-02-10 09:10:32 -07:00 |
|
|
|
117e7010f6
|
Merge pull request #13 from RecentRunner/CURDProductSupplier
Added CRUD to productSuppliers
|
2026-02-04 22:12:13 -07:00 |
|
Alex
|
b53dcf10a7
|
Added CRUD to productSuppliers
-add CRUD to productSupplier and changed sqlDatabase so cost is in productSuppliers table
|
2026-02-04 19:05:41 -07:00 |
|
|
|
ccc9a67d8b
|
Merge pull request #12 from RecentRunner/CRUDProducts
Added CRUD to Products and added Validation to dialog
|
2026-02-04 17:03:23 -07:00 |
|
Alex
|
07a6d3bfc6
|
Added CRUD to Products and added Validation to dialog
|
2026-02-03 20:02:46 -07:00 |
|
Alex
|
310b66329f
|
Added CRUD to Suppliers
|
2026-02-01 18:43:35 -07:00 |
|
Alex
|
d11f8070ca
|
Fixed Views for Product and Suppliers
|
2026-02-01 14:56:00 -07:00 |
|
Alex
|
47fe06a5c3
|
Added connection to database
- displayed products and suppliers to table but still incomplete
|
2026-01-31 17:52:30 -07:00 |
|
NikithaKommidi89
|
d4fe78b65f
|
Merge branch 'main' of https://github.com/RecentRunner/group-2-threaded-project-petshop-desktop
|
2026-01-30 19:02:43 -07:00 |
|
NikithaKommidi89
|
2f90757229
|
Database
|
2026-01-30 19:02:19 -07:00 |
|
augmentedpotato
|
cb6a389a6a
|
initial commit
|
2026-01-30 18:54:57 -07:00 |
|
Alex
|
5f42633350
|
Added UI
|
2026-01-28 18:48:36 -07:00 |
|
