Skip to content

pofcc-75 fresh version #2151

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

Open
anthonydummer wants to merge 1 commit into
base: master
Choose a base branch
from
Open

pofcc-75 fresh version #2151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@hmcts/ccd-case-ui-toolkit",
"version": "7.3.49",
"version": "7.3.49-pofcc-75-v3",
"engines": {
"node": ">=20.19.0"
},
Expand Down
2 changes: 1 addition & 1 deletion projects/ccd-case-ui-toolkit/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@hmcts/ccd-case-ui-toolkit",
"version": "7.3.49",
"version": "7.3.49-pofcc-75-v3",
"engines": {
"node": ">=20.19.0"
},
Expand Down
138 changes: 70 additions & 68 deletions ...-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit-page/case-edit-page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,78 +1,80 @@
<ng-container *ngIf="currentPage">
<h1 *ngIf="!currentPage.label" class="govuk-heading-l">{{eventTrigger.name | rpxTranslate}}</h1>
<ng-container *ngIf="currentPage.label">
<span class="govuk-caption-l">{{ eventTrigger.name | rpxTranslate}}</span>
<h1 class="govuk-heading-l">{{currentPage.label | rpxTranslate}}</h1>
<main id="content" role="main" class="govuk-main-wrapper">
<ng-container *ngIf="currentPage">
<h1 *ngIf="!currentPage.label" class="govuk-heading-l">{{eventTrigger.name | rpxTranslate}}</h1>
<ng-container *ngIf="currentPage.label">
<span class="govuk-caption-l">{{ eventTrigger.name | rpxTranslate}}</span>
<h1 class="govuk-heading-l">{{currentPage.label | rpxTranslate}}</h1>
</ng-container>
</ng-container>
</ng-container>

<!--Case ID or Title -->
<div *ngIf="getCaseTitle(); then titleBlock; else idBlock"></div>
<ng-template #titleBlock>
<ccd-markdown [content]="getCaseTitle() | ccdCaseTitle: caseFields : editForm.controls['data'] | rpxTranslate"></ccd-markdown>
</ng-template>
<ng-template #idBlock>
<h2 *ngIf="getCaseId()" class="heading-h2">#{{ getCaseId() | ccdCaseReference }}</h2>
</ng-template>
<!--Case ID or Title -->
<div *ngIf="getCaseTitle(); then titleBlock; else idBlock"></div>
<ng-template #titleBlock>
<ccd-markdown [content]="getCaseTitle() | ccdCaseTitle: caseFields : editForm.controls['data'] | rpxTranslate"></ccd-markdown>
</ng-template>
<ng-template #idBlock>
<h2 *ngIf="getCaseId()" class="heading-h2">#{{ getCaseId() | ccdCaseReference }}</h2>
</ng-template>

<!-- Error message summary -->
<div *ngIf="validationErrors.length > 0" class="govuk-error-summary" aria-labelledby="error-summary-title" role="alert" tabindex="-1" data-module="govuk-error-summary">
<h2 class="govuk-error-summary__title" id="error-summary-title">
{{'There is a problem' | rpxTranslate}}
</h2>
<div *ngFor="let validationError of validationErrors" class="govuk-error-summary__body">
<ul class="govuk-list govuk-error-summary__list">
<li>
<a (click)="navigateToErrorElement(validationError.id)" (keyup.enter)="navigateToErrorElement(validationError.id)" tabindex="0" class="validation-error">
{{ validationError.message | rpxTranslate: getRpxTranslatePipeArgs(validationError.label | rpxTranslate): null }}
</a>
</li>
</ul>
<!-- Error message summary -->
<div *ngIf="validationErrors.length > 0" class="govuk-error-summary" aria-labelledby="error-summary-title" role="alert" tabindex="-1" data-module="govuk-error-summary">
<h2 class="govuk-error-summary__title" id="error-summary-title">
{{'There is a problem' | rpxTranslate}}
</h2>
<div *ngFor="let validationError of validationErrors" class="govuk-error-summary__body">
<ul class="govuk-list govuk-error-summary__list">
<li>
<a (click)="navigateToErrorElement(validationError.id)" (keyup.enter)="navigateToErrorElement(validationError.id)" tabindex="0" class="validation-error">
{{ validationError.message | rpxTranslate: getRpxTranslatePipeArgs(validationError.label | rpxTranslate): null }}
</a>
</li>
</ul>
</div>
</div>
</div>

<ccd-case-edit-generic-errors [error]="caseEdit.error"></ccd-case-edit-generic-errors>
<ccd-case-edit-generic-errors [error]="caseEdit.error"></ccd-case-edit-generic-errors>

