diff --git a/.vscode/launch.json b/.vscode/launch.json
index 95ef277..4d1d636 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -5,10 +5,10 @@
// Use IntelliSense to find out which attributes exist for C# debugging
// Use hover for the description of the existing attributes
// For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
- "name": ".NET Core Launch (web)",
+ "name": ".NET Core Launch (web) - Server",
"type": "coreclr",
"request": "launch",
- "preLaunchTask": "build",
+ "preLaunchTask": "buildServer",
// If you have changed target frameworks, make sure to update the program path.
"program": "${workspaceFolder}/Server/bin/Debug/net7.0/win-x64/OI.Metrology.Server.dll",
"args": [],
@@ -28,11 +28,44 @@
}
},
{
- "name": ".NET Core Attach",
+ "name": ".NET Core Attach - Server",
"type": "coreclr",
"request": "attach",
- "preLaunchTask": "watch",
+ "preLaunchTask": "watchServer",
"processName": "OI.Metrology.Server.exe"
+ },
+ {
+ // Use IntelliSense to find out which attributes exist for C# debugging
+ // Use hover for the description of the existing attributes
+ // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
+ "name": ".NET Core Launch (web) - ClientHub",
+ "type": "coreclr",
+ "request": "launch",
+ "preLaunchTask": "buildClientHub",
+ // If you have changed target frameworks, make sure to update the program path.
+ "program": "${workspaceFolder}/ClientHub/bin/Debug/net7.0/win-x64/OI.Metrology.ClientHub.dll",
+ "args": [],
+ "cwd": "${workspaceFolder}/ClientHub",
+ "stopAtEntry": false,
+ // Enable launching a web browser when ASP.NET Core starts. For more information: https://aka.ms/VSCode-CS-LaunchJson-WebBrowser
+ "serverReadyAction": {
+ "action": "openExternally",
+ "pattern": "\\bNow listening on:\\s+(https?://\\S+)",
+ "uriFormat": "%s/swagger/index.html"
+ },
+ "env": {
+ "ASPNETCORE_ENVIRONMENT": "Development"
+ },
+ "sourceFileMap": {
+ "/Views": "${workspaceFolder}/ClientHub/Views"
+ }
+ },
+ {
+ "name": ".NET Core Attach - ClientHub",
+ "type": "coreclr",
+ "request": "attach",
+ "preLaunchTask": "watchClientHub",
+ "processName": "OI.Metrology.ClientHub.exe"
}
]
}
\ No newline at end of file
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 5e32c89..72ffadb 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -2,7 +2,7 @@
"version": "2.0.0",
"tasks": [
{
- "label": "build",
+ "label": "buildServer",
"command": "dotnet",
"type": "process",
"args": [
@@ -14,7 +14,7 @@
"problemMatcher": "$msCompile"
},
{
- "label": "publish",
+ "label": "publishServer",
"command": "dotnet",
"type": "process",
"args": [
@@ -38,7 +38,7 @@
"problemMatcher": "$msCompile"
},
{
- "label": "watch",
+ "label": "watchServer",
"command": "dotnet",
"type": "process",
"args": [
@@ -70,6 +70,64 @@
"endsPattern": "^.*Application started.*"
}
}
+ },
+ {
+ "label": "buildClientHub",
+ "command": "dotnet",
+ "type": "process",
+ "args": [
+ "build",
+ "${workspaceFolder}/ClientHub/OI.Metrology.ClientHub.csproj",
+ "/property:GenerateFullPaths=true",
+ "/consoleloggerparameters:NoSummary"
+ ],
+ "problemMatcher": "$msCompile"
+ },
+ {
+ "label": "publishClientHub",
+ "command": "dotnet",
+ "type": "process",
+ "args": [
+ "publish",
+ "${workspaceFolder}/ClientHub/OI.Metrology.ClientHub.csproj",
+ "/property:GenerateFullPaths=true",
+ "/consoleloggerparameters:NoSummary"
+ ],
+ "problemMatcher": "$msCompile"
+ },
+ {
+ "label": "watchClientHub",
+ "command": "dotnet",
+ "type": "process",
+ "args": [
+ "watch",
+ "--launch-profile",
+ "http",
+ "run",
+ "--project",
+ "${workspaceFolder}/ClientHub/OI.Metrology.ClientHub.csproj",
+ "--verbose"
+ ],
+ "isBackground": true,
+ "dependsOn": [
+ "build"
+ ],
+ "problemMatcher": {
+ "fileLocation": "relative",
+ "pattern": {
+ "regexp": "^([^\\s].*)\\((\\d+|\\d+,\\d+|\\d+,\\d+,\\d+,\\d+)\\):\\s+(error|warning|info)\\s+(TS\\d+)\\s*:\\s*(.*)$",
+ "file": 1,
+ "location": 2,
+ "severity": 3,
+ "code": 4,
+ "message": 5
+ },
+ "background": {
+ "activeOnStart": true,
+ "beginsPattern": "^.*Shutdown requested.*",
+ "endsPattern": "^.*Application started.*"
+ }
+ }
}
]
}
\ No newline at end of file
diff --git a/ClientHub/wwwroot/site.js b/ClientHub/wwwroot/site.js
index 0998664..4fae8ef 100644
--- a/ClientHub/wwwroot/site.js
+++ b/ClientHub/wwwroot/site.js
@@ -545,4 +545,7 @@ function triggerFileDownload(fileName, url) {
anchorElement.download = fileName ?? '';
anchorElement.click();
anchorElement.remove();
+}
+
+function initIndex(){
}
\ No newline at end of file
diff --git a/ClientHub/wwwroot/styles/Site.css b/ClientHub/wwwroot/styles/Site.css
index 2b306a8..7c35d14 100644
--- a/ClientHub/wwwroot/styles/Site.css
+++ b/ClientHub/wwwroot/styles/Site.css
@@ -70,6 +70,25 @@ div.modal-content-warning {
background-color: red !important;
}
+.prod-database {
+ background-color: #d7d7d7 !important;
+}
+
+/* hover */
+.ui-iggrid td.ui-state-hover,
+.ui-iggrid .ui-ig-altrecord td.ui-state-hover,
+.ui-iggrid .ui-ig-altrecord td.ui-state-default.ui-state-hover,
+.ui-iggrid th.ui-iggrid-rowselector-class.ui-state-hover,
+.ui-iggrid .ui-ig-altrecord th.ui-iggrid-rowselector-class.ui-state-hover,
+.ui-iggrid .ui-ig-altrecord th.ui-iggrid-rowselector-class.ui-state-default.ui-state-hover,
+.ui-iggrid-responsive-vertical tr > td.ui-state-hover:first-child,
+.ui-iggrid-responsive-vertical tr.ui-ig-altrecord > td.ui-state-hover:first-child {
+ color: #333333;
+ background: #f5ff3b;
+ border-top: 1px solid transparent;
+ border-bottom: 1px solid #ddd;
+}
+
.test-database .navbar-brand,
.test-database .navbar-text,
.test-database .navbar-nav > li > a {
@@ -106,4 +125,4 @@ div.modal-content-warning {
#ExportData {
zoom: 2;
-}
\ No newline at end of file
+}
diff --git a/Server/wwwroot/styles/Site.css b/Server/wwwroot/styles/Site.css
index c3c986b..996b4b4 100644
--- a/Server/wwwroot/styles/Site.css
+++ b/Server/wwwroot/styles/Site.css
@@ -1,102 +1,106 @@
body {
- padding-top: 50px;
- padding-bottom: 20px;
- background-color: #FAFAFA;
+ padding-top: 50px;
+ padding-bottom: 20px;
+ background-color: #fafafa;
}
/* Set padding to keep content from hitting the edges */
.body-content {
- padding-left: 15px;
- padding-right: 15px;
+ padding-left: 15px;
+ padding-right: 15px;
}
/* Set width on the form input elements since they're 100% wide by default */
input,
select,
textarea {
- max-width: 280px;
+ max-width: 280px;
}
div.modal-content-error {
- background-color: #9e2525;
- color: #ffffff;
+ background-color: #9e2525;
+ color: #ffffff;
}
div.modal-content-success {
- background-color: #e5fbe5;
- color: #000000;
+ background-color: #e5fbe5;
+ color: #000000;
}
div.modal-content-info {
- background-color: #5bc0de;
- color: #000000;
+ background-color: #5bc0de;
+ color: #000000;
}
div.modal-content-warning {
- background-color: yellow;
- color: #000000;
+ background-color: yellow;
+ color: #000000;
}
.changes-highlight {
- background-color: yellow;
+ background-color: yellow;
}
.k-alt .changes-highlight {
- background-color: #f0f050;
+ background-color: #f0f050;
}
.button-highlight {
- background-color: yellow !important;
+ background-color: yellow !important;
}
.history-deleted {
- background-color: #FFDDDD;
+ background-color: #ffdddd;
}
.k-alt.history-deleted {
- background-color: #EECCCC !important;
+ background-color: #eecccc !important;
}
.error-highlight {
- color: red;
- font-weight: bold;
+ color: red;
+ font-weight: bold;
}
.checkbox-container {
- max-height: 200px;
- overflow: auto;
+ max-height: 200px;
+ overflow: auto;
}
.test-database {
- background-color: red !important;
+ background-color: red !important;
}
- .test-database .navbar-brand,
- .test-database .navbar-text,
- .test-database .navbar-nav > li > a {
- color: white;
- }
+.prod-database {
+ background-color: #478f7c !important;
+}
- .test-database .navbar-nav > li > a:hover,
- .test-database .navbar-nav > li > a:focus {
- color: black !important;
- }
+.test-database .navbar-brand,
+.test-database .navbar-text,
+.test-database .navbar-nav > li > a {
+ color: white;
+}
+
+.test-database .navbar-nav > li > a:hover,
+.test-database .navbar-nav > li > a:focus {
+ color: black !important;
+}
.test-database-text {
- font-weight: bold;
- font-size: 20px;
- line-height: 20px;
+ font-weight: bold;
+ font-size: 20px;
+ line-height: 20px;
}
.navbar {
- border-bottom-color: black;
- background-color: white;
+ border-bottom-color: black;
+ background-color: white;
}
.navbar-nav > li > a {
- font-weight: bold;
+ font-weight: bold;
}
.icon-bar {
- background-color: black;
-}
\ No newline at end of file
+ background-color: black;
+}
diff --git a/View/Pages/AwaitingDisposition.razor b/View/Pages/AwaitingDisposition.razor
index b467890..4432b58 100644
--- a/View/Pages/AwaitingDisposition.razor
+++ b/View/Pages/AwaitingDisposition.razor
@@ -1,6 +1,7 @@
@page "/"
@page "/AwaitingDisposition"
+@using MudBlazor
@using Microsoft.AspNetCore.Components.Web
@namespace OI.Metrology.View
@@ -13,12 +14,8 @@
-
-
-
-
-
-
+
Open
+
Refresh