Merge remote-tracking branch 'origin/main'

csharp/App/Backend/DataTypes/Configuration.cs

@@ -8,10 +8,21 @@ public class Configuration
     public DateTime CalibrationChargeDate                        { get; set; } 
     public CalibrationChargeType CalibrationDischargeState       { get; set; } 
     public DateTime CalibrationDischargeDate                     { get; set; } 
+    
+    //For sodistoreHome installations
+    
+    public Double MaximumDischargingCurrent                      { get; set; } 
+    public Double MaximumChargingCurrent                         { get; set; } 
+    public Double OperatingPriority                              { get; set; } 
+    public Double BatteriesCount                                 { get; set; } 
+    
     public String GetConfigurationString()
     {
         return $"MinimumSoC: {MinimumSoC}, GridSetPoint: {GridSetPoint}, CalibrationChargeState: {CalibrationChargeState}, CalibrationChargeDate: {CalibrationChargeDate}, " +
-               $"CalibrationDischargeState: {CalibrationDischargeState}, CalibrationDischargeDate: {CalibrationDischargeDate}";
+               $"CalibrationDischargeState: {CalibrationDischargeState}, CalibrationDischargeDate: {CalibrationDischargeDate}" +
+               $"MaximumDischargingCurrent: {MaximumDischargingCurrent}, MaximumChargingCurrent: {MaximumChargingCurrent}, OperatingPriority: {OperatingPriority}" +
+               $"BatteriesCount: {BatteriesCount}";
+               
     }
 }
 

csharp/App/Backend/DataTypes/Installation.cs

@@ -43,6 +43,8 @@ public class Installation : TreeNode
     public int Product          { get; set; } = (int)ProductType.Salimax;
     public int Device           { get; set; } = 0;
     public string SerialNumber  { get; set; } = "";
+    public string InverterSN  { get; set; } = "";
+    public string DataloggerSN  { get; set; } = "";
     
     [Ignore]
     public String OrderNumbers  { get; set; }

csharp/App/Backend/DataTypes/Methods/ExoCmd.cs

