Merge branch 'dev' into bugs/re-enable-sync

source/backend/api/Pims.Api.csproj

@@ -2,8 +2,8 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
  <PropertyGroup>
  <UserSecretsId>0ef6255f-9ea0-49ec-8c65-c172304b4926</UserSecretsId>
- <Version>5.6.0-89.24</Version>
- <Version>5.6.0-89.24</Version>
+ <Version>5.6.0-89.28</Version>
+ <Version>5.6.0-89.28</Version>
  <AssemblyVersion>5.6.0.89</AssemblyVersion>
  <GenerateDocumentationFile>true</GenerateDocumentationFile>
  <ProjectGuid>16BC0468-78F6-4C91-87DA-7403C919E646</ProjectGuid>

source/database/mssql/scripts/dbscripts/MSSQL_Script_Footer.txt

@@ -0,0 +1,10 @@
+If XACT_STATE()=1
+ BEGIN
+ PRINT 'Committing Tranaction...'
+ COMMIT TRANSACTION
+ END
+ELSE IF XACT_STATE()=-1
+ BEGIN
+ PRINT 'Rolling Back Transaction...'
+ ROLLBACK TRANSACTION
+ END

source/database/mssql/scripts/dbscripts/MSSQL_Script_Header.txt

@@ -0,0 +1,4 @@
+:On Error Exit
+SET XACT_ABORT ON
+GO
+BEGIN TRANSACTION

source/database/mssql/scripts/dbscripts/callmaster.sh

@@ -0,0 +1 @@
+source "run_sql_scripts.sh" -f "C:\WorkPIMS\PSP_PIMS_S89_00" -s "\Alter Up"

source/database/mssql/scripts/dbscripts/run_sql_scripts.sh

@@ -0,0 +1,45 @@
+#!/bin/bash
+
+# Retrieve the parameters passed
+while getopts f:s: option
+do 
+ case "${option}"
+ in
+ f)FOLDER=${OPTARG};;
+ s)SUBFOLDER=${OPTARG};;
+ esac
+done
+
+# Set your output file
+SQLFOLDER=${FOLDER}${SUBFOLDER}
+FILE=${FOLDER}${SUBFOLDER}'\master.sql'
+SCRIPTHOME=${PWD}
+
+echo $SQLFOLDER
+echo $FILE
+echo $SCRIPTHOME
+
+# Initialize the destination file
+cp 'MSSQL_Script_Header.txt' "$FILE"
+echo >> "$FILE"
+
+# exit 0
+
+cd "$SQLFOLDER"
+
+# Enable extended globbing
+shopt -s extglob nullglob
+
+# Loop through all SQL files in the current directory
+for sql_file in !(master).sql
+do
+ echo 'Running $sql_file...' $sql_file
+ echo "PRINT 'Executing" $sql_file "'" >> "$FILE"
+ echo ':r' $sql_file >> "$FILE"
+done
+
+cd $SCRIPTHOME
+
+# Finalize the destination file
+echo >> "$FILE"
+cat 'MSSQL_Script_Footer.txt' >> "$FILE"

source/frontend/package.json