<ccd-callback-errors
[triggerTextContinue]="triggerTextStart"
[triggerTextIgnore]="triggerTextIgnoreWarnings"
[callbackErrorsSubject]="caseEdit.callbackErrorsSubject"
(callbackErrorsContext)="callbackErrorsNotify($event)">
</ccd-callback-errors>
<div class="width-50">
<form *ngIf="currentPage" class="form" [formGroup]="editForm" (submit)="nextStep()">
<fieldset id="fieldset-case-data">
<legend style="display: none;"></legend>
<!-- single column -->
<ccd-case-edit-form id='caseEditForm' *ngIf="!currentPage.isMultiColumn()" [fields]="currentPage.getCol1Fields()"
[formGroup]="editForm.controls['data']" [caseFields]="caseFields"
[pageChangeSubject]="pageChangeSubject"
(valuesChanged)="applyValuesChanged($event)"></ccd-case-edit-form>
<!-- two columns -->
<div *ngIf="currentPage.isMultiColumn()" class="grid-row">
<div class="column-two-thirds rightBorderSeparator">
<ccd-case-edit-form id='caseEditForm1' [fields]="currentPage.getCol1Fields()"
[formGroup]="editForm.controls['data']" [caseFields]="caseFields"></ccd-case-edit-form>
</div>
<div class="column-one-third">
<ccd-case-edit-form id='caseEditForm2' [fields]="currentPage.getCol2Fields()"
[formGroup]="editForm.controls['data']" [caseFields]="caseFields"></ccd-case-edit-form>
<ccd-callback-errors
[triggerTextContinue]="triggerTextStart"
[triggerTextIgnore]="triggerTextIgnoreWarnings"
[callbackErrorsSubject]="caseEdit.callbackErrorsSubject"
(callbackErrorsContext)="callbackErrorsNotify($event)">
</ccd-callback-errors>
<div class="width-50">
<form *ngIf="currentPage" class="form" [formGroup]="editForm" (submit)="nextStep()">
<fieldset id="fieldset-case-data">
<legend style="display: none;"></legend>
<!-- single column -->
<ccd-case-edit-form id='caseEditForm' *ngIf="!currentPage.isMultiColumn()" [fields]="currentPage.getCol1Fields()"
[formGroup]="editForm.controls['data']" [caseFields]="caseFields"
[pageChangeSubject]="pageChangeSubject"
(valuesChanged)="applyValuesChanged($event)"></ccd-case-edit-form>
<!-- two columns -->
<div *ngIf="currentPage.isMultiColumn()" class="grid-row">
<div class="column-two-thirds rightBorderSeparator">
<ccd-case-edit-form id='caseEditForm1' [fields]="currentPage.getCol1Fields()"
[formGroup]="editForm.controls['data']" [caseFields]="caseFields"></ccd-case-edit-form>
</div>
<div class="column-one-third">
<ccd-case-edit-form id='caseEditForm2' [fields]="currentPage.getCol2Fields()"
[formGroup]="editForm.controls['data']" [caseFields]="caseFields"></ccd-case-edit-form>
</div>
</div>
</div>
</fieldset>
</fieldset>

<div class="form-group form-group-related">
<button class="button button-secondary" type="button" (click)="toPreviousPage()" *ngIf="!isAtStart()" [disabled]="isDisabled()">
{{'Previous' | rpxTranslate}}
</button>
<button class="button" type="submit" [disabled]="submitting()">{{triggerText | rpxTranslate}}</button>
</div>
<div class="form-group form-group-related">
<button class="button button-secondary" type="button" (click)="toPreviousPage()" *ngIf="!isAtStart()" [disabled]="isDisabled()">
{{'Previous' | rpxTranslate}}
</button>
<button class="button" type="submit" [disabled]="submitting()">{{triggerText | rpxTranslate}}</button>
</div>

<p class="cancel"><button type="button" (click)="cancel()" class="govuk-js-link">{{getCancelText() | rpxTranslate}}</button></p>
</form>
</div>
<p class="cancel"><button type="button" (click)="cancel()" class="govuk-js-link">{{getCancelText() | rpxTranslate}}</button></p>
</form>
</div>

<ccd-case-event-completion *ngIf="caseEdit.isEventCompletionChecksRequired"
[eventCompletionParams]="caseEdit.eventCompletionParams"
(eventCanBeCompleted)="onEventCanBeCompleted($event)">
</ccd-case-event-completion>
<ccd-case-event-completion *ngIf="caseEdit.isEventCompletionChecksRequired"
[eventCompletionParams]="caseEdit.eventCompletionParams"
(eventCanBeCompleted)="onEventCanBeCompleted($event)">
</ccd-case-event-completion>
</main>
Loading