Changed Ground Cover to Foliar/Cover on Modals

NickGulajec · Jun 24, 2014 · 6c1363b · 6c1363b
1 parent 39c593f
commit 6c1363b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/app/controllers/plotObservationsModal.js b/app/controllers/plotObservationsModal.js
@@ -11,10 +11,15 @@ var title = args.title;
 //Query the database, assign returned ground cover to TextField
 try {
 	var db = Ti.Database.open('ltemaDB');
-	var resultRow = db.execute(	'SELECT ground_cover \
+	var resultRow = db.execute(	'SELECT ground_cover, count \
 						FROM plot_observation \
 						WHERE observation_id = ?', observationID);
 	var groundCover = resultRow.fieldByName('ground_cover');
+	var count = resultRow.fieldByName('count');
+	//Set the label depending on the oberservation type
+	if(count == 0){
+		$.groundCoverLbl.text = "	Cover:";
+	}
 	$.groundCover.value = groundCover;
 } catch (e) {
 	var errorMessage = e.message;

diff --git a/app/controllers/plotObservationsModalDisclosureIcon.js b/app/controllers/plotObservationsModalDisclosureIcon.js
@@ -14,12 +14,16 @@ var siteID = args.siteID;
 //Query the database, assign returned ground cover to TextField
 try {
 	var db = Ti.Database.open('ltemaDB');
-	var resultRow = db.execute(	'SELECT ground_cover \
+	var resultRow = db.execute(	'SELECT ground_cover, count \
 						FROM plot_observation \
 						WHERE observation_id = ?', observationID);
 	var groundCover = resultRow.fieldByName('ground_cover');
+	var count = resultRow.fieldByName('count');
 	//var mediaID = resultRow.fieldByName('media_id');
-
+	//Set the label depending on the oberservation type
+	if(count == 0){
+		$.groundCoverLbl.text = "Cover:";
+	}
 	$.groundCover.value = groundCover;
 
 		//if media does not exist

diff --git a/app/views/plotObservationsModal.xml b/app/views/plotObservationsModal.xml
@@ -11,7 +11,7 @@
 			</RightNavButton>
 
 			<ScrollView>	
-				<Label id="groundCoverLbl" text="Ground Cover:" />
+				<Label id="groundCoverLbl" text="Foliar Cover:" />
 				<TextField id="groundCover" />
 				<Label id="percentSymbolLabel" />
 				<Label id="groundCoverError" class="error" visible="false" />

diff --git a/app/views/plotObservationsModalDisclosureIcon.xml b/app/views/plotObservationsModalDisclosureIcon.xml
@@ -11,7 +11,7 @@
 			</RightNavButton>
 
 			<ScrollView>	
-				<Label id="groundCoverLbl" text="Ground Cover:" />
+				<Label id="groundCoverLbl" text="Foliar Cover:" />
 				<Label id="groundCover" />
 
 				<Label id="commentsLbl" text="Comments:" />