@@ -1,6 +1,6 @@
 {
  "name": "frontend",
- "version": "5.6.0-89.24",
+ "version": "5.6.0-89.28",
  "private": true,
  "dependencies": {
  "@bcgov/bc-sans": "1.0.1",

source/frontend/src/components/common/form/ContactInput/__snapshots__/ContactInputView.test.tsx.snap

@@ -50,15 +50,37 @@ exports[`ContactInputView component > renders as expected 1`] = `
 .c1.btn:focus {
  outline-width: 0.4rem;
  outline-style: solid;
+ outline-color: var(--surface-color-primary-button-hover);
  outline-offset: 1px;
  box-shadow: none;
 }
 
+.c1.btn.btn-primary {
+ color: #FFFFFF;
+ background-color: #013366;
+}
+
+.c1.btn.btn-primary:hover,
+.c1.btn.btn-primary:active,
+.c1.btn.btn-primary:focus {
+ background-color: #1E5189;
+}
+
 .c1.btn.btn-secondary {
+ color: #013366;
  background: none;
+ border-color: #013366;
+}
+
+.c1.btn.btn-secondary:hover,
+.c1.btn.btn-secondary:active,
+.c1.btn.btn-secondary:focus {
+ color: #FFFFFF;
+ background-color: #013366;
 }
 
 .c1.btn.btn-info {
+ color: #9F9D9C;
  border: none;
  background: none;
  padding-left: 0.6rem;
@@ -68,20 +90,66 @@ exports[`ContactInputView component > renders as expected 1`] = `
 .c1.btn.btn-info:hover,
 .c1.btn.btn-info:active,
 .c1.btn.btn-info:focus {
+ color: var(--surface-color-primary-button-hover);
  background: none;
 }
 
 .c1.btn.btn-light {
+ color: #FFFFFF;
+ background-color: #606060;
  border: none;
 }
 
+.c1.btn.btn-light:hover,
+.c1.btn.btn-light:active,
+.c1.btn.btn-light:focus {
+ color: #FFFFFF;
+ background-color: #606060;
+}
+
 .c1.btn.btn-dark {
+ color: #FFFFFF;
+ background-color: #474543;
  border: none;
 }
 
+.c1.btn.btn-dark:hover,
+.c1.btn.btn-dark:active,
+.c1.btn.btn-dark:focus {
+ color: #FFFFFF;
+ background-color: #474543;
+}
+
+.c1.btn.btn-danger {
+ color: #FFFFFF;
+ background-color: #CE3E39;
+}
+
+.c1.btn.btn-danger:hover,
+.c1.btn.btn-danger:active,
+.c1.btn.btn-danger:focus {
+ color: #FFFFFF;
+ background-color: #CE3E39;
+}
+
+.c1.btn.btn-warning {
+ color: #FFFFFF;
+ background-color: #FCBA19;
+ border-color: #FCBA19;
+}
+
+.c1.btn.btn-warning:hover,
+.c1.btn.btn-warning:active,
+.c1.btn.btn-warning:focus {
+ color: #FFFFFF;
+ border-color: #FCBA19;
+ background-color: #FCBA19;
+}
+
 .c1.btn.btn-link {
  font-size: 1.6rem;
  font-weight: 400;
+ color: var(--surface-color-primary-button-default);
  background: none;
  border: none;
  -webkit-text-decoration: none;
@@ -103,6 +171,7 @@ exports[`ContactInputView component > renders as expected 1`] = `
 .c1.btn.btn-link:hover,
 .c1.btn.btn-link:active,
 .c1.btn.btn-link:focus {
+ color: var(--surface-color-primary-button-hover);
  -webkit-text-decoration: underline;
  text-decoration: underline;
  border: none;
@@ -113,6 +182,7 @@ exports[`ContactInputView component > renders as expected 1`] = `
 
 .c1.btn.btn-link:disabled,
 .c1.btn.btn-link.disabled {
+ color: #9F9D9C;
  background: none;
  pointer-events: none;
 }
@@ -149,12 +219,13 @@ exports[`ContactInputView component > renders as expected 1`] = `
  padding-left: 1.2rem;
  padding-right: 2.8rem;
  background-image: none;
- border: solid 0.1rem;
+ color: #474543;
+ border: #606060 solid 0.1rem;
  cursor: default;
 }
 
 .c0.is-invalid {
- border: solid 0.1rem;
+ border: #CE3E39 solid 0.1rem;
 }
 
 .c2.c2.btn {
@@ -165,6 +236,7 @@ exports[`ContactInputView component > renders as expected 1`] = `
  padding-right: 1.2rem;
  height: 1.6rem;
  right: 0rem;
+ color: #9F9D9C;
  -webkit-text-decoration: none;
  text-decoration: none;
  line-height: unset;
@@ -177,6 +249,7 @@ exports[`ContactInputView component > renders as expected 1`] = `
 .c2.c2.btn:hover,
 .c2.c2.btn:active,
 .c2.c2.btn:focus {
+ color: #CE3E39;
  -webkit-text-decoration: none;
  text-decoration: none;
  opacity: unset;

source/frontend/src/components/common/form/__snapshots__/NotesModal.test.tsx.snap

@@ -50,15 +50,37 @@ exports[`NotesModal component > renders as expected 1`] = `
 .c0.btn:focus {
  outline-width: 0.4rem;
  outline-style: solid;
+ outline-color: var(--surface-color-primary-button-hover);
  outline-offset: 1px;
  box-shadow: none;
 }
 
+.c0.btn.btn-primary {
+ color: #FFFFFF;
+ background-color: #013366;
+}
+
+.c0.btn.btn-primary:hover,
+.c0.btn.btn-primary:active,
+.c0.btn.btn-primary:focus {
+ background-color: #1E5189;
+}
+
 .c0.btn.btn-secondary {
+ color: #013366;
  background: none;
+ border-color: #013366;
+}
+
+.c0.btn.btn-secondary:hover,
+.c0.btn.btn-secondary:active,
+.c0.btn.btn-secondary:focus {
+ color: #FFFFFF;
+ background-color: #013366;
 }
 
 .c0.btn.btn-info {
+ color: #9F9D9C;
  border: none;
  background: none;
  padding-left: 0.6rem;
@@ -68,20 +90,66 @@ exports[`NotesModal component > renders as expected 1`] = `
 .c0.btn.btn-info:hover,
 .c0.btn.btn-info:active,
 .c0.btn.btn-info:focus {
+ color: var(--surface-color-primary-button-hover);
  background: none;
 }
 
 .c0.btn.btn-light {
+ color: #FFFFFF;
+ background-color: #606060;
  border: none;
 }
 
+.c0.btn.btn-light:hover,
+.c0.btn.btn-light:active,
+.c0.btn.btn-light:focus {
+ color: #FFFFFF;
+ background-color: #606060;
+}
+
 .c0.btn.btn-dark {
+ color: #FFFFFF;
+ background-color: #474543;
  border: none;
 }
 
+.c0.btn.btn-dark:hover,
+.c0.btn.btn-dark:active,
+.c0.btn.btn-dark:focus {
+ color: #FFFFFF;
+ background-color: #474543;
+}
+
+.c0.btn.btn-danger {
+ color: #FFFFFF;
+ background-color: #CE3E39;
+}
+
+.c0.btn.btn-danger:hover,
+.c0.btn.btn-danger:active,
+.c0.btn.btn-danger:focus {
+ color: #FFFFFF;
+ background-color: #CE3E39;
+}
+
+.c0.btn.btn-warning {
+ color: #FFFFFF;
+ background-color: #FCBA19;
+ border-color: #FCBA19;
+}
+
+.c0.btn.btn-warning:hover,
+.c0.btn.btn-warning:active,
+.c0.btn.btn-warning:focus {
+ color: #FFFFFF;
+ border-color: #FCBA19;
+ background-color: #FCBA19;
+}
+
 .c0.btn.btn-link {
  font-size: 1.6rem;
  font-weight: 400;
+ color: var(--surface-color-primary-button-default);
  background: none;
  border: none;
  -webkit-text-decoration: none;
@@ -103,6 +171,7 @@ exports[`NotesModal component > renders as expected 1`] = `
 .c0.btn.btn-link:hover,
 .c0.btn.btn-link:active,
 .c0.btn.btn-link:focus {
+ color: var(--surface-color-primary-button-hover);
  -webkit-text-decoration: underline;
  text-decoration: underline;
  border: none;
@@ -113,6 +182,7 @@ exports[`NotesModal component > renders as expected 1`] = `
 
 .c0.btn.btn-link:disabled,
 .c0.btn.btn-link.disabled {
+ color: #9F9D9C;
  background: none;
  pointer-events: none;
 }
@@ -164,6 +234,30 @@ exports[`NotesModal component > renders as expected 1`] = `
  transition: all 0.3s ease-in;
 }
 
+.c1.c1.btn.btn-primary svg {
+ color: #013366;
+}
+
+.c1.c1.btn.btn-primary svg:hover {
+ color: #013366;
+}
+
+.c1.c1.btn.btn-light svg {
+ color: var(--surface-color-primary-button-default);
+}
+
+.c1.c1.btn.btn-light svg:hover {
+ color: #CE3E39;
+}
+
+.c1.c1.btn.btn-info svg {
+ color: var(--surface-color-primary-button-default);
+}
+
+.c1.c1.btn.btn-info svg:hover {
+ color: var(--surface-color-primary-button-hover);
+}
+
 <button
  class="c0 Button c1 btn btn-primary"
  title="notes"