Skip to content

Commit

Permalink
Merge pull request #262 from DFE-Digital/PostMVP_School_batch_check
Browse files Browse the repository at this point in the history
Fetch data from school journey
  • Loading branch information
wailsey authored Dec 16, 2024
2 parents 437e880 + da4672f commit 94e79c6
Show file tree
Hide file tree
Showing 12 changed files with 774 additions and 65 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/mis-logos/arbor-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/mis-logos/sims.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
38 changes: 37 additions & 1 deletion app/assets/sass/application.scss
Original file line number Diff line number Diff line change
Expand Up @@ -585,10 +585,46 @@ section.dfe {
}

.dfe-page-header {
background-color: #f0f8ff; /* Example: Light blue */
background-color: #f0f8ff; /*Light blue */
padding: 20px;
}

.moj-sub-navigation .moj-sub-navigation__link[aria-current="true"] {
border-bottom: 4px solid #1d70b8;
}

/* Flexbox alignment for the radio button, image, and text */
.govuk-radios__label {
display: flex;
align-items: flex-start; /* Align radio button to the top of the content */
gap: 15px; /* Space between the radio button and the content */
margin-bottom: 15px; /* Add spacing between radio button items */
}

/* Wrap image and text together */
.radio-content {
display: flex;
// flex-direction: column; /* Stack image and text vertically */
gap: 5px; /* Space between image and text */
}

/* Ensure consistent size for logos */
.radio-button-image {
width: 100px; /* Fixed width */
height: auto; /* Maintain aspect ratio */
object-fit: contain; /* Ensure logos are not stretched */
}

/* Optional: Adjust text for alignment */
.radio-button-text {
font-size: 16px;
line-height: 1.2;
margin: 0; /* Remove any default margin */
}

