Compare commits

...

2 Commits

Author SHA1 Message Date
Noe 1e6c10b96e Merge remote-tracking branch 'origin/main' 2024-07-22 08:30:13 +02:00
Noe 8244067351 Recover missed files from backend 2024-07-19 12:36:27 +02:00
3 changed files with 30 additions and 21 deletions

View File

@ -19,6 +19,12 @@ public static partial class Db
.FirstOrDefault(i => i.Id == id);
}
public static UserAction? GetActionById(Int64? id)
{
return UserActions
.FirstOrDefault(i => i.Id == id);
}
public static User? GetUserById(Int64? id)
{
return Users

View File

@ -276,27 +276,30 @@ function Installation(props: singleInstallationProps) {
/>
</div>
</div>
{loading && currentTab != 'information' && currentTab != 'overview' && (
<Container
maxWidth="xl"
sx={{
display: 'flex',
flexDirection: 'column',
justifyContent: 'center',
alignItems: 'center',
height: '70vh'
}}
>
<CircularProgress size={60} style={{ color: '#ffc04d' }} />
<Typography
variant="body2"
style={{ color: 'black', fontWeight: 'bold' }}
mt={2}
{loading &&
currentTab != 'information' &&
currentTab != 'overview' &&
currentTab != 'log' && (
<Container
maxWidth="xl"
sx={{
display: 'flex',
flexDirection: 'column',
justifyContent: 'center',
alignItems: 'center',
height: '70vh'
}}
>
Connecting to the device...
</Typography>
</Container>
)}
<CircularProgress size={60} style={{ color: '#ffc04d' }} />
<Typography
variant="body2"
style={{ color: 'black', fontWeight: 'bold' }}
mt={2}
>
Connecting to the device...
</Typography>
</Container>
)}
<Card variant="outlined">
<Grid

View File

@ -14,7 +14,7 @@ function SalidomoInstallationTabs() {
const location = useLocation();
const context = useContext(UserContext);
const { currentUser } = context;
const tabList = ['batteryview', 'information'];
const tabList = ['batteryview', 'information', 'overview', 'log'];
const [currentTab, setCurrentTab] = useState<string>(undefined);
const [fetchedInstallations, setFetchedInstallations] =