@@ -381,25 +381,6 @@ public static class ExoCmd
     public static async Task<Boolean> SendConfig(this Installation installation, Configuration config)
     {
         
-        // This looks hacky but here we grab the vpn-Ip of the installation by its installation Name (e.g. Salimax0001)
-        // From the vpn server (here salidomo, but we use the vpn home ip for future-proofing)
-        // using var client = new HttpClient();
-        // var webRequest = client.GetAsync("10.2.0.1/vpnstatus.txt");
-        // var text = webRequest.ToString();
-        // var lines = text!.Split(new [] { Environment.NewLine }, StringSplitOptions.None);
-        // var vpnIp = lines.First(l => l.Contains(installation.InstallationName)).Split(",")[1];
-        //
-        // // Writing the config to a file and then sending that file with rsync sounds inefficient
-        // // We should find a better solution...
-        // // TODO The VPN server should do this not the backend!!!
-        // await File.WriteAllTextAsync("./config.json", config);
-        // var result = await Cli.Wrap("rsync")
-        //     .WithArguments("./config.json")
-        //     .AppendArgument($@"root@{vpnIp}:/salimax")
-        //     .ExecuteAsync();
-        
-        // return result.ExitCode == 200;
-        
         var maxRetransmissions = 4;
         UdpClient udpClient = new UdpClient();
         udpClient.Client.ReceiveTimeout = 2000;
@@ -415,8 +396,8 @@ public static class ExoCmd
 
             Console.WriteLine(config.GetConfigurationString());
 
-            //Console.WriteLine($"Sent UDP message to {installation.VpnIp}:{port}: {config}");
+            Console.WriteLine($"Sent UDP message to {installation.VpnIp}:{port}: {config}");
-            Console.WriteLine($"Sent UDP message to {installation.VpnIp}:{port}"+" GridSetPoint is "+config.GridSetPoint +" and MinimumSoC is "+config.MinimumSoC);
+            //Console.WriteLine($"Sent UDP message to {installation.VpnIp}:{port}"+" GridSetPoint is "+config.GridSetPoint +" and MinimumSoC is "+config.MinimumSoC);
 
             IPEndPoint remoteEndPoint = new IPEndPoint(IPAddress.Parse(installation.VpnIp), port);
 

csharp/App/Backend/Program.cs

@@ -89,7 +89,7 @@ public static class Program
 
     private static OpenApiInfo OpenApiInfo { get; } = new OpenApiInfo
     {
-        Title = "Innesco Backend API",
+        Title = "Inesco Backend API",
         Version = "v1"
     };
 

csharp/App/Backend/Websockets/RabbitMQManager.cs

@@ -148,6 +148,8 @@ public static class RabbitMqManager
 
                     Int32 prevStatus;
 
+                   
+
                     //This installation id does not exist in our in-memory data structure, add it.
                     if (!WebsocketManager.InstallationConnections.ContainsKey(installationId))
                     {
@@ -167,6 +169,11 @@ public static class RabbitMqManager
                         WebsocketManager.InstallationConnections[installationId].Timestamp = DateTime.Now;
                     }
                     
+                    if (installationId == 795)
+                    {
+                        Console.WriteLine("RECEIVED A HEARTBIT FROM prototype, time is "+ WebsocketManager.InstallationConnections[installationId].Timestamp);
+                    }
+                    
                     installation.Status = receivedStatusMessage.Status;
                     installation.Apply(Db.Update);
 

csharp/App/Backend/Websockets/WebsockerManager.cs

@@ -22,12 +22,12 @@ public static class WebsocketManager
                 Console.WriteLine("Monitoring installation table...");
                 foreach (var installationConnection in InstallationConnections)
                 {
-                    Console.WriteLine("installationConnection ID is " + installationConnection.Key + "latest timestamp is" +installationConnection.Value.Timestamp + "product is "+ installationConnection.Value.Product
+                    Console.WriteLine("installationConnection ID is " + installationConnection.Key + ", latest timestamp is" +installationConnection.Value.Timestamp + ", product is "+ installationConnection.Value.Product
-                    + "and time diff is "+ (DateTime.Now - installationConnection.Value.Timestamp));
+                    + ", and time diff is "+ (DateTime.Now - installationConnection.Value.Timestamp));
 
                     if ((installationConnection.Value.Product == (int)ProductType.Salimax && (DateTime.Now - installationConnection.Value.Timestamp) > TimeSpan.FromMinutes(2)) ||
                         (installationConnection.Value.Product == (int)ProductType.Salidomo && (DateTime.Now - installationConnection.Value.Timestamp) > TimeSpan.FromMinutes(60)) ||
-                        (installationConnection.Value.Product == (int)ProductType.SodioHome && (DateTime.Now - installationConnection.Value.Timestamp) > TimeSpan.FromMinutes(2)) ||
+                        (installationConnection.Value.Product == (int)ProductType.SodioHome && (DateTime.Now - installationConnection.Value.Timestamp) > TimeSpan.FromMinutes(4)) ||
                         (installationConnection.Value.Product == (int)ProductType.SodiStoreMax && (DateTime.Now - installationConnection.Value.Timestamp) > TimeSpan.FromMinutes(2))
                        )
                     {

csharp/DataCollectorWebApp/Controller.cs

@@ -40,7 +40,8 @@ public class Installation
     public int Product { get; set; } = 0;
     public int Device           { get; set; } = 0;
     public string SerialNumber  { get; set; } = "";
-
+    public string InverterSN  { get; set; } = "";
+    public string DataloggerSN  { get; set; } = "";
     public String OrderNumbers  { get; set; }
     public String VrmLink       { get; set; } = "";
 }   

typescript/frontend-marios2/src/content/dashboards/BatteryView/BatteryViewSodioHome.tsx

@@ -44,7 +44,6 @@ function BatteryViewSodioHome(props: BatteryViewSodioHomeProps) {
           .sort((a, b) => parseInt(b.BatteryId) - parseInt(a.BatteryId))
       : [];
 
-  console.log('battery view', sortedBatteryView);
   const [loading, setLoading] = useState(sortedBatteryView.length == 0);
   const handleMainStatsButton = () => {
     navigate(routes.mainstats);

typescript/frontend-marios2/src/content/dashboards/Configuration/Configuration.tsx

@@ -93,7 +93,7 @@ function Configuration(props: ConfigurationProps) {
   const { currentUser, setUser } = context;
   const { product, setProduct } = useContext(ProductIdContext);
 
-  const [formValues, setFormValues] = useState<ConfigurationValues>({
+  const [formValues, setFormValues] = useState<Partial<ConfigurationValues>>({
     minimumSoC: props.values.Config.MinSoc,
     gridSetPoint: (props.values.Config.GridSetPoint as number) / 1000,
     calibrationChargeState: CalibrationChargeOptionsController.indexOf(
@@ -151,7 +151,7 @@ function Configuration(props: ConfigurationProps) {
       return;
     } else {
       // console.log('asked for', dayjs(formValues.calibrationChargeDate));
-      const configurationToSend: ConfigurationValues = {
+      const configurationToSend: Partial<ConfigurationValues> = {
         minimumSoC: formValues.minimumSoC,
         gridSetPoint: formValues.gridSetPoint,
         calibrationChargeState: formValues.calibrationChargeState,

typescript/frontend-marios2/src/content/dashboards/Information/InformationSalidomo.tsx

@@ -286,7 +286,7 @@ function InformationSalidomo(props: InformationSalidomoProps) {
                       marginLeft: 1,
                       marginTop: 1,
                       marginBottom: 1,
-                      width: 390
+                      width: 440
                     }}
                   >
                     <InputLabel

typescript/frontend-marios2/src/content/dashboards/Information/InformationSodistoreHome.tsx

@@ -0,0 +1,494 @@
+import {
+  Alert,
+  Box,
+  CardContent,
+  CircularProgress,
+  Container,
+  FormControl,
+  Grid,
+  IconButton,
+  InputLabel,
+  MenuItem,
+  Modal,
+  Select,
+  TextField,
+  Typography,
+  useTheme
+} from '@mui/material';
+import { FormattedMessage } from 'react-intl';
+import Button from '@mui/material/Button';
+import { Close as CloseIcon } from '@mui/icons-material';
+import React, { useContext, useState } from 'react';
+import { I_S3Credentials } from '../../../interfaces/S3Types';
+import { I_Installation } from '../../../interfaces/InstallationTypes';
+import { InstallationsContext } from '../../../contexts/InstallationsContextProvider';
+import { UserContext } from '../../../contexts/userContext';
+import routes from '../../../Resources/routes.json';
+import { useNavigate } from 'react-router-dom';
+import { UserType } from '../../../interfaces/UserTypes';
+
+interface InformationSodistorehomeProps {
+  values: I_Installation;
+  s3Credentials: I_S3Credentials;
+  type?: string;
+}
+
+function InformationSodistorehome(props: InformationSodistorehomeProps) {
+  if (props.values === null) {
+    return null;
+  }
+
+  const context = useContext(UserContext);
+  const { currentUser } = context;
+  const theme = useTheme();
+  const [formValues, setFormValues] = useState(props.values);
+  const requiredFields = ['name', 'region', 'location', 'country'];
+  const [openModalDeleteInstallation, setOpenModalDeleteInstallation] =
+    useState(false);
+  const navigate = useNavigate();
+
+  const DeviceTypes = [
+    { id: 3, name: 'Growatt' },
+    { id: 4, name: 'Sinexcel' }
+  ];
+
+
+  const installationContext = useContext(InstallationsContext);
+  const {
+    updateInstallation,
+    deleteInstallation,
+    loading,
+    setLoading,
+    error,
+    setError,
+    updated,
+    setUpdated
+  } = installationContext;
+
+  const handleChange = (e) => {
+    const { name, value } = e.target;
+    setFormValues({
+      ...formValues,
+      [name]: value
+    });
+  };
+  const handleSubmit = () => {
+    setLoading(true);
+    setError(false);
+    updateInstallation(formValues, props.type);
+  };
+
+  const handleDelete = () => {
+    setLoading(true);
+    setError(false);
+    setOpenModalDeleteInstallation(true);
+  };
+
+  const deleteInstallationModalHandle = () => {
+    setOpenModalDeleteInstallation(false);
+    deleteInstallation(formValues, props.type);
+    setLoading(false);
+
+    navigate(routes.salidomo_installations + routes.list, {
+      replace: true
+    });
+  };
+
+  const deleteInstallationModalHandleCancel = () => {
+    setOpenModalDeleteInstallation(false);
+    setLoading(false);
+  };
+
+  const areRequiredFieldsFilled = () => {
+    for (const field of requiredFields) {
+      if (!formValues[field]) {
+        return false;
+      }
+    }
+    return true;
+  };
+
+  return (
+    <>
+      {openModalDeleteInstallation && (
+        <Modal
+          open={openModalDeleteInstallation}
+          onClose={deleteInstallationModalHandleCancel}
+          aria-labelledby="error-modal"
+          aria-describedby="error-modal-description"
+        >
+          <Box
+            sx={{
+              position: 'absolute',
+              top: '50%',
+              left: '50%',
+              transform: 'translate(-50%, -50%)',
+              width: 350,
+              bgcolor: 'background.paper',
+              borderRadius: 4,
+              boxShadow: 24,
+              p: 4,
+              display: 'flex',
+              flexDirection: 'column',
+              alignItems: 'center'
+            }}
+          >
+            <Typography
+              variant="body1"
+              gutterBottom
+              sx={{ fontWeight: 'bold' }}
+            >
+              Do you want to delete this installation?
+            </Typography>
+
+            <div
+              style={{
+                display: 'flex',
+                alignItems: 'center',
+                marginTop: 10
+              }}
+            >
+              <Button
+                sx={{
+                  marginTop: 2,
+                  textTransform: 'none',
+                  bgcolor: '#ffc04d',
+                  color: '#111111',
+                  '&:hover': { bgcolor: '#f7b34d' }
+                }}
+                onClick={deleteInstallationModalHandle}
+              >
+                Delete
+              </Button>
+              <Button
+                sx={{
+                  marginTop: 2,
+                  marginLeft: 2,
+                  textTransform: 'none',
+                  bgcolor: '#ffc04d',
+                  color: '#111111',
+                  '&:hover': { bgcolor: '#f7b34d' }
+                }}
+                onClick={deleteInstallationModalHandleCancel}
+              >
+                Cancel
+              </Button>
+            </div>
+          </Box>
+        </Modal>
+      )}
+
+      <Container maxWidth="xl">
+        <Grid
+          container
+          direction="row"
+          justifyContent="center"
+          alignItems="stretch"
+          spacing={3}
+        >
+          <Grid item xs={12} md={12}>
+            <CardContent>
+              <Box
+                component="form"
+                sx={{
+                  '& .MuiTextField-root': { m: 1, width: '50ch' }
+                }}
+                noValidate
+                autoComplete="off"
+              >
+                <div>
+                  <TextField
+                    label={
+                      <FormattedMessage
+                        id="installation_name"
+                        defaultMessage="Installation Name"
+                      />
+                    }
+                    name="name"
+                    value={formValues.name}
+                    onChange={handleChange}
+                    variant="outlined"
+                    fullWidth
+                  />
+                </div>
+                <div>
+                  <TextField
+                    label={
+                      <FormattedMessage id="region" defaultMessage="Region" />
+                    }
+                    name="region"
+                    value={formValues.region}
+                    onChange={handleChange}
+                    variant="outlined"
+                    fullWidth
+                    required
+                    error={formValues.region === ''}
+                  />
+                </div>
+                <div>
+                  <TextField
+                    label={
+                      <FormattedMessage
+                        id="location"
+                        defaultMessage="Location"
+                      />
+                    }
+                    name="location"
+                    value={formValues.location}
+                    onChange={handleChange}
+                    variant="outlined"
+                    fullWidth
+                    required
+                    error={formValues.location === ''}
+                  />
+                </div>
+                <div>
+                  <TextField
+                    label={
+                      <FormattedMessage id="country" defaultMessage="Country" />
+                    }
+                    name="country"
+                    value={formValues.country}
+                    onChange={handleChange}
+                    variant="outlined"
+                    fullWidth
+                    required
+                    error={formValues.country === ''}
+                  />
+                </div>
+
+                <div>
+                  <TextField
+                    label={
+                      <FormattedMessage id="vpnip" defaultMessage="VPN IP" />
+                    }
+                    name="vpnIp"
+                    value={formValues.vpnIp}
+                    onChange={handleChange}
+                    variant="outlined"
+                    fullWidth
+                  />
+                </div>
+
+                <div>
+                  <FormControl
+                    fullWidth
+                    sx={{
+                      marginLeft: 1,
+                      marginTop: 1,
+                      marginBottom: 1,
+                      width: 440
+                    }}
+                  >
+                    <InputLabel
+                      sx={{
+                        fontSize: 14,
+                        backgroundColor: 'white'
+                      }}
+                    >
+                      <FormattedMessage
+                        id="DeviceType"
+                        defaultMessage="Device Type"
+                      />
+                    </InputLabel>
+                    <Select
+                      name="device"
+                      value={formValues.device}
+                      onChange={handleChange}
+                    >
+                      {DeviceTypes.map((device) => (
+                        <MenuItem key={device.id} value={device.id}>
+                          {device.name}
+                        </MenuItem>
+                      ))}
+                    </Select>
+                  </FormControl>
+                </div>
+
+                <div>
+                  <TextField
+                    label={
+                      <FormattedMessage
+                        id="inverterSN"
+                        defaultMessage="Inverter Serial Number"
+                      />
+                    }
+                    name="inverterSN"
+                    value={formValues.inverterSN}
+                    onChange={handleChange}
+                    variant="outlined"
+                    fullWidth
+                  />
+                </div>
+
+                <div>
+                  <TextField
+                    label={
+                      <FormattedMessage
+                        id="dataloggerSN"
+                        defaultMessage="Datalogger Serial Number"
+                      />
+                    }
+                    name="dataloggerSN"
+                    value={formValues.dataloggerSN}
+                    onChange={handleChange}
+                    variant="outlined"
+                    fullWidth
+                  />
+                </div>
+
+                <div>
+                  <TextField
+                    label={
+                      <FormattedMessage
+                        id="information"
+                        defaultMessage="Information"
+                      />
+                    }
+                    name="information"
+                    value={formValues.information}
+                    onChange={handleChange}
+                    variant="outlined"
+                    fullWidth
+                  />
+                </div>
+
+                {currentUser.userType == UserType.admin && (
+                  <>
+                    <div>
+                      <TextField
+                        label="S3 Bucket Name"
+                        name="s3writesecretkey"
+                        value={
+                          formValues.s3BucketId +
+                          '-c0436b6a-d276-4cd8-9c44-1eae86cf5d0e'
+                        }
+                        variant="outlined"
+                        fullWidth
+                      />
+                    </div>
+
+                    <div>
+                      <TextField
+                        label="S3 Write Key"
+                        name="s3writesecretkey"
+                        value={formValues.s3WriteKey}
+                        variant="outlined"
+                        fullWidth
+                      />
+                    </div>
+
+                    <div>
+                      <TextField
+                        label="S3 Write Secret Key"
+                        name="s3writesecretkey"
+                        value={formValues.s3WriteSecret}
+                        variant="outlined"
+                        fullWidth
+                      />
+                    </div>
+                  </>
+                )}
+
+                <div
+                  style={{
+                    display: 'flex',
+                    alignItems: 'center',
+                    marginTop: 10
+                  }}
+                >
+                  <Button
+                    variant="contained"
+                    onClick={handleSubmit}
+                    sx={{
+                      marginLeft: '10px'
+                    }}
+                    disabled={!areRequiredFieldsFilled()}
+                  >
+                    <FormattedMessage
+                      id="applyChanges"
+                      defaultMessage="Apply Changes"
+                    />
+                  </Button>
+
+                  {currentUser.userType == UserType.admin && (
+                    <Button
+                      variant="contained"
+                      onClick={handleDelete}
+                      sx={{
+                        marginLeft: '10px'
+                      }}
+                    >
+                      <FormattedMessage
+                        id="deleteInstallation"
+                        defaultMessage="Delete Installation"
+                      />
+                    </Button>
+                  )}
+
+                  {loading && (
+                    <CircularProgress
+                      sx={{
+                        color: theme.palette.primary.main,
+                        marginLeft: '20px'
+                      }}
+                    />
+                  )}
+                  {error && (
+                    <Alert
+                      severity="error"
+                      sx={{
+                        ml: 1,
+                        display: 'flex',
+                        alignItems: 'center'
+                      }}
+                    >
+                      <FormattedMessage
+                        id="errorOccured"
+                        defaultMessage="An error has occurred"
+                      />
+                      <IconButton
+                        color="inherit"
+                        size="small"
+                        onClick={() => setError(false)}
+                        sx={{ marginLeft: '4px' }}
+                      >
+                        <CloseIcon fontSize="small" />
+                      </IconButton>
+                    </Alert>
+                  )}
+                  {updated && (
+                    <Alert
+                      severity="success"
+                      sx={{
+                        ml: 1,
+                        display: 'flex',
+                        alignItems: 'center'
+                      }}
+                    >
+                      <FormattedMessage
+                        id="successfullyUpdated"
+                        defaultMessage="Successfully updated"
+                      />
+
+                      <IconButton
+                        color="inherit"
+                        size="small"
+                        onClick={() => setUpdated(false)} // Set error state to false on click
+                        sx={{ marginLeft: '4px' }}
+                      >
+                        <CloseIcon fontSize="small" />
+                      </IconButton>
+                    </Alert>
+                  )}
+                </div>
+              </Box>
+            </CardContent>
+          </Grid>
+        </Grid>
+      </Container>
+    </>
+  );
+}
+
+export default InformationSodistorehome;

typescript/frontend-marios2/src/content/dashboards/Log/graph.util.tsx

@@ -323,6 +323,12 @@ export interface JSONRecordData {
       TruConvertDcIp: { DeviceState: string };
       TsRelaysIp: { DeviceState: string };
     };
+
+    //For SodistoerHome
+    MaximumChargingCurrent: number;
+    MaximumDischargingCurrent: number;
+    OperatingPriority: string;
+    BatteriesCount: number;
   };
 
   DcDc: {
@@ -602,6 +608,12 @@ export type ConfigurationValues = {
   calibrationChargeDate: Date | null;
   calibrationDischargeState: number;
   calibrationDischargeDate: Date | null;
+
+  //For sodistoreHome
+  maximumDischargingCurrent: number;
+  maximumChargingCurrent: number;
+  operatingPriority: number;
+  batteriesCount: number;
 };
 //
 // export interface Pv {

typescript/frontend-marios2/src/content/dashboards/SodiohomeInstallations/Installation.tsx

@@ -19,11 +19,12 @@ import HistoryOfActions from '../History/History';
 import BuildIcon from '@mui/icons-material/Build';
 import AccessContextProvider from '../../../contexts/AccessContextProvider';
 import Access from '../ManageAccess/Access';
-import Information from '../Information/Information';
+import InformationSodistorehome from '../Information/InformationSodistoreHome';
 import { TimeSpan, UnixTime } from '../../../dataCache/time';
 import { fetchDataJson } from '../Installations/fetchData';
 import { FetchResult } from '../../../dataCache/dataCache';
 import BatteryViewSodioHome from '../BatteryView/BatteryViewSodioHome';
+import SodistoreHomeConfiguration from './SodistoreHomeConfiguration';
 
 interface singleInstallationProps {
   current_installation?: I_Installation;
@@ -179,6 +180,43 @@ function SodioHomeInstallation(props: singleInstallationProps) {
     }
   };
 
+  const fetchDataForOneTime = async () => {
+    var timeperiodToSearch = 200;
+    let res;
+    let timestampToFetch;
+
+    for (var i = timeperiodToSearch; i > 0; i -= 2) {
+      timestampToFetch = UnixTime.now().earlier(TimeSpan.fromSeconds(i));
+      try {
+        res = await fetchDataJson(timestampToFetch, s3Credentials, false);
+        if (res !== FetchResult.notAvailable && res !== FetchResult.tryLater) {
+          break;
+        }
+      } catch (err) {
+        console.error('Error fetching data:', err);
+        return false;
+      }
+    }
+
+    if (i <= 0) {
+      setConnected(false);
+      setLoading(false);
+      return false;
+    }
+    setConnected(true);
+    setLoading(false);
+
+    const timestamp = Object.keys(res)[Object.keys(res).length - 1];
+    setValues(res[timestamp]);
+    // setValues(
+    //   extractValues({
+    //     time: UnixTime.fromTicks(parseInt(timestamp, 10)),
+    //     value: res[timestamp]
+    //   })
+    // );
+    return true;
+  };
+
   useEffect(() => {
     let path = location.split('/');
     setCurrentTab(path[path.length - 1]);
@@ -213,9 +251,9 @@ function SodioHomeInstallation(props: singleInstallationProps) {
         }
       }
       // Fetch only one time in configuration tab
-      // if (currentTab == 'configuration') {
+      if (currentTab == 'configuration') {
-      //   fetchDataForOneTime();
+        fetchDataForOneTime();
-      // }
+      }
 
       return () => {
         continueFetching.current = false;
@@ -375,11 +413,11 @@ function SodioHomeInstallation(props: singleInstallationProps) {
               <Route
                 path={routes.information}
                 element={
-                  <Information
+                  <InformationSodistorehome
                     values={props.current_installation}
                     s3Credentials={s3Credentials}
                     type={props.type}
-                  ></Information>
+                  ></InformationSodistorehome>
                 }
               />
 
@@ -429,6 +467,18 @@ function SodioHomeInstallation(props: singleInstallationProps) {
                 />
               )}
 
+              {currentUser.userType == UserType.admin && (
+                <Route
+                  path={routes.configuration}
+                  element={
+                    <SodistoreHomeConfiguration
+                      values={values}
+                      id={props.current_installation.id}
+                    ></SodistoreHomeConfiguration>
+                  }
+                />
+              )}
+
               {currentUser.userType == UserType.admin && (
                 <Route
                   path={routes.manage}

typescript/frontend-marios2/src/content/dashboards/SodiohomeInstallations/SodistoreHomeConfiguration.tsx

@@ -0,0 +1,387 @@
+import { ConfigurationValues, JSONRecordData } from '../Log/graph.util';
+import {
+  Alert,
+  Box,
+  CardContent,
+  CircularProgress,
+  Container,
+  FormControl,
+  Grid,
+  IconButton,
+  InputLabel,
+  Modal,
+  Select,
+  TextField,
+  Typography,
+  useTheme
+} from '@mui/material';
+
+import React, { useContext, useState } from 'react';
+import { FormattedMessage } from 'react-intl';
+import Button from '@mui/material/Button';
+import { Close as CloseIcon } from '@mui/icons-material';
+import MenuItem from '@mui/material/MenuItem';
+import axiosConfig from '../../../Resources/axiosConfig';
+import { UserContext } from '../../../contexts/userContext';
+import { ProductIdContext } from '../../../contexts/ProductIdContextProvider';
+
+interface SodistoreHomeConfigurationProps {
+  values: JSONRecordData;
+  id: number;
+}
+
+function SodistoreHomeConfiguration(props: SodistoreHomeConfigurationProps) {
+  if (props.values === null) {
+    return null;
+  }
+
+  const OperatingPriorityOptions = [
+    'LoadPriority',
+    'BatteryPriority',
+    'GridPriority'
+  ];
+
+  const [errors, setErrors] = useState({
+    minimumSoC: false,
+    gridSetPoint: false
+  });
+
+  const SetErrorForField = (field_name, state) => {
+    setErrors((prevErrors) => ({
+      ...prevErrors,
+      [field_name]: state
+    }));
+  };
+  const theme = useTheme();
+  const [loading, setLoading] = useState(false);
+  const [error, setError] = useState(false);
+  const [updated, setUpdated] = useState(false);
+  const [dateSelectionError, setDateSelectionError] = useState('');
+  const [isErrorDateModalOpen, setErrorDateModalOpen] = useState(false);
+  const context = useContext(UserContext);
+  const { currentUser, setUser } = context;
+  const { product, setProduct } = useContext(ProductIdContext);
+
+  const [formValues, setFormValues] = useState<Partial<ConfigurationValues>>({
+    minimumSoC: props.values.Config.MinSoc,
+    maximumDischargingCurrent: props.values.Config.MaximumChargingCurrent,
+    maximumChargingCurrent: props.values.Config.MaximumDischargingCurrent,
+    operatingPriority: OperatingPriorityOptions.indexOf(
+      props.values.Config.OperatingPriority
+    ),
+    batteriesCount: props.values.Config.BatteriesCount
+  });
+
+  const handleOperatingPriorityChange = (event) => {
+    setFormValues({
+      ...formValues,
+      ['operatingPriority']: OperatingPriorityOptions.indexOf(
+        event.target.value
+      )
+    });
+  };
+
+  const handleSubmit = async (e) => {
+    // console.log('asked for', dayjs(formValues.calibrationChargeDate));
+    const configurationToSend: Partial<ConfigurationValues> = {
+      minimumSoC: formValues.minimumSoC,
+      maximumDischargingCurrent: formValues.maximumDischargingCurrent,
+      maximumChargingCurrent: formValues.maximumChargingCurrent,
+      operatingPriority: formValues.operatingPriority,
+      batteriesCount:formValues.batteriesCount
+    };
+
+    setLoading(true);
+    const res = await axiosConfig
+      .post(
+        `/EditInstallationConfig?installationId=${props.id}`,
+        configurationToSend
+      )
+      .catch((err) => {
+        if (err.response) {
+          setError(true);
+          setLoading(false);
+        }
+      });
+
+    if (res) {
+      setUpdated(true);
+      setLoading(false);
+    }
+  };
+
+  const handleChange = (e) => {
+    const { name, value } = e.target;
+
+    switch (name) {
+      case 'minimumSoC':
+        if (
+          /[^0-9.]/.test(value) ||
+          isNaN(parseFloat(value)) ||
+          parseFloat(value) > 100
+        ) {
+          SetErrorForField(name, true);
+        } else {
+          SetErrorForField(name, false);
+        }
+        break;
+      case 'gridSetPoint':
+        if (/[^0-9.]/.test(value) || isNaN(parseFloat(value))) {
+          SetErrorForField(name, true);
+        } else {
+          SetErrorForField(name, false);
+        }
+        break;
+
+      default:
+        break;
+    }
+
+    setFormValues({
+      ...formValues,
+      [name]: value
+    });
+  };
+
+  const handleOkOnErrorDateModal = () => {
+    setErrorDateModalOpen(false);
+  };
+
+  return (
+    <Container maxWidth="xl">
+      <Grid
+        container
+        direction="row"
+        justifyContent="center"
+        alignItems="stretch"
+        spacing={3}
+      >
+        {isErrorDateModalOpen && (
+          <Modal open={isErrorDateModalOpen} onClose={() => {}}>
+            <Box
+              sx={{
+                position: 'absolute',
+                top: '50%',
+                left: '50%',
+                transform: 'translate(-50%, -50%)',
+                width: 450,
+                bgcolor: 'background.paper',
+                borderRadius: 4,
+                boxShadow: 24,
+                p: 4,
+                display: 'flex',
+                flexDirection: 'column',
+                alignItems: 'center'
+              }}
+            >
+              <Typography
+                variant="body1"
+                gutterBottom
+                sx={{ fontWeight: 'bold' }}
+              >
+                {dateSelectionError}
+              </Typography>
+
+              <Button
+                sx={{
+                  marginTop: 2,
+                  textTransform: 'none',
+                  bgcolor: '#ffc04d',
+                  color: '#111111',
+                  '&:hover': { bgcolor: '#f7b34d' }
+                }}
+                onClick={handleOkOnErrorDateModal}
+              >
+                Ok
+              </Button>
+            </Box>
+          </Modal>
+        )}
+
+        <Grid item xs={12} md={12}>
+          <CardContent>
+            <Box
+              component="form"
+              sx={{
+                '& .MuiTextField-root': { m: 1, width: 390 }
+              }}
+              noValidate
+              autoComplete="off"
+            >
+              <>
+                <div style={{ marginBottom: '5px' }}>
+                  <TextField
+                    label={
+                      <FormattedMessage
+                        id="batteriesCount "
+                        defaultMessage="Batteries Count"
+                      />
+                    }
+                    name="batteriesCount"
+                    value={formValues.batteriesCount}
+                    onChange={handleChange}
+                    fullWidth
+                  />
+                </div>
+
+                <div style={{ marginBottom: '5px' }}>
+                  <TextField
+                    label={
+                      <FormattedMessage
+                        id="minimum_soc "
+                        defaultMessage="Minimum SoC (%)"
+                      />
+                    }
+                    name="minimumSoC"
+                    value={formValues.minimumSoC}
+                    onChange={handleChange}
+                    helperText={
+                      errors.minimumSoC ? (
+                        <span style={{ color: 'red' }}>
+                          Value should be between 0-100%
+                        </span>
+                      ) : (
+                        ''
+                      )
+                    }
+                    fullWidth
+                  />
+                </div>
+
+                <div style={{ marginBottom: '5px' }}>
+                  <TextField
+                    label={
+                      <FormattedMessage
+                        id="maximumChargingCurrent "
+                        defaultMessage="Maximum Charging Current"
+                      />
+                    }
+                    name="maximumChargingCurrent"
+                    value={formValues.maximumChargingCurrent}
+                    onChange={handleChange}
+                    fullWidth
+                  />
+                </div>
+
+                <div style={{ marginBottom: '5px' }}>
+                  <TextField
+                    label={
+                      <FormattedMessage
+                        id="maximumDischargingCurrent "
+                        defaultMessage="Maximum Discharging Current"
+                      />
+                    }
+                    name="maximumDischargingCurrent"
+                    value={formValues.maximumDischargingCurrent}
+                    onChange={handleChange}
+                    fullWidth
+                  />
+                </div>
+
+                <div style={{ marginBottom: '5px', marginTop: '10px' }}>
+                  <FormControl fullWidth sx={{ marginLeft: 1, width: 390 }}>
+                    <InputLabel
+                      sx={{
+                        fontSize: 14,
+                        backgroundColor: 'white'
+                      }}
+                    >
+                      <FormattedMessage
+                        id="operating_priority"
+                        defaultMessage="Operating Priority"
+                      />
+                    </InputLabel>
+                    <Select
+                      value={
+                        OperatingPriorityOptions[formValues.operatingPriority]
+                      }
+                      onChange={handleOperatingPriorityChange}
+                    >
+                      {OperatingPriorityOptions.map((option) => (
+                        <MenuItem key={option} value={option}>
+                          {option}
+                        </MenuItem>
+                      ))}
+                    </Select>
+                  </FormControl>
+                </div>
+              </>
+
+              <div
+                style={{
+                  display: 'flex',
+                  alignItems: 'center',
+                  marginTop: 10
+                }}
+              >
+                <Button
+                  variant="contained"
+                  onClick={handleSubmit}
+                  sx={{
+                    marginLeft: '10px'
+                  }}
+                >
+                  <FormattedMessage
+                    id="applychanges"
+                    defaultMessage="Apply Changes"
+                  />
+                </Button>
+                {loading && (
+                  <CircularProgress
+                    sx={{
+                      color: theme.palette.primary.main,
+                      marginLeft: '20px'
+                    }}
+                  />
+                )}
+
+                {updated && (
+                  <Alert
+                    severity="success"
+                    sx={{
+                      ml: 1,
+                      display: 'flex',
+                      alignItems: 'center'
+                    }}
+                  >
+                    Successfully applied configuration file
+                    <IconButton
+                      color="inherit"
+                      size="small"
+                      onClick={() => setUpdated(false)}
+                      sx={{ marginLeft: '4px' }}
+                    >
+                      <CloseIcon fontSize="small" />
+                    </IconButton>
+                  </Alert>
+                )}
+                {error && (
+                  <Alert
+                    severity="error"
+                    sx={{
+                      ml: 1,
+                      display: 'flex',
+                      alignItems: 'center'
+                    }}
+                  >
+                    An error has occurred
+                    <IconButton
+                      color="inherit"
+                      size="small"
+                      onClick={() => setError(false)}
+                      sx={{ marginLeft: '4px' }}
+                    >
+                      <CloseIcon fontSize="small" />
+                    </IconButton>
+                  </Alert>
+                )}
+              </div>
+            </Box>
+          </CardContent>
+        </Grid>
+      </Grid>
+    </Container>
+  );
+}
+
+export default SodistoreHomeConfiguration;

typescript/frontend-marios2/src/content/dashboards/SodiohomeInstallations/SodistorehomeInstallationForm.tsx

@@ -0,0 +1,321 @@
+import React, { useContext, useState } from 'react';
+import {
+  Alert,
+  Box,
+  CircularProgress,
+  FormControl,
+  IconButton,
+  InputLabel,
+  MenuItem,
+  Modal,
+  Select,
+  TextField,
+  useTheme
+} from '@mui/material';
+import Button from '@mui/material/Button';
+import { Close as CloseIcon } from '@mui/icons-material';
+import { I_Installation } from 'src/interfaces/InstallationTypes';
+import { InstallationsContext } from 'src/contexts/InstallationsContextProvider';
+import { FormattedMessage } from 'react-intl';
+
+interface SodistorehomeInstallationFormPros {
+  cancel: () => void;
+  submit: () => void;
+  parentid: number;
+}
+
+function SodistorehomeInstallationForm(props: SodistorehomeInstallationFormPros) {
+  const theme = useTheme();
+  const [open, setOpen] = useState(true);
+  const [formValues, setFormValues] = useState<Partial<I_Installation>>({
+    name: '',
+    region: '',
+    location: '',
+    country: '',
+    vpnIp: '',
+  });
+  const requiredFields = ['name', 'location', 'country', 'vpnIp'];
+
+  const DeviceTypes = [
+    { id: 3, name: 'Growatt' },
+    { id: 4, name: 'Sinexcel' }
+  ];
+  const installationContext = useContext(InstallationsContext);
+  const { createInstallation, loading, setLoading, error, setError } =
+    installationContext;
+
+  const handleChange = (e) => {
+    const { name, value } = e.target;
+
+    setFormValues({
+      ...formValues,
+      [name]: value
+    });
+  };
+  const handleSubmit = async (e) => {
+    setLoading(true);
+    formValues.parentId = props.parentid;
+    formValues.product = 2;
+    const responseData = await createInstallation(formValues);
+    props.submit();
+  };
+  const handleCancelSubmit = (e) => {
+    props.cancel();
+  };
+
+  const areRequiredFieldsFilled = () => {
+    for (const field of requiredFields) {
+      if (!formValues[field]) {
+        return false;
+      }
+    }
+    return true;
+  };
+
+  const isMobile = window.innerWidth <= 1490;
+
+  return (
+    <>
+      <Modal
+        open={open}
+        onClose={() => {}}
+        aria-labelledby="error-modal"
+        aria-describedby="error-modal-description"
+      >
+        <Box
+          sx={{
+            position: 'absolute',
+            top: isMobile ? '50%' : '40%',
+            left: '50%',
+            transform: 'translate(-50%, -50%)',
+            width: 500,
+            bgcolor: 'background.paper',
+            borderRadius: 4,
+            boxShadow: 24,
+            p: 4
+          }}
+        >
+          <Box
+            component="form"
+            sx={{
+              display: 'flex',
+              flexDirection: 'column',
+              alignItems: 'center', // Center items horizontally
+              '& .MuiTextField-root': {
+                m: 1,
+                width: 390
+              }
+            }}
+            noValidate
+            autoComplete="off"
+          >
+            <div>
+              <TextField
+                label={
+                  <FormattedMessage
+                    id="installationName"
+                    defaultMessage="Installation Name"
+                  />
+                }
+                name="name"
+                value={formValues.name}
+                onChange={handleChange}
+                required
+                error={formValues.name === ''}
+              />
+            </div>
+            <div>
+              <TextField
+                label={<FormattedMessage id="region" defaultMessage="Region" />}
+                name="region"
+                value={formValues.region}
+                onChange={handleChange}
+                required
+                error={formValues.region === ''}
+              />
+            </div>
+            <div>
+              <TextField
+                label={
+                  <FormattedMessage id="location" defaultMessage="Location" />
+                }
+                name="location"
+                value={formValues.location}
+                onChange={handleChange}
+                required
+                error={formValues.location === ''}
+              />
+            </div>
+
+            <div>
+              <TextField
+                label={
+                  <FormattedMessage id="country" defaultMessage="Country" />
+                }
+                name="country"
+                value={formValues.country}
+                onChange={handleChange}
+                required
+                error={formValues.country === ''}
+              />
+            </div>
+
+            <div>
+              <TextField
+                label={<FormattedMessage id="VpnIp" defaultMessage="VpnIp" />}
+                name="vpnIp"
+                value={formValues.vpnIp}
+                onChange={handleChange}
+                required
+                error={formValues.vpnIp === ''}
+              />
+            </div>
+
+            <div>
+              <FormControl
+                fullWidth
+                sx={{
+                  marginTop: 1,
+                  marginBottom: 1,
+                  width: 390
+                }}
+              >
+                <InputLabel
+                  sx={{
+                    fontSize: 14,
+                    backgroundColor: 'white'
+                  }}
+                >
+                  <FormattedMessage
+                    id="DeviceType"
+                    defaultMessage="Device Type"
+                  />
+                </InputLabel>
+                <Select
+                  name="device"
+                  value={formValues.device}
+                  onChange={handleChange}
+                >
+                  {DeviceTypes.map((device) => (
+                    <MenuItem key={device.id} value={device.id}>
+                      {device.name}
+                    </MenuItem>
+                  ))}
+                </Select>
+              </FormControl>
+            </div>
+
+            <div>
+              <TextField
+                label={
+                  <FormattedMessage
+                    id="inverterSN"
+                    defaultMessage="Inverter Serial Number"
+                  />
+                }
+                name="inverterSN"
+                value={formValues.inverterSN}
+                onChange={handleChange}
+                variant="outlined"
+                fullWidth
+              />
+            </div>
+
+            <div>
+              <TextField
+                label={
+                  <FormattedMessage
+                    id="dataloggerSN"
+                    defaultMessage="Datalogger Serial Number"
+                  />
+                }
+                name="dataloggerSN"
+                value={formValues.dataloggerSN}
+                onChange={handleChange}
+                variant="outlined"
+                fullWidth
+              />
+            </div>
+
+            <div>
+              <TextField
+                label={
+                  <FormattedMessage
+                    id="Information"
+                    defaultMessage="Information"
+                  />
+                }
+                name="information"
+                value={formValues.information}
+                onChange={handleChange}
+              />
+            </div>
+          </Box>
+          <div
+            style={{
+              display: 'flex',
+              alignItems: 'center',
+              marginTop: 10
+            }}
+          >
+            <Button
+              variant="contained"
+              onClick={handleSubmit}
+              sx={{
+                marginLeft: '20px'
+              }}
+              disabled={!areRequiredFieldsFilled()}
+            >
+              <FormattedMessage id="submit" defaultMessage="Submit" />
+            </Button>
+
+            <Button
+              variant="contained"
+              onClick={handleCancelSubmit}
+              sx={{
+                marginLeft: '10px'
+              }}
+            >
+              <FormattedMessage id="cancel" defaultMessage="Cancel" />
+            </Button>
+
+            {loading && (
+              <CircularProgress
+                sx={{
+                  color: theme.palette.primary.main,
+                  marginLeft: '20px'
+                }}
+              />
+            )}
+
+            {error && (
+              <Alert
+                severity="error"
+                sx={{
+                  ml: 1,
+                  display: 'flex',
+                  alignItems: 'center'
+                }}
+              >
+                <FormattedMessage
+                  id="errorOccured"
+                  defaultMessage="An error has occured"
+                />
+                <IconButton
+                  color="inherit"
+                  size="small"
+                  onClick={() => setError(false)}
+                  sx={{ marginLeft: '4px' }}
+                >
+                  <CloseIcon fontSize="small" />
+                </IconButton>
+              </Alert>
+            )}
+          </div>
+        </Box>
+      </Modal>
+    </>
+  );
+}
+
+export default SodistorehomeInstallationForm;

typescript/frontend-marios2/src/content/dashboards/SodiohomeInstallations/index.tsx

@@ -29,7 +29,8 @@ function SodioHomeInstallationTabs(props: SodioHomeInstallationTabsProps) {
     'manage',
     'overview',
     'log',
-    'history'
+    'history',
+    'configuration'
   ];
 
   const [currentTab, setCurrentTab] = useState<string>(undefined);
@@ -133,6 +134,16 @@ function SodioHomeInstallationTabs(props: SodioHomeInstallationTabsProps) {
               <FormattedMessage id="information" defaultMessage="Information" />
             )
           },
+
+          {
+            value: 'configuration',
+            label: (
+              <FormattedMessage
+                id="configuration"
+                defaultMessage="Configuration"
+              />
+            )
+          },
           {
             value: 'history',
             label: (
@@ -213,6 +224,15 @@ function SodioHomeInstallationTabs(props: SodioHomeInstallationTabsProps) {
               <FormattedMessage id="information" defaultMessage="Information" />
             )
           },
+          {
+            value: 'configuration',
+            label: (
+              <FormattedMessage
+                id="configuration"
+                defaultMessage="Configuration"
+              />
+            )
+          },
           {
             value: 'history',
             label: (

typescript/frontend-marios2/src/content/dashboards/Tree/Information.tsx

@@ -26,6 +26,7 @@ import { InstallationsContext } from '../../../contexts/InstallationsContextProv
 import { UserType } from '../../../interfaces/UserTypes';
 import InstallationForm from '../Installations/installationForm';
 import SalidomoInstallationForm from '../SalidomoInstallations/SalidomoInstallationForm';
+import SodiostorehomeInstallationForm from '../SodiohomeInstallations/SodistorehomeInstallationForm';
 
 interface TreeInformationProps {
   folder: I_Folder;
@@ -322,7 +323,6 @@ function TreeInformation(props: TreeInformationProps) {
       )}
       {openModalInstallation &&
         (product == 'Salimax' ||
-          product == 'SodistoreHome' ||
           product == 'SodistoreMax') && (
           <InstallationForm
             cancel={handleFormCancel}
@@ -339,6 +339,14 @@ function TreeInformation(props: TreeInformationProps) {
         />
       )}
 
+      {openModalInstallation && product == 'SodistoreHome' && (
+        <SodiostorehomeInstallationForm
+          cancel={handleFormCancel}
+          submit={handleInstallationFormSubmit}
+          parentid={props.folder.id}
+        />
+      )}
+
       <Container maxWidth="xl">
         <Grid
           container

typescript/frontend-marios2/src/interfaces/InstallationTypes.tsx

@@ -13,6 +13,8 @@ export interface I_Installation extends I_S3Credentials {
   id: number;
   name: string;
   information: string;
+  inverterSN: string;
+  dataloggerSN: string;
   parentId: number;
   s3WriteKey: string;
   s3WriteSecret: string;