Skip to content

Code refactor #749

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

Open
alexdntowe wants to merge 23 commits into
base: feature/ECASOGP-8452
Choose a base branch
from
Open

Code refactor #749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
6c1b17a
Code refactor
alexdntowe Mar 10, 2023
cc2007e
Fixing buttons top display
alexdntowe Mar 13, 2023
70e398e
Fixed responsiveness
alexdntowe Mar 14, 2023
c935d46
Fixed the clear all not updating the top parent select all
alexdntowe Mar 15, 2023
33ab866
Added changed to skip to search
alexdntowe Mar 16, 2023
ebd3afa
Fixed filter
alexdntowe Mar 16, 2023
c6d9ad3
Adding docker config for mac
alexdntowe Mar 16, 2023
6dc66d7
Merge branch 'feature/ECASOGP-8452-b' of https://github.com/GSA/CFO.g…
alexdntowe Mar 16, 2023
1d3cb9f
Fixed responsiveness issues
alexdntowe Mar 17, 2023
46b509d
Update career-planning.css
alexdntowe Mar 17, 2023
3ce501e
updated button on media
alexdntowe Mar 17, 2023
641fa42
Responsiveness issues fixed
alexdntowe Mar 20, 2023
bfc9155
Fixed the fous
alexdntowe Mar 20, 2023
0acf562
Update career-planning.css
alexdntowe Mar 20, 2023
2571764
Updated modal on mobil
alexdntowe Mar 20, 2023
55b01e9
ECASOGP-8452: Fix autocomplete search issues
istankevych Mar 21, 2023
e4b00f7
Merge branch 'feature/ECASOGP-8452-b' of github.com:GSA/CFO.gov into …
istankevych Mar 21, 2023
c972aee
ECASOGP-8452: Fix autocomplete search tags issue
istankevych Mar 21, 2023
4301982
removing special charater
alexdntowe Mar 24, 2023
2941471
Addressed 508 and responsiveness issues
alexdntowe Mar 30, 2023
c653732
Fixed download button on ipad
alexdntowe Mar 31, 2023
2b0c4c9
Sorted the filter items on the modal
alexdntowe Mar 31, 2023
1ece0e2
Removing these 508 fixed, creating another bug
alexdntowe Apr 24, 2023
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
4 changes: 2 additions & 2 deletions .idea/misc.xml
View file
Open in desktop

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

22 changes: 22 additions & 0 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
FROM ruby:2.6.6

RUN apt-get update && \
apt-get install --reinstall -y locales && \
sed -i 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
locale-gen en_US.UTF-8

ENV LANG en_US.UTF-8
ENV LANGUAGE en_US
ENV LC_ALL en_US.UTF-8

RUN mkdir -p /app

WORKDIR /app

COPY Gemfile /app

#COPY Gemfile.lock /app

RUN bundle install

EXPOSE 4000
195 changes: 195 additions & 0 deletions _includes/career-planning-tool/wfm-filter.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,195 @@
<div class="usa-media-block tablet:grid-col-4 desktop:grid-col-3 career-advancement-block">
<h2>Filter your results</h2>
<div id="secondary-skip" class="facets-panel bg-base-lightest padding-y-3 border-base-light border-1px radius-md border-2px padding-x-105">

<h3 class="margin-top-0">Job Series<i class="fa fa-info-circle usa-tooltip margin-left-1 font-size-16" data-position="right" title="Filter your search by Federal job series"></i></h3>
<div class="display-flex flex-column">
{% assign series_array = "" | split: "," %}

{% for item in site.cards %}
{% if item.category == 'career' %}
{% if series_array contains item.job_series %}

{% else %}
{% assign series_array = series_array | push: item.job_series %}
{% endif %}
{% endif %}
{% endfor %}

{% assign series_array = series_array | sort %}
{% for series in series_array %}
{% assign series_id = series | downcase | slice: 0, 4 |replace: ", ", "-" | replace: " ", "-" %}
<button
type="button"
id="series-{{ series_id }}"
data-id="series-{{ series_id }}"
aria-label="Series-{{ series }}"
class="usa-button padding-1 margin-bottom-2 margin-right-0 text-bold text-black bg-white radius-lg border-2px border-gray-30"
>{{ series }}</button>
{% endfor %}
</div>

