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

#1181 & #1280 UI fixes #1287

Merged
merged 2 commits into from
Aug 1, 2024
Merged

#1181 & #1280 UI fixes #1287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ec52c9
#1181 | Fix UI for offline dashboard view
sachsk Jul 22, 2024
4d5c6af
#1280 | In show mode display the name of the sync setting in users sh…
sachsk Jul 22, 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
3 changes: 2 additions & 1 deletion src/adminApp/user.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,11 +171,12 @@ const SubjectTypeSyncAttributeShow = ({ subjectType, syncConceptValueMap, ...pro
const ConceptSyncAttributeShow = ({ subjectType, syncConceptValueMap, syncAttributeName, ...props }) => {
const syncSettings = get(props.record, ["syncSettings", subjectType.name], {});
const conceptUUID = get(syncSettings, [syncAttributeName]);
const syncConceptName = subjectType[syncAttributeName].name;
if (isEmpty(conceptUUID)) return null;

return (
<div>
<span style={{ color: "rgba(0, 0, 0, 0.54)", fontSize: "12px", marginRight: 10 }}>{startCase(syncAttributeName)}</span>
<span style={{ color: "rgba(0, 0, 0, 0.54)", fontSize: "12px", marginRight: 10 }}>{startCase(syncConceptName)}</span>
{map(get(syncSettings, `${syncAttributeName}Values`, []), value => (
<Chip style={{ margin: "0.2em" }} label={syncConceptValueMap.get(value) || value} key={value} />
))}
Expand Down
1 change: 1 addition & 0 deletions src/formDesigner/components/Dashboard/CreateEditDashboard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ const CreateEditDashboard = ({ edit, history, operationalModules, getOperational
{getErrorByKey(error, "EMPTY_NAME")}
<p />
<AvniTextField
style={{ width: "12em" }}
multiline
id="description"
label="Dashboard Description"
Expand Down
2 changes: 1 addition & 1 deletion src/formDesigner/components/Dashboard/SelectCardsView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export const SelectCardsView = ({ dashboardSection, addCards }) => {
return (
<div>
<Grid container spacing={2}>
<Grid item xs={10}>
<Grid item xs={10} style={{ zIndex: 2 }}>
<Select
name="addCard"
ref={cardSelectRef}
Expand Down