Merge remote-tracking branch 'origin/main'

This commit is contained in:
atef 2024-06-04 12:23:36 +02:00
commit 8d2c5aca8d
4 changed files with 8 additions and 8 deletions

View File

@ -21,6 +21,6 @@ rsync -v \
./bin/Release/$dotnet_version/linux-x64/publish/* \
$username@"$salimax_ip":~/salimax
#echo -e "\n============================ Execute ============================\n"
echo -e "\n============================ Execute ============================\n"
#sshpass -p "$root_password" ssh -o StrictHostKeyChecking=no -t "$username"@"$salimax_ip" "echo '$root_password' | sudo -S sh -c 'cd salimax && ./restart'" 2>/dev/null
sshpass -p "$root_password" ssh -o StrictHostKeyChecking=no -t "$username"@"$salimax_ip" "echo '$root_password' | sudo -S sh -c 'cd salimax && ./restart'" 2>/dev/null

View File

@ -1,4 +1,4 @@
#define Amax
#undef Amax
#undef GridLimit
using System.IO.Compression;

View File

@ -162,10 +162,10 @@ function Configuration(props: ConfigurationProps) {
const handleConfirm = (newDate) => {
//console.log('non adapted day is ', newDate);
//console.log('adapted day is ', dayjs.utc(newDate).toDate());
// setFormValues({
// ...formValues,
// ['calibrationChargeDate']: dayjs(newDate).toDate()
// });
setFormValues({
...formValues,
['calibrationChargeDate']: dayjs(newDate).toDate()
});
};
const handleSelectedCalibrationChargeDay = (event) => {

View File

@ -167,7 +167,7 @@ export const getChartOptions = (
style: {
fontSize: '12px'
},
offsetY: -185,
offsetY: -190,
offsetX: 25,
rotate: 0
},