Skip to content

Feature/scat 5647 #1643

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

Merged
SahitiVemulapalli merged 2 commits into from
Jul 28, 2022
Merged

Feature/scat 5647 #1643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c661ea
5647-commit
2073810-Sonam Jul 28, 2022
a9facd1
scat 5196 scat 5307
SahitiVemulapalli Jul 28, 2022
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
129 changes: 79 additions & 50 deletions src/main/features/requirements/views/rfp-review.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -845,20 +845,15 @@ management information or reporting by the Supplier
{% endif %}
</dd>
</div>
<div class="govuk-summary-list__row">
<dt class="govuk-summary-list__key">
<h3><strong>Set the specific ratio of quality groups</strong></h3><br/>
<p> Technical group </p><br/>
<p>Cultural group</p><br/>
<p>Social value group</p><br/>
</dt>
<dd class="govuk-summary-list__key">
<br/><br/><br/><br/>
<p>{{technicalgroupquestion1}}%</p><br/>
<p>{{culturalgroupquestion1}}%</p><br/>
<p>{{socialvaluegroupquestion1}}%</p><br/>
</dd>
<dd class="govuk-summary-list__actions">

<div class="govuk-summary-list__row">
<dt class="govuk-summary-list__value border-bottom-rfp-review">
<h3><strong>Set the specific ratio of quality groups</strong></h3><br/><br/>
</dt>
<dt class="govuk-summary-list__value border-bottom-rfp-review">

</dt>
<dd class="govuk-summary-list__actions border-bottom-rfp-review">
{% if eventStatus != "published"%}
<a class="govuk-link" href="/rfp/assesstment-question?agreement_id=RM6263&proc_id={{proc_id}}&event_id={{event_id}}&id=Criterion 2&group_id=Group 3">
Change<span class="govuk-visually-hidden">project name</span>
Expand All @@ -867,6 +862,31 @@ management information or reporting by the Supplier
</dd>
</div>
<div class="govuk-summary-list__row">
<dt class="govuk-summary-list__key border-bottom-rfp-review" >
<p>Technical group </p>
</dt>
<dd class="govuk-summary-list__value border-bottom-rfp-review">
<p> {{technicalgroupquestion1}}%</p>
</dd>
</div>
<div class="govuk-summary-list__row">
<dt class="govuk-summary-list__key border-bottom-rfp-review">
<p>Cultural group </p>
</dt>
<dd class="govuk-summary-list__value border-bottom-rfp-review">
<p>{{culturalgroupquestion1}}%</p>
</dd>
</div>
<div class="govuk-summary-list__row">
<dt class="govuk-summary-list__key">
<p> Social value group </p>
</dt>
<dd class="govuk-summary-list__value ">
<p> {{socialvaluegroupquestion1}}%</p>
</dd>
</div>

