Skip to content

Commit

Permalink
Merge branch 'develop' into bug/checkboxes
Browse files Browse the repository at this point in the history
  • Loading branch information
@randywoods
randywoods authored Nov 10, 2023
2 parents 11a5baf + f3f293b commit 86c6715
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 11 deletions.
18 changes: 9 additions & 9 deletions ...ssment/prepare/assessment-info/demographics-extended/demographics-extended.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,21 +76,21 @@ <h4>Infrastructure Taxonomy</h4>
<a href="https://www.flsenate.gov/Committees/billsummaries/2022/html/2864" target="_blank">Florida House Bill 7055</a>?
</p>
<div class="d-flex flex-column ml-3">
<input class="radio-custom" name="HB7055No" id="HB7055No" type="radio" autocomplete="off" tabindex="1"
<input class="radio-custom" style="visibility: visible" name="HB7055No" id="HB7055No" type="radio" autocomplete="off" tabindex="1"
(click)="setHb7055('N')" [checked]="demographicData.hb7055 == 'N'">
<label class="radio-custom-label" for="HB7055No">No</label>
<input class="radio-custom" name="HB7055Yes" id="HB7055Yes" type="radio" autocomplete="off" tabindex="0"
<input class="radio-custom" style="visibility: visible" name="HB7055Yes" id="HB7055Yes" type="radio" autocomplete="off" tabindex="0"
(click)="setHb7055('Y')" [checked]="demographicData.hb7055 == 'Y'">
<label class="radio-custom-label" for="HB7055Yes">Yes</label>
</div>
<div *ngIf="demographicData.hb7055 == 'Y'" class="ml-5 mt-3">
<p>
Are you intending to apply for the State of Florida Local Cybersecurity Grant Program? The full assessments completes the requirements for house bill 7055?
</p>
<input class="radio-custom" name="hb7055GrantNo" id="hb7055GrantNo" type="radio" autocomplete="off" tabindex="1"
<input class="radio-custom" style="visibility: visible" name="hb7055GrantNo" id="hb7055GrantNo" type="radio" autocomplete="off" tabindex="1"
(click)="sethb7055Grant('N')" [checked]="demographicData.hb7055GrantGrant == 'N'">
<label class="radio-custom-label" for="hb7055GrantNo">No</label>
<input class="radio-custom" name="hb7055GrantYes" id="hb7055GrantYes" type="radio" autocomplete="off" tabindex="0"
<input class="radio-custom" style="visibility: visible" name="hb7055GrantYes" id="hb7055GrantYes" type="radio" autocomplete="off" tabindex="0"
(click)="sethb7055Grant('Y')" [checked]="demographicData.hb7055Grant == 'Y'">
<label class="radio-custom-label" for="hb7055GrantYes">Yes</label>
<p>
Expand All @@ -109,7 +109,7 @@ <h4>Infrastructure Taxonomy</h4>
</p>

<div class="d-flex flex-column ml-3">
<input class="radio-custom" name="primaryType" id="primaryIT" type="radio" autocomplete="off" tabindex="0"
<input class="radio-custom" style="visibility: visible" name="primaryType" id="primaryIT" type="radio" autocomplete="off" tabindex="0"
(click)="setInfrastructureItOt('IT')" [checked]="demographicData.infrastructureItOt == 'IT'">
<label class="radio-custom-label" for="primaryIT">
<strong class="mr-4">Information Technology (IT)</strong>
Expand All @@ -128,7 +128,7 @@ <h4>Infrastructure Taxonomy</h4>
</div>
</div>
</label>
<input class="radio-custom" name="primaryType" id="primaryOT" type="radio" autocomplete="off" tabindex="0"
<input class="radio-custom" style="visibility: visible" name="primaryType" id="primaryOT" type="radio" autocomplete="off" tabindex="0"
(click)="setInfrastructureItOt('OT')" [checked]="demographicData.infrastructureItOt == 'OT'">
<label class="radio-custom-label" for="primaryOT">
<strong class="mr-4">Operational Technology (OT)</strong>
Expand Down Expand Up @@ -320,13 +320,13 @@ <h5>
</p>
<p class="font-italic">Are you interested in being considered for this free assessment follow-on service?</p>
<div class="d-flex flex-column ml-3">
<input class="radio-custom" name="FreeAssessYes" id="FreeAssessYes" type="radio" autocomplete="off"
<input class="radio-custom" style="visibility: visible" name="FreeAssessYes" id="FreeAssessYes" type="radio" autocomplete="off"
tabindex="0" (click)="setCyberRisk('Y')" [checked]="demographicData.cyberRiskService == 'Y'">
<label class="radio-custom-label" for="FreeAssessYes">Yes</label>
<input class="radio-custom" name="FreeAssessNo" id="FreeAssessNo" type="radio" autocomplete="off"
<input class="radio-custom" style="visibility: visible" name="FreeAssessNo" id="FreeAssessNo" type="radio" autocomplete="off"
tabindex="0" (click)="setCyberRisk('N')" [checked]="demographicData.cyberRiskService == 'N'">
<label class="radio-custom-label" for="FreeAssessNo">No</label>
<input class="radio-custom" name="FreeAssessMaybe" id="FreeAssessMaybe" type="radio" autocomplete="off"
<input class="radio-custom" style="visibility: visible" name="FreeAssessMaybe" id="FreeAssessMaybe" type="radio" autocomplete="off"
tabindex="0" (click)="setCyberRisk('M')" [checked]="demographicData.cyberRiskService == 'M'">
<label class="radio-custom-label" for="FreeAssessMaybe">Maybe Later</label>
</div>
Expand Down
29 changes: 27 additions & 2 deletions CSETWebNg/src/app/layout/cf-layout-main/cf-layout-main.component.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,13 +208,38 @@ a {

.checkbox-custom,
.radio-custom {
opacity: 0;
opacity: 0;
}

input#cbSelectAll.checkbox-custom{
display: none;
}
input#cbShowOptionY.checkbox-custom{
display: none;
}
input#cbShowOptionN.checkbox-custom{
display: none;
}
input#cbShowU.checkbox-custom{
display: none;
}
input#cbShowComments.checkbox-custom{
display: none;
}
input#cbShowFeedback.checkbox-custom{
display: none;
}
input#cbShowMarked.checkbox-custom{
display: none;
}
input#cbShowDisc.checkbox-custom{
display: none;
}


.checkbox-custom-label,
.radio-custom-label {
display: flex;
display: flex;
vertical-align: middle;
margin: 5px;
cursor: pointer;
Expand Down

0 comments on commit 86c6715

Please sign in to comment.