<h3>GS Level<i class="fa fa-info-circle usa-tooltip margin-left-1 font-size-16" data-position="right" title="Filter your search by GS-level"></i></h3>
<div class="display-flex flex-column">
{% assign level_array = "" | split: "," %}

{% for item in site.cards %}
{% if item.category == 'career' %}
{% if level_array contains item.level %}

{% else %}
{% assign level_array = level_array | push: item.level %}
{% endif %}
{% endif %}
{% endfor %}

{% assign level_array = level_array | numerical_sort %}
{% for level in level_array %}
{% assign level_id = level | downcase | replace: ", ", "-" | replace: " ", "-" %}
<button
type="button"
id="GS-{{ level_id }}"
data-id="GS-{{ level_id }}"
aria-label="GS Level - {{ level }}"
class="usa-button padding-1 margin-bottom-2 margin-right-0 text-bold text-black border-2px bg-white radius-lg border-gray-30"
>GS {{ level }}</button>
{% endfor %}
</div>

<div class="career-competency-level-1-input-group">
<h3 class="font-sans-xs" >Job Specific Technical <br> Competencies<i class="fa fa-info-circle usa-tooltip margin-left-1 font-size-16" data-position="right" title="You may further filter by selecting job-specific competencies (i.e., specialized knowledge is required for each job series)"></i></h3>
<div class="career-input-group">
<label class="text-underline text-accent-cool-darker display-inline-block text-no-wrap font-sans-2xs" for="job-career-competency-select-all" id="job-career-competency-select"><strong>Select All</strong></label>
<input style="position: absolute; left: -9999px;" type="checkbox" id="job-career-competency-select-all"/>
</div>
</div>
<div class="display-flex flex-column">
{% assign competency_group_array = site.cards | where: 'category', 'career' | map: 'competency_group' | uniq %}
{% assign job_comps = 'Primary,Secondary,Alternate' | split: "," %}
{% assign general_comps = site.cards | map: 'competency_group' | uniq %}
{% for comp in job_comps %}
{% assign general_comps = general_comps | where_exp: "item", "item != comp" %}
{% endfor %}
{% assign competency_sort_array = 'Personal,Project,Leading,Future Skills' | split: ',' %}
{% assign sorted_competency_group_array = "" | split: "," %}

{% for comp in competency_sort_array %}
{% for comp2 in general_comps %}
{% if comp == comp2 %}
{% assign sorted_competency_group_array = sorted_competency_group_array | push: comp | uniq %}
{% endif %}
{% endfor %}
{% endfor %}

{% comment %}
Loops through the job specific competencies to print their filters on the page.
{% endcomment %}
{% for competency_group in job_comps %}
{% assign competency_array = site.cards | where: 'category', 'career' | where: 'competency_group', competency_group | map: 'competency' | uniq | sort %}

{% assign competency_group_id = competency_group | replace: ", ", "-" | replace: " ", "-" %}
<div class="career-competency-and-competency-group-input-groups margin-bottom-2">
<div class="career-competency-level-2-input-group padding-1 text-bold text-black bg-white radius-lg border-2px border-gray-30 flex-column">
<div class="career-competency-toggle-open">
<div class="career-competency-toggle-open--inner">
<button type="button" id="competency-group-button-{{ competency_group_id | downcase }}" class="usa-button usa-button--unstyled text-no-underline text-black career-competency-toggle-button" aria-label="{{ competency_group }}, collapsed"><i class='fa fa-plus'></i> <b>{{ competency_group }}</b></button>
<div class="career-competency-level-3-input-group">
<div class="career-input-group">
<label for="{{ competency_group_id | downcase }}" class="career-competency-input-groups-label text-underline text-accent-cool-darker display-inline-block font-sans-3xs" id="competency-group-label-{{ competency_group_id | downcase }}"><strong class="cpt-strong">Select All</strong></label>
<input
type="checkbox"
id="{{ competency_group_id | downcase}}"
data-filter="competency"
data-major-group="job-specific"
data-id="{{ competency_group_id | downcase }}"
title="{{ competency_group }}"
class="text-offscreen"
/>
</div>
</div>
</div>
{% for competency in competency_array %}
{% assign competency_id = competency | replace: ", ", "-" | replace: " ", "-" %}
<div class="career-competency-input-groups" style="display: none;">
<div class="career-competency-level-4-input-group">
<div class="career-input-group margin-top-105">
<input
type="checkbox"
id="{{ competency_group_id | downcase }}-{{ competency_id | downcase }}"
data-filter="competency"
data-major-group="job-specific"
data-group="{{ competency_group_id | downcase }}"
data-id="{{ competency_id | downcase }}"
title="{{ competency }}"
aria-label="{{ competency }}"
/>
<label for="{{ competency_group_id | downcase }}-{{ competency_id | downcase }}" class="career-competency-input-groups-label">{{ competency }}</label>
</div>
</div>
</div>
{% endfor %}
</div>
</div>
</div>
{% endfor %}
</div>
<div class="career-competency-level-1-input-group">
<h3 class="font-sans-xs">General Career <br />Competencies<i class="fa fa-info-circle usa-tooltip margin-left-1 font-size-16" data-position="right" title="General competencies are the same for all Federal employees."></i></h3>
<div class="career-input-group">
<label class="text-underline text-accent-cool-darker display-inline-block text-no-wrap font-sans-2xs" for="general-career-competency-select-all" id="general-career-competency-select"><strong>Select All</strong></label>
<input style="position: absolute; left: -9999px;" type="checkbox" id="general-career-competency-select-all"/>
</div>
</div>
<div class="display-flex flex-column">
{% for competency_group in sorted_competency_group_array %}
{% assign competency_array = site.cards | where: 'category', 'career' | where: 'competency_group', competency_group | map: 'competency' | uniq | sort %}

