LearningAnalyticsUK
diff --git a/‎.gitignore
+4 b/‎.gitignore
+4
diff --git a/‎build.sbt
+2-2 b/‎build.sbt
+2-2
diff --git a/‎db-cli/db-cli.iml
-77 b/‎db-cli/db-cli.iml
-77
diff --git a/‎db/db.iml
-75 b/‎db/db.iml
-75
diff --git a/‎glance-eval-cli/src/main/scala/uk/ac/ncl/la/soar/glance/eval/cli/AssessSurveyResponses.scala
+1-1 b/‎glance-eval-cli/src/main/scala/uk/ac/ncl/la/soar/glance/eval/cli/AssessSurveyResponses.scala
+1-1
diff --git a/‎glance-eval/js/src/main/resources/index.html
+20 b/‎glance-eval/js/src/main/resources/index.html
+20
diff --git a/‎glance-eval/jvm/src/main/scala/uk/ac/ncl/la/soar/glance/eval/server/Repositories.scala
+7-6 b/‎glance-eval/jvm/src/main/scala/uk/ac/ncl/la/soar/glance/eval/server/Repositories.scala
+7-6
@@ -1,3 +1,6 @@
+# User specific exclusions
+deploy/ 
+
 # Created by .ignore support plugin (hsz.mobi)
 ### JetBrains template
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
@@ -25,6 +28,7 @@
 
 ## File-based project format:
 *.iws
+*.iml
 
 ## Plugin-specific files:
 
 
@@ -258,7 +258,7 @@ def commonAssembly(main: String, jar: String) = Seq(
     case "log4j.properties" => MergeStrategy.last
     case "overview.html" => MergeStrategy.rename
     case "JS_DEPENDENCIES" => MergeStrategy.discard
-    case "application.conf" => MergeStrategy.last
+    case "application.conf" => MergeStrategy.first
     case x =>
       val oldStrategy = (assemblyMergeStrategy in assembly).value
       oldStrategy(x)
@@ -419,7 +419,7 @@ lazy val glanceEvalJVM = glanceEval.jvm
     mainClass in Compile := Some("uk.ac.ncl.la.soar.glance.eval.server.Main"))
   .settings(commonBackendDeps:_*)
   .settings(flywaySettings("glance_eval"):_*)
-  .settings(commonAssembly("uk.ac.ncl.la.soar.glance.web.server.Main", "soar-glance-eval.jar"))
+  .settings(commonAssembly("uk.ac.ncl.la.soar.glance.eval.server.Main", "soar-glance-eval.jar"))
 
 //TODO: Investigate intermittent heap space OOM error on assembly of this module
 lazy val glanceEvalCli = soarProject("glance-eval-cli")
 
@@ -141,7 +141,7 @@ object AssessSurveyResponses extends Command[AssessConfig, Unit] {
     * Given the header of a csv, return all the column headers except the first.
     * These are the module codes in the survey
     */
-  private def parseHeader(header: String): Either[String, Seq[ModuleCode]] =  {
+  private def parseHeader(header: String): Either[String, Seq[ModuleCode] =  {
     //Parse out "Student Number" and the module codes as an indexed vector
     val columns = header.split(',').map(_.trim)
     //Check if student number is first column -
 
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Glance Survey</title>
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
+    <link rel="stylesheet" href="https://cdn.datatables.net/1.10.13/css/dataTables.bootstrap.min.css">
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-select/1.12.2/css/bootstrap-select.min.css">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-tagsinput/0.8.0/bootstrap-tagsinput.css">
+    <link rel="stylesheet" href="assets/dashboard.css">
+</head>
+<body>
+<div id="soar-app"></div>
+
+<!-- This is a very manual process, TODO: Look for a way to have build process create includes -->
+<script type="text/javascript" src="assets/soar-glance-eval-jsdeps.min.js"></script>
+<script type="text/javascript" src="assets/soar-glance-eval-opt.js"></script>
+</body>
+</html>
@@ -56,12 +56,13 @@ object Repositories {
     lazy val config = loadConfigOrThrow[Config]
 
     for {
-      cfg <- Task(config)
-      _ <- migrate(
-        s"${cfg.database.url}${cfg.database.name}",
-        cfg.database.user,
-        cfg.database.password
-      )
+      cfg <- Task {println(config); config}
+//      _ <- migrate(
+//        s"${cfg.database.url}${cfg.database.name}",
+//        cfg.database.user,
+//        cfg.database.password
+//      )
+      
       xa = DriverManagerTransactor[Task](
         "org.postgresql.Driver",
         s"${cfg.database.url}${cfg.database.name}",