Skip to content

Commit

Permalink
Revert "Continued improvements to MC participants"
Browse files Browse the repository at this point in the history 
This reverts commit 7587a82.
  • Loading branch information
@Iceinfly
Iceinfly committed Oct 9, 2024
1 parent 9888edd commit dd53fbd
Show file tree
Hide file tree
Showing 11 changed files with 208 additions and 0 deletions.
6 changes: 6 additions & 0 deletions src/GRA.Web/Areas/MissionControl/Views/Participants/Add.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,11 +183,17 @@

<hr />

<<<<<<< HEAD
<div class="row row-spacing">
<div class="col-12">
<button type="submit" class="btn btn-outline-primary float-end btn-spinner" button-spinner>
=======
<div class="row mb-3">
<div class="col-12 d-flex justify-content-end">
<button type="submit"
class="btn btn-outline-primary"
button-spinner>
>>>>>>> a8987a795f5bfbe988fafeb6fb0e6dfb67776978
Add Participant
</button>
</div>
Expand Down
30 changes: 30 additions & 0 deletions src/GRA.Web/Areas/MissionControl/Views/Participants/Books.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,13 @@
</div>
</div>

<<<<<<< HEAD
<div class="mb-3">
<a asp-action="Index" class="btn btn-outline-secondary">Return to Participants</a>
@if (!Model.HasPendingQuestionnaire)
{
<button type="button" data-bs-toggle="modal" data-bs-target="#addModal" class="btn btn-outline-primary">Add Book</button>
=======
<div class="mb-3 d-flex d-print-none justify-content-end">
@if (!Model.HasPendingQuestionnaire && Model.OpenToLog)
{
Expand All @@ -91,6 +98,7 @@
class="btn btn-outline-primary me-2">
Add Book
</button>
>>>>>>> a8987a795f5bfbe988fafeb6fb0e6dfb67776978
}
<a asp-action="Index" class="btn btn-outline-secondary">Return to Participants</a>
</div>
Expand Down Expand Up @@ -136,11 +144,20 @@
<div class="modal-footer d-flex justify-content-end">
<button type="button"
class="btn btn-outline-secondary"
<<<<<<< HEAD
data-bs-dismiss="modal"
style="margin-right: 1em;">
Cancel
</button>
<button type="submit"
class="btn btn-outline-primary float-end"
=======
data-bs-dismiss="modal">
Cancel
</button>
<button type="submit"
class="btn btn-outline-primary"
>>>>>>> a8987a795f5bfbe988fafeb6fb0e6dfb67776978
aria-label="Confirm">
Add
</button>
Expand Down Expand Up @@ -193,11 +210,19 @@
<div class="modal-footer d-flex justify-content-end">
<button type="button"
class="btn btn-outline-secondary"
<<<<<<< HEAD
data-bs-dismiss="modal"
style="margin-right: 1em;">
Cancel
</button>
<button type="submit" class="btn btn-outline-primary float-end"
=======
data-bs-dismiss="modal">
Cancel
</button>
<button type="submit"
class="btn btn-outline-primary"
>>>>>>> a8987a795f5bfbe988fafeb6fb0e6dfb67776978
aria-label="Confirm">
Save
</button>
Expand Down Expand Up @@ -232,7 +257,12 @@
<div class="modal-footer d-flex justify-content-end">
<button type="button"
class="btn btn-outline-secondary"
<<<<<<< HEAD
data-bs-dismiss="modal"
style="margin-right: 1em;">
=======
data-bs-dismiss="modal">
>>>>>>> a8987a795f5bfbe988fafeb6fb0e6dfb67776978
Cancel
</button>
<form asp-controller="Participants"
Expand Down
5 changes: 5 additions & 0 deletions src/GRA.Web/Areas/MissionControl/Views/Participants/EmailSubscriptionLog.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,11 @@
</div>
</div>

<<<<<<< HEAD
<div class="mb-3">
<a asp-action="Index" class="btn btn-outline-secondary">Return to Participants</a>
=======
<div class="mb-3 d-print-none d-flex">
<a asp-action="Index" class="btn btn-outline-secondary ms-auto">Return to Participants</a>
>>>>>>> a8987a795f5bfbe988fafeb6fb0e6dfb67776978
</div>
101 changes: 101 additions & 0 deletions src/GRA.Web/Areas/MissionControl/Views/Participants/Household.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -621,6 +621,106 @@
data-bs-backdrop="static"
data-bs-keyboard="false"
aria-labelledby="listModalLabel">
<<<<<<< HEAD
<div class="modal-dialog modal-lg" role="document">
<div class="row">
<div class="col-12 col-sm-10 offset-sm-1">
<div class="card">
<div class="card-header">
<span class="lead">Add existing participant</span>
</div>
<div class="card-body">
<div class="row">
<div class="col-12">
<ul class="nav nav-pills" style="padding: 10px 0;">
<li id="All" class="active participantScope">
<a style="cursor:pointer">All</a>
</li>
<li id="System" class="participantScope">
<a class="dropdown-toggle"
data-bs-toggle="dropdown"
href="#"
role="button"
aria-haspopup="true"
aria-expanded="false">
<span id="systemText">System</span> <span class="caret"></span>
</a>
<ul class="dropdown-menu">
@foreach (var system in Model.SystemList)
{
<li>
<a class="system-selector"
data-id="@system.Id">
@system.Name
</a>
</li>
}
</ul>
</li>
<li id="Branch" class="participantScope">
<a class="dropdown-toggle"
data-bs-toggle="dropdown"
href="#"
role="button"
aria-haspopup="true"
aria-expanded="false">
<span id="branchText">Branch</span> <span class="caret"></span>
</a>
<ul id="branchDropdown" class="dropdown-menu">
@foreach (var branch in Model.BranchList)
{
<li>
<a class="branch-selector"
data-id="@branch.Id">
@branch.Name
</a>
</li>
}
</ul>
</li>
</ul>
</div>
</div>

<div class="row mb-3">
<div class="col-8">
<input id="searchText" class="form-control"
placeholder="Enter text to search for a participant here" />
</div>
<div class="col-4">
<div class="col-6">
<button type="button"
id="searchButton"
class="btn btn-outline-primary"
style="margin-right: 8px;">
Search
</button>
</div>
<div class="col-6">
<button type="button"
id="clearButton"
class="btn btn-outline-secondary ">
Clear
</button>
</div>
</div>
</div>
<div id="searchMessage" class="row d-none">
<div class="col-12">
<p class="alert-sm alert-info">
Searching for '<strong id="searchTerm"></strong>'
</p>
</div>
</div>
<div class="row">
<form asp-action="AddExisitingParticipant"
method="post"
role="form">
<input name="Id" value="@Model.Id" type="hidden" />
<div id="modalParticipantsList" class="col-12">
</div>
</form>
=======
<div class="modal-dialog modal-xl" role="document">
<div class="modal-content">
<div class="card">
Expand Down Expand Up @@ -678,6 +778,7 @@
</ul>
</li>
</ul>
>>>>>>> a8987a795f5bfbe988fafeb6fb0e6dfb67776978
</div>
</div>
<div class="row mb-3">
Expand Down
9 changes: 9 additions & 0 deletions src/GRA.Web/Areas/MissionControl/Views/Participants/HouseholdAdd.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,15 +131,24 @@
</div>
</div>

<<<<<<< HEAD
<div class="mb-3">
<a asp-action="Household" asp-route-id="@Model.Id" class="btn btn-outline-secondary">Return to Household</a>
=======
<div class="mb-3 d-flex justify-content-end">
<a asp-action="Household"
asp-route-id="@Model.Id"
class="btn btn-outline-secondary me-2">Return to Household</a>
>>>>>>> a8987a795f5bfbe988fafeb6fb0e6dfb67776978
<button type="submit"
id="Submit"
name="Submit"
value="Submit"
<<<<<<< HEAD
class="btn btn-outline-primary btn-spinner"
=======
class="btn btn-outline-primary"
>>>>>>> a8987a795f5bfbe988fafeb6fb0e6dfb67776978
button-spinner>
<span class="buttonText">Add Member</span>
</button>
Expand Down
13 changes: 13 additions & 0 deletions src/GRA.Web/Areas/MissionControl/Views/Participants/Mail.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,20 @@
</div>
</div>

<<<<<<< HEAD
<div class="mb-3">
<a asp-action="Index" class="btn btn-outline-secondary">Return to Participants</a>
@if (Model.CanSendMail)
{
<a asp-action="MailSend" asp-route-id="@Model.Id" class="btn btn-outline-primary">Send Mail</a>
=======
<div class="mb-3 d-flex d-print-none justify-content-end">
@if (Model.CanSendMail)
{
<a asp-action="MailSend"
asp-route-id="@Model.Id"
class="btn btn-outline-primary me-2">Send Mail</a>
>>>>>>> a8987a795f5bfbe988fafeb6fb0e6dfb67776978
}
<a asp-action="Index" class="btn btn-outline-secondary">Return to Participants</a>
</div>
Expand Down Expand Up @@ -124,7 +132,12 @@
<div class="modal-footer d-flex justify-content-end">
<button type="button"
class="btn btn-outline-secondary"
<<<<<<< HEAD
data-bs-dismiss="modal"
style="margin-right: 1em;">
=======
data-bs-dismiss="modal">
>>>>>>> a8987a795f5bfbe988fafeb6fb0e6dfb67776978
Cancel
</button>
<form asp-controller="Participants"
Expand Down
11 changes: 11 additions & 0 deletions src/GRA.Web/Areas/MissionControl/Views/Participants/MailDetail.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,15 @@
</div>


<<<<<<< HEAD
<div class="mb-3">
<a asp-action="Index" class="btn btn-outline-secondary">Return to Participants</a>
<a asp-action="Mail" asp-route-id="@Model.Id" class="btn btn-outline-secondary">Return to Mail List</a>
=======
<div class="mb-3 d-print-none d-flex">
<a asp-action="Index"
class="btn btn-outline-secondary">Return to Participants</a>
>>>>>>> a8987a795f5bfbe988fafeb6fb0e6dfb67776978
@if (Model.CanRemoveMail)
{
<button type="button"
Expand Down Expand Up @@ -83,7 +89,12 @@
<div class="modal-footer d-flex justify-content-end">
<button type="button"
class="btn btn-outline-secondary"
<<<<<<< HEAD
data-bs-dismiss="modal"
style="margin-right: 1em;">
=======
data-bs-dismiss="modal">
>>>>>>> a8987a795f5bfbe988fafeb6fb0e6dfb67776978
Cancel
</button>
<form asp-controller="Participants"
Expand Down
6 changes: 6 additions & 0 deletions src/GRA.Web/Areas/MissionControl/Views/Participants/MailSend.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,17 @@
</div>
</div>
<div class="row">
<<<<<<< HEAD
<div class="col-sm-8 offset-sm-2">
<a asp-action="Index" class="btn btn-outline-secondary">Return to Participants List</a>
<a asp-action="Mail" asp-route-id="@Model.Id" class="btn btn-outline-secondary">Return to Mail List</a>
=======
<div class="col-sm-8 offset-sm-2 d-flex d-print-none">
<a asp-action="Index" class="btn btn-outline-secondary">Return to Participants List</a>
<a asp-action="Mail"
asp-route-id="@Model.Id"
class="btn btn-outline-secondary ms-auto me-2">Return to Mail List</a>
>>>>>>> a8987a795f5bfbe988fafeb6fb0e6dfb67776978
<button type="submit" class="btn btn-outline-primary">
Send Mail
</button>
Expand Down
6 changes: 6 additions & 0 deletions src/GRA.Web/Areas/MissionControl/Views/Participants/PasswordReset.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,19 @@ else
</div>
</div>
</div>
<<<<<<< HEAD
<div class="mb-3">
<a asp-action="Index" class="btn btn-outline-secondary">Return to Participants</a>
<button type="submit" class="btn btn-outline-primary">Reset Password</button>
=======
<div class="mb-3 d-flex d-print-none justify-content-end">
<a asp-action="Index"
class="btn btn-outline-secondary me-2">Return to Participants</a>
<button type="submit"
class="btn btn-outline-primary">
Reset Password
</button>
>>>>>>> a8987a795f5bfbe988fafeb6fb0e6dfb67776978
</div>
</form>
}
Expand Down
17 changes: 17 additions & 0 deletions src/GRA.Web/Areas/MissionControl/Views/Participants/Roles.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,13 @@
{
<li class="list-group-item" data-id="@role.Id" data-name="@role.Name">
@role.Name
<<<<<<< HEAD
<button type="button" class="btn btn-outline-secondary btn-sm move-right"><span class="fas fa-angle-double-right"></span></button>
=======
<button type="button" class="btn btn-outline-secondary btn-sm move-right">
<span class="fas fa-angle-double-right"></span>
</button>
>>>>>>> a8987a795f5bfbe988fafeb6fb0e6dfb67776978
</li>
}
</ul>
Expand All @@ -28,9 +32,13 @@
{
<li class="list-group-item" data-id="@role.Id" data-name="@role.Name">
@role.Name
<<<<<<< HEAD
<button type="button" class="btn btn-outline-secondary btn-sm move-left"><span class="fas fa-angle-double-left"></span></button>
=======
<button type="button" class="btn btn-outline-secondary btn-sm move-left">
<span class="fas fa-angle-double-left"></span>
</button>
>>>>>>> a8987a795f5bfbe988fafeb6fb0e6dfb67776978
</li>
}
</ul>
Expand All @@ -39,13 +47,22 @@

<hr />

<<<<<<< HEAD
<div class="mb-3">
<a asp-action="Index" class="btn btn-outline-secondary">Return to Participants</a>
=======
<div class="mb-3 d-flex d-print-none justify-content-end">
<a asp-action="Index" class="btn btn-outline-secondary me-2">Return to Participants</a>
>>>>>>> a8987a795f5bfbe988fafeb6fb0e6dfb67776978
<button type="submit"
id="Submit"
name="Submit"
value="Submit"
<<<<<<< HEAD
class="btn btn-outline-primary btn-spinner"
=======
class="btn btn-outline-primary"
>>>>>>> a8987a795f5bfbe988fafeb6fb0e6dfb67776978
button-spinner>
<span class="buttonText">Save Roles</span>
</button>
Expand Down
Loading

0 comments on commit dd53fbd

Please sign in to comment.