Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ gem 'dry-struct'
# Use solid_cache as a cache store
gem "solid_cache", "~> 1.0"

##### JAVSCRIPT/CSS/ASSETS #######
##### JAVASCRIPT/CSS/ASSETS #######

# Bootstrap is a library for HTML, CSS and JS.
gem 'bootstrap', '~> 5.2'
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/base/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ $diaper-color-purple-67: #9491c4;
$diaper-text-color-interactive-default: $diaper-color-blue-49;
$diaper-text-color-interactive-hover: $diaper-color-blue-64;

// notifcations
// notifications
$diaper-notifcation-color-error-default: $diaper-color-red-55;
$diaper-notifcation-color-warning-default: $diaper-color-orange-51;
$diaper-notifcation-color-success-default: $diaper-color-green-33;
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/distributions_controller.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Provides full CRUD+ for Distributions, which are the primary way for inventory to leave a Diaperbank. Most
# Distributions are given out through community partners (either via Partnerbase, or to Partners-on-record). It's
# technically possible to also do Direct Services by having a Partner called "Direct Services" and then issuing
# Distributions to them, though it would lack some of the additional featuers and failsafes that a Diaperbank
# Distributions to them, though it would lack some of the additional features and failsafes that a Diaperbank
# might want if they were doing direct services.
class DistributionsController < ApplicationController
include DateRangeHelper
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export default class extends Controller {

/**
* Toggles the visibility of the nested element depending
* on wither the checkbox is checked or not.
* on whether the checkbox is checked or not.
*/
toggleNestedElementVisibility() {
this.nestedElementTarget.classList.toggle("d-none", !this.checkboxTarget.checked)
Expand Down
4 changes: 2 additions & 2 deletions app/javascript/controllers/deadline_day_controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export default class extends Controller {
freq: RRule.MONTHLY,
interval: monthlyInterval,
bymonthday: parseInt(this.dayOfMonthTarget.value),
byhour: 11, // Force RRule to calculate an occurrance after today
byhour: 11, // Force RRule to calculate an occurrence after today
until: untilDate
})
reminder_date = this.getFirstOccurrenceAfterToday( rule.all(), today )
Expand All @@ -62,7 +62,7 @@ export default class extends Controller {
freq: RRule.MONTHLY,
interval: monthlyInterval,
byweekday: WEEKDAY_NUM_TO_OBJ[ parseInt(this.dayOfWeekTarget.value) ].nth( parseInt(this.everyNthDayTarget.value) ),
byhour: 11, // Force RRule to calculate an occurrance after today
byhour: 11, // Force RRule to calculate an occurrence after today
wkst: RRule.SU,
until: untilDate
})
Expand Down
2 changes: 1 addition & 1 deletion app/services/distribution_itemized_breakdown_service.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
class DistributionItemizedBreakdownService
#
# Initializes the DistributionItemizedBreakdownService whoms
# Initializes the DistributionItemizedBreakdownService whose
# purpose to construct a itemized breakdown of items distributed
# and what is left on-hand currently (at the time of running)
#
Expand Down
2 changes: 1 addition & 1 deletion db/seeds.rb
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@

