Skip to content

Commit

Permalink
Merge pull request #714 from GSA/pre-staging
Browse files Browse the repository at this point in the history
Features/Edits
  • Loading branch information
swgsgo authored Sep 27, 2024
2 parents 8895949 + 6f31ce4 commit 89e4a31
Show file tree
Hide file tree
Showing 8 changed files with 761 additions and 465 deletions.
980 changes: 517 additions & 463 deletions _data/news.json

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion _includes/banner.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
<div class="grid-row grid-gap">
<div class="{% if include.width %}{{ include.width}} {% else %}grid-col-12 {% endif %}{% if include.offset %}{{ include.offset}}{% endif %} padding-top-4 padding-bottom-4">
<h1 class="pm-hero__heading margin-0 padding-bottom-6 padding-top-6 font-merriweather font-body-2xl text-light">
{{page.title}}

{% if include.title-override %}{{ include.title-override}}{% else %}{{page.title}}{% endif %}
</h1>
</div>
</div>
Expand Down
9 changes: 8 additions & 1 deletion _includes/menu.html
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,14 @@ <h1 class="usa-header-title">{{ site.title }}</h1>
</li>
{% endfor %}
</ul>
{% include searchgov/form.html searchgov=site.searchgov %}
<div class="grid-row flex-align-center tablet:width-mobile">
<div class="tablet:grid-col flex-1">
{% include notifications.html %}
</div>
<div class="tablet:grid-col flex-8">
{% include searchgov/form.html searchgov=site.searchgov %}
</div>
</div>
</div>
</div>
</nav>
Expand Down
30 changes: 30 additions & 0 deletions _includes/news/news-by-category.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@

{% if site.data.news.items && include.category %}
<div class="news-by-category">
<div class="display-flex flex-align-center">
<!-- <svg class="usa-icon usa-icon--size-4 text-primary" aria-hidden="true" focusable="false" role="img"><use xlink:href="{{ site.baseurl }}/assets/img/sprite.svg#info"></use></svg> -->
<h2 class="margin-bottom-0 margin-top-0">
News
</h2>
</div>
<ul style="list-style-type: none; padding-left: 0;">
{% for news_item in site.data.news.items %}
{% if news_item.Title and news_item.Category == include.category %}
<li class="margin-bottom-4"><img src="{{ site.baseurl }}/assets/images/project-icons/news.webp" class="news" alt="news icon">
<span class="date display-block">
<b>{{ news_item.Source }}</b>
</span>
<a class="article display-block" title="{{ news_item.Title }}" href="{{ news_item.Hyperlink }}" target="_blank">
{{ news_item.Title }}
</a>
<span class="date">
<i>{{ news_item.Date | date: "%B %d, %Y" }}</i>
</span>
</li>
{% endif %}
{% endfor %}
</ul>
</div>
{% endif %}


71 changes: 71 additions & 0 deletions _includes/notifications.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
<div class="notifications">
<a href="#latest-notifications" class="text-base-dark display-block margin-top-1 tablet:" id="notification-button" aria-controls="latest-notifications" data-open-modal title="View latest Shared Services Notifications">
<svg class="usa-icon usa-icon--size-3" aria-hidden="true" focusable="false" role="img">
<use xlink:href="{{ site.baseurl }}/assets/img/sprite.svg#notifications"></use>
</svg>
</a>
<div class="usa-modal" id="latest-notifications" aria-labelledby="modal-1-heading" aria-describedby="modal-1-description">
<div class="usa-modal__content">
<div class="usa-modal__main">
<div class="usa-prose">
<p id="modal-1-description">
<div id="news-content">

</div>
</p>
</div>
</div>
<button type="button" class="usa-button usa-modal__close margin-top-neg-2" aria-label="Close this window" data-close-modal>
<svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
<use xlink:href="{{ site.baseurl }}/assets/img/sprite.svg#close"></use>
</svg>
</button>
</div>
</div>
</div>
<script>
window.addEventListener('load', function() {
let output = '';
fetch('{{ site.baseurl }}/news-api/')
.then(response => response.json())
.then(data => {
let year = new Date().getFullYear();
let pastmonth = (new Date().getMonth()).toString().padStart(2, '0');
let currentmonth = (new Date().getMonth() + 1).toString().padStart(2, '0');

// Build dates array from last 3 weeks
let datesArray = [];
for (let i = 0; i < 21; i++) {
let date = new Date(new Date().setDate(new Date().getDate() - i)).toISOString().split('T')[0];
datesArray.push(date);
}

// let filteredData = data.filter(function(item) {
// return item.Date.includes(year + '-' + currentmonth);
// });

// Filter data by dates array
let filteredData = data.filter(function(item) {
return datesArray.includes(item.Date.split('T')[0]);
});

if (filteredData.length === 0) {
output = 'No new notifications';
} else {
document.getElementById('notification-button').classList.remove('text-base-dark');
document.getElementById('notification-button').classList.add('text-secondary-dark');
output += '<h1 class="font-body-lg">Latest Notifications</h1>';
for (const item of filteredData) {
output += '<p><a href="' + item.Hyperlink + '" title="' + item.Title + '" class="display-block font-body-xs">' + item.Title + '</a>';
output += '<time datetime="' + new Date(item.Date).toISOString().split('T')[0] + '" class="notification-date display-block font-body-xs"><i>' + new Date(item.Date).toLocaleDateString('en-US', {timeZone: 'UTC'}) + '</i></time></p>';
}
}
output += '<p><a href="{{ site.baseurl }}/#news" class="display-inline-block font-body-xs usa-button" data-close-modal>View all notifications</a></p>';
document.getElementById('news-content').innerHTML = output;

})
.catch(error => {
console.error('Error:', error);
});
});
</script>
133 changes: 133 additions & 0 deletions _pages/marketplace/financial-management.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
---
layout: base
permalink: /marketplace/qsmo-ffm/
title: Financial Management
description: "Effective stewardship of taxpayer funds is a responsibility of the Federal Government and the Chief Financial Officer. Federal agencies currently manage over $6 trillion in annual spending."
news-category: FIBF-FM
---


