display name instead of id, margin under table sections, Download xml to Download

This commit is contained in:
burnettk 2022-11-25 10:23:00 -05:00
parent f3dcb0a6a2
commit 3023c52a2b
9 changed files with 27 additions and 10 deletions

View File

@ -76,8 +76,8 @@ class ProcessInstanceReportService:
"columns": [ "columns": [
{"Header": "id", "accessor": "id"}, {"Header": "id", "accessor": "id"},
{ {
"Header": "process_model_identifier", "Header": "process_model_display_name",
"accessor": "process_model_identifier", "accessor": "process_model_display_name",
}, },
{"Header": "start_in_seconds", "accessor": "start_in_seconds"}, {"Header": "start_in_seconds", "accessor": "start_in_seconds"},
{"Header": "end_in_seconds", "accessor": "end_in_seconds"}, {"Header": "end_in_seconds", "accessor": "end_in_seconds"},

View File

@ -14,6 +14,7 @@ type OwnProps = {
pagination: PaginationObject | null; pagination: PaginationObject | null;
tableToDisplay: any; tableToDisplay: any;
paginationQueryParamPrefix?: string; paginationQueryParamPrefix?: string;
paginationClassName?: string;
}; };
export default function PaginationForTable({ export default function PaginationForTable({
@ -23,6 +24,7 @@ export default function PaginationForTable({
pagination, pagination,
tableToDisplay, tableToDisplay,
paginationQueryParamPrefix, paginationQueryParamPrefix,
paginationClassName,
}: OwnProps) { }: OwnProps) {
const PER_PAGE_OPTIONS = [2, 10, 50, 100]; const PER_PAGE_OPTIONS = [2, 10, 50, 100];
const [searchParams, setSearchParams] = useSearchParams(); const [searchParams, setSearchParams] = useSearchParams();
@ -44,6 +46,7 @@ export default function PaginationForTable({
<> <>
{tableToDisplay} {tableToDisplay}
<Pagination <Pagination
className={paginationClassName}
data-qa="pagination-options" data-qa="pagination-options"
backwardText="Previous page" backwardText="Previous page"
forwardText="Next page" forwardText="Next page"

View File

@ -60,6 +60,7 @@ type OwnProps = {
showReports?: boolean; showReports?: boolean;
reportIdentifier?: string; reportIdentifier?: string;
textToShowIfEmpty?: string; textToShowIfEmpty?: string;
paginationClassName?: string;
}; };
interface dateParameters { interface dateParameters {
@ -74,6 +75,7 @@ export default function ProcessInstanceListTable({
showReports = true, showReports = true,
reportIdentifier, reportIdentifier,
textToShowIfEmpty, textToShowIfEmpty,
paginationClassName,
}: OwnProps) { }: OwnProps) {
const params = useParams(); const params = useParams();
const [searchParams] = useSearchParams(); const [searchParams] = useSearchParams();
@ -799,12 +801,17 @@ export default function ProcessInstanceListTable({
tableToDisplay={buildTable()} tableToDisplay={buildTable()}
paginationQueryParamPrefix={paginationQueryParamPrefix} paginationQueryParamPrefix={paginationQueryParamPrefix}
perPageOptions={perPageOptions} perPageOptions={perPageOptions}
paginationClassName={paginationClassName}
/> />
</> </>
); );
} }
if (textToShowIfEmpty) { if (textToShowIfEmpty) {
return <p className="no-results-message">{textToShowIfEmpty}</p>; return (
<p className="no-results-message with-large-bottom-margin">
{textToShowIfEmpty}
</p>
);
} }
return null; return null;

View File

@ -569,7 +569,7 @@ export default function ReactDiagramEditor({
a={targetUris.processModelFileShowPath} a={targetUris.processModelFileShowPath}
ability={ability} ability={ability}
> >
<Button onClick={downloadXmlFile}>Download xml</Button> <Button onClick={downloadXmlFile}>Download</Button>
</Can> </Can>
</> </>
); );

View File

@ -111,7 +111,7 @@ export default function MyOpenProcesses() {
const tasksComponent = () => { const tasksComponent = () => {
if (pagination && pagination.total < 1) { if (pagination && pagination.total < 1) {
return ( return (
<p className="no-results-message"> <p className="no-results-message with-large-bottom-margin">
There are no tasks for processes you started at this time. There are no tasks for processes you started at this time.
</p> </p>
); );
@ -130,6 +130,7 @@ export default function MyOpenProcesses() {
pagination={pagination} pagination={pagination}
tableToDisplay={buildTable()} tableToDisplay={buildTable()}
paginationQueryParamPrefix={paginationQueryParamPrefix} paginationQueryParamPrefix={paginationQueryParamPrefix}
paginationClassName="with-large-bottom-margin"
/> />
); );
}; };

View File

@ -112,7 +112,7 @@ export default function TasksWaitingForMe() {
const tasksComponent = () => { const tasksComponent = () => {
if (pagination && pagination.total < 1) { if (pagination && pagination.total < 1) {
return ( return (
<p className="no-results-message"> <p className="no-results-message with-large-bottom-margin">
You have no task assignments at this time. You have no task assignments at this time.
</p> </p>
); );
@ -131,6 +131,7 @@ export default function TasksWaitingForMe() {
pagination={pagination} pagination={pagination}
tableToDisplay={buildTable()} tableToDisplay={buildTable()}
paginationQueryParamPrefix="tasks_waiting_for_me" paginationQueryParamPrefix="tasks_waiting_for_me"
paginationClassName="with-large-bottom-margin"
/> />
); );
}; };

View File

@ -147,6 +147,10 @@ h1.with-icons {
margin-bottom: 1em; margin-bottom: 1em;
} }
.with-large-bottom-margin {
margin-bottom: 3em;
}
.diagram-viewer-canvas { .diagram-viewer-canvas {
border:1px solid #000000; border:1px solid #000000;
height:70vh; height:70vh;

View File

@ -14,8 +14,9 @@ export default function CompletedInstances() {
reportIdentifier="system_report_instances_initiated_by_me" reportIdentifier="system_report_instances_initiated_by_me"
showReports={false} showReports={false}
textToShowIfEmpty="You have no completed instances at this time." textToShowIfEmpty="You have no completed instances at this time."
paginationClassName="with-large-bottom-margin"
/> />
<h2 style={{ marginTop: '1em' }}>Tasks completed by me</h2> <h2>Tasks completed by me</h2>
<p className="data-table-description"> <p className="data-table-description">
This is a list of instances where you have completed tasks. This is a list of instances where you have completed tasks.
</p> </p>
@ -26,8 +27,9 @@ export default function CompletedInstances() {
reportIdentifier="system_report_instances_with_tasks_completed_by_me" reportIdentifier="system_report_instances_with_tasks_completed_by_me"
showReports={false} showReports={false}
textToShowIfEmpty="You have no completed tasks at this time." textToShowIfEmpty="You have no completed tasks at this time."
paginationClassName="with-large-bottom-margin"
/> />
<h2 style={{ marginTop: '1em' }}>Tasks completed by my groups</h2> <h2>Tasks completed by my groups</h2>
<p className="data-table-description"> <p className="data-table-description">
This is a list of instances with tasks that were completed by groups you This is a list of instances with tasks that were completed by groups you
belong to. belong to.

View File

@ -5,10 +5,9 @@ import TasksWaitingForMyGroups from '../components/TasksWaitingForMyGroups';
export default function GroupedTasks() { export default function GroupedTasks() {
return ( return (
<> <>
{/* be careful moving these around since the first two have with-large-bottom-margin in order to get some space between the three table sections */}
<TasksForMyOpenProcesses /> <TasksForMyOpenProcesses />
<br />
<TasksWaitingForMe /> <TasksWaitingForMe />
<br />
<TasksWaitingForMyGroups /> <TasksWaitingForMyGroups />
</> </>
); );