Skip to content

Commit

Permalink
Added the edit pages for tasks and reports
Browse files Browse the repository at this point in the history
  • Loading branch information
Asem Radhwi committed Jun 14, 2011
1 parent a596a8b commit 670499a
Show file tree
Hide file tree
Showing 4 changed files with 245 additions and 159 deletions.
4 changes: 2 additions & 2 deletions geocamCover/models.py
View file
Expand Up @@ -36,7 +36,7 @@ def __unicode__(self):
return self.name

def get_struct(self):
return {"place_id": self.place_id, "title": self.title, "notes": self.notes, "status": self.status,
return {"id":self.id, "place_id": self.place_id, "title": self.title, "notes": self.notes, "status": self.status,
"percent_completed": self.percent_completed}


Expand All @@ -54,7 +54,7 @@ def __unicode__(self):
return self.name

def get_struct(self):
return {"place_id": self.place_id, "title": self.title, "description": self.description,
return {"id": self.id, "place_id": self.place_id, "title": self.title, "description": self.description,
"priority": self.priority}


Expand Down
212 changes: 134 additions & 78 deletions geocamCover/static/geocamCover/app.js
View file
Expand Up @@ -12,7 +12,7 @@ function Report() {
this.task = null;
this.title = "";
this.status = "";
this.percent_completed = 0;
this.percentCompleted = 0;
this.notes = "";
this.task = new Task();
}
Expand All @@ -23,24 +23,21 @@ function Place() {
this.position = null;
this.reports = [];
this.tasks = [];
this.marker = null;
this.marker = null;
}

var places = [];
var clicked_position;
var selectedPlace;
var reportId;
var taskId;

$(window).resize(function() {
pageResize();
});

$(document).ready(function () {






//MOFFETT FIELD COORDINATES
var latlng = new google.maps.LatLng(37.41288, -122.052934);
$('#map_canvas').gmap({
Expand All @@ -65,19 +62,19 @@ $(document).ready(function () {
task.priority = t.priority;
task.title = t.title;
task.description = t.description;
place.tasks.push(task);
place.tasks[task.id] = task;
}

for (var r in val.reports) {
r = val.reports[r];
var report = new Report();
report.id = r.id;
report.place = place;
report.percent_completed = r.percent_completed;
report.percentCompleted = r.percentCompleted;
report.title = r.title;
report.notes = r.notes;
report.status = r.status;
place.reports.push(report);
place.reports[report.id] = report;
}
places[place.id] = place;
});
Expand All @@ -99,13 +96,13 @@ $(document).ready(function () {


$("#place-form-form, #edit-place-page-form").submit(function(e) {
var place;
if (e.target.id == "edit-place-page-form"){
place = selectedPlace;
} else if (e.target.id == "place-form-form"){
place = new Place();
place.position = clicked_position;
}
var place;
if (e.target.id == "edit-place-page-form") {
place = selectedPlace;
} else if (e.target.id == "place-form-form") {
place = new Place();
place.position = clicked_position;
}
place.name = $(this).find('.name').val();

var new_place = JSON.stringify({"place_id": place.id, "latitude": place.position.lat(),
Expand All @@ -117,72 +114,88 @@ $(document).ready(function () {
showLog(place.id);
});

$(this).find('.name').val("");
$(this).find('.name').val("");

hidePlaceForm();

return false;
});

$("#tasks-page form").submit(function() {


task = new Task();
task.id = taskId;
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);

var new_task = JSON.stringify({"place_id": task.place_id, "title": task.title,

var new_task = JSON.stringify({"task_id":task.id,"place_id": task.place_id, "title": task.title,
"description": task.description, "priority": task.priority });
$.post('/geocamCover/task/', new_task, function(data) {
// nothing yet
task.id = data;
places[task.place_id].tasks[task.id] = task;
showLog(task.place_id);


});

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

$("#reports-page form").submit(function() {


report = new Report();
report.id = reportId;
report.title = $('#reports-page .title').val();
report.status = $('#reports-page .status').val();
report.percent_completed = $('#reports-page .percent_completed').val();

var percent_completed = $('#reports-page .percent-completed').val()

if (percent_completed == "")
percent_completed = 0;

report.percentCompleted = percent_completed;

report.notes = $('#reports-page .notes').val();
report.place_id = selectedPlace.id;
places[report.place_id].reports.push(report);

var new_report = JSON.stringify({"place_id": report.place_id, "title": report.title,
"status": report.status, "percent_completed": report.percent_completed,
var new_report = JSON.stringify({"report_id": report.id, "place_id": report.place_id, "title": report.title,
"status": report.status, "percent_completed": report.percentCompleted,
"notes": report.notes});
$.post('/geocamCover/report/', new_report, function(data) {
// nothing yet
report.id = data;
places[report.place_id].reports[report.id] = report;
showLog(report.place_id);
});

$('#reports-page .title').val("");
$('#reports-page .notes').val("");
$('#reports-page .status').val("");
$('#reports-page .percent_completed').val(0);
showLog(report.place_id);
return false;


});


jQuery("title").html("GeoCam Cover");

});


function deletePlace(){
var delete_request = JSON.stringify({"place_id": selectedPlace.id});
$.post('/geocamCover/delete_place/', delete_request, function(data) {
delete places[selectedPlace.id];
showMap();
});
//var markers = $("#map_canvas").gmap('getMarkers');
//markers.
function deletePlace() {
var delete_request = JSON.stringify({"place_id": selectedPlace.id});
$.post('/geocamCover/delete_place/', delete_request, function(data) {
// alert(selectedPlace.position);
// $('#map_canvas').gmap('findMarker', 'place', selectedPlace.position, function(found, marker) {
//
// alert(marker.title);
//// marker.setVisible(false);
// });
delete places[selectedPlace.id];
showMap();
});

}


Expand All @@ -192,14 +205,16 @@ function addMarker(place) {
'position': place.position,
'title': place.name
})
marker.click(function() {
showLog(place.id);
});
marker.click(function() {
showLog(place.id);
});

// marker.point.setMap(null);
}


function showLog(place_id) {
document.location.href = "/geocamCover/#logs-page";

place = places[place_id];


Expand All @@ -210,17 +225,17 @@ function showLog(place_id) {
var noTasksAndReports = true;

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


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

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

Expand All @@ -234,52 +249,93 @@ function showLog(place_id) {

}

document.location.href = "/geocamCover/#logs-page";


}

function showEditPlace() {
$('#edit-place-page a').removeClass("ui-btn-active");
$("#edit-place-page h1 .name").html(selectedPlace.name.length == 0 ? "Unnamed Place" : selectedPlace.name);
$("#edit-place-page form .name").val(selectedPlace.name);

document.location.href = "/geocamCover/#edit-place-page";
}


function showNewTask() {
document.location.href = "/geocamCover/#tasks-page";
taskId = null;

$('#tasks-page a').removeClass("ui-btn-active");
$("#tasks-page .name").html(selectedPlace.name.length == 0 ? "Unnamed Place" : selectedPlace.name);
$("#tasks-page h1").html("Add Tasks to " + (selectedPlace.name.length == 0 ? "Unnamed Place" : selectedPlace.name));

//Initializing the form elements
$("#tasks-page .title").val("");
$("#tasks-page .priority").val(3);
$("#tasks-page .description").val("");
$("#tasks-page .submit-button").val("Submit Task");

document.location.href = "/geocamCover/#tasks-page";
}


function showNewReport() {
document.location.href = "/geocamCover/#reports-page";
reportId = null;

$('#reports-page a').removeClass("ui-btn-active");
$("#reports-page .name").html(selectedPlace.name.length == 0 ? "Unnamed Place" : selectedPlace.name);
}
$("#reports-page h1").html("Add Report to " + (selectedPlace.name.length == 0 ? "Unnamed Place" : selectedPlace.name));

//Initializing form elements
$("#reports-page .title").val("");
$("#reports-page .status").val("");
$("#reports-page .percent-completed").val(0);
$("#reports-page .notes").val("");
$("#reports-page .submit-button").val("Submit Report");

document.location.href = "/geocamCover/#reports-page";

function showEditPlace(){
document.location.href = "/geocamCover/#edit-place-page";
$('#edit-place-page a').removeClass("ui-btn-active");
$("#edit-place-page h1 .name").html(selectedPlace.name.length == 0 ? "Unnamed Place" : selectedPlace.name);
$("#edit-place-page form .name").val(selectedPlace.name);
}


function showEditReport(report_idx){
var report = selectedPlace.reports[report_idx];
document.location.href = "/geocamCover/#edit-report-page";
$('#edit-report-page a').removeClass("ui-btn-active");
$("#edit-report-page h1 .name").html(report.title);
$("#edit-report-page form .name").val(report.title);
function showEditTask(task_id) {
var task = selectedPlace.tasks[task_id];
taskId = task.id;

$('#tasks-page a').removeClass("ui-btn-active");
$("#tasks-page h1").html("Edit " + task.title);

//Setting form elements
$("#tasks-page .title").val(task.title);
$("#tasks-page .priority").val(task.priority);
$("#tasks-page .description").val(task.description);
$("#tasks-page .submit-button").val("Update Task");

document.location.href = "/geocamCover/#tasks-page";

}


function showEditTask(task_idx){
var task = selectedPlace.tasks[task_idx];
document.location.href = "/geocamCover/#edit-task-page";
$('#edit-task-page a').removeClass("ui-btn-active");
$("#edit-task-page h1 .name").html(task.title);
$("#edit-task-page form .name").val(task.title);
function showEditReport(report_id) {
var report = selectedPlace.reports[report_id];
reportId = report.id;

$('#reports-page a').removeClass("ui-btn-active");
$("#reports-page h1").html("Edit " + report.title);

//Setting form elements
$("#reports-page .title").val(report.title);
$("#reports-page .status").val(report.status);
$("#reports-page .percent-completed").val(report.percentCompleted);
$("#reports-page .notes").val(report.notes);
$("#reports-page .submit-button").val("Update Report");

document.location.href = "/geocamCover/#reports-page";
}


function showMap() {
document.location.href = "/geocamCover/#map-page";
pageResize();
}


Expand Down

0 comments on commit 670499a

Please sign in to comment.