Skip to content

Commit

Permalink
-nc
Browse files Browse the repository at this point in the history
  • Loading branch information
robengel committed Jun 13, 2011
1 parent cbc93ba commit c1e0b19
Show file tree
Hide file tree
Showing 4 changed files with 145 additions and 131 deletions.
86 changes: 44 additions & 42 deletions geocamCover/static/geocamCover/app.js
View file
Expand Up @@ -27,11 +27,11 @@ function Place() {

var places = [];
var clicked_position;
var selected_place;
var globalTempPlaceId = 666;
var selectedPlace;

$(document).ready(function () {


//MOFFETT FIELD COORDINATES
var latlng = new google.maps.LatLng(37.41288, -122.052934);
$('#map_canvas').gmap({
Expand Down Expand Up @@ -91,28 +91,25 @@ $(document).ready(function () {
place = new Place();
place.position = clicked_position;
place.name = $('#place-form .name').val();
addMarker(place);

var new_place = JSON.stringify({"latitude": clicked_position.lat(),
"longitude": clicked_position.lng(), "name": place.name });
$.post('/geocamCover/place/', new_place, function(data) {
// nothing yet
// need to get ID as ACK from server using JSON-RPC
place.id = data;
places[place.id] = place;
addMarker(place);
showLog(place.id);
});
// USING A TEMP ID FOR NOW
place.id = ++globalTempPlaceId;
places[globalTempPlaceId] = place;


$('#place-form .name').val("");
showLog(place.id);
return false;
});

$("#new-task form").submit(function() {
$("#tasks-page form").submit(function() {
task = new Task();
task.title = $('#new-task .title').val();
task.description = $('#new-task .description').val();
task.priority = $('#new-task .priority').val();
task.title = $('#tasks-page .title').val();
task.description = $('#tasks-page .description').val();
task.priority = $('#tasks-page .priority').val();
task.place_id = selectedPlace.id;
places[task.place_id].tasks.push(task);

Expand All @@ -122,19 +119,19 @@ $(document).ready(function () {
// nothing yet
});

$('#new-task .title').val("");
$('#new-task .description').val("");
$('#new-task .priority').val(3);
$('#tasks-page .title').val("");
$('#tasks-page .description').val("");
$('#tasks-page .priority').val(3);
showLog(task.place_id);
return false;
});

$("#new-report form").submit(function() {
$("#reports-page form").submit(function() {
report = new Report();
report.title = $('#new-report .title').val();
report.status = $('#new-report .status').val();
report.percent_completed = $('#new-report .percent_completed').val();
report.notes = $('#new-report .notes').val();
report.title = $('#reports-page .title').val();
report.status = $('#reports-page .status').val();
report.percent_completed = $('#reports-page .percent_completed').val();
report.notes = $('#reports-page .notes').val();
report.place_id = selectedPlace.id;
places[report.place_id].reports.push(report);

Expand All @@ -145,10 +142,10 @@ $(document).ready(function () {
// nothing yet
});

$('#new-report .title').val("");
$('#new-report .notes').val("");
$('#new-report .status').val("");
$('#new-report .percent_completed').val(0);
$('#reports-page .title').val("");
$('#reports-page .notes').val("");
$('#reports-page .status').val("");
$('#reports-page .percent_completed').val(0);
showLog(report.place_id);
return false;
});
Expand All @@ -169,45 +166,50 @@ function addMarker(place) {


function showLog(place_id) {
document.location.href = "/geocamCover/#logs-page";
place = places[place_id];
$('#place-log .name').html(place.name);
$('#place-log').show();
$('#new-task').hide();
$('#new-report').hide();
$('#logs-page h1').append(place.name);
$('#logs-page a').removeClass("ui-btn-active");
selectedPlace = place;

var noTasksAndReports = true;

$('#logs').empty();
for(var task in place.tasks){
task = place.tasks[task];
$('#logs').append("<li><a href='#'>" + task.title + "</a></li>");
noTasksAndReports = false;
}

for(var report in place.reports){
report = place.reports[report];
$('#logs').append("<li><a href='#'>" + report.title + "</a></li>");
noTasksAndReports = false;
}

if (noTasksAndReports){
$('#logs').append('<li>No tasks or reports for this place...</li>');
}


$('#logs').listview("refresh");
}


function showNewTask() {
$("#new-task .name").html(selectedPlace.name);
$('#place-log').hide();
$('#new-task').show();
document.location.href = "/geocamCover/#tasks-page";
$('#tasks-page a').removeClass("ui-btn-active");
$("#tasks-page .name").html(selectedPlace.name);
}


function showNewReport() {
$("#new-report .name").html(selectedPlace.name);
$('#place-log').hide();
$('#new-report').show();
document.location.href = "/geocamCover/#reports-page";
$('#reports-page a').removeClass("ui-btn-active");
$("#reports-page .name").html(selectedPlace.name);
}


function showMap() {
$('#dim').hide();
$('#place-form').hide();
$('#place-log').hide();
$('#new-task').hide();
$('#new-report').hide();
return false;
document.location.href = "/geocamCover/#map-page";
}
11 changes: 5 additions & 6 deletions geocamCover/static/geocamCover/layout.css
View file
Expand Up @@ -16,7 +16,6 @@ html, body {
z-index: 10;
width: 100%;
height: 100%;
display: none;
}

.form{
Expand All @@ -30,19 +29,19 @@ html, body {
width:100%;
}*/

#place-form{

display: none;
}

#place-form form{
position: absolute;
bottom: 0;
bottom: 43px;
width: 100%;
background-image: -webkit-gradient(linear,left top,left bottom,color-stop(0,#EEE),color-stop(1,#DDD));
text-align: center;
}

#place-log{
height: 100%;
}


#dim{
display: none;
Expand Down
168 changes: 90 additions & 78 deletions geocamCover/templates/geocamCover/index.html
View file
Expand Up @@ -15,89 +15,101 @@
</head>

<body>
<div data-role="page">
<div data-role="content" style='padding:0px'>

<div id="map-page" data-role="page">
<div data-role="header">
<h1>GeoCam Cover</h1>
</div>
<div data-role="content" style='padding:0px'>
<div id="dim"></div>
<div id="map_canvas"></div>

<div id="place-form">
<form>
<h1>Do you want to add this as a place?</h1>
<input style='width:95%' class="name" type="text" placeholder="Place Name... (optional)"/>
<input type="submit" value="Add Place"/>
<input type="button" value="Back to Map" onclick="return showMap();"/>
</form>
</div>

<div class="form" id="place-log">
<div data-role="header">
<h1 class='name'></h1>
</div>

<div data-role="content">
<ul id="logs" data-role="listview" data-theme="g">
</ul>
<div id="map_canvas"></div>
<div id="place-form">
<form>
<h1>Do you want to add this as a place?</h1>
<input style='width:95%' class="name" type="text" placeholder="Place Name... (optional)"/>
<input type="submit" value="Add Place"/>
<input type="button" value="Back to Map" onclick="$('#dim').hide();$('#place-form').hide();"/>
</form>
</div>
</div>
</div>


<div id="logs-page" data-role="page">

<div data-role="header">
<a href="#" data-rel="back" data-icon="arrow-l">Back</a>
<h1 class='name'></h1>
<a href="#" class="ui-btn-right" data-icon="gear" data-role="button">Edit</a>
</div>

<div data-role="content">
<ul id="logs" data-role="listview" data-theme="e">
</ul>

</div>


<div class='form-buttons'>
<input onclick="showNewTask();" type="submit" value="Add Task"/>
<input onclick="showNewReport();" type="submit" value="Add Report"/>
<input type="submit" value="Back to Map" onclick="return showMap();"/>
</div>
</div>

<div id="reports-page" data-role="page">
<div data-role="header">
<a href="#" data-rel="back" data-icon="delete">Cancel</a>
<h1>Add Report to '<span class='name'></span>'</h1>
</div>
<div data-role="content">
<form>
<input type='text' class='title' placeholder='Report Title...'/>
<select class="status">
<option disabled>Status</option>
<option>Temp 1</option>
<option>Temp 2</option>
<option>Temp 3</option>
</select>

<div>
<input type="range" name="points" min="0" max="100" value="0" class="percent_completed"/>
</div>

<div class='form-buttons'>
<input onclick="showNewTask();" type="submit" value="Add Task"/>
<input onclick="showNewReport();" type="submit" value="Add Report"/>
<input type="submit" value="Back to Map" onclick="return showMap();"/>
</div>
</div>

<div class="form" id="new-task">
<form>
<div data-role="header">
<h1>Add Task to '<span class='name'></span>'</h1>
</div>
<input type='text' class='title' placeholder='Task Title...'/>

<div>
<input type="range" name="points" min="1" max="5" value="3" class="priority"/>
</div>
<textarea placeholder='Description...' class="description"></textarea>

<div class='form-buttons'>
<input type="submit" value="Submit Task"/>
<input type="button" value="Back to Logs" onclick="return showLog(selectedPlace);"/>
<input type="submit" value="Back to Map" onclick="return showMap();"/>
</div>
</form>
</div>

<div class="form" id="new-report">
<form>
<div data-role="header">
<h1>Add Report to '<span class='name'></span>'</h1>
</div>
<input type='text' class='title' placeholder='Report Title...'/>
<select class="status">
<option disabled>Status</option>
<option>Temp 1</option>
<option>Temp 2</option>
<option>Temp 3</option>
</select>

<div>
<input type="range" name="points" min="0" max="100" value="0" class="percent_completed"/>
</div>
<textarea class="notes" placeholder='Notes...'></textarea>

<div class='form-buttons'>
<input type="submit" value="Submit Report"/>
<input type="button" value="Back to Logs" onclick="return showLog(selectedPlace);"/>
<input type="submit" value="Back to Map" onclick="return showMap();"/>
</div>
</form>
</div>
<textarea class="notes" placeholder='Notes...'></textarea>
<input type="submit" value="Submit Report"/>
</form>

<input type="button" value="Back to Logs" onclick="return showLog(selectedPlace);"/>
<input type="submit" value="Back to Map" onclick="return showMap();"/>
</div>

</div>
<!-- /content -->
</div>
<!-- /header -->
</div><!-- /page -->

<div id="tasks-page" data-role="page">
<div data-role="header">
<a href="#" data-rel="back" data-icon="delete">Cancel</a>
<h1>Add Task to '<span class='name'></span>'</h1>
</div>

<div data-role="content">
<form>
<input type='text' class='title' placeholder='Task Title...'/><br/>
<input type="range" name="points" min="1" max="5" value="3" class="priority"/>
<textarea placeholder='Description...' class="description"></textarea>
<input type="submit" value="Submit Task"/>
</form>

<input type="button" value="Back to Logs" onclick="return showLog(selectedPlace);"/>
<input type="submit" value="Back to Map" onclick="return showMap();"/>
</div>

</div>


<div id="edit-place-page" data-role="page">
</div>



</body>
</html>

0 comments on commit c1e0b19

Please sign in to comment.