.text-red {
color: #d4351c; /* GOV.UK standard red */
font-weight: bold;
margin: 0; /* Ensure no additional margins */
display: inline; /* Keep it inline */
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,218 @@
{% extends "../../../../layouts/layout-dfe-schoolnav.html" %}
{% set pageName="Common File Transfer (CTF) errors removed" %}

{% block content %}

<div class="govuk-grid-row">
<div class="govuk-grid-column-full-width">
<!-- <h1 class="govuk-heading-l">{{pageName}}</h1> -->


<article class="moj-ticket-panel" aria-label="Sub navigation 1">
<div class="govuk-notification-banner govuk-notification-banner--success" role="alert" aria-labelledby="govuk-notification-banner-title" data-module="govuk-notification-banner">
<div class="govuk-notification-banner__header">
<h2 class="govuk-notification-banner__title" id="govuk-notification-banner-title">
Success
</h2>
</div>
<div class="govuk-notification-banner__content">
<h3 class="govuk-notification-banner__heading">
{{pageName}}
</h3>
<p class="govuk-body">4 records with errors have been successfully removed. <br> Download the XML file with the updated records and import them again or run batch check with the remaining records. </div>
</div>


<!-- <section class="moj-ticket-panel__content moj-ticket-panel__content--red" aria-label="Section 1">
<h2 class="govuk-heading-m govuk-!-margin-bottom-2">You have 7 errors</h2>
<p class="govuk-body">Return to your MIS to fix the listed errors. Once the errors are fixed, download a new XML
file with the specified records and upload it again.</p>
<a class="govuk-button govuk-!-margin-bottom-1" data-module="govuk-button">
Remove files with errors
</a>
</section> -->

</article>
</div>

<div class="govuk-grid-column-full">

<!-- <nav class="moj-sub-navigation" aria-label="Sub navigation">
<ul class="moj-sub-navigation__list">
<li class="moj-sub-navigation__item">
<a class="moj-sub-navigation__link" aria-current="true" data-section="ready-section"
href="#ready"><strong>Ready to check</strong></a>
</li>
<li class="moj-sub-navigation__item">
<a class="moj-sub-navigation__link" data-section="error-section" href="#errors"><strong>Errors</strong></a>
</li>
</ul>
</nav> -->


<div id="ready-section" class="govuk-table-section">
<div class="govuk-grid-column-two-thirds">
<!-- <h2 class="govuk-heading-l">Ready to check</h2> -->
</div>

</div>

<table class="govuk-table" data-module="moj-multi-select" data-multi-select-checkbox="#select-all"
data-multi-select-idprefix=" -" data-module="moj-sortable-table">
<thead class="govuk-table__head">
<tr class="govuk-table__row">
<th class="govuk-table__header" scope="col" id="select-all"></th>
<th scope="col" class="govuk-table__header">Parent <br>first name</th>
<th scope="col" class="govuk-table__header">Parent last name</th>
<th scope="col" class="govuk-table__header">Parent date <br>of birth</th>
<th scope="col" class="govuk-table__header">Parent NINO <br>or NASS</th>
<th scope="col" class="govuk-table__header">Child</th>
<th scope="col" class="govuk-table__header govuk-table__header--date">Childs date <br>of birth</th>
<th scope="col" class="govuk-table__header">Contact email</th>
<th scope="col" class="govuk-table__header">Error</th>
</tr>
</thead>
<tbody class="govuk-table__body">
<tr class="govuk-table__row govuk-table__row--selected">
<td class="govuk-table__cell">
<div class="govuk-checkboxes__item govuk-checkboxes--small moj-multi-select__checkbox">
<input type="checkbox" class="govuk-checkboxes__input" id="mountain-aconcagua">
<label class="govuk-label govuk-checkboxes__label" for="mountain-aconcagua">
<span class="govuk-visually-hidden"> </span>
</label>
</div>
</td>
<!-- <tr class="govuk-table__row"> -->


<td class="govuk-table__cell">Eden</td>
<td class="govuk-table__cell">Tesfay</td>
<td class="govuk-table__cell govuk-table__cell--date">27 April 1973</td>
<td class="govuk-table__cell ">NW123456b</td>
<td class="govuk-table__cell">Samuel Tesfay</td>
<td class="govuk-table__cell govuk-table__cell--date">12 Jan 2017</td>
<td class="govuk-table__cell">[email protected]</td>
<td class="govuk-table__cell"><span class="text-red">Issue with National Insurance number</span></td>

</tr>
</tbody>
<tbody class="govuk-table__body">
<tr class="govuk-table__row govuk-table__row--selected">
<td class="govuk-table__cell">
<div class="govuk-checkboxes__item govuk-checkboxes--small moj-multi-select__checkbox">
<input type="checkbox" class="govuk-checkboxes__input" id="m ">
<label class="govuk-label govuk-checkboxes__label" for=" a">
<span class="govuk-visually-hidden"> </span>
</label>
</div>
</td>
<td class="govuk-table__cell">Eden</td>
<td class="govuk-table__cell">Tesfay</td>
<td class="govuk-table__cell govuk-table__cell--date">27 April 1973</td>
<td class="govuk-table__cell">NW123456b</td>
<td class="govuk-table__cell">Samuel Tesfay</td>
<td class="govuk-table__cell govuk-table__cell--date">12 Jan 2017</td>
<td class="govuk-table__cell">[email protected]</td>
<td class="govuk-table__cell"><span class="text-red">Issue with parent date of birth</span></td>


</tr>
</tbody>
<tbody class="govuk-table__body">
<tbody class="govuk-table__body">
<tr class="govuk-table__row govuk-table__row--selected">
<td class="govuk-table__cell">
<div class="govuk-checkboxes__item govuk-checkboxes--small moj-multi-select__checkbox">
<input type="checkbox" class="govuk-checkboxes__input" id=" ">
<label class="govuk-label govuk-checkboxes__label" for=" ">
<span class="govuk-visually-hidden"> </span>
</label>
</div>
</td>
<td class="govuk-table__cell">Eden </td>
<td class="govuk-table__cell">Tesfay</td>
<td class="govuk-table__cell govuk-table__cell--date">27 April 1973</td>
<td class="govuk-table__cell">NW123456b</td>
<td class="govuk-table__cell">Samuel Tesfay</td>
<td class="govuk-table__cell govuk-table__cell--date">12 Jan 2017</td>
<td class="govuk-table__cell">[email protected]</td>
<td class="govuk-table__cell"><span class="text-red">Issue with National Insurance number</span></td>


</tr>
</tbody>
<tr class="govuk-table__row govuk-table__row--selected">
<td class="govuk-table__cell">
<div class="govuk-checkboxes__item govuk-checkboxes--small moj-multi-select__checkbox">
<input type="checkbox" class="govuk-checkboxes__input" id="mountain-aconcagua">
<label class="govuk-label govuk-checkboxes__label" for="mountain-aconcagua">
<span class="govuk-visually-hidden"> </span>
</label>
</div>
</td>
<td class="govuk-table__cell">Eden</td>
<td class="govuk-table__cell">Tesfay</td>
<td class="govuk-table__cell govuk-table__cell--date">27 April 1973</td>
<td class="govuk-table__cell">NW123456b</td>
<td class="govuk-table__cell">Samuel Tesfay</td>
<td class="govuk-table__cell govuk-table__cell--date">12 Jan 2017</td>
<td class="govuk-table__cell">[email protected]</td>
<td class="govuk-table__cell"><span class="text-red">Issue with first name</span> </td>


</tr>
</tbody>
</table>
</div>



</table>
</div>
<!--
{{ govukButton({
text: "Run batch check",
classes: "govuk-button--primary",
href: '../batch-checking/batch-checking-loader'
}) }} -->

</div>
</div>
{% endblock %}

{% block pageScripts %}

<script>
document.addEventListener('DOMContentLoaded', function () {
const navLinks = document.querySelectorAll('.moj-sub-navigation__link');
const sections = document.querySelectorAll('.govuk-table-section');

// Initially hide all sections except the one corresponding to the active link
const activeLink = document.querySelector('.moj-sub-navigation__link[aria-current="true"]');
const targetId = activeLink ? activeLink.getAttribute('data-section') : 'ready-section';

sections.forEach(section => {
section.style.display = section.id === targetId ? 'block' : 'none';
});

// Add event listeners to handle tab switching
navLinks.forEach(link => {
link.addEventListener('click', function (event) {
event.preventDefault();

// Update aria-current for navigation links
navLinks.forEach(nav => nav.removeAttribute('aria-current'));
this.setAttribute('aria-current', 'true');

// Show only the corresponding section
const newTargetId = this.getAttribute('data-section');
sections.forEach(section => {
section.style.display = section.id === newTargetId ? 'block' : 'none';
});
});
});
});
</script>


{% endblock %}
Loading

0 comments on commit 94e79c6

Please sign in to comment.