From 5f42633350ca8891d44cab4f6e9a55ffedfb0a94 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 28 Jan 2026 18:48:36 -0700 Subject: [PATCH 001/127] Added UI --- .gitignore | 39 +++ .mvn/wrapper/maven-wrapper.jar | Bin 0 -> 58727 bytes .mvn/wrapper/maven-wrapper.properties | 2 + mvnw | 316 ++++++++++++++++++ mvnw.cmd | 188 +++++++++++ pom.xml | 77 +++++ src/main/java/module-info.java | 10 + .../org/example/petshopdesktop/Launcher.java | 9 + .../petshopdesktop/PetShopApplication.java | 19 ++ .../controllers/AdoptionController.java | 60 ++++ .../controllers/AppointmentController.java | 63 ++++ .../controllers/InventoryController.java | 54 +++ .../controllers/MainLayoutController.java | 140 ++++++++ .../controllers/PetController.java | 63 ++++ .../controllers/ProductController.java | 60 ++++ .../ProductSupplierController.java | 57 ++++ .../controllers/SaleController.java | 50 +++ .../controllers/ServiceController.java | 57 ++++ .../controllers/SupplierController.java | 57 ++++ .../petshopdesktop/main-layout-view.fxml | 115 +++++++ .../modelviews/adoption-view.fxml | 79 +++++ .../modelviews/appointment-view.fxml | 80 +++++ .../modelviews/inventory-view.fxml | 77 +++++ .../petshopdesktop/modelviews/pet-view.fxml | 80 +++++ .../modelviews/product-supplier-view.fxml | 78 +++++ .../modelviews/product-view.fxml | 79 +++++ .../petshopdesktop/modelviews/sale-view.fxml | 73 ++++ .../modelviews/service-view.fxml | 78 +++++ .../modelviews/supplier-view.fxml | 78 +++++ 29 files changed, 2138 insertions(+) create mode 100644 .gitignore create mode 100644 .mvn/wrapper/maven-wrapper.jar create mode 100644 .mvn/wrapper/maven-wrapper.properties create mode 100644 mvnw create mode 100644 mvnw.cmd create mode 100644 pom.xml create mode 100644 src/main/java/module-info.java create mode 100644 src/main/java/org/example/petshopdesktop/Launcher.java create mode 100644 src/main/java/org/example/petshopdesktop/PetShopApplication.java create mode 100644 src/main/java/org/example/petshopdesktop/controllers/AdoptionController.java create mode 100644 src/main/java/org/example/petshopdesktop/controllers/AppointmentController.java create mode 100644 src/main/java/org/example/petshopdesktop/controllers/InventoryController.java create mode 100644 src/main/java/org/example/petshopdesktop/controllers/MainLayoutController.java create mode 100644 src/main/java/org/example/petshopdesktop/controllers/PetController.java create mode 100644 src/main/java/org/example/petshopdesktop/controllers/ProductController.java create mode 100644 src/main/java/org/example/petshopdesktop/controllers/ProductSupplierController.java create mode 100644 src/main/java/org/example/petshopdesktop/controllers/SaleController.java create mode 100644 src/main/java/org/example/petshopdesktop/controllers/ServiceController.java create mode 100644 src/main/java/org/example/petshopdesktop/controllers/SupplierController.java create mode 100644 src/main/resources/org/example/petshopdesktop/main-layout-view.fxml create mode 100644 src/main/resources/org/example/petshopdesktop/modelviews/adoption-view.fxml create mode 100644 src/main/resources/org/example/petshopdesktop/modelviews/appointment-view.fxml create mode 100644 src/main/resources/org/example/petshopdesktop/modelviews/inventory-view.fxml create mode 100644 src/main/resources/org/example/petshopdesktop/modelviews/pet-view.fxml create mode 100644 src/main/resources/org/example/petshopdesktop/modelviews/product-supplier-view.fxml create mode 100644 src/main/resources/org/example/petshopdesktop/modelviews/product-view.fxml create mode 100644 src/main/resources/org/example/petshopdesktop/modelviews/sale-view.fxml create mode 100644 src/main/resources/org/example/petshopdesktop/modelviews/service-view.fxml create mode 100644 src/main/resources/org/example/petshopdesktop/modelviews/supplier-view.fxml diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..480bdf52 --- /dev/null +++ b/.gitignore @@ -0,0 +1,39 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ +.kotlin + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..c1dd12f17644411d6e840bd5a10c6ecda0175f18 GIT binary patch literal 58727 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%0ANsA|A3-jj|r`KAo%oTajX3>^E` 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 YM{}PByk10KD_nuQ4E7Du?}+~TKh4V)`~Uy| literal 0 HcmV?d00001 diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 00000000..e077837e --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.5/apache-maven-3.8.5-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar \ No newline at end of file diff --git a/mvnw b/mvnw new file mode 100644 index 00000000..8a8fb228 --- /dev/null +++ b/mvnw @@ -0,0 +1,316 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /usr/local/etc/mavenrc ] ; then + . /usr/local/etc/mavenrc + fi + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`\\unset -f command; \\command -v java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + $MAVEN_DEBUG_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" \ + "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 00000000..1d8ab018 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,188 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* +if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% ^ + %JVM_CONFIG_MAVEN_PROPS% ^ + %MAVEN_OPTS% ^ + %MAVEN_DEBUG_OPTS% ^ + -classpath %WRAPPER_JAR% ^ + "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ + %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" +if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%"=="on" pause + +if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% + +cmd /C exit /B %ERROR_CODE% diff --git a/pom.xml b/pom.xml new file mode 100644 index 00000000..f068b382 --- /dev/null +++ b/pom.xml @@ -0,0 +1,77 @@ + + + 4.0.0 + + org.example + PetShopDesktop + 1.0-SNAPSHOT + PetShopDesktop + + + UTF-8 + 5.12.1 + + + + + org.openjfx + javafx-controls + 21.0.6 + + + org.openjfx + javafx-fxml + 21.0.6 + + + + org.junit.jupiter + junit-jupiter-api + ${junit.version} + test + + + org.junit.jupiter + junit-jupiter-engine + ${junit.version} + test + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.13.0 + + 23 + 23 + + + + org.openjfx + javafx-maven-plugin + 0.0.8 + + + + default-cli + + org.example.petshopdesktop/org.example.petshopdesktop.PetShopApplication + + app + app + app + true + true + true + + + + + + + \ No newline at end of file diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java new file mode 100644 index 00000000..88acaa41 --- /dev/null +++ b/src/main/java/module-info.java @@ -0,0 +1,10 @@ +module org.example.petshopdesktop { + requires javafx.controls; + requires javafx.fxml; + + + opens org.example.petshopdesktop to javafx.fxml; + exports org.example.petshopdesktop; + exports org.example.petshopdesktop.controllers; + opens org.example.petshopdesktop.controllers to javafx.fxml; +} \ No newline at end of file diff --git a/src/main/java/org/example/petshopdesktop/Launcher.java b/src/main/java/org/example/petshopdesktop/Launcher.java new file mode 100644 index 00000000..70456482 --- /dev/null +++ b/src/main/java/org/example/petshopdesktop/Launcher.java @@ -0,0 +1,9 @@ +package org.example.petshopdesktop; + +import javafx.application.Application; + +public class Launcher { + public static void main(String[] args) { + Application.launch(PetShopApplication.class, args); + } +} diff --git a/src/main/java/org/example/petshopdesktop/PetShopApplication.java b/src/main/java/org/example/petshopdesktop/PetShopApplication.java new file mode 100644 index 00000000..8a8fcd65 --- /dev/null +++ b/src/main/java/org/example/petshopdesktop/PetShopApplication.java @@ -0,0 +1,19 @@ +package org.example.petshopdesktop; + +import javafx.application.Application; +import javafx.fxml.FXMLLoader; +import javafx.scene.Scene; +import javafx.stage.Stage; + +import java.io.IOException; + +public class PetShopApplication extends Application { + @Override + public void start(Stage stage) throws IOException { + FXMLLoader fxmlLoader = new FXMLLoader(PetShopApplication.class.getResource("main-layout-view.fxml")); + Scene scene = new Scene(fxmlLoader.load()); + stage.setTitle("Pet Shop Manager"); + stage.setScene(scene); + stage.show(); + } +} diff --git a/src/main/java/org/example/petshopdesktop/controllers/AdoptionController.java b/src/main/java/org/example/petshopdesktop/controllers/AdoptionController.java new file mode 100644 index 00000000..f59c8e8d --- /dev/null +++ b/src/main/java/org/example/petshopdesktop/controllers/AdoptionController.java @@ -0,0 +1,60 @@ +package org.example.petshopdesktop.controllers; + +import javafx.event.ActionEvent; +import javafx.fxml.FXML; +import javafx.scene.control.Button; +import javafx.scene.control.TableColumn; +import javafx.scene.control.TableView; +import javafx.scene.control.TextField; + +public class AdoptionController { + + @FXML + private Button btnAdd; + + @FXML + private Button btnDelete; + + @FXML + private Button btnEdit; + + @FXML + private TableColumn colAdoptionDate; + + @FXML + private TableColumn colAdoptionFee; + + @FXML + private TableColumn colAdoptionId; + + @FXML + private TableColumn colAdoptionStatus; + + @FXML + private TableColumn colCustomerName; + + @FXML + private TableColumn colPetId; + + @FXML + private TableView tvAdoptions; + + @FXML + private TextField txtSearch; + + @FXML + void btnAddClicked(ActionEvent event) { + + } + + @FXML + void btnDeleteClicked(ActionEvent event) { + + } + + @FXML + void btnEditClicked(ActionEvent event) { + + } + +} diff --git a/src/main/java/org/example/petshopdesktop/controllers/AppointmentController.java b/src/main/java/org/example/petshopdesktop/controllers/AppointmentController.java new file mode 100644 index 00000000..9eb6dfce --- /dev/null +++ b/src/main/java/org/example/petshopdesktop/controllers/AppointmentController.java @@ -0,0 +1,63 @@ +package org.example.petshopdesktop.controllers; + +import javafx.event.ActionEvent; +import javafx.fxml.FXML; +import javafx.scene.control.Button; +import javafx.scene.control.TableColumn; +import javafx.scene.control.TableView; +import javafx.scene.control.TextField; + +public class AppointmentController { + + @FXML + private Button btnAdd; + + @FXML + private Button btnDelete; + + @FXML + private Button btnEdit; + + @FXML + private TableColumn colAppointmentDate; + + @FXML + private TableColumn colAppointmentId; + + @FXML + private TableColumn colAppointmentStatus; + + @FXML + private TableColumn colAppointmentTime; + + @FXML + private TableColumn colCustomerName; + + @FXML + private TableColumn colPetName; + + @FXML + private TableColumn colServiceName; + + @FXML + private TableView tvAppointments; + + @FXML + private TextField txtSearch; + + @FXML + void btnAddClicked(ActionEvent event) { + + } + + @FXML + void btnDeleteClicked(ActionEvent event) { + + } + + @FXML + void btnEditClicked(ActionEvent event) { + + } + +} diff --git a/src/main/java/org/example/petshopdesktop/controllers/InventoryController.java b/src/main/java/org/example/petshopdesktop/controllers/InventoryController.java new file mode 100644 index 00000000..18dbd6a4 --- /dev/null +++ b/src/main/java/org/example/petshopdesktop/controllers/InventoryController.java @@ -0,0 +1,54 @@ +package org.example.petshopdesktop.controllers; + +import javafx.event.ActionEvent; +import javafx.fxml.FXML; +import javafx.scene.control.Button; +import javafx.scene.control.TableColumn; +import javafx.scene.control.TableView; +import javafx.scene.control.TextField; + +public class InventoryController { + + @FXML + private Button btnAdd; + + @FXML + private Button btnDelete; + + @FXML + private Button btnEdit; + + @FXML + private TableColumn colInventoryId; + + @FXML + private TableColumn colProductId; + + @FXML + private TableColumn colProductName; + + @FXML + private TableColumn colQuantity; + + @FXML + private TableView tvInventory; + + @FXML + private TextField txtSearch; + + @FXML + void btnAddClicked(ActionEvent event) { + + } + + @FXML + void btnDeleteClicked(ActionEvent event) { + + } + + @FXML + void btnEditClicked(ActionEvent event) { + + } + +} diff --git a/src/main/java/org/example/petshopdesktop/controllers/MainLayoutController.java b/src/main/java/org/example/petshopdesktop/controllers/MainLayoutController.java new file mode 100644 index 00000000..a5a3060d --- /dev/null +++ b/src/main/java/org/example/petshopdesktop/controllers/MainLayoutController.java @@ -0,0 +1,140 @@ +package org.example.petshopdesktop.controllers; + +import javafx.event.ActionEvent; +import javafx.fxml.FXML; +import javafx.fxml.FXMLLoader; +import javafx.scene.Parent; +import javafx.scene.control.Button; +import javafx.scene.layout.StackPane; + +public class MainLayoutController { + + @FXML + private Button btnAdoptions; + + @FXML + private Button btnAppointments; + + @FXML + private Button btnInventory; + + @FXML + private Button btnPets; + + @FXML + private Button btnProductSuppliers; + + @FXML + private Button btnProducts; + + @FXML + private Button btnSalesHistory; + + @FXML + private Button btnServices; + + @FXML + private Button btnSuppliers; + + @FXML + private StackPane spContentArea; + + @FXML + void btnAdoptionsClicked(ActionEvent event) { + loadView("adoption-view.fxml"); + updateButtons(btnAdoptions); + } + + @FXML + void btnAppointmentsClicked(ActionEvent event) { + loadView("appointment-view.fxml"); + updateButtons(btnAppointments); + } + + @FXML + void btnInventoryClicked(ActionEvent event) { + loadView("inventory-view.fxml"); + updateButtons(btnInventory); + } + + @FXML + void btnPetsClicked(ActionEvent event) { + loadView("pet-view.fxml"); + updateButtons(btnPets); + } + + @FXML + void btnProductSuppliersClicked(ActionEvent event) { + loadView("product-supplier-view.fxml"); + updateButtons(btnProductSuppliers); + } + + @FXML + void btnProductsClicked(ActionEvent event) { + loadView("product-view.fxml"); + updateButtons(btnProducts); + } + + @FXML + void btnSalesHistoryClicked(ActionEvent event) { + loadView("sale-view.fxml"); + updateButtons(btnSalesHistory); + } + + @FXML + void btnServicesClicked(ActionEvent event) { + loadView("service-view.fxml"); + updateButtons(btnServices); + } + + @FXML + void btnSuppliersClicked(ActionEvent event) { + loadView("supplier-view.fxml"); + updateButtons(btnSuppliers); + } + + @FXML + public void initialize() { + loadView("pet-view.fxml"); + } + + /** + * Load a view when a button is clicked on the navigation + * @param fxmlFile the fxmlFile name to be loaded + */ + private void loadView(String fxmlFile) { + try { + //Get the location of the fxml for view + FXMLLoader loader = new FXMLLoader(getClass().getResource("/org/example/petshopdesktop/modelviews/" + fxmlFile)); + Parent view = loader.load(); + //Clear any content that is in the stack pane and add the new view to display + spContentArea.getChildren().clear(); + spContentArea.getChildren().add(view); + } catch (Exception e) { + System.out.println("Error loading view: " + fxmlFile); + } + } + + /** + * update the button visuals when a button is clicked on the navigation + * @param activeButton the button to be set active + */ + private void updateButtons(Button activeButton) { + //reset all buttons + Button[] BUTTONS = {btnAdoptions, btnPets, btnAppointments, btnInventory, + btnSalesHistory, btnServices, btnSuppliers, btnProductSuppliers, btnProducts}; + for (Button button : BUTTONS) { + //set all buttons to inactive + button.setStyle("-fx-background-color: transparent; " + + "-fx-text-fill: #CCCCCC; " + + "-fx-cursor: hand"); + } + + //set active button + activeButton.setStyle("-fx-background-color: #FF6B6B; " + + "-fx-text-fill: white; " + + "-fx-cursor: hand; " + + "-fx-background-radius: 8"); + } + +} diff --git a/src/main/java/org/example/petshopdesktop/controllers/PetController.java b/src/main/java/org/example/petshopdesktop/controllers/PetController.java new file mode 100644 index 00000000..26834d72 --- /dev/null +++ b/src/main/java/org/example/petshopdesktop/controllers/PetController.java @@ -0,0 +1,63 @@ +package org.example.petshopdesktop.controllers; + +import javafx.event.ActionEvent; +import javafx.fxml.FXML; +import javafx.scene.control.Button; +import javafx.scene.control.TableColumn; +import javafx.scene.control.TableView; +import javafx.scene.control.TextField; + +public class PetController { + + @FXML + private Button btnAdd; + + @FXML + private Button btnDelete; + + @FXML + private Button btnEdit; + + @FXML + private TableColumn colPetAge; + + @FXML + private TableColumn colPetBreed; + + @FXML + private TableColumn colPetId; + + @FXML + private TableColumn colPetName; + + @FXML + private TableColumn colPetPrice; + + @FXML + private TableColumn colPetSpecies; + + @FXML + private TableColumn colPetStatus; + + @FXML + private TableView tvPets; + + @FXML + private TextField txtSearch; + + @FXML + void btnAddClicked(ActionEvent event) { + + } + + @FXML + void btnDeleteClicked(ActionEvent event) { + + } + + @FXML + void btnEditClicked(ActionEvent event) { + + } + +} diff --git a/src/main/java/org/example/petshopdesktop/controllers/ProductController.java b/src/main/java/org/example/petshopdesktop/controllers/ProductController.java new file mode 100644 index 00000000..27d038e0 --- /dev/null +++ b/src/main/java/org/example/petshopdesktop/controllers/ProductController.java @@ -0,0 +1,60 @@ +package org.example.petshopdesktop.controllers; + +import javafx.event.ActionEvent; +import javafx.fxml.FXML; +import javafx.scene.control.Button; +import javafx.scene.control.TableColumn; +import javafx.scene.control.TableView; +import javafx.scene.control.TextField; + +public class ProductController { + + @FXML + private Button btnAdd; + + @FXML + private Button btnDelete; + + @FXML + private Button btnEdit; + + @FXML + private TableColumn colProductCategory; + + @FXML + private TableColumn colProductDesc; + + @FXML + private TableColumn colProductId; + + @FXML + private TableColumn colProductName; + + @FXML + private TableColumn colProductPrice; + + @FXML + private TableColumn colProductSKU; + + @FXML + private TableView tvProducts; + + @FXML + private TextField txtSearch; + + @FXML + void btnAddClicked(ActionEvent event) { + + } + + @FXML + void btnDeleteClicked(ActionEvent event) { + + } + + @FXML + void btnEditClicked(ActionEvent event) { + + } + +} diff --git a/src/main/java/org/example/petshopdesktop/controllers/ProductSupplierController.java b/src/main/java/org/example/petshopdesktop/controllers/ProductSupplierController.java new file mode 100644 index 00000000..d8a6e90a --- /dev/null +++ b/src/main/java/org/example/petshopdesktop/controllers/ProductSupplierController.java @@ -0,0 +1,57 @@ +package org.example.petshopdesktop.controllers; + +import javafx.event.ActionEvent; +import javafx.fxml.FXML; +import javafx.scene.control.Button; +import javafx.scene.control.TableColumn; +import javafx.scene.control.TableView; +import javafx.scene.control.TextField; + +public class ProductSupplierController { + + @FXML + private Button btnAdd; + + @FXML + private Button btnDelete; + + @FXML + private Button btnEdit; + + @FXML + private TableColumn colCost; + + @FXML + private TableColumn colProductId; + + @FXML + private TableColumn colProductName; + + @FXML + private TableColumn colSupplierId; + + @FXML + private TableColumn colSupplierName; + + @FXML + private TableView tvProductSuppliers; + + @FXML + private TextField txtSearch; + + @FXML + void btnAddClicked(ActionEvent event) { + + } + + @FXML + void btnDeleteClicked(ActionEvent event) { + + } + + @FXML + void btnEditClicked(ActionEvent event) { + + } + +} diff --git a/src/main/java/org/example/petshopdesktop/controllers/SaleController.java b/src/main/java/org/example/petshopdesktop/controllers/SaleController.java new file mode 100644 index 00000000..a54139a2 --- /dev/null +++ b/src/main/java/org/example/petshopdesktop/controllers/SaleController.java @@ -0,0 +1,50 @@ +package org.example.petshopdesktop.controllers; + +import javafx.event.ActionEvent; +import javafx.fxml.FXML; +import javafx.scene.control.Button; +import javafx.scene.control.TableColumn; +import javafx.scene.control.TableView; +import javafx.scene.control.TextField; + +public class SaleController { + + @FXML + private Button btnRefresh; + + @FXML + private TableColumn colCustomerName; + + @FXML + private TableColumn colSaleDate; + + @FXML + private TableColumn colSaleId; + + @FXML + private TableColumn colSalePaymentType; + + @FXML + private TableColumn colSaleQuantity; + + @FXML + private TableColumn colSaleTotal; + + @FXML + private TableColumn colSaleUnitPrice; + + @FXML + private TableColumn colServiceProduct; + + @FXML + private TableView tvSales; + + @FXML + private TextField txtSearch; + + @FXML + void btnRefresh(ActionEvent event) { + + } + +} diff --git a/src/main/java/org/example/petshopdesktop/controllers/ServiceController.java b/src/main/java/org/example/petshopdesktop/controllers/ServiceController.java new file mode 100644 index 00000000..65f73c7d --- /dev/null +++ b/src/main/java/org/example/petshopdesktop/controllers/ServiceController.java @@ -0,0 +1,57 @@ +package org.example.petshopdesktop.controllers; + +import javafx.event.ActionEvent; +import javafx.fxml.FXML; +import javafx.scene.control.Button; +import javafx.scene.control.TableColumn; +import javafx.scene.control.TableView; +import javafx.scene.control.TextField; + +public class ServiceController { + + @FXML + private Button btnAdd; + + @FXML + private Button btnDelete; + + @FXML + private Button btnEdit; + + @FXML + private TableColumn colServiceDesc; + + @FXML + private TableColumn colServiceDuration; + + @FXML + private TableColumn colServiceId; + + @FXML + private TableColumn colServiceName; + + @FXML + private TableColumn colServicePrice; + + @FXML + private TableView tvServices; + + @FXML + private TextField txtSearch; + + @FXML + void btnAddClicked(ActionEvent event) { + + } + + @FXML + void btnDeleteClicked(ActionEvent event) { + + } + + @FXML + void btnEditClicked(ActionEvent event) { + + } + +} diff --git a/src/main/java/org/example/petshopdesktop/controllers/SupplierController.java b/src/main/java/org/example/petshopdesktop/controllers/SupplierController.java new file mode 100644 index 00000000..409cde3b --- /dev/null +++ b/src/main/java/org/example/petshopdesktop/controllers/SupplierController.java @@ -0,0 +1,57 @@ +package org.example.petshopdesktop.controllers; + +import javafx.event.ActionEvent; +import javafx.fxml.FXML; +import javafx.scene.control.Button; +import javafx.scene.control.TableColumn; +import javafx.scene.control.TableView; +import javafx.scene.control.TextField; + +public class SupplierController { + + @FXML + private Button btnAdd; + + @FXML + private Button btnDelete; + + @FXML + private Button btnEdit; + + @FXML + private TableColumn colContactPerson; + + @FXML + private TableColumn colSupplierEmail; + + @FXML + private TableColumn colSupplierId; + + @FXML + private TableColumn colSupplierName; + + @FXML + private TableColumn colSupplierPhone; + + @FXML + private TableView tvSuppliers; + + @FXML + private TextField txtSearch; + + @FXML + void btnAddClicked(ActionEvent event) { + + } + + @FXML + void btnDeleteClicked(ActionEvent event) { + + } + + @FXML + void btnEditClicked(ActionEvent event) { + + } + +} diff --git a/src/main/resources/org/example/petshopdesktop/main-layout-view.fxml b/src/main/resources/org/example/petshopdesktop/main-layout-view.fxml new file mode 100644 index 00000000..9579dff6 --- /dev/null +++ b/src/main/resources/org/example/petshopdesktop/main-layout-view.fxml @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ diff --git a/src/main/resources/org/example/petshopdesktop/modelviews/adoption-view.fxml b/src/main/resources/org/example/petshopdesktop/modelviews/adoption-view.fxml new file mode 100644 index 00000000..c1ec6564 --- /dev/null +++ b/src/main/resources/org/example/petshopdesktop/modelviews/adoption-view.fxml @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/org/example/petshopdesktop/modelviews/appointment-view.fxml b/src/main/resources/org/example/petshopdesktop/modelviews/appointment-view.fxml new file mode 100644 index 00000000..ec7e6cce --- /dev/null +++ b/src/main/resources/org/example/petshopdesktop/modelviews/appointment-view.fxml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/org/example/petshopdesktop/modelviews/inventory-view.fxml b/src/main/resources/org/example/petshopdesktop/modelviews/inventory-view.fxml new file mode 100644 index 00000000..dea27d1b --- /dev/null +++ b/src/main/resources/org/example/petshopdesktop/modelviews/inventory-view.fxml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/org/example/petshopdesktop/modelviews/pet-view.fxml b/src/main/resources/org/example/petshopdesktop/modelviews/pet-view.fxml new file mode 100644 index 00000000..a9ab6772 --- /dev/null +++ b/src/main/resources/org/example/petshopdesktop/modelviews/pet-view.fxml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/org/example/petshopdesktop/modelviews/product-supplier-view.fxml b/src/main/resources/org/example/petshopdesktop/modelviews/product-supplier-view.fxml new file mode 100644 index 00000000..6ef50d13 --- /dev/null +++ b/src/main/resources/org/example/petshopdesktop/modelviews/product-supplier-view.fxml @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/org/example/petshopdesktop/modelviews/product-view.fxml b/src/main/resources/org/example/petshopdesktop/modelviews/product-view.fxml new file mode 100644 index 00000000..68f15d78 --- /dev/null +++ b/src/main/resources/org/example/petshopdesktop/modelviews/product-view.fxml @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/org/example/petshopdesktop/modelviews/sale-view.fxml b/src/main/resources/org/example/petshopdesktop/modelviews/sale-view.fxml new file mode 100644 index 00000000..26b24418 --- /dev/null +++ b/src/main/resources/org/example/petshopdesktop/modelviews/sale-view.fxml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/org/example/petshopdesktop/modelviews/service-view.fxml b/src/main/resources/org/example/petshopdesktop/modelviews/service-view.fxml new file mode 100644 index 00000000..c3398855 --- /dev/null +++ b/src/main/resources/org/example/petshopdesktop/modelviews/service-view.fxml @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/org/example/petshopdesktop/modelviews/supplier-view.fxml b/src/main/resources/org/example/petshopdesktop/modelviews/supplier-view.fxml new file mode 100644 index 00000000..423ae2bf --- /dev/null +++ b/src/main/resources/org/example/petshopdesktop/modelviews/supplier-view.fxml @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From cb6a389a6a14f73ab66aba0905dfab740afcab08 Mon Sep 17 00:00:00 2001 From: augmentedpotato Date: Fri, 30 Jan 2026 18:54:57 -0700 Subject: [PATCH 002/127] initial commit --- src/main/java/org/example/petshopdesktop/Launcher.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/org/example/petshopdesktop/Launcher.java b/src/main/java/org/example/petshopdesktop/Launcher.java index 70456482..8b91cd9c 100644 --- a/src/main/java/org/example/petshopdesktop/Launcher.java +++ b/src/main/java/org/example/petshopdesktop/Launcher.java @@ -1,3 +1,5 @@ +//Initial commmit + package org.example.petshopdesktop; import javafx.application.Application; From 2f90757229c66c16e5145e17eb452704d75176b7 Mon Sep 17 00:00:00 2001 From: NikithaKommidi89 Date: Fri, 30 Jan 2026 19:02:19 -0700 Subject: [PATCH 003/127] Database --- Petstoredata.sql | 85 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 Petstoredata.sql diff --git a/Petstoredata.sql b/Petstoredata.sql new file mode 100644 index 00000000..5eb101be --- /dev/null +++ b/Petstoredata.sql @@ -0,0 +1,85 @@ + +DROP DATABASE IF EXISTS Petstoredb; +CREATE DATABASE Petstoredb; +USE Petstoredb; + +INSERT INTO store_location (store_name, address, phone, email) +VALUES +('Downtown Branch', '123 Main St', '123-456-7890', 'downtown@petshop.com'), +('North Branch', '456 North Ave', '987-654-3210', 'north@petshop.com'); + + + +INSERT INTO employee (first_name, last_name, email, phone, role, is_active) +VALUES +('John', 'Doe', 'john@petshop.com', '111-222-3333', 'Manager', TRUE), +('Sara', 'Smith', 'sara@petshop.com', '444-555-6666', 'Staff', TRUE); + +INSERT INTO employee_store (employee_id, store_id) +VALUES +(1, 1), +(2, 1), +(2, 2); + +INSERT INTO customer (first_name, last_name, email, phone) +VALUES +('Alex', 'Brown', 'alex@gmail.com', '777-888-9999'), +('Emily', 'Clark', 'emily@gmail.com', '666-555-4444'); + +INSERT INTO pet (pet_name, pet_species, pet_breed, pet_age, pet_status, pet_price) +VALUES +('Buddy', 'Dog', 'Labrador', 2, 'Available', 500.00), +('Milo', 'Cat', 'Persian', 1, 'Available', 300.00); + +INSERT INTO adoption (pet_id, customer_id, adoption_date, adoption_status) +VALUES +(1, 1, '2026-01-15', 'Completed'); + +INSERT INTO supplier (sup_company, sup_contact_first_name, sup_contact_last_name, sup_email, sup_phone) +VALUES +('PetFood Inc', 'Robert', 'King', 'contact@petfood.com', '888-111-2222'); + +INSERT INTO category (category_name, category_type) +VALUES +('Dog Food', 'Product'), +('Cat Toys', 'Product'); + +INSERT INTO product (prod_name, prod_sku, prod_price, category_id, prod_desc) +VALUES +('Premium Dog Food', 'DF001', 50.00, 1, 'High quality dog food'), +('Cat Toy Ball', 'CT001', 10.00, 2, 'Colorful toy for cats'); + +INSERT INTO product_supplier (sup_id, prod_id) +VALUES +(1, 1), +(1, 2); + +INSERT INTO inventory (prod_id, quantity) +VALUES +(1, 100), +(2, 200); + +INSERT INTO service (service_name, service_desc, service_duration, service_price) +VALUES +('Pet Grooming', 'Full grooming service', 60, 40.00); + +INSERT INTO appointment (service_id, customer_id, appointment_date, appointment_time, appointment_status) +VALUES +(1, 2, '2026-02-01', '10:30:00', 'Booked'); + +INSERT INTO appointment_pet (appointment_id, pet_id) +VALUES +(1, 2); + +INSERT INTO sale (sale_date, total_amount, payment_method, employee_id, store_id) +VALUES +(NOW(), 60.00, 'Card', 2, 1); + +INSERT INTO sale_item (sale_id, prod_id, quantity, unit_price) +VALUES +(1, 2, 2, 10.00); + +INSERT INTO activity_log (employee_id, activity) +VALUES +(1, 'Created new sale'), +(2, 'Booked appointment'); From 47fe06a5c3d02b0fcd4567f501d5daba9026b56e Mon Sep 17 00:00:00 2001 From: Alex Date: Sat, 31 Jan 2026 17:52:30 -0700 Subject: [PATCH 004/127] Added connection to database - displayed products and suppliers to table but still incomplete --- Petstoredata.sql | 191 ++++++++++++++++-- pom.xml | 6 + src/main/java/module-info.java | 3 +- .../controllers/ProductController.java | 63 +++++- .../controllers/SupplierController.java | 47 ++++- .../petshopdesktop/database/ConnectionDB.java | 45 +++++ .../petshopdesktop/database/ProductDB.java | 42 ++++ .../petshopdesktop/database/SupplierDB.java | 38 ++++ .../petshopdesktop/models/Product.java | 97 +++++++++ .../petshopdesktop/models/Supplier.java | 96 +++++++++ 10 files changed, 594 insertions(+), 34 deletions(-) create mode 100644 src/main/java/org/example/petshopdesktop/database/ConnectionDB.java create mode 100644 src/main/java/org/example/petshopdesktop/database/ProductDB.java create mode 100644 src/main/java/org/example/petshopdesktop/database/SupplierDB.java create mode 100644 src/main/java/org/example/petshopdesktop/models/Product.java create mode 100644 src/main/java/org/example/petshopdesktop/models/Supplier.java diff --git a/Petstoredata.sql b/Petstoredata.sql index 5eb101be..763c21cf 100644 --- a/Petstoredata.sql +++ b/Petstoredata.sql @@ -1,85 +1,236 @@ - DROP DATABASE IF EXISTS Petstoredb; CREATE DATABASE Petstoredb; USE Petstoredb; -INSERT INTO store_location (store_name, address, phone, email) +-- Create Tables + +CREATE TABLE storeLocation ( + storeId INT AUTO_INCREMENT PRIMARY KEY, + storeName VARCHAR(100) NOT NULL, + address VARCHAR(255), + phone VARCHAR(20), + email VARCHAR(100) +); + +CREATE TABLE employee ( + employeeId INT AUTO_INCREMENT PRIMARY KEY, + firstName VARCHAR(50) NOT NULL, + lastName VARCHAR(50) NOT NULL, + email VARCHAR(100), + phone VARCHAR(20), + role VARCHAR(50), + isActive BOOLEAN DEFAULT TRUE +); + +CREATE TABLE employeeStore ( + employeeId INT, + storeId INT, + PRIMARY KEY (employeeId, storeId), + FOREIGN KEY (employeeId) REFERENCES employee(employeeId), + FOREIGN KEY (storeId) REFERENCES storeLocation(storeId) +); + +CREATE TABLE customer ( + customerId INT AUTO_INCREMENT PRIMARY KEY, + firstName VARCHAR(50) NOT NULL, + lastName VARCHAR(50) NOT NULL, + email VARCHAR(100), + phone VARCHAR(20) +); + +CREATE TABLE pet ( + petId INT AUTO_INCREMENT PRIMARY KEY, + petName VARCHAR(50), + petSpecies VARCHAR(50), + petBreed VARCHAR(50), + petAge INT, + petStatus VARCHAR(20), + petPrice DECIMAL(10, 2) +); + +CREATE TABLE adoption ( + adoptionId INT AUTO_INCREMENT PRIMARY KEY, + petId INT, + customerId INT, + adoptionDate DATE, + adoptionStatus VARCHAR(20), + FOREIGN KEY (petId) REFERENCES pet(petId), + FOREIGN KEY (customerId) REFERENCES customer(customerId) +); + +CREATE TABLE supplier ( + supId INT AUTO_INCREMENT PRIMARY KEY, + supCompany VARCHAR(100) NOT NULL, + supContactFirstName VARCHAR(50), + supContactLastName VARCHAR(50), + supEmail VARCHAR(100), + supPhone VARCHAR(20) +); + +CREATE TABLE category ( + categoryId INT AUTO_INCREMENT PRIMARY KEY, + categoryName VARCHAR(100) NOT NULL, + categoryType VARCHAR(50) +); + +CREATE TABLE product ( + prodId INT AUTO_INCREMENT PRIMARY KEY, + prodName VARCHAR(100) NOT NULL, + prodSku VARCHAR(50) UNIQUE, + prodPrice DECIMAL(10, 2), + categoryId INT, + prodDesc TEXT, + FOREIGN KEY (categoryId) REFERENCES category(categoryId) +); + +CREATE TABLE productSupplier ( + supId INT, + prodId INT, + PRIMARY KEY (supId, prodId), + FOREIGN KEY (supId) REFERENCES supplier(supId), + FOREIGN KEY (prodId) REFERENCES product(prodId) +); + +CREATE TABLE inventory ( + inventoryId INT AUTO_INCREMENT PRIMARY KEY, + prodId INT, + quantity INT DEFAULT 0, + FOREIGN KEY (prodId) REFERENCES product(prodId) +); + +CREATE TABLE service ( + serviceId INT AUTO_INCREMENT PRIMARY KEY, + serviceName VARCHAR(100) NOT NULL, + serviceDesc TEXT, + serviceDuration INT, + servicePrice DECIMAL(10, 2) +); + +CREATE TABLE appointment ( + appointmentId INT AUTO_INCREMENT PRIMARY KEY, + serviceId INT, + customerId INT, + appointmentDate DATE, + appointmentTime TIME, + appointmentStatus VARCHAR(20), + FOREIGN KEY (serviceId) REFERENCES service(serviceId), + FOREIGN KEY (customerId) REFERENCES customer(customerId) +); + +CREATE TABLE appointmentPet ( + appointmentId INT, + petId INT, + PRIMARY KEY (appointmentId, petId), + FOREIGN KEY (appointmentId) REFERENCES appointment(appointmentId), + FOREIGN KEY (petId) REFERENCES pet(petId) +); + +CREATE TABLE sale ( + saleId INT AUTO_INCREMENT PRIMARY KEY, + saleDate DATETIME, + totalAmount DECIMAL(10, 2), + paymentMethod VARCHAR(50), + employeeId INT, + storeId INT, + FOREIGN KEY (employeeId) REFERENCES employee(employeeId), + FOREIGN KEY (storeId) REFERENCES storeLocation(storeId) +); + +CREATE TABLE saleItem ( + saleItemId INT AUTO_INCREMENT PRIMARY KEY, + saleId INT, + prodId INT, + quantity INT, + unitPrice DECIMAL(10, 2), + FOREIGN KEY (saleId) REFERENCES sale(saleId), + FOREIGN KEY (prodId) REFERENCES product(prodId) +); + +CREATE TABLE activityLog ( + logId INT AUTO_INCREMENT PRIMARY KEY, + employeeId INT, + activity TEXT, + logTimestamp TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + FOREIGN KEY (employeeId) REFERENCES employee(employeeId) +); + +-- Insert Sample Data + +INSERT INTO storeLocation (storeName, address, phone, email) VALUES ('Downtown Branch', '123 Main St', '123-456-7890', 'downtown@petshop.com'), ('North Branch', '456 North Ave', '987-654-3210', 'north@petshop.com'); - - -INSERT INTO employee (first_name, last_name, email, phone, role, is_active) +INSERT INTO employee (firstName, lastName, email, phone, role, isActive) VALUES ('John', 'Doe', 'john@petshop.com', '111-222-3333', 'Manager', TRUE), ('Sara', 'Smith', 'sara@petshop.com', '444-555-6666', 'Staff', TRUE); -INSERT INTO employee_store (employee_id, store_id) +INSERT INTO employeeStore (employeeId, storeId) VALUES (1, 1), (2, 1), (2, 2); -INSERT INTO customer (first_name, last_name, email, phone) +INSERT INTO customer (firstName, lastName, email, phone) VALUES ('Alex', 'Brown', 'alex@gmail.com', '777-888-9999'), ('Emily', 'Clark', 'emily@gmail.com', '666-555-4444'); -INSERT INTO pet (pet_name, pet_species, pet_breed, pet_age, pet_status, pet_price) +INSERT INTO pet (petName, petSpecies, petBreed, petAge, petStatus, petPrice) VALUES ('Buddy', 'Dog', 'Labrador', 2, 'Available', 500.00), ('Milo', 'Cat', 'Persian', 1, 'Available', 300.00); -INSERT INTO adoption (pet_id, customer_id, adoption_date, adoption_status) +INSERT INTO adoption (petId, customerId, adoptionDate, adoptionStatus) VALUES (1, 1, '2026-01-15', 'Completed'); -INSERT INTO supplier (sup_company, sup_contact_first_name, sup_contact_last_name, sup_email, sup_phone) +INSERT INTO supplier (supCompany, supContactFirstName, supContactLastName, supEmail, supPhone) VALUES ('PetFood Inc', 'Robert', 'King', 'contact@petfood.com', '888-111-2222'); -INSERT INTO category (category_name, category_type) +INSERT INTO category (categoryName, categoryType) VALUES ('Dog Food', 'Product'), ('Cat Toys', 'Product'); -INSERT INTO product (prod_name, prod_sku, prod_price, category_id, prod_desc) +INSERT INTO product (prodName, prodSku, prodPrice, categoryId, prodDesc) VALUES ('Premium Dog Food', 'DF001', 50.00, 1, 'High quality dog food'), ('Cat Toy Ball', 'CT001', 10.00, 2, 'Colorful toy for cats'); -INSERT INTO product_supplier (sup_id, prod_id) +INSERT INTO productSupplier (supId, prodId) VALUES (1, 1), (1, 2); -INSERT INTO inventory (prod_id, quantity) +INSERT INTO inventory (prodId, quantity) VALUES (1, 100), (2, 200); -INSERT INTO service (service_name, service_desc, service_duration, service_price) +INSERT INTO service (serviceName, serviceDesc, serviceDuration, servicePrice) VALUES ('Pet Grooming', 'Full grooming service', 60, 40.00); -INSERT INTO appointment (service_id, customer_id, appointment_date, appointment_time, appointment_status) +INSERT INTO appointment (serviceId, customerId, appointmentDate, appointmentTime, appointmentStatus) VALUES (1, 2, '2026-02-01', '10:30:00', 'Booked'); -INSERT INTO appointment_pet (appointment_id, pet_id) +INSERT INTO appointmentPet (appointmentId, petId) VALUES (1, 2); -INSERT INTO sale (sale_date, total_amount, payment_method, employee_id, store_id) +INSERT INTO sale (saleDate, totalAmount, paymentMethod, employeeId, storeId) VALUES (NOW(), 60.00, 'Card', 2, 1); -INSERT INTO sale_item (sale_id, prod_id, quantity, unit_price) +INSERT INTO saleItem (saleId, prodId, quantity, unitPrice) VALUES (1, 2, 2, 10.00); -INSERT INTO activity_log (employee_id, activity) +INSERT INTO activityLog (employeeId, activity) VALUES (1, 'Created new sale'), (2, 'Booked appointment'); diff --git a/pom.xml b/pom.xml index f068b382..8cb9a1ba 100644 --- a/pom.xml +++ b/pom.xml @@ -38,6 +38,12 @@ ${junit.version} test + + + com.mysql + mysql-connector-j + 9.3.0 + diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index 88acaa41..4dcea055 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -1,8 +1,9 @@ module org.example.petshopdesktop { requires javafx.controls; requires javafx.fxml; + requires java.sql; - + opens org.example.petshopdesktop.models to javafx.base; opens org.example.petshopdesktop to javafx.fxml; exports org.example.petshopdesktop; exports org.example.petshopdesktop.controllers; diff --git a/src/main/java/org/example/petshopdesktop/controllers/ProductController.java b/src/main/java/org/example/petshopdesktop/controllers/ProductController.java index 27d038e0..3b71614f 100644 --- a/src/main/java/org/example/petshopdesktop/controllers/ProductController.java +++ b/src/main/java/org/example/petshopdesktop/controllers/ProductController.java @@ -1,11 +1,18 @@ package org.example.petshopdesktop.controllers; +import javafx.collections.FXCollections; +import javafx.collections.ObservableList; import javafx.event.ActionEvent; import javafx.fxml.FXML; import javafx.scene.control.Button; import javafx.scene.control.TableColumn; import javafx.scene.control.TableView; import javafx.scene.control.TextField; +import javafx.scene.control.cell.PropertyValueFactory; +import org.example.petshopdesktop.database.ProductDB; +import org.example.petshopdesktop.models.Product; + +import java.sql.SQLException; public class ProductController { @@ -19,29 +26,71 @@ public class ProductController { private Button btnEdit; @FXML - private TableColumn colProductCategory; + private TableColumn colProductCategory; @FXML - private TableColumn colProductDesc; + private TableColumn colProductDesc; @FXML - private TableColumn colProductId; + private TableColumn colProductId; @FXML - private TableColumn colProductName; + private TableColumn colProductName; @FXML - private TableColumn colProductPrice; + private TableColumn colProductPrice; @FXML - private TableColumn colProductSKU; + private TableColumn colProductSKU; @FXML - private TableView tvProducts; + private TableView tvProducts; @FXML private TextField txtSearch; + //data declaration + private ObservableList data = FXCollections.observableArrayList(); //empty + + /** + * Set up the table view for fees and display it when starting up + */ + @FXML + void initialize() { + //set up table columns + colProductId.setCellValueFactory(new PropertyValueFactory("prodId")); + colProductName.setCellValueFactory(new PropertyValueFactory("prodName")); + colProductSKU.setCellValueFactory(new PropertyValueFactory("prodSku")); + colProductPrice.setCellValueFactory(new PropertyValueFactory("prodPrice")); + colProductCategory.setCellValueFactory(new PropertyValueFactory("categoryId")); + colProductDesc.setCellValueFactory(new PropertyValueFactory("prodDesc")); + + displayProducts(); + + //TODO MUST DISPLAY CATEGORY NAME INSTEAD OF ID + + + } + + /** + * Display the products to table view + */ + private void displayProducts(){ + //Erase old content + data.clear(); + + //get Products from database + try{ + data = ProductDB.getProducts(); + } catch (SQLException e) { + throw new RuntimeException(e); + } + + //put data in the table + tvProducts.setItems(data); + } + + @FXML void btnAddClicked(ActionEvent event) { diff --git a/src/main/java/org/example/petshopdesktop/controllers/SupplierController.java b/src/main/java/org/example/petshopdesktop/controllers/SupplierController.java index 409cde3b..07730787 100644 --- a/src/main/java/org/example/petshopdesktop/controllers/SupplierController.java +++ b/src/main/java/org/example/petshopdesktop/controllers/SupplierController.java @@ -1,11 +1,18 @@ package org.example.petshopdesktop.controllers; +import javafx.collections.FXCollections; +import javafx.collections.ObservableList; import javafx.event.ActionEvent; import javafx.fxml.FXML; import javafx.scene.control.Button; import javafx.scene.control.TableColumn; import javafx.scene.control.TableView; import javafx.scene.control.TextField; +import javafx.scene.control.cell.PropertyValueFactory; +import org.example.petshopdesktop.database.SupplierDB; +import org.example.petshopdesktop.models.Supplier; + +import java.sql.SQLException; public class SupplierController { @@ -19,26 +26,54 @@ public class SupplierController { private Button btnEdit; @FXML - private TableColumn colContactPerson; + private TableColumn colContactPerson; @FXML - private TableColumn colSupplierEmail; + private TableColumn colSupplierEmail; @FXML - private TableColumn colSupplierId; + private TableColumn colSupplierId; @FXML - private TableColumn colSupplierName; + private TableColumn colSupplierName; @FXML - private TableColumn colSupplierPhone; + private TableColumn colSupplierPhone; @FXML - private TableView tvSuppliers; + private TableView tvSuppliers; @FXML private TextField txtSearch; + private ObservableList data = FXCollections.observableArrayList(); + + @FXML + void initialize(){ + colSupplierId.setCellValueFactory(new PropertyValueFactory("supId")); + colSupplierName.setCellValueFactory(new PropertyValueFactory("supCompany")); + colContactPerson.setCellValueFactory(new PropertyValueFactory("supContactFirstName")); + colSupplierEmail.setCellValueFactory(new PropertyValueFactory("supEmail")); + colSupplierPhone.setCellValueFactory(new PropertyValueFactory("supPhone")); + + displaySupplier(); + + //TODO MUST DISPLAY FULL NAME INSTEAD OF FIRST NAME ALSO ADD COMMENTS LATER + } + + private void displaySupplier(){ + data.clear(); + + try{ + data = SupplierDB.getSuppliers(); + } catch (SQLException e) { + throw new RuntimeException(e); + } + + tvSuppliers.setItems(data); + } + + @FXML void btnAddClicked(ActionEvent event) { diff --git a/src/main/java/org/example/petshopdesktop/database/ConnectionDB.java b/src/main/java/org/example/petshopdesktop/database/ConnectionDB.java new file mode 100644 index 00000000..2b0bad1d --- /dev/null +++ b/src/main/java/org/example/petshopdesktop/database/ConnectionDB.java @@ -0,0 +1,45 @@ +package org.example.petshopdesktop.database; + +import java.io.FileInputStream; +import java.io.IOException; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; +import java.util.Properties; + +public class ConnectionDB { + /** + * Method to try and connect to the database sing cnnection.properties located in the + * root of C drive + * @return Connection to the database + */ + public static Connection getConnection(){ + String url = ""; + String user = ""; + String password = ""; + + try{ + //Read connection.properties file + FileInputStream fis = new FileInputStream("c:\\connectionpetstore.properties"); //location of connection can be changed here + Properties prop = new Properties(); + prop.load(fis); + url = prop.getProperty("url"); + user = prop.getProperty("user"); + password = prop.getProperty("password"); + } + catch(IOException e){ + throw new RuntimeException("Problem with reading connection info: "+e.getMessage()); + } + + Connection conn = null; + + try{ + //try to get connection with the data taken from connection.properties + conn = DriverManager.getConnection(url,user,password); + return conn; + } + catch (SQLException e) { + throw new RuntimeException("Problem with database connection: "+e.getMessage()); + } + } +} diff --git a/src/main/java/org/example/petshopdesktop/database/ProductDB.java b/src/main/java/org/example/petshopdesktop/database/ProductDB.java new file mode 100644 index 00000000..d113d679 --- /dev/null +++ b/src/main/java/org/example/petshopdesktop/database/ProductDB.java @@ -0,0 +1,42 @@ +package org.example.petshopdesktop.database; + +import javafx.collections.FXCollections; +import javafx.collections.ObservableList; +import org.example.petshopdesktop.models.Product; + +import java.io.FileInputStream; +import java.io.IOException; +import java.sql.*; +import java.util.Properties; + +/** + * A class containing all the methods relating to CRUD on Products table + */ +public class ProductDB { + + public static ObservableList getProducts() throws SQLException{ + //Connect to the database + ObservableList products = FXCollections.observableArrayList(); + Connection conn = ConnectionDB.getConnection(); + + //Execute Query + Statement stmt = conn.createStatement(); + ResultSet rs = stmt.executeQuery("SELECT * FROM product"); + + //While there is still data add products to the list + while(rs.next()){ + Product product = new Product( + rs.getInt(1), + rs.getString(2), + rs.getString(3), + rs.getDouble(4), + rs.getInt(5), + rs.getString(6)); + products.add(product); + } + + //close connection and return products + conn.close(); + return products; + } +} diff --git a/src/main/java/org/example/petshopdesktop/database/SupplierDB.java b/src/main/java/org/example/petshopdesktop/database/SupplierDB.java new file mode 100644 index 00000000..55426d3d --- /dev/null +++ b/src/main/java/org/example/petshopdesktop/database/SupplierDB.java @@ -0,0 +1,38 @@ +package org.example.petshopdesktop.database; + +import javafx.collections.FXCollections; +import javafx.collections.ObservableList; +import org.example.petshopdesktop.models.Product; +import org.example.petshopdesktop.models.Supplier; + +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; + +public class SupplierDB { + public static ObservableList getSuppliers() throws SQLException { + //Connect to the database + ObservableList suppliers = FXCollections.observableArrayList(); + Connection conn = ConnectionDB.getConnection(); + + //Execute Query + Statement stmt = conn.createStatement(); + ResultSet rs = stmt.executeQuery("SELECT * FROM supplier"); + + //While there is still data add products to the list + while(rs.next()){ + Supplier supplier = new Supplier( + rs.getInt(1), + rs.getString(2), + rs.getString(3), + rs.getString(4), + rs.getString(5), + rs.getString(6)); + suppliers.add(supplier); + } + + conn.close(); + return suppliers; + } +} diff --git a/src/main/java/org/example/petshopdesktop/models/Product.java b/src/main/java/org/example/petshopdesktop/models/Product.java new file mode 100644 index 00000000..62217315 --- /dev/null +++ b/src/main/java/org/example/petshopdesktop/models/Product.java @@ -0,0 +1,97 @@ +package org.example.petshopdesktop.models; + +import javafx.beans.property.SimpleDoubleProperty; +import javafx.beans.property.SimpleIntegerProperty; +import javafx.beans.property.SimpleStringProperty; + +public class Product { + public SimpleIntegerProperty prodId; + public SimpleStringProperty prodName; + public SimpleStringProperty prodSku; + public SimpleDoubleProperty prodPrice; + public SimpleIntegerProperty categoryId; + public SimpleStringProperty prodDesc; + + //constructor + public Product(int prodId, String prodName, String prodSku, double prodPrice, int categoryId, String prodDesc) { + this.prodId = new SimpleIntegerProperty(prodId); + this.prodName = new SimpleStringProperty(prodName); + this.prodSku = new SimpleStringProperty(prodSku); + this.prodPrice = new SimpleDoubleProperty(prodPrice); + this.categoryId = new SimpleIntegerProperty(categoryId); + this.prodDesc = new SimpleStringProperty(prodDesc); + } + + //getter and setters + public int getProdId() { + return prodId.get(); + } + + public SimpleIntegerProperty prodIdProperty() { + return prodId; + } + + public void setProdId(int prodId) { + this.prodId.set(prodId); + } + + public String getProdName() { + return prodName.get(); + } + + public SimpleStringProperty prodNameProperty() { + return prodName; + } + + public void setProdName(String prodName) { + this.prodName.set(prodName); + } + + public String getProdSku() { + return prodSku.get(); + } + + public SimpleStringProperty prodSkuProperty() { + return prodSku; + } + + public void setProdSku(String prodSku) { + this.prodSku.set(prodSku); + } + + public double getProdPrice() { + return prodPrice.get(); + } + + public SimpleDoubleProperty prodPriceProperty() { + return prodPrice; + } + + public void setProdPrice(double prodPrice) { + this.prodPrice.set(prodPrice); + } + + public int getCategoryId() { + return categoryId.get(); + } + + public SimpleIntegerProperty categoryIdProperty() { + return categoryId; + } + + public void setCategoryId(int categoryId) { + this.categoryId.set(categoryId); + } + + public String getProdDesc() { + return prodDesc.get(); + } + + public SimpleStringProperty prodDescProperty() { + return prodDesc; + } + + public void setProdDesc(String prodDesc) { + this.prodDesc.set(prodDesc); + } +} diff --git a/src/main/java/org/example/petshopdesktop/models/Supplier.java b/src/main/java/org/example/petshopdesktop/models/Supplier.java new file mode 100644 index 00000000..5822a977 --- /dev/null +++ b/src/main/java/org/example/petshopdesktop/models/Supplier.java @@ -0,0 +1,96 @@ +package org.example.petshopdesktop.models; + +import javafx.beans.property.SimpleIntegerProperty; +import javafx.beans.property.SimpleStringProperty; + +public class Supplier { + SimpleIntegerProperty supId; + SimpleStringProperty supCompany; + SimpleStringProperty supContactFirstName; + SimpleStringProperty supContactLastName; + SimpleStringProperty supEmail; + SimpleStringProperty supPhone; + + //constructor + public Supplier(int supId, String supCompany, String supContactFirstName, String supContactLastName, String supEmail, String supPhone) { + this.supId = new SimpleIntegerProperty(supId); + this.supCompany = new SimpleStringProperty(supCompany); + this.supContactFirstName = new SimpleStringProperty(supContactFirstName); + this.supContactLastName = new SimpleStringProperty(supContactLastName); + this.supEmail = new SimpleStringProperty(supEmail); + this.supPhone = new SimpleStringProperty(supPhone); + } + + //getter and setter + public int getSupId() { + return supId.get(); + } + + public SimpleIntegerProperty supIdProperty() { + return supId; + } + + public void setSupId(int supId) { + this.supId.set(supId); + } + + public String getSupCompany() { + return supCompany.get(); + } + + public SimpleStringProperty supCompanyProperty() { + return supCompany; + } + + public void setSupCompany(String supCompany) { + this.supCompany.set(supCompany); + } + + public String getSupContactFirstName() { + return supContactFirstName.get(); + } + + public SimpleStringProperty supContactFirstNameProperty() { + return supContactFirstName; + } + + public void setSupContactFirstName(String supContactFirstName) { + this.supContactFirstName.set(supContactFirstName); + } + + public String getSupContactLastName() { + return supContactLastName.get(); + } + + public SimpleStringProperty supContactLastNameProperty() { + return supContactLastName; + } + + public void setSupContactLastName(String supContactLastName) { + this.supContactLastName.set(supContactLastName); + } + + public String getSupEmail() { + return supEmail.get(); + } + + public SimpleStringProperty supEmailProperty() { + return supEmail; + } + + public void setSupEmail(String supEmail) { + this.supEmail.set(supEmail); + } + + public String getSupPhone() { + return supPhone.get(); + } + + public SimpleStringProperty supPhoneProperty() { + return supPhone; + } + + public void setSupPhone(String supPhone) { + this.supPhone.set(supPhone); + } +} From d11f8070cac02fca3a040289add3bb69bae2791d Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 1 Feb 2026 14:56:00 -0700 Subject: [PATCH 005/127] Fixed Views for Product and Suppliers --- src/main/java/module-info.java | 1 + .../petshopdesktop/DTOs/ProductDTO.java | 131 ++++++++++++++++++ .../controllers/ProductController.java | 44 +++--- .../controllers/SupplierController.java | 12 +- .../SupplierDialogController.java | 5 + .../petshopdesktop/database/ProductDB.java | 41 ++++++ .../petshopdesktop/database/SupplierDB.java | 9 ++ .../petshopdesktop/models/Product.java | 15 +- .../petshopdesktop/models/Supplier.java | 13 ++ 9 files changed, 242 insertions(+), 29 deletions(-) create mode 100644 src/main/java/org/example/petshopdesktop/DTOs/ProductDTO.java create mode 100644 src/main/java/org/example/petshopdesktop/controllers/dialogcontrollers/SupplierDialogController.java diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index 4dcea055..0c7ee955 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -3,6 +3,7 @@ module org.example.petshopdesktop { requires javafx.fxml; requires java.sql; + opens org.example.petshopdesktop.DTOs to javafx.base; opens org.example.petshopdesktop.models to javafx.base; opens org.example.petshopdesktop to javafx.fxml; exports org.example.petshopdesktop; diff --git a/src/main/java/org/example/petshopdesktop/DTOs/ProductDTO.java b/src/main/java/org/example/petshopdesktop/DTOs/ProductDTO.java new file mode 100644 index 00000000..865af1de --- /dev/null +++ b/src/main/java/org/example/petshopdesktop/DTOs/ProductDTO.java @@ -0,0 +1,131 @@ +package org.example.petshopdesktop.DTOs; + +import javafx.beans.property.SimpleDoubleProperty; +import javafx.beans.property.SimpleIntegerProperty; +import javafx.beans.property.SimpleStringProperty; +import org.example.petshopdesktop.models.Product; + +/** + * The class for productDTO, all product data is store here but also gets categoryName + */ +public class ProductDTO { + private SimpleIntegerProperty prodId; + private SimpleStringProperty prodName; + private SimpleStringProperty prodSku; + private SimpleDoubleProperty prodPrice; + private SimpleIntegerProperty categoryId; //used for edit and delete + private SimpleStringProperty categoryName; + private SimpleStringProperty prodDesc; + + //constructor + public ProductDTO(int prodId, String prodName, String prodSku, double prodPrice, int categoryId, String categoryName, String prodDesc) { + this.prodId = new SimpleIntegerProperty(prodId); + this.prodName = new SimpleStringProperty(prodName); + this.prodSku = new SimpleStringProperty(prodSku); + this.prodPrice = new SimpleDoubleProperty(prodPrice); + this.categoryId = new SimpleIntegerProperty(categoryId); + this.categoryName = new SimpleStringProperty(categoryName); + this.prodDesc = new SimpleStringProperty(prodDesc); + } + + //getter and setters + public int getProdId() { + return prodId.get(); + } + + public SimpleIntegerProperty prodIdProperty() { + return prodId; + } + + public void setProdId(int prodId) { + this.prodId.set(prodId); + } + + public String getProdName() { + return prodName.get(); + } + + public SimpleStringProperty prodNameProperty() { + return prodName; + } + + public void setProdName(String prodName) { + this.prodName.set(prodName); + } + + public String getProdSku() { + return prodSku.get(); + } + + public SimpleStringProperty prodSkuProperty() { + return prodSku; + } + + public void setProdSku(String prodSku) { + this.prodSku.set(prodSku); + } + + public double getProdPrice() { + return prodPrice.get(); + } + + public SimpleDoubleProperty prodPriceProperty() { + return prodPrice; + } + + public void setProdPrice(double prodPrice) { + this.prodPrice.set(prodPrice); + } + + public String getCategoryName() { + return categoryName.get(); + } + + public SimpleStringProperty categoryNameProperty() { + return categoryName; + } + + public void setCategoryName(String categoryName) { + this.categoryName.set(categoryName); + } + + public String getProdDesc() { + return prodDesc.get(); + } + + public SimpleStringProperty prodDescProperty() { + return prodDesc; + } + + public void setProdDesc(String prodDesc) { + this.prodDesc.set(prodDesc); + } + + public int getCategoryId() { + return categoryId.get(); + } + + public SimpleIntegerProperty categoryIdProperty() { + return categoryId; + } + + public void setCategoryId(int categoryId) { + this.categoryId.set(categoryId); + } + + /** + * Converts DTO into product for editing and deleting + * @return + */ + public Product toProduct(){ + Product product = new Product( + getProdId(), + getProdName(), + getProdSku(), + getProdPrice(), + getCategoryId(), + getProdDesc() + ); + return product; + } +} diff --git a/src/main/java/org/example/petshopdesktop/controllers/ProductController.java b/src/main/java/org/example/petshopdesktop/controllers/ProductController.java index 3b71614f..c79110fd 100644 --- a/src/main/java/org/example/petshopdesktop/controllers/ProductController.java +++ b/src/main/java/org/example/petshopdesktop/controllers/ProductController.java @@ -9,11 +9,15 @@ import javafx.scene.control.TableColumn; import javafx.scene.control.TableView; import javafx.scene.control.TextField; import javafx.scene.control.cell.PropertyValueFactory; +import org.example.petshopdesktop.DTOs.ProductDTO; import org.example.petshopdesktop.database.ProductDB; import org.example.petshopdesktop.models.Product; import java.sql.SQLException; +/** + * The controller for any operations in the products view + */ public class ProductController { @FXML @@ -26,54 +30,52 @@ public class ProductController { private Button btnEdit; @FXML - private TableColumn colProductCategory; + private TableColumn colProductCategory; @FXML - private TableColumn colProductDesc; + private TableColumn colProductDesc; @FXML - private TableColumn colProductId; + private TableColumn colProductId; @FXML - private TableColumn colProductName; + private TableColumn colProductName; @FXML - private TableColumn colProductPrice; + private TableColumn colProductPrice; @FXML - private TableColumn colProductSKU; + private TableColumn colProductSKU; @FXML - private TableView tvProducts; + private TableView tvProducts; @FXML private TextField txtSearch; //data declaration - private ObservableList data = FXCollections.observableArrayList(); //empty + private ObservableList data = FXCollections.observableArrayList(); //empty + private String mode = null; /** - * Set up the table view for fees and display it when starting up + * Set up the table view for products and display it when starting up */ @FXML void initialize() { //set up table columns - colProductId.setCellValueFactory(new PropertyValueFactory("prodId")); - colProductName.setCellValueFactory(new PropertyValueFactory("prodName")); - colProductSKU.setCellValueFactory(new PropertyValueFactory("prodSku")); - colProductPrice.setCellValueFactory(new PropertyValueFactory("prodPrice")); - colProductCategory.setCellValueFactory(new PropertyValueFactory("categoryId")); - colProductDesc.setCellValueFactory(new PropertyValueFactory("prodDesc")); + colProductId.setCellValueFactory(new PropertyValueFactory("prodId")); + colProductName.setCellValueFactory(new PropertyValueFactory("prodName")); + colProductSKU.setCellValueFactory(new PropertyValueFactory("prodSku")); + colProductPrice.setCellValueFactory(new PropertyValueFactory("prodPrice")); + colProductCategory.setCellValueFactory(new PropertyValueFactory("categoryName")); + colProductDesc.setCellValueFactory(new PropertyValueFactory("prodDesc")); displayProducts(); - //TODO MUST DISPLAY CATEGORY NAME INSTEAD OF ID - - } /** - * Display the products to table view + * Display the productDTO to table view */ private void displayProducts(){ //Erase old content @@ -81,9 +83,9 @@ public class ProductController { //get Products from database try{ - data = ProductDB.getProducts(); + data = ProductDB.getProductDTO(); } catch (SQLException e) { - throw new RuntimeException(e); + System.out.println(e.getMessage()); } //put data in the table diff --git a/src/main/java/org/example/petshopdesktop/controllers/SupplierController.java b/src/main/java/org/example/petshopdesktop/controllers/SupplierController.java index 07730787..6ac02698 100644 --- a/src/main/java/org/example/petshopdesktop/controllers/SupplierController.java +++ b/src/main/java/org/example/petshopdesktop/controllers/SupplierController.java @@ -14,6 +14,9 @@ import org.example.petshopdesktop.models.Supplier; import java.sql.SQLException; +/** + * The controller for any operations in the supplier view + */ public class SupplierController { @FXML @@ -48,19 +51,24 @@ public class SupplierController { private ObservableList data = FXCollections.observableArrayList(); + /** + * Set up the table view for suppliers and display it when starting up + */ @FXML void initialize(){ colSupplierId.setCellValueFactory(new PropertyValueFactory("supId")); colSupplierName.setCellValueFactory(new PropertyValueFactory("supCompany")); - colContactPerson.setCellValueFactory(new PropertyValueFactory("supContactFirstName")); + colContactPerson.setCellValueFactory(new PropertyValueFactory("supFullName")); colSupplierEmail.setCellValueFactory(new PropertyValueFactory("supEmail")); colSupplierPhone.setCellValueFactory(new PropertyValueFactory("supPhone")); displaySupplier(); - //TODO MUST DISPLAY FULL NAME INSTEAD OF FIRST NAME ALSO ADD COMMENTS LATER } + /** + * Display the suppliers to table view + */ private void displaySupplier(){ data.clear(); diff --git a/src/main/java/org/example/petshopdesktop/controllers/dialogcontrollers/SupplierDialogController.java b/src/main/java/org/example/petshopdesktop/controllers/dialogcontrollers/SupplierDialogController.java new file mode 100644 index 00000000..de8c1f6d --- /dev/null +++ b/src/main/java/org/example/petshopdesktop/controllers/dialogcontrollers/SupplierDialogController.java @@ -0,0 +1,5 @@ +package org.example.petshopdesktop.controllers.dialogcontrollers; + +public class SupplierDialogController { + +} diff --git a/src/main/java/org/example/petshopdesktop/database/ProductDB.java b/src/main/java/org/example/petshopdesktop/database/ProductDB.java index d113d679..5eaf1e89 100644 --- a/src/main/java/org/example/petshopdesktop/database/ProductDB.java +++ b/src/main/java/org/example/petshopdesktop/database/ProductDB.java @@ -2,6 +2,7 @@ package org.example.petshopdesktop.database; import javafx.collections.FXCollections; import javafx.collections.ObservableList; +import org.example.petshopdesktop.DTOs.ProductDTO; import org.example.petshopdesktop.models.Product; import java.io.FileInputStream; @@ -14,6 +15,11 @@ import java.util.Properties; */ public class ProductDB { + /** + * gets all the products into an observable list + * @return a list of all the products + * @throws SQLException if failed to find products in the database + */ public static ObservableList getProducts() throws SQLException{ //Connect to the database ObservableList products = FXCollections.observableArrayList(); @@ -39,4 +45,39 @@ public class ProductDB { conn.close(); return products; } + + /** + * gets all the ProductDTOs into an observable list for display (displays categoryName instead of categoryId) + * @return the list of all the ProductDTOs + * @throws SQLException if failed to find products in the database + */ + public static ObservableList getProductDTO() throws SQLException{ + //Connect to the database + ObservableList products = FXCollections.observableArrayList(); + Connection conn = ConnectionDB.getConnection(); + + //Execute Query + Statement stmt = conn.createStatement(); + String sql = "SELECT p.prodId, p.prodName, p.prodSku, p.prodPrice, p.categoryId, c.categoryName, p.prodDesc " + + "FROM product p " + + "LEFT JOIN category c ON p.categoryId = c.categoryId"; + ResultSet rs = stmt.executeQuery(sql); + + //While there is still data add products to the list + while(rs.next()){ + ProductDTO product = new ProductDTO( + rs.getInt(1), + rs.getString(2), + rs.getString(3), + rs.getDouble(4), + rs.getInt(5), + rs.getString(6), + rs.getString(7)); + products.add(product); + } + + //close connection and return products + conn.close(); + return products; + } } diff --git a/src/main/java/org/example/petshopdesktop/database/SupplierDB.java b/src/main/java/org/example/petshopdesktop/database/SupplierDB.java index 55426d3d..ca41bc30 100644 --- a/src/main/java/org/example/petshopdesktop/database/SupplierDB.java +++ b/src/main/java/org/example/petshopdesktop/database/SupplierDB.java @@ -10,7 +10,16 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; +/** + * A class containing all the methods relating to CRUD on Suppliers table + */ public class SupplierDB { + + /** + * gets all the suppliers into an observable list + * @return a list of all the suppliers + * @throws SQLException if failed to find suppliers in the database + */ public static ObservableList getSuppliers() throws SQLException { //Connect to the database ObservableList suppliers = FXCollections.observableArrayList(); diff --git a/src/main/java/org/example/petshopdesktop/models/Product.java b/src/main/java/org/example/petshopdesktop/models/Product.java index 62217315..1a7333b3 100644 --- a/src/main/java/org/example/petshopdesktop/models/Product.java +++ b/src/main/java/org/example/petshopdesktop/models/Product.java @@ -4,13 +4,16 @@ import javafx.beans.property.SimpleDoubleProperty; import javafx.beans.property.SimpleIntegerProperty; import javafx.beans.property.SimpleStringProperty; +/** + * The class for the entity of products (contains all data relating to products) + */ public class Product { - public SimpleIntegerProperty prodId; - public SimpleStringProperty prodName; - public SimpleStringProperty prodSku; - public SimpleDoubleProperty prodPrice; - public SimpleIntegerProperty categoryId; - public SimpleStringProperty prodDesc; + private SimpleIntegerProperty prodId; + private SimpleStringProperty prodName; + private SimpleStringProperty prodSku; + private SimpleDoubleProperty prodPrice; + private SimpleIntegerProperty categoryId; + private SimpleStringProperty prodDesc; //constructor public Product(int prodId, String prodName, String prodSku, double prodPrice, int categoryId, String prodDesc) { diff --git a/src/main/java/org/example/petshopdesktop/models/Supplier.java b/src/main/java/org/example/petshopdesktop/models/Supplier.java index 5822a977..36f05094 100644 --- a/src/main/java/org/example/petshopdesktop/models/Supplier.java +++ b/src/main/java/org/example/petshopdesktop/models/Supplier.java @@ -3,6 +3,9 @@ package org.example.petshopdesktop.models; import javafx.beans.property.SimpleIntegerProperty; import javafx.beans.property.SimpleStringProperty; +/** + * The class for the entity of supplier (contains all data relating to suppliers) + */ public class Supplier { SimpleIntegerProperty supId; SimpleStringProperty supCompany; @@ -93,4 +96,14 @@ public class Supplier { public void setSupPhone(String supPhone) { this.supPhone.set(supPhone); } + + //custom methods + + /** + * Get the full name of supplier contact to display in a single cell + * @return full name of supplier contact + */ + public String getSupFullName() { + return getSupContactFirstName() + " " + getSupContactLastName(); + } } From 310b66329f3184eb66f87056f9ad748736a1b097 Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 1 Feb 2026 18:43:35 -0700 Subject: [PATCH 006/127] Added CRUD to Suppliers --- src/main/java/module-info.java | 4 +- .../controllers/ProductController.java | 3 + .../controllers/SupplierController.java | 134 +++++++++++++- .../SupplierDialogController.java | 173 ++++++++++++++++++ .../petshopdesktop/database/SupplierDB.java | 91 ++++++++- .../dialogviews/supplier-dialog-view.fxml | 161 ++++++++++++++++ 6 files changed, 556 insertions(+), 10 deletions(-) create mode 100644 src/main/resources/org/example/petshopdesktop/dialogviews/supplier-dialog-view.fxml diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index 0c7ee955..7459e876 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -6,7 +6,9 @@ module org.example.petshopdesktop { opens org.example.petshopdesktop.DTOs to javafx.base; opens org.example.petshopdesktop.models to javafx.base; opens org.example.petshopdesktop to javafx.fxml; + opens org.example.petshopdesktop.controllers.dialogcontrollers to javafx.fxml; + opens org.example.petshopdesktop.controllers to javafx.fxml; + exports org.example.petshopdesktop; exports org.example.petshopdesktop.controllers; - opens org.example.petshopdesktop.controllers to javafx.fxml; } \ No newline at end of file diff --git a/src/main/java/org/example/petshopdesktop/controllers/ProductController.java b/src/main/java/org/example/petshopdesktop/controllers/ProductController.java index c79110fd..d8811cc0 100644 --- a/src/main/java/org/example/petshopdesktop/controllers/ProductController.java +++ b/src/main/java/org/example/petshopdesktop/controllers/ProductController.java @@ -62,6 +62,9 @@ public class ProductController { */ @FXML void initialize() { + //Disable buttons until a row is selected + btnEdit.setDisable(true); + btnDelete.setDisable(true); //set up table columns colProductId.setCellValueFactory(new PropertyValueFactory("prodId")); colProductName.setCellValueFactory(new PropertyValueFactory("prodName")); diff --git a/src/main/java/org/example/petshopdesktop/controllers/SupplierController.java b/src/main/java/org/example/petshopdesktop/controllers/SupplierController.java index 6ac02698..c64eff6c 100644 --- a/src/main/java/org/example/petshopdesktop/controllers/SupplierController.java +++ b/src/main/java/org/example/petshopdesktop/controllers/SupplierController.java @@ -4,15 +4,20 @@ import javafx.collections.FXCollections; import javafx.collections.ObservableList; import javafx.event.ActionEvent; import javafx.fxml.FXML; -import javafx.scene.control.Button; -import javafx.scene.control.TableColumn; -import javafx.scene.control.TableView; -import javafx.scene.control.TextField; +import javafx.fxml.FXMLLoader; +import javafx.scene.Scene; +import javafx.scene.control.*; import javafx.scene.control.cell.PropertyValueFactory; +import javafx.stage.Modality; +import javafx.stage.Stage; +import org.example.petshopdesktop.controllers.dialogcontrollers.SupplierDialogController; import org.example.petshopdesktop.database.SupplierDB; import org.example.petshopdesktop.models.Supplier; +import java.io.IOException; import java.sql.SQLException; +import java.sql.SQLIntegrityConstraintViolationException; +import java.util.Optional; /** * The controller for any operations in the supplier view @@ -50,12 +55,17 @@ public class SupplierController { private TextField txtSearch; private ObservableList data = FXCollections.observableArrayList(); + private String mode = null; /** * Set up the table view for suppliers and display it when starting up */ @FXML void initialize(){ + //Disable buttons until a row is selected + btnEdit.setDisable(true); + btnDelete.setDisable(true); + //set columns for table view colSupplierId.setCellValueFactory(new PropertyValueFactory("supId")); colSupplierName.setCellValueFactory(new PropertyValueFactory("supCompany")); colContactPerson.setCellValueFactory(new PropertyValueFactory("supFullName")); @@ -64,6 +74,15 @@ public class SupplierController { displaySupplier(); + // Enable buttons when a row is selected + tvSuppliers.getSelectionModel().selectedItemProperty().addListener( + (observable, oldValue, newValue) -> { + btnEdit.setDisable(false); + btnDelete.setDisable(false); + } + ); + + } /** @@ -82,19 +101,124 @@ public class SupplierController { } + /** + * open a new dialog for adding a supplier + * @param event + */ @FXML void btnAddClicked(ActionEvent event) { - + mode = "Add"; + openDialog(null,mode); } + /** + * + * @param event + */ @FXML void btnDeleteClicked(ActionEvent event) { + int numRows = 0; + //set selected supplier + Supplier selectedSupplier = tvSuppliers.getSelectionModel().getSelectedItem(); + //ask user to confirm + Alert question = new Alert(Alert.AlertType.CONFIRMATION); + question.setHeaderText("Please confirm delete"); + question.setContentText("Are you sure you want to delete this supplier?"); + Optional result = question.showAndWait(); //show alert and wait for response + + //if confirmed, start deletion + if (result.isPresent() && result.get() == ButtonType.OK){ + int supId = selectedSupplier.getSupId(); + + //Try deleting supplier + try{ + numRows = SupplierDB.deleteSupplier(supId); + } + catch (SQLIntegrityConstraintViolationException e){ + Alert alert = new Alert(Alert.AlertType.ERROR); + alert.setHeaderText("Database Operation Error"); + alert.setContentText("Delete failed\n" + + "the selected supplier is being referred in another table"); + alert.showAndWait(); + return; + } + catch (SQLException e) { + throw new RuntimeException(e); + } + + //prompt user of any errors + if (numRows == 0){ + Alert alert = new Alert(Alert.AlertType.ERROR); + alert.setHeaderText("Database Operation Error"); + alert.setContentText("Delete failed"); + alert.showAndWait(); + } + else{ + //prompt user of delete conformation + Alert alert = new Alert(Alert.AlertType.CONFIRMATION); + alert.setHeaderText("Database Operation Confirmed"); + alert.setContentText("Delete successful"); + alert.showAndWait(); + //refresh display + displaySupplier(); + } + } } + /** + * Open a new dialog for editing a supplier + * @param event click event + */ @FXML void btnEditClicked(ActionEvent event) { + //set selected supplier + Supplier selectedSupplier = tvSuppliers.getSelectionModel().getSelectedItem(); + if (selectedSupplier != null) { + mode = "Edit"; + openDialog(selectedSupplier, mode); + } + } + + /** + * Function to open the new Dialog for edit or adding + * depending on the mode given + * @param supplier the supplier entity fo editing, null if adding + * @param mode the mode the dialog should be in + */ + private void openDialog(Supplier supplier, String mode){ + //Get new view + FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("/org/example/petshopdesktop/dialogviews/supplier-dialog-view.fxml")); //CHECK + Scene scene = null; + try{ + scene = new Scene(fxmlLoader.load()); + } catch (IOException e) { + throw new RuntimeException(e); + } + SupplierDialogController dialogController = fxmlLoader.getController(); //controller associated with this view + dialogController.setMode(mode); + + //Open the dialog depending on the mode + if(mode.equals("Edit")){ + //Make it display suppliers details in dialog + dialogController.displaySupplierDetails(supplier); + } + Stage dialogStage = new Stage(); + dialogStage.initModality(Modality.APPLICATION_MODAL); //make it modal + if(mode.equals("Add")){ + dialogStage.setTitle("Add Supplier"); + } + else { + dialogStage.setTitle("Edit Supplier"); + } + dialogStage.setScene(scene); + dialogStage.showAndWait(); + + //When dialog closes update table view and disable edit and delete buttons + displaySupplier(); + btnDelete.setDisable(true); + btnEdit.setDisable(true); } } diff --git a/src/main/java/org/example/petshopdesktop/controllers/dialogcontrollers/SupplierDialogController.java b/src/main/java/org/example/petshopdesktop/controllers/dialogcontrollers/SupplierDialogController.java index de8c1f6d..fe6e06c2 100644 --- a/src/main/java/org/example/petshopdesktop/controllers/dialogcontrollers/SupplierDialogController.java +++ b/src/main/java/org/example/petshopdesktop/controllers/dialogcontrollers/SupplierDialogController.java @@ -1,5 +1,178 @@ package org.example.petshopdesktop.controllers.dialogcontrollers; +import javafx.event.EventHandler; +import javafx.fxml.FXML; +import javafx.scene.Node; +import javafx.scene.control.Alert; +import javafx.scene.control.Button; +import javafx.scene.control.Label; +import javafx.scene.control.TextField; +import javafx.scene.input.MouseEvent; +import javafx.stage.Stage; +import org.example.petshopdesktop.database.SupplierDB; +import org.example.petshopdesktop.models.Supplier; + +import java.sql.SQLException; + public class SupplierDialogController { + @FXML + private Button btnCancel; + + @FXML + private Button btnSave; + + @FXML + private Label lblMode; + + @FXML + private Label lblSupId; + + @FXML + private TextField txtCompanyName; + + @FXML + private TextField txtContactFirstName; + + @FXML + private TextField txtContactLastName; + + @FXML + private TextField txtEmail; + + @FXML + private TextField txtPhone; + + private String mode = null; + + @FXML + void initialize() { + //Set up mouse handlers for buttons + btnSave.setOnMouseClicked(new EventHandler() { + @Override + public void handle(MouseEvent mouseEvent) { + buttonSaveClicked(mouseEvent); + } + }); + + btnCancel.setOnMouseClicked(new EventHandler() { + @Override + public void handle(MouseEvent mouseEvent) { + closeStage(mouseEvent); + } + }); + } + + private void buttonSaveClicked(MouseEvent mouseEvent) { + int numRow = 0; //how many rows affected + String errorMsg = ""; //error message for validation + + //TODO: Import validation class and validate text fields here + + if(errorMsg.isEmpty()){ //no validation errors detected + Supplier supplier = collectSupplier(); //get supplier info + if (mode.equals("Add")) { //add mode + try{ + numRow = SupplierDB.insertSupplier(supplier); + } catch (SQLException e) { + throw new RuntimeException(e); + } + } + else{ //edit mode + try{ + numRow = SupplierDB.updateSupplier(supplier.getSupId(),supplier); + } catch (SQLException e) { + throw new RuntimeException(e); + } + } + + //if no rows were affected then there was an error (prompt user of error) + if (numRow == 0){ + Alert alert = new Alert(Alert.AlertType.ERROR); + alert.setHeaderText("Database Operation Error"); + alert.setContentText(mode + " failed"); + alert.showAndWait(); + closeStage(mouseEvent); + } + else { + //tell the user operation was successful + Alert alert = new Alert(Alert.AlertType.CONFIRMATION); + alert.setHeaderText("Database Operation Confirmed"); + alert.setContentText(mode + " succeeded"); + alert.showAndWait(); + closeStage(mouseEvent); + } + } + else{ //Display validation errors + Alert alert = new Alert(Alert.AlertType.ERROR); + alert.setHeaderText("Input Error"); + alert.setContentText(errorMsg); + alert.showAndWait(); + } + } + + /** + * Close the window + * @param mouseEvent mouse event to close + */ + private void closeStage(MouseEvent mouseEvent) { + Node node = (Node) mouseEvent.getSource(); + Stage stage = (Stage) node.getScene().getWindow(); + stage.close(); + } + + /** + * Collect the supplier info + * @return supplier info with the id or the new supplier + */ + private Supplier collectSupplier(){ + int supId = 0; + Supplier supplier = null; + + if(lblSupId.isVisible()){ //Edit mode + //get supplier id from lblId (split the string so we only get the int) + supId = Integer.parseInt(lblSupId.getText().split(": ")[1]); + } + supplier = new Supplier( + supId, + txtCompanyName.getText(), + txtContactFirstName.getText(), + txtContactLastName.getText(), + txtEmail.getText(), + txtPhone.getText() + ); + return supplier; + } + + /** + * Display the supplier data in text fields + * @param supplier the supplier entity containing data to display + */ + public void displaySupplierDetails(Supplier supplier){ + if (supplier!=null){ + lblSupId.setText("ID: " + supplier.getSupId()); + txtCompanyName.setText(supplier.getSupCompany()); + txtContactFirstName.setText(supplier.getSupContactFirstName()); + txtContactLastName.setText(supplier.getSupContactLastName()); + txtEmail.setText(supplier.getSupEmail()); + txtPhone.setText(supplier.getSupPhone()); + } + } + + + /** + * Set the mode of the dialog + * @param mode the mode to for the dialog + */ + public void setMode(String mode) { + this.mode = mode; + lblMode.setText(mode + " Supplier"); + if(mode.equals("Add")) { + lblSupId.setVisible(false); + } + else if(mode.equals("Edit")) { + lblSupId.setVisible(true); + } + } + } diff --git a/src/main/java/org/example/petshopdesktop/database/SupplierDB.java b/src/main/java/org/example/petshopdesktop/database/SupplierDB.java index ca41bc30..cc186081 100644 --- a/src/main/java/org/example/petshopdesktop/database/SupplierDB.java +++ b/src/main/java/org/example/petshopdesktop/database/SupplierDB.java @@ -5,10 +5,7 @@ import javafx.collections.ObservableList; import org.example.petshopdesktop.models.Product; import org.example.petshopdesktop.models.Supplier; -import java.sql.Connection; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; +import java.sql.*; /** * A class containing all the methods relating to CRUD on Suppliers table @@ -44,4 +41,90 @@ public class SupplierDB { conn.close(); return suppliers; } + + /** + * Inserts a new supplier to the database + * @param supplier supplier entity to be inserted + * @return number of rows affected in the database + * @throws SQLException if insertion failed + */ + public static int insertSupplier(Supplier supplier) throws SQLException { + int numRows = 0; + + Connection conn = ConnectionDB.getConnection(); + String sql = "INSERT INTO supplier (supId, supCompany, supContactFirstName, supContactLastName, supEmail, supPhone)" + + "VALUES (?, ?, ?, ?, ?, ?)"; + + //These are the values from supplier to put into the query above + PreparedStatement stmt = conn.prepareStatement(sql); + stmt.setInt(1, supplier.getSupId()); + stmt.setString(2, supplier.getSupCompany()); + stmt.setString(3, supplier.getSupContactFirstName()); + stmt.setString(4, supplier.getSupContactLastName()); + stmt.setString(5, supplier.getSupEmail()); + stmt.setString(6, supplier.getSupPhone()); + + //update the number of rows affected, return and close connection + numRows = stmt.executeUpdate(); + conn.close(); + + return numRows; + } + + /** + * Update an existing supplier to the database + * @param supId id of supplier + * @param supplier new supplier data + * @return number of rows affected in the database + * @throws SQLException if update failed + */ + public static int updateSupplier(int supId, Supplier supplier) throws SQLException { + int numRows = 0; + + Connection conn = ConnectionDB.getConnection(); + String sql = "UPDATE supplier SET " + + " supCompany = ?, " + + " supContactFirstName = ?, " + + " supContactLastName = ?, " + + " supEmail = ?, " + + " supPhone = ? " + + " WHERE supId = ?"; + + //updated values to update the supplier with the query above + PreparedStatement stmt = conn.prepareStatement(sql); + stmt.setString(1, supplier.getSupCompany()); + stmt.setString(2, supplier.getSupContactFirstName()); + stmt.setString(3, supplier.getSupContactLastName()); + stmt.setString(4, supplier.getSupEmail()); + stmt.setString(5, supplier.getSupPhone()); + stmt.setInt(6, supId); + + //Update the rows and close connection + numRows = stmt.executeUpdate(); + conn.close(); + + return numRows; + } + + /** + * Delete a supplier form the database + * @param supId supplier id to be deleted + * @return number of rows affected in the database + * @throws SQLException if delete failed + */ + public static int deleteSupplier(int supId) throws SQLException { + int numRows = 0; + Connection conn = ConnectionDB.getConnection(); + + String sql = "DELETE FROM supplier WHERE supId = ?"; + PreparedStatement stmt = conn.prepareStatement(sql); + //The supplier id to be deleted for the query above + stmt.setInt(1, supId); + + //close connection and update rows affected + numRows = stmt.executeUpdate(); + conn.close(); + + return numRows; + } } diff --git a/src/main/resources/org/example/petshopdesktop/dialogviews/supplier-dialog-view.fxml b/src/main/resources/org/example/petshopdesktop/dialogviews/supplier-dialog-view.fxml new file mode 100644 index 00000000..e26557c8 --- /dev/null +++ b/src/main/resources/org/example/petshopdesktop/dialogviews/supplier-dialog-view.fxml @@ -0,0 +1,161 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 07a6d3bfc6dba02149487fee69a7946ddce29187 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 3 Feb 2026 20:02:46 -0700 Subject: [PATCH 007/127] Added CRUD to Products and added Validation to dialog --- Petstoredata.sql | 215 ++++++++++++------ .../petshopdesktop/DTOs/ProductDTO.java | 17 +- .../org/example/petshopdesktop/Validator.java | 131 +++++++++++ .../controllers/ProductController.java | 169 +++++++++++++- .../controllers/SupplierController.java | 47 +++- .../ProductDialogController.java | 211 +++++++++++++++++ .../SupplierDialogController.java | 21 +- .../petshopdesktop/database/CategoryDB.java | 41 ++++ .../petshopdesktop/database/ProductDB.java | 155 +++++++++++-- .../petshopdesktop/database/SupplierDB.java | 52 ++++- .../petshopdesktop/models/Category.java | 59 +++++ .../petshopdesktop/models/Product.java | 16 +- .../dialogviews/product-dialog-view.fxml | 149 ++++++++++++ .../modelviews/product-view.fxml | 9 +- 14 files changed, 1147 insertions(+), 145 deletions(-) create mode 100644 src/main/java/org/example/petshopdesktop/Validator.java create mode 100644 src/main/java/org/example/petshopdesktop/controllers/dialogcontrollers/ProductDialogController.java create mode 100644 src/main/java/org/example/petshopdesktop/database/CategoryDB.java create mode 100644 src/main/java/org/example/petshopdesktop/models/Category.java create mode 100644 src/main/resources/org/example/petshopdesktop/dialogviews/product-dialog-view.fxml diff --git a/Petstoredata.sql b/Petstoredata.sql index 763c21cf..c1d1046b 100644 --- a/Petstoredata.sql +++ b/Petstoredata.sql @@ -7,24 +7,24 @@ USE Petstoredb; CREATE TABLE storeLocation ( storeId INT AUTO_INCREMENT PRIMARY KEY, storeName VARCHAR(100) NOT NULL, - address VARCHAR(255), - phone VARCHAR(20), - email VARCHAR(100) + address VARCHAR(255) NOT NULL, + phone VARCHAR(20) NOT NULL, + email VARCHAR(100) NOT NULL ); CREATE TABLE employee ( employeeId INT AUTO_INCREMENT PRIMARY KEY, firstName VARCHAR(50) NOT NULL, lastName VARCHAR(50) NOT NULL, - email VARCHAR(100), - phone VARCHAR(20), - role VARCHAR(50), - isActive BOOLEAN DEFAULT TRUE + email VARCHAR(100) NOT NULL, + phone VARCHAR(20) NOT NULL, + role VARCHAR(50) NOT NULL, + isActive BOOLEAN DEFAULT TRUE NOT NULL ); CREATE TABLE employeeStore ( - employeeId INT, - storeId INT, + employeeId INT NOT NULL, + storeId INT NOT NULL, PRIMARY KEY (employeeId, storeId), FOREIGN KEY (employeeId) REFERENCES employee(employeeId), FOREIGN KEY (storeId) REFERENCES storeLocation(storeId) @@ -34,26 +34,26 @@ CREATE TABLE customer ( customerId INT AUTO_INCREMENT PRIMARY KEY, firstName VARCHAR(50) NOT NULL, lastName VARCHAR(50) NOT NULL, - email VARCHAR(100), - phone VARCHAR(20) + email VARCHAR(100) NOT NULL, + phone VARCHAR(20) NOT NULL ); CREATE TABLE pet ( petId INT AUTO_INCREMENT PRIMARY KEY, - petName VARCHAR(50), - petSpecies VARCHAR(50), - petBreed VARCHAR(50), - petAge INT, - petStatus VARCHAR(20), - petPrice DECIMAL(10, 2) + petName VARCHAR(50) NOT NULL, + petSpecies VARCHAR(50) NOT NULL, + petBreed VARCHAR(50) NOT NULL, + petAge INT NOT NULL, + petStatus VARCHAR(20) NOT NULL, + petPrice DECIMAL(10, 2) NOT NULL ); CREATE TABLE adoption ( adoptionId INT AUTO_INCREMENT PRIMARY KEY, - petId INT, - customerId INT, - adoptionDate DATE, - adoptionStatus VARCHAR(20), + petId INT NOT NULL, + customerId INT NOT NULL, + adoptionDate DATE NOT NULL, + adoptionStatus VARCHAR(20) NOT NULL, FOREIGN KEY (petId) REFERENCES pet(petId), FOREIGN KEY (customerId) REFERENCES customer(customerId) ); @@ -61,31 +61,30 @@ CREATE TABLE adoption ( CREATE TABLE supplier ( supId INT AUTO_INCREMENT PRIMARY KEY, supCompany VARCHAR(100) NOT NULL, - supContactFirstName VARCHAR(50), - supContactLastName VARCHAR(50), - supEmail VARCHAR(100), - supPhone VARCHAR(20) + supContactFirstName VARCHAR(50) NOT NULL, + supContactLastName VARCHAR(50) NOT NULL, + supEmail VARCHAR(100) NOT NULL, + supPhone VARCHAR(20) NOT NULL ); CREATE TABLE category ( categoryId INT AUTO_INCREMENT PRIMARY KEY, categoryName VARCHAR(100) NOT NULL, - categoryType VARCHAR(50) + categoryType VARCHAR(50) NOT NULL ); CREATE TABLE product ( prodId INT AUTO_INCREMENT PRIMARY KEY, prodName VARCHAR(100) NOT NULL, - prodSku VARCHAR(50) UNIQUE, - prodPrice DECIMAL(10, 2), - categoryId INT, + prodPrice DECIMAL(10, 2) NOT NULL, + categoryId INT NOT NULL, prodDesc TEXT, FOREIGN KEY (categoryId) REFERENCES category(categoryId) ); CREATE TABLE productSupplier ( - supId INT, - prodId INT, + supId INT NOT NULL, + prodId INT NOT NULL, PRIMARY KEY (supId, prodId), FOREIGN KEY (supId) REFERENCES supplier(supId), FOREIGN KEY (prodId) REFERENCES product(prodId) @@ -93,8 +92,8 @@ CREATE TABLE productSupplier ( CREATE TABLE inventory ( inventoryId INT AUTO_INCREMENT PRIMARY KEY, - prodId INT, - quantity INT DEFAULT 0, + prodId INT NOT NULL, + quantity INT DEFAULT 0 NOT NULL, FOREIGN KEY (prodId) REFERENCES product(prodId) ); @@ -102,24 +101,24 @@ CREATE TABLE service ( serviceId INT AUTO_INCREMENT PRIMARY KEY, serviceName VARCHAR(100) NOT NULL, serviceDesc TEXT, - serviceDuration INT, - servicePrice DECIMAL(10, 2) + serviceDuration INT NOT NULL, + servicePrice DECIMAL(10, 2) NOT NULL ); CREATE TABLE appointment ( appointmentId INT AUTO_INCREMENT PRIMARY KEY, - serviceId INT, - customerId INT, - appointmentDate DATE, - appointmentTime TIME, - appointmentStatus VARCHAR(20), + serviceId INT NOT NULL, + customerId INT NOT NULL, + appointmentDate DATE NOT NULL, + appointmentTime TIME NOT NULL, + appointmentStatus VARCHAR(20) NOT NULL, FOREIGN KEY (serviceId) REFERENCES service(serviceId), FOREIGN KEY (customerId) REFERENCES customer(customerId) ); CREATE TABLE appointmentPet ( - appointmentId INT, - petId INT, + appointmentId INT NOT NULL, + petId INT NOT NULL, PRIMARY KEY (appointmentId, petId), FOREIGN KEY (appointmentId) REFERENCES appointment(appointmentId), FOREIGN KEY (petId) REFERENCES pet(petId) @@ -127,30 +126,30 @@ CREATE TABLE appointmentPet ( CREATE TABLE sale ( saleId INT AUTO_INCREMENT PRIMARY KEY, - saleDate DATETIME, - totalAmount DECIMAL(10, 2), - paymentMethod VARCHAR(50), - employeeId INT, - storeId INT, + saleDate DATETIME NOT NULL, + totalAmount DECIMAL(10, 2) NOT NULL, + paymentMethod VARCHAR(50) NOT NULL, + employeeId INT NOT NULL, + storeId INT NOT NULL, FOREIGN KEY (employeeId) REFERENCES employee(employeeId), FOREIGN KEY (storeId) REFERENCES storeLocation(storeId) ); CREATE TABLE saleItem ( saleItemId INT AUTO_INCREMENT PRIMARY KEY, - saleId INT, - prodId INT, - quantity INT, - unitPrice DECIMAL(10, 2), + saleId INT NOT NULL, + prodId INT NOT NULL, + quantity INT NOT NULL, + unitPrice DECIMAL(10, 2) NOT NULL, FOREIGN KEY (saleId) REFERENCES sale(saleId), FOREIGN KEY (prodId) REFERENCES product(prodId) ); CREATE TABLE activityLog ( logId INT AUTO_INCREMENT PRIMARY KEY, - employeeId INT, - activity TEXT, - logTimestamp TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + employeeId INT NOT NULL, + activity TEXT NOT NULL, + logTimestamp TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL, FOREIGN KEY (employeeId) REFERENCES employee(employeeId) ); @@ -159,78 +158,148 @@ CREATE TABLE activityLog ( INSERT INTO storeLocation (storeName, address, phone, email) VALUES ('Downtown Branch', '123 Main St', '123-456-7890', 'downtown@petshop.com'), -('North Branch', '456 North Ave', '987-654-3210', 'north@petshop.com'); +('North Branch', '456 North Ave', '987-654-3210', 'north@petshop.com'), +('West Side Store', '789 West Blvd', '555-123-4567', 'westside@petshop.com'), +('East End Shop', '321 East Road', '555-987-6543', 'eastend@petshop.com'), +('South Mall Location', '654 South Plaza', '555-246-8135', 'southmall@petshop.com'); INSERT INTO employee (firstName, lastName, email, phone, role, isActive) VALUES ('John', 'Doe', 'john@petshop.com', '111-222-3333', 'Manager', TRUE), -('Sara', 'Smith', 'sara@petshop.com', '444-555-6666', 'Staff', TRUE); +('Sara', 'Smith', 'sara@petshop.com', '444-555-6666', 'Staff', TRUE), +('Michael', 'Johnson', 'michael@petshop.com', '222-333-4444', 'Groomer', TRUE), +('Lisa', 'Williams', 'lisa@petshop.com', '333-444-5555', 'Staff', TRUE), +('David', 'Brown', 'david@petshop.com', '555-666-7777', 'Veterinarian', TRUE), +('Emma', 'Davis', 'emma@petshop.com', '666-777-8888', 'Manager', FALSE); INSERT INTO employeeStore (employeeId, storeId) VALUES (1, 1), (2, 1), -(2, 2); +(2, 2), +(3, 2), +(4, 3), +(5, 1), +(5, 4), +(6, 5); INSERT INTO customer (firstName, lastName, email, phone) VALUES ('Alex', 'Brown', 'alex@gmail.com', '777-888-9999'), -('Emily', 'Clark', 'emily@gmail.com', '666-555-4444'); +('Emily', 'Clark', 'emily@gmail.com', '666-555-4444'), +('James', 'Wilson', 'james@gmail.com', '888-999-0000'), +('Olivia', 'Martinez', 'olivia@gmail.com', '999-000-1111'), +('William', 'Anderson', 'william@gmail.com', '000-111-2222'), +('Sophia', 'Taylor', 'sophia@gmail.com', '111-222-3333'); INSERT INTO pet (petName, petSpecies, petBreed, petAge, petStatus, petPrice) VALUES ('Buddy', 'Dog', 'Labrador', 2, 'Available', 500.00), -('Milo', 'Cat', 'Persian', 1, 'Available', 300.00); +('Milo', 'Cat', 'Persian', 1, 'Available', 300.00), +('Charlie', 'Dog', 'Golden Retriever', 3, 'Available', 550.00), +('Luna', 'Cat', 'Siamese', 2, 'Adopted', 350.00), +('Max', 'Dog', 'Beagle', 1, 'Available', 450.00), +('Bella', 'Cat', 'Maine Coon', 4, 'Available', 400.00); INSERT INTO adoption (petId, customerId, adoptionDate, adoptionStatus) VALUES -(1, 1, '2026-01-15', 'Completed'); +(1, 1, '2026-01-15', 'Completed'), +(4, 3, '2026-01-20', 'Completed'), +(2, 2, '2026-01-25', 'Pending'), +(5, 4, '2026-02-01', 'Completed'), +(6, 5, '2026-02-02', 'Pending'); INSERT INTO supplier (supCompany, supContactFirstName, supContactLastName, supEmail, supPhone) VALUES -('PetFood Inc', 'Robert', 'King', 'contact@petfood.com', '888-111-2222'); +('PetFood Inc', 'Robert', 'King', 'contact@petfood.com', '888-111-2222'), +('Toy World', 'Jennifer', 'Lee', 'sales@toyworld.com', '888-222-3333'), +('Pet Supplies Co', 'Kevin', 'White', 'info@petsupplies.com', '888-333-4444'), +('Animal Care Products', 'Nancy', 'Green', 'orders@animalcare.com', '888-444-5555'), +('Premium Pet Goods', 'Tom', 'Black', 'support@premiumpet.com', '888-555-6666'); INSERT INTO category (categoryName, categoryType) VALUES ('Dog Food', 'Product'), -('Cat Toys', 'Product'); +('Cat Toys', 'Product'), +('Bird Supplies', 'Product'), +('Aquarium', 'Product'), +('Small Animals', 'Product'); -INSERT INTO product (prodName, prodSku, prodPrice, categoryId, prodDesc) +INSERT INTO product (prodName, prodPrice, categoryId, prodDesc) VALUES -('Premium Dog Food', 'DF001', 50.00, 1, 'High quality dog food'), -('Cat Toy Ball', 'CT001', 10.00, 2, 'Colorful toy for cats'); +('Premium Dog Food', 50.00, 1, 'High quality dog food'), +('Cat Toy Ball', 10.00, 2, 'Colorful toy for cats'), +('Bird Cage Large', 120.00, 3, 'Spacious bird cage'), +('Fish Tank 20 Gallon', 80.00, 4, 'Complete aquarium kit'), +('Hamster Wheel', 15.00, 5, 'Exercise wheel for small pets'), +('Organic Dog Treats', 25.00, 1, 'Natural dog treats'); INSERT INTO productSupplier (supId, prodId) VALUES (1, 1), -(1, 2); +(1, 2), +(2, 2), +(3, 3), +(3, 4), +(4, 5), +(5, 6), +(1, 6); INSERT INTO inventory (prodId, quantity) VALUES (1, 100), -(2, 200); +(2, 200), +(3, 50), +(4, 30), +(5, 150), +(6, 75); INSERT INTO service (serviceName, serviceDesc, serviceDuration, servicePrice) VALUES -('Pet Grooming', 'Full grooming service', 60, 40.00); +('Pet Grooming', 'Full grooming service', 60, 40.00), +('Nail Trimming', 'Quick nail trim', 15, 10.00), +('Bath and Brush', 'Bathing and brushing service', 45, 30.00), +('Veterinary Checkup', 'Complete health examination', 30, 75.00), +('Teeth Cleaning', 'Professional dental cleaning', 90, 100.00); INSERT INTO appointment (serviceId, customerId, appointmentDate, appointmentTime, appointmentStatus) VALUES -(1, 2, '2026-02-01', '10:30:00', 'Booked'); +(1, 2, '2026-02-01', '10:30:00', 'Booked'), +(2, 1, '2026-02-03', '14:00:00', 'Booked'), +(3, 3, '2026-02-05', '09:00:00', 'Completed'), +(4, 4, '2026-02-07', '11:30:00', 'Booked'), +(5, 5, '2026-02-10', '15:00:00', 'Cancelled'); INSERT INTO appointmentPet (appointmentId, petId) VALUES -(1, 2); +(1, 2), +(2, 1), +(3, 3), +(4, 5), +(5, 6); INSERT INTO sale (saleDate, totalAmount, paymentMethod, employeeId, storeId) VALUES -(NOW(), 60.00, 'Card', 2, 1); +(NOW(), 60.00, 'Card', 2, 1), +('2026-01-28 10:30:00', 50.00, 'Cash', 1, 1), +('2026-01-29 14:15:00', 120.00, 'Card', 4, 3), +('2026-01-30 16:45:00', 80.00, 'Card', 2, 2), +('2026-02-01 11:20:00', 150.00, 'Cash', 5, 4); INSERT INTO saleItem (saleId, prodId, quantity, unitPrice) VALUES -(1, 2, 2, 10.00); +(1, 2, 2, 10.00), +(2, 1, 1, 50.00), +(3, 3, 1, 120.00), +(4, 4, 1, 80.00), +(5, 6, 6, 25.00), +(2, 2, 3, 10.00); INSERT INTO activityLog (employeeId, activity) VALUES (1, 'Created new sale'), -(2, 'Booked appointment'); +(2, 'Booked appointment'), +(3, 'Completed grooming service'), +(4, 'Processed inventory order'), +(5, 'Conducted health checkup'), +(1, 'Updated customer information'); \ No newline at end of file diff --git a/src/main/java/org/example/petshopdesktop/DTOs/ProductDTO.java b/src/main/java/org/example/petshopdesktop/DTOs/ProductDTO.java index 865af1de..3ea081df 100644 --- a/src/main/java/org/example/petshopdesktop/DTOs/ProductDTO.java +++ b/src/main/java/org/example/petshopdesktop/DTOs/ProductDTO.java @@ -11,17 +11,15 @@ import org.example.petshopdesktop.models.Product; public class ProductDTO { private SimpleIntegerProperty prodId; private SimpleStringProperty prodName; - private SimpleStringProperty prodSku; private SimpleDoubleProperty prodPrice; private SimpleIntegerProperty categoryId; //used for edit and delete private SimpleStringProperty categoryName; private SimpleStringProperty prodDesc; //constructor - public ProductDTO(int prodId, String prodName, String prodSku, double prodPrice, int categoryId, String categoryName, String prodDesc) { + public ProductDTO(int prodId, String prodName, double prodPrice, int categoryId, String categoryName, String prodDesc) { this.prodId = new SimpleIntegerProperty(prodId); this.prodName = new SimpleStringProperty(prodName); - this.prodSku = new SimpleStringProperty(prodSku); this.prodPrice = new SimpleDoubleProperty(prodPrice); this.categoryId = new SimpleIntegerProperty(categoryId); this.categoryName = new SimpleStringProperty(categoryName); @@ -53,18 +51,6 @@ public class ProductDTO { this.prodName.set(prodName); } - public String getProdSku() { - return prodSku.get(); - } - - public SimpleStringProperty prodSkuProperty() { - return prodSku; - } - - public void setProdSku(String prodSku) { - this.prodSku.set(prodSku); - } - public double getProdPrice() { return prodPrice.get(); } @@ -121,7 +107,6 @@ public class ProductDTO { Product product = new Product( getProdId(), getProdName(), - getProdSku(), getProdPrice(), getCategoryId(), getProdDesc() diff --git a/src/main/java/org/example/petshopdesktop/Validator.java b/src/main/java/org/example/petshopdesktop/Validator.java new file mode 100644 index 00000000..29182e20 --- /dev/null +++ b/src/main/java/org/example/petshopdesktop/Validator.java @@ -0,0 +1,131 @@ +package org.example.petshopdesktop; + +public class Validator { + + /** + * Checks if string is not empty + * @param value string to check + * @param name name of the input + * @return error msg if string is not empty, otherwise empty + */ + public static String isPresent(String value, String name){ + String msg =""; //OK so far + if(value.isEmpty() || name.isBlank()){ + msg += name + " is required. \n"; + } + return msg; + } + + /** + * Checks if the input is a non-negative double + * @param value input of string + * @param name name of input + * @return error msg if input is not a number or negative, otherwise empty + */ + public static String isNonNegativeDouble(String value, String name){ + String msg =""; //OK so far + double result; + try{ + result = Double.parseDouble(value); + if (result < 0){ + msg += name + " must be greater than or equal 0. \n"; + } + } + catch (NumberFormatException e){ + msg += name + " must be a number.\n"; + } + return msg; + } + + /** + * Checks if the input is a double in 2 different range + * @param value input of string + * @param name name of inpt + * @param minValue min value of range + * @param maxValue max value of range + * @return error msg if input is out of range, otherwise empty + */ + public static String isDoubleInRange(String value, String name, double minValue, double maxValue){ + String msg =""; //OK so far + double result; + try{ + result = Double.parseDouble(value); + if (result < minValue || result > maxValue){ + msg += name + " must be between " + minValue + " and " + maxValue + "\n"; + } + } + catch (NumberFormatException e){ + msg += name + " must be a number.\n"; + } + return msg; + } + + /** + * Checks if the input is a non-negative integer + * @param value input of string + * @param name name of input + * @return error msg if input is not a number or negative, otherwise empty + */ + public static String isNonNegativeInteger(String value, String name){ + String msg =""; //OK so far + int result; + try{ + result = Integer.parseInt(value); + if (result < 0){ + msg += name + " must be greater than or equal 0. \n"; + } + } + catch (NumberFormatException e){ + msg += name + " must be a whole number.\n"; + } + return msg; + } + + /** + * check if the string is a given amount of characters or fewer + * @param value input of string + * @param name name of input + * @return error msg if input is more than given characters length + */ + public static String isLessThanVarChars(String value, String name, int length){ + String msg =""; + if (value.length() > length){ + msg += name + " must be less than " + length + " characters. \n"; + } + return msg; + } + + /** + * Checks if the input is a valid email format + * @param value input of string + * @param name name of input + * @return error msg if input is not a valid email format, otherwise empty + */ + public static String isValidEmail(String value, String name){ + String msg = ""; //OK so far + // Email regex + String regex = "^[A-Za-z0-9+_.-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,}$"; + + if (!value.matches(regex)){ + msg += name + " is not in a valid format. \n"; + } + return msg; + } + + /** + * Checks if the input is a valid phone number in format XXX-XXX-XXXX + * @param value input of string + * @param name name of input + * @return error msg if input is not in valid phone format, otherwise empty + */ + public static String isValidPhoneNumber(String value, String name){ + String msg = ""; //OK so far + // Phone regex + String regex = "^\\d{3}-\\d{3}-\\d{4}$"; + + if (!value.matches(regex)){ + msg += name + " must be in format XXX-XXX-XXXX. \n"; + } + return msg; + } +} diff --git a/src/main/java/org/example/petshopdesktop/controllers/ProductController.java b/src/main/java/org/example/petshopdesktop/controllers/ProductController.java index d8811cc0..4dc1587e 100644 --- a/src/main/java/org/example/petshopdesktop/controllers/ProductController.java +++ b/src/main/java/org/example/petshopdesktop/controllers/ProductController.java @@ -4,16 +4,24 @@ import javafx.collections.FXCollections; import javafx.collections.ObservableList; import javafx.event.ActionEvent; import javafx.fxml.FXML; -import javafx.scene.control.Button; -import javafx.scene.control.TableColumn; -import javafx.scene.control.TableView; -import javafx.scene.control.TextField; +import javafx.fxml.FXMLLoader; +import javafx.scene.Scene; +import javafx.scene.control.*; import javafx.scene.control.cell.PropertyValueFactory; +import javafx.stage.Modality; +import javafx.stage.Stage; import org.example.petshopdesktop.DTOs.ProductDTO; +import org.example.petshopdesktop.controllers.dialogcontrollers.ProductDialogController; +import org.example.petshopdesktop.controllers.dialogcontrollers.SupplierDialogController; import org.example.petshopdesktop.database.ProductDB; +import org.example.petshopdesktop.database.SupplierDB; import org.example.petshopdesktop.models.Product; +import org.example.petshopdesktop.models.Supplier; +import java.io.IOException; import java.sql.SQLException; +import java.sql.SQLIntegrityConstraintViolationException; +import java.util.Optional; /** * The controller for any operations in the products view @@ -44,9 +52,6 @@ public class ProductController { @FXML private TableColumn colProductPrice; - @FXML - private TableColumn colProductSKU; - @FXML private TableView tvProducts; @@ -68,19 +73,31 @@ public class ProductController { //set up table columns colProductId.setCellValueFactory(new PropertyValueFactory("prodId")); colProductName.setCellValueFactory(new PropertyValueFactory("prodName")); - colProductSKU.setCellValueFactory(new PropertyValueFactory("prodSku")); colProductPrice.setCellValueFactory(new PropertyValueFactory("prodPrice")); colProductCategory.setCellValueFactory(new PropertyValueFactory("categoryName")); colProductDesc.setCellValueFactory(new PropertyValueFactory("prodDesc")); - displayProducts(); + displayProduct(); + + //EventListener to Enable buttons when a row is selected + tvProducts.getSelectionModel().selectedItemProperty().addListener( + (observable, oldValue, newValue) -> { + btnEdit.setDisable(false); + btnDelete.setDisable(false); + } + ); + + //EventListener to search when text is changed on searchbar + txtSearch.textProperty().addListener((observable, oldValue, newValue) -> { + displayFilteredProduct(newValue); + }); } /** * Display the productDTO to table view */ - private void displayProducts(){ + private void displayProduct(){ //Erase old content data.clear(); @@ -95,20 +112,148 @@ public class ProductController { tvProducts.setItems(data); } - + /** + * open a new dialog for adding a product + * @param event + */ @FXML void btnAddClicked(ActionEvent event) { - + mode = "Add"; + openDialog(null,mode); } + /** + * Delete a selected product when delete is clicked + * @param event click event for button + */ @FXML void btnDeleteClicked(ActionEvent event) { + int numRows = 0; + //set selected product + ProductDTO selectedProduct = tvProducts.getSelectionModel().getSelectedItem(); + //ask user to confirm + Alert question = new Alert(Alert.AlertType.CONFIRMATION); + question.setHeaderText("Please confirm delete"); + question.setContentText("Are you sure you want to delete this product?"); + Optional result = question.showAndWait(); //show alert and wait for response + + //if confirmed,start deletion + if (result.isPresent() && result.get() == ButtonType.OK) { + int prodId = selectedProduct.getProdId(); + + //try deleting + try{ + numRows = ProductDB.deleteProduct(prodId); + } + catch (SQLIntegrityConstraintViolationException e){ + Alert alert = new Alert(Alert.AlertType.ERROR); + alert.setHeaderText("Database Operation Error"); + alert.setContentText("Delete failed\n" + + "the selected product is being referred in another table"); + alert.showAndWait(); + return; + } + catch (SQLException e) { + throw new RuntimeException(e); + } + + //prompt user of any errors + if (numRows == 0){ + Alert alert = new Alert(Alert.AlertType.ERROR); + alert.setHeaderText("Database Operation Error"); + alert.setContentText("Delete failed"); + alert.showAndWait(); + } + else{ + //prompt user of delete conformation + Alert alert = new Alert(Alert.AlertType.CONFIRMATION); + alert.setHeaderText("Database Operation Confirmed"); + alert.setContentText("Delete successful"); + alert.showAndWait(); + //refresh display and reset inputs + displayProduct(); + btnDelete.setDisable(true); + btnEdit.setDisable(true); + txtSearch.setText(""); + } + } } + /** + * Open a new dialog for editing a product + * @param event click event for button + */ @FXML void btnEditClicked(ActionEvent event) { + //set selected product + ProductDTO selectedProduct = tvProducts.getSelectionModel().getSelectedItem(); + if (selectedProduct != null) { + mode = "Edit"; + openDialog(selectedProduct, mode); + } + } + + /** + * Filter the table given the string from the searchbar + * @param filter word to filter table + */ + private void displayFilteredProduct(String filter){ + data.clear(); + try{ + if (txtSearch.getText() == null || txtSearch.getText().isEmpty()){ + displayProduct(); //If search bar is empty just display everything + } + else{ + //Filter the using the keyword + data = ProductDB.getFilteredProductDTOs(filter); + tvProducts.setItems(data); + } + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + /** + * Function to open the new Dialog for edit or adding + * depending on the mode given + * @param product the product entity for editing, null if adding + * @param mode the mode the dialog should be in + */ + private void openDialog(ProductDTO product, String mode){ + //Get new view + FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("/org/example/petshopdesktop/dialogviews/product-dialog-view.fxml")); + Scene scene = null; + try{ + scene = new Scene(fxmlLoader.load()); + } catch (IOException e) { + throw new RuntimeException(e); + } + ProductDialogController dialogController = fxmlLoader.getController(); //controller associated with this view + dialogController.setMode(mode); + + //Open the dialog depending on the mode + if(mode.equals("Edit")){ + //Make it display suppliers details in dialog + dialogController.displayProductDetails(product); + } + Stage dialogStage = new Stage(); + dialogStage.initModality(Modality.APPLICATION_MODAL); //make it modal + if(mode.equals("Add")){ + dialogStage.setTitle("Add Product"); + } + else { + dialogStage.setTitle("Edit Product"); + } + dialogStage.setScene(scene); + dialogStage.showAndWait(); + + //When dialog closes update table view and disable edit and delete buttons, and reset search bar + displayProduct(); + btnDelete.setDisable(true); + btnEdit.setDisable(true); + txtSearch.setText(""); } } diff --git a/src/main/java/org/example/petshopdesktop/controllers/SupplierController.java b/src/main/java/org/example/petshopdesktop/controllers/SupplierController.java index c64eff6c..080cc751 100644 --- a/src/main/java/org/example/petshopdesktop/controllers/SupplierController.java +++ b/src/main/java/org/example/petshopdesktop/controllers/SupplierController.java @@ -74,7 +74,7 @@ public class SupplierController { displaySupplier(); - // Enable buttons when a row is selected + //EventListener to Enable buttons when a row is selected tvSuppliers.getSelectionModel().selectedItemProperty().addListener( (observable, oldValue, newValue) -> { btnEdit.setDisable(false); @@ -82,6 +82,11 @@ public class SupplierController { } ); + //EventListener to search when text is changed on searchbar + txtSearch.textProperty().addListener((observable, oldValue, newValue) -> { + displayFilteredSupplier(newValue); + }); + } @@ -100,10 +105,30 @@ public class SupplierController { tvSuppliers.setItems(data); } + /** + * Filter the table given the string from the searchbar + * @param filter word to filter table + */ + private void displayFilteredSupplier(String filter){ + data.clear(); + try{ + if (txtSearch.getText() == null || txtSearch.getText().isEmpty()){ + displaySupplier(); //If search bar is empty just display everything + } + else{ + //Filter the using the keyword + data = SupplierDB.getFilteredSuppliers(filter); + tvSuppliers.setItems(data); + } + } catch (Exception e) { + throw new RuntimeException(e); + } + } + /** * open a new dialog for adding a supplier - * @param event + * @param event click event for button */ @FXML void btnAddClicked(ActionEvent event) { @@ -112,8 +137,8 @@ public class SupplierController { } /** - * - * @param event + * Delete a selected supplier when delete is clicked + * @param event click event for button */ @FXML void btnDeleteClicked(ActionEvent event) { @@ -162,13 +187,16 @@ public class SupplierController { alert.showAndWait(); //refresh display displaySupplier(); + btnDelete.setDisable(true); + btnEdit.setDisable(true); + txtSearch.setText(""); } } } /** * Open a new dialog for editing a supplier - * @param event click event + * @param event click event for button */ @FXML void btnEditClicked(ActionEvent event) { @@ -184,12 +212,12 @@ public class SupplierController { /** * Function to open the new Dialog for edit or adding * depending on the mode given - * @param supplier the supplier entity fo editing, null if adding + * @param supplier the supplier entity for editing, null if adding * @param mode the mode the dialog should be in */ private void openDialog(Supplier supplier, String mode){ //Get new view - FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("/org/example/petshopdesktop/dialogviews/supplier-dialog-view.fxml")); //CHECK + FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("/org/example/petshopdesktop/dialogviews/supplier-dialog-view.fxml")); Scene scene = null; try{ scene = new Scene(fxmlLoader.load()); @@ -215,10 +243,11 @@ public class SupplierController { dialogStage.setScene(scene); dialogStage.showAndWait(); - //When dialog closes update table view and disable edit and delete buttons + //When dialog closes update table view and disable edit and delete buttons, and reset search bar displaySupplier(); btnDelete.setDisable(true); btnEdit.setDisable(true); + txtSearch.setText(""); } -} +} \ No newline at end of file diff --git a/src/main/java/org/example/petshopdesktop/controllers/dialogcontrollers/ProductDialogController.java b/src/main/java/org/example/petshopdesktop/controllers/dialogcontrollers/ProductDialogController.java new file mode 100644 index 00000000..5cc58d87 --- /dev/null +++ b/src/main/java/org/example/petshopdesktop/controllers/dialogcontrollers/ProductDialogController.java @@ -0,0 +1,211 @@ +package org.example.petshopdesktop.controllers.dialogcontrollers; + +import javafx.collections.FXCollections; +import javafx.collections.ObservableList; +import javafx.event.EventHandler; +import javafx.fxml.FXML; +import javafx.scene.Node; +import javafx.scene.control.*; +import javafx.scene.input.MouseEvent; +import javafx.stage.Stage; +import org.example.petshopdesktop.DTOs.ProductDTO; +import org.example.petshopdesktop.Validator; +import org.example.petshopdesktop.database.CategoryDB; +import org.example.petshopdesktop.database.ProductDB; +import org.example.petshopdesktop.models.Category; +import org.example.petshopdesktop.models.Product; +import org.example.petshopdesktop.models.Supplier; + +import java.sql.SQLException; +import java.util.ArrayList; + +public class ProductDialogController { + + @FXML + private Button btnCancel; + + @FXML + private Button btnSave; + + @FXML + private ComboBox cbProdCategory; + + @FXML + private Label lblMode; + + @FXML + private Label lblProdId; + + @FXML + private TextField txtProdDesc; + + @FXML + private TextField txtProdName; + + @FXML + private TextField txtProdPrice; + + private String mode = null; + + /** + * Add event listeners to buttons when dialog loads + */ + @FXML + void initialize() { + //Set up mouse handlers for buttons + btnSave.setOnMouseClicked(new EventHandler() { + @Override + public void handle(MouseEvent mouseEvent) { + buttonSaveClicked(mouseEvent); + } + }); + + btnCancel.setOnMouseClicked(new EventHandler() { + @Override + public void handle(MouseEvent mouseEvent) { + closeStage(mouseEvent); + } + }); + + //Set up combobox for selecting category + try { + //set up combobox + ObservableList categories = FXCollections.observableArrayList(); //empty list + categories = CategoryDB.getCategories(); + cbProdCategory.setItems(categories); + } catch (SQLException e) { + throw new RuntimeException(e); + } + + } + + private void buttonSaveClicked(MouseEvent mouseEvent) { + int numRow = 0; //how many rows affected + String errorMsg = ""; //error message for validation + + //Check Validation (input required) + errorMsg += Validator.isPresent(txtProdName.getText(), "Product Name"); + errorMsg += Validator.isPresent(txtProdPrice.getText(), "Product Price"); + if (cbProdCategory.getSelectionModel().getSelectedItem() == null) { + errorMsg += "Category is required \n"; + } + + //Check validation (length size) + errorMsg += Validator.isLessThanVarChars(txtProdName.getText(), "Product Name", 100); + errorMsg += Validator.isLessThanVarChars(txtProdDesc.getText(), "Description", 100); + errorMsg += Validator.isLessThanVarChars(txtProdPrice.getText(), "Product Price", 12); + + //Check Validation (format) + errorMsg += Validator.isNonNegativeDouble(txtProdPrice.getText(), "Product Price"); + + if (errorMsg.isEmpty()) { //no validation errors detected + Product product = collectProduct(); //get product info + if (mode.equals("Add")){ //add mode + try{ + numRow = ProductDB.insertProduct(product); + } catch (SQLException e) { + throw new RuntimeException(e); + } + } + else { //edit + try{ + numRow = ProductDB.updateProduct(product.getProdId(),product); + } catch (SQLException e) { + throw new RuntimeException(e); + } + } + + //if no rows were affected then there was an error (prompt user of error) + if (numRow == 0){ + Alert alert = new Alert(Alert.AlertType.ERROR); + alert.setHeaderText("Database Operation Error"); + alert.setContentText(mode + " failed"); + alert.showAndWait(); + closeStage(mouseEvent); + } + else { + //tell the user operation was successful + Alert alert = new Alert(Alert.AlertType.CONFIRMATION); + alert.setHeaderText("Database Operation Confirmed"); + alert.setContentText(mode + " succeeded"); + alert.showAndWait(); + closeStage(mouseEvent); + } + } + else{ //Display validation errors + Alert alert = new Alert(Alert.AlertType.ERROR); + alert.setHeaderText("Input Error"); + alert.setContentText(errorMsg); + alert.showAndWait(); + } + } + + /** + * Collect the product info + * @return product info with the id or the new product + */ + private Product collectProduct(){ + int prodId = 0; + Product product = null; + + if(lblProdId.isVisible()){ //Edit mode + //get product id from lblId (split the string so we only get the int) + prodId = Integer.parseInt(lblProdId.getText().split(": ")[1]); + } + product = new Product( + prodId, + txtProdName.getText(), + Double.parseDouble(txtProdPrice.getText()), + cbProdCategory.getSelectionModel().getSelectedItem().getCategoryId(), + txtProdDesc.getText() + ); + return product; + } + + /** + * Display the product data in text fields and combobox + * @param product the supplier entity containing data to display + */ + public void displayProductDetails(ProductDTO product){ + if (product!=null){ + lblProdId.setText("ID: " + product.getProdId()); + txtProdName.setText(product.getProdName()); + txtProdDesc.setText(product.getProdDesc()); + txtProdPrice.setText(product.getProdPrice() + ""); + + //get the right combobox selection + for (Category category : cbProdCategory.getItems()) { + if(category.getCategoryId() == product.getCategoryId()){ + cbProdCategory.setValue(category); + } + } + + } + } + + /** + * Close the window + * @param mouseEvent mouse event to close + */ + private void closeStage(MouseEvent mouseEvent) { + Node node = (Node) mouseEvent.getSource(); + Stage stage = (Stage) node.getScene().getWindow(); + stage.close(); + } + + /** + * Set the mode of the dialog + * @param mode the mode to for the dialog + */ + public void setMode(String mode) { + this.mode = mode; + lblMode.setText(mode + " Product"); + if(mode.equals("Add")) { + lblProdId.setVisible(false); + } + else if(mode.equals("Edit")) { + lblProdId.setVisible(true); + } + } + +} diff --git a/src/main/java/org/example/petshopdesktop/controllers/dialogcontrollers/SupplierDialogController.java b/src/main/java/org/example/petshopdesktop/controllers/dialogcontrollers/SupplierDialogController.java index fe6e06c2..d901d3d5 100644 --- a/src/main/java/org/example/petshopdesktop/controllers/dialogcontrollers/SupplierDialogController.java +++ b/src/main/java/org/example/petshopdesktop/controllers/dialogcontrollers/SupplierDialogController.java @@ -9,6 +9,7 @@ import javafx.scene.control.Label; import javafx.scene.control.TextField; import javafx.scene.input.MouseEvent; import javafx.stage.Stage; +import org.example.petshopdesktop.Validator; import org.example.petshopdesktop.database.SupplierDB; import org.example.petshopdesktop.models.Supplier; @@ -45,6 +46,9 @@ public class SupplierDialogController { private String mode = null; + /** + * Add event listeners to buttons when dialog loads + */ @FXML void initialize() { //Set up mouse handlers for buttons @@ -67,7 +71,22 @@ public class SupplierDialogController { int numRow = 0; //how many rows affected String errorMsg = ""; //error message for validation - //TODO: Import validation class and validate text fields here + //Check validation (input required) + errorMsg += Validator.isPresent(txtCompanyName.getText(), "Company Name"); + errorMsg += Validator.isPresent(txtContactFirstName.getText(), "Contact First Name"); + errorMsg += Validator.isPresent(txtContactLastName.getText(), "Contact Last Name"); + errorMsg += Validator.isPresent(txtEmail.getText(), "Email Address"); + errorMsg += Validator.isPresent(txtPhone.getText(), "Phone Number"); + + //Check validation (Length size) + errorMsg += Validator.isLessThanVarChars(txtCompanyName.getText(),"Company Name", 100); + errorMsg += Validator.isLessThanVarChars(txtContactFirstName.getText(), "Contact First Name", 50); + errorMsg += Validator.isLessThanVarChars(txtContactLastName.getText(), "Contact Last Name", 50); + errorMsg += Validator.isLessThanVarChars(txtEmail.getText(), "Email Address", 100); + + //Check validation (format) + errorMsg += Validator.isValidEmail(txtEmail.getText(), "Email Address"); + errorMsg += Validator.isValidPhoneNumber(txtPhone.getText(), "Phone Number"); if(errorMsg.isEmpty()){ //no validation errors detected Supplier supplier = collectSupplier(); //get supplier info diff --git a/src/main/java/org/example/petshopdesktop/database/CategoryDB.java b/src/main/java/org/example/petshopdesktop/database/CategoryDB.java new file mode 100644 index 00000000..f9a2a434 --- /dev/null +++ b/src/main/java/org/example/petshopdesktop/database/CategoryDB.java @@ -0,0 +1,41 @@ +package org.example.petshopdesktop.database; + +import javafx.collections.FXCollections; +import javafx.collections.ObservableList; +import org.example.petshopdesktop.models.Category; +import org.example.petshopdesktop.models.Product; + +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; + +public class CategoryDB { + /** + * gets all the category into an observable list + * @return a list of all the category + * @throws SQLException if failed to find categories in the database + */ + public static ObservableList getCategories() throws SQLException{ + //Connect to the database + ObservableList categories = FXCollections.observableArrayList(); + Connection conn = ConnectionDB.getConnection(); + + //Execute Query + Statement stmt = conn.createStatement(); + ResultSet rs = stmt.executeQuery("SELECT * FROM category"); + + //While there is still data add categories to the list + while(rs.next()){ + Category category = new Category( + rs.getInt(1), + rs.getString(2), + rs.getString(3)); + categories.add(category); + } + + //close connection and return categories + conn.close(); + return categories; + } +} diff --git a/src/main/java/org/example/petshopdesktop/database/ProductDB.java b/src/main/java/org/example/petshopdesktop/database/ProductDB.java index 5eaf1e89..b5fbeb07 100644 --- a/src/main/java/org/example/petshopdesktop/database/ProductDB.java +++ b/src/main/java/org/example/petshopdesktop/database/ProductDB.java @@ -4,11 +4,9 @@ import javafx.collections.FXCollections; import javafx.collections.ObservableList; import org.example.petshopdesktop.DTOs.ProductDTO; import org.example.petshopdesktop.models.Product; +import org.example.petshopdesktop.models.Supplier; -import java.io.FileInputStream; -import java.io.IOException; import java.sql.*; -import java.util.Properties; /** * A class containing all the methods relating to CRUD on Products table @@ -34,10 +32,9 @@ public class ProductDB { Product product = new Product( rs.getInt(1), rs.getString(2), - rs.getString(3), - rs.getDouble(4), - rs.getInt(5), - rs.getString(6)); + rs.getDouble(3), + rs.getInt(4), + rs.getString(5)); products.add(product); } @@ -58,7 +55,7 @@ public class ProductDB { //Execute Query Statement stmt = conn.createStatement(); - String sql = "SELECT p.prodId, p.prodName, p.prodSku, p.prodPrice, p.categoryId, c.categoryName, p.prodDesc " + + String sql = "SELECT p.prodId, p.prodName, p.prodPrice, p.categoryId, c.categoryName, p.prodDesc " + "FROM product p " + "LEFT JOIN category c ON p.categoryId = c.categoryId"; ResultSet rs = stmt.executeQuery(sql); @@ -68,11 +65,10 @@ public class ProductDB { ProductDTO product = new ProductDTO( rs.getInt(1), rs.getString(2), - rs.getString(3), - rs.getDouble(4), - rs.getInt(5), - rs.getString(6), - rs.getString(7)); + rs.getDouble(3), + rs.getInt(4), + rs.getString(5), + rs.getString(6)); products.add(product); } @@ -80,4 +76,137 @@ public class ProductDB { conn.close(); return products; } + + /** + * Inserts a new product to the database + * @param product product entity to be inserted + * @return number of rows affected in the database + * @throws SQLException if insertion failed + */ + public static int insertProduct(Product product) throws SQLException { + int numRows = 0; + + Connection conn = ConnectionDB.getConnection(); + String sql = "INSERT INTO product (prodId, prodName, prodPrice, categoryId, prodDesc)" + + "VALUES (?, ?, ?, ?, ?)"; + + //These are the values from product to put into the query above + PreparedStatement stmt = conn.prepareStatement(sql); + stmt.setInt(1, product.getProdId()); + stmt.setString(2, product.getProdName()); + stmt.setDouble(3, product.getProdPrice()); + stmt.setInt(4, product.getCategoryId()); + stmt.setString(5, product.getProdDesc()); + + //update the number of rows affected, return and close connection + numRows = stmt.executeUpdate(); + conn.close(); + + return numRows; + } + + /** + * Update an existing product to the database + * @param prodId id of product + * @param product new product data + * @return number of rows affected in the database + * @throws SQLException if update failed + */ + public static int updateProduct(int prodId, Product product) throws SQLException { + int numRows = 0; + + Connection conn = ConnectionDB.getConnection(); + String sql = "UPDATE product SET " + + " prodName = ?, " + + " prodPrice = ?, " + + " categoryId = ?, " + + " prodDesc = ? " + + " WHERE prodId = ?"; + + //update values to query + PreparedStatement stmt = conn.prepareStatement(sql); + stmt.setString(1, product.getProdName()); + stmt.setDouble(2, product.getProdPrice()); + stmt.setInt(3, product.getCategoryId()); + stmt.setString(4, product.getProdDesc()); + stmt.setInt(5, prodId); + + //Update rows and close connection + numRows = stmt.executeUpdate(); + conn.close(); + + return numRows; + } + + /** + * Delete a product from the database + * @param prodId product id to be deleted + * @return number of rows affected in the database + * @throws SQLException if delete failed + */ + public static int deleteProduct(int prodId) throws SQLException { + int numRows = 0; + Connection conn = ConnectionDB.getConnection(); + + String sql = "DELETE FROM product WHERE prodId = ?"; + PreparedStatement stmt = conn.prepareStatement(sql); + + stmt.setInt(1, prodId); + + //close connection and update rows affected + numRows = stmt.executeUpdate(); + conn.close(); + + return numRows; + } + + /** + * Gets a list of productDTOs that is filtered by a given string + * @param filter the word to filter table + * @return ObservableList of ProductDTOs with the filtered data + * @throws SQLException if getting products failed + */ + public static ObservableList getFilteredProductDTOs(String filter) throws SQLException { + //Connect to the database + ObservableList products = FXCollections.observableArrayList(); + Connection conn = ConnectionDB.getConnection(); + + //Get SQL query for filtered word + String sql = + "SELECT p.prodId, p.prodName, p.prodPrice, p.categoryId, c.categoryName, p.prodDesc" + + " FROM product p" + + " LEFT JOIN category c ON p.categoryId = c.categoryId" + + " WHERE " + + "prodName LIKE ? OR " + + "prodPrice LIKE ? OR " + + "categoryName LIKE ? OR " + + "prodDesc LIKE ?"; + + //add % wildcard so the query can use LIKE to filter data + String filteredString = "%" + filter + "%"; + + PreparedStatement stmt = conn.prepareStatement(sql); + stmt.setString(1, filteredString); + stmt.setString(2, filteredString); + stmt.setString(3, filteredString); + stmt.setString(4, filteredString); + + //execute query + ResultSet rs = stmt.executeQuery(); + + //While there is still data add products to the list + while(rs.next()){ + ProductDTO product = new ProductDTO( + rs.getInt(1), + rs.getString(2), + rs.getDouble(3), + rs.getInt(4), + rs.getString(5), + rs.getString(6)); + products.add(product); + } + + conn.close(); + return products; + } } diff --git a/src/main/java/org/example/petshopdesktop/database/SupplierDB.java b/src/main/java/org/example/petshopdesktop/database/SupplierDB.java index cc186081..325b6dd4 100644 --- a/src/main/java/org/example/petshopdesktop/database/SupplierDB.java +++ b/src/main/java/org/example/petshopdesktop/database/SupplierDB.java @@ -26,7 +26,7 @@ public class SupplierDB { Statement stmt = conn.createStatement(); ResultSet rs = stmt.executeQuery("SELECT * FROM supplier"); - //While there is still data add products to the list + //While there is still data add suppliers to the list while(rs.next()){ Supplier supplier = new Supplier( rs.getInt(1), @@ -127,4 +127,54 @@ public class SupplierDB { return numRows; } + + /** + * Gets a list of Suppliers that is filtered by a given string + * @param filter the word to filter table + * @return ObservableList of suppliers with the filtered data + * @throws SQLException if getting suppliers failed + */ + public static ObservableList getFilteredSuppliers(String filter) throws SQLException { + //Connect to the database + ObservableList suppliers = FXCollections.observableArrayList(); + Connection conn = ConnectionDB.getConnection(); + + //Get SQL query for filtered word + String sql = + "SELECT * FROM supplier" + + " WHERE " + + "supCompany LIKE ? OR " + + "supContactFirstName LIKE ? OR " + + "supContactLastName LIKE ? OR " + + "supEmail LIKE ? OR " + + "supPhone LIKE ?"; + + //add % wildcard so the query can use LIKE to filter data + String filteredString = "%" + filter + "%"; + + PreparedStatement stmt = conn.prepareStatement(sql); + stmt.setString(1, filteredString); + stmt.setString(2, filteredString); + stmt.setString(3, filteredString); + stmt.setString(4, filteredString); + stmt.setString(5, filteredString); + + //execute query + ResultSet rs = stmt.executeQuery(); + + //While there is still data add suppliers to the list + while(rs.next()){ + Supplier supplier = new Supplier( + rs.getInt(1), + rs.getString(2), + rs.getString(3), + rs.getString(4), + rs.getString(5), + rs.getString(6)); + suppliers.add(supplier); + } + + conn.close(); + return suppliers; + } } diff --git a/src/main/java/org/example/petshopdesktop/models/Category.java b/src/main/java/org/example/petshopdesktop/models/Category.java new file mode 100644 index 00000000..1f28182b --- /dev/null +++ b/src/main/java/org/example/petshopdesktop/models/Category.java @@ -0,0 +1,59 @@ +package org.example.petshopdesktop.models; + +import javafx.beans.property.SimpleIntegerProperty; +import javafx.beans.property.SimpleStringProperty; + +public class Category { + private SimpleIntegerProperty categoryId; + private SimpleStringProperty categoryName; + private SimpleStringProperty categoryType; + + //Constrctor + public Category(int categoryId, String categoryName, String categoryType) { + this.categoryId = new SimpleIntegerProperty(categoryId); + this.categoryName = new SimpleStringProperty(categoryName); + this.categoryType = new SimpleStringProperty(categoryType); + } + + //getters and setters + public int getCategoryId() { + return categoryId.get(); + } + + public SimpleIntegerProperty categoryIdProperty() { + return categoryId; + } + + public void setCategoryId(int categoryId) { + this.categoryId.set(categoryId); + } + + public String getCategoryName() { + return categoryName.get(); + } + + public SimpleStringProperty categoryNameProperty() { + return categoryName; + } + + public void setCategoryName(String categoryName) { + this.categoryName.set(categoryName); + } + + public String getCategoryType() { + return categoryType.get(); + } + + public SimpleStringProperty categoryTypeProperty() { + return categoryType; + } + + public void setCategoryType(String categoryType) { + this.categoryType.set(categoryType); + } + + @Override + public String toString() { + return getCategoryName(); + } +} diff --git a/src/main/java/org/example/petshopdesktop/models/Product.java b/src/main/java/org/example/petshopdesktop/models/Product.java index 1a7333b3..0738068a 100644 --- a/src/main/java/org/example/petshopdesktop/models/Product.java +++ b/src/main/java/org/example/petshopdesktop/models/Product.java @@ -10,16 +10,14 @@ import javafx.beans.property.SimpleStringProperty; public class Product { private SimpleIntegerProperty prodId; private SimpleStringProperty prodName; - private SimpleStringProperty prodSku; private SimpleDoubleProperty prodPrice; private SimpleIntegerProperty categoryId; private SimpleStringProperty prodDesc; //constructor - public Product(int prodId, String prodName, String prodSku, double prodPrice, int categoryId, String prodDesc) { + public Product(int prodId, String prodName, double prodPrice, int categoryId, String prodDesc) { this.prodId = new SimpleIntegerProperty(prodId); this.prodName = new SimpleStringProperty(prodName); - this.prodSku = new SimpleStringProperty(prodSku); this.prodPrice = new SimpleDoubleProperty(prodPrice); this.categoryId = new SimpleIntegerProperty(categoryId); this.prodDesc = new SimpleStringProperty(prodDesc); @@ -50,18 +48,6 @@ public class Product { this.prodName.set(prodName); } - public String getProdSku() { - return prodSku.get(); - } - - public SimpleStringProperty prodSkuProperty() { - return prodSku; - } - - public void setProdSku(String prodSku) { - this.prodSku.set(prodSku); - } - public double getProdPrice() { return prodPrice.get(); } diff --git a/src/main/resources/org/example/petshopdesktop/dialogviews/product-dialog-view.fxml b/src/main/resources/org/example/petshopdesktop/dialogviews/product-dialog-view.fxml new file mode 100644 index 00000000..2972f5ed --- /dev/null +++ b/src/main/resources/org/example/petshopdesktop/dialogviews/product-dialog-view.fxml @@ -0,0 +1,149 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/org/example/petshopdesktop/modelviews/product-view.fxml b/src/main/resources/org/example/petshopdesktop/modelviews/product-view.fxml index 68f15d78..2473d057 100644 --- a/src/main/resources/org/example/petshopdesktop/modelviews/product-view.fxml +++ b/src/main/resources/org/example/petshopdesktop/modelviews/product-view.fxml @@ -68,11 +68,10 @@ - - - - - + + + + From b53dcf10a7c5a306610b810fafbe211f206cfa25 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 4 Feb 2026 19:05:41 -0700 Subject: [PATCH 008/127] Added CRUD to productSuppliers -add CRUD to productSupplier and changed sqlDatabase so cost is in productSuppliers table --- Petstoredata.sql | 19 +- .../DTOs/ProductSupplierDTO.java | 83 ++++++ .../controllers/ProductController.java | 6 +- .../ProductSupplierController.java | 221 +++++++++++++++- .../controllers/SupplierController.java | 4 +- .../ProductDialogController.java | 9 +- .../ProductSupplierDialogController.java | 245 ++++++++++++++++++ .../SupplierDialogController.java | 5 + .../database/ProductSupplierDB.java | 197 ++++++++++++++ .../petshopdesktop/models/Product.java | 5 + .../models/ProductSupplier.java | 54 ++++ .../petshopdesktop/models/Supplier.java | 5 + .../product-supplier-dialog-view.fxml | 136 ++++++++++ 13 files changed, 962 insertions(+), 27 deletions(-) create mode 100644 src/main/java/org/example/petshopdesktop/DTOs/ProductSupplierDTO.java create mode 100644 src/main/java/org/example/petshopdesktop/controllers/dialogcontrollers/ProductSupplierDialogController.java create mode 100644 src/main/java/org/example/petshopdesktop/database/ProductSupplierDB.java create mode 100644 src/main/java/org/example/petshopdesktop/models/ProductSupplier.java create mode 100644 src/main/resources/org/example/petshopdesktop/dialogviews/product-supplier-dialog-view.fxml diff --git a/Petstoredata.sql b/Petstoredata.sql index c1d1046b..1b968e23 100644 --- a/Petstoredata.sql +++ b/Petstoredata.sql @@ -85,6 +85,7 @@ CREATE TABLE product ( CREATE TABLE productSupplier ( supId INT NOT NULL, prodId INT NOT NULL, + cost DECIMAL(10, 2) NOT NULL, PRIMARY KEY (supId, prodId), FOREIGN KEY (supId) REFERENCES supplier(supId), FOREIGN KEY (prodId) REFERENCES product(prodId) @@ -234,16 +235,16 @@ VALUES ('Hamster Wheel', 15.00, 5, 'Exercise wheel for small pets'), ('Organic Dog Treats', 25.00, 1, 'Natural dog treats'); -INSERT INTO productSupplier (supId, prodId) +INSERT INTO productSupplier (supId, prodId, cost) VALUES -(1, 1), -(1, 2), -(2, 2), -(3, 3), -(3, 4), -(4, 5), -(5, 6), -(1, 6); +(1, 1, 35.00), +(1, 2, 6.50), +(2, 2, 7.00), +(3, 3, 90.00), +(3, 4, 60.00), +(4, 5, 10.00), +(5, 6, 18.00), +(1, 6, 17.50); INSERT INTO inventory (prodId, quantity) VALUES diff --git a/src/main/java/org/example/petshopdesktop/DTOs/ProductSupplierDTO.java b/src/main/java/org/example/petshopdesktop/DTOs/ProductSupplierDTO.java new file mode 100644 index 00000000..8fb481b0 --- /dev/null +++ b/src/main/java/org/example/petshopdesktop/DTOs/ProductSupplierDTO.java @@ -0,0 +1,83 @@ +package org.example.petshopdesktop.DTOs; + +import javafx.beans.property.SimpleDoubleProperty; +import javafx.beans.property.SimpleIntegerProperty; +import javafx.beans.property.SimpleStringProperty; + +public class ProductSupplierDTO { + private SimpleIntegerProperty supId; + private SimpleIntegerProperty prodId; + private SimpleStringProperty supCompany; + private SimpleStringProperty prodName; + private SimpleDoubleProperty cost; + + //constructor + public ProductSupplierDTO(int supId, int prodId, String supCompany, String prodName, double cost) { + this.supId = new SimpleIntegerProperty(supId); + this.prodId = new SimpleIntegerProperty(prodId); + this.supCompany = new SimpleStringProperty(supCompany); + this.prodName = new SimpleStringProperty(prodName); + this.cost = new SimpleDoubleProperty(cost); + } + + //getter and setters + public int getSupId() { + return supId.get(); + } + + public SimpleIntegerProperty supIdProperty() { + return supId; + } + + public void setSupId(int supId) { + this.supId.set(supId); + } + + public int getProdId() { + return prodId.get(); + } + + public SimpleIntegerProperty prodIdProperty() { + return prodId; + } + + public void setProdId(int prodId) { + this.prodId.set(prodId); + } + + public String getSupCompany() { + return supCompany.get(); + } + + public SimpleStringProperty supCompanyProperty() { + return supCompany; + } + + public void setSupCompany(String supCompany) { + this.supCompany.set(supCompany); + } + + public String getProdName() { + return prodName.get(); + } + + public SimpleStringProperty prodNameProperty() { + return prodName; + } + + public void setProdName(String prodName) { + this.prodName.set(prodName); + } + + public double getCost() { + return cost.get(); + } + + public SimpleDoubleProperty costProperty() { + return cost; + } + + public void setCost(double cost) { + this.cost.set(cost); + } +} diff --git a/src/main/java/org/example/petshopdesktop/controllers/ProductController.java b/src/main/java/org/example/petshopdesktop/controllers/ProductController.java index 4dc1587e..8c0021fb 100644 --- a/src/main/java/org/example/petshopdesktop/controllers/ProductController.java +++ b/src/main/java/org/example/petshopdesktop/controllers/ProductController.java @@ -105,7 +105,7 @@ public class ProductController { try{ data = ProductDB.getProductDTO(); } catch (SQLException e) { - System.out.println(e.getMessage()); + System.out.println("Error while fetching table data: " + e.getMessage()); } //put data in the table @@ -114,7 +114,7 @@ public class ProductController { /** * open a new dialog for adding a product - * @param event + * @param event click event for button */ @FXML void btnAddClicked(ActionEvent event) { @@ -211,7 +211,7 @@ public class ProductController { tvProducts.setItems(data); } } catch (Exception e) { - throw new RuntimeException(e); + System.out.println("Error while fetching table data: " + e.getMessage()); } } diff --git a/src/main/java/org/example/petshopdesktop/controllers/ProductSupplierController.java b/src/main/java/org/example/petshopdesktop/controllers/ProductSupplierController.java index d8a6e90a..56080c6e 100644 --- a/src/main/java/org/example/petshopdesktop/controllers/ProductSupplierController.java +++ b/src/main/java/org/example/petshopdesktop/controllers/ProductSupplierController.java @@ -1,11 +1,27 @@ package org.example.petshopdesktop.controllers; +import javafx.collections.FXCollections; +import javafx.collections.ObservableList; import javafx.event.ActionEvent; import javafx.fxml.FXML; -import javafx.scene.control.Button; -import javafx.scene.control.TableColumn; -import javafx.scene.control.TableView; -import javafx.scene.control.TextField; +import javafx.fxml.FXMLLoader; +import javafx.scene.Scene; +import javafx.scene.control.*; +import javafx.scene.control.cell.PropertyValueFactory; +import javafx.stage.Modality; +import javafx.stage.Stage; +import org.example.petshopdesktop.DTOs.ProductDTO; +import org.example.petshopdesktop.DTOs.ProductSupplierDTO; +import org.example.petshopdesktop.controllers.dialogcontrollers.ProductDialogController; +import org.example.petshopdesktop.controllers.dialogcontrollers.ProductSupplierDialogController; +import org.example.petshopdesktop.database.ProductDB; +import org.example.petshopdesktop.database.ProductSupplierDB; +import org.example.petshopdesktop.models.ProductSupplier; + +import java.io.IOException; +import java.sql.SQLException; +import java.sql.SQLIntegrityConstraintViolationException; +import java.util.Optional; public class ProductSupplierController { @@ -19,39 +35,222 @@ public class ProductSupplierController { private Button btnEdit; @FXML - private TableColumn colCost; + private TableColumn colCost; @FXML - private TableColumn colProductId; + private TableColumn colProductId; @FXML - private TableColumn colProductName; + private TableColumn colProductName; @FXML - private TableColumn colSupplierId; + private TableColumn colSupplierId; @FXML - private TableColumn colSupplierName; + private TableColumn colSupplierName; @FXML - private TableView tvProductSuppliers; + private TableView tvProductSuppliers; @FXML private TextField txtSearch; + //data declaration + private ObservableList data = FXCollections.observableArrayList(); + private String mode = null; + + /** + * Set up the table view for table and display it when starting up + */ @FXML - void btnAddClicked(ActionEvent event) { + public void initialize() { + //Disable buttons until a row is selected + btnEdit.setDisable(true); + btnDelete.setDisable(true); + //set up table columns + colProductId.setCellValueFactory(new PropertyValueFactory("prodId")); + colProductName.setCellValueFactory(new PropertyValueFactory("prodName")); + colSupplierId.setCellValueFactory(new PropertyValueFactory("supId")); + colSupplierName.setCellValueFactory(new PropertyValueFactory("supCompany")); + colCost.setCellValueFactory(new PropertyValueFactory("cost")); + + displayProductSupplier(); + + //EventListener to Enable buttons when a row is selected + tvProductSuppliers.getSelectionModel().selectedItemProperty().addListener( + (observable, oldValue, newValue) -> { + btnEdit.setDisable(false); + btnDelete.setDisable(false); + } + ); + + //EventListener to search when text is changed on searchbar + txtSearch.textProperty().addListener((observable, oldValue, newValue) -> { + displayFilteredProductSupplier(newValue); + }); } + /** + * Display the ProductSupplierDTO to table view + */ + private void displayProductSupplier() { + //Erase old content + data.clear(); + + //get ProductSupplier from database + try{ + data = ProductSupplierDB.getProductSupplierDTO(); + } catch (SQLException e) { + System.out.println("Error while fetching table data: " + e.getMessage()); + } + + //put data in the table + tvProductSuppliers.setItems(data); + } + + /** + * Filter the table given the string from the searchbar + * @param filter word to filter table + */ + private void displayFilteredProductSupplier(String filter){ + data.clear(); + try{ + if (txtSearch.getText() == null || txtSearch.getText().isEmpty()){ + displayProductSupplier(); //If search bar is empty just display everything + } + else{ + //Filter the using the keyword + data = ProductSupplierDB.getFilteredProductSupplierDTO(filter); + tvProductSuppliers.setItems(data); + } + } catch (Exception e) { + System.out.println("Error while fetching table data: " + e.getMessage()); + } + } + + /** + * open a new dialog for adding a productSupplier + * @param event click event for button + */ + @FXML + void btnAddClicked(ActionEvent event) { + mode = "Add"; + openDialog(null,mode); + } + + /** + * Delete a selected productSupplier when delete is clicked + * @param event click event for button + */ @FXML void btnDeleteClicked(ActionEvent event) { + int numRows = 0; + //set selected item + ProductSupplierDTO selectedProductSupplier = tvProductSuppliers.getSelectionModel().getSelectedItem(); + //ask user to confirm + Alert question = new Alert(Alert.AlertType.CONFIRMATION); + question.setHeaderText("Please confirm delete"); + question.setContentText("Are you sure you want to delete this product-supplier?"); + Optional result = question.showAndWait(); //show alert and wait for response + + //if confirmed,start deletion + if (result.isPresent() && result.get() == ButtonType.OK) { + int supId = selectedProductSupplier.getSupId(); + int prodId = selectedProductSupplier.getProdId(); + + //try deleting + try{ + numRows = ProductSupplierDB.deleteProductSupplier(supId, prodId); + } + catch (SQLIntegrityConstraintViolationException e){ + Alert alert = new Alert(Alert.AlertType.ERROR); + alert.setHeaderText("Database Operation Error"); + alert.setContentText("Delete failed\n" + + "the selected product-supplier is being referred in another table"); + alert.showAndWait(); + return; + } + catch (SQLException e) { + throw new RuntimeException(e); + } + + //prompt user of any errors + if (numRows == 0){ + Alert alert = new Alert(Alert.AlertType.ERROR); + alert.setHeaderText("Database Operation Error"); + alert.setContentText("Delete failed"); + alert.showAndWait(); + } + else{ + //prompt user of delete conformation + Alert alert = new Alert(Alert.AlertType.CONFIRMATION); + alert.setHeaderText("Database Operation Confirmed"); + alert.setContentText("Delete successful"); + alert.showAndWait(); + //refresh display and reset inputs + displayProductSupplier(); + btnDelete.setDisable(true); + btnEdit.setDisable(true); + txtSearch.setText(""); + } + } } @FXML void btnEditClicked(ActionEvent event) { + //set selected item + ProductSupplierDTO selectedProductSupplier = tvProductSuppliers.getSelectionModel().getSelectedItem(); + if (selectedProductSupplier != null) { + mode = "Edit"; + openDialog(selectedProductSupplier,mode); + } + } + + /** + * Function to open the new Dialog for edit or adding + * depending on the mode given + * @param productSupplier the productSupplier entity for editing, null if adding + * @param mode the mode the dialog should be in + */ + private void openDialog(ProductSupplierDTO productSupplier, String mode){ + //Get new view + FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("/org/example/petshopdesktop/dialogviews/product-supplier-dialog-view.fxml")); + Scene scene = null; + try{ + scene = new Scene(fxmlLoader.load()); + } catch (IOException e) { + throw new RuntimeException(e); + } + ProductSupplierDialogController dialogController = fxmlLoader.getController(); //controller associated with this view + dialogController.setMode(mode); + if (productSupplier != null) { + dialogController.setSelectedIds(productSupplier.getSupId(), productSupplier.getProdId()); + } + + //Open the dialog depending on the mode + if(mode.equals("Edit")){ + //Make it display suppliers details in dialog + dialogController.displayProductSupplierDetails(productSupplier); + } + Stage dialogStage = new Stage(); + dialogStage.initModality(Modality.APPLICATION_MODAL); //make it modal + if(mode.equals("Add")){ + dialogStage.setTitle("Add Product-Supplier"); + } + else { + dialogStage.setTitle("Edit Product-Supplier"); + } + dialogStage.setScene(scene); + dialogStage.showAndWait(); + + //When dialog closes update table view and disable edit and delete buttons, and reset search bar + displayProductSupplier(); + btnDelete.setDisable(true); + btnEdit.setDisable(true); + txtSearch.setText(""); } } diff --git a/src/main/java/org/example/petshopdesktop/controllers/SupplierController.java b/src/main/java/org/example/petshopdesktop/controllers/SupplierController.java index 080cc751..aa909103 100644 --- a/src/main/java/org/example/petshopdesktop/controllers/SupplierController.java +++ b/src/main/java/org/example/petshopdesktop/controllers/SupplierController.java @@ -99,7 +99,7 @@ public class SupplierController { try{ data = SupplierDB.getSuppliers(); } catch (SQLException e) { - throw new RuntimeException(e); + System.out.println("Error while fetching table data: " + e.getMessage()); } tvSuppliers.setItems(data); @@ -121,7 +121,7 @@ public class SupplierController { tvSuppliers.setItems(data); } } catch (Exception e) { - throw new RuntimeException(e); + System.out.println("Error while fetching table data: " + e.getMessage()); } } diff --git a/src/main/java/org/example/petshopdesktop/controllers/dialogcontrollers/ProductDialogController.java b/src/main/java/org/example/petshopdesktop/controllers/dialogcontrollers/ProductDialogController.java index 5cc58d87..3aa29a93 100644 --- a/src/main/java/org/example/petshopdesktop/controllers/dialogcontrollers/ProductDialogController.java +++ b/src/main/java/org/example/petshopdesktop/controllers/dialogcontrollers/ProductDialogController.java @@ -79,6 +79,11 @@ public class ProductDialogController { } + /** + * Validates the inputs, then add or update the database depending + * on the mode + * @param mouseEvent click event for save button + */ private void buttonSaveClicked(MouseEvent mouseEvent) { int numRow = 0; //how many rows affected String errorMsg = ""; //error message for validation @@ -164,7 +169,7 @@ public class ProductDialogController { /** * Display the product data in text fields and combobox - * @param product the supplier entity containing data to display + * @param product the product entity containing data to display */ public void displayProductDetails(ProductDTO product){ if (product!=null){ @@ -176,7 +181,7 @@ public class ProductDialogController { //get the right combobox selection for (Category category : cbProdCategory.getItems()) { if(category.getCategoryId() == product.getCategoryId()){ - cbProdCategory.setValue(category); + cbProdCategory.getSelectionModel().select(category); } } diff --git a/src/main/java/org/example/petshopdesktop/controllers/dialogcontrollers/ProductSupplierDialogController.java b/src/main/java/org/example/petshopdesktop/controllers/dialogcontrollers/ProductSupplierDialogController.java new file mode 100644 index 00000000..909363b2 --- /dev/null +++ b/src/main/java/org/example/petshopdesktop/controllers/dialogcontrollers/ProductSupplierDialogController.java @@ -0,0 +1,245 @@ +package org.example.petshopdesktop.controllers.dialogcontrollers; + +import javafx.collections.FXCollections; +import javafx.collections.ObservableList; +import javafx.event.EventHandler; +import javafx.fxml.FXML; +import javafx.scene.Node; +import javafx.scene.control.*; +import javafx.scene.input.MouseEvent; +import javafx.stage.Stage; +import org.example.petshopdesktop.DTOs.ProductSupplierDTO; +import org.example.petshopdesktop.Validator; +import org.example.petshopdesktop.database.ProductDB; +import org.example.petshopdesktop.database.ProductSupplierDB; +import org.example.petshopdesktop.database.SupplierDB; +import org.example.petshopdesktop.models.Product; +import org.example.petshopdesktop.models.ProductSupplier; +import org.example.petshopdesktop.models.Supplier; + +import java.sql.SQLException; +import java.sql.SQLIntegrityConstraintViolationException; + +public class ProductSupplierDialogController { + + @FXML + private Button btnCancel; + + @FXML + private Button btnSave; + + @FXML + private ComboBox cbProduct; + + @FXML + private ComboBox cbSupplier; + + @FXML + private Label lblMode; + + @FXML + private Label lblProductSupplierId; + + @FXML + private TextField txtCost; + + private String mode = null; + private int selectedSupId = -1; + private int selectedProdId = -1; + + /** + * add event listeners to buttons and set up combobox + */ + @FXML + void initialize() { //Set up mouse handlers for buttons + btnSave.setOnMouseClicked(new EventHandler() { + @Override + public void handle(MouseEvent mouseEvent) { + buttonSaveClicked(mouseEvent); + } + }); + + btnCancel.setOnMouseClicked(new EventHandler() { + @Override + public void handle(MouseEvent mouseEvent) { + closeStage(mouseEvent); + } + }); + + //Set up combobox for selecting product and supplier + try{ + ObservableList suppliers = FXCollections.observableArrayList(); //empty list + ObservableList products = FXCollections.observableArrayList(); //empty list + + //get suppliers and products from DB + suppliers = SupplierDB.getSuppliers(); + products = ProductDB.getProducts(); + + //Populate combobox + cbSupplier.setItems(suppliers); + cbProduct.setItems(products); + } + catch(SQLException e){ + throw new RuntimeException(e); + } + + } + + /** + * Validates the inputs, then add or update the database depending + * on the mode + * @param mouseEvent click event for save button + */ + private void buttonSaveClicked(MouseEvent mouseEvent) { + int numRows = 0; + String errorMsg = ""; //error message for validation + + //Check Validation (input required) + errorMsg += Validator.isPresent(txtCost.getText(), "Cost"); + if (cbProduct.getSelectionModel().getSelectedItem() == null) { + errorMsg += "Product is required \n"; + } + if (cbSupplier.getSelectionModel().getSelectedItem() == null) { + errorMsg += "Supplier is required \n"; + } + + //Check validation (length size) + errorMsg += Validator.isLessThanVarChars(txtCost.getText(), "Cost", 12); + + //Check validation (format) + errorMsg += Validator.isNonNegativeDouble(txtCost.getText(), "Cost"); + + if(errorMsg.isEmpty()){ //no validation errors + ProductSupplier productSupplier = collectProductSupplier(); //get productSupplier info + if (mode.equals("Add")) { //add mode + try{ + numRows = ProductSupplierDB.insertProductSupplier(productSupplier); + } + catch(SQLIntegrityConstraintViolationException e){ + Alert alert = new Alert(Alert.AlertType.ERROR); + alert.setHeaderText("Database Operation Error"); + alert.setContentText("Add failed \n" + + "the product-supplier link is already in the database"); + alert.showAndWait(); + numRows = -1; //Update numRow so alert only shows once + closeStage(mouseEvent); + } + catch(SQLException e){ + throw new RuntimeException(e); + } + } + else { //edit + try{ + numRows = ProductSupplierDB.updateProductSupplier(selectedSupId, selectedProdId, productSupplier); + } + catch(SQLIntegrityConstraintViolationException e){ + Alert alert = new Alert(Alert.AlertType.ERROR); + alert.setHeaderText("Database Operation Error"); + alert.setContentText("Edit failed \n" + + "the product-supplier link is already in the database"); + alert.showAndWait(); + numRows = -1; //Update numRow so alert only shows once + closeStage(mouseEvent); + } + catch(SQLException e){ + throw new RuntimeException(e); + } + } + + //if no rows were affected then there was an error (prompt user of error) + if (numRows == 0){ + Alert alert = new Alert(Alert.AlertType.ERROR); + alert.setHeaderText("Database Operation Error"); + alert.setContentText(mode + " failed"); + alert.showAndWait(); + closeStage(mouseEvent); + } + else if (numRows > 0){ + //tell the user operation was successful + Alert alert = new Alert(Alert.AlertType.CONFIRMATION); + alert.setHeaderText("Database Operation Confirmed"); + alert.setContentText(mode + " succeeded"); + alert.showAndWait(); + closeStage(mouseEvent); + } + } + else { //Display validation errors + Alert alert = new Alert(Alert.AlertType.ERROR); + alert.setHeaderText("Input Error"); + alert.setContentText(errorMsg); + alert.showAndWait(); + } + } + + /** + * collect the data for new/updated productSupplier + * @return productSupplier entity with data + */ + private ProductSupplier collectProductSupplier() { + ProductSupplier productSupplier = null; + + productSupplier = new ProductSupplier( + cbSupplier.getSelectionModel().getSelectedItem().getSupId(), + cbProduct.getSelectionModel().getSelectedItem().getProdId(), + Double.parseDouble(txtCost.getText()) + ); + + return productSupplier; + } + + /** + * Display the productsupplier data in text fields and combobox + * @param productSupplier + */ + public void displayProductSupplierDetails(ProductSupplierDTO productSupplier){ + if(productSupplier != null){ + txtCost.setText(productSupplier.getCost() + ""); + } + + //Get the right combobox selection (product) + for (Product product : cbProduct.getItems()) { + if(product.getProdId() == productSupplier.getProdId()){ + cbProduct.getSelectionModel().select(product); + } + } + + //Get the right combobox selection (supplier) + for (Supplier supplier : cbSupplier.getItems()) { + if (supplier.getSupId() == productSupplier.getSupId()) { + cbSupplier.getSelectionModel().select(supplier); + } + } + + } + + /** + * Close the window + * @param mouseEvent mouse event to close + */ + private void closeStage(MouseEvent mouseEvent) { + Node node = (Node) mouseEvent.getSource(); + Stage stage = (Stage) node.getScene().getWindow(); + stage.close(); + } + + /** + * Set the mode of the dialog + * @param mode the mode for the dialog + */ + public void setMode(String mode) { + this.mode = mode; + lblMode.setText(mode + " Product"); + lblProductSupplierId.setVisible(false); + } + + /** + * set the current supplier and productId for (needed for update since compound primary key) + * @param supId supplier id + * @param prodId product id + */ + public void setSelectedIds(int supId, int prodId){ + this.selectedSupId = supId; + this.selectedProdId = prodId; + } + +} diff --git a/src/main/java/org/example/petshopdesktop/controllers/dialogcontrollers/SupplierDialogController.java b/src/main/java/org/example/petshopdesktop/controllers/dialogcontrollers/SupplierDialogController.java index d901d3d5..34cb91eb 100644 --- a/src/main/java/org/example/petshopdesktop/controllers/dialogcontrollers/SupplierDialogController.java +++ b/src/main/java/org/example/petshopdesktop/controllers/dialogcontrollers/SupplierDialogController.java @@ -67,6 +67,11 @@ public class SupplierDialogController { }); } + /** + * Validates the inputs, then add or update the database depending + * on the mode + * @param mouseEvent click event for save button + */ private void buttonSaveClicked(MouseEvent mouseEvent) { int numRow = 0; //how many rows affected String errorMsg = ""; //error message for validation diff --git a/src/main/java/org/example/petshopdesktop/database/ProductSupplierDB.java b/src/main/java/org/example/petshopdesktop/database/ProductSupplierDB.java new file mode 100644 index 00000000..cc651bd0 --- /dev/null +++ b/src/main/java/org/example/petshopdesktop/database/ProductSupplierDB.java @@ -0,0 +1,197 @@ +package org.example.petshopdesktop.database; + +import javafx.collections.FXCollections; +import javafx.collections.ObservableList; +import org.example.petshopdesktop.DTOs.ProductDTO; +import org.example.petshopdesktop.DTOs.ProductSupplierDTO; +import org.example.petshopdesktop.models.Product; +import org.example.petshopdesktop.models.ProductSupplier; + +import java.sql.*; + +public class ProductSupplierDB { + /** + * gets all the productSupplier into an observable list + * @return a list of all the productSupplierDTOs + * @throws SQLException if failed to find productSupplier in the database + */ + public static ObservableList getProductSupplierDTO() throws SQLException{ + //Connect to the database + ObservableList productSuppliers = FXCollections.observableArrayList(); + Connection conn = ConnectionDB.getConnection(); + + //Execute Query + Statement stmt = conn.createStatement(); + String sql = "SELECT ps.supId, ps.prodId, s.supCompany, p.prodName, ps.cost " + + "FROM productsupplier ps " + + "LEFT JOIN product p " + + "ON p.prodId = ps.prodId " + + "LEFT JOIN supplier s " + + "ON s.supId = ps.supId"; + ResultSet rs = stmt.executeQuery(sql); + + //While there is still data add productSupplier to list + while(rs.next()){ + ProductSupplierDTO productSupplier = new ProductSupplierDTO( + rs.getInt(1), + rs.getInt(2), + rs.getString(3), + rs.getString(4), + rs.getDouble(5) + ); + productSuppliers.add(productSupplier); + } + + //close connection and return products + conn.close(); + return productSuppliers; + } + + /** + * Gets a list of ProductSupplierDTOs that is filtered by a given string + * @param filter the word to filter table + * @return ObservableList of ProductSupplierDTOs with the filtered data + * @throws SQLException if getting productSuppliers failed + */ + public static ObservableList getFilteredProductSupplierDTO (String filter) throws SQLException { + //connect to the database + ObservableList productSuppliers = FXCollections.observableArrayList(); + Connection conn = ConnectionDB.getConnection(); + + //Get SQL query for filter word + String sql = + "SELECT ps.supId, ps.prodId, s.supCompany, p.prodName, ps.cost " + + "FROM product p " + + "LEFT JOIN productsupplier ps " + + "ON p.prodId = ps.prodId " + + "LEFT JOIN supplier s " + + "ON s.supId = ps.supId " + + "WHERE " + + "prodName LIKE ? OR " + + "supCompany LIKE ? OR " + + "cost LIKE ?"; + + //add % wildcard so query can use LIKE to filter data + String filteredString = "%" + filter + "%"; + + PreparedStatement stmt = conn.prepareStatement(sql); + stmt.setString(1, filteredString); + stmt.setString(2, filteredString); + stmt.setString(3, filteredString); + + //execute query + ResultSet rs = stmt.executeQuery(); + + //While there is still data add productSupplier to the list + while(rs.next()){ + ProductSupplierDTO productSupplier = new ProductSupplierDTO( + rs.getInt(1), + rs.getInt(2), + rs.getString(3), + rs.getString(4), + rs.getDouble(5) + ); + productSuppliers.add(productSupplier); + } + + conn.close(); + return productSuppliers; + } + + /** + * Inserts a new productSupplier to the database + * @param productSupplier productSupplier entity to be inserted + * @return number of rows affected + * @throws SQLException if insert failed + */ + public static int insertProductSupplier(ProductSupplier productSupplier) throws SQLException{ + int numRows = 0; + + Connection conn = ConnectionDB.getConnection(); + String sql = "INSERT INTO productsupplier (prodId, supId, cost) " + + "VALUES (?, ?, ?)"; + + //These are the values from productSupplier to put into query above + PreparedStatement stmt = conn.prepareStatement(sql); + stmt.setInt(1, productSupplier.getProdId()); + stmt.setInt(2, productSupplier.getSupId()); + stmt.setDouble(3, productSupplier.getCost()); + + //update number of rows affected, return and close connection + numRows = stmt.executeUpdate(); + conn.close(); + + return numRows; + } + + /** + * Update a productSupplier by deleting old productSupplier and inserting new one + * @param oldProdId old product id (used to change primary compound key) + * @param oldSupId old supplier id (used to change primary compound key) + * @param productSupplier productSupplier entity with new info to update (including new primary compound key) + * @return number of rows affected in database + * @throws SQLException if update failed + */ + public static int updateProductSupplier(int oldSupId, int oldProdId, ProductSupplier productSupplier) throws SQLException{ + int numRows = 0; + Connection conn = ConnectionDB.getConnection(); + + //Make transaction so update can be rolled back if insert failed + conn.setAutoCommit(false); + + try{ + //Delete old data first + String sql = "DELETE FROM productsupplier WHERE supId = ? AND prodId = ?"; + PreparedStatement stmt = conn.prepareStatement(sql); + stmt.setInt(1, oldSupId); + stmt.setInt(2, oldProdId); + numRows = stmt.executeUpdate(); + + //Then change the data by inserting a new relation with given keys (only if delete worked) + if(numRows > 0){ + sql = "INSERT INTO productsupplier (prodId, supId, cost) " + + "VALUES (?, ?, ?)"; + stmt = conn.prepareStatement(sql); + stmt.setInt(1, productSupplier.getProdId()); + stmt.setInt(2, productSupplier.getSupId()); + stmt.setDouble(3, productSupplier.getCost()); + numRows = stmt.executeUpdate(); + } + //Commit changes if both delete and insert worked + conn.commit(); + } + catch(SQLException e){ + //Rollback CRUD failed + conn.rollback(); + throw e; + } + finally { + //Set auto commit back to true before closing connection + conn.setAutoCommit(true); + conn.close(); + } + return numRows; + } + + /** + * Delete a productSupplier from the database + * @param prodId id of the product + * @param supId id of the supplier + * @return number of rows affected in the database + * @throws SQLException if delete failed + */ + public static int deleteProductSupplier(int supId, int prodId) throws SQLException{ + int numRows = 0; + Connection conn = ConnectionDB.getConnection(); + + String sql = "DELETE FROM productsupplier WHERE supId = ? AND prodId = ?"; + PreparedStatement stmt = conn.prepareStatement(sql); + stmt.setInt(1, supId); + stmt.setInt(2, prodId); + + numRows = stmt.executeUpdate(); + conn.close(); + + return numRows; + } +} diff --git a/src/main/java/org/example/petshopdesktop/models/Product.java b/src/main/java/org/example/petshopdesktop/models/Product.java index 0738068a..bf0913e5 100644 --- a/src/main/java/org/example/petshopdesktop/models/Product.java +++ b/src/main/java/org/example/petshopdesktop/models/Product.java @@ -83,4 +83,9 @@ public class Product { public void setProdDesc(String prodDesc) { this.prodDesc.set(prodDesc); } + + @Override + public String toString() { + return getProdName(); + } } diff --git a/src/main/java/org/example/petshopdesktop/models/ProductSupplier.java b/src/main/java/org/example/petshopdesktop/models/ProductSupplier.java new file mode 100644 index 00000000..e674974d --- /dev/null +++ b/src/main/java/org/example/petshopdesktop/models/ProductSupplier.java @@ -0,0 +1,54 @@ +package org.example.petshopdesktop.models; + +import javafx.beans.property.SimpleDoubleProperty; +import javafx.beans.property.SimpleIntegerProperty; + +public class ProductSupplier { + private SimpleIntegerProperty supId; + private SimpleIntegerProperty prodId; + private SimpleDoubleProperty cost; + + //constructor + public ProductSupplier(int supId, int prodId, double cost) { + this.supId = new SimpleIntegerProperty(supId); + this.prodId = new SimpleIntegerProperty(prodId); + this.cost = new SimpleDoubleProperty(cost); + } + + //getter and setters + public int getSupId() { + return supId.get(); + } + + public SimpleIntegerProperty supIdProperty() { + return supId; + } + + public void setSupId(int supId) { + this.supId.set(supId); + } + + public int getProdId() { + return prodId.get(); + } + + public SimpleIntegerProperty prodIdProperty() { + return prodId; + } + + public void setProdId(int prodId) { + this.prodId.set(prodId); + } + + public double getCost() { + return cost.get(); + } + + public SimpleDoubleProperty costProperty() { + return cost; + } + + public void setCost(double cost) { + this.cost.set(cost); + } +} diff --git a/src/main/java/org/example/petshopdesktop/models/Supplier.java b/src/main/java/org/example/petshopdesktop/models/Supplier.java index 36f05094..1120670a 100644 --- a/src/main/java/org/example/petshopdesktop/models/Supplier.java +++ b/src/main/java/org/example/petshopdesktop/models/Supplier.java @@ -106,4 +106,9 @@ public class Supplier { public String getSupFullName() { return getSupContactFirstName() + " " + getSupContactLastName(); } + + @Override + public String toString() { + return getSupCompany(); + } } diff --git a/src/main/resources/org/example/petshopdesktop/dialogviews/product-supplier-dialog-view.fxml b/src/main/resources/org/example/petshopdesktop/dialogviews/product-supplier-dialog-view.fxml new file mode 100644 index 00000000..0ef57a60 --- /dev/null +++ b/src/main/resources/org/example/petshopdesktop/dialogviews/product-supplier-dialog-view.fxml @@ -0,0 +1,136 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From e8322cb8f50c72b1c42e0fc7a61ef608b83d57cc Mon Sep 17 00:00:00 2001 From: Harkamal Randhawa Date: Tue, 10 Feb 2026 09:10:32 -0700 Subject: [PATCH 009/127] Added docker compose for consistent MySQL setup --- docker-compose.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 docker-compose.yml diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 00000000..6703b07c --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,18 @@ +services: + mysql: + image: mysql:8.4 + container_name: petstore-mysql + ports: + - "3306:3306" + environment: + MYSQL_ROOT_PASSWORD: rootpass + MYSQL_DATABASE: Petstoredb + MYSQL_USER: petapp + MYSQL_PASSWORD: petapppass + volumes: + - ./Petstoredata.sql:/docker-entrypoint-initdb.d/01-Petstoredata.sql:ro + - petstore_mysql_data:/var/lib/mysql + +volumes: + petstore_mysql_data: + From c2294d2faa5b533d2bde65c020f0e1367655569f Mon Sep 17 00:00:00 2001 From: Harkamal Randhawa Date: Tue, 10 Feb 2026 09:15:20 -0700 Subject: [PATCH 010/127] Added an example connection file and also added proper error tracing --- connectionpetstore.properties.example | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 connectionpetstore.properties.example diff --git a/connectionpetstore.properties.example b/connectionpetstore.properties.example new file mode 100644 index 00000000..426ecafb --- /dev/null +++ b/connectionpetstore.properties.example @@ -0,0 +1,3 @@ +url=jdbc:mysql://127.0.0.1:3306/Petstoredb?useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=UTC +user=petapp +password=petapppass \ No newline at end of file From 12020a2feb678267c2dcc45b50301d129ac6cee5 Mon Sep 17 00:00:00 2001 From: Harkamal Randhawa Date: Tue, 10 Feb 2026 16:35:49 -0700 Subject: [PATCH 011/127] Fixed DB connection and java version issue --- .gitignore | 5 ++- pom.xml | 9 +++-- .../controllers/MainLayoutController.java | 3 +- .../petshopdesktop/database/ConnectionDB.java | 33 ++++++++++++------- 4 files changed, 32 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index 480bdf52..4a8c77b5 100644 --- a/.gitignore +++ b/.gitignore @@ -36,4 +36,7 @@ build/ .vscode/ ### Mac OS ### -.DS_Store \ No newline at end of file +.DS_Store + +## Database related +connectionpetstore.properties diff --git a/pom.xml b/pom.xml index 8cb9a1ba..6da4edce 100644 --- a/pom.xml +++ b/pom.xml @@ -8,9 +8,9 @@ PetShopDesktop 1.0-SNAPSHOT PetShopDesktop - UTF-8 + 25.0.2 5.12.1 @@ -18,12 +18,12 @@ org.openjfx javafx-controls - 21.0.6 + ${javafx.version} org.openjfx javafx-fxml - 21.0.6 + ${javafx.version} @@ -66,8 +66,7 @@ default-cli - org.example.petshopdesktop/org.example.petshopdesktop.PetShopApplication - + org.example.petshopdesktop/org.example.petshopdesktop.PetShopApplication app app app diff --git a/src/main/java/org/example/petshopdesktop/controllers/MainLayoutController.java b/src/main/java/org/example/petshopdesktop/controllers/MainLayoutController.java index a5a3060d..431d38d4 100644 --- a/src/main/java/org/example/petshopdesktop/controllers/MainLayoutController.java +++ b/src/main/java/org/example/petshopdesktop/controllers/MainLayoutController.java @@ -111,7 +111,8 @@ public class MainLayoutController { spContentArea.getChildren().clear(); spContentArea.getChildren().add(view); } catch (Exception e) { - System.out.println("Error loading view: " + fxmlFile); + System.err.println("Error loading view: " + fxmlFile); + e.printStackTrace(); } } diff --git a/src/main/java/org/example/petshopdesktop/database/ConnectionDB.java b/src/main/java/org/example/petshopdesktop/database/ConnectionDB.java index 2b0bad1d..3435c7ac 100644 --- a/src/main/java/org/example/petshopdesktop/database/ConnectionDB.java +++ b/src/main/java/org/example/petshopdesktop/database/ConnectionDB.java @@ -2,6 +2,9 @@ package org.example.petshopdesktop.database; import java.io.FileInputStream; import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; import java.sql.Connection; import java.sql.DriverManager; import java.sql.SQLException; @@ -9,8 +12,7 @@ import java.util.Properties; public class ConnectionDB { /** - * Method to try and connect to the database sing cnnection.properties located in the - * root of C drive + * Method to try and connect to the database using connectionpetstore.properties. * @return Connection to the database */ public static Connection getConnection(){ @@ -18,10 +20,23 @@ public class ConnectionDB { String user = ""; String password = ""; - try{ - //Read connection.properties file - FileInputStream fis = new FileInputStream("c:\\connectionpetstore.properties"); //location of connection can be changed here - Properties prop = new Properties(); + Properties prop = new Properties(); + Path propsPath; + + String explicitPath = System.getenv("PETSTORE_DB_PROPS"); + if (explicitPath != null && !explicitPath.isBlank()) { + propsPath = Paths.get(explicitPath); + } else { + Path cwd = Paths.get(System.getProperty("user.dir"), "connectionpetstore.properties"); + Path xdg = Paths.get(System.getProperty("user.home"), ".config", "petstore", "connectionpetstore.properties"); + Path legacyWindows = Paths.get("./connectionpetstore.properties"); + + if (Files.exists(cwd)) propsPath = cwd; + else if (Files.exists(xdg)) propsPath = xdg; + else propsPath = legacyWindows; + } + + try (FileInputStream fis = new FileInputStream(propsPath.toString())) { prop.load(fis); url = prop.getProperty("url"); user = prop.getProperty("user"); @@ -31,12 +46,8 @@ public class ConnectionDB { throw new RuntimeException("Problem with reading connection info: "+e.getMessage()); } - Connection conn = null; - try{ - //try to get connection with the data taken from connection.properties - conn = DriverManager.getConnection(url,user,password); - return conn; + return DriverManager.getConnection(url,user,password); } catch (SQLException e) { throw new RuntimeException("Problem with database connection: "+e.getMessage()); From bcb383c40a77a48c098fe6e4c4b33dec8deb0515 Mon Sep 17 00:00:00 2001 From: augmentedpotato Date: Wed, 11 Feb 2026 08:40:31 -0700 Subject: [PATCH 012/127] Pets CRUD --- connectionpetstore.properties | 3 + .../controllers/PetController.java | 187 ++++++++++++++-- .../PetDialogController.java | 203 ++++++++++++++++++ .../petshopdesktop/database/PetDB.java | 145 +++++++++++++ .../example/petshopdesktop/models/Pet.java | 109 ++++++++++ 5 files changed, 633 insertions(+), 14 deletions(-) create mode 100644 connectionpetstore.properties create mode 100644 src/main/java/org/example/petshopdesktop/controllers/dialogcontrollers/PetDialogController.java create mode 100644 src/main/java/org/example/petshopdesktop/database/PetDB.java create mode 100644 src/main/java/org/example/petshopdesktop/models/Pet.java diff --git a/connectionpetstore.properties b/connectionpetstore.properties new file mode 100644 index 00000000..426ecafb --- /dev/null +++ b/connectionpetstore.properties @@ -0,0 +1,3 @@ +url=jdbc:mysql://127.0.0.1:3306/Petstoredb?useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=UTC +user=petapp +password=petapppass \ No newline at end of file diff --git a/src/main/java/org/example/petshopdesktop/controllers/PetController.java b/src/main/java/org/example/petshopdesktop/controllers/PetController.java index 26834d72..7eb55cb8 100644 --- a/src/main/java/org/example/petshopdesktop/controllers/PetController.java +++ b/src/main/java/org/example/petshopdesktop/controllers/PetController.java @@ -1,11 +1,24 @@ package org.example.petshopdesktop.controllers; +import javafx.collections.FXCollections; +import javafx.collections.ObservableList; import javafx.event.ActionEvent; import javafx.fxml.FXML; -import javafx.scene.control.Button; -import javafx.scene.control.TableColumn; -import javafx.scene.control.TableView; -import javafx.scene.control.TextField; +import javafx.fxml.FXMLLoader; +import javafx.scene.Scene; +import javafx.scene.control.*; +import javafx.scene.control.cell.PropertyValueFactory; +import javafx.stage.Modality; +import javafx.stage.Stage; +import org.example.petshopdesktop.controllers.dialogcontrollers.PetDialogController; +import org.example.petshopdesktop.database.PetDB; +import org.example.petshopdesktop.database.ProductDB; +import org.example.petshopdesktop.models.Pet; + +import java.io.IOException; +import java.sql.SQLException; +import java.sql.SQLIntegrityConstraintViolationException; +import java.util.Optional; public class PetController { @@ -19,45 +32,191 @@ public class PetController { private Button btnEdit; @FXML - private TableColumn colPetAge; + private TableColumn colPetAge; @FXML - private TableColumn colPetBreed; + private TableColumn colPetBreed; @FXML - private TableColumn colPetId; + private TableColumn colPetId; @FXML - private TableColumn colPetName; + private TableColumn colPetName; @FXML - private TableColumn colPetPrice; + private TableColumn colPetPrice; @FXML - private TableColumn colPetSpecies; + private TableColumn colPetSpecies; @FXML - private TableColumn colPetStatus; + private TableColumn colPetStatus; @FXML - private TableView tvPets; + private TableView tvPets; @FXML private TextField txtSearch; @FXML void btnAddClicked(ActionEvent event) { - + mode = "Add"; + openDialog(null,mode); } @FXML void btnDeleteClicked(ActionEvent event) { + int numRows = 0; + Pet selectedPet = tvPets.getSelectionModel().getSelectedItem(); + //ask user to confirm + Alert question = new Alert(Alert.AlertType.CONFIRMATION); + question.setHeaderText("Please confirm delete"); + question.setContentText("Are you sure you want to delete this pet?"); + Optional result = question.showAndWait(); //show alert and wait for response + + //if confirmed,start deletion + if (result.isPresent() && result.get() == ButtonType.OK) { + int petId = selectedPet.getPetId(); + + //try deleting + try{ + numRows = PetDB.deletePet(petId); + } + catch (SQLIntegrityConstraintViolationException e){ + Alert alert = new Alert(Alert.AlertType.ERROR); + alert.setHeaderText("Database Operation Error"); + alert.setContentText("Delete failed\n" + + "the selected pet is being referred in another table"); + alert.showAndWait(); + return; + } + catch (SQLException e) { + throw new RuntimeException(e); + } + + //prompt user of any errors + if (numRows == 0){ + Alert alert = new Alert(Alert.AlertType.ERROR); + alert.setHeaderText("Database Operation Error"); + alert.setContentText("Delete failed"); + alert.showAndWait(); + } + else{ + //prompt user of delete conformation + Alert alert = new Alert(Alert.AlertType.CONFIRMATION); + alert.setHeaderText("Database Operation Confirmed"); + alert.setContentText("Delete successful"); + alert.showAndWait(); + //refresh display and reset inputs + displayPets(); + btnDelete.setDisable(true); + btnEdit.setDisable(true); + txtSearch.setText(""); + } + } } @FXML void btnEditClicked(ActionEvent event) { + Pet selectedPet = tvPets.getSelectionModel().getSelectedItem(); + if(selectedPet != null){ + mode = "Edit"; + openDialog(selectedPet,mode); + } } -} + private ObservableList data = FXCollections.observableArrayList(); + String mode = null; + + @FXML + void initialize() { + btnEdit.setDisable(true); + btnDelete.setDisable(true); + + colPetId.setCellValueFactory(new PropertyValueFactory("petId")); + colPetName.setCellValueFactory(new PropertyValueFactory("petName")); + colPetSpecies.setCellValueFactory(new PropertyValueFactory("petSpecies")); + colPetBreed.setCellValueFactory(new PropertyValueFactory("petBreed")); + colPetAge.setCellValueFactory(new PropertyValueFactory("petAge")); + colPetStatus.setCellValueFactory(new PropertyValueFactory("petStatus")); + colPetPrice.setCellValueFactory(new PropertyValueFactory("petPrice")); + + displayPets(); + + tvPets.getSelectionModel().selectedItemProperty().addListener( + (observable, oldValue, newValue) -> { + btnEdit.setDisable(false); + btnDelete.setDisable(false); + }); + + txtSearch.textProperty().addListener((observable, oldValue, newValue) -> { + displayFilteredPet(newValue); + }); + } + + private void displayFilteredPet(String filter) { + data.clear(); + try{ + if (txtSearch.getText() == null || txtSearch.getText().isEmpty()){ + displayPets(); + } + else { + data = PetDB.getFilteredPets(filter); + tvPets.setItems(data); + } + } catch (Exception e) { + System.out.println("Error while fetching table data: " + e.getMessage()); + } + } + + private void displayPets() { + data.clear(); + + try{ + data = PetDB.getPets(); + } + catch(SQLException e){ + System.out.println("Error while fetching table data: " + e.getMessage()); + } + + tvPets.setItems(data); + } + + private void openDialog(Pet pet, String mode){ + //Get new view + FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("/org/example/petshopdesktop/dialogviews/pet-dialog-view.fxml")); + Scene scene = null; + try{ + scene = new Scene(fxmlLoader.load()); + } catch (IOException e) { + throw new RuntimeException(e); + } + PetDialogController dialogController = fxmlLoader.getController(); //controller associated with this view + dialogController.setMode(mode); + + //Open the dialog depending on the mode + if(mode.equals("Edit")){ + //Make it display pet details in dialog + dialogController.displayPetDetails(pet); + } + Stage dialogStage = new Stage(); + dialogStage.initModality(Modality.APPLICATION_MODAL); //make it modal + if(mode.equals("Add")){ + dialogStage.setTitle("Add Pet"); + } + else { + dialogStage.setTitle("Edit Pet"); + } + dialogStage.setScene(scene); + dialogStage.showAndWait(); + + //When dialog closes update table view and disable edit and delete buttons, and reset search bar + displayPets(); + btnDelete.setDisable(true); + btnEdit.setDisable(true); + txtSearch.setText(""); + } + +} \ No newline at end of file diff --git a/src/main/java/org/example/petshopdesktop/controllers/dialogcontrollers/PetDialogController.java b/src/main/java/org/example/petshopdesktop/controllers/dialogcontrollers/PetDialogController.java new file mode 100644 index 00000000..45be6c3c --- /dev/null +++ b/src/main/java/org/example/petshopdesktop/controllers/dialogcontrollers/PetDialogController.java @@ -0,0 +1,203 @@ +package org.example.petshopdesktop.controllers.dialogcontrollers; + +import javafx.collections.FXCollections; +import javafx.collections.ObservableList; +import javafx.event.EventHandler; +import javafx.fxml.FXML; +import javafx.scene.Node; +import javafx.scene.control.*; +import javafx.scene.input.MouseEvent; +import javafx.stage.Stage; +import org.example.petshopdesktop.DTOs.ProductDTO; +import org.example.petshopdesktop.Validator; +import org.example.petshopdesktop.database.PetDB; +import org.example.petshopdesktop.models.Category; +import org.example.petshopdesktop.models.Pet; + +import java.sql.SQLException; + +public class PetDialogController { + + @FXML + private Button btnCancel; + + @FXML + private Button btnSave; + + @FXML + private ComboBox cbPetStatus; + + @FXML + private Label lblMode; + + @FXML + private Label lblPetId; + + @FXML + private TextField txtPetAge; + + @FXML + private TextField txtPetBreed; + + @FXML + private TextField txtPetName; + + @FXML + private TextField txtPetPrice; + + @FXML + private TextField txtPetSpecies; + + private String mode = null; + + private ObservableList statusList = FXCollections.observableArrayList( + "Available", "Adopted" + ); + + @FXML + void initialize() { + + cbPetStatus.setItems(statusList); //set status combobox + + //Set up mouse handlers for buttons + btnSave.setOnMouseClicked(new EventHandler() { + @Override + public void handle(MouseEvent mouseEvent) { + buttonSaveClicked(mouseEvent); + } + }); + + btnCancel.setOnMouseClicked(new EventHandler() { + @Override + public void handle(MouseEvent mouseEvent) { + closeStage(mouseEvent); + } + }); + } + + private void buttonSaveClicked(MouseEvent mouseEvent) { + int numRow = 0; + String errorMsg = ""; + + //Check validation (input required) + errorMsg += Validator.isPresent(txtPetName.getText(), "Pet Name"); + errorMsg += Validator.isPresent(txtPetAge.getText(), "Age"); + errorMsg += Validator.isPresent(txtPetBreed.getText(), "Breed"); + errorMsg += Validator.isPresent(txtPetSpecies.getText(), "Species"); + errorMsg += Validator.isPresent(txtPetPrice.getText(), "Price"); + if (cbPetStatus.getSelectionModel().getSelectedItem() == null){ + errorMsg += "Status is required"; + } + + //Check validation (length size) + errorMsg += Validator.isLessThanVarChars(txtPetName.getText(), "Pet Name", 50); + errorMsg += Validator.isLessThanVarChars(txtPetSpecies.getText(), "Species", 50); + errorMsg += Validator.isLessThanVarChars(txtPetBreed.getText(), "Breed", 50); + errorMsg += Validator.isLessThanVarChars(txtPetPrice.getText(), "Price", 12); + errorMsg += Validator.isLessThanVarChars(txtPetAge.getText(), "Age", 11); + + //Check validation (format) + errorMsg += Validator.isNonNegativeDouble(txtPetPrice.getText(), "Price"); + errorMsg += Validator.isNonNegativeInteger(txtPetAge.getText(), "Age"); + + if(errorMsg.isEmpty()){ + Pet pet = collectPet(); + if(mode.equals("Add")) { + try{ + numRow = PetDB.insertPet(pet); + } + catch (SQLException e) { + throw new RuntimeException(e); + } + } + else { + try { + numRow = PetDB.updatePet(pet.getPetId(), pet); + } + catch (SQLException e) { + throw new RuntimeException(e); + } + } + + //if no rows were affected then there was an error (prompt user of error) + if (numRow == 0){ + Alert alert = new Alert(Alert.AlertType.ERROR); + alert.setHeaderText("Database Operation Error"); + alert.setContentText(mode + " failed"); + alert.showAndWait(); + closeStage(mouseEvent); + } + else { + //tell the user operation was successful + Alert alert = new Alert(Alert.AlertType.CONFIRMATION); + alert.setHeaderText("Database Operation Confirmed"); + alert.setContentText(mode + " succeeded"); + alert.showAndWait(); + closeStage(mouseEvent); + } + } + else{ + Alert alert = new Alert(Alert.AlertType.ERROR); + alert.setHeaderText("Input Error"); + alert.setContentText(errorMsg); + alert.showAndWait(); + } + } + + private Pet collectPet() { + int petId =0; + Pet pet = null; + + if(lblPetId.isVisible()){ + petId = Integer.parseInt(lblPetId.getText().split(": ")[1]); + } + pet = new Pet( + petId, + txtPetName.getText(), + txtPetSpecies.getText(), + txtPetBreed.getText(), + Integer.parseInt(txtPetAge.getText()), + cbPetStatus.getValue(), + Double.parseDouble(txtPetPrice.getText()) + ); + return pet; + } + + private void closeStage(MouseEvent mouseEvent) { + Node node = (Node) mouseEvent.getSource(); + Stage stage = (Stage) node.getScene().getWindow(); + stage.close(); + } + + public void displayPetDetails(Pet pet){ + if (pet!=null){ + lblPetId.setText("ID: " + pet.getPetId()); + txtPetName.setText(pet.getPetName()); + txtPetSpecies.setText(pet.getPetSpecies()); + txtPetBreed.setText(pet.getPetBreed()); + txtPetAge.setText(pet.getPetAge() + ""); + txtPetPrice.setText(pet.getPetPrice() + ""); + + //get the right combobox selection + for (String status : cbPetStatus.getItems()) { + if(status.equals(pet.getPetStatus())){ + cbPetStatus.getSelectionModel().select(status); + } + } + + + } + } + + public void setMode(String mode) { + this.mode = mode; + lblMode.setText(mode + " Pet"); + if(mode.equals("Add")) { + lblPetId.setVisible(false); + } + else if(mode.equals("Edit")) { + lblPetId.setVisible(true); + } + } + +} diff --git a/src/main/java/org/example/petshopdesktop/database/PetDB.java b/src/main/java/org/example/petshopdesktop/database/PetDB.java new file mode 100644 index 00000000..d1b7ca37 --- /dev/null +++ b/src/main/java/org/example/petshopdesktop/database/PetDB.java @@ -0,0 +1,145 @@ +package org.example.petshopdesktop.database; + +import javafx.collections.FXCollections; +import javafx.collections.ObservableList; +import org.example.petshopdesktop.models.Pet; + +import java.sql.*; + +public class PetDB { + public static ObservableList getPets() throws SQLException { + //Connect to the database + ObservableList pets = FXCollections.observableArrayList(); + Connection conn = ConnectionDB.getConnection(); + + //Execute Query + Statement stmt = conn.createStatement(); + ResultSet rs = stmt.executeQuery("SELECT * FROM pet"); + + //While there is still data add pets to the list + while(rs.next()){ + Pet pet = new Pet( + rs.getInt(1), + rs.getString(2), + rs.getString(3), + rs.getString(4), + rs.getInt(5), + rs.getString(6), + rs.getDouble(7) + ); + pets.add(pet); + } + + //close connection and return pets + conn.close(); + return pets; + } + + public static ObservableList getFilteredPets(String filter) throws SQLException { + //Connect to the database + ObservableList pets = FXCollections.observableArrayList(); + Connection conn = ConnectionDB.getConnection(); + + //Get SQL query for filtered word + String sql = "SELECT * FROM pet " + + " WHERE " + + "petName LIKE ? OR " + + "petSpecies LIKE ? OR " + + "petBreed LIKE ? OR " + + "petAge LIKE ? OR " + + "petStatus LIKE ? OR " + + "petPrice LIKE ?"; + + String filteredString = "%" + filter + "%"; + + PreparedStatement stmt = conn.prepareStatement(sql); + stmt.setString(1, filteredString); + stmt.setString(2, filteredString); + stmt.setString(3, filteredString); + stmt.setString(4, filteredString); + stmt.setString(5, filteredString); + stmt.setString(6, filteredString); + + ResultSet rs = stmt.executeQuery(); + + while(rs.next()){ + Pet pet = new Pet( + rs.getInt(1), + rs.getString(2), + rs.getString(3), + rs.getString(4), + rs.getInt(5), + rs.getString(6), + rs.getDouble(7) + ); + pets.add(pet); + } + + conn.close(); + return pets; + } + + public static int insertPet(Pet pet) throws SQLException { + int numRows = 0; + + Connection conn = ConnectionDB.getConnection(); + String sql = "INSERT INTO pet (petId, petName, petSpecies, petBreed, petAge, petStatus, petPrice)" + + " VALUES (?, ?, ?, ?, ?, ?, ?)"; + + PreparedStatement stmt = conn.prepareStatement(sql); + stmt.setInt(1, pet.getPetId()); + stmt.setString(2, pet.getPetName()); + stmt.setString(3, pet.getPetSpecies()); + stmt.setString(4, pet.getPetBreed()); + stmt.setInt(5, pet.getPetAge()); + stmt.setString(6, pet.getPetStatus()); + stmt.setDouble(7, pet.getPetPrice()); + + numRows = stmt.executeUpdate(); + conn.close(); + + return numRows; + } + + public static int updatePet(int petId, Pet pet) throws SQLException { + int numRows = 0; + + Connection conn = ConnectionDB.getConnection(); + String sql = "UPDATE pet SET " + + " petName = ?, " + + " petSpecies = ?, " + + " petBreed = ?, " + + " petAge = ?, " + + " petStatus = ?, " + + " petPrice = ? " + + " WHERE petId = ?"; + PreparedStatement stmt = conn.prepareStatement(sql); + stmt.setString(1, pet.getPetName()); + stmt.setString(2, pet.getPetSpecies()); + stmt.setString(3, pet.getPetBreed()); + stmt.setInt(4, pet.getPetAge()); + stmt.setString(5, pet.getPetStatus()); + stmt.setDouble(6, pet.getPetPrice()); + stmt.setInt(7, petId); + + numRows = stmt.executeUpdate(); + conn.close(); + + return numRows; + } + + public static int deletePet(int petId) throws SQLException { + int numRows = 0; + Connection conn = ConnectionDB.getConnection(); + + String sql = "DELETE FROM pet WHERE petId = ?"; + PreparedStatement stmt = conn.prepareStatement(sql); + + stmt.setInt(1, petId); + + numRows = stmt.executeUpdate(); + conn.close(); + + return numRows; + } +} diff --git a/src/main/java/org/example/petshopdesktop/models/Pet.java b/src/main/java/org/example/petshopdesktop/models/Pet.java new file mode 100644 index 00000000..e1f2e3fb --- /dev/null +++ b/src/main/java/org/example/petshopdesktop/models/Pet.java @@ -0,0 +1,109 @@ +package org.example.petshopdesktop.models; + +import javafx.beans.property.SimpleDoubleProperty; +import javafx.beans.property.SimpleIntegerProperty; +import javafx.beans.property.SimpleStringProperty; + +public class Pet { + private SimpleIntegerProperty petId; + private SimpleStringProperty petName; + private SimpleStringProperty petSpecies; + private SimpleStringProperty petBreed; + private SimpleIntegerProperty petAge; + private SimpleStringProperty petStatus; + private SimpleDoubleProperty petPrice; + + public Pet(int petId, String petName, String petSpecies, String petBreed, int petAge, String petStatus, double petPrice) { + this.petId = new SimpleIntegerProperty(petId); + this.petName = new SimpleStringProperty(petName); + this.petSpecies = new SimpleStringProperty(petSpecies); + this.petBreed = new SimpleStringProperty(petBreed); + this.petAge = new SimpleIntegerProperty(petAge); + this.petStatus = new SimpleStringProperty(petStatus); + this.petPrice = new SimpleDoubleProperty(petPrice); + } + + public int getPetId() { + return petId.get(); + } + + public void setPetId(int petId) { + this.petId.set(petId); + } + + public SimpleIntegerProperty petIdProperty() { + return petId; + } + + public String getPetName() { + return petName.get(); + } + + public void setPetName(String petName) { + this.petName.set(petName); + } + + public SimpleStringProperty petNameProperty() { + return petName; + } + + public String getPetSpecies() { + return petSpecies.get(); + } + + public void setPetSpecies(String petSpecies) { + this.petSpecies.set(petSpecies); + } + + public SimpleStringProperty petSpeciesProperty() { + return petSpecies; + } + + public String getPetBreed() { + return petBreed.get(); + } + + public void setPetBreed(String petBreed) { + this.petBreed.set(petBreed); + } + + public SimpleStringProperty petBreedProperty() { + return petBreed; + } + + public int getPetAge() { + return petAge.get(); + } + + public void setPetAge(int petAge) { + this.petAge.set(petAge); + } + + public SimpleIntegerProperty petAgeProperty() { + return petAge; + } + + public String getPetStatus() { + return petStatus.get(); + } + + public void setPetStatus(String petStatus) { + this.petStatus.set(petStatus); + } + + public SimpleStringProperty petStatusProperty() { + return petStatus; + } + + public double getPetPrice() { + return petPrice.get(); + } + + public void setPetPrice(double petPrice) { + this.petPrice.set(petPrice); + } + + public SimpleDoubleProperty petPriceProperty() { + return petPrice; + } +} From edf5bb7a7e07a97da94252ecbcd916f8575807d7 Mon Sep 17 00:00:00 2001 From: Nikitha Date: Thu, 19 Feb 2026 19:38:14 -0700 Subject: [PATCH 013/127] Appoinment,service,Purchase fxml --- .../dialogviews/appointment-dialog-view.fxml | 176 ++++++++++++++++++ .../dialogviews/service-dialog-view.fxml | 147 +++++++++++++++ .../modelviews/appointment-view.fxml | 8 +- .../modelviews/purchaseorder-view.fxml | 82 ++++++++ .../modelviews/service-view.fxml | 8 +- 5 files changed, 413 insertions(+), 8 deletions(-) create mode 100644 src/main/resources/org/example/petshopdesktop/dialogviews/appointment-dialog-view.fxml create mode 100644 src/main/resources/org/example/petshopdesktop/dialogviews/service-dialog-view.fxml create mode 100644 src/main/resources/org/example/petshopdesktop/modelviews/purchaseorder-view.fxml diff --git a/src/main/resources/org/example/petshopdesktop/dialogviews/appointment-dialog-view.fxml b/src/main/resources/org/example/petshopdesktop/dialogviews/appointment-dialog-view.fxml new file mode 100644 index 00000000..7ff155b2 --- /dev/null +++ b/src/main/resources/org/example/petshopdesktop/dialogviews/appointment-dialog-view.fxml @@ -0,0 +1,176 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/org/example/petshopdesktop/dialogviews/service-dialog-view.fxml b/src/main/resources/org/example/petshopdesktop/dialogviews/service-dialog-view.fxml new file mode 100644 index 00000000..ccd4c24f --- /dev/null +++ b/src/main/resources/org/example/petshopdesktop/dialogviews/service-dialog-view.fxml @@ -0,0 +1,147 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/org/example/petshopdesktop/modelviews/appointment-view.fxml b/src/main/resources/org/example/petshopdesktop/modelviews/appointment-view.fxml index ec7e6cce..4bfd3029 100644 --- a/src/main/resources/org/example/petshopdesktop/modelviews/appointment-view.fxml +++ b/src/main/resources/org/example/petshopdesktop/modelviews/appointment-view.fxml @@ -66,15 +66,15 @@ - - - + + + - + diff --git a/src/main/resources/org/example/petshopdesktop/modelviews/purchaseorder-view.fxml b/src/main/resources/org/example/petshopdesktop/modelviews/purchaseorder-view.fxml new file mode 100644 index 00000000..fdac860e --- /dev/null +++ b/src/main/resources/org/example/petshopdesktop/modelviews/purchaseorder-view.fxml @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/org/example/petshopdesktop/modelviews/service-view.fxml b/src/main/resources/org/example/petshopdesktop/modelviews/service-view.fxml index c3398855..2adac139 100644 --- a/src/main/resources/org/example/petshopdesktop/modelviews/service-view.fxml +++ b/src/main/resources/org/example/petshopdesktop/modelviews/service-view.fxml @@ -66,13 +66,13 @@ - - - + + + - + From 168400a6b310b638f933d3fea21143264c94757f Mon Sep 17 00:00:00 2001 From: augmentedpotato Date: Fri, 20 Feb 2026 20:16:35 -0700 Subject: [PATCH 014/127] Dialog view now exists --- .../dialogviews/pet-dialog-view.fxml | 175 ++++++++++++++++++ 1 file changed, 175 insertions(+) create mode 100644 src/main/resources/org/example/petshopdesktop/dialogviews/pet-dialog-view.fxml diff --git a/src/main/resources/org/example/petshopdesktop/dialogviews/pet-dialog-view.fxml b/src/main/resources/org/example/petshopdesktop/dialogviews/pet-dialog-view.fxml new file mode 100644 index 00000000..0784811b --- /dev/null +++ b/src/main/resources/org/example/petshopdesktop/dialogviews/pet-dialog-view.fxml @@ -0,0 +1,175 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From a12af3f0ee9dee7c041883e9f3a21dd1d321a285 Mon Sep 17 00:00:00 2001 From: Harkamal Randhawa Date: Sat, 21 Feb 2026 13:27:50 -0700 Subject: [PATCH 015/127] 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 --- src/main/java/module-info.java | 2 + .../petshopdesktop/PetShopApplication.java | 10 ++- .../org/example/petshopdesktop/auth/Role.java | 6 ++ .../petshopdesktop/auth/UserSession.java | 44 ++++++++++ .../controllers/LoginController.java | 67 ++++++++++++++++ .../controllers/MainLayoutController.java | 45 +++++++++++ .../petshopdesktop/database/UserDB.java | 71 ++++++++++++++++ .../example/petshopdesktop/models/User.java | 27 +++++++ .../example/petshopdesktop/login-view.fxml | 80 +++++++++++++++++++ .../petshopdesktop/main-layout-view.fxml | 15 +++- 10 files changed, 363 insertions(+), 4 deletions(-) create mode 100644 src/main/java/org/example/petshopdesktop/auth/Role.java create mode 100644 src/main/java/org/example/petshopdesktop/auth/UserSession.java create mode 100644 src/main/java/org/example/petshopdesktop/controllers/LoginController.java create mode 100644 src/main/java/org/example/petshopdesktop/database/UserDB.java create mode 100644 src/main/java/org/example/petshopdesktop/models/User.java create mode 100644 src/main/resources/org/example/petshopdesktop/login-view.fxml diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index 7459e876..d1f07dd9 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -8,7 +8,9 @@ module org.example.petshopdesktop { opens org.example.petshopdesktop to javafx.fxml; opens org.example.petshopdesktop.controllers.dialogcontrollers to javafx.fxml; opens org.example.petshopdesktop.controllers to javafx.fxml; + opens org.example.petshopdesktop.auth to javafx.fxml; exports org.example.petshopdesktop; exports org.example.petshopdesktop.controllers; + exports org.example.petshopdesktop.auth; } \ No newline at end of file diff --git a/src/main/java/org/example/petshopdesktop/PetShopApplication.java b/src/main/java/org/example/petshopdesktop/PetShopApplication.java index 8a8fcd65..06def37b 100644 --- a/src/main/java/org/example/petshopdesktop/PetShopApplication.java +++ b/src/main/java/org/example/petshopdesktop/PetShopApplication.java @@ -4,15 +4,21 @@ import javafx.application.Application; import javafx.fxml.FXMLLoader; import javafx.scene.Scene; import javafx.stage.Stage; +import org.example.petshopdesktop.database.UserDB; import java.io.IOException; public class PetShopApplication extends Application { @Override public void start(Stage stage) throws IOException { - FXMLLoader fxmlLoader = new FXMLLoader(PetShopApplication.class.getResource("main-layout-view.fxml")); + try { + UserDB.initializeTable(); + } catch (Exception e) { + System.err.println("Warning: could not initialize users table: " + e.getMessage()); + } + FXMLLoader fxmlLoader = new FXMLLoader(PetShopApplication.class.getResource("login-view.fxml")); Scene scene = new Scene(fxmlLoader.load()); - stage.setTitle("Pet Shop Manager"); + stage.setTitle("Pet Shop Manager - Login"); stage.setScene(scene); stage.show(); } diff --git a/src/main/java/org/example/petshopdesktop/auth/Role.java b/src/main/java/org/example/petshopdesktop/auth/Role.java new file mode 100644 index 00000000..64f38459 --- /dev/null +++ b/src/main/java/org/example/petshopdesktop/auth/Role.java @@ -0,0 +1,6 @@ +package org.example.petshopdesktop.auth; + +public enum Role { + ADMIN, + STAFF +} diff --git a/src/main/java/org/example/petshopdesktop/auth/UserSession.java b/src/main/java/org/example/petshopdesktop/auth/UserSession.java new file mode 100644 index 00000000..748c9546 --- /dev/null +++ b/src/main/java/org/example/petshopdesktop/auth/UserSession.java @@ -0,0 +1,44 @@ +package org.example.petshopdesktop.auth; + +public class UserSession { + + private static UserSession instance; + + private String username; + private Role role; + + private UserSession() {} + + public static UserSession getInstance() { + if (instance == null) { + instance = new UserSession(); + } + return instance; + } + + public void login(String username, Role role) { + this.username = username; + this.role = role; + } + + public void logout() { + this.username = null; + this.role = null; + } + + public String getUsername() { + return username; + } + + public Role getRole() { + return role; + } + + public boolean isAdmin() { + return Role.ADMIN.equals(role); + } + + public boolean isLoggedIn() { + return username != null && role != null; + } +} diff --git a/src/main/java/org/example/petshopdesktop/controllers/LoginController.java b/src/main/java/org/example/petshopdesktop/controllers/LoginController.java new file mode 100644 index 00000000..43bb3334 --- /dev/null +++ b/src/main/java/org/example/petshopdesktop/controllers/LoginController.java @@ -0,0 +1,67 @@ +package org.example.petshopdesktop.controllers; + +import javafx.event.ActionEvent; +import javafx.fxml.FXML; +import javafx.fxml.FXMLLoader; +import javafx.scene.Scene; +import javafx.scene.control.Label; +import javafx.scene.control.PasswordField; +import javafx.scene.control.TextField; +import javafx.stage.Stage; +import org.example.petshopdesktop.auth.UserSession; +import org.example.petshopdesktop.database.UserDB; +import org.example.petshopdesktop.models.User; + +import java.sql.SQLException; + +public class LoginController { + + @FXML + private TextField txtUsername; + + @FXML + private PasswordField txtPassword; + + @FXML + private Label lblError; + + @FXML + void btnLoginClicked(ActionEvent event) { + String username = txtUsername.getText().trim(); + String password = txtPassword.getText(); + + if (username.isEmpty() || password.isEmpty()) { + lblError.setText("Please enter username and password."); + return; + } + + try { + User user = UserDB.authenticate(username, password); + if (user == null) { + lblError.setText("Invalid username or password."); + txtPassword.clear(); + return; + } + + UserSession.getInstance().login(user.getUsername(), user.getRole()); + openMainLayout(); + + } catch (SQLException e) { + lblError.setText("Database error: " + e.getMessage()); + } + } + + private void openMainLayout() { + try { + FXMLLoader loader = new FXMLLoader( + getClass().getResource("/org/example/petshopdesktop/main-layout-view.fxml")); + Scene scene = new Scene(loader.load()); + Stage stage = (Stage) txtUsername.getScene().getWindow(); + stage.setScene(scene); + stage.setTitle("Pet Shop Manager"); + } catch (Exception e) { + lblError.setText("Error loading application: " + e.getMessage()); + e.printStackTrace(); + } + } +} diff --git a/src/main/java/org/example/petshopdesktop/controllers/MainLayoutController.java b/src/main/java/org/example/petshopdesktop/controllers/MainLayoutController.java index 431d38d4..3584a0cc 100644 --- a/src/main/java/org/example/petshopdesktop/controllers/MainLayoutController.java +++ b/src/main/java/org/example/petshopdesktop/controllers/MainLayoutController.java @@ -4,8 +4,12 @@ import javafx.event.ActionEvent; import javafx.fxml.FXML; import javafx.fxml.FXMLLoader; import javafx.scene.Parent; +import javafx.scene.Scene; import javafx.scene.control.Button; +import javafx.scene.control.Label; import javafx.scene.layout.StackPane; +import javafx.stage.Stage; +import org.example.petshopdesktop.auth.UserSession; public class MainLayoutController { @@ -18,6 +22,9 @@ public class MainLayoutController { @FXML private Button btnInventory; + @FXML + private Button btnLogout; + @FXML private Button btnPets; @@ -36,6 +43,12 @@ public class MainLayoutController { @FXML private Button btnSuppliers; + @FXML + private Label lblUsername; + + @FXML + private Label lblRole; + @FXML private StackPane spContentArea; @@ -93,11 +106,43 @@ public class MainLayoutController { updateButtons(btnSuppliers); } + @FXML + void btnLogoutClicked(ActionEvent event) { + UserSession.getInstance().logout(); + try { + FXMLLoader loader = new FXMLLoader( + getClass().getResource("/org/example/petshopdesktop/login-view.fxml")); + Scene scene = new Scene(loader.load()); + Stage stage = (Stage) btnLogout.getScene().getWindow(); + stage.setScene(scene); + stage.setTitle("Pet Shop Manager - Login"); + } catch (Exception e) { + System.err.println("Error loading login view: " + e.getMessage()); + e.printStackTrace(); + } + } + @FXML public void initialize() { + applyRBAC(); loadView("pet-view.fxml"); } + private void applyRBAC() { + UserSession session = UserSession.getInstance(); + + lblUsername.setText(session.getUsername()); + lblRole.setText(session.getRole().toString()); + + boolean isAdmin = session.isAdmin(); + btnInventory.setVisible(isAdmin); + btnInventory.setManaged(isAdmin); + btnSuppliers.setVisible(isAdmin); + btnSuppliers.setManaged(isAdmin); + btnProductSuppliers.setVisible(isAdmin); + btnProductSuppliers.setManaged(isAdmin); + } + /** * Load a view when a button is clicked on the navigation * @param fxmlFile the fxmlFile name to be loaded diff --git a/src/main/java/org/example/petshopdesktop/database/UserDB.java b/src/main/java/org/example/petshopdesktop/database/UserDB.java new file mode 100644 index 00000000..8909d211 --- /dev/null +++ b/src/main/java/org/example/petshopdesktop/database/UserDB.java @@ -0,0 +1,71 @@ +package org.example.petshopdesktop.database; + +import org.example.petshopdesktop.auth.Role; +import org.example.petshopdesktop.models.User; + +import java.sql.*; + +public class UserDB { + + /** + * Authenticate a user by username and password. + * Passwords are stored as SHA-256 hex digests in the database. + * + * @param username the username to authenticate + * @param password the plaintext password + * @return the User if credentials are valid, or null if authentication fails + */ + public static User authenticate(String username, String password) throws SQLException { + String sql = "SELECT user_id, username, role FROM users " + + "WHERE username = ? AND password_hash = SHA2(?, 256)"; + + try (Connection conn = ConnectionDB.getConnection(); + PreparedStatement ps = conn.prepareStatement(sql)) { + + ps.setString(1, username); + ps.setString(2, password); + + try (ResultSet rs = ps.executeQuery()) { + if (rs.next()) { + int userId = rs.getInt("user_id"); + String uname = rs.getString("username"); + Role role = Role.valueOf(rs.getString("role").toUpperCase()); + return new User(userId, uname, role); + } + } + } + return null; + } + + /** + * Create the users table and seed default admin/staff accounts if they do not exist. + * Passwords are stored as SHA2-256 hashes. + */ + public static void initializeTable() throws SQLException { + String createTable = """ + CREATE TABLE IF NOT EXISTS users ( + user_id INT AUTO_INCREMENT PRIMARY KEY, + username VARCHAR(100) NOT NULL UNIQUE, + password_hash CHAR(64) NOT NULL, + role ENUM('ADMIN','STAFF') NOT NULL + ) + """; + + String seedAdmin = """ + INSERT IGNORE INTO users (username, password_hash, role) + VALUES ('admin', SHA2('admin123', 256), 'ADMIN') + """; + + String seedStaff = """ + INSERT IGNORE INTO users (username, password_hash, role) + VALUES ('staff', SHA2('staff123', 256), 'STAFF') + """; + + try (Connection conn = ConnectionDB.getConnection(); + Statement st = conn.createStatement()) { + st.executeUpdate(createTable); + st.executeUpdate(seedAdmin); + st.executeUpdate(seedStaff); + } + } +} diff --git a/src/main/java/org/example/petshopdesktop/models/User.java b/src/main/java/org/example/petshopdesktop/models/User.java new file mode 100644 index 00000000..02089be4 --- /dev/null +++ b/src/main/java/org/example/petshopdesktop/models/User.java @@ -0,0 +1,27 @@ +package org.example.petshopdesktop.models; + +import org.example.petshopdesktop.auth.Role; + +public class User { + private int userId; + private String username; + private Role role; + + public User(int userId, String username, Role role) { + this.userId = userId; + this.username = username; + this.role = role; + } + + public int getUserId() { + return userId; + } + + public String getUsername() { + return username; + } + + public Role getRole() { + return role; + } +} diff --git a/src/main/resources/org/example/petshopdesktop/login-view.fxml b/src/main/resources/org/example/petshopdesktop/login-view.fxml new file mode 100644 index 00000000..65199c95 --- /dev/null +++ b/src/main/resources/org/example/petshopdesktop/login-view.fxml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/org/example/petshopdesktop/main-layout-view.fxml b/src/main/resources/org/example/petshopdesktop/main-layout-view.fxml index 9579dff6..983d07a9 100644 --- a/src/main/resources/org/example/petshopdesktop/main-layout-view.fxml +++ b/src/main/resources/org/example/petshopdesktop/main-layout-view.fxml @@ -16,12 +16,12 @@ - From bbf06456f5b12c4a35b02c88681116e0957fd002 Mon Sep 17 00:00:00 2001 From: Harkamal Randhawa Date: Sun, 22 Feb 2026 17:39:42 -0700 Subject: [PATCH 016/127] comments --- .../org/example/petshopdesktop/auth/Role.java | 7 +++++++ .../example/petshopdesktop/auth/UserSession.java | 15 +++++++++++++++ .../controllers/LoginController.java | 9 +++++++++ .../controllers/MainLayoutController.java | 13 +++++++++++++ .../example/petshopdesktop/database/UserDB.java | 9 +++++++++ 5 files changed, 53 insertions(+) diff --git a/src/main/java/org/example/petshopdesktop/auth/Role.java b/src/main/java/org/example/petshopdesktop/auth/Role.java index 64f38459..e631ddf7 100644 --- a/src/main/java/org/example/petshopdesktop/auth/Role.java +++ b/src/main/java/org/example/petshopdesktop/auth/Role.java @@ -1,6 +1,13 @@ package org.example.petshopdesktop.auth; +/* +Petshop Desktop +Purpose: Application role definitions used by session state and role based access control. +*/ public enum Role { + // Administrative access, includes system management screens. ADMIN, + + // Staff access, limited to day to day operational screens. STAFF } diff --git a/src/main/java/org/example/petshopdesktop/auth/UserSession.java b/src/main/java/org/example/petshopdesktop/auth/UserSession.java index 748c9546..2cc4538a 100644 --- a/src/main/java/org/example/petshopdesktop/auth/UserSession.java +++ b/src/main/java/org/example/petshopdesktop/auth/UserSession.java @@ -1,14 +1,24 @@ package org.example.petshopdesktop.auth; +/* +Petshop Desktop +Purpose: In memory session state for the authenticated user. +Notes: Session is process local and cleared on logout or application restart. +*/ public class UserSession { + // Singleton instance used to share session state across controllers. private static UserSession instance; + // Current authenticated username, null when logged out. private String username; + + // Current authenticated role, null when logged out. private Role role; private UserSession() {} + // Lazily initialised singleton accessor. public static UserSession getInstance() { if (instance == null) { instance = new UserSession(); @@ -16,11 +26,13 @@ public class UserSession { return instance; } + // Stores identity and role for the active session. public void login(String username, Role role) { this.username = username; this.role = role; } + // Clears session state and returns the application to an unauthenticated state. public void logout() { this.username = null; this.role = null; @@ -34,10 +46,13 @@ public class UserSession { return role; } + // Convenience check for administrative privileges. + // Role.ADMIN.equals(role) remains safe when role is null. public boolean isAdmin() { return Role.ADMIN.equals(role); } + // Session is considered active only when both username and role are set. public boolean isLoggedIn() { return username != null && role != null; } diff --git a/src/main/java/org/example/petshopdesktop/controllers/LoginController.java b/src/main/java/org/example/petshopdesktop/controllers/LoginController.java index 43bb3334..440c5686 100644 --- a/src/main/java/org/example/petshopdesktop/controllers/LoginController.java +++ b/src/main/java/org/example/petshopdesktop/controllers/LoginController.java @@ -14,6 +14,10 @@ import org.example.petshopdesktop.models.User; import java.sql.SQLException; +/* +Petshop Desktop +Purpose: Authentication controller responsible for validating credentials and initialising the user session. +*/ public class LoginController { @FXML @@ -27,15 +31,18 @@ public class LoginController { @FXML void btnLoginClicked(ActionEvent event) { + // Input normalisation keeps authentication behaviour consistent. String username = txtUsername.getText().trim(); String password = txtPassword.getText(); + // Basic validation to avoid unnecessary database calls. if (username.isEmpty() || password.isEmpty()) { lblError.setText("Please enter username and password."); return; } try { + // Credential verification returns a fully populated User on success. User user = UserDB.authenticate(username, password); if (user == null) { lblError.setText("Invalid username or password."); @@ -43,6 +50,7 @@ public class LoginController { return; } + // Session state is stored in memory for use by controllers and UI RBAC. UserSession.getInstance().login(user.getUsername(), user.getRole()); openMainLayout(); @@ -53,6 +61,7 @@ public class LoginController { private void openMainLayout() { try { + // View transition into the post login application shell. FXMLLoader loader = new FXMLLoader( getClass().getResource("/org/example/petshopdesktop/main-layout-view.fxml")); Scene scene = new Scene(loader.load()); diff --git a/src/main/java/org/example/petshopdesktop/controllers/MainLayoutController.java b/src/main/java/org/example/petshopdesktop/controllers/MainLayoutController.java index 3584a0cc..a910432e 100644 --- a/src/main/java/org/example/petshopdesktop/controllers/MainLayoutController.java +++ b/src/main/java/org/example/petshopdesktop/controllers/MainLayoutController.java @@ -11,6 +11,10 @@ import javafx.scene.layout.StackPane; import javafx.stage.Stage; import org.example.petshopdesktop.auth.UserSession; +/* +Petshop Desktop +Purpose: Main application shell controller, includes navigation and UI level role based access control. +*/ public class MainLayoutController { @FXML @@ -108,6 +112,7 @@ public class MainLayoutController { @FXML void btnLogoutClicked(ActionEvent event) { + // Logout clears session state before returning to the login view. UserSession.getInstance().logout(); try { FXMLLoader loader = new FXMLLoader( @@ -124,16 +129,22 @@ public class MainLayoutController { @FXML public void initialize() { + // RBAC state is applied once during initial layout load. applyRBAC(); + + // Default landing view after successful authentication. loadView("pet-view.fxml"); } private void applyRBAC() { UserSession session = UserSession.getInstance(); + // Session identity is displayed in the header for clarity and auditing. lblUsername.setText(session.getUsername()); lblRole.setText(session.getRole().toString()); + // UI level RBAC hides admin only navigation entries for non admin users. + // setManaged(false) removes the node from layout calculations to avoid empty spacing. boolean isAdmin = session.isAdmin(); btnInventory.setVisible(isAdmin); btnInventory.setManaged(isAdmin); @@ -141,6 +152,8 @@ public class MainLayoutController { btnSuppliers.setManaged(isAdmin); btnProductSuppliers.setVisible(isAdmin); btnProductSuppliers.setManaged(isAdmin); + + // Privileged operations should still be enforced within the relevant controllers and database methods. } /** diff --git a/src/main/java/org/example/petshopdesktop/database/UserDB.java b/src/main/java/org/example/petshopdesktop/database/UserDB.java index 8909d211..3b5f78b4 100644 --- a/src/main/java/org/example/petshopdesktop/database/UserDB.java +++ b/src/main/java/org/example/petshopdesktop/database/UserDB.java @@ -5,6 +5,10 @@ import org.example.petshopdesktop.models.User; import java.sql.*; +/* +Petshop Desktop +Purpose: User authentication and role lookup against the users table. +*/ public class UserDB { /** @@ -29,7 +33,11 @@ public class UserDB { if (rs.next()) { int userId = rs.getInt("user_id"); String uname = rs.getString("username"); + + // Role values are stored in the database as strings and normalised to match the enum. + // Table constraints limit role values, Role.valueOf is expected to be safe under normal operation. Role role = Role.valueOf(rs.getString("role").toUpperCase()); + return new User(userId, uname, role); } } @@ -51,6 +59,7 @@ public class UserDB { ) """; + // Default accounts support initial development and testing, credentials should be rotated or removed for deployment. String seedAdmin = """ INSERT IGNORE INTO users (username, password_hash, role) VALUES ('admin', SHA2('admin123', 256), 'ADMIN') From 1f784f72d166153b1ca5a69c0765058641ab29c3 Mon Sep 17 00:00:00 2001 From: Nikitha Date: Sun, 22 Feb 2026 18:21:22 -0700 Subject: [PATCH 017/127] appionmeent,service --- .../petshopdesktop/DTOs/ServiceDTO.java | 110 ++++++++++++++ .../controllers/AppointmentController.java | 77 +++++++++- .../controllers/ServiceController.java | 135 +++++++++++++----- .../AppointmentDialogController.java | 111 ++++++++++++++ .../ServiceDialogController.java | 98 +++++++++++++ .../database/AppointmentDB.java | 73 ++++++++++ .../petshopdesktop/database/ServiceDB.java | 120 ++++++++++++++++ .../petshopdesktop/models/Appointment.java | 40 ++++++ .../petshopdesktop/models/Service.java | 98 +++++++++++++ .../dialogviews/appointment-dialog-view.fxml | 11 +- 10 files changed, 835 insertions(+), 38 deletions(-) create mode 100644 src/main/java/org/example/petshopdesktop/DTOs/ServiceDTO.java create mode 100644 src/main/java/org/example/petshopdesktop/controllers/dialogcontrollers/AppointmentDialogController.java create mode 100644 src/main/java/org/example/petshopdesktop/controllers/dialogcontrollers/ServiceDialogController.java create mode 100644 src/main/java/org/example/petshopdesktop/database/AppointmentDB.java create mode 100644 src/main/java/org/example/petshopdesktop/database/ServiceDB.java create mode 100644 src/main/java/org/example/petshopdesktop/models/Appointment.java create mode 100644 src/main/java/org/example/petshopdesktop/models/Service.java diff --git a/src/main/java/org/example/petshopdesktop/DTOs/ServiceDTO.java b/src/main/java/org/example/petshopdesktop/DTOs/ServiceDTO.java new file mode 100644 index 00000000..c876cd3f --- /dev/null +++ b/src/main/java/org/example/petshopdesktop/DTOs/ServiceDTO.java @@ -0,0 +1,110 @@ +package org.example.petshopdesktop.DTOs; + +import javafx.beans.property.SimpleDoubleProperty; +import javafx.beans.property.SimpleIntegerProperty; +import javafx.beans.property.SimpleStringProperty; +import org.example.petshopdesktop.models.Service; + +/** + * The class for ServiceDTO, all service data stored here + */ +public class ServiceDTO { + + private SimpleIntegerProperty serviceId; + private SimpleStringProperty serviceName; + private SimpleStringProperty serviceDesc; + private SimpleIntegerProperty serviceDuration; + private SimpleDoubleProperty servicePrice; + + // constructor + public ServiceDTO(int serviceId, + String serviceName, + String serviceDesc, + int serviceDuration, + double servicePrice) { + + this.serviceId = new SimpleIntegerProperty(serviceId); + this.serviceName = new SimpleStringProperty(serviceName); + this.serviceDesc = new SimpleStringProperty(serviceDesc); + this.serviceDuration = new SimpleIntegerProperty(serviceDuration); + this.servicePrice = new SimpleDoubleProperty(servicePrice); + } + + // getters & setters + + public int getServiceId() { + return serviceId.get(); + } + + public SimpleIntegerProperty serviceIdProperty() { + return serviceId; + } + + public void setServiceId(int serviceId) { + this.serviceId.set(serviceId); + } + + public String getServiceName() { + return serviceName.get(); + } + + public SimpleStringProperty serviceNameProperty() { + return serviceName; + } + + public void setServiceName(String serviceName) { + this.serviceName.set(serviceName); + } + + public String getServiceDesc() { + return serviceDesc.get(); + } + + public SimpleStringProperty serviceDescProperty() { + return serviceDesc; + } + + public void setServiceDesc(String serviceDesc) { + this.serviceDesc.set(serviceDesc); + } + + public int getServiceDuration() { + return serviceDuration.get(); + } + + public SimpleIntegerProperty serviceDurationProperty() { + return serviceDuration; + } + + public void setServiceDuration(int serviceDuration) { + this.serviceDuration.set(serviceDuration); + } + + public double getServicePrice() { + return servicePrice.get(); + } + + public SimpleDoubleProperty servicePriceProperty() { + return servicePrice; + } + + public void setServicePrice(double servicePrice) { + this.servicePrice.set(servicePrice); + } + + /** + * Converts DTO into Service model (for edit/delete) + */ + public Service toService() { + + Service service = new Service( + getServiceId(), + getServiceName(), + getServiceDesc(), + getServiceDuration(), + getServicePrice() + ); + + return service; + } +} \ No newline at end of file diff --git a/src/main/java/org/example/petshopdesktop/controllers/AppointmentController.java b/src/main/java/org/example/petshopdesktop/controllers/AppointmentController.java index 9eb6dfce..3d5f6d13 100644 --- a/src/main/java/org/example/petshopdesktop/controllers/AppointmentController.java +++ b/src/main/java/org/example/petshopdesktop/controllers/AppointmentController.java @@ -6,9 +6,39 @@ import javafx.scene.control.Button; import javafx.scene.control.TableColumn; import javafx.scene.control.TableView; import javafx.scene.control.TextField; +import javafx.collections.FXCollections; +import javafx.collections.ObservableList; + +import javafx.fxml.FXMLLoader; +import javafx.scene.Parent; +import javafx.scene.Scene; +import javafx.stage.Stage; + +import java.io.IOException; +import org.example.petshopdesktop.database.AppointmentDB; +import org.example.petshopdesktop.models.Appointment; + public class AppointmentController { + + private ObservableList appointments = + FXCollections.observableArrayList(); + + @FXML + + + public void initialize() { + loadAppointments(); + } + + + + private void loadAppointments() { + appointments.setAll(AppointmentDB.getAllAppointments()); + tvAppointments.setItems(appointments); + } + @FXML private Button btnAdd; @@ -40,7 +70,7 @@ public class AppointmentController { private TableColumn colServiceName; @FXML - private TableView tvAppointments; + private TableView tvAppointments; @FXML private TextField txtSearch; @@ -48,16 +78,61 @@ public class AppointmentController { @FXML void btnAddClicked(ActionEvent event) { + try { + FXMLLoader loader = new FXMLLoader( + getClass().getResource("/appointment-dialog-view.fxml") + ); + + Stage stage = new Stage(); + stage.setScene(new Scene(loader.load())); + stage.showAndWait(); + + loadAppointments(); + + } catch (Exception e) { + e.printStackTrace(); + } } @FXML void btnDeleteClicked(ActionEvent event) { + Appointment selected = tvAppointments.getSelectionModel().getSelectedItem(); + + if (selected == null) return; + + try { + AppointmentDB.deleteAppointment( + selected.getAppointmentId() + ); + loadAppointments(); + } catch (Exception e) { + e.printStackTrace(); + } } @FXML void btnEditClicked(ActionEvent event) { + Appointment selected = tvAppointments.getSelectionModel().getSelectedItem(); + + if (selected == null) return; + + try { + FXMLLoader loader = new FXMLLoader( + getClass().getResource("/appointment-dialog-view.fxml") + ); + + Stage stage = new Stage(); + stage.setScene(new Scene(loader.load())); + stage.showAndWait(); + + loadAppointments(); + + } catch (Exception e) { + e.printStackTrace(); + } } } + diff --git a/src/main/java/org/example/petshopdesktop/controllers/ServiceController.java b/src/main/java/org/example/petshopdesktop/controllers/ServiceController.java index 65f73c7d..d0c361f7 100644 --- a/src/main/java/org/example/petshopdesktop/controllers/ServiceController.java +++ b/src/main/java/org/example/petshopdesktop/controllers/ServiceController.java @@ -2,56 +2,123 @@ package org.example.petshopdesktop.controllers; import javafx.event.ActionEvent; import javafx.fxml.FXML; -import javafx.scene.control.Button; -import javafx.scene.control.TableColumn; -import javafx.scene.control.TableView; -import javafx.scene.control.TextField; +import javafx.fxml.FXMLLoader; +import javafx.scene.Parent; +import javafx.scene.Scene; +import javafx.scene.control.*; +import javafx.scene.control.cell.PropertyValueFactory; +import javafx.stage.Stage; +import org.example.petshopdesktop.database.ServiceDB; +import org.example.petshopdesktop.models.Service; +import org.example.petshopdesktop.controllers.dialogcontrollers.ServiceDialogController; public class ServiceController { - @FXML - private Button btnAdd; + @FXML private Button btnAdd; + @FXML private Button btnDelete; + @FXML private Button btnEdit; + + @FXML private TableColumn colServiceId; + @FXML private TableColumn colServiceName; + @FXML private TableColumn colServiceDesc; + @FXML private TableColumn colServiceDuration; + @FXML private TableColumn colServicePrice; + + @FXML private TableView tvServices; + + @FXML private TextField txtSearch; @FXML - private Button btnDelete; + public void initialize() { - @FXML - private Button btnEdit; + colServiceId.setCellValueFactory(new PropertyValueFactory<>("serviceId")); + colServiceName.setCellValueFactory(new PropertyValueFactory<>("serviceName")); + colServiceDesc.setCellValueFactory(new PropertyValueFactory<>("serviceDesc")); + colServiceDuration.setCellValueFactory(new PropertyValueFactory<>("serviceDuration")); + colServicePrice.setCellValueFactory(new PropertyValueFactory<>("servicePrice")); - @FXML - private TableColumn colServiceDesc; + loadServices(); + } - @FXML - private TableColumn colServiceDuration; + private void loadServices() { + try { + tvServices.setItems(ServiceDB.getServices()); + } catch (Exception e) { + showAlert("Database Error", "Unable to load services."); + e.printStackTrace(); + } + } - @FXML - private TableColumn colServiceId; - - @FXML - private TableColumn colServiceName; - - @FXML - private TableColumn colServicePrice; - - @FXML - private TableView tvServices; - - @FXML - private TextField txtSearch; @FXML void btnAddClicked(ActionEvent event) { - - } - - @FXML - void btnDeleteClicked(ActionEvent event) { - + openDialog(null); + loadServices(); } @FXML void btnEditClicked(ActionEvent event) { + Service selected = tvServices.getSelectionModel().getSelectedItem(); + + if (selected == null) { + showAlert("Select Service", "Please select a service to edit."); + return; + } + + openDialog(selected); + loadServices(); } -} + @FXML + void btnDeleteClicked(ActionEvent event) { + + Service selected = tvServices.getSelectionModel().getSelectedItem(); + + if (selected == null) { + showAlert("Select Service", "Please select a service to delete."); + return; + } + + try { + ServiceDB.deleteService(selected.getServiceId()); + loadServices(); + } catch (Exception e) { + showAlert("Database Error", "Unable to delete service."); + e.printStackTrace(); + } + } + + private void openDialog(Service service) { + + try { + FXMLLoader loader = new FXMLLoader( + getClass().getResource( + "/org.example.petshopdesktop/dialogviews/ServiceDialogView.fxml" + ) + ); + + Parent root = loader.load(); + + // IMPORTANT: specify controller type + ServiceDialogController controller = + loader.getController(); + + controller.setService(service); + + Stage stage = new Stage(); + stage.setScene(new Scene(root)); + stage.showAndWait(); + + } catch (Exception e) { + e.printStackTrace(); + } + } + private void showAlert(String title, String msg) { + Alert alert = new Alert(Alert.AlertType.INFORMATION); + alert.setTitle(title); + alert.setHeaderText(null); + alert.setContentText(msg); + alert.showAndWait(); + } +} \ No newline at end of file diff --git a/src/main/java/org/example/petshopdesktop/controllers/dialogcontrollers/AppointmentDialogController.java b/src/main/java/org/example/petshopdesktop/controllers/dialogcontrollers/AppointmentDialogController.java new file mode 100644 index 00000000..af607180 --- /dev/null +++ b/src/main/java/org/example/petshopdesktop/controllers/dialogcontrollers/AppointmentDialogController.java @@ -0,0 +1,111 @@ +package org.example.petshopdesktop.controllers.dialogcontrollers; + +import javafx.collections.FXCollections; +import javafx.collections.ObservableList; +import javafx.event.EventHandler; +import javafx.fxml.FXML; +import javafx.scene.Node; +import javafx.scene.control.Button; +import javafx.scene.control.ComboBox; +import javafx.scene.control.DatePicker; +import javafx.scene.control.Label; +import javafx.scene.input.MouseEvent; +import javafx.stage.Stage; + +import org.example.petshopdesktop.database.AppointmentDB; +import org.example.petshopdesktop.models.Appointment; + +import java.sql.Time; + +public class AppointmentDialogController { + + @FXML + private Button btnCancel; + + @FXML + private Button btnSave; + + @FXML + private ComboBox cbAppointmentStatus; + + @FXML + private ComboBox