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.

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

- Modal wont cancel, PQE blank fields bug, char info shows 'no info...' rather than no #1537

Merged
merged 3 commits into from
Dec 23, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions src/components/Page/InformationReviewSectionRenderer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -174,14 +174,14 @@
:edit="edit"
:index="index"
type="text"
:extension="key"
extension="otherTasks"
@changeField="changeField"
/>
</div>
</dd>

<dd
v-else-if="data[index][key] instanceof Date"
v-else-if="data[index][key] ? data[index][key] instanceof Date : key.search('Date')"
class="govuk-summary-list__value"
>
<InformationReviewRenderer
Expand Down Expand Up @@ -216,7 +216,7 @@
ref="removeModal"
>
<ModalInner
@closed="closeModal"
@close="closeModal"
@confirmed="removeField"
/>
</Modal>
Expand Down
80 changes: 42 additions & 38 deletions src/views/Exercise/Applications/Application.vue
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,46 @@
</h1>
</div>
<div class="govuk-grid-column-one-half text-right print-none">
<span
v-if="activeTab == 'full'"
>
<span
class="govuk-!-margin-left-4"
>
<button
v-if="isApplied"
class="govuk-button btn-unlock"
@click="unlock"
>
Unlock
</button>
<button
v-else
class="govuk-button btn-mark-as-applied"
@click="submitApplication"
>
Mark as applied
</button>
</span>
<span
class="govuk-!-margin-left-4 govuk-!-margin-right-4"
>
<button
v-if="editMode"
class="govuk-button govuk-button btn-unlock"
@click="toggleEdit"
>
Done
</button>
<button
v-else
class="govuk-button govuk-button--secondary btn-mark-as-applied"
@click="toggleEdit"
>
Edit
</button>
</span>
</span>
<div class="moj-button-menu">
<button
ref="dropDownRef"
Expand Down Expand Up @@ -73,44 +113,6 @@
</button>
</div>
</div>

<span
v-if="activeTab == 'full'"
class=" govuk-!-margin-left-4"
>
<button
v-if="isApplied"
class="govuk-button btn-unlock"
@click="unlock"
>
Unlock
</button>
<button
v-else
class="govuk-button btn-mark-as-applied"
@click="submitApplication"
>
Mark as applied
</button>
</span>
<span
class=" govuk-!-margin-left-4"
>
<button
v-if="editMode"
class="govuk-button govuk-button btn-unlock"
@click="toggleEdit"
>
Done
</button>
<button
v-else
class="govuk-button govuk-button--secondary btn-mark-as-applied"
@click="toggleEdit"
>
Edit
</button>
</span>
</div>
</div>

Expand Down Expand Up @@ -309,6 +311,7 @@ import splitFullName from '@jac-uk/jac-kit/helpers/splitFullName';
import { authorisedToPerformAction } from '@/helpers/authUsers';
import PageNotFound from '@/views/Errors/PageNotFound';
import InformationReviewRenderer from '@/components/Page/InformationReviewRenderer';
import CharacterChecks from '@/views/Exercise/Tasks/CharacterChecks';

import {
isLegal,
Expand All @@ -335,6 +338,7 @@ export default {
ExperienceSummary,
AssessmentsSummary,
AssessorsSummary,
CharacterChecks,
},
data() {
return {
Expand Down
1 change: 1 addition & 0 deletions src/views/Exercise/Tasks/CharacterChecks.vue
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,7 @@ import { formatDate } from '@jac-uk/jac-kit/filters/filters';
import { functions } from '@/firebase';

export default {
name: 'CharacterChecks',
components: {
Banner,
ActionButton,
Expand Down
Loading