Skip to content

Commit

Permalink
template changes to ensure submitting cohort highlighted
Browse files Browse the repository at this point in the history
  • Loading branch information
@eatyourpeas
eatyourpeas committed Dec 3, 2024
1 parent 3d62758 commit da9bc6c
Show file tree
Hide file tree
Showing 3 changed files with 59 additions and 102 deletions.
92 changes: 6 additions & 86 deletions static/styles/cards.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,41 +45,6 @@
margin: 1em auto;
}

/* .ui.rcpch_dark_blue.card {
background-color: var(--rcpch_dark_blue);
border-radius: 0%;
font-family: var(--rcpch_standard_font);
font-weight: 400;
color: white;
width: auto;
}
.ui.rcpch_dark_blue.card .content .header {
background-color: var(--rcpch_dark_blue);
border-radius: 0%;
font-family: var(--rcpch_standard_font);
font-weight: 400;
color: white;
} */

/* .ui.rcpch_dark_blue.card .content i {
color: white;
}
.ui.rcpch_dark_blue.card .category {
background-color: var(--rcpch_dark_blue);
border-radius: 0%;
font-family: var(--rcpch_standard_font);
font-weight: 400;
color: white;
}
.ui.white.card {
border-radius: 0%;
font-family: var(--rcpch_standard_font);
font-weight: 400;
} */

