v6.9.0

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,18 @@
+<!-- Note that this template has a lot of sections that _could_ be filled in, but you don't need to fill them all in. If you don't have answers to some questions and/or you don't have time to figure it out right now, just skip them, we can always fill it in later. Having the issue filed at all is what's most important. -->
+##### Brief description of issue/feature
+
+<!-- This part mostly applies for features/design ideas; delete this if you're just reporting a bug. -->
+##### Design ideas & mockups
+
+<!-- Include any of the below that applies to you, delete any headers that don't apply -->
+##### Expected behavior
+
+<!-- For current behavior, include screenshots/recordings if applicable; check terminal & browser console for errors -->
+##### Current behavior
+
+##### Steps to reproduce
+
+##### Potential solution(s)
+
+<!-- prod vs test vs dev env, which city/cities, language(s), browser(s), OS(s)? -->
+##### Where has the error occurred?

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,24 @@
+Resolves #123
+
+This is a brief description of the problem solved or feature implemented and how you implemented it.
+
+##### Before/After screenshots <!-- delete if not applicable -->
+
+##### Things to check before submitting the PR <!-- if something doesn't apply, just check the box or remove the line -->
+- [ ] If there is a visual design component, I've posted before/after screenshots on the relevant issue thread and have been given a thumbs up on my design.
+- [ ] I've asked for and added translations for any user facing text that was added or modified.
+- [ ] I've updated logging if applicable. Clicks, keyboard presses, and other interactions should be logged in the `audit_task_interaction` or `validation_task_interaction` tables. If you added/modified an element that users can interact with, you may need to add/change the logging. Links between pages should be logged in the `webpage_activity` table. If you're not sure if you need to update the logging, ask Mikey.
+- [ ] I've added/modified comments for large or confusing blocks of code.
+- [ ] I've made sure my code and comments follow the [style guide](https://github.com/ProjectSidewalk/SidewalkWebpage/wiki/Style-Guide).
+- [ ] I've tested on multiple browsers.
+- [ ] I've tested as an Anonymous user, Registered user, and as a Turker.
+- [ ] I've tested in both English and Spanish.
+- [ ] I've tested on both desktop and mobile (as of Aug 2020, only need to test mobile for validation sign in page changes).
+- [ ] I've verified that this PR is set to merge into the develop branch.
+- [ ] I've written a descriptive PR title.
+
+##### Steps to reproduce the bug <!-- delete if not applicable -->
+1.
+
+##### Testing instructions
+1.

.gitignore

@@ -13,6 +13,7 @@ coverage/
 .ivy2
 bower.json
 component.json