# Base profile information all partners should have
# Includes fields in the agency_information, contacts, and pick_up_person partial
# The counties and areas served by the partner are handled elsewere
# The counties and areas served by the partner are handled elsewhere
profile = Partners::Profile.create!({
essentials_bank_id: p.organization_id,
partner_id: p.id,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ Change came into effective after https://github.com/rubyforgood/human-essentials

## Consequences

Merging the two applications has the benefit of reducing complexity for ease of maintaince. However, a great deal of refactor work is
Merging the two applications has the benefit of reducing complexity for ease of maintenance. However, a great deal of refactor work is
needed to remove old concepts that were based on two applications (aka redundant models). In the interim, the data modeling is confusing
until we refactor.
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Accepted

## Context

The application's design is mainly based on [AdminLTE](https://adminlte.io/) which is a open source design library based off of boostrap. In 2022, TailwindCSS
The application's design is mainly based on [AdminLTE](https://adminlte.io/) which is a open source design library based off of bootstrap. In 2022, TailwindCSS
was introduced in hopes to make the application easier to maintain. And subsequently, a theme was picked out to replace AdminLTE that is based on TailwindCSS.
However, the team decided in a meeting that the benefits that TailwindCSS could offer does not outweigh the efforts to migrating to a new framework.

Expand Down
2 changes: 1 addition & 1 deletion docs/user_guide/bank/getting_started_partners.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

2. However, if you're not ready to have your Partners make Requests yet, that's ok -- you can put them in the system without inviting them. You'll still be able to record what you are distributing to them.

3. You can import all your Partners at once. You can only import Partners once, though -- this is a precaution to make sure we don't accidently create duplicates.
3. You can import all your Partners at once. You can only import Partners once, though -- this is a precaution to make sure we don't accidentally create duplicates.

4. The usual way to handle bringing on Partners to be able to make Requests is to invite them, then have them fill in their profile before approving them, so that you get the information from them that your bank needs for grants, etc. However, if that's not how you want to work, it is also possible to invite and approve them in one step.

Expand Down
2 changes: 1 addition & 1 deletion docs/user_guide/bank/inventory_audits.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ The big thing you need to remember is that Audits have to be 'finalized' by an o
## Starting an Audit

Click on "Inventory", then "Inventory Audit" in the left hand menu, then "+New Audit".
![Navigaton to new Audit](images/inventory/inventory_audits_new_navigation.png)
![Navigation to new Audit](images/inventory/inventory_audits_new_navigation.png)

This brings up the new Audit page.

Expand Down
2 changes: 1 addition & 1 deletion docs/wiki/application_overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ For the second item, after the `BaseItem` is retrieved, it consults back to the

## Definitions & Terms

(Note - in the following sections, the term "diaper bank" and "organization" are used interchangably.
(Note - in the following sections, the term "diaper bank" and "organization" are used interchangeably.

**Adjustment** - When a diaper bank has to make a change to its on-hand inventory totals, it creates an adjustment. A single adjustment can record the change of quantities for multiple different kinds of items. These adjustments create a record internally for transaction and are the only interface for an organization to make direct changes to their inventories. They are internally modeled as `Adjustment`.

Expand Down
2 changes: 1 addition & 1 deletion spec/models/tag_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
it { should validate_length_of(:name).is_at_most(256) }
end

describe "assocations" do
describe "associations" do
it { should have_many(:taggings) }
it { should belong_to(:organization) }
end
Expand Down
2 changes: 1 addition & 1 deletion spec/models/tagging_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# taggable_id :bigint not null
#
RSpec.describe Tagging, type: :model do
describe "assocations" do
describe "associations" do
it { should belong_to(:tag) }
it { should belong_to(:taggable) }
end
Expand Down
2 changes: 1 addition & 1 deletion spec/services/exports/export_partners_csv_service_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
enable_quantity_based_requests: true)
end

let(:county_1) { create(:county, name: "High County, Maine", region: "Maine") } # Information for the area_served parital
let(:county_1) { create(:county, name: "High County, Maine", region: "Maine") } # Information for the area_served partial
let(:county_2) { create(:county, name: "laRue County, Louisiana", region: "Louisiana") }
let(:county_3) { create(:county, name: "Ste. Anne County, Louisiana", region: "Louisiana") }
let!(:served_area_1) { create(:partners_served_area, partner_profile: profile, county: county_1, client_share: 50) }
Expand Down
2 changes: 1 addition & 1 deletion spec/system/barcode_item_system_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
expect(page).not_to have_content("barcode_to_delete")
end

it "Double clicking the delete button does not result in the barcode attemping to be deleted twice" do
it "Double clicking the delete button does not result in the barcode attempting to be deleted twice" do
item = create(:item, name: "Red 1T Diapers", base_item: base_item)
b_item = create(:barcode_item, organization: organization, barcodeable: item, value: "barcode_to_delete")

Expand Down
2 changes: 1 addition & 1 deletion spec/system/distribution_system_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -935,7 +935,7 @@
expect(page).to have_content("This distribution has been marked as being completed!")
end

it "Double clicking distribution complete does not result in the distribution attemping to be completed twice" do
it "Double clicking distribution complete does not result in the distribution attempting to be completed twice" do
visit new_distribution_path
item = View::Inventory.new(organization.id).items_for_location(storage_location.id).first.db_item
TestInventory.create_inventory(organization,
Expand Down
2 changes: 1 addition & 1 deletion spec/system/partner_system_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
expect(partner_awaiting_approval.reload.approved?).to eq(true)
end

it 'Double clicking approval button does not result in the partner attemping to be approved twice' do
it 'Double clicking approval button does not result in the partner attempting to be approved twice' do
visit partners_path

assert page.has_content? partner_awaiting_approval.name
Expand Down
2 changes: 1 addition & 1 deletion spec/system/partners/approval_process_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
refute page.has_content? '# of Individuals'
end

it "Double clicking submit for approval button does not result in the partner attemping to be approved twice" do
it "Double clicking submit for approval button does not result in the partner attempting to be approved twice" do
click_on 'My Profile'
assert page.has_content? 'Uninvited'
all('a', text: 'Update Information').last.click
Expand Down