Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

completeddate #18

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

completeddate #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions script/firebaseScriptLogWork.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* For Testing
/* For Testing
// Your web app's Firebase configuration
var firebaseConfig = {
apiKey: "AIzaSyA1unUPPxmMSwJGQ1khDiDLtxAXYElqm54",
Expand Down Expand Up @@ -84,14 +84,15 @@ firebase.auth.EmailAuthProvider.PROVIDER_ID
// tosUrl: '<your-tos-url>',
// // Privacy policy url.
// privacyPolicyUrl: '<your-privacy-policy-url>'
};
};

function createNewTask(title,des,priority,difficulty,creator,assignee,estimatedTime,status,category,creationDate) {

var taskIdNumber = getIdNumber();
var taskId = category[0]+taskIdNumber;
var loggedWorkTotalTime = 0;
var workDone = 0;
var completedDate = "Not Yet Completed";
05saitejaswi marked this conversation as resolved.
Show resolved Hide resolved

database.ref('Tasks/' + taskId).set({
Title: title,
Expand All @@ -105,7 +106,8 @@ function createNewTask(title,des,priority,difficulty,creator,assignee,estimatedT
Category: category,
LogWorkTotalTime: loggedWorkTotalTime,
CreationDate: creationDate,
WorkDone: workDone
WorkDone: workDone,
CompletedDate: completedDate,
});

newTaskCreatedSuccessfully();
Expand Down Expand Up @@ -162,13 +164,15 @@ function createInstance(id, data)
datalist[id] = new Data(data);
}

function updateFromLogWorkData(id, logWorkTotalTime, status, workDone, comment)
function updateFromLogWorkData(id, logWorkTotalTime, status, workDone, comment,completedDate)
{
var updates = {};
updates['/Tasks/' + id + '/LogWorkTotalTime'] = logWorkTotalTime;
updates['/Tasks/' + id + '/Status'] = status;
updates['/Tasks/' + id + '/WorkDone'] = workDone;
updates['/Tasks/' + id + '/Comment'] = comment;
updates["/Tasks/" + id + "/CompletedDate"] = completedDate;


return database.ref().update(updates);

Expand Down
16 changes: 10 additions & 6 deletions script/workLoggingSystem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ function setIntoTaskCard(id) {
var title = datalist[id].title;
var status = datalist[id].status;
var priority = datalist[id].priority;
var completedDate = datalist[id].completedDate;
var estimatedTime = datalist[id].estimatedTime;
var difficulty = datalist[id].difficulty;
var des = datalist[id].des;
Expand All @@ -40,7 +41,7 @@ function setIntoTaskCard(id) {

console.log(title, status, priority, estimatedTime, difficulty, des, creator, category, assignee, creationDate, id);

loadFrame(id, title, status, priority, estimatedTime, difficulty, des, creator, category, assignee, logWorkTotalTime, workDone, creationDate);
loadFrame(id, title, status, priority,completedDate, estimatedTime, difficulty, des, creator, category, assignee, logWorkTotalTime, workDone, creationDate);

return "ok";
}
Expand Down Expand Up @@ -115,7 +116,7 @@ function fillLogWork(id)
var time = today.getHours() + ":" + today.getMinutes();
var commentDateTime = date + "|" + time + "|" ;


document.getElementById("logWorkId").innerHTML = id;
document.getElementById("logWorkTitle").innerHTML = datalist[id].title;
document.getElementById("logWorkET").innerHTML = datalist[id].estimatedTime;
Expand All @@ -132,7 +133,7 @@ function openEditWork() {
$("#head").hide(0);
$("#editWork").fadeIn(100);

fillEditWork(selectedId);
fillEditWork(selectedId);
}

function fillEditWork(id) {
Expand Down Expand Up @@ -319,8 +320,11 @@ $("#logWorkSubmit").click(function() {
var comment = document.getElementById("logWorkComment").value;

logWorkTotalTime = parseInt(logWorkTotalTime) + parseInt(logWorkTime);

var result = updateFromLogWorkData(id, logWorkTotalTime, status, workDone, comment);
if (status == "Completed") {
var today = new Date();
var completedDate =today.getDate() +"/" +(today.getMonth() + 1) +"/" +today.getFullYear();
}
var result = updateFromLogWorkData(id, logWorkTotalTime, status, workDone, comment,completedDate);

console.log(result);

Expand All @@ -331,4 +335,4 @@ $("#allTaskButton").click(function() {
$('#loginBody').hide(0);
$("#createNewTask").hide(0);
$("#allTaskPage").fadeIn(100);
});
});
3 changes: 2 additions & 1 deletion script/workLoggingSystemData.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ class Data {
this.title = data.Title;
this.status = data.Status;
this.priority = data.Priority;
this.completedDate = data.CompletedDate;
this.estimatedTime = data.ET;
this.difficulty = data.Difficulty;
this.des = data.Description;
Expand All @@ -13,4 +14,4 @@ class Data {
this.workDone = data.WorkDone;
this.creationDate = data.CreationDate;
}
}
}
37 changes: 21 additions & 16 deletions script/workLoggingSystemFrames.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
function loadFrame(id, title, status, priority, estimatedTime, difficulty, des, creator, category, assignee, logWorkTotalTime, workDone,creationDate)
function loadFrame(id, title, status, priority,completedDate, estimatedTime, difficulty, des, creator, category, assignee, logWorkTotalTime, workDone,creationDate)
{

var tickets = document.getElementById("jobTickets").innerHTML;
var completedTickets = document.getElementById("taskTickets").innerHTML;

Expand All @@ -15,12 +15,12 @@ frame += "<div class=\"col-md-12\">";
frame += "<div class=\"row frameHead\">";
frame += "<div class=\"col-md-3 menuTicket\">Id:</div>";
frame += "<div class=\"col detail\">"+id+"</div>";
frame += "</div>";
frame += "</div>";
frame += "<div class=\"row\">";
frame += "<div class=\"col-md-3 menuTicket\">Title: </div>";
frame += "<div class=\"col detail\">"+title+"</div>";
frame += "</div>";
frame += "<div class=\"row\">";
frame += "<div class=\"row\">";
frame += "<div class=\"col-md-3 menuTicket\">Priority:</div>";
frame += "<div class=\"col detail\">"+priority+"</div>";
frame += "</div>";
Expand Down Expand Up @@ -50,7 +50,7 @@ frameDetails += "<button id=\"logWorkButton\" onclick=\"openLogWork()\">Log Work
frameDetails += "</div>";
frameDetails += "<div class=\"col-md-2 editButton\" id=\"editWorkButton\">";
frameDetails += "<button id=\"editWorkButton\" onclick=\"openEditWork()\">Edit</button>";
frameDetails += "</div>";
frameDetails += "</div>";
frameDetails += "<div class=\"col-md-3\">";
frameDetails += "<div class=\"row\">";
frameDetails += "<div class=\"col-md-3 menu\">Id:</div>";
Expand All @@ -62,28 +62,33 @@ frameDetails += "</div>";
frameDetails += "<div class=\"row part\">";
frameDetails += "<div class=\"col-md-2 menu\">Description: </div>";
frameDetails += "<div class=\"col\">";
frameDetails += "<div class=\"row desBox\">";
frameDetails += "<div class=\"col\">"+des+"</div>";
frameDetails += "</div>";
frameDetails += "<div class=\"row desBox\">";
frameDetails += "<div class=\"col\">"+des+"</div>";
frameDetails += "</div>";
frameDetails += "<div class=\"col-md-1\">";
frameDetails += "</div>";
frameDetails += "</div>";
frameDetails += "<div class=\"row part\">";
frameDetails += "<div class=\"col\">";
frameDetails += "<div class=\"col-md-1\">";
frameDetails += "</div>";
frameDetails += "</div>";
frameDetails += "<div class=\"row part\">";
frameDetails += "<div class=\"col\">";
frameDetails += "<div class=\"row\">";
frameDetails += "<div class=\"col menu\">Priority:</div>";
frameDetails += "<div class=\"col menu\">Priority:</div>";
frameDetails += "<div class=\"col menuData\">"+priority+"</div>";
frameDetails += "</div>";
frameDetails += "</div>";
frameDetails += "<div class=\"col\"></div>";
frameDetails += "<br>";
frameDetails += '<div class="row">';
frameDetails += '<div class="col menu">Date Of Completion:</div>';
frameDetails += '<div class="col menuData">' + completedDate + "</div>";
frameDetails += "</div>";
frameDetails += "</div>";
frameDetails += "<div class=\"col\"></div>";
frameDetails += "<div class=\"col\">";
frameDetails += "<div class=\"row\">";
frameDetails += "<div class=\"col menu\">Difficulty:</div>";
frameDetails += "<div class=\"col menuData\">"+difficulty+"</div>";
frameDetails += "</div>";
frameDetails += "</div>";
frameDetails += "<div class=\"col\"></div>";
frameDetails += "<div class=\"col\"></div>";
frameDetails += "<div class=\"col\">";
frameDetails += "<div class=\"row\">";
frameDetails += "<div class=\"col menu\">Assignee:</div>";
Expand Down