+db/*-dump
 
 ### IntelliJ (https://github.com/github/gitignore/blob/master/Global/JetBrains.gitignore)
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio

README.md

@@ -1,5 +1,5 @@
 # Sidewalk Webpage
-The Project Sidewalk webpage. 
+Want a Project Sidewalk server set up for your city/municipality? We have had various discussions on Github about what we are looking for when choosing new cities to deploy in (geographic diversity, presence of local advocates, funding, etc.), which you can read through [here](https://github.com/ProjectSidewalk/SidewalkWebpage/issues/1379), [here](https://github.com/ProjectSidewalk/SidewalkWebpage/issues/1626), and [here](https://github.com/ProjectSidewalk/SidewalkWebpage/issues/281). If you would like to suggest that we deploy in your city/municipality, please email us at sidewalk@cs.uw.edu!
 
 ## Development Instructions
 
@@ -64,7 +64,7 @@ To run the web server locally, from the root of the SidewalkWebpage directory:
 1. SSH into containers: To ssh into the containers, run `make ssh target=[web|db]`. Note that `[web|db]` is not a literal syntax, it specifies which container you would want to ssh into. For example, you can do `make ssh target=web`.
 
 ### Programming environment
-The IDE [IntelliJ IDEA](https://www.jetbrains.com/idea/) is highly recommended for development, particularly with Scala. You should be able to get a [student license](https://www.jetbrains.com/student/) to use get the "ultimate" edition of IntelliJ IDEA.
+The IDE [IntelliJ IDEA](https://www.jetbrains.com/idea/) is highly recommended for development, particularly with Scala. You should be able to get a [student license](https://www.jetbrains.com/student/) to get the "ultimate" edition of IntelliJ IDEA. If using IntelliJ IDEA, we would recommend installing the [Play Routes](https://plugins.jetbrains.com/plugin/10053-play-routes/), [i18n support](https://plugins.jetbrains.com/plugin/12981-i18n-support/), and [HOCON](https://plugins.jetbrains.com/plugin/10481-hocon) plugins.
 
 To look at and run queries on your database, you will want to install a database client. [Valentina Studio](https://www.valentina-db.com/en/valentina-studio-overview) is a good cross-platform database client. People also like using [Postico](https://eggerapps.at/postico/) for Mac or [PGAdmin](https://www.pgadmin.org/download/) on Windows/Mac.
 

app/controllers/AdminController.scala

@@ -25,6 +25,10 @@ import org.geotools.referencing.CRS
 import play.api.libs.json.{JsArray, JsError, JsObject, Json}
 import play.extras.geojson
 import play.api.mvc.BodyParsers
+import play.api.Play
+import play.api.Play.current
+import play.api.cache.Cache
+import play.api.cache.EhCachePlugin
 
 import scala.concurrent.Future
 import scala.collection.mutable.ListBuffer
@@ -521,4 +525,12 @@ class AdminController @Inject() (implicit val env: Environment[User, SessionAuth
       }
     )
   }
+
+  /** Clears all cached values stored in the EhCachePlugin, which is Play's default cache plugin. */
+  def clearPlayCache() = UserAwareAction.async { implicit request =>
+    val cacheController = Play.application.plugin[EhCachePlugin].get.manager
+    val cache = cacheController.getCache("play")
+    cache.removeAll()
+    Future.successful(Ok("success"))
+  }
 }

app/controllers/ApplicationController.scala

