OP-1302 | Make JTable sortable in edit inventory

bundle/language_en.properties

@@ -1793,6 +1793,7 @@ angal.userbrowser.step2.pleaserepeatthenewpassword.label
 angal.userbrowser.theadminusercannotbedeleted.msg                                                      = The "admin" user cannot be deleted.
 angal.userbrowser.thepasswordhasbeenchanged.msg                                                        = The password has been changed.
 angal.userbrowser.theuseralreadyexists.fmt.msg                                                         = The user "{0}" already exists.
+angal.userbrowser.theusernamecontainsinvalidcharacters.msg                                             = The user name must contain only a-z, 0-9, dash, period and underscore characters.
 angal.userbrowser.title                                                                                = User Browser
 angal.userbrowser.user.col                                                                             = User
 angal.vaccine.deletevaccine.fmt.msg                                                                    = Delete vaccine: {0}?

oh.ps1

@@ -984,8 +984,11 @@ function write_api_config_file {
 		# generate OH API token and save to settings file
 		$JWT_TOKEN_SECRET=( -join ($(for($i=0; $i -lt 64; $i++) { ((65..90)+(97..122)+(".")+("!")+("?")+("&") | Get-Random | % {[char]$_}) })) )
 		Write-Host "Writing OH API configuration file -> $API_SETTINGS..."
-		(Get-Content "$OH_PATH/$OH_DIR/rsc/$API_SETTINGS.dist").replace("JWT_TOKEN_SECRET","$JWT_TOKEN_SECRET") | Set-Content "$OH_PATH/$OH_DIR/rsc/$API_SETTINGS"
-		(Get-Content "$OH_PATH/$OH_DIR/rsc/$API_SETTINGS").replace("OH_API_PID","$OH_API_PID") | Set-Content "$OH_PATH/$OH_DIR/rsc/$API_SETTINGS"
+		(Get-Content "$OH_PATH/$OH_DIR/rsc/$API_SETTINGS.dist") `
+            -replace "JWT_TOKEN_SECRET", "$JWT_TOKEN_SECRET" `
+            -replace "OH_API_PID", "$OH_API_PID" `
+            -replace "API_HOST:API_PORT", "localhost:8080" `
+            | Set-Content "$OH_PATH/$OH_DIR/rsc/$API_SETTINGS"
 	}
 }
 
@@ -1039,7 +1042,7 @@ function write_config_files {
 		(Get-Content "$OH_PATH/$OH_DIR/rsc/$DATABASE_SETTINGS").replace("DBNAME","$DATABASE_NAME") | Set-Content "$OH_PATH/$OH_DIR/rsc/$DATABASE_SETTINGS"
 
 		# direct creation of $DATABASE_SETTINGS - deprecated
-		#Set-Content -Path $OH_PATH/$OH_DIR/rsc/$DATABASE_SETTINGS -Value "jdbc.url=jdbc:mysql://"$DATABASE_SERVER":$DATABASE_PORT/$DATABASE_NAME"
+		#Set-Content -Path $OH_PATH/$OH_DIR/rsc/$DATABASE_SETTINGS -Value "jdbc.url=jdbc:mariadb://"$DATABASE_SERVER":$DATABASE_PORT/$DATABASE_NAME"
 		#Add-Content -Path $OH_PATH/$OH_DIR/rsc/$DATABASE_SETTINGS -Value "jdbc.username=$DATABASE_USER"
 		#Add-Content -Path $OH_PATH/$OH_DIR/rsc/$DATABASE_SETTINGS -Value "jdbc.password=$DATABASE_PASSWORD"
 	}

oh.sh

@@ -876,7 +876,10 @@ function write_api_config_file {
 		# JWT_TOKEN_SECRET=`openssl rand -base64 64 | xargs`
 		JWT_TOKEN_SECRET=`LC_ALL=C tr -dc A-Za-z0-9 </dev/urandom | head -c 66`
 		echo "Writing OH API configuration file -> $API_SETTINGS..."
-		sed -e "s/JWT_TOKEN_SECRET/"$JWT_TOKEN_SECRET"/g" -e "s&OH_API_PID&"$OH_API_PID"&g" ./$OH_DIR/rsc/$API_SETTINGS.dist > ./$OH_DIR/rsc/$API_SETTINGS
+		sed -e "s/JWT_TOKEN_SECRET/"$JWT_TOKEN_SECRET"/g" \
+		    -e "s&OH_API_PID&"$OH_API_PID"&g" \
+		    -e "s/API_HOST:API_PORT/localhost:8080/g" \
+		    ./$OH_DIR/rsc/$API_SETTINGS.dist > ./$OH_DIR/rsc/$API_SETTINGS
 	fi
 }
 

ohmac.sh

@@ -268,7 +268,11 @@ function write_api_config_file {
 		JWT_TOKEN_SECRET=`LC_ALL=C tr -dc A-Za-z0-9 </dev/urandom | head -c 66`
 
 		echo "Writing OH API configuration file -> $API_SETTINGS..."
-		sed -i '' -e "s/JWT_TOKEN_SECRET/"$JWT_TOKEN_SECRET"/g" -e "s&OH_API_PID&"$OH_API_PID"&g" $SET_FILE.dist
+		sed -i '' \
+			-e "s/JWT_TOKEN_SECRET/$JWT_TOKEN_SECRET/g" \
+			-e "s/API_HOST:API_PORT/localhost:8080/g" \
+			-e "s&OH_API_PID&$OH_API_PID&g" \
+			$SET_FILE.dist
 		cp -f $SET_FILE.dist $SET_FILE	
 	fi
 }

pom.xml

@@ -34,7 +34,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>3.3.1</version>
+				<version>3.4.0</version>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -296,7 +296,7 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
-			<version>2.0.13</version>
+			<version>2.0.16</version>
 		</dependency>
 		<dependency>
 			<groupId>org.imgscalr</groupId>

rsc/database.properties.dist

@@ -1,3 +1,3 @@
-jdbc.url=jdbc:mysql://DBSERVER:DBPORT/DBNAME
+jdbc.url=jdbc:mariadb://DBSERVER:DBPORT/DBNAME
 jdbc.username=DBUSER
 jdbc.password=DBPASS

rsc/sms.properties.dist

@@ -28,6 +28,8 @@ skebby-gateway-service.ribbon.base-url=https://api.skebby.it:443
 # USER_KEY and ACCESS_TOKEN avoids the login call every time we need to send sms
 skebby-gateway-service.accessToken=
 skebby-gateway-service.userKey=
+# message_type: GP for Classic+, TI for Classic, SI for Basic (default)
+#skebby-gateway-service.messageType=
 
 
 ##################################################################