<div class="govuk-summary-list__row">
<dt class="govuk-summary-list__value">
<h3><strong>Add your technical questions </strong></h3><br/>
{%if techGroup !=undefined and techGroup !=null and techGroup | length >0%}
Expand All @@ -890,15 +910,15 @@ management information or reporting by the Supplier
{% endfor %}
{%endif%}
</dd>
<dd class="govuk-summary-list__actions">
<dd class="govuk-summary-list__actions border-top-rfp-review-">
{% if eventStatus != "published"%}
<a class="govuk-link" href="/rfp/assesstment-question?agreement_id=RM6263&proc_id={{proc_id}}&event_id={{event_id}}&id=Criterion 2&group_id=Group 4">
Change<span class="govuk-visually-hidden">project name</span>
</a>
{% endif %}
</dd>
</div>
<div class="govuk-summary-list__row">
<div class="govuk-summary-list__row ">
<dt class="govuk-summary-list__value">
<h3><strong>Add your cultural questions</strong></h3><br/><br/>
{%if techGroup !=undefined and techGroup !=null and techGroup | length >0%}
Expand Down Expand Up @@ -982,53 +1002,62 @@ management information or reporting by the Supplier
{% endif %}
</dd>
</div> #}
{#</dl>
<dl>#}
<div class="govuk-summary-list__row">
<dt class="govuk-summary-list__value">
<dt class="govuk-summary-list__value border-bottom-rfp-review">
<h3><strong>How you will score suppliers</strong></h3><br/><br/>
{%if tierData !=undefined and tierData !=null and tierData | length >0%}
{% for data in tierData%}
{%if loop.index ==1%}
<br/>
{%endif%}
{%if loop.index !=1%}
<br/><br/><br/><br/>
{%endif%}
<p>Level Name</p><br/>
<p>Score</p><br/>
<p>Description</p><br/>
{% endfor %}
{%endif%}
</dt>
<dd class="govuk-summary-list__value govuk-summary-list__key">

{%if tierData !=undefined and tierData !=null and tierData | length >0%}

{% for data in tierData %}
{%if loop.index ==1%}
<br/><br/>
{%endif%}

<p>{{data.name}}</p><br/>
<p>{{data.id}}</p><br/>
<p>{{data.text}}</p><br><br>
{% endfor%}
{%endif%}
</dd>
<dd class="govuk-summary-list__actions">
</dt>
<dt class="govuk-summary-list__value border-bottom-rfp-review">

</dt>
<dd class="govuk-summary-list__actions border-bottom-rfp-review">
{% if eventStatus != "published"%}
<a class="govuk-link" href="/rfp/set-scoring-criteria">
Change<span class="govuk-visually-hidden">project name</span>
</a>
{% endif %}
</dd>
</div>
{%if tierData !=undefined and tierData !=null and tierData | length >0%}
{% for data in tierData%}

<div class="govuk-summary-list__row">
<dt class="govuk-summary-list__key border-bottom-rfp-review" >
<p> Level Name </p>
</dt>
<dd class="govuk-summary-list__value border-bottom-rfp-review">
<p> {{data.name}}</p>
</dd>
</div>
<div class="govuk-summary-list__row">
<dt class="govuk-summary-list__key border-bottom-rfp-review">
<p>Score </p>
</dt>
<dd class="govuk-summary-list__value border-bottom-rfp-review">
<p>{{data.id}}</p>
</dd>
</div>
<div class="govuk-summary-list__row">
<dt class="govuk-summary-list__key border-bottom-rfp-review">
<p> Description </p>
</dt>
<dd class="govuk-summary-list__value border-bottom-rfp-review">
<p> {{data.text}}</p>
</dd>
</div>

{% endfor %}
{%endif%}

</dl>

{%endblock%}
{# END-----------Your assessment criteria #}

{# START-----------Review and publish your further competition #}
{%block Review_and_publish_your_further_competition%}

<div class="border-top-rfp-review-"></div>
<h2 class="govuk-heading-m">6. Review and publish {% if selectedeventtype!='DA' %}your further competition{%endif%} </h2>
<dl class="govuk-summary-list">
<div class="govuk-summary-list__row">
Expand Down Expand Up @@ -1164,7 +1193,7 @@ management information or reporting by the Supplier
}) }}
{%endif%}
<br><br>
<div class="ccs-link-group">
<!--<div class="ccs-link-group">
<span>
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd"
Expand All @@ -1174,7 +1203,7 @@ management information or reporting by the Supplier
</span>
<br>

</div>
</div>-->
<br><br>
</div>
</div>
Expand Down
7 changes: 7 additions & 0 deletions src/main/public/assets/styles/application.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 9 additions & 1 deletion src/main/public/assets/styles/custom.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,15 @@
.cookie-message__heading {
padding-right: 4.375rem !important;
}

.border-bottom-rfp-review
{
border-bottom:0px !important
}
.border-top-rfp-review-
{
border-top:1px solid #b1b4b6 !important;
margin-bottom:15px !important;
}
.cookie-message__actions {
display: -ms-flexbox !important;
display: flex !important;
Expand Down