Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix : Hardcoded reporting urls in home page #1151

Merged
merged 5 commits into from
Mar 14, 2024
Merged

Fix : Hardcoded reporting urls in home page #1151

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4a2d7a4
#1140 |fix:change report detail hardcoded with getting from mock api
vedfordev Mar 3, 2024
e62ac9a
#1140 | change mock api to avni-server end point
vedfordev Mar 4, 2024
f8a7587
#1140 | changed fetch api to http method and removed function
vedfordev Mar 7, 2024
658f78e
#1140 | removed cleanup function
vedfordev Mar 8, 2024
67e69ba
#1140 | add length condition in reportingsystem
vedfordev Mar 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 54 additions & 30 deletions src/rootApp/views/SignInView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@ import { RemoveRedEye } from "@material-ui/icons";
import Button from "@material-ui/core/Button";
import Link from "@material-ui/core/Link";
import Typography from "@material-ui/core/Typography";
import React, { useState } from "react";
import React, { useEffect, useState } from "react";
import SideImage from "../../avni-background.jpeg";
import { withStyles } from "@material-ui/core/styles";
import ApplicationContext from "../../ApplicationContext";
import http from "common/utils/httpClient";

function SignInView({
classes,
Expand All @@ -29,6 +30,19 @@ function SignInView({
}) {
const [passwordIsMasked, setPasswordIsMasked] = useState(true);
const autoComplete = ApplicationContext.isDevEnv() ? "on" : "off";
const [reportingSystems, setReportingSystems] = useState(null);

useEffect(() => {
http
.get("/Config")
.then(
response =>
response.data &&
response.data.reportingSystems &&
response.data.reportingSystems.length > 0 &&
setReportingSystems(response.data.reportingSystems)
);
}, []);

return (
<Grid container component="main" className={classes.root}>
Expand Down Expand Up @@ -115,40 +129,50 @@ function SignInView({
</form>
</CardContent>
</Card>
<Grid style={{ backgroundColor: "#f0f2f0" }}>
<CardHeader title={"View Reports"} />
<CardContent>
<Typography variant="body2" color="secondary">
Avni provides reports using one of two different external BI tools - Metabase and
Jasper Reports. You can find out the reports used by your organisation from your
system administrator.
</Typography>
<Typography variant="body2" color="secondary">
<br />
Choose your reporting system
</Typography>
</CardContent>
<CardActions>
<Link href={"https://reporting.avniproject.org"}>
<Button size="small" variant={"contained"} className={classes.submit}>
Metabase Reports
</Button>
</Link>
<Link
href={"https://reporting-jasper.avniproject.org/jasperserver"}
style={{ marginLeft: "56px" }}
>
<Button size="small" variant={"contained"} className={classes.submit}>
Jasper Reports
</Button>
</Link>
</CardActions>
</Grid>
{reportingSystems && <ShowReport classes={classes} reportingSystems={reportingSystems} />}
</Grid>
</Grid>
);
}

const ShowReport = ({ classes, reportingSystems }) => {
return (
<>
<Grid style={{ backgroundColor: "#f0f2f0" }}>
<CardHeader title={"View Reports"} />
<CardContent>
<Typography variant="body2" color="secondary">
Avni provides reports using one of two different external BI tools - Metabase and Jasper
Reports. You can find out the reports used by your organisation from your system
administrator.
</Typography>
<Typography variant="body2" color="secondary">
<br />
Choose your reporting system
</Typography>
</CardContent>
<CardActions style={{ justifyContent: "space-evenly" }}>
{reportingSystems.map(({ name, url }) => (
<ReportDetails key={name} name={name} url={url} classes={classes} />
))}
</CardActions>
</Grid>
</>
);
};

const ReportDetails = ({ name, url, classes }) => {
return (
<>
<Link href={url}>
<Button size="small" variant={"contained"} className={classes.submit}>
{name}
</Button>
</Link>
</>
);
};

const useStyles = theme => ({
root: {
height: "100vh"
Expand Down