.cohorts_dates_grid{
display: grid;
grid-template-columns: 48% 4% 48%;
Expand All @@ -102,17 +67,21 @@

.ui.centered.header.cohort_card_header {
margin-top: 0;
margin-bottom: 0;
border-radius: 0%;
}
/* cards for organisation details */
.organisation_details {
padding: 0.5em 0.5em;
margin: 0em auto;
margin: auto;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
}

.ui.card{
border-radius: 0%;
}

.ui.rcpch.organisation.icon {
margin-right: 0.5em;
Expand Down Expand Up @@ -210,53 +179,4 @@
font-weight: 400;
align-content: center;
}

/* .ui.rcpch_individual_kpi_fixed.card {
display: flex;
flex-direction: column;
background-color: white !important;
font-family: var(--rcpch_standard_font);
color: white;
text-align: center;
font-weight: 400;
align-content: center;
}
.ui.rcpch_individual_kpi_fixed.card .content {
background-color: var(--rcpch_mid_grey);
width: 100%;
border-radius: 0% !important;
}
.ui.rcpch_individual_kpi.card .content {
background-color: var(--rcpch_strong_blue);
width: 100%;
border-radius: 0% !important;
}
.ui.rcpch_individual_kpi.card:hover .content {
background-color: var(--rcpch_light_blue);
}
.ui.rcpch_individual_kpi.card .content.summary_kpi_pie_title h3 {
color: white;
}
.ui.rcpch_individual_kpi_fixed.card .content.summary_kpi_pie_title h3 {
color: white;
}
.ui.rcpch_individual_kpi.card .description {
padding-top: 10px;
color: var(--rcpch_charcoal);
text-align: left;
margin: 10px;
}
.ui.rcpch_individual_kpi_fixed.card .description {
padding-top: 10px;
color: var(--rcpch_charcoal);
text-align: left;
margin: 10px;
} */

25 changes: 14 additions & 11 deletions templates/epilepsy12/partials/organisation/cohort_card.html
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<div class="ui card">
{% if cohort_data.within_grace_period %}<div class="cohorts_dates_three_grid">{% else %}<div class="cohorts_dates_grid">{% endif %}
{% if cohort_data.within_grace_period %}
<div>
<div class="cohorts_dates_three_grid">

<div class="content">
<div class="rcpch_summary_stats">
<div class="ui centered header cohort_card_header">
<h3>COHORT</h3>
</div>

<div class="rcpch_summary_stats_row">
<h1>{{cohort_data.grace_cohort.cohort}}</h1>
<h1 {% if cohort_data.within_grace_period %} style="color: var(--rcpch_pink)"{% endif %}>{{cohort_data.grace_cohort.cohort}}</h1>
<h3>
{% if cohort_data.grace_cohort > cohort_data.today %} Actively
recruiting and submitting data {% else %} Recruitment closed - data
collection ongoing until
{{cohort_data.grace_cohort.submission_date}} {% endif %}
{% if cohort_data.grace_cohort.submission_date > cohort_data.today %}
Recruitment closed - data collection ongoing until {{cohort_data.grace_cohort.submission_date}} {% else %}
Recruitment closed - data collection complete
{% endif %}
</h3>
<h4>
{{cohort_data.grace_cohort.cohort_start_date}} -
Expand All @@ -22,14 +22,13 @@ <h4>
</div>

<div class="rcpch_summary_stats_row">
<h1>{{cohort_data.grace_cohort.days_remaining}}</h1>
<h1 style="color: var(--rcpch_pink)">{{cohort_data.grace_cohort.days_remaining}}</h1>
<h2>Days remaining</h2>
<h3>until latest submission date</h3>
<h4>({{cohort_data.grace_cohort.submission_date}})</h4>
</div>
</div>
</div>
{% endif %}

<div class="grid_line"></div>

Expand All @@ -40,7 +39,11 @@ <h3>COHORT</h3>
</div>

<div class="rcpch_summary_stats_row">
<h1>{{cohort_data.submitting_cohort}}</h1>
{% if cohort_data.submitting_cohort_end_date > cohort_data.today %}
<h1 style="color: var(--rcpch_pink)">{{cohort_data.submitting_cohort}}</h1>
{% else %}
<h1>{{cohort_data.submitting_cohort}}</h1>
{% endif %}
<h3>
{% if cohort_data.submitting_cohort_end_date > cohort_data.today %}
Actively recruiting and submitting data {% else %} Recruitment
Expand Down
44 changes: 39 additions & 5 deletions templates/epilepsy12/partials/selected_organisation_summary.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,16 +94,20 @@
{% endif %}
</div>

<div class="fluid centered row">
{% include 'epilepsy12/partials/organisation/cohort_card.html' with cohort_data=cohort_data %}
</div>

<div class='sixteen wide fluid column'>


<div class="ui three stackable cards">

<div class="ui card">
<div class="content">
<div class="ui centered header">
<h3>{{ selected_organisation.name }}</h3>
</div>
<div class="ui centered header">
<h3>{{ selected_organisation.name }}</h3>
</div>
<h4 class="ui horizontal divider">
<i class="ui rcpch small organisation icon "></i>Address
</h4>
Expand Down Expand Up @@ -144,7 +148,37 @@ <h4 class="ui horizontal divider">
</div>
</div>

{% include 'epilepsy12/partials/organisation/cohort_card.html' with cohort_data=cohort_data %}
<div class="ui card">
<div class="content">
<div class="ui centered header">
<h3>Memberships</h3>
</div>
<div class="organisation_details">
<h4 class="ui horizontal divider">
<i class="ui rcpch small map signs icon "></i>Open UK Network
</h4>
<div class="organisation_details ">
{{ selected_organisation.openuk_network }}
</div>
{% if selected_organisation.trust %}
<h4 class="ui horizontal divider">
<i class="ui rcpch small organisation icon "></i>Integrated Care Board
</h4>
<div class="organisation_details ">
{{ selected_organisation.integrated_care_board }}
</div>
<h4 class="ui horizontal divider">
<i class="ui rcpch small map outline icon "></i> NHS England Region
</h4>
<div class="organisation_details ">
{{ selected_organisation.nhs_england_region }}
</div>
{% endif %}


</div>
</div>
</div>

<div class="ui card">
<div class="content">
Expand Down Expand Up @@ -179,7 +213,7 @@ <h3>Completed Patient Records</h3>

</div>
</div>
</div>
</div>



Expand Down

0 comments on commit da9bc6c

Please sign in to comment.