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

Add New Schedule Fields #417

Merged
merged 6 commits into from
Oct 21, 2024
Merged

Add New Schedule Fields #417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f28b706
Add schedule fields and migration
GregFinzer Oct 19, 2024
df4e0c2
Merge branch 'develop' into feature/addNewScheduleFields
GregFinzer Oct 21, 2024
9d4c641
Manage Schedule New Fields
GregFinzer Oct 21, 2024
fc7faec
Build Address and Mailing Address
GregFinzer Oct 21, 2024
105194b
Display Organizer and Address if it is filled in for the Volunteer Si…
GregFinzer Oct 21, 2024
11aa112
Fix for failing tests
GregFinzer Oct 21, 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
40 changes: 28 additions & 12 deletions BedBrigade.Client/Components/LocationGrid.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,22 +68,35 @@ else
</div>
</div>
<div class="row">
<div class="form-group col-md-4">
<SfTextBox @bind-Value=@location.Address1 Enabled="true" Placeholder="@_lc.Keys["Address"]" FloatLabelType="FloatLabelType.Auto" />
<div class="form-group col-md-8">
<SfTextBox @bind-Value=@location.MailingAddress Enabled="true" Placeholder="@_lc.Keys["MailingAddress"]" FloatLabelType="FloatLabelType.Auto" />
</div>
<div class="form-group col-md-4">
<SfTextBox @bind-Value=@location.Address2 Enabled="true" Placeholder="@_lc.Keys["SuitepoBox"]" FloatLabelType="FloatLabelType.Auto" />
</div>
<div class="row">
<div class="col-md-4">
<SfTextBox @bind-Value=@location.MailingCity Enabled="true" Placeholder="@_lc.Keys["MailingCity"]" FloatLabelType="FloatLabelType.Auto" />
</div>
<div class="col-md-4">
<SfTextBox @bind-Value=@location.MailingState Enabled="true" Placeholder="@_lc.Keys["MailingState"]" FloatLabelType="FloatLabelType.Auto" />
</div>
<div class="col-md-4">
<SfTextBox @bind-Value=@location.MailingPostalCode Enabled="true" Placeholder="@_lc.Keys["MailingPostalCode"]" FloatLabelType="FloatLabelType.Auto" />
</div>
</div>
<div class="row">
<div class="form-group col-md-8">
<SfTextBox @bind-Value=@location.BuildAddress Enabled="true" Placeholder="@_lc.Keys["BuildAddress"]" FloatLabelType="FloatLabelType.Auto" />
</div>
</div>
<div class="row">
<div class="col-md-4">
<SfTextBox @bind-Value=@location.City Enabled="true" Placeholder="@_lc.Keys["City"]" FloatLabelType="FloatLabelType.Auto" />
<SfTextBox @bind-Value=@location.BuildCity Enabled="true" Placeholder="@_lc.Keys["BuildCity"]" FloatLabelType="FloatLabelType.Auto" />
</div>
<div class="col-md-4">
<SfTextBox @bind-Value=@location.State Enabled="true" Placeholder="@_lc.Keys["State"]" FloatLabelType="FloatLabelType.Auto" />
<SfTextBox @bind-Value=@location.BuildState Enabled="true" Placeholder="@_lc.Keys["BuildState"]" FloatLabelType="FloatLabelType.Auto" />
</div>
<div class="col-md-4">
<SfTextBox @bind-Value=@location.PostalCode Enabled="true" Placeholder="@_lc.Keys["PostalCode"]" FloatLabelType="FloatLabelType.Auto" />
<SfTextBox @bind-Value=@location.BuildPostalCode Enabled="true" Placeholder="@_lc.Keys["BuildPostalCode"]" FloatLabelType="FloatLabelType.Auto" />
</div>
</div>
<div class="row">
Expand Down Expand Up @@ -115,11 +128,14 @@ else
<GridColumn Field=@nameof(Location.Name) ShowColumnMenu="false" HeaderText="Name" Type="ColumnType.String" AllowEditing="false" AllowFiltering="false" AutoFit="true" />
<GridColumn Field=@nameof(Location.Route) ShowColumnMenu="false" HeaderText="Route" Type="ColumnType.String" AllowEditing="false" AllowFiltering="false" AutoFit="true" />
<GridColumn Field=@nameof(Location.IsActive) HeaderText="Active" Width="130" DisplayAsCheckBox="true" Type="ColumnType.Boolean" AllowEditing="false" AllowFiltering="true" TextAlign="TextAlign.Center" />
<GridColumn Field=@nameof(Location.Address1) ShowColumnMenu="false" HeaderText="Address" Type="ColumnType.String" AllowEditing="false" AllowFiltering="false" AutoFit="true" />
<GridColumn Field=@nameof(Location.Address2) ShowColumnMenu="false" HeaderText="Suite/PO Box" Type="ColumnType.String" AllowEditing="false" AllowFiltering="false" AutoFit="true" />
<GridColumn Field=@nameof(Location.City) ShowColumnMenu="false" HeaderText="City" Type="ColumnType.String" AllowEditing="false" AllowFiltering="false" AutoFit="true" />
<GridColumn Field=@nameof(Location.State) ShowColumnMenu="false" HeaderText="State" Type="ColumnType.String" AllowEditing="false" AllowFiltering="false" AutoFit="true" />
<GridColumn Field=@nameof(Location.PostalCode) ShowColumnMenu="false" HeaderText="Postal Code" Type="ColumnType.String" AllowEditing="false" AllowFiltering="false" AutoFit="true" />
<GridColumn Field=@nameof(Location.MailingAddress) ShowColumnMenu="false" HeaderText="Mailing Address" Type="ColumnType.String" AllowEditing="false" AllowFiltering="false" AutoFit="true" />
<GridColumn Field=@nameof(Location.MailingCity) ShowColumnMenu="false" HeaderText="Mailing City" Type="ColumnType.String" AllowEditing="false" AllowFiltering="false" AutoFit="true" />
<GridColumn Field=@nameof(Location.MailingState) ShowColumnMenu="false" HeaderText="Mailing State" Type="ColumnType.String" AllowEditing="false" AllowFiltering="false" AutoFit="true" />
<GridColumn Field=@nameof(Location.MailingPostalCode) ShowColumnMenu="false" HeaderText="Mailing Postal Code" Type="ColumnType.String" AllowEditing="false" AllowFiltering="false" AutoFit="true" />
<GridColumn Field=@nameof(Location.BuildAddress) ShowColumnMenu="false" HeaderText="Build Address" Type="ColumnType.String" AllowEditing="false" AllowFiltering="false" AutoFit="true" />
<GridColumn Field=@nameof(Location.BuildCity) ShowColumnMenu="false" HeaderText="Build City" Type="ColumnType.String" AllowEditing="false" AllowFiltering="false" AutoFit="true" />
<GridColumn Field=@nameof(Location.BuildState) ShowColumnMenu="false" HeaderText="Build State" Type="ColumnType.String" AllowEditing="false" AllowFiltering="false" AutoFit="true" />
<GridColumn Field=@nameof(Location.BuildPostalCode) ShowColumnMenu="false" HeaderText="Build Postal Code" Type="ColumnType.String" AllowEditing="false" AllowFiltering="false" AutoFit="true" />
<GridColumn Field=@nameof(Location.Latitude) ShowColumnMenu="false" HeaderText="Latitude" Type="ColumnType.Number" Format="###.##" AllowEditing="false" AllowFiltering="false" AutoFit="true" />
<GridColumn Field=@nameof(Location.Longitude) ShowColumnMenu="false" HeaderText="Longitude" Type="ColumnType.Number" Format="###.##" AllowEditing="false" AllowFiltering="false" AutoFit="true" />
<GridForeignColumn Field=@nameof(Location.MetroAreaId) ForeignDataSource=@MetroAreas ForeignKeyField="MetroAreaId" ForeignKeyValue="Name" ShowColumnMenu="true" HeaderText="Metro Area" Type="ColumnType.String" AllowEditing="false" AllowGrouping="true" AllowFiltering="true" AutoFit="true" />
Expand Down
9 changes: 4 additions & 5 deletions BedBrigade.Client/Components/Pages/Administration/Preload.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,10 @@ else
<GridColumn Field=@nameof(Location.LocationId) HeaderText="ID" TextAlign="TextAlign.Right" Width="120"></GridColumn>
<GridColumn Field=@nameof(Location.Name) HeaderText="Name" Width="150"></GridColumn>
<GridColumn Field=@nameof(Location.Route) HeaderText="Route" Width="150"></GridColumn>
<GridColumn Field=@nameof(Location.Address1) HeaderText="Address 1" Width="150"></GridColumn>
<GridColumn Field=@nameof(Location.Address2) HeaderText="Address 2" Width="150"></GridColumn>
<GridColumn Field=@nameof(Location.City) HeaderText="City" Width="120"></GridColumn>
<GridColumn Field=@nameof(Location.State) HeaderText="State" Width="120"></GridColumn>
<GridColumn Field=@nameof(Location.PostalCode) HeaderText="Postal Code" Width="120"></GridColumn>
<GridColumn Field=@nameof(Location.BuildAddress) HeaderText="Address" Width="150"></GridColumn>
<GridColumn Field=@nameof(Location.BuildCity) HeaderText="City" Width="120"></GridColumn>
<GridColumn Field=@nameof(Location.BuildState) HeaderText="State" Width="120"></GridColumn>
<GridColumn Field=@nameof(Location.BuildPostalCode) HeaderText="Postal Code" Width="120"></GridColumn>
<GridColumn Field=@nameof(Location.Latitude) HeaderText="Latitude" Format="N10" TextAlign="TextAlign.Right" Width="150"></GridColumn>
<GridColumn Field=@nameof(Location.Longitude) HeaderText="Longitude" Format="N10" TextAlign="TextAlign.Right" Width="150"></GridColumn>
<GridColumn Field=@nameof(Location.MetroAreaId) HeaderText="Metro Area ID" TextAlign="TextAlign.Right" Width="120"></GridColumn>
Expand Down
26 changes: 26 additions & 0 deletions BedBrigade.Client/Components/Pages/VolunteerSignUp.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,32 @@
<label class="formlabel">@_lc.Keys["EventDateTime"]</label>
<label>@SelectedEvent.EventDateScheduled.ToString("dddd, MM/dd/yyyy h:mm tt") to @SelectedEvent.EventDateScheduled.AddHours(SelectedEvent.EventDurationHours).ToShortTimeString()</label>
</div>
@if (!String.IsNullOrEmpty(SelectedEvent.Address))
{
<div class="form-group">
<label class="formlabel">@_lc.Keys["Address"]</label>
<label>
<a href="@GoogleMaps.CreateGoogleMapsLinkForSchedule(SelectedEvent)" target="_blank">
@($"{SelectedEvent.Address}, {SelectedEvent.City}, {SelectedEvent.State} {SelectedEvent.PostalCode}")
</a>
</label>
</div>
}
@if (!String.IsNullOrEmpty(SelectedEvent.OrganizerName))
{
<div class="form-group">
<label class="formlabel">@_lc.Keys["Organizer"]</label>
<label>
@SelectedEvent.OrganizerName&nbsp;
<a href="@($"mailto:{SelectedEvent.OrganizerEmail}")">
@SelectedEvent.OrganizerEmail
</a>&nbsp;
<a href="@($"tel:{StringUtil.ExtractDigits(SelectedEvent.OrganizerPhone)}")">
@SelectedEvent.OrganizerPhone.FormatPhoneNumber()
</a>
</label>
</div>
}
<div class="form-group">
<label class="formlabel">@_lc.Keys["VolunteersRegisteredneeded"]</label>
<label>@SelectedEvent.VolunteersRegistered/@SelectedEvent.VolunteersMax</label>
Expand Down
Loading
Loading