@@ -120,6 +120,7 @@ class ApplicationController @Inject() (implicit val env: Environment[User, Sessi
             if(qString.isEmpty){
               WebpageActivityTable.save(WebpageActivity(0, user.userId.toString, ipAddress, "Visit_Index", timestamp))
               // Get city configs.
+              val envType: String = Play.configuration.getString("environment-type").get
               val cityStr: String = Play.configuration.getString("city-id").get
               val cityName: String = Play.configuration.getString("city-params.city-name." + cityStr).get
               val stateAbbreviation: String = Play.configuration.getString("city-params.state-abbreviation." + cityStr).get
@@ -131,7 +132,7 @@ class ApplicationController @Inject() (implicit val env: Environment[User, Sessi
               val otherCityUrls: List[(String, String)] = otherCities.map { otherCity =>
                 val otherName: String = Play.configuration.getString("city-params.city-name." + otherCity).get
                 val otherState: String = Play.configuration.getString("city-params.state-abbreviation." + otherCity).get
-                val otherURL: String = Play.configuration.getString("city-params.landing-page-url." + otherCity).get
+                val otherURL: String = Play.configuration.getString("city-params.landing-page-url." + envType + "." + otherCity).get
                 (otherName + ", " + otherState, otherURL)
               }
               // Get total audited distance. If using metric system, convert from miles to kilometers.

app/controllers/AuditController.scala

@@ -54,7 +54,13 @@ class AuditController @Inject() (implicit val env: Environment[User, SessionAuth
 
     request.identity match {
       case Some(user) =>
-        // Get current region if we aren't assigning new one; otherwise assign new region
+        // If the user is a Turker and has audited less than 50 meters in the current region, then delete the current region.
+        val currentMeters: Option[Float] = MissionTable.getMetersAuditedInCurrentMission(user.userId)
+        if (user.role.getOrElse("") == "Turker" &&  currentMeters.isDefined && currentMeters.get < 50) {
+          UserCurrentRegionTable.delete(user.userId)
+        }
+
+        // Get current region if we aren't assigning new one; otherwise assign new region.
         var region: Option[NamedRegion] = nextRegion match {
           case Some("easy") => // Assign an easy region if the query string has nextRegion=easy.
             UserCurrentRegionTable.assignEasyRegion(user.userId)

app/controllers/ValidationController.scala

@@ -80,7 +80,7 @@ class ValidationController @Inject() (implicit val env: Environment[User, Sessio
         if (validationData._4.missionType != "validation" || user.role.getOrElse("") == "Turker" || !isMobile(request)) {
           Future.successful(Redirect("/audit"))
         } else {
-          Future.successful(Ok(views.html.mobileValidate("Project Sidewalk - Validate", Some(user), validationData._1, validationData._2, validationData._3, validationData._4.numComplete, validationData._5)))
+          Future.successful(Ok(views.html.mobileValidate("Project Sidewalk - Validate", Some(user), validationData._1, validationData._2, validationData._3, validationData._4.numComplete, validationData._5, validationData._6)))
         }
       case None =>
         Future.successful(Redirect(s"/anonSignUp?url=/mobile"));
@@ -100,7 +100,7 @@ class ValidationController @Inject() (implicit val env: Environment[User, Sessio
         if (validationData._4.missionType != "validation" || user.role.getOrElse("") == "Turker") {
           Future.successful(Redirect("/audit"))
         } else {
-          Future.successful(Ok(views.html.rapidValidation("Project Sidewalk - Validate", Some(user), validationData._1, validationData._2, validationData._3, validationData._4.numComplete, validationData._5)))
+          Future.successful(Ok(views.html.rapidValidation("Project Sidewalk - Validate", Some(user), validationData._1, validationData._2, validationData._3, validationData._4.numComplete, validationData._5, validationData._6)))
         }
       case None =>
         Future.successful(Redirect(s"/anonSignUp?url=/rapidValidate"));

app/forms/ForgotPasswordForm.scala

@@ -12,6 +12,6 @@ object ForgotPasswordForm {
    * A play framework form.
    */
   val form = Form(
-    "email" -> email
+    "emailForgotPassword" -> email
   )
 }

app/forms/ResetPasswordForm.scala

@@ -13,8 +13,8 @@ object ResetPasswordForm {
    */
   val form = Form(
     mapping(
-      "password" -> nonEmptyText,
-      "passwordConfirm" -> nonEmptyText
+      "passwordReset" -> nonEmptyText,
+      "passwordResetConfirm" -> nonEmptyText
     )(PasswordData.apply)(PasswordData.unapply)
   )
 

app/forms/SignInForm.scala

@@ -8,7 +8,7 @@ object SignInForm {
   val form = Form(
     mapping(
       "identifier" -> email,
-      "password" -> nonEmptyText
+      "passwordSignIn" -> nonEmptyText
     )(Credentials.apply)(Credentials.unapply)
   )
 }

app/models/mission/MissionTable.scala

@@ -9,7 +9,7 @@ import models.audit.{AuditTask, AuditTaskTable}
 import models.daos.slick.DBTableDefinitions.{DBUser, UserTable}
 import models.utils.MyPostgresDriver.simple._
 import models.region._
-import models.user.{RoleTable, UserRoleTable}
+import models.user.{RoleTable, UserRoleTable, UserCurrentRegionTable}
 import models.label.{LabelTable, LabelTypeTable}
 import models.region.RegionPropertyTable
 import play.api.Logger
@@ -510,7 +510,7 @@ object MissionTable {
   }
 
   /**
-    * Get total distance audited by a user in miles.
+    * Gets total distance audited by a user in miles.
     *
     * @param userId
     * @return
@@ -519,6 +519,22 @@ object MissionTable {
     missions.filter(_.userId === userId.toString).map(_.distanceProgress).sum.run.getOrElse(0F) * METERS_TO_MILES
   }
 
+  /**
+    * Gets meters audited by a user in their current mission, if it exists.
+    *
+    * @param userId
+    * @return
+    */
+  def getMetersAuditedInCurrentMission(userId: UUID): Option[Float] = db.withSession { implicit session =>
+    val currentMeters: Option[Float] = for {
+      currentRegion <- UserCurrentRegionTable.currentRegion(userId)
+      currentMission <- getCurrentMissionInRegion(userId, currentRegion)
+    } yield {
+      currentMission.distanceProgress.getOrElse(0F)
+    }
+    currentMeters
+  }
+
   /**
     * Provides functionality for accessing mission table while a user is auditing while preventing race conditions.
     *

app/models/user/UserCurrentRegionTable.scala

@@ -135,4 +135,14 @@ object UserCurrentRegionTable {
     }
     regionId
   }
+
+    /**
+    * Delete the current region for a user if it exists.
+    *
+    * @param userId user ID
+    * @return
+    */
+  def delete(userId: UUID) = db.withSession { implicit session =>
+    userCurrentRegions.filter(_.userId === userId.toString).delete
+  }
 }

app/views/admin/index.scala.html

@@ -291,6 +291,8 @@ <h1>Coverage</h1>
                         <h1></h1>
 
                     </div>
+                    <button onclick="admin.clearPlayCache()">@Messages("admin.clear.play.cache")</button>
+                    <p id="clearPlayCacheSuccess" style="color:green"></p>
                 </div>
                 <div class="row">
                     <h1>Comments</h1>
@@ -467,6 +469,25 @@ <h2>Daily Label Counts</h2>
 
                     <h2>Severity Ratings by Label Type</h2>
                     <div class="col-lg-12">
+                        <div class="stats-grid">
+                            <p>
+                                <span>Average (curb ramp): </span><span id="curb-ramp-mean"></span><br>
+                                <span>Average (missing curb ramp): </span><span id="missing-ramp-mean"></span><br>
+                                <span>Average (surface problem): </span><span id="surface-mean"></span><br>
+                                <span>Average (obstacle): </span><span id="obstacle-mean"></span><br>
+                                <span>Average (no sidewalk): </span><span id="no-sidewalk-mean"></span><br>
+                                <span>Average (all label types): </span><span id="labels-mean"></span><br>
+                            </p>
+                            <p>
+                                <span>Standard Deviation (curb ramp): </span><span id="curb-ramp-std"></span><br>
+                                <span>Standard Deviation (missing curb ramp): </span><span id="missing-ramp-std"></span><br>
+                                <span>Standard Deviation (surface problem): </span><span id="surface-std"></span><br>
+                                <span>Standard Deviation (obstacle): </span><span id="obstacle-std"></span><br>
+                                <span>Standard Deviation (no sidewalk): </span><span id="no-sidewalk-std"></span><br>
+                                <span>Standard Deviation (all label types): </span><span id="labels-std"></span><br>
+                            </p>
+                        </div>
+
                         <div id="severity-histograms"></div>
                     </div>
 

app/views/admin/task.scala.html

@@ -25,7 +25,7 @@
     <link href='@routes.Assets.at("stylesheets/admin.css")' rel="stylesheet"/>
     <script type="text/javascript" src='@routes.Assets.at("javascripts/lib/d3.v3.js")'></script>
     <script type="text/javascript" src='@routes.Assets.at("javascripts/lib/c3.min.js")'></script>
-    <script type="text/javascript" src='@routes.Assets.at("javascripts/lib/underscore.min.js")'></script>
+    <script type="text/javascript" src='@routes.Assets.at("javascripts/lib/underscore-min.js")'></script>
     <script type="text/javascript" src='@routes.Assets.at("javascripts/Admin/build/Admin.js")'></script>
     <script type="text/javascript" src='@routes.Assets.at("javascripts/SVLabel/src/SVLabel/util/UtilitiesSidewalk.js")'></script>
     <script type="text/javascript" src='@routes.Assets.at("javascripts/SVLabel/src/SVLabel/util/UtilitiesColor.js")'></script>