diff --git a/.vscode/launch.json b/.vscode/launch.json index 8e0b5e2..74a8734 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -9,14 +9,14 @@ "projectName": "matrix", "cwd": "${workspaceFolder}", "console": "integratedTerminal", - "preLaunchTask": "matrix: package", + "preLaunchTask": "matrix: dev compile", "classPaths": [ "$Test" ], "env": { "JAVA_HOME": "/Users/maddy/Library/Java/JavaVirtualMachines/ms-21.0.8/Contents/Home" }, - "vmArgs": "-Dserver.port=8080 -Djava.awt.headless=true", + "vmArgs": "-Dserver.port=8080 -Djava.awt.headless=true -Dmatrix.webapp=${workspaceFolder}/build/WebContent -Dmatrix.classes=${workspaceFolder}/target/classes", "shortenCommandLine": "argfile" }, { diff --git a/.vscode/settings.json b/.vscode/settings.json index e0f15db..0be1c0c 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +1,4 @@ { - "java.configuration.updateBuildConfiguration": "automatic" + "java.configuration.updateBuildConfiguration": "automatic", + "java.compile.nullAnalysis.mode": "automatic" } \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 2b618b2..53e7d29 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -2,11 +2,11 @@ "version": "2.0.0", "tasks": [ { - "label": "matrix: package", + "label": "matrix: dev compile", "type": "shell", "command": "mvn", "args": [ - "package", + "test-compile", "-DskipTests" ], "options": { diff --git a/build/WebContent/WEB-INF/app/admin/maintenance.jsp b/build/WebContent/WEB-INF/app/admin/maintenance.jsp index cdfeaa6..b2c0e7f 100644 --- a/build/WebContent/WEB-INF/app/admin/maintenance.jsp +++ b/build/WebContent/WEB-INF/app/admin/maintenance.jsp @@ -5,7 +5,7 @@ <%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> <%@taglib prefix="spring" uri="http://www.springframework.org/tags" %> - +
@@ -22,32 +22,34 @@ - -
-
- Nimble 1.0 ${Sessvals.getCompanyCode() } (${Sessvals.getBranchLocation() }) ${Sessvals.getUserDisplayName()} (${Sessvals.getUserGroupName()})
-
- Application Maintenance
+
+ Application Maintenance
- Branch Detail
- |
- |
-
-
- Nimble 1.0 ${Sessvals.getCompanyCode() } (${Sessvals.getBranchLocation() }) ${Sessvals.getUserDisplayName()} (${Sessvals.getUserGroupName()})
-
- Manage Branch
-
- | - - | -
| S.No | -Branch Name | -Address | -GST No | -Status | -Action | -
| ${status.count} | -${lc[1]} | -${lc[2]} | -${lc[3]} | -
- |
-
- |
-
| S.No | Branch Name | Address | GST No | Status | Action |
|---|---|---|---|---|---|
| ${status.count} | + | + |
-
- Nimble 1.0 ${Sessvals.getCompanyCode() } (${Sessvals.getBranchLocation() }) ${Sessvals.getUserDisplayName()} (${Sessvals.getUserGroupName()})
-
- Manage Users
-
- | S.No | -Login ID | -Name | -Group | -Status | -Action | -
| ${status.count} | -${lc[1]} | -${lc[2]} | -${lc[3]} | -
- |
- - - | -
+ | S.No | +Login ID | +Name | +Group | +Status | +Action | +
|---|---|---|---|---|---|
| ${status.count} | ++ + | ++ + | +
- User Detail
- |
- |
-
-
- Nimble 1.0 ${Sessvals.getCompanyCode() } (${Sessvals.getBranchLocation() }) ${Sessvals.getUserDisplayName()} (${Sessvals.getUserGroupName()})
-
-
- Nimble 1.0 ${Sessvals.getCompanyCode() } (${Sessvals.getBranchLocation() }) ${Sessvals.getUserDisplayName()} (${Sessvals.getUserGroupName()})
-
-
- Nimble 1.0 ${Sessvals.getCompanyCode() } (${Sessvals.getBranchLocation() }) ${Sessvals.getUserDisplayName()} (${Sessvals.getUserGroupName()})
-
- Allocation
+
+ Allocation
-
- Nimble 1.0 ${Sessvals.getCompanyCode() } (${Sessvals.getBranchLocation() }) ${Sessvals.getUserDisplayName()} (${Sessvals.getUserGroupName()})
-
- Cut-Off List
+
+ Cut-Off List
-
- Nimble 1.0 ${Sessvals.getCompanyCode() } (${Sessvals.getBranchLocation() }) ${Sessvals.getUserDisplayName()} (${Sessvals.getUserGroupName()})
- | Customer Name | DOB | @@ -86,14 +90,14 @@||||||||||
|
-
-
- Earlier Details
+
+
+ Earlier Details
-
|