From 498cdd2be275c9d7d926634d2e153080964f4342 Mon Sep 17 00:00:00 2001 From: TPS23 Date: Mon, 18 Sep 2017 16:58:11 -0400 Subject: [PATCH 1/4] updated application version in app.conf --- conf/application.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/application.conf b/conf/application.conf index bf50f44..3bc9dbc 100644 --- a/conf/application.conf +++ b/conf/application.conf @@ -84,7 +84,7 @@ play.evolutions.enabled=false play.http.context="/ls" # Application version. This is read by build.sbt -app.version="1.2.1" +app.version="2.0.2" # Set max post text (body) size #parsers.text.maxLength=10240K From a8be9b0d0a5ea72ac8a349302f7b1d985638e7c3 Mon Sep 17 00:00:00 2001 From: TPS23 Date: Tue, 19 Sep 2017 17:04:16 -0400 Subject: [PATCH 2/4] Removed remaining css.x backup files --- public/stylesheets/create.css.x | 44 --------------- public/stylesheets/index.css.x | 29 ---------- public/stylesheets/search.css.x | 97 --------------------------------- 3 files changed, 170 deletions(-) delete mode 100644 public/stylesheets/create.css.x delete mode 100644 public/stylesheets/index.css.x delete mode 100644 public/stylesheets/search.css.x diff --git a/public/stylesheets/create.css.x b/public/stylesheets/create.css.x deleted file mode 100644 index de19454..0000000 --- a/public/stylesheets/create.css.x +++ /dev/null @@ -1,44 +0,0 @@ -@media only screen and (min-width: 768px) { - #creation-dialog { - width: 49.75%; - margin-right: 0.5%; - } - - #parent-wizard { - width: 49.75%; - } -} - -@media only screen and (max-width: 767px) { - #parent-wizard { - width: 100%; - } -} - -#file-input { - background-color: #EEEEEE; - width: 100%; - border-radius: 0px 4px 4px 0px; - border-style: solid; - border-color: #D5D6D6; - border-width: 1px; -} - -#description-label { - border-radius: 4px 4px 0px 0px; - border-style: solid; - border-width: 1px; - border-color: #D5D6D6; - padding: 6px; - background-color: #EEEEEE; - color: #505050; -} - -#description { - background-color: #FFFFFF; - width: 100%; - border-radius: 0px 4px 4px 0px; - border-style: solid; - border-color: #D5D6D6; - border-width: 1px; -} diff --git a/public/stylesheets/index.css.x b/public/stylesheets/index.css.x deleted file mode 100644 index ee0918a..0000000 --- a/public/stylesheets/index.css.x +++ /dev/null @@ -1,29 +0,0 @@ -/* - index.css -*/ - -body { - margin: 0px; - padding: 0px; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; -} - -em { - /*font-family: 'Times New Roman';*/ - font-weight: normal; -} - -.data-container { - color: rgb(0, 0, 0); - font-size: 16px; - clear: both; -} - -.map { - width: 100%; //600px; - height: 450px; -} - -#codes-toggle { - height: 20px; -} diff --git a/public/stylesheets/search.css.x b/public/stylesheets/search.css.x deleted file mode 100644 index 90bec3e..0000000 --- a/public/stylesheets/search.css.x +++ /dev/null @@ -1,97 +0,0 @@ -#search-button { - vertical-align: inherit; -} - -#leaflet-draw-marker a:hover{ - cursor: default; - background-color: transparent; - border-bottom-width: 1px; - border-bottom-style: solid; - border-bottom-color: rgba(0, 0, 0, 0.1); -} - -@media only screen and (min-width: 768px) { - #map-container { - width: 49.75%; - margin-right: 0.5%; - } - - #results-output { - width: 49.75%; - } -} -@media only screen and (max-width: 767px) { - #map-container { - width: 100%; - } - - #results-output { - width: 100%; - margin-bottom: 5px; - } -} - -#result-count { - border-radius: 5px 5px 0px 0px; - background-color: #000000; - color: #00FFFF; -} - -#result table { - display: table; - width: 100%; -} - -#result table thead, -#result table tbody { - width: 100%; - float: left; -} - -#result table tbody { - border-radius: 5px; - overflow: auto; - max-height: 500px; -} - -#result table tr { - width: 100%; - display: table; -} - -#result tbody tr:nth-child(even) { - background-color: #F0FFFF; -} - -#result tbody tr:nth-child(odd) { - background-color: #FFFFFF; -} - -#result table thead tr { - background-color: #F0FFFF; - border-bottom-color: rgb(221, 221, 221); - border-bottom-width: 1px; - border-bottom-style: solid; -} - -#result table tbody tr td, -#result table thead tr th { - padding: 0px; - border-bottom: 0px; -} - -#result table thead .location-col { - width: 38%; -} - -#result table tbody .location-col { - width: 40%; -} - -#result table .type-col { - width: 20%; -} - -#result table .within-col { - width: 40%; -} From 03c727554a91d0a2bc5b6661dd36bf526c297f5d Mon Sep 17 00:00:00 2001 From: TPS23 Date: Fri, 27 Oct 2017 18:47:06 -0400 Subject: [PATCH 3/4] Fixed translator bugs involving multiple category entries and improper categorization --- app/views/country_selector.scala.html | 2 ++ public/javascripts/translator.js | 23 +++++++++++++---------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/app/views/country_selector.scala.html b/app/views/country_selector.scala.html index 62386a8..352a1e7 100644 --- a/app/views/country_selector.scala.html +++ b/app/views/country_selector.scala.html @@ -1,5 +1,7 @@
+ + diff --git a/public/javascripts/translator.js b/public/javascripts/translator.js index 792f8b5..46bdf53 100644 --- a/public/javascripts/translator.js +++ b/public/javascripts/translator.js @@ -115,7 +115,7 @@ } for(i = 0; i < responseData.length; i++) { - displayResultRow(responseData[i].features[0].properties, maxCodesLength, codeTypes); + displayResultRow(responseData[i].features[0].properties, codeTypes); } }, error: function(xhr,status,error) { @@ -131,28 +131,31 @@ return; } - function displayResultRow(properties, maxCodesLength, codeTypes) { + function displayResultRow(properties, codeTypes) { var name = properties.name, codes = properties.codes, row = document.createElement("tr"), th = document.createElement("th"), td, - i; + i, + j; th.innerHTML = name; th.headers = "results-names"; row.appendChild(th); - for(i = 0; i < maxCodesLength; i++) { + for(i = 0; i < codeTypes.length; i++) { td = document.createElement("td"); - if(codes[i]) { - while(codes[i].codeTypeName !== codeTypes[row.children.length - 1]) { - row.appendChild(td); - td = document.createElement("td"); + for(j = 0; j < codes.length; j++) { + if(codes[j].codeTypeName === codeTypes[i]) { + if(td.innerHTML.length === 0) { + td.innerHTML = codes[j].code; + } + else { + td.innerHTML += ", " + codes[j].code; + } } - - td.innerHTML = codes[i].code; } td.headers = "results-codes"; From 7e047de8031652ebe3388295a44cb0c1e31ab014 Mon Sep 17 00:00:00 2001 From: TPS23 Date: Fri, 27 Oct 2017 18:53:41 -0400 Subject: [PATCH 4/4] Created new 'Get All Countries' button but hiding until implemented; TODO: IMPLEMENT 'Get All Countries' BUTTON --- app/views/country_selector.scala.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/country_selector.scala.html b/app/views/country_selector.scala.html index 352a1e7..2933d9a 100644 --- a/app/views/country_selector.scala.html +++ b/app/views/country_selector.scala.html @@ -1,6 +1,6 @@
- +