Skip to content
Snippets Groups Projects
Commit 08e0ceb4 authored by Muhammad Zahid's avatar Muhammad Zahid
Browse files

Initial commit

parents
No related branches found
No related tags found
No related merge requests found
Showing
with 994 additions and 0 deletions
HELP.md
.gradle
build/
!gradle/wrapper/gradle-wrapper.jar
!**/src/main/**/build/
!**/src/test/**/build/
### STS ###
.apt_generated
.classpath
.factorypath
.project
.settings
.springBeans
.sts4-cache
bin/
!**/src/main/**/bin/
!**/src/test/**/bin/
### IntelliJ IDEA ###
.idea
*.iws
*.iml
*.ipr
out/
!**/src/main/**/out/
!**/src/test/**/out/
### NetBeans ###
/nbproject/private/
/nbbuild/
/dist/
/nbdist/
/.nb-gradle/
### VS Code ###
.vscode/
# AssessmentTrackingTest
## Getting started
To make it easy for you to get started with GitLab, here's a list of recommended next steps.
Already a pro? Just edit this README.md and make it your own. Want to make it easy? [Use the template at the bottom](#editing-this-readme)!
## Add your files
- [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files
- [ ] [Add files using the command line](https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command:
```
cd existing_repo
git remote add origin https://git.cardiff.ac.uk/scmimc/assessmenttrackingtest.git
git branch -M main
git push -uf origin main
```
## Integrate with your tools
- [ ] [Set up project integrations](https://git.cardiff.ac.uk/scmimc/assessmenttrackingtest/-/settings/integrations)
## Collaborate with your team
- [ ] [Invite team members and collaborators](https://docs.gitlab.com/ee/user/project/members/)
- [ ] [Create a new merge request](https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html)
- [ ] [Automatically close issues from merge requests](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically)
- [ ] [Enable merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/)
- [ ] [Set auto-merge](https://docs.gitlab.com/ee/user/project/merge_requests/merge_when_pipeline_succeeds.html)
## Test and Deploy
Use the built-in continuous integration in GitLab.
- [ ] [Get started with GitLab CI/CD](https://docs.gitlab.com/ee/ci/quick_start/index.html)
- [ ] [Analyze your code for known vulnerabilities with Static Application Security Testing(SAST)](https://docs.gitlab.com/ee/user/application_security/sast/)
- [ ] [Deploy to Kubernetes, Amazon EC2, or Amazon ECS using Auto Deploy](https://docs.gitlab.com/ee/topics/autodevops/requirements.html)
- [ ] [Use pull-based deployments for improved Kubernetes management](https://docs.gitlab.com/ee/user/clusters/agent/)
- [ ] [Set up protected environments](https://docs.gitlab.com/ee/ci/environments/protected_environments.html)
***
# Editing this README
When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!). Thank you to [makeareadme.com](https://www.makeareadme.com/) for this template.
## Suggestions for a good README
Every project is different, so consider which of these sections apply to yours. The sections used in the template are suggestions for most open source projects. Also keep in mind that while a README can be too long and detailed, too long is better than too short. If you think your README is too long, consider utilizing another form of documentation rather than cutting out information.
## Name
Choose a self-explaining name for your project.
## Description
Let people know what your project can do specifically. Provide context and add a link to any reference visitors might be unfamiliar with. A list of Features or a Background subsection can also be added here. If there are alternatives to your project, this is a good place to list differentiating factors.
## Badges
On some READMEs, you may see small images that convey metadata, such as whether or not all the tests are passing for the project. You can use Shields to add some to your README. Many services also have instructions for adding a badge.
## Visuals
Depending on what you are making, it can be a good idea to include screenshots or even a video (you'll frequently see GIFs rather than actual videos). Tools like ttygif can help, but check out Asciinema for a more sophisticated method.
## Installation
Within a particular ecosystem, there may be a common way of installing things, such as using Yarn, NuGet, or Homebrew. However, consider the possibility that whoever is reading your README is a novice and would like more guidance. Listing specific steps helps remove ambiguity and gets people to using your project as quickly as possible. If it only runs in a specific context like a particular programming language version or operating system or has dependencies that have to be installed manually, also add a Requirements subsection.
## Usage
Use examples liberally, and show the expected output if you can. It's helpful to have inline the smallest example of usage that you can demonstrate, while providing links to more sophisticated examples if they are too long to reasonably include in the README.
## Support
Tell people where they can go to for help. It can be any combination of an issue tracker, a chat room, an email address, etc.
## Roadmap
If you have ideas for releases in the future, it is a good idea to list them in the README.
## Contributing
State if you are open to contributions and what your requirements are for accepting them.
For people who want to make changes to your project, it's helpful to have some documentation on how to get started. Perhaps there is a script that they should run or some environment variables that they need to set. Make these steps explicit. These instructions could also be useful to your future self.
You can also document commands to lint the code or run tests. These steps help to ensure high code quality and reduce the likelihood that the changes inadvertently break something. Having instructions for running tests is especially helpful if it requires external setup, such as starting a Selenium server for testing in a browser.
## Authors and acknowledgment
Show your appreciation to those who have contributed to the project.
## License
For open source projects, say how it is licensed.
## Project status
If you have run out of energy or time for your project, put a note at the top of the README saying that development has slowed down or stopped completely. Someone may choose to fork your project or volunteer to step in as a maintainer or owner, allowing your project to keep going. You can also make an explicit request for maintainers.
plugins {
id 'java'
id 'org.springframework.boot' version '3.2.0'
id 'io.spring.dependency-management' version '1.1.4'
id 'jacoco'
}
group = 'uk.ac.cf.cs'
version = '0.0.1-SNAPSHOT'
java {
sourceCompatibility = '17'
}
configurations {
compileOnly {
extendsFrom annotationProcessor
}
}
repositories {
mavenCentral()
}
dependencies {
implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.springframework.boot:spring-boot-starter-validation'
implementation 'org.springframework.boot:spring-boot-starter-jdbc'
//from https://mariadb.com/kb/en/java-connector-using-gradle/
implementation 'org.mariadb.jdbc:mariadb-java-client:2.1.2'
implementation 'junit:junit:4.12'
compileOnly 'org.projectlombok:lombok'
developmentOnly 'org.springframework.boot:spring-boot-devtools'
annotationProcessor 'org.projectlombok:lombok'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
testImplementation 'com.h2database:h2'
testImplementation group: 'net.sourceforge.htmlunit', name: 'htmlunit', version: '2.32'
testImplementation group: 'org.seleniumhq.selenium', name: 'selenium-java', version: '4.1.0'
}
jar{ enabled = true }
tasks.named('test') {
useJUnitPlatform()
}
data.sql 0 → 100644
use assessmenttracker;
insert into modules (moduleName, moduleNumber, startYear) values ( 'WebApps', 'CMT612', 2023);
insert into modules (moduleName, moduleNumber, startYear) values ( 'Agile', 'CMT611', 2023);
insert into modules (moduleName, moduleNumber, startYear) values ( 'SDS1', 'CM6113', 2023);
insert into modules (moduleName, moduleNumber, startYear) values ( 'CompThinking', 'CM6114', 2023);
insert into modules (moduleName, moduleNumber, startYear) values ( 'WebApps', 'CMT612', 2024);
insert into users (firstName, lastName) values ( 'Ian', 'Cooper');
insert into users (firstName, lastName) values ( 'Ban', 'Booper');
insert into users (firstName, lastName) values ( 'Dan', 'Dooper');
insert into users (firstName, lastName) values ( 'Ean', 'Eooper');
insert into moduleLeaders (userID, moduleID) values ( '1', '1');
insert into moduleLeaders (userID, moduleID) values ( '1', '2');
insert into moduleLeaders (userID, moduleID) values ( '1', '4');
insert into moduleModerators (userID, moduleID) values ( '2', '1');
insert into moduleModerators (userID, moduleID) values ( '2', '2');
insert into moduleModerators (userID, moduleID) values ( '3', '4');
insert into moduleModerators (userID, moduleID) values ( '1', '3');
insert into assessmentStatus (moduleID, weighting, assessmentName, assessmentReady,readyDate,intModerated)
values (1, 40, 'initial assessment', true, '2023-12-25', false);
insert into assessmentStatus (moduleID, weighting, assessmentName, assessmentReady,readyDate,intModerated)
values (1, 60, 'secondAssessment', true, '2023-12-25', false);
insert into assessmentStatus (moduleID,weighting, assessmentName, assessmentReady, readyDate,intModerated, intModeratedDate,intModComments)
values (2, 100, 'onlyAssessment', true, '2023-12-25', true, '2023-12-25', 'the assessment needs more work');
insert into assessmentStatus (moduleID,weighting, assessmentName)
values (3, 100, 'onlyAssessmentforthis module');
\ No newline at end of file
File added
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
gradlew 0 → 100644
#!/bin/sh
#
# Copyright © 2015-2021 the original authors.
#
# Licensed 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.
#
##############################################################################
#
# Gradle start up script for POSIX generated by Gradle.
#
# Important for running:
#
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
# noncompliant, but you have some other compliant shell such as ksh or
# bash, then to run this script, type that shell name before the whole
# command line, like:
#
# ksh Gradle
#
# Busybox and similar reduced shells will NOT work, because this script
# requires all of these POSIX shell features:
# * functions;
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
# * compound commands having a testable exit status, especially «case»;
# * various built-in commands including «command», «set», and «ulimit».
#
# Important for patching:
#
# (2) This script targets any POSIX shell, so it avoids extensions provided
# by Bash, Ksh, etc; in particular arrays are avoided.
#
# The "traditional" practice of packing multiple parameters into a
# space-separated string is a well documented source of bugs and security
# problems, so this is (mostly) avoided, by progressively accumulating
# options in "$@", and eventually passing that to Java.
#
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
# see the in-line comments for details.
#
# There are tweaks for specific operating systems such as AIX, CygWin,
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
#
##############################################################################
# Attempt to set APP_HOME
# Resolve links: $0 may be a link
app_path=$0
# Need this for daisy-chained symlinks.
while
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
[ -h "$app_path" ]
do
ls=$( ls -ld "$app_path" )
link=${ls#*' -> '}
case $link in #(
/*) app_path=$link ;; #(
*) app_path=$APP_HOME$link ;;
esac
done
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
warn () {
echo "$*"
} >&2
die () {
echo
echo "$*"
echo
exit 1
} >&2
# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
case "$( uname )" in #(
CYGWIN* ) cygwin=true ;; #(
Darwin* ) darwin=true ;; #(
MSYS* | MINGW* ) msys=true ;; #(
NONSTOP* ) nonstop=true ;;
esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM.
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
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD=java
if ! command -v java >/dev/null 2>&1
then
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
fi
# Increase the maximum file descriptors if we can.
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC2039,SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
fi
# Collect all arguments for the java command, stacking in reverse order:
# * args from the command line
# * the main class name
# * -classpath
# * -D...appname settings
# * --module-path (only if needed)
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
# For Cygwin or MSYS, switch paths to Windows format before running java
if "$cygwin" || "$msys" ; then
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
JAVACMD=$( cygpath --unix "$JAVACMD" )
# Now convert the arguments - kludge to limit ourselves to /bin/sh
for arg do
if
case $arg in #(
-*) false ;; # don't mess with options #(
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
[ -e "$t" ] ;; #(
*) false ;;
esac
then
arg=$( cygpath --path --ignore --mixed "$arg" )
fi
# Roll the args list around exactly as many times as the number of
# args, so each arg winds up back in the position where it started, but
# possibly modified.
#
# NB: a `for` loop captures its iteration list before it begins, so
# changing the positional parameters here affects neither the number of
# iterations, nor the values presented in `arg`.
shift # remove old arg
set -- "$@" "$arg" # push replacement arg
done
fi
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.
set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
-classpath "$CLASSPATH" \
org.gradle.wrapper.GradleWrapperMain \
"$@"
# Stop when "xargs" is not available.
if ! command -v xargs >/dev/null 2>&1
then
die "xargs is not available"
fi
# Use "xargs" to parse quoted args.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
#
# In Bash we could simply go:
#
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
# set -- "${ARGS[@]}" "$@"
#
# but POSIX shell has neither arrays nor command substitution, so instead we
# post-process each arg (as a line of input to sed) to backslash-escape any
# character that might be a shell metacharacter, then use eval to reverse
# that process (while maintaining the separation between arguments), and wrap
# the whole thing up as a single "set" statement.
#
# This will of course break if any of these variables contains a newline or
# an unmatched quote.
#
eval "set -- $(
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
xargs -n1 |
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
tr '\n' ' '
)" '"$@"'
exec "$JAVACMD" "$@"
@rem
@rem Copyright 2015 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem 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, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem
@rem ##########################################################################
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0
if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto execute
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:execute
@rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
:end
@rem End local scope for the variables with windows NT shell
if %ERRORLEVEL% equ 0 goto mainEnd
:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
set EXIT_CODE=%ERRORLEVEL%
if %EXIT_CODE% equ 0 set EXIT_CODE=1
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
exit /b %EXIT_CODE%
:mainEnd
if "%OS%"=="Windows_NT" endlocal
:omega
use assessmenttracker;
drop table if exists moduleLeaders;
drop table if exists moduleModerators;
drop table if exists assessmentStatus;
drop table if exists modules;
drop table if exists users;
create table if not exists modules (
id bigint auto_increment primary key,
moduleName varchar(128),
moduleNumber varchar(128),
startYear int
);
create table if not exists users (
id bigint auto_increment primary key,
emailAddress varchar(320) unique,
firstName varchar(128),
lastName varchar(128)
);
create table if not exists moduleLeaders (
userID bigint,
moduleID bigint,
foreign key (userID) references users(id),
foreign key (moduleID) references modules(id)
);
create table if not exists moduleModerators (
userID bigint,
moduleID bigint,
foreign key (userID) references users(id),
foreign key (moduleID) references modules(id)
);
create table if not exists assessmentStatus (
id bigint auto_increment primary key,
moduleID bigint,
weighting int,
assessmentName varchar(1000),
assessmentReady boolean,
readyDate date,
intModerated boolean,
intModeratedDate date,
intModComments varchar(10000)
);
\ No newline at end of file
rootProject.name = 'assessmenttracker'
package uk.ac.cf.cs.assessmenttracker;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication
public class AssessmenttrackerApplication {
public static void main(String[] args) {
SpringApplication.run(AssessmenttrackerApplication.class, args);
}
}
package uk.ac.cf.cs.assessmenttracker;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;
@Data
@Configuration
@ConfigurationProperties("app.property")
public class Config {
private int defaultStartYear;
public int getDefaultStartYear() {
return defaultStartYear;
}
public void setDefaultStartYear(Integer aDefaultStartYear){
this.defaultStartYear = aDefaultStartYear;
}
}
package uk.ac.cf.cs.assessmenttracker.assessment;
import jakarta.validation.constraints.NotEmpty;
import lombok.AllArgsConstructor;
import lombok.Data;
import java.sql.Date;
@Data
@AllArgsConstructor
public class Assessment {
private int id;
private int moduleID;
private int weighting;
private String assessmentName;
private boolean assessmentReady;
@NotEmpty(message = "The ready date cannot be empty please use the original date of first moderation")
private Date readyDate;
private boolean intModerated;
private Date intModeratedDate;
private String intModComments;
public Assessment(){}
public Assessment(int aModuleID){
this.moduleID = aModuleID;
}
public Assessment(int aId, String aAssessmentName){
this.id = aId;
this.assessmentName = aAssessmentName;
}
}
package uk.ac.cf.cs.assessmenttracker.assessment;
import lombok.AllArgsConstructor;
import lombok.Data;
import uk.ac.cf.cs.assessmenttracker.modules.Module;
import java.util.List;
@Data
@AllArgsConstructor
public class AssessmentAndModule {
List<Assessment> assessments;
Module module;
public AssessmentAndModule(Assessment aAssessment) {
this.assessments = List.of(aAssessment);
}
public AssessmentAndModule(Assessment aAssessment, Module aModule) {
assessments = List.of(aAssessment);
module = aModule;
}
}
package uk.ac.cf.cs.assessmenttracker.assessment;
import jakarta.validation.Valid;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.servlet.ModelAndView;
import uk.ac.cf.cs.assessmenttracker.modules.ModuleService;
import uk.ac.cf.cs.assessmenttracker.modules.Module;
import java.util.List;
@Controller
public class AssessmentController {
private ModuleService moduleService;
private AssessmentService assessmentService;
public AssessmentController(ModuleService aModuleService, AssessmentService aAssessmentService) {
this.moduleService = aModuleService;
this.assessmentService = aAssessmentService;
}
@GetMapping("/assessment")
public ModelAndView getModulesAndAllAssociatedAssessments() {
ModelAndView modelAndView = new ModelAndView("assessments/moduleAssessmentList");
List<AssessmentAndModule> aNmList = assessmentService.getAllModulesWithAssessments();
modelAndView.addObject("modules", aNmList);
return modelAndView;
}
@GetMapping("/assessment/start/{startYear}")
public ModelAndView getModulesAndAllAssociatedAssessmentsStartYear(@PathVariable("startYear") int startYear) {
ModelAndView modelAndView = new ModelAndView("assessments/moduleAssessmentList");
List<AssessmentAndModule> aNmList = assessmentService.getAllModulesWithAssessments(startYear);
modelAndView.addObject("modules", aNmList);
return modelAndView;
}
@GetMapping("/assessment/{assessmentid}")
public ModelAndView getModule(@PathVariable("assessmentid") int assessmentid) {
ModelAndView modelAndView = new ModelAndView();
AssessmentAndModule aNm = assessmentService.getAssessmentAndModuleByAssessmentID(assessmentid);
if (aNm.module == null){
modelAndView.setViewName("errors/resourceNotFound");
} else {
modelAndView.setViewName("assessments/assessmentDetails");
modelAndView.addObject("module", aNm.module);
modelAndView.addObject("assessment", aNm.assessments.get(0));
}
return modelAndView;
}
//This works because the assessment ID is currently the module ID - if this changes there will be a problem.
@GetMapping("/assessment/ready/{assessmentid}")
public ModelAndView getReadyForm(@PathVariable("assessmentid") int assessmentid) {
ModelAndView modelAndView = new ModelAndView("assessments/ready");
Assessment assessment = moduleService.getModuleAssessment(assessmentid); // maybe change to AssessmentService method later?
Module module = moduleService.getModule(assessmentid);
modelAndView.addObject("assessment", assessment);
modelAndView.addObject("module", module);
return modelAndView;
}
//This works because the assessment ID is currently the module ID - if this changes there will be a problem.
@GetMapping("/assessment/moderatorReview/{assessmentid}")
public ModelAndView getIntReviewForm(@PathVariable("assessmentid") int assessmentid) {
ModelAndView modelAndView = new ModelAndView("assessments/moderatorReview");
AssessmentAndModule aNm = assessmentService.getAssessmentAndModuleByAssessmentID(assessmentid);
modelAndView.addObject("assessment", aNm.getAssessments().get(0));
modelAndView.addObject("module", aNm.getModule() );
System.out.println(aNm.getModule()+" "+ aNm.getAssessments().get(0).getModuleID());
return modelAndView;
}
@PostMapping("/assessment/moderatorReview/{assessmentid}")
public ModelAndView submitForm(@Valid @ModelAttribute("moderatorReview") ModeratorReview moderatorReview,
BindingResult bindingResult, Model model,
@PathVariable("assessmentid") int assessmentid){
if (bindingResult.hasErrors()) {
ModelAndView modelAndView = new ModelAndView("assessments/moderatorReview", model.asMap());
AssessmentAndModule aNm = assessmentService.getAssessmentAndModuleByAssessmentID(assessmentid);
modelAndView.addObject("assessment", aNm.getAssessments().get(0));
modelAndView.addObject("module", aNm.getModule() );
System.out.println("Errors"+ assessmentid );
return modelAndView;
}
System.out.println(moderatorReview);
assessmentService.saveModeratorReview(moderatorReview);
ModelAndView modelAndView = new ModelAndView("redirect:/assessment/"+moderatorReview.getId());
return modelAndView;
}
@PostMapping("/assessment/ready/{assessmentid}")
public ModelAndView submitForm(@Valid @ModelAttribute("review") AssessmentReady assessmentReady,
BindingResult bindingResult, Model model,
@PathVariable("assessmentid") int assessmentid){
if (bindingResult.hasErrors()) {
ModelAndView modelAndView = new ModelAndView("assessments/ready", model.asMap());
AssessmentAndModule aNm = assessmentService.getAssessmentAndModuleByAssessmentID(assessmentid);
modelAndView.addObject("assessment", aNm.getAssessments().get(0));
modelAndView.addObject("module", aNm.getModule() );
System.out.println("Errors");
return modelAndView;
}
System.out.println(assessmentReady);
assessmentService.saveAssessmentReady(assessmentReady);
ModelAndView modelAndView = new ModelAndView("redirect:/assessment/"+assessmentReady.getId());
return modelAndView;
}
}
package uk.ac.cf.cs.assessmenttracker.assessment;
import lombok.AllArgsConstructor;
import lombok.Data;
import java.sql.Date;
@Data
@AllArgsConstructor
public class AssessmentReady {
private int id;
private boolean assessmentReady;
private Date readyDate;
}
package uk.ac.cf.cs.assessmenttracker.assessment;
import org.springframework.stereotype.Repository;
import uk.ac.cf.cs.assessmenttracker.modules.Module;
import java.util.List;
public interface AssessmentRepository {
Assessment getAssessment(int moduleid);
List<Assessment> getAssessments(int moduleid);
void saveAssessmentReady(AssessmentReady assessmentReady);
void saveModeratorReview(ModeratorReview moderatorReview);
}
package uk.ac.cf.cs.assessmenttracker.assessment;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.core.RowMapper;
import org.springframework.stereotype.Repository;
import java.util.List;
@Repository
public class AssessmentRepositoryJDBC implements AssessmentRepository{
private JdbcTemplate jdbc;
private RowMapper<Assessment> assessmentMapper;
public AssessmentRepositoryJDBC(JdbcTemplate aJdbc) {
this.jdbc = aJdbc;
setAssessmentMapper();
}
private void setAssessmentMapper() {
assessmentMapper = (rs, i) -> new Assessment(
rs.getInt("id"),
rs.getInt("moduleID"),
rs.getInt("weighting"),
rs.getString("assessmentName"),
rs.getBoolean("assessmentReady"),
rs.getDate("readyDate"),
rs.getBoolean("intModerated"),
rs.getDate("intModeratedDate"),
rs.getString("intModComments")
);
}
@Override
public void saveAssessmentReady(AssessmentReady assessmentReady) {
int id = assessmentReady.getId();
String updateSql = "update assessmentStatus set assessmentReady=?, readyDate = ? where id = ?";
String insertSql = "insert into assessmentStatus (assessmentReady, readyDate, id) Values(?,?,?)";
String checkSQL = "select count(*) from assessmentStatus where iD = ?";
Integer results = jdbc.queryForObject(checkSQL, Integer.class, id);
if (results.intValue() == 1) {
jdbc.update(updateSql, assessmentReady.isAssessmentReady(),
assessmentReady.getReadyDate(),
assessmentReady.getId());
} else {
jdbc.update(insertSql, assessmentReady.isAssessmentReady(),
assessmentReady.getReadyDate(),
assessmentReady.getId());
}
}
@Override
public List<Assessment> getAssessments(int moduleID) {
String sql = "select * from assessmentStatus where moduleID = ?";
return jdbc.query(sql, assessmentMapper, moduleID);
}
@Override
public Assessment getAssessment(int id) {
String checkSQL = "select count(*) from assessmentStatus where id= ?";
Integer results = jdbc.queryForObject(checkSQL, Integer.class, id);
if (results.intValue() == 1){
String sql = "select * from assessmentStatus where id = ?";
return jdbc.queryForObject(sql, assessmentMapper, id);
} else {
return new Assessment(id);
}
}
@Override
public void saveModeratorReview(ModeratorReview moderatorReview) {
String sql = "update assessmentStatus set " +
"intModerated = ?, " +
"intModeratedDate= ?, " +
"intModComments = ? " +
"where id = ?";
jdbc.update(sql, moderatorReview.isIntModerated(),
moderatorReview.getIntModeratedDate(),
moderatorReview.getIntModComments(),
moderatorReview.getId());
}
}
package uk.ac.cf.cs.assessmenttracker.assessment;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import uk.ac.cf.cs.assessmenttracker.Config;
import uk.ac.cf.cs.assessmenttracker.modules.Module;
import uk.ac.cf.cs.assessmenttracker.modules.ModuleRepository;
import java.util.ArrayList;
import java.util.List;
@Service
public class AssessmentService {
private AssessmentRepository assessmentRepository;
private ModuleRepository moduleRepository;
@Autowired
Config myConfig;
public AssessmentService(AssessmentRepository aAssessmentRepository, ModuleRepository aModuleRepository) {
this.assessmentRepository = aAssessmentRepository;
this.moduleRepository = aModuleRepository;
}
public void saveModeratorReview(ModeratorReview moderatorReview) {
assessmentRepository.saveModeratorReview(moderatorReview);
}
public void saveAssessmentReady(AssessmentReady assessmentReady) {
assessmentRepository.saveAssessmentReady(assessmentReady);
}
public AssessmentAndModule getAssessmentAndModuleByAssessmentID(int assessmentID){
Assessment assessment = assessmentRepository.getAssessment(assessmentID);
AssessmentAndModule aNm = new AssessmentAndModule(assessment, moduleRepository.getModule(assessment.getModuleID()));
return aNm;
}
public List<AssessmentAndModule> getAllModulesWithAssessments() {
return getAllModulesWithAssessments(myConfig.getDefaultStartYear());
}
public List<AssessmentAndModule> getAllModulesWithAssessments(int startYear) {
List<Module> modules = moduleRepository.getModules(startYear);
List<AssessmentAndModule> aNmList = new ArrayList<AssessmentAndModule>();
for (Module module : modules){
List<Assessment> assessments = assessmentRepository.getAssessments(module.getId());
if (assessments == null){
assessments = new ArrayList<>();
}
aNmList.add(new AssessmentAndModule(assessments, module));
}
return aNmList;
}
}
package uk.ac.cf.cs.assessmenttracker.assessment;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import lombok.AllArgsConstructor;
import lombok.Data;
import java.sql.Date;
@Data
@AllArgsConstructor
public class ModeratorReview {
private int id;
private boolean intModerated;
@NotNull(message = "The date cannot be empty please use first date moderated")
private Date intModeratedDate;
private String intModComments;
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment