v0.16.1 - Mise en prod 21/09/2021

.scalafmt.conf

@@ -1,4 +1,4 @@
-version = "3.0.2"
+version = "3.0.4"
 maxColumn = 100
 spaces.afterKeywordBeforeParen = true
 newlines.topLevelStatements = [before, after]

app/controllers/ApplicationController.scala

@@ -423,7 +423,7 @@ case class ApplicationController @Inject() (
  val numOfMonthsDisplayed: Int = request
  .getQueryString(Keys.QueryParam.numOfMonthsDisplayed)
  .flatMap(s => Try(s.toInt).toOption)
- .getOrElse(12)
+ .getOrElse(3)
  val area = if (areaId === Area.allArea.id) None else Area.fromId(areaId)
  allApplicationVisibleByUserAdmin(request.currentUser, area, numOfMonthsDisplayed).map {
  unfilteredApplications =>
@@ -1085,14 +1085,16 @@ case class ApplicationController @Inject() (
  )
  form.fold(
  formWithErrors => {
+ val message =
+ s"Erreur dans le formulaire de réponse (${formWithErrors.errors.map(_.format).mkString(", ")})."
  val error =
- s"Erreur dans le formulaire de réponse (${formWithErrors.errors.map(_.message).mkString(", ")})."
- eventService.log(AnswerNotCreated, s"$error", application = application.some)
+ s"Erreur dans le formulaire de réponse (${formErrorsLog(formWithErrors)})"
+ eventService.log(AnswerNotCreated, error, application = application.some)
  Future(
  Redirect(
  routes.ApplicationController.show(applicationId).withFragment("answer-error")
  )
- .flashing("answer-error" -> error, "opened-tab" -> "anwser")
+ .flashing("answer-error" -> message, "opened-tab" -> "anwser")
  )
  },
  answerData => {

app/controllers/UserController.scala

@@ -232,11 +232,18 @@ case class UserController @Inject() (
  eventService.log(UsersShowed, "Appelle la liste des utilisateurs")
  val idToGroup = groups.map(group => (group.id, group)).toMap
  val userInfos = users.map { user =>
+ val completeName = {
+ val firstName = user.firstName.getOrElse("")
+ val lastName = user.lastName.getOrElse("")
+ if (firstName.nonEmpty || lastName.nonEmpty) s"${user.name} ($lastName $firstName)"
+ else user.name
+ }
  UserInfos(
  id = user.id,
  firstName = user.firstName,
  lastName = user.lastName,
  name = user.name,
+ completeName = completeName,
  qualite = user.qualite,
  email = user.email,
  phoneNumber = user.phoneNumber,

app/models/Application.scala

@@ -46,6 +46,7 @@ case class Application(
  (invitedGroupIdsAtCreation ::: answers.flatMap(_.invitedGroupIds)).toSet
 
  val seenByUserIds = seenByUsers.map(_.userId)
+ val seenByUsersMap = seenByUsers.map { case SeenByUser(userId, date) => (userId, date) }.toMap
 
  def newAnswersFor(userId: UUID) = {
  val maybeSeenLastDate = seenByUsers.find(_.userId === userId).map(_.lastSeenDate)

app/serializers/ApiModel.scala

@@ -79,6 +79,7 @@ object ApiModel {
  firstName: Option[String],
  lastName: Option[String],
  name: String,
+ completeName: String,
  qualite: String,
  email: String,
  phoneNumber: Option[String],

app/views/helpers/menuNav.scala.html

@@ -30,7 +30,7 @@
  }
 
  @if(Authorization.canSeeApplicationsAsAdmin(currentUserRights)) {
- <a @linkAttrs(routes.ApplicationController.all(Area.allArea.id), serializers.Keys.QueryParam.numOfMonthsDisplayed + "=12")>
+ <a @linkAttrs(routes.ApplicationController.all(Area.allArea.id), serializers.Keys.QueryParam.numOfMonthsDisplayed + "=3")>
  <i class="material-icons" role="presentation">folder</i>Admin : demandes
  </a>
  }

app/views/showApplication.scala.html

@@ -315,13 +315,16 @@ <h2 class="mdl-card__title-text">@application.subject</h2>
  </span>
  </div>
  <div class="mdl-list__item-secondary-content">
- @if(application.seenByUserIds.contains(userId)){
+ @application.seenByUsersMap.get(userId) match {
+ case None => {}
+ case Some(date) => {
  <div id="seen-@userId" class="vertical-align--middle">
- <i class="material-icons icon--light">remove_red_eye</i>
+ <i class="material-icons">remove_red_eye</i>
  </div>
  <div class="mdl-tooltip" for="seen-@userId">
- Consultée par l’utilisateur
+ Consultée par l’utilisateur (@Time.formatPatternFr(date.atZone(currentUser.timeZone), "dd MMM YYYY - HH:mm"))
  </div>
+ }
  }
  </div>
  </div>

package.json

@@ -15,17 +15,17 @@
  "ts-polyfill": "3.8.2",
  "unfetch": "4.2.0",
  "unorm": "1.6.0",
- "xlsx": "0.17.1"
+ "xlsx": "0.17.2"
  },
  "devDependencies": {
  "@types/tabulator-tables": "4.9.3",
  "copy-webpack-plugin": "9.0.1",
- "css-loader": "6.2.0",
- "mini-css-extract-plugin": "2.2.2",
+ "css-loader": "6.3.0",
+ "mini-css-extract-plugin": "2.3.0",
  "rimraf": "3.0.2",
  "ts-loader": "9.2.5",
- "typescript": "4.4.2",
- "webpack": "5.52.0",
+ "typescript": "4.4.3",
+ "webpack": "5.53.0",
  "webpack-cli": "4.8.0",
  "webpack-merge": "5.8.0"
  }

project/plugins.sbt

@@ -3,7 +3,7 @@
 // of jackson is set in build.sbt (with the patch version that is not vulnerable)
 addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.8")
 addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.10.0-RC1")
-addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.8.2")
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.9.0")
 addSbtPlugin("com.codacy" % "sbt-codacy-coverage" % "3.0.3")
 addSbtPlugin("com.typesafe.sbt" % "sbt-digest" % "1.1.4")
 addSbtPlugin("com.typesafe.sbt" % "sbt-gzip" % "1.0.2")
@@ -17,4 +17,4 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.1")
 // Makes available sbt commands results to project scala code
 addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0")
 
-addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.30")
+addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.31")

typescript/src/admin.ts

@@ -86,8 +86,10 @@ if (window.document.getElementById(franceServiceDeploymentTableTagId)) {
  }
  }
  const element = window.document.getElementById(franceServiceDeploymentTotalTagId);
- element.textContent = "Nombre de déploiements (plus de 1 utilisateur): " +
- nrOfDeployed + " ; Nombre total: " + totalNr
+ if (element) {
+ element.textContent = "Nombre de déploiements (plus de 1 utilisateur): " +
+ nrOfDeployed + " ; Nombre total: " + totalNr
+ }
  return response; //return the response data to tabulator
  },
  layout: "fitColumns", //fit columns to width of table
@@ -101,22 +103,28 @@ if (window.document.getElementById(franceServiceDeploymentTableTagId)) {
 
 
 
- window.document.getElementById(franceServiceDeploymentDownloadBtnCsvId).onclick = () => {
- const date = new Date().toISOString().replace(/:/g, '-');
- franceServiceDeploymentTable.download(
- 'csv',
- 'aplus-export-deploiement-france-service-' + date + '.csv'
- );
- };
+ const csvBtn = window.document.getElementById(franceServiceDeploymentDownloadBtnCsvId);
+ if (csvBtn) {
+ csvBtn.onclick = () => {
+ const date = new Date().toISOString().replace(/:/g, '-');
+ franceServiceDeploymentTable.download(
+ 'csv',
+ 'aplus-export-deploiement-france-service-' + date + '.csv'
+ );
+ };
+ }
 
- window.document.getElementById(franceServiceDeploymentDownloadBtnXlsxId).onclick = () => {
- const date = new Date().toISOString().replace(/:/g, '-');
- franceServiceDeploymentTable.download(
- "xlsx",
- 'aplus-export-deploiement-france-service-' + date + '.xlsx',
- { sheetName: "Déploiement France Service" }
- );
- };
+ const xlsxBtn = window.document.getElementById(franceServiceDeploymentDownloadBtnXlsxId);
+ if (xlsxBtn) {
+ xlsxBtn.onclick = () => {
+ const date = new Date().toISOString().replace(/:/g, '-');
+ franceServiceDeploymentTable.download(
+ "xlsx",
+ 'aplus-export-deploiement-france-service-' + date + '.xlsx',
+ { sheetName: "Déploiement France Service" }
+ );
+ };
+ }
 
 }
 
@@ -269,15 +277,21 @@ if (window.document.getElementById(deploymentTableTagId)) {
  height: "85vh",
  });
 
- window.document.getElementById(deploymentDownloadBtnCsvId).onclick = () => {
- const date = new Date().toISOString().replace(/:/g, '-');
- table.download('csv', 'aplus-export-deploiement-' + date + '.csv');
- };
+ const csvBtn = window.document.getElementById(deploymentDownloadBtnCsvId);
+ if (csvBtn) {
+ csvBtn.onclick = () => {
+ const date = new Date().toISOString().replace(/:/g, '-');
+ table.download('csv', 'aplus-export-deploiement-' + date + '.csv');
+ };
+ }
 
- window.document.getElementById(deploymentDownloadBtnXlsxId).onclick = () => {
- const date = new Date().toISOString().replace(/:/g, '-');
- table.download("xlsx", 'aplus-export-deploiement-' + date + '.xlsx', { sheetName: "Déploiement" });
- };
+ const xlsxBtn = window.document.getElementById(deploymentDownloadBtnXlsxId);
+ if (xlsxBtn) {
+ xlsxBtn.onclick = () => {
+ const date = new Date().toISOString().replace(/:/g, '-');
+ table.download("xlsx", 'aplus-export-deploiement-' + date + '.xlsx', { sheetName: "Déploiement" });
+ };
+ }
 
  });
 }