{% assign competency_group_id = competency_group | replace: ", ", "-" | replace: " ", "-" %}
<div class="career-competency-and-competency-group-input-groups margin-bottom-2">
<div class="career-competency-level-2-input-group padding-1 text-bold text-black bg-white radius-lg border-2px border-gray-30 flex-column">
<div class="career-competency-toggle-open">
<div class="career-competency-toggle-open--inner">
<button type="button" id="competency-group-button-{{ competency_group_id | downcase }}" class="usa-button usa-button--unstyled text-no-underline text-black career-competency-toggle-button" aria-label="{{ competency_group }}, collapsed"><i class='fa fa-plus'></i> <b>{{ competency_group }}</b></button>
<div class="career-competency-level-3-input-group">
<div class="career-input-group">
<label for="{{ competency_group_id | downcase }}" class="career-competency-input-groups-label text-underline text-accent-cool-darker display-inline-block font-sans-3xs" id="competency-group-label-{{ competency_group_id | downcase }}"><strong class="cpt-strong">Select All</strong></label>
<input
type="checkbox"
id="{{ competency_group_id | downcase}}"
data-filter="competency"
data-major-group="general"
data-id="{{ competency_group_id | downcase }}"
title="{{ competency_group }}"
class="text-offscreen"
/>
</div>
</div>
</div>
{% for competency in competency_array %}
{% assign competency_id = competency | replace: ", ", "-" | replace: " ", "-" %}
<div class="career-competency-input-groups" style="display: none;">
<div class="career-competency-level-4-input-group">
<div class="career-input-group margin-top-105">
<input
type="checkbox"
id="{{ competency_group_id | downcase }}-{{ competency_id | downcase }}"
data-filter="competency"
data-major-group="general"
data-group="{{ competency_group_id | downcase }}"
data-id="{{ competency_id | downcase }}"
title="{{ competency }}"
aria-label="{{ competency }}"
/>
<label for="{{ competency_group_id | downcase }}-{{ competency_id | downcase }}" class="career-competency-input-groups-label">{{ competency }}</label>
</div>
</div>
</div>
{% endfor %}
</div>
</div>
</div>
{% endfor %}

</div>
</div>
</div>
11 changes: 11 additions & 0 deletions _includes/career-planning-tool/wfm-header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<div id="blog" class="bg-primary-darker usa-content font-serif-lg">
<div class="grid-container-widescreen">
<div class="display-flex flex-row flex-align-center">
<div class="padding-right-5"><a href="{{site.baseurl}}/"><img class="bg-white ogp-img logo-size" src="{{site.baseurl}}/assets/images/logos/logo-main-cfo.png" alt="CFO.gov Home Page"> </a> </div>
<div class="maxw-tablet">
<h1 class="text-normal text-white margin-bottom-1 font-serif-lg">Career Planning & Training Tool (in BETA)</h1>
<p class="text-base-lighter padding-top-0 margin-top-0 text-light">Discover the knowledge, skills, and training that can help advance your Federal career</p>
</div>
</div>
</div>
</div>
Loading