{% include banner.html title-override="Marketplace" width="grid-col-11" offset="grid-offset-1" %}

<div class="grid-container">
<div class="grid-row grid-gap">
<div class="tablet:grid-col-10 tablet:grid-offset-1 padding-top-1">
{% include breadcrumbs.html %}
</div>
</div>
</div>

<section class="pm" id="financial-management">
<div class="grid-container">
<div class="grid-row">
<div class="tablet:grid-col-6 tablet:grid-offset-1 padding-top-4 tablet:padding-right-3 display-flex flex-column">
<h2 class="margin-bottom-0 margin-top-0">
Financial Management
</h2>
<p>
Effective stewardship of taxpayer funds is a responsibility of the Federal Government and the Chief Financial Officer. Federal agencies currently manage over $6 trillion in annual spending. Common goals and objectives include:
</p>
<ul class="margin-top-0">
<li>Improving Financial Transparency</li>
<li>Enhancing Internal Controls to Reduce Risk</li>
<li>Integrating Performance and Budgeting</li>
<li>Strengthening Payment Integrity</li>
<li>Automating Financial Processes</li>
<li>Using Data to Maximize Resource Allocation</li>
</ul>
<hr class="margin-top-auto width-full">
</div>
<div class="tablet:grid-col-5 padding-top-4 display-flex flex-column">
<div class="display-flex flex-align-center">
<!-- <svg class="usa-icon usa-icon--size-4 text-primary" aria-hidden="true" focusable="false" role="img"><use xlink:href="{{ site.baseurl }}/assets/img/sprite.svg#check_circle"></use></svg> -->
<h2 class="margin-bottom-0 margin-top-0">
Goal, Priority, and Policy Alignment
</h2>
</div>
<p><b>President's Management Agenda</b></p>
<ul class="margin-top-0 margin-bottom-0">
<li>Priority 3: <a href="https://www.performance.gov/pma/businessofgov/#overview" title="performance.gov" target="_blank">Managing the Business of Government</a>, Strategy 2 <a href="https://www.performance.gov/pma/businessofgov/strategy/2/" target="_blank" title="Strengthen Federal Financial Management">Strengthen Federal Financial Management.</a></li>
</ul>
<p><b>Statute and Policy</b></p>
<ul class="margin-top-0 margin-bottom-3">
<li><a href="https://www.whitehouse.gov/wp-content/uploads/2019/04/M-19-16.pdf?page=3" title="Centralized Mission Support Capabilities for the Federal Government" target="_blank"> M-19-16: Centralized Mission Support Capabilities for the Federal Government</a></li>
<li><a href="https://www.congress.gov/113/plaws/publ101/PLAW-113publ101.pdf" title="DATA Act of 2014" target="_blank">DATA Act of 2014</a></li>
<li><a href="https://www.congress.gov/bill/104th-congress/house-bill/4319" title="Federal Financial Management Improvement Act" target="_blank">Federal Financial Management Improvement Act</a></li>
<li><a href="https://www.govinfo.gov/app/details/STATUTE-104/STATUTE-104-Pg2838/context" title="CFO Act of 1990" target="_blank">CFO Act of 1990</a></li>
<li><a href="https://www.whitehouse.gov/wp-content/uploads/legacy_drupal_files/omb/memoranda/2016/m-16-17.pdf" title="OMB Circular A-123" target="_blank">OMB Circular A-123</a> (Appendix <a href="https://www.whitehouse.gov/wp-content/uploads/2018/06/M-18-16.pdf" target="_blank" title="Apendix A">A</a>, <a href="https://www.whitehouse.gov/wp-content/uploads/2019/08/Issuance-of-Revised-Appendix-B-to-OMB-Circular-A-123.pdf" target="_blank" title="Apendix B">B</a>, <a href="https://www.whitehouse.gov/wp-content/uploads/2021/03/M-21-19.pdf" target="_blank" title="Apendix C">C</a>, and <a href="https://www.whitehouse.gov/wp-content/uploads/2023/01/M_23-06-Appendix-D_final.pdf" target="_blank" title="Apendix D">D</a>)</li>
<li><a href="https://www.whitehouse.gov/wp-content/uploads/2018/06/a11.pdf" title="OMB Circular A-11" target="_blank">OMB Circular A-11</a></li>
</ul>
<hr class="margin-top-auto width-full">
</div>
</div>
<div class="grid-row">
<div class="tablet:grid-col-6 tablet:grid-offset-1 tablet:padding-right-3 display-flex flex-column">
<div class="display-flex flex-align-center">
<!-- <svg class="usa-icon usa-icon--size-4 text-primary" aria-hidden="true" focusable="false" role="img"><use xlink:href="{{ site.baseurl }}/assets/img/sprite.svg#local_grocery_store"></use></svg> -->
<h2 class="margin-bottom-0 margin-top-0">
Services and Solutions
</h2>
</div>
<p>
The Department of Treasury’s <a href="https://tfx.treasury.gov/fmqsmo" title="Financial Management Quality Service Management Office" target="_blank">Financial Management Quality Service Management Office</a> manages the <a href="https://tfx.treasury.gov/fmqsmo/marketplace-catalog" title="FM Marketplace Catalog" target="_blank">FM Marketplace Catalog</a> as a resource for agencies to identify and research from over 70 services and solutions that can support their financial management needs to accomplish both agency and shared government-wide goals.
</p>
<ul class="margin-top-0 margin-bottom-3">
<li><a href="https://tfx.treasury.gov/fmqsmo/marketplace-catalog" title="FM Marketplace Catalog" target="_blank">Explore FM Marketplace Catalog</a></li>
<li><a href="https://tfx.treasury.gov/fmqsmo/faqs" title="FAQ About the FM QSMO" target="_blank">FAQ About the FM QSMO</a></li>
<li>Contact the FM QSMO: <a href="mailto: [email protected]" title="Contact the FM QSMO" target="_blank">[email protected]</a></li>
</ul>
<hr class="margin-top-auto width-full">
</div>
<div class="tablet:grid-col-5 display-flex flex-column">
<div class="display-flex flex-align-center">
<!-- <svg class="usa-icon usa-icon--size-4 text-primary" aria-hidden="true" focusable="false" role="img"><use xlink:href="{{ site.baseurl }}/assets/img/sprite.svg#verified_user"></use></svg> -->
<h2 class="margin-bottom-0 margin-top-0">
Data and Business Standards
</h2>
</div>
<ul class="margin-top-2">
<li><a href="https://ussm.gsa.gov/fibf-fm/#business_lifecycle" title="Budget Execution" target="_blank">Budget Execution</a></li>
<li><a href="https://ussm.gsa.gov/fibf-fm/#business_lifecycle" title="Financial Asset and Information Management">Financial Asset and Information Management</a></li>
<li><a href="https://ussm.gsa.gov/fibf-fm/#business_lifecycle" title="Business Lifecycle">Payable Management</a></li>
<li><a href="https://ussm.gsa.gov/fibf-fm/#business_lifecycle" title="Revenue Management">Revenue Management</a></li>
<li><a href="https://ussm.gsa.gov/fibf-fm/#business_lifecycle" title="Business Lifecycle">Receivable and Collection Management</a></li>
<li><a href="https://ussm.gsa.gov/fibf-fm/#business_lifecycle" title="Business Lifecycle">Delinquent Debt Management</a></li>
<li><a href="https://ussm.gsa.gov/fibf-fm/#business_lifecycle" title="Business Lifecycle">Cost Management</a></li>
<li><a href="https://ussm.gsa.gov/fibf-fm/#business_lifecycle" title="Business Lifecycle">General Ledger Management</a></li>
<li><a href="https://ussm.gsa.gov/fibf-fm/#business_lifecycle" title="Business Lifecycle" target="_blank">Financial Reconciliation</a></li>
<li><a href="https://ussm.gsa.gov/fibf-fm/#business_lifecycle" title="Business Lifecycle">Financial / Performance Reporting</a></li>
</ul>
<hr class="margin-top-auto width-full">
</div>
</div>
<div class="grid-row">
<div class="tablet:grid-col-11 grid-offset-1">
{% include news/news-by-category.html category=page.news-category %}
<hr>
</div>
</div>
<div class="grid-row padding-bottom-5">
<div class="tablet:grid-col-10 grid-offset-1">
<h2>Other References</h2>
<ul class="margin-top-0 margin-bottom-3">
<li>
<a href="https://fmvision.fiscal.treasury.gov/files/Future-of-Financial-Management.pdf" title="Dept of Treasury’s 10-Year Vision for Financial Management" target="_blank">
Dept of Treasury’s 10-Year Vision for Financial Management
</a>
</li>
<li>
<a href="https://tfx.treasury.gov/fmqsmo/fmcf" title="Financial Management Capability Framework" target="_blank">
Financial Management Capability Framework
</a>
</li>
<li>
<a href="https://tfx.treasury.gov/fmqsmo/updates" title="FM QSMO’s Latest Updates" target="_blank">
FM QSMO’s Latest Updates
</a>
</li>
</ul>
</div>
</div>
</div>
</section>

File renamed without changes.
File renamed without changes.

0 comments on commit 89e4a31

Please sign in to comment.