Innovenergy
/
Innovenergy_trunk
2
1
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

This commit is contained in:
atef 2024-06-04 12:23:36 +02:00
parent 382043b79c 9e9dc169dd
commit 8d2c5aca8d
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
csharp/App/SaliMax/deploy.sh
View File

@ -21,6 +21,6 @@ rsync -v \
./bin/Release/$dotnet_version/linux-x64/publish/* \ ./bin/Release/$dotnet_version/linux-x64/publish/* \
$username@"$salimax_ip":~/salimax $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

2
csharp/App/SaliMax/src/Program.cs
View File

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

8
typescript/frontend-marios2/src/content/dashboards/Configuration/Configuration.tsx
View File

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

2
typescript/frontend-marios2/src/content/dashboards/Overview/chartOptions.tsx
View File

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