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

Ticdi 103 - create document page layout #229

Merged
merged 2 commits into from
Aug 29, 2024
Merged

Ticdi 103 - create document page layout #229

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
52ca7aa
adjust create document page layout
mgtennant Aug 29, 2024
ba201eb
add id to provision search
mgtennant Aug 29, 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 backend/src/report/report.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,8 @@ export class ReportService {
const md2 = JSON.stringify(cdogsData);
conf.data = md2;
const response2 = await ax(conf).catch((error) => {
console.log(error.response);
console.log('cdogs error');
console.log(error);
});
// response2.data is the docx file after the second insertions
// (anything nested in a variable or provision should be inserted at this point)
Expand Down
1 change: 0 additions & 1 deletion frontend/src/app/components/common/Collapsible.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ const Collapsible: FC<CollapsibleProps> = ({ title, children, isOpen }) => {
</div>
</div>

<hr />
<div style={contentStyle}>{children}</div>
</div>
);
Expand Down
24 changes: 10 additions & 14 deletions frontend/src/app/content/pages/LandingPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,6 @@ const LandingPage: FC = () => {
);
if (!displayData.error) {
setData(displayData.dtr);
setIsOpen(true);
} else {
setError(displayData.error);
setShowError(true);
Expand Down Expand Up @@ -215,7 +214,6 @@ const LandingPage: FC = () => {
const displayData: { dtr: DTRDisplayObject | null; error: string | null } = await getDisplayData(dtidValue);
if (!displayData.error) {
setData(displayData.dtr);
setIsOpen(true);
} else {
setError(displayData.error);
setShowError(true);
Expand Down Expand Up @@ -448,19 +446,7 @@ const LandingPage: FC = () => {
<div className="font-weight-bold inlineDiv mr-1">Primary Contact Name:</div>
<div className="inlineDiv">{data?.primaryContactName}</div>
</div>
<Collapsible title="Disposition Transaction ID Details" isOpen={isOpen}>
{data ? <DtidDetails data={data!} /> : <Skeleton />}
</Collapsible>
<Collapsible title="Tenure Details" isOpen={isOpen}>
{data ? <TenureDetails data={data!} /> : <Skeleton />}
</Collapsible>
<Collapsible title="Interested Parties" isOpen={isOpen}>
{data ? <InterestedParties data={data!} /> : <Skeleton />}
</Collapsible>

<hr />
<h3>Create Document</h3>
<hr />
<Row className="mb-3">
<div className="ml-3 mr-3">
<b>Document Type:</b>
Expand All @@ -480,6 +466,16 @@ const LandingPage: FC = () => {
</select>
</div>
</Row>
<Collapsible title="Disposition Transaction ID Details" isOpen={isOpen}>
{data ? <DtidDetails data={data!} /> : <Skeleton />}
</Collapsible>
<Collapsible title="Tenure Details" isOpen={isOpen}>
{data ? <TenureDetails data={data!} /> : <Skeleton />}
</Collapsible>
<Collapsible title="Interested Parties" isOpen={isOpen}>
{data ? <InterestedParties data={data!} /> : <Skeleton />}
</Collapsible>

{provisionGroups && dtid && documentType ? (
<>
<Collapsible title="Provisions" isOpen={false}>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/app/content/pages/ManageProvisionsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ const ManageProvisionsPage: FC<ManageProvisionsPageProps> = () => {
};

const handleFilterProvisions = (searchTerm: string) => {
const searchKeys: string[] = ['provision_name', 'category'];
const searchKeys: string[] = ['id', 'provision_name', 'category'];
setFilterText(searchTerm);

const fp: Provision[] = data.allProvisions
Expand Down
Loading