Merge branch 'master' of https://github.com/lapig-ufg/tvi

lapig-ufg · Jun 16, 2017 · 9fb13ea · 9fb13ea
2 parents 8133db8 + 70d3e0d
commit 9fb13ea
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 13 deletions.
diff --git a/devops/scripts/clear-redis-cache.sh b/devops/scripts/clear-redis-cache.sh
@@ -2,13 +2,9 @@
 
 for key in $(redis-cli KEYS '*' ); do
 
-	result=$(redis-cli GET $key | grep 'QW4gaW50ZXJuYWwgc2VydmVyIGVycm9yIGhhcyBvY2N1cnJlZCA*')
-	if [ ! -z "$result" ]; then
-		redis-cli DEL $key
-	fi
-
-	result=$(redis-cli GET $key | grep 'VXNlciBtZW1vcnkgbGltaXQgZXhjZWVkZWQu')
-	if [ ! -z "$result" ]; then
+	count=$(redis-cli GET $key | wc -c)
+	if [[ $count -le 4000 ]]; then
+		echo " ($count) $key"
 		redis-cli DEL $key
 	fi
 

diff --git a/src/client/assets/style.css b/src/client/assets/style.css
@@ -158,14 +158,15 @@ legend.scheduler-border {
   padding-top: 5px;
   padding-bottom: 5px;
   background-color: #f1f1f1;
+  width: 280px;
 }
 
 .form-label-lclu {
   margin: 10px;
 }
 
 .form-year-lclu {
-  width: 96px !important;
+  width: 85px !important;
   margin-top: 0px;
 }
 
@@ -186,4 +187,13 @@ h3{
 
 .leaflet-control-attribution {
   display: none !important;
-};
+}
+
+.form-lulc-panel {
+  height: 370px;
+  overflow-y: auto;
+  padding-right: 0px;
+  width: 318px;
+  border-bottom: 1px solid silver;
+}
+
diff --git a/src/client/controllers/temporal.js b/src/client/controllers/temporal.js
@@ -12,7 +12,7 @@ Application.controller('temporalController', function($rootScope, $scope, $locat
 		initialYear: 2000,
 		finalYear: 2016,
 		zoomLevel: 13,
-		landUse: ["Agricultura", "Área urbana", "Água", "Mata de galeria", "Mosaico de ocupação", "Não observado", "Pastagem", "Silvicultura", "Vegetação nativa"]
+		landUse: ["Agricultura Anual", "Agricultura Perene", "Área urbana", "Água", "Cana-de-açucar", "Mosaico de ocupação", "Não observado", "Pastagem Cultivada", "Pastagem Natural", "Solo Exposto", "Silvicultura", "Vegetação nativa"]
 	}
 
 	$scope.formPlus = function(){

diff --git a/src/client/views/temporal.tpl.html b/src/client/views/temporal.tpl.html
@@ -15,15 +15,15 @@
 			  	</div>
 				</div>
 				<div class="row">
-					<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
+					<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12 form-lulc-panel">
 						<form class="form-inline form-lclu" ng-repeat="answer in answers">
 							<label class="form-label-lclu" style="margin-right: 24px;">Entre</label><select ng-disabled='answers.length != ($index + 1)' class="form-inline form-control form-year-lclu" ng-model="answer.initialYear" ng-options="x for x in optionYears[$index]"></select>
 						  <label class="form-label-lclu">e</label><select ng-disabled='answers.length != ($index + 1)' class="form-inline form-control form-year-lclu" ng-model="answer.finalYear" ng-options="y for y in optionYears[$index]"></select>
-							<br><label style="margin: 10px;">Classe: </label><select style="width: 75%;" ng-disabled='answers.length != ($index + 1)' class="form-control" ng-model="answer.landUse" ng-options="z for z in config.landUse"></select>
+							<br><label style="margin: 10px;">Classe: </label><select style="width: 200px;" ng-disabled='answers.length != ($index + 1)' class="form-control" ng-model="answer.landUse" ng-options="z for z in config.landUse"></select>
 						</form>
 						<input type="button" style="margin-right:5px" class="btn btn-warning pull-left" ng-disabled="answers[answers.length - 1].finalYear == config.finalYear" ng-click="formPlus()" value="+">
 						<input type="button" class="btn btn-danger pull-left" ng-click="formSubtraction()" ng-disabled="answers.length == 1" value="-">
-						<input type="button" class="btn btn-success pull-right" ng-click="submitForm()" value="Enviar" ng-disabled='onSubmission'>
+						<input style="margin-right: 25px;" type="button" class="btn btn-success pull-right" ng-click="submitForm()" value="Enviar" ng-disabled='onSubmission'>
 						<div class="pull-right button-align">
 	            <b>{{counter}} s</b>
 	          </div>