diff --git a/shared/src/business/useCases/addCoversheetInteractor.js b/shared/src/business/useCases/addCoversheetInteractor.js index 88f66b16fd5..2c263a8b345 100644 --- a/shared/src/business/useCases/addCoversheetInteractor.js +++ b/shared/src/business/useCases/addCoversheetInteractor.js @@ -23,7 +23,7 @@ exports.generateCoverSheetData = ({ (documentEntity.servedAt && applicationContext .getUtilities() - .formatDateString(documentEntity.servedAt, 'MMDDYYYY')) || + .formatDateString(documentEntity.servedAt, 'MMDDYY')) || ''; let dateReceivedFormatted; @@ -33,14 +33,14 @@ exports.generateCoverSheetData = ({ (documentEntity.createdAt && applicationContext .getUtilities() - .formatDateString(documentEntity.createdAt, 'MMDDYYYY')) || + .formatDateString(documentEntity.createdAt, 'MMDDYY')) || ''; } else { dateReceivedFormatted = (documentEntity.createdAt && applicationContext .getUtilities() - .formatDateString(documentEntity.createdAt, 'MM/DD/YYYY hh:mm a')) || + .formatDateString(documentEntity.createdAt, 'MM/DD/YY hh:mm a')) || ''; } @@ -48,7 +48,7 @@ exports.generateCoverSheetData = ({ (documentEntity.filingDate && applicationContext .getUtilities() - .formatDateString(documentEntity.filingDate, 'MMDDYYYY')) || + .formatDateString(documentEntity.filingDate, 'MMDDYY')) || ''; const caseCaptionToUse = useInitialData @@ -84,7 +84,7 @@ exports.generateCoverSheetData = ({ dateFiledLodgedLabel: isLodged ? 'Lodged' : 'Filed', dateReceived: dateReceivedFormatted, dateServed: dateServedFormatted, - docketNumber: `Docket Number: ${docketNumberWithSuffix}`, + docketNumber: `Docket No.: ${docketNumberWithSuffix}`, documentTitle, electronicallyFiled: !documentEntity.isPaper, mailingDate: documentEntity.mailingDate || '', diff --git a/shared/src/business/useCases/addCoversheetInteractor.test.js b/shared/src/business/useCases/addCoversheetInteractor.test.js index 749d5ea7571..833de703db2 100644 --- a/shared/src/business/useCases/addCoversheetInteractor.test.js +++ b/shared/src/business/useCases/addCoversheetInteractor.test.js @@ -278,7 +278,7 @@ describe('addCoversheetInteractor', () => { }, }); - expect(result.dateFiledLodged).toEqual('04/19/2019'); + expect(result.dateFiledLodged).toEqual('04/19/19'); }); it('shows does not show the filing date if the document does not have a valid filingDate', async () => { @@ -371,7 +371,7 @@ describe('addCoversheetInteractor', () => { }, }); - expect(result.dateReceived).toEqual('04/19/2019 10:45 am'); + expect(result.dateReceived).toEqual('04/19/19 10:45 am'); }); it('shows does not show the received date if the document does not have a valid createdAt and is electronically filed', async () => { @@ -418,7 +418,7 @@ describe('addCoversheetInteractor', () => { }, }); - expect(result.dateReceived).toEqual('04/19/2019'); + expect(result.dateReceived).toEqual('04/19/19'); }); it('shows does not show the received date if the document does not have a valid createdAt and is filed by paper', async () => { @@ -467,7 +467,7 @@ describe('addCoversheetInteractor', () => { }, }); - expect(result.dateServed).toEqual('04/20/2019'); + expect(result.dateServed).toEqual('04/20/19'); }); it('does not display the service date if servedAt is not present', async () => { @@ -515,7 +515,7 @@ describe('addCoversheetInteractor', () => { }, }); - expect(result.docketNumber).toEqual('Docket Number: 102-19'); + expect(result.docketNumber).toEqual('Docket No.: 102-19'); }); it('returns the docket number with suffix along with a Docket Number label', async () => { @@ -540,7 +540,7 @@ describe('addCoversheetInteractor', () => { }, }); - expect(result.docketNumber).toEqual('Docket Number: 102-19S'); + expect(result.docketNumber).toEqual('Docket No.: 102-19S'); }); it('displays Electronically Filed when the document is filed electronically', async () => { @@ -729,7 +729,7 @@ describe('addCoversheetInteractor', () => { useInitialData: true, }); - expect(result.docketNumber).toEqual('Docket Number: 102-19Z'); + expect(result.docketNumber).toEqual('Docket No.: 102-19Z'); expect(result.caseTitle).toEqual('Janie and Jackie Petitioner, '); }); }); diff --git a/shared/src/business/utilities/documentGenerators.js b/shared/src/business/utilities/documentGenerators.js index 3192981ba97..776dc1b4e24 100644 --- a/shared/src/business/utilities/documentGenerators.js +++ b/shared/src/business/utilities/documentGenerators.js @@ -124,7 +124,7 @@ const docketRecord = async ({ applicationContext, data }) => { const footerHtml = reactTemplateGenerator({ componentName: 'DatePrintedFooter', data: { - datePrinted: applicationContext.getUtilities().formatNow('MM/DD/YYYY'), + datePrinted: applicationContext.getUtilities().formatNow('MM/DD/YY'), }, }); @@ -313,7 +313,7 @@ const pendingReport = async ({ applicationContext, data }) => { const footerHtml = reactTemplateGenerator({ componentName: 'DatePrintedFooter', data: { - datePrinted: applicationContext.getUtilities().formatNow('MM/DD/YYYY'), + datePrinted: applicationContext.getUtilities().formatNow('MM/DD/YY'), }, }); @@ -404,7 +404,6 @@ const standingPretrialNotice = async ({ applicationContext, data }) => { const reactStandingPretrialNoticeTemplate = reactTemplateGenerator({ componentName: 'StandingPretrialNotice', data: { - footerDate, options: { caseCaptionExtension, caseTitle, @@ -431,6 +430,16 @@ const standingPretrialNotice = async ({ applicationContext, data }) => { }, }); + let footerHtml = ''; + if (footerDate) { + footerHtml = reactTemplateGenerator({ + componentName: 'DateServedFooter', + data: { + dateServed: footerDate, + }, + }); + } + const pdf = await applicationContext .getUseCases() .generatePdfFromHtmlInteractor({ @@ -438,6 +447,7 @@ const standingPretrialNotice = async ({ applicationContext, data }) => { contentHtml: pdfContentHtml, displayHeaderFooter: true, docketNumber: docketNumberWithSuffix, + footerHtml, headerHtml, overwriteHeader: true, }); @@ -457,7 +467,6 @@ const standingPretrialOrder = async ({ applicationContext, data }) => { const reactStandingPretrialOrderTemplate = reactTemplateGenerator({ componentName: 'StandingPretrialOrder', data: { - footerDate, options: { caseCaptionExtension, caseTitle, @@ -484,6 +493,16 @@ const standingPretrialOrder = async ({ applicationContext, data }) => { }, }); + let footerHtml = ''; + if (footerDate) { + footerHtml = reactTemplateGenerator({ + componentName: 'DateServedFooter', + data: { + dateServed: footerDate, + }, + }); + } + const pdf = await applicationContext .getUseCases() .generatePdfFromHtmlInteractor({ @@ -491,6 +510,7 @@ const standingPretrialOrder = async ({ applicationContext, data }) => { contentHtml: pdfContentHtml, displayHeaderFooter: true, docketNumber: docketNumberWithSuffix, + footerHtml, headerHtml, overwriteHeader: true, }); @@ -526,7 +546,7 @@ const caseInventoryReport = async ({ applicationContext, data }) => { const footerHtml = reactTemplateGenerator({ componentName: 'DatePrintedFooter', data: { - datePrinted: applicationContext.getUtilities().formatNow('MM/DD/YYYY'), + datePrinted: applicationContext.getUtilities().formatNow('MM/DD/YY'), }, }); @@ -585,7 +605,7 @@ const trialCalendar = async ({ applicationContext, data }) => { const footerHtml = reactTemplateGenerator({ componentName: 'DatePrintedFooter', data: { - datePrinted: applicationContext.getUtilities().formatNow('MM/DD/YYYY'), + datePrinted: applicationContext.getUtilities().formatNow('MM/DD/YY'), }, }); @@ -635,7 +655,7 @@ const trialSessionPlanningReport = async ({ applicationContext, data }) => { const footerHtml = reactTemplateGenerator({ componentName: 'DatePrintedFooter', data: { - datePrinted: applicationContext.getUtilities().formatNow('MM/DD/YYYY'), + datePrinted: applicationContext.getUtilities().formatNow('MM/DD/YY'), }, }); diff --git a/shared/src/business/utilities/documentGenerators.test.js b/shared/src/business/utilities/documentGenerators.test.js index 88c50665024..e3dbd332534 100644 --- a/shared/src/business/utilities/documentGenerators.test.js +++ b/shared/src/business/utilities/documentGenerators.test.js @@ -174,10 +174,10 @@ describe('documentGenerators', () => { caseCaptionExtension: 'Petitioner', caseTitle: 'Test Person', certificateOfService: true, - dateFiledLodged: '01/01/2020', + dateFiledLodged: '01/01/20', dateFiledLodgedLabel: 'Filed', - dateReceived: '01/02/2020', - dateServed: '01/03/2020', + dateReceived: '01/02/20', + dateServed: '01/03/20', docketNumberWithSuffix: '123-45S', documentTitle: 'Petition', electronicallyFiled: true, @@ -362,7 +362,8 @@ describe('documentGenerators', () => { applicationContext, data: { caseCaptionExtension: 'Petitioner(s)', - caseTitle: 'Test Petitioner', + caseTitle: + 'Test Petitioner, Another Petitioner, and Yet Another Petitioner', docketNumberWithSuffix: '123-45S', footerDate: '02/02/20', trialInfo: { @@ -431,8 +432,41 @@ describe('documentGenerators', () => { }); }); + describe('notice', () => { + it('generates a Notice document', async () => { + const pdf = await order({ + applicationContext, + data: { + caseCaptionExtension: 'Petitioner(s)', + caseTitle: 'Test Petitioner', + docketNumberWithSuffix: '123-45S', + orderContent: `

This is some sample notice text.

+ +

NOTICE that the joint motion for continuance is granted in that thesecases are stricken for trial from the Court's January 27, 2020, Los Angeles, California, trial session. It is further

+ +

NOTICE that the joint motion to remand to respondent's Appeals Office is granted and these cases are + remanded to respondent's Appeals Office for a supplemental collection due process hearing. It is further

`, + orderTitle: 'NOTICE', + signatureText: 'Test Signature', + }, + }); + + // Do not write PDF when running on CircleCI + if (process.env.PDF_OUTPUT) { + writePdfFile('Notice', pdf); + expect(applicationContext.getChromiumBrowser).toHaveBeenCalled(); + } + + expect( + applicationContext.getUseCases().generatePdfFromHtmlInteractor, + ).toHaveBeenCalled(); + expect(applicationContext.getNodeSass).toHaveBeenCalled(); + expect(applicationContext.getPug).toHaveBeenCalled(); + }); + }); + describe('order', () => { - it('generates a Standing Pre-trial Order document', async () => { + it('generates an Order document', async () => { const pdf = await order({ applicationContext, data: { @@ -450,9 +484,37 @@ describe('documentGenerators', () => { located closest to petitioners' residence (or at such other place as may be mutually agreed upon) at a reasonable and mutually agreed upon date and time, but no later than April 1, 2020. It is further

+

ORDERED that each party shall, on or before April 15, 2020, file with the Court, and serve on the other party, a report regarding the then present status of these cases. It is further

+ +

ORDERED that the joint motion to remand to respondent's Appeals Office is granted and these cases are + remanded to respondent's Appeals Office for a supplemental collection due process hearing. It is further

+ +

ORDERED that respondent shall offer petitioners an administrative hearing at respondent's Appeals Office + located closest to petitioners' residence (or at such other place as may be mutually agreed upon) at a + reasonable and mutually agreed upon date and time, but no later than April 1, 2020. It is further

+ +

ORDERED that each party shall, on or before April 15, 2020, file with the Court, and serve on the other party, a report regarding the then present status of these cases. It is further

+ +

ORDERED that the joint motion for continuance is granted in that thesecases are stricken for trial from the Court's January 27, 2020, Los Angeles, California, trial session. It is further

+ +

ORDERED that the joint motion to remand to respondent's Appeals Office is granted and these cases are + remanded to respondent's Appeals Office for a supplemental collection due process hearing. It is further

+ +

ORDERED that respondent shall offer petitioners an administrative hearing at respondent's Appeals Office + located closest to petitioners' residence (or at such other place as may be mutually agreed upon) at a + reasonable and mutually agreed upon date and time, but no later than April 1, 2020. It is further

+ +

ORDERED that each party shall, on or before April 15, 2020, file with the Court, and serve on the other party, a report regarding the then present status of these cases. It is further

+ +

ORDERED that the joint motion to remand to respondent's Appeals Office is granted and these cases are + remanded to respondent's Appeals Office for a supplemental collection due process hearing. It is further

+ +

ORDERED that respondent shall offer petitioners an administrative hearing at respondent's Appeals Office + located closest to petitioners' residence (or at such other place as may be mutually agreed upon) at a + reasonable and mutually agreed upon date and time, but no later than April 1, 2020. It is further

+

ORDERED that each party shall, on or before April 15, 2020, file with the Court, and serve on the other party, a report regarding the then present status of these cases. It is further

`, orderTitle: 'ORDER', - signatureText: 'Test Signature', }, }); diff --git a/shared/src/business/utilities/htmlGenerator/index.scss b/shared/src/business/utilities/htmlGenerator/index.scss index e4af36c3ad4..ba0ce4545e5 100644 --- a/shared/src/business/utilities/htmlGenerator/index.scss +++ b/shared/src/business/utilities/htmlGenerator/index.scss @@ -31,7 +31,7 @@ h3 { margin-bottom: 20px; font-family: 'nimbus_roman', serif; font-family: serif; - font-size: 14px; + font-size: 16px; text-align: center; text-decoration: underline; @@ -135,6 +135,10 @@ th { .court-header { margin-bottom: 30px; font-family: serif; + + h1 { + font-size: 16px; + } } .case-information #caption, @@ -274,17 +278,17 @@ th { } .court-address { - font-size: 12px; + font-size: 14px; text-align: center; } @page { - margin: 2cm 1cm; + margin: 1.5cm 1cm 2cm 1cm; size: 8.5in 11in; } @page :first { - margin-top: 1cm; - margin-bottom: 2cm; + margin-top: 0; + margin-bottom: 2.5cm; } .margin-top-0 { @@ -326,7 +330,6 @@ th { .please-change { margin-bottom: 20px; font-size: 14px; - font-weight: 600; } .extra-margin-top { @@ -357,7 +360,7 @@ th { h3 { margin-top: 0; - font-size: 14px; + font-size: 16px; font-weight: normal; text-decoration: none; } @@ -367,7 +370,7 @@ th { #docket-number, #document-title, #certificate-of-service { - font-family: 'nimbus_sans_l', sans-serif !important; + font-family: 'nimbus_roman', serif; } #certificate-of-service { @@ -416,6 +419,10 @@ th { } } +#order-content { + font-size: 14px; +} + .calendar-icon { width: 12px; height: 12px; @@ -429,7 +436,7 @@ th { .docket { position: absolute; - top: 0; + top: 1cm; left: 0; padding-left: 0.6in; } diff --git a/shared/src/business/utilities/pdfGenerator/components/AddressLabel.jsx b/shared/src/business/utilities/pdfGenerator/components/AddressLabel.jsx index fa5cca7d626..4afc561f4ba 100644 --- a/shared/src/business/utilities/pdfGenerator/components/AddressLabel.jsx +++ b/shared/src/business/utilities/pdfGenerator/components/AddressLabel.jsx @@ -12,6 +12,9 @@ export const AddressLabel = ({ }) => { return (
+
{name}
{address1}
{address2 &&
{address2}
} diff --git a/shared/src/business/utilities/pdfGenerator/components/CompressedDocketHeader.jsx b/shared/src/business/utilities/pdfGenerator/components/CompressedDocketHeader.jsx index 6529156cb0d..602904ea251 100644 --- a/shared/src/business/utilities/pdfGenerator/components/CompressedDocketHeader.jsx +++ b/shared/src/business/utilities/pdfGenerator/components/CompressedDocketHeader.jsx @@ -14,7 +14,7 @@ export const CompressedDocketHeader = ({ Revenue, Respondent
- Docket Number {docketNumberWithSuffix} + Docket No. {docketNumberWithSuffix}
{h3 &&

{h3}

} diff --git a/shared/src/business/utilities/pdfGenerator/components/CompressedDocketHeader.test.js b/shared/src/business/utilities/pdfGenerator/components/CompressedDocketHeader.test.js index 4e0171c7c66..929e79c32ea 100644 --- a/shared/src/business/utilities/pdfGenerator/components/CompressedDocketHeader.test.js +++ b/shared/src/business/utilities/pdfGenerator/components/CompressedDocketHeader.test.js @@ -19,9 +19,7 @@ describe('CompressedDocketHeader', () => { let wrapper = shallow( , ); - expect(wrapper.find('#docket-number').text()).toEqual( - 'Docket Number 123-45S', - ); + expect(wrapper.find('#docket-number').text()).toEqual('Docket No. 123-45S'); }); it('only renders an h3 element if h3 prop is provided', () => { diff --git a/shared/src/business/utilities/pdfGenerator/components/DatePrintedFooter.test.js b/shared/src/business/utilities/pdfGenerator/components/DatePrintedFooter.test.js index d2ed537a5b2..f240689b808 100644 --- a/shared/src/business/utilities/pdfGenerator/components/DatePrintedFooter.test.js +++ b/shared/src/business/utilities/pdfGenerator/components/DatePrintedFooter.test.js @@ -4,7 +4,7 @@ const { shallow } = require('enzyme'); describe('DatePrintedFooter', () => { it('renders the given dateServed from props', () => { - let wrapper = shallow(); - expect(wrapper.text()).toContain('Printed 01/01/2020'); + let wrapper = shallow(); + expect(wrapper.text()).toContain('Printed 01/01/20'); }); }); diff --git a/shared/src/business/utilities/pdfGenerator/components/DatePrintedFooter.test.jsx b/shared/src/business/utilities/pdfGenerator/components/DatePrintedFooter.test.jsx index 1ad31361796..f33294d63c5 100644 --- a/shared/src/business/utilities/pdfGenerator/components/DatePrintedFooter.test.jsx +++ b/shared/src/business/utilities/pdfGenerator/components/DatePrintedFooter.test.jsx @@ -4,9 +4,9 @@ const { shallow } = require('enzyme'); describe('DatePrintedFooter', () => { it('renders the date from props', () => { - let wrapper = shallow(); + let wrapper = shallow(); expect(wrapper.find('.date-printed-footer').text()).toEqual( - 'Printed 01/01/2020', + 'Printed 01/01/20', ); }); }); diff --git a/shared/src/business/utilities/pdfGenerator/components/DocketHeader.jsx b/shared/src/business/utilities/pdfGenerator/components/DocketHeader.jsx index ba47de47707..d555045bf3f 100644 --- a/shared/src/business/utilities/pdfGenerator/components/DocketHeader.jsx +++ b/shared/src/business/utilities/pdfGenerator/components/DocketHeader.jsx @@ -16,7 +16,7 @@ export const DocketHeader = ({
Commissioner of Internal Revenue
Respondent
-
Docket Number {docketNumberWithSuffix}
+
Docket No. {docketNumberWithSuffix}
{h3 &&

{h3}

} diff --git a/shared/src/business/utilities/pdfGenerator/components/DocketHeader.test.js b/shared/src/business/utilities/pdfGenerator/components/DocketHeader.test.js index 91fcca811c8..fb86da1cc55 100644 --- a/shared/src/business/utilities/pdfGenerator/components/DocketHeader.test.js +++ b/shared/src/business/utilities/pdfGenerator/components/DocketHeader.test.js @@ -27,9 +27,7 @@ describe('DocketHeader', () => { it('renders the docket number from props', () => { let wrapper = shallow(); - expect(wrapper.find('#docket-number').text()).toEqual( - 'Docket Number 123-45S', - ); + expect(wrapper.find('#docket-number').text()).toEqual('Docket No. 123-45S'); }); it('only renders an h3 element if h3 prop is provided', () => { diff --git a/shared/src/business/utilities/pdfGenerator/components/PageMetaHeaderDocket.jsx b/shared/src/business/utilities/pdfGenerator/components/PageMetaHeaderDocket.jsx index 39b428c99e7..939e685c82a 100644 --- a/shared/src/business/utilities/pdfGenerator/components/PageMetaHeaderDocket.jsx +++ b/shared/src/business/utilities/pdfGenerator/components/PageMetaHeaderDocket.jsx @@ -2,11 +2,11 @@ const React = require('react'); export const PageMetaHeaderDocket = ({ docketNumber }) => { return ( - <> +
- Docket Number: {docketNumber} + Docket No.: {docketNumber}
{ Page of{' '}
- +
); }; diff --git a/shared/src/business/utilities/pdfGenerator/components/PageMetaHeaderDocket.test.js b/shared/src/business/utilities/pdfGenerator/components/PageMetaHeaderDocket.test.js index 1de549d21de..7805a7bbb0b 100644 --- a/shared/src/business/utilities/pdfGenerator/components/PageMetaHeaderDocket.test.js +++ b/shared/src/business/utilities/pdfGenerator/components/PageMetaHeaderDocket.test.js @@ -5,6 +5,6 @@ const { shallow } = require('enzyme'); describe('PageMetaHeaderDocket', () => { it('renders the docket number from props', () => { let wrapper = shallow(); - expect(wrapper.text()).toContain('Docket Number: 123-45'); + expect(wrapper.text()).toContain('Docket No.: 123-45'); }); }); diff --git a/shared/src/business/utilities/pdfGenerator/components/ReportsMetaHeader.jsx b/shared/src/business/utilities/pdfGenerator/components/ReportsMetaHeader.jsx index c3350a20c6c..60bf96d3459 100644 --- a/shared/src/business/utilities/pdfGenerator/components/ReportsMetaHeader.jsx +++ b/shared/src/business/utilities/pdfGenerator/components/ReportsMetaHeader.jsx @@ -2,7 +2,7 @@ const React = require('react'); export const ReportsMetaHeader = ({ headerTitle }) => { return ( - <> +
{ Page of{' '}
- +
); }; diff --git a/shared/src/business/utilities/pdfGenerator/documentTemplates/CaseInventoryReport.jsx b/shared/src/business/utilities/pdfGenerator/documentTemplates/CaseInventoryReport.jsx index 4946bc93436..64ef7495982 100644 --- a/shared/src/business/utilities/pdfGenerator/documentTemplates/CaseInventoryReport.jsx +++ b/shared/src/business/utilities/pdfGenerator/documentTemplates/CaseInventoryReport.jsx @@ -17,8 +17,8 @@ export const CaseInventoryReport = ({ - - + + {showStatusColumn && } {showJudgeColumn && } diff --git a/shared/src/business/utilities/pdfGenerator/documentTemplates/NoticeOfDocketChange.test.js b/shared/src/business/utilities/pdfGenerator/documentTemplates/NoticeOfDocketChange.test.js index f54460610ad..2a796e9f268 100644 --- a/shared/src/business/utilities/pdfGenerator/documentTemplates/NoticeOfDocketChange.test.js +++ b/shared/src/business/utilities/pdfGenerator/documentTemplates/NoticeOfDocketChange.test.js @@ -40,7 +40,7 @@ describe('NoticeOfDocketChange', () => { options.caseCaptionExtension, ); expect(wrapper.find('#docket-number').text()).toEqual( - `Docket Number ${options.docketNumberWithSuffix}`, + `Docket No. ${options.docketNumberWithSuffix}`, ); expect(wrapper.find('h3').at(0).text()).toEqual('Notice of Docket Change'); }); diff --git a/shared/src/business/utilities/pdfGenerator/documentTemplates/NoticeOfReceiptOfPetition.test.js b/shared/src/business/utilities/pdfGenerator/documentTemplates/NoticeOfReceiptOfPetition.test.js index 962b368070c..175d0c9c10e 100644 --- a/shared/src/business/utilities/pdfGenerator/documentTemplates/NoticeOfReceiptOfPetition.test.js +++ b/shared/src/business/utilities/pdfGenerator/documentTemplates/NoticeOfReceiptOfPetition.test.js @@ -30,7 +30,7 @@ describe('NoticeOfReceiptOfPetition', () => { expect(wrapper.find('#caption').text()).toContain(caseTitle); expect(wrapper.find('#caption').text()).toContain(caseCaptionExtension); expect(wrapper.find('#docket-number').text()).toEqual( - `Docket Number ${docketNumberWithSuffix}`, + `Docket No. ${docketNumberWithSuffix}`, ); expect(wrapper.find('h3').at(0).text()).toEqual( 'Notice of Receipt of Petition', diff --git a/shared/src/business/utilities/pdfGenerator/documentTemplates/Order.test.js b/shared/src/business/utilities/pdfGenerator/documentTemplates/Order.test.js index ce3e5aa4ab7..64206875bcd 100644 --- a/shared/src/business/utilities/pdfGenerator/documentTemplates/Order.test.js +++ b/shared/src/business/utilities/pdfGenerator/documentTemplates/Order.test.js @@ -26,7 +26,7 @@ describe('Order', () => { options.caseCaptionExtension, ); expect(wrapper.find('#docket-number').text()).toEqual( - `Docket Number ${options.docketNumberWithSuffix}`, + `Docket No. ${options.docketNumberWithSuffix}`, ); }); diff --git a/shared/src/business/utilities/pdfGenerator/documentTemplates/PendingReport.jsx b/shared/src/business/utilities/pdfGenerator/documentTemplates/PendingReport.jsx index 54fec21e74e..5196e8b382f 100644 --- a/shared/src/business/utilities/pdfGenerator/documentTemplates/PendingReport.jsx +++ b/shared/src/business/utilities/pdfGenerator/documentTemplates/PendingReport.jsx @@ -11,11 +11,11 @@ export const PendingReport = ({ pendingItems, subtitle }) => {
DocketCase titleDocket No.Case TitleCase StatusJudge
- + - - - + + + diff --git a/shared/src/business/utilities/pdfGenerator/documentTemplates/ReceiptOfFiling.test.js b/shared/src/business/utilities/pdfGenerator/documentTemplates/ReceiptOfFiling.test.js index 06df4fef535..9c883aee68d 100644 --- a/shared/src/business/utilities/pdfGenerator/documentTemplates/ReceiptOfFiling.test.js +++ b/shared/src/business/utilities/pdfGenerator/documentTemplates/ReceiptOfFiling.test.js @@ -57,7 +57,7 @@ describe('ReceiptOfFiling', () => { `${options.caseTitle}, ${options.caseCaptionExtension}`, ); expect(wrapper.find('#docket-number').text()).toEqual( - `Docket Number ${options.docketNumberWithSuffix}`, + `Docket No. ${options.docketNumberWithSuffix}`, ); expect(wrapper.find('.case-information h3').text()).toEqual( 'Receipt of Filing', diff --git a/shared/src/business/utilities/pdfGenerator/documentTemplates/StandingPretrialNotice.jsx b/shared/src/business/utilities/pdfGenerator/documentTemplates/StandingPretrialNotice.jsx index 887af65fce0..db01159b196 100644 --- a/shared/src/business/utilities/pdfGenerator/documentTemplates/StandingPretrialNotice.jsx +++ b/shared/src/business/utilities/pdfGenerator/documentTemplates/StandingPretrialNotice.jsx @@ -3,7 +3,7 @@ const React = require('react'); const { DocketHeader } = require('../components/DocketHeader.jsx'); const { PrimaryHeader } = require('../components/PrimaryHeader.jsx'); -export const StandingPretrialNotice = ({ footerDate, options, trialInfo }) => { +export const StandingPretrialNotice = ({ options, trialInfo }) => { return ( <> @@ -115,13 +115,6 @@ export const StandingPretrialNotice = ({ footerDate, options, trialInfo }) => { Trial Judge

-

- Served {footerDate} -

); }; diff --git a/shared/src/business/utilities/pdfGenerator/documentTemplates/StandingPretrialNotice.test.js b/shared/src/business/utilities/pdfGenerator/documentTemplates/StandingPretrialNotice.test.js index 496ea0cf8fb..3b29311bf86 100644 --- a/shared/src/business/utilities/pdfGenerator/documentTemplates/StandingPretrialNotice.test.js +++ b/shared/src/business/utilities/pdfGenerator/documentTemplates/StandingPretrialNotice.test.js @@ -5,7 +5,6 @@ import { StandingPretrialNotice } from './StandingPretrialNotice.jsx'; describe('StandingPretrialNotice', () => { let options; let trialInfo; - let footerDate = '05/01/2020'; beforeAll(() => { options = { @@ -39,7 +38,7 @@ describe('StandingPretrialNotice', () => { options.caseCaptionExtension, ); expect(wrapper.find('#docket-number').text()).toEqual( - `Docket Number ${options.docketNumberWithSuffix}`, + `Docket No. ${options.docketNumberWithSuffix}`, ); }); @@ -113,18 +112,4 @@ describe('StandingPretrialNotice', () => { expect(signature.text()).toContain(`(Signed) ${trialInfo.judge.name}`); }); - - it('renders the served date', () => { - const wrapper = shallow( - , - ); - - const servedStamp = wrapper.find('#served-stamp'); - - expect(servedStamp.text()).toContain(`Served ${footerDate}`); - }); }); diff --git a/shared/src/business/utilities/pdfGenerator/documentTemplates/StandingPretrialOrder.jsx b/shared/src/business/utilities/pdfGenerator/documentTemplates/StandingPretrialOrder.jsx index 98ac6ea2f62..bac0578a321 100644 --- a/shared/src/business/utilities/pdfGenerator/documentTemplates/StandingPretrialOrder.jsx +++ b/shared/src/business/utilities/pdfGenerator/documentTemplates/StandingPretrialOrder.jsx @@ -3,7 +3,7 @@ const React = require('react'); const { DocketHeader } = require('../components/DocketHeader.jsx'); const { PrimaryHeader } = require('../components/PrimaryHeader.jsx'); -export const StandingPretrialOrder = ({ footerDate, options, trialInfo }) => { +export const StandingPretrialOrder = ({ options, trialInfo }) => { return ( <> @@ -99,17 +99,7 @@ export const StandingPretrialOrder = ({ footerDate, options, trialInfo }) => { material that is not so stipulated or exchanged, unless the parties have agreed otherwise or the Court so allows for good cause shown.

- - -

- Served {footerDate} -

-

3. Pretrial Memoranda. It is ORDERED that, unless a basis of settlement (resolution of the diff --git a/shared/src/business/utilities/pdfGenerator/documentTemplates/StandingPretrialOrder.test.js b/shared/src/business/utilities/pdfGenerator/documentTemplates/StandingPretrialOrder.test.js index 051360c6f92..5e5e74436c5 100644 --- a/shared/src/business/utilities/pdfGenerator/documentTemplates/StandingPretrialOrder.test.js +++ b/shared/src/business/utilities/pdfGenerator/documentTemplates/StandingPretrialOrder.test.js @@ -33,7 +33,7 @@ describe('StandingPretrialOrder', () => { options.caseCaptionExtension, ); expect(wrapper.find('#docket-number').text()).toEqual( - `Docket Number ${options.docketNumberWithSuffix}`, + `Docket No. ${options.docketNumberWithSuffix}`, ); }); @@ -46,15 +46,4 @@ describe('StandingPretrialOrder', () => { expect(wrapper.text()).toContain(trialInfo.state); expect(wrapper.text()).toContain(trialInfo.judge.name); }); - - it('renders a document with a served date', () => { - const wrapper = shallow( - , - ); - expect(wrapper.find('#served-stamp').text()).toEqual('Served 02/02/2020'); - }); }); diff --git a/shared/src/business/utilities/pdfGenerator/documentTemplates/TrialCalendar.jsx b/shared/src/business/utilities/pdfGenerator/documentTemplates/TrialCalendar.jsx index 1aa03d063d8..e6a58e7940d 100644 --- a/shared/src/business/utilities/pdfGenerator/documentTemplates/TrialCalendar.jsx +++ b/shared/src/business/utilities/pdfGenerator/documentTemplates/TrialCalendar.jsx @@ -81,16 +81,16 @@ export const TrialCalendar = ({ cases, sessionDetail }) => {

- Open Cases ({cases.length}) + Open cases ({cases.length})

DocketDocket No. Date FiledCase nameFilings and proceedingsCase statusCase NameFilings and ProceedingsCase Status Judge
- + - - + + diff --git a/shared/src/business/utilities/pdfGenerator/documentTemplates/TrialCalendar.test.js b/shared/src/business/utilities/pdfGenerator/documentTemplates/TrialCalendar.test.js index 34299eee500..18bf3da1c22 100644 --- a/shared/src/business/utilities/pdfGenerator/documentTemplates/TrialCalendar.test.js +++ b/shared/src/business/utilities/pdfGenerator/documentTemplates/TrialCalendar.test.js @@ -106,7 +106,7 @@ describe('TrialCalendar', () => { ); expect(wrapper.find('#cases-count').text()).toEqual( - `Open Cases (${cases.length})`, + `Open cases (${cases.length})`, ); });
Docket no.Docket No. Case TitlePetitioner counselRespondent counselPetitioner CounselRespondent Counsel