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

Jump to bottom

Peut faire un essai avant d’ajouter des préinscriptions #1027

Merged
merged 1 commit into from
May 4, 2021
Merged

Peut faire un essai avant d’ajouter des préinscriptions #1027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 10 additions & 4 deletions app/controllers/SignupController.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,11 +185,17 @@ case class SignupController @Inject() (
)
)

val insertRequests: Future[List[(Either[Error, Unit], SignupRequest)]] =
if (form.dryRun)
Future.successful(newSignups.map(signup => (().asRight, signup)))
else
Future
.traverse(newSignups)(signup =>
signupService.addSignupRequest(signup).map(result => (result, signup))
)

EitherT(
Future
.traverse(newSignups)(signup =>
signupService.addSignupRequest(signup).map(result => (result, signup))
)
insertRequests
.map { results =>
val errors: List[(SignupRequest, Error)] = results
.flatMap { case (result, signup) =>
Expand Down
3 changes: 2 additions & 1 deletion app/models/formModels.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,14 +83,15 @@ object formModels {

}

final case class AddSignupsFormData(emails: String)
final case class AddSignupsFormData(emails: String, dryRun: Boolean)

object AddSignupsFormData {

val form =
Form(
mapping(
"emails" -> text,
"dryRun" -> boolean,
)(AddSignupsFormData.apply)(AddSignupsFormData.unapply)
)

Expand Down
16 changes: 15 additions & 1 deletion app/views/signupAdmin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,20 @@ object signupAdmin {
),
)
),
div(
cls := "mdl-cell mdl-cell--12-col",
label(
cls := "mdl-checkbox mdl-js-checkbox",
input(
id := "dryRun",
name := "dryRun",
`type` := "checkbox",
cls := "mdl-checkbox__input",
value := "true"
),
span(cls := "mdl-checkbox__label", "Essai (test sans ajout)")
)
),
div(
cls := "mdl-cell mdl-cell--12-col",
button(
Expand All @@ -210,7 +224,7 @@ object signupAdmin {
),
tbody(
frag(
signups.filter(_._2.isEmpty).map { case (signup, _) =>
signups.filter(_._2.isEmpty).sortBy(_._1.requestDate).reverse.map { case (signup, _) =>
tr(
td(cls := "mdl-data-table__cell--non-numeric", signup.email),
td(signup.requestDate.toString),
Expand Down