Skip to content
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

Staging deployment #374

Merged
merged 2 commits into from
Sep 26, 2024
Merged

Staging deployment #374

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
8b58f04
TOP-250 one off events not showing date 🤦‍♀️
apricot13 Sep 26, 2024
9e13a41
Merge pull request #373 from wearefuturegov/TOP-250-one-off-event-dat…
apricot13 Sep 26, 2024
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 .docker/services/outpost-api-service/outpost-api-service.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: "3.7"
services:
outpost-api-service:
image: ghcr.io/wearefuturegov/outpost-api-service:latest
platform: linux/arm64
platform: linux/amd64
environment:
NODE_ENV: development
FORCE_SSL: false
Expand Down
2 changes: 1 addition & 1 deletion app/models/regular_schedule.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ def description
"Every #{month}#{day} from #{dtstart.strftime("%d/%m/%Y")} at #{opens_at.strftime("%I:%M%P")} to #{closes_at.strftime("%I:%M%P")}#{ends}"
end
else
"#{dtstart.strftime('%A')} from #{opens_at.strftime("%I:%M%P")} to #{closes_at.strftime("%I:%M%P")}"
"#{dtstart.strftime('%A%e %B %Y')} from #{opens_at.strftime("%I:%M%P")} to #{closes_at.strftime("%I:%M%P")}"
end
else
# opening time
Expand Down
2 changes: 1 addition & 1 deletion spec/models/regular_schedule_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@
let(:dtstart) { DateTime.new(2023, 10, 4) } # Wednesday
context 'single event time' do
it 'should return description of the single event time' do
expect(regular_schedule.description).to eq("Wednesday from #{opens_at.strftime("%I:%M%P")} to #{closes_at.strftime("%I:%M%P")}")
expect(regular_schedule.description).to eq("#{dtstart.strftime('%A%e %B %Y')} from #{opens_at.strftime("%I:%M%P")} to #{closes_at.strftime("%I:%M%P")}")
end
end

Expand Down
Loading