From f632e529cb10fe2460d6823dc17f4472875e5b29 Mon Sep 17 00:00:00 2001
From: 05saitejaswi <saitejaswi.chakravaram05@gmail.com>
Date: Sun, 26 Jul 2020 15:32:34 +0530
Subject: [PATCH] completeddate

---
 script/firebaseScriptLogWork.js   | 12 ++++++----
 script/workLoggingSystem.js       | 16 ++++++++-----
 script/workLoggingSystemData.js   |  3 ++-
 script/workLoggingSystemFrames.js | 37 ++++++++++++++++++-------------
 4 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/script/firebaseScriptLogWork.js b/script/firebaseScriptLogWork.js
index 9ccf97e..c0e74c8 100644
--- a/script/firebaseScriptLogWork.js
+++ b/script/firebaseScriptLogWork.js
@@ -1,4 +1,4 @@
-/* For Testing 
+/* For Testing
 // Your web app's Firebase configuration
 var firebaseConfig = {
     apiKey: "AIzaSyA1unUPPxmMSwJGQ1khDiDLtxAXYElqm54",
@@ -84,7 +84,7 @@ 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) {
 
@@ -92,6 +92,7 @@ function createNewTask(title,des,priority,difficulty,creator,assignee,estimatedT
   var taskId = category[0]+taskIdNumber;
   var loggedWorkTotalTime = 0;
   var workDone = 0;
+  var completedDate = "Not Yet Completed";
 
   database.ref('Tasks/' + taskId).set({
     Title: title,
@@ -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();
@@ -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);
 
diff --git a/script/workLoggingSystem.js b/script/workLoggingSystem.js
index 89b8fed..4337d26 100644
--- a/script/workLoggingSystem.js
+++ b/script/workLoggingSystem.js
@@ -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;
@@ -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";
 }
@@ -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;
@@ -132,7 +133,7 @@ function openEditWork() {
     $("#head").hide(0);
     $("#editWork").fadeIn(100);
 
-    fillEditWork(selectedId);    
+    fillEditWork(selectedId);
 }
 
 function fillEditWork(id) {
@@ -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);
 
@@ -331,4 +335,4 @@ $("#allTaskButton").click(function() {
     $('#loginBody').hide(0);
     $("#createNewTask").hide(0);
     $("#allTaskPage").fadeIn(100);
-});
\ No newline at end of file
+});
diff --git a/script/workLoggingSystemData.js b/script/workLoggingSystemData.js
index aae627c..f30b531 100644
--- a/script/workLoggingSystemData.js
+++ b/script/workLoggingSystemData.js
@@ -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;
@@ -13,4 +14,4 @@ class Data {
         this.workDone = data.WorkDone;
         this.creationDate = data.CreationDate;
     }
-}
\ No newline at end of file
+}
diff --git a/script/workLoggingSystemFrames.js b/script/workLoggingSystemFrames.js
index a468a88..78c646e 100644
--- a/script/workLoggingSystemFrames.js
+++ b/script/workLoggingSystemFrames.js
@@ -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;
 
@@ -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>";
@@ -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>";
@@ -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>";