From 408fa03f38b3e8c5d177229f1de67a42d455491a Mon Sep 17 00:00:00 2001
From: komal <komal9779@gmail.com>
Date: Fri, 11 Dec 2020 19:46:58 +0530
Subject: [PATCH 01/37] added back button

---
 .../create-new-session/create-new-session.component.html   | 4 ++--
 .../create-new-session/create-new-session.component.ts     | 4 ++++
 .../create-new-sprint/create-new-sprint.component.html     | 4 ++--
 .../body/create-new-sprint/create-new-sprint.component.ts  | 4 ++++
 .../body/task-details/edit-page/edit-page.component.html   | 6 +++---
 .../app/body/task-details/edit-page/edit-page.component.ts | 7 ++++++-
 .../app/body/task-details/log-work/log-work.component.html | 6 ++++++
 .../app/body/task-details/log-work/log-work.component.ts   | 5 +++++
 .../src/app/body/task-details/task-details.component.html  | 4 ++--
 .../src/app/body/task-details/task-details.component.ts    | 5 +++++
 worktrolly-ui/src/app/body/tasks/tasks.component.html      | 4 ++--
 worktrolly-ui/src/app/body/tasks/tasks.component.ts        | 7 ++++++-
 12 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.html b/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.html
index 049405717..f0842297d 100644
--- a/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.html
+++ b/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.html
@@ -2,8 +2,8 @@
     <div class="bg-light px-5">
         <div class="row pt-2">
             <div class="col-md-11 col-10"></div>
-            <span type="button" class="col-md-1 col-2 pt-5 material-icons">
-              close
+            <span type="button" class="col-md-1 col-2 pt-5 material-icons" (click)="backToDashboard()">
+              back
           </span>
         </div>
         <div class="row">
diff --git a/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.ts b/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.ts
index 37232a05f..1f426278c 100644
--- a/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.ts
+++ b/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.ts
@@ -52,4 +52,8 @@ export class CreateNewSessionComponent implements OnInit {
     }
   }
 
+  backToDashboard(){
+    this.router.navigate(['/']);
+  }
+
 }
diff --git a/worktrolly-ui/src/app/body/create-new-sprint/create-new-sprint.component.html b/worktrolly-ui/src/app/body/create-new-sprint/create-new-sprint.component.html
index c207e9443..c1f1225ca 100644
--- a/worktrolly-ui/src/app/body/create-new-sprint/create-new-sprint.component.html
+++ b/worktrolly-ui/src/app/body/create-new-sprint/create-new-sprint.component.html
@@ -2,8 +2,8 @@
     <div class="bg-light px-5 py-5" id="startNewSprint">
         <div class="row pt-2">
             <div class="col-md-11 col-10"></div>
-            <span type="button" class="col-md-1 col-2 pt-5 material-icons" id="backToMainFromNewSprint">
-                close
+            <span type="button" class="col-md-1 col-2 pt-5 material-icons" (click)="backToDashboard()">
+                back
             </span>
         </div>
         <div class="row">
diff --git a/worktrolly-ui/src/app/body/create-new-sprint/create-new-sprint.component.ts b/worktrolly-ui/src/app/body/create-new-sprint/create-new-sprint.component.ts
index 95c13934b..9e9a42eaf 100644
--- a/worktrolly-ui/src/app/body/create-new-sprint/create-new-sprint.component.ts
+++ b/worktrolly-ui/src/app/body/create-new-sprint/create-new-sprint.component.ts
@@ -102,4 +102,8 @@ export class CreateNewSprintComponent implements OnInit {
 
   }
 
+  backToDashboard(){
+    this.router.navigate(['/']);
+  }
+
 }
diff --git a/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.html b/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.html
index 52b65327e..a2c3a39d4 100644
--- a/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.html
+++ b/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.html
@@ -1,10 +1,10 @@
 <form (ngSubmit)="editPage()" #form="ngForm">
-    <div class="container py-5" id="editPageTask">
+    <div class="container py-5" style="display: block;" id="editPageTask">
         <div class="bg-light px-5">
             <div class="row pt-2">
                 <div class="col-md-11 col-10"></div>
-                <span type="button" class="col-md-1 col-2 pt-5 material-icons">
-                    close
+                <span type="button" class="col-md-1 col-2 pt-5 material-icons" (click)="backToTaskDetails()">
+                    back
                 </span>
             </div>
             <div class="row">
diff --git a/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.ts b/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.ts
index d9f8cbdf7..ed0cac909 100644
--- a/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.ts
+++ b/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.ts
@@ -2,6 +2,7 @@ import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angu
 import { AngularFireFunctions } from '@angular/fire/functions';
 import { NgForm } from '@angular/forms';
 import { Tasks } from 'src/app/Interface/TasksInterface';
+import { Router } from '@angular/router';
 
 @Component({
   selector: 'app-edit-page',
@@ -17,7 +18,7 @@ export class EditPageComponent implements OnInit {
   editTask: Tasks
   previousSprintId: number
 
-  constructor(private functions: AngularFireFunctions) { }
+  constructor(private functions: AngularFireFunctions, private router: Router) { }
 
   ngOnInit(): void {
     this.editTask = this.task;
@@ -51,4 +52,8 @@ export class EditPageComponent implements OnInit {
     this.editTaskCompleted.emit({ completed: true });
   }
 
+  backToTaskDetails(){
+    window.location.reload();
+  }
+
 }
diff --git a/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.html b/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.html
index 7999e981a..7412c0a64 100644
--- a/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.html
+++ b/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.html
@@ -2,6 +2,12 @@
     <form (ngSubmit)="submitLogWorkPage()" #form="ngForm">
         <div class="container px-0 py-5" id="logWorkPage">
             <div class="bg-dark py-2 px-5">
+                <div class="row pt-1">
+                    <div class="col-md-11 col-10"></div>
+                    <span type="button" class="col-md-1 col-2 pt-5 material-icons" style="color: white;" (click)="backToTaskDetails()">
+                        back
+                    </span>
+                </div>
                 <h3 class="pt-5 fontHeading text-white">Log Work</h3>
                 <!-- <div class="row pt-5 pb-2 ml-1">
                     <div class="alert alert-info form-inline col-md-5" role="alert">
diff --git a/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.ts b/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.ts
index 509fff877..7533900ff 100644
--- a/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.ts
+++ b/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.ts
@@ -43,4 +43,9 @@ async submitLogWorkPage() {
 workDone(){
   this.logWorkCompleted.emit({ completed: true });
 }
+
+backToTaskDetails(){
+  window.location.reload();
+}
+
 }
diff --git a/worktrolly-ui/src/app/body/task-details/task-details.component.html b/worktrolly-ui/src/app/body/task-details/task-details.component.html
index 4e7b27771..f55fbfca7 100644
--- a/worktrolly-ui/src/app/body/task-details/task-details.component.html
+++ b/worktrolly-ui/src/app/body/task-details/task-details.component.html
@@ -5,8 +5,8 @@
                 <div class="row mt-5">
                     <div class="col-md-9 col-7"></div>
                     <span type="button" class="material-icons mt-5 col-md-2 col-3" (click)="deleteTask()"> delete </span>
-                    <span type="button" class="col-md-1 col-2 mt-5 material-icons" id="backToMainFromCardDescription">
-                        close
+                    <span type="button" class="col-md-1 col-2 mt-5 material-icons" (click)="backToTasks(task.Category)">
+                        back
                     </span>
                 </div>
                 <div class="row">
diff --git a/worktrolly-ui/src/app/body/task-details/task-details.component.ts b/worktrolly-ui/src/app/body/task-details/task-details.component.ts
index 697ebe0a5..de07b01db 100644
--- a/worktrolly-ui/src/app/body/task-details/task-details.component.ts
+++ b/worktrolly-ui/src/app/body/task-details/task-details.component.ts
@@ -69,4 +69,9 @@ export class TaskDetailsComponent implements OnInit {
       console.log("Error", error);
     }
   }
+
+  backToTasks(category: string){
+    this.sprintName = "S" + this.task.SprintNumber;
+    this.router.navigate(['Tasks', category, this.sprintName])
+  }
 }
diff --git a/worktrolly-ui/src/app/body/tasks/tasks.component.html b/worktrolly-ui/src/app/body/tasks/tasks.component.html
index 50302521e..f5b0a264e 100644
--- a/worktrolly-ui/src/app/body/tasks/tasks.component.html
+++ b/worktrolly-ui/src/app/body/tasks/tasks.component.html
@@ -2,8 +2,8 @@
     <div class="container pt-2 pb-5 pl-2">
         <div class="row pt-5">
             <h3 class="col-md-8 col-8 fontHeading">Tasks</h3>
-            <span type="button" class="col-md-4 col-1  material-icons" id="backToDashboard">
-          close
+            <span type="button" class="col-md-4 col-1  material-icons" (click)="backToDashboard()" id="backToDashboard">
+          back
       </span>
         </div>
         <hr class="w-75 ml-0">
diff --git a/worktrolly-ui/src/app/body/tasks/tasks.component.ts b/worktrolly-ui/src/app/body/tasks/tasks.component.ts
index 4b211586a..3254b98ab 100644
--- a/worktrolly-ui/src/app/body/tasks/tasks.component.ts
+++ b/worktrolly-ui/src/app/body/tasks/tasks.component.ts
@@ -4,6 +4,7 @@ import { ActivatedRoute } from '@angular/router';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/internal/operators/map';
 import { Tasks, TasksId } from 'src/app/Interface/TasksInterface';
+import { Router } from '@angular/router';
 
 @Component({
   selector: 'app-tasks',
@@ -19,7 +20,7 @@ export class TasksComponent implements OnInit {
   tasksCollection: AngularFirestoreCollection<Tasks>
   tasksData: Observable<TasksId[]>
 
-  constructor(private route: ActivatedRoute, private db: AngularFirestore) { }
+  constructor(private route: ActivatedRoute,private router: Router, private db: AngularFirestore) { }
 
   ngOnInit(): void {
     this.category = this.route.snapshot.params['category'];
@@ -45,4 +46,8 @@ export class TasksComponent implements OnInit {
     );
   }
 
+  backToDashboard(){
+    this.router.navigate(['/']);
+  }
+
 }

From d0ea704ee123b45222b0567d7e177121f577bda2 Mon Sep 17 00:00:00 2001
From: komal <komal9779@gmail.com>
Date: Fri, 15 Jan 2021 00:30:06 +0530
Subject: [PATCH 02/37] feat(dev/validation): added validation to
 create-new-session-component

---
 functions/index.js                            |  99 +++++------
 .../create-new-session.component.html         |   2 +-
 .../create-new-session.component.ts           |  16 +-
 .../log-work/log-work.component.html          |  12 --
 .../log-work/log-work.component.ts            |  11 --
 .../src/app/services/validation.service.ts    | 165 ++++++++++++++++++
 worktrolly-ui/src/environments/environment.ts |  23 ++-
 7 files changed, 241 insertions(+), 87 deletions(-)
 create mode 100644 worktrolly-ui/src/app/services/validation.service.ts

diff --git a/functions/index.js b/functions/index.js
index 5201fd7d0..8dc53bdad 100644
--- a/functions/index.js
+++ b/functions/index.js
@@ -202,7 +202,8 @@ exports.startNewSprint = functions.https.onRequest((request, response) => {
         var totalBusiness = parseInt(request.body.data.TotalBusiness);
         var totalMarketing = parseInt(request.body.data.TotalMarketing);
         var totalOther = parseInt(request.body.data.TotalOther);
-        var newSprintId;
+        var newSprintId = parseInt(request.body.data.NewSprintId);
+        var newSprintIdString = "S" + newSprintId.toString();
         var createSprintPromise;
         var result;
 
@@ -210,60 +211,52 @@ exports.startNewSprint = functions.https.onRequest((request, response) => {
         console.log("Start Date from Backend: " + startDate);
         console.log("Status from Backend: " + status);
 
-        db.collection("RawData").doc("AppDetails").get()
-            .then(function(doc) {
-                newSprintId = parseInt(doc.data().CurrentSprintId) + 1;
-                var newSprintIdString = "S" + newSprintId.toString();
-
-                return db.collection("Main").doc(newSprintIdString).get().then((doc) => {
-                    if (doc.exists) {
-                        createSprintPromise = db.collection("Main").doc(newSprintIdString).update({
-                            TotalDevelopmentTask: totalDevelopment,
-                            TotalBusinessTask: totalBusiness,
-                            TotalMarketingTask: totalMarketing,
-                            TotalOtherTask: totalOther,
-                            EndDate: endDate,
-                            StartDate: startDate,
-                            Status: status
-                        });
-                    } else {
-                        var totalUnCompletedTask = 0;
-                        var totalCompletedTask = 0;
-                        var totalNumberOfTask = 0;
-
-                        createSprintPromise = db.collection("Main").doc(newSprintIdString).set({
-                            TotalDevelopmentTask: totalDevelopment,
-                            TotalBusinessTask: totalBusiness,
-                            TotalMarketingTask: totalMarketing,
-                            TotalOtherTask: totalOther,
-                            EndDate: endDate,
-                            StartDate: startDate,
-                            Status: status,
-                            TotalUnCompletedTask: totalUnCompletedTask,
-                            TotalCompletedTask: totalCompletedTask,
-                            TotalNumberOfTask: totalNumberOfTask
-                        });
-                    }
-                    return Promise.resolve(createSprintPromise);
+        const p1 = db.collection("Main").doc(newSprintIdString).get().then((doc) => {
+            if (doc.exists) {
+                createSprintPromise = db.collection("Main").doc(newSprintIdString).update({
+                    TotalDevelopmentTask: totalDevelopment,
+                    TotalBusinessTask: totalBusiness,
+                    TotalMarketingTask: totalMarketing,
+                    TotalOtherTask: totalOther,
+                    EndDate: endDate,
+                    StartDate: startDate,
+                    Status: status
                 });
-            })
-            .then(function(createSprintPromise) {
-                var setNewSprintCounterPromise = db.collection("RawData").doc("AppDetails").update({
-                    CurrentSprintId: newSprintId
+            } else {
+                var totalUnCompletedTask = 0;
+                var totalCompletedTask = 0;
+                var totalNumberOfTask = 0;
+
+                createSprintPromise = db.collection("Main").doc(newSprintIdString).set({
+                    TotalDevelopmentTask: totalDevelopment,
+                    TotalBusinessTask: totalBusiness,
+                    TotalMarketingTask: totalMarketing,
+                    TotalOtherTask: totalOther,
+                    EndDate: endDate,
+                    StartDate: startDate,
+                    Status: status,
+                    TotalUnCompletedTask: totalUnCompletedTask,
+                    TotalCompletedTask: totalCompletedTask,
+                    TotalNumberOfTask: totalNumberOfTask
                 });
-                return Promise.resolve(setNewSprintCounterPromise);
-            })
-            .then(function(setNewSprintCounterPromise) {
-                console.log("Sprint started successfully");
-                result = { data: "OK" }
-                console.log("Document successfully written!");
-                return response.status(200).send(result);
-            })
-            .catch(function(error) {
-                result = { data: error }
-                console.log("error", error);
-                return response.status(500).send(result);
-            });
+            }
+            return Promise.resolve(createSprintPromise);
+        });
+        const p2 = db.collection("RawData").doc("AppDetails").update({
+            CurrentSprintId: newSprintId
+        });
+        const Promises = [p1,p2];
+        return Promise.all(Promises).then(() => {
+            console.log("Sprint started successfully");
+            result = { data: "OK" }
+            console.log("Document successfully written!");
+            return response.status(200).send(result);
+        })
+        .catch((error) => {
+            result = { data: error }
+            console.log("error", error);
+            return response.status(500).send(result);
+        });
     });
 });
 
diff --git a/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.html b/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.html
index a42879f19..b056dc105 100644
--- a/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.html
+++ b/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.html
@@ -23,7 +23,7 @@ <h5 class="active nav-link" style="font-weight:bolder">Create New Task</h5>
                     <div>{{ todayDate }}</div>
                 </div>
             </div>
-            <form (ngSubmit)="createNewSession()" #form="ngForm">
+            <form (ngSubmit)="validate()" #form="ngForm">
                 <div class="form-group row pt-2">
                     <label for="input" class="col-sm-2 col-form-label">Title</label>
                     <div class="col-sm-10">
diff --git a/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.ts b/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.ts
index 93ea5b3e1..8bc2d646f 100644
--- a/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.ts
+++ b/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.ts
@@ -2,6 +2,7 @@ import { Component, OnInit, ViewChild } from '@angular/core';
 import { AngularFireFunctions } from '@angular/fire/functions';
 import { NgForm } from '@angular/forms';
 import { Router } from '@angular/router';
+import { ValidationService } from '../../services/validation.service';
 
 @Component({
   selector: 'app-create-new-session',
@@ -24,9 +25,10 @@ export class CreateNewSessionComponent implements OnInit {
   status: string
   sprintNumber: number
   storyPoint: number
-  enableLoader: boolean = false;
+  enableLoader: boolean = false
+  valid: boolean = true;
 
-  constructor(private functions: AngularFireFunctions, private router: Router) { }
+  constructor(private functions: AngularFireFunctions, public validationService: ValidationService, private router: Router) { }
 
   ngOnInit(): void {
     var today = new Date();
@@ -38,6 +40,16 @@ export class CreateNewSessionComponent implements OnInit {
     this.todayDate = dd + "/" + mm + "/" + yyyy;
   }
 
+  async validate(){
+    let labels = ['title', 'status', 'priority', 'estimatedTime', 'difficulty', 'description', 'creator', 'category', 'assignee', 'creationDate', 'sprintNumber', 'storyPoint'];
+    let values = [this.title, this.status, this.priority, this.estimatedTime, this.difficulty, this.description, this.creatorName, this.category, this.assigneeName, this.todayDate, this.sprintNumber, this.storyPoint];
+    labels.forEach(function(label, index){  
+    this.valid = this.valid && this.validationService.checkValidity(label, values[index]);
+    });
+    if(this.valid === true)
+      this.createNewSession();
+  }
+
   async createNewSession() {
     this.enableLoader = true;
     const callable = this.functions.httpsCallable('createNewTask');
diff --git a/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.html b/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.html
index 0cf8de282..89add2293 100644
--- a/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.html
+++ b/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.html
@@ -1,16 +1,5 @@
 <ng-container *ngIf="!enableLoader">
     <form (ngSubmit)="submitLogWorkPage()" #form="ngForm">
-<<<<<<< HEAD
-        <div class="container px-0 py-5" id="logWorkPage">
-            <div class="bg-dark py-2 px-5">
-                <div class="row pt-1">
-                    <div class="col-md-11 col-10"></div>
-                    <span type="button" class="col-md-1 col-2 pt-5 material-icons" style="color: white;" (click)="backToTaskDetails()">
-                        back
-                    </span>
-                </div>
-                <h3 class="pt-5 fontHeading text-white">Log Work</h3>
-=======
         <div class="container p-3">
             <div class="card text-dark mb-3" id="logWorkPage">
                 <nav class="navbar navbar-expand-lg navbar-dark" id="navbarMenu">
@@ -25,7 +14,6 @@ <h5 class="active nav-link" style="font-weight:bolder">Log Work</h5>
                         </li>
                     </ul>
                 </nav>
->>>>>>> f9da5381cd079ca58cf180fce7fafe28ffd21faf
                 <!-- <div class="row pt-5 pb-2 ml-1">
                     <div class="alert alert-info form-inline col-md-5" role="alert">
                         <div style="font-weight: bold;" class="pr-3">Id:</div>
diff --git a/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.ts b/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.ts
index 436d5ac74..f824bccf4 100644
--- a/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.ts
+++ b/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.ts
@@ -42,18 +42,7 @@ export class LogWorkComponent implements OnInit {
     }
   }
 
-<<<<<<< HEAD
-workDone(){
-  this.logWorkCompleted.emit({ completed: true });
-}
-
-backToTaskDetails(){
-  window.location.reload();
-}
-
-=======
   workDone() {
     this.logWorkCompleted.emit({ completed: true });
   }
->>>>>>> f9da5381cd079ca58cf180fce7fafe28ffd21faf
 }
diff --git a/worktrolly-ui/src/app/services/validation.service.ts b/worktrolly-ui/src/app/services/validation.service.ts
new file mode 100644
index 000000000..fb4c00402
--- /dev/null
+++ b/worktrolly-ui/src/app/services/validation.service.ts
@@ -0,0 +1,165 @@
+import { Injectable } from '@angular/core';
+import { User } from "../Interface/UserInterface";
+import { Tasks } from "../Interface/TasksInterface";
+import { Validators } from '@angular/forms';
+
+@Injectable({    
+    providedIn: 'root',
+})    
+
+export class ValidationService {    
+
+    constructor() { }    
+
+    async checkValidity(label:String, value:any){
+        switch(label)
+        {
+            case 'title': { 
+                return this.checkTitle(value);
+            } 
+            case 'status': { 
+                return this.checkStatus(value);
+            } 
+            case 'priority': { 
+                return(this.checkPriority(value)); 
+            } 
+            case 'estimatedTime': { 
+                return(this.checkEstimatedTime(value));
+            } 
+            case 'difficulty': { 
+                return(this.checkDifficulty(value));
+            } 
+            case 'description': { 
+                return(this.checkDescription(value));
+            } 
+            case 'creator': { 
+                return(this.checkCreator(value));
+            } 
+            case 'category': { 
+                return(this.checkCategory(value));
+            } 
+            case 'assignee': { 
+                return(this.checkAssignee(value));
+            } 
+            case 'creationDate': { 
+                return(this.checkCreationDate(value));
+            } 
+            case 'sprintNumber': { 
+                return(this.checkSprintNumber(value));
+            } 
+            case 'storyPoint': { 
+                return(this.checkStoryPoint(value));
+            } 
+        }
+    }
+
+
+    async checkTitle(value: String){
+        if (Validators.required ===null)
+            return(true);
+        else{
+            console.log("Title field is required");
+            return(false);
+        }
+    }
+
+    async checkStatus(value: String){
+        if (Validators.required ===null)
+            return(true);
+        else{
+            console.log("Status field is required");
+            return(false);
+        }
+    }
+
+    async checkPriority(value: String){
+        if (Validators.required ===null)
+            return(true);
+        else{
+            console.log("Priority field is required");
+            return(false);
+        }    
+    }
+
+    async checkEstimatedTime(value: number){
+        if (Validators.required ===null)
+            return(true);
+        else{
+            console.log("Estimated-Time field is required");
+            return(false);
+        }    
+    }
+
+    async checkDifficulty(value: String){
+        if (Validators.required ===null)
+            return(true);
+        else{
+            console.log("Title field required");
+            return(false);
+        }
+    }
+
+    async checkDescription(value: String){
+        if (Validators.required ===null)
+            return(true);
+        else{
+            console.log("Description field is required");
+            return(false);
+        }
+    }
+
+    async checkCreator(value: String){
+        if (Validators.required ===null)
+            return(true);
+        else{
+            console.log("Creator field is required");
+            return(false);
+        }
+    }
+
+    async checkCategory(value: String){
+        if (Validators.required ===null)
+            return(true);
+        else{
+            console.log("Categpry field is required");
+            return(false);
+        }    
+    }
+
+    async checkAssignee(value: String){
+        if (Validators.required ===null)
+            return(true);
+        else{
+            console.log("Assignee field is required");
+            return(false);
+        }   
+    }
+
+    async checkCreationDate(value: String){
+        if (Validators.required ===null)
+            return(true);
+        else{
+            console.log("Creation-Date field is required");
+            return(false);
+        }   
+    }
+
+    async checkSprintNumber(value: number){
+        if (Validators.required ===null)
+            return(true);
+        else{
+            console.log("Sprint-Number field is required");
+            return(false);
+        }   
+    }
+
+    async checkStoryPoint(value: number){
+        if (Validators.required ===null)
+            return(true);
+        else{
+            console.log("Storyu-Point field required");
+            return(false);
+        }  
+    }
+
+}    
\ No newline at end of file
diff --git a/worktrolly-ui/src/environments/environment.ts b/worktrolly-ui/src/environments/environment.ts
index fcf63f9bb..70f5d54ca 100644
--- a/worktrolly-ui/src/environments/environment.ts
+++ b/worktrolly-ui/src/environments/environment.ts
@@ -5,14 +5,21 @@
 export const environment = {
   production: false,
   firebase: {
-    apiKey: "AIzaSyAP-cLcP8gB3bsUHSK9oexPq0BDykBPzzE",
-    authDomain: "worktrolly.firebaseapp.com",
-    databaseURL: "https://worktrolly.firebaseio.com",
-    projectId: "worktrolly",
-    storageBucket: "worktrolly.appspot.com",
-    messagingSenderId: "358996208239",
-    appId: "1:358996208239:web:73a1939b7267070d2dfb9a",
-    measurementId: "G-FEQ8PFLLCV"
+    // apiKey: "AIzaSyAP-cLcP8gB3bsUHSK9oexPq0BDykBPzzE",
+    // authDomain: "worktrolly.firebaseapp.com",
+    // databaseURL: "https://worktrolly.firebaseio.com",
+    // projectId: "worktrolly",
+    // storageBucket: "worktrolly.appspot.com",
+    // messagingSenderId: "358996208239",
+    // appId: "1:358996208239:web:73a1939b7267070d2dfb9a",
+    // measurementId: "G-FEQ8PFLLCV"
+
+    apiKey: "AIzaSyB5eHr9LlPanKlSaA555oyvYWfaBKyHpdw",
+    authDomain: "test-39399.firebaseapp.com",
+    projectId: "test-39399",
+    storageBucket: "test-39399.appspot.com",
+    messagingSenderId: "819887394429",
+    appId: "1:819887394429:web:8208af6affda64a1e0ab14"
   }
 };
 

From c8113811b1ec9c728fd90e542c94af1dbc54b7bb Mon Sep 17 00:00:00 2001
From: komal <komal9779@gmail.com>
Date: Sat, 16 Jan 2021 23:48:57 +0530
Subject: [PATCH 03/37] feat(dev/validation): added validation feature

---
 .../create-new-session.component.ts           |  12 +-
 .../create-new-sprint.component.html          |   2 +-
 .../create-new-sprint.component.ts            |  21 ++-
 .../edit-page/edit-page.component.html        |  45 +------
 .../edit-page/edit-page.component.ts          |  18 ++-
 .../log-work/log-work.component.html          |   2 +-
 .../log-work/log-work.component.ts            |  17 ++-
 .../src/app/services/validation.service.ts    | 127 +++++++++++++++---
 worktrolly-ui/src/environments/environment.ts |  23 ++--
 9 files changed, 180 insertions(+), 87 deletions(-)

diff --git a/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.ts b/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.ts
index 8bc2d646f..9a86f14b4 100644
--- a/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.ts
+++ b/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.ts
@@ -43,11 +43,15 @@ export class CreateNewSessionComponent implements OnInit {
   async validate(){
     let labels = ['title', 'status', 'priority', 'estimatedTime', 'difficulty', 'description', 'creator', 'category', 'assignee', 'creationDate', 'sprintNumber', 'storyPoint'];
     let values = [this.title, this.status, this.priority, this.estimatedTime, this.difficulty, this.description, this.creatorName, this.category, this.assigneeName, this.todayDate, this.sprintNumber, this.storyPoint];
-    labels.forEach(function(label, index){  
-    this.valid = this.valid && this.validationService.checkValidity(label, values[index]);
-    });
-    if(this.valid === true)
+    var condition = await (this.validationService.checkValidity(labels,values)).then(res => {
+      return res;});
+    if(condition)
+    {
+      console.log("Inputs are valid");
       this.createNewSession();
+    }
+    else
+    console.log("Task not created! Validation error");
   }
 
   async createNewSession() {
diff --git a/worktrolly-ui/src/app/body/create-new-sprint/create-new-sprint.component.html b/worktrolly-ui/src/app/body/create-new-sprint/create-new-sprint.component.html
index 3b34886db..c7ea89292 100644
--- a/worktrolly-ui/src/app/body/create-new-sprint/create-new-sprint.component.html
+++ b/worktrolly-ui/src/app/body/create-new-sprint/create-new-sprint.component.html
@@ -17,7 +17,7 @@ <h5 class="active nav-link" style="font-weight:bolder">Create New Sprint</h5>
             </div>
         </div>
         <div class="px-5">
-            <form (ngSubmit)="createNewSprint()" #form="ngForm">
+            <form (ngSubmit)="validate()" #form="ngForm">
                 <div class="form-group row pt-2">
                     <div class="alert alert-info form-inline col-sm-4" role="alert">
                         <div style="font-weight: bold;" class="pr-3">Sprint:</div>
diff --git a/worktrolly-ui/src/app/body/create-new-sprint/create-new-sprint.component.ts b/worktrolly-ui/src/app/body/create-new-sprint/create-new-sprint.component.ts
index 6fd85e480..4565d0e12 100644
--- a/worktrolly-ui/src/app/body/create-new-sprint/create-new-sprint.component.ts
+++ b/worktrolly-ui/src/app/body/create-new-sprint/create-new-sprint.component.ts
@@ -5,6 +5,7 @@ import { AngularFirestore, AngularFirestoreDocument } from '@angular/fire/firest
 import { Observable } from 'rxjs';
 import { RawDataId, RawDataType } from 'src/app/Interface/RawDataInterface';
 import { Router } from '@angular/router';
+import { ValidationService } from '../../services/validation.service';
 
 @Component({
   selector: 'app-create-new-sprint',
@@ -33,7 +34,7 @@ export class CreateNewSprintComponent implements OnInit {
 
   currentSprintNumber: number;
 
-  constructor(private db: AngularFirestore, private functions: AngularFireFunctions, private router: Router) { }
+  constructor(private db: AngularFirestore, private functions: AngularFireFunctions, private router: Router, public validationService: ValidationService) { }
 
   ngOnInit(): void {
     this.getNewSprintId();
@@ -84,6 +85,20 @@ export class CreateNewSprintComponent implements OnInit {
     }
   }
 
+  async validate(){
+    let labels = ['startDate', 'endDate', 'status'];
+    let values = [this.startDate, this.endDate, this.status];
+    var condition = await (this.validationService.checkValidity(labels,values)).then(res => {
+      return res;});
+    if(condition)
+    {
+      console.log("Inputs are valid");
+      this.createNewSprint();
+    }
+    else
+    console.log("Sprint not created! Validation error");
+  }
+
   async createNewSprint() {
     console.log(this.startDate);
     console.log(this.endDate);
@@ -97,9 +112,9 @@ export class CreateNewSprintComponent implements OnInit {
     const callable = this.functions.httpsCallable('startNewSprint');
 
     try {
-      const result = await callable({ StartDate: this.startDate, EndDate: this.endDate, TotalDevelopment: this.totalDevelopment, TotalBusiness: this.totalBusiness, TotalMarketing: this.totalMarketing, TotalOther: this.totalOther, Status: this.status }).toPromise();
+      const result = await callable({ StartDate: this.startDate, EndDate: this.endDate, TotalDevelopment: this.totalDevelopment, TotalBusiness: this.totalBusiness, TotalMarketing: this.totalMarketing, TotalOther: this.totalOther, Status: this.status, NewSprintId: this.currentSprintNumber }).toPromise();
 
-      console.log("Successfully created the task");
+      console.log("Successfully created the sprint");
       console.log(result);
       this.router.navigate(['/']);
     } catch (error) {
diff --git a/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.html b/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.html
index 6f16d6a5c..3cbbc095e 100644
--- a/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.html
+++ b/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.html
@@ -1,46 +1,4 @@
-<<<<<<< HEAD
-<form (ngSubmit)="editPage()" #form="ngForm">
-    <div class="container py-5" style="display: block;" id="editPageTask">
-        <div class="bg-light px-5">
-            <div class="row pt-2">
-                <div class="col-md-11 col-10"></div>
-                <span type="button" class="col-md-1 col-2 pt-5 material-icons" (click)="backToTaskDetails()">
-                    back
-                </span>
-            </div>
-            <div class="row">
-                <div class="col-md-4">
-                    <h3 class="pl-1 fontHeading">Edit Page</h3>
-                    <hr class="w-75 ml-0">
-                </div>
-                <div class="alert alert-info form-inline col-md-5" role="alert">
-                    <div style="font-weight: bold;" class="pr-3">Id:</div>
-                    <div>{{editTask.Id}}</div>
-                </div>
-            </div>
-            <div class="form-group row pt-2">
-                <label for="input" class="col-sm-2 col-form-label">Title</label>
-                <div class="alert alert-info form-inline col-sm-10" role="alert">
-                    <div>{{editTask.Title}}</div>
-                </div>
-            </div>
-            <div class="form-group row">
-                <label for="description" class="col-sm-2 col-form-label">Description</label>
-                <div class="col-sm-10">
-                    <input type="text" class="form-control" [(ngModel)]="editTask.Description" [ngModelOptions]="{standalone: true}">
-                </div>
-            </div>
-            <div class="form-row">
-                <div class="form-group col-md-4">
-                    <label for="input">Assignee</label>
-                    <input type="text" class="form-control" [(ngModel)]="editTask.Assignee" [ngModelOptions]="{standalone: true}">
-                </div>
-                <div class="form-group col-md-4">
-                    <label for="text">Creator</label>
-                    <div class="alert alert-info form-inline">
-                        <div id="creatorEditPageTask">{{editTask.Creator}}</div>
-=======
-<form *ngIf="!enableLoader" (ngSubmit)="editPage()" #form="ngForm">
+<form *ngIf="!enableLoader" (ngSubmit)="validate()" #form="ngForm">
     <div class="container p-3">
         <div class="card text-dark mb-3" id="editPageTaskContainer">
             <nav class="navbar navbar-expand-lg navbar-dark" id="navbarMenu">
@@ -60,7 +18,6 @@ <h5 class="active nav-link" style="font-weight:bolder">Edit Page</h5>
                     <div class="alert alert-info form-inline col-md-5" id="non-editable" role="alert">
                         <div style="font-weight: bold;" class="pr-3">Id:</div>
                         <div>{{editTask.Id}}</div>
->>>>>>> f9da5381cd079ca58cf180fce7fafe28ffd21faf
                     </div>
                 </div>
                 <div class="form-group row pt-2">
diff --git a/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.ts b/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.ts
index 54df6bd20..f9bed1116 100644
--- a/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.ts
+++ b/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.ts
@@ -3,6 +3,8 @@ import { AngularFireFunctions } from '@angular/fire/functions';
 import { NgForm } from '@angular/forms';
 import { Tasks } from 'src/app/Interface/TasksInterface';
 import { Router } from '@angular/router';
+import { ValidationService } from '../../../services/validation.service';
+
 
 @Component({
   selector: 'app-edit-page',
@@ -19,13 +21,27 @@ export class EditPageComponent implements OnInit {
   previousSprintId: number
   enableLoader: boolean = false
 
-  constructor(private functions: AngularFireFunctions, private router: Router) { }
+  constructor(private functions: AngularFireFunctions, private router: Router, public validationService: ValidationService) { }
 
   ngOnInit(): void {
     this.editTask = this.task;
     this.previousSprintId = this.task.SprintNumber;
   }
 
+  async validate(){
+    let labels = ['priority', 'estimatedTime', 'difficulty', 'description', 'assignee', 'sprintNumber', 'storyPoint'];
+    let values = [this.editTask.Priority, this.editTask.EstimatedTime, this.editTask.Difficulty, this.editTask.Description, this.editTask.Assignee, this.editTask.SprintNumber, this.editTask.StoryPointNumber];
+    var condition = await (this.validationService.checkValidity(labels,values)).then(res => {
+      return res;});
+    if(condition)
+    {
+      console.log("Inputs are valid");
+      this.editPage();
+    }
+    else
+    console.log("Page not edited due to validation error");
+  }
+
   async editPage() {
     this.enableLoader = true
     const callable = this.functions.httpsCallable('editPageTask');
diff --git a/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.html b/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.html
index 89add2293..d7e57fc85 100644
--- a/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.html
+++ b/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.html
@@ -1,5 +1,5 @@
 <ng-container *ngIf="!enableLoader">
-    <form (ngSubmit)="submitLogWorkPage()" #form="ngForm">
+    <form (ngSubmit)="validate()" #form="ngForm">
         <div class="container p-3">
             <div class="card text-dark mb-3" id="logWorkPage">
                 <nav class="navbar navbar-expand-lg navbar-dark" id="navbarMenu">
diff --git a/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.ts b/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.ts
index f824bccf4..a9b40ccd6 100644
--- a/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.ts
+++ b/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.ts
@@ -2,6 +2,7 @@ import { Component, OnInit, Input, ViewChild, Output, EventEmitter } from '@angu
 import { NgForm } from '@angular/forms';
 import { Tasks } from 'src/app/Interface/TasksInterface';
 import { AngularFireFunctions } from '@angular/fire/functions';
+import { ValidationService } from '../../../services/validation.service';
 
 @Component({
   selector: 'app-log-work',
@@ -22,10 +23,24 @@ export class LogWorkComponent implements OnInit {
   logWorkComment: number
   enableLoader: boolean = false
 
-  constructor(private functions: AngularFireFunctions) { }
+  constructor(private functions: AngularFireFunctions, public validationService: ValidationService) { }
 
   ngOnInit(): void { }
 
+  async validate(){
+    let labels = ['status', 'logHours', 'workCompleted', 'comment'];
+    let values = [this.logWorkStatus, this.logHours, this.logWorkDone, this.logWorkComment];
+    var condition = await (this.validationService.checkValidity(labels,values)).then(res => {
+      return res;});
+    if(condition)
+    {
+      console.log("Inputs are valid");
+      this.submitLogWorkPage();
+    }
+    else
+    console.log("Log-Work failed due to validation error");
+  }
+
   async submitLogWorkPage() {
     this.enableLoader = true;
     const callable = this.functions.httpsCallable('logWork');
diff --git a/worktrolly-ui/src/app/services/validation.service.ts b/worktrolly-ui/src/app/services/validation.service.ts
index fb4c00402..68ce5ac18 100644
--- a/worktrolly-ui/src/app/services/validation.service.ts
+++ b/worktrolly-ui/src/app/services/validation.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { User } from "../Interface/UserInterface";
 import { Tasks } from "../Interface/TasksInterface";
-import { Validators } from '@angular/forms';
+import { FormControl, Validators } from '@angular/forms';
 
 @Injectable({    
     providedIn: 'root',
@@ -11,7 +11,7 @@ export class ValidationService {
 
     constructor() { }    
 
-    async checkValidity(label:String, value:any){
+    validation(label:any, value:any){
         switch(label)
         {
             case 'title': { 
@@ -50,12 +50,44 @@ export class ValidationService {
             case 'storyPoint': { 
                 return(this.checkStoryPoint(value));
             } 
+            case 'startDate': { 
+                return(this.checkStartDate(value));
+            } 
+            case 'endDate': { 
+                return(this.checkEndDate(value));
+            }
+            case 'logHours': { 
+                return(this.checkLogHours(value));
+            } 
+            case 'workCompleted': { 
+                return(this.checkWorkCompleted(value));
+            } 
+            case 'comment': { 
+                return(this.checkComment(value));
+            } 
         }
     }
 
+    async checkValidity(labels: any[], values: any[]){
+        var valid = 0;
+        for(let i=0; i<labels.length; i++)
+        {
+            var condition = await this.validation(labels[i], values[i]).then(res => {
+                return res;});
+            if(condition)
+            {
+                valid+=1;
+            }
+        }
+        if (valid == labels.length)
+            return (true);
+        else
+            return(false);
+    }
 
     async checkTitle(value: String){
-        if (Validators.required ===null)
+        const control = new FormControl(value, Validators.required);
+        if (control.errors === null)
             return(true);
         else{
             console.log("Title field is required");
@@ -64,7 +96,8 @@ export class ValidationService {
     }
 
     async checkStatus(value: String){
-        if (Validators.required ===null)
+        const control = new FormControl(value, Validators.required);
+        if (control.errors === null)
             return(true);
         else{
             console.log("Status field is required");
@@ -73,7 +106,8 @@ export class ValidationService {
     }
 
     async checkPriority(value: String){
-        if (Validators.required ===null)
+        const control = new FormControl(value, Validators.required);
+        if (control.errors === null)
             return(true);
         else{
             console.log("Priority field is required");
@@ -82,7 +116,8 @@ export class ValidationService {
     }
 
     async checkEstimatedTime(value: number){
-        if (Validators.required ===null)
+        const control = new FormControl(value, Validators.required);
+        if (control.errors === null)
             return(true);
         else{
             console.log("Estimated-Time field is required");
@@ -91,16 +126,18 @@ export class ValidationService {
     }
 
     async checkDifficulty(value: String){
-        if (Validators.required ===null)
+        const control = new FormControl(value, Validators.required);
+        if (control.errors === null)
             return(true);
         else{
-            console.log("Title field required");
+            console.log("Difficulty field is required");
             return(false);
         }
     }
 
     async checkDescription(value: String){
-        if (Validators.required ===null)
+        const control = new FormControl(value, Validators.required);
+        if (control.errors === null)
             return(true);
         else{
             console.log("Description field is required");
@@ -109,7 +146,8 @@ export class ValidationService {
     }
 
     async checkCreator(value: String){
-        if (Validators.required ===null)
+        const control = new FormControl(value, Validators.required);
+        if (control.errors === null)
             return(true);
         else{
             console.log("Creator field is required");
@@ -118,16 +156,18 @@ export class ValidationService {
     }
 
     async checkCategory(value: String){
-        if (Validators.required ===null)
+        const control = new FormControl(value, Validators.required);
+        if (control.errors === null)
             return(true);
         else{
-            console.log("Categpry field is required");
+            console.log("Category field is required");
             return(false);
         }    
     }
 
     async checkAssignee(value: String){
-        if (Validators.required ===null)
+        const control = new FormControl(value, Validators.required);
+        if (control.errors === null)
             return(true);
         else{
             console.log("Assignee field is required");
@@ -136,7 +176,8 @@ export class ValidationService {
     }
 
     async checkCreationDate(value: String){
-        if (Validators.required ===null)
+        const control = new FormControl(value, Validators.required);
+        if (control.errors === null)
             return(true);
         else{
             console.log("Creation-Date field is required");
@@ -145,7 +186,8 @@ export class ValidationService {
     }
 
     async checkSprintNumber(value: number){
-        if (Validators.required ===null)
+        const control = new FormControl(value, Validators.required);
+        if (control.errors === null)
             return(true);
         else{
             console.log("Sprint-Number field is required");
@@ -154,10 +196,61 @@ export class ValidationService {
     }
 
     async checkStoryPoint(value: number){
-        if (Validators.required ===null)
+        const control = new FormControl(value, Validators.required);
+        if (control.errors === null)
+            return(true);
+        else{
+            console.log("Story-Point field is required");
+            return(false);
+        }  
+    }
+
+    async checkStartDate(value: String){
+        const control = new FormControl(value, Validators.required);
+        if (control.errors === null)
+            return(true);
+        else{
+            console.log("Start-Date field is required");
+            return(false);
+        }  
+    }
+
+    async checkEndDate(value: String){
+        const control = new FormControl(value, Validators.required);
+        if (control.errors === null)
+            return(true);
+        else{
+            console.log("End-Date field is required");
+            return(false);
+        }  
+    }
+
+    async checkLogHours(value: number){
+        const control = new FormControl(value, Validators.required);
+        if (control.errors === null)
+            return(true);
+        else{
+            console.log("Log-Hours field is required");
+            return(false);
+        }  
+    }
+
+    async checkWorkCompleted(value: number){
+        const control = new FormControl(value, Validators.required);
+        if (control.errors === null)
+            return(true);
+        else{
+            console.log("Work-Completed field is required");
+            return(false);
+        }  
+    }
+
+    async checkComment(value: String){
+        const control = new FormControl(value, Validators.required);
+        if (control.errors === null)
             return(true);
         else{
-            console.log("Storyu-Point field required");
+            console.log("Comment field is required");
             return(false);
         }  
     }
diff --git a/worktrolly-ui/src/environments/environment.ts b/worktrolly-ui/src/environments/environment.ts
index 70f5d54ca..fcf63f9bb 100644
--- a/worktrolly-ui/src/environments/environment.ts
+++ b/worktrolly-ui/src/environments/environment.ts
@@ -5,21 +5,14 @@
 export const environment = {
   production: false,
   firebase: {
-    // apiKey: "AIzaSyAP-cLcP8gB3bsUHSK9oexPq0BDykBPzzE",
-    // authDomain: "worktrolly.firebaseapp.com",
-    // databaseURL: "https://worktrolly.firebaseio.com",
-    // projectId: "worktrolly",
-    // storageBucket: "worktrolly.appspot.com",
-    // messagingSenderId: "358996208239",
-    // appId: "1:358996208239:web:73a1939b7267070d2dfb9a",
-    // measurementId: "G-FEQ8PFLLCV"
-
-    apiKey: "AIzaSyB5eHr9LlPanKlSaA555oyvYWfaBKyHpdw",
-    authDomain: "test-39399.firebaseapp.com",
-    projectId: "test-39399",
-    storageBucket: "test-39399.appspot.com",
-    messagingSenderId: "819887394429",
-    appId: "1:819887394429:web:8208af6affda64a1e0ab14"
+    apiKey: "AIzaSyAP-cLcP8gB3bsUHSK9oexPq0BDykBPzzE",
+    authDomain: "worktrolly.firebaseapp.com",
+    databaseURL: "https://worktrolly.firebaseio.com",
+    projectId: "worktrolly",
+    storageBucket: "worktrolly.appspot.com",
+    messagingSenderId: "358996208239",
+    appId: "1:358996208239:web:73a1939b7267070d2dfb9a",
+    measurementId: "G-FEQ8PFLLCV"
   }
 };
 

From af4632bb0ea24668453aaca96aa25b6976891b10 Mon Sep 17 00:00:00 2001
From: AvinashMahanthi <avinashfab5678@gmail.com>
Date: Tue, 19 Jan 2021 19:32:31 +0530
Subject: [PATCH 04/37] moved btns to navbar

---
 .../task-details/task-details.component.html  | 33 +++++++++++--------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/worktrolly-ui/src/app/body/task-details/task-details.component.html b/worktrolly-ui/src/app/body/task-details/task-details.component.html
index 46b99f467..bcef4a568 100644
--- a/worktrolly-ui/src/app/body/task-details/task-details.component.html
+++ b/worktrolly-ui/src/app/body/task-details/task-details.component.html
@@ -8,14 +8,25 @@
                             <h5 class="active nav-link" style="font-weight:bolder">Task Details</h5>
                         </li>
                     </ul>
-                    <ul class="nav navbar-nav navbar-right">
-                        <li class="nav-item" *ngIf="authService.afauth.user | async">
-                            <span type="button" class="material-icons text-light mr-3" (click)="deleteTask()"> delete </span>
-                        </li>
-                        <li class="nav-item">
-                            <span type="button" class="material-icons text-light" (click)="backToTasks()">close</span>
-                        </li>
-                    </ul>
+                    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarTexts" aria-controls="navbarText" aria-expanded="false" aria-label="Toggle navigation">
+                        <span class="navbar-toggler-icon text-white"></span>
+                    </button>
+                    <div class="collapse navbar-collapse" id="navbarTexts">
+                        <ul class="nav navbar-nav ml-auto justify-content-end">
+                            <li class="nav-item active pr-5 py-1 justify-content-between">
+                                <button type="submit" class="btn" id="button" *ngIf="(authService.afauth.user | async) && task.Status!=='Completed'" (click)="logWorkPage()">Log Work</button>
+                            </li>
+                            <li class="nav-item active pr-5 py-1 justify-content-between">
+                                <button type="submit" class="btn" id="button" *ngIf="(authService.afauth.user | async) && task.Status!=='Completed'" (click)="editTask()">Edit</button>
+                            </li>
+                            <li class="nav-item active py-1 justify-content-between" *ngIf="authService.afauth.user | async">
+                                <span type="button" class="material-icons text-light mr-3" (click)="deleteTask()"> delete </span>
+                            </li>
+                            <li class="nav-item active py-1 justify-content-between">
+                                <span type="button" class="material-icons text-light" (click)="backToTasks()">close</span>
+                            </li>
+                        </ul>
+                    </div>
                 </nav>
                 <div class="card-body">
                     <div class="row">
@@ -24,12 +35,6 @@ <h5 class="active nav-link" style="font-weight:bolder">Task Details</h5>
                             <div id="creationDateTaskDescription">{{task.CreationDate}}</div>
                         </div>
                         <div class="col-md-5 col-1"></div>
-                        <div class="col-md-2 col-4">
-                            <button type="submit" class="btn mt-2 mb-5 mx-3" id="button" *ngIf="(authService.afauth.user | async) && task.Status!=='Completed'" (click)="logWorkPage()">Log Work</button>
-                        </div>
-                        <div class="col-md-1 col-2">
-                            <button type="submit" class="btn mt-2 mb-5" id="button" *ngIf="(authService.afauth.user | async) && task.Status!=='Completed'" (click)="editTask()">Edit</button>
-                        </div>
                     </div>
                     <div class="form-group row mt-2">
                         <label for="input" class="col-sm-2 col-form-label">ID</label>

From 44e5c62132137c485afeda7f9d289155c00d941b Mon Sep 17 00:00:00 2001
From: AvinashMahanthi <avinashfab5678@gmail.com>
Date: Tue, 19 Jan 2021 19:53:56 +0530
Subject: [PATCH 05/37] added icon

---
 .../src/app/body/task-details/task-details.component.html   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/worktrolly-ui/src/app/body/task-details/task-details.component.html b/worktrolly-ui/src/app/body/task-details/task-details.component.html
index bcef4a568..087902ee1 100644
--- a/worktrolly-ui/src/app/body/task-details/task-details.component.html
+++ b/worktrolly-ui/src/app/body/task-details/task-details.component.html
@@ -16,10 +16,10 @@ <h5 class="active nav-link" style="font-weight:bolder">Task Details</h5>
                             <li class="nav-item active pr-5 py-1 justify-content-between">
                                 <button type="submit" class="btn" id="button" *ngIf="(authService.afauth.user | async) && task.Status!=='Completed'" (click)="logWorkPage()">Log Work</button>
                             </li>
-                            <li class="nav-item active pr-5 py-1 justify-content-between">
-                                <button type="submit" class="btn" id="button" *ngIf="(authService.afauth.user | async) && task.Status!=='Completed'" (click)="editTask()">Edit</button>
+                            <li class="nav-item active pr-4 py-1 justify-content-between">
+                                <span type="button" class="material-icons text-light" *ngIf="(authService.afauth.user | async) && task.Status!=='Completed'" (click)="editTask()">edit</span>
                             </li>
-                            <li class="nav-item active py-1 justify-content-between" *ngIf="authService.afauth.user | async">
+                            <li class="nav-item active pr-2 py-1 justify-content-between" *ngIf="authService.afauth.user | async">
                                 <span type="button" class="material-icons text-light mr-3" (click)="deleteTask()"> delete </span>
                             </li>
                             <li class="nav-item active py-1 justify-content-between">

From 403fdc4802215be6a3765e7fba69c8bcd4138d71 Mon Sep 17 00:00:00 2001
From: komal <komal9779@gmail.com>
Date: Wed, 20 Jan 2021 00:22:56 +0530
Subject: [PATCH 06/37] feat(dev/validation):updated requested changes-used
 json

---
 .../create-new-session.component.html          |  2 +-
 .../create-new-session.component.ts            | 18 ++++++++++++++----
 .../create-new-sprint.component.html           |  2 +-
 .../create-new-sprint.component.ts             |  9 +++++----
 .../edit-page/edit-page.component.html         |  2 +-
 .../edit-page/edit-page.component.ts           | 13 +++++++++----
 .../log-work/log-work.component.html           |  2 +-
 .../log-work/log-work.component.ts             |  8 ++++++--
 .../src/app/services/validation.service.ts     | 10 +++++-----
 9 files changed, 43 insertions(+), 23 deletions(-)

diff --git a/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.html b/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.html
index b056dc105..004893a0d 100644
--- a/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.html
+++ b/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.html
@@ -23,7 +23,7 @@ <h5 class="active nav-link" style="font-weight:bolder">Create New Task</h5>
                     <div>{{ todayDate }}</div>
                 </div>
             </div>
-            <form (ngSubmit)="validate()" #form="ngForm">
+            <form (ngSubmit)="submit()" #form="ngForm">
                 <div class="form-group row pt-2">
                     <label for="input" class="col-sm-2 col-form-label">Title</label>
                     <div class="col-sm-10">
diff --git a/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.ts b/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.ts
index e9885c859..6d9d6156c 100644
--- a/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.ts
+++ b/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.ts
@@ -40,10 +40,20 @@ export class CreateNewSessionComponent implements OnInit {
     this.todayDate = dd + "/" + mm + "/" + yyyy;
   }
 
-  async validate(){
-    let labels = ['title', 'status', 'priority', 'estimatedTime', 'difficulty', 'description', 'creator', 'category', 'assignee', 'creationDate', 'sprintNumber', 'storyPoint'];
-    let values = [this.title, this.status, this.priority, this.estimatedTime, this.difficulty, this.description, this.creatorName, this.category, this.assigneeName, this.todayDate, this.sprintNumber, this.storyPoint];
-    var condition = await (this.validationService.checkValidity(labels,values)).then(res => {
+  async submit(){
+    let data = [{label:"title",value:this.title},
+      {label:"status",value:this.status},
+      {label:"priority",value:this.priority},
+      {label:"estimatedTime",value:this.estimatedTime},
+      {label:"difficulty",value:this.difficulty},
+      {label:"description",value:this.description},
+      {label:"creator",value:this.creatorName},
+      {label:"category",value:this.category},
+      {label:"assignee",value:this.assigneeName},
+      {label:"creationDate",value:this.todayDate},
+      {label:"sprintNumber",value:this.sprintNumber},
+      {label:"storyPoint",value:this.storyPoint}];
+    var condition = await (this.validationService.checkValidity(data)).then(res => {
       return res;});
     if(condition)
     {
diff --git a/worktrolly-ui/src/app/body/create-new-sprint/create-new-sprint.component.html b/worktrolly-ui/src/app/body/create-new-sprint/create-new-sprint.component.html
index c7ea89292..9c825dfbc 100644
--- a/worktrolly-ui/src/app/body/create-new-sprint/create-new-sprint.component.html
+++ b/worktrolly-ui/src/app/body/create-new-sprint/create-new-sprint.component.html
@@ -17,7 +17,7 @@ <h5 class="active nav-link" style="font-weight:bolder">Create New Sprint</h5>
             </div>
         </div>
         <div class="px-5">
-            <form (ngSubmit)="validate()" #form="ngForm">
+            <form (ngSubmit)="submit()" #form="ngForm">
                 <div class="form-group row pt-2">
                     <div class="alert alert-info form-inline col-sm-4" role="alert">
                         <div style="font-weight: bold;" class="pr-3">Sprint:</div>
diff --git a/worktrolly-ui/src/app/body/create-new-sprint/create-new-sprint.component.ts b/worktrolly-ui/src/app/body/create-new-sprint/create-new-sprint.component.ts
index a21a508c8..701259d1a 100644
--- a/worktrolly-ui/src/app/body/create-new-sprint/create-new-sprint.component.ts
+++ b/worktrolly-ui/src/app/body/create-new-sprint/create-new-sprint.component.ts
@@ -86,10 +86,11 @@ export class CreateNewSprintComponent implements OnInit {
     }
   }
 
-  async validate(){
-    let labels = ['startDate', 'endDate', 'status'];
-    let values = [this.startDate, this.endDate, this.status];
-    var condition = await (this.validationService.checkValidity(labels,values)).then(res => {
+  async submit(){
+    let data = [{label:"startDate",value:this.startDate},
+      {label:"endDate",value:this.endDate},
+      {label:"status",value:this.status}];
+    var condition = await (this.validationService.checkValidity(data)).then(res => {
       return res;});
     if(condition)
     {
diff --git a/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.html b/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.html
index 1adc614f2..a9051844b 100644
--- a/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.html
+++ b/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.html
@@ -1,4 +1,4 @@
-<form *ngIf="!enableLoader" (ngSubmit)="validate()" #form="ngForm">
+<form *ngIf="!enableLoader" (ngSubmit)="submit()" #form="ngForm">
     <div class="container p-3">
         <div class="card text-dark mb-3" id="editPageTaskContainer">
             <nav class="navbar navbar-expand-lg navbar-dark" id="navbarMenu">
diff --git a/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.ts b/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.ts
index f9bed1116..c81721079 100644
--- a/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.ts
+++ b/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.ts
@@ -28,10 +28,15 @@ export class EditPageComponent implements OnInit {
     this.previousSprintId = this.task.SprintNumber;
   }
 
-  async validate(){
-    let labels = ['priority', 'estimatedTime', 'difficulty', 'description', 'assignee', 'sprintNumber', 'storyPoint'];
-    let values = [this.editTask.Priority, this.editTask.EstimatedTime, this.editTask.Difficulty, this.editTask.Description, this.editTask.Assignee, this.editTask.SprintNumber, this.editTask.StoryPointNumber];
-    var condition = await (this.validationService.checkValidity(labels,values)).then(res => {
+  async submit(){
+    let data = [{label:"priority",value:this.editTask.Priority},
+    {label:"estimatedTime",value:this.editTask.EstimatedTime},
+    {label:"difficulty",value:this.editTask.Difficulty},
+    {label:"description",value:this.editTask.Description},
+    {label:"assignee",value:this.editTask.Assignee},
+    {label:"sprintNumber",value:this.editTask.SprintNumber},
+    {label:"storyPoint",value:this.editTask.StoryPointNumber}];
+    var condition = await (this.validationService.checkValidity(data)).then(res => {
       return res;});
     if(condition)
     {
diff --git a/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.html b/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.html
index d7e57fc85..0d8d3790a 100644
--- a/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.html
+++ b/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.html
@@ -1,5 +1,5 @@
 <ng-container *ngIf="!enableLoader">
-    <form (ngSubmit)="validate()" #form="ngForm">
+    <form (ngSubmit)="submit()" #form="ngForm">
         <div class="container p-3">
             <div class="card text-dark mb-3" id="logWorkPage">
                 <nav class="navbar navbar-expand-lg navbar-dark" id="navbarMenu">
diff --git a/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.ts b/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.ts
index a9b40ccd6..8101eafd7 100644
--- a/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.ts
+++ b/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.ts
@@ -27,10 +27,14 @@ export class LogWorkComponent implements OnInit {
 
   ngOnInit(): void { }
 
-  async validate(){
+  async submit(){
     let labels = ['status', 'logHours', 'workCompleted', 'comment'];
     let values = [this.logWorkStatus, this.logHours, this.logWorkDone, this.logWorkComment];
-    var condition = await (this.validationService.checkValidity(labels,values)).then(res => {
+    let data = [{label:"status",value:this.logWorkStatus},
+    {label:"logHours",value:this.logHours},
+    {label:"workCompleted",value:this.logWorkDone},
+    {label:"comment",value:this.logWorkComment}];
+    var condition = await (this.validationService.checkValidity(data)).then(res => {
       return res;});
     if(condition)
     {
diff --git a/worktrolly-ui/src/app/services/validation.service.ts b/worktrolly-ui/src/app/services/validation.service.ts
index 68ce5ac18..557e587ef 100644
--- a/worktrolly-ui/src/app/services/validation.service.ts
+++ b/worktrolly-ui/src/app/services/validation.service.ts
@@ -68,18 +68,18 @@ export class ValidationService {
         }
     }
 
-    async checkValidity(labels: any[], values: any[]){
+    async checkValidity(data: any[]){
         var valid = 0;
-        for(let i=0; i<labels.length; i++)
-        {
-            var condition = await this.validation(labels[i], values[i]).then(res => {
+        
+        for (const element of data) {
+            var condition = await this.validation(element.label, element.value).then(res => {
                 return res;});
             if(condition)
             {
                 valid+=1;
             }
         }
-        if (valid == labels.length)
+        if (valid == data.length)
             return (true);
         else
             return(false);

From 897304a4bd274dbce3fa721d04ee4e384c07309d Mon Sep 17 00:00:00 2001
From: AvinashMahanthi <avinashfab5678@gmail.com>
Date: Wed, 20 Jan 2021 02:05:35 +0530
Subject: [PATCH 07/37] feat(taskDetails):updated minor UI changes

---
 .../src/app/body/task-details/task-details.component.html       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/worktrolly-ui/src/app/body/task-details/task-details.component.html b/worktrolly-ui/src/app/body/task-details/task-details.component.html
index 087902ee1..e2ad75e2e 100644
--- a/worktrolly-ui/src/app/body/task-details/task-details.component.html
+++ b/worktrolly-ui/src/app/body/task-details/task-details.component.html
@@ -12,7 +12,7 @@ <h5 class="active nav-link" style="font-weight:bolder">Task Details</h5>
                         <span class="navbar-toggler-icon text-white"></span>
                     </button>
                     <div class="collapse navbar-collapse" id="navbarTexts">
-                        <ul class="nav navbar-nav ml-auto justify-content-end">
+                        <ul class="nav navbar-nav ml-auto justify-content-end align-items-center">
                             <li class="nav-item active pr-5 py-1 justify-content-between">
                                 <button type="submit" class="btn" id="button" *ngIf="(authService.afauth.user | async) && task.Status!=='Completed'" (click)="logWorkPage()">Log Work</button>
                             </li>

From dac955896c3559cf6c0adb62f56b86c3759d1c96 Mon Sep 17 00:00:00 2001
From: AvinashMahanthi <avinashfab5678@gmail.com>
Date: Wed, 20 Jan 2021 22:29:17 +0530
Subject: [PATCH 08/37] feat(task-details.component):added minor changes

---
 .../body/task-details/task-details.component.css   | 14 ++++++++++++++
 .../body/task-details/task-details.component.html  |  4 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/worktrolly-ui/src/app/body/task-details/task-details.component.css b/worktrolly-ui/src/app/body/task-details/task-details.component.css
index 4d4beeea5..b8d1360eb 100644
--- a/worktrolly-ui/src/app/body/task-details/task-details.component.css
+++ b/worktrolly-ui/src/app/body/task-details/task-details.component.css
@@ -16,4 +16,18 @@
 
 #navbarMenu {
     background-color: #8120f0;
+}
+
+@media (max-width: 991px) {
+    .navbar-nav {
+        float: left;
+        flex-direction: row;
+    }
+}
+
+@media (max-width: 392px) {
+    .navbar-nav {
+        float: left;
+        flex-direction: row;
+    }
 }
\ No newline at end of file
diff --git a/worktrolly-ui/src/app/body/task-details/task-details.component.html b/worktrolly-ui/src/app/body/task-details/task-details.component.html
index e2ad75e2e..8211092dc 100644
--- a/worktrolly-ui/src/app/body/task-details/task-details.component.html
+++ b/worktrolly-ui/src/app/body/task-details/task-details.component.html
@@ -11,8 +11,8 @@ <h5 class="active nav-link" style="font-weight:bolder">Task Details</h5>
                     <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarTexts" aria-controls="navbarText" aria-expanded="false" aria-label="Toggle navigation">
                         <span class="navbar-toggler-icon text-white"></span>
                     </button>
-                    <div class="collapse navbar-collapse" id="navbarTexts">
-                        <ul class="nav navbar-nav ml-auto justify-content-end align-items-center">
+                    <div class="collapse navbar-collapse pl-lg-0" id="navbarTexts">
+                        <ul class="nav navbar-nav ml-auto align-items-center">
                             <li class="nav-item active pr-5 py-1 justify-content-between">
                                 <button type="submit" class="btn" id="button" *ngIf="(authService.afauth.user | async) && task.Status!=='Completed'" (click)="logWorkPage()">Log Work</button>
                             </li>

From 118acce78bcc82be0c6f9148b7e02d8fdb4bf350 Mon Sep 17 00:00:00 2001
From: shreyachowdhury4 <shreya040624@gmail.com>
Date: Thu, 21 Jan 2021 20:02:11 +0530
Subject: [PATCH 09/37] fix taskcard ui

---
 .../body/tasks/task-cards/task-cards.component.css |  3 ++-
 .../tasks/task-cards/task-cards.component.html     | 12 +++++-------
 .../priority-icons/priority-icons.component.html   |  6 +++---
 .../icons/status-icons/status-icons.component.html | 14 +++++++-------
 4 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/worktrolly-ui/src/app/body/tasks/task-cards/task-cards.component.css b/worktrolly-ui/src/app/body/tasks/task-cards/task-cards.component.css
index c946aa08a..01ae940b1 100644
--- a/worktrolly-ui/src/app/body/tasks/task-cards/task-cards.component.css
+++ b/worktrolly-ui/src/app/body/tasks/task-cards/task-cards.component.css
@@ -1,5 +1,6 @@
 .taskCards {
     border: 1px solid #8120f0;
-    font-size: 12px;
+    font-family: "Times New Roman", Times, serif;
+    font-size: 15px;
     color: #000;
 }
\ No newline at end of file
diff --git a/worktrolly-ui/src/app/body/tasks/task-cards/task-cards.component.html b/worktrolly-ui/src/app/body/tasks/task-cards/task-cards.component.html
index 0edb4357f..a7a3c9a52 100644
--- a/worktrolly-ui/src/app/body/tasks/task-cards/task-cards.component.html
+++ b/worktrolly-ui/src/app/body/tasks/task-cards/task-cards.component.html
@@ -1,20 +1,18 @@
 <div class="card text-dark mb-3 taskCards" (click)="openTaskDetails(task.id)">
     <div class="card-header">
         <div class="row pb-2">
-            <div class="col-md-1 col-2 px-2">
+            <div class="col-md-1 col-1 px-2">
                 <app-status-icons [Status]="task.Status"></app-status-icons>
-            </div>
-            <div class="col-md-1 col-2 px-2">
                 <app-priority-icons [Priority]="task.Priority"></app-priority-icons>
             </div>
-            <div class="col-md-1 col-2 px-2">
-                {{task.id}}
+            <div class="col-md-1 col-1 px-2">
+                <span data-toggle="tooltip" data-placement="top" title="task.id">{{task.id}}</span>
             </div>
             <div class="col-md-7 col-4 px-2">
-                <span class="material-icons">Title</span> {{task.Title}}
+                <span class="material-icons" data-toggle="tooltip" data-placement="top" title="Title">Title</span> {{task.Title}}
             </div>
             <div class="col-md-2 col-2 px-2">
-                <span class="material-icons">perm_identity</span> {{task.Assignee}}
+                <span class="material-icons" data-toggle="tooltip" style="vertical-align: middle;" data-placement="top" title="Assignee">perm_identity</span> {{task.Assignee}}
             </div>
         </div>
     </div>
diff --git a/worktrolly-ui/src/app/icons/priority-icons/priority-icons.component.html b/worktrolly-ui/src/app/icons/priority-icons/priority-icons.component.html
index 0b77378e2..c9c9a9e32 100644
--- a/worktrolly-ui/src/app/icons/priority-icons/priority-icons.component.html
+++ b/worktrolly-ui/src/app/icons/priority-icons/priority-icons.component.html
@@ -1,17 +1,17 @@
 <ng-container *ngIf="Priority == 'Low' ">
-    <span class="material-icons">
+    <span class="material-icons" style="color: yellow; padding: right 16px;" data-toggle="tooltip" data-placement="top" title="Low">
         keyboard_arrow_down
     </span>
 </ng-container>
 
 <ng-container *ngIf="Priority == 'Medium' ">
-    <span class="material-icons">
+    <span class="material-icons" style="color: violet; padding: right 16px;" data-toggle="tooltip" data-placement="top" title="Medium">
         sync_alt
     </span>
 </ng-container>
 
 <ng-container *ngIf="Priority == 'High' ">
-    <span class="material-icons">
+    <span class="material-icons" style="color: red; padding: right 16px;" data-toggle="tooltip" data-placement="top" title="High">
         keyboard_arrow_up
     </span>
 </ng-container>
\ No newline at end of file
diff --git a/worktrolly-ui/src/app/icons/status-icons/status-icons.component.html b/worktrolly-ui/src/app/icons/status-icons/status-icons.component.html
index 6329d2437..97c173fbb 100644
--- a/worktrolly-ui/src/app/icons/status-icons/status-icons.component.html
+++ b/worktrolly-ui/src/app/icons/status-icons/status-icons.component.html
@@ -1,29 +1,29 @@
 <ng-container *ngIf="Status == 'Completed' ">
-    <span class="material-icons">
-        check_circle_outline
+    <span class="material-icons" style="color: lime; padding-right:20px;" data-toggle="tooltip" data-placement="top" title="completed">
+    check_circle_outline
     </span>
 </ng-container>
 
 <ng-container *ngIf="Status == 'Ready to start' ">
-    <span class="material-icons">
+    <span class="material-icons" style="color: rgb(255, 0, 128); padding-right:20px;" data-toggle="tooltip" data-placement="top" title="Ready to start">
         not_started
     </span>
 </ng-container>
 
 <ng-container *ngIf="Status == 'Blocked' ">
-    <span class="material-icons">
+    <span class="material-icons" style="color: gray; padding-right:20px;" data-toggle="tooltip" data-placement="top" title="Blocked">
         block
     </span>
 </ng-container>
 
 <ng-container *ngIf="Status == 'Under Progress' ">
-    <span class="material-icons">
+    <span class="material-icons" style="color: #fc6a03; padding-right:20px;" data-toggle="tooltip" data-placement="top" title="Under Progress">
         arrow_circle_up
     </span>
 </ng-container>
 
 <ng-container *ngIf="Status == 'Ice Box' ">
-    <span class="material-icons">
+    <span class="material-icons" style="color: skyblue; padding-right:20px;" data-toggle="tooltip" data-placement="top" title="Ice Box">
         inventory_2
     </span>
-</ng-container>
\ No newline at end of file
+</ng-container>

From 2c8cb9ef51dc8dad721f1ca332a6393af13b2e60 Mon Sep 17 00:00:00 2001
From: shreyachowdhury4 <shreya040624@gmail.com>
Date: Fri, 22 Jan 2021 09:34:30 +0530
Subject: [PATCH 10/37] fix task-cards ui

---
 .../src/app/body/tasks/task-cards/task-cards.component.css      | 1 -
 .../src/app/body/tasks/task-cards/task-cards.component.html     | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/worktrolly-ui/src/app/body/tasks/task-cards/task-cards.component.css b/worktrolly-ui/src/app/body/tasks/task-cards/task-cards.component.css
index 01ae940b1..7d3202b08 100644
--- a/worktrolly-ui/src/app/body/tasks/task-cards/task-cards.component.css
+++ b/worktrolly-ui/src/app/body/tasks/task-cards/task-cards.component.css
@@ -1,6 +1,5 @@
 .taskCards {
     border: 1px solid #8120f0;
-    font-family: "Times New Roman", Times, serif;
     font-size: 15px;
     color: #000;
 }
\ No newline at end of file
diff --git a/worktrolly-ui/src/app/body/tasks/task-cards/task-cards.component.html b/worktrolly-ui/src/app/body/tasks/task-cards/task-cards.component.html
index a7a3c9a52..be165ba40 100644
--- a/worktrolly-ui/src/app/body/tasks/task-cards/task-cards.component.html
+++ b/worktrolly-ui/src/app/body/tasks/task-cards/task-cards.component.html
@@ -6,7 +6,7 @@
                 <app-priority-icons [Priority]="task.Priority"></app-priority-icons>
             </div>
             <div class="col-md-1 col-1 px-2">
-                <span data-toggle="tooltip" data-placement="top" title="task.id">{{task.id}}</span>
+                <span style="font-weight: bold;" data-toggle="tooltip" data-placement="top" title="task.id">{{task.id}}</span>
             </div>
             <div class="col-md-7 col-4 px-2">
                 <span class="material-icons" data-toggle="tooltip" data-placement="top" title="Title">Title</span> {{task.Title}}

From a17b2ec77892c660d50f07fce12171ee8303e3a3 Mon Sep 17 00:00:00 2001
From: vivek kumar <vivekkumar@viveks-MacBook-Air-2.local>
Date: Sat, 23 Jan 2021 18:10:43 +0530
Subject: [PATCH 11/37] feat(navbar): Added navbar

Signed-off-by: vivek kumar <vivekkumar@viveks-MacBook-Air-2.local>
---
 worktrolly-ui/src/app/app.module.ts           |  4 +-
 .../src/app/body/board/board.component.ts     |  9 ++-
 .../src/app/body/body.component.html          |  1 +
 .../src/app/body/navbar/navbar.component.css  |  3 +
 .../src/app/body/navbar/navbar.component.html |  9 +++
 .../app/body/navbar/navbar.component.spec.ts  | 25 +++++++++
 .../src/app/body/navbar/navbar.component.ts   | 16 ++++++
 .../task-details/task-details.component.ts    | 12 +++-
 .../src/app/body/tasks/tasks.component.ts     |  9 ++-
 .../services/navbar-handler.service.spec.ts   | 16 ++++++
 .../app/services/navbar-handler.service.ts    | 55 +++++++++++++++++++
 11 files changed, 153 insertions(+), 6 deletions(-)
 create mode 100644 worktrolly-ui/src/app/body/navbar/navbar.component.css
 create mode 100644 worktrolly-ui/src/app/body/navbar/navbar.component.html
 create mode 100644 worktrolly-ui/src/app/body/navbar/navbar.component.spec.ts
 create mode 100644 worktrolly-ui/src/app/body/navbar/navbar.component.ts
 create mode 100644 worktrolly-ui/src/app/services/navbar-handler.service.spec.ts
 create mode 100644 worktrolly-ui/src/app/services/navbar-handler.service.ts

diff --git a/worktrolly-ui/src/app/app.module.ts b/worktrolly-ui/src/app/app.module.ts
index 82cdf6aa0..7242e7ebb 100644
--- a/worktrolly-ui/src/app/app.module.ts
+++ b/worktrolly-ui/src/app/app.module.ts
@@ -29,6 +29,7 @@ import { MyDashBoardComponent } from './body/my-dashboard/my-dashboard.component
 import { PriorityIconsComponent } from './icons/priority-icons/priority-icons.component';
 import { StatusIconsComponent } from './icons/status-icons/status-icons.component';
 import { FilterTaskComponent } from './body/filter-task/filter-task.component';
+import { NavbarComponent } from './body/navbar/navbar.component';
 
 @NgModule({
   declarations: [
@@ -52,7 +53,8 @@ import { FilterTaskComponent } from './body/filter-task/filter-task.component';
     MyDashBoardComponent,
     PriorityIconsComponent,
     StatusIconsComponent,
-    FilterTaskComponent
+    FilterTaskComponent,
+    NavbarComponent
   ],
   imports: [
     BrowserModule,
diff --git a/worktrolly-ui/src/app/body/board/board.component.ts b/worktrolly-ui/src/app/body/board/board.component.ts
index 7fb760209..5180bbb0b 100644
--- a/worktrolly-ui/src/app/body/board/board.component.ts
+++ b/worktrolly-ui/src/app/body/board/board.component.ts
@@ -1,9 +1,10 @@
 import { Component, OnInit } from '@angular/core';
 import { AngularFirestore, AngularFirestoreCollection, AngularFirestoreDocument } from '@angular/fire/firestore';
-import { ActivatedRoute, Router } from '@angular/router';
+import { Router } from '@angular/router';
 import { Observable, pipe } from 'rxjs';
 import { map } from 'rxjs/operators'
 import { Main, MainDataId, RawDataId, RawDataType } from 'src/app/Interface/RawDataInterface';
+import { NavbarHandlerService } from 'src/app/services/navbar-handler.service';
 
 @Component({
   selector: 'app-board',
@@ -12,6 +13,8 @@ import { Main, MainDataId, RawDataId, RawDataType } from 'src/app/Interface/RawD
 })
 export class BoardComponent implements OnInit {
 
+  componentName = "Board";
+
   // public rawData: RawDataType;
   public rawDataObservable: Observable<RawDataType>;
   public rawDocument: AngularFirestoreDocument<RawDataType>;
@@ -24,7 +27,7 @@ export class BoardComponent implements OnInit {
 
   filterSprintNumber: string;
 
-  constructor(private db: AngularFirestore, private router: Router, private route: ActivatedRoute) { }
+  constructor(private db: AngularFirestore, private router: Router, public navbarHandler: NavbarHandlerService) { }
 
   ngOnInit(): void {
     // Better way of use db.
@@ -39,6 +42,8 @@ export class BoardComponent implements OnInit {
     //   }))
     // );
 
+    this.navbarHandler.addToNavbar(this.componentName);
+
     // Efficient for now
     this.getCurrentSprint();
     this.readCurrentSprintData();
diff --git a/worktrolly-ui/src/app/body/body.component.html b/worktrolly-ui/src/app/body/body.component.html
index 0680b43f9..6659729a0 100644
--- a/worktrolly-ui/src/app/body/body.component.html
+++ b/worktrolly-ui/src/app/body/body.component.html
@@ -1 +1,2 @@
+<app-navbar></app-navbar>
 <router-outlet></router-outlet>
diff --git a/worktrolly-ui/src/app/body/navbar/navbar.component.css b/worktrolly-ui/src/app/body/navbar/navbar.component.css
new file mode 100644
index 000000000..d9f31ae45
--- /dev/null
+++ b/worktrolly-ui/src/app/body/navbar/navbar.component.css
@@ -0,0 +1,3 @@
+#currentTab {
+    color: #10be65;
+}
diff --git a/worktrolly-ui/src/app/body/navbar/navbar.component.html b/worktrolly-ui/src/app/body/navbar/navbar.component.html
new file mode 100644
index 000000000..00a1d1071
--- /dev/null
+++ b/worktrolly-ui/src/app/body/navbar/navbar.component.html
@@ -0,0 +1,9 @@
+<div class="p-2">
+    <ng-container *ngIf="navbarHandler.navbarString">
+        {{navbarHandler.navbarString}} /
+    </ng-container>
+    <ng-container *ngIf="navbarHandler.currentTab">
+        <a id="currentTab">{{navbarHandler.currentTab}}</a>
+    </ng-container>
+
+</div>
diff --git a/worktrolly-ui/src/app/body/navbar/navbar.component.spec.ts b/worktrolly-ui/src/app/body/navbar/navbar.component.spec.ts
new file mode 100644
index 000000000..f8ccd6f41
--- /dev/null
+++ b/worktrolly-ui/src/app/body/navbar/navbar.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { NavbarComponent } from './navbar.component';
+
+describe('NavbarComponent', () => {
+  let component: NavbarComponent;
+  let fixture: ComponentFixture<NavbarComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ NavbarComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(NavbarComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/worktrolly-ui/src/app/body/navbar/navbar.component.ts b/worktrolly-ui/src/app/body/navbar/navbar.component.ts
new file mode 100644
index 000000000..e8bc0f877
--- /dev/null
+++ b/worktrolly-ui/src/app/body/navbar/navbar.component.ts
@@ -0,0 +1,16 @@
+import { Component, OnInit } from '@angular/core';
+import { NavbarHandlerService } from 'src/app/services/navbar-handler.service';
+
+@Component({
+  selector: 'app-navbar',
+  templateUrl: './navbar.component.html',
+  styleUrls: ['./navbar.component.css']
+})
+export class NavbarComponent implements OnInit {
+
+  constructor(public navbarHandler: NavbarHandlerService) { }
+
+  ngOnInit(): void {
+  }
+
+}
diff --git a/worktrolly-ui/src/app/body/task-details/task-details.component.ts b/worktrolly-ui/src/app/body/task-details/task-details.component.ts
index 251ea78cc..1be5a2eae 100644
--- a/worktrolly-ui/src/app/body/task-details/task-details.component.ts
+++ b/worktrolly-ui/src/app/body/task-details/task-details.component.ts
@@ -7,6 +7,7 @@ import { map } from 'rxjs/operators'
 import { Tasks } from 'src/app/Interface/TasksInterface';
 import { AuthService } from 'src/app/services/auth.service';
 import {Location} from '@angular/common';
+import { NavbarHandlerService } from 'src/app/services/navbar-handler.service';
 
 @Component({
   selector: 'app-task-details',
@@ -15,6 +16,8 @@ import {Location} from '@angular/common';
 })
 export class TaskDetailsComponent implements OnInit {
 
+  componentName: string = ""
+
   sprintName: string
   Id: string
   logWorkEnabled: boolean = false
@@ -24,10 +27,14 @@ export class TaskDetailsComponent implements OnInit {
   public taskDocument: AngularFirestoreDocument<Tasks>
   public taskDataObservable: Observable<Tasks>
 
-  constructor(private route: ActivatedRoute, public db: AngularFirestore, private router: Router, private functions: AngularFireFunctions, public authService: AuthService, private location: Location) { }
+  constructor(private route: ActivatedRoute, public db: AngularFirestore, private router: Router, private functions: AngularFireFunctions, public authService: AuthService, private location: Location, private navbarHandler: NavbarHandlerService) { }
 
   ngOnInit(): void {
     this.Id = this.route.snapshot.params['taskId'];
+
+    this.componentName = this.Id;
+    this.navbarHandler.addToNavbar(this.componentName);
+
     this.getTaskDetail();
   }
 
@@ -73,7 +80,8 @@ export class TaskDetailsComponent implements OnInit {
   }
 
   backToTasks(){
+    this.navbarHandler.removeFromNavbar();
     this.location.back()
   }
- 
+
 }
diff --git a/worktrolly-ui/src/app/body/tasks/tasks.component.ts b/worktrolly-ui/src/app/body/tasks/tasks.component.ts
index b3e0e6649..11448caab 100644
--- a/worktrolly-ui/src/app/body/tasks/tasks.component.ts
+++ b/worktrolly-ui/src/app/body/tasks/tasks.component.ts
@@ -6,6 +6,7 @@ import { map } from 'rxjs/internal/operators/map';
 import { Tasks, TasksId } from 'src/app/Interface/TasksInterface';
 import { Router } from '@angular/router';
 import firebase from "firebase/app";
+import { NavbarHandlerService } from 'src/app/services/navbar-handler.service';
 @Component({
   selector: 'app-tasks',
   templateUrl: './tasks.component.html',
@@ -13,6 +14,8 @@ import firebase from "firebase/app";
 })
 export class TasksComponent implements OnInit {
 
+  componentName: string = ""
+
   currentSprintName: string
   category: string
   currentSprintNumber: number
@@ -26,13 +29,16 @@ export class TasksComponent implements OnInit {
   filterStatus: string
   filterCategory: string
   showFilter: boolean = false
-  constructor(private route: ActivatedRoute, private router: Router, private db: AngularFirestore) { }
+  constructor(private route: ActivatedRoute, private router: Router, private db: AngularFirestore, public navbarHandler: NavbarHandlerService) { }
 
   ngOnInit(): void {
 
     this.category = this.route.snapshot.params['category'];
     this.currentSprintName = this.route.snapshot.params['currentSprintName'];
 
+    this.componentName = this.category;
+    this.navbarHandler.addToNavbar(this.componentName);
+
     if (this.currentSprintName == "Backlog") {
       this.currentSprintNumber = -1;
     } else {
@@ -75,6 +81,7 @@ export class TasksComponent implements OnInit {
     );
   }
   backToDashboard() {
+    this.navbarHandler.removeFromNavbar();
     this.router.navigate(['/Board']);
   }
 
diff --git a/worktrolly-ui/src/app/services/navbar-handler.service.spec.ts b/worktrolly-ui/src/app/services/navbar-handler.service.spec.ts
new file mode 100644
index 000000000..9628805e3
--- /dev/null
+++ b/worktrolly-ui/src/app/services/navbar-handler.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { NavbarHandlerService } from './navbar-handler.service';
+
+describe('NavbarHandlerService', () => {
+  let service: NavbarHandlerService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(NavbarHandlerService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});
diff --git a/worktrolly-ui/src/app/services/navbar-handler.service.ts b/worktrolly-ui/src/app/services/navbar-handler.service.ts
new file mode 100644
index 000000000..65a64ede5
--- /dev/null
+++ b/worktrolly-ui/src/app/services/navbar-handler.service.ts
@@ -0,0 +1,55 @@
+import { Injectable } from '@angular/core';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class NavbarHandlerService {
+
+  navbarList: string[] = []
+  navbarString: string = ""
+  currentTab: string = ""
+
+
+  constructor() { }
+
+  addToNavbar(componentName: string) {
+    let searchIndex = this.navbarList.indexOf(componentName);
+
+    if(searchIndex == -1) {
+      this.navbarList.push(componentName);
+
+      if(this.currentTab !== "" && this.currentTab.length > 0) {
+        if(this.navbarString == "") {
+          this.navbarString = this.currentTab;
+        } else {
+          this.navbarString = this.navbarString + " / " + this.currentTab;
+        }
+      }
+
+      this.currentTab = componentName;
+    }
+  }
+
+  removeFromNavbar() {
+    if(this.navbarList.length) {
+      this.navbarList.pop();
+    }
+
+    if(this.currentTab !== "") {
+      if(this.navbarString !== "") {
+        let lastIndex = this.navbarString.lastIndexOf("/");
+
+        if(lastIndex == -1) {
+          this.currentTab = this.navbarString;
+          this.navbarString = "";
+        } else {
+          this.currentTab = this.navbarString.slice(lastIndex+1, this.navbarString.length);
+          this.navbarString = this.navbarString.slice(0, lastIndex);
+        }
+      } else {
+        this.currentTab = "";
+      }
+    }
+
+  }
+}

From d51e231bdea563a7ee95f8334107e8e955dde745 Mon Sep 17 00:00:00 2001
From: sandeep-v1404 <valpasanisandeep@gmail.com>
Date: Sat, 23 Jan 2021 23:13:45 +0530
Subject: [PATCH 12/37] feat(Chart): Added Performance Chart Component

Signed-off-by: sandeep-v1404 <valpasanisandeep@gmail.com>
---
 worktrolly-ui/package-lock.json               | 18 ++++-
 worktrolly-ui/package.json                    |  7 +-
 worktrolly-ui/src/app/app.module.ts           | 16 +++-
 .../common-tools/chart/chart.component.css    |  6 ++
 .../common-tools/chart/chart.component.html   |  2 +
 .../chart/chart.component.spec.ts             | 25 +++++++
 .../common-tools/chart/chart.component.ts     | 21 ++++++
 .../src/app/body/loader/loader.component.html |  2 +-
 .../my-dashboard/my-dashboard.component.css   |  9 ---
 .../my-dashboard/my-dashboard.component.html  | 31 ++------
 .../my-dashboard/my-dashboard.component.ts    | 44 +++++------
 .../my-tasks/my-tasks.component.css           |  8 ++
 .../my-tasks/my-tasks.component.html          | 11 +++
 .../my-tasks/my-tasks.component.spec.ts       | 25 +++++++
 .../my-tasks/my-tasks.component.ts            | 36 +++++++++
 .../performance-chart.component.css           |  8 ++
 .../performance-chart.component.html          | 20 +++++
 .../performance-chart.component.spec.ts       | 25 +++++++
 .../performance-chart.component.ts            | 73 +++++++++++++++++++
 .../range-card/range-card.component.css       | 19 +++++
 .../range-card/range-card.component.html      | 28 +++++++
 .../range-card/range-card.component.spec.ts   | 25 +++++++
 .../range-card/range-card.component.ts        | 24 ++++++
 .../src/app/services/backend.service.spec.ts  | 16 ++++
 .../src/app/services/backend.service.ts       | 32 ++++++++
 25 files changed, 462 insertions(+), 69 deletions(-)
 create mode 100644 worktrolly-ui/src/app/body/common-tools/chart/chart.component.css
 create mode 100644 worktrolly-ui/src/app/body/common-tools/chart/chart.component.html
 create mode 100644 worktrolly-ui/src/app/body/common-tools/chart/chart.component.spec.ts
 create mode 100644 worktrolly-ui/src/app/body/common-tools/chart/chart.component.ts
 create mode 100644 worktrolly-ui/src/app/body/my-dashboard/my-tasks/my-tasks.component.css
 create mode 100644 worktrolly-ui/src/app/body/my-dashboard/my-tasks/my-tasks.component.html
 create mode 100644 worktrolly-ui/src/app/body/my-dashboard/my-tasks/my-tasks.component.spec.ts
 create mode 100644 worktrolly-ui/src/app/body/my-dashboard/my-tasks/my-tasks.component.ts
 create mode 100644 worktrolly-ui/src/app/body/my-dashboard/performance-chart/performance-chart.component.css
 create mode 100644 worktrolly-ui/src/app/body/my-dashboard/performance-chart/performance-chart.component.html
 create mode 100644 worktrolly-ui/src/app/body/my-dashboard/performance-chart/performance-chart.component.spec.ts
 create mode 100644 worktrolly-ui/src/app/body/my-dashboard/performance-chart/performance-chart.component.ts
 create mode 100644 worktrolly-ui/src/app/body/my-dashboard/performance-chart/range-card/range-card.component.css
 create mode 100644 worktrolly-ui/src/app/body/my-dashboard/performance-chart/range-card/range-card.component.html
 create mode 100644 worktrolly-ui/src/app/body/my-dashboard/performance-chart/range-card/range-card.component.spec.ts
 create mode 100644 worktrolly-ui/src/app/body/my-dashboard/performance-chart/range-card/range-card.component.ts
 create mode 100644 worktrolly-ui/src/app/services/backend.service.spec.ts
 create mode 100644 worktrolly-ui/src/app/services/backend.service.ts

diff --git a/worktrolly-ui/package-lock.json b/worktrolly-ui/package-lock.json
index 2193a0322..e3ddb0a9d 100644
--- a/worktrolly-ui/package-lock.json
+++ b/worktrolly-ui/package-lock.json
@@ -1,6 +1,6 @@
 {
-  "name": "worktrolly-ui",
-  "version": "0.0.0",
+  "name": "worktrolly",
+  "version": "0.2.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -2762,6 +2762,11 @@
         "@types/node": "*"
       }
     },
+    "@types/google.visualization": {
+      "version": "0.0.52",
+      "resolved": "https://registry.npmjs.org/@types/google.visualization/-/google.visualization-0.0.52.tgz",
+      "integrity": "sha512-zyY6z8JswGNRVK2TwZGOGLnRKiBdHAAyj5SwBMRwPM0DclvwMR91GZHiXH2/hNPJNlc3VdmFDQPVl1zzSYN6pw=="
+    },
     "@types/jasmine": {
       "version": "3.5.14",
       "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-3.5.14.tgz",
@@ -3156,6 +3161,15 @@
       "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=",
       "dev": true
     },
+    "angular-google-charts": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/angular-google-charts/-/angular-google-charts-2.0.0.tgz",
+      "integrity": "sha512-GEx8V+eB1IJ09rsb7zlweYj7a+7e/RS4WzRBcoareH2y/0VJOJHPUn1NKVElPSzlYawRVyPNOZF7Eeq6X+la1A==",
+      "requires": {
+        "@types/google.visualization": "^0.0.52",
+        "tslib": "^2.0.0"
+      }
+    },
     "ansi-align": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz",
diff --git a/worktrolly-ui/package.json b/worktrolly-ui/package.json
index a14e7b25e..ce0d2d2bd 100644
--- a/worktrolly-ui/package.json
+++ b/worktrolly-ui/package.json
@@ -20,13 +20,14 @@
         "@angular/platform-browser": "~11.0.2",
         "@angular/platform-browser-dynamic": "~11.0.2",
         "@angular/router": "~11.0.2",
+        "angular-google-charts": "^2.0.0",
         "bootstrap": "^4.5.3",
+        "firebase": "^7.0.0 || ^8.0.0",
         "jquery": "^3.5.1",
         "popper.js": "^1.16.1",
         "rxjs": "~6.6.0",
         "tslib": "^2.0.0",
-        "zone.js": "~0.10.2",
-        "firebase": "^7.0.0 || ^8.0.0"
+        "zone.js": "~0.10.2"
     },
     "devDependencies": {
         "@angular-devkit/architect": ">= 0.900 < 0.1100",
@@ -54,4 +55,4 @@
         "tslint": "~6.1.0",
         "typescript": "~4.0.2"
     }
-}
\ No newline at end of file
+}
diff --git a/worktrolly-ui/src/app/app.module.ts b/worktrolly-ui/src/app/app.module.ts
index 82cdf6aa0..555622170 100644
--- a/worktrolly-ui/src/app/app.module.ts
+++ b/worktrolly-ui/src/app/app.module.ts
@@ -5,8 +5,9 @@ import { AngularFireModule } from '@angular/fire';
 import { AngularFireFunctionsModule } from '@angular/fire/functions';
 import { AngularFirestoreModule } from '@angular/fire/firestore'
 import { environment } from '../environments/environment';
-
 import { AppRoutingModule } from './app-routing.module';
+import { GoogleChartsModule } from 'angular-google-charts';
+
 import { AppComponent } from './app.component';
 import { HeaderComponent } from './header/header.component';
 import { BodyComponent } from './body/body.component';
@@ -29,6 +30,10 @@ import { MyDashBoardComponent } from './body/my-dashboard/my-dashboard.component
 import { PriorityIconsComponent } from './icons/priority-icons/priority-icons.component';
 import { StatusIconsComponent } from './icons/status-icons/status-icons.component';
 import { FilterTaskComponent } from './body/filter-task/filter-task.component';
+import { ChartComponent } from './body/common-tools/chart/chart.component';
+import { MyTasksComponent } from './body/my-dashboard/my-tasks/my-tasks.component';
+import { PerformanceChartComponent } from './body/my-dashboard/performance-chart/performance-chart.component';
+import { RangeCardComponent } from "./body/my-dashboard/performance-chart/range-card/range-card.component"
 
 @NgModule({
   declarations: [
@@ -52,7 +57,11 @@ import { FilterTaskComponent } from './body/filter-task/filter-task.component';
     MyDashBoardComponent,
     PriorityIconsComponent,
     StatusIconsComponent,
-    FilterTaskComponent
+    FilterTaskComponent,
+    ChartComponent,
+    MyTasksComponent,
+    PerformanceChartComponent,
+    RangeCardComponent
   ],
   imports: [
     BrowserModule,
@@ -61,7 +70,8 @@ import { FilterTaskComponent } from './body/filter-task/filter-task.component';
     AngularFireModule.initializeApp(environment.firebase),
     AngularFireFunctionsModule,
     AngularFirestoreModule,
-    AppRoutingModule
+    AppRoutingModule,
+    GoogleChartsModule.forRoot({ version: 'current' })
   ],
   providers: [AuthService],
   bootstrap: [AppComponent]
diff --git a/worktrolly-ui/src/app/body/common-tools/chart/chart.component.css b/worktrolly-ui/src/app/body/common-tools/chart/chart.component.css
new file mode 100644
index 000000000..e0c38c05c
--- /dev/null
+++ b/worktrolly-ui/src/app/body/common-tools/chart/chart.component.css
@@ -0,0 +1,6 @@
+#chart {
+    width: 110%;
+    height: 100%;
+    margin-left: -3%;
+    background: transparent;
+}
\ No newline at end of file
diff --git a/worktrolly-ui/src/app/body/common-tools/chart/chart.component.html b/worktrolly-ui/src/app/body/common-tools/chart/chart.component.html
new file mode 100644
index 000000000..a9f397d49
--- /dev/null
+++ b/worktrolly-ui/src/app/body/common-tools/chart/chart.component.html
@@ -0,0 +1,2 @@
+<google-chart id="chart" [dynamicResize]="dynamicResizable" [options]="myOptions" [type]="myChartType" [data]="data" [columns]="chartColumns">
+</google-chart>
\ No newline at end of file
diff --git a/worktrolly-ui/src/app/body/common-tools/chart/chart.component.spec.ts b/worktrolly-ui/src/app/body/common-tools/chart/chart.component.spec.ts
new file mode 100644
index 000000000..6c6d0944c
--- /dev/null
+++ b/worktrolly-ui/src/app/body/common-tools/chart/chart.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ChartComponent } from './chart.component';
+
+describe('ChartComponent', () => {
+  let component: ChartComponent;
+  let fixture: ComponentFixture<ChartComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ ChartComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ChartComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/worktrolly-ui/src/app/body/common-tools/chart/chart.component.ts b/worktrolly-ui/src/app/body/common-tools/chart/chart.component.ts
new file mode 100644
index 000000000..55280f68c
--- /dev/null
+++ b/worktrolly-ui/src/app/body/common-tools/chart/chart.component.ts
@@ -0,0 +1,21 @@
+import { Component, Input, OnInit } from '@angular/core';
+@Component({
+  selector: 'app-chart',
+  templateUrl: './chart.component.html',
+  styleUrls: ['./chart.component.css']
+})
+export class ChartComponent implements OnInit {
+  @Input("data") data: []
+
+  constructor() { }
+  ngOnInit(): void { }
+
+  myChartType: string = "LineChart"
+  chartColumns = ["Sprint Number", "StoryPoint"]
+  myOptions = {
+    colors: ['#8120f0'],
+    is3D: true,
+    curveType: 'function'
+  };
+  dynamicResizable: boolean = true
+}
diff --git a/worktrolly-ui/src/app/body/loader/loader.component.html b/worktrolly-ui/src/app/body/loader/loader.component.html
index d33ef3b6f..ea45c4904 100644
--- a/worktrolly-ui/src/app/body/loader/loader.component.html
+++ b/worktrolly-ui/src/app/body/loader/loader.component.html
@@ -1,4 +1,4 @@
-<div class="d-flex justify-content-center" style="position: absolute;left: 50%;top: 50%;">
+<div class="d-flex justify-content-center pt-2" style="position: absolute;left: 50%;top: 50%;">
     <div class="spinner-border" id="loader" role="status">
     </div>
 </div>
\ No newline at end of file
diff --git a/worktrolly-ui/src/app/body/my-dashboard/my-dashboard.component.css b/worktrolly-ui/src/app/body/my-dashboard/my-dashboard.component.css
index 5aefc5d3e..e69de29bb 100644
--- a/worktrolly-ui/src/app/body/my-dashboard/my-dashboard.component.css
+++ b/worktrolly-ui/src/app/body/my-dashboard/my-dashboard.component.css
@@ -1,9 +0,0 @@
-#navbarMenu {
-    background-color: #8120f0;
-}
-
-.container {
-    margin-top: 20px;
-    margin-bottom: 10px;
-    border: 1px solid #8120f0;
-}
\ No newline at end of file
diff --git a/worktrolly-ui/src/app/body/my-dashboard/my-dashboard.component.html b/worktrolly-ui/src/app/body/my-dashboard/my-dashboard.component.html
index 0759cb451..0474561db 100644
--- a/worktrolly-ui/src/app/body/my-dashboard/my-dashboard.component.html
+++ b/worktrolly-ui/src/app/body/my-dashboard/my-dashboard.component.html
@@ -1,27 +1,10 @@
-<div id="taskPage">
-    <div class="container pt-2 pb-4 pl-2">
-        <div class="row">
-            <div class="col-9 col-md-10 m-2">
-                <h5 style="font-weight:bolder">My DashBoard</h5>
-            </div>
+<div class="container" *ngIf="(userObservable | async ) && (backendService.rawDataObservable | async)">
+    <div class="row pt-5">
+        <div class="col">
+            <app-performance-chart [username]="username" [currentSprint]="currentSprintNumber"></app-performance-chart>
         </div>
-        <div class="row">
-            <div class="col">
-                <nav class="navbar navbar-expand-sm navbar-dark" id="navbarMenu">
-                    <ul class="navbar-nav mr-auto" *ngIf="userObservable |async">
-                        <li class="nav-item">
-                            <h5 class="active nav-link" style="font-weight:bolder">{{user.displayName}}</h5>
-                        </li>
-                    </ul>
-                </nav>
-            </div>
-        </div>
-        <hr class="w-75 ml-0">
-        <div id="cardsList">
-            <ng-container *ngFor="let item of tasksData | async">
-                <app-task-cards [task]="item"></app-task-cards>
-            </ng-container>
+        <div class="col">
+            <app-my-tasks [username]="username" [currentSprint]="currentSprintNumber"></app-my-tasks>
         </div>
     </div>
-</div>
-<app-loader *ngIf="!(tasksData | async)"></app-loader>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/worktrolly-ui/src/app/body/my-dashboard/my-dashboard.component.ts b/worktrolly-ui/src/app/body/my-dashboard/my-dashboard.component.ts
index 97a9177e0..d68d10cf4 100644
--- a/worktrolly-ui/src/app/body/my-dashboard/my-dashboard.component.ts
+++ b/worktrolly-ui/src/app/body/my-dashboard/my-dashboard.component.ts
@@ -1,11 +1,10 @@
-import { Component, Input, OnInit } from '@angular/core';
-import { AngularFirestore, AngularFirestoreCollection } from '@angular/fire/firestore';
-import { ActivatedRoute, Router } from '@angular/router';
+import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/internal/operators/map';
-import { Tasks, TasksId } from 'src/app/Interface/TasksInterface';
 import { User } from 'src/app/Interface/UserInterface';
 import { AuthService } from 'src/app/services/auth.service';
+import { BackendService } from 'src/app/services/backend.service';
 
 @Component({
   selector: 'app-my-dashboard',
@@ -14,40 +13,31 @@ import { AuthService } from 'src/app/services/auth.service';
 })
 export class MyDashBoardComponent implements OnInit {
   user: User
-  displayName: string
-  
-  tasksCollection: AngularFirestoreCollection<Tasks>
-  tasksData: Observable<TasksId[]>
+  username: string
+
   userObservable: Observable<User>
 
-  constructor(public router: Router, private db: AngularFirestore,public authService: AuthService) { }
+  currentSprintNumber: number;
+  currentSprintName: string;
+
+  constructor(public router: Router, public authService: AuthService, public backendService: BackendService) { }
 
-  ngOnInit(): void {   
+  ngOnInit(): void {
+    this.backendService.getCurrentSprint().subscribe(data => {
+      this.currentSprintNumber = data.CurrentSprintId;
+      this.currentSprintName = "S" + this.currentSprintNumber;
+    });
     this.readUser();
   }
-
-  readUser(){
+  readUser() {
     this.userObservable = this.authService.afauth.user.pipe(map(action => {
       const data = action as User;
       this.user = data;
-      if(data == null){
+      if (data == null) {
         this.router.navigate(['/Board']);
       }
-      this.displayName = data.displayName;
-      this.readTaskData(this.displayName);
+      this.username = data.displayName;
       return { ...data }
     }));
   }
-
-  readTaskData(displayName:string) {
-    console.log(displayName)
-    this.tasksCollection = this.db.collection<Tasks>("Tasks", ref=>ref.where('Assignee', '==', displayName));
-    this.tasksData = this.tasksCollection.snapshotChanges().pipe(
-      map(actions => actions.map(a => {
-        const data = a.payload.doc.data() as Tasks;
-        const id = a.payload.doc.id;
-        return { id, ...data };
-      }))
-    );
-  }
 }
diff --git a/worktrolly-ui/src/app/body/my-dashboard/my-tasks/my-tasks.component.css b/worktrolly-ui/src/app/body/my-dashboard/my-tasks/my-tasks.component.css
new file mode 100644
index 000000000..633488208
--- /dev/null
+++ b/worktrolly-ui/src/app/body/my-dashboard/my-tasks/my-tasks.component.css
@@ -0,0 +1,8 @@
+.card-header {
+    background-color: #8120f0;
+    color: white;
+}
+
+.card {
+    border: 1px solid #8120f0;
+}
\ No newline at end of file
diff --git a/worktrolly-ui/src/app/body/my-dashboard/my-tasks/my-tasks.component.html b/worktrolly-ui/src/app/body/my-dashboard/my-tasks/my-tasks.component.html
new file mode 100644
index 000000000..5a53d3b5f
--- /dev/null
+++ b/worktrolly-ui/src/app/body/my-dashboard/my-tasks/my-tasks.component.html
@@ -0,0 +1,11 @@
+<div class="card mb-3" style="width: 100%;">
+    <div class="card-header">My Tasks</div>
+    <div class="card-body" *ngIf="tasksData | async">
+        <ng-container *ngFor="let item of tasksData | async">
+            <app-task-cards [task]="item"></app-task-cards>
+        </ng-container>
+    </div>
+    <div class="card-body" *ngIf="!(tasksData | async)">
+        <app-loader></app-loader>
+    </div>
+</div>
\ No newline at end of file
diff --git a/worktrolly-ui/src/app/body/my-dashboard/my-tasks/my-tasks.component.spec.ts b/worktrolly-ui/src/app/body/my-dashboard/my-tasks/my-tasks.component.spec.ts
new file mode 100644
index 000000000..95d285eeb
--- /dev/null
+++ b/worktrolly-ui/src/app/body/my-dashboard/my-tasks/my-tasks.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { MyTasksComponent } from './my-tasks.component';
+
+describe('MyTasksComponent', () => {
+  let component: MyTasksComponent;
+  let fixture: ComponentFixture<MyTasksComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ MyTasksComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(MyTasksComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/worktrolly-ui/src/app/body/my-dashboard/my-tasks/my-tasks.component.ts b/worktrolly-ui/src/app/body/my-dashboard/my-tasks/my-tasks.component.ts
new file mode 100644
index 000000000..b67b48684
--- /dev/null
+++ b/worktrolly-ui/src/app/body/my-dashboard/my-tasks/my-tasks.component.ts
@@ -0,0 +1,36 @@
+import { Component, Input, OnInit } from '@angular/core';
+import { AngularFirestore, AngularFirestoreCollection } from '@angular/fire/firestore';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+import { Tasks, TasksId } from 'src/app/Interface/TasksInterface';
+
+@Component({
+  selector: 'app-my-tasks',
+  templateUrl: './my-tasks.component.html',
+  styleUrls: ['./my-tasks.component.css']
+})
+export class MyTasksComponent implements OnInit {
+
+  @Input("username") username: string
+  @Input("currentSprint") currentSprintNumber: number
+
+  tasksCollection: AngularFirestoreCollection<Tasks>
+  tasksData: Observable<TasksId[]>
+
+  constructor(public db: AngularFirestore) { }
+
+  ngOnInit(): void {
+    this.readTaskData();
+  }
+
+  readTaskData() {
+    this.tasksCollection = this.db.collection<Tasks>("Tasks", ref => ref.where('Assignee', '==', this.username).where("SprintNumber", "==", this.currentSprintNumber));
+    this.tasksData = this.tasksCollection.snapshotChanges().pipe(
+      map(actions => actions.map(a => {
+        const data = a.payload.doc.data() as Tasks;
+        const id = a.payload.doc.id;
+        return { id, ...data };
+      }))
+    );
+  }
+}
diff --git a/worktrolly-ui/src/app/body/my-dashboard/performance-chart/performance-chart.component.css b/worktrolly-ui/src/app/body/my-dashboard/performance-chart/performance-chart.component.css
new file mode 100644
index 000000000..633488208
--- /dev/null
+++ b/worktrolly-ui/src/app/body/my-dashboard/performance-chart/performance-chart.component.css
@@ -0,0 +1,8 @@
+.card-header {
+    background-color: #8120f0;
+    color: white;
+}
+
+.card {
+    border: 1px solid #8120f0;
+}
\ No newline at end of file
diff --git a/worktrolly-ui/src/app/body/my-dashboard/performance-chart/performance-chart.component.html b/worktrolly-ui/src/app/body/my-dashboard/performance-chart/performance-chart.component.html
new file mode 100644
index 000000000..2d94b4a71
--- /dev/null
+++ b/worktrolly-ui/src/app/body/my-dashboard/performance-chart/performance-chart.component.html
@@ -0,0 +1,20 @@
+<ng-container>
+    <div class="card mb-3">
+        <div class="card-header">
+            <div class="row align-items-center">
+                <div class="col-6">
+                    Performance Chart
+                </div>
+                <div class="col-6 text-right">
+                    <app-range-card (setRange)="onGetRange($event)"></app-range-card>
+                </div>
+            </div>
+        </div>
+        <div class="card-body" *ngIf="data.length && !showLoader">
+            <app-chart [data]="data"></app-chart>
+        </div>
+        <div class="card-body" *ngIf="showLoader">
+            <app-loader></app-loader>
+        </div>
+    </div>
+</ng-container>
\ No newline at end of file
diff --git a/worktrolly-ui/src/app/body/my-dashboard/performance-chart/performance-chart.component.spec.ts b/worktrolly-ui/src/app/body/my-dashboard/performance-chart/performance-chart.component.spec.ts
new file mode 100644
index 000000000..645b6ec4d
--- /dev/null
+++ b/worktrolly-ui/src/app/body/my-dashboard/performance-chart/performance-chart.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { PerformanceChartComponent } from './performance-chart.component';
+
+describe('PerformanceChartComponent', () => {
+  let component: PerformanceChartComponent;
+  let fixture: ComponentFixture<PerformanceChartComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ PerformanceChartComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(PerformanceChartComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/worktrolly-ui/src/app/body/my-dashboard/performance-chart/performance-chart.component.ts b/worktrolly-ui/src/app/body/my-dashboard/performance-chart/performance-chart.component.ts
new file mode 100644
index 000000000..81435a087
--- /dev/null
+++ b/worktrolly-ui/src/app/body/my-dashboard/performance-chart/performance-chart.component.ts
@@ -0,0 +1,73 @@
+import { Component, Input, OnInit } from '@angular/core';
+import { AngularFirestore } from '@angular/fire/firestore';
+
+@Component({
+  selector: 'app-performance-chart',
+  templateUrl: './performance-chart.component.html',
+  styleUrls: ['./performance-chart.component.css']
+})
+export class PerformanceChartComponent implements OnInit {
+
+  @Input("username") username: string
+  @Input("currentSprint") currentSprintNumber: number
+
+  showLoader: boolean = true
+  sprintRange1: number
+  sprintRange2: number
+  data = [];
+  constructor(public db: AngularFirestore) { }
+
+  ngOnInit(): void {
+    this.sprintRange2 = this.currentSprintNumber
+    this.sprintRange1 = this.sprintRange2 - 2
+    this.createData().then(data => {
+      this.data = data
+      this.showLoader = false
+    }).catch(error => {
+      console.log(error);
+    });
+  }
+  async createData() {
+    if (this.sprintRange2 <= 0) {
+      this.sprintRange2 = this.currentSprintNumber
+    }
+    let tempData = []
+    for (let index = this.sprintRange1; index <= this.sprintRange2; index++) {
+      let storyPoint: number = 0
+      await this.readData(index)
+        .then(data => {
+          storyPoint = data;
+          tempData.push(["S" + index, storyPoint]);
+        })
+        .catch(err => {
+          console.log(err);
+        })
+    }
+    return tempData;
+  }
+  async readData(sprintNumber: number) {
+    var storyPoint: number = 0;
+    try {
+      await this.db.collection("Tasks").ref.where("SprintNumber", "==", sprintNumber).where("Assignee", "==", this.username)
+        .get()
+        .then(function (querySnapshot) {
+          querySnapshot.forEach((doc) => {
+            const sp = doc.data().StoryPointNumber;
+            storyPoint = storyPoint + parseInt(sp);
+          });
+        })
+    } catch (error) { }
+    return storyPoint
+  }
+  onGetRange(rangeData: { sprintRange1: number, sprintRange2: number }) {
+    this.showLoader = true
+    this.sprintRange1 = rangeData.sprintRange1
+    this.sprintRange2 = rangeData.sprintRange2
+    this.createData().then(data => {
+      this.data = data
+      this.showLoader = false
+    }).catch(error => {
+      console.log(error);
+    });
+  }
+}
diff --git a/worktrolly-ui/src/app/body/my-dashboard/performance-chart/range-card/range-card.component.css b/worktrolly-ui/src/app/body/my-dashboard/performance-chart/range-card/range-card.component.css
new file mode 100644
index 000000000..8d22f7da2
--- /dev/null
+++ b/worktrolly-ui/src/app/body/my-dashboard/performance-chart/range-card/range-card.component.css
@@ -0,0 +1,19 @@
+#button {
+    background-color: #10be65;
+    border: 2px solid #8120f0;
+    color: white;
+}
+
+#button:focus,
+#button:active {
+    outline: 0 none;
+    box-shadow: none;
+}
+
+input:focus,
+select:focus,
+textarea:focus {
+    box-shadow: none;
+    outline: 0 none;
+    border-color: #8120f0;
+}
\ No newline at end of file
diff --git a/worktrolly-ui/src/app/body/my-dashboard/performance-chart/range-card/range-card.component.html b/worktrolly-ui/src/app/body/my-dashboard/performance-chart/range-card/range-card.component.html
new file mode 100644
index 000000000..05b3e9907
--- /dev/null
+++ b/worktrolly-ui/src/app/body/my-dashboard/performance-chart/range-card/range-card.component.html
@@ -0,0 +1,28 @@
+<div class="dropdown">
+    <span class="material-icons" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-expanded="false">
+            perm_data_setting
+    </span>
+    <div class="dropdown-menu dropdown-menu-right" id="dropdownRangeCard">
+        <div class="row p-1 align-items-center">
+            <div class="col-6">
+                <label for="input">Start Range</label>
+            </div>
+            <div class="col">
+                <input type="number" min="1" class="form-control" [(ngModel)]="sprintRange1" [ngModelOptions]="{standalone: true}">
+            </div>
+        </div>
+        <div class="row p-1 align-items-center">
+            <div class="col-6">
+                <label for="input">End Range</label>
+            </div>
+            <div class="col">
+                <input type="number" min="2" class="form-control" [(ngModel)]="sprintRange2" [ngModelOptions]="{standalone: true}">
+            </div>
+        </div>
+        <div class="row p-1">
+            <div class="offset-5 offset-sm-6 offset-md-7 col">
+                <button type="submit" class="btn" id="button" (click)="onSetRange()">Submit</button>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/worktrolly-ui/src/app/body/my-dashboard/performance-chart/range-card/range-card.component.spec.ts b/worktrolly-ui/src/app/body/my-dashboard/performance-chart/range-card/range-card.component.spec.ts
new file mode 100644
index 000000000..0a2adc16e
--- /dev/null
+++ b/worktrolly-ui/src/app/body/my-dashboard/performance-chart/range-card/range-card.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { RangeCardComponent } from './range-card.component';
+
+describe('RangeCardComponent', () => {
+  let component: RangeCardComponent;
+  let fixture: ComponentFixture<RangeCardComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ RangeCardComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(RangeCardComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/worktrolly-ui/src/app/body/my-dashboard/performance-chart/range-card/range-card.component.ts b/worktrolly-ui/src/app/body/my-dashboard/performance-chart/range-card/range-card.component.ts
new file mode 100644
index 000000000..0e819accd
--- /dev/null
+++ b/worktrolly-ui/src/app/body/my-dashboard/performance-chart/range-card/range-card.component.ts
@@ -0,0 +1,24 @@
+import { Component, EventEmitter, OnInit, Output } from '@angular/core';
+
+@Component({
+  selector: 'app-range-card',
+  templateUrl: './range-card.component.html',
+  styleUrls: ['./range-card.component.css']
+})
+export class RangeCardComponent implements OnInit {
+
+  @Output() setRange = new EventEmitter<{ sprintRange1: number, sprintRange2: number }>();
+  sprintRange1: number
+  sprintRange2: number
+
+
+  constructor() { }
+
+  ngOnInit(): void {
+  }
+  onSetRange() {
+    this.setRange.emit({ sprintRange1: this.sprintRange1, sprintRange2: this.sprintRange2 });
+    this.sprintRange1 = 1
+    this.sprintRange2 = 2
+  }
+}
diff --git a/worktrolly-ui/src/app/services/backend.service.spec.ts b/worktrolly-ui/src/app/services/backend.service.spec.ts
new file mode 100644
index 000000000..bd90d07c6
--- /dev/null
+++ b/worktrolly-ui/src/app/services/backend.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { BackendService } from './backend.service';
+
+describe('BackendService', () => {
+  let service: BackendService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(BackendService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});
diff --git a/worktrolly-ui/src/app/services/backend.service.ts b/worktrolly-ui/src/app/services/backend.service.ts
new file mode 100644
index 000000000..b73084a1e
--- /dev/null
+++ b/worktrolly-ui/src/app/services/backend.service.ts
@@ -0,0 +1,32 @@
+import { Injectable } from '@angular/core';
+import { AngularFirestore, AngularFirestoreDocument } from '@angular/fire/firestore';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+import { RawDataType } from '../Interface/RawDataInterface';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class BackendService {
+  public rawDataObservable: Observable<RawDataType>;
+  public rawDocument: AngularFirestoreDocument<RawDataType>;
+
+
+  currentSprintNumber: number;
+  currentSprintName: string;
+
+  constructor(private db: AngularFirestore) { }
+
+  getCurrentSprint() {
+    this.rawDocument = this.db.doc<RawDataType>('RawData/AppDetails');
+    this.rawDataObservable = this.rawDocument.snapshotChanges().pipe(
+      map(actions => {
+        const data = actions.payload.data() as RawDataType;
+        this.currentSprintNumber = data.CurrentSprintId;
+        this.currentSprintName = "S" + this.currentSprintNumber;
+        return { ...data }
+      })
+    )
+    return this.rawDataObservable
+  }
+}

From 34b68fe7f5d20416d55b0cee30d958189adc2537 Mon Sep 17 00:00:00 2001
From: bighnesh0404 <saibighneshprusty@gmail.com>
Date: Sun, 24 Jan 2021 18:36:00 +0530
Subject: [PATCH 13/37] feat(darkTheme) - The complete website theme has been
 changed into dark theme

---
 worktrolly-ui/package-lock.json               |  4 +-
 .../src/app/body/board/board.component.css    |  4 +-
 .../feature-card/feature-card.component.html  |  2 +-
 .../sprint-details.component.css              | 10 ++--
 .../sprint-details.component.html             | 48 +++++++++----------
 worktrolly-ui/src/app/body/body.component.css |  3 ++
 .../create-new-session.component.css          | 10 ++--
 .../create-new-session.component.html         |  2 +-
 .../create-new-sprint.component.css           | 12 ++---
 .../create-new-sprint.component.html          | 14 +++---
 .../filter-task/filter-task.component.css     |  8 ++--
 .../filter-task/filter-task.component.html    |  2 +-
 .../src/app/body/loader/loader.component.css  |  2 +-
 .../src/app/body/login/login.component.css    |  8 ++--
 .../my-dashboard/my-dashboard.component.css   |  4 +-
 .../my-dashboard/my-dashboard.component.html  |  2 +-
 .../edit-page/edit-page.component.css         | 12 ++---
 .../edit-page/edit-page.component.html        |  2 +-
 .../log-work/log-work.component.css           | 12 ++---
 .../log-work/log-work.component.html          |  2 +-
 .../task-details/task-details.component.css   |  8 ++--
 .../task-details/task-details.component.html  |  2 +-
 .../tasks/task-cards/task-cards.component.css |  2 +-
 .../task-cards/task-cards.component.html      |  2 +-
 .../src/app/body/tasks/tasks.component.css    |  8 ++--
 .../src/app/header/header.component.css       |  8 ++--
 .../src/app/header/header.component.html      |  2 +-
 .../login-handler/login-handler.component.css |  4 +-
 .../user-card/user-card.component.css         |  8 ++--
 .../src/environments/environment.prod.ts      | 24 ++++++----
 worktrolly-ui/src/environments/environment.ts | 24 ++++++----
 worktrolly-ui/src/index.html                  |  2 +-
 32 files changed, 136 insertions(+), 121 deletions(-)

diff --git a/worktrolly-ui/package-lock.json b/worktrolly-ui/package-lock.json
index 2193a0322..bb64020a6 100644
--- a/worktrolly-ui/package-lock.json
+++ b/worktrolly-ui/package-lock.json
@@ -1,6 +1,6 @@
 {
-  "name": "worktrolly-ui",
-  "version": "0.0.0",
+  "name": "worktrolly",
+  "version": "0.2.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/worktrolly-ui/src/app/body/board/board.component.css b/worktrolly-ui/src/app/body/board/board.component.css
index b74afc3e4..543f2dcc4 100644
--- a/worktrolly-ui/src/app/body/board/board.component.css
+++ b/worktrolly-ui/src/app/body/board/board.component.css
@@ -1,6 +1,6 @@
 #button {
-    background-color: #10be65;
-    border: 2px solid #8120f0;
+    background-color: #16C85A;
+    border: 2px solid #5A20F0;
     color: white;
 }
 
diff --git a/worktrolly-ui/src/app/body/board/feature-card/feature-card.component.html b/worktrolly-ui/src/app/body/board/feature-card/feature-card.component.html
index 44d47c816..2d2e50562 100644
--- a/worktrolly-ui/src/app/body/board/feature-card/feature-card.component.html
+++ b/worktrolly-ui/src/app/body/board/feature-card/feature-card.component.html
@@ -1,4 +1,4 @@
-<div class="card text-white mb-3" style="max-width: 18rem; background-color: #8120f0;">
+<div class="card text-white mb-3" style="max-width: 18rem; background-color: #5A20F0;">
     <div class="card-body">
         <h5 class="card-title" style="font-size: 18px;">{{ cardName }}</h5>
         <div class="row card-text" style="font-size: 12px;">
diff --git a/worktrolly-ui/src/app/body/board/sprint-details/sprint-details.component.css b/worktrolly-ui/src/app/body/board/sprint-details/sprint-details.component.css
index 8396a4540..691053f19 100644
--- a/worktrolly-ui/src/app/body/board/sprint-details/sprint-details.component.css
+++ b/worktrolly-ui/src/app/body/board/sprint-details/sprint-details.component.css
@@ -1,6 +1,6 @@
 #dropdownMenuButton {
     border-radius: 20px;
-    background-color: #10be65;
+    background-color: #16C85A;
     color: black;
 }
 
@@ -8,18 +8,18 @@
 /* #filterMenu{*/
 
 #button {
-    background-color: #10be65;
-    border: 1px solid #8120f0;
+    background-color: #16C85A;
+    border: 1px solid #5A20F0;
     color: white;
 }
 
 #filterMenu {
-    background-color: #10be65;
+    background-color: #16C85A;
 }
 
 #dropdownButton {
     color: white;
-    background-color: #8120f0;
+    background-color: #5A20F0;
 }
 
 #button:focus,
diff --git a/worktrolly-ui/src/app/body/board/sprint-details/sprint-details.component.html b/worktrolly-ui/src/app/body/board/sprint-details/sprint-details.component.html
index af99e80e4..9c7d6b10e 100644
--- a/worktrolly-ui/src/app/body/board/sprint-details/sprint-details.component.html
+++ b/worktrolly-ui/src/app/body/board/sprint-details/sprint-details.component.html
@@ -1,6 +1,6 @@
-<div class="pt-3">
-    <div class="card">
-        <div class="card-body" style="font-weight: bold; background-color: #8120f0; color:white;">
+<div class="pt-3 text-white">
+    <div class="card" style="border: none;">
+        <div class="card-header" style="font-weight: bold; background-color: #5A20F0; color:white;">
             <div class="row  align-items-center">
                 <div class="col-md-2 col-3">
                     <h5 class="pl-2" style="font-size: 18px;">Sprint No:</h5>
@@ -30,29 +30,25 @@ <h5 id="sprintId">{{currentSprintName}}</h5>
                 </div>
             </div>
         </div>
-        <div class="row">
-            <div class="col-md-8">
-                <div class="card-body" style="background-color: white;">
-                    <div class="row py-2">
-                        <h6 class="card-title col-md-2 col-4" style="font-weight: bold;font-size: 14px;">Details: </h6>
-                        <h6 class="card-text col-md-10 col-8" id="sprintDetail" style="font-size: 12px;"></h6>
-                    </div>
-                    <div class="row py-2">
-                        <h6 class="card-title col-md-2 col-4" style="font-weight: bold;font-size: 14px;">Start Date:
-                        </h6>
-                        <h6 class="card-text col-md-10 col-8" id="sprintStartDate" style="font-size: 12px;">
-                            {{StartDate}}</h6>
-                    </div>
-                    <div class="row py-2">
-                        <h6 class="card-title col-md-2 col-4" style="font-weight: bold;font-size: 14px;">End Date: </h6>
-                        <h6 class="card-text col-md-10 col-8" id="sprintEndDate" style="font-size: 12px;">{{EndDate}}
-                        </h6>
-                    </div>
-                    <div class="row py-2">
-                        <h6 class="card-title col-md-2 col-4" style="font-weight: bold;font-size: 14px;">Status: </h6>
-                        <h6 class="card-text col-md-10 col-8" id="sprintStatus" style="font-size: 12px;">{{Status}}</h6>
-                    </div>
-                </div>
+        <div class="card-body" style="background-color:#202124;">
+            <div class="row py-2">
+                <h6 class="card-title col-md-2 col-4" style="font-weight: bold;font-size: 14px;">Details: </h6>
+                <h6 class="card-text col-md-10 col-8" id="sprintDetail" style="font-size: 12px;"></h6>
+            </div>
+            <div class="row py-2">
+                <h6 class="card-title col-md-2 col-4" style="font-weight: bold;font-size: 14px;">Start Date:
+                </h6>
+                <h6 class="card-text col-md-10 col-8" id="sprintStartDate" style="font-size: 12px;">
+                    {{StartDate}}</h6>
+            </div>
+            <div class="row py-2">
+                <h6 class="card-title col-md-2 col-4" style="font-weight: bold;font-size: 14px;">End Date: </h6>
+                <h6 class="card-text col-md-10 col-8" id="sprintEndDate" style="font-size: 12px;">{{EndDate}}
+                </h6>
+            </div>
+            <div class="row py-2">
+                <h6 class="card-title col-md-2 col-4" style="font-weight: bold;font-size: 14px;">Status: </h6>
+                <h6 class="card-text col-md-10 col-8" id="sprintStatus" style="font-size: 12px;">{{Status}}</h6>
             </div>
         </div>
     </div>
diff --git a/worktrolly-ui/src/app/body/body.component.css b/worktrolly-ui/src/app/body/body.component.css
index e69de29bb..e6a5578dd 100644
--- a/worktrolly-ui/src/app/body/body.component.css
+++ b/worktrolly-ui/src/app/body/body.component.css
@@ -0,0 +1,3 @@
+body {
+    background-color: black;
+}
\ No newline at end of file
diff --git a/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.css b/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.css
index 33d899bd2..063e21a8f 100644
--- a/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.css
+++ b/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.css
@@ -1,10 +1,10 @@
 #createNewTaskContainer {
-    border: 1px solid #8120f0;
+    border: 1px solid #5A20F0;
 }
 
 #button {
-    background-color: #10be65;
-    border: 2px solid #8120f0;
+    background-color: #16C85A;
+    border: 2px solid #5A20F0;
     color: white;
 }
 
@@ -15,7 +15,7 @@
 }
 
 #navbarMenu {
-    background-color: #8120f0;
+    background-color: #5A20F0;
 }
 
 input:focus,
@@ -23,5 +23,5 @@ select:focus,
 textarea:focus {
     box-shadow: none;
     outline: 0 none;
-    border-color: #8120f0;
+    border-color: #5A20F0;
 }
\ No newline at end of file
diff --git a/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.html b/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.html
index a42879f19..a6b09ea8e 100644
--- a/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.html
+++ b/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.html
@@ -16,7 +16,7 @@ <h5 class="active nav-link" style="font-weight:bolder">Create New Task</h5>
                 </nav>
             </div>
         </div>
-        <div class="px-5">
+        <div class="px-5 text-light">
             <div class="row">
                 <div class="alert form-inline w-50 col-md-3 pb-3" style="font-size: 20px;" role="alert">
                     <div style="font-weight: bold;" class="pr-3">Date:</div>
diff --git a/worktrolly-ui/src/app/body/create-new-sprint/create-new-sprint.component.css b/worktrolly-ui/src/app/body/create-new-sprint/create-new-sprint.component.css
index b1401a9ac..4fad8b6b9 100644
--- a/worktrolly-ui/src/app/body/create-new-sprint/create-new-sprint.component.css
+++ b/worktrolly-ui/src/app/body/create-new-sprint/create-new-sprint.component.css
@@ -1,10 +1,10 @@
 #startNewSprintContainer {
-    border: 1px solid #8120f0;
+    border: 1px solid #5A20F0;
 }
 
 #button {
-    background-color: #10be65;
-    border: 2px solid #8120f0;
+    background-color: #16C85A;
+    border: 2px solid #5A20F0;
     color: white;
 }
 
@@ -15,16 +15,16 @@
 }
 
 #detail {
-    background-color: #10be65;
+    background-color: #16C85A;
 }
 
 #navbarMenu {
-    background-color: #8120f0;
+    background-color: #5A20F0;
 }
 
 select:focus,
 input:focus {
     box-shadow: none;
     outline: 0 none;
-    border-color: #8120f0;
+    border-color: #5A20F0;
 }
\ No newline at end of file
diff --git a/worktrolly-ui/src/app/body/create-new-sprint/create-new-sprint.component.html b/worktrolly-ui/src/app/body/create-new-sprint/create-new-sprint.component.html
index 3b34886db..6889065cd 100644
--- a/worktrolly-ui/src/app/body/create-new-sprint/create-new-sprint.component.html
+++ b/worktrolly-ui/src/app/body/create-new-sprint/create-new-sprint.component.html
@@ -25,28 +25,28 @@ <h5 class="active nav-link" style="font-weight:bolder">Create New Sprint</h5>
                     </div>
                 </div>
                 <div class="form-row">
-                    <div class="form-group col-md-3">
+                    <div class="form-group col-md-3 text-light">
                         <label for="input">Development</label>
                         <div class="alert text-white form-inline" id="detail" role="alert">
                             <div style="font-weight: bold;" class="pr-3"> No. of Task:</div>
                             <div class="ml-auto"> {{ totalDevelopment }} </div>
                         </div>
                     </div>
-                    <div class="form-group col-md-3">
+                    <div class="form-group col-md-3 text-light">
                         <label for="text">Business</label>
                         <div class="alert text-white form-inline" id="detail" role="alert">
                             <div style="font-weight: bold;" class="pr-3"> No. of Task:</div>
                             <div class="ml-auto"> {{ totalBusiness }} </div>
                         </div>
                     </div>
-                    <div class="form-group col-md-3">
+                    <div class="form-group col-md-3 text-light">
                         <label for="text">Marketing</label>
                         <div class="alert text-white form-inline" id="detail" role="alert">
                             <div style="font-weight: bold;" class="pr-3"> No. of Task:</div>
                             <div class="ml-auto"> {{ totalMarketing }} </div>
                         </div>
                     </div>
-                    <div class="form-group col-md-3">
+                    <div class="form-group col-md-3 text-light">
                         <label for="text">Other</label>
                         <div class="alert  text-white form-inline" id="detail" role="alert">
                             <div style="font-weight: bold;" class="pr-3"> No. of Task:</div>
@@ -55,15 +55,15 @@ <h5 class="active nav-link" style="font-weight:bolder">Create New Sprint</h5>
                     </div>
                 </div>
                 <div class="form-row">
-                    <div class="form-group col-md-4">
+                    <div class="form-group col-md-4 text-light">
                         <label for="input">Start Date</label>
                         <input class="form-control" type="date" [(ngModel)]="startDate" [ngModelOptions]="{standalone: true}">
                     </div>
-                    <div class="form-group col-md-4">
+                    <div class="form-group col-md-4 text-light">
                         <label for="input">End Date</label>
                         <input class="form-control" type="date" [(ngModel)]="endDate" [ngModelOptions]="{standalone: true}">
                     </div>
-                    <div class="form-group col-md-4">
+                    <div class="form-group col-md-4 text-light">
                         <label for="inputState">Status</label>
                         <select class="form-control" [(ngModel)]="status" [ngModelOptions]="{standalone: true}">
                             <option selected>choose...</option>
diff --git a/worktrolly-ui/src/app/body/filter-task/filter-task.component.css b/worktrolly-ui/src/app/body/filter-task/filter-task.component.css
index 853591e07..c3a3b72dc 100644
--- a/worktrolly-ui/src/app/body/filter-task/filter-task.component.css
+++ b/worktrolly-ui/src/app/body/filter-task/filter-task.component.css
@@ -1,6 +1,6 @@
 #button {
-    background-color: #10be65;
-    border: 2px solid #8120f0;
+    background-color: #16C85A;
+    border: 2px solid #5A20F0;
     color: white;
 }
 
@@ -12,12 +12,12 @@
 
 
 /* option {
-    background-color: #8120f0;
+    background-color: #5A20F0;
 } */
 
 select:focus,
 input:focus {
     box-shadow: none;
     outline: 0 none;
-    border-color: #8120f0;
+    border-color: #5A20F0;
 }
\ No newline at end of file
diff --git a/worktrolly-ui/src/app/body/filter-task/filter-task.component.html b/worktrolly-ui/src/app/body/filter-task/filter-task.component.html
index b56c6eed4..47006548f 100644
--- a/worktrolly-ui/src/app/body/filter-task/filter-task.component.html
+++ b/worktrolly-ui/src/app/body/filter-task/filter-task.component.html
@@ -1,4 +1,4 @@
-<div class="row">
+<div class="row text-light">
     <div class="col">
         <div class="form-check">
             <input type="checkbox" class="form-check-input" id="Assignee" [(ngModel)]="isAssigneeChecked" />
diff --git a/worktrolly-ui/src/app/body/loader/loader.component.css b/worktrolly-ui/src/app/body/loader/loader.component.css
index 6873d99b4..51b83b84a 100644
--- a/worktrolly-ui/src/app/body/loader/loader.component.css
+++ b/worktrolly-ui/src/app/body/loader/loader.component.css
@@ -1,3 +1,3 @@
 #loader {
-    color: #8120f0;
+    color: #5A20F0;
 }
\ No newline at end of file
diff --git a/worktrolly-ui/src/app/body/login/login.component.css b/worktrolly-ui/src/app/body/login/login.component.css
index 998caf1ab..a99f0d6dd 100644
--- a/worktrolly-ui/src/app/body/login/login.component.css
+++ b/worktrolly-ui/src/app/body/login/login.component.css
@@ -1,15 +1,15 @@
 #loginContainer {
-    border: 1px solid #8120f0;
+    border: 1px solid #5A20F0;
 }
 
 #loginNavbar {
-    background-color: #8120f0;
+    background-color: #5A20F0;
     color: white;
 }
 
 #button {
-    background-color: #10be65;
-    border: 1px solid #8120f0;
+    background-color: #16C85A;
+    border: 1px solid #5A20F0;
     color: white;
 }
 
diff --git a/worktrolly-ui/src/app/body/my-dashboard/my-dashboard.component.css b/worktrolly-ui/src/app/body/my-dashboard/my-dashboard.component.css
index 5aefc5d3e..1b1d32c4c 100644
--- a/worktrolly-ui/src/app/body/my-dashboard/my-dashboard.component.css
+++ b/worktrolly-ui/src/app/body/my-dashboard/my-dashboard.component.css
@@ -1,9 +1,9 @@
 #navbarMenu {
-    background-color: #8120f0;
+    background-color: #5A20F0;
 }
 
 .container {
     margin-top: 20px;
     margin-bottom: 10px;
-    border: 1px solid #8120f0;
+    border: 1px solid #5A20F0;
 }
\ No newline at end of file
diff --git a/worktrolly-ui/src/app/body/my-dashboard/my-dashboard.component.html b/worktrolly-ui/src/app/body/my-dashboard/my-dashboard.component.html
index 0759cb451..f5b3cc0bc 100644
--- a/worktrolly-ui/src/app/body/my-dashboard/my-dashboard.component.html
+++ b/worktrolly-ui/src/app/body/my-dashboard/my-dashboard.component.html
@@ -1,7 +1,7 @@
 <div id="taskPage">
     <div class="container pt-2 pb-4 pl-2">
         <div class="row">
-            <div class="col-9 col-md-10 m-2">
+            <div class="col-9 col-md-10 m-2 text-light">
                 <h5 style="font-weight:bolder">My DashBoard</h5>
             </div>
         </div>
diff --git a/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.css b/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.css
index 1109e61a5..96dc4e842 100644
--- a/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.css
+++ b/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.css
@@ -1,10 +1,10 @@
 #editPageTaskContainer {
-    border: 1px solid #8120f0;
+    border: 1px solid #5A20F0;
 }
 
 #button {
-    background-color: #10be65;
-    border: 2px solid #8120f0;
+    background-color: #16C85A;
+    border: 2px solid #5A20F0;
     color: white;
 }
 
@@ -15,17 +15,17 @@
 }
 
 #non-editable {
-    background-color: #10be65;
+    background-color: #16C85A;
     color: white;
 }
 
 #navbarMenu {
-    background-color: #8120f0;
+    background-color: #5A20F0;
 }
 
 select:focus,
 input:focus {
     box-shadow: none;
     outline: 0 none;
-    border-color: #8120f0;
+    border-color: #5A20F0;
 }
\ No newline at end of file
diff --git a/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.html b/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.html
index fae1e3e49..8f9a0d6e3 100644
--- a/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.html
+++ b/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.html
@@ -1,6 +1,6 @@
 <form *ngIf="!enableLoader" (ngSubmit)="editPage()" #form="ngForm">
     <div class="container p-3">
-        <div class="card text-dark mb-3" id="editPageTaskContainer">
+        <div class="card text-light mb-3" id="editPageTaskContainer" style="background-color:#202124;">
             <nav class="navbar navbar-expand-lg navbar-dark" id="navbarMenu">
                 <ul class="navbar-nav mr-auto">
                     <li class="nav-item">
diff --git a/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.css b/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.css
index 493e7201d..7d2bf71a5 100644
--- a/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.css
+++ b/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.css
@@ -1,25 +1,25 @@
 #logWorkPage {
-    border: 1px solid #8120f0;
+    border: 1px solid #5A20F0;
 }
 
 #logDetail {
-    background-color: #10be65;
+    background-color: #16C85A;
     color: white;
 }
 
 #logWorkSubmit {
-    background-color: #10be65;
-    border: 2px solid #8120f0;
+    background-color: #16C85A;
+    border: 2px solid #5A20F0;
     color: white;
 }
 
 #navbarMenu {
-    background-color: #8120f0;
+    background-color: #5A20F0;
 }
 
 select:focus,
 input:focus {
     box-shadow: none;
     outline: 0 none;
-    border-color: #8120f0;
+    border-color: #5A20F0;
 }
\ No newline at end of file
diff --git a/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.html b/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.html
index 89add2293..1f11b9f6a 100644
--- a/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.html
+++ b/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.html
@@ -1,7 +1,7 @@
 <ng-container *ngIf="!enableLoader">
     <form (ngSubmit)="submitLogWorkPage()" #form="ngForm">
         <div class="container p-3">
-            <div class="card text-dark mb-3" id="logWorkPage">
+            <div class="card text-light mb-3" id="logWorkPage" style="background-color:#202124;">
                 <nav class="navbar navbar-expand-lg navbar-dark" id="navbarMenu">
                     <ul class="navbar-nav mr-auto">
                         <li class="nav-item">
diff --git a/worktrolly-ui/src/app/body/task-details/task-details.component.css b/worktrolly-ui/src/app/body/task-details/task-details.component.css
index 4d4beeea5..3691f6c01 100644
--- a/worktrolly-ui/src/app/body/task-details/task-details.component.css
+++ b/worktrolly-ui/src/app/body/task-details/task-details.component.css
@@ -1,10 +1,10 @@
 #cardDescription {
-    border: 1px solid #8120f0;
+    border: 1px solid #5A20F0;
 }
 
 #button {
-    background-color: #10be65;
-    border: 1px solid #8120f0;
+    background-color: #16C85A;
+    border: 1px solid #5A20F0;
     color: white;
 }
 
@@ -15,5 +15,5 @@
 }
 
 #navbarMenu {
-    background-color: #8120f0;
+    background-color: #5A20F0;
 }
\ No newline at end of file
diff --git a/worktrolly-ui/src/app/body/task-details/task-details.component.html b/worktrolly-ui/src/app/body/task-details/task-details.component.html
index 46b99f467..c0b1b9180 100644
--- a/worktrolly-ui/src/app/body/task-details/task-details.component.html
+++ b/worktrolly-ui/src/app/body/task-details/task-details.component.html
@@ -1,7 +1,7 @@
 <ng-container *ngIf="taskDataObservable | async">
     <ng-container *ngIf="!logWorkEnabled && !editTaskEnabled">
         <div class="container p-5">
-            <div class="card text-dark mb-3" id="cardDescription">
+            <div class="card text-light mb-3" id="cardDescription" style="background-color:#202124;">
                 <nav class="navbar navbar-expand-lg navbar-dark" id="navbarMenu">
                     <ul class="navbar-nav mr-auto">
                         <li class="nav-item">
diff --git a/worktrolly-ui/src/app/body/tasks/task-cards/task-cards.component.css b/worktrolly-ui/src/app/body/tasks/task-cards/task-cards.component.css
index c946aa08a..4afb9bb23 100644
--- a/worktrolly-ui/src/app/body/tasks/task-cards/task-cards.component.css
+++ b/worktrolly-ui/src/app/body/tasks/task-cards/task-cards.component.css
@@ -1,5 +1,5 @@
 .taskCards {
-    border: 1px solid #8120f0;
+    border: 1px solid #5A20F0;
     font-size: 12px;
     color: #000;
 }
\ No newline at end of file
diff --git a/worktrolly-ui/src/app/body/tasks/task-cards/task-cards.component.html b/worktrolly-ui/src/app/body/tasks/task-cards/task-cards.component.html
index 0edb4357f..bc41c6c72 100644
--- a/worktrolly-ui/src/app/body/tasks/task-cards/task-cards.component.html
+++ b/worktrolly-ui/src/app/body/tasks/task-cards/task-cards.component.html
@@ -1,4 +1,4 @@
-<div class="card text-dark mb-3 taskCards" (click)="openTaskDetails(task.id)">
+<div class="card text-white mb-3 taskCards" (click)="openTaskDetails(task.id)" style="background-color: #20282E;">
     <div class="card-header">
         <div class="row pb-2">
             <div class="col-md-1 col-2 px-2">
diff --git a/worktrolly-ui/src/app/body/tasks/tasks.component.css b/worktrolly-ui/src/app/body/tasks/tasks.component.css
index 60e9d408e..912ce74f4 100644
--- a/worktrolly-ui/src/app/body/tasks/tasks.component.css
+++ b/worktrolly-ui/src/app/body/tasks/tasks.component.css
@@ -1,21 +1,21 @@
 #navbarMenu {
-    background-color: #8120f0;
+    background-color: #5A20F0;
     color: white;
 }
 
 .container {
     margin-top: 20px;
     margin-bottom: 10px;
-    border: 1px solid #8120f0;
+    border: 1px solid #5A20F0;
 }
 
 select:focus,
 input:focus {
     box-shadow: none;
     outline: 0 none;
-    border-color: #8120f0;
+    border-color: #5A20F0;
 }
 
 .toggleFilter {
-    color: #10be65;
+    color: #16C85A;
 }
\ No newline at end of file
diff --git a/worktrolly-ui/src/app/header/header.component.css b/worktrolly-ui/src/app/header/header.component.css
index f32e32317..3c7e4b4eb 100644
--- a/worktrolly-ui/src/app/header/header.component.css
+++ b/worktrolly-ui/src/app/header/header.component.css
@@ -1,12 +1,12 @@
 #login-btn {
-    background-color: #10be65;
-    border: 1px solid #8120f0;
+    background-color: #16C85A;
+    border: 1px solid #5A20F0;
     color: white;
 }
 
 #button {
-    background-color: #10be65;
-    border: 1px solid #8120f0;
+    background-color: #16C85A;
+    border: 1px solid #5A20F0;
     color: white;
 }
 
diff --git a/worktrolly-ui/src/app/header/header.component.html b/worktrolly-ui/src/app/header/header.component.html
index fdf5d6c2e..54ef5de98 100644
--- a/worktrolly-ui/src/app/header/header.component.html
+++ b/worktrolly-ui/src/app/header/header.component.html
@@ -1,4 +1,4 @@
-<nav class="navbar navbar-expand-lg sticky-top navbar-dark" style="background-color: #8120f0;">
+<nav class="navbar navbar-expand-lg sticky-top navbar-dark" style="background-color: #5A20F0;">
     <a class="navbar-brand text-white px-2" style="font-weight: bold;" href="index.html">
         <img src="../../assets/logo.png" width="30" height="30" alt="" loading="lazy"> Work Trolly
     </a>
diff --git a/worktrolly-ui/src/app/header/login-handler/login-handler.component.css b/worktrolly-ui/src/app/header/login-handler/login-handler.component.css
index 157d20294..0174c7037 100644
--- a/worktrolly-ui/src/app/header/login-handler/login-handler.component.css
+++ b/worktrolly-ui/src/app/header/login-handler/login-handler.component.css
@@ -1,6 +1,6 @@
 #button {
-    background-color: #10be65;
-    border: 1px solid #8120f0;
+    background-color: #16C85A;
+    border: 1px solid #5A20F0;
     color: white;
 }
 
diff --git a/worktrolly-ui/src/app/header/login-handler/user-card/user-card.component.css b/worktrolly-ui/src/app/header/login-handler/user-card/user-card.component.css
index 03ffe1d5f..c4125b272 100644
--- a/worktrolly-ui/src/app/header/login-handler/user-card/user-card.component.css
+++ b/worktrolly-ui/src/app/header/login-handler/user-card/user-card.component.css
@@ -1,17 +1,17 @@
 #dropdownUserCard {
-    border: 1px solid #8120f0;
+    border: 1px solid #5A20F0;
 }
 
 .dropdown-item:hover {
-    background-color: #8120f0;
+    background-color: #5A20F0;
 }
 
 #username {
-    background-color: #8120f0;
+    background-color: #5A20F0;
     color: white;
     font-weight: bolder;
 }
 
 #line {
-    border: 1px solid #8120f0;
+    border: 1px solid #5A20F0;
 }
\ No newline at end of file
diff --git a/worktrolly-ui/src/environments/environment.prod.ts b/worktrolly-ui/src/environments/environment.prod.ts
index 16380fac9..8505dfbf1 100644
--- a/worktrolly-ui/src/environments/environment.prod.ts
+++ b/worktrolly-ui/src/environments/environment.prod.ts
@@ -1,13 +1,21 @@
 export const environment = {
   production: true,
   firebase: {
-    apiKey: "AIzaSyAP-cLcP8gB3bsUHSK9oexPq0BDykBPzzE",
-    authDomain: "worktrolly.firebaseapp.com",
-    databaseURL: "https://worktrolly.firebaseio.com",
-    projectId: "worktrolly",
-    storageBucket: "worktrolly.appspot.com",
-    messagingSenderId: "358996208239",
-    appId: "1:358996208239:web:73a1939b7267070d2dfb9a",
-    measurementId: "G-FEQ8PFLLCV"
+    // apiKey: "AIzaSyAP-cLcP8gB3bsUHSK9oexPq0BDykBPzzE",
+    // authDomain: "worktrolly.firebaseapp.com",
+    // databaseURL: "https://worktrolly.firebaseio.com",
+    // projectId: "worktrolly",
+    // storageBucket: "worktrolly.appspot.com",
+    // messagingSenderId: "358996208239",
+    // appId: "1:358996208239:web:73a1939b7267070d2dfb9a",
+    // measurementId: "G-FEQ8PFLLCV"
+    apiKey: "AIzaSyAaMjQnm3NnUmHHW2Smt6wJyRV7a0FIeFo",
+  authDomain: "wls1-b942d.firebaseapp.com",
+  databaseURL: "https://wls1-b942d.firebaseio.com",
+  projectId: "wls1-b942d",
+  storageBucket: "wls1-b942d.appspot.com",
+  messagingSenderId: "1056324548947",
+  appId: "1:1056324548947:web:642a1d3c3fab60460c49a6",
+  measurementId: "G-KWPDV4PSDG"
   }
 };
diff --git a/worktrolly-ui/src/environments/environment.ts b/worktrolly-ui/src/environments/environment.ts
index fcf63f9bb..0d37f57b0 100644
--- a/worktrolly-ui/src/environments/environment.ts
+++ b/worktrolly-ui/src/environments/environment.ts
@@ -5,14 +5,22 @@
 export const environment = {
   production: false,
   firebase: {
-    apiKey: "AIzaSyAP-cLcP8gB3bsUHSK9oexPq0BDykBPzzE",
-    authDomain: "worktrolly.firebaseapp.com",
-    databaseURL: "https://worktrolly.firebaseio.com",
-    projectId: "worktrolly",
-    storageBucket: "worktrolly.appspot.com",
-    messagingSenderId: "358996208239",
-    appId: "1:358996208239:web:73a1939b7267070d2dfb9a",
-    measurementId: "G-FEQ8PFLLCV"
+    // apiKey: "AIzaSyAP-cLcP8gB3bsUHSK9oexPq0BDykBPzzE",
+    // authDomain: "worktrolly.firebaseapp.com",
+    // databaseURL: "https://worktrolly.firebaseio.com",
+    // projectId: "worktrolly",
+    // storageBucket: "worktrolly.appspot.com",
+    // messagingSenderId: "358996208239",
+    // appId: "1:358996208239:web:73a1939b7267070d2dfb9a",
+    // measurementId: "G-FEQ8PFLLCV"
+    apiKey: "AIzaSyAaMjQnm3NnUmHHW2Smt6wJyRV7a0FIeFo",
+  authDomain: "wls1-b942d.firebaseapp.com",
+  databaseURL: "https://wls1-b942d.firebaseio.com",
+  projectId: "wls1-b942d",
+  storageBucket: "wls1-b942d.appspot.com",
+  messagingSenderId: "1056324548947",
+  appId: "1:1056324548947:web:642a1d3c3fab60460c49a6",
+  measurementId: "G-KWPDV4PSDG"
   }
 };
 
diff --git a/worktrolly-ui/src/index.html b/worktrolly-ui/src/index.html
index 35db8ce35..8b3c33fa2 100644
--- a/worktrolly-ui/src/index.html
+++ b/worktrolly-ui/src/index.html
@@ -7,7 +7,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="icon" type="image/x-icon" href="favicon.ico">
 </head>
-<body>
+<body style="background-color:#11171B;">
   <app-root></app-root>
 </body>
 </html>

From 5e5e9f3815fb87f70152b0205e80da5cd0293faa Mon Sep 17 00:00:00 2001
From: bighnesh0404 <saibighneshprusty@gmail.com>
Date: Sun, 24 Jan 2021 19:07:24 +0530
Subject: [PATCH 14/37] feat(darkTheme)

---
 .../body/create-new-session/create-new-session.component.html   | 2 +-
 .../app/body/create-new-sprint/create-new-sprint.component.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.html b/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.html
index a6b09ea8e..b75567f73 100644
--- a/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.html
+++ b/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.html
@@ -1,5 +1,5 @@
 <div *ngIf="!enableLoader" class="container py-5">
-    <div id="createNewTaskContainer">
+    <div id="createNewTaskContainer" style="background-color:#202124;">
         <div class="row">
             <div class="col">
                 <nav class="navbar navbar-expand-lg navbar-dark" id="navbarMenu">
diff --git a/worktrolly-ui/src/app/body/create-new-sprint/create-new-sprint.component.html b/worktrolly-ui/src/app/body/create-new-sprint/create-new-sprint.component.html
index 6889065cd..edefe1be4 100644
--- a/worktrolly-ui/src/app/body/create-new-sprint/create-new-sprint.component.html
+++ b/worktrolly-ui/src/app/body/create-new-sprint/create-new-sprint.component.html
@@ -1,5 +1,5 @@
 <div *ngIf="!enableLoader" class="container">
-    <div class="mt-5" id="startNewSprintContainer">
+    <div class="mt-5" id="startNewSprintContainer" style="background-color:#202124;">
         <div class="row">
             <div class="col">
                 <nav class="navbar navbar-expand-lg navbar-dark" id="navbarMenu">

From 086a2bb4f453432e1795a8701a27902a422c13f5 Mon Sep 17 00:00:00 2001
From: bighnesh0404 <saibighneshprusty@gmail.com>
Date: Sun, 24 Jan 2021 19:11:01 +0530
Subject: [PATCH 15/37] feat(darkTheme)

---
 .../src/environments/environment.prod.ts      | 24 +++++++------------
 worktrolly-ui/src/environments/environment.ts | 24 +++++++------------
 2 files changed, 16 insertions(+), 32 deletions(-)

diff --git a/worktrolly-ui/src/environments/environment.prod.ts b/worktrolly-ui/src/environments/environment.prod.ts
index 8505dfbf1..16380fac9 100644
--- a/worktrolly-ui/src/environments/environment.prod.ts
+++ b/worktrolly-ui/src/environments/environment.prod.ts
@@ -1,21 +1,13 @@
 export const environment = {
   production: true,
   firebase: {
-    // apiKey: "AIzaSyAP-cLcP8gB3bsUHSK9oexPq0BDykBPzzE",
-    // authDomain: "worktrolly.firebaseapp.com",
-    // databaseURL: "https://worktrolly.firebaseio.com",
-    // projectId: "worktrolly",
-    // storageBucket: "worktrolly.appspot.com",
-    // messagingSenderId: "358996208239",
-    // appId: "1:358996208239:web:73a1939b7267070d2dfb9a",
-    // measurementId: "G-FEQ8PFLLCV"
-    apiKey: "AIzaSyAaMjQnm3NnUmHHW2Smt6wJyRV7a0FIeFo",
-  authDomain: "wls1-b942d.firebaseapp.com",
-  databaseURL: "https://wls1-b942d.firebaseio.com",
-  projectId: "wls1-b942d",
-  storageBucket: "wls1-b942d.appspot.com",
-  messagingSenderId: "1056324548947",
-  appId: "1:1056324548947:web:642a1d3c3fab60460c49a6",
-  measurementId: "G-KWPDV4PSDG"
+    apiKey: "AIzaSyAP-cLcP8gB3bsUHSK9oexPq0BDykBPzzE",
+    authDomain: "worktrolly.firebaseapp.com",
+    databaseURL: "https://worktrolly.firebaseio.com",
+    projectId: "worktrolly",
+    storageBucket: "worktrolly.appspot.com",
+    messagingSenderId: "358996208239",
+    appId: "1:358996208239:web:73a1939b7267070d2dfb9a",
+    measurementId: "G-FEQ8PFLLCV"
   }
 };
diff --git a/worktrolly-ui/src/environments/environment.ts b/worktrolly-ui/src/environments/environment.ts
index 0d37f57b0..fcf63f9bb 100644
--- a/worktrolly-ui/src/environments/environment.ts
+++ b/worktrolly-ui/src/environments/environment.ts
@@ -5,22 +5,14 @@
 export const environment = {
   production: false,
   firebase: {
-    // apiKey: "AIzaSyAP-cLcP8gB3bsUHSK9oexPq0BDykBPzzE",
-    // authDomain: "worktrolly.firebaseapp.com",
-    // databaseURL: "https://worktrolly.firebaseio.com",
-    // projectId: "worktrolly",
-    // storageBucket: "worktrolly.appspot.com",
-    // messagingSenderId: "358996208239",
-    // appId: "1:358996208239:web:73a1939b7267070d2dfb9a",
-    // measurementId: "G-FEQ8PFLLCV"
-    apiKey: "AIzaSyAaMjQnm3NnUmHHW2Smt6wJyRV7a0FIeFo",
-  authDomain: "wls1-b942d.firebaseapp.com",
-  databaseURL: "https://wls1-b942d.firebaseio.com",
-  projectId: "wls1-b942d",
-  storageBucket: "wls1-b942d.appspot.com",
-  messagingSenderId: "1056324548947",
-  appId: "1:1056324548947:web:642a1d3c3fab60460c49a6",
-  measurementId: "G-KWPDV4PSDG"
+    apiKey: "AIzaSyAP-cLcP8gB3bsUHSK9oexPq0BDykBPzzE",
+    authDomain: "worktrolly.firebaseapp.com",
+    databaseURL: "https://worktrolly.firebaseio.com",
+    projectId: "worktrolly",
+    storageBucket: "worktrolly.appspot.com",
+    messagingSenderId: "358996208239",
+    appId: "1:358996208239:web:73a1939b7267070d2dfb9a",
+    measurementId: "G-FEQ8PFLLCV"
   }
 };
 

From af08e565a26bcbba7f02c3da229d8bad560b2cd5 Mon Sep 17 00:00:00 2001
From: AvinashMahanthi <avinashfab5678@gmail.com>
Date: Mon, 25 Jan 2021 16:20:42 +0530
Subject: [PATCH 16/37] feat(task-details.component): fixed UI

---
 .../task-details/task-details.component.css   |  9 +------
 .../task-details/task-details.component.html  | 24 +++++++++----------
 2 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/worktrolly-ui/src/app/body/task-details/task-details.component.css b/worktrolly-ui/src/app/body/task-details/task-details.component.css
index b8d1360eb..8681a2605 100644
--- a/worktrolly-ui/src/app/body/task-details/task-details.component.css
+++ b/worktrolly-ui/src/app/body/task-details/task-details.component.css
@@ -20,14 +20,7 @@
 
 @media (max-width: 991px) {
     .navbar-nav {
-        float: left;
-        flex-direction: row;
-    }
-}
-
-@media (max-width: 392px) {
-    .navbar-nav {
-        float: left;
+        float: right;
         flex-direction: row;
     }
 }
\ No newline at end of file
diff --git a/worktrolly-ui/src/app/body/task-details/task-details.component.html b/worktrolly-ui/src/app/body/task-details/task-details.component.html
index 8211092dc..fe64c6947 100644
--- a/worktrolly-ui/src/app/body/task-details/task-details.component.html
+++ b/worktrolly-ui/src/app/body/task-details/task-details.component.html
@@ -5,25 +5,23 @@
                 <nav class="navbar navbar-expand-lg navbar-dark" id="navbarMenu">
                     <ul class="navbar-nav mr-auto">
                         <li class="nav-item">
-                            <h5 class="active nav-link" style="font-weight:bolder">Task Details</h5>
+                            <h5 class="active nav-link navbar-text" style="font-weight:bolder">Task Details</h5>
                         </li>
                     </ul>
-                    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarTexts" aria-controls="navbarText" aria-expanded="false" aria-label="Toggle navigation">
-                        <span class="navbar-toggler-icon text-white"></span>
-                    </button>
-                    <div class="collapse navbar-collapse pl-lg-0" id="navbarTexts">
+                    <div class="pl-lg-0" id="navbarTexts">
                         <ul class="nav navbar-nav ml-auto align-items-center">
-                            <li class="nav-item active pr-5 py-1 justify-content-between">
-                                <button type="submit" class="btn" id="button" *ngIf="(authService.afauth.user | async) && task.Status!=='Completed'" (click)="logWorkPage()">Log Work</button>
+                            <li class=" active pr-3 py-1 justify-content-between">
+                                <span type="submit" class="material-icons text-light" data-bs-toggle="tooltip" data-bs-placement="top" title="Log work" *ngIf="(authService.afauth.user | async) && task.Status!=='Completed'" (click)="logWorkPage()">pending_actions</span>
                             </li>
-                            <li class="nav-item active pr-4 py-1 justify-content-between">
-                                <span type="button" class="material-icons text-light" *ngIf="(authService.afauth.user | async) && task.Status!=='Completed'" (click)="editTask()">edit</span>
+                            <li class=" active pr-3 py-1 justify-content-between">
+                                <span type="button" class="material-icons text-light" data-bs-toggle="tooltip" data-bs-placement="top" title="Edit" *ngIf="(authService.afauth.user | async) && task.Status!=='Completed'" (click)="editTask()">edit</span>
                             </li>
-                            <li class="nav-item active pr-2 py-1 justify-content-between" *ngIf="authService.afauth.user | async">
-                                <span type="button" class="material-icons text-light mr-3" (click)="deleteTask()"> delete </span>
+                            <li class=" active pr-1 py-1 justify-content-between" data-bs-toggle="tooltip" data-bs-placement="top" title="Delete" *ngIf="authService.afauth.user | async">
+                                <span type="button" class="material-icons text-light mr-3" (click)="deleteTask()">
+                                    delete </span>
                             </li>
-                            <li class="nav-item active py-1 justify-content-between">
-                                <span type="button" class="material-icons text-light" (click)="backToTasks()">close</span>
+                            <li class=" active py-1 justify-content-between">
+                                <span type="button" class="material-icons text-light" data-bs-toggle="tooltip" data-bs-placement="top" title="close" (click)="backToTasks()">close</span>
                             </li>
                         </ul>
                     </div>

From e047849e477e0a7d6a9e5d2adfb898a2005d6f78 Mon Sep 17 00:00:00 2001
From: bighnesh0404 <saibighneshprusty@gmail.com>
Date: Mon, 25 Jan 2021 19:21:22 +0530
Subject: [PATCH 17/37] Feat(darkTheme)

---
 worktrolly-ui/package-lock.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/worktrolly-ui/package-lock.json b/worktrolly-ui/package-lock.json
index bb64020a6..2193a0322 100644
--- a/worktrolly-ui/package-lock.json
+++ b/worktrolly-ui/package-lock.json
@@ -1,6 +1,6 @@
 {
-  "name": "worktrolly",
-  "version": "0.2.0",
+  "name": "worktrolly-ui",
+  "version": "0.0.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

From 701f700a1ee0d4d4d3bb0895d8ddeba0d2f7a1ce Mon Sep 17 00:00:00 2001
From: shreyachowdhury4 <shreya040624@gmail.com>
Date: Tue, 26 Jan 2021 12:02:21 +0530
Subject: [PATCH 18/37] fix task-cards ui

---
 .../app/body/tasks/task-cards/task-cards.component.css |  3 +++
 .../body/tasks/task-cards/task-cards.component.html    | 10 +++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/worktrolly-ui/src/app/body/tasks/task-cards/task-cards.component.css b/worktrolly-ui/src/app/body/tasks/task-cards/task-cards.component.css
index 7d3202b08..719b6f959 100644
--- a/worktrolly-ui/src/app/body/tasks/task-cards/task-cards.component.css
+++ b/worktrolly-ui/src/app/body/tasks/task-cards/task-cards.component.css
@@ -2,4 +2,7 @@
     border: 1px solid #8120f0;
     font-size: 15px;
     color: #000;
+}
+.app-status-icons {
+    padding-bottom: 10px;
 }
\ No newline at end of file
diff --git a/worktrolly-ui/src/app/body/tasks/task-cards/task-cards.component.html b/worktrolly-ui/src/app/body/tasks/task-cards/task-cards.component.html
index be165ba40..43735b2ce 100644
--- a/worktrolly-ui/src/app/body/tasks/task-cards/task-cards.component.html
+++ b/worktrolly-ui/src/app/body/tasks/task-cards/task-cards.component.html
@@ -1,17 +1,17 @@
 <div class="card text-dark mb-3 taskCards" (click)="openTaskDetails(task.id)">
     <div class="card-header">
         <div class="row pb-2">
-            <div class="col-md-1 col-1 px-2">
+            <div class="col-md-1 col-1 px-2 pt-3">
                 <app-status-icons [Status]="task.Status"></app-status-icons>
                 <app-priority-icons [Priority]="task.Priority"></app-priority-icons>
             </div>
-            <div class="col-md-1 col-1 px-2">
-                <span style="font-weight: bold;" data-toggle="tooltip" data-placement="top" title="task.id">{{task.id}}</span>
+            <div class="col-md-1 col-1 px-2 pt-3">
+                <span style="font-weight:bold;" data-toggle="tooltip" data-placement="top" title="task.id">{{task.id}}</span>
             </div>
-            <div class="col-md-7 col-4 px-2">
+            <div class="col-md-7 col-4 px-2 pt-2">
                 <span class="material-icons" data-toggle="tooltip" data-placement="top" title="Title">Title</span> {{task.Title}}
             </div>
-            <div class="col-md-2 col-2 px-2">
+            <div class="col-md-2 col-2 px-2 pt-3">
                 <span class="material-icons" data-toggle="tooltip" style="vertical-align: middle;" data-placement="top" title="Assignee">perm_identity</span> {{task.Assignee}}
             </div>
         </div>

From 8c912f09334a9f59904c823b845dbd9977a7c3af Mon Sep 17 00:00:00 2001
From: sandeep-v1404 <valpasanisandeep@gmail.com>
Date: Tue, 26 Jan 2021 12:53:16 +0530
Subject: [PATCH 19/37] feat(Chart):Modified Changes

---
 .../performance-chart.component.ts                |  6 +++---
 .../range-card/range-card.component.ts            | 15 +++++++++++++--
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/worktrolly-ui/src/app/body/my-dashboard/performance-chart/performance-chart.component.ts b/worktrolly-ui/src/app/body/my-dashboard/performance-chart/performance-chart.component.ts
index 81435a087..02c991138 100644
--- a/worktrolly-ui/src/app/body/my-dashboard/performance-chart/performance-chart.component.ts
+++ b/worktrolly-ui/src/app/body/my-dashboard/performance-chart/performance-chart.component.ts
@@ -28,9 +28,6 @@ export class PerformanceChartComponent implements OnInit {
     });
   }
   async createData() {
-    if (this.sprintRange2 <= 0) {
-      this.sprintRange2 = this.currentSprintNumber
-    }
     let tempData = []
     for (let index = this.sprintRange1; index <= this.sprintRange2; index++) {
       let storyPoint: number = 0
@@ -63,6 +60,9 @@ export class PerformanceChartComponent implements OnInit {
     this.showLoader = true
     this.sprintRange1 = rangeData.sprintRange1
     this.sprintRange2 = rangeData.sprintRange2
+    if (this.sprintRange2 > this.currentSprintNumber) {
+      this.sprintRange2 = this.currentSprintNumber
+    }
     this.createData().then(data => {
       this.data = data
       this.showLoader = false
diff --git a/worktrolly-ui/src/app/body/my-dashboard/performance-chart/range-card/range-card.component.ts b/worktrolly-ui/src/app/body/my-dashboard/performance-chart/range-card/range-card.component.ts
index 0e819accd..3362c057e 100644
--- a/worktrolly-ui/src/app/body/my-dashboard/performance-chart/range-card/range-card.component.ts
+++ b/worktrolly-ui/src/app/body/my-dashboard/performance-chart/range-card/range-card.component.ts
@@ -17,8 +17,19 @@ export class RangeCardComponent implements OnInit {
   ngOnInit(): void {
   }
   onSetRange() {
+    if (this.sprintRange1 > this.sprintRange2) {
+      let temp = this.sprintRange2
+      this.sprintRange2 = this.sprintRange1
+      this.sprintRange1 = temp
+    }
+    if (this.sprintRange1 <= 0) {
+      this.sprintRange1 = 1
+    }
+    if (this.sprintRange2 <= 1) {
+      this.sprintRange2 = 2
+    }
     this.setRange.emit({ sprintRange1: this.sprintRange1, sprintRange2: this.sprintRange2 });
-    this.sprintRange1 = 1
-    this.sprintRange2 = 2
+    this.sprintRange1 = 0
+    this.sprintRange2 = 0
   }
 }

From 6332a2baaf6a12e4a42245e209ed58d00024a8c6 Mon Sep 17 00:00:00 2001
From: sandeep-v1404 <valpasanisandeep@gmail.com>
Date: Tue, 26 Jan 2021 13:24:18 +0530
Subject: [PATCH 20/37] feat(Chart):Added Validation to Range-Card

---
 .../range-card/range-card.component.html      |   2 +-
 .../range-card/range-card.component.ts        |  26 +-
 .../src/app/services/validation.service.ts    | 301 +++++++++---------
 3 files changed, 171 insertions(+), 158 deletions(-)

diff --git a/worktrolly-ui/src/app/body/my-dashboard/performance-chart/range-card/range-card.component.html b/worktrolly-ui/src/app/body/my-dashboard/performance-chart/range-card/range-card.component.html
index 05b3e9907..4c10019f6 100644
--- a/worktrolly-ui/src/app/body/my-dashboard/performance-chart/range-card/range-card.component.html
+++ b/worktrolly-ui/src/app/body/my-dashboard/performance-chart/range-card/range-card.component.html
@@ -21,7 +21,7 @@
         </div>
         <div class="row p-1">
             <div class="offset-5 offset-sm-6 offset-md-7 col">
-                <button type="submit" class="btn" id="button" (click)="onSetRange()">Submit</button>
+                <button type="submit" class="btn" id="button" (click)="validateRange()">Submit</button>
             </div>
         </div>
     </div>
diff --git a/worktrolly-ui/src/app/body/my-dashboard/performance-chart/range-card/range-card.component.ts b/worktrolly-ui/src/app/body/my-dashboard/performance-chart/range-card/range-card.component.ts
index 3362c057e..12933685f 100644
--- a/worktrolly-ui/src/app/body/my-dashboard/performance-chart/range-card/range-card.component.ts
+++ b/worktrolly-ui/src/app/body/my-dashboard/performance-chart/range-card/range-card.component.ts
@@ -1,4 +1,5 @@
 import { Component, EventEmitter, OnInit, Output } from '@angular/core';
+import { ValidationService } from 'src/app/services/validation.service';
 
 @Component({
   selector: 'app-range-card',
@@ -11,23 +12,22 @@ export class RangeCardComponent implements OnInit {
   sprintRange1: number
   sprintRange2: number
 
-
-  constructor() { }
+  constructor(public validationService: ValidationService) { }
 
   ngOnInit(): void {
   }
-  onSetRange() {
-    if (this.sprintRange1 > this.sprintRange2) {
-      let temp = this.sprintRange2
-      this.sprintRange2 = this.sprintRange1
-      this.sprintRange1 = temp
-    }
-    if (this.sprintRange1 <= 0) {
-      this.sprintRange1 = 1
-    }
-    if (this.sprintRange2 <= 1) {
-      this.sprintRange2 = 2
+  async validateRange() {
+    var condition = await (this.validationService.checkSprintRange(this.sprintRange1, this.sprintRange2)).then(res => {
+      return res;
+    });
+    if (condition) {
+      console.log("Inputs are valid");
+      this.onSetRange();
     }
+    else
+      console.log("Validation error");
+  }
+  onSetRange() {
     this.setRange.emit({ sprintRange1: this.sprintRange1, sprintRange2: this.sprintRange2 });
     this.sprintRange1 = 0
     this.sprintRange2 = 0
diff --git a/worktrolly-ui/src/app/services/validation.service.ts b/worktrolly-ui/src/app/services/validation.service.ts
index 557e587ef..f9e565449 100644
--- a/worktrolly-ui/src/app/services/validation.service.ts
+++ b/worktrolly-ui/src/app/services/validation.service.ts
@@ -3,256 +3,269 @@ import { User } from "../Interface/UserInterface";
 import { Tasks } from "../Interface/TasksInterface";
 import { FormControl, Validators } from '@angular/forms';
 
-@Injectable({    
+@Injectable({
     providedIn: 'root',
-})    
+})
 
-export class ValidationService {    
+export class ValidationService {
 
-    constructor() { }    
+    constructor() { }
 
-    validation(label:any, value:any){
-        switch(label)
-        {
-            case 'title': { 
+    validation(label: any, value: any) {
+        switch (label) {
+            case 'title': {
                 return this.checkTitle(value);
-            } 
-            case 'status': { 
+            }
+            case 'status': {
                 return this.checkStatus(value);
-            } 
-            case 'priority': { 
-                return(this.checkPriority(value)); 
-            } 
-            case 'estimatedTime': { 
-                return(this.checkEstimatedTime(value));
-            } 
-            case 'difficulty': { 
-                return(this.checkDifficulty(value));
-            } 
-            case 'description': { 
-                return(this.checkDescription(value));
-            } 
-            case 'creator': { 
-                return(this.checkCreator(value));
-            } 
-            case 'category': { 
-                return(this.checkCategory(value));
-            } 
-            case 'assignee': { 
-                return(this.checkAssignee(value));
-            } 
-            case 'creationDate': { 
-                return(this.checkCreationDate(value));
-            } 
-            case 'sprintNumber': { 
-                return(this.checkSprintNumber(value));
-            } 
-            case 'storyPoint': { 
-                return(this.checkStoryPoint(value));
-            } 
-            case 'startDate': { 
-                return(this.checkStartDate(value));
-            } 
-            case 'endDate': { 
-                return(this.checkEndDate(value));
             }
-            case 'logHours': { 
-                return(this.checkLogHours(value));
-            } 
-            case 'workCompleted': { 
-                return(this.checkWorkCompleted(value));
-            } 
-            case 'comment': { 
-                return(this.checkComment(value));
-            } 
+            case 'priority': {
+                return (this.checkPriority(value));
+            }
+            case 'estimatedTime': {
+                return (this.checkEstimatedTime(value));
+            }
+            case 'difficulty': {
+                return (this.checkDifficulty(value));
+            }
+            case 'description': {
+                return (this.checkDescription(value));
+            }
+            case 'creator': {
+                return (this.checkCreator(value));
+            }
+            case 'category': {
+                return (this.checkCategory(value));
+            }
+            case 'assignee': {
+                return (this.checkAssignee(value));
+            }
+            case 'creationDate': {
+                return (this.checkCreationDate(value));
+            }
+            case 'sprintNumber': {
+                return (this.checkSprintNumber(value));
+            }
+            case 'storyPoint': {
+                return (this.checkStoryPoint(value));
+            }
+            case 'startDate': {
+                return (this.checkStartDate(value));
+            }
+            case 'endDate': {
+                return (this.checkEndDate(value));
+            }
+            case 'logHours': {
+                return (this.checkLogHours(value));
+            }
+            case 'workCompleted': {
+                return (this.checkWorkCompleted(value));
+            }
+            case 'comment': {
+                return (this.checkComment(value));
+            }
         }
     }
 
-    async checkValidity(data: any[]){
+    async checkValidity(data: any[]) {
         var valid = 0;
-        
+
         for (const element of data) {
             var condition = await this.validation(element.label, element.value).then(res => {
-                return res;});
-            if(condition)
-            {
-                valid+=1;
+                return res;
+            });
+            if (condition) {
+                valid += 1;
             }
         }
         if (valid == data.length)
             return (true);
         else
-            return(false);
+            return (false);
     }
 
-    async checkTitle(value: String){
+    async checkTitle(value: String) {
         const control = new FormControl(value, Validators.required);
         if (control.errors === null)
-            return(true);
-        else{
+            return (true);
+        else {
             console.log("Title field is required");
-            return(false);
+            return (false);
         }
     }
 
-    async checkStatus(value: String){
+    async checkStatus(value: String) {
         const control = new FormControl(value, Validators.required);
         if (control.errors === null)
-            return(true);
-        else{
+            return (true);
+        else {
             console.log("Status field is required");
-            return(false);
+            return (false);
         }
     }
 
-    async checkPriority(value: String){
+    async checkPriority(value: String) {
         const control = new FormControl(value, Validators.required);
         if (control.errors === null)
-            return(true);
-        else{
+            return (true);
+        else {
             console.log("Priority field is required");
-            return(false);
-        }    
+            return (false);
+        }
     }
 
-    async checkEstimatedTime(value: number){
+    async checkEstimatedTime(value: number) {
         const control = new FormControl(value, Validators.required);
         if (control.errors === null)
-            return(true);
-        else{
+            return (true);
+        else {
             console.log("Estimated-Time field is required");
-            return(false);
-        }    
+            return (false);
+        }
     }
 
-    async checkDifficulty(value: String){
+    async checkDifficulty(value: String) {
         const control = new FormControl(value, Validators.required);
         if (control.errors === null)
-            return(true);
-        else{
+            return (true);
+        else {
             console.log("Difficulty field is required");
-            return(false);
+            return (false);
         }
     }
 
-    async checkDescription(value: String){
+    async checkDescription(value: String) {
         const control = new FormControl(value, Validators.required);
         if (control.errors === null)
-            return(true);
-        else{
+            return (true);
+        else {
             console.log("Description field is required");
-            return(false);
+            return (false);
         }
     }
 
-    async checkCreator(value: String){
+    async checkCreator(value: String) {
         const control = new FormControl(value, Validators.required);
         if (control.errors === null)
-            return(true);
-        else{
+            return (true);
+        else {
             console.log("Creator field is required");
-            return(false);
+            return (false);
         }
     }
 
-    async checkCategory(value: String){
+    async checkCategory(value: String) {
         const control = new FormControl(value, Validators.required);
         if (control.errors === null)
-            return(true);
-        else{
+            return (true);
+        else {
             console.log("Category field is required");
-            return(false);
-        }    
+            return (false);
+        }
     }
 
-    async checkAssignee(value: String){
+    async checkAssignee(value: String) {
         const control = new FormControl(value, Validators.required);
         if (control.errors === null)
-            return(true);
-        else{
+            return (true);
+        else {
             console.log("Assignee field is required");
-            return(false);
-        }   
+            return (false);
+        }
     }
 
-    async checkCreationDate(value: String){
+    async checkCreationDate(value: String) {
         const control = new FormControl(value, Validators.required);
         if (control.errors === null)
-            return(true);
-        else{
+            return (true);
+        else {
             console.log("Creation-Date field is required");
-            return(false);
-        }   
+            return (false);
+        }
     }
 
-    async checkSprintNumber(value: number){
+    async checkSprintNumber(value: number) {
         const control = new FormControl(value, Validators.required);
         if (control.errors === null)
-            return(true);
-        else{
+            return (true);
+        else {
             console.log("Sprint-Number field is required");
-            return(false);
-        }   
+            return (false);
+        }
     }
 
-    async checkStoryPoint(value: number){
+    async checkStoryPoint(value: number) {
         const control = new FormControl(value, Validators.required);
         if (control.errors === null)
-            return(true);
-        else{
+            return (true);
+        else {
             console.log("Story-Point field is required");
-            return(false);
-        }  
+            return (false);
+        }
     }
 
-    async checkStartDate(value: String){
+    async checkStartDate(value: String) {
         const control = new FormControl(value, Validators.required);
         if (control.errors === null)
-            return(true);
-        else{
+            return (true);
+        else {
             console.log("Start-Date field is required");
-            return(false);
-        }  
+            return (false);
+        }
     }
 
-    async checkEndDate(value: String){
+    async checkEndDate(value: String) {
         const control = new FormControl(value, Validators.required);
         if (control.errors === null)
-            return(true);
-        else{
+            return (true);
+        else {
             console.log("End-Date field is required");
-            return(false);
-        }  
+            return (false);
+        }
     }
 
-    async checkLogHours(value: number){
+    async checkLogHours(value: number) {
         const control = new FormControl(value, Validators.required);
         if (control.errors === null)
-            return(true);
-        else{
+            return (true);
+        else {
             console.log("Log-Hours field is required");
-            return(false);
-        }  
+            return (false);
+        }
     }
 
-    async checkWorkCompleted(value: number){
+    async checkWorkCompleted(value: number) {
         const control = new FormControl(value, Validators.required);
         if (control.errors === null)
-            return(true);
-        else{
+            return (true);
+        else {
             console.log("Work-Completed field is required");
-            return(false);
-        }  
+            return (false);
+        }
     }
 
-    async checkComment(value: String){
+    async checkComment(value: String) {
         const control = new FormControl(value, Validators.required);
         if (control.errors === null)
-            return(true);
-        else{
+            return (true);
+        else {
             console.log("Comment field is required");
-            return(false);
-        }  
+            return (false);
+        }
     }
-
-}    
\ No newline at end of file
+    async checkSprintRange(value1: number, value2: number) {
+        if (value1 >= value2) {
+            console.log("Start Range should not be greater or equal to End Range");
+            return (false)
+        }
+        if (value1 <= 0) {
+            console.log("Start Range should not be less than 1");
+            return (false)
+        }
+        if (value2 <= 0) {
+            console.log("End Range should not be less than 1");
+            return (false)
+        }
+        return (true)
+    }
+}  
\ No newline at end of file

From 2378f13d98dd8e8234a4ab66ff636eba3182c60a Mon Sep 17 00:00:00 2001
From: SandeepV <valpasanisandeep@gmail.com>
Date: Tue, 26 Jan 2021 14:59:08 +0530
Subject: [PATCH 21/37] Update package-lock.json

---
 worktrolly-ui/package-lock.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/worktrolly-ui/package-lock.json b/worktrolly-ui/package-lock.json
index e3ddb0a9d..816a91dbf 100644
--- a/worktrolly-ui/package-lock.json
+++ b/worktrolly-ui/package-lock.json
@@ -1,6 +1,6 @@
 {
-  "name": "worktrolly",
-  "version": "0.2.0",
+  "name": "worktrolly-ui",
+  "version": "0.0.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

From 67151aaf93850e770e6017ccce23c88c6d0d059a Mon Sep 17 00:00:00 2001
From: sandeep-v1404 <valpasanisandeep@gmail.com>
Date: Tue, 26 Jan 2021 16:54:31 +0530
Subject: [PATCH 22/37] feat(Chart):Added Fluid Container and updated
 package.json

---
 worktrolly-ui/package.json                                  | 6 +++---
 .../src/app/body/common-tools/chart/chart.component.css     | 4 +---
 .../src/app/body/my-dashboard/my-dashboard.component.html   | 2 +-
 .../app/body/my-dashboard/my-tasks/my-tasks.component.css   | 4 ++--
 .../performance-chart/performance-chart.component.css       | 4 ++--
 .../performance-chart/range-card/range-card.component.css   | 4 ++--
 .../src/app/body/task-details/task-details.component.css    | 4 ----
 7 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/worktrolly-ui/package.json b/worktrolly-ui/package.json
index ce0d2d2bd..0e1b5f681 100644
--- a/worktrolly-ui/package.json
+++ b/worktrolly-ui/package.json
@@ -22,12 +22,12 @@
         "@angular/router": "~11.0.2",
         "angular-google-charts": "^2.0.0",
         "bootstrap": "^4.5.3",
-        "firebase": "^7.0.0 || ^8.0.0",
         "jquery": "^3.5.1",
         "popper.js": "^1.16.1",
         "rxjs": "~6.6.0",
         "tslib": "^2.0.0",
-        "zone.js": "~0.10.2"
+        "zone.js": "~0.10.2",
+        "firebase": "^7.0.0 || ^8.0.0"
     },
     "devDependencies": {
         "@angular-devkit/architect": ">= 0.900 < 0.1100",
@@ -55,4 +55,4 @@
         "tslint": "~6.1.0",
         "typescript": "~4.0.2"
     }
-}
+}
\ No newline at end of file
diff --git a/worktrolly-ui/src/app/body/common-tools/chart/chart.component.css b/worktrolly-ui/src/app/body/common-tools/chart/chart.component.css
index e0c38c05c..d7418973d 100644
--- a/worktrolly-ui/src/app/body/common-tools/chart/chart.component.css
+++ b/worktrolly-ui/src/app/body/common-tools/chart/chart.component.css
@@ -1,6 +1,4 @@
 #chart {
-    width: 110%;
+    width: 100%;
     height: 100%;
-    margin-left: -3%;
-    background: transparent;
 }
\ No newline at end of file
diff --git a/worktrolly-ui/src/app/body/my-dashboard/my-dashboard.component.html b/worktrolly-ui/src/app/body/my-dashboard/my-dashboard.component.html
index 0474561db..aa68e516b 100644
--- a/worktrolly-ui/src/app/body/my-dashboard/my-dashboard.component.html
+++ b/worktrolly-ui/src/app/body/my-dashboard/my-dashboard.component.html
@@ -1,4 +1,4 @@
-<div class="container" *ngIf="(userObservable | async ) && (backendService.rawDataObservable | async)">
+<div class="container-fluid" *ngIf="(userObservable | async ) && (backendService.rawDataObservable | async)">
     <div class="row pt-5">
         <div class="col">
             <app-performance-chart [username]="username" [currentSprint]="currentSprintNumber"></app-performance-chart>
diff --git a/worktrolly-ui/src/app/body/my-dashboard/my-tasks/my-tasks.component.css b/worktrolly-ui/src/app/body/my-dashboard/my-tasks/my-tasks.component.css
index 633488208..1425ae8c1 100644
--- a/worktrolly-ui/src/app/body/my-dashboard/my-tasks/my-tasks.component.css
+++ b/worktrolly-ui/src/app/body/my-dashboard/my-tasks/my-tasks.component.css
@@ -1,8 +1,8 @@
 .card-header {
-    background-color: #8120f0;
+    background-color: #5A20F0;
     color: white;
 }
 
 .card {
-    border: 1px solid #8120f0;
+    border: 1px solid #5A20F0;
 }
\ No newline at end of file
diff --git a/worktrolly-ui/src/app/body/my-dashboard/performance-chart/performance-chart.component.css b/worktrolly-ui/src/app/body/my-dashboard/performance-chart/performance-chart.component.css
index 633488208..890624d76 100644
--- a/worktrolly-ui/src/app/body/my-dashboard/performance-chart/performance-chart.component.css
+++ b/worktrolly-ui/src/app/body/my-dashboard/performance-chart/performance-chart.component.css
@@ -1,8 +1,8 @@
 .card-header {
-    background-color: #8120f0;
+    background-color: #5A20F0;
     color: white;
 }
 
 .card {
-    border: 1px solid #8120f0;
+    border: 1px solid#5A20F0;
 }
\ No newline at end of file
diff --git a/worktrolly-ui/src/app/body/my-dashboard/performance-chart/range-card/range-card.component.css b/worktrolly-ui/src/app/body/my-dashboard/performance-chart/range-card/range-card.component.css
index 8d22f7da2..dc2e5a194 100644
--- a/worktrolly-ui/src/app/body/my-dashboard/performance-chart/range-card/range-card.component.css
+++ b/worktrolly-ui/src/app/body/my-dashboard/performance-chart/range-card/range-card.component.css
@@ -1,6 +1,6 @@
 #button {
     background-color: #10be65;
-    border: 2px solid #8120f0;
+    border: 2px solid #5A20F0;
     color: white;
 }
 
@@ -15,5 +15,5 @@ select:focus,
 textarea:focus {
     box-shadow: none;
     outline: 0 none;
-    border-color: #8120f0;
+    border-color: #5A20F0;
 }
\ No newline at end of file
diff --git a/worktrolly-ui/src/app/body/task-details/task-details.component.css b/worktrolly-ui/src/app/body/task-details/task-details.component.css
index c71b25827..d407a45cc 100644
--- a/worktrolly-ui/src/app/body/task-details/task-details.component.css
+++ b/worktrolly-ui/src/app/body/task-details/task-details.component.css
@@ -15,10 +15,7 @@
 }
 
 #navbarMenu {
-
     background-color: #5A20F0;
-
-    background-color: #8120f0;
 }
 
 @media (max-width: 991px) {
@@ -26,5 +23,4 @@
         float: right;
         flex-direction: row;
     }
-
 }
\ No newline at end of file

From d75857ee8afcda2cd80468c61f54baadd16bcde7 Mon Sep 17 00:00:00 2001
From: shreyachowdhury4 <shreya040624@gmail.com>
Date: Tue, 26 Jan 2021 16:56:05 +0530
Subject: [PATCH 23/37] fix task-cards ui

---
 .../tasks/task-cards/task-cards.component.css  | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/worktrolly-ui/src/app/body/tasks/task-cards/task-cards.component.css b/worktrolly-ui/src/app/body/tasks/task-cards/task-cards.component.css
index c574307e8..8bd047750 100644
--- a/worktrolly-ui/src/app/body/tasks/task-cards/task-cards.component.css
+++ b/worktrolly-ui/src/app/body/tasks/task-cards/task-cards.component.css
@@ -1,13 +1,5 @@
-.taskCards {
-<<<<<<< HEAD
-    border: 1px solid #8120f0;
-    font-size: 15px;
-=======
-    border: 1px solid #5A20F0;
-    font-size: 12px;
->>>>>>> fe1c7bac036e9b6f1042e4a14b8dfc03e2d86c21
-    color: #000;
-}
-.app-status-icons {
-    padding-bottom: 10px;
-}
\ No newline at end of file
+.taskCards  {
+    border:1px solid #8120f0;
+    font-size:15px;
+    color:#000;
+  }

From 0aa285f149ca904b92414646b87e089ec998b7cd Mon Sep 17 00:00:00 2001
From: sandeep-v1404 <valpasanisandeep@gmail.com>
Date: Tue, 26 Jan 2021 16:58:06 +0530
Subject: [PATCH 24/37] feat(Chart):Updated Chart Colors

---
 .../src/app/body/common-tools/chart/chart.component.ts          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/worktrolly-ui/src/app/body/common-tools/chart/chart.component.ts b/worktrolly-ui/src/app/body/common-tools/chart/chart.component.ts
index 55280f68c..b49bb4a77 100644
--- a/worktrolly-ui/src/app/body/common-tools/chart/chart.component.ts
+++ b/worktrolly-ui/src/app/body/common-tools/chart/chart.component.ts
@@ -13,7 +13,7 @@ export class ChartComponent implements OnInit {
   myChartType: string = "LineChart"
   chartColumns = ["Sprint Number", "StoryPoint"]
   myOptions = {
-    colors: ['#8120f0'],
+    colors: ['#5A20F0'],
     is3D: true,
     curveType: 'function'
   };

From f0f3a90329cd749e705e158630e18ccdd4f6de04 Mon Sep 17 00:00:00 2001
From: komal <komal9779@gmail.com>
Date: Tue, 26 Jan 2021 20:25:29 +0530
Subject: [PATCH 25/37] feat(dev/activity): added an activity collection

---
 functions/index.js                            | 102 ++++++++++++++++--
 .../edit-page/edit-page.component.ts          |  16 ++-
 .../log-work/log-work.component.ts            |  18 +++-
 .../task-details/task-details.component.ts    |  17 ++-
 4 files changed, 143 insertions(+), 10 deletions(-)

diff --git a/functions/index.js b/functions/index.js
index 8dc53bdad..8d86969ee 100644
--- a/functions/index.js
+++ b/functions/index.js
@@ -54,6 +54,8 @@ exports.createNewTask = functions.https.onRequest((request, response) => {
         var result;
         var totalUnCompletedTask = 0;
         var sprintDataPromise;
+        var totalActions = 0;
+        var totalComments = 0;
 
         const promise1 = db.collection("RawData").doc("AppDetails").get().then((doc) => {
             totalNumberOfTask = doc.data().TotalNumberOfTask;
@@ -103,7 +105,13 @@ exports.createNewTask = functions.https.onRequest((request, response) => {
                 TotalNumberOfTask: totalNumberOfTask,
                 TotalUnCompletedTask: totalUnCompletedTask
             });
-            const Promises = [P1,P2];
+            
+            const P3 = db.collection("Activity").doc(taskId).set({
+                TaskId: taskId,
+                TotalActions: totalActions,
+                TotalComments: totalComments
+            });
+            const Promises = [P1,P2,P3];
             return Promise.all(Promises);
         });
 
@@ -177,6 +185,7 @@ exports.createNewTask = functions.https.onRequest((request, response) => {
             }
             return Promise.resolve(sprintDataPromise);
         });
+
         const newTaskPromises = [promise1, promise2];
         Promise.all(newTaskPromises).then(() => {
                 result = { data: "OK!" }
@@ -267,9 +276,14 @@ exports.logWork = functions.https.onRequest((request, response) => {
         var logHours = parseInt(request.body.data.LogHours);
         var workDone = parseInt(request.body.data.LogWorkDone);
         var sprintNumber = parseInt(request.body.data.SprintNumber);
-        // var logWorkComment = request.body.data.LogWorkComment;
+        var logWorkComment = request.body.data.LogWorkComment;
+        var date = request.body.data.Date;
+        var time = request.body.data.Time;
         var fullSprintId = createSprintId(sprintNumber);
         var logWorkTotalTime;
+        var totalActions;
+        var totalComments;
+        var actionId;
 
         const promise1 = db.collection("Tasks").doc(taskId).get().then((doc) => {
             logWorkTotalTime = parseInt(doc.data().LogWorkTotalTime);
@@ -309,7 +323,29 @@ exports.logWork = functions.https.onRequest((request, response) => {
             });
             return Promise.resolve(updateSprintstatus);
         });
-        const logWorkPromises = [promise1, promise2, promise3];
+        const promise4 = db.collection("Activity").doc(taskId).get().then((doc) => {
+            totalActions = parseInt(doc.data().TotalActions);
+            totalActions = parseInt(totalActions)+1;
+
+            totalComments = parseInt(doc.data().TotalComments);
+            totalComments = parseInt(totalComments)+1;
+
+            actionId = "A" + totalActions;
+
+            var p1 = db.collection("Activity").doc(taskId).update({
+                TotalActions: totalActions,
+                TotalComments: totalComments
+            });
+            var p2 = db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
+                Type: "comment",
+                Comment: logWorkComment,
+                Date: date,
+                Time: time
+            });
+            const Promises = [p1,p2];
+            return Promise.all(Promises);
+        });
+        const logWorkPromises = [promise1, promise2, promise3,promise4];
         Promise.all(logWorkPromises).then(() => {
                 result = { data: "OK" }
                 console.log("Document successfully written!");
@@ -349,9 +385,17 @@ exports.editPageTask = functions.https.onRequest((request, response) => {
         var totalUnCompletedTask;
         var totalCompletedTask;
         var sprintEditPromise;
+        var date = request.body.data.Date;
+        var time = request.body.data.Time;
+        var totalActions;
+        var actionId;
+        var type = "edit";
+        var comment = "edited task details";
 
         var promises = [];
         if (editedSprintNumber !== previousId) {
+            type="moved";
+            comment="moved to sprint " + editedSprintId;
             const p1 = db.collection("Main").doc(previousSprintId).get().then((doc) => {
                 totalNumberOfTask = doc.data().TotalNumberOfTask;
                 totalDevelopmentTask = doc.data().TotalDevelopmentTask;
@@ -450,7 +494,28 @@ exports.editPageTask = functions.https.onRequest((request, response) => {
             });
             promises.push(p2);
         }
-        var p3 = db.collection("Tasks").doc(taskId).update({
+
+        var p3 = db.collection("Activity").doc(taskId).get().then((doc) => {
+            totalActions = parseInt(doc.data().TotalActions);
+            totalActions = parseInt(totalActions)+1;
+
+            actionId = "A" + totalActions;
+
+            var prom1 = db.collection("Activity").doc(taskId).update({
+                TotalActions: totalActions,
+            });
+            var prom2 = db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
+                Type: type,
+                Comment: comment,
+                Date: date,
+                Time: time
+            });
+            const proms = [prom1,prom2];
+            return Promise.all(proms);
+        });
+        promises.push(p3);
+
+        var p4 = db.collection("Tasks").doc(taskId).update({
                 Description: description,
                 CreationDate: creationDate,
                 Priority: priority,
@@ -460,7 +525,9 @@ exports.editPageTask = functions.https.onRequest((request, response) => {
                 SprintNumber: editedSprintNumber,
                 StoryPointNumber: storyPointNumber
         });
-        promises.push(p3);
+        promises.push(p4);
+
+
 
         Promise.all(promises).then(() => {
             result = { data: "OK" };
@@ -492,6 +559,10 @@ exports.deleteTask = functions.https.onRequest((request, response) => {
         var result;
         var totalCompletedTask;
         var totalUnCompletedTask;
+        var date = request.body.data.Date;
+        var time = request.body.data.Time;
+        var totalActions;
+        var actionId;
 
         const p1 = db.collection("Tasks").doc(taskId).update({
             Category: "Trash",
@@ -529,7 +600,26 @@ exports.deleteTask = functions.https.onRequest((request, response) => {
             });
             return Promise.resolve(updateDeleteTaskCounter);
         });
-        const deleteTaskPromises = [p1, p2];
+
+        const p3 = db.collection("Activity").doc(taskId).get().then((doc) => {
+            totalActions = parseInt(doc.data().TotalActions);
+            totalActions = parseInt(totalActions)+1;
+
+            actionId = "A" + totalActions;
+
+            var prom1 = db.collection("Activity").doc(taskId).update({
+                TotalActions: totalActions,
+            });
+            var prom2 = db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
+                Type: "delete",
+                Comment: "deleted task " + taskId,
+                Date: date,
+                Time: time
+            });
+            const proms = [prom1,prom2];
+            return Promise.all(proms);
+        });
+        const deleteTaskPromises = [p1, p2, p3];
         Promise.all(deleteTaskPromises).then(() => {
                 result = { data: "OK" };
                 console.log("Document sucessfully deleted");
diff --git a/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.ts b/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.ts
index c81721079..9f61a1ae0 100644
--- a/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.ts
+++ b/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.ts
@@ -20,10 +20,24 @@ export class EditPageComponent implements OnInit {
   editTask: Tasks
   previousSprintId: number
   enableLoader: boolean = false
+  todayDate: string
+  time: string
 
   constructor(private functions: AngularFireFunctions, private router: Router, public validationService: ValidationService) { }
 
   ngOnInit(): void {
+    var today = new Date();
+
+    var dd = String(today.getDate()).padStart(2, '0');
+    var mm = String(today.getMonth() + 1).padStart(2, '0');
+    var yyyy = today.getFullYear();
+
+    var hh = String(today.getHours()).padStart(2, '0');
+    var mn = String(today.getMinutes()).padStart(2, '0');
+    var ss= String(today.getSeconds()).padStart(2, '0');
+    this.todayDate = dd + "/" + mm + "/" + yyyy;
+    this.time = hh + ":" + mn + ":" + ss;
+
     this.editTask = this.task;
     this.previousSprintId = this.task.SprintNumber;
   }
@@ -58,7 +72,7 @@ export class EditPageComponent implements OnInit {
 
       console.log(this.editTask.SprintNumber);
       if (!(this.task.Status === "Completed")) {
-        const result = await callable({ Id: this.editTask.Id, Description: this.editTask.Description, Priority: this.editTask.Priority, Difficulty: this.editTask.Difficulty, Assignee: this.editTask.Assignee, EstimatedTime: this.editTask.EstimatedTime, Category: this.task.Category, SprintNumber: this.editTask.SprintNumber, StoryPointNumber: this.editTask.StoryPointNumber, PreviousId: this.previousSprintId, CreationDate: this.editTask.CreationDate }).toPromise();
+        const result = await callable({ Id: this.editTask.Id, Description: this.editTask.Description, Priority: this.editTask.Priority, Difficulty: this.editTask.Difficulty, Assignee: this.editTask.Assignee, EstimatedTime: this.editTask.EstimatedTime, Category: this.task.Category, SprintNumber: this.editTask.SprintNumber, StoryPointNumber: this.editTask.StoryPointNumber, PreviousId: this.previousSprintId, CreationDate: this.editTask.CreationDate, Date: this.todayDate, Time: this.time}).toPromise();
         console.log("Successfully Updated the task");
         console.log(result);
         this.editTaskDone();
diff --git a/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.ts b/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.ts
index 8101eafd7..5c1cc3894 100644
--- a/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.ts
+++ b/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.ts
@@ -22,10 +22,24 @@ export class LogWorkComponent implements OnInit {
   logHours: number
   logWorkComment: number
   enableLoader: boolean = false
+  todayDate: string
+  time: string
 
   constructor(private functions: AngularFireFunctions, public validationService: ValidationService) { }
 
-  ngOnInit(): void { }
+  ngOnInit(): void { 
+    var today = new Date();
+
+    var dd = String(today.getDate()).padStart(2, '0');
+    var mm = String(today.getMonth() + 1).padStart(2, '0');
+    var yyyy = today.getFullYear();
+
+    var hh = String(today.getHours()).padStart(2, '0');
+    var mn = String(today.getMinutes()).padStart(2, '0');
+    var ss= String(today.getSeconds()).padStart(2, '0');
+    this.todayDate = dd + "/" + mm + "/" + yyyy;
+    this.time = hh + ":" + mn + ":" + ss;
+  }
 
   async submit(){
     let labels = ['status', 'logHours', 'workCompleted', 'comment'];
@@ -50,7 +64,7 @@ export class LogWorkComponent implements OnInit {
     const callable = this.functions.httpsCallable('logWork');
 
     try {
-      const result = await callable({ SprintNumber: this.task.SprintNumber, LogTaskId: this.task.Id, LogHours: this.logHours, LogWorkDone: this.logWorkDone, LogWorkStatus: this.logWorkStatus, LogWorkComment: this.logWorkComment }).toPromise();
+      const result = await callable({ SprintNumber: this.task.SprintNumber, LogTaskId: this.task.Id, LogHours: this.logHours, LogWorkDone: this.logWorkDone, LogWorkStatus: this.logWorkStatus, LogWorkComment: this.logWorkComment, Date: this.todayDate, Time: this.time}).toPromise();
 
       console.log("Logged Work Successfully");
       console.log(result);
diff --git a/worktrolly-ui/src/app/body/task-details/task-details.component.ts b/worktrolly-ui/src/app/body/task-details/task-details.component.ts
index 251ea78cc..6aea5f2d2 100644
--- a/worktrolly-ui/src/app/body/task-details/task-details.component.ts
+++ b/worktrolly-ui/src/app/body/task-details/task-details.component.ts
@@ -21,12 +21,27 @@ export class TaskDetailsComponent implements OnInit {
   editTaskEnabled: boolean = false
   userLoggedIn: boolean = false
   task: Tasks
+  todayDate: string
+  time: string
+  
   public taskDocument: AngularFirestoreDocument<Tasks>
   public taskDataObservable: Observable<Tasks>
 
   constructor(private route: ActivatedRoute, public db: AngularFirestore, private router: Router, private functions: AngularFireFunctions, public authService: AuthService, private location: Location) { }
 
   ngOnInit(): void {
+    var today = new Date();
+
+    var dd = String(today.getDate()).padStart(2, '0');
+    var mm = String(today.getMonth() + 1).padStart(2, '0');
+    var yyyy = today.getFullYear();
+
+    var hh = String(today.getHours()).padStart(2, '0');
+    var mn = String(today.getMinutes()).padStart(2, '0');
+    var ss= String(today.getSeconds()).padStart(2, '0');
+    this.todayDate = dd + "/" + mm + "/" + yyyy;
+    this.time = hh + ":" + mn + ":" + ss;
+
     this.Id = this.route.snapshot.params['taskId'];
     this.getTaskDetail();
   }
@@ -63,7 +78,7 @@ export class TaskDetailsComponent implements OnInit {
     const callable = this.functions.httpsCallable('deleteTask');
 
     try {
-      const result = await callable({ Id: this.task.Id, SprintNumber: this.task.SprintNumber, Category: this.task.Category, Status: this.task.Status }).toPromise();
+      const result = await callable({ Id: this.task.Id, SprintNumber: this.task.SprintNumber, Category: this.task.Category, Status: this.task.Status, Date: this.todayDate, Time: this.time }).toPromise();
       console.log(this.task.Id + " deleted");
       console.log(result);
       this.router.navigate(['/']);

From a8115a4b3cdb8fb2a9f331951a10e85e835eb8fb Mon Sep 17 00:00:00 2001
From: sandeep-v1404 <valpasanisandeep@gmail.com>
Date: Wed, 27 Jan 2021 15:06:25 +0530
Subject: [PATCH 26/37] feat(Chart): Added Header to Range Card

---
 .../body/my-dashboard/my-tasks/my-tasks.component.html   | 4 +++-
 .../performance-chart/performance-chart.component.html   | 2 +-
 .../range-card/range-card.component.css                  | 9 +++++++++
 .../range-card/range-card.component.html                 | 9 +++++++--
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/worktrolly-ui/src/app/body/my-dashboard/my-tasks/my-tasks.component.html b/worktrolly-ui/src/app/body/my-dashboard/my-tasks/my-tasks.component.html
index 5a53d3b5f..441013325 100644
--- a/worktrolly-ui/src/app/body/my-dashboard/my-tasks/my-tasks.component.html
+++ b/worktrolly-ui/src/app/body/my-dashboard/my-tasks/my-tasks.component.html
@@ -1,5 +1,7 @@
 <div class="card mb-3" style="width: 100%;">
-    <div class="card-header">My Tasks</div>
+    <div class="card-header">
+        <h6 class="m-0">My Tasks</h6>
+    </div>
     <div class="card-body" *ngIf="tasksData | async">
         <ng-container *ngFor="let item of tasksData | async">
             <app-task-cards [task]="item"></app-task-cards>
diff --git a/worktrolly-ui/src/app/body/my-dashboard/performance-chart/performance-chart.component.html b/worktrolly-ui/src/app/body/my-dashboard/performance-chart/performance-chart.component.html
index 2d94b4a71..02d634893 100644
--- a/worktrolly-ui/src/app/body/my-dashboard/performance-chart/performance-chart.component.html
+++ b/worktrolly-ui/src/app/body/my-dashboard/performance-chart/performance-chart.component.html
@@ -3,7 +3,7 @@
         <div class="card-header">
             <div class="row align-items-center">
                 <div class="col-6">
-                    Performance Chart
+                    <h6 class="m-0">Performance Chart</h6>
                 </div>
                 <div class="col-6 text-right">
                     <app-range-card (setRange)="onGetRange($event)"></app-range-card>
diff --git a/worktrolly-ui/src/app/body/my-dashboard/performance-chart/range-card/range-card.component.css b/worktrolly-ui/src/app/body/my-dashboard/performance-chart/range-card/range-card.component.css
index dc2e5a194..de50d4dee 100644
--- a/worktrolly-ui/src/app/body/my-dashboard/performance-chart/range-card/range-card.component.css
+++ b/worktrolly-ui/src/app/body/my-dashboard/performance-chart/range-card/range-card.component.css
@@ -16,4 +16,13 @@ textarea:focus {
     box-shadow: none;
     outline: 0 none;
     border-color: #5A20F0;
+}
+
+#header {
+    background-color: #5A20F0;
+    border-top: 1px solid black;
+}
+
+#dropdownRangeCard {
+    border-color: #5A20F0;
 }
\ No newline at end of file
diff --git a/worktrolly-ui/src/app/body/my-dashboard/performance-chart/range-card/range-card.component.html b/worktrolly-ui/src/app/body/my-dashboard/performance-chart/range-card/range-card.component.html
index 4c10019f6..fed9bf6fc 100644
--- a/worktrolly-ui/src/app/body/my-dashboard/performance-chart/range-card/range-card.component.html
+++ b/worktrolly-ui/src/app/body/my-dashboard/performance-chart/range-card/range-card.component.html
@@ -2,7 +2,12 @@
     <span class="material-icons" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-expanded="false">
             perm_data_setting
     </span>
-    <div class="dropdown-menu dropdown-menu-right" id="dropdownRangeCard">
+    <div class="dropdown-menu dropdown-menu-right p-0" id="dropdownRangeCard">
+        <div class="row m-0 align-items-center" id="header">
+            <div class="col p-2 text-white">
+                <h6>Custom Sprint Range</h6>
+            </div>
+        </div>
         <div class="row p-1 align-items-center">
             <div class="col-6">
                 <label for="input">Start Range</label>
@@ -20,7 +25,7 @@
             </div>
         </div>
         <div class="row p-1">
-            <div class="offset-5 offset-sm-6 offset-md-7 col">
+            <div class="offset-5 offset-sm-6 offset-md-7 offset-lg-8 col">
                 <button type="submit" class="btn" id="button" (click)="validateRange()">Submit</button>
             </div>
         </div>

From 208ad7523a06f893879ba734487ead0ee9d01ae1 Mon Sep 17 00:00:00 2001
From: shreyachowdhury4 <shreya040624@gmail.com>
Date: Thu, 28 Jan 2021 19:53:38 +0530
Subject: [PATCH 27/37] fic taskcard ui

---
 .../tasks/task-cards/task-cards.component.css |  2 +-
 .../priority-icons.component.css              | 12 +++++++++++
 .../priority-icons.component.html             |  6 +++---
 .../status-icons/status-icons.component.css   | 20 +++++++++++++++++++
 .../status-icons/status-icons.component.html  | 10 +++++-----
 5 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/worktrolly-ui/src/app/body/tasks/task-cards/task-cards.component.css b/worktrolly-ui/src/app/body/tasks/task-cards/task-cards.component.css
index 8bd047750..447f1c2e8 100644
--- a/worktrolly-ui/src/app/body/tasks/task-cards/task-cards.component.css
+++ b/worktrolly-ui/src/app/body/tasks/task-cards/task-cards.component.css
@@ -1,5 +1,5 @@
 .taskCards  {
     border:1px solid #8120f0;
-    font-size:15px;
+    font-size:10px;
     color:#000;
   }
diff --git a/worktrolly-ui/src/app/icons/priority-icons/priority-icons.component.css b/worktrolly-ui/src/app/icons/priority-icons/priority-icons.component.css
index e69de29bb..75d693355 100644
--- a/worktrolly-ui/src/app/icons/priority-icons/priority-icons.component.css
+++ b/worktrolly-ui/src/app/icons/priority-icons/priority-icons.component.css
@@ -0,0 +1,12 @@
+.low {
+    color: #ffff00; 
+    padding: right 16px;
+}
+.medium {
+    color: #ee82ee; 
+    padding: right 16px;
+}
+.high {
+    color: #ff0000;
+    padding: right 16px;
+}
\ No newline at end of file
diff --git a/worktrolly-ui/src/app/icons/priority-icons/priority-icons.component.html b/worktrolly-ui/src/app/icons/priority-icons/priority-icons.component.html
index c9c9a9e32..81ddad2c8 100644
--- a/worktrolly-ui/src/app/icons/priority-icons/priority-icons.component.html
+++ b/worktrolly-ui/src/app/icons/priority-icons/priority-icons.component.html
@@ -1,17 +1,17 @@
 <ng-container *ngIf="Priority == 'Low' ">
-    <span class="material-icons" style="color: yellow; padding: right 16px;" data-toggle="tooltip" data-placement="top" title="Low">
+    <span class="material-icons low" data-toggle="tooltip" data-placement="top" title="Low">
         keyboard_arrow_down
     </span>
 </ng-container>
 
 <ng-container *ngIf="Priority == 'Medium' ">
-    <span class="material-icons" style="color: violet; padding: right 16px;" data-toggle="tooltip" data-placement="top" title="Medium">
+    <span class="material-icons medium" data-toggle="tooltip" data-placement="top" title="Medium">
         sync_alt
     </span>
 </ng-container>
 
 <ng-container *ngIf="Priority == 'High' ">
-    <span class="material-icons" style="color: red; padding: right 16px;" data-toggle="tooltip" data-placement="top" title="High">
+    <span class="material-icons high" data-toggle="tooltip" data-placement="top" title="High">
         keyboard_arrow_up
     </span>
 </ng-container>
\ No newline at end of file
diff --git a/worktrolly-ui/src/app/icons/status-icons/status-icons.component.css b/worktrolly-ui/src/app/icons/status-icons/status-icons.component.css
index e69de29bb..14152de5b 100644
--- a/worktrolly-ui/src/app/icons/status-icons/status-icons.component.css
+++ b/worktrolly-ui/src/app/icons/status-icons/status-icons.component.css
@@ -0,0 +1,20 @@
+.completed {
+    color: #00ff00; 
+    padding-right:20px;
+}
+.Ready {
+    color: #ff0080; 
+    padding-right:20px;
+}
+.blocked {
+    color: #808080; 
+    padding-right:20px;
+}
+.Under {
+    color: #fc6a03; 
+    padding-right:20px;
+}
+.Ice {
+    color: #87ceeb; 
+    padding-right:20px;
+}
\ No newline at end of file
diff --git a/worktrolly-ui/src/app/icons/status-icons/status-icons.component.html b/worktrolly-ui/src/app/icons/status-icons/status-icons.component.html
index 97c173fbb..ff959e004 100644
--- a/worktrolly-ui/src/app/icons/status-icons/status-icons.component.html
+++ b/worktrolly-ui/src/app/icons/status-icons/status-icons.component.html
@@ -1,29 +1,29 @@
 <ng-container *ngIf="Status == 'Completed' ">
-    <span class="material-icons" style="color: lime; padding-right:20px;" data-toggle="tooltip" data-placement="top" title="completed">
+    <span class="material-icons completed" data-toggle="tooltip" data-placement="top" title="completed">
     check_circle_outline
     </span>
 </ng-container>
 
 <ng-container *ngIf="Status == 'Ready to start' ">
-    <span class="material-icons" style="color: rgb(255, 0, 128); padding-right:20px;" data-toggle="tooltip" data-placement="top" title="Ready to start">
+    <span class="material-icons Ready" data-toggle="tooltip" data-placement="top" title="Ready to start">
         not_started
     </span>
 </ng-container>
 
 <ng-container *ngIf="Status == 'Blocked' ">
-    <span class="material-icons" style="color: gray; padding-right:20px;" data-toggle="tooltip" data-placement="top" title="Blocked">
+    <span class="material-icons blocked" data-toggle="tooltip" data-placement="top" title="Blocked">
         block
     </span>
 </ng-container>
 
 <ng-container *ngIf="Status == 'Under Progress' ">
-    <span class="material-icons" style="color: #fc6a03; padding-right:20px;" data-toggle="tooltip" data-placement="top" title="Under Progress">
+    <span class="material-icons Under" data-toggle="tooltip" data-placement="top" title="Under Progress">
         arrow_circle_up
     </span>
 </ng-container>
 
 <ng-container *ngIf="Status == 'Ice Box' ">
-    <span class="material-icons" style="color: skyblue; padding-right:20px;" data-toggle="tooltip" data-placement="top" title="Ice Box">
+    <span class="material-icons Ice" data-toggle="tooltip" data-placement="top" title="Ice Box">
         inventory_2
     </span>
 </ng-container>

From 51a0f421a7922681f64ef29dd15b553c125aabfb Mon Sep 17 00:00:00 2001
From: vivek kumar <vivekkumar@viveks-MacBook-Air-2.local>
Date: Thu, 28 Jan 2021 20:30:47 +0530
Subject: [PATCH 28/37] feat(navbar): dark theme suppot

Signed-off-by: vivek kumar <vivekkumar@viveks-MacBook-Air-2.local>
---
 worktrolly-ui/src/app/body/navbar/navbar.component.css  | 4 ++++
 worktrolly-ui/src/app/body/navbar/navbar.component.html | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/worktrolly-ui/src/app/body/navbar/navbar.component.css b/worktrolly-ui/src/app/body/navbar/navbar.component.css
index d9f31ae45..9ebd2aa50 100644
--- a/worktrolly-ui/src/app/body/navbar/navbar.component.css
+++ b/worktrolly-ui/src/app/body/navbar/navbar.component.css
@@ -1,3 +1,7 @@
 #currentTab {
     color: #10be65;
 }
+
+#navbarString {
+    color: white;
+}
diff --git a/worktrolly-ui/src/app/body/navbar/navbar.component.html b/worktrolly-ui/src/app/body/navbar/navbar.component.html
index 00a1d1071..e3d36669b 100644
--- a/worktrolly-ui/src/app/body/navbar/navbar.component.html
+++ b/worktrolly-ui/src/app/body/navbar/navbar.component.html
@@ -1,5 +1,5 @@
 <div class="p-2">
-    <ng-container *ngIf="navbarHandler.navbarString">
+    <ng-container id="navbarString" *ngIf="navbarHandler.navbarString">
         {{navbarHandler.navbarString}} /
     </ng-container>
     <ng-container *ngIf="navbarHandler.currentTab">

From fd64b7272c1de0eaf9a159f19513f517c4a4c043 Mon Sep 17 00:00:00 2001
From: komal <komal9779@gmail.com>
Date: Fri, 29 Jan 2021 03:27:15 +0530
Subject: [PATCH 29/37] feat(dev/activity):created activity collection in db
 and seperate js files for API

---
 functions/index.js                            | 690 +-----------------
 .../create-new-session.component.ts           |  15 +-
 .../edit-page/edit-page.component.ts          |  43 +-
 .../log-work/log-work.component.ts            |  16 +-
 .../task-details/task-details.component.ts    |  16 +-
 5 files changed, 61 insertions(+), 719 deletions(-)

diff --git a/functions/index.js b/functions/index.js
index 8d86969ee..14cddc9ae 100644
--- a/functions/index.js
+++ b/functions/index.js
@@ -1,10 +1,22 @@
 const functions = require('firebase-functions');
-var cors = require('cors')({ origin: true });
-
 const admin = require('firebase-admin');
 admin.initializeApp();
-
-const db = admin.firestore();
+const createNewTaskAPI = require('./createNewTaskAPI');
+const startNewSprintAPI = require('./startNewSprintAPI');
+const logWorkAPI = require('./logWorkAPI');
+const editPageTaskAPI = require('./editPageTaskAPI');
+const deleteTaskAPI = require('./deleteTaskAPI');
+const createNewUserAPI = require('./createNewUserAPI');
+const updateSprintStatusAPI = require('./updateSprintStatusAPI');
+
+
+exports.createNewTask = createNewTaskAPI.createNewTask;
+exports.startNewSprint = startNewSprintAPI.startNewSprint;
+exports.logWork = logWorkAPI.logWork;
+exports.editPageTask = editPageTaskAPI.editPageTask;
+exports.deleteTask = deleteTaskAPI.deleteTask;
+exports.createNewUser = createNewUserAPI.createNewUser;
+exports.updateSprintStatus = updateSprintStatusAPI.updateSprintStatus;
 
 // class Task {
 //     constructor(id, title, status, priority, estimatedTime, difficulty, description, creator, category, assignee, logWorkTotalTime, workDone, creationDate, sprintNumber, storyPointNumber) {
@@ -26,673 +38,3 @@ const db = admin.firestore();
 //     }
 // }
 
-
-exports.createNewTask = functions.https.onRequest((request, response) => {
-    cors(request, response, () => {
-        console.log(request);
-        var title = request.body.data.Title;
-        var des = request.body.data.Description;
-        var priority = request.body.data.Priority;
-        var difficulty = request.body.data.Difficulty;
-        var creator = request.body.data.Creator;
-        var assignee = request.body.data.Assignee;
-        var estimatedTime = parseInt(request.body.data.EstimatedTime);
-        var status = request.body.data.Status;
-        var category = request.body.data.Category;
-        var storyPointNumber = parseInt(request.body.data.StoryPointNumber);
-        var sprintNumber = parseInt(request.body.data.SprintNumber);
-        var creationDate = request.body.data.CreationDate;
-        var fullSprintId = createSprintId(sprintNumber);
-        var loggedWorkTotalTime = 0;
-        var workDone = 0;
-        var taskId = "";
-        var totalDevelopmentTask;
-        var totalBusinessTask;
-        var totalOtherTask;
-        var totalMarketingTask;
-        var totalNumberOfTask;
-        var result;
-        var totalUnCompletedTask = 0;
-        var sprintDataPromise;
-        var totalActions = 0;
-        var totalComments = 0;
-
-        const promise1 = db.collection("RawData").doc("AppDetails").get().then((doc) => {
-            totalNumberOfTask = doc.data().TotalNumberOfTask;
-            totalDevelopmentTask = doc.data().TotalDevelopmentTask;
-            totalBusinessTask = doc.data().TotalBusinessTask;
-            totalMarketingTask = doc.data().TotalMarketingTask;
-            totalOtherTask = doc.data().TotalOtherTask;
-            totalUnCompletedTask = doc.data().TotalUnCompletedTask;
-            if (category === "Development") {
-                totalDevelopmentTask = totalDevelopmentTask + 1;
-                taskId = category[0] + totalDevelopmentTask;
-            } else if (category === "Business") {
-                totalBusinessTask = totalBusinessTask + 1;
-                taskId = category[0] + totalBusinessTask;
-            } else if (category === "Marketing") {
-                totalMarketingTask = totalMarketingTask + 1;
-                taskId = category[0] + totalMarketingTask;
-            } else {
-                totalOtherTask = totalOtherTask + 1;
-                taskId = category[0] + totalOtherTask;
-            }
-            totalUnCompletedTask = totalUnCompletedTask + 1;
-            totalNumberOfTask = totalNumberOfTask + 1;
-            console.log(taskId);
-            const P1 = db.collection("Tasks").doc(taskId).set({
-                Id: taskId,
-                Title: title,
-                Description: des,
-                Priority: priority,
-                Difficulty: difficulty,
-                Creator: creator,
-                Assignee: assignee,
-                EstimatedTime: estimatedTime,
-                Status: status,
-                Category: category,
-                LogWorkTotalTime: loggedWorkTotalTime,
-                WorkDone: workDone,
-                SprintNumber: sprintNumber,
-                StoryPointNumber: storyPointNumber,
-                CreationDate: creationDate
-            });
-            const P2 = db.collection("RawData").doc("AppDetails").update({
-                TotalDevelopmentTask: totalDevelopmentTask,
-                TotalBusinessTask: totalBusinessTask,
-                TotalMarketingTask: totalMarketingTask,
-                TotalOtherTask: totalOtherTask,
-                TotalNumberOfTask: totalNumberOfTask,
-                TotalUnCompletedTask: totalUnCompletedTask
-            });
-            
-            const P3 = db.collection("Activity").doc(taskId).set({
-                TaskId: taskId,
-                TotalActions: totalActions,
-                TotalComments: totalComments
-            });
-            const Promises = [P1,P2,P3];
-            return Promise.all(Promises);
-        });
-
-        const promise2 = db.collection("Main").doc(fullSprintId).get().then((doc) => {
-            if (doc.exists) {
-                totalNumberOfTask = doc.data().TotalNumberOfTask;
-                totalDevelopmentTask = doc.data().TotalDevelopmentTask;
-                totalBusinessTask = doc.data().TotalBusinessTask;
-                totalOtherTask = doc.data().TotalOtherTask;
-                totalMarketingTask = doc.data().TotalMarketingTask;
-                totalUnCompletedTask = doc.data().TotalUnCompletedTask;
-
-                if (category === "Development") {
-                    totalDevelopmentTask = totalDevelopmentTask + 1;
-                } else if (category === "Business") {
-                    totalBusinessTask = totalBusinessTask + 1;
-                } else if (category === "Marketing") {
-                    totalMarketingTask = totalMarketingTask + 1;
-                } else {
-                    totalOtherTask = totalOtherTask + 1;
-                }
-
-                totalNumberOfTask = totalNumberOfTask + 1;
-                totalUnCompletedTask = totalUnCompletedTask + 1;
-
-
-                sprintDataPromise = db.collection("Main").doc(fullSprintId).update({
-                    TotalBusinessTask: totalBusinessTask,
-                    TotalDevelopmentTask: totalDevelopmentTask,
-                    TotalMarketingTask: totalMarketingTask,
-                    TotalOtherTask: totalOtherTask,
-                    TotalUnCompletedTask: totalUnCompletedTask,
-                    TotalNumberOfTask: totalNumberOfTask
-                });
-            } else {
-                totalBusinessTask = 0;
-                totalDevelopmentTask = 0;
-                totalMarketingTask = 0;
-                totalOtherTask = 0;
-                totalUnCompletedTask = 0;
-                totalCompletedTask = 0;
-                totalNumberOfTask = 0;
-
-                if (category === "Development") {
-                    totalDevelopmentTask = totalDevelopmentTask + 1;
-                } else if (category === "Business") {
-                    totalBusinessTask = totalBusinessTask + 1;
-                } else if (category === "Marketing") {
-                    totalMarketingTask = totalMarketingTask + 1;
-                } else {
-                    totalOtherTask = totalOtherTask + 1;
-                }
-
-
-                totalNumberOfTask = totalNumberOfTask + 1;
-                totalUnCompletedTask = totalUnCompletedTask + 1;
-
-                sprintDataPromise = db.collection("Main").doc(fullSprintId).set({
-                    EndDate: "xx/xx/xxxx",
-                    StartDate: "xx/xx/xxxx",
-                    Status: "Not Started",
-                    TotalBusinessTask: totalBusinessTask,
-                    TotalDevelopmentTask: totalDevelopmentTask,
-                    TotalMarketingTask: totalMarketingTask,
-                    TotalOtherTask: totalOtherTask,
-                    TotalUnCompletedTask: totalUnCompletedTask,
-                    TotalCompletedTask: totalCompletedTask,
-                    TotalNumberOfTask: totalNumberOfTask
-                });
-
-            }
-            return Promise.resolve(sprintDataPromise);
-        });
-
-        const newTaskPromises = [promise1, promise2];
-        Promise.all(newTaskPromises).then(() => {
-                result = { data: "OK!" }
-                console.log("Document successfully written!");
-                return response.status(200).send(result);
-            })
-        .catch((error) => {
-            result = { data: error };
-            console.error("Error writing document: ", error);
-            return response.status(500).send(result);
-        });
-    });
-});
-
-exports.startNewSprint = functions.https.onRequest((request, response) => {
-    cors(request, response, () => {
-        console.log(request);
-
-        var status = request.body.data.Status;
-        var startDate = request.body.data.StartDate;
-        var endDate = request.body.data.EndDate;
-        var totalDevelopment = parseInt(request.body.data.TotalDevelopment);
-        var totalBusiness = parseInt(request.body.data.TotalBusiness);
-        var totalMarketing = parseInt(request.body.data.TotalMarketing);
-        var totalOther = parseInt(request.body.data.TotalOther);
-        var newSprintId = parseInt(request.body.data.NewSprintId);
-        var newSprintIdString = "S" + newSprintId.toString();
-        var createSprintPromise;
-        var result;
-
-        console.log("End Date from Backend: " + endDate);
-        console.log("Start Date from Backend: " + startDate);
-        console.log("Status from Backend: " + status);
-
-        const p1 = db.collection("Main").doc(newSprintIdString).get().then((doc) => {
-            if (doc.exists) {
-                createSprintPromise = db.collection("Main").doc(newSprintIdString).update({
-                    TotalDevelopmentTask: totalDevelopment,
-                    TotalBusinessTask: totalBusiness,
-                    TotalMarketingTask: totalMarketing,
-                    TotalOtherTask: totalOther,
-                    EndDate: endDate,
-                    StartDate: startDate,
-                    Status: status
-                });
-            } else {
-                var totalUnCompletedTask = 0;
-                var totalCompletedTask = 0;
-                var totalNumberOfTask = 0;
-
-                createSprintPromise = db.collection("Main").doc(newSprintIdString).set({
-                    TotalDevelopmentTask: totalDevelopment,
-                    TotalBusinessTask: totalBusiness,
-                    TotalMarketingTask: totalMarketing,
-                    TotalOtherTask: totalOther,
-                    EndDate: endDate,
-                    StartDate: startDate,
-                    Status: status,
-                    TotalUnCompletedTask: totalUnCompletedTask,
-                    TotalCompletedTask: totalCompletedTask,
-                    TotalNumberOfTask: totalNumberOfTask
-                });
-            }
-            return Promise.resolve(createSprintPromise);
-        });
-        const p2 = db.collection("RawData").doc("AppDetails").update({
-            CurrentSprintId: newSprintId
-        });
-        const Promises = [p1,p2];
-        return Promise.all(Promises).then(() => {
-            console.log("Sprint started successfully");
-            result = { data: "OK" }
-            console.log("Document successfully written!");
-            return response.status(200).send(result);
-        })
-        .catch((error) => {
-            result = { data: error }
-            console.log("error", error);
-            return response.status(500).send(result);
-        });
-    });
-});
-
-exports.logWork = functions.https.onRequest((request, response) => {
-    cors(request, response, () => {
-        var status = request.body.data.LogWorkStatus;
-        var taskId = request.body.data.LogTaskId;
-        var logHours = parseInt(request.body.data.LogHours);
-        var workDone = parseInt(request.body.data.LogWorkDone);
-        var sprintNumber = parseInt(request.body.data.SprintNumber);
-        var logWorkComment = request.body.data.LogWorkComment;
-        var date = request.body.data.Date;
-        var time = request.body.data.Time;
-        var fullSprintId = createSprintId(sprintNumber);
-        var logWorkTotalTime;
-        var totalActions;
-        var totalComments;
-        var actionId;
-
-        const promise1 = db.collection("Tasks").doc(taskId).get().then((doc) => {
-            logWorkTotalTime = parseInt(doc.data().LogWorkTotalTime);
-            logWorkTotalTime = parseInt(logWorkTotalTime) + parseInt(logHours);
-
-            var updatePromise = db.collection("Tasks").doc(taskId).update({
-                LogWorkTotalTime: logWorkTotalTime,
-                WorkDone: workDone,
-                Status: status
-            });
-            return Promise.resolve(updatePromise);
-        });
-        const promise2 = db.collection("RawData").doc("AppDetails").get().then((doc) => {
-            totalCompletedTask = parseInt(doc.data().TotalCompletedTask);
-            totalUnCompletedTask = parseInt(doc.data().TotalUnCompletedTask);
-            if (status === "Completed") {
-                totalCompletedTask = totalCompletedTask + 1;
-                totalUnCompletedTask = totalUnCompletedTask - 1;
-            }
-            var updateStatus = db.collection("RawData").doc("AppDetails").update({
-                TotalCompletedTask: totalCompletedTask,
-                TotalUnCompletedTask: totalUnCompletedTask
-            });
-            return Promise.resolve(updateStatus);
-        });
-        const promise3 = db.collection("Main").doc(fullSprintId).get().then((doc) => {
-            totalCompletedTask = parseInt(doc.data().TotalCompletedTask);
-            totalUnCompletedTask = parseInt(doc.data().TotalUnCompletedTask);
-
-            if (status === "Completed") {
-                totalCompletedTask = totalCompletedTask + 1;
-                totalUnCompletedTask = totalUnCompletedTask - 1;
-            }
-            var updateSprintstatus = db.collection("Main").doc(fullSprintId).update({
-                TotalCompletedTask: totalCompletedTask,
-                TotalUnCompletedTask: totalUnCompletedTask
-            });
-            return Promise.resolve(updateSprintstatus);
-        });
-        const promise4 = db.collection("Activity").doc(taskId).get().then((doc) => {
-            totalActions = parseInt(doc.data().TotalActions);
-            totalActions = parseInt(totalActions)+1;
-
-            totalComments = parseInt(doc.data().TotalComments);
-            totalComments = parseInt(totalComments)+1;
-
-            actionId = "A" + totalActions;
-
-            var p1 = db.collection("Activity").doc(taskId).update({
-                TotalActions: totalActions,
-                TotalComments: totalComments
-            });
-            var p2 = db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
-                Type: "comment",
-                Comment: logWorkComment,
-                Date: date,
-                Time: time
-            });
-            const Promises = [p1,p2];
-            return Promise.all(Promises);
-        });
-        const logWorkPromises = [promise1, promise2, promise3,promise4];
-        Promise.all(logWorkPromises).then(() => {
-                result = { data: "OK" }
-                console.log("Document successfully written!");
-                return response.status(200).send(result);
-            })
-            .catch((error) => {
-                var result = { data: error };
-                console.log("error", error);
-                return response.status(500).send(result)
-            });
-    });
-});
-
-exports.editPageTask = functions.https.onRequest((request, response) => {
-    cors(request, response, () => {
-        console.log(request);
-
-        var description = request.body.data.Description;
-        var priority = request.body.data.Priority;
-        var difficulty = request.body.data.Difficulty;
-        var assignee = request.body.data.Assignee;
-        var estimatedTime = request.body.data.EstimatedTime;
-        var category = request.body.data.Category;
-        var storyPointNumber = request.body.data.StoryPointNumber;
-        var editedSprintNumber = request.body.data.SprintNumber;
-        var previousId = request.body.data.PreviousId;
-        var creationDate = request.body.data.CreationDate;
-        var previousSprintId = createSprintId(previousId);
-        var taskId = request.body.data.Id;
-        var editedSprintId = createSprintId(editedSprintNumber);
-        var totalDevelopmentTask;
-        var totalBusinessTask;
-        var totalMarketingTask;
-        var totalOtherTask;
-        var totalNumberOfTask;
-        var result;
-        var totalUnCompletedTask;
-        var totalCompletedTask;
-        var sprintEditPromise;
-        var date = request.body.data.Date;
-        var time = request.body.data.Time;
-        var totalActions;
-        var actionId;
-        var type = "edit";
-        var comment = "edited task details";
-
-        var promises = [];
-        if (editedSprintNumber !== previousId) {
-            type="moved";
-            comment="moved to sprint " + editedSprintId;
-            const p1 = db.collection("Main").doc(previousSprintId).get().then((doc) => {
-                totalNumberOfTask = doc.data().TotalNumberOfTask;
-                totalDevelopmentTask = doc.data().TotalDevelopmentTask;
-                totalBusinessTask = doc.data().TotalBusinessTask;
-                totalMarketingTask = doc.data().TotalMarketingTask;
-                totalOtherTask = doc.data().TotalOtherTask;
-                totalUnCompletedTask = doc.data().TotalUnCompletedTask;
-
-                if (category === "Development") {
-                    totalDevelopmentTask = totalDevelopmentTask - 1;
-                } else if (category === "Business") {
-                    totalBusinessTask = totalBusinessTask - 1;
-                } else if (category === "Marketing") {
-                    totalMarketingTask = totalMarketingTask - 1;
-                } else {
-                    totalOtherTask = totalOtherTask - 1;
-                }
-
-                totalNumberOfTask = totalNumberOfTask - 1;
-                totalUnCompletedTask = totalUnCompletedTask - 1;
-                var editSprintDeleteCounter = db.collection("Main").doc(previousSprintId).update({
-                    TotalDevelopmentTask: totalDevelopmentTask,
-                    TotalBusinessTask: totalBusinessTask,
-                    TotalMarketingTask: totalMarketingTask,
-                    TotalOtherTask: totalOtherTask,
-                    TotalNumberOfTask: totalNumberOfTask,
-                    TotalUnCompletedTask: totalUnCompletedTask
-                });
-
-                return Promise.resolve(editSprintDeleteCounter);
-            });
-            promises.push(p1);
-
-            const p2 = db.collection("Main").doc(editedSprintId).get().then((doc) => {
-                if (doc.exists) {
-                    totalNumberOfTask = doc.data().TotalNumberOfTask;
-                    totalDevelopmentTask = doc.data().TotalDevelopmentTask;
-                    totalBusinessTask = doc.data().TotalBusinessTask;
-                    totalMarketingTask = doc.data().TotalMarketingTask;
-                    totalOtherTask = doc.data().TotalOtherTask;
-                    totalUnCompletedTask = doc.data().TotalUnCompletedTask;
-
-                    if (category === "Development") {
-                        totalDevelopmentTask = totalDevelopmentTask + 1;
-                    } else if (category === "Business") {
-                        totalBusinessTask = totalBusinessTask + 1;
-                    } else if (category === "Marketing") {
-                        totalMarketingTask = totalMarketingTask + 1;
-                    } else {
-                        totalOtherTask = totalOtherTask + 1;
-                    }
-
-                    totalNumberOfTask = totalNumberOfTask + 1;
-                    totalUnCompletedTask = totalUnCompletedTask + 1;
-
-                    sprintEditPromise = db.collection("Main").doc(editedSprintId).update({
-                        TotalBusinessTask: totalBusinessTask,
-                        TotalDevelopmentTask: totalDevelopmentTask,
-                        TotalMarketingTask: totalMarketingTask,
-                        TotalOtherTask: totalOtherTask,
-                        TotalUnCompletedTask: totalUnCompletedTask,
-                        TotalNumberOfTask: totalNumberOfTask
-                    });
-                } else {
-                    totalBusinessTask = 0;
-                    totalDevelopmentTask = 0;
-                    totalMarketingTask = 0;
-                    totalOtherTask = 0;
-                    totalUnCompletedTask = 0;
-                    totalCompletedTask = 0;
-                    totalNumberOfTask = 0;
-
-                    if (category === "Development") {
-                        totalDevelopmentTask = totalDevelopmentTask + 1;
-                    } else if (category === "Business") {
-                        totalBusinessTask = totalBusinessTask + 1;
-                    } else if (category === "Marketing") {
-                        totalMarketingTask = totalMarketingTask + 1;
-                    } else {
-                        totalOtherTask = totalOtherTask + 1;
-                    }
-
-                    totalNumberOfTask = totalNumberOfTask + 1;
-                    totalUnCompletedTask = totalUnCompletedTask + 1;
-                    sprintEditPromise = db.collection("Main").doc(editedSprintId).set({
-                        TotalBusinessTask: totalBusinessTask,
-                        TotalDevelopmentTask: totalDevelopmentTask,
-                        TotalMarketingTask: totalMarketingTask,
-                        TotalOtherTask: totalOtherTask,
-                        TotalUnCompletedTask: totalUnCompletedTask,
-                        TotalCompletedTask: totalCompletedTask,
-                        TotalNumberOfTask: totalNumberOfTask
-                    });
-                }
-                return Promise.resolve(sprintEditPromise)
-            });
-            promises.push(p2);
-        }
-
-        var p3 = db.collection("Activity").doc(taskId).get().then((doc) => {
-            totalActions = parseInt(doc.data().TotalActions);
-            totalActions = parseInt(totalActions)+1;
-
-            actionId = "A" + totalActions;
-
-            var prom1 = db.collection("Activity").doc(taskId).update({
-                TotalActions: totalActions,
-            });
-            var prom2 = db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
-                Type: type,
-                Comment: comment,
-                Date: date,
-                Time: time
-            });
-            const proms = [prom1,prom2];
-            return Promise.all(proms);
-        });
-        promises.push(p3);
-
-        var p4 = db.collection("Tasks").doc(taskId).update({
-                Description: description,
-                CreationDate: creationDate,
-                Priority: priority,
-                Difficulty: difficulty,
-                Assignee: assignee,
-                EstimatedTime: estimatedTime,
-                SprintNumber: editedSprintNumber,
-                StoryPointNumber: storyPointNumber
-        });
-        promises.push(p4);
-
-
-
-        Promise.all(promises).then(() => {
-            result = { data: "OK" };
-            console.log("Document sucessfully written");
-            return response.status(200).send(result);
-        })
-        .catch((error) => {
-            result = { data: error };
-            console.log("error", error);
-            return response.status(500).send(result)
-        });
-    });
-});
-
-exports.deleteTask = functions.https.onRequest((request, response) => {
-    cors(request, response, () => {
-        console.log(request);
-
-        var sprintNumber = request.body.data.SprintNumber;
-        var taskId = request.body.data.Id;
-        var fullSprintId = createSprintId(sprintNumber);
-        var category = request.body.data.Category;
-        var status = request.body.data.Status;
-        var totalDevelopmentTask;
-        var totalBusinessTask;
-        var totalMarketingTask;
-        var totalOtherTask;
-        var totalNumberOfTask;
-        var result;
-        var totalCompletedTask;
-        var totalUnCompletedTask;
-        var date = request.body.data.Date;
-        var time = request.body.data.Time;
-        var totalActions;
-        var actionId;
-
-        const p1 = db.collection("Tasks").doc(taskId).update({
-            Category: "Trash",
-            SprintNumber: -2
-        });
-        
-        const p2 = db.collection("Main").doc(fullSprintId).get().then((doc) => {
-            totalNumberOfTask = doc.data().TotalNumberOfTask;
-            totalDevelopmentTask = doc.data().TotalDevelopmentTask;
-            totalBusinessTask = doc.data().TotalBusinessTask;
-            totalMarketingTask = doc.data().TotalMarketingTask;
-            totalOtherTask = doc.data().TotalOtherTask
-            totalCompletedTask = doc.data().TotalCompletedTask;
-            totalUnCompletedTask = doc.data().TotalUnCompletedTask;
-
-            if (category === "Development") {
-                totalDevelopmentTask = totalDevelopmentTask - 1;
-            } else if (category === "Business") {
-                totalBusinessTask = totalBusinessTask - 1;
-            } else if (category === "Marketing") {
-                totalMarketingTask = totalMarketingTask - 1;
-            } else {
-                totalOtherTask = totalOtherTask -1;
-            }
-            totalNumberOfTask = totalNumberOfTask - 1;
-            status === "Completed" ? totalCompletedTask = totalCompletedTask - 1 : totalUnCompletedTask = totalUnCompletedTask - 1;
-            var updateDeleteTaskCounter = db.collection("Main").doc(fullSprintId).update({
-                TotalDevelopmentTask: totalDevelopmentTask,
-                TotalBusinessTask: totalBusinessTask,
-                TotalMarketingTask: totalMarketingTask,
-                TotalOtherTask: totalOtherTask,
-                TotalNumberOfTask: totalNumberOfTask,
-                TotalCompletedTask: totalCompletedTask,
-                TotalUnCompletedTask: totalUnCompletedTask
-            });
-            return Promise.resolve(updateDeleteTaskCounter);
-        });
-
-        const p3 = db.collection("Activity").doc(taskId).get().then((doc) => {
-            totalActions = parseInt(doc.data().TotalActions);
-            totalActions = parseInt(totalActions)+1;
-
-            actionId = "A" + totalActions;
-
-            var prom1 = db.collection("Activity").doc(taskId).update({
-                TotalActions: totalActions,
-            });
-            var prom2 = db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
-                Type: "delete",
-                Comment: "deleted task " + taskId,
-                Date: date,
-                Time: time
-            });
-            const proms = [prom1,prom2];
-            return Promise.all(proms);
-        });
-        const deleteTaskPromises = [p1, p2, p3];
-        Promise.all(deleteTaskPromises).then(() => {
-                result = { data: "OK" };
-                console.log("Document sucessfully deleted");
-                return response.status(200).send(result);
-            })
-            .catch((error) => {
-                result = { data: error };
-                console.log("error", error);
-                return response.status(500).send(result)
-            });
-    });
-});
-
-function createSprintId(sprintNumber) {
-    if (sprintNumber === -1) {
-        return "Backlog";
-    } else {
-        return ("S" + sprintNumber);
-    }
-}
-exports.createNewUser = functions.https.onRequest((request, response) => {
-    cors(request, response, () => {
-        console.log(request);
-        const user = request.body.data;
-        const Uid = user.uid;
-        const PhotoURL = user.photoURL;
-        const DisplayName = user.displayName;
-        const Email = user.email;
-        const PhoneNumber = user.phoneNumber;
-        const ProviderId = user.providerId;
-
-        db.collection("Users").doc(Uid).get().then((doc) => {
-                if (doc.exists) {
-                    const userData = db.collection("Users").doc(Uid).update({
-                        uid: Uid,
-                        photoURL: PhotoURL,
-                        displayName: DisplayName,
-                        email: Email,
-                        phoneNumber: PhoneNumber,
-                        providerId: ProviderId
-                    });
-                    return Promise.resolve(userData);
-                } else {
-                    const userData = db.collection("Users").doc(Uid).set({
-                        uid: Uid,
-                        photoURL: PhotoURL,
-                        displayName: DisplayName,
-                        email: Email,
-                        phoneNumber: PhoneNumber,
-                        providerId: ProviderId
-                    });
-                    return Promise.resolve(userData);
-                }
-            }).then(() => {
-                result = { data: "User Logged In Successfully" };
-                console.log("Document successfully written");
-                return response.status(200).send(result);
-            })
-            .catch((error) => {
-                result = { data: error };
-                console.log("error", error);
-                return response.status(500).send(result)
-            });
-    });
-});
-
-exports.updateSprintStatus = functions.https.onRequest((request, response) => {
-    cors(request, response, () => {
-        var sprintStatus = request.body.data.SprintStatus;
-        var currentSprintName = request.body.data.CurrentSprintName;
-        console.log(currentSprintName);
-        db.collection("Main").doc(currentSprintName).update({
-            Status: sprintStatus,
-        });
-    });
-})
\ No newline at end of file
diff --git a/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.ts b/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.ts
index 6d9d6156c..7ce0ae35d 100644
--- a/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.ts
+++ b/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.ts
@@ -3,6 +3,7 @@ import { AngularFireFunctions } from '@angular/fire/functions';
 import { NgForm } from '@angular/forms';
 import { Router } from '@angular/router';
 import { ValidationService } from '../../services/validation.service';
+import { ToolsService } from '../../services/tools.service';
 import { Location } from '@angular/common';
 
 @Component({
@@ -26,18 +27,14 @@ export class CreateNewSessionComponent implements OnInit {
   status: string
   sprintNumber: number
   storyPoint: number
+  time: string
   enableLoader: boolean = false
   valid: boolean = true;
 
-  constructor(private functions: AngularFireFunctions, public validationService: ValidationService, private router: Router, private location: Location) { }
+  constructor(private functions: AngularFireFunctions, public validationService: ValidationService, private router: Router, private location: Location, public toolsService: ToolsService) { }
   ngOnInit(): void {
-    var today = new Date();
-
-    var dd = String(today.getDate()).padStart(2, '0');
-    var mm = String(today.getMonth() + 1).padStart(2, '0');
-    var yyyy = today.getFullYear();
-
-    this.todayDate = dd + "/" + mm + "/" + yyyy;
+    this.todayDate = this.toolsService.date();
+    this.time = this.toolsService.time();
   }
 
   async submit(){
@@ -69,7 +66,7 @@ export class CreateNewSessionComponent implements OnInit {
     const callable = this.functions.httpsCallable('createNewTask');
 
     try {
-      const result = await callable({ Title: this.title, Description: this.description, Priority: this.priority, Difficulty: this.difficulty, Creator: this.creatorName, Assignee: this.assigneeName, EstimatedTime: this.estimatedTime, Status: this.status, Category: this.category, SprintNumber: this.sprintNumber, StoryPointNumber: this.storyPoint, CreationDate: this.todayDate }).toPromise();
+      const result = await callable({ Title: this.title, Description: this.description, Priority: this.priority, Difficulty: this.difficulty, Creator: this.creatorName, Assignee: this.assigneeName, EstimatedTime: this.estimatedTime, Status: this.status, Category: this.category, SprintNumber: this.sprintNumber, StoryPointNumber: this.storyPoint, CreationDate: this.todayDate, Time: this.time }).toPromise();
 
       console.log("Successfully created the task");
       console.log(result);
diff --git a/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.ts b/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.ts
index 9f61a1ae0..a225472cd 100644
--- a/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.ts
+++ b/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.ts
@@ -4,6 +4,7 @@ import { NgForm } from '@angular/forms';
 import { Tasks } from 'src/app/Interface/TasksInterface';
 import { Router } from '@angular/router';
 import { ValidationService } from '../../../services/validation.service';
+import { ToolsService } from '../../../services/tools.service';
 
 
 @Component({
@@ -22,24 +23,20 @@ export class EditPageComponent implements OnInit {
   enableLoader: boolean = false
   todayDate: string
   time: string
+  changedData: string = ""
+  prevVal =[]
+  newVal =[]
 
-  constructor(private functions: AngularFireFunctions, private router: Router, public validationService: ValidationService) { }
+  constructor(private functions: AngularFireFunctions, private router: Router, public validationService: ValidationService, public toolsService: ToolsService) { }
 
   ngOnInit(): void {
-    var today = new Date();
 
-    var dd = String(today.getDate()).padStart(2, '0');
-    var mm = String(today.getMonth() + 1).padStart(2, '0');
-    var yyyy = today.getFullYear();
-
-    var hh = String(today.getHours()).padStart(2, '0');
-    var mn = String(today.getMinutes()).padStart(2, '0');
-    var ss= String(today.getSeconds()).padStart(2, '0');
-    this.todayDate = dd + "/" + mm + "/" + yyyy;
-    this.time = hh + ":" + mn + ":" + ss;
+    this.todayDate = this.toolsService.date();
+    this.time = this.toolsService.time();
 
     this.editTask = this.task;
     this.previousSprintId = this.task.SprintNumber;
+    this.prevVal = [this.task.Description, this.task.Assignee, this.task.EstimatedTime, this.task.Priority, this.task.Difficulty, this.task.StoryPointNumber];
   }
 
   async submit(){
@@ -54,6 +51,8 @@ export class EditPageComponent implements OnInit {
       return res;});
     if(condition)
     {
+      this.newVal = [this.editTask.Description, this.editTask.Assignee, this.editTask.EstimatedTime, this.editTask.Priority, this.editTask.Difficulty, this.editTask.StoryPointNumber];
+      this.generateChanges();
       console.log("Inputs are valid");
       this.editPage();
     }
@@ -61,6 +60,26 @@ export class EditPageComponent implements OnInit {
     console.log("Page not edited due to validation error");
   }
 
+async generateChanges() {
+  console.log(this.editTask, this.task);
+    if(this.prevVal[0] != this.newVal[0])
+      this.changedData = this.changedData + " description,";
+    if(this.prevVal[1] != this.newVal[1])
+      this.changedData = this.changedData + " assignee," ;
+    if(this.prevVal[2] != this.newVal[2])
+      this.changedData = this.changedData + " estimated-time," ;
+    if(this.prevVal[3] != this.newVal[3])
+      this.changedData = this.changedData + " priority," ;
+    if(this.prevVal[4] != this.newVal[4])
+      this.changedData = this.changedData + " difficulty," ;
+    if(this.prevVal[5] != this.newVal[5])
+      this.changedData = this.changedData + " story-point,";
+    if(this.changedData != "")
+      this.changedData = "Edited-" + this.changedData;
+      this.changedData = this.changedData.substring(0,this.changedData.length-1) + "."
+    console.log(this.changedData);
+  }
+
   async editPage() {
     this.enableLoader = true
     const callable = this.functions.httpsCallable('editPageTask');
@@ -72,7 +91,7 @@ export class EditPageComponent implements OnInit {
 
       console.log(this.editTask.SprintNumber);
       if (!(this.task.Status === "Completed")) {
-        const result = await callable({ Id: this.editTask.Id, Description: this.editTask.Description, Priority: this.editTask.Priority, Difficulty: this.editTask.Difficulty, Assignee: this.editTask.Assignee, EstimatedTime: this.editTask.EstimatedTime, Category: this.task.Category, SprintNumber: this.editTask.SprintNumber, StoryPointNumber: this.editTask.StoryPointNumber, PreviousId: this.previousSprintId, CreationDate: this.editTask.CreationDate, Date: this.todayDate, Time: this.time}).toPromise();
+        const result = await callable({ Id: this.editTask.Id, Description: this.editTask.Description, Priority: this.editTask.Priority, Difficulty: this.editTask.Difficulty, Assignee: this.editTask.Assignee, EstimatedTime: this.editTask.EstimatedTime, Category: this.task.Category, SprintNumber: this.editTask.SprintNumber, StoryPointNumber: this.editTask.StoryPointNumber, PreviousId: this.previousSprintId, CreationDate: this.editTask.CreationDate, Date: this.todayDate, Time: this.time, ChangedData: this.changedData}).toPromise();
         console.log("Successfully Updated the task");
         console.log(result);
         this.editTaskDone();
diff --git a/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.ts b/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.ts
index 5c1cc3894..2031bdc75 100644
--- a/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.ts
+++ b/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.ts
@@ -3,6 +3,7 @@ import { NgForm } from '@angular/forms';
 import { Tasks } from 'src/app/Interface/TasksInterface';
 import { AngularFireFunctions } from '@angular/fire/functions';
 import { ValidationService } from '../../../services/validation.service';
+import { ToolsService } from '../../../services/tools.service';
 
 @Component({
   selector: 'app-log-work',
@@ -25,20 +26,11 @@ export class LogWorkComponent implements OnInit {
   todayDate: string
   time: string
 
-  constructor(private functions: AngularFireFunctions, public validationService: ValidationService) { }
+  constructor(private functions: AngularFireFunctions, public validationService: ValidationService, public toolsService: ToolsService) { }
 
   ngOnInit(): void { 
-    var today = new Date();
-
-    var dd = String(today.getDate()).padStart(2, '0');
-    var mm = String(today.getMonth() + 1).padStart(2, '0');
-    var yyyy = today.getFullYear();
-
-    var hh = String(today.getHours()).padStart(2, '0');
-    var mn = String(today.getMinutes()).padStart(2, '0');
-    var ss= String(today.getSeconds()).padStart(2, '0');
-    this.todayDate = dd + "/" + mm + "/" + yyyy;
-    this.time = hh + ":" + mn + ":" + ss;
+    this.todayDate = this.toolsService.date();
+    this.time = this.toolsService.time();
   }
 
   async submit(){
diff --git a/worktrolly-ui/src/app/body/task-details/task-details.component.ts b/worktrolly-ui/src/app/body/task-details/task-details.component.ts
index 6aea5f2d2..686b62031 100644
--- a/worktrolly-ui/src/app/body/task-details/task-details.component.ts
+++ b/worktrolly-ui/src/app/body/task-details/task-details.component.ts
@@ -6,6 +6,7 @@ import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators'
 import { Tasks } from 'src/app/Interface/TasksInterface';
 import { AuthService } from 'src/app/services/auth.service';
+import { ToolsService } from '../../services/tools.service';
 import {Location} from '@angular/common';
 
 @Component({
@@ -27,20 +28,11 @@ export class TaskDetailsComponent implements OnInit {
   public taskDocument: AngularFirestoreDocument<Tasks>
   public taskDataObservable: Observable<Tasks>
 
-  constructor(private route: ActivatedRoute, public db: AngularFirestore, private router: Router, private functions: AngularFireFunctions, public authService: AuthService, private location: Location) { }
+  constructor(private route: ActivatedRoute, public db: AngularFirestore, private router: Router, private functions: AngularFireFunctions, public authService: AuthService, private location: Location, public toolsService: ToolsService) { }
 
   ngOnInit(): void {
-    var today = new Date();
-
-    var dd = String(today.getDate()).padStart(2, '0');
-    var mm = String(today.getMonth() + 1).padStart(2, '0');
-    var yyyy = today.getFullYear();
-
-    var hh = String(today.getHours()).padStart(2, '0');
-    var mn = String(today.getMinutes()).padStart(2, '0');
-    var ss= String(today.getSeconds()).padStart(2, '0');
-    this.todayDate = dd + "/" + mm + "/" + yyyy;
-    this.time = hh + ":" + mn + ":" + ss;
+    this.todayDate = this.toolsService.date();
+    this.time = this.toolsService.time();
 
     this.Id = this.route.snapshot.params['taskId'];
     this.getTaskDetail();

From 897b1e29c80929d47d828b286a6ab8124c645a71 Mon Sep 17 00:00:00 2001
From: komal <komal9779@gmail.com>
Date: Fri, 29 Jan 2021 03:33:22 +0530
Subject: [PATCH 30/37] feat(dev/activity): using tools.service and splitting
 api into various js files

---
 functions/createNewTaskAPI.js                 | 240 ++++++++++++++++++
 functions/createNewUserAPI.js                 |  52 ++++
 functions/deleteTaskAPI.js                    | 147 +++++++++++
 functions/editPageTaskAPI.js                  | 237 +++++++++++++++++
 functions/logWorkAPI.js                       | 143 +++++++++++
 functions/startNewSprintAPI.js                |  76 ++++++
 functions/updateSprintStatusAPI.js            |  17 ++
 .../src/app/services/tools.service.spec.ts    |  16 ++
 .../src/app/services/tools.service.ts         |  29 +++
 9 files changed, 957 insertions(+)
 create mode 100644 functions/createNewTaskAPI.js
 create mode 100644 functions/createNewUserAPI.js
 create mode 100644 functions/deleteTaskAPI.js
 create mode 100644 functions/editPageTaskAPI.js
 create mode 100644 functions/logWorkAPI.js
 create mode 100644 functions/startNewSprintAPI.js
 create mode 100644 functions/updateSprintStatusAPI.js
 create mode 100644 worktrolly-ui/src/app/services/tools.service.spec.ts
 create mode 100644 worktrolly-ui/src/app/services/tools.service.ts

diff --git a/functions/createNewTaskAPI.js b/functions/createNewTaskAPI.js
new file mode 100644
index 000000000..0b3f709b4
--- /dev/null
+++ b/functions/createNewTaskAPI.js
@@ -0,0 +1,240 @@
+const functions = require('firebase-functions');
+var cors = require('cors')({ origin: true });
+
+const admin = require('firebase-admin');
+
+const db = admin.firestore();
+
+exports.createNewTask = functions.https.onRequest((request, response) => {
+    cors(request, response, () => {
+        console.log(request);
+        var title = request.body.data.Title;
+        var des = request.body.data.Description;
+        var priority = request.body.data.Priority;
+        var difficulty = request.body.data.Difficulty;
+        var creator = request.body.data.Creator;
+        var assignee = request.body.data.Assignee;
+        var estimatedTime = parseInt(request.body.data.EstimatedTime);
+        var status = request.body.data.Status;
+        var category = request.body.data.Category;
+        var storyPointNumber = parseInt(request.body.data.StoryPointNumber);
+        var sprintNumber = parseInt(request.body.data.SprintNumber);
+        var creationDate = request.body.data.CreationDate;
+        var time = request.body.data.Time;
+        var fullSprintId = createSprintId(sprintNumber);
+        var loggedWorkTotalTime = 0;
+        var workDone = 0;
+        var taskId = "";
+        var totalDevelopmentTask;
+        var totalBusinessTask;
+        var totalOtherTask;
+        var totalMarketingTask;
+        var totalNumberOfTask;
+        var result;
+        var totalUnCompletedTask = 0;
+        var sprintDataPromise;
+
+        const promise1 = db.collection("RawData").doc("AppDetails").get().then((doc) => {
+            totalNumberOfTask = doc.data().TotalNumberOfTask;
+            totalDevelopmentTask = doc.data().TotalDevelopmentTask;
+            totalBusinessTask = doc.data().TotalBusinessTask;
+            totalMarketingTask = doc.data().TotalMarketingTask;
+            totalOtherTask = doc.data().TotalOtherTask;
+            totalUnCompletedTask = doc.data().TotalUnCompletedTask;
+            if (category === "Development") {
+                totalDevelopmentTask = totalDevelopmentTask + 1;
+                taskId = category[0] + totalDevelopmentTask;
+            } else if (category === "Business") {
+                totalBusinessTask = totalBusinessTask + 1;
+                taskId = category[0] + totalBusinessTask;
+            } else if (category === "Marketing") {
+                totalMarketingTask = totalMarketingTask + 1;
+                taskId = category[0] + totalMarketingTask;
+            } else {
+                totalOtherTask = totalOtherTask + 1;
+                taskId = category[0] + totalOtherTask;
+            }
+            totalUnCompletedTask = totalUnCompletedTask + 1;
+            totalNumberOfTask = totalNumberOfTask + 1;
+            console.log(taskId);
+            const P1 = db.collection("Tasks").doc(taskId).set({
+                Id: taskId,
+                Title: title,
+                Description: des,
+                Priority: priority,
+                Difficulty: difficulty,
+                Creator: creator,
+                Assignee: assignee,
+                EstimatedTime: estimatedTime,
+                Status: status,
+                Category: category,
+                LogWorkTotalTime: loggedWorkTotalTime,
+                WorkDone: workDone,
+                SprintNumber: sprintNumber,
+                StoryPointNumber: storyPointNumber,
+                CreationDate: creationDate
+            });
+            const P2 = db.collection("RawData").doc("AppDetails").update({
+                TotalDevelopmentTask: totalDevelopmentTask,
+                TotalBusinessTask: totalBusinessTask,
+                TotalMarketingTask: totalMarketingTask,
+                TotalOtherTask: totalOtherTask,
+                TotalNumberOfTask: totalNumberOfTask,
+                TotalUnCompletedTask: totalUnCompletedTask
+            });
+            updateActivity("CREATED", "Created task "+taskId, taskId, creationDate, time);
+            const Promises = [P1,P2];
+            return Promise.all(Promises);
+        });
+
+        const promise2 = db.collection("Main").doc(fullSprintId).get().then((doc) => {
+            if (doc.exists) {
+                totalNumberOfTask = doc.data().TotalNumberOfTask;
+                totalDevelopmentTask = doc.data().TotalDevelopmentTask;
+                totalBusinessTask = doc.data().TotalBusinessTask;
+                totalOtherTask = doc.data().TotalOtherTask;
+                totalMarketingTask = doc.data().TotalMarketingTask;
+                totalUnCompletedTask = doc.data().TotalUnCompletedTask;
+
+                if (category === "Development") {
+                    totalDevelopmentTask = totalDevelopmentTask + 1;
+                } else if (category === "Business") {
+                    totalBusinessTask = totalBusinessTask + 1;
+                } else if (category === "Marketing") {
+                    totalMarketingTask = totalMarketingTask + 1;
+                } else {
+                    totalOtherTask = totalOtherTask + 1;
+                }
+
+                totalNumberOfTask = totalNumberOfTask + 1;
+                totalUnCompletedTask = totalUnCompletedTask + 1;
+
+
+                sprintDataPromise = db.collection("Main").doc(fullSprintId).update({
+                    TotalBusinessTask: totalBusinessTask,
+                    TotalDevelopmentTask: totalDevelopmentTask,
+                    TotalMarketingTask: totalMarketingTask,
+                    TotalOtherTask: totalOtherTask,
+                    TotalUnCompletedTask: totalUnCompletedTask,
+                    TotalNumberOfTask: totalNumberOfTask
+                });
+            } else {
+                totalBusinessTask = 0;
+                totalDevelopmentTask = 0;
+                totalMarketingTask = 0;
+                totalOtherTask = 0;
+                totalUnCompletedTask = 0;
+                totalCompletedTask = 0;
+                totalNumberOfTask = 0;
+
+                if (category === "Development") {
+                    totalDevelopmentTask = totalDevelopmentTask + 1;
+                } else if (category === "Business") {
+                    totalBusinessTask = totalBusinessTask + 1;
+                } else if (category === "Marketing") {
+                    totalMarketingTask = totalMarketingTask + 1;
+                } else {
+                    totalOtherTask = totalOtherTask + 1;
+                }
+
+
+                totalNumberOfTask = totalNumberOfTask + 1;
+                totalUnCompletedTask = totalUnCompletedTask + 1;
+
+                sprintDataPromise = db.collection("Main").doc(fullSprintId).set({
+                    EndDate: "xx/xx/xxxx",
+                    StartDate: "xx/xx/xxxx",
+                    Status: "Not Started",
+                    TotalBusinessTask: totalBusinessTask,
+                    TotalDevelopmentTask: totalDevelopmentTask,
+                    TotalMarketingTask: totalMarketingTask,
+                    TotalOtherTask: totalOtherTask,
+                    TotalUnCompletedTask: totalUnCompletedTask,
+                    TotalCompletedTask: totalCompletedTask,
+                    TotalNumberOfTask: totalNumberOfTask
+                });
+
+            }
+            return Promise.resolve(sprintDataPromise);
+        });
+
+        const newTaskPromises = [promise1, promise2];
+        Promise.all(newTaskPromises).then(() => {
+                result = { data: "OK!" }
+                console.log("Document successfully written!");
+                return response.status(200).send(result);
+            })
+        .catch((error) => {
+            result = { data: error };
+            console.error("Error writing document: ", error);
+            return response.status(500).send(result);
+        });
+    });
+});
+
+function createSprintId(sprintNumber) {
+    if (sprintNumber === -1) {
+        return "Backlog";
+    } else {
+        return ("S" + sprintNumber);
+    }
+}
+
+async function updateActivity(type, comment, taskId, date, time){
+    var actionId = "";
+    if(type === "CREATED") {
+        actionId = "A0";
+        db.collection("Activity").doc(taskId).set({
+            TaskId: taskId,
+            TotalActions: 0,
+            TotalComments: 0
+        });
+        db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
+            Type: type,
+            Comment: comment,
+            Date: date,
+            Time: time
+        });
+    }
+    else if (type === "COMMENT") {
+        actionId = await db.collection("Activity").doc(taskId).get().then((doc) => {
+            totalActions = doc.data().TotalActions;
+            totalActions = totalActions+1;
+            totalComments = doc.data().TotalComments;
+            totalComments = totalComments+1;
+            return ("A" + totalActions);
+        });
+        if (actionId !== ""){
+            db.collection("Activity").doc(taskId).update({
+                TotalActions: totalActions,
+                TotalComments: totalComments,
+            });
+            db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
+                Type: type,
+                Comment: comment,
+                Date: date,
+                Time: time
+            });
+        }
+    }
+    else{
+        actionId = await db.collection("Activity").doc(taskId).get().then((doc) => {
+            totalActions = doc.data().TotalActions;
+            totalActions = totalActions+1;
+
+            return ("A" + totalActions);
+
+        });
+        if (actionId !== ""){
+            db.collection("Activity").doc(taskId).update({
+                TotalActions: totalActions,
+            });
+            db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
+                Type: type,
+                Comment: comment,
+                Date: date,
+                Time: time
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/functions/createNewUserAPI.js b/functions/createNewUserAPI.js
new file mode 100644
index 000000000..c2236a37d
--- /dev/null
+++ b/functions/createNewUserAPI.js
@@ -0,0 +1,52 @@
+const functions = require('firebase-functions');
+var cors = require('cors')({ origin: true });
+
+const admin = require('firebase-admin');
+
+const db = admin.firestore();
+
+exports.createNewUser = functions.https.onRequest((request, response) => {
+    cors(request, response, () => {
+        console.log(request);
+        const user = request.body.data;
+        const Uid = user.uid;
+        const PhotoURL = user.photoURL;
+        const DisplayName = user.displayName;
+        const Email = user.email;
+        const PhoneNumber = user.phoneNumber;
+        const ProviderId = user.providerId;
+
+        db.collection("Users").doc(Uid).get().then((doc) => {
+                if (doc.exists) {
+                    const userData = db.collection("Users").doc(Uid).update({
+                        uid: Uid,
+                        photoURL: PhotoURL,
+                        displayName: DisplayName,
+                        email: Email,
+                        phoneNumber: PhoneNumber,
+                        providerId: ProviderId
+                    });
+                    return Promise.resolve(userData);
+                } else {
+                    const userData = db.collection("Users").doc(Uid).set({
+                        uid: Uid,
+                        photoURL: PhotoURL,
+                        displayName: DisplayName,
+                        email: Email,
+                        phoneNumber: PhoneNumber,
+                        providerId: ProviderId
+                    });
+                    return Promise.resolve(userData);
+                }
+            }).then(() => {
+                result = { data: "User Logged In Successfully" };
+                console.log("Document successfully written");
+                return response.status(200).send(result);
+            })
+            .catch((error) => {
+                result = { data: error };
+                console.log("error", error);
+                return response.status(500).send(result)
+            });
+    });
+});
\ No newline at end of file
diff --git a/functions/deleteTaskAPI.js b/functions/deleteTaskAPI.js
new file mode 100644
index 000000000..c44447f37
--- /dev/null
+++ b/functions/deleteTaskAPI.js
@@ -0,0 +1,147 @@
+const functions = require('firebase-functions');
+var cors = require('cors')({ origin: true });
+
+const admin = require('firebase-admin');
+
+const db = admin.firestore();
+
+exports.deleteTask = functions.https.onRequest((request, response) => {
+    cors(request, response, () => {
+        console.log(request);
+
+        var sprintNumber = request.body.data.SprintNumber;
+        var taskId = request.body.data.Id;
+        var fullSprintId = createSprintId(sprintNumber);
+        var category = request.body.data.Category;
+        var status = request.body.data.Status;
+        var totalDevelopmentTask;
+        var totalBusinessTask;
+        var totalMarketingTask;
+        var totalOtherTask;
+        var totalNumberOfTask;
+        var result;
+        var totalCompletedTask;
+        var totalUnCompletedTask;
+        var date = request.body.data.Date;
+        var time = request.body.data.Time;
+        var totalActions;
+        var actionId;
+
+        const p1 = db.collection("Tasks").doc(taskId).update({
+            Category: "Trash",
+            SprintNumber: -2
+        });
+        
+        const p2 = db.collection("Main").doc(fullSprintId).get().then((doc) => {
+            totalNumberOfTask = doc.data().TotalNumberOfTask;
+            totalDevelopmentTask = doc.data().TotalDevelopmentTask;
+            totalBusinessTask = doc.data().TotalBusinessTask;
+            totalMarketingTask = doc.data().TotalMarketingTask;
+            totalOtherTask = doc.data().TotalOtherTask
+            totalCompletedTask = doc.data().TotalCompletedTask;
+            totalUnCompletedTask = doc.data().TotalUnCompletedTask;
+
+            if (category === "Development") {
+                totalDevelopmentTask = totalDevelopmentTask - 1;
+            } else if (category === "Business") {
+                totalBusinessTask = totalBusinessTask - 1;
+            } else if (category === "Marketing") {
+                totalMarketingTask = totalMarketingTask - 1;
+            } else {
+                totalOtherTask = totalOtherTask -1;
+            }
+            totalNumberOfTask = totalNumberOfTask - 1;
+            status === "Completed" ? totalCompletedTask = totalCompletedTask - 1 : totalUnCompletedTask = totalUnCompletedTask - 1;
+            var updateDeleteTaskCounter = db.collection("Main").doc(fullSprintId).update({
+                TotalDevelopmentTask: totalDevelopmentTask,
+                TotalBusinessTask: totalBusinessTask,
+                TotalMarketingTask: totalMarketingTask,
+                TotalOtherTask: totalOtherTask,
+                TotalNumberOfTask: totalNumberOfTask,
+                TotalCompletedTask: totalCompletedTask,
+                TotalUnCompletedTask: totalUnCompletedTask
+            });
+            return Promise.resolve(updateDeleteTaskCounter);
+        });
+        updateActivity("DELETED", "Deleted task "+taskId, taskId, date, time);
+
+        const deleteTaskPromises = [p1, p2];
+        Promise.all(deleteTaskPromises).then(() => {
+                result = { data: "OK" };
+                console.log("Document sucessfully deleted");
+                return response.status(200).send(result);
+            })
+            .catch((error) => {
+                result = { data: error };
+                console.log("error", error);
+                return response.status(500).send(result)
+            });
+    });
+});
+
+function createSprintId(sprintNumber) {
+    if (sprintNumber === -1) {
+        return "Backlog";
+    } else {
+        return ("S" + sprintNumber);
+    }
+}
+
+async function updateActivity(type, comment, taskId, date, time){
+    var actionId = "";
+    if(type === "CREATED") {
+        actionId = "A0";
+        db.collection("Activity").doc(taskId).set({
+            TaskId: taskId,
+            TotalActions: 0,
+            TotalComments: 0
+        });
+        db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
+            Type: type,
+            Comment: comment,
+            Date: date,
+            Time: time
+        });
+    }
+    else if (type === "COMMENT") {
+        actionId = await db.collection("Activity").doc(taskId).get().then((doc) => {
+            totalActions = doc.data().TotalActions;
+            totalActions = totalActions+1;
+            totalComments = doc.data().TotalComments;
+            totalComments = totalComments+1;
+            return ("A" + totalActions);
+        });
+        if (actionId !== ""){
+            db.collection("Activity").doc(taskId).update({
+                TotalActions: totalActions,
+                TotalComments: totalComments,
+            });
+            db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
+                Type: type,
+                Comment: comment,
+                Date: date,
+                Time: time
+            });
+        }
+    }
+    else{
+        actionId = await db.collection("Activity").doc(taskId).get().then((doc) => {
+            totalActions = doc.data().TotalActions;
+            totalActions = totalActions+1;
+
+            return ("A" + totalActions);
+
+        });
+        if (actionId !== ""){
+            db.collection("Activity").doc(taskId).update({
+                TotalActions: totalActions,
+            });
+            db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
+                Type: type,
+                Comment: comment,
+                Date: date,
+                Time: time
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/functions/editPageTaskAPI.js b/functions/editPageTaskAPI.js
new file mode 100644
index 000000000..69ab4c803
--- /dev/null
+++ b/functions/editPageTaskAPI.js
@@ -0,0 +1,237 @@
+const functions = require('firebase-functions');
+var cors = require('cors')({ origin: true });
+
+const admin = require('firebase-admin');
+
+const db = admin.firestore();
+
+exports.editPageTask = functions.https.onRequest((request, response) => {
+    cors(request, response, () => {
+        console.log(request);
+
+        var description = request.body.data.Description;
+        var priority = request.body.data.Priority;
+        var difficulty = request.body.data.Difficulty;
+        var assignee = request.body.data.Assignee;
+        var estimatedTime = request.body.data.EstimatedTime;
+        var category = request.body.data.Category;
+        var storyPointNumber = request.body.data.StoryPointNumber;
+        var editedSprintNumber = request.body.data.SprintNumber;
+        var previousId = request.body.data.PreviousId;
+        var creationDate = request.body.data.CreationDate;
+        var changedData = request.body.data.ChangedData;
+        var previousSprintId = createSprintId(previousId);
+        var taskId = request.body.data.Id;
+        var editedSprintId = createSprintId(editedSprintNumber);
+        var totalDevelopmentTask;
+        var totalBusinessTask;
+        var totalMarketingTask;
+        var totalOtherTask;
+        var totalNumberOfTask;
+        var result;
+        var totalUnCompletedTask;
+        var totalCompletedTask;
+        var sprintEditPromise;
+        var date = request.body.data.Date;
+        var time = request.body.data.Time;
+        var totalActions;
+        var actionId;
+        var type = "EDITED";
+        var comment = "Edited task details: ";
+
+
+        var promises = [];
+        if (editedSprintNumber !== previousId) {
+            comment += "Moved to sprint " + editedSprintId + ". ";
+            const p1 = db.collection("Main").doc(previousSprintId).get().then((doc) => {
+                totalNumberOfTask = doc.data().TotalNumberOfTask;
+                totalDevelopmentTask = doc.data().TotalDevelopmentTask;
+                totalBusinessTask = doc.data().TotalBusinessTask;
+                totalMarketingTask = doc.data().TotalMarketingTask;
+                totalOtherTask = doc.data().TotalOtherTask;
+                totalUnCompletedTask = doc.data().TotalUnCompletedTask;
+
+                if (category === "Development") {
+                    totalDevelopmentTask = totalDevelopmentTask - 1;
+                } else if (category === "Business") {
+                    totalBusinessTask = totalBusinessTask - 1;
+                } else if (category === "Marketing") {
+                    totalMarketingTask = totalMarketingTask - 1;
+                } else {
+                    totalOtherTask = totalOtherTask - 1;
+                }
+
+                totalNumberOfTask = totalNumberOfTask - 1;
+                totalUnCompletedTask = totalUnCompletedTask - 1;
+                var editSprintDeleteCounter = db.collection("Main").doc(previousSprintId).update({
+                    TotalDevelopmentTask: totalDevelopmentTask,
+                    TotalBusinessTask: totalBusinessTask,
+                    TotalMarketingTask: totalMarketingTask,
+                    TotalOtherTask: totalOtherTask,
+                    TotalNumberOfTask: totalNumberOfTask,
+                    TotalUnCompletedTask: totalUnCompletedTask
+                });
+
+                return Promise.resolve(editSprintDeleteCounter);
+            });
+            promises.push(p1);
+
+            const p2 = db.collection("Main").doc(editedSprintId).get().then((doc) => {
+                if (doc.exists) {
+                    totalNumberOfTask = doc.data().TotalNumberOfTask;
+                    totalDevelopmentTask = doc.data().TotalDevelopmentTask;
+                    totalBusinessTask = doc.data().TotalBusinessTask;
+                    totalMarketingTask = doc.data().TotalMarketingTask;
+                    totalOtherTask = doc.data().TotalOtherTask;
+                    totalUnCompletedTask = doc.data().TotalUnCompletedTask;
+
+                    if (category === "Development") {
+                        totalDevelopmentTask = totalDevelopmentTask + 1;
+                    } else if (category === "Business") {
+                        totalBusinessTask = totalBusinessTask + 1;
+                    } else if (category === "Marketing") {
+                        totalMarketingTask = totalMarketingTask + 1;
+                    } else {
+                        totalOtherTask = totalOtherTask + 1;
+                    }
+
+                    totalNumberOfTask = totalNumberOfTask + 1;
+                    totalUnCompletedTask = totalUnCompletedTask + 1;
+
+                    sprintEditPromise = db.collection("Main").doc(editedSprintId).update({
+                        TotalBusinessTask: totalBusinessTask,
+                        TotalDevelopmentTask: totalDevelopmentTask,
+                        TotalMarketingTask: totalMarketingTask,
+                        TotalOtherTask: totalOtherTask,
+                        TotalUnCompletedTask: totalUnCompletedTask,
+                        TotalNumberOfTask: totalNumberOfTask
+                    });
+                } else {
+                    totalBusinessTask = 0;
+                    totalDevelopmentTask = 0;
+                    totalMarketingTask = 0;
+                    totalOtherTask = 0;
+                    totalUnCompletedTask = 0;
+                    totalCompletedTask = 0;
+                    totalNumberOfTask = 0;
+
+                    if (category === "Development") {
+                        totalDevelopmentTask = totalDevelopmentTask + 1;
+                    } else if (category === "Business") {
+                        totalBusinessTask = totalBusinessTask + 1;
+                    } else if (category === "Marketing") {
+                        totalMarketingTask = totalMarketingTask + 1;
+                    } else {
+                        totalOtherTask = totalOtherTask + 1;
+                    }
+
+                    totalNumberOfTask = totalNumberOfTask + 1;
+                    totalUnCompletedTask = totalUnCompletedTask + 1;
+                    sprintEditPromise = db.collection("Main").doc(editedSprintId).set({
+                        TotalBusinessTask: totalBusinessTask,
+                        TotalDevelopmentTask: totalDevelopmentTask,
+                        TotalMarketingTask: totalMarketingTask,
+                        TotalOtherTask: totalOtherTask,
+                        TotalUnCompletedTask: totalUnCompletedTask,
+                        TotalCompletedTask: totalCompletedTask,
+                        TotalNumberOfTask: totalNumberOfTask
+                    });
+                }
+                return Promise.resolve(sprintEditPromise)
+            });
+            promises.push(p2);
+        }
+
+        var p3 = db.collection("Tasks").doc(taskId).update({
+                Description: description,
+                CreationDate: creationDate,
+                Priority: priority,
+                Difficulty: difficulty,
+                Assignee: assignee,
+                EstimatedTime: estimatedTime,
+                SprintNumber: editedSprintNumber,
+                StoryPointNumber: storyPointNumber
+        });
+        promises.push(p3);
+        comment = comment + changedData;
+        updateActivity(type, comment, taskId, date, time);
+
+        Promise.all(promises).then(() => {
+            result = { data: "OK" };
+            console.log("Document sucessfully written");
+            return response.status(200).send(result);
+        })
+        .catch((error) => {
+            result = { data: error };
+            console.log("error", error);
+            return response.status(500).send(result)
+        });
+    });
+});
+
+function createSprintId(sprintNumber) {
+    if (sprintNumber === -1) {
+        return "Backlog";
+    } else {
+        return ("S" + sprintNumber);
+    }
+}
+
+async function updateActivity(type, comment, taskId, date, time){
+    var actionId = "";
+    if(type === "CREATED") {
+        actionId = "A0";
+        db.collection("Activity").doc(taskId).set({
+            TaskId: taskId,
+            TotalActions: 0,
+            TotalComments: 0
+        });
+        db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
+            Type: type,
+            Comment: comment,
+            Date: date,
+            Time: time
+        });
+    }
+    else if (type === "COMMENT") {
+        actionId = await db.collection("Activity").doc(taskId).get().then((doc) => {
+            totalActions = doc.data().TotalActions;
+            totalActions = totalActions+1;
+            totalComments = doc.data().TotalComments;
+            totalComments = totalComments+1;
+            return ("A" + totalActions);
+        });
+        if (actionId !== ""){
+            db.collection("Activity").doc(taskId).update({
+                TotalActions: totalActions,
+                TotalComments: totalComments,
+            });
+            db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
+                Type: type,
+                Comment: comment,
+                Date: date,
+                Time: time
+            });
+        }
+    }
+    else{
+        actionId = await db.collection("Activity").doc(taskId).get().then((doc) => {
+            totalActions = doc.data().TotalActions;
+            totalActions = totalActions+1;
+
+            return ("A" + totalActions);
+
+        });
+        if (actionId !== ""){
+            db.collection("Activity").doc(taskId).update({
+                TotalActions: totalActions,
+            });
+            db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
+                Type: type,
+                Comment: comment,
+                Date: date,
+                Time: time
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/functions/logWorkAPI.js b/functions/logWorkAPI.js
new file mode 100644
index 000000000..1160b7a42
--- /dev/null
+++ b/functions/logWorkAPI.js
@@ -0,0 +1,143 @@
+const functions = require('firebase-functions');
+var cors = require('cors')({ origin: true });
+
+const admin = require('firebase-admin');
+
+const db = admin.firestore();
+
+exports.logWork = functions.https.onRequest((request, response) => {
+    cors(request, response, () => {
+        var status = request.body.data.LogWorkStatus;
+        var taskId = request.body.data.LogTaskId;
+        var logHours = parseInt(request.body.data.LogHours);
+        var workDone = parseInt(request.body.data.LogWorkDone);
+        var sprintNumber = parseInt(request.body.data.SprintNumber);
+        var logWorkComment = request.body.data.LogWorkComment;
+        var date = request.body.data.Date;
+        var time = request.body.data.Time;
+        var fullSprintId = createSprintId(sprintNumber);
+        var logWorkTotalTime;
+        var totalActions;
+        var totalComments;
+        var actionId;
+
+        const promise1 = db.collection("Tasks").doc(taskId).get().then((doc) => {
+            logWorkTotalTime = parseInt(doc.data().LogWorkTotalTime);
+            logWorkTotalTime = parseInt(logWorkTotalTime) + parseInt(logHours);
+
+            var updatePromise = db.collection("Tasks").doc(taskId).update({
+                LogWorkTotalTime: logWorkTotalTime,
+                WorkDone: workDone,
+                Status: status
+            });
+            return Promise.resolve(updatePromise);
+        });
+        const promise2 = db.collection("RawData").doc("AppDetails").get().then((doc) => {
+            totalCompletedTask = parseInt(doc.data().TotalCompletedTask);
+            totalUnCompletedTask = parseInt(doc.data().TotalUnCompletedTask);
+            if (status === "Completed") {
+                totalCompletedTask = totalCompletedTask + 1;
+                totalUnCompletedTask = totalUnCompletedTask - 1;
+            }
+            var updateStatus = db.collection("RawData").doc("AppDetails").update({
+                TotalCompletedTask: totalCompletedTask,
+                TotalUnCompletedTask: totalUnCompletedTask
+            });
+            return Promise.resolve(updateStatus);
+        });
+        const promise3 = db.collection("Main").doc(fullSprintId).get().then((doc) => {
+            totalCompletedTask = parseInt(doc.data().TotalCompletedTask);
+            totalUnCompletedTask = parseInt(doc.data().TotalUnCompletedTask);
+
+            if (status === "Completed") {
+                totalCompletedTask = totalCompletedTask + 1;
+                totalUnCompletedTask = totalUnCompletedTask - 1;
+            }
+            var updateSprintstatus = db.collection("Main").doc(fullSprintId).update({
+                TotalCompletedTask: totalCompletedTask,
+                TotalUnCompletedTask: totalUnCompletedTask
+            });
+            return Promise.resolve(updateSprintstatus);
+        });
+        updateActivity("COMMENT", logWorkComment, taskId, date, time);
+        
+        const logWorkPromises = [promise1, promise2, promise3];
+        Promise.all(logWorkPromises).then(() => {
+                result = { data: "OK" }
+                console.log("Document successfully written!");
+                return response.status(200).send(result);
+            })
+            .catch((error) => {
+                var result = { data: error };
+                console.log("error", error);
+                return response.status(500).send(result)
+            });
+    });
+});
+
+function createSprintId(sprintNumber) {
+    if (sprintNumber === -1) {
+        return "Backlog";
+    } else {
+        return ("S" + sprintNumber);
+    }
+}
+
+async function updateActivity(type, comment, taskId, date, time){
+    var actionId = "";
+    if(type === "CREATED") {
+        actionId = "A0";
+        db.collection("Activity").doc(taskId).set({
+            TaskId: taskId,
+            TotalActions: 0,
+            TotalComments: 0
+        });
+        db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
+            Type: type,
+            Comment: comment,
+            Date: date,
+            Time: time
+        });
+    }
+    else if (type === "COMMENT") {
+        actionId = await db.collection("Activity").doc(taskId).get().then((doc) => {
+            totalActions = doc.data().TotalActions;
+            totalActions = totalActions+1;
+            totalComments = doc.data().TotalComments;
+            totalComments = totalComments+1;
+            return ("A" + totalActions);
+        });
+        if (actionId !== ""){
+            db.collection("Activity").doc(taskId).update({
+                TotalActions: totalActions,
+                TotalComments: totalComments,
+            });
+            db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
+                Type: type,
+                Comment: comment,
+                Date: date,
+                Time: time
+            });
+        }
+    }
+    else{
+        actionId = await db.collection("Activity").doc(taskId).get().then((doc) => {
+            totalActions = doc.data().TotalActions;
+            totalActions = totalActions+1;
+
+            return ("A" + totalActions);
+
+        });
+        if (actionId !== ""){
+            db.collection("Activity").doc(taskId).update({
+                TotalActions: totalActions,
+            });
+            db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
+                Type: type,
+                Comment: comment,
+                Date: date,
+                Time: time
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/functions/startNewSprintAPI.js b/functions/startNewSprintAPI.js
new file mode 100644
index 000000000..5da7fe2c2
--- /dev/null
+++ b/functions/startNewSprintAPI.js
@@ -0,0 +1,76 @@
+const functions = require('firebase-functions');
+var cors = require('cors')({ origin: true });
+
+const admin = require('firebase-admin');
+
+const db = admin.firestore();
+
+exports.startNewSprint = functions.https.onRequest((request, response) => {
+    cors(request, response, () => {
+        console.log(request);
+
+        var status = request.body.data.Status;
+        var startDate = request.body.data.StartDate;
+        var endDate = request.body.data.EndDate;
+        var totalDevelopment = parseInt(request.body.data.TotalDevelopment);
+        var totalBusiness = parseInt(request.body.data.TotalBusiness);
+        var totalMarketing = parseInt(request.body.data.TotalMarketing);
+        var totalOther = parseInt(request.body.data.TotalOther);
+        var newSprintId = parseInt(request.body.data.NewSprintId);
+        var newSprintIdString = "S" + newSprintId.toString();
+        var createSprintPromise;
+        var result;
+
+        console.log("End Date from Backend: " + endDate);
+        console.log("Start Date from Backend: " + startDate);
+        console.log("Status from Backend: " + status);
+
+        const p1 = db.collection("Main").doc(newSprintIdString).get().then((doc) => {
+            if (doc.exists) {
+                createSprintPromise = db.collection("Main").doc(newSprintIdString).update({
+                    TotalDevelopmentTask: totalDevelopment,
+                    TotalBusinessTask: totalBusiness,
+                    TotalMarketingTask: totalMarketing,
+                    TotalOtherTask: totalOther,
+                    EndDate: endDate,
+                    StartDate: startDate,
+                    Status: status
+                });
+            } else {
+                var totalUnCompletedTask = 0;
+                var totalCompletedTask = 0;
+                var totalNumberOfTask = 0;
+
+                createSprintPromise = db.collection("Main").doc(newSprintIdString).set({
+                    TotalDevelopmentTask: totalDevelopment,
+                    TotalBusinessTask: totalBusiness,
+                    TotalMarketingTask: totalMarketing,
+                    TotalOtherTask: totalOther,
+                    EndDate: endDate,
+                    StartDate: startDate,
+                    Status: status,
+                    TotalUnCompletedTask: totalUnCompletedTask,
+                    TotalCompletedTask: totalCompletedTask,
+                    TotalNumberOfTask: totalNumberOfTask
+                });
+            }
+            return Promise.resolve(createSprintPromise);
+        });
+        const p2 = db.collection("RawData").doc("AppDetails").update({
+            CurrentSprintId: newSprintId
+        });
+        const Promises = [p1,p2];
+        return Promise.all(Promises).then(() => {
+            console.log("Sprint started successfully");
+            result = { data: "OK" }
+            console.log("Document successfully written!");
+            return response.status(200).send(result);
+        })
+        .catch((error) => {
+            result = { data: error }
+            console.log("error", error);
+            return response.status(500).send(result);
+        });
+    });
+});
+
diff --git a/functions/updateSprintStatusAPI.js b/functions/updateSprintStatusAPI.js
new file mode 100644
index 000000000..71f8de785
--- /dev/null
+++ b/functions/updateSprintStatusAPI.js
@@ -0,0 +1,17 @@
+const functions = require('firebase-functions');
+var cors = require('cors')({ origin: true });
+
+const admin = require('firebase-admin');
+
+const db = admin.firestore();
+
+exports.updateSprintStatus = functions.https.onRequest((request, response) => {
+    cors(request, response, () => {
+        var sprintStatus = request.body.data.SprintStatus;
+        var currentSprintName = request.body.data.CurrentSprintName;
+        console.log(currentSprintName);
+        db.collection("Main").doc(currentSprintName).update({
+            Status: sprintStatus,
+        });
+    });
+})
diff --git a/worktrolly-ui/src/app/services/tools.service.spec.ts b/worktrolly-ui/src/app/services/tools.service.spec.ts
new file mode 100644
index 000000000..3225de8e6
--- /dev/null
+++ b/worktrolly-ui/src/app/services/tools.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { ToolsService } from './tools.service';
+
+describe('ToolsService', () => {
+  let service: ToolsService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(ToolsService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});
diff --git a/worktrolly-ui/src/app/services/tools.service.ts b/worktrolly-ui/src/app/services/tools.service.ts
new file mode 100644
index 000000000..67cc02d24
--- /dev/null
+++ b/worktrolly-ui/src/app/services/tools.service.ts
@@ -0,0 +1,29 @@
+import { Injectable } from '@angular/core';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class ToolsService {
+
+  todayDate: string
+  todayTime: string
+
+  constructor() { }
+
+  date(){
+    var today = new Date();
+    var dd = String(today.getDate()).padStart(2, '0');
+    var mm = String(today.getMonth() + 1).padStart(2, '0');
+    var yyyy = today.getFullYear();
+    return this.todayDate = dd + "/" + mm + "/" + yyyy;
+  }
+
+  time(){
+    var today = new Date();
+    var hh = String(today.getHours()).padStart(2, '0');
+    var mn = String(today.getMinutes()).padStart(2, '0');
+    var ss= String(today.getSeconds()).padStart(2, '0');
+    return this.todayTime = hh + ":" + mn + ":" + ss;
+  }
+
+}

From 4930c561885e16a6d71d019f42a5a5f5ff8c8271 Mon Sep 17 00:00:00 2001
From: Shrishti Pathak <67093261+Shrishti1802@users.noreply.github.com>
Date: Fri, 29 Jan 2021 16:34:57 +0530
Subject: [PATCH 31/37] Revert "feat(dev/activity): added an activity
 collection in database."

---
 functions/createNewTaskAPI.js                 | 240 -------
 functions/createNewUserAPI.js                 |  52 --
 functions/deleteTaskAPI.js                    | 147 -----
 functions/editPageTaskAPI.js                  | 237 -------
 functions/index.js                            | 600 +++++++++++++++++-
 functions/logWorkAPI.js                       | 143 -----
 functions/startNewSprintAPI.js                |  76 ---
 functions/updateSprintStatusAPI.js            |  17 -
 .../create-new-session.component.ts           |  15 +-
 .../edit-page/edit-page.component.ts          |  37 +-
 .../log-work/log-work.component.ts            |  12 +-
 .../task-details/task-details.component.ts    |  11 +-
 .../src/app/services/tools.service.spec.ts    |  16 -
 .../src/app/services/tools.service.ts         |  29 -
 14 files changed, 600 insertions(+), 1032 deletions(-)
 delete mode 100644 functions/createNewTaskAPI.js
 delete mode 100644 functions/createNewUserAPI.js
 delete mode 100644 functions/deleteTaskAPI.js
 delete mode 100644 functions/editPageTaskAPI.js
 delete mode 100644 functions/logWorkAPI.js
 delete mode 100644 functions/startNewSprintAPI.js
 delete mode 100644 functions/updateSprintStatusAPI.js
 delete mode 100644 worktrolly-ui/src/app/services/tools.service.spec.ts
 delete mode 100644 worktrolly-ui/src/app/services/tools.service.ts

diff --git a/functions/createNewTaskAPI.js b/functions/createNewTaskAPI.js
deleted file mode 100644
index 0b3f709b4..000000000
--- a/functions/createNewTaskAPI.js
+++ /dev/null
@@ -1,240 +0,0 @@
-const functions = require('firebase-functions');
-var cors = require('cors')({ origin: true });
-
-const admin = require('firebase-admin');
-
-const db = admin.firestore();
-
-exports.createNewTask = functions.https.onRequest((request, response) => {
-    cors(request, response, () => {
-        console.log(request);
-        var title = request.body.data.Title;
-        var des = request.body.data.Description;
-        var priority = request.body.data.Priority;
-        var difficulty = request.body.data.Difficulty;
-        var creator = request.body.data.Creator;
-        var assignee = request.body.data.Assignee;
-        var estimatedTime = parseInt(request.body.data.EstimatedTime);
-        var status = request.body.data.Status;
-        var category = request.body.data.Category;
-        var storyPointNumber = parseInt(request.body.data.StoryPointNumber);
-        var sprintNumber = parseInt(request.body.data.SprintNumber);
-        var creationDate = request.body.data.CreationDate;
-        var time = request.body.data.Time;
-        var fullSprintId = createSprintId(sprintNumber);
-        var loggedWorkTotalTime = 0;
-        var workDone = 0;
-        var taskId = "";
-        var totalDevelopmentTask;
-        var totalBusinessTask;
-        var totalOtherTask;
-        var totalMarketingTask;
-        var totalNumberOfTask;
-        var result;
-        var totalUnCompletedTask = 0;
-        var sprintDataPromise;
-
-        const promise1 = db.collection("RawData").doc("AppDetails").get().then((doc) => {
-            totalNumberOfTask = doc.data().TotalNumberOfTask;
-            totalDevelopmentTask = doc.data().TotalDevelopmentTask;
-            totalBusinessTask = doc.data().TotalBusinessTask;
-            totalMarketingTask = doc.data().TotalMarketingTask;
-            totalOtherTask = doc.data().TotalOtherTask;
-            totalUnCompletedTask = doc.data().TotalUnCompletedTask;
-            if (category === "Development") {
-                totalDevelopmentTask = totalDevelopmentTask + 1;
-                taskId = category[0] + totalDevelopmentTask;
-            } else if (category === "Business") {
-                totalBusinessTask = totalBusinessTask + 1;
-                taskId = category[0] + totalBusinessTask;
-            } else if (category === "Marketing") {
-                totalMarketingTask = totalMarketingTask + 1;
-                taskId = category[0] + totalMarketingTask;
-            } else {
-                totalOtherTask = totalOtherTask + 1;
-                taskId = category[0] + totalOtherTask;
-            }
-            totalUnCompletedTask = totalUnCompletedTask + 1;
-            totalNumberOfTask = totalNumberOfTask + 1;
-            console.log(taskId);
-            const P1 = db.collection("Tasks").doc(taskId).set({
-                Id: taskId,
-                Title: title,
-                Description: des,
-                Priority: priority,
-                Difficulty: difficulty,
-                Creator: creator,
-                Assignee: assignee,
-                EstimatedTime: estimatedTime,
-                Status: status,
-                Category: category,
-                LogWorkTotalTime: loggedWorkTotalTime,
-                WorkDone: workDone,
-                SprintNumber: sprintNumber,
-                StoryPointNumber: storyPointNumber,
-                CreationDate: creationDate
-            });
-            const P2 = db.collection("RawData").doc("AppDetails").update({
-                TotalDevelopmentTask: totalDevelopmentTask,
-                TotalBusinessTask: totalBusinessTask,
-                TotalMarketingTask: totalMarketingTask,
-                TotalOtherTask: totalOtherTask,
-                TotalNumberOfTask: totalNumberOfTask,
-                TotalUnCompletedTask: totalUnCompletedTask
-            });
-            updateActivity("CREATED", "Created task "+taskId, taskId, creationDate, time);
-            const Promises = [P1,P2];
-            return Promise.all(Promises);
-        });
-
-        const promise2 = db.collection("Main").doc(fullSprintId).get().then((doc) => {
-            if (doc.exists) {
-                totalNumberOfTask = doc.data().TotalNumberOfTask;
-                totalDevelopmentTask = doc.data().TotalDevelopmentTask;
-                totalBusinessTask = doc.data().TotalBusinessTask;
-                totalOtherTask = doc.data().TotalOtherTask;
-                totalMarketingTask = doc.data().TotalMarketingTask;
-                totalUnCompletedTask = doc.data().TotalUnCompletedTask;
-
-                if (category === "Development") {
-                    totalDevelopmentTask = totalDevelopmentTask + 1;
-                } else if (category === "Business") {
-                    totalBusinessTask = totalBusinessTask + 1;
-                } else if (category === "Marketing") {
-                    totalMarketingTask = totalMarketingTask + 1;
-                } else {
-                    totalOtherTask = totalOtherTask + 1;
-                }
-
-                totalNumberOfTask = totalNumberOfTask + 1;
-                totalUnCompletedTask = totalUnCompletedTask + 1;
-
-
-                sprintDataPromise = db.collection("Main").doc(fullSprintId).update({
-                    TotalBusinessTask: totalBusinessTask,
-                    TotalDevelopmentTask: totalDevelopmentTask,
-                    TotalMarketingTask: totalMarketingTask,
-                    TotalOtherTask: totalOtherTask,
-                    TotalUnCompletedTask: totalUnCompletedTask,
-                    TotalNumberOfTask: totalNumberOfTask
-                });
-            } else {
-                totalBusinessTask = 0;
-                totalDevelopmentTask = 0;
-                totalMarketingTask = 0;
-                totalOtherTask = 0;
-                totalUnCompletedTask = 0;
-                totalCompletedTask = 0;
-                totalNumberOfTask = 0;
-
-                if (category === "Development") {
-                    totalDevelopmentTask = totalDevelopmentTask + 1;
-                } else if (category === "Business") {
-                    totalBusinessTask = totalBusinessTask + 1;
-                } else if (category === "Marketing") {
-                    totalMarketingTask = totalMarketingTask + 1;
-                } else {
-                    totalOtherTask = totalOtherTask + 1;
-                }
-
-
-                totalNumberOfTask = totalNumberOfTask + 1;
-                totalUnCompletedTask = totalUnCompletedTask + 1;
-
-                sprintDataPromise = db.collection("Main").doc(fullSprintId).set({
-                    EndDate: "xx/xx/xxxx",
-                    StartDate: "xx/xx/xxxx",
-                    Status: "Not Started",
-                    TotalBusinessTask: totalBusinessTask,
-                    TotalDevelopmentTask: totalDevelopmentTask,
-                    TotalMarketingTask: totalMarketingTask,
-                    TotalOtherTask: totalOtherTask,
-                    TotalUnCompletedTask: totalUnCompletedTask,
-                    TotalCompletedTask: totalCompletedTask,
-                    TotalNumberOfTask: totalNumberOfTask
-                });
-
-            }
-            return Promise.resolve(sprintDataPromise);
-        });
-
-        const newTaskPromises = [promise1, promise2];
-        Promise.all(newTaskPromises).then(() => {
-                result = { data: "OK!" }
-                console.log("Document successfully written!");
-                return response.status(200).send(result);
-            })
-        .catch((error) => {
-            result = { data: error };
-            console.error("Error writing document: ", error);
-            return response.status(500).send(result);
-        });
-    });
-});
-
-function createSprintId(sprintNumber) {
-    if (sprintNumber === -1) {
-        return "Backlog";
-    } else {
-        return ("S" + sprintNumber);
-    }
-}
-
-async function updateActivity(type, comment, taskId, date, time){
-    var actionId = "";
-    if(type === "CREATED") {
-        actionId = "A0";
-        db.collection("Activity").doc(taskId).set({
-            TaskId: taskId,
-            TotalActions: 0,
-            TotalComments: 0
-        });
-        db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
-            Type: type,
-            Comment: comment,
-            Date: date,
-            Time: time
-        });
-    }
-    else if (type === "COMMENT") {
-        actionId = await db.collection("Activity").doc(taskId).get().then((doc) => {
-            totalActions = doc.data().TotalActions;
-            totalActions = totalActions+1;
-            totalComments = doc.data().TotalComments;
-            totalComments = totalComments+1;
-            return ("A" + totalActions);
-        });
-        if (actionId !== ""){
-            db.collection("Activity").doc(taskId).update({
-                TotalActions: totalActions,
-                TotalComments: totalComments,
-            });
-            db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
-                Type: type,
-                Comment: comment,
-                Date: date,
-                Time: time
-            });
-        }
-    }
-    else{
-        actionId = await db.collection("Activity").doc(taskId).get().then((doc) => {
-            totalActions = doc.data().TotalActions;
-            totalActions = totalActions+1;
-
-            return ("A" + totalActions);
-
-        });
-        if (actionId !== ""){
-            db.collection("Activity").doc(taskId).update({
-                TotalActions: totalActions,
-            });
-            db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
-                Type: type,
-                Comment: comment,
-                Date: date,
-                Time: time
-            });
-        }
-    }
-}
\ No newline at end of file
diff --git a/functions/createNewUserAPI.js b/functions/createNewUserAPI.js
deleted file mode 100644
index c2236a37d..000000000
--- a/functions/createNewUserAPI.js
+++ /dev/null
@@ -1,52 +0,0 @@
-const functions = require('firebase-functions');
-var cors = require('cors')({ origin: true });
-
-const admin = require('firebase-admin');
-
-const db = admin.firestore();
-
-exports.createNewUser = functions.https.onRequest((request, response) => {
-    cors(request, response, () => {
-        console.log(request);
-        const user = request.body.data;
-        const Uid = user.uid;
-        const PhotoURL = user.photoURL;
-        const DisplayName = user.displayName;
-        const Email = user.email;
-        const PhoneNumber = user.phoneNumber;
-        const ProviderId = user.providerId;
-
-        db.collection("Users").doc(Uid).get().then((doc) => {
-                if (doc.exists) {
-                    const userData = db.collection("Users").doc(Uid).update({
-                        uid: Uid,
-                        photoURL: PhotoURL,
-                        displayName: DisplayName,
-                        email: Email,
-                        phoneNumber: PhoneNumber,
-                        providerId: ProviderId
-                    });
-                    return Promise.resolve(userData);
-                } else {
-                    const userData = db.collection("Users").doc(Uid).set({
-                        uid: Uid,
-                        photoURL: PhotoURL,
-                        displayName: DisplayName,
-                        email: Email,
-                        phoneNumber: PhoneNumber,
-                        providerId: ProviderId
-                    });
-                    return Promise.resolve(userData);
-                }
-            }).then(() => {
-                result = { data: "User Logged In Successfully" };
-                console.log("Document successfully written");
-                return response.status(200).send(result);
-            })
-            .catch((error) => {
-                result = { data: error };
-                console.log("error", error);
-                return response.status(500).send(result)
-            });
-    });
-});
\ No newline at end of file
diff --git a/functions/deleteTaskAPI.js b/functions/deleteTaskAPI.js
deleted file mode 100644
index c44447f37..000000000
--- a/functions/deleteTaskAPI.js
+++ /dev/null
@@ -1,147 +0,0 @@
-const functions = require('firebase-functions');
-var cors = require('cors')({ origin: true });
-
-const admin = require('firebase-admin');
-
-const db = admin.firestore();
-
-exports.deleteTask = functions.https.onRequest((request, response) => {
-    cors(request, response, () => {
-        console.log(request);
-
-        var sprintNumber = request.body.data.SprintNumber;
-        var taskId = request.body.data.Id;
-        var fullSprintId = createSprintId(sprintNumber);
-        var category = request.body.data.Category;
-        var status = request.body.data.Status;
-        var totalDevelopmentTask;
-        var totalBusinessTask;
-        var totalMarketingTask;
-        var totalOtherTask;
-        var totalNumberOfTask;
-        var result;
-        var totalCompletedTask;
-        var totalUnCompletedTask;
-        var date = request.body.data.Date;
-        var time = request.body.data.Time;
-        var totalActions;
-        var actionId;
-
-        const p1 = db.collection("Tasks").doc(taskId).update({
-            Category: "Trash",
-            SprintNumber: -2
-        });
-        
-        const p2 = db.collection("Main").doc(fullSprintId).get().then((doc) => {
-            totalNumberOfTask = doc.data().TotalNumberOfTask;
-            totalDevelopmentTask = doc.data().TotalDevelopmentTask;
-            totalBusinessTask = doc.data().TotalBusinessTask;
-            totalMarketingTask = doc.data().TotalMarketingTask;
-            totalOtherTask = doc.data().TotalOtherTask
-            totalCompletedTask = doc.data().TotalCompletedTask;
-            totalUnCompletedTask = doc.data().TotalUnCompletedTask;
-
-            if (category === "Development") {
-                totalDevelopmentTask = totalDevelopmentTask - 1;
-            } else if (category === "Business") {
-                totalBusinessTask = totalBusinessTask - 1;
-            } else if (category === "Marketing") {
-                totalMarketingTask = totalMarketingTask - 1;
-            } else {
-                totalOtherTask = totalOtherTask -1;
-            }
-            totalNumberOfTask = totalNumberOfTask - 1;
-            status === "Completed" ? totalCompletedTask = totalCompletedTask - 1 : totalUnCompletedTask = totalUnCompletedTask - 1;
-            var updateDeleteTaskCounter = db.collection("Main").doc(fullSprintId).update({
-                TotalDevelopmentTask: totalDevelopmentTask,
-                TotalBusinessTask: totalBusinessTask,
-                TotalMarketingTask: totalMarketingTask,
-                TotalOtherTask: totalOtherTask,
-                TotalNumberOfTask: totalNumberOfTask,
-                TotalCompletedTask: totalCompletedTask,
-                TotalUnCompletedTask: totalUnCompletedTask
-            });
-            return Promise.resolve(updateDeleteTaskCounter);
-        });
-        updateActivity("DELETED", "Deleted task "+taskId, taskId, date, time);
-
-        const deleteTaskPromises = [p1, p2];
-        Promise.all(deleteTaskPromises).then(() => {
-                result = { data: "OK" };
-                console.log("Document sucessfully deleted");
-                return response.status(200).send(result);
-            })
-            .catch((error) => {
-                result = { data: error };
-                console.log("error", error);
-                return response.status(500).send(result)
-            });
-    });
-});
-
-function createSprintId(sprintNumber) {
-    if (sprintNumber === -1) {
-        return "Backlog";
-    } else {
-        return ("S" + sprintNumber);
-    }
-}
-
-async function updateActivity(type, comment, taskId, date, time){
-    var actionId = "";
-    if(type === "CREATED") {
-        actionId = "A0";
-        db.collection("Activity").doc(taskId).set({
-            TaskId: taskId,
-            TotalActions: 0,
-            TotalComments: 0
-        });
-        db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
-            Type: type,
-            Comment: comment,
-            Date: date,
-            Time: time
-        });
-    }
-    else if (type === "COMMENT") {
-        actionId = await db.collection("Activity").doc(taskId).get().then((doc) => {
-            totalActions = doc.data().TotalActions;
-            totalActions = totalActions+1;
-            totalComments = doc.data().TotalComments;
-            totalComments = totalComments+1;
-            return ("A" + totalActions);
-        });
-        if (actionId !== ""){
-            db.collection("Activity").doc(taskId).update({
-                TotalActions: totalActions,
-                TotalComments: totalComments,
-            });
-            db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
-                Type: type,
-                Comment: comment,
-                Date: date,
-                Time: time
-            });
-        }
-    }
-    else{
-        actionId = await db.collection("Activity").doc(taskId).get().then((doc) => {
-            totalActions = doc.data().TotalActions;
-            totalActions = totalActions+1;
-
-            return ("A" + totalActions);
-
-        });
-        if (actionId !== ""){
-            db.collection("Activity").doc(taskId).update({
-                TotalActions: totalActions,
-            });
-            db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
-                Type: type,
-                Comment: comment,
-                Date: date,
-                Time: time
-            });
-        }
-    }
-}
\ No newline at end of file
diff --git a/functions/editPageTaskAPI.js b/functions/editPageTaskAPI.js
deleted file mode 100644
index 69ab4c803..000000000
--- a/functions/editPageTaskAPI.js
+++ /dev/null
@@ -1,237 +0,0 @@
-const functions = require('firebase-functions');
-var cors = require('cors')({ origin: true });
-
-const admin = require('firebase-admin');
-
-const db = admin.firestore();
-
-exports.editPageTask = functions.https.onRequest((request, response) => {
-    cors(request, response, () => {
-        console.log(request);
-
-        var description = request.body.data.Description;
-        var priority = request.body.data.Priority;
-        var difficulty = request.body.data.Difficulty;
-        var assignee = request.body.data.Assignee;
-        var estimatedTime = request.body.data.EstimatedTime;
-        var category = request.body.data.Category;
-        var storyPointNumber = request.body.data.StoryPointNumber;
-        var editedSprintNumber = request.body.data.SprintNumber;
-        var previousId = request.body.data.PreviousId;
-        var creationDate = request.body.data.CreationDate;
-        var changedData = request.body.data.ChangedData;
-        var previousSprintId = createSprintId(previousId);
-        var taskId = request.body.data.Id;
-        var editedSprintId = createSprintId(editedSprintNumber);
-        var totalDevelopmentTask;
-        var totalBusinessTask;
-        var totalMarketingTask;
-        var totalOtherTask;
-        var totalNumberOfTask;
-        var result;
-        var totalUnCompletedTask;
-        var totalCompletedTask;
-        var sprintEditPromise;
-        var date = request.body.data.Date;
-        var time = request.body.data.Time;
-        var totalActions;
-        var actionId;
-        var type = "EDITED";
-        var comment = "Edited task details: ";
-
-
-        var promises = [];
-        if (editedSprintNumber !== previousId) {
-            comment += "Moved to sprint " + editedSprintId + ". ";
-            const p1 = db.collection("Main").doc(previousSprintId).get().then((doc) => {
-                totalNumberOfTask = doc.data().TotalNumberOfTask;
-                totalDevelopmentTask = doc.data().TotalDevelopmentTask;
-                totalBusinessTask = doc.data().TotalBusinessTask;
-                totalMarketingTask = doc.data().TotalMarketingTask;
-                totalOtherTask = doc.data().TotalOtherTask;
-                totalUnCompletedTask = doc.data().TotalUnCompletedTask;
-
-                if (category === "Development") {
-                    totalDevelopmentTask = totalDevelopmentTask - 1;
-                } else if (category === "Business") {
-                    totalBusinessTask = totalBusinessTask - 1;
-                } else if (category === "Marketing") {
-                    totalMarketingTask = totalMarketingTask - 1;
-                } else {
-                    totalOtherTask = totalOtherTask - 1;
-                }
-
-                totalNumberOfTask = totalNumberOfTask - 1;
-                totalUnCompletedTask = totalUnCompletedTask - 1;
-                var editSprintDeleteCounter = db.collection("Main").doc(previousSprintId).update({
-                    TotalDevelopmentTask: totalDevelopmentTask,
-                    TotalBusinessTask: totalBusinessTask,
-                    TotalMarketingTask: totalMarketingTask,
-                    TotalOtherTask: totalOtherTask,
-                    TotalNumberOfTask: totalNumberOfTask,
-                    TotalUnCompletedTask: totalUnCompletedTask
-                });
-
-                return Promise.resolve(editSprintDeleteCounter);
-            });
-            promises.push(p1);
-
-            const p2 = db.collection("Main").doc(editedSprintId).get().then((doc) => {
-                if (doc.exists) {
-                    totalNumberOfTask = doc.data().TotalNumberOfTask;
-                    totalDevelopmentTask = doc.data().TotalDevelopmentTask;
-                    totalBusinessTask = doc.data().TotalBusinessTask;
-                    totalMarketingTask = doc.data().TotalMarketingTask;
-                    totalOtherTask = doc.data().TotalOtherTask;
-                    totalUnCompletedTask = doc.data().TotalUnCompletedTask;
-
-                    if (category === "Development") {
-                        totalDevelopmentTask = totalDevelopmentTask + 1;
-                    } else if (category === "Business") {
-                        totalBusinessTask = totalBusinessTask + 1;
-                    } else if (category === "Marketing") {
-                        totalMarketingTask = totalMarketingTask + 1;
-                    } else {
-                        totalOtherTask = totalOtherTask + 1;
-                    }
-
-                    totalNumberOfTask = totalNumberOfTask + 1;
-                    totalUnCompletedTask = totalUnCompletedTask + 1;
-
-                    sprintEditPromise = db.collection("Main").doc(editedSprintId).update({
-                        TotalBusinessTask: totalBusinessTask,
-                        TotalDevelopmentTask: totalDevelopmentTask,
-                        TotalMarketingTask: totalMarketingTask,
-                        TotalOtherTask: totalOtherTask,
-                        TotalUnCompletedTask: totalUnCompletedTask,
-                        TotalNumberOfTask: totalNumberOfTask
-                    });
-                } else {
-                    totalBusinessTask = 0;
-                    totalDevelopmentTask = 0;
-                    totalMarketingTask = 0;
-                    totalOtherTask = 0;
-                    totalUnCompletedTask = 0;
-                    totalCompletedTask = 0;
-                    totalNumberOfTask = 0;
-
-                    if (category === "Development") {
-                        totalDevelopmentTask = totalDevelopmentTask + 1;
-                    } else if (category === "Business") {
-                        totalBusinessTask = totalBusinessTask + 1;
-                    } else if (category === "Marketing") {
-                        totalMarketingTask = totalMarketingTask + 1;
-                    } else {
-                        totalOtherTask = totalOtherTask + 1;
-                    }
-
-                    totalNumberOfTask = totalNumberOfTask + 1;
-                    totalUnCompletedTask = totalUnCompletedTask + 1;
-                    sprintEditPromise = db.collection("Main").doc(editedSprintId).set({
-                        TotalBusinessTask: totalBusinessTask,
-                        TotalDevelopmentTask: totalDevelopmentTask,
-                        TotalMarketingTask: totalMarketingTask,
-                        TotalOtherTask: totalOtherTask,
-                        TotalUnCompletedTask: totalUnCompletedTask,
-                        TotalCompletedTask: totalCompletedTask,
-                        TotalNumberOfTask: totalNumberOfTask
-                    });
-                }
-                return Promise.resolve(sprintEditPromise)
-            });
-            promises.push(p2);
-        }
-
-        var p3 = db.collection("Tasks").doc(taskId).update({
-                Description: description,
-                CreationDate: creationDate,
-                Priority: priority,
-                Difficulty: difficulty,
-                Assignee: assignee,
-                EstimatedTime: estimatedTime,
-                SprintNumber: editedSprintNumber,
-                StoryPointNumber: storyPointNumber
-        });
-        promises.push(p3);
-        comment = comment + changedData;
-        updateActivity(type, comment, taskId, date, time);
-
-        Promise.all(promises).then(() => {
-            result = { data: "OK" };
-            console.log("Document sucessfully written");
-            return response.status(200).send(result);
-        })
-        .catch((error) => {
-            result = { data: error };
-            console.log("error", error);
-            return response.status(500).send(result)
-        });
-    });
-});
-
-function createSprintId(sprintNumber) {
-    if (sprintNumber === -1) {
-        return "Backlog";
-    } else {
-        return ("S" + sprintNumber);
-    }
-}
-
-async function updateActivity(type, comment, taskId, date, time){
-    var actionId = "";
-    if(type === "CREATED") {
-        actionId = "A0";
-        db.collection("Activity").doc(taskId).set({
-            TaskId: taskId,
-            TotalActions: 0,
-            TotalComments: 0
-        });
-        db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
-            Type: type,
-            Comment: comment,
-            Date: date,
-            Time: time
-        });
-    }
-    else if (type === "COMMENT") {
-        actionId = await db.collection("Activity").doc(taskId).get().then((doc) => {
-            totalActions = doc.data().TotalActions;
-            totalActions = totalActions+1;
-            totalComments = doc.data().TotalComments;
-            totalComments = totalComments+1;
-            return ("A" + totalActions);
-        });
-        if (actionId !== ""){
-            db.collection("Activity").doc(taskId).update({
-                TotalActions: totalActions,
-                TotalComments: totalComments,
-            });
-            db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
-                Type: type,
-                Comment: comment,
-                Date: date,
-                Time: time
-            });
-        }
-    }
-    else{
-        actionId = await db.collection("Activity").doc(taskId).get().then((doc) => {
-            totalActions = doc.data().TotalActions;
-            totalActions = totalActions+1;
-
-            return ("A" + totalActions);
-
-        });
-        if (actionId !== ""){
-            db.collection("Activity").doc(taskId).update({
-                TotalActions: totalActions,
-            });
-            db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
-                Type: type,
-                Comment: comment,
-                Date: date,
-                Time: time
-            });
-        }
-    }
-}
\ No newline at end of file
diff --git a/functions/index.js b/functions/index.js
index 14cddc9ae..8dc53bdad 100644
--- a/functions/index.js
+++ b/functions/index.js
@@ -1,22 +1,10 @@
 const functions = require('firebase-functions');
+var cors = require('cors')({ origin: true });
+
 const admin = require('firebase-admin');
 admin.initializeApp();
-const createNewTaskAPI = require('./createNewTaskAPI');
-const startNewSprintAPI = require('./startNewSprintAPI');
-const logWorkAPI = require('./logWorkAPI');
-const editPageTaskAPI = require('./editPageTaskAPI');
-const deleteTaskAPI = require('./deleteTaskAPI');
-const createNewUserAPI = require('./createNewUserAPI');
-const updateSprintStatusAPI = require('./updateSprintStatusAPI');
-
-
-exports.createNewTask = createNewTaskAPI.createNewTask;
-exports.startNewSprint = startNewSprintAPI.startNewSprint;
-exports.logWork = logWorkAPI.logWork;
-exports.editPageTask = editPageTaskAPI.editPageTask;
-exports.deleteTask = deleteTaskAPI.deleteTask;
-exports.createNewUser = createNewUserAPI.createNewUser;
-exports.updateSprintStatus = updateSprintStatusAPI.updateSprintStatus;
+
+const db = admin.firestore();
 
 // class Task {
 //     constructor(id, title, status, priority, estimatedTime, difficulty, description, creator, category, assignee, logWorkTotalTime, workDone, creationDate, sprintNumber, storyPointNumber) {
@@ -38,3 +26,583 @@ exports.updateSprintStatus = updateSprintStatusAPI.updateSprintStatus;
 //     }
 // }
 
+
+exports.createNewTask = functions.https.onRequest((request, response) => {
+    cors(request, response, () => {
+        console.log(request);
+        var title = request.body.data.Title;
+        var des = request.body.data.Description;
+        var priority = request.body.data.Priority;
+        var difficulty = request.body.data.Difficulty;
+        var creator = request.body.data.Creator;
+        var assignee = request.body.data.Assignee;
+        var estimatedTime = parseInt(request.body.data.EstimatedTime);
+        var status = request.body.data.Status;
+        var category = request.body.data.Category;
+        var storyPointNumber = parseInt(request.body.data.StoryPointNumber);
+        var sprintNumber = parseInt(request.body.data.SprintNumber);
+        var creationDate = request.body.data.CreationDate;
+        var fullSprintId = createSprintId(sprintNumber);
+        var loggedWorkTotalTime = 0;
+        var workDone = 0;
+        var taskId = "";
+        var totalDevelopmentTask;
+        var totalBusinessTask;
+        var totalOtherTask;
+        var totalMarketingTask;
+        var totalNumberOfTask;
+        var result;
+        var totalUnCompletedTask = 0;
+        var sprintDataPromise;
+
+        const promise1 = db.collection("RawData").doc("AppDetails").get().then((doc) => {
+            totalNumberOfTask = doc.data().TotalNumberOfTask;
+            totalDevelopmentTask = doc.data().TotalDevelopmentTask;
+            totalBusinessTask = doc.data().TotalBusinessTask;
+            totalMarketingTask = doc.data().TotalMarketingTask;
+            totalOtherTask = doc.data().TotalOtherTask;
+            totalUnCompletedTask = doc.data().TotalUnCompletedTask;
+            if (category === "Development") {
+                totalDevelopmentTask = totalDevelopmentTask + 1;
+                taskId = category[0] + totalDevelopmentTask;
+            } else if (category === "Business") {
+                totalBusinessTask = totalBusinessTask + 1;
+                taskId = category[0] + totalBusinessTask;
+            } else if (category === "Marketing") {
+                totalMarketingTask = totalMarketingTask + 1;
+                taskId = category[0] + totalMarketingTask;
+            } else {
+                totalOtherTask = totalOtherTask + 1;
+                taskId = category[0] + totalOtherTask;
+            }
+            totalUnCompletedTask = totalUnCompletedTask + 1;
+            totalNumberOfTask = totalNumberOfTask + 1;
+            console.log(taskId);
+            const P1 = db.collection("Tasks").doc(taskId).set({
+                Id: taskId,
+                Title: title,
+                Description: des,
+                Priority: priority,
+                Difficulty: difficulty,
+                Creator: creator,
+                Assignee: assignee,
+                EstimatedTime: estimatedTime,
+                Status: status,
+                Category: category,
+                LogWorkTotalTime: loggedWorkTotalTime,
+                WorkDone: workDone,
+                SprintNumber: sprintNumber,
+                StoryPointNumber: storyPointNumber,
+                CreationDate: creationDate
+            });
+            const P2 = db.collection("RawData").doc("AppDetails").update({
+                TotalDevelopmentTask: totalDevelopmentTask,
+                TotalBusinessTask: totalBusinessTask,
+                TotalMarketingTask: totalMarketingTask,
+                TotalOtherTask: totalOtherTask,
+                TotalNumberOfTask: totalNumberOfTask,
+                TotalUnCompletedTask: totalUnCompletedTask
+            });
+            const Promises = [P1,P2];
+            return Promise.all(Promises);
+        });
+
+        const promise2 = db.collection("Main").doc(fullSprintId).get().then((doc) => {
+            if (doc.exists) {
+                totalNumberOfTask = doc.data().TotalNumberOfTask;
+                totalDevelopmentTask = doc.data().TotalDevelopmentTask;
+                totalBusinessTask = doc.data().TotalBusinessTask;
+                totalOtherTask = doc.data().TotalOtherTask;
+                totalMarketingTask = doc.data().TotalMarketingTask;
+                totalUnCompletedTask = doc.data().TotalUnCompletedTask;
+
+                if (category === "Development") {
+                    totalDevelopmentTask = totalDevelopmentTask + 1;
+                } else if (category === "Business") {
+                    totalBusinessTask = totalBusinessTask + 1;
+                } else if (category === "Marketing") {
+                    totalMarketingTask = totalMarketingTask + 1;
+                } else {
+                    totalOtherTask = totalOtherTask + 1;
+                }
+
+                totalNumberOfTask = totalNumberOfTask + 1;
+                totalUnCompletedTask = totalUnCompletedTask + 1;
+
+
+                sprintDataPromise = db.collection("Main").doc(fullSprintId).update({
+                    TotalBusinessTask: totalBusinessTask,
+                    TotalDevelopmentTask: totalDevelopmentTask,
+                    TotalMarketingTask: totalMarketingTask,
+                    TotalOtherTask: totalOtherTask,
+                    TotalUnCompletedTask: totalUnCompletedTask,
+                    TotalNumberOfTask: totalNumberOfTask
+                });
+            } else {
+                totalBusinessTask = 0;
+                totalDevelopmentTask = 0;
+                totalMarketingTask = 0;
+                totalOtherTask = 0;
+                totalUnCompletedTask = 0;
+                totalCompletedTask = 0;
+                totalNumberOfTask = 0;
+
+                if (category === "Development") {
+                    totalDevelopmentTask = totalDevelopmentTask + 1;
+                } else if (category === "Business") {
+                    totalBusinessTask = totalBusinessTask + 1;
+                } else if (category === "Marketing") {
+                    totalMarketingTask = totalMarketingTask + 1;
+                } else {
+                    totalOtherTask = totalOtherTask + 1;
+                }
+
+
+                totalNumberOfTask = totalNumberOfTask + 1;
+                totalUnCompletedTask = totalUnCompletedTask + 1;
+
+                sprintDataPromise = db.collection("Main").doc(fullSprintId).set({
+                    EndDate: "xx/xx/xxxx",
+                    StartDate: "xx/xx/xxxx",
+                    Status: "Not Started",
+                    TotalBusinessTask: totalBusinessTask,
+                    TotalDevelopmentTask: totalDevelopmentTask,
+                    TotalMarketingTask: totalMarketingTask,
+                    TotalOtherTask: totalOtherTask,
+                    TotalUnCompletedTask: totalUnCompletedTask,
+                    TotalCompletedTask: totalCompletedTask,
+                    TotalNumberOfTask: totalNumberOfTask
+                });
+
+            }
+            return Promise.resolve(sprintDataPromise);
+        });
+        const newTaskPromises = [promise1, promise2];
+        Promise.all(newTaskPromises).then(() => {
+                result = { data: "OK!" }
+                console.log("Document successfully written!");
+                return response.status(200).send(result);
+            })
+        .catch((error) => {
+            result = { data: error };
+            console.error("Error writing document: ", error);
+            return response.status(500).send(result);
+        });
+    });
+});
+
+exports.startNewSprint = functions.https.onRequest((request, response) => {
+    cors(request, response, () => {
+        console.log(request);
+
+        var status = request.body.data.Status;
+        var startDate = request.body.data.StartDate;
+        var endDate = request.body.data.EndDate;
+        var totalDevelopment = parseInt(request.body.data.TotalDevelopment);
+        var totalBusiness = parseInt(request.body.data.TotalBusiness);
+        var totalMarketing = parseInt(request.body.data.TotalMarketing);
+        var totalOther = parseInt(request.body.data.TotalOther);
+        var newSprintId = parseInt(request.body.data.NewSprintId);
+        var newSprintIdString = "S" + newSprintId.toString();
+        var createSprintPromise;
+        var result;
+
+        console.log("End Date from Backend: " + endDate);
+        console.log("Start Date from Backend: " + startDate);
+        console.log("Status from Backend: " + status);
+
+        const p1 = db.collection("Main").doc(newSprintIdString).get().then((doc) => {
+            if (doc.exists) {
+                createSprintPromise = db.collection("Main").doc(newSprintIdString).update({
+                    TotalDevelopmentTask: totalDevelopment,
+                    TotalBusinessTask: totalBusiness,
+                    TotalMarketingTask: totalMarketing,
+                    TotalOtherTask: totalOther,
+                    EndDate: endDate,
+                    StartDate: startDate,
+                    Status: status
+                });
+            } else {
+                var totalUnCompletedTask = 0;
+                var totalCompletedTask = 0;
+                var totalNumberOfTask = 0;
+
+                createSprintPromise = db.collection("Main").doc(newSprintIdString).set({
+                    TotalDevelopmentTask: totalDevelopment,
+                    TotalBusinessTask: totalBusiness,
+                    TotalMarketingTask: totalMarketing,
+                    TotalOtherTask: totalOther,
+                    EndDate: endDate,
+                    StartDate: startDate,
+                    Status: status,
+                    TotalUnCompletedTask: totalUnCompletedTask,
+                    TotalCompletedTask: totalCompletedTask,
+                    TotalNumberOfTask: totalNumberOfTask
+                });
+            }
+            return Promise.resolve(createSprintPromise);
+        });
+        const p2 = db.collection("RawData").doc("AppDetails").update({
+            CurrentSprintId: newSprintId
+        });
+        const Promises = [p1,p2];
+        return Promise.all(Promises).then(() => {
+            console.log("Sprint started successfully");
+            result = { data: "OK" }
+            console.log("Document successfully written!");
+            return response.status(200).send(result);
+        })
+        .catch((error) => {
+            result = { data: error }
+            console.log("error", error);
+            return response.status(500).send(result);
+        });
+    });
+});
+
+exports.logWork = functions.https.onRequest((request, response) => {
+    cors(request, response, () => {
+        var status = request.body.data.LogWorkStatus;
+        var taskId = request.body.data.LogTaskId;
+        var logHours = parseInt(request.body.data.LogHours);
+        var workDone = parseInt(request.body.data.LogWorkDone);
+        var sprintNumber = parseInt(request.body.data.SprintNumber);
+        // var logWorkComment = request.body.data.LogWorkComment;
+        var fullSprintId = createSprintId(sprintNumber);
+        var logWorkTotalTime;
+
+        const promise1 = db.collection("Tasks").doc(taskId).get().then((doc) => {
+            logWorkTotalTime = parseInt(doc.data().LogWorkTotalTime);
+            logWorkTotalTime = parseInt(logWorkTotalTime) + parseInt(logHours);
+
+            var updatePromise = db.collection("Tasks").doc(taskId).update({
+                LogWorkTotalTime: logWorkTotalTime,
+                WorkDone: workDone,
+                Status: status
+            });
+            return Promise.resolve(updatePromise);
+        });
+        const promise2 = db.collection("RawData").doc("AppDetails").get().then((doc) => {
+            totalCompletedTask = parseInt(doc.data().TotalCompletedTask);
+            totalUnCompletedTask = parseInt(doc.data().TotalUnCompletedTask);
+            if (status === "Completed") {
+                totalCompletedTask = totalCompletedTask + 1;
+                totalUnCompletedTask = totalUnCompletedTask - 1;
+            }
+            var updateStatus = db.collection("RawData").doc("AppDetails").update({
+                TotalCompletedTask: totalCompletedTask,
+                TotalUnCompletedTask: totalUnCompletedTask
+            });
+            return Promise.resolve(updateStatus);
+        });
+        const promise3 = db.collection("Main").doc(fullSprintId).get().then((doc) => {
+            totalCompletedTask = parseInt(doc.data().TotalCompletedTask);
+            totalUnCompletedTask = parseInt(doc.data().TotalUnCompletedTask);
+
+            if (status === "Completed") {
+                totalCompletedTask = totalCompletedTask + 1;
+                totalUnCompletedTask = totalUnCompletedTask - 1;
+            }
+            var updateSprintstatus = db.collection("Main").doc(fullSprintId).update({
+                TotalCompletedTask: totalCompletedTask,
+                TotalUnCompletedTask: totalUnCompletedTask
+            });
+            return Promise.resolve(updateSprintstatus);
+        });
+        const logWorkPromises = [promise1, promise2, promise3];
+        Promise.all(logWorkPromises).then(() => {
+                result = { data: "OK" }
+                console.log("Document successfully written!");
+                return response.status(200).send(result);
+            })
+            .catch((error) => {
+                var result = { data: error };
+                console.log("error", error);
+                return response.status(500).send(result)
+            });
+    });
+});
+
+exports.editPageTask = functions.https.onRequest((request, response) => {
+    cors(request, response, () => {
+        console.log(request);
+
+        var description = request.body.data.Description;
+        var priority = request.body.data.Priority;
+        var difficulty = request.body.data.Difficulty;
+        var assignee = request.body.data.Assignee;
+        var estimatedTime = request.body.data.EstimatedTime;
+        var category = request.body.data.Category;
+        var storyPointNumber = request.body.data.StoryPointNumber;
+        var editedSprintNumber = request.body.data.SprintNumber;
+        var previousId = request.body.data.PreviousId;
+        var creationDate = request.body.data.CreationDate;
+        var previousSprintId = createSprintId(previousId);
+        var taskId = request.body.data.Id;
+        var editedSprintId = createSprintId(editedSprintNumber);
+        var totalDevelopmentTask;
+        var totalBusinessTask;
+        var totalMarketingTask;
+        var totalOtherTask;
+        var totalNumberOfTask;
+        var result;
+        var totalUnCompletedTask;
+        var totalCompletedTask;
+        var sprintEditPromise;
+
+        var promises = [];
+        if (editedSprintNumber !== previousId) {
+            const p1 = db.collection("Main").doc(previousSprintId).get().then((doc) => {
+                totalNumberOfTask = doc.data().TotalNumberOfTask;
+                totalDevelopmentTask = doc.data().TotalDevelopmentTask;
+                totalBusinessTask = doc.data().TotalBusinessTask;
+                totalMarketingTask = doc.data().TotalMarketingTask;
+                totalOtherTask = doc.data().TotalOtherTask;
+                totalUnCompletedTask = doc.data().TotalUnCompletedTask;
+
+                if (category === "Development") {
+                    totalDevelopmentTask = totalDevelopmentTask - 1;
+                } else if (category === "Business") {
+                    totalBusinessTask = totalBusinessTask - 1;
+                } else if (category === "Marketing") {
+                    totalMarketingTask = totalMarketingTask - 1;
+                } else {
+                    totalOtherTask = totalOtherTask - 1;
+                }
+
+                totalNumberOfTask = totalNumberOfTask - 1;
+                totalUnCompletedTask = totalUnCompletedTask - 1;
+                var editSprintDeleteCounter = db.collection("Main").doc(previousSprintId).update({
+                    TotalDevelopmentTask: totalDevelopmentTask,
+                    TotalBusinessTask: totalBusinessTask,
+                    TotalMarketingTask: totalMarketingTask,
+                    TotalOtherTask: totalOtherTask,
+                    TotalNumberOfTask: totalNumberOfTask,
+                    TotalUnCompletedTask: totalUnCompletedTask
+                });
+
+                return Promise.resolve(editSprintDeleteCounter);
+            });
+            promises.push(p1);
+
+            const p2 = db.collection("Main").doc(editedSprintId).get().then((doc) => {
+                if (doc.exists) {
+                    totalNumberOfTask = doc.data().TotalNumberOfTask;
+                    totalDevelopmentTask = doc.data().TotalDevelopmentTask;
+                    totalBusinessTask = doc.data().TotalBusinessTask;
+                    totalMarketingTask = doc.data().TotalMarketingTask;
+                    totalOtherTask = doc.data().TotalOtherTask;
+                    totalUnCompletedTask = doc.data().TotalUnCompletedTask;
+
+                    if (category === "Development") {
+                        totalDevelopmentTask = totalDevelopmentTask + 1;
+                    } else if (category === "Business") {
+                        totalBusinessTask = totalBusinessTask + 1;
+                    } else if (category === "Marketing") {
+                        totalMarketingTask = totalMarketingTask + 1;
+                    } else {
+                        totalOtherTask = totalOtherTask + 1;
+                    }
+
+                    totalNumberOfTask = totalNumberOfTask + 1;
+                    totalUnCompletedTask = totalUnCompletedTask + 1;
+
+                    sprintEditPromise = db.collection("Main").doc(editedSprintId).update({
+                        TotalBusinessTask: totalBusinessTask,
+                        TotalDevelopmentTask: totalDevelopmentTask,
+                        TotalMarketingTask: totalMarketingTask,
+                        TotalOtherTask: totalOtherTask,
+                        TotalUnCompletedTask: totalUnCompletedTask,
+                        TotalNumberOfTask: totalNumberOfTask
+                    });
+                } else {
+                    totalBusinessTask = 0;
+                    totalDevelopmentTask = 0;
+                    totalMarketingTask = 0;
+                    totalOtherTask = 0;
+                    totalUnCompletedTask = 0;
+                    totalCompletedTask = 0;
+                    totalNumberOfTask = 0;
+
+                    if (category === "Development") {
+                        totalDevelopmentTask = totalDevelopmentTask + 1;
+                    } else if (category === "Business") {
+                        totalBusinessTask = totalBusinessTask + 1;
+                    } else if (category === "Marketing") {
+                        totalMarketingTask = totalMarketingTask + 1;
+                    } else {
+                        totalOtherTask = totalOtherTask + 1;
+                    }
+
+                    totalNumberOfTask = totalNumberOfTask + 1;
+                    totalUnCompletedTask = totalUnCompletedTask + 1;
+                    sprintEditPromise = db.collection("Main").doc(editedSprintId).set({
+                        TotalBusinessTask: totalBusinessTask,
+                        TotalDevelopmentTask: totalDevelopmentTask,
+                        TotalMarketingTask: totalMarketingTask,
+                        TotalOtherTask: totalOtherTask,
+                        TotalUnCompletedTask: totalUnCompletedTask,
+                        TotalCompletedTask: totalCompletedTask,
+                        TotalNumberOfTask: totalNumberOfTask
+                    });
+                }
+                return Promise.resolve(sprintEditPromise)
+            });
+            promises.push(p2);
+        }
+        var p3 = db.collection("Tasks").doc(taskId).update({
+                Description: description,
+                CreationDate: creationDate,
+                Priority: priority,
+                Difficulty: difficulty,
+                Assignee: assignee,
+                EstimatedTime: estimatedTime,
+                SprintNumber: editedSprintNumber,
+                StoryPointNumber: storyPointNumber
+        });
+        promises.push(p3);
+
+        Promise.all(promises).then(() => {
+            result = { data: "OK" };
+            console.log("Document sucessfully written");
+            return response.status(200).send(result);
+        })
+        .catch((error) => {
+            result = { data: error };
+            console.log("error", error);
+            return response.status(500).send(result)
+        });
+    });
+});
+
+exports.deleteTask = functions.https.onRequest((request, response) => {
+    cors(request, response, () => {
+        console.log(request);
+
+        var sprintNumber = request.body.data.SprintNumber;
+        var taskId = request.body.data.Id;
+        var fullSprintId = createSprintId(sprintNumber);
+        var category = request.body.data.Category;
+        var status = request.body.data.Status;
+        var totalDevelopmentTask;
+        var totalBusinessTask;
+        var totalMarketingTask;
+        var totalOtherTask;
+        var totalNumberOfTask;
+        var result;
+        var totalCompletedTask;
+        var totalUnCompletedTask;
+
+        const p1 = db.collection("Tasks").doc(taskId).update({
+            Category: "Trash",
+            SprintNumber: -2
+        });
+        
+        const p2 = db.collection("Main").doc(fullSprintId).get().then((doc) => {
+            totalNumberOfTask = doc.data().TotalNumberOfTask;
+            totalDevelopmentTask = doc.data().TotalDevelopmentTask;
+            totalBusinessTask = doc.data().TotalBusinessTask;
+            totalMarketingTask = doc.data().TotalMarketingTask;
+            totalOtherTask = doc.data().TotalOtherTask
+            totalCompletedTask = doc.data().TotalCompletedTask;
+            totalUnCompletedTask = doc.data().TotalUnCompletedTask;
+
+            if (category === "Development") {
+                totalDevelopmentTask = totalDevelopmentTask - 1;
+            } else if (category === "Business") {
+                totalBusinessTask = totalBusinessTask - 1;
+            } else if (category === "Marketing") {
+                totalMarketingTask = totalMarketingTask - 1;
+            } else {
+                totalOtherTask = totalOtherTask -1;
+            }
+            totalNumberOfTask = totalNumberOfTask - 1;
+            status === "Completed" ? totalCompletedTask = totalCompletedTask - 1 : totalUnCompletedTask = totalUnCompletedTask - 1;
+            var updateDeleteTaskCounter = db.collection("Main").doc(fullSprintId).update({
+                TotalDevelopmentTask: totalDevelopmentTask,
+                TotalBusinessTask: totalBusinessTask,
+                TotalMarketingTask: totalMarketingTask,
+                TotalOtherTask: totalOtherTask,
+                TotalNumberOfTask: totalNumberOfTask,
+                TotalCompletedTask: totalCompletedTask,
+                TotalUnCompletedTask: totalUnCompletedTask
+            });
+            return Promise.resolve(updateDeleteTaskCounter);
+        });
+        const deleteTaskPromises = [p1, p2];
+        Promise.all(deleteTaskPromises).then(() => {
+                result = { data: "OK" };
+                console.log("Document sucessfully deleted");
+                return response.status(200).send(result);
+            })
+            .catch((error) => {
+                result = { data: error };
+                console.log("error", error);
+                return response.status(500).send(result)
+            });
+    });
+});
+
+function createSprintId(sprintNumber) {
+    if (sprintNumber === -1) {
+        return "Backlog";
+    } else {
+        return ("S" + sprintNumber);
+    }
+}
+exports.createNewUser = functions.https.onRequest((request, response) => {
+    cors(request, response, () => {
+        console.log(request);
+        const user = request.body.data;
+        const Uid = user.uid;
+        const PhotoURL = user.photoURL;
+        const DisplayName = user.displayName;
+        const Email = user.email;
+        const PhoneNumber = user.phoneNumber;
+        const ProviderId = user.providerId;
+
+        db.collection("Users").doc(Uid).get().then((doc) => {
+                if (doc.exists) {
+                    const userData = db.collection("Users").doc(Uid).update({
+                        uid: Uid,
+                        photoURL: PhotoURL,
+                        displayName: DisplayName,
+                        email: Email,
+                        phoneNumber: PhoneNumber,
+                        providerId: ProviderId
+                    });
+                    return Promise.resolve(userData);
+                } else {
+                    const userData = db.collection("Users").doc(Uid).set({
+                        uid: Uid,
+                        photoURL: PhotoURL,
+                        displayName: DisplayName,
+                        email: Email,
+                        phoneNumber: PhoneNumber,
+                        providerId: ProviderId
+                    });
+                    return Promise.resolve(userData);
+                }
+            }).then(() => {
+                result = { data: "User Logged In Successfully" };
+                console.log("Document successfully written");
+                return response.status(200).send(result);
+            })
+            .catch((error) => {
+                result = { data: error };
+                console.log("error", error);
+                return response.status(500).send(result)
+            });
+    });
+});
+
+exports.updateSprintStatus = functions.https.onRequest((request, response) => {
+    cors(request, response, () => {
+        var sprintStatus = request.body.data.SprintStatus;
+        var currentSprintName = request.body.data.CurrentSprintName;
+        console.log(currentSprintName);
+        db.collection("Main").doc(currentSprintName).update({
+            Status: sprintStatus,
+        });
+    });
+})
\ No newline at end of file
diff --git a/functions/logWorkAPI.js b/functions/logWorkAPI.js
deleted file mode 100644
index 1160b7a42..000000000
--- a/functions/logWorkAPI.js
+++ /dev/null
@@ -1,143 +0,0 @@
-const functions = require('firebase-functions');
-var cors = require('cors')({ origin: true });
-
-const admin = require('firebase-admin');
-
-const db = admin.firestore();
-
-exports.logWork = functions.https.onRequest((request, response) => {
-    cors(request, response, () => {
-        var status = request.body.data.LogWorkStatus;
-        var taskId = request.body.data.LogTaskId;
-        var logHours = parseInt(request.body.data.LogHours);
-        var workDone = parseInt(request.body.data.LogWorkDone);
-        var sprintNumber = parseInt(request.body.data.SprintNumber);
-        var logWorkComment = request.body.data.LogWorkComment;
-        var date = request.body.data.Date;
-        var time = request.body.data.Time;
-        var fullSprintId = createSprintId(sprintNumber);
-        var logWorkTotalTime;
-        var totalActions;
-        var totalComments;
-        var actionId;
-
-        const promise1 = db.collection("Tasks").doc(taskId).get().then((doc) => {
-            logWorkTotalTime = parseInt(doc.data().LogWorkTotalTime);
-            logWorkTotalTime = parseInt(logWorkTotalTime) + parseInt(logHours);
-
-            var updatePromise = db.collection("Tasks").doc(taskId).update({
-                LogWorkTotalTime: logWorkTotalTime,
-                WorkDone: workDone,
-                Status: status
-            });
-            return Promise.resolve(updatePromise);
-        });
-        const promise2 = db.collection("RawData").doc("AppDetails").get().then((doc) => {
-            totalCompletedTask = parseInt(doc.data().TotalCompletedTask);
-            totalUnCompletedTask = parseInt(doc.data().TotalUnCompletedTask);
-            if (status === "Completed") {
-                totalCompletedTask = totalCompletedTask + 1;
-                totalUnCompletedTask = totalUnCompletedTask - 1;
-            }
-            var updateStatus = db.collection("RawData").doc("AppDetails").update({
-                TotalCompletedTask: totalCompletedTask,
-                TotalUnCompletedTask: totalUnCompletedTask
-            });
-            return Promise.resolve(updateStatus);
-        });
-        const promise3 = db.collection("Main").doc(fullSprintId).get().then((doc) => {
-            totalCompletedTask = parseInt(doc.data().TotalCompletedTask);
-            totalUnCompletedTask = parseInt(doc.data().TotalUnCompletedTask);
-
-            if (status === "Completed") {
-                totalCompletedTask = totalCompletedTask + 1;
-                totalUnCompletedTask = totalUnCompletedTask - 1;
-            }
-            var updateSprintstatus = db.collection("Main").doc(fullSprintId).update({
-                TotalCompletedTask: totalCompletedTask,
-                TotalUnCompletedTask: totalUnCompletedTask
-            });
-            return Promise.resolve(updateSprintstatus);
-        });
-        updateActivity("COMMENT", logWorkComment, taskId, date, time);
-        
-        const logWorkPromises = [promise1, promise2, promise3];
-        Promise.all(logWorkPromises).then(() => {
-                result = { data: "OK" }
-                console.log("Document successfully written!");
-                return response.status(200).send(result);
-            })
-            .catch((error) => {
-                var result = { data: error };
-                console.log("error", error);
-                return response.status(500).send(result)
-            });
-    });
-});
-
-function createSprintId(sprintNumber) {
-    if (sprintNumber === -1) {
-        return "Backlog";
-    } else {
-        return ("S" + sprintNumber);
-    }
-}
-
-async function updateActivity(type, comment, taskId, date, time){
-    var actionId = "";
-    if(type === "CREATED") {
-        actionId = "A0";
-        db.collection("Activity").doc(taskId).set({
-            TaskId: taskId,
-            TotalActions: 0,
-            TotalComments: 0
-        });
-        db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
-            Type: type,
-            Comment: comment,
-            Date: date,
-            Time: time
-        });
-    }
-    else if (type === "COMMENT") {
-        actionId = await db.collection("Activity").doc(taskId).get().then((doc) => {
-            totalActions = doc.data().TotalActions;
-            totalActions = totalActions+1;
-            totalComments = doc.data().TotalComments;
-            totalComments = totalComments+1;
-            return ("A" + totalActions);
-        });
-        if (actionId !== ""){
-            db.collection("Activity").doc(taskId).update({
-                TotalActions: totalActions,
-                TotalComments: totalComments,
-            });
-            db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
-                Type: type,
-                Comment: comment,
-                Date: date,
-                Time: time
-            });
-        }
-    }
-    else{
-        actionId = await db.collection("Activity").doc(taskId).get().then((doc) => {
-            totalActions = doc.data().TotalActions;
-            totalActions = totalActions+1;
-
-            return ("A" + totalActions);
-
-        });
-        if (actionId !== ""){
-            db.collection("Activity").doc(taskId).update({
-                TotalActions: totalActions,
-            });
-            db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
-                Type: type,
-                Comment: comment,
-                Date: date,
-                Time: time
-            });
-        }
-    }
-}
\ No newline at end of file
diff --git a/functions/startNewSprintAPI.js b/functions/startNewSprintAPI.js
deleted file mode 100644
index 5da7fe2c2..000000000
--- a/functions/startNewSprintAPI.js
+++ /dev/null
@@ -1,76 +0,0 @@
-const functions = require('firebase-functions');
-var cors = require('cors')({ origin: true });
-
-const admin = require('firebase-admin');
-
-const db = admin.firestore();
-
-exports.startNewSprint = functions.https.onRequest((request, response) => {
-    cors(request, response, () => {
-        console.log(request);
-
-        var status = request.body.data.Status;
-        var startDate = request.body.data.StartDate;
-        var endDate = request.body.data.EndDate;
-        var totalDevelopment = parseInt(request.body.data.TotalDevelopment);
-        var totalBusiness = parseInt(request.body.data.TotalBusiness);
-        var totalMarketing = parseInt(request.body.data.TotalMarketing);
-        var totalOther = parseInt(request.body.data.TotalOther);
-        var newSprintId = parseInt(request.body.data.NewSprintId);
-        var newSprintIdString = "S" + newSprintId.toString();
-        var createSprintPromise;
-        var result;
-
-        console.log("End Date from Backend: " + endDate);
-        console.log("Start Date from Backend: " + startDate);
-        console.log("Status from Backend: " + status);
-
-        const p1 = db.collection("Main").doc(newSprintIdString).get().then((doc) => {
-            if (doc.exists) {
-                createSprintPromise = db.collection("Main").doc(newSprintIdString).update({
-                    TotalDevelopmentTask: totalDevelopment,
-                    TotalBusinessTask: totalBusiness,
-                    TotalMarketingTask: totalMarketing,
-                    TotalOtherTask: totalOther,
-                    EndDate: endDate,
-                    StartDate: startDate,
-                    Status: status
-                });
-            } else {
-                var totalUnCompletedTask = 0;
-                var totalCompletedTask = 0;
-                var totalNumberOfTask = 0;
-
-                createSprintPromise = db.collection("Main").doc(newSprintIdString).set({
-                    TotalDevelopmentTask: totalDevelopment,
-                    TotalBusinessTask: totalBusiness,
-                    TotalMarketingTask: totalMarketing,
-                    TotalOtherTask: totalOther,
-                    EndDate: endDate,
-                    StartDate: startDate,
-                    Status: status,
-                    TotalUnCompletedTask: totalUnCompletedTask,
-                    TotalCompletedTask: totalCompletedTask,
-                    TotalNumberOfTask: totalNumberOfTask
-                });
-            }
-            return Promise.resolve(createSprintPromise);
-        });
-        const p2 = db.collection("RawData").doc("AppDetails").update({
-            CurrentSprintId: newSprintId
-        });
-        const Promises = [p1,p2];
-        return Promise.all(Promises).then(() => {
-            console.log("Sprint started successfully");
-            result = { data: "OK" }
-            console.log("Document successfully written!");
-            return response.status(200).send(result);
-        })
-        .catch((error) => {
-            result = { data: error }
-            console.log("error", error);
-            return response.status(500).send(result);
-        });
-    });
-});
-
diff --git a/functions/updateSprintStatusAPI.js b/functions/updateSprintStatusAPI.js
deleted file mode 100644
index 71f8de785..000000000
--- a/functions/updateSprintStatusAPI.js
+++ /dev/null
@@ -1,17 +0,0 @@
-const functions = require('firebase-functions');
-var cors = require('cors')({ origin: true });
-
-const admin = require('firebase-admin');
-
-const db = admin.firestore();
-
-exports.updateSprintStatus = functions.https.onRequest((request, response) => {
-    cors(request, response, () => {
-        var sprintStatus = request.body.data.SprintStatus;
-        var currentSprintName = request.body.data.CurrentSprintName;
-        console.log(currentSprintName);
-        db.collection("Main").doc(currentSprintName).update({
-            Status: sprintStatus,
-        });
-    });
-})
diff --git a/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.ts b/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.ts
index 7ce0ae35d..6d9d6156c 100644
--- a/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.ts
+++ b/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.ts
@@ -3,7 +3,6 @@ import { AngularFireFunctions } from '@angular/fire/functions';
 import { NgForm } from '@angular/forms';
 import { Router } from '@angular/router';
 import { ValidationService } from '../../services/validation.service';
-import { ToolsService } from '../../services/tools.service';
 import { Location } from '@angular/common';
 
 @Component({
@@ -27,14 +26,18 @@ export class CreateNewSessionComponent implements OnInit {
   status: string
   sprintNumber: number
   storyPoint: number
-  time: string
   enableLoader: boolean = false
   valid: boolean = true;
 
-  constructor(private functions: AngularFireFunctions, public validationService: ValidationService, private router: Router, private location: Location, public toolsService: ToolsService) { }
+  constructor(private functions: AngularFireFunctions, public validationService: ValidationService, private router: Router, private location: Location) { }
   ngOnInit(): void {
-    this.todayDate = this.toolsService.date();
-    this.time = this.toolsService.time();
+    var today = new Date();
+
+    var dd = String(today.getDate()).padStart(2, '0');
+    var mm = String(today.getMonth() + 1).padStart(2, '0');
+    var yyyy = today.getFullYear();
+
+    this.todayDate = dd + "/" + mm + "/" + yyyy;
   }
 
   async submit(){
@@ -66,7 +69,7 @@ export class CreateNewSessionComponent implements OnInit {
     const callable = this.functions.httpsCallable('createNewTask');
 
     try {
-      const result = await callable({ Title: this.title, Description: this.description, Priority: this.priority, Difficulty: this.difficulty, Creator: this.creatorName, Assignee: this.assigneeName, EstimatedTime: this.estimatedTime, Status: this.status, Category: this.category, SprintNumber: this.sprintNumber, StoryPointNumber: this.storyPoint, CreationDate: this.todayDate, Time: this.time }).toPromise();
+      const result = await callable({ Title: this.title, Description: this.description, Priority: this.priority, Difficulty: this.difficulty, Creator: this.creatorName, Assignee: this.assigneeName, EstimatedTime: this.estimatedTime, Status: this.status, Category: this.category, SprintNumber: this.sprintNumber, StoryPointNumber: this.storyPoint, CreationDate: this.todayDate }).toPromise();
 
       console.log("Successfully created the task");
       console.log(result);
diff --git a/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.ts b/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.ts
index a225472cd..c81721079 100644
--- a/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.ts
+++ b/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.ts
@@ -4,7 +4,6 @@ import { NgForm } from '@angular/forms';
 import { Tasks } from 'src/app/Interface/TasksInterface';
 import { Router } from '@angular/router';
 import { ValidationService } from '../../../services/validation.service';
-import { ToolsService } from '../../../services/tools.service';
 
 
 @Component({
@@ -21,22 +20,12 @@ export class EditPageComponent implements OnInit {
   editTask: Tasks
   previousSprintId: number
   enableLoader: boolean = false
-  todayDate: string
-  time: string
-  changedData: string = ""
-  prevVal =[]
-  newVal =[]
 
-  constructor(private functions: AngularFireFunctions, private router: Router, public validationService: ValidationService, public toolsService: ToolsService) { }
+  constructor(private functions: AngularFireFunctions, private router: Router, public validationService: ValidationService) { }
 
   ngOnInit(): void {
-
-    this.todayDate = this.toolsService.date();
-    this.time = this.toolsService.time();
-
     this.editTask = this.task;
     this.previousSprintId = this.task.SprintNumber;
-    this.prevVal = [this.task.Description, this.task.Assignee, this.task.EstimatedTime, this.task.Priority, this.task.Difficulty, this.task.StoryPointNumber];
   }
 
   async submit(){
@@ -51,8 +40,6 @@ export class EditPageComponent implements OnInit {
       return res;});
     if(condition)
     {
-      this.newVal = [this.editTask.Description, this.editTask.Assignee, this.editTask.EstimatedTime, this.editTask.Priority, this.editTask.Difficulty, this.editTask.StoryPointNumber];
-      this.generateChanges();
       console.log("Inputs are valid");
       this.editPage();
     }
@@ -60,26 +47,6 @@ export class EditPageComponent implements OnInit {
     console.log("Page not edited due to validation error");
   }
 
-async generateChanges() {
-  console.log(this.editTask, this.task);
-    if(this.prevVal[0] != this.newVal[0])
-      this.changedData = this.changedData + " description,";
-    if(this.prevVal[1] != this.newVal[1])
-      this.changedData = this.changedData + " assignee," ;
-    if(this.prevVal[2] != this.newVal[2])
-      this.changedData = this.changedData + " estimated-time," ;
-    if(this.prevVal[3] != this.newVal[3])
-      this.changedData = this.changedData + " priority," ;
-    if(this.prevVal[4] != this.newVal[4])
-      this.changedData = this.changedData + " difficulty," ;
-    if(this.prevVal[5] != this.newVal[5])
-      this.changedData = this.changedData + " story-point,";
-    if(this.changedData != "")
-      this.changedData = "Edited-" + this.changedData;
-      this.changedData = this.changedData.substring(0,this.changedData.length-1) + "."
-    console.log(this.changedData);
-  }
-
   async editPage() {
     this.enableLoader = true
     const callable = this.functions.httpsCallable('editPageTask');
@@ -91,7 +58,7 @@ async generateChanges() {
 
       console.log(this.editTask.SprintNumber);
       if (!(this.task.Status === "Completed")) {
-        const result = await callable({ Id: this.editTask.Id, Description: this.editTask.Description, Priority: this.editTask.Priority, Difficulty: this.editTask.Difficulty, Assignee: this.editTask.Assignee, EstimatedTime: this.editTask.EstimatedTime, Category: this.task.Category, SprintNumber: this.editTask.SprintNumber, StoryPointNumber: this.editTask.StoryPointNumber, PreviousId: this.previousSprintId, CreationDate: this.editTask.CreationDate, Date: this.todayDate, Time: this.time, ChangedData: this.changedData}).toPromise();
+        const result = await callable({ Id: this.editTask.Id, Description: this.editTask.Description, Priority: this.editTask.Priority, Difficulty: this.editTask.Difficulty, Assignee: this.editTask.Assignee, EstimatedTime: this.editTask.EstimatedTime, Category: this.task.Category, SprintNumber: this.editTask.SprintNumber, StoryPointNumber: this.editTask.StoryPointNumber, PreviousId: this.previousSprintId, CreationDate: this.editTask.CreationDate }).toPromise();
         console.log("Successfully Updated the task");
         console.log(result);
         this.editTaskDone();
diff --git a/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.ts b/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.ts
index 2031bdc75..8101eafd7 100644
--- a/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.ts
+++ b/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.ts
@@ -3,7 +3,6 @@ import { NgForm } from '@angular/forms';
 import { Tasks } from 'src/app/Interface/TasksInterface';
 import { AngularFireFunctions } from '@angular/fire/functions';
 import { ValidationService } from '../../../services/validation.service';
-import { ToolsService } from '../../../services/tools.service';
 
 @Component({
   selector: 'app-log-work',
@@ -23,15 +22,10 @@ export class LogWorkComponent implements OnInit {
   logHours: number
   logWorkComment: number
   enableLoader: boolean = false
-  todayDate: string
-  time: string
 
-  constructor(private functions: AngularFireFunctions, public validationService: ValidationService, public toolsService: ToolsService) { }
+  constructor(private functions: AngularFireFunctions, public validationService: ValidationService) { }
 
-  ngOnInit(): void { 
-    this.todayDate = this.toolsService.date();
-    this.time = this.toolsService.time();
-  }
+  ngOnInit(): void { }
 
   async submit(){
     let labels = ['status', 'logHours', 'workCompleted', 'comment'];
@@ -56,7 +50,7 @@ export class LogWorkComponent implements OnInit {
     const callable = this.functions.httpsCallable('logWork');
 
     try {
-      const result = await callable({ SprintNumber: this.task.SprintNumber, LogTaskId: this.task.Id, LogHours: this.logHours, LogWorkDone: this.logWorkDone, LogWorkStatus: this.logWorkStatus, LogWorkComment: this.logWorkComment, Date: this.todayDate, Time: this.time}).toPromise();
+      const result = await callable({ SprintNumber: this.task.SprintNumber, LogTaskId: this.task.Id, LogHours: this.logHours, LogWorkDone: this.logWorkDone, LogWorkStatus: this.logWorkStatus, LogWorkComment: this.logWorkComment }).toPromise();
 
       console.log("Logged Work Successfully");
       console.log(result);
diff --git a/worktrolly-ui/src/app/body/task-details/task-details.component.ts b/worktrolly-ui/src/app/body/task-details/task-details.component.ts
index a91ce0aae..1be5a2eae 100644
--- a/worktrolly-ui/src/app/body/task-details/task-details.component.ts
+++ b/worktrolly-ui/src/app/body/task-details/task-details.component.ts
@@ -6,7 +6,6 @@ import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators'
 import { Tasks } from 'src/app/Interface/TasksInterface';
 import { AuthService } from 'src/app/services/auth.service';
-import { ToolsService } from '../../services/tools.service';
 import {Location} from '@angular/common';
 import { NavbarHandlerService } from 'src/app/services/navbar-handler.service';
 
@@ -25,18 +24,12 @@ export class TaskDetailsComponent implements OnInit {
   editTaskEnabled: boolean = false
   userLoggedIn: boolean = false
   task: Tasks
-  todayDate: string
-  time: string
-  
   public taskDocument: AngularFirestoreDocument<Tasks>
   public taskDataObservable: Observable<Tasks>
 
-  constructor(private route: ActivatedRoute, public db: AngularFirestore, private router: Router, private functions: AngularFireFunctions, public authService: AuthService, private location: Location, public toolsService: ToolsService, private navbarHandler: NavbarHandlerService) { }
+  constructor(private route: ActivatedRoute, public db: AngularFirestore, private router: Router, private functions: AngularFireFunctions, public authService: AuthService, private location: Location, private navbarHandler: NavbarHandlerService) { }
 
   ngOnInit(): void {
-    this.todayDate = this.toolsService.date();
-    this.time = this.toolsService.time();
-
     this.Id = this.route.snapshot.params['taskId'];
 
     this.componentName = this.Id;
@@ -77,7 +70,7 @@ export class TaskDetailsComponent implements OnInit {
     const callable = this.functions.httpsCallable('deleteTask');
 
     try {
-      const result = await callable({ Id: this.task.Id, SprintNumber: this.task.SprintNumber, Category: this.task.Category, Status: this.task.Status, Date: this.todayDate, Time: this.time }).toPromise();
+      const result = await callable({ Id: this.task.Id, SprintNumber: this.task.SprintNumber, Category: this.task.Category, Status: this.task.Status }).toPromise();
       console.log(this.task.Id + " deleted");
       console.log(result);
       this.router.navigate(['/']);
diff --git a/worktrolly-ui/src/app/services/tools.service.spec.ts b/worktrolly-ui/src/app/services/tools.service.spec.ts
deleted file mode 100644
index 3225de8e6..000000000
--- a/worktrolly-ui/src/app/services/tools.service.spec.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { ToolsService } from './tools.service';
-
-describe('ToolsService', () => {
-  let service: ToolsService;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({});
-    service = TestBed.inject(ToolsService);
-  });
-
-  it('should be created', () => {
-    expect(service).toBeTruthy();
-  });
-});
diff --git a/worktrolly-ui/src/app/services/tools.service.ts b/worktrolly-ui/src/app/services/tools.service.ts
deleted file mode 100644
index 67cc02d24..000000000
--- a/worktrolly-ui/src/app/services/tools.service.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { Injectable } from '@angular/core';
-
-@Injectable({
-  providedIn: 'root'
-})
-export class ToolsService {
-
-  todayDate: string
-  todayTime: string
-
-  constructor() { }
-
-  date(){
-    var today = new Date();
-    var dd = String(today.getDate()).padStart(2, '0');
-    var mm = String(today.getMonth() + 1).padStart(2, '0');
-    var yyyy = today.getFullYear();
-    return this.todayDate = dd + "/" + mm + "/" + yyyy;
-  }
-
-  time(){
-    var today = new Date();
-    var hh = String(today.getHours()).padStart(2, '0');
-    var mn = String(today.getMinutes()).padStart(2, '0');
-    var ss= String(today.getSeconds()).padStart(2, '0');
-    return this.todayTime = hh + ":" + mn + ":" + ss;
-  }
-
-}

From ee6fd2de9e991be51041fc4847135fbf7d26b08d Mon Sep 17 00:00:00 2001
From: Komal Sharma <52309262+k0malSharma@users.noreply.github.com>
Date: Sat, 30 Jan 2021 10:28:23 +0530
Subject: [PATCH 32/37] Revert "Revert "feat(dev/activity): added an activity
 collection in database.""

---
 functions/createNewTaskAPI.js                 | 240 +++++++
 functions/createNewUserAPI.js                 |  52 ++
 functions/deleteTaskAPI.js                    | 147 +++++
 functions/editPageTaskAPI.js                  | 237 +++++++
 functions/index.js                            | 600 +-----------------
 functions/logWorkAPI.js                       | 143 +++++
 functions/startNewSprintAPI.js                |  76 +++
 functions/updateSprintStatusAPI.js            |  17 +
 .../create-new-session.component.ts           |  15 +-
 .../edit-page/edit-page.component.ts          |  37 +-
 .../log-work/log-work.component.ts            |  12 +-
 .../task-details/task-details.component.ts    |  11 +-
 .../src/app/services/tools.service.spec.ts    |  16 +
 .../src/app/services/tools.service.ts         |  29 +
 14 files changed, 1032 insertions(+), 600 deletions(-)
 create mode 100644 functions/createNewTaskAPI.js
 create mode 100644 functions/createNewUserAPI.js
 create mode 100644 functions/deleteTaskAPI.js
 create mode 100644 functions/editPageTaskAPI.js
 create mode 100644 functions/logWorkAPI.js
 create mode 100644 functions/startNewSprintAPI.js
 create mode 100644 functions/updateSprintStatusAPI.js
 create mode 100644 worktrolly-ui/src/app/services/tools.service.spec.ts
 create mode 100644 worktrolly-ui/src/app/services/tools.service.ts

diff --git a/functions/createNewTaskAPI.js b/functions/createNewTaskAPI.js
new file mode 100644
index 000000000..0b3f709b4
--- /dev/null
+++ b/functions/createNewTaskAPI.js
@@ -0,0 +1,240 @@
+const functions = require('firebase-functions');
+var cors = require('cors')({ origin: true });
+
+const admin = require('firebase-admin');
+
+const db = admin.firestore();
+
+exports.createNewTask = functions.https.onRequest((request, response) => {
+    cors(request, response, () => {
+        console.log(request);
+        var title = request.body.data.Title;
+        var des = request.body.data.Description;
+        var priority = request.body.data.Priority;
+        var difficulty = request.body.data.Difficulty;
+        var creator = request.body.data.Creator;
+        var assignee = request.body.data.Assignee;
+        var estimatedTime = parseInt(request.body.data.EstimatedTime);
+        var status = request.body.data.Status;
+        var category = request.body.data.Category;
+        var storyPointNumber = parseInt(request.body.data.StoryPointNumber);
+        var sprintNumber = parseInt(request.body.data.SprintNumber);
+        var creationDate = request.body.data.CreationDate;
+        var time = request.body.data.Time;
+        var fullSprintId = createSprintId(sprintNumber);
+        var loggedWorkTotalTime = 0;
+        var workDone = 0;
+        var taskId = "";
+        var totalDevelopmentTask;
+        var totalBusinessTask;
+        var totalOtherTask;
+        var totalMarketingTask;
+        var totalNumberOfTask;
+        var result;
+        var totalUnCompletedTask = 0;
+        var sprintDataPromise;
+
+        const promise1 = db.collection("RawData").doc("AppDetails").get().then((doc) => {
+            totalNumberOfTask = doc.data().TotalNumberOfTask;
+            totalDevelopmentTask = doc.data().TotalDevelopmentTask;
+            totalBusinessTask = doc.data().TotalBusinessTask;
+            totalMarketingTask = doc.data().TotalMarketingTask;
+            totalOtherTask = doc.data().TotalOtherTask;
+            totalUnCompletedTask = doc.data().TotalUnCompletedTask;
+            if (category === "Development") {
+                totalDevelopmentTask = totalDevelopmentTask + 1;
+                taskId = category[0] + totalDevelopmentTask;
+            } else if (category === "Business") {
+                totalBusinessTask = totalBusinessTask + 1;
+                taskId = category[0] + totalBusinessTask;
+            } else if (category === "Marketing") {
+                totalMarketingTask = totalMarketingTask + 1;
+                taskId = category[0] + totalMarketingTask;
+            } else {
+                totalOtherTask = totalOtherTask + 1;
+                taskId = category[0] + totalOtherTask;
+            }
+            totalUnCompletedTask = totalUnCompletedTask + 1;
+            totalNumberOfTask = totalNumberOfTask + 1;
+            console.log(taskId);
+            const P1 = db.collection("Tasks").doc(taskId).set({
+                Id: taskId,
+                Title: title,
+                Description: des,
+                Priority: priority,
+                Difficulty: difficulty,
+                Creator: creator,
+                Assignee: assignee,
+                EstimatedTime: estimatedTime,
+                Status: status,
+                Category: category,
+                LogWorkTotalTime: loggedWorkTotalTime,
+                WorkDone: workDone,
+                SprintNumber: sprintNumber,
+                StoryPointNumber: storyPointNumber,
+                CreationDate: creationDate
+            });
+            const P2 = db.collection("RawData").doc("AppDetails").update({
+                TotalDevelopmentTask: totalDevelopmentTask,
+                TotalBusinessTask: totalBusinessTask,
+                TotalMarketingTask: totalMarketingTask,
+                TotalOtherTask: totalOtherTask,
+                TotalNumberOfTask: totalNumberOfTask,
+                TotalUnCompletedTask: totalUnCompletedTask
+            });
+            updateActivity("CREATED", "Created task "+taskId, taskId, creationDate, time);
+            const Promises = [P1,P2];
+            return Promise.all(Promises);
+        });
+
+        const promise2 = db.collection("Main").doc(fullSprintId).get().then((doc) => {
+            if (doc.exists) {
+                totalNumberOfTask = doc.data().TotalNumberOfTask;
+                totalDevelopmentTask = doc.data().TotalDevelopmentTask;
+                totalBusinessTask = doc.data().TotalBusinessTask;
+                totalOtherTask = doc.data().TotalOtherTask;
+                totalMarketingTask = doc.data().TotalMarketingTask;
+                totalUnCompletedTask = doc.data().TotalUnCompletedTask;
+
+                if (category === "Development") {
+                    totalDevelopmentTask = totalDevelopmentTask + 1;
+                } else if (category === "Business") {
+                    totalBusinessTask = totalBusinessTask + 1;
+                } else if (category === "Marketing") {
+                    totalMarketingTask = totalMarketingTask + 1;
+                } else {
+                    totalOtherTask = totalOtherTask + 1;
+                }
+
+                totalNumberOfTask = totalNumberOfTask + 1;
+                totalUnCompletedTask = totalUnCompletedTask + 1;
+
+
+                sprintDataPromise = db.collection("Main").doc(fullSprintId).update({
+                    TotalBusinessTask: totalBusinessTask,
+                    TotalDevelopmentTask: totalDevelopmentTask,
+                    TotalMarketingTask: totalMarketingTask,
+                    TotalOtherTask: totalOtherTask,
+                    TotalUnCompletedTask: totalUnCompletedTask,
+                    TotalNumberOfTask: totalNumberOfTask
+                });
+            } else {
+                totalBusinessTask = 0;
+                totalDevelopmentTask = 0;
+                totalMarketingTask = 0;
+                totalOtherTask = 0;
+                totalUnCompletedTask = 0;
+                totalCompletedTask = 0;
+                totalNumberOfTask = 0;
+
+                if (category === "Development") {
+                    totalDevelopmentTask = totalDevelopmentTask + 1;
+                } else if (category === "Business") {
+                    totalBusinessTask = totalBusinessTask + 1;
+                } else if (category === "Marketing") {
+                    totalMarketingTask = totalMarketingTask + 1;
+                } else {
+                    totalOtherTask = totalOtherTask + 1;
+                }
+
+
+                totalNumberOfTask = totalNumberOfTask + 1;
+                totalUnCompletedTask = totalUnCompletedTask + 1;
+
+                sprintDataPromise = db.collection("Main").doc(fullSprintId).set({
+                    EndDate: "xx/xx/xxxx",
+                    StartDate: "xx/xx/xxxx",
+                    Status: "Not Started",
+                    TotalBusinessTask: totalBusinessTask,
+                    TotalDevelopmentTask: totalDevelopmentTask,
+                    TotalMarketingTask: totalMarketingTask,
+                    TotalOtherTask: totalOtherTask,
+                    TotalUnCompletedTask: totalUnCompletedTask,
+                    TotalCompletedTask: totalCompletedTask,
+                    TotalNumberOfTask: totalNumberOfTask
+                });
+
+            }
+            return Promise.resolve(sprintDataPromise);
+        });
+
+        const newTaskPromises = [promise1, promise2];
+        Promise.all(newTaskPromises).then(() => {
+                result = { data: "OK!" }
+                console.log("Document successfully written!");
+                return response.status(200).send(result);
+            })
+        .catch((error) => {
+            result = { data: error };
+            console.error("Error writing document: ", error);
+            return response.status(500).send(result);
+        });
+    });
+});
+
+function createSprintId(sprintNumber) {
+    if (sprintNumber === -1) {
+        return "Backlog";
+    } else {
+        return ("S" + sprintNumber);
+    }
+}
+
+async function updateActivity(type, comment, taskId, date, time){
+    var actionId = "";
+    if(type === "CREATED") {
+        actionId = "A0";
+        db.collection("Activity").doc(taskId).set({
+            TaskId: taskId,
+            TotalActions: 0,
+            TotalComments: 0
+        });
+        db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
+            Type: type,
+            Comment: comment,
+            Date: date,
+            Time: time
+        });
+    }
+    else if (type === "COMMENT") {
+        actionId = await db.collection("Activity").doc(taskId).get().then((doc) => {
+            totalActions = doc.data().TotalActions;
+            totalActions = totalActions+1;
+            totalComments = doc.data().TotalComments;
+            totalComments = totalComments+1;
+            return ("A" + totalActions);
+        });
+        if (actionId !== ""){
+            db.collection("Activity").doc(taskId).update({
+                TotalActions: totalActions,
+                TotalComments: totalComments,
+            });
+            db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
+                Type: type,
+                Comment: comment,
+                Date: date,
+                Time: time
+            });
+        }
+    }
+    else{
+        actionId = await db.collection("Activity").doc(taskId).get().then((doc) => {
+            totalActions = doc.data().TotalActions;
+            totalActions = totalActions+1;
+
+            return ("A" + totalActions);
+
+        });
+        if (actionId !== ""){
+            db.collection("Activity").doc(taskId).update({
+                TotalActions: totalActions,
+            });
+            db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
+                Type: type,
+                Comment: comment,
+                Date: date,
+                Time: time
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/functions/createNewUserAPI.js b/functions/createNewUserAPI.js
new file mode 100644
index 000000000..c2236a37d
--- /dev/null
+++ b/functions/createNewUserAPI.js
@@ -0,0 +1,52 @@
+const functions = require('firebase-functions');
+var cors = require('cors')({ origin: true });
+
+const admin = require('firebase-admin');
+
+const db = admin.firestore();
+
+exports.createNewUser = functions.https.onRequest((request, response) => {
+    cors(request, response, () => {
+        console.log(request);
+        const user = request.body.data;
+        const Uid = user.uid;
+        const PhotoURL = user.photoURL;
+        const DisplayName = user.displayName;
+        const Email = user.email;
+        const PhoneNumber = user.phoneNumber;
+        const ProviderId = user.providerId;
+
+        db.collection("Users").doc(Uid).get().then((doc) => {
+                if (doc.exists) {
+                    const userData = db.collection("Users").doc(Uid).update({
+                        uid: Uid,
+                        photoURL: PhotoURL,
+                        displayName: DisplayName,
+                        email: Email,
+                        phoneNumber: PhoneNumber,
+                        providerId: ProviderId
+                    });
+                    return Promise.resolve(userData);
+                } else {
+                    const userData = db.collection("Users").doc(Uid).set({
+                        uid: Uid,
+                        photoURL: PhotoURL,
+                        displayName: DisplayName,
+                        email: Email,
+                        phoneNumber: PhoneNumber,
+                        providerId: ProviderId
+                    });
+                    return Promise.resolve(userData);
+                }
+            }).then(() => {
+                result = { data: "User Logged In Successfully" };
+                console.log("Document successfully written");
+                return response.status(200).send(result);
+            })
+            .catch((error) => {
+                result = { data: error };
+                console.log("error", error);
+                return response.status(500).send(result)
+            });
+    });
+});
\ No newline at end of file
diff --git a/functions/deleteTaskAPI.js b/functions/deleteTaskAPI.js
new file mode 100644
index 000000000..c44447f37
--- /dev/null
+++ b/functions/deleteTaskAPI.js
@@ -0,0 +1,147 @@
+const functions = require('firebase-functions');
+var cors = require('cors')({ origin: true });
+
+const admin = require('firebase-admin');
+
+const db = admin.firestore();
+
+exports.deleteTask = functions.https.onRequest((request, response) => {
+    cors(request, response, () => {
+        console.log(request);
+
+        var sprintNumber = request.body.data.SprintNumber;
+        var taskId = request.body.data.Id;
+        var fullSprintId = createSprintId(sprintNumber);
+        var category = request.body.data.Category;
+        var status = request.body.data.Status;
+        var totalDevelopmentTask;
+        var totalBusinessTask;
+        var totalMarketingTask;
+        var totalOtherTask;
+        var totalNumberOfTask;
+        var result;
+        var totalCompletedTask;
+        var totalUnCompletedTask;
+        var date = request.body.data.Date;
+        var time = request.body.data.Time;
+        var totalActions;
+        var actionId;
+
+        const p1 = db.collection("Tasks").doc(taskId).update({
+            Category: "Trash",
+            SprintNumber: -2
+        });
+        
+        const p2 = db.collection("Main").doc(fullSprintId).get().then((doc) => {
+            totalNumberOfTask = doc.data().TotalNumberOfTask;
+            totalDevelopmentTask = doc.data().TotalDevelopmentTask;
+            totalBusinessTask = doc.data().TotalBusinessTask;
+            totalMarketingTask = doc.data().TotalMarketingTask;
+            totalOtherTask = doc.data().TotalOtherTask
+            totalCompletedTask = doc.data().TotalCompletedTask;
+            totalUnCompletedTask = doc.data().TotalUnCompletedTask;
+
+            if (category === "Development") {
+                totalDevelopmentTask = totalDevelopmentTask - 1;
+            } else if (category === "Business") {
+                totalBusinessTask = totalBusinessTask - 1;
+            } else if (category === "Marketing") {
+                totalMarketingTask = totalMarketingTask - 1;
+            } else {
+                totalOtherTask = totalOtherTask -1;
+            }
+            totalNumberOfTask = totalNumberOfTask - 1;
+            status === "Completed" ? totalCompletedTask = totalCompletedTask - 1 : totalUnCompletedTask = totalUnCompletedTask - 1;
+            var updateDeleteTaskCounter = db.collection("Main").doc(fullSprintId).update({
+                TotalDevelopmentTask: totalDevelopmentTask,
+                TotalBusinessTask: totalBusinessTask,
+                TotalMarketingTask: totalMarketingTask,
+                TotalOtherTask: totalOtherTask,
+                TotalNumberOfTask: totalNumberOfTask,
+                TotalCompletedTask: totalCompletedTask,
+                TotalUnCompletedTask: totalUnCompletedTask
+            });
+            return Promise.resolve(updateDeleteTaskCounter);
+        });
+        updateActivity("DELETED", "Deleted task "+taskId, taskId, date, time);
+
+        const deleteTaskPromises = [p1, p2];
+        Promise.all(deleteTaskPromises).then(() => {
+                result = { data: "OK" };
+                console.log("Document sucessfully deleted");
+                return response.status(200).send(result);
+            })
+            .catch((error) => {
+                result = { data: error };
+                console.log("error", error);
+                return response.status(500).send(result)
+            });
+    });
+});
+
+function createSprintId(sprintNumber) {
+    if (sprintNumber === -1) {
+        return "Backlog";
+    } else {
+        return ("S" + sprintNumber);
+    }
+}
+
+async function updateActivity(type, comment, taskId, date, time){
+    var actionId = "";
+    if(type === "CREATED") {
+        actionId = "A0";
+        db.collection("Activity").doc(taskId).set({
+            TaskId: taskId,
+            TotalActions: 0,
+            TotalComments: 0
+        });
+        db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
+            Type: type,
+            Comment: comment,
+            Date: date,
+            Time: time
+        });
+    }
+    else if (type === "COMMENT") {
+        actionId = await db.collection("Activity").doc(taskId).get().then((doc) => {
+            totalActions = doc.data().TotalActions;
+            totalActions = totalActions+1;
+            totalComments = doc.data().TotalComments;
+            totalComments = totalComments+1;
+            return ("A" + totalActions);
+        });
+        if (actionId !== ""){
+            db.collection("Activity").doc(taskId).update({
+                TotalActions: totalActions,
+                TotalComments: totalComments,
+            });
+            db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
+                Type: type,
+                Comment: comment,
+                Date: date,
+                Time: time
+            });
+        }
+    }
+    else{
+        actionId = await db.collection("Activity").doc(taskId).get().then((doc) => {
+            totalActions = doc.data().TotalActions;
+            totalActions = totalActions+1;
+
+            return ("A" + totalActions);
+
+        });
+        if (actionId !== ""){
+            db.collection("Activity").doc(taskId).update({
+                TotalActions: totalActions,
+            });
+            db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
+                Type: type,
+                Comment: comment,
+                Date: date,
+                Time: time
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/functions/editPageTaskAPI.js b/functions/editPageTaskAPI.js
new file mode 100644
index 000000000..69ab4c803
--- /dev/null
+++ b/functions/editPageTaskAPI.js
@@ -0,0 +1,237 @@
+const functions = require('firebase-functions');
+var cors = require('cors')({ origin: true });
+
+const admin = require('firebase-admin');
+
+const db = admin.firestore();
+
+exports.editPageTask = functions.https.onRequest((request, response) => {
+    cors(request, response, () => {
+        console.log(request);
+
+        var description = request.body.data.Description;
+        var priority = request.body.data.Priority;
+        var difficulty = request.body.data.Difficulty;
+        var assignee = request.body.data.Assignee;
+        var estimatedTime = request.body.data.EstimatedTime;
+        var category = request.body.data.Category;
+        var storyPointNumber = request.body.data.StoryPointNumber;
+        var editedSprintNumber = request.body.data.SprintNumber;
+        var previousId = request.body.data.PreviousId;
+        var creationDate = request.body.data.CreationDate;
+        var changedData = request.body.data.ChangedData;
+        var previousSprintId = createSprintId(previousId);
+        var taskId = request.body.data.Id;
+        var editedSprintId = createSprintId(editedSprintNumber);
+        var totalDevelopmentTask;
+        var totalBusinessTask;
+        var totalMarketingTask;
+        var totalOtherTask;
+        var totalNumberOfTask;
+        var result;
+        var totalUnCompletedTask;
+        var totalCompletedTask;
+        var sprintEditPromise;
+        var date = request.body.data.Date;
+        var time = request.body.data.Time;
+        var totalActions;
+        var actionId;
+        var type = "EDITED";
+        var comment = "Edited task details: ";
+
+
+        var promises = [];
+        if (editedSprintNumber !== previousId) {
+            comment += "Moved to sprint " + editedSprintId + ". ";
+            const p1 = db.collection("Main").doc(previousSprintId).get().then((doc) => {
+                totalNumberOfTask = doc.data().TotalNumberOfTask;
+                totalDevelopmentTask = doc.data().TotalDevelopmentTask;
+                totalBusinessTask = doc.data().TotalBusinessTask;
+                totalMarketingTask = doc.data().TotalMarketingTask;
+                totalOtherTask = doc.data().TotalOtherTask;
+                totalUnCompletedTask = doc.data().TotalUnCompletedTask;
+
+                if (category === "Development") {
+                    totalDevelopmentTask = totalDevelopmentTask - 1;
+                } else if (category === "Business") {
+                    totalBusinessTask = totalBusinessTask - 1;
+                } else if (category === "Marketing") {
+                    totalMarketingTask = totalMarketingTask - 1;
+                } else {
+                    totalOtherTask = totalOtherTask - 1;
+                }
+
+                totalNumberOfTask = totalNumberOfTask - 1;
+                totalUnCompletedTask = totalUnCompletedTask - 1;
+                var editSprintDeleteCounter = db.collection("Main").doc(previousSprintId).update({
+                    TotalDevelopmentTask: totalDevelopmentTask,
+                    TotalBusinessTask: totalBusinessTask,
+                    TotalMarketingTask: totalMarketingTask,
+                    TotalOtherTask: totalOtherTask,
+                    TotalNumberOfTask: totalNumberOfTask,
+                    TotalUnCompletedTask: totalUnCompletedTask
+                });
+
+                return Promise.resolve(editSprintDeleteCounter);
+            });
+            promises.push(p1);
+
+            const p2 = db.collection("Main").doc(editedSprintId).get().then((doc) => {
+                if (doc.exists) {
+                    totalNumberOfTask = doc.data().TotalNumberOfTask;
+                    totalDevelopmentTask = doc.data().TotalDevelopmentTask;
+                    totalBusinessTask = doc.data().TotalBusinessTask;
+                    totalMarketingTask = doc.data().TotalMarketingTask;
+                    totalOtherTask = doc.data().TotalOtherTask;
+                    totalUnCompletedTask = doc.data().TotalUnCompletedTask;
+
+                    if (category === "Development") {
+                        totalDevelopmentTask = totalDevelopmentTask + 1;
+                    } else if (category === "Business") {
+                        totalBusinessTask = totalBusinessTask + 1;
+                    } else if (category === "Marketing") {
+                        totalMarketingTask = totalMarketingTask + 1;
+                    } else {
+                        totalOtherTask = totalOtherTask + 1;
+                    }
+
+                    totalNumberOfTask = totalNumberOfTask + 1;
+                    totalUnCompletedTask = totalUnCompletedTask + 1;
+
+                    sprintEditPromise = db.collection("Main").doc(editedSprintId).update({
+                        TotalBusinessTask: totalBusinessTask,
+                        TotalDevelopmentTask: totalDevelopmentTask,
+                        TotalMarketingTask: totalMarketingTask,
+                        TotalOtherTask: totalOtherTask,
+                        TotalUnCompletedTask: totalUnCompletedTask,
+                        TotalNumberOfTask: totalNumberOfTask
+                    });
+                } else {
+                    totalBusinessTask = 0;
+                    totalDevelopmentTask = 0;
+                    totalMarketingTask = 0;
+                    totalOtherTask = 0;
+                    totalUnCompletedTask = 0;
+                    totalCompletedTask = 0;
+                    totalNumberOfTask = 0;
+
+                    if (category === "Development") {
+                        totalDevelopmentTask = totalDevelopmentTask + 1;
+                    } else if (category === "Business") {
+                        totalBusinessTask = totalBusinessTask + 1;
+                    } else if (category === "Marketing") {
+                        totalMarketingTask = totalMarketingTask + 1;
+                    } else {
+                        totalOtherTask = totalOtherTask + 1;
+                    }
+
+                    totalNumberOfTask = totalNumberOfTask + 1;
+                    totalUnCompletedTask = totalUnCompletedTask + 1;
+                    sprintEditPromise = db.collection("Main").doc(editedSprintId).set({
+                        TotalBusinessTask: totalBusinessTask,
+                        TotalDevelopmentTask: totalDevelopmentTask,
+                        TotalMarketingTask: totalMarketingTask,
+                        TotalOtherTask: totalOtherTask,
+                        TotalUnCompletedTask: totalUnCompletedTask,
+                        TotalCompletedTask: totalCompletedTask,
+                        TotalNumberOfTask: totalNumberOfTask
+                    });
+                }
+                return Promise.resolve(sprintEditPromise)
+            });
+            promises.push(p2);
+        }
+
+        var p3 = db.collection("Tasks").doc(taskId).update({
+                Description: description,
+                CreationDate: creationDate,
+                Priority: priority,
+                Difficulty: difficulty,
+                Assignee: assignee,
+                EstimatedTime: estimatedTime,
+                SprintNumber: editedSprintNumber,
+                StoryPointNumber: storyPointNumber
+        });
+        promises.push(p3);
+        comment = comment + changedData;
+        updateActivity(type, comment, taskId, date, time);
+
+        Promise.all(promises).then(() => {
+            result = { data: "OK" };
+            console.log("Document sucessfully written");
+            return response.status(200).send(result);
+        })
+        .catch((error) => {
+            result = { data: error };
+            console.log("error", error);
+            return response.status(500).send(result)
+        });
+    });
+});
+
+function createSprintId(sprintNumber) {
+    if (sprintNumber === -1) {
+        return "Backlog";
+    } else {
+        return ("S" + sprintNumber);
+    }
+}
+
+async function updateActivity(type, comment, taskId, date, time){
+    var actionId = "";
+    if(type === "CREATED") {
+        actionId = "A0";
+        db.collection("Activity").doc(taskId).set({
+            TaskId: taskId,
+            TotalActions: 0,
+            TotalComments: 0
+        });
+        db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
+            Type: type,
+            Comment: comment,
+            Date: date,
+            Time: time
+        });
+    }
+    else if (type === "COMMENT") {
+        actionId = await db.collection("Activity").doc(taskId).get().then((doc) => {
+            totalActions = doc.data().TotalActions;
+            totalActions = totalActions+1;
+            totalComments = doc.data().TotalComments;
+            totalComments = totalComments+1;
+            return ("A" + totalActions);
+        });
+        if (actionId !== ""){
+            db.collection("Activity").doc(taskId).update({
+                TotalActions: totalActions,
+                TotalComments: totalComments,
+            });
+            db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
+                Type: type,
+                Comment: comment,
+                Date: date,
+                Time: time
+            });
+        }
+    }
+    else{
+        actionId = await db.collection("Activity").doc(taskId).get().then((doc) => {
+            totalActions = doc.data().TotalActions;
+            totalActions = totalActions+1;
+
+            return ("A" + totalActions);
+
+        });
+        if (actionId !== ""){
+            db.collection("Activity").doc(taskId).update({
+                TotalActions: totalActions,
+            });
+            db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
+                Type: type,
+                Comment: comment,
+                Date: date,
+                Time: time
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/functions/index.js b/functions/index.js
index 8dc53bdad..14cddc9ae 100644
--- a/functions/index.js
+++ b/functions/index.js
@@ -1,10 +1,22 @@
 const functions = require('firebase-functions');
-var cors = require('cors')({ origin: true });
-
 const admin = require('firebase-admin');
 admin.initializeApp();
-
-const db = admin.firestore();
+const createNewTaskAPI = require('./createNewTaskAPI');
+const startNewSprintAPI = require('./startNewSprintAPI');
+const logWorkAPI = require('./logWorkAPI');
+const editPageTaskAPI = require('./editPageTaskAPI');
+const deleteTaskAPI = require('./deleteTaskAPI');
+const createNewUserAPI = require('./createNewUserAPI');
+const updateSprintStatusAPI = require('./updateSprintStatusAPI');
+
+
+exports.createNewTask = createNewTaskAPI.createNewTask;
+exports.startNewSprint = startNewSprintAPI.startNewSprint;
+exports.logWork = logWorkAPI.logWork;
+exports.editPageTask = editPageTaskAPI.editPageTask;
+exports.deleteTask = deleteTaskAPI.deleteTask;
+exports.createNewUser = createNewUserAPI.createNewUser;
+exports.updateSprintStatus = updateSprintStatusAPI.updateSprintStatus;
 
 // class Task {
 //     constructor(id, title, status, priority, estimatedTime, difficulty, description, creator, category, assignee, logWorkTotalTime, workDone, creationDate, sprintNumber, storyPointNumber) {
@@ -26,583 +38,3 @@ const db = admin.firestore();
 //     }
 // }
 
-
-exports.createNewTask = functions.https.onRequest((request, response) => {
-    cors(request, response, () => {
-        console.log(request);
-        var title = request.body.data.Title;
-        var des = request.body.data.Description;
-        var priority = request.body.data.Priority;
-        var difficulty = request.body.data.Difficulty;
-        var creator = request.body.data.Creator;
-        var assignee = request.body.data.Assignee;
-        var estimatedTime = parseInt(request.body.data.EstimatedTime);
-        var status = request.body.data.Status;
-        var category = request.body.data.Category;
-        var storyPointNumber = parseInt(request.body.data.StoryPointNumber);
-        var sprintNumber = parseInt(request.body.data.SprintNumber);
-        var creationDate = request.body.data.CreationDate;
-        var fullSprintId = createSprintId(sprintNumber);
-        var loggedWorkTotalTime = 0;
-        var workDone = 0;
-        var taskId = "";
-        var totalDevelopmentTask;
-        var totalBusinessTask;
-        var totalOtherTask;
-        var totalMarketingTask;
-        var totalNumberOfTask;
-        var result;
-        var totalUnCompletedTask = 0;
-        var sprintDataPromise;
-
-        const promise1 = db.collection("RawData").doc("AppDetails").get().then((doc) => {
-            totalNumberOfTask = doc.data().TotalNumberOfTask;
-            totalDevelopmentTask = doc.data().TotalDevelopmentTask;
-            totalBusinessTask = doc.data().TotalBusinessTask;
-            totalMarketingTask = doc.data().TotalMarketingTask;
-            totalOtherTask = doc.data().TotalOtherTask;
-            totalUnCompletedTask = doc.data().TotalUnCompletedTask;
-            if (category === "Development") {
-                totalDevelopmentTask = totalDevelopmentTask + 1;
-                taskId = category[0] + totalDevelopmentTask;
-            } else if (category === "Business") {
-                totalBusinessTask = totalBusinessTask + 1;
-                taskId = category[0] + totalBusinessTask;
-            } else if (category === "Marketing") {
-                totalMarketingTask = totalMarketingTask + 1;
-                taskId = category[0] + totalMarketingTask;
-            } else {
-                totalOtherTask = totalOtherTask + 1;
-                taskId = category[0] + totalOtherTask;
-            }
-            totalUnCompletedTask = totalUnCompletedTask + 1;
-            totalNumberOfTask = totalNumberOfTask + 1;
-            console.log(taskId);
-            const P1 = db.collection("Tasks").doc(taskId).set({
-                Id: taskId,
-                Title: title,
-                Description: des,
-                Priority: priority,
-                Difficulty: difficulty,
-                Creator: creator,
-                Assignee: assignee,
-                EstimatedTime: estimatedTime,
-                Status: status,
-                Category: category,
-                LogWorkTotalTime: loggedWorkTotalTime,
-                WorkDone: workDone,
-                SprintNumber: sprintNumber,
-                StoryPointNumber: storyPointNumber,
-                CreationDate: creationDate
-            });
-            const P2 = db.collection("RawData").doc("AppDetails").update({
-                TotalDevelopmentTask: totalDevelopmentTask,
-                TotalBusinessTask: totalBusinessTask,
-                TotalMarketingTask: totalMarketingTask,
-                TotalOtherTask: totalOtherTask,
-                TotalNumberOfTask: totalNumberOfTask,
-                TotalUnCompletedTask: totalUnCompletedTask
-            });
-            const Promises = [P1,P2];
-            return Promise.all(Promises);
-        });
-
-        const promise2 = db.collection("Main").doc(fullSprintId).get().then((doc) => {
-            if (doc.exists) {
-                totalNumberOfTask = doc.data().TotalNumberOfTask;
-                totalDevelopmentTask = doc.data().TotalDevelopmentTask;
-                totalBusinessTask = doc.data().TotalBusinessTask;
-                totalOtherTask = doc.data().TotalOtherTask;
-                totalMarketingTask = doc.data().TotalMarketingTask;
-                totalUnCompletedTask = doc.data().TotalUnCompletedTask;
-
-                if (category === "Development") {
-                    totalDevelopmentTask = totalDevelopmentTask + 1;
-                } else if (category === "Business") {
-                    totalBusinessTask = totalBusinessTask + 1;
-                } else if (category === "Marketing") {
-                    totalMarketingTask = totalMarketingTask + 1;
-                } else {
-                    totalOtherTask = totalOtherTask + 1;
-                }
-
-                totalNumberOfTask = totalNumberOfTask + 1;
-                totalUnCompletedTask = totalUnCompletedTask + 1;
-
-
-                sprintDataPromise = db.collection("Main").doc(fullSprintId).update({
-                    TotalBusinessTask: totalBusinessTask,
-                    TotalDevelopmentTask: totalDevelopmentTask,
-                    TotalMarketingTask: totalMarketingTask,
-                    TotalOtherTask: totalOtherTask,
-                    TotalUnCompletedTask: totalUnCompletedTask,
-                    TotalNumberOfTask: totalNumberOfTask
-                });
-            } else {
-                totalBusinessTask = 0;
-                totalDevelopmentTask = 0;
-                totalMarketingTask = 0;
-                totalOtherTask = 0;
-                totalUnCompletedTask = 0;
-                totalCompletedTask = 0;
-                totalNumberOfTask = 0;
-
-                if (category === "Development") {
-                    totalDevelopmentTask = totalDevelopmentTask + 1;
-                } else if (category === "Business") {
-                    totalBusinessTask = totalBusinessTask + 1;
-                } else if (category === "Marketing") {
-                    totalMarketingTask = totalMarketingTask + 1;
-                } else {
-                    totalOtherTask = totalOtherTask + 1;
-                }
-
-
-                totalNumberOfTask = totalNumberOfTask + 1;
-                totalUnCompletedTask = totalUnCompletedTask + 1;
-
-                sprintDataPromise = db.collection("Main").doc(fullSprintId).set({
-                    EndDate: "xx/xx/xxxx",
-                    StartDate: "xx/xx/xxxx",
-                    Status: "Not Started",
-                    TotalBusinessTask: totalBusinessTask,
-                    TotalDevelopmentTask: totalDevelopmentTask,
-                    TotalMarketingTask: totalMarketingTask,
-                    TotalOtherTask: totalOtherTask,
-                    TotalUnCompletedTask: totalUnCompletedTask,
-                    TotalCompletedTask: totalCompletedTask,
-                    TotalNumberOfTask: totalNumberOfTask
-                });
-
-            }
-            return Promise.resolve(sprintDataPromise);
-        });
-        const newTaskPromises = [promise1, promise2];
-        Promise.all(newTaskPromises).then(() => {
-                result = { data: "OK!" }
-                console.log("Document successfully written!");
-                return response.status(200).send(result);
-            })
-        .catch((error) => {
-            result = { data: error };
-            console.error("Error writing document: ", error);
-            return response.status(500).send(result);
-        });
-    });
-});
-
-exports.startNewSprint = functions.https.onRequest((request, response) => {
-    cors(request, response, () => {
-        console.log(request);
-
-        var status = request.body.data.Status;
-        var startDate = request.body.data.StartDate;
-        var endDate = request.body.data.EndDate;
-        var totalDevelopment = parseInt(request.body.data.TotalDevelopment);
-        var totalBusiness = parseInt(request.body.data.TotalBusiness);
-        var totalMarketing = parseInt(request.body.data.TotalMarketing);
-        var totalOther = parseInt(request.body.data.TotalOther);
-        var newSprintId = parseInt(request.body.data.NewSprintId);
-        var newSprintIdString = "S" + newSprintId.toString();
-        var createSprintPromise;
-        var result;
-
-        console.log("End Date from Backend: " + endDate);
-        console.log("Start Date from Backend: " + startDate);
-        console.log("Status from Backend: " + status);
-
-        const p1 = db.collection("Main").doc(newSprintIdString).get().then((doc) => {
-            if (doc.exists) {
-                createSprintPromise = db.collection("Main").doc(newSprintIdString).update({
-                    TotalDevelopmentTask: totalDevelopment,
-                    TotalBusinessTask: totalBusiness,
-                    TotalMarketingTask: totalMarketing,
-                    TotalOtherTask: totalOther,
-                    EndDate: endDate,
-                    StartDate: startDate,
-                    Status: status
-                });
-            } else {
-                var totalUnCompletedTask = 0;
-                var totalCompletedTask = 0;
-                var totalNumberOfTask = 0;
-
-                createSprintPromise = db.collection("Main").doc(newSprintIdString).set({
-                    TotalDevelopmentTask: totalDevelopment,
-                    TotalBusinessTask: totalBusiness,
-                    TotalMarketingTask: totalMarketing,
-                    TotalOtherTask: totalOther,
-                    EndDate: endDate,
-                    StartDate: startDate,
-                    Status: status,
-                    TotalUnCompletedTask: totalUnCompletedTask,
-                    TotalCompletedTask: totalCompletedTask,
-                    TotalNumberOfTask: totalNumberOfTask
-                });
-            }
-            return Promise.resolve(createSprintPromise);
-        });
-        const p2 = db.collection("RawData").doc("AppDetails").update({
-            CurrentSprintId: newSprintId
-        });
-        const Promises = [p1,p2];
-        return Promise.all(Promises).then(() => {
-            console.log("Sprint started successfully");
-            result = { data: "OK" }
-            console.log("Document successfully written!");
-            return response.status(200).send(result);
-        })
-        .catch((error) => {
-            result = { data: error }
-            console.log("error", error);
-            return response.status(500).send(result);
-        });
-    });
-});
-
-exports.logWork = functions.https.onRequest((request, response) => {
-    cors(request, response, () => {
-        var status = request.body.data.LogWorkStatus;
-        var taskId = request.body.data.LogTaskId;
-        var logHours = parseInt(request.body.data.LogHours);
-        var workDone = parseInt(request.body.data.LogWorkDone);
-        var sprintNumber = parseInt(request.body.data.SprintNumber);
-        // var logWorkComment = request.body.data.LogWorkComment;
-        var fullSprintId = createSprintId(sprintNumber);
-        var logWorkTotalTime;
-
-        const promise1 = db.collection("Tasks").doc(taskId).get().then((doc) => {
-            logWorkTotalTime = parseInt(doc.data().LogWorkTotalTime);
-            logWorkTotalTime = parseInt(logWorkTotalTime) + parseInt(logHours);
-
-            var updatePromise = db.collection("Tasks").doc(taskId).update({
-                LogWorkTotalTime: logWorkTotalTime,
-                WorkDone: workDone,
-                Status: status
-            });
-            return Promise.resolve(updatePromise);
-        });
-        const promise2 = db.collection("RawData").doc("AppDetails").get().then((doc) => {
-            totalCompletedTask = parseInt(doc.data().TotalCompletedTask);
-            totalUnCompletedTask = parseInt(doc.data().TotalUnCompletedTask);
-            if (status === "Completed") {
-                totalCompletedTask = totalCompletedTask + 1;
-                totalUnCompletedTask = totalUnCompletedTask - 1;
-            }
-            var updateStatus = db.collection("RawData").doc("AppDetails").update({
-                TotalCompletedTask: totalCompletedTask,
-                TotalUnCompletedTask: totalUnCompletedTask
-            });
-            return Promise.resolve(updateStatus);
-        });
-        const promise3 = db.collection("Main").doc(fullSprintId).get().then((doc) => {
-            totalCompletedTask = parseInt(doc.data().TotalCompletedTask);
-            totalUnCompletedTask = parseInt(doc.data().TotalUnCompletedTask);
-
-            if (status === "Completed") {
-                totalCompletedTask = totalCompletedTask + 1;
-                totalUnCompletedTask = totalUnCompletedTask - 1;
-            }
-            var updateSprintstatus = db.collection("Main").doc(fullSprintId).update({
-                TotalCompletedTask: totalCompletedTask,
-                TotalUnCompletedTask: totalUnCompletedTask
-            });
-            return Promise.resolve(updateSprintstatus);
-        });
-        const logWorkPromises = [promise1, promise2, promise3];
-        Promise.all(logWorkPromises).then(() => {
-                result = { data: "OK" }
-                console.log("Document successfully written!");
-                return response.status(200).send(result);
-            })
-            .catch((error) => {
-                var result = { data: error };
-                console.log("error", error);
-                return response.status(500).send(result)
-            });
-    });
-});
-
-exports.editPageTask = functions.https.onRequest((request, response) => {
-    cors(request, response, () => {
-        console.log(request);
-
-        var description = request.body.data.Description;
-        var priority = request.body.data.Priority;
-        var difficulty = request.body.data.Difficulty;
-        var assignee = request.body.data.Assignee;
-        var estimatedTime = request.body.data.EstimatedTime;
-        var category = request.body.data.Category;
-        var storyPointNumber = request.body.data.StoryPointNumber;
-        var editedSprintNumber = request.body.data.SprintNumber;
-        var previousId = request.body.data.PreviousId;
-        var creationDate = request.body.data.CreationDate;
-        var previousSprintId = createSprintId(previousId);
-        var taskId = request.body.data.Id;
-        var editedSprintId = createSprintId(editedSprintNumber);
-        var totalDevelopmentTask;
-        var totalBusinessTask;
-        var totalMarketingTask;
-        var totalOtherTask;
-        var totalNumberOfTask;
-        var result;
-        var totalUnCompletedTask;
-        var totalCompletedTask;
-        var sprintEditPromise;
-
-        var promises = [];
-        if (editedSprintNumber !== previousId) {
-            const p1 = db.collection("Main").doc(previousSprintId).get().then((doc) => {
-                totalNumberOfTask = doc.data().TotalNumberOfTask;
-                totalDevelopmentTask = doc.data().TotalDevelopmentTask;
-                totalBusinessTask = doc.data().TotalBusinessTask;
-                totalMarketingTask = doc.data().TotalMarketingTask;
-                totalOtherTask = doc.data().TotalOtherTask;
-                totalUnCompletedTask = doc.data().TotalUnCompletedTask;
-
-                if (category === "Development") {
-                    totalDevelopmentTask = totalDevelopmentTask - 1;
-                } else if (category === "Business") {
-                    totalBusinessTask = totalBusinessTask - 1;
-                } else if (category === "Marketing") {
-                    totalMarketingTask = totalMarketingTask - 1;
-                } else {
-                    totalOtherTask = totalOtherTask - 1;
-                }
-
-                totalNumberOfTask = totalNumberOfTask - 1;
-                totalUnCompletedTask = totalUnCompletedTask - 1;
-                var editSprintDeleteCounter = db.collection("Main").doc(previousSprintId).update({
-                    TotalDevelopmentTask: totalDevelopmentTask,
-                    TotalBusinessTask: totalBusinessTask,
-                    TotalMarketingTask: totalMarketingTask,
-                    TotalOtherTask: totalOtherTask,
-                    TotalNumberOfTask: totalNumberOfTask,
-                    TotalUnCompletedTask: totalUnCompletedTask
-                });
-
-                return Promise.resolve(editSprintDeleteCounter);
-            });
-            promises.push(p1);
-
-            const p2 = db.collection("Main").doc(editedSprintId).get().then((doc) => {
-                if (doc.exists) {
-                    totalNumberOfTask = doc.data().TotalNumberOfTask;
-                    totalDevelopmentTask = doc.data().TotalDevelopmentTask;
-                    totalBusinessTask = doc.data().TotalBusinessTask;
-                    totalMarketingTask = doc.data().TotalMarketingTask;
-                    totalOtherTask = doc.data().TotalOtherTask;
-                    totalUnCompletedTask = doc.data().TotalUnCompletedTask;
-
-                    if (category === "Development") {
-                        totalDevelopmentTask = totalDevelopmentTask + 1;
-                    } else if (category === "Business") {
-                        totalBusinessTask = totalBusinessTask + 1;
-                    } else if (category === "Marketing") {
-                        totalMarketingTask = totalMarketingTask + 1;
-                    } else {
-                        totalOtherTask = totalOtherTask + 1;
-                    }
-
-                    totalNumberOfTask = totalNumberOfTask + 1;
-                    totalUnCompletedTask = totalUnCompletedTask + 1;
-
-                    sprintEditPromise = db.collection("Main").doc(editedSprintId).update({
-                        TotalBusinessTask: totalBusinessTask,
-                        TotalDevelopmentTask: totalDevelopmentTask,
-                        TotalMarketingTask: totalMarketingTask,
-                        TotalOtherTask: totalOtherTask,
-                        TotalUnCompletedTask: totalUnCompletedTask,
-                        TotalNumberOfTask: totalNumberOfTask
-                    });
-                } else {
-                    totalBusinessTask = 0;
-                    totalDevelopmentTask = 0;
-                    totalMarketingTask = 0;
-                    totalOtherTask = 0;
-                    totalUnCompletedTask = 0;
-                    totalCompletedTask = 0;
-                    totalNumberOfTask = 0;
-
-                    if (category === "Development") {
-                        totalDevelopmentTask = totalDevelopmentTask + 1;
-                    } else if (category === "Business") {
-                        totalBusinessTask = totalBusinessTask + 1;
-                    } else if (category === "Marketing") {
-                        totalMarketingTask = totalMarketingTask + 1;
-                    } else {
-                        totalOtherTask = totalOtherTask + 1;
-                    }
-
-                    totalNumberOfTask = totalNumberOfTask + 1;
-                    totalUnCompletedTask = totalUnCompletedTask + 1;
-                    sprintEditPromise = db.collection("Main").doc(editedSprintId).set({
-                        TotalBusinessTask: totalBusinessTask,
-                        TotalDevelopmentTask: totalDevelopmentTask,
-                        TotalMarketingTask: totalMarketingTask,
-                        TotalOtherTask: totalOtherTask,
-                        TotalUnCompletedTask: totalUnCompletedTask,
-                        TotalCompletedTask: totalCompletedTask,
-                        TotalNumberOfTask: totalNumberOfTask
-                    });
-                }
-                return Promise.resolve(sprintEditPromise)
-            });
-            promises.push(p2);
-        }
-        var p3 = db.collection("Tasks").doc(taskId).update({
-                Description: description,
-                CreationDate: creationDate,
-                Priority: priority,
-                Difficulty: difficulty,
-                Assignee: assignee,
-                EstimatedTime: estimatedTime,
-                SprintNumber: editedSprintNumber,
-                StoryPointNumber: storyPointNumber
-        });
-        promises.push(p3);
-
-        Promise.all(promises).then(() => {
-            result = { data: "OK" };
-            console.log("Document sucessfully written");
-            return response.status(200).send(result);
-        })
-        .catch((error) => {
-            result = { data: error };
-            console.log("error", error);
-            return response.status(500).send(result)
-        });
-    });
-});
-
-exports.deleteTask = functions.https.onRequest((request, response) => {
-    cors(request, response, () => {
-        console.log(request);
-
-        var sprintNumber = request.body.data.SprintNumber;
-        var taskId = request.body.data.Id;
-        var fullSprintId = createSprintId(sprintNumber);
-        var category = request.body.data.Category;
-        var status = request.body.data.Status;
-        var totalDevelopmentTask;
-        var totalBusinessTask;
-        var totalMarketingTask;
-        var totalOtherTask;
-        var totalNumberOfTask;
-        var result;
-        var totalCompletedTask;
-        var totalUnCompletedTask;
-
-        const p1 = db.collection("Tasks").doc(taskId).update({
-            Category: "Trash",
-            SprintNumber: -2
-        });
-        
-        const p2 = db.collection("Main").doc(fullSprintId).get().then((doc) => {
-            totalNumberOfTask = doc.data().TotalNumberOfTask;
-            totalDevelopmentTask = doc.data().TotalDevelopmentTask;
-            totalBusinessTask = doc.data().TotalBusinessTask;
-            totalMarketingTask = doc.data().TotalMarketingTask;
-            totalOtherTask = doc.data().TotalOtherTask
-            totalCompletedTask = doc.data().TotalCompletedTask;
-            totalUnCompletedTask = doc.data().TotalUnCompletedTask;
-
-            if (category === "Development") {
-                totalDevelopmentTask = totalDevelopmentTask - 1;
-            } else if (category === "Business") {
-                totalBusinessTask = totalBusinessTask - 1;
-            } else if (category === "Marketing") {
-                totalMarketingTask = totalMarketingTask - 1;
-            } else {
-                totalOtherTask = totalOtherTask -1;
-            }
-            totalNumberOfTask = totalNumberOfTask - 1;
-            status === "Completed" ? totalCompletedTask = totalCompletedTask - 1 : totalUnCompletedTask = totalUnCompletedTask - 1;
-            var updateDeleteTaskCounter = db.collection("Main").doc(fullSprintId).update({
-                TotalDevelopmentTask: totalDevelopmentTask,
-                TotalBusinessTask: totalBusinessTask,
-                TotalMarketingTask: totalMarketingTask,
-                TotalOtherTask: totalOtherTask,
-                TotalNumberOfTask: totalNumberOfTask,
-                TotalCompletedTask: totalCompletedTask,
-                TotalUnCompletedTask: totalUnCompletedTask
-            });
-            return Promise.resolve(updateDeleteTaskCounter);
-        });
-        const deleteTaskPromises = [p1, p2];
-        Promise.all(deleteTaskPromises).then(() => {
-                result = { data: "OK" };
-                console.log("Document sucessfully deleted");
-                return response.status(200).send(result);
-            })
-            .catch((error) => {
-                result = { data: error };
-                console.log("error", error);
-                return response.status(500).send(result)
-            });
-    });
-});
-
-function createSprintId(sprintNumber) {
-    if (sprintNumber === -1) {
-        return "Backlog";
-    } else {
-        return ("S" + sprintNumber);
-    }
-}
-exports.createNewUser = functions.https.onRequest((request, response) => {
-    cors(request, response, () => {
-        console.log(request);
-        const user = request.body.data;
-        const Uid = user.uid;
-        const PhotoURL = user.photoURL;
-        const DisplayName = user.displayName;
-        const Email = user.email;
-        const PhoneNumber = user.phoneNumber;
-        const ProviderId = user.providerId;
-
-        db.collection("Users").doc(Uid).get().then((doc) => {
-                if (doc.exists) {
-                    const userData = db.collection("Users").doc(Uid).update({
-                        uid: Uid,
-                        photoURL: PhotoURL,
-                        displayName: DisplayName,
-                        email: Email,
-                        phoneNumber: PhoneNumber,
-                        providerId: ProviderId
-                    });
-                    return Promise.resolve(userData);
-                } else {
-                    const userData = db.collection("Users").doc(Uid).set({
-                        uid: Uid,
-                        photoURL: PhotoURL,
-                        displayName: DisplayName,
-                        email: Email,
-                        phoneNumber: PhoneNumber,
-                        providerId: ProviderId
-                    });
-                    return Promise.resolve(userData);
-                }
-            }).then(() => {
-                result = { data: "User Logged In Successfully" };
-                console.log("Document successfully written");
-                return response.status(200).send(result);
-            })
-            .catch((error) => {
-                result = { data: error };
-                console.log("error", error);
-                return response.status(500).send(result)
-            });
-    });
-});
-
-exports.updateSprintStatus = functions.https.onRequest((request, response) => {
-    cors(request, response, () => {
-        var sprintStatus = request.body.data.SprintStatus;
-        var currentSprintName = request.body.data.CurrentSprintName;
-        console.log(currentSprintName);
-        db.collection("Main").doc(currentSprintName).update({
-            Status: sprintStatus,
-        });
-    });
-})
\ No newline at end of file
diff --git a/functions/logWorkAPI.js b/functions/logWorkAPI.js
new file mode 100644
index 000000000..1160b7a42
--- /dev/null
+++ b/functions/logWorkAPI.js
@@ -0,0 +1,143 @@
+const functions = require('firebase-functions');
+var cors = require('cors')({ origin: true });
+
+const admin = require('firebase-admin');
+
+const db = admin.firestore();
+
+exports.logWork = functions.https.onRequest((request, response) => {
+    cors(request, response, () => {
+        var status = request.body.data.LogWorkStatus;
+        var taskId = request.body.data.LogTaskId;
+        var logHours = parseInt(request.body.data.LogHours);
+        var workDone = parseInt(request.body.data.LogWorkDone);
+        var sprintNumber = parseInt(request.body.data.SprintNumber);
+        var logWorkComment = request.body.data.LogWorkComment;
+        var date = request.body.data.Date;
+        var time = request.body.data.Time;
+        var fullSprintId = createSprintId(sprintNumber);
+        var logWorkTotalTime;
+        var totalActions;
+        var totalComments;
+        var actionId;
+
+        const promise1 = db.collection("Tasks").doc(taskId).get().then((doc) => {
+            logWorkTotalTime = parseInt(doc.data().LogWorkTotalTime);
+            logWorkTotalTime = parseInt(logWorkTotalTime) + parseInt(logHours);
+
+            var updatePromise = db.collection("Tasks").doc(taskId).update({
+                LogWorkTotalTime: logWorkTotalTime,
+                WorkDone: workDone,
+                Status: status
+            });
+            return Promise.resolve(updatePromise);
+        });
+        const promise2 = db.collection("RawData").doc("AppDetails").get().then((doc) => {
+            totalCompletedTask = parseInt(doc.data().TotalCompletedTask);
+            totalUnCompletedTask = parseInt(doc.data().TotalUnCompletedTask);
+            if (status === "Completed") {
+                totalCompletedTask = totalCompletedTask + 1;
+                totalUnCompletedTask = totalUnCompletedTask - 1;
+            }
+            var updateStatus = db.collection("RawData").doc("AppDetails").update({
+                TotalCompletedTask: totalCompletedTask,
+                TotalUnCompletedTask: totalUnCompletedTask
+            });
+            return Promise.resolve(updateStatus);
+        });
+        const promise3 = db.collection("Main").doc(fullSprintId).get().then((doc) => {
+            totalCompletedTask = parseInt(doc.data().TotalCompletedTask);
+            totalUnCompletedTask = parseInt(doc.data().TotalUnCompletedTask);
+
+            if (status === "Completed") {
+                totalCompletedTask = totalCompletedTask + 1;
+                totalUnCompletedTask = totalUnCompletedTask - 1;
+            }
+            var updateSprintstatus = db.collection("Main").doc(fullSprintId).update({
+                TotalCompletedTask: totalCompletedTask,
+                TotalUnCompletedTask: totalUnCompletedTask
+            });
+            return Promise.resolve(updateSprintstatus);
+        });
+        updateActivity("COMMENT", logWorkComment, taskId, date, time);
+        
+        const logWorkPromises = [promise1, promise2, promise3];
+        Promise.all(logWorkPromises).then(() => {
+                result = { data: "OK" }
+                console.log("Document successfully written!");
+                return response.status(200).send(result);
+            })
+            .catch((error) => {
+                var result = { data: error };
+                console.log("error", error);
+                return response.status(500).send(result)
+            });
+    });
+});
+
+function createSprintId(sprintNumber) {
+    if (sprintNumber === -1) {
+        return "Backlog";
+    } else {
+        return ("S" + sprintNumber);
+    }
+}
+
+async function updateActivity(type, comment, taskId, date, time){
+    var actionId = "";
+    if(type === "CREATED") {
+        actionId = "A0";
+        db.collection("Activity").doc(taskId).set({
+            TaskId: taskId,
+            TotalActions: 0,
+            TotalComments: 0
+        });
+        db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
+            Type: type,
+            Comment: comment,
+            Date: date,
+            Time: time
+        });
+    }
+    else if (type === "COMMENT") {
+        actionId = await db.collection("Activity").doc(taskId).get().then((doc) => {
+            totalActions = doc.data().TotalActions;
+            totalActions = totalActions+1;
+            totalComments = doc.data().TotalComments;
+            totalComments = totalComments+1;
+            return ("A" + totalActions);
+        });
+        if (actionId !== ""){
+            db.collection("Activity").doc(taskId).update({
+                TotalActions: totalActions,
+                TotalComments: totalComments,
+            });
+            db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
+                Type: type,
+                Comment: comment,
+                Date: date,
+                Time: time
+            });
+        }
+    }
+    else{
+        actionId = await db.collection("Activity").doc(taskId).get().then((doc) => {
+            totalActions = doc.data().TotalActions;
+            totalActions = totalActions+1;
+
+            return ("A" + totalActions);
+
+        });
+        if (actionId !== ""){
+            db.collection("Activity").doc(taskId).update({
+                TotalActions: totalActions,
+            });
+            db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
+                Type: type,
+                Comment: comment,
+                Date: date,
+                Time: time
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/functions/startNewSprintAPI.js b/functions/startNewSprintAPI.js
new file mode 100644
index 000000000..5da7fe2c2
--- /dev/null
+++ b/functions/startNewSprintAPI.js
@@ -0,0 +1,76 @@
+const functions = require('firebase-functions');
+var cors = require('cors')({ origin: true });
+
+const admin = require('firebase-admin');
+
+const db = admin.firestore();
+
+exports.startNewSprint = functions.https.onRequest((request, response) => {
+    cors(request, response, () => {
+        console.log(request);
+
+        var status = request.body.data.Status;
+        var startDate = request.body.data.StartDate;
+        var endDate = request.body.data.EndDate;
+        var totalDevelopment = parseInt(request.body.data.TotalDevelopment);
+        var totalBusiness = parseInt(request.body.data.TotalBusiness);
+        var totalMarketing = parseInt(request.body.data.TotalMarketing);
+        var totalOther = parseInt(request.body.data.TotalOther);
+        var newSprintId = parseInt(request.body.data.NewSprintId);
+        var newSprintIdString = "S" + newSprintId.toString();
+        var createSprintPromise;
+        var result;
+
+        console.log("End Date from Backend: " + endDate);
+        console.log("Start Date from Backend: " + startDate);
+        console.log("Status from Backend: " + status);
+
+        const p1 = db.collection("Main").doc(newSprintIdString).get().then((doc) => {
+            if (doc.exists) {
+                createSprintPromise = db.collection("Main").doc(newSprintIdString).update({
+                    TotalDevelopmentTask: totalDevelopment,
+                    TotalBusinessTask: totalBusiness,
+                    TotalMarketingTask: totalMarketing,
+                    TotalOtherTask: totalOther,
+                    EndDate: endDate,
+                    StartDate: startDate,
+                    Status: status
+                });
+            } else {
+                var totalUnCompletedTask = 0;
+                var totalCompletedTask = 0;
+                var totalNumberOfTask = 0;
+
+                createSprintPromise = db.collection("Main").doc(newSprintIdString).set({
+                    TotalDevelopmentTask: totalDevelopment,
+                    TotalBusinessTask: totalBusiness,
+                    TotalMarketingTask: totalMarketing,
+                    TotalOtherTask: totalOther,
+                    EndDate: endDate,
+                    StartDate: startDate,
+                    Status: status,
+                    TotalUnCompletedTask: totalUnCompletedTask,
+                    TotalCompletedTask: totalCompletedTask,
+                    TotalNumberOfTask: totalNumberOfTask
+                });
+            }
+            return Promise.resolve(createSprintPromise);
+        });
+        const p2 = db.collection("RawData").doc("AppDetails").update({
+            CurrentSprintId: newSprintId
+        });
+        const Promises = [p1,p2];
+        return Promise.all(Promises).then(() => {
+            console.log("Sprint started successfully");
+            result = { data: "OK" }
+            console.log("Document successfully written!");
+            return response.status(200).send(result);
+        })
+        .catch((error) => {
+            result = { data: error }
+            console.log("error", error);
+            return response.status(500).send(result);
+        });
+    });
+});
+
diff --git a/functions/updateSprintStatusAPI.js b/functions/updateSprintStatusAPI.js
new file mode 100644
index 000000000..71f8de785
--- /dev/null
+++ b/functions/updateSprintStatusAPI.js
@@ -0,0 +1,17 @@
+const functions = require('firebase-functions');
+var cors = require('cors')({ origin: true });
+
+const admin = require('firebase-admin');
+
+const db = admin.firestore();
+
+exports.updateSprintStatus = functions.https.onRequest((request, response) => {
+    cors(request, response, () => {
+        var sprintStatus = request.body.data.SprintStatus;
+        var currentSprintName = request.body.data.CurrentSprintName;
+        console.log(currentSprintName);
+        db.collection("Main").doc(currentSprintName).update({
+            Status: sprintStatus,
+        });
+    });
+})
diff --git a/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.ts b/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.ts
index 6d9d6156c..7ce0ae35d 100644
--- a/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.ts
+++ b/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.ts
@@ -3,6 +3,7 @@ import { AngularFireFunctions } from '@angular/fire/functions';
 import { NgForm } from '@angular/forms';
 import { Router } from '@angular/router';
 import { ValidationService } from '../../services/validation.service';
+import { ToolsService } from '../../services/tools.service';
 import { Location } from '@angular/common';
 
 @Component({
@@ -26,18 +27,14 @@ export class CreateNewSessionComponent implements OnInit {
   status: string
   sprintNumber: number
   storyPoint: number
+  time: string
   enableLoader: boolean = false
   valid: boolean = true;
 
-  constructor(private functions: AngularFireFunctions, public validationService: ValidationService, private router: Router, private location: Location) { }
+  constructor(private functions: AngularFireFunctions, public validationService: ValidationService, private router: Router, private location: Location, public toolsService: ToolsService) { }
   ngOnInit(): void {
-    var today = new Date();
-
-    var dd = String(today.getDate()).padStart(2, '0');
-    var mm = String(today.getMonth() + 1).padStart(2, '0');
-    var yyyy = today.getFullYear();
-
-    this.todayDate = dd + "/" + mm + "/" + yyyy;
+    this.todayDate = this.toolsService.date();
+    this.time = this.toolsService.time();
   }
 
   async submit(){
@@ -69,7 +66,7 @@ export class CreateNewSessionComponent implements OnInit {
     const callable = this.functions.httpsCallable('createNewTask');
 
     try {
-      const result = await callable({ Title: this.title, Description: this.description, Priority: this.priority, Difficulty: this.difficulty, Creator: this.creatorName, Assignee: this.assigneeName, EstimatedTime: this.estimatedTime, Status: this.status, Category: this.category, SprintNumber: this.sprintNumber, StoryPointNumber: this.storyPoint, CreationDate: this.todayDate }).toPromise();
+      const result = await callable({ Title: this.title, Description: this.description, Priority: this.priority, Difficulty: this.difficulty, Creator: this.creatorName, Assignee: this.assigneeName, EstimatedTime: this.estimatedTime, Status: this.status, Category: this.category, SprintNumber: this.sprintNumber, StoryPointNumber: this.storyPoint, CreationDate: this.todayDate, Time: this.time }).toPromise();
 
       console.log("Successfully created the task");
       console.log(result);
diff --git a/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.ts b/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.ts
index c81721079..a225472cd 100644
--- a/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.ts
+++ b/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.ts
@@ -4,6 +4,7 @@ import { NgForm } from '@angular/forms';
 import { Tasks } from 'src/app/Interface/TasksInterface';
 import { Router } from '@angular/router';
 import { ValidationService } from '../../../services/validation.service';
+import { ToolsService } from '../../../services/tools.service';
 
 
 @Component({
@@ -20,12 +21,22 @@ export class EditPageComponent implements OnInit {
   editTask: Tasks
   previousSprintId: number
   enableLoader: boolean = false
+  todayDate: string
+  time: string
+  changedData: string = ""
+  prevVal =[]
+  newVal =[]
 
-  constructor(private functions: AngularFireFunctions, private router: Router, public validationService: ValidationService) { }
+  constructor(private functions: AngularFireFunctions, private router: Router, public validationService: ValidationService, public toolsService: ToolsService) { }
 
   ngOnInit(): void {
+
+    this.todayDate = this.toolsService.date();
+    this.time = this.toolsService.time();
+
     this.editTask = this.task;
     this.previousSprintId = this.task.SprintNumber;
+    this.prevVal = [this.task.Description, this.task.Assignee, this.task.EstimatedTime, this.task.Priority, this.task.Difficulty, this.task.StoryPointNumber];
   }
 
   async submit(){
@@ -40,6 +51,8 @@ export class EditPageComponent implements OnInit {
       return res;});
     if(condition)
     {
+      this.newVal = [this.editTask.Description, this.editTask.Assignee, this.editTask.EstimatedTime, this.editTask.Priority, this.editTask.Difficulty, this.editTask.StoryPointNumber];
+      this.generateChanges();
       console.log("Inputs are valid");
       this.editPage();
     }
@@ -47,6 +60,26 @@ export class EditPageComponent implements OnInit {
     console.log("Page not edited due to validation error");
   }
 
+async generateChanges() {
+  console.log(this.editTask, this.task);
+    if(this.prevVal[0] != this.newVal[0])
+      this.changedData = this.changedData + " description,";
+    if(this.prevVal[1] != this.newVal[1])
+      this.changedData = this.changedData + " assignee," ;
+    if(this.prevVal[2] != this.newVal[2])
+      this.changedData = this.changedData + " estimated-time," ;
+    if(this.prevVal[3] != this.newVal[3])
+      this.changedData = this.changedData + " priority," ;
+    if(this.prevVal[4] != this.newVal[4])
+      this.changedData = this.changedData + " difficulty," ;
+    if(this.prevVal[5] != this.newVal[5])
+      this.changedData = this.changedData + " story-point,";
+    if(this.changedData != "")
+      this.changedData = "Edited-" + this.changedData;
+      this.changedData = this.changedData.substring(0,this.changedData.length-1) + "."
+    console.log(this.changedData);
+  }
+
   async editPage() {
     this.enableLoader = true
     const callable = this.functions.httpsCallable('editPageTask');
@@ -58,7 +91,7 @@ export class EditPageComponent implements OnInit {
 
       console.log(this.editTask.SprintNumber);
       if (!(this.task.Status === "Completed")) {
-        const result = await callable({ Id: this.editTask.Id, Description: this.editTask.Description, Priority: this.editTask.Priority, Difficulty: this.editTask.Difficulty, Assignee: this.editTask.Assignee, EstimatedTime: this.editTask.EstimatedTime, Category: this.task.Category, SprintNumber: this.editTask.SprintNumber, StoryPointNumber: this.editTask.StoryPointNumber, PreviousId: this.previousSprintId, CreationDate: this.editTask.CreationDate }).toPromise();
+        const result = await callable({ Id: this.editTask.Id, Description: this.editTask.Description, Priority: this.editTask.Priority, Difficulty: this.editTask.Difficulty, Assignee: this.editTask.Assignee, EstimatedTime: this.editTask.EstimatedTime, Category: this.task.Category, SprintNumber: this.editTask.SprintNumber, StoryPointNumber: this.editTask.StoryPointNumber, PreviousId: this.previousSprintId, CreationDate: this.editTask.CreationDate, Date: this.todayDate, Time: this.time, ChangedData: this.changedData}).toPromise();
         console.log("Successfully Updated the task");
         console.log(result);
         this.editTaskDone();
diff --git a/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.ts b/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.ts
index 8101eafd7..2031bdc75 100644
--- a/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.ts
+++ b/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.ts
@@ -3,6 +3,7 @@ import { NgForm } from '@angular/forms';
 import { Tasks } from 'src/app/Interface/TasksInterface';
 import { AngularFireFunctions } from '@angular/fire/functions';
 import { ValidationService } from '../../../services/validation.service';
+import { ToolsService } from '../../../services/tools.service';
 
 @Component({
   selector: 'app-log-work',
@@ -22,10 +23,15 @@ export class LogWorkComponent implements OnInit {
   logHours: number
   logWorkComment: number
   enableLoader: boolean = false
+  todayDate: string
+  time: string
 
-  constructor(private functions: AngularFireFunctions, public validationService: ValidationService) { }
+  constructor(private functions: AngularFireFunctions, public validationService: ValidationService, public toolsService: ToolsService) { }
 
-  ngOnInit(): void { }
+  ngOnInit(): void { 
+    this.todayDate = this.toolsService.date();
+    this.time = this.toolsService.time();
+  }
 
   async submit(){
     let labels = ['status', 'logHours', 'workCompleted', 'comment'];
@@ -50,7 +56,7 @@ export class LogWorkComponent implements OnInit {
     const callable = this.functions.httpsCallable('logWork');
 
     try {
-      const result = await callable({ SprintNumber: this.task.SprintNumber, LogTaskId: this.task.Id, LogHours: this.logHours, LogWorkDone: this.logWorkDone, LogWorkStatus: this.logWorkStatus, LogWorkComment: this.logWorkComment }).toPromise();
+      const result = await callable({ SprintNumber: this.task.SprintNumber, LogTaskId: this.task.Id, LogHours: this.logHours, LogWorkDone: this.logWorkDone, LogWorkStatus: this.logWorkStatus, LogWorkComment: this.logWorkComment, Date: this.todayDate, Time: this.time}).toPromise();
 
       console.log("Logged Work Successfully");
       console.log(result);
diff --git a/worktrolly-ui/src/app/body/task-details/task-details.component.ts b/worktrolly-ui/src/app/body/task-details/task-details.component.ts
index 1be5a2eae..a91ce0aae 100644
--- a/worktrolly-ui/src/app/body/task-details/task-details.component.ts
+++ b/worktrolly-ui/src/app/body/task-details/task-details.component.ts
@@ -6,6 +6,7 @@ import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators'
 import { Tasks } from 'src/app/Interface/TasksInterface';
 import { AuthService } from 'src/app/services/auth.service';
+import { ToolsService } from '../../services/tools.service';
 import {Location} from '@angular/common';
 import { NavbarHandlerService } from 'src/app/services/navbar-handler.service';
 
@@ -24,12 +25,18 @@ export class TaskDetailsComponent implements OnInit {
   editTaskEnabled: boolean = false
   userLoggedIn: boolean = false
   task: Tasks
+  todayDate: string
+  time: string
+  
   public taskDocument: AngularFirestoreDocument<Tasks>
   public taskDataObservable: Observable<Tasks>
 
-  constructor(private route: ActivatedRoute, public db: AngularFirestore, private router: Router, private functions: AngularFireFunctions, public authService: AuthService, private location: Location, private navbarHandler: NavbarHandlerService) { }
+  constructor(private route: ActivatedRoute, public db: AngularFirestore, private router: Router, private functions: AngularFireFunctions, public authService: AuthService, private location: Location, public toolsService: ToolsService, private navbarHandler: NavbarHandlerService) { }
 
   ngOnInit(): void {
+    this.todayDate = this.toolsService.date();
+    this.time = this.toolsService.time();
+
     this.Id = this.route.snapshot.params['taskId'];
 
     this.componentName = this.Id;
@@ -70,7 +77,7 @@ export class TaskDetailsComponent implements OnInit {
     const callable = this.functions.httpsCallable('deleteTask');
 
     try {
-      const result = await callable({ Id: this.task.Id, SprintNumber: this.task.SprintNumber, Category: this.task.Category, Status: this.task.Status }).toPromise();
+      const result = await callable({ Id: this.task.Id, SprintNumber: this.task.SprintNumber, Category: this.task.Category, Status: this.task.Status, Date: this.todayDate, Time: this.time }).toPromise();
       console.log(this.task.Id + " deleted");
       console.log(result);
       this.router.navigate(['/']);
diff --git a/worktrolly-ui/src/app/services/tools.service.spec.ts b/worktrolly-ui/src/app/services/tools.service.spec.ts
new file mode 100644
index 000000000..3225de8e6
--- /dev/null
+++ b/worktrolly-ui/src/app/services/tools.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { ToolsService } from './tools.service';
+
+describe('ToolsService', () => {
+  let service: ToolsService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(ToolsService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});
diff --git a/worktrolly-ui/src/app/services/tools.service.ts b/worktrolly-ui/src/app/services/tools.service.ts
new file mode 100644
index 000000000..67cc02d24
--- /dev/null
+++ b/worktrolly-ui/src/app/services/tools.service.ts
@@ -0,0 +1,29 @@
+import { Injectable } from '@angular/core';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class ToolsService {
+
+  todayDate: string
+  todayTime: string
+
+  constructor() { }
+
+  date(){
+    var today = new Date();
+    var dd = String(today.getDate()).padStart(2, '0');
+    var mm = String(today.getMonth() + 1).padStart(2, '0');
+    var yyyy = today.getFullYear();
+    return this.todayDate = dd + "/" + mm + "/" + yyyy;
+  }
+
+  time(){
+    var today = new Date();
+    var hh = String(today.getHours()).padStart(2, '0');
+    var mn = String(today.getMinutes()).padStart(2, '0');
+    var ss= String(today.getSeconds()).padStart(2, '0');
+    return this.todayTime = hh + ":" + mn + ":" + ss;
+  }
+
+}

From ed0ca04590ac03bbc5f0eb5588f3981292221165 Mon Sep 17 00:00:00 2001
From: Komal Sharma <52309262+k0malSharma@users.noreply.github.com>
Date: Sat, 30 Jan 2021 11:17:08 +0530
Subject: [PATCH 33/37] Revert "Revert "Revert "feat(dev/activity): added an
 activity collection in database."""

---
 functions/createNewTaskAPI.js                 | 240 -------
 functions/createNewUserAPI.js                 |  52 --
 functions/deleteTaskAPI.js                    | 147 -----
 functions/editPageTaskAPI.js                  | 237 -------
 functions/index.js                            | 600 +++++++++++++++++-
 functions/logWorkAPI.js                       | 143 -----
 functions/startNewSprintAPI.js                |  76 ---
 functions/updateSprintStatusAPI.js            |  17 -
 .../create-new-session.component.ts           |  15 +-
 .../edit-page/edit-page.component.ts          |  37 +-
 .../log-work/log-work.component.ts            |  12 +-
 .../task-details/task-details.component.ts    |  11 +-
 .../src/app/services/tools.service.spec.ts    |  16 -
 .../src/app/services/tools.service.ts         |  29 -
 14 files changed, 600 insertions(+), 1032 deletions(-)
 delete mode 100644 functions/createNewTaskAPI.js
 delete mode 100644 functions/createNewUserAPI.js
 delete mode 100644 functions/deleteTaskAPI.js
 delete mode 100644 functions/editPageTaskAPI.js
 delete mode 100644 functions/logWorkAPI.js
 delete mode 100644 functions/startNewSprintAPI.js
 delete mode 100644 functions/updateSprintStatusAPI.js
 delete mode 100644 worktrolly-ui/src/app/services/tools.service.spec.ts
 delete mode 100644 worktrolly-ui/src/app/services/tools.service.ts

diff --git a/functions/createNewTaskAPI.js b/functions/createNewTaskAPI.js
deleted file mode 100644
index 0b3f709b4..000000000
--- a/functions/createNewTaskAPI.js
+++ /dev/null
@@ -1,240 +0,0 @@
-const functions = require('firebase-functions');
-var cors = require('cors')({ origin: true });
-
-const admin = require('firebase-admin');
-
-const db = admin.firestore();
-
-exports.createNewTask = functions.https.onRequest((request, response) => {
-    cors(request, response, () => {
-        console.log(request);
-        var title = request.body.data.Title;
-        var des = request.body.data.Description;
-        var priority = request.body.data.Priority;
-        var difficulty = request.body.data.Difficulty;
-        var creator = request.body.data.Creator;
-        var assignee = request.body.data.Assignee;
-        var estimatedTime = parseInt(request.body.data.EstimatedTime);
-        var status = request.body.data.Status;
-        var category = request.body.data.Category;
-        var storyPointNumber = parseInt(request.body.data.StoryPointNumber);
-        var sprintNumber = parseInt(request.body.data.SprintNumber);
-        var creationDate = request.body.data.CreationDate;
-        var time = request.body.data.Time;
-        var fullSprintId = createSprintId(sprintNumber);
-        var loggedWorkTotalTime = 0;
-        var workDone = 0;
-        var taskId = "";
-        var totalDevelopmentTask;
-        var totalBusinessTask;
-        var totalOtherTask;
-        var totalMarketingTask;
-        var totalNumberOfTask;
-        var result;
-        var totalUnCompletedTask = 0;
-        var sprintDataPromise;
-
-        const promise1 = db.collection("RawData").doc("AppDetails").get().then((doc) => {
-            totalNumberOfTask = doc.data().TotalNumberOfTask;
-            totalDevelopmentTask = doc.data().TotalDevelopmentTask;
-            totalBusinessTask = doc.data().TotalBusinessTask;
-            totalMarketingTask = doc.data().TotalMarketingTask;
-            totalOtherTask = doc.data().TotalOtherTask;
-            totalUnCompletedTask = doc.data().TotalUnCompletedTask;
-            if (category === "Development") {
-                totalDevelopmentTask = totalDevelopmentTask + 1;
-                taskId = category[0] + totalDevelopmentTask;
-            } else if (category === "Business") {
-                totalBusinessTask = totalBusinessTask + 1;
-                taskId = category[0] + totalBusinessTask;
-            } else if (category === "Marketing") {
-                totalMarketingTask = totalMarketingTask + 1;
-                taskId = category[0] + totalMarketingTask;
-            } else {
-                totalOtherTask = totalOtherTask + 1;
-                taskId = category[0] + totalOtherTask;
-            }
-            totalUnCompletedTask = totalUnCompletedTask + 1;
-            totalNumberOfTask = totalNumberOfTask + 1;
-            console.log(taskId);
-            const P1 = db.collection("Tasks").doc(taskId).set({
-                Id: taskId,
-                Title: title,
-                Description: des,
-                Priority: priority,
-                Difficulty: difficulty,
-                Creator: creator,
-                Assignee: assignee,
-                EstimatedTime: estimatedTime,
-                Status: status,
-                Category: category,
-                LogWorkTotalTime: loggedWorkTotalTime,
-                WorkDone: workDone,
-                SprintNumber: sprintNumber,
-                StoryPointNumber: storyPointNumber,
-                CreationDate: creationDate
-            });
-            const P2 = db.collection("RawData").doc("AppDetails").update({
-                TotalDevelopmentTask: totalDevelopmentTask,
-                TotalBusinessTask: totalBusinessTask,
-                TotalMarketingTask: totalMarketingTask,
-                TotalOtherTask: totalOtherTask,
-                TotalNumberOfTask: totalNumberOfTask,
-                TotalUnCompletedTask: totalUnCompletedTask
-            });
-            updateActivity("CREATED", "Created task "+taskId, taskId, creationDate, time);
-            const Promises = [P1,P2];
-            return Promise.all(Promises);
-        });
-
-        const promise2 = db.collection("Main").doc(fullSprintId).get().then((doc) => {
-            if (doc.exists) {
-                totalNumberOfTask = doc.data().TotalNumberOfTask;
-                totalDevelopmentTask = doc.data().TotalDevelopmentTask;
-                totalBusinessTask = doc.data().TotalBusinessTask;
-                totalOtherTask = doc.data().TotalOtherTask;
-                totalMarketingTask = doc.data().TotalMarketingTask;
-                totalUnCompletedTask = doc.data().TotalUnCompletedTask;
-
-                if (category === "Development") {
-                    totalDevelopmentTask = totalDevelopmentTask + 1;
-                } else if (category === "Business") {
-                    totalBusinessTask = totalBusinessTask + 1;
-                } else if (category === "Marketing") {
-                    totalMarketingTask = totalMarketingTask + 1;
-                } else {
-                    totalOtherTask = totalOtherTask + 1;
-                }
-
-                totalNumberOfTask = totalNumberOfTask + 1;
-                totalUnCompletedTask = totalUnCompletedTask + 1;
-
-
-                sprintDataPromise = db.collection("Main").doc(fullSprintId).update({
-                    TotalBusinessTask: totalBusinessTask,
-                    TotalDevelopmentTask: totalDevelopmentTask,
-                    TotalMarketingTask: totalMarketingTask,
-                    TotalOtherTask: totalOtherTask,
-                    TotalUnCompletedTask: totalUnCompletedTask,
-                    TotalNumberOfTask: totalNumberOfTask
-                });
-            } else {
-                totalBusinessTask = 0;
-                totalDevelopmentTask = 0;
-                totalMarketingTask = 0;
-                totalOtherTask = 0;
-                totalUnCompletedTask = 0;
-                totalCompletedTask = 0;
-                totalNumberOfTask = 0;
-
-                if (category === "Development") {
-                    totalDevelopmentTask = totalDevelopmentTask + 1;
-                } else if (category === "Business") {
-                    totalBusinessTask = totalBusinessTask + 1;
-                } else if (category === "Marketing") {
-                    totalMarketingTask = totalMarketingTask + 1;
-                } else {
-                    totalOtherTask = totalOtherTask + 1;
-                }
-
-
-                totalNumberOfTask = totalNumberOfTask + 1;
-                totalUnCompletedTask = totalUnCompletedTask + 1;
-
-                sprintDataPromise = db.collection("Main").doc(fullSprintId).set({
-                    EndDate: "xx/xx/xxxx",
-                    StartDate: "xx/xx/xxxx",
-                    Status: "Not Started",
-                    TotalBusinessTask: totalBusinessTask,
-                    TotalDevelopmentTask: totalDevelopmentTask,
-                    TotalMarketingTask: totalMarketingTask,
-                    TotalOtherTask: totalOtherTask,
-                    TotalUnCompletedTask: totalUnCompletedTask,
-                    TotalCompletedTask: totalCompletedTask,
-                    TotalNumberOfTask: totalNumberOfTask
-                });
-
-            }
-            return Promise.resolve(sprintDataPromise);
-        });
-
-        const newTaskPromises = [promise1, promise2];
-        Promise.all(newTaskPromises).then(() => {
-                result = { data: "OK!" }
-                console.log("Document successfully written!");
-                return response.status(200).send(result);
-            })
-        .catch((error) => {
-            result = { data: error };
-            console.error("Error writing document: ", error);
-            return response.status(500).send(result);
-        });
-    });
-});
-
-function createSprintId(sprintNumber) {
-    if (sprintNumber === -1) {
-        return "Backlog";
-    } else {
-        return ("S" + sprintNumber);
-    }
-}
-
-async function updateActivity(type, comment, taskId, date, time){
-    var actionId = "";
-    if(type === "CREATED") {
-        actionId = "A0";
-        db.collection("Activity").doc(taskId).set({
-            TaskId: taskId,
-            TotalActions: 0,
-            TotalComments: 0
-        });
-        db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
-            Type: type,
-            Comment: comment,
-            Date: date,
-            Time: time
-        });
-    }
-    else if (type === "COMMENT") {
-        actionId = await db.collection("Activity").doc(taskId).get().then((doc) => {
-            totalActions = doc.data().TotalActions;
-            totalActions = totalActions+1;
-            totalComments = doc.data().TotalComments;
-            totalComments = totalComments+1;
-            return ("A" + totalActions);
-        });
-        if (actionId !== ""){
-            db.collection("Activity").doc(taskId).update({
-                TotalActions: totalActions,
-                TotalComments: totalComments,
-            });
-            db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
-                Type: type,
-                Comment: comment,
-                Date: date,
-                Time: time
-            });
-        }
-    }
-    else{
-        actionId = await db.collection("Activity").doc(taskId).get().then((doc) => {
-            totalActions = doc.data().TotalActions;
-            totalActions = totalActions+1;
-
-            return ("A" + totalActions);
-
-        });
-        if (actionId !== ""){
-            db.collection("Activity").doc(taskId).update({
-                TotalActions: totalActions,
-            });
-            db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
-                Type: type,
-                Comment: comment,
-                Date: date,
-                Time: time
-            });
-        }
-    }
-}
\ No newline at end of file
diff --git a/functions/createNewUserAPI.js b/functions/createNewUserAPI.js
deleted file mode 100644
index c2236a37d..000000000
--- a/functions/createNewUserAPI.js
+++ /dev/null
@@ -1,52 +0,0 @@
-const functions = require('firebase-functions');
-var cors = require('cors')({ origin: true });
-
-const admin = require('firebase-admin');
-
-const db = admin.firestore();
-
-exports.createNewUser = functions.https.onRequest((request, response) => {
-    cors(request, response, () => {
-        console.log(request);
-        const user = request.body.data;
-        const Uid = user.uid;
-        const PhotoURL = user.photoURL;
-        const DisplayName = user.displayName;
-        const Email = user.email;
-        const PhoneNumber = user.phoneNumber;
-        const ProviderId = user.providerId;
-
-        db.collection("Users").doc(Uid).get().then((doc) => {
-                if (doc.exists) {
-                    const userData = db.collection("Users").doc(Uid).update({
-                        uid: Uid,
-                        photoURL: PhotoURL,
-                        displayName: DisplayName,
-                        email: Email,
-                        phoneNumber: PhoneNumber,
-                        providerId: ProviderId
-                    });
-                    return Promise.resolve(userData);
-                } else {
-                    const userData = db.collection("Users").doc(Uid).set({
-                        uid: Uid,
-                        photoURL: PhotoURL,
-                        displayName: DisplayName,
-                        email: Email,
-                        phoneNumber: PhoneNumber,
-                        providerId: ProviderId
-                    });
-                    return Promise.resolve(userData);
-                }
-            }).then(() => {
-                result = { data: "User Logged In Successfully" };
-                console.log("Document successfully written");
-                return response.status(200).send(result);
-            })
-            .catch((error) => {
-                result = { data: error };
-                console.log("error", error);
-                return response.status(500).send(result)
-            });
-    });
-});
\ No newline at end of file
diff --git a/functions/deleteTaskAPI.js b/functions/deleteTaskAPI.js
deleted file mode 100644
index c44447f37..000000000
--- a/functions/deleteTaskAPI.js
+++ /dev/null
@@ -1,147 +0,0 @@
-const functions = require('firebase-functions');
-var cors = require('cors')({ origin: true });
-
-const admin = require('firebase-admin');
-
-const db = admin.firestore();
-
-exports.deleteTask = functions.https.onRequest((request, response) => {
-    cors(request, response, () => {
-        console.log(request);
-
-        var sprintNumber = request.body.data.SprintNumber;
-        var taskId = request.body.data.Id;
-        var fullSprintId = createSprintId(sprintNumber);
-        var category = request.body.data.Category;
-        var status = request.body.data.Status;
-        var totalDevelopmentTask;
-        var totalBusinessTask;
-        var totalMarketingTask;
-        var totalOtherTask;
-        var totalNumberOfTask;
-        var result;
-        var totalCompletedTask;
-        var totalUnCompletedTask;
-        var date = request.body.data.Date;
-        var time = request.body.data.Time;
-        var totalActions;
-        var actionId;
-
-        const p1 = db.collection("Tasks").doc(taskId).update({
-            Category: "Trash",
-            SprintNumber: -2
-        });
-        
-        const p2 = db.collection("Main").doc(fullSprintId).get().then((doc) => {
-            totalNumberOfTask = doc.data().TotalNumberOfTask;
-            totalDevelopmentTask = doc.data().TotalDevelopmentTask;
-            totalBusinessTask = doc.data().TotalBusinessTask;
-            totalMarketingTask = doc.data().TotalMarketingTask;
-            totalOtherTask = doc.data().TotalOtherTask
-            totalCompletedTask = doc.data().TotalCompletedTask;
-            totalUnCompletedTask = doc.data().TotalUnCompletedTask;
-
-            if (category === "Development") {
-                totalDevelopmentTask = totalDevelopmentTask - 1;
-            } else if (category === "Business") {
-                totalBusinessTask = totalBusinessTask - 1;
-            } else if (category === "Marketing") {
-                totalMarketingTask = totalMarketingTask - 1;
-            } else {
-                totalOtherTask = totalOtherTask -1;
-            }
-            totalNumberOfTask = totalNumberOfTask - 1;
-            status === "Completed" ? totalCompletedTask = totalCompletedTask - 1 : totalUnCompletedTask = totalUnCompletedTask - 1;
-            var updateDeleteTaskCounter = db.collection("Main").doc(fullSprintId).update({
-                TotalDevelopmentTask: totalDevelopmentTask,
-                TotalBusinessTask: totalBusinessTask,
-                TotalMarketingTask: totalMarketingTask,
-                TotalOtherTask: totalOtherTask,
-                TotalNumberOfTask: totalNumberOfTask,
-                TotalCompletedTask: totalCompletedTask,
-                TotalUnCompletedTask: totalUnCompletedTask
-            });
-            return Promise.resolve(updateDeleteTaskCounter);
-        });
-        updateActivity("DELETED", "Deleted task "+taskId, taskId, date, time);
-
-        const deleteTaskPromises = [p1, p2];
-        Promise.all(deleteTaskPromises).then(() => {
-                result = { data: "OK" };
-                console.log("Document sucessfully deleted");
-                return response.status(200).send(result);
-            })
-            .catch((error) => {
-                result = { data: error };
-                console.log("error", error);
-                return response.status(500).send(result)
-            });
-    });
-});
-
-function createSprintId(sprintNumber) {
-    if (sprintNumber === -1) {
-        return "Backlog";
-    } else {
-        return ("S" + sprintNumber);
-    }
-}
-
-async function updateActivity(type, comment, taskId, date, time){
-    var actionId = "";
-    if(type === "CREATED") {
-        actionId = "A0";
-        db.collection("Activity").doc(taskId).set({
-            TaskId: taskId,
-            TotalActions: 0,
-            TotalComments: 0
-        });
-        db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
-            Type: type,
-            Comment: comment,
-            Date: date,
-            Time: time
-        });
-    }
-    else if (type === "COMMENT") {
-        actionId = await db.collection("Activity").doc(taskId).get().then((doc) => {
-            totalActions = doc.data().TotalActions;
-            totalActions = totalActions+1;
-            totalComments = doc.data().TotalComments;
-            totalComments = totalComments+1;
-            return ("A" + totalActions);
-        });
-        if (actionId !== ""){
-            db.collection("Activity").doc(taskId).update({
-                TotalActions: totalActions,
-                TotalComments: totalComments,
-            });
-            db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
-                Type: type,
-                Comment: comment,
-                Date: date,
-                Time: time
-            });
-        }
-    }
-    else{
-        actionId = await db.collection("Activity").doc(taskId).get().then((doc) => {
-            totalActions = doc.data().TotalActions;
-            totalActions = totalActions+1;
-
-            return ("A" + totalActions);
-
-        });
-        if (actionId !== ""){
-            db.collection("Activity").doc(taskId).update({
-                TotalActions: totalActions,
-            });
-            db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
-                Type: type,
-                Comment: comment,
-                Date: date,
-                Time: time
-            });
-        }
-    }
-}
\ No newline at end of file
diff --git a/functions/editPageTaskAPI.js b/functions/editPageTaskAPI.js
deleted file mode 100644
index 69ab4c803..000000000
--- a/functions/editPageTaskAPI.js
+++ /dev/null
@@ -1,237 +0,0 @@
-const functions = require('firebase-functions');
-var cors = require('cors')({ origin: true });
-
-const admin = require('firebase-admin');
-
-const db = admin.firestore();
-
-exports.editPageTask = functions.https.onRequest((request, response) => {
-    cors(request, response, () => {
-        console.log(request);
-
-        var description = request.body.data.Description;
-        var priority = request.body.data.Priority;
-        var difficulty = request.body.data.Difficulty;
-        var assignee = request.body.data.Assignee;
-        var estimatedTime = request.body.data.EstimatedTime;
-        var category = request.body.data.Category;
-        var storyPointNumber = request.body.data.StoryPointNumber;
-        var editedSprintNumber = request.body.data.SprintNumber;
-        var previousId = request.body.data.PreviousId;
-        var creationDate = request.body.data.CreationDate;
-        var changedData = request.body.data.ChangedData;
-        var previousSprintId = createSprintId(previousId);
-        var taskId = request.body.data.Id;
-        var editedSprintId = createSprintId(editedSprintNumber);
-        var totalDevelopmentTask;
-        var totalBusinessTask;
-        var totalMarketingTask;
-        var totalOtherTask;
-        var totalNumberOfTask;
-        var result;
-        var totalUnCompletedTask;
-        var totalCompletedTask;
-        var sprintEditPromise;
-        var date = request.body.data.Date;
-        var time = request.body.data.Time;
-        var totalActions;
-        var actionId;
-        var type = "EDITED";
-        var comment = "Edited task details: ";
-
-
-        var promises = [];
-        if (editedSprintNumber !== previousId) {
-            comment += "Moved to sprint " + editedSprintId + ". ";
-            const p1 = db.collection("Main").doc(previousSprintId).get().then((doc) => {
-                totalNumberOfTask = doc.data().TotalNumberOfTask;
-                totalDevelopmentTask = doc.data().TotalDevelopmentTask;
-                totalBusinessTask = doc.data().TotalBusinessTask;
-                totalMarketingTask = doc.data().TotalMarketingTask;
-                totalOtherTask = doc.data().TotalOtherTask;
-                totalUnCompletedTask = doc.data().TotalUnCompletedTask;
-
-                if (category === "Development") {
-                    totalDevelopmentTask = totalDevelopmentTask - 1;
-                } else if (category === "Business") {
-                    totalBusinessTask = totalBusinessTask - 1;
-                } else if (category === "Marketing") {
-                    totalMarketingTask = totalMarketingTask - 1;
-                } else {
-                    totalOtherTask = totalOtherTask - 1;
-                }
-
-                totalNumberOfTask = totalNumberOfTask - 1;
-                totalUnCompletedTask = totalUnCompletedTask - 1;
-                var editSprintDeleteCounter = db.collection("Main").doc(previousSprintId).update({
-                    TotalDevelopmentTask: totalDevelopmentTask,
-                    TotalBusinessTask: totalBusinessTask,
-                    TotalMarketingTask: totalMarketingTask,
-                    TotalOtherTask: totalOtherTask,
-                    TotalNumberOfTask: totalNumberOfTask,
-                    TotalUnCompletedTask: totalUnCompletedTask
-                });
-
-                return Promise.resolve(editSprintDeleteCounter);
-            });
-            promises.push(p1);
-
-            const p2 = db.collection("Main").doc(editedSprintId).get().then((doc) => {
-                if (doc.exists) {
-                    totalNumberOfTask = doc.data().TotalNumberOfTask;
-                    totalDevelopmentTask = doc.data().TotalDevelopmentTask;
-                    totalBusinessTask = doc.data().TotalBusinessTask;
-                    totalMarketingTask = doc.data().TotalMarketingTask;
-                    totalOtherTask = doc.data().TotalOtherTask;
-                    totalUnCompletedTask = doc.data().TotalUnCompletedTask;
-
-                    if (category === "Development") {
-                        totalDevelopmentTask = totalDevelopmentTask + 1;
-                    } else if (category === "Business") {
-                        totalBusinessTask = totalBusinessTask + 1;
-                    } else if (category === "Marketing") {
-                        totalMarketingTask = totalMarketingTask + 1;
-                    } else {
-                        totalOtherTask = totalOtherTask + 1;
-                    }
-
-                    totalNumberOfTask = totalNumberOfTask + 1;
-                    totalUnCompletedTask = totalUnCompletedTask + 1;
-
-                    sprintEditPromise = db.collection("Main").doc(editedSprintId).update({
-                        TotalBusinessTask: totalBusinessTask,
-                        TotalDevelopmentTask: totalDevelopmentTask,
-                        TotalMarketingTask: totalMarketingTask,
-                        TotalOtherTask: totalOtherTask,
-                        TotalUnCompletedTask: totalUnCompletedTask,
-                        TotalNumberOfTask: totalNumberOfTask
-                    });
-                } else {
-                    totalBusinessTask = 0;
-                    totalDevelopmentTask = 0;
-                    totalMarketingTask = 0;
-                    totalOtherTask = 0;
-                    totalUnCompletedTask = 0;
-                    totalCompletedTask = 0;
-                    totalNumberOfTask = 0;
-
-                    if (category === "Development") {
-                        totalDevelopmentTask = totalDevelopmentTask + 1;
-                    } else if (category === "Business") {
-                        totalBusinessTask = totalBusinessTask + 1;
-                    } else if (category === "Marketing") {
-                        totalMarketingTask = totalMarketingTask + 1;
-                    } else {
-                        totalOtherTask = totalOtherTask + 1;
-                    }
-
-                    totalNumberOfTask = totalNumberOfTask + 1;
-                    totalUnCompletedTask = totalUnCompletedTask + 1;
-                    sprintEditPromise = db.collection("Main").doc(editedSprintId).set({
-                        TotalBusinessTask: totalBusinessTask,
-                        TotalDevelopmentTask: totalDevelopmentTask,
-                        TotalMarketingTask: totalMarketingTask,
-                        TotalOtherTask: totalOtherTask,
-                        TotalUnCompletedTask: totalUnCompletedTask,
-                        TotalCompletedTask: totalCompletedTask,
-                        TotalNumberOfTask: totalNumberOfTask
-                    });
-                }
-                return Promise.resolve(sprintEditPromise)
-            });
-            promises.push(p2);
-        }
-
-        var p3 = db.collection("Tasks").doc(taskId).update({
-                Description: description,
-                CreationDate: creationDate,
-                Priority: priority,
-                Difficulty: difficulty,
-                Assignee: assignee,
-                EstimatedTime: estimatedTime,
-                SprintNumber: editedSprintNumber,
-                StoryPointNumber: storyPointNumber
-        });
-        promises.push(p3);
-        comment = comment + changedData;
-        updateActivity(type, comment, taskId, date, time);
-
-        Promise.all(promises).then(() => {
-            result = { data: "OK" };
-            console.log("Document sucessfully written");
-            return response.status(200).send(result);
-        })
-        .catch((error) => {
-            result = { data: error };
-            console.log("error", error);
-            return response.status(500).send(result)
-        });
-    });
-});
-
-function createSprintId(sprintNumber) {
-    if (sprintNumber === -1) {
-        return "Backlog";
-    } else {
-        return ("S" + sprintNumber);
-    }
-}
-
-async function updateActivity(type, comment, taskId, date, time){
-    var actionId = "";
-    if(type === "CREATED") {
-        actionId = "A0";
-        db.collection("Activity").doc(taskId).set({
-            TaskId: taskId,
-            TotalActions: 0,
-            TotalComments: 0
-        });
-        db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
-            Type: type,
-            Comment: comment,
-            Date: date,
-            Time: time
-        });
-    }
-    else if (type === "COMMENT") {
-        actionId = await db.collection("Activity").doc(taskId).get().then((doc) => {
-            totalActions = doc.data().TotalActions;
-            totalActions = totalActions+1;
-            totalComments = doc.data().TotalComments;
-            totalComments = totalComments+1;
-            return ("A" + totalActions);
-        });
-        if (actionId !== ""){
-            db.collection("Activity").doc(taskId).update({
-                TotalActions: totalActions,
-                TotalComments: totalComments,
-            });
-            db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
-                Type: type,
-                Comment: comment,
-                Date: date,
-                Time: time
-            });
-        }
-    }
-    else{
-        actionId = await db.collection("Activity").doc(taskId).get().then((doc) => {
-            totalActions = doc.data().TotalActions;
-            totalActions = totalActions+1;
-
-            return ("A" + totalActions);
-
-        });
-        if (actionId !== ""){
-            db.collection("Activity").doc(taskId).update({
-                TotalActions: totalActions,
-            });
-            db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
-                Type: type,
-                Comment: comment,
-                Date: date,
-                Time: time
-            });
-        }
-    }
-}
\ No newline at end of file
diff --git a/functions/index.js b/functions/index.js
index 14cddc9ae..8dc53bdad 100644
--- a/functions/index.js
+++ b/functions/index.js
@@ -1,22 +1,10 @@
 const functions = require('firebase-functions');
+var cors = require('cors')({ origin: true });
+
 const admin = require('firebase-admin');
 admin.initializeApp();
-const createNewTaskAPI = require('./createNewTaskAPI');
-const startNewSprintAPI = require('./startNewSprintAPI');
-const logWorkAPI = require('./logWorkAPI');
-const editPageTaskAPI = require('./editPageTaskAPI');
-const deleteTaskAPI = require('./deleteTaskAPI');
-const createNewUserAPI = require('./createNewUserAPI');
-const updateSprintStatusAPI = require('./updateSprintStatusAPI');
-
-
-exports.createNewTask = createNewTaskAPI.createNewTask;
-exports.startNewSprint = startNewSprintAPI.startNewSprint;
-exports.logWork = logWorkAPI.logWork;
-exports.editPageTask = editPageTaskAPI.editPageTask;
-exports.deleteTask = deleteTaskAPI.deleteTask;
-exports.createNewUser = createNewUserAPI.createNewUser;
-exports.updateSprintStatus = updateSprintStatusAPI.updateSprintStatus;
+
+const db = admin.firestore();
 
 // class Task {
 //     constructor(id, title, status, priority, estimatedTime, difficulty, description, creator, category, assignee, logWorkTotalTime, workDone, creationDate, sprintNumber, storyPointNumber) {
@@ -38,3 +26,583 @@ exports.updateSprintStatus = updateSprintStatusAPI.updateSprintStatus;
 //     }
 // }
 
+
+exports.createNewTask = functions.https.onRequest((request, response) => {
+    cors(request, response, () => {
+        console.log(request);
+        var title = request.body.data.Title;
+        var des = request.body.data.Description;
+        var priority = request.body.data.Priority;
+        var difficulty = request.body.data.Difficulty;
+        var creator = request.body.data.Creator;
+        var assignee = request.body.data.Assignee;
+        var estimatedTime = parseInt(request.body.data.EstimatedTime);
+        var status = request.body.data.Status;
+        var category = request.body.data.Category;
+        var storyPointNumber = parseInt(request.body.data.StoryPointNumber);
+        var sprintNumber = parseInt(request.body.data.SprintNumber);
+        var creationDate = request.body.data.CreationDate;
+        var fullSprintId = createSprintId(sprintNumber);
+        var loggedWorkTotalTime = 0;
+        var workDone = 0;
+        var taskId = "";
+        var totalDevelopmentTask;
+        var totalBusinessTask;
+        var totalOtherTask;
+        var totalMarketingTask;
+        var totalNumberOfTask;
+        var result;
+        var totalUnCompletedTask = 0;
+        var sprintDataPromise;
+
+        const promise1 = db.collection("RawData").doc("AppDetails").get().then((doc) => {
+            totalNumberOfTask = doc.data().TotalNumberOfTask;
+            totalDevelopmentTask = doc.data().TotalDevelopmentTask;
+            totalBusinessTask = doc.data().TotalBusinessTask;
+            totalMarketingTask = doc.data().TotalMarketingTask;
+            totalOtherTask = doc.data().TotalOtherTask;
+            totalUnCompletedTask = doc.data().TotalUnCompletedTask;
+            if (category === "Development") {
+                totalDevelopmentTask = totalDevelopmentTask + 1;
+                taskId = category[0] + totalDevelopmentTask;
+            } else if (category === "Business") {
+                totalBusinessTask = totalBusinessTask + 1;
+                taskId = category[0] + totalBusinessTask;
+            } else if (category === "Marketing") {
+                totalMarketingTask = totalMarketingTask + 1;
+                taskId = category[0] + totalMarketingTask;
+            } else {
+                totalOtherTask = totalOtherTask + 1;
+                taskId = category[0] + totalOtherTask;
+            }
+            totalUnCompletedTask = totalUnCompletedTask + 1;
+            totalNumberOfTask = totalNumberOfTask + 1;
+            console.log(taskId);
+            const P1 = db.collection("Tasks").doc(taskId).set({
+                Id: taskId,
+                Title: title,
+                Description: des,
+                Priority: priority,
+                Difficulty: difficulty,
+                Creator: creator,
+                Assignee: assignee,
+                EstimatedTime: estimatedTime,
+                Status: status,
+                Category: category,
+                LogWorkTotalTime: loggedWorkTotalTime,
+                WorkDone: workDone,
+                SprintNumber: sprintNumber,
+                StoryPointNumber: storyPointNumber,
+                CreationDate: creationDate
+            });
+            const P2 = db.collection("RawData").doc("AppDetails").update({
+                TotalDevelopmentTask: totalDevelopmentTask,
+                TotalBusinessTask: totalBusinessTask,
+                TotalMarketingTask: totalMarketingTask,
+                TotalOtherTask: totalOtherTask,
+                TotalNumberOfTask: totalNumberOfTask,
+                TotalUnCompletedTask: totalUnCompletedTask
+            });
+            const Promises = [P1,P2];
+            return Promise.all(Promises);
+        });
+
+        const promise2 = db.collection("Main").doc(fullSprintId).get().then((doc) => {
+            if (doc.exists) {
+                totalNumberOfTask = doc.data().TotalNumberOfTask;
+                totalDevelopmentTask = doc.data().TotalDevelopmentTask;
+                totalBusinessTask = doc.data().TotalBusinessTask;
+                totalOtherTask = doc.data().TotalOtherTask;
+                totalMarketingTask = doc.data().TotalMarketingTask;
+                totalUnCompletedTask = doc.data().TotalUnCompletedTask;
+
+                if (category === "Development") {
+                    totalDevelopmentTask = totalDevelopmentTask + 1;
+                } else if (category === "Business") {
+                    totalBusinessTask = totalBusinessTask + 1;
+                } else if (category === "Marketing") {
+                    totalMarketingTask = totalMarketingTask + 1;
+                } else {
+                    totalOtherTask = totalOtherTask + 1;
+                }
+
+                totalNumberOfTask = totalNumberOfTask + 1;
+                totalUnCompletedTask = totalUnCompletedTask + 1;
+
+
+                sprintDataPromise = db.collection("Main").doc(fullSprintId).update({
+                    TotalBusinessTask: totalBusinessTask,
+                    TotalDevelopmentTask: totalDevelopmentTask,
+                    TotalMarketingTask: totalMarketingTask,
+                    TotalOtherTask: totalOtherTask,
+                    TotalUnCompletedTask: totalUnCompletedTask,
+                    TotalNumberOfTask: totalNumberOfTask
+                });
+            } else {
+                totalBusinessTask = 0;
+                totalDevelopmentTask = 0;
+                totalMarketingTask = 0;
+                totalOtherTask = 0;
+                totalUnCompletedTask = 0;
+                totalCompletedTask = 0;
+                totalNumberOfTask = 0;
+
+                if (category === "Development") {
+                    totalDevelopmentTask = totalDevelopmentTask + 1;
+                } else if (category === "Business") {
+                    totalBusinessTask = totalBusinessTask + 1;
+                } else if (category === "Marketing") {
+                    totalMarketingTask = totalMarketingTask + 1;
+                } else {
+                    totalOtherTask = totalOtherTask + 1;
+                }
+
+
+                totalNumberOfTask = totalNumberOfTask + 1;
+                totalUnCompletedTask = totalUnCompletedTask + 1;
+
+                sprintDataPromise = db.collection("Main").doc(fullSprintId).set({
+                    EndDate: "xx/xx/xxxx",
+                    StartDate: "xx/xx/xxxx",
+                    Status: "Not Started",
+                    TotalBusinessTask: totalBusinessTask,
+                    TotalDevelopmentTask: totalDevelopmentTask,
+                    TotalMarketingTask: totalMarketingTask,
+                    TotalOtherTask: totalOtherTask,
+                    TotalUnCompletedTask: totalUnCompletedTask,
+                    TotalCompletedTask: totalCompletedTask,
+                    TotalNumberOfTask: totalNumberOfTask
+                });
+
+            }
+            return Promise.resolve(sprintDataPromise);
+        });
+        const newTaskPromises = [promise1, promise2];
+        Promise.all(newTaskPromises).then(() => {
+                result = { data: "OK!" }
+                console.log("Document successfully written!");
+                return response.status(200).send(result);
+            })
+        .catch((error) => {
+            result = { data: error };
+            console.error("Error writing document: ", error);
+            return response.status(500).send(result);
+        });
+    });
+});
+
+exports.startNewSprint = functions.https.onRequest((request, response) => {
+    cors(request, response, () => {
+        console.log(request);
+
+        var status = request.body.data.Status;
+        var startDate = request.body.data.StartDate;
+        var endDate = request.body.data.EndDate;
+        var totalDevelopment = parseInt(request.body.data.TotalDevelopment);
+        var totalBusiness = parseInt(request.body.data.TotalBusiness);
+        var totalMarketing = parseInt(request.body.data.TotalMarketing);
+        var totalOther = parseInt(request.body.data.TotalOther);
+        var newSprintId = parseInt(request.body.data.NewSprintId);
+        var newSprintIdString = "S" + newSprintId.toString();
+        var createSprintPromise;
+        var result;
+
+        console.log("End Date from Backend: " + endDate);
+        console.log("Start Date from Backend: " + startDate);
+        console.log("Status from Backend: " + status);
+
+        const p1 = db.collection("Main").doc(newSprintIdString).get().then((doc) => {
+            if (doc.exists) {
+                createSprintPromise = db.collection("Main").doc(newSprintIdString).update({
+                    TotalDevelopmentTask: totalDevelopment,
+                    TotalBusinessTask: totalBusiness,
+                    TotalMarketingTask: totalMarketing,
+                    TotalOtherTask: totalOther,
+                    EndDate: endDate,
+                    StartDate: startDate,
+                    Status: status
+                });
+            } else {
+                var totalUnCompletedTask = 0;
+                var totalCompletedTask = 0;
+                var totalNumberOfTask = 0;
+
+                createSprintPromise = db.collection("Main").doc(newSprintIdString).set({
+                    TotalDevelopmentTask: totalDevelopment,
+                    TotalBusinessTask: totalBusiness,
+                    TotalMarketingTask: totalMarketing,
+                    TotalOtherTask: totalOther,
+                    EndDate: endDate,
+                    StartDate: startDate,
+                    Status: status,
+                    TotalUnCompletedTask: totalUnCompletedTask,
+                    TotalCompletedTask: totalCompletedTask,
+                    TotalNumberOfTask: totalNumberOfTask
+                });
+            }
+            return Promise.resolve(createSprintPromise);
+        });
+        const p2 = db.collection("RawData").doc("AppDetails").update({
+            CurrentSprintId: newSprintId
+        });
+        const Promises = [p1,p2];
+        return Promise.all(Promises).then(() => {
+            console.log("Sprint started successfully");
+            result = { data: "OK" }
+            console.log("Document successfully written!");
+            return response.status(200).send(result);
+        })
+        .catch((error) => {
+            result = { data: error }
+            console.log("error", error);
+            return response.status(500).send(result);
+        });
+    });
+});
+
+exports.logWork = functions.https.onRequest((request, response) => {
+    cors(request, response, () => {
+        var status = request.body.data.LogWorkStatus;
+        var taskId = request.body.data.LogTaskId;
+        var logHours = parseInt(request.body.data.LogHours);
+        var workDone = parseInt(request.body.data.LogWorkDone);
+        var sprintNumber = parseInt(request.body.data.SprintNumber);
+        // var logWorkComment = request.body.data.LogWorkComment;
+        var fullSprintId = createSprintId(sprintNumber);
+        var logWorkTotalTime;
+
+        const promise1 = db.collection("Tasks").doc(taskId).get().then((doc) => {
+            logWorkTotalTime = parseInt(doc.data().LogWorkTotalTime);
+            logWorkTotalTime = parseInt(logWorkTotalTime) + parseInt(logHours);
+
+            var updatePromise = db.collection("Tasks").doc(taskId).update({
+                LogWorkTotalTime: logWorkTotalTime,
+                WorkDone: workDone,
+                Status: status
+            });
+            return Promise.resolve(updatePromise);
+        });
+        const promise2 = db.collection("RawData").doc("AppDetails").get().then((doc) => {
+            totalCompletedTask = parseInt(doc.data().TotalCompletedTask);
+            totalUnCompletedTask = parseInt(doc.data().TotalUnCompletedTask);
+            if (status === "Completed") {
+                totalCompletedTask = totalCompletedTask + 1;
+                totalUnCompletedTask = totalUnCompletedTask - 1;
+            }
+            var updateStatus = db.collection("RawData").doc("AppDetails").update({
+                TotalCompletedTask: totalCompletedTask,
+                TotalUnCompletedTask: totalUnCompletedTask
+            });
+            return Promise.resolve(updateStatus);
+        });
+        const promise3 = db.collection("Main").doc(fullSprintId).get().then((doc) => {
+            totalCompletedTask = parseInt(doc.data().TotalCompletedTask);
+            totalUnCompletedTask = parseInt(doc.data().TotalUnCompletedTask);
+
+            if (status === "Completed") {
+                totalCompletedTask = totalCompletedTask + 1;
+                totalUnCompletedTask = totalUnCompletedTask - 1;
+            }
+            var updateSprintstatus = db.collection("Main").doc(fullSprintId).update({
+                TotalCompletedTask: totalCompletedTask,
+                TotalUnCompletedTask: totalUnCompletedTask
+            });
+            return Promise.resolve(updateSprintstatus);
+        });
+        const logWorkPromises = [promise1, promise2, promise3];
+        Promise.all(logWorkPromises).then(() => {
+                result = { data: "OK" }
+                console.log("Document successfully written!");
+                return response.status(200).send(result);
+            })
+            .catch((error) => {
+                var result = { data: error };
+                console.log("error", error);
+                return response.status(500).send(result)
+            });
+    });
+});
+
+exports.editPageTask = functions.https.onRequest((request, response) => {
+    cors(request, response, () => {
+        console.log(request);
+
+        var description = request.body.data.Description;
+        var priority = request.body.data.Priority;
+        var difficulty = request.body.data.Difficulty;
+        var assignee = request.body.data.Assignee;
+        var estimatedTime = request.body.data.EstimatedTime;
+        var category = request.body.data.Category;
+        var storyPointNumber = request.body.data.StoryPointNumber;
+        var editedSprintNumber = request.body.data.SprintNumber;
+        var previousId = request.body.data.PreviousId;
+        var creationDate = request.body.data.CreationDate;
+        var previousSprintId = createSprintId(previousId);
+        var taskId = request.body.data.Id;
+        var editedSprintId = createSprintId(editedSprintNumber);
+        var totalDevelopmentTask;
+        var totalBusinessTask;
+        var totalMarketingTask;
+        var totalOtherTask;
+        var totalNumberOfTask;
+        var result;
+        var totalUnCompletedTask;
+        var totalCompletedTask;
+        var sprintEditPromise;
+
+        var promises = [];
+        if (editedSprintNumber !== previousId) {
+            const p1 = db.collection("Main").doc(previousSprintId).get().then((doc) => {
+                totalNumberOfTask = doc.data().TotalNumberOfTask;
+                totalDevelopmentTask = doc.data().TotalDevelopmentTask;
+                totalBusinessTask = doc.data().TotalBusinessTask;
+                totalMarketingTask = doc.data().TotalMarketingTask;
+                totalOtherTask = doc.data().TotalOtherTask;
+                totalUnCompletedTask = doc.data().TotalUnCompletedTask;
+
+                if (category === "Development") {
+                    totalDevelopmentTask = totalDevelopmentTask - 1;
+                } else if (category === "Business") {
+                    totalBusinessTask = totalBusinessTask - 1;
+                } else if (category === "Marketing") {
+                    totalMarketingTask = totalMarketingTask - 1;
+                } else {
+                    totalOtherTask = totalOtherTask - 1;
+                }
+
+                totalNumberOfTask = totalNumberOfTask - 1;
+                totalUnCompletedTask = totalUnCompletedTask - 1;
+                var editSprintDeleteCounter = db.collection("Main").doc(previousSprintId).update({
+                    TotalDevelopmentTask: totalDevelopmentTask,
+                    TotalBusinessTask: totalBusinessTask,
+                    TotalMarketingTask: totalMarketingTask,
+                    TotalOtherTask: totalOtherTask,
+                    TotalNumberOfTask: totalNumberOfTask,
+                    TotalUnCompletedTask: totalUnCompletedTask
+                });
+
+                return Promise.resolve(editSprintDeleteCounter);
+            });
+            promises.push(p1);
+
+            const p2 = db.collection("Main").doc(editedSprintId).get().then((doc) => {
+                if (doc.exists) {
+                    totalNumberOfTask = doc.data().TotalNumberOfTask;
+                    totalDevelopmentTask = doc.data().TotalDevelopmentTask;
+                    totalBusinessTask = doc.data().TotalBusinessTask;
+                    totalMarketingTask = doc.data().TotalMarketingTask;
+                    totalOtherTask = doc.data().TotalOtherTask;
+                    totalUnCompletedTask = doc.data().TotalUnCompletedTask;
+
+                    if (category === "Development") {
+                        totalDevelopmentTask = totalDevelopmentTask + 1;
+                    } else if (category === "Business") {
+                        totalBusinessTask = totalBusinessTask + 1;
+                    } else if (category === "Marketing") {
+                        totalMarketingTask = totalMarketingTask + 1;
+                    } else {
+                        totalOtherTask = totalOtherTask + 1;
+                    }
+
+                    totalNumberOfTask = totalNumberOfTask + 1;
+                    totalUnCompletedTask = totalUnCompletedTask + 1;
+
+                    sprintEditPromise = db.collection("Main").doc(editedSprintId).update({
+                        TotalBusinessTask: totalBusinessTask,
+                        TotalDevelopmentTask: totalDevelopmentTask,
+                        TotalMarketingTask: totalMarketingTask,
+                        TotalOtherTask: totalOtherTask,
+                        TotalUnCompletedTask: totalUnCompletedTask,
+                        TotalNumberOfTask: totalNumberOfTask
+                    });
+                } else {
+                    totalBusinessTask = 0;
+                    totalDevelopmentTask = 0;
+                    totalMarketingTask = 0;
+                    totalOtherTask = 0;
+                    totalUnCompletedTask = 0;
+                    totalCompletedTask = 0;
+                    totalNumberOfTask = 0;
+
+                    if (category === "Development") {
+                        totalDevelopmentTask = totalDevelopmentTask + 1;
+                    } else if (category === "Business") {
+                        totalBusinessTask = totalBusinessTask + 1;
+                    } else if (category === "Marketing") {
+                        totalMarketingTask = totalMarketingTask + 1;
+                    } else {
+                        totalOtherTask = totalOtherTask + 1;
+                    }
+
+                    totalNumberOfTask = totalNumberOfTask + 1;
+                    totalUnCompletedTask = totalUnCompletedTask + 1;
+                    sprintEditPromise = db.collection("Main").doc(editedSprintId).set({
+                        TotalBusinessTask: totalBusinessTask,
+                        TotalDevelopmentTask: totalDevelopmentTask,
+                        TotalMarketingTask: totalMarketingTask,
+                        TotalOtherTask: totalOtherTask,
+                        TotalUnCompletedTask: totalUnCompletedTask,
+                        TotalCompletedTask: totalCompletedTask,
+                        TotalNumberOfTask: totalNumberOfTask
+                    });
+                }
+                return Promise.resolve(sprintEditPromise)
+            });
+            promises.push(p2);
+        }
+        var p3 = db.collection("Tasks").doc(taskId).update({
+                Description: description,
+                CreationDate: creationDate,
+                Priority: priority,
+                Difficulty: difficulty,
+                Assignee: assignee,
+                EstimatedTime: estimatedTime,
+                SprintNumber: editedSprintNumber,
+                StoryPointNumber: storyPointNumber
+        });
+        promises.push(p3);
+
+        Promise.all(promises).then(() => {
+            result = { data: "OK" };
+            console.log("Document sucessfully written");
+            return response.status(200).send(result);
+        })
+        .catch((error) => {
+            result = { data: error };
+            console.log("error", error);
+            return response.status(500).send(result)
+        });
+    });
+});
+
+exports.deleteTask = functions.https.onRequest((request, response) => {
+    cors(request, response, () => {
+        console.log(request);
+
+        var sprintNumber = request.body.data.SprintNumber;
+        var taskId = request.body.data.Id;
+        var fullSprintId = createSprintId(sprintNumber);
+        var category = request.body.data.Category;
+        var status = request.body.data.Status;
+        var totalDevelopmentTask;
+        var totalBusinessTask;
+        var totalMarketingTask;
+        var totalOtherTask;
+        var totalNumberOfTask;
+        var result;
+        var totalCompletedTask;
+        var totalUnCompletedTask;
+
+        const p1 = db.collection("Tasks").doc(taskId).update({
+            Category: "Trash",
+            SprintNumber: -2
+        });
+        
+        const p2 = db.collection("Main").doc(fullSprintId).get().then((doc) => {
+            totalNumberOfTask = doc.data().TotalNumberOfTask;
+            totalDevelopmentTask = doc.data().TotalDevelopmentTask;
+            totalBusinessTask = doc.data().TotalBusinessTask;
+            totalMarketingTask = doc.data().TotalMarketingTask;
+            totalOtherTask = doc.data().TotalOtherTask
+            totalCompletedTask = doc.data().TotalCompletedTask;
+            totalUnCompletedTask = doc.data().TotalUnCompletedTask;
+
+            if (category === "Development") {
+                totalDevelopmentTask = totalDevelopmentTask - 1;
+            } else if (category === "Business") {
+                totalBusinessTask = totalBusinessTask - 1;
+            } else if (category === "Marketing") {
+                totalMarketingTask = totalMarketingTask - 1;
+            } else {
+                totalOtherTask = totalOtherTask -1;
+            }
+            totalNumberOfTask = totalNumberOfTask - 1;
+            status === "Completed" ? totalCompletedTask = totalCompletedTask - 1 : totalUnCompletedTask = totalUnCompletedTask - 1;
+            var updateDeleteTaskCounter = db.collection("Main").doc(fullSprintId).update({
+                TotalDevelopmentTask: totalDevelopmentTask,
+                TotalBusinessTask: totalBusinessTask,
+                TotalMarketingTask: totalMarketingTask,
+                TotalOtherTask: totalOtherTask,
+                TotalNumberOfTask: totalNumberOfTask,
+                TotalCompletedTask: totalCompletedTask,
+                TotalUnCompletedTask: totalUnCompletedTask
+            });
+            return Promise.resolve(updateDeleteTaskCounter);
+        });
+        const deleteTaskPromises = [p1, p2];
+        Promise.all(deleteTaskPromises).then(() => {
+                result = { data: "OK" };
+                console.log("Document sucessfully deleted");
+                return response.status(200).send(result);
+            })
+            .catch((error) => {
+                result = { data: error };
+                console.log("error", error);
+                return response.status(500).send(result)
+            });
+    });
+});
+
+function createSprintId(sprintNumber) {
+    if (sprintNumber === -1) {
+        return "Backlog";
+    } else {
+        return ("S" + sprintNumber);
+    }
+}
+exports.createNewUser = functions.https.onRequest((request, response) => {
+    cors(request, response, () => {
+        console.log(request);
+        const user = request.body.data;
+        const Uid = user.uid;
+        const PhotoURL = user.photoURL;
+        const DisplayName = user.displayName;
+        const Email = user.email;
+        const PhoneNumber = user.phoneNumber;
+        const ProviderId = user.providerId;
+
+        db.collection("Users").doc(Uid).get().then((doc) => {
+                if (doc.exists) {
+                    const userData = db.collection("Users").doc(Uid).update({
+                        uid: Uid,
+                        photoURL: PhotoURL,
+                        displayName: DisplayName,
+                        email: Email,
+                        phoneNumber: PhoneNumber,
+                        providerId: ProviderId
+                    });
+                    return Promise.resolve(userData);
+                } else {
+                    const userData = db.collection("Users").doc(Uid).set({
+                        uid: Uid,
+                        photoURL: PhotoURL,
+                        displayName: DisplayName,
+                        email: Email,
+                        phoneNumber: PhoneNumber,
+                        providerId: ProviderId
+                    });
+                    return Promise.resolve(userData);
+                }
+            }).then(() => {
+                result = { data: "User Logged In Successfully" };
+                console.log("Document successfully written");
+                return response.status(200).send(result);
+            })
+            .catch((error) => {
+                result = { data: error };
+                console.log("error", error);
+                return response.status(500).send(result)
+            });
+    });
+});
+
+exports.updateSprintStatus = functions.https.onRequest((request, response) => {
+    cors(request, response, () => {
+        var sprintStatus = request.body.data.SprintStatus;
+        var currentSprintName = request.body.data.CurrentSprintName;
+        console.log(currentSprintName);
+        db.collection("Main").doc(currentSprintName).update({
+            Status: sprintStatus,
+        });
+    });
+})
\ No newline at end of file
diff --git a/functions/logWorkAPI.js b/functions/logWorkAPI.js
deleted file mode 100644
index 1160b7a42..000000000
--- a/functions/logWorkAPI.js
+++ /dev/null
@@ -1,143 +0,0 @@
-const functions = require('firebase-functions');
-var cors = require('cors')({ origin: true });
-
-const admin = require('firebase-admin');
-
-const db = admin.firestore();
-
-exports.logWork = functions.https.onRequest((request, response) => {
-    cors(request, response, () => {
-        var status = request.body.data.LogWorkStatus;
-        var taskId = request.body.data.LogTaskId;
-        var logHours = parseInt(request.body.data.LogHours);
-        var workDone = parseInt(request.body.data.LogWorkDone);
-        var sprintNumber = parseInt(request.body.data.SprintNumber);
-        var logWorkComment = request.body.data.LogWorkComment;
-        var date = request.body.data.Date;
-        var time = request.body.data.Time;
-        var fullSprintId = createSprintId(sprintNumber);
-        var logWorkTotalTime;
-        var totalActions;
-        var totalComments;
-        var actionId;
-
-        const promise1 = db.collection("Tasks").doc(taskId).get().then((doc) => {
-            logWorkTotalTime = parseInt(doc.data().LogWorkTotalTime);
-            logWorkTotalTime = parseInt(logWorkTotalTime) + parseInt(logHours);
-
-            var updatePromise = db.collection("Tasks").doc(taskId).update({
-                LogWorkTotalTime: logWorkTotalTime,
-                WorkDone: workDone,
-                Status: status
-            });
-            return Promise.resolve(updatePromise);
-        });
-        const promise2 = db.collection("RawData").doc("AppDetails").get().then((doc) => {
-            totalCompletedTask = parseInt(doc.data().TotalCompletedTask);
-            totalUnCompletedTask = parseInt(doc.data().TotalUnCompletedTask);
-            if (status === "Completed") {
-                totalCompletedTask = totalCompletedTask + 1;
-                totalUnCompletedTask = totalUnCompletedTask - 1;
-            }
-            var updateStatus = db.collection("RawData").doc("AppDetails").update({
-                TotalCompletedTask: totalCompletedTask,
-                TotalUnCompletedTask: totalUnCompletedTask
-            });
-            return Promise.resolve(updateStatus);
-        });
-        const promise3 = db.collection("Main").doc(fullSprintId).get().then((doc) => {
-            totalCompletedTask = parseInt(doc.data().TotalCompletedTask);
-            totalUnCompletedTask = parseInt(doc.data().TotalUnCompletedTask);
-
-            if (status === "Completed") {
-                totalCompletedTask = totalCompletedTask + 1;
-                totalUnCompletedTask = totalUnCompletedTask - 1;
-            }
-            var updateSprintstatus = db.collection("Main").doc(fullSprintId).update({
-                TotalCompletedTask: totalCompletedTask,
-                TotalUnCompletedTask: totalUnCompletedTask
-            });
-            return Promise.resolve(updateSprintstatus);
-        });
-        updateActivity("COMMENT", logWorkComment, taskId, date, time);
-        
-        const logWorkPromises = [promise1, promise2, promise3];
-        Promise.all(logWorkPromises).then(() => {
-                result = { data: "OK" }
-                console.log("Document successfully written!");
-                return response.status(200).send(result);
-            })
-            .catch((error) => {
-                var result = { data: error };
-                console.log("error", error);
-                return response.status(500).send(result)
-            });
-    });
-});
-
-function createSprintId(sprintNumber) {
-    if (sprintNumber === -1) {
-        return "Backlog";
-    } else {
-        return ("S" + sprintNumber);
-    }
-}
-
-async function updateActivity(type, comment, taskId, date, time){
-    var actionId = "";
-    if(type === "CREATED") {
-        actionId = "A0";
-        db.collection("Activity").doc(taskId).set({
-            TaskId: taskId,
-            TotalActions: 0,
-            TotalComments: 0
-        });
-        db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
-            Type: type,
-            Comment: comment,
-            Date: date,
-            Time: time
-        });
-    }
-    else if (type === "COMMENT") {
-        actionId = await db.collection("Activity").doc(taskId).get().then((doc) => {
-            totalActions = doc.data().TotalActions;
-            totalActions = totalActions+1;
-            totalComments = doc.data().TotalComments;
-            totalComments = totalComments+1;
-            return ("A" + totalActions);
-        });
-        if (actionId !== ""){
-            db.collection("Activity").doc(taskId).update({
-                TotalActions: totalActions,
-                TotalComments: totalComments,
-            });
-            db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
-                Type: type,
-                Comment: comment,
-                Date: date,
-                Time: time
-            });
-        }
-    }
-    else{
-        actionId = await db.collection("Activity").doc(taskId).get().then((doc) => {
-            totalActions = doc.data().TotalActions;
-            totalActions = totalActions+1;
-
-            return ("A" + totalActions);
-
-        });
-        if (actionId !== ""){
-            db.collection("Activity").doc(taskId).update({
-                TotalActions: totalActions,
-            });
-            db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
-                Type: type,
-                Comment: comment,
-                Date: date,
-                Time: time
-            });
-        }
-    }
-}
\ No newline at end of file
diff --git a/functions/startNewSprintAPI.js b/functions/startNewSprintAPI.js
deleted file mode 100644
index 5da7fe2c2..000000000
--- a/functions/startNewSprintAPI.js
+++ /dev/null
@@ -1,76 +0,0 @@
-const functions = require('firebase-functions');
-var cors = require('cors')({ origin: true });
-
-const admin = require('firebase-admin');
-
-const db = admin.firestore();
-
-exports.startNewSprint = functions.https.onRequest((request, response) => {
-    cors(request, response, () => {
-        console.log(request);
-
-        var status = request.body.data.Status;
-        var startDate = request.body.data.StartDate;
-        var endDate = request.body.data.EndDate;
-        var totalDevelopment = parseInt(request.body.data.TotalDevelopment);
-        var totalBusiness = parseInt(request.body.data.TotalBusiness);
-        var totalMarketing = parseInt(request.body.data.TotalMarketing);
-        var totalOther = parseInt(request.body.data.TotalOther);
-        var newSprintId = parseInt(request.body.data.NewSprintId);
-        var newSprintIdString = "S" + newSprintId.toString();
-        var createSprintPromise;
-        var result;
-
-        console.log("End Date from Backend: " + endDate);
-        console.log("Start Date from Backend: " + startDate);
-        console.log("Status from Backend: " + status);
-
-        const p1 = db.collection("Main").doc(newSprintIdString).get().then((doc) => {
-            if (doc.exists) {
-                createSprintPromise = db.collection("Main").doc(newSprintIdString).update({
-                    TotalDevelopmentTask: totalDevelopment,
-                    TotalBusinessTask: totalBusiness,
-                    TotalMarketingTask: totalMarketing,
-                    TotalOtherTask: totalOther,
-                    EndDate: endDate,
-                    StartDate: startDate,
-                    Status: status
-                });
-            } else {
-                var totalUnCompletedTask = 0;
-                var totalCompletedTask = 0;
-                var totalNumberOfTask = 0;
-
-                createSprintPromise = db.collection("Main").doc(newSprintIdString).set({
-                    TotalDevelopmentTask: totalDevelopment,
-                    TotalBusinessTask: totalBusiness,
-                    TotalMarketingTask: totalMarketing,
-                    TotalOtherTask: totalOther,
-                    EndDate: endDate,
-                    StartDate: startDate,
-                    Status: status,
-                    TotalUnCompletedTask: totalUnCompletedTask,
-                    TotalCompletedTask: totalCompletedTask,
-                    TotalNumberOfTask: totalNumberOfTask
-                });
-            }
-            return Promise.resolve(createSprintPromise);
-        });
-        const p2 = db.collection("RawData").doc("AppDetails").update({
-            CurrentSprintId: newSprintId
-        });
-        const Promises = [p1,p2];
-        return Promise.all(Promises).then(() => {
-            console.log("Sprint started successfully");
-            result = { data: "OK" }
-            console.log("Document successfully written!");
-            return response.status(200).send(result);
-        })
-        .catch((error) => {
-            result = { data: error }
-            console.log("error", error);
-            return response.status(500).send(result);
-        });
-    });
-});
-
diff --git a/functions/updateSprintStatusAPI.js b/functions/updateSprintStatusAPI.js
deleted file mode 100644
index 71f8de785..000000000
--- a/functions/updateSprintStatusAPI.js
+++ /dev/null
@@ -1,17 +0,0 @@
-const functions = require('firebase-functions');
-var cors = require('cors')({ origin: true });
-
-const admin = require('firebase-admin');
-
-const db = admin.firestore();
-
-exports.updateSprintStatus = functions.https.onRequest((request, response) => {
-    cors(request, response, () => {
-        var sprintStatus = request.body.data.SprintStatus;
-        var currentSprintName = request.body.data.CurrentSprintName;
-        console.log(currentSprintName);
-        db.collection("Main").doc(currentSprintName).update({
-            Status: sprintStatus,
-        });
-    });
-})
diff --git a/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.ts b/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.ts
index 7ce0ae35d..6d9d6156c 100644
--- a/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.ts
+++ b/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.ts
@@ -3,7 +3,6 @@ import { AngularFireFunctions } from '@angular/fire/functions';
 import { NgForm } from '@angular/forms';
 import { Router } from '@angular/router';
 import { ValidationService } from '../../services/validation.service';
-import { ToolsService } from '../../services/tools.service';
 import { Location } from '@angular/common';
 
 @Component({
@@ -27,14 +26,18 @@ export class CreateNewSessionComponent implements OnInit {
   status: string
   sprintNumber: number
   storyPoint: number
-  time: string
   enableLoader: boolean = false
   valid: boolean = true;
 
-  constructor(private functions: AngularFireFunctions, public validationService: ValidationService, private router: Router, private location: Location, public toolsService: ToolsService) { }
+  constructor(private functions: AngularFireFunctions, public validationService: ValidationService, private router: Router, private location: Location) { }
   ngOnInit(): void {
-    this.todayDate = this.toolsService.date();
-    this.time = this.toolsService.time();
+    var today = new Date();
+
+    var dd = String(today.getDate()).padStart(2, '0');
+    var mm = String(today.getMonth() + 1).padStart(2, '0');
+    var yyyy = today.getFullYear();
+
+    this.todayDate = dd + "/" + mm + "/" + yyyy;
   }
 
   async submit(){
@@ -66,7 +69,7 @@ export class CreateNewSessionComponent implements OnInit {
     const callable = this.functions.httpsCallable('createNewTask');
 
     try {
-      const result = await callable({ Title: this.title, Description: this.description, Priority: this.priority, Difficulty: this.difficulty, Creator: this.creatorName, Assignee: this.assigneeName, EstimatedTime: this.estimatedTime, Status: this.status, Category: this.category, SprintNumber: this.sprintNumber, StoryPointNumber: this.storyPoint, CreationDate: this.todayDate, Time: this.time }).toPromise();
+      const result = await callable({ Title: this.title, Description: this.description, Priority: this.priority, Difficulty: this.difficulty, Creator: this.creatorName, Assignee: this.assigneeName, EstimatedTime: this.estimatedTime, Status: this.status, Category: this.category, SprintNumber: this.sprintNumber, StoryPointNumber: this.storyPoint, CreationDate: this.todayDate }).toPromise();
 
       console.log("Successfully created the task");
       console.log(result);
diff --git a/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.ts b/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.ts
index a225472cd..c81721079 100644
--- a/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.ts
+++ b/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.ts
@@ -4,7 +4,6 @@ import { NgForm } from '@angular/forms';
 import { Tasks } from 'src/app/Interface/TasksInterface';
 import { Router } from '@angular/router';
 import { ValidationService } from '../../../services/validation.service';
-import { ToolsService } from '../../../services/tools.service';
 
 
 @Component({
@@ -21,22 +20,12 @@ export class EditPageComponent implements OnInit {
   editTask: Tasks
   previousSprintId: number
   enableLoader: boolean = false
-  todayDate: string
-  time: string
-  changedData: string = ""
-  prevVal =[]
-  newVal =[]
 
-  constructor(private functions: AngularFireFunctions, private router: Router, public validationService: ValidationService, public toolsService: ToolsService) { }
+  constructor(private functions: AngularFireFunctions, private router: Router, public validationService: ValidationService) { }
 
   ngOnInit(): void {
-
-    this.todayDate = this.toolsService.date();
-    this.time = this.toolsService.time();
-
     this.editTask = this.task;
     this.previousSprintId = this.task.SprintNumber;
-    this.prevVal = [this.task.Description, this.task.Assignee, this.task.EstimatedTime, this.task.Priority, this.task.Difficulty, this.task.StoryPointNumber];
   }
 
   async submit(){
@@ -51,8 +40,6 @@ export class EditPageComponent implements OnInit {
       return res;});
     if(condition)
     {
-      this.newVal = [this.editTask.Description, this.editTask.Assignee, this.editTask.EstimatedTime, this.editTask.Priority, this.editTask.Difficulty, this.editTask.StoryPointNumber];
-      this.generateChanges();
       console.log("Inputs are valid");
       this.editPage();
     }
@@ -60,26 +47,6 @@ export class EditPageComponent implements OnInit {
     console.log("Page not edited due to validation error");
   }
 
-async generateChanges() {
-  console.log(this.editTask, this.task);
-    if(this.prevVal[0] != this.newVal[0])
-      this.changedData = this.changedData + " description,";
-    if(this.prevVal[1] != this.newVal[1])
-      this.changedData = this.changedData + " assignee," ;
-    if(this.prevVal[2] != this.newVal[2])
-      this.changedData = this.changedData + " estimated-time," ;
-    if(this.prevVal[3] != this.newVal[3])
-      this.changedData = this.changedData + " priority," ;
-    if(this.prevVal[4] != this.newVal[4])
-      this.changedData = this.changedData + " difficulty," ;
-    if(this.prevVal[5] != this.newVal[5])
-      this.changedData = this.changedData + " story-point,";
-    if(this.changedData != "")
-      this.changedData = "Edited-" + this.changedData;
-      this.changedData = this.changedData.substring(0,this.changedData.length-1) + "."
-    console.log(this.changedData);
-  }
-
   async editPage() {
     this.enableLoader = true
     const callable = this.functions.httpsCallable('editPageTask');
@@ -91,7 +58,7 @@ async generateChanges() {
 
       console.log(this.editTask.SprintNumber);
       if (!(this.task.Status === "Completed")) {
-        const result = await callable({ Id: this.editTask.Id, Description: this.editTask.Description, Priority: this.editTask.Priority, Difficulty: this.editTask.Difficulty, Assignee: this.editTask.Assignee, EstimatedTime: this.editTask.EstimatedTime, Category: this.task.Category, SprintNumber: this.editTask.SprintNumber, StoryPointNumber: this.editTask.StoryPointNumber, PreviousId: this.previousSprintId, CreationDate: this.editTask.CreationDate, Date: this.todayDate, Time: this.time, ChangedData: this.changedData}).toPromise();
+        const result = await callable({ Id: this.editTask.Id, Description: this.editTask.Description, Priority: this.editTask.Priority, Difficulty: this.editTask.Difficulty, Assignee: this.editTask.Assignee, EstimatedTime: this.editTask.EstimatedTime, Category: this.task.Category, SprintNumber: this.editTask.SprintNumber, StoryPointNumber: this.editTask.StoryPointNumber, PreviousId: this.previousSprintId, CreationDate: this.editTask.CreationDate }).toPromise();
         console.log("Successfully Updated the task");
         console.log(result);
         this.editTaskDone();
diff --git a/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.ts b/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.ts
index 2031bdc75..8101eafd7 100644
--- a/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.ts
+++ b/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.ts
@@ -3,7 +3,6 @@ import { NgForm } from '@angular/forms';
 import { Tasks } from 'src/app/Interface/TasksInterface';
 import { AngularFireFunctions } from '@angular/fire/functions';
 import { ValidationService } from '../../../services/validation.service';
-import { ToolsService } from '../../../services/tools.service';
 
 @Component({
   selector: 'app-log-work',
@@ -23,15 +22,10 @@ export class LogWorkComponent implements OnInit {
   logHours: number
   logWorkComment: number
   enableLoader: boolean = false
-  todayDate: string
-  time: string
 
-  constructor(private functions: AngularFireFunctions, public validationService: ValidationService, public toolsService: ToolsService) { }
+  constructor(private functions: AngularFireFunctions, public validationService: ValidationService) { }
 
-  ngOnInit(): void { 
-    this.todayDate = this.toolsService.date();
-    this.time = this.toolsService.time();
-  }
+  ngOnInit(): void { }
 
   async submit(){
     let labels = ['status', 'logHours', 'workCompleted', 'comment'];
@@ -56,7 +50,7 @@ export class LogWorkComponent implements OnInit {
     const callable = this.functions.httpsCallable('logWork');
 
     try {
-      const result = await callable({ SprintNumber: this.task.SprintNumber, LogTaskId: this.task.Id, LogHours: this.logHours, LogWorkDone: this.logWorkDone, LogWorkStatus: this.logWorkStatus, LogWorkComment: this.logWorkComment, Date: this.todayDate, Time: this.time}).toPromise();
+      const result = await callable({ SprintNumber: this.task.SprintNumber, LogTaskId: this.task.Id, LogHours: this.logHours, LogWorkDone: this.logWorkDone, LogWorkStatus: this.logWorkStatus, LogWorkComment: this.logWorkComment }).toPromise();
 
       console.log("Logged Work Successfully");
       console.log(result);
diff --git a/worktrolly-ui/src/app/body/task-details/task-details.component.ts b/worktrolly-ui/src/app/body/task-details/task-details.component.ts
index a91ce0aae..1be5a2eae 100644
--- a/worktrolly-ui/src/app/body/task-details/task-details.component.ts
+++ b/worktrolly-ui/src/app/body/task-details/task-details.component.ts
@@ -6,7 +6,6 @@ import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators'
 import { Tasks } from 'src/app/Interface/TasksInterface';
 import { AuthService } from 'src/app/services/auth.service';
-import { ToolsService } from '../../services/tools.service';
 import {Location} from '@angular/common';
 import { NavbarHandlerService } from 'src/app/services/navbar-handler.service';
 
@@ -25,18 +24,12 @@ export class TaskDetailsComponent implements OnInit {
   editTaskEnabled: boolean = false
   userLoggedIn: boolean = false
   task: Tasks
-  todayDate: string
-  time: string
-  
   public taskDocument: AngularFirestoreDocument<Tasks>
   public taskDataObservable: Observable<Tasks>
 
-  constructor(private route: ActivatedRoute, public db: AngularFirestore, private router: Router, private functions: AngularFireFunctions, public authService: AuthService, private location: Location, public toolsService: ToolsService, private navbarHandler: NavbarHandlerService) { }
+  constructor(private route: ActivatedRoute, public db: AngularFirestore, private router: Router, private functions: AngularFireFunctions, public authService: AuthService, private location: Location, private navbarHandler: NavbarHandlerService) { }
 
   ngOnInit(): void {
-    this.todayDate = this.toolsService.date();
-    this.time = this.toolsService.time();
-
     this.Id = this.route.snapshot.params['taskId'];
 
     this.componentName = this.Id;
@@ -77,7 +70,7 @@ export class TaskDetailsComponent implements OnInit {
     const callable = this.functions.httpsCallable('deleteTask');
 
     try {
-      const result = await callable({ Id: this.task.Id, SprintNumber: this.task.SprintNumber, Category: this.task.Category, Status: this.task.Status, Date: this.todayDate, Time: this.time }).toPromise();
+      const result = await callable({ Id: this.task.Id, SprintNumber: this.task.SprintNumber, Category: this.task.Category, Status: this.task.Status }).toPromise();
       console.log(this.task.Id + " deleted");
       console.log(result);
       this.router.navigate(['/']);
diff --git a/worktrolly-ui/src/app/services/tools.service.spec.ts b/worktrolly-ui/src/app/services/tools.service.spec.ts
deleted file mode 100644
index 3225de8e6..000000000
--- a/worktrolly-ui/src/app/services/tools.service.spec.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { ToolsService } from './tools.service';
-
-describe('ToolsService', () => {
-  let service: ToolsService;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({});
-    service = TestBed.inject(ToolsService);
-  });
-
-  it('should be created', () => {
-    expect(service).toBeTruthy();
-  });
-});
diff --git a/worktrolly-ui/src/app/services/tools.service.ts b/worktrolly-ui/src/app/services/tools.service.ts
deleted file mode 100644
index 67cc02d24..000000000
--- a/worktrolly-ui/src/app/services/tools.service.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { Injectable } from '@angular/core';
-
-@Injectable({
-  providedIn: 'root'
-})
-export class ToolsService {
-
-  todayDate: string
-  todayTime: string
-
-  constructor() { }
-
-  date(){
-    var today = new Date();
-    var dd = String(today.getDate()).padStart(2, '0');
-    var mm = String(today.getMonth() + 1).padStart(2, '0');
-    var yyyy = today.getFullYear();
-    return this.todayDate = dd + "/" + mm + "/" + yyyy;
-  }
-
-  time(){
-    var today = new Date();
-    var hh = String(today.getHours()).padStart(2, '0');
-    var mn = String(today.getMinutes()).padStart(2, '0');
-    var ss= String(today.getSeconds()).padStart(2, '0');
-    return this.todayTime = hh + ":" + mn + ":" + ss;
-  }
-
-}

From 8d28e9f8d05551804e93e2d7d7c7fab82118ba19 Mon Sep 17 00:00:00 2001
From: Komal Sharma <52309262+k0malSharma@users.noreply.github.com>
Date: Sat, 30 Jan 2021 10:28:23 +0530
Subject: [PATCH 34/37] Revert "Revert "feat(dev/activity): added an activity
 collection in database.""

---
 functions/createNewTaskAPI.js                 | 240 +++++++
 functions/createNewUserAPI.js                 |  52 ++
 functions/deleteTaskAPI.js                    | 147 +++++
 functions/editPageTaskAPI.js                  | 237 +++++++
 functions/index.js                            | 600 +-----------------
 functions/logWorkAPI.js                       | 143 +++++
 functions/startNewSprintAPI.js                |  76 +++
 functions/updateSprintStatusAPI.js            |  17 +
 .../create-new-session.component.ts           |  15 +-
 .../edit-page/edit-page.component.ts          |  37 +-
 .../log-work/log-work.component.ts            |  12 +-
 .../task-details/task-details.component.ts    |  11 +-
 .../src/app/services/tools.service.spec.ts    |  16 +
 .../src/app/services/tools.service.ts         |  29 +
 14 files changed, 1032 insertions(+), 600 deletions(-)
 create mode 100644 functions/createNewTaskAPI.js
 create mode 100644 functions/createNewUserAPI.js
 create mode 100644 functions/deleteTaskAPI.js
 create mode 100644 functions/editPageTaskAPI.js
 create mode 100644 functions/logWorkAPI.js
 create mode 100644 functions/startNewSprintAPI.js
 create mode 100644 functions/updateSprintStatusAPI.js
 create mode 100644 worktrolly-ui/src/app/services/tools.service.spec.ts
 create mode 100644 worktrolly-ui/src/app/services/tools.service.ts

diff --git a/functions/createNewTaskAPI.js b/functions/createNewTaskAPI.js
new file mode 100644
index 000000000..0b3f709b4
--- /dev/null
+++ b/functions/createNewTaskAPI.js
@@ -0,0 +1,240 @@
+const functions = require('firebase-functions');
+var cors = require('cors')({ origin: true });
+
+const admin = require('firebase-admin');
+
+const db = admin.firestore();
+
+exports.createNewTask = functions.https.onRequest((request, response) => {
+    cors(request, response, () => {
+        console.log(request);
+        var title = request.body.data.Title;
+        var des = request.body.data.Description;
+        var priority = request.body.data.Priority;
+        var difficulty = request.body.data.Difficulty;
+        var creator = request.body.data.Creator;
+        var assignee = request.body.data.Assignee;
+        var estimatedTime = parseInt(request.body.data.EstimatedTime);
+        var status = request.body.data.Status;
+        var category = request.body.data.Category;
+        var storyPointNumber = parseInt(request.body.data.StoryPointNumber);
+        var sprintNumber = parseInt(request.body.data.SprintNumber);
+        var creationDate = request.body.data.CreationDate;
+        var time = request.body.data.Time;
+        var fullSprintId = createSprintId(sprintNumber);
+        var loggedWorkTotalTime = 0;
+        var workDone = 0;
+        var taskId = "";
+        var totalDevelopmentTask;
+        var totalBusinessTask;
+        var totalOtherTask;
+        var totalMarketingTask;
+        var totalNumberOfTask;
+        var result;
+        var totalUnCompletedTask = 0;
+        var sprintDataPromise;
+
+        const promise1 = db.collection("RawData").doc("AppDetails").get().then((doc) => {
+            totalNumberOfTask = doc.data().TotalNumberOfTask;
+            totalDevelopmentTask = doc.data().TotalDevelopmentTask;
+            totalBusinessTask = doc.data().TotalBusinessTask;
+            totalMarketingTask = doc.data().TotalMarketingTask;
+            totalOtherTask = doc.data().TotalOtherTask;
+            totalUnCompletedTask = doc.data().TotalUnCompletedTask;
+            if (category === "Development") {
+                totalDevelopmentTask = totalDevelopmentTask + 1;
+                taskId = category[0] + totalDevelopmentTask;
+            } else if (category === "Business") {
+                totalBusinessTask = totalBusinessTask + 1;
+                taskId = category[0] + totalBusinessTask;
+            } else if (category === "Marketing") {
+                totalMarketingTask = totalMarketingTask + 1;
+                taskId = category[0] + totalMarketingTask;
+            } else {
+                totalOtherTask = totalOtherTask + 1;
+                taskId = category[0] + totalOtherTask;
+            }
+            totalUnCompletedTask = totalUnCompletedTask + 1;
+            totalNumberOfTask = totalNumberOfTask + 1;
+            console.log(taskId);
+            const P1 = db.collection("Tasks").doc(taskId).set({
+                Id: taskId,
+                Title: title,
+                Description: des,
+                Priority: priority,
+                Difficulty: difficulty,
+                Creator: creator,
+                Assignee: assignee,
+                EstimatedTime: estimatedTime,
+                Status: status,
+                Category: category,
+                LogWorkTotalTime: loggedWorkTotalTime,
+                WorkDone: workDone,
+                SprintNumber: sprintNumber,
+                StoryPointNumber: storyPointNumber,
+                CreationDate: creationDate
+            });
+            const P2 = db.collection("RawData").doc("AppDetails").update({
+                TotalDevelopmentTask: totalDevelopmentTask,
+                TotalBusinessTask: totalBusinessTask,
+                TotalMarketingTask: totalMarketingTask,
+                TotalOtherTask: totalOtherTask,
+                TotalNumberOfTask: totalNumberOfTask,
+                TotalUnCompletedTask: totalUnCompletedTask
+            });
+            updateActivity("CREATED", "Created task "+taskId, taskId, creationDate, time);
+            const Promises = [P1,P2];
+            return Promise.all(Promises);
+        });
+
+        const promise2 = db.collection("Main").doc(fullSprintId).get().then((doc) => {
+            if (doc.exists) {
+                totalNumberOfTask = doc.data().TotalNumberOfTask;
+                totalDevelopmentTask = doc.data().TotalDevelopmentTask;
+                totalBusinessTask = doc.data().TotalBusinessTask;
+                totalOtherTask = doc.data().TotalOtherTask;
+                totalMarketingTask = doc.data().TotalMarketingTask;
+                totalUnCompletedTask = doc.data().TotalUnCompletedTask;
+
+                if (category === "Development") {
+                    totalDevelopmentTask = totalDevelopmentTask + 1;
+                } else if (category === "Business") {
+                    totalBusinessTask = totalBusinessTask + 1;
+                } else if (category === "Marketing") {
+                    totalMarketingTask = totalMarketingTask + 1;
+                } else {
+                    totalOtherTask = totalOtherTask + 1;
+                }
+
+                totalNumberOfTask = totalNumberOfTask + 1;
+                totalUnCompletedTask = totalUnCompletedTask + 1;
+
+
+                sprintDataPromise = db.collection("Main").doc(fullSprintId).update({
+                    TotalBusinessTask: totalBusinessTask,
+                    TotalDevelopmentTask: totalDevelopmentTask,
+                    TotalMarketingTask: totalMarketingTask,
+                    TotalOtherTask: totalOtherTask,
+                    TotalUnCompletedTask: totalUnCompletedTask,
+                    TotalNumberOfTask: totalNumberOfTask
+                });
+            } else {
+                totalBusinessTask = 0;
+                totalDevelopmentTask = 0;
+                totalMarketingTask = 0;
+                totalOtherTask = 0;
+                totalUnCompletedTask = 0;
+                totalCompletedTask = 0;
+                totalNumberOfTask = 0;
+
+                if (category === "Development") {
+                    totalDevelopmentTask = totalDevelopmentTask + 1;
+                } else if (category === "Business") {
+                    totalBusinessTask = totalBusinessTask + 1;
+                } else if (category === "Marketing") {
+                    totalMarketingTask = totalMarketingTask + 1;
+                } else {
+                    totalOtherTask = totalOtherTask + 1;
+                }
+
+
+                totalNumberOfTask = totalNumberOfTask + 1;
+                totalUnCompletedTask = totalUnCompletedTask + 1;
+
+                sprintDataPromise = db.collection("Main").doc(fullSprintId).set({
+                    EndDate: "xx/xx/xxxx",
+                    StartDate: "xx/xx/xxxx",
+                    Status: "Not Started",
+                    TotalBusinessTask: totalBusinessTask,
+                    TotalDevelopmentTask: totalDevelopmentTask,
+                    TotalMarketingTask: totalMarketingTask,
+                    TotalOtherTask: totalOtherTask,
+                    TotalUnCompletedTask: totalUnCompletedTask,
+                    TotalCompletedTask: totalCompletedTask,
+                    TotalNumberOfTask: totalNumberOfTask
+                });
+
+            }
+            return Promise.resolve(sprintDataPromise);
+        });
+
+        const newTaskPromises = [promise1, promise2];
+        Promise.all(newTaskPromises).then(() => {
+                result = { data: "OK!" }
+                console.log("Document successfully written!");
+                return response.status(200).send(result);
+            })
+        .catch((error) => {
+            result = { data: error };
+            console.error("Error writing document: ", error);
+            return response.status(500).send(result);
+        });
+    });
+});
+
+function createSprintId(sprintNumber) {
+    if (sprintNumber === -1) {
+        return "Backlog";
+    } else {
+        return ("S" + sprintNumber);
+    }
+}
+
+async function updateActivity(type, comment, taskId, date, time){
+    var actionId = "";
+    if(type === "CREATED") {
+        actionId = "A0";
+        db.collection("Activity").doc(taskId).set({
+            TaskId: taskId,
+            TotalActions: 0,
+            TotalComments: 0
+        });
+        db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
+            Type: type,
+            Comment: comment,
+            Date: date,
+            Time: time
+        });
+    }
+    else if (type === "COMMENT") {
+        actionId = await db.collection("Activity").doc(taskId).get().then((doc) => {
+            totalActions = doc.data().TotalActions;
+            totalActions = totalActions+1;
+            totalComments = doc.data().TotalComments;
+            totalComments = totalComments+1;
+            return ("A" + totalActions);
+        });
+        if (actionId !== ""){
+            db.collection("Activity").doc(taskId).update({
+                TotalActions: totalActions,
+                TotalComments: totalComments,
+            });
+            db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
+                Type: type,
+                Comment: comment,
+                Date: date,
+                Time: time
+            });
+        }
+    }
+    else{
+        actionId = await db.collection("Activity").doc(taskId).get().then((doc) => {
+            totalActions = doc.data().TotalActions;
+            totalActions = totalActions+1;
+
+            return ("A" + totalActions);
+
+        });
+        if (actionId !== ""){
+            db.collection("Activity").doc(taskId).update({
+                TotalActions: totalActions,
+            });
+            db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
+                Type: type,
+                Comment: comment,
+                Date: date,
+                Time: time
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/functions/createNewUserAPI.js b/functions/createNewUserAPI.js
new file mode 100644
index 000000000..c2236a37d
--- /dev/null
+++ b/functions/createNewUserAPI.js
@@ -0,0 +1,52 @@
+const functions = require('firebase-functions');
+var cors = require('cors')({ origin: true });
+
+const admin = require('firebase-admin');
+
+const db = admin.firestore();
+
+exports.createNewUser = functions.https.onRequest((request, response) => {
+    cors(request, response, () => {
+        console.log(request);
+        const user = request.body.data;
+        const Uid = user.uid;
+        const PhotoURL = user.photoURL;
+        const DisplayName = user.displayName;
+        const Email = user.email;
+        const PhoneNumber = user.phoneNumber;
+        const ProviderId = user.providerId;
+
+        db.collection("Users").doc(Uid).get().then((doc) => {
+                if (doc.exists) {
+                    const userData = db.collection("Users").doc(Uid).update({
+                        uid: Uid,
+                        photoURL: PhotoURL,
+                        displayName: DisplayName,
+                        email: Email,
+                        phoneNumber: PhoneNumber,
+                        providerId: ProviderId
+                    });
+                    return Promise.resolve(userData);
+                } else {
+                    const userData = db.collection("Users").doc(Uid).set({
+                        uid: Uid,
+                        photoURL: PhotoURL,
+                        displayName: DisplayName,
+                        email: Email,
+                        phoneNumber: PhoneNumber,
+                        providerId: ProviderId
+                    });
+                    return Promise.resolve(userData);
+                }
+            }).then(() => {
+                result = { data: "User Logged In Successfully" };
+                console.log("Document successfully written");
+                return response.status(200).send(result);
+            })
+            .catch((error) => {
+                result = { data: error };
+                console.log("error", error);
+                return response.status(500).send(result)
+            });
+    });
+});
\ No newline at end of file
diff --git a/functions/deleteTaskAPI.js b/functions/deleteTaskAPI.js
new file mode 100644
index 000000000..c44447f37
--- /dev/null
+++ b/functions/deleteTaskAPI.js
@@ -0,0 +1,147 @@
+const functions = require('firebase-functions');
+var cors = require('cors')({ origin: true });
+
+const admin = require('firebase-admin');
+
+const db = admin.firestore();
+
+exports.deleteTask = functions.https.onRequest((request, response) => {
+    cors(request, response, () => {
+        console.log(request);
+
+        var sprintNumber = request.body.data.SprintNumber;
+        var taskId = request.body.data.Id;
+        var fullSprintId = createSprintId(sprintNumber);
+        var category = request.body.data.Category;
+        var status = request.body.data.Status;
+        var totalDevelopmentTask;
+        var totalBusinessTask;
+        var totalMarketingTask;
+        var totalOtherTask;
+        var totalNumberOfTask;
+        var result;
+        var totalCompletedTask;
+        var totalUnCompletedTask;
+        var date = request.body.data.Date;
+        var time = request.body.data.Time;
+        var totalActions;
+        var actionId;
+
+        const p1 = db.collection("Tasks").doc(taskId).update({
+            Category: "Trash",
+            SprintNumber: -2
+        });
+        
+        const p2 = db.collection("Main").doc(fullSprintId).get().then((doc) => {
+            totalNumberOfTask = doc.data().TotalNumberOfTask;
+            totalDevelopmentTask = doc.data().TotalDevelopmentTask;
+            totalBusinessTask = doc.data().TotalBusinessTask;
+            totalMarketingTask = doc.data().TotalMarketingTask;
+            totalOtherTask = doc.data().TotalOtherTask
+            totalCompletedTask = doc.data().TotalCompletedTask;
+            totalUnCompletedTask = doc.data().TotalUnCompletedTask;
+
+            if (category === "Development") {
+                totalDevelopmentTask = totalDevelopmentTask - 1;
+            } else if (category === "Business") {
+                totalBusinessTask = totalBusinessTask - 1;
+            } else if (category === "Marketing") {
+                totalMarketingTask = totalMarketingTask - 1;
+            } else {
+                totalOtherTask = totalOtherTask -1;
+            }
+            totalNumberOfTask = totalNumberOfTask - 1;
+            status === "Completed" ? totalCompletedTask = totalCompletedTask - 1 : totalUnCompletedTask = totalUnCompletedTask - 1;
+            var updateDeleteTaskCounter = db.collection("Main").doc(fullSprintId).update({
+                TotalDevelopmentTask: totalDevelopmentTask,
+                TotalBusinessTask: totalBusinessTask,
+                TotalMarketingTask: totalMarketingTask,
+                TotalOtherTask: totalOtherTask,
+                TotalNumberOfTask: totalNumberOfTask,
+                TotalCompletedTask: totalCompletedTask,
+                TotalUnCompletedTask: totalUnCompletedTask
+            });
+            return Promise.resolve(updateDeleteTaskCounter);
+        });
+        updateActivity("DELETED", "Deleted task "+taskId, taskId, date, time);
+
+        const deleteTaskPromises = [p1, p2];
+        Promise.all(deleteTaskPromises).then(() => {
+                result = { data: "OK" };
+                console.log("Document sucessfully deleted");
+                return response.status(200).send(result);
+            })
+            .catch((error) => {
+                result = { data: error };
+                console.log("error", error);
+                return response.status(500).send(result)
+            });
+    });
+});
+
+function createSprintId(sprintNumber) {
+    if (sprintNumber === -1) {
+        return "Backlog";
+    } else {
+        return ("S" + sprintNumber);
+    }
+}
+
+async function updateActivity(type, comment, taskId, date, time){
+    var actionId = "";
+    if(type === "CREATED") {
+        actionId = "A0";
+        db.collection("Activity").doc(taskId).set({
+            TaskId: taskId,
+            TotalActions: 0,
+            TotalComments: 0
+        });
+        db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
+            Type: type,
+            Comment: comment,
+            Date: date,
+            Time: time
+        });
+    }
+    else if (type === "COMMENT") {
+        actionId = await db.collection("Activity").doc(taskId).get().then((doc) => {
+            totalActions = doc.data().TotalActions;
+            totalActions = totalActions+1;
+            totalComments = doc.data().TotalComments;
+            totalComments = totalComments+1;
+            return ("A" + totalActions);
+        });
+        if (actionId !== ""){
+            db.collection("Activity").doc(taskId).update({
+                TotalActions: totalActions,
+                TotalComments: totalComments,
+            });
+            db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
+                Type: type,
+                Comment: comment,
+                Date: date,
+                Time: time
+            });
+        }
+    }
+    else{
+        actionId = await db.collection("Activity").doc(taskId).get().then((doc) => {
+            totalActions = doc.data().TotalActions;
+            totalActions = totalActions+1;
+
+            return ("A" + totalActions);
+
+        });
+        if (actionId !== ""){
+            db.collection("Activity").doc(taskId).update({
+                TotalActions: totalActions,
+            });
+            db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
+                Type: type,
+                Comment: comment,
+                Date: date,
+                Time: time
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/functions/editPageTaskAPI.js b/functions/editPageTaskAPI.js
new file mode 100644
index 000000000..69ab4c803
--- /dev/null
+++ b/functions/editPageTaskAPI.js
@@ -0,0 +1,237 @@
+const functions = require('firebase-functions');
+var cors = require('cors')({ origin: true });
+
+const admin = require('firebase-admin');
+
+const db = admin.firestore();
+
+exports.editPageTask = functions.https.onRequest((request, response) => {
+    cors(request, response, () => {
+        console.log(request);
+
+        var description = request.body.data.Description;
+        var priority = request.body.data.Priority;
+        var difficulty = request.body.data.Difficulty;
+        var assignee = request.body.data.Assignee;
+        var estimatedTime = request.body.data.EstimatedTime;
+        var category = request.body.data.Category;
+        var storyPointNumber = request.body.data.StoryPointNumber;
+        var editedSprintNumber = request.body.data.SprintNumber;
+        var previousId = request.body.data.PreviousId;
+        var creationDate = request.body.data.CreationDate;
+        var changedData = request.body.data.ChangedData;
+        var previousSprintId = createSprintId(previousId);
+        var taskId = request.body.data.Id;
+        var editedSprintId = createSprintId(editedSprintNumber);
+        var totalDevelopmentTask;
+        var totalBusinessTask;
+        var totalMarketingTask;
+        var totalOtherTask;
+        var totalNumberOfTask;
+        var result;
+        var totalUnCompletedTask;
+        var totalCompletedTask;
+        var sprintEditPromise;
+        var date = request.body.data.Date;
+        var time = request.body.data.Time;
+        var totalActions;
+        var actionId;
+        var type = "EDITED";
+        var comment = "Edited task details: ";
+
+
+        var promises = [];
+        if (editedSprintNumber !== previousId) {
+            comment += "Moved to sprint " + editedSprintId + ". ";
+            const p1 = db.collection("Main").doc(previousSprintId).get().then((doc) => {
+                totalNumberOfTask = doc.data().TotalNumberOfTask;
+                totalDevelopmentTask = doc.data().TotalDevelopmentTask;
+                totalBusinessTask = doc.data().TotalBusinessTask;
+                totalMarketingTask = doc.data().TotalMarketingTask;
+                totalOtherTask = doc.data().TotalOtherTask;
+                totalUnCompletedTask = doc.data().TotalUnCompletedTask;
+
+                if (category === "Development") {
+                    totalDevelopmentTask = totalDevelopmentTask - 1;
+                } else if (category === "Business") {
+                    totalBusinessTask = totalBusinessTask - 1;
+                } else if (category === "Marketing") {
+                    totalMarketingTask = totalMarketingTask - 1;
+                } else {
+                    totalOtherTask = totalOtherTask - 1;
+                }
+
+                totalNumberOfTask = totalNumberOfTask - 1;
+                totalUnCompletedTask = totalUnCompletedTask - 1;
+                var editSprintDeleteCounter = db.collection("Main").doc(previousSprintId).update({
+                    TotalDevelopmentTask: totalDevelopmentTask,
+                    TotalBusinessTask: totalBusinessTask,
+                    TotalMarketingTask: totalMarketingTask,
+                    TotalOtherTask: totalOtherTask,
+                    TotalNumberOfTask: totalNumberOfTask,
+                    TotalUnCompletedTask: totalUnCompletedTask
+                });
+
+                return Promise.resolve(editSprintDeleteCounter);
+            });
+            promises.push(p1);
+
+            const p2 = db.collection("Main").doc(editedSprintId).get().then((doc) => {
+                if (doc.exists) {
+                    totalNumberOfTask = doc.data().TotalNumberOfTask;
+                    totalDevelopmentTask = doc.data().TotalDevelopmentTask;
+                    totalBusinessTask = doc.data().TotalBusinessTask;
+                    totalMarketingTask = doc.data().TotalMarketingTask;
+                    totalOtherTask = doc.data().TotalOtherTask;
+                    totalUnCompletedTask = doc.data().TotalUnCompletedTask;
+
+                    if (category === "Development") {
+                        totalDevelopmentTask = totalDevelopmentTask + 1;
+                    } else if (category === "Business") {
+                        totalBusinessTask = totalBusinessTask + 1;
+                    } else if (category === "Marketing") {
+                        totalMarketingTask = totalMarketingTask + 1;
+                    } else {
+                        totalOtherTask = totalOtherTask + 1;
+                    }
+
+                    totalNumberOfTask = totalNumberOfTask + 1;
+                    totalUnCompletedTask = totalUnCompletedTask + 1;
+
+                    sprintEditPromise = db.collection("Main").doc(editedSprintId).update({
+                        TotalBusinessTask: totalBusinessTask,
+                        TotalDevelopmentTask: totalDevelopmentTask,
+                        TotalMarketingTask: totalMarketingTask,
+                        TotalOtherTask: totalOtherTask,
+                        TotalUnCompletedTask: totalUnCompletedTask,
+                        TotalNumberOfTask: totalNumberOfTask
+                    });
+                } else {
+                    totalBusinessTask = 0;
+                    totalDevelopmentTask = 0;
+                    totalMarketingTask = 0;
+                    totalOtherTask = 0;
+                    totalUnCompletedTask = 0;
+                    totalCompletedTask = 0;
+                    totalNumberOfTask = 0;
+
+                    if (category === "Development") {
+                        totalDevelopmentTask = totalDevelopmentTask + 1;
+                    } else if (category === "Business") {
+                        totalBusinessTask = totalBusinessTask + 1;
+                    } else if (category === "Marketing") {
+                        totalMarketingTask = totalMarketingTask + 1;
+                    } else {
+                        totalOtherTask = totalOtherTask + 1;
+                    }
+
+                    totalNumberOfTask = totalNumberOfTask + 1;
+                    totalUnCompletedTask = totalUnCompletedTask + 1;
+                    sprintEditPromise = db.collection("Main").doc(editedSprintId).set({
+                        TotalBusinessTask: totalBusinessTask,
+                        TotalDevelopmentTask: totalDevelopmentTask,
+                        TotalMarketingTask: totalMarketingTask,
+                        TotalOtherTask: totalOtherTask,
+                        TotalUnCompletedTask: totalUnCompletedTask,
+                        TotalCompletedTask: totalCompletedTask,
+                        TotalNumberOfTask: totalNumberOfTask
+                    });
+                }
+                return Promise.resolve(sprintEditPromise)
+            });
+            promises.push(p2);
+        }
+
+        var p3 = db.collection("Tasks").doc(taskId).update({
+                Description: description,
+                CreationDate: creationDate,
+                Priority: priority,
+                Difficulty: difficulty,
+                Assignee: assignee,
+                EstimatedTime: estimatedTime,
+                SprintNumber: editedSprintNumber,
+                StoryPointNumber: storyPointNumber
+        });
+        promises.push(p3);
+        comment = comment + changedData;
+        updateActivity(type, comment, taskId, date, time);
+
+        Promise.all(promises).then(() => {
+            result = { data: "OK" };
+            console.log("Document sucessfully written");
+            return response.status(200).send(result);
+        })
+        .catch((error) => {
+            result = { data: error };
+            console.log("error", error);
+            return response.status(500).send(result)
+        });
+    });
+});
+
+function createSprintId(sprintNumber) {
+    if (sprintNumber === -1) {
+        return "Backlog";
+    } else {
+        return ("S" + sprintNumber);
+    }
+}
+
+async function updateActivity(type, comment, taskId, date, time){
+    var actionId = "";
+    if(type === "CREATED") {
+        actionId = "A0";
+        db.collection("Activity").doc(taskId).set({
+            TaskId: taskId,
+            TotalActions: 0,
+            TotalComments: 0
+        });
+        db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
+            Type: type,
+            Comment: comment,
+            Date: date,
+            Time: time
+        });
+    }
+    else if (type === "COMMENT") {
+        actionId = await db.collection("Activity").doc(taskId).get().then((doc) => {
+            totalActions = doc.data().TotalActions;
+            totalActions = totalActions+1;
+            totalComments = doc.data().TotalComments;
+            totalComments = totalComments+1;
+            return ("A" + totalActions);
+        });
+        if (actionId !== ""){
+            db.collection("Activity").doc(taskId).update({
+                TotalActions: totalActions,
+                TotalComments: totalComments,
+            });
+            db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
+                Type: type,
+                Comment: comment,
+                Date: date,
+                Time: time
+            });
+        }
+    }
+    else{
+        actionId = await db.collection("Activity").doc(taskId).get().then((doc) => {
+            totalActions = doc.data().TotalActions;
+            totalActions = totalActions+1;
+
+            return ("A" + totalActions);
+
+        });
+        if (actionId !== ""){
+            db.collection("Activity").doc(taskId).update({
+                TotalActions: totalActions,
+            });
+            db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
+                Type: type,
+                Comment: comment,
+                Date: date,
+                Time: time
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/functions/index.js b/functions/index.js
index 8dc53bdad..14cddc9ae 100644
--- a/functions/index.js
+++ b/functions/index.js
@@ -1,10 +1,22 @@
 const functions = require('firebase-functions');
-var cors = require('cors')({ origin: true });
-
 const admin = require('firebase-admin');
 admin.initializeApp();
-
-const db = admin.firestore();
+const createNewTaskAPI = require('./createNewTaskAPI');
+const startNewSprintAPI = require('./startNewSprintAPI');
+const logWorkAPI = require('./logWorkAPI');
+const editPageTaskAPI = require('./editPageTaskAPI');
+const deleteTaskAPI = require('./deleteTaskAPI');
+const createNewUserAPI = require('./createNewUserAPI');
+const updateSprintStatusAPI = require('./updateSprintStatusAPI');
+
+
+exports.createNewTask = createNewTaskAPI.createNewTask;
+exports.startNewSprint = startNewSprintAPI.startNewSprint;
+exports.logWork = logWorkAPI.logWork;
+exports.editPageTask = editPageTaskAPI.editPageTask;
+exports.deleteTask = deleteTaskAPI.deleteTask;
+exports.createNewUser = createNewUserAPI.createNewUser;
+exports.updateSprintStatus = updateSprintStatusAPI.updateSprintStatus;
 
 // class Task {
 //     constructor(id, title, status, priority, estimatedTime, difficulty, description, creator, category, assignee, logWorkTotalTime, workDone, creationDate, sprintNumber, storyPointNumber) {
@@ -26,583 +38,3 @@ const db = admin.firestore();
 //     }
 // }
 
-
-exports.createNewTask = functions.https.onRequest((request, response) => {
-    cors(request, response, () => {
-        console.log(request);
-        var title = request.body.data.Title;
-        var des = request.body.data.Description;
-        var priority = request.body.data.Priority;
-        var difficulty = request.body.data.Difficulty;
-        var creator = request.body.data.Creator;
-        var assignee = request.body.data.Assignee;
-        var estimatedTime = parseInt(request.body.data.EstimatedTime);
-        var status = request.body.data.Status;
-        var category = request.body.data.Category;
-        var storyPointNumber = parseInt(request.body.data.StoryPointNumber);
-        var sprintNumber = parseInt(request.body.data.SprintNumber);
-        var creationDate = request.body.data.CreationDate;
-        var fullSprintId = createSprintId(sprintNumber);
-        var loggedWorkTotalTime = 0;
-        var workDone = 0;
-        var taskId = "";
-        var totalDevelopmentTask;
-        var totalBusinessTask;
-        var totalOtherTask;
-        var totalMarketingTask;
-        var totalNumberOfTask;
-        var result;
-        var totalUnCompletedTask = 0;
-        var sprintDataPromise;
-
-        const promise1 = db.collection("RawData").doc("AppDetails").get().then((doc) => {
-            totalNumberOfTask = doc.data().TotalNumberOfTask;
-            totalDevelopmentTask = doc.data().TotalDevelopmentTask;
-            totalBusinessTask = doc.data().TotalBusinessTask;
-            totalMarketingTask = doc.data().TotalMarketingTask;
-            totalOtherTask = doc.data().TotalOtherTask;
-            totalUnCompletedTask = doc.data().TotalUnCompletedTask;
-            if (category === "Development") {
-                totalDevelopmentTask = totalDevelopmentTask + 1;
-                taskId = category[0] + totalDevelopmentTask;
-            } else if (category === "Business") {
-                totalBusinessTask = totalBusinessTask + 1;
-                taskId = category[0] + totalBusinessTask;
-            } else if (category === "Marketing") {
-                totalMarketingTask = totalMarketingTask + 1;
-                taskId = category[0] + totalMarketingTask;
-            } else {
-                totalOtherTask = totalOtherTask + 1;
-                taskId = category[0] + totalOtherTask;
-            }
-            totalUnCompletedTask = totalUnCompletedTask + 1;
-            totalNumberOfTask = totalNumberOfTask + 1;
-            console.log(taskId);
-            const P1 = db.collection("Tasks").doc(taskId).set({
-                Id: taskId,
-                Title: title,
-                Description: des,
-                Priority: priority,
-                Difficulty: difficulty,
-                Creator: creator,
-                Assignee: assignee,
-                EstimatedTime: estimatedTime,
-                Status: status,
-                Category: category,
-                LogWorkTotalTime: loggedWorkTotalTime,
-                WorkDone: workDone,
-                SprintNumber: sprintNumber,
-                StoryPointNumber: storyPointNumber,
-                CreationDate: creationDate
-            });
-            const P2 = db.collection("RawData").doc("AppDetails").update({
-                TotalDevelopmentTask: totalDevelopmentTask,
-                TotalBusinessTask: totalBusinessTask,
-                TotalMarketingTask: totalMarketingTask,
-                TotalOtherTask: totalOtherTask,
-                TotalNumberOfTask: totalNumberOfTask,
-                TotalUnCompletedTask: totalUnCompletedTask
-            });
-            const Promises = [P1,P2];
-            return Promise.all(Promises);
-        });
-
-        const promise2 = db.collection("Main").doc(fullSprintId).get().then((doc) => {
-            if (doc.exists) {
-                totalNumberOfTask = doc.data().TotalNumberOfTask;
-                totalDevelopmentTask = doc.data().TotalDevelopmentTask;
-                totalBusinessTask = doc.data().TotalBusinessTask;
-                totalOtherTask = doc.data().TotalOtherTask;
-                totalMarketingTask = doc.data().TotalMarketingTask;
-                totalUnCompletedTask = doc.data().TotalUnCompletedTask;
-
-                if (category === "Development") {
-                    totalDevelopmentTask = totalDevelopmentTask + 1;
-                } else if (category === "Business") {
-                    totalBusinessTask = totalBusinessTask + 1;
-                } else if (category === "Marketing") {
-                    totalMarketingTask = totalMarketingTask + 1;
-                } else {
-                    totalOtherTask = totalOtherTask + 1;
-                }
-
-                totalNumberOfTask = totalNumberOfTask + 1;
-                totalUnCompletedTask = totalUnCompletedTask + 1;
-
-
-                sprintDataPromise = db.collection("Main").doc(fullSprintId).update({
-                    TotalBusinessTask: totalBusinessTask,
-                    TotalDevelopmentTask: totalDevelopmentTask,
-                    TotalMarketingTask: totalMarketingTask,
-                    TotalOtherTask: totalOtherTask,
-                    TotalUnCompletedTask: totalUnCompletedTask,
-                    TotalNumberOfTask: totalNumberOfTask
-                });
-            } else {
-                totalBusinessTask = 0;
-                totalDevelopmentTask = 0;
-                totalMarketingTask = 0;
-                totalOtherTask = 0;
-                totalUnCompletedTask = 0;
-                totalCompletedTask = 0;
-                totalNumberOfTask = 0;
-
-                if (category === "Development") {
-                    totalDevelopmentTask = totalDevelopmentTask + 1;
-                } else if (category === "Business") {
-                    totalBusinessTask = totalBusinessTask + 1;
-                } else if (category === "Marketing") {
-                    totalMarketingTask = totalMarketingTask + 1;
-                } else {
-                    totalOtherTask = totalOtherTask + 1;
-                }
-
-
-                totalNumberOfTask = totalNumberOfTask + 1;
-                totalUnCompletedTask = totalUnCompletedTask + 1;
-
-                sprintDataPromise = db.collection("Main").doc(fullSprintId).set({
-                    EndDate: "xx/xx/xxxx",
-                    StartDate: "xx/xx/xxxx",
-                    Status: "Not Started",
-                    TotalBusinessTask: totalBusinessTask,
-                    TotalDevelopmentTask: totalDevelopmentTask,
-                    TotalMarketingTask: totalMarketingTask,
-                    TotalOtherTask: totalOtherTask,
-                    TotalUnCompletedTask: totalUnCompletedTask,
-                    TotalCompletedTask: totalCompletedTask,
-                    TotalNumberOfTask: totalNumberOfTask
-                });
-
-            }
-            return Promise.resolve(sprintDataPromise);
-        });
-        const newTaskPromises = [promise1, promise2];
-        Promise.all(newTaskPromises).then(() => {
-                result = { data: "OK!" }
-                console.log("Document successfully written!");
-                return response.status(200).send(result);
-            })
-        .catch((error) => {
-            result = { data: error };
-            console.error("Error writing document: ", error);
-            return response.status(500).send(result);
-        });
-    });
-});
-
-exports.startNewSprint = functions.https.onRequest((request, response) => {
-    cors(request, response, () => {
-        console.log(request);
-
-        var status = request.body.data.Status;
-        var startDate = request.body.data.StartDate;
-        var endDate = request.body.data.EndDate;
-        var totalDevelopment = parseInt(request.body.data.TotalDevelopment);
-        var totalBusiness = parseInt(request.body.data.TotalBusiness);
-        var totalMarketing = parseInt(request.body.data.TotalMarketing);
-        var totalOther = parseInt(request.body.data.TotalOther);
-        var newSprintId = parseInt(request.body.data.NewSprintId);
-        var newSprintIdString = "S" + newSprintId.toString();
-        var createSprintPromise;
-        var result;
-
-        console.log("End Date from Backend: " + endDate);
-        console.log("Start Date from Backend: " + startDate);
-        console.log("Status from Backend: " + status);
-
-        const p1 = db.collection("Main").doc(newSprintIdString).get().then((doc) => {
-            if (doc.exists) {
-                createSprintPromise = db.collection("Main").doc(newSprintIdString).update({
-                    TotalDevelopmentTask: totalDevelopment,
-                    TotalBusinessTask: totalBusiness,
-                    TotalMarketingTask: totalMarketing,
-                    TotalOtherTask: totalOther,
-                    EndDate: endDate,
-                    StartDate: startDate,
-                    Status: status
-                });
-            } else {
-                var totalUnCompletedTask = 0;
-                var totalCompletedTask = 0;
-                var totalNumberOfTask = 0;
-
-                createSprintPromise = db.collection("Main").doc(newSprintIdString).set({
-                    TotalDevelopmentTask: totalDevelopment,
-                    TotalBusinessTask: totalBusiness,
-                    TotalMarketingTask: totalMarketing,
-                    TotalOtherTask: totalOther,
-                    EndDate: endDate,
-                    StartDate: startDate,
-                    Status: status,
-                    TotalUnCompletedTask: totalUnCompletedTask,
-                    TotalCompletedTask: totalCompletedTask,
-                    TotalNumberOfTask: totalNumberOfTask
-                });
-            }
-            return Promise.resolve(createSprintPromise);
-        });
-        const p2 = db.collection("RawData").doc("AppDetails").update({
-            CurrentSprintId: newSprintId
-        });
-        const Promises = [p1,p2];
-        return Promise.all(Promises).then(() => {
-            console.log("Sprint started successfully");
-            result = { data: "OK" }
-            console.log("Document successfully written!");
-            return response.status(200).send(result);
-        })
-        .catch((error) => {
-            result = { data: error }
-            console.log("error", error);
-            return response.status(500).send(result);
-        });
-    });
-});
-
-exports.logWork = functions.https.onRequest((request, response) => {
-    cors(request, response, () => {
-        var status = request.body.data.LogWorkStatus;
-        var taskId = request.body.data.LogTaskId;
-        var logHours = parseInt(request.body.data.LogHours);
-        var workDone = parseInt(request.body.data.LogWorkDone);
-        var sprintNumber = parseInt(request.body.data.SprintNumber);
-        // var logWorkComment = request.body.data.LogWorkComment;
-        var fullSprintId = createSprintId(sprintNumber);
-        var logWorkTotalTime;
-
-        const promise1 = db.collection("Tasks").doc(taskId).get().then((doc) => {
-            logWorkTotalTime = parseInt(doc.data().LogWorkTotalTime);
-            logWorkTotalTime = parseInt(logWorkTotalTime) + parseInt(logHours);
-
-            var updatePromise = db.collection("Tasks").doc(taskId).update({
-                LogWorkTotalTime: logWorkTotalTime,
-                WorkDone: workDone,
-                Status: status
-            });
-            return Promise.resolve(updatePromise);
-        });
-        const promise2 = db.collection("RawData").doc("AppDetails").get().then((doc) => {
-            totalCompletedTask = parseInt(doc.data().TotalCompletedTask);
-            totalUnCompletedTask = parseInt(doc.data().TotalUnCompletedTask);
-            if (status === "Completed") {
-                totalCompletedTask = totalCompletedTask + 1;
-                totalUnCompletedTask = totalUnCompletedTask - 1;
-            }
-            var updateStatus = db.collection("RawData").doc("AppDetails").update({
-                TotalCompletedTask: totalCompletedTask,
-                TotalUnCompletedTask: totalUnCompletedTask
-            });
-            return Promise.resolve(updateStatus);
-        });
-        const promise3 = db.collection("Main").doc(fullSprintId).get().then((doc) => {
-            totalCompletedTask = parseInt(doc.data().TotalCompletedTask);
-            totalUnCompletedTask = parseInt(doc.data().TotalUnCompletedTask);
-
-            if (status === "Completed") {
-                totalCompletedTask = totalCompletedTask + 1;
-                totalUnCompletedTask = totalUnCompletedTask - 1;
-            }
-            var updateSprintstatus = db.collection("Main").doc(fullSprintId).update({
-                TotalCompletedTask: totalCompletedTask,
-                TotalUnCompletedTask: totalUnCompletedTask
-            });
-            return Promise.resolve(updateSprintstatus);
-        });
-        const logWorkPromises = [promise1, promise2, promise3];
-        Promise.all(logWorkPromises).then(() => {
-                result = { data: "OK" }
-                console.log("Document successfully written!");
-                return response.status(200).send(result);
-            })
-            .catch((error) => {
-                var result = { data: error };
-                console.log("error", error);
-                return response.status(500).send(result)
-            });
-    });
-});
-
-exports.editPageTask = functions.https.onRequest((request, response) => {
-    cors(request, response, () => {
-        console.log(request);
-
-        var description = request.body.data.Description;
-        var priority = request.body.data.Priority;
-        var difficulty = request.body.data.Difficulty;
-        var assignee = request.body.data.Assignee;
-        var estimatedTime = request.body.data.EstimatedTime;
-        var category = request.body.data.Category;
-        var storyPointNumber = request.body.data.StoryPointNumber;
-        var editedSprintNumber = request.body.data.SprintNumber;
-        var previousId = request.body.data.PreviousId;
-        var creationDate = request.body.data.CreationDate;
-        var previousSprintId = createSprintId(previousId);
-        var taskId = request.body.data.Id;
-        var editedSprintId = createSprintId(editedSprintNumber);
-        var totalDevelopmentTask;
-        var totalBusinessTask;
-        var totalMarketingTask;
-        var totalOtherTask;
-        var totalNumberOfTask;
-        var result;
-        var totalUnCompletedTask;
-        var totalCompletedTask;
-        var sprintEditPromise;
-
-        var promises = [];
-        if (editedSprintNumber !== previousId) {
-            const p1 = db.collection("Main").doc(previousSprintId).get().then((doc) => {
-                totalNumberOfTask = doc.data().TotalNumberOfTask;
-                totalDevelopmentTask = doc.data().TotalDevelopmentTask;
-                totalBusinessTask = doc.data().TotalBusinessTask;
-                totalMarketingTask = doc.data().TotalMarketingTask;
-                totalOtherTask = doc.data().TotalOtherTask;
-                totalUnCompletedTask = doc.data().TotalUnCompletedTask;
-
-                if (category === "Development") {
-                    totalDevelopmentTask = totalDevelopmentTask - 1;
-                } else if (category === "Business") {
-                    totalBusinessTask = totalBusinessTask - 1;
-                } else if (category === "Marketing") {
-                    totalMarketingTask = totalMarketingTask - 1;
-                } else {
-                    totalOtherTask = totalOtherTask - 1;
-                }
-
-                totalNumberOfTask = totalNumberOfTask - 1;
-                totalUnCompletedTask = totalUnCompletedTask - 1;
-                var editSprintDeleteCounter = db.collection("Main").doc(previousSprintId).update({
-                    TotalDevelopmentTask: totalDevelopmentTask,
-                    TotalBusinessTask: totalBusinessTask,
-                    TotalMarketingTask: totalMarketingTask,
-                    TotalOtherTask: totalOtherTask,
-                    TotalNumberOfTask: totalNumberOfTask,
-                    TotalUnCompletedTask: totalUnCompletedTask
-                });
-
-                return Promise.resolve(editSprintDeleteCounter);
-            });
-            promises.push(p1);
-
-            const p2 = db.collection("Main").doc(editedSprintId).get().then((doc) => {
-                if (doc.exists) {
-                    totalNumberOfTask = doc.data().TotalNumberOfTask;
-                    totalDevelopmentTask = doc.data().TotalDevelopmentTask;
-                    totalBusinessTask = doc.data().TotalBusinessTask;
-                    totalMarketingTask = doc.data().TotalMarketingTask;
-                    totalOtherTask = doc.data().TotalOtherTask;
-                    totalUnCompletedTask = doc.data().TotalUnCompletedTask;
-
-                    if (category === "Development") {
-                        totalDevelopmentTask = totalDevelopmentTask + 1;
-                    } else if (category === "Business") {
-                        totalBusinessTask = totalBusinessTask + 1;
-                    } else if (category === "Marketing") {
-                        totalMarketingTask = totalMarketingTask + 1;
-                    } else {
-                        totalOtherTask = totalOtherTask + 1;
-                    }
-
-                    totalNumberOfTask = totalNumberOfTask + 1;
-                    totalUnCompletedTask = totalUnCompletedTask + 1;
-
-                    sprintEditPromise = db.collection("Main").doc(editedSprintId).update({
-                        TotalBusinessTask: totalBusinessTask,
-                        TotalDevelopmentTask: totalDevelopmentTask,
-                        TotalMarketingTask: totalMarketingTask,
-                        TotalOtherTask: totalOtherTask,
-                        TotalUnCompletedTask: totalUnCompletedTask,
-                        TotalNumberOfTask: totalNumberOfTask
-                    });
-                } else {
-                    totalBusinessTask = 0;
-                    totalDevelopmentTask = 0;
-                    totalMarketingTask = 0;
-                    totalOtherTask = 0;
-                    totalUnCompletedTask = 0;
-                    totalCompletedTask = 0;
-                    totalNumberOfTask = 0;
-
-                    if (category === "Development") {
-                        totalDevelopmentTask = totalDevelopmentTask + 1;
-                    } else if (category === "Business") {
-                        totalBusinessTask = totalBusinessTask + 1;
-                    } else if (category === "Marketing") {
-                        totalMarketingTask = totalMarketingTask + 1;
-                    } else {
-                        totalOtherTask = totalOtherTask + 1;
-                    }
-
-                    totalNumberOfTask = totalNumberOfTask + 1;
-                    totalUnCompletedTask = totalUnCompletedTask + 1;
-                    sprintEditPromise = db.collection("Main").doc(editedSprintId).set({
-                        TotalBusinessTask: totalBusinessTask,
-                        TotalDevelopmentTask: totalDevelopmentTask,
-                        TotalMarketingTask: totalMarketingTask,
-                        TotalOtherTask: totalOtherTask,
-                        TotalUnCompletedTask: totalUnCompletedTask,
-                        TotalCompletedTask: totalCompletedTask,
-                        TotalNumberOfTask: totalNumberOfTask
-                    });
-                }
-                return Promise.resolve(sprintEditPromise)
-            });
-            promises.push(p2);
-        }
-        var p3 = db.collection("Tasks").doc(taskId).update({
-                Description: description,
-                CreationDate: creationDate,
-                Priority: priority,
-                Difficulty: difficulty,
-                Assignee: assignee,
-                EstimatedTime: estimatedTime,
-                SprintNumber: editedSprintNumber,
-                StoryPointNumber: storyPointNumber
-        });
-        promises.push(p3);
-
-        Promise.all(promises).then(() => {
-            result = { data: "OK" };
-            console.log("Document sucessfully written");
-            return response.status(200).send(result);
-        })
-        .catch((error) => {
-            result = { data: error };
-            console.log("error", error);
-            return response.status(500).send(result)
-        });
-    });
-});
-
-exports.deleteTask = functions.https.onRequest((request, response) => {
-    cors(request, response, () => {
-        console.log(request);
-
-        var sprintNumber = request.body.data.SprintNumber;
-        var taskId = request.body.data.Id;
-        var fullSprintId = createSprintId(sprintNumber);
-        var category = request.body.data.Category;
-        var status = request.body.data.Status;
-        var totalDevelopmentTask;
-        var totalBusinessTask;
-        var totalMarketingTask;
-        var totalOtherTask;
-        var totalNumberOfTask;
-        var result;
-        var totalCompletedTask;
-        var totalUnCompletedTask;
-
-        const p1 = db.collection("Tasks").doc(taskId).update({
-            Category: "Trash",
-            SprintNumber: -2
-        });
-        
-        const p2 = db.collection("Main").doc(fullSprintId).get().then((doc) => {
-            totalNumberOfTask = doc.data().TotalNumberOfTask;
-            totalDevelopmentTask = doc.data().TotalDevelopmentTask;
-            totalBusinessTask = doc.data().TotalBusinessTask;
-            totalMarketingTask = doc.data().TotalMarketingTask;
-            totalOtherTask = doc.data().TotalOtherTask
-            totalCompletedTask = doc.data().TotalCompletedTask;
-            totalUnCompletedTask = doc.data().TotalUnCompletedTask;
-
-            if (category === "Development") {
-                totalDevelopmentTask = totalDevelopmentTask - 1;
-            } else if (category === "Business") {
-                totalBusinessTask = totalBusinessTask - 1;
-            } else if (category === "Marketing") {
-                totalMarketingTask = totalMarketingTask - 1;
-            } else {
-                totalOtherTask = totalOtherTask -1;
-            }
-            totalNumberOfTask = totalNumberOfTask - 1;
-            status === "Completed" ? totalCompletedTask = totalCompletedTask - 1 : totalUnCompletedTask = totalUnCompletedTask - 1;
-            var updateDeleteTaskCounter = db.collection("Main").doc(fullSprintId).update({
-                TotalDevelopmentTask: totalDevelopmentTask,
-                TotalBusinessTask: totalBusinessTask,
-                TotalMarketingTask: totalMarketingTask,
-                TotalOtherTask: totalOtherTask,
-                TotalNumberOfTask: totalNumberOfTask,
-                TotalCompletedTask: totalCompletedTask,
-                TotalUnCompletedTask: totalUnCompletedTask
-            });
-            return Promise.resolve(updateDeleteTaskCounter);
-        });
-        const deleteTaskPromises = [p1, p2];
-        Promise.all(deleteTaskPromises).then(() => {
-                result = { data: "OK" };
-                console.log("Document sucessfully deleted");
-                return response.status(200).send(result);
-            })
-            .catch((error) => {
-                result = { data: error };
-                console.log("error", error);
-                return response.status(500).send(result)
-            });
-    });
-});
-
-function createSprintId(sprintNumber) {
-    if (sprintNumber === -1) {
-        return "Backlog";
-    } else {
-        return ("S" + sprintNumber);
-    }
-}
-exports.createNewUser = functions.https.onRequest((request, response) => {
-    cors(request, response, () => {
-        console.log(request);
-        const user = request.body.data;
-        const Uid = user.uid;
-        const PhotoURL = user.photoURL;
-        const DisplayName = user.displayName;
-        const Email = user.email;
-        const PhoneNumber = user.phoneNumber;
-        const ProviderId = user.providerId;
-
-        db.collection("Users").doc(Uid).get().then((doc) => {
-                if (doc.exists) {
-                    const userData = db.collection("Users").doc(Uid).update({
-                        uid: Uid,
-                        photoURL: PhotoURL,
-                        displayName: DisplayName,
-                        email: Email,
-                        phoneNumber: PhoneNumber,
-                        providerId: ProviderId
-                    });
-                    return Promise.resolve(userData);
-                } else {
-                    const userData = db.collection("Users").doc(Uid).set({
-                        uid: Uid,
-                        photoURL: PhotoURL,
-                        displayName: DisplayName,
-                        email: Email,
-                        phoneNumber: PhoneNumber,
-                        providerId: ProviderId
-                    });
-                    return Promise.resolve(userData);
-                }
-            }).then(() => {
-                result = { data: "User Logged In Successfully" };
-                console.log("Document successfully written");
-                return response.status(200).send(result);
-            })
-            .catch((error) => {
-                result = { data: error };
-                console.log("error", error);
-                return response.status(500).send(result)
-            });
-    });
-});
-
-exports.updateSprintStatus = functions.https.onRequest((request, response) => {
-    cors(request, response, () => {
-        var sprintStatus = request.body.data.SprintStatus;
-        var currentSprintName = request.body.data.CurrentSprintName;
-        console.log(currentSprintName);
-        db.collection("Main").doc(currentSprintName).update({
-            Status: sprintStatus,
-        });
-    });
-})
\ No newline at end of file
diff --git a/functions/logWorkAPI.js b/functions/logWorkAPI.js
new file mode 100644
index 000000000..1160b7a42
--- /dev/null
+++ b/functions/logWorkAPI.js
@@ -0,0 +1,143 @@
+const functions = require('firebase-functions');
+var cors = require('cors')({ origin: true });
+
+const admin = require('firebase-admin');
+
+const db = admin.firestore();
+
+exports.logWork = functions.https.onRequest((request, response) => {
+    cors(request, response, () => {
+        var status = request.body.data.LogWorkStatus;
+        var taskId = request.body.data.LogTaskId;
+        var logHours = parseInt(request.body.data.LogHours);
+        var workDone = parseInt(request.body.data.LogWorkDone);
+        var sprintNumber = parseInt(request.body.data.SprintNumber);
+        var logWorkComment = request.body.data.LogWorkComment;
+        var date = request.body.data.Date;
+        var time = request.body.data.Time;
+        var fullSprintId = createSprintId(sprintNumber);
+        var logWorkTotalTime;
+        var totalActions;
+        var totalComments;
+        var actionId;
+
+        const promise1 = db.collection("Tasks").doc(taskId).get().then((doc) => {
+            logWorkTotalTime = parseInt(doc.data().LogWorkTotalTime);
+            logWorkTotalTime = parseInt(logWorkTotalTime) + parseInt(logHours);
+
+            var updatePromise = db.collection("Tasks").doc(taskId).update({
+                LogWorkTotalTime: logWorkTotalTime,
+                WorkDone: workDone,
+                Status: status
+            });
+            return Promise.resolve(updatePromise);
+        });
+        const promise2 = db.collection("RawData").doc("AppDetails").get().then((doc) => {
+            totalCompletedTask = parseInt(doc.data().TotalCompletedTask);
+            totalUnCompletedTask = parseInt(doc.data().TotalUnCompletedTask);
+            if (status === "Completed") {
+                totalCompletedTask = totalCompletedTask + 1;
+                totalUnCompletedTask = totalUnCompletedTask - 1;
+            }
+            var updateStatus = db.collection("RawData").doc("AppDetails").update({
+                TotalCompletedTask: totalCompletedTask,
+                TotalUnCompletedTask: totalUnCompletedTask
+            });
+            return Promise.resolve(updateStatus);
+        });
+        const promise3 = db.collection("Main").doc(fullSprintId).get().then((doc) => {
+            totalCompletedTask = parseInt(doc.data().TotalCompletedTask);
+            totalUnCompletedTask = parseInt(doc.data().TotalUnCompletedTask);
+
+            if (status === "Completed") {
+                totalCompletedTask = totalCompletedTask + 1;
+                totalUnCompletedTask = totalUnCompletedTask - 1;
+            }
+            var updateSprintstatus = db.collection("Main").doc(fullSprintId).update({
+                TotalCompletedTask: totalCompletedTask,
+                TotalUnCompletedTask: totalUnCompletedTask
+            });
+            return Promise.resolve(updateSprintstatus);
+        });
+        updateActivity("COMMENT", logWorkComment, taskId, date, time);
+        
+        const logWorkPromises = [promise1, promise2, promise3];
+        Promise.all(logWorkPromises).then(() => {
+                result = { data: "OK" }
+                console.log("Document successfully written!");
+                return response.status(200).send(result);
+            })
+            .catch((error) => {
+                var result = { data: error };
+                console.log("error", error);
+                return response.status(500).send(result)
+            });
+    });
+});
+
+function createSprintId(sprintNumber) {
+    if (sprintNumber === -1) {
+        return "Backlog";
+    } else {
+        return ("S" + sprintNumber);
+    }
+}
+
+async function updateActivity(type, comment, taskId, date, time){
+    var actionId = "";
+    if(type === "CREATED") {
+        actionId = "A0";
+        db.collection("Activity").doc(taskId).set({
+            TaskId: taskId,
+            TotalActions: 0,
+            TotalComments: 0
+        });
+        db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
+            Type: type,
+            Comment: comment,
+            Date: date,
+            Time: time
+        });
+    }
+    else if (type === "COMMENT") {
+        actionId = await db.collection("Activity").doc(taskId).get().then((doc) => {
+            totalActions = doc.data().TotalActions;
+            totalActions = totalActions+1;
+            totalComments = doc.data().TotalComments;
+            totalComments = totalComments+1;
+            return ("A" + totalActions);
+        });
+        if (actionId !== ""){
+            db.collection("Activity").doc(taskId).update({
+                TotalActions: totalActions,
+                TotalComments: totalComments,
+            });
+            db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
+                Type: type,
+                Comment: comment,
+                Date: date,
+                Time: time
+            });
+        }
+    }
+    else{
+        actionId = await db.collection("Activity").doc(taskId).get().then((doc) => {
+            totalActions = doc.data().TotalActions;
+            totalActions = totalActions+1;
+
+            return ("A" + totalActions);
+
+        });
+        if (actionId !== ""){
+            db.collection("Activity").doc(taskId).update({
+                TotalActions: totalActions,
+            });
+            db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
+                Type: type,
+                Comment: comment,
+                Date: date,
+                Time: time
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/functions/startNewSprintAPI.js b/functions/startNewSprintAPI.js
new file mode 100644
index 000000000..5da7fe2c2
--- /dev/null
+++ b/functions/startNewSprintAPI.js
@@ -0,0 +1,76 @@
+const functions = require('firebase-functions');
+var cors = require('cors')({ origin: true });
+
+const admin = require('firebase-admin');
+
+const db = admin.firestore();
+
+exports.startNewSprint = functions.https.onRequest((request, response) => {
+    cors(request, response, () => {
+        console.log(request);
+
+        var status = request.body.data.Status;
+        var startDate = request.body.data.StartDate;
+        var endDate = request.body.data.EndDate;
+        var totalDevelopment = parseInt(request.body.data.TotalDevelopment);
+        var totalBusiness = parseInt(request.body.data.TotalBusiness);
+        var totalMarketing = parseInt(request.body.data.TotalMarketing);
+        var totalOther = parseInt(request.body.data.TotalOther);
+        var newSprintId = parseInt(request.body.data.NewSprintId);
+        var newSprintIdString = "S" + newSprintId.toString();
+        var createSprintPromise;
+        var result;
+
+        console.log("End Date from Backend: " + endDate);
+        console.log("Start Date from Backend: " + startDate);
+        console.log("Status from Backend: " + status);
+
+        const p1 = db.collection("Main").doc(newSprintIdString).get().then((doc) => {
+            if (doc.exists) {
+                createSprintPromise = db.collection("Main").doc(newSprintIdString).update({
+                    TotalDevelopmentTask: totalDevelopment,
+                    TotalBusinessTask: totalBusiness,
+                    TotalMarketingTask: totalMarketing,
+                    TotalOtherTask: totalOther,
+                    EndDate: endDate,
+                    StartDate: startDate,
+                    Status: status
+                });
+            } else {
+                var totalUnCompletedTask = 0;
+                var totalCompletedTask = 0;
+                var totalNumberOfTask = 0;
+
+                createSprintPromise = db.collection("Main").doc(newSprintIdString).set({
+                    TotalDevelopmentTask: totalDevelopment,
+                    TotalBusinessTask: totalBusiness,
+                    TotalMarketingTask: totalMarketing,
+                    TotalOtherTask: totalOther,
+                    EndDate: endDate,
+                    StartDate: startDate,
+                    Status: status,
+                    TotalUnCompletedTask: totalUnCompletedTask,
+                    TotalCompletedTask: totalCompletedTask,
+                    TotalNumberOfTask: totalNumberOfTask
+                });
+            }
+            return Promise.resolve(createSprintPromise);
+        });
+        const p2 = db.collection("RawData").doc("AppDetails").update({
+            CurrentSprintId: newSprintId
+        });
+        const Promises = [p1,p2];
+        return Promise.all(Promises).then(() => {
+            console.log("Sprint started successfully");
+            result = { data: "OK" }
+            console.log("Document successfully written!");
+            return response.status(200).send(result);
+        })
+        .catch((error) => {
+            result = { data: error }
+            console.log("error", error);
+            return response.status(500).send(result);
+        });
+    });
+});
+
diff --git a/functions/updateSprintStatusAPI.js b/functions/updateSprintStatusAPI.js
new file mode 100644
index 000000000..71f8de785
--- /dev/null
+++ b/functions/updateSprintStatusAPI.js
@@ -0,0 +1,17 @@
+const functions = require('firebase-functions');
+var cors = require('cors')({ origin: true });
+
+const admin = require('firebase-admin');
+
+const db = admin.firestore();
+
+exports.updateSprintStatus = functions.https.onRequest((request, response) => {
+    cors(request, response, () => {
+        var sprintStatus = request.body.data.SprintStatus;
+        var currentSprintName = request.body.data.CurrentSprintName;
+        console.log(currentSprintName);
+        db.collection("Main").doc(currentSprintName).update({
+            Status: sprintStatus,
+        });
+    });
+})
diff --git a/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.ts b/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.ts
index 6d9d6156c..7ce0ae35d 100644
--- a/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.ts
+++ b/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.ts
@@ -3,6 +3,7 @@ import { AngularFireFunctions } from '@angular/fire/functions';
 import { NgForm } from '@angular/forms';
 import { Router } from '@angular/router';
 import { ValidationService } from '../../services/validation.service';
+import { ToolsService } from '../../services/tools.service';
 import { Location } from '@angular/common';
 
 @Component({
@@ -26,18 +27,14 @@ export class CreateNewSessionComponent implements OnInit {
   status: string
   sprintNumber: number
   storyPoint: number
+  time: string
   enableLoader: boolean = false
   valid: boolean = true;
 
-  constructor(private functions: AngularFireFunctions, public validationService: ValidationService, private router: Router, private location: Location) { }
+  constructor(private functions: AngularFireFunctions, public validationService: ValidationService, private router: Router, private location: Location, public toolsService: ToolsService) { }
   ngOnInit(): void {
-    var today = new Date();
-
-    var dd = String(today.getDate()).padStart(2, '0');
-    var mm = String(today.getMonth() + 1).padStart(2, '0');
-    var yyyy = today.getFullYear();
-
-    this.todayDate = dd + "/" + mm + "/" + yyyy;
+    this.todayDate = this.toolsService.date();
+    this.time = this.toolsService.time();
   }
 
   async submit(){
@@ -69,7 +66,7 @@ export class CreateNewSessionComponent implements OnInit {
     const callable = this.functions.httpsCallable('createNewTask');
 
     try {
-      const result = await callable({ Title: this.title, Description: this.description, Priority: this.priority, Difficulty: this.difficulty, Creator: this.creatorName, Assignee: this.assigneeName, EstimatedTime: this.estimatedTime, Status: this.status, Category: this.category, SprintNumber: this.sprintNumber, StoryPointNumber: this.storyPoint, CreationDate: this.todayDate }).toPromise();
+      const result = await callable({ Title: this.title, Description: this.description, Priority: this.priority, Difficulty: this.difficulty, Creator: this.creatorName, Assignee: this.assigneeName, EstimatedTime: this.estimatedTime, Status: this.status, Category: this.category, SprintNumber: this.sprintNumber, StoryPointNumber: this.storyPoint, CreationDate: this.todayDate, Time: this.time }).toPromise();
 
       console.log("Successfully created the task");
       console.log(result);
diff --git a/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.ts b/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.ts
index c81721079..a225472cd 100644
--- a/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.ts
+++ b/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.ts
@@ -4,6 +4,7 @@ import { NgForm } from '@angular/forms';
 import { Tasks } from 'src/app/Interface/TasksInterface';
 import { Router } from '@angular/router';
 import { ValidationService } from '../../../services/validation.service';
+import { ToolsService } from '../../../services/tools.service';
 
 
 @Component({
@@ -20,12 +21,22 @@ export class EditPageComponent implements OnInit {
   editTask: Tasks
   previousSprintId: number
   enableLoader: boolean = false
+  todayDate: string
+  time: string
+  changedData: string = ""
+  prevVal =[]
+  newVal =[]
 
-  constructor(private functions: AngularFireFunctions, private router: Router, public validationService: ValidationService) { }
+  constructor(private functions: AngularFireFunctions, private router: Router, public validationService: ValidationService, public toolsService: ToolsService) { }
 
   ngOnInit(): void {
+
+    this.todayDate = this.toolsService.date();
+    this.time = this.toolsService.time();
+
     this.editTask = this.task;
     this.previousSprintId = this.task.SprintNumber;
+    this.prevVal = [this.task.Description, this.task.Assignee, this.task.EstimatedTime, this.task.Priority, this.task.Difficulty, this.task.StoryPointNumber];
   }
 
   async submit(){
@@ -40,6 +51,8 @@ export class EditPageComponent implements OnInit {
       return res;});
     if(condition)
     {
+      this.newVal = [this.editTask.Description, this.editTask.Assignee, this.editTask.EstimatedTime, this.editTask.Priority, this.editTask.Difficulty, this.editTask.StoryPointNumber];
+      this.generateChanges();
       console.log("Inputs are valid");
       this.editPage();
     }
@@ -47,6 +60,26 @@ export class EditPageComponent implements OnInit {
     console.log("Page not edited due to validation error");
   }
 
+async generateChanges() {
+  console.log(this.editTask, this.task);
+    if(this.prevVal[0] != this.newVal[0])
+      this.changedData = this.changedData + " description,";
+    if(this.prevVal[1] != this.newVal[1])
+      this.changedData = this.changedData + " assignee," ;
+    if(this.prevVal[2] != this.newVal[2])
+      this.changedData = this.changedData + " estimated-time," ;
+    if(this.prevVal[3] != this.newVal[3])
+      this.changedData = this.changedData + " priority," ;
+    if(this.prevVal[4] != this.newVal[4])
+      this.changedData = this.changedData + " difficulty," ;
+    if(this.prevVal[5] != this.newVal[5])
+      this.changedData = this.changedData + " story-point,";
+    if(this.changedData != "")
+      this.changedData = "Edited-" + this.changedData;
+      this.changedData = this.changedData.substring(0,this.changedData.length-1) + "."
+    console.log(this.changedData);
+  }
+
   async editPage() {
     this.enableLoader = true
     const callable = this.functions.httpsCallable('editPageTask');
@@ -58,7 +91,7 @@ export class EditPageComponent implements OnInit {
 
       console.log(this.editTask.SprintNumber);
       if (!(this.task.Status === "Completed")) {
-        const result = await callable({ Id: this.editTask.Id, Description: this.editTask.Description, Priority: this.editTask.Priority, Difficulty: this.editTask.Difficulty, Assignee: this.editTask.Assignee, EstimatedTime: this.editTask.EstimatedTime, Category: this.task.Category, SprintNumber: this.editTask.SprintNumber, StoryPointNumber: this.editTask.StoryPointNumber, PreviousId: this.previousSprintId, CreationDate: this.editTask.CreationDate }).toPromise();
+        const result = await callable({ Id: this.editTask.Id, Description: this.editTask.Description, Priority: this.editTask.Priority, Difficulty: this.editTask.Difficulty, Assignee: this.editTask.Assignee, EstimatedTime: this.editTask.EstimatedTime, Category: this.task.Category, SprintNumber: this.editTask.SprintNumber, StoryPointNumber: this.editTask.StoryPointNumber, PreviousId: this.previousSprintId, CreationDate: this.editTask.CreationDate, Date: this.todayDate, Time: this.time, ChangedData: this.changedData}).toPromise();
         console.log("Successfully Updated the task");
         console.log(result);
         this.editTaskDone();
diff --git a/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.ts b/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.ts
index 8101eafd7..2031bdc75 100644
--- a/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.ts
+++ b/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.ts
@@ -3,6 +3,7 @@ import { NgForm } from '@angular/forms';
 import { Tasks } from 'src/app/Interface/TasksInterface';
 import { AngularFireFunctions } from '@angular/fire/functions';
 import { ValidationService } from '../../../services/validation.service';
+import { ToolsService } from '../../../services/tools.service';
 
 @Component({
   selector: 'app-log-work',
@@ -22,10 +23,15 @@ export class LogWorkComponent implements OnInit {
   logHours: number
   logWorkComment: number
   enableLoader: boolean = false
+  todayDate: string
+  time: string
 
-  constructor(private functions: AngularFireFunctions, public validationService: ValidationService) { }
+  constructor(private functions: AngularFireFunctions, public validationService: ValidationService, public toolsService: ToolsService) { }
 
-  ngOnInit(): void { }
+  ngOnInit(): void { 
+    this.todayDate = this.toolsService.date();
+    this.time = this.toolsService.time();
+  }
 
   async submit(){
     let labels = ['status', 'logHours', 'workCompleted', 'comment'];
@@ -50,7 +56,7 @@ export class LogWorkComponent implements OnInit {
     const callable = this.functions.httpsCallable('logWork');
 
     try {
-      const result = await callable({ SprintNumber: this.task.SprintNumber, LogTaskId: this.task.Id, LogHours: this.logHours, LogWorkDone: this.logWorkDone, LogWorkStatus: this.logWorkStatus, LogWorkComment: this.logWorkComment }).toPromise();
+      const result = await callable({ SprintNumber: this.task.SprintNumber, LogTaskId: this.task.Id, LogHours: this.logHours, LogWorkDone: this.logWorkDone, LogWorkStatus: this.logWorkStatus, LogWorkComment: this.logWorkComment, Date: this.todayDate, Time: this.time}).toPromise();
 
       console.log("Logged Work Successfully");
       console.log(result);
diff --git a/worktrolly-ui/src/app/body/task-details/task-details.component.ts b/worktrolly-ui/src/app/body/task-details/task-details.component.ts
index 1be5a2eae..a91ce0aae 100644
--- a/worktrolly-ui/src/app/body/task-details/task-details.component.ts
+++ b/worktrolly-ui/src/app/body/task-details/task-details.component.ts
@@ -6,6 +6,7 @@ import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators'
 import { Tasks } from 'src/app/Interface/TasksInterface';
 import { AuthService } from 'src/app/services/auth.service';
+import { ToolsService } from '../../services/tools.service';
 import {Location} from '@angular/common';
 import { NavbarHandlerService } from 'src/app/services/navbar-handler.service';
 
@@ -24,12 +25,18 @@ export class TaskDetailsComponent implements OnInit {
   editTaskEnabled: boolean = false
   userLoggedIn: boolean = false
   task: Tasks
+  todayDate: string
+  time: string
+  
   public taskDocument: AngularFirestoreDocument<Tasks>
   public taskDataObservable: Observable<Tasks>
 
-  constructor(private route: ActivatedRoute, public db: AngularFirestore, private router: Router, private functions: AngularFireFunctions, public authService: AuthService, private location: Location, private navbarHandler: NavbarHandlerService) { }
+  constructor(private route: ActivatedRoute, public db: AngularFirestore, private router: Router, private functions: AngularFireFunctions, public authService: AuthService, private location: Location, public toolsService: ToolsService, private navbarHandler: NavbarHandlerService) { }
 
   ngOnInit(): void {
+    this.todayDate = this.toolsService.date();
+    this.time = this.toolsService.time();
+
     this.Id = this.route.snapshot.params['taskId'];
 
     this.componentName = this.Id;
@@ -70,7 +77,7 @@ export class TaskDetailsComponent implements OnInit {
     const callable = this.functions.httpsCallable('deleteTask');
 
     try {
-      const result = await callable({ Id: this.task.Id, SprintNumber: this.task.SprintNumber, Category: this.task.Category, Status: this.task.Status }).toPromise();
+      const result = await callable({ Id: this.task.Id, SprintNumber: this.task.SprintNumber, Category: this.task.Category, Status: this.task.Status, Date: this.todayDate, Time: this.time }).toPromise();
       console.log(this.task.Id + " deleted");
       console.log(result);
       this.router.navigate(['/']);
diff --git a/worktrolly-ui/src/app/services/tools.service.spec.ts b/worktrolly-ui/src/app/services/tools.service.spec.ts
new file mode 100644
index 000000000..3225de8e6
--- /dev/null
+++ b/worktrolly-ui/src/app/services/tools.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { ToolsService } from './tools.service';
+
+describe('ToolsService', () => {
+  let service: ToolsService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(ToolsService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});
diff --git a/worktrolly-ui/src/app/services/tools.service.ts b/worktrolly-ui/src/app/services/tools.service.ts
new file mode 100644
index 000000000..67cc02d24
--- /dev/null
+++ b/worktrolly-ui/src/app/services/tools.service.ts
@@ -0,0 +1,29 @@
+import { Injectable } from '@angular/core';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class ToolsService {
+
+  todayDate: string
+  todayTime: string
+
+  constructor() { }
+
+  date(){
+    var today = new Date();
+    var dd = String(today.getDate()).padStart(2, '0');
+    var mm = String(today.getMonth() + 1).padStart(2, '0');
+    var yyyy = today.getFullYear();
+    return this.todayDate = dd + "/" + mm + "/" + yyyy;
+  }
+
+  time(){
+    var today = new Date();
+    var hh = String(today.getHours()).padStart(2, '0');
+    var mn = String(today.getMinutes()).padStart(2, '0');
+    var ss= String(today.getSeconds()).padStart(2, '0');
+    return this.todayTime = hh + ":" + mn + ":" + ss;
+  }
+
+}

From 25f5262f0f21c97388b15b7f78baa74092b0f9e8 Mon Sep 17 00:00:00 2001
From: Komal Sharma <52309262+k0malSharma@users.noreply.github.com>
Date: Sat, 30 Jan 2021 11:17:08 +0530
Subject: [PATCH 35/37] Revert "Revert "Revert "feat(dev/activity): added an
 activity collection in database."""

---
 functions/createNewTaskAPI.js                 | 240 -------
 functions/createNewUserAPI.js                 |  52 --
 functions/deleteTaskAPI.js                    | 147 -----
 functions/editPageTaskAPI.js                  | 237 -------
 functions/index.js                            | 600 +++++++++++++++++-
 functions/logWorkAPI.js                       | 143 -----
 functions/startNewSprintAPI.js                |  76 ---
 functions/updateSprintStatusAPI.js            |  17 -
 .../create-new-session.component.ts           |  15 +-
 .../edit-page/edit-page.component.ts          |  37 +-
 .../log-work/log-work.component.ts            |  12 +-
 .../task-details/task-details.component.ts    |  11 +-
 .../src/app/services/tools.service.spec.ts    |  16 -
 .../src/app/services/tools.service.ts         |  29 -
 14 files changed, 600 insertions(+), 1032 deletions(-)
 delete mode 100644 functions/createNewTaskAPI.js
 delete mode 100644 functions/createNewUserAPI.js
 delete mode 100644 functions/deleteTaskAPI.js
 delete mode 100644 functions/editPageTaskAPI.js
 delete mode 100644 functions/logWorkAPI.js
 delete mode 100644 functions/startNewSprintAPI.js
 delete mode 100644 functions/updateSprintStatusAPI.js
 delete mode 100644 worktrolly-ui/src/app/services/tools.service.spec.ts
 delete mode 100644 worktrolly-ui/src/app/services/tools.service.ts

diff --git a/functions/createNewTaskAPI.js b/functions/createNewTaskAPI.js
deleted file mode 100644
index 0b3f709b4..000000000
--- a/functions/createNewTaskAPI.js
+++ /dev/null
@@ -1,240 +0,0 @@
-const functions = require('firebase-functions');
-var cors = require('cors')({ origin: true });
-
-const admin = require('firebase-admin');
-
-const db = admin.firestore();
-
-exports.createNewTask = functions.https.onRequest((request, response) => {
-    cors(request, response, () => {
-        console.log(request);
-        var title = request.body.data.Title;
-        var des = request.body.data.Description;
-        var priority = request.body.data.Priority;
-        var difficulty = request.body.data.Difficulty;
-        var creator = request.body.data.Creator;
-        var assignee = request.body.data.Assignee;
-        var estimatedTime = parseInt(request.body.data.EstimatedTime);
-        var status = request.body.data.Status;
-        var category = request.body.data.Category;
-        var storyPointNumber = parseInt(request.body.data.StoryPointNumber);
-        var sprintNumber = parseInt(request.body.data.SprintNumber);
-        var creationDate = request.body.data.CreationDate;
-        var time = request.body.data.Time;
-        var fullSprintId = createSprintId(sprintNumber);
-        var loggedWorkTotalTime = 0;
-        var workDone = 0;
-        var taskId = "";
-        var totalDevelopmentTask;
-        var totalBusinessTask;
-        var totalOtherTask;
-        var totalMarketingTask;
-        var totalNumberOfTask;
-        var result;
-        var totalUnCompletedTask = 0;
-        var sprintDataPromise;
-
-        const promise1 = db.collection("RawData").doc("AppDetails").get().then((doc) => {
-            totalNumberOfTask = doc.data().TotalNumberOfTask;
-            totalDevelopmentTask = doc.data().TotalDevelopmentTask;
-            totalBusinessTask = doc.data().TotalBusinessTask;
-            totalMarketingTask = doc.data().TotalMarketingTask;
-            totalOtherTask = doc.data().TotalOtherTask;
-            totalUnCompletedTask = doc.data().TotalUnCompletedTask;
-            if (category === "Development") {
-                totalDevelopmentTask = totalDevelopmentTask + 1;
-                taskId = category[0] + totalDevelopmentTask;
-            } else if (category === "Business") {
-                totalBusinessTask = totalBusinessTask + 1;
-                taskId = category[0] + totalBusinessTask;
-            } else if (category === "Marketing") {
-                totalMarketingTask = totalMarketingTask + 1;
-                taskId = category[0] + totalMarketingTask;
-            } else {
-                totalOtherTask = totalOtherTask + 1;
-                taskId = category[0] + totalOtherTask;
-            }
-            totalUnCompletedTask = totalUnCompletedTask + 1;
-            totalNumberOfTask = totalNumberOfTask + 1;
-            console.log(taskId);
-            const P1 = db.collection("Tasks").doc(taskId).set({
-                Id: taskId,
-                Title: title,
-                Description: des,
-                Priority: priority,
-                Difficulty: difficulty,
-                Creator: creator,
-                Assignee: assignee,
-                EstimatedTime: estimatedTime,
-                Status: status,
-                Category: category,
-                LogWorkTotalTime: loggedWorkTotalTime,
-                WorkDone: workDone,
-                SprintNumber: sprintNumber,
-                StoryPointNumber: storyPointNumber,
-                CreationDate: creationDate
-            });
-            const P2 = db.collection("RawData").doc("AppDetails").update({
-                TotalDevelopmentTask: totalDevelopmentTask,
-                TotalBusinessTask: totalBusinessTask,
-                TotalMarketingTask: totalMarketingTask,
-                TotalOtherTask: totalOtherTask,
-                TotalNumberOfTask: totalNumberOfTask,
-                TotalUnCompletedTask: totalUnCompletedTask
-            });
-            updateActivity("CREATED", "Created task "+taskId, taskId, creationDate, time);
-            const Promises = [P1,P2];
-            return Promise.all(Promises);
-        });
-
-        const promise2 = db.collection("Main").doc(fullSprintId).get().then((doc) => {
-            if (doc.exists) {
-                totalNumberOfTask = doc.data().TotalNumberOfTask;
-                totalDevelopmentTask = doc.data().TotalDevelopmentTask;
-                totalBusinessTask = doc.data().TotalBusinessTask;
-                totalOtherTask = doc.data().TotalOtherTask;
-                totalMarketingTask = doc.data().TotalMarketingTask;
-                totalUnCompletedTask = doc.data().TotalUnCompletedTask;
-
-                if (category === "Development") {
-                    totalDevelopmentTask = totalDevelopmentTask + 1;
-                } else if (category === "Business") {
-                    totalBusinessTask = totalBusinessTask + 1;
-                } else if (category === "Marketing") {
-                    totalMarketingTask = totalMarketingTask + 1;
-                } else {
-                    totalOtherTask = totalOtherTask + 1;
-                }
-
-                totalNumberOfTask = totalNumberOfTask + 1;
-                totalUnCompletedTask = totalUnCompletedTask + 1;
-
-
-                sprintDataPromise = db.collection("Main").doc(fullSprintId).update({
-                    TotalBusinessTask: totalBusinessTask,
-                    TotalDevelopmentTask: totalDevelopmentTask,
-                    TotalMarketingTask: totalMarketingTask,
-                    TotalOtherTask: totalOtherTask,
-                    TotalUnCompletedTask: totalUnCompletedTask,
-                    TotalNumberOfTask: totalNumberOfTask
-                });
-            } else {
-                totalBusinessTask = 0;
-                totalDevelopmentTask = 0;
-                totalMarketingTask = 0;
-                totalOtherTask = 0;
-                totalUnCompletedTask = 0;
-                totalCompletedTask = 0;
-                totalNumberOfTask = 0;
-
-                if (category === "Development") {
-                    totalDevelopmentTask = totalDevelopmentTask + 1;
-                } else if (category === "Business") {
-                    totalBusinessTask = totalBusinessTask + 1;
-                } else if (category === "Marketing") {
-                    totalMarketingTask = totalMarketingTask + 1;
-                } else {
-                    totalOtherTask = totalOtherTask + 1;
-                }
-
-
-                totalNumberOfTask = totalNumberOfTask + 1;
-                totalUnCompletedTask = totalUnCompletedTask + 1;
-
-                sprintDataPromise = db.collection("Main").doc(fullSprintId).set({
-                    EndDate: "xx/xx/xxxx",
-                    StartDate: "xx/xx/xxxx",
-                    Status: "Not Started",
-                    TotalBusinessTask: totalBusinessTask,
-                    TotalDevelopmentTask: totalDevelopmentTask,
-                    TotalMarketingTask: totalMarketingTask,
-                    TotalOtherTask: totalOtherTask,
-                    TotalUnCompletedTask: totalUnCompletedTask,
-                    TotalCompletedTask: totalCompletedTask,
-                    TotalNumberOfTask: totalNumberOfTask
-                });
-
-            }
-            return Promise.resolve(sprintDataPromise);
-        });
-
-        const newTaskPromises = [promise1, promise2];
-        Promise.all(newTaskPromises).then(() => {
-                result = { data: "OK!" }
-                console.log("Document successfully written!");
-                return response.status(200).send(result);
-            })
-        .catch((error) => {
-            result = { data: error };
-            console.error("Error writing document: ", error);
-            return response.status(500).send(result);
-        });
-    });
-});
-
-function createSprintId(sprintNumber) {
-    if (sprintNumber === -1) {
-        return "Backlog";
-    } else {
-        return ("S" + sprintNumber);
-    }
-}
-
-async function updateActivity(type, comment, taskId, date, time){
-    var actionId = "";
-    if(type === "CREATED") {
-        actionId = "A0";
-        db.collection("Activity").doc(taskId).set({
-            TaskId: taskId,
-            TotalActions: 0,
-            TotalComments: 0
-        });
-        db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
-            Type: type,
-            Comment: comment,
-            Date: date,
-            Time: time
-        });
-    }
-    else if (type === "COMMENT") {
-        actionId = await db.collection("Activity").doc(taskId).get().then((doc) => {
-            totalActions = doc.data().TotalActions;
-            totalActions = totalActions+1;
-            totalComments = doc.data().TotalComments;
-            totalComments = totalComments+1;
-            return ("A" + totalActions);
-        });
-        if (actionId !== ""){
-            db.collection("Activity").doc(taskId).update({
-                TotalActions: totalActions,
-                TotalComments: totalComments,
-            });
-            db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
-                Type: type,
-                Comment: comment,
-                Date: date,
-                Time: time
-            });
-        }
-    }
-    else{
-        actionId = await db.collection("Activity").doc(taskId).get().then((doc) => {
-            totalActions = doc.data().TotalActions;
-            totalActions = totalActions+1;
-
-            return ("A" + totalActions);
-
-        });
-        if (actionId !== ""){
-            db.collection("Activity").doc(taskId).update({
-                TotalActions: totalActions,
-            });
-            db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
-                Type: type,
-                Comment: comment,
-                Date: date,
-                Time: time
-            });
-        }
-    }
-}
\ No newline at end of file
diff --git a/functions/createNewUserAPI.js b/functions/createNewUserAPI.js
deleted file mode 100644
index c2236a37d..000000000
--- a/functions/createNewUserAPI.js
+++ /dev/null
@@ -1,52 +0,0 @@
-const functions = require('firebase-functions');
-var cors = require('cors')({ origin: true });
-
-const admin = require('firebase-admin');
-
-const db = admin.firestore();
-
-exports.createNewUser = functions.https.onRequest((request, response) => {
-    cors(request, response, () => {
-        console.log(request);
-        const user = request.body.data;
-        const Uid = user.uid;
-        const PhotoURL = user.photoURL;
-        const DisplayName = user.displayName;
-        const Email = user.email;
-        const PhoneNumber = user.phoneNumber;
-        const ProviderId = user.providerId;
-
-        db.collection("Users").doc(Uid).get().then((doc) => {
-                if (doc.exists) {
-                    const userData = db.collection("Users").doc(Uid).update({
-                        uid: Uid,
-                        photoURL: PhotoURL,
-                        displayName: DisplayName,
-                        email: Email,
-                        phoneNumber: PhoneNumber,
-                        providerId: ProviderId
-                    });
-                    return Promise.resolve(userData);
-                } else {
-                    const userData = db.collection("Users").doc(Uid).set({
-                        uid: Uid,
-                        photoURL: PhotoURL,
-                        displayName: DisplayName,
-                        email: Email,
-                        phoneNumber: PhoneNumber,
-                        providerId: ProviderId
-                    });
-                    return Promise.resolve(userData);
-                }
-            }).then(() => {
-                result = { data: "User Logged In Successfully" };
-                console.log("Document successfully written");
-                return response.status(200).send(result);
-            })
-            .catch((error) => {
-                result = { data: error };
-                console.log("error", error);
-                return response.status(500).send(result)
-            });
-    });
-});
\ No newline at end of file
diff --git a/functions/deleteTaskAPI.js b/functions/deleteTaskAPI.js
deleted file mode 100644
index c44447f37..000000000
--- a/functions/deleteTaskAPI.js
+++ /dev/null
@@ -1,147 +0,0 @@
-const functions = require('firebase-functions');
-var cors = require('cors')({ origin: true });
-
-const admin = require('firebase-admin');
-
-const db = admin.firestore();
-
-exports.deleteTask = functions.https.onRequest((request, response) => {
-    cors(request, response, () => {
-        console.log(request);
-
-        var sprintNumber = request.body.data.SprintNumber;
-        var taskId = request.body.data.Id;
-        var fullSprintId = createSprintId(sprintNumber);
-        var category = request.body.data.Category;
-        var status = request.body.data.Status;
-        var totalDevelopmentTask;
-        var totalBusinessTask;
-        var totalMarketingTask;
-        var totalOtherTask;
-        var totalNumberOfTask;
-        var result;
-        var totalCompletedTask;
-        var totalUnCompletedTask;
-        var date = request.body.data.Date;
-        var time = request.body.data.Time;
-        var totalActions;
-        var actionId;
-
-        const p1 = db.collection("Tasks").doc(taskId).update({
-            Category: "Trash",
-            SprintNumber: -2
-        });
-        
-        const p2 = db.collection("Main").doc(fullSprintId).get().then((doc) => {
-            totalNumberOfTask = doc.data().TotalNumberOfTask;
-            totalDevelopmentTask = doc.data().TotalDevelopmentTask;
-            totalBusinessTask = doc.data().TotalBusinessTask;
-            totalMarketingTask = doc.data().TotalMarketingTask;
-            totalOtherTask = doc.data().TotalOtherTask
-            totalCompletedTask = doc.data().TotalCompletedTask;
-            totalUnCompletedTask = doc.data().TotalUnCompletedTask;
-
-            if (category === "Development") {
-                totalDevelopmentTask = totalDevelopmentTask - 1;
-            } else if (category === "Business") {
-                totalBusinessTask = totalBusinessTask - 1;
-            } else if (category === "Marketing") {
-                totalMarketingTask = totalMarketingTask - 1;
-            } else {
-                totalOtherTask = totalOtherTask -1;
-            }
-            totalNumberOfTask = totalNumberOfTask - 1;
-            status === "Completed" ? totalCompletedTask = totalCompletedTask - 1 : totalUnCompletedTask = totalUnCompletedTask - 1;
-            var updateDeleteTaskCounter = db.collection("Main").doc(fullSprintId).update({
-                TotalDevelopmentTask: totalDevelopmentTask,
-                TotalBusinessTask: totalBusinessTask,
-                TotalMarketingTask: totalMarketingTask,
-                TotalOtherTask: totalOtherTask,
-                TotalNumberOfTask: totalNumberOfTask,
-                TotalCompletedTask: totalCompletedTask,
-                TotalUnCompletedTask: totalUnCompletedTask
-            });
-            return Promise.resolve(updateDeleteTaskCounter);
-        });
-        updateActivity("DELETED", "Deleted task "+taskId, taskId, date, time);
-
-        const deleteTaskPromises = [p1, p2];
-        Promise.all(deleteTaskPromises).then(() => {
-                result = { data: "OK" };
-                console.log("Document sucessfully deleted");
-                return response.status(200).send(result);
-            })
-            .catch((error) => {
-                result = { data: error };
-                console.log("error", error);
-                return response.status(500).send(result)
-            });
-    });
-});
-
-function createSprintId(sprintNumber) {
-    if (sprintNumber === -1) {
-        return "Backlog";
-    } else {
-        return ("S" + sprintNumber);
-    }
-}
-
-async function updateActivity(type, comment, taskId, date, time){
-    var actionId = "";
-    if(type === "CREATED") {
-        actionId = "A0";
-        db.collection("Activity").doc(taskId).set({
-            TaskId: taskId,
-            TotalActions: 0,
-            TotalComments: 0
-        });
-        db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
-            Type: type,
-            Comment: comment,
-            Date: date,
-            Time: time
-        });
-    }
-    else if (type === "COMMENT") {
-        actionId = await db.collection("Activity").doc(taskId).get().then((doc) => {
-            totalActions = doc.data().TotalActions;
-            totalActions = totalActions+1;
-            totalComments = doc.data().TotalComments;
-            totalComments = totalComments+1;
-            return ("A" + totalActions);
-        });
-        if (actionId !== ""){
-            db.collection("Activity").doc(taskId).update({
-                TotalActions: totalActions,
-                TotalComments: totalComments,
-            });
-            db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
-                Type: type,
-                Comment: comment,
-                Date: date,
-                Time: time
-            });
-        }
-    }
-    else{
-        actionId = await db.collection("Activity").doc(taskId).get().then((doc) => {
-            totalActions = doc.data().TotalActions;
-            totalActions = totalActions+1;
-
-            return ("A" + totalActions);
-
-        });
-        if (actionId !== ""){
-            db.collection("Activity").doc(taskId).update({
-                TotalActions: totalActions,
-            });
-            db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
-                Type: type,
-                Comment: comment,
-                Date: date,
-                Time: time
-            });
-        }
-    }
-}
\ No newline at end of file
diff --git a/functions/editPageTaskAPI.js b/functions/editPageTaskAPI.js
deleted file mode 100644
index 69ab4c803..000000000
--- a/functions/editPageTaskAPI.js
+++ /dev/null
@@ -1,237 +0,0 @@
-const functions = require('firebase-functions');
-var cors = require('cors')({ origin: true });
-
-const admin = require('firebase-admin');
-
-const db = admin.firestore();
-
-exports.editPageTask = functions.https.onRequest((request, response) => {
-    cors(request, response, () => {
-        console.log(request);
-
-        var description = request.body.data.Description;
-        var priority = request.body.data.Priority;
-        var difficulty = request.body.data.Difficulty;
-        var assignee = request.body.data.Assignee;
-        var estimatedTime = request.body.data.EstimatedTime;
-        var category = request.body.data.Category;
-        var storyPointNumber = request.body.data.StoryPointNumber;
-        var editedSprintNumber = request.body.data.SprintNumber;
-        var previousId = request.body.data.PreviousId;
-        var creationDate = request.body.data.CreationDate;
-        var changedData = request.body.data.ChangedData;
-        var previousSprintId = createSprintId(previousId);
-        var taskId = request.body.data.Id;
-        var editedSprintId = createSprintId(editedSprintNumber);
-        var totalDevelopmentTask;
-        var totalBusinessTask;
-        var totalMarketingTask;
-        var totalOtherTask;
-        var totalNumberOfTask;
-        var result;
-        var totalUnCompletedTask;
-        var totalCompletedTask;
-        var sprintEditPromise;
-        var date = request.body.data.Date;
-        var time = request.body.data.Time;
-        var totalActions;
-        var actionId;
-        var type = "EDITED";
-        var comment = "Edited task details: ";
-
-
-        var promises = [];
-        if (editedSprintNumber !== previousId) {
-            comment += "Moved to sprint " + editedSprintId + ". ";
-            const p1 = db.collection("Main").doc(previousSprintId).get().then((doc) => {
-                totalNumberOfTask = doc.data().TotalNumberOfTask;
-                totalDevelopmentTask = doc.data().TotalDevelopmentTask;
-                totalBusinessTask = doc.data().TotalBusinessTask;
-                totalMarketingTask = doc.data().TotalMarketingTask;
-                totalOtherTask = doc.data().TotalOtherTask;
-                totalUnCompletedTask = doc.data().TotalUnCompletedTask;
-
-                if (category === "Development") {
-                    totalDevelopmentTask = totalDevelopmentTask - 1;
-                } else if (category === "Business") {
-                    totalBusinessTask = totalBusinessTask - 1;
-                } else if (category === "Marketing") {
-                    totalMarketingTask = totalMarketingTask - 1;
-                } else {
-                    totalOtherTask = totalOtherTask - 1;
-                }
-
-                totalNumberOfTask = totalNumberOfTask - 1;
-                totalUnCompletedTask = totalUnCompletedTask - 1;
-                var editSprintDeleteCounter = db.collection("Main").doc(previousSprintId).update({
-                    TotalDevelopmentTask: totalDevelopmentTask,
-                    TotalBusinessTask: totalBusinessTask,
-                    TotalMarketingTask: totalMarketingTask,
-                    TotalOtherTask: totalOtherTask,
-                    TotalNumberOfTask: totalNumberOfTask,
-                    TotalUnCompletedTask: totalUnCompletedTask
-                });
-
-                return Promise.resolve(editSprintDeleteCounter);
-            });
-            promises.push(p1);
-
-            const p2 = db.collection("Main").doc(editedSprintId).get().then((doc) => {
-                if (doc.exists) {
-                    totalNumberOfTask = doc.data().TotalNumberOfTask;
-                    totalDevelopmentTask = doc.data().TotalDevelopmentTask;
-                    totalBusinessTask = doc.data().TotalBusinessTask;
-                    totalMarketingTask = doc.data().TotalMarketingTask;
-                    totalOtherTask = doc.data().TotalOtherTask;
-                    totalUnCompletedTask = doc.data().TotalUnCompletedTask;
-
-                    if (category === "Development") {
-                        totalDevelopmentTask = totalDevelopmentTask + 1;
-                    } else if (category === "Business") {
-                        totalBusinessTask = totalBusinessTask + 1;
-                    } else if (category === "Marketing") {
-                        totalMarketingTask = totalMarketingTask + 1;
-                    } else {
-                        totalOtherTask = totalOtherTask + 1;
-                    }
-
-                    totalNumberOfTask = totalNumberOfTask + 1;
-                    totalUnCompletedTask = totalUnCompletedTask + 1;
-
-                    sprintEditPromise = db.collection("Main").doc(editedSprintId).update({
-                        TotalBusinessTask: totalBusinessTask,
-                        TotalDevelopmentTask: totalDevelopmentTask,
-                        TotalMarketingTask: totalMarketingTask,
-                        TotalOtherTask: totalOtherTask,
-                        TotalUnCompletedTask: totalUnCompletedTask,
-                        TotalNumberOfTask: totalNumberOfTask
-                    });
-                } else {
-                    totalBusinessTask = 0;
-                    totalDevelopmentTask = 0;
-                    totalMarketingTask = 0;
-                    totalOtherTask = 0;
-                    totalUnCompletedTask = 0;
-                    totalCompletedTask = 0;
-                    totalNumberOfTask = 0;
-
-                    if (category === "Development") {
-                        totalDevelopmentTask = totalDevelopmentTask + 1;
-                    } else if (category === "Business") {
-                        totalBusinessTask = totalBusinessTask + 1;
-                    } else if (category === "Marketing") {
-                        totalMarketingTask = totalMarketingTask + 1;
-                    } else {
-                        totalOtherTask = totalOtherTask + 1;
-                    }
-
-                    totalNumberOfTask = totalNumberOfTask + 1;
-                    totalUnCompletedTask = totalUnCompletedTask + 1;
-                    sprintEditPromise = db.collection("Main").doc(editedSprintId).set({
-                        TotalBusinessTask: totalBusinessTask,
-                        TotalDevelopmentTask: totalDevelopmentTask,
-                        TotalMarketingTask: totalMarketingTask,
-                        TotalOtherTask: totalOtherTask,
-                        TotalUnCompletedTask: totalUnCompletedTask,
-                        TotalCompletedTask: totalCompletedTask,
-                        TotalNumberOfTask: totalNumberOfTask
-                    });
-                }
-                return Promise.resolve(sprintEditPromise)
-            });
-            promises.push(p2);
-        }
-
-        var p3 = db.collection("Tasks").doc(taskId).update({
-                Description: description,
-                CreationDate: creationDate,
-                Priority: priority,
-                Difficulty: difficulty,
-                Assignee: assignee,
-                EstimatedTime: estimatedTime,
-                SprintNumber: editedSprintNumber,
-                StoryPointNumber: storyPointNumber
-        });
-        promises.push(p3);
-        comment = comment + changedData;
-        updateActivity(type, comment, taskId, date, time);
-
-        Promise.all(promises).then(() => {
-            result = { data: "OK" };
-            console.log("Document sucessfully written");
-            return response.status(200).send(result);
-        })
-        .catch((error) => {
-            result = { data: error };
-            console.log("error", error);
-            return response.status(500).send(result)
-        });
-    });
-});
-
-function createSprintId(sprintNumber) {
-    if (sprintNumber === -1) {
-        return "Backlog";
-    } else {
-        return ("S" + sprintNumber);
-    }
-}
-
-async function updateActivity(type, comment, taskId, date, time){
-    var actionId = "";
-    if(type === "CREATED") {
-        actionId = "A0";
-        db.collection("Activity").doc(taskId).set({
-            TaskId: taskId,
-            TotalActions: 0,
-            TotalComments: 0
-        });
-        db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
-            Type: type,
-            Comment: comment,
-            Date: date,
-            Time: time
-        });
-    }
-    else if (type === "COMMENT") {
-        actionId = await db.collection("Activity").doc(taskId).get().then((doc) => {
-            totalActions = doc.data().TotalActions;
-            totalActions = totalActions+1;
-            totalComments = doc.data().TotalComments;
-            totalComments = totalComments+1;
-            return ("A" + totalActions);
-        });
-        if (actionId !== ""){
-            db.collection("Activity").doc(taskId).update({
-                TotalActions: totalActions,
-                TotalComments: totalComments,
-            });
-            db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
-                Type: type,
-                Comment: comment,
-                Date: date,
-                Time: time
-            });
-        }
-    }
-    else{
-        actionId = await db.collection("Activity").doc(taskId).get().then((doc) => {
-            totalActions = doc.data().TotalActions;
-            totalActions = totalActions+1;
-
-            return ("A" + totalActions);
-
-        });
-        if (actionId !== ""){
-            db.collection("Activity").doc(taskId).update({
-                TotalActions: totalActions,
-            });
-            db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
-                Type: type,
-                Comment: comment,
-                Date: date,
-                Time: time
-            });
-        }
-    }
-}
\ No newline at end of file
diff --git a/functions/index.js b/functions/index.js
index 14cddc9ae..8dc53bdad 100644
--- a/functions/index.js
+++ b/functions/index.js
@@ -1,22 +1,10 @@
 const functions = require('firebase-functions');
+var cors = require('cors')({ origin: true });
+
 const admin = require('firebase-admin');
 admin.initializeApp();
-const createNewTaskAPI = require('./createNewTaskAPI');
-const startNewSprintAPI = require('./startNewSprintAPI');
-const logWorkAPI = require('./logWorkAPI');
-const editPageTaskAPI = require('./editPageTaskAPI');
-const deleteTaskAPI = require('./deleteTaskAPI');
-const createNewUserAPI = require('./createNewUserAPI');
-const updateSprintStatusAPI = require('./updateSprintStatusAPI');
-
-
-exports.createNewTask = createNewTaskAPI.createNewTask;
-exports.startNewSprint = startNewSprintAPI.startNewSprint;
-exports.logWork = logWorkAPI.logWork;
-exports.editPageTask = editPageTaskAPI.editPageTask;
-exports.deleteTask = deleteTaskAPI.deleteTask;
-exports.createNewUser = createNewUserAPI.createNewUser;
-exports.updateSprintStatus = updateSprintStatusAPI.updateSprintStatus;
+
+const db = admin.firestore();
 
 // class Task {
 //     constructor(id, title, status, priority, estimatedTime, difficulty, description, creator, category, assignee, logWorkTotalTime, workDone, creationDate, sprintNumber, storyPointNumber) {
@@ -38,3 +26,583 @@ exports.updateSprintStatus = updateSprintStatusAPI.updateSprintStatus;
 //     }
 // }
 
+
+exports.createNewTask = functions.https.onRequest((request, response) => {
+    cors(request, response, () => {
+        console.log(request);
+        var title = request.body.data.Title;
+        var des = request.body.data.Description;
+        var priority = request.body.data.Priority;
+        var difficulty = request.body.data.Difficulty;
+        var creator = request.body.data.Creator;
+        var assignee = request.body.data.Assignee;
+        var estimatedTime = parseInt(request.body.data.EstimatedTime);
+        var status = request.body.data.Status;
+        var category = request.body.data.Category;
+        var storyPointNumber = parseInt(request.body.data.StoryPointNumber);
+        var sprintNumber = parseInt(request.body.data.SprintNumber);
+        var creationDate = request.body.data.CreationDate;
+        var fullSprintId = createSprintId(sprintNumber);
+        var loggedWorkTotalTime = 0;
+        var workDone = 0;
+        var taskId = "";
+        var totalDevelopmentTask;
+        var totalBusinessTask;
+        var totalOtherTask;
+        var totalMarketingTask;
+        var totalNumberOfTask;
+        var result;
+        var totalUnCompletedTask = 0;
+        var sprintDataPromise;
+
+        const promise1 = db.collection("RawData").doc("AppDetails").get().then((doc) => {
+            totalNumberOfTask = doc.data().TotalNumberOfTask;
+            totalDevelopmentTask = doc.data().TotalDevelopmentTask;
+            totalBusinessTask = doc.data().TotalBusinessTask;
+            totalMarketingTask = doc.data().TotalMarketingTask;
+            totalOtherTask = doc.data().TotalOtherTask;
+            totalUnCompletedTask = doc.data().TotalUnCompletedTask;
+            if (category === "Development") {
+                totalDevelopmentTask = totalDevelopmentTask + 1;
+                taskId = category[0] + totalDevelopmentTask;
+            } else if (category === "Business") {
+                totalBusinessTask = totalBusinessTask + 1;
+                taskId = category[0] + totalBusinessTask;
+            } else if (category === "Marketing") {
+                totalMarketingTask = totalMarketingTask + 1;
+                taskId = category[0] + totalMarketingTask;
+            } else {
+                totalOtherTask = totalOtherTask + 1;
+                taskId = category[0] + totalOtherTask;
+            }
+            totalUnCompletedTask = totalUnCompletedTask + 1;
+            totalNumberOfTask = totalNumberOfTask + 1;
+            console.log(taskId);
+            const P1 = db.collection("Tasks").doc(taskId).set({
+                Id: taskId,
+                Title: title,
+                Description: des,
+                Priority: priority,
+                Difficulty: difficulty,
+                Creator: creator,
+                Assignee: assignee,
+                EstimatedTime: estimatedTime,
+                Status: status,
+                Category: category,
+                LogWorkTotalTime: loggedWorkTotalTime,
+                WorkDone: workDone,
+                SprintNumber: sprintNumber,
+                StoryPointNumber: storyPointNumber,
+                CreationDate: creationDate
+            });
+            const P2 = db.collection("RawData").doc("AppDetails").update({
+                TotalDevelopmentTask: totalDevelopmentTask,
+                TotalBusinessTask: totalBusinessTask,
+                TotalMarketingTask: totalMarketingTask,
+                TotalOtherTask: totalOtherTask,
+                TotalNumberOfTask: totalNumberOfTask,
+                TotalUnCompletedTask: totalUnCompletedTask
+            });
+            const Promises = [P1,P2];
+            return Promise.all(Promises);
+        });
+
+        const promise2 = db.collection("Main").doc(fullSprintId).get().then((doc) => {
+            if (doc.exists) {
+                totalNumberOfTask = doc.data().TotalNumberOfTask;
+                totalDevelopmentTask = doc.data().TotalDevelopmentTask;
+                totalBusinessTask = doc.data().TotalBusinessTask;
+                totalOtherTask = doc.data().TotalOtherTask;
+                totalMarketingTask = doc.data().TotalMarketingTask;
+                totalUnCompletedTask = doc.data().TotalUnCompletedTask;
+
+                if (category === "Development") {
+                    totalDevelopmentTask = totalDevelopmentTask + 1;
+                } else if (category === "Business") {
+                    totalBusinessTask = totalBusinessTask + 1;
+                } else if (category === "Marketing") {
+                    totalMarketingTask = totalMarketingTask + 1;
+                } else {
+                    totalOtherTask = totalOtherTask + 1;
+                }
+
+                totalNumberOfTask = totalNumberOfTask + 1;
+                totalUnCompletedTask = totalUnCompletedTask + 1;
+
+
+                sprintDataPromise = db.collection("Main").doc(fullSprintId).update({
+                    TotalBusinessTask: totalBusinessTask,
+                    TotalDevelopmentTask: totalDevelopmentTask,
+                    TotalMarketingTask: totalMarketingTask,
+                    TotalOtherTask: totalOtherTask,
+                    TotalUnCompletedTask: totalUnCompletedTask,
+                    TotalNumberOfTask: totalNumberOfTask
+                });
+            } else {
+                totalBusinessTask = 0;
+                totalDevelopmentTask = 0;
+                totalMarketingTask = 0;
+                totalOtherTask = 0;
+                totalUnCompletedTask = 0;
+                totalCompletedTask = 0;
+                totalNumberOfTask = 0;
+
+                if (category === "Development") {
+                    totalDevelopmentTask = totalDevelopmentTask + 1;
+                } else if (category === "Business") {
+                    totalBusinessTask = totalBusinessTask + 1;
+                } else if (category === "Marketing") {
+                    totalMarketingTask = totalMarketingTask + 1;
+                } else {
+                    totalOtherTask = totalOtherTask + 1;
+                }
+
+
+                totalNumberOfTask = totalNumberOfTask + 1;
+                totalUnCompletedTask = totalUnCompletedTask + 1;
+
+                sprintDataPromise = db.collection("Main").doc(fullSprintId).set({
+                    EndDate: "xx/xx/xxxx",
+                    StartDate: "xx/xx/xxxx",
+                    Status: "Not Started",
+                    TotalBusinessTask: totalBusinessTask,
+                    TotalDevelopmentTask: totalDevelopmentTask,
+                    TotalMarketingTask: totalMarketingTask,
+                    TotalOtherTask: totalOtherTask,
+                    TotalUnCompletedTask: totalUnCompletedTask,
+                    TotalCompletedTask: totalCompletedTask,
+                    TotalNumberOfTask: totalNumberOfTask
+                });
+
+            }
+            return Promise.resolve(sprintDataPromise);
+        });
+        const newTaskPromises = [promise1, promise2];
+        Promise.all(newTaskPromises).then(() => {
+                result = { data: "OK!" }
+                console.log("Document successfully written!");
+                return response.status(200).send(result);
+            })
+        .catch((error) => {
+            result = { data: error };
+            console.error("Error writing document: ", error);
+            return response.status(500).send(result);
+        });
+    });
+});
+
+exports.startNewSprint = functions.https.onRequest((request, response) => {
+    cors(request, response, () => {
+        console.log(request);
+
+        var status = request.body.data.Status;
+        var startDate = request.body.data.StartDate;
+        var endDate = request.body.data.EndDate;
+        var totalDevelopment = parseInt(request.body.data.TotalDevelopment);
+        var totalBusiness = parseInt(request.body.data.TotalBusiness);
+        var totalMarketing = parseInt(request.body.data.TotalMarketing);
+        var totalOther = parseInt(request.body.data.TotalOther);
+        var newSprintId = parseInt(request.body.data.NewSprintId);
+        var newSprintIdString = "S" + newSprintId.toString();
+        var createSprintPromise;
+        var result;
+
+        console.log("End Date from Backend: " + endDate);
+        console.log("Start Date from Backend: " + startDate);
+        console.log("Status from Backend: " + status);
+
+        const p1 = db.collection("Main").doc(newSprintIdString).get().then((doc) => {
+            if (doc.exists) {
+                createSprintPromise = db.collection("Main").doc(newSprintIdString).update({
+                    TotalDevelopmentTask: totalDevelopment,
+                    TotalBusinessTask: totalBusiness,
+                    TotalMarketingTask: totalMarketing,
+                    TotalOtherTask: totalOther,
+                    EndDate: endDate,
+                    StartDate: startDate,
+                    Status: status
+                });
+            } else {
+                var totalUnCompletedTask = 0;
+                var totalCompletedTask = 0;
+                var totalNumberOfTask = 0;
+
+                createSprintPromise = db.collection("Main").doc(newSprintIdString).set({
+                    TotalDevelopmentTask: totalDevelopment,
+                    TotalBusinessTask: totalBusiness,
+                    TotalMarketingTask: totalMarketing,
+                    TotalOtherTask: totalOther,
+                    EndDate: endDate,
+                    StartDate: startDate,
+                    Status: status,
+                    TotalUnCompletedTask: totalUnCompletedTask,
+                    TotalCompletedTask: totalCompletedTask,
+                    TotalNumberOfTask: totalNumberOfTask
+                });
+            }
+            return Promise.resolve(createSprintPromise);
+        });
+        const p2 = db.collection("RawData").doc("AppDetails").update({
+            CurrentSprintId: newSprintId
+        });
+        const Promises = [p1,p2];
+        return Promise.all(Promises).then(() => {
+            console.log("Sprint started successfully");
+            result = { data: "OK" }
+            console.log("Document successfully written!");
+            return response.status(200).send(result);
+        })
+        .catch((error) => {
+            result = { data: error }
+            console.log("error", error);
+            return response.status(500).send(result);
+        });
+    });
+});
+
+exports.logWork = functions.https.onRequest((request, response) => {
+    cors(request, response, () => {
+        var status = request.body.data.LogWorkStatus;
+        var taskId = request.body.data.LogTaskId;
+        var logHours = parseInt(request.body.data.LogHours);
+        var workDone = parseInt(request.body.data.LogWorkDone);
+        var sprintNumber = parseInt(request.body.data.SprintNumber);
+        // var logWorkComment = request.body.data.LogWorkComment;
+        var fullSprintId = createSprintId(sprintNumber);
+        var logWorkTotalTime;
+
+        const promise1 = db.collection("Tasks").doc(taskId).get().then((doc) => {
+            logWorkTotalTime = parseInt(doc.data().LogWorkTotalTime);
+            logWorkTotalTime = parseInt(logWorkTotalTime) + parseInt(logHours);
+
+            var updatePromise = db.collection("Tasks").doc(taskId).update({
+                LogWorkTotalTime: logWorkTotalTime,
+                WorkDone: workDone,
+                Status: status
+            });
+            return Promise.resolve(updatePromise);
+        });
+        const promise2 = db.collection("RawData").doc("AppDetails").get().then((doc) => {
+            totalCompletedTask = parseInt(doc.data().TotalCompletedTask);
+            totalUnCompletedTask = parseInt(doc.data().TotalUnCompletedTask);
+            if (status === "Completed") {
+                totalCompletedTask = totalCompletedTask + 1;
+                totalUnCompletedTask = totalUnCompletedTask - 1;
+            }
+            var updateStatus = db.collection("RawData").doc("AppDetails").update({
+                TotalCompletedTask: totalCompletedTask,
+                TotalUnCompletedTask: totalUnCompletedTask
+            });
+            return Promise.resolve(updateStatus);
+        });
+        const promise3 = db.collection("Main").doc(fullSprintId).get().then((doc) => {
+            totalCompletedTask = parseInt(doc.data().TotalCompletedTask);
+            totalUnCompletedTask = parseInt(doc.data().TotalUnCompletedTask);
+
+            if (status === "Completed") {
+                totalCompletedTask = totalCompletedTask + 1;
+                totalUnCompletedTask = totalUnCompletedTask - 1;
+            }
+            var updateSprintstatus = db.collection("Main").doc(fullSprintId).update({
+                TotalCompletedTask: totalCompletedTask,
+                TotalUnCompletedTask: totalUnCompletedTask
+            });
+            return Promise.resolve(updateSprintstatus);
+        });
+        const logWorkPromises = [promise1, promise2, promise3];
+        Promise.all(logWorkPromises).then(() => {
+                result = { data: "OK" }
+                console.log("Document successfully written!");
+                return response.status(200).send(result);
+            })
+            .catch((error) => {
+                var result = { data: error };
+                console.log("error", error);
+                return response.status(500).send(result)
+            });
+    });
+});
+
+exports.editPageTask = functions.https.onRequest((request, response) => {
+    cors(request, response, () => {
+        console.log(request);
+
+        var description = request.body.data.Description;
+        var priority = request.body.data.Priority;
+        var difficulty = request.body.data.Difficulty;
+        var assignee = request.body.data.Assignee;
+        var estimatedTime = request.body.data.EstimatedTime;
+        var category = request.body.data.Category;
+        var storyPointNumber = request.body.data.StoryPointNumber;
+        var editedSprintNumber = request.body.data.SprintNumber;
+        var previousId = request.body.data.PreviousId;
+        var creationDate = request.body.data.CreationDate;
+        var previousSprintId = createSprintId(previousId);
+        var taskId = request.body.data.Id;
+        var editedSprintId = createSprintId(editedSprintNumber);
+        var totalDevelopmentTask;
+        var totalBusinessTask;
+        var totalMarketingTask;
+        var totalOtherTask;
+        var totalNumberOfTask;
+        var result;
+        var totalUnCompletedTask;
+        var totalCompletedTask;
+        var sprintEditPromise;
+
+        var promises = [];
+        if (editedSprintNumber !== previousId) {
+            const p1 = db.collection("Main").doc(previousSprintId).get().then((doc) => {
+                totalNumberOfTask = doc.data().TotalNumberOfTask;
+                totalDevelopmentTask = doc.data().TotalDevelopmentTask;
+                totalBusinessTask = doc.data().TotalBusinessTask;
+                totalMarketingTask = doc.data().TotalMarketingTask;
+                totalOtherTask = doc.data().TotalOtherTask;
+                totalUnCompletedTask = doc.data().TotalUnCompletedTask;
+
+                if (category === "Development") {
+                    totalDevelopmentTask = totalDevelopmentTask - 1;
+                } else if (category === "Business") {
+                    totalBusinessTask = totalBusinessTask - 1;
+                } else if (category === "Marketing") {
+                    totalMarketingTask = totalMarketingTask - 1;
+                } else {
+                    totalOtherTask = totalOtherTask - 1;
+                }
+
+                totalNumberOfTask = totalNumberOfTask - 1;
+                totalUnCompletedTask = totalUnCompletedTask - 1;
+                var editSprintDeleteCounter = db.collection("Main").doc(previousSprintId).update({
+                    TotalDevelopmentTask: totalDevelopmentTask,
+                    TotalBusinessTask: totalBusinessTask,
+                    TotalMarketingTask: totalMarketingTask,
+                    TotalOtherTask: totalOtherTask,
+                    TotalNumberOfTask: totalNumberOfTask,
+                    TotalUnCompletedTask: totalUnCompletedTask
+                });
+
+                return Promise.resolve(editSprintDeleteCounter);
+            });
+            promises.push(p1);
+
+            const p2 = db.collection("Main").doc(editedSprintId).get().then((doc) => {
+                if (doc.exists) {
+                    totalNumberOfTask = doc.data().TotalNumberOfTask;
+                    totalDevelopmentTask = doc.data().TotalDevelopmentTask;
+                    totalBusinessTask = doc.data().TotalBusinessTask;
+                    totalMarketingTask = doc.data().TotalMarketingTask;
+                    totalOtherTask = doc.data().TotalOtherTask;
+                    totalUnCompletedTask = doc.data().TotalUnCompletedTask;
+
+                    if (category === "Development") {
+                        totalDevelopmentTask = totalDevelopmentTask + 1;
+                    } else if (category === "Business") {
+                        totalBusinessTask = totalBusinessTask + 1;
+                    } else if (category === "Marketing") {
+                        totalMarketingTask = totalMarketingTask + 1;
+                    } else {
+                        totalOtherTask = totalOtherTask + 1;
+                    }
+
+                    totalNumberOfTask = totalNumberOfTask + 1;
+                    totalUnCompletedTask = totalUnCompletedTask + 1;
+
+                    sprintEditPromise = db.collection("Main").doc(editedSprintId).update({
+                        TotalBusinessTask: totalBusinessTask,
+                        TotalDevelopmentTask: totalDevelopmentTask,
+                        TotalMarketingTask: totalMarketingTask,
+                        TotalOtherTask: totalOtherTask,
+                        TotalUnCompletedTask: totalUnCompletedTask,
+                        TotalNumberOfTask: totalNumberOfTask
+                    });
+                } else {
+                    totalBusinessTask = 0;
+                    totalDevelopmentTask = 0;
+                    totalMarketingTask = 0;
+                    totalOtherTask = 0;
+                    totalUnCompletedTask = 0;
+                    totalCompletedTask = 0;
+                    totalNumberOfTask = 0;
+
+                    if (category === "Development") {
+                        totalDevelopmentTask = totalDevelopmentTask + 1;
+                    } else if (category === "Business") {
+                        totalBusinessTask = totalBusinessTask + 1;
+                    } else if (category === "Marketing") {
+                        totalMarketingTask = totalMarketingTask + 1;
+                    } else {
+                        totalOtherTask = totalOtherTask + 1;
+                    }
+
+                    totalNumberOfTask = totalNumberOfTask + 1;
+                    totalUnCompletedTask = totalUnCompletedTask + 1;
+                    sprintEditPromise = db.collection("Main").doc(editedSprintId).set({
+                        TotalBusinessTask: totalBusinessTask,
+                        TotalDevelopmentTask: totalDevelopmentTask,
+                        TotalMarketingTask: totalMarketingTask,
+                        TotalOtherTask: totalOtherTask,
+                        TotalUnCompletedTask: totalUnCompletedTask,
+                        TotalCompletedTask: totalCompletedTask,
+                        TotalNumberOfTask: totalNumberOfTask
+                    });
+                }
+                return Promise.resolve(sprintEditPromise)
+            });
+            promises.push(p2);
+        }
+        var p3 = db.collection("Tasks").doc(taskId).update({
+                Description: description,
+                CreationDate: creationDate,
+                Priority: priority,
+                Difficulty: difficulty,
+                Assignee: assignee,
+                EstimatedTime: estimatedTime,
+                SprintNumber: editedSprintNumber,
+                StoryPointNumber: storyPointNumber
+        });
+        promises.push(p3);
+
+        Promise.all(promises).then(() => {
+            result = { data: "OK" };
+            console.log("Document sucessfully written");
+            return response.status(200).send(result);
+        })
+        .catch((error) => {
+            result = { data: error };
+            console.log("error", error);
+            return response.status(500).send(result)
+        });
+    });
+});
+
+exports.deleteTask = functions.https.onRequest((request, response) => {
+    cors(request, response, () => {
+        console.log(request);
+
+        var sprintNumber = request.body.data.SprintNumber;
+        var taskId = request.body.data.Id;
+        var fullSprintId = createSprintId(sprintNumber);
+        var category = request.body.data.Category;
+        var status = request.body.data.Status;
+        var totalDevelopmentTask;
+        var totalBusinessTask;
+        var totalMarketingTask;
+        var totalOtherTask;
+        var totalNumberOfTask;
+        var result;
+        var totalCompletedTask;
+        var totalUnCompletedTask;
+
+        const p1 = db.collection("Tasks").doc(taskId).update({
+            Category: "Trash",
+            SprintNumber: -2
+        });
+        
+        const p2 = db.collection("Main").doc(fullSprintId).get().then((doc) => {
+            totalNumberOfTask = doc.data().TotalNumberOfTask;
+            totalDevelopmentTask = doc.data().TotalDevelopmentTask;
+            totalBusinessTask = doc.data().TotalBusinessTask;
+            totalMarketingTask = doc.data().TotalMarketingTask;
+            totalOtherTask = doc.data().TotalOtherTask
+            totalCompletedTask = doc.data().TotalCompletedTask;
+            totalUnCompletedTask = doc.data().TotalUnCompletedTask;
+
+            if (category === "Development") {
+                totalDevelopmentTask = totalDevelopmentTask - 1;
+            } else if (category === "Business") {
+                totalBusinessTask = totalBusinessTask - 1;
+            } else if (category === "Marketing") {
+                totalMarketingTask = totalMarketingTask - 1;
+            } else {
+                totalOtherTask = totalOtherTask -1;
+            }
+            totalNumberOfTask = totalNumberOfTask - 1;
+            status === "Completed" ? totalCompletedTask = totalCompletedTask - 1 : totalUnCompletedTask = totalUnCompletedTask - 1;
+            var updateDeleteTaskCounter = db.collection("Main").doc(fullSprintId).update({
+                TotalDevelopmentTask: totalDevelopmentTask,
+                TotalBusinessTask: totalBusinessTask,
+                TotalMarketingTask: totalMarketingTask,
+                TotalOtherTask: totalOtherTask,
+                TotalNumberOfTask: totalNumberOfTask,
+                TotalCompletedTask: totalCompletedTask,
+                TotalUnCompletedTask: totalUnCompletedTask
+            });
+            return Promise.resolve(updateDeleteTaskCounter);
+        });
+        const deleteTaskPromises = [p1, p2];
+        Promise.all(deleteTaskPromises).then(() => {
+                result = { data: "OK" };
+                console.log("Document sucessfully deleted");
+                return response.status(200).send(result);
+            })
+            .catch((error) => {
+                result = { data: error };
+                console.log("error", error);
+                return response.status(500).send(result)
+            });
+    });
+});
+
+function createSprintId(sprintNumber) {
+    if (sprintNumber === -1) {
+        return "Backlog";
+    } else {
+        return ("S" + sprintNumber);
+    }
+}
+exports.createNewUser = functions.https.onRequest((request, response) => {
+    cors(request, response, () => {
+        console.log(request);
+        const user = request.body.data;
+        const Uid = user.uid;
+        const PhotoURL = user.photoURL;
+        const DisplayName = user.displayName;
+        const Email = user.email;
+        const PhoneNumber = user.phoneNumber;
+        const ProviderId = user.providerId;
+
+        db.collection("Users").doc(Uid).get().then((doc) => {
+                if (doc.exists) {
+                    const userData = db.collection("Users").doc(Uid).update({
+                        uid: Uid,
+                        photoURL: PhotoURL,
+                        displayName: DisplayName,
+                        email: Email,
+                        phoneNumber: PhoneNumber,
+                        providerId: ProviderId
+                    });
+                    return Promise.resolve(userData);
+                } else {
+                    const userData = db.collection("Users").doc(Uid).set({
+                        uid: Uid,
+                        photoURL: PhotoURL,
+                        displayName: DisplayName,
+                        email: Email,
+                        phoneNumber: PhoneNumber,
+                        providerId: ProviderId
+                    });
+                    return Promise.resolve(userData);
+                }
+            }).then(() => {
+                result = { data: "User Logged In Successfully" };
+                console.log("Document successfully written");
+                return response.status(200).send(result);
+            })
+            .catch((error) => {
+                result = { data: error };
+                console.log("error", error);
+                return response.status(500).send(result)
+            });
+    });
+});
+
+exports.updateSprintStatus = functions.https.onRequest((request, response) => {
+    cors(request, response, () => {
+        var sprintStatus = request.body.data.SprintStatus;
+        var currentSprintName = request.body.data.CurrentSprintName;
+        console.log(currentSprintName);
+        db.collection("Main").doc(currentSprintName).update({
+            Status: sprintStatus,
+        });
+    });
+})
\ No newline at end of file
diff --git a/functions/logWorkAPI.js b/functions/logWorkAPI.js
deleted file mode 100644
index 1160b7a42..000000000
--- a/functions/logWorkAPI.js
+++ /dev/null
@@ -1,143 +0,0 @@
-const functions = require('firebase-functions');
-var cors = require('cors')({ origin: true });
-
-const admin = require('firebase-admin');
-
-const db = admin.firestore();
-
-exports.logWork = functions.https.onRequest((request, response) => {
-    cors(request, response, () => {
-        var status = request.body.data.LogWorkStatus;
-        var taskId = request.body.data.LogTaskId;
-        var logHours = parseInt(request.body.data.LogHours);
-        var workDone = parseInt(request.body.data.LogWorkDone);
-        var sprintNumber = parseInt(request.body.data.SprintNumber);
-        var logWorkComment = request.body.data.LogWorkComment;
-        var date = request.body.data.Date;
-        var time = request.body.data.Time;
-        var fullSprintId = createSprintId(sprintNumber);
-        var logWorkTotalTime;
-        var totalActions;
-        var totalComments;
-        var actionId;
-
-        const promise1 = db.collection("Tasks").doc(taskId).get().then((doc) => {
-            logWorkTotalTime = parseInt(doc.data().LogWorkTotalTime);
-            logWorkTotalTime = parseInt(logWorkTotalTime) + parseInt(logHours);
-
-            var updatePromise = db.collection("Tasks").doc(taskId).update({
-                LogWorkTotalTime: logWorkTotalTime,
-                WorkDone: workDone,
-                Status: status
-            });
-            return Promise.resolve(updatePromise);
-        });
-        const promise2 = db.collection("RawData").doc("AppDetails").get().then((doc) => {
-            totalCompletedTask = parseInt(doc.data().TotalCompletedTask);
-            totalUnCompletedTask = parseInt(doc.data().TotalUnCompletedTask);
-            if (status === "Completed") {
-                totalCompletedTask = totalCompletedTask + 1;
-                totalUnCompletedTask = totalUnCompletedTask - 1;
-            }
-            var updateStatus = db.collection("RawData").doc("AppDetails").update({
-                TotalCompletedTask: totalCompletedTask,
-                TotalUnCompletedTask: totalUnCompletedTask
-            });
-            return Promise.resolve(updateStatus);
-        });
-        const promise3 = db.collection("Main").doc(fullSprintId).get().then((doc) => {
-            totalCompletedTask = parseInt(doc.data().TotalCompletedTask);
-            totalUnCompletedTask = parseInt(doc.data().TotalUnCompletedTask);
-
-            if (status === "Completed") {
-                totalCompletedTask = totalCompletedTask + 1;
-                totalUnCompletedTask = totalUnCompletedTask - 1;
-            }
-            var updateSprintstatus = db.collection("Main").doc(fullSprintId).update({
-                TotalCompletedTask: totalCompletedTask,
-                TotalUnCompletedTask: totalUnCompletedTask
-            });
-            return Promise.resolve(updateSprintstatus);
-        });
-        updateActivity("COMMENT", logWorkComment, taskId, date, time);
-        
-        const logWorkPromises = [promise1, promise2, promise3];
-        Promise.all(logWorkPromises).then(() => {
-                result = { data: "OK" }
-                console.log("Document successfully written!");
-                return response.status(200).send(result);
-            })
-            .catch((error) => {
-                var result = { data: error };
-                console.log("error", error);
-                return response.status(500).send(result)
-            });
-    });
-});
-
-function createSprintId(sprintNumber) {
-    if (sprintNumber === -1) {
-        return "Backlog";
-    } else {
-        return ("S" + sprintNumber);
-    }
-}
-
-async function updateActivity(type, comment, taskId, date, time){
-    var actionId = "";
-    if(type === "CREATED") {
-        actionId = "A0";
-        db.collection("Activity").doc(taskId).set({
-            TaskId: taskId,
-            TotalActions: 0,
-            TotalComments: 0
-        });
-        db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
-            Type: type,
-            Comment: comment,
-            Date: date,
-            Time: time
-        });
-    }
-    else if (type === "COMMENT") {
-        actionId = await db.collection("Activity").doc(taskId).get().then((doc) => {
-            totalActions = doc.data().TotalActions;
-            totalActions = totalActions+1;
-            totalComments = doc.data().TotalComments;
-            totalComments = totalComments+1;
-            return ("A" + totalActions);
-        });
-        if (actionId !== ""){
-            db.collection("Activity").doc(taskId).update({
-                TotalActions: totalActions,
-                TotalComments: totalComments,
-            });
-            db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
-                Type: type,
-                Comment: comment,
-                Date: date,
-                Time: time
-            });
-        }
-    }
-    else{
-        actionId = await db.collection("Activity").doc(taskId).get().then((doc) => {
-            totalActions = doc.data().TotalActions;
-            totalActions = totalActions+1;
-
-            return ("A" + totalActions);
-
-        });
-        if (actionId !== ""){
-            db.collection("Activity").doc(taskId).update({
-                TotalActions: totalActions,
-            });
-            db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
-                Type: type,
-                Comment: comment,
-                Date: date,
-                Time: time
-            });
-        }
-    }
-}
\ No newline at end of file
diff --git a/functions/startNewSprintAPI.js b/functions/startNewSprintAPI.js
deleted file mode 100644
index 5da7fe2c2..000000000
--- a/functions/startNewSprintAPI.js
+++ /dev/null
@@ -1,76 +0,0 @@
-const functions = require('firebase-functions');
-var cors = require('cors')({ origin: true });
-
-const admin = require('firebase-admin');
-
-const db = admin.firestore();
-
-exports.startNewSprint = functions.https.onRequest((request, response) => {
-    cors(request, response, () => {
-        console.log(request);
-
-        var status = request.body.data.Status;
-        var startDate = request.body.data.StartDate;
-        var endDate = request.body.data.EndDate;
-        var totalDevelopment = parseInt(request.body.data.TotalDevelopment);
-        var totalBusiness = parseInt(request.body.data.TotalBusiness);
-        var totalMarketing = parseInt(request.body.data.TotalMarketing);
-        var totalOther = parseInt(request.body.data.TotalOther);
-        var newSprintId = parseInt(request.body.data.NewSprintId);
-        var newSprintIdString = "S" + newSprintId.toString();
-        var createSprintPromise;
-        var result;
-
-        console.log("End Date from Backend: " + endDate);
-        console.log("Start Date from Backend: " + startDate);
-        console.log("Status from Backend: " + status);
-
-        const p1 = db.collection("Main").doc(newSprintIdString).get().then((doc) => {
-            if (doc.exists) {
-                createSprintPromise = db.collection("Main").doc(newSprintIdString).update({
-                    TotalDevelopmentTask: totalDevelopment,
-                    TotalBusinessTask: totalBusiness,
-                    TotalMarketingTask: totalMarketing,
-                    TotalOtherTask: totalOther,
-                    EndDate: endDate,
-                    StartDate: startDate,
-                    Status: status
-                });
-            } else {
-                var totalUnCompletedTask = 0;
-                var totalCompletedTask = 0;
-                var totalNumberOfTask = 0;
-
-                createSprintPromise = db.collection("Main").doc(newSprintIdString).set({
-                    TotalDevelopmentTask: totalDevelopment,
-                    TotalBusinessTask: totalBusiness,
-                    TotalMarketingTask: totalMarketing,
-                    TotalOtherTask: totalOther,
-                    EndDate: endDate,
-                    StartDate: startDate,
-                    Status: status,
-                    TotalUnCompletedTask: totalUnCompletedTask,
-                    TotalCompletedTask: totalCompletedTask,
-                    TotalNumberOfTask: totalNumberOfTask
-                });
-            }
-            return Promise.resolve(createSprintPromise);
-        });
-        const p2 = db.collection("RawData").doc("AppDetails").update({
-            CurrentSprintId: newSprintId
-        });
-        const Promises = [p1,p2];
-        return Promise.all(Promises).then(() => {
-            console.log("Sprint started successfully");
-            result = { data: "OK" }
-            console.log("Document successfully written!");
-            return response.status(200).send(result);
-        })
-        .catch((error) => {
-            result = { data: error }
-            console.log("error", error);
-            return response.status(500).send(result);
-        });
-    });
-});
-
diff --git a/functions/updateSprintStatusAPI.js b/functions/updateSprintStatusAPI.js
deleted file mode 100644
index 71f8de785..000000000
--- a/functions/updateSprintStatusAPI.js
+++ /dev/null
@@ -1,17 +0,0 @@
-const functions = require('firebase-functions');
-var cors = require('cors')({ origin: true });
-
-const admin = require('firebase-admin');
-
-const db = admin.firestore();
-
-exports.updateSprintStatus = functions.https.onRequest((request, response) => {
-    cors(request, response, () => {
-        var sprintStatus = request.body.data.SprintStatus;
-        var currentSprintName = request.body.data.CurrentSprintName;
-        console.log(currentSprintName);
-        db.collection("Main").doc(currentSprintName).update({
-            Status: sprintStatus,
-        });
-    });
-})
diff --git a/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.ts b/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.ts
index 7ce0ae35d..6d9d6156c 100644
--- a/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.ts
+++ b/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.ts
@@ -3,7 +3,6 @@ import { AngularFireFunctions } from '@angular/fire/functions';
 import { NgForm } from '@angular/forms';
 import { Router } from '@angular/router';
 import { ValidationService } from '../../services/validation.service';
-import { ToolsService } from '../../services/tools.service';
 import { Location } from '@angular/common';
 
 @Component({
@@ -27,14 +26,18 @@ export class CreateNewSessionComponent implements OnInit {
   status: string
   sprintNumber: number
   storyPoint: number
-  time: string
   enableLoader: boolean = false
   valid: boolean = true;
 
-  constructor(private functions: AngularFireFunctions, public validationService: ValidationService, private router: Router, private location: Location, public toolsService: ToolsService) { }
+  constructor(private functions: AngularFireFunctions, public validationService: ValidationService, private router: Router, private location: Location) { }
   ngOnInit(): void {
-    this.todayDate = this.toolsService.date();
-    this.time = this.toolsService.time();
+    var today = new Date();
+
+    var dd = String(today.getDate()).padStart(2, '0');
+    var mm = String(today.getMonth() + 1).padStart(2, '0');
+    var yyyy = today.getFullYear();
+
+    this.todayDate = dd + "/" + mm + "/" + yyyy;
   }
 
   async submit(){
@@ -66,7 +69,7 @@ export class CreateNewSessionComponent implements OnInit {
     const callable = this.functions.httpsCallable('createNewTask');
 
     try {
-      const result = await callable({ Title: this.title, Description: this.description, Priority: this.priority, Difficulty: this.difficulty, Creator: this.creatorName, Assignee: this.assigneeName, EstimatedTime: this.estimatedTime, Status: this.status, Category: this.category, SprintNumber: this.sprintNumber, StoryPointNumber: this.storyPoint, CreationDate: this.todayDate, Time: this.time }).toPromise();
+      const result = await callable({ Title: this.title, Description: this.description, Priority: this.priority, Difficulty: this.difficulty, Creator: this.creatorName, Assignee: this.assigneeName, EstimatedTime: this.estimatedTime, Status: this.status, Category: this.category, SprintNumber: this.sprintNumber, StoryPointNumber: this.storyPoint, CreationDate: this.todayDate }).toPromise();
 
       console.log("Successfully created the task");
       console.log(result);
diff --git a/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.ts b/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.ts
index a225472cd..c81721079 100644
--- a/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.ts
+++ b/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.ts
@@ -4,7 +4,6 @@ import { NgForm } from '@angular/forms';
 import { Tasks } from 'src/app/Interface/TasksInterface';
 import { Router } from '@angular/router';
 import { ValidationService } from '../../../services/validation.service';
-import { ToolsService } from '../../../services/tools.service';
 
 
 @Component({
@@ -21,22 +20,12 @@ export class EditPageComponent implements OnInit {
   editTask: Tasks
   previousSprintId: number
   enableLoader: boolean = false
-  todayDate: string
-  time: string
-  changedData: string = ""
-  prevVal =[]
-  newVal =[]
 
-  constructor(private functions: AngularFireFunctions, private router: Router, public validationService: ValidationService, public toolsService: ToolsService) { }
+  constructor(private functions: AngularFireFunctions, private router: Router, public validationService: ValidationService) { }
 
   ngOnInit(): void {
-
-    this.todayDate = this.toolsService.date();
-    this.time = this.toolsService.time();
-
     this.editTask = this.task;
     this.previousSprintId = this.task.SprintNumber;
-    this.prevVal = [this.task.Description, this.task.Assignee, this.task.EstimatedTime, this.task.Priority, this.task.Difficulty, this.task.StoryPointNumber];
   }
 
   async submit(){
@@ -51,8 +40,6 @@ export class EditPageComponent implements OnInit {
       return res;});
     if(condition)
     {
-      this.newVal = [this.editTask.Description, this.editTask.Assignee, this.editTask.EstimatedTime, this.editTask.Priority, this.editTask.Difficulty, this.editTask.StoryPointNumber];
-      this.generateChanges();
       console.log("Inputs are valid");
       this.editPage();
     }
@@ -60,26 +47,6 @@ export class EditPageComponent implements OnInit {
     console.log("Page not edited due to validation error");
   }
 
-async generateChanges() {
-  console.log(this.editTask, this.task);
-    if(this.prevVal[0] != this.newVal[0])
-      this.changedData = this.changedData + " description,";
-    if(this.prevVal[1] != this.newVal[1])
-      this.changedData = this.changedData + " assignee," ;
-    if(this.prevVal[2] != this.newVal[2])
-      this.changedData = this.changedData + " estimated-time," ;
-    if(this.prevVal[3] != this.newVal[3])
-      this.changedData = this.changedData + " priority," ;
-    if(this.prevVal[4] != this.newVal[4])
-      this.changedData = this.changedData + " difficulty," ;
-    if(this.prevVal[5] != this.newVal[5])
-      this.changedData = this.changedData + " story-point,";
-    if(this.changedData != "")
-      this.changedData = "Edited-" + this.changedData;
-      this.changedData = this.changedData.substring(0,this.changedData.length-1) + "."
-    console.log(this.changedData);
-  }
-
   async editPage() {
     this.enableLoader = true
     const callable = this.functions.httpsCallable('editPageTask');
@@ -91,7 +58,7 @@ async generateChanges() {
 
       console.log(this.editTask.SprintNumber);
       if (!(this.task.Status === "Completed")) {
-        const result = await callable({ Id: this.editTask.Id, Description: this.editTask.Description, Priority: this.editTask.Priority, Difficulty: this.editTask.Difficulty, Assignee: this.editTask.Assignee, EstimatedTime: this.editTask.EstimatedTime, Category: this.task.Category, SprintNumber: this.editTask.SprintNumber, StoryPointNumber: this.editTask.StoryPointNumber, PreviousId: this.previousSprintId, CreationDate: this.editTask.CreationDate, Date: this.todayDate, Time: this.time, ChangedData: this.changedData}).toPromise();
+        const result = await callable({ Id: this.editTask.Id, Description: this.editTask.Description, Priority: this.editTask.Priority, Difficulty: this.editTask.Difficulty, Assignee: this.editTask.Assignee, EstimatedTime: this.editTask.EstimatedTime, Category: this.task.Category, SprintNumber: this.editTask.SprintNumber, StoryPointNumber: this.editTask.StoryPointNumber, PreviousId: this.previousSprintId, CreationDate: this.editTask.CreationDate }).toPromise();
         console.log("Successfully Updated the task");
         console.log(result);
         this.editTaskDone();
diff --git a/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.ts b/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.ts
index 2031bdc75..8101eafd7 100644
--- a/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.ts
+++ b/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.ts
@@ -3,7 +3,6 @@ import { NgForm } from '@angular/forms';
 import { Tasks } from 'src/app/Interface/TasksInterface';
 import { AngularFireFunctions } from '@angular/fire/functions';
 import { ValidationService } from '../../../services/validation.service';
-import { ToolsService } from '../../../services/tools.service';
 
 @Component({
   selector: 'app-log-work',
@@ -23,15 +22,10 @@ export class LogWorkComponent implements OnInit {
   logHours: number
   logWorkComment: number
   enableLoader: boolean = false
-  todayDate: string
-  time: string
 
-  constructor(private functions: AngularFireFunctions, public validationService: ValidationService, public toolsService: ToolsService) { }
+  constructor(private functions: AngularFireFunctions, public validationService: ValidationService) { }
 
-  ngOnInit(): void { 
-    this.todayDate = this.toolsService.date();
-    this.time = this.toolsService.time();
-  }
+  ngOnInit(): void { }
 
   async submit(){
     let labels = ['status', 'logHours', 'workCompleted', 'comment'];
@@ -56,7 +50,7 @@ export class LogWorkComponent implements OnInit {
     const callable = this.functions.httpsCallable('logWork');
 
     try {
-      const result = await callable({ SprintNumber: this.task.SprintNumber, LogTaskId: this.task.Id, LogHours: this.logHours, LogWorkDone: this.logWorkDone, LogWorkStatus: this.logWorkStatus, LogWorkComment: this.logWorkComment, Date: this.todayDate, Time: this.time}).toPromise();
+      const result = await callable({ SprintNumber: this.task.SprintNumber, LogTaskId: this.task.Id, LogHours: this.logHours, LogWorkDone: this.logWorkDone, LogWorkStatus: this.logWorkStatus, LogWorkComment: this.logWorkComment }).toPromise();
 
       console.log("Logged Work Successfully");
       console.log(result);
diff --git a/worktrolly-ui/src/app/body/task-details/task-details.component.ts b/worktrolly-ui/src/app/body/task-details/task-details.component.ts
index a91ce0aae..1be5a2eae 100644
--- a/worktrolly-ui/src/app/body/task-details/task-details.component.ts
+++ b/worktrolly-ui/src/app/body/task-details/task-details.component.ts
@@ -6,7 +6,6 @@ import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators'
 import { Tasks } from 'src/app/Interface/TasksInterface';
 import { AuthService } from 'src/app/services/auth.service';
-import { ToolsService } from '../../services/tools.service';
 import {Location} from '@angular/common';
 import { NavbarHandlerService } from 'src/app/services/navbar-handler.service';
 
@@ -25,18 +24,12 @@ export class TaskDetailsComponent implements OnInit {
   editTaskEnabled: boolean = false
   userLoggedIn: boolean = false
   task: Tasks
-  todayDate: string
-  time: string
-  
   public taskDocument: AngularFirestoreDocument<Tasks>
   public taskDataObservable: Observable<Tasks>
 
-  constructor(private route: ActivatedRoute, public db: AngularFirestore, private router: Router, private functions: AngularFireFunctions, public authService: AuthService, private location: Location, public toolsService: ToolsService, private navbarHandler: NavbarHandlerService) { }
+  constructor(private route: ActivatedRoute, public db: AngularFirestore, private router: Router, private functions: AngularFireFunctions, public authService: AuthService, private location: Location, private navbarHandler: NavbarHandlerService) { }
 
   ngOnInit(): void {
-    this.todayDate = this.toolsService.date();
-    this.time = this.toolsService.time();
-
     this.Id = this.route.snapshot.params['taskId'];
 
     this.componentName = this.Id;
@@ -77,7 +70,7 @@ export class TaskDetailsComponent implements OnInit {
     const callable = this.functions.httpsCallable('deleteTask');
 
     try {
-      const result = await callable({ Id: this.task.Id, SprintNumber: this.task.SprintNumber, Category: this.task.Category, Status: this.task.Status, Date: this.todayDate, Time: this.time }).toPromise();
+      const result = await callable({ Id: this.task.Id, SprintNumber: this.task.SprintNumber, Category: this.task.Category, Status: this.task.Status }).toPromise();
       console.log(this.task.Id + " deleted");
       console.log(result);
       this.router.navigate(['/']);
diff --git a/worktrolly-ui/src/app/services/tools.service.spec.ts b/worktrolly-ui/src/app/services/tools.service.spec.ts
deleted file mode 100644
index 3225de8e6..000000000
--- a/worktrolly-ui/src/app/services/tools.service.spec.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { ToolsService } from './tools.service';
-
-describe('ToolsService', () => {
-  let service: ToolsService;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({});
-    service = TestBed.inject(ToolsService);
-  });
-
-  it('should be created', () => {
-    expect(service).toBeTruthy();
-  });
-});
diff --git a/worktrolly-ui/src/app/services/tools.service.ts b/worktrolly-ui/src/app/services/tools.service.ts
deleted file mode 100644
index 67cc02d24..000000000
--- a/worktrolly-ui/src/app/services/tools.service.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { Injectable } from '@angular/core';
-
-@Injectable({
-  providedIn: 'root'
-})
-export class ToolsService {
-
-  todayDate: string
-  todayTime: string
-
-  constructor() { }
-
-  date(){
-    var today = new Date();
-    var dd = String(today.getDate()).padStart(2, '0');
-    var mm = String(today.getMonth() + 1).padStart(2, '0');
-    var yyyy = today.getFullYear();
-    return this.todayDate = dd + "/" + mm + "/" + yyyy;
-  }
-
-  time(){
-    var today = new Date();
-    var hh = String(today.getHours()).padStart(2, '0');
-    var mn = String(today.getMinutes()).padStart(2, '0');
-    var ss= String(today.getSeconds()).padStart(2, '0');
-    return this.todayTime = hh + ":" + mn + ":" + ss;
-  }
-
-}

From 2d27c3bded0744b6a3d11efe81c68329824cb7a3 Mon Sep 17 00:00:00 2001
From: komal <komal9779@gmail.com>
Date: Sat, 30 Jan 2021 14:12:25 +0530
Subject: [PATCH 36/37] feat(dev/activity):Re activity collection

---
 functions/index.js                            | 597 +-----------------
 .../create-new-session.component.ts           |  15 +-
 .../edit-page/edit-page.component.ts          |  40 +-
 .../log-work/log-work.component.ts            |  12 +-
 .../task-details/task-details.component.ts    |  11 +-
 .../src/app/services/tools.service.ts         |  29 +
 6 files changed, 103 insertions(+), 601 deletions(-)
 create mode 100644 worktrolly-ui/src/app/services/tools.service.ts

diff --git a/functions/index.js b/functions/index.js
index 8dc53bdad..f5255c035 100644
--- a/functions/index.js
+++ b/functions/index.js
@@ -1,10 +1,14 @@
 const functions = require('firebase-functions');
-var cors = require('cors')({ origin: true });
-
 const admin = require('firebase-admin');
 admin.initializeApp();
 
-const db = admin.firestore();
+const createNewTaskAPI = require('./createNewTaskAPI');
+const startNewSprintAPI = require('./startNewSprintAPI');
+const logWorkAPI = require('./logWorkAPI');
+const editPageTaskAPI = require('./editPageTaskAPI');
+const deleteTaskAPI = require('./deleteTaskAPI');
+const createNewUserAPI = require('./createNewUserAPI');
+const updateSprintStatusAPI = require('./updateSprintStatusAPI');
 
 // class Task {
 //     constructor(id, title, status, priority, estimatedTime, difficulty, description, creator, category, assignee, logWorkTotalTime, workDone, creationDate, sprintNumber, storyPointNumber) {
@@ -26,583 +30,10 @@ const db = admin.firestore();
 //     }
 // }
 
-
-exports.createNewTask = functions.https.onRequest((request, response) => {
-    cors(request, response, () => {
-        console.log(request);
-        var title = request.body.data.Title;
-        var des = request.body.data.Description;
-        var priority = request.body.data.Priority;
-        var difficulty = request.body.data.Difficulty;
-        var creator = request.body.data.Creator;
-        var assignee = request.body.data.Assignee;
-        var estimatedTime = parseInt(request.body.data.EstimatedTime);
-        var status = request.body.data.Status;
-        var category = request.body.data.Category;
-        var storyPointNumber = parseInt(request.body.data.StoryPointNumber);
-        var sprintNumber = parseInt(request.body.data.SprintNumber);
-        var creationDate = request.body.data.CreationDate;
-        var fullSprintId = createSprintId(sprintNumber);
-        var loggedWorkTotalTime = 0;
-        var workDone = 0;
-        var taskId = "";
-        var totalDevelopmentTask;
-        var totalBusinessTask;
-        var totalOtherTask;
-        var totalMarketingTask;
-        var totalNumberOfTask;
-        var result;
-        var totalUnCompletedTask = 0;
-        var sprintDataPromise;
-
-        const promise1 = db.collection("RawData").doc("AppDetails").get().then((doc) => {
-            totalNumberOfTask = doc.data().TotalNumberOfTask;
-            totalDevelopmentTask = doc.data().TotalDevelopmentTask;
-            totalBusinessTask = doc.data().TotalBusinessTask;
-            totalMarketingTask = doc.data().TotalMarketingTask;
-            totalOtherTask = doc.data().TotalOtherTask;
-            totalUnCompletedTask = doc.data().TotalUnCompletedTask;
-            if (category === "Development") {
-                totalDevelopmentTask = totalDevelopmentTask + 1;
-                taskId = category[0] + totalDevelopmentTask;
-            } else if (category === "Business") {
-                totalBusinessTask = totalBusinessTask + 1;
-                taskId = category[0] + totalBusinessTask;
-            } else if (category === "Marketing") {
-                totalMarketingTask = totalMarketingTask + 1;
-                taskId = category[0] + totalMarketingTask;
-            } else {
-                totalOtherTask = totalOtherTask + 1;
-                taskId = category[0] + totalOtherTask;
-            }
-            totalUnCompletedTask = totalUnCompletedTask + 1;
-            totalNumberOfTask = totalNumberOfTask + 1;
-            console.log(taskId);
-            const P1 = db.collection("Tasks").doc(taskId).set({
-                Id: taskId,
-                Title: title,
-                Description: des,
-                Priority: priority,
-                Difficulty: difficulty,
-                Creator: creator,
-                Assignee: assignee,
-                EstimatedTime: estimatedTime,
-                Status: status,
-                Category: category,
-                LogWorkTotalTime: loggedWorkTotalTime,
-                WorkDone: workDone,
-                SprintNumber: sprintNumber,
-                StoryPointNumber: storyPointNumber,
-                CreationDate: creationDate
-            });
-            const P2 = db.collection("RawData").doc("AppDetails").update({
-                TotalDevelopmentTask: totalDevelopmentTask,
-                TotalBusinessTask: totalBusinessTask,
-                TotalMarketingTask: totalMarketingTask,
-                TotalOtherTask: totalOtherTask,
-                TotalNumberOfTask: totalNumberOfTask,
-                TotalUnCompletedTask: totalUnCompletedTask
-            });
-            const Promises = [P1,P2];
-            return Promise.all(Promises);
-        });
-
-        const promise2 = db.collection("Main").doc(fullSprintId).get().then((doc) => {
-            if (doc.exists) {
-                totalNumberOfTask = doc.data().TotalNumberOfTask;
-                totalDevelopmentTask = doc.data().TotalDevelopmentTask;
-                totalBusinessTask = doc.data().TotalBusinessTask;
-                totalOtherTask = doc.data().TotalOtherTask;
-                totalMarketingTask = doc.data().TotalMarketingTask;
-                totalUnCompletedTask = doc.data().TotalUnCompletedTask;
-
-                if (category === "Development") {
-                    totalDevelopmentTask = totalDevelopmentTask + 1;
-                } else if (category === "Business") {
-                    totalBusinessTask = totalBusinessTask + 1;
-                } else if (category === "Marketing") {
-                    totalMarketingTask = totalMarketingTask + 1;
-                } else {
-                    totalOtherTask = totalOtherTask + 1;
-                }
-
-                totalNumberOfTask = totalNumberOfTask + 1;
-                totalUnCompletedTask = totalUnCompletedTask + 1;
-
-
-                sprintDataPromise = db.collection("Main").doc(fullSprintId).update({
-                    TotalBusinessTask: totalBusinessTask,
-                    TotalDevelopmentTask: totalDevelopmentTask,
-                    TotalMarketingTask: totalMarketingTask,
-                    TotalOtherTask: totalOtherTask,
-                    TotalUnCompletedTask: totalUnCompletedTask,
-                    TotalNumberOfTask: totalNumberOfTask
-                });
-            } else {
-                totalBusinessTask = 0;
-                totalDevelopmentTask = 0;
-                totalMarketingTask = 0;
-                totalOtherTask = 0;
-                totalUnCompletedTask = 0;
-                totalCompletedTask = 0;
-                totalNumberOfTask = 0;
-
-                if (category === "Development") {
-                    totalDevelopmentTask = totalDevelopmentTask + 1;
-                } else if (category === "Business") {
-                    totalBusinessTask = totalBusinessTask + 1;
-                } else if (category === "Marketing") {
-                    totalMarketingTask = totalMarketingTask + 1;
-                } else {
-                    totalOtherTask = totalOtherTask + 1;
-                }
-
-
-                totalNumberOfTask = totalNumberOfTask + 1;
-                totalUnCompletedTask = totalUnCompletedTask + 1;
-
-                sprintDataPromise = db.collection("Main").doc(fullSprintId).set({
-                    EndDate: "xx/xx/xxxx",
-                    StartDate: "xx/xx/xxxx",
-                    Status: "Not Started",
-                    TotalBusinessTask: totalBusinessTask,
-                    TotalDevelopmentTask: totalDevelopmentTask,
-                    TotalMarketingTask: totalMarketingTask,
-                    TotalOtherTask: totalOtherTask,
-                    TotalUnCompletedTask: totalUnCompletedTask,
-                    TotalCompletedTask: totalCompletedTask,
-                    TotalNumberOfTask: totalNumberOfTask
-                });
-
-            }
-            return Promise.resolve(sprintDataPromise);
-        });
-        const newTaskPromises = [promise1, promise2];
-        Promise.all(newTaskPromises).then(() => {
-                result = { data: "OK!" }
-                console.log("Document successfully written!");
-                return response.status(200).send(result);
-            })
-        .catch((error) => {
-            result = { data: error };
-            console.error("Error writing document: ", error);
-            return response.status(500).send(result);
-        });
-    });
-});
-
-exports.startNewSprint = functions.https.onRequest((request, response) => {
-    cors(request, response, () => {
-        console.log(request);
-
-        var status = request.body.data.Status;
-        var startDate = request.body.data.StartDate;
-        var endDate = request.body.data.EndDate;
-        var totalDevelopment = parseInt(request.body.data.TotalDevelopment);
-        var totalBusiness = parseInt(request.body.data.TotalBusiness);
-        var totalMarketing = parseInt(request.body.data.TotalMarketing);
-        var totalOther = parseInt(request.body.data.TotalOther);
-        var newSprintId = parseInt(request.body.data.NewSprintId);
-        var newSprintIdString = "S" + newSprintId.toString();
-        var createSprintPromise;
-        var result;
-
-        console.log("End Date from Backend: " + endDate);
-        console.log("Start Date from Backend: " + startDate);
-        console.log("Status from Backend: " + status);
-
-        const p1 = db.collection("Main").doc(newSprintIdString).get().then((doc) => {
-            if (doc.exists) {
-                createSprintPromise = db.collection("Main").doc(newSprintIdString).update({
-                    TotalDevelopmentTask: totalDevelopment,
-                    TotalBusinessTask: totalBusiness,
-                    TotalMarketingTask: totalMarketing,
-                    TotalOtherTask: totalOther,
-                    EndDate: endDate,
-                    StartDate: startDate,
-                    Status: status
-                });
-            } else {
-                var totalUnCompletedTask = 0;
-                var totalCompletedTask = 0;
-                var totalNumberOfTask = 0;
-
-                createSprintPromise = db.collection("Main").doc(newSprintIdString).set({
-                    TotalDevelopmentTask: totalDevelopment,
-                    TotalBusinessTask: totalBusiness,
-                    TotalMarketingTask: totalMarketing,
-                    TotalOtherTask: totalOther,
-                    EndDate: endDate,
-                    StartDate: startDate,
-                    Status: status,
-                    TotalUnCompletedTask: totalUnCompletedTask,
-                    TotalCompletedTask: totalCompletedTask,
-                    TotalNumberOfTask: totalNumberOfTask
-                });
-            }
-            return Promise.resolve(createSprintPromise);
-        });
-        const p2 = db.collection("RawData").doc("AppDetails").update({
-            CurrentSprintId: newSprintId
-        });
-        const Promises = [p1,p2];
-        return Promise.all(Promises).then(() => {
-            console.log("Sprint started successfully");
-            result = { data: "OK" }
-            console.log("Document successfully written!");
-            return response.status(200).send(result);
-        })
-        .catch((error) => {
-            result = { data: error }
-            console.log("error", error);
-            return response.status(500).send(result);
-        });
-    });
-});
-
-exports.logWork = functions.https.onRequest((request, response) => {
-    cors(request, response, () => {
-        var status = request.body.data.LogWorkStatus;
-        var taskId = request.body.data.LogTaskId;
-        var logHours = parseInt(request.body.data.LogHours);
-        var workDone = parseInt(request.body.data.LogWorkDone);
-        var sprintNumber = parseInt(request.body.data.SprintNumber);
-        // var logWorkComment = request.body.data.LogWorkComment;
-        var fullSprintId = createSprintId(sprintNumber);
-        var logWorkTotalTime;
-
-        const promise1 = db.collection("Tasks").doc(taskId).get().then((doc) => {
-            logWorkTotalTime = parseInt(doc.data().LogWorkTotalTime);
-            logWorkTotalTime = parseInt(logWorkTotalTime) + parseInt(logHours);
-
-            var updatePromise = db.collection("Tasks").doc(taskId).update({
-                LogWorkTotalTime: logWorkTotalTime,
-                WorkDone: workDone,
-                Status: status
-            });
-            return Promise.resolve(updatePromise);
-        });
-        const promise2 = db.collection("RawData").doc("AppDetails").get().then((doc) => {
-            totalCompletedTask = parseInt(doc.data().TotalCompletedTask);
-            totalUnCompletedTask = parseInt(doc.data().TotalUnCompletedTask);
-            if (status === "Completed") {
-                totalCompletedTask = totalCompletedTask + 1;
-                totalUnCompletedTask = totalUnCompletedTask - 1;
-            }
-            var updateStatus = db.collection("RawData").doc("AppDetails").update({
-                TotalCompletedTask: totalCompletedTask,
-                TotalUnCompletedTask: totalUnCompletedTask
-            });
-            return Promise.resolve(updateStatus);
-        });
-        const promise3 = db.collection("Main").doc(fullSprintId).get().then((doc) => {
-            totalCompletedTask = parseInt(doc.data().TotalCompletedTask);
-            totalUnCompletedTask = parseInt(doc.data().TotalUnCompletedTask);
-
-            if (status === "Completed") {
-                totalCompletedTask = totalCompletedTask + 1;
-                totalUnCompletedTask = totalUnCompletedTask - 1;
-            }
-            var updateSprintstatus = db.collection("Main").doc(fullSprintId).update({
-                TotalCompletedTask: totalCompletedTask,
-                TotalUnCompletedTask: totalUnCompletedTask
-            });
-            return Promise.resolve(updateSprintstatus);
-        });
-        const logWorkPromises = [promise1, promise2, promise3];
-        Promise.all(logWorkPromises).then(() => {
-                result = { data: "OK" }
-                console.log("Document successfully written!");
-                return response.status(200).send(result);
-            })
-            .catch((error) => {
-                var result = { data: error };
-                console.log("error", error);
-                return response.status(500).send(result)
-            });
-    });
-});
-
-exports.editPageTask = functions.https.onRequest((request, response) => {
-    cors(request, response, () => {
-        console.log(request);
-
-        var description = request.body.data.Description;
-        var priority = request.body.data.Priority;
-        var difficulty = request.body.data.Difficulty;
-        var assignee = request.body.data.Assignee;
-        var estimatedTime = request.body.data.EstimatedTime;
-        var category = request.body.data.Category;
-        var storyPointNumber = request.body.data.StoryPointNumber;
-        var editedSprintNumber = request.body.data.SprintNumber;
-        var previousId = request.body.data.PreviousId;
-        var creationDate = request.body.data.CreationDate;
-        var previousSprintId = createSprintId(previousId);
-        var taskId = request.body.data.Id;
-        var editedSprintId = createSprintId(editedSprintNumber);
-        var totalDevelopmentTask;
-        var totalBusinessTask;
-        var totalMarketingTask;
-        var totalOtherTask;
-        var totalNumberOfTask;
-        var result;
-        var totalUnCompletedTask;
-        var totalCompletedTask;
-        var sprintEditPromise;
-
-        var promises = [];
-        if (editedSprintNumber !== previousId) {
-            const p1 = db.collection("Main").doc(previousSprintId).get().then((doc) => {
-                totalNumberOfTask = doc.data().TotalNumberOfTask;
-                totalDevelopmentTask = doc.data().TotalDevelopmentTask;
-                totalBusinessTask = doc.data().TotalBusinessTask;
-                totalMarketingTask = doc.data().TotalMarketingTask;
-                totalOtherTask = doc.data().TotalOtherTask;
-                totalUnCompletedTask = doc.data().TotalUnCompletedTask;
-
-                if (category === "Development") {
-                    totalDevelopmentTask = totalDevelopmentTask - 1;
-                } else if (category === "Business") {
-                    totalBusinessTask = totalBusinessTask - 1;
-                } else if (category === "Marketing") {
-                    totalMarketingTask = totalMarketingTask - 1;
-                } else {
-                    totalOtherTask = totalOtherTask - 1;
-                }
-
-                totalNumberOfTask = totalNumberOfTask - 1;
-                totalUnCompletedTask = totalUnCompletedTask - 1;
-                var editSprintDeleteCounter = db.collection("Main").doc(previousSprintId).update({
-                    TotalDevelopmentTask: totalDevelopmentTask,
-                    TotalBusinessTask: totalBusinessTask,
-                    TotalMarketingTask: totalMarketingTask,
-                    TotalOtherTask: totalOtherTask,
-                    TotalNumberOfTask: totalNumberOfTask,
-                    TotalUnCompletedTask: totalUnCompletedTask
-                });
-
-                return Promise.resolve(editSprintDeleteCounter);
-            });
-            promises.push(p1);
-
-            const p2 = db.collection("Main").doc(editedSprintId).get().then((doc) => {
-                if (doc.exists) {
-                    totalNumberOfTask = doc.data().TotalNumberOfTask;
-                    totalDevelopmentTask = doc.data().TotalDevelopmentTask;
-                    totalBusinessTask = doc.data().TotalBusinessTask;
-                    totalMarketingTask = doc.data().TotalMarketingTask;
-                    totalOtherTask = doc.data().TotalOtherTask;
-                    totalUnCompletedTask = doc.data().TotalUnCompletedTask;
-
-                    if (category === "Development") {
-                        totalDevelopmentTask = totalDevelopmentTask + 1;
-                    } else if (category === "Business") {
-                        totalBusinessTask = totalBusinessTask + 1;
-                    } else if (category === "Marketing") {
-                        totalMarketingTask = totalMarketingTask + 1;
-                    } else {
-                        totalOtherTask = totalOtherTask + 1;
-                    }
-
-                    totalNumberOfTask = totalNumberOfTask + 1;
-                    totalUnCompletedTask = totalUnCompletedTask + 1;
-
-                    sprintEditPromise = db.collection("Main").doc(editedSprintId).update({
-                        TotalBusinessTask: totalBusinessTask,
-                        TotalDevelopmentTask: totalDevelopmentTask,
-                        TotalMarketingTask: totalMarketingTask,
-                        TotalOtherTask: totalOtherTask,
-                        TotalUnCompletedTask: totalUnCompletedTask,
-                        TotalNumberOfTask: totalNumberOfTask
-                    });
-                } else {
-                    totalBusinessTask = 0;
-                    totalDevelopmentTask = 0;
-                    totalMarketingTask = 0;
-                    totalOtherTask = 0;
-                    totalUnCompletedTask = 0;
-                    totalCompletedTask = 0;
-                    totalNumberOfTask = 0;
-
-                    if (category === "Development") {
-                        totalDevelopmentTask = totalDevelopmentTask + 1;
-                    } else if (category === "Business") {
-                        totalBusinessTask = totalBusinessTask + 1;
-                    } else if (category === "Marketing") {
-                        totalMarketingTask = totalMarketingTask + 1;
-                    } else {
-                        totalOtherTask = totalOtherTask + 1;
-                    }
-
-                    totalNumberOfTask = totalNumberOfTask + 1;
-                    totalUnCompletedTask = totalUnCompletedTask + 1;
-                    sprintEditPromise = db.collection("Main").doc(editedSprintId).set({
-                        TotalBusinessTask: totalBusinessTask,
-                        TotalDevelopmentTask: totalDevelopmentTask,
-                        TotalMarketingTask: totalMarketingTask,
-                        TotalOtherTask: totalOtherTask,
-                        TotalUnCompletedTask: totalUnCompletedTask,
-                        TotalCompletedTask: totalCompletedTask,
-                        TotalNumberOfTask: totalNumberOfTask
-                    });
-                }
-                return Promise.resolve(sprintEditPromise)
-            });
-            promises.push(p2);
-        }
-        var p3 = db.collection("Tasks").doc(taskId).update({
-                Description: description,
-                CreationDate: creationDate,
-                Priority: priority,
-                Difficulty: difficulty,
-                Assignee: assignee,
-                EstimatedTime: estimatedTime,
-                SprintNumber: editedSprintNumber,
-                StoryPointNumber: storyPointNumber
-        });
-        promises.push(p3);
-
-        Promise.all(promises).then(() => {
-            result = { data: "OK" };
-            console.log("Document sucessfully written");
-            return response.status(200).send(result);
-        })
-        .catch((error) => {
-            result = { data: error };
-            console.log("error", error);
-            return response.status(500).send(result)
-        });
-    });
-});
-
-exports.deleteTask = functions.https.onRequest((request, response) => {
-    cors(request, response, () => {
-        console.log(request);
-
-        var sprintNumber = request.body.data.SprintNumber;
-        var taskId = request.body.data.Id;
-        var fullSprintId = createSprintId(sprintNumber);
-        var category = request.body.data.Category;
-        var status = request.body.data.Status;
-        var totalDevelopmentTask;
-        var totalBusinessTask;
-        var totalMarketingTask;
-        var totalOtherTask;
-        var totalNumberOfTask;
-        var result;
-        var totalCompletedTask;
-        var totalUnCompletedTask;
-
-        const p1 = db.collection("Tasks").doc(taskId).update({
-            Category: "Trash",
-            SprintNumber: -2
-        });
-        
-        const p2 = db.collection("Main").doc(fullSprintId).get().then((doc) => {
-            totalNumberOfTask = doc.data().TotalNumberOfTask;
-            totalDevelopmentTask = doc.data().TotalDevelopmentTask;
-            totalBusinessTask = doc.data().TotalBusinessTask;
-            totalMarketingTask = doc.data().TotalMarketingTask;
-            totalOtherTask = doc.data().TotalOtherTask
-            totalCompletedTask = doc.data().TotalCompletedTask;
-            totalUnCompletedTask = doc.data().TotalUnCompletedTask;
-
-            if (category === "Development") {
-                totalDevelopmentTask = totalDevelopmentTask - 1;
-            } else if (category === "Business") {
-                totalBusinessTask = totalBusinessTask - 1;
-            } else if (category === "Marketing") {
-                totalMarketingTask = totalMarketingTask - 1;
-            } else {
-                totalOtherTask = totalOtherTask -1;
-            }
-            totalNumberOfTask = totalNumberOfTask - 1;
-            status === "Completed" ? totalCompletedTask = totalCompletedTask - 1 : totalUnCompletedTask = totalUnCompletedTask - 1;
-            var updateDeleteTaskCounter = db.collection("Main").doc(fullSprintId).update({
-                TotalDevelopmentTask: totalDevelopmentTask,
-                TotalBusinessTask: totalBusinessTask,
-                TotalMarketingTask: totalMarketingTask,
-                TotalOtherTask: totalOtherTask,
-                TotalNumberOfTask: totalNumberOfTask,
-                TotalCompletedTask: totalCompletedTask,
-                TotalUnCompletedTask: totalUnCompletedTask
-            });
-            return Promise.resolve(updateDeleteTaskCounter);
-        });
-        const deleteTaskPromises = [p1, p2];
-        Promise.all(deleteTaskPromises).then(() => {
-                result = { data: "OK" };
-                console.log("Document sucessfully deleted");
-                return response.status(200).send(result);
-            })
-            .catch((error) => {
-                result = { data: error };
-                console.log("error", error);
-                return response.status(500).send(result)
-            });
-    });
-});
-
-function createSprintId(sprintNumber) {
-    if (sprintNumber === -1) {
-        return "Backlog";
-    } else {
-        return ("S" + sprintNumber);
-    }
-}
-exports.createNewUser = functions.https.onRequest((request, response) => {
-    cors(request, response, () => {
-        console.log(request);
-        const user = request.body.data;
-        const Uid = user.uid;
-        const PhotoURL = user.photoURL;
-        const DisplayName = user.displayName;
-        const Email = user.email;
-        const PhoneNumber = user.phoneNumber;
-        const ProviderId = user.providerId;
-
-        db.collection("Users").doc(Uid).get().then((doc) => {
-                if (doc.exists) {
-                    const userData = db.collection("Users").doc(Uid).update({
-                        uid: Uid,
-                        photoURL: PhotoURL,
-                        displayName: DisplayName,
-                        email: Email,
-                        phoneNumber: PhoneNumber,
-                        providerId: ProviderId
-                    });
-                    return Promise.resolve(userData);
-                } else {
-                    const userData = db.collection("Users").doc(Uid).set({
-                        uid: Uid,
-                        photoURL: PhotoURL,
-                        displayName: DisplayName,
-                        email: Email,
-                        phoneNumber: PhoneNumber,
-                        providerId: ProviderId
-                    });
-                    return Promise.resolve(userData);
-                }
-            }).then(() => {
-                result = { data: "User Logged In Successfully" };
-                console.log("Document successfully written");
-                return response.status(200).send(result);
-            })
-            .catch((error) => {
-                result = { data: error };
-                console.log("error", error);
-                return response.status(500).send(result)
-            });
-    });
-});
-
-exports.updateSprintStatus = functions.https.onRequest((request, response) => {
-    cors(request, response, () => {
-        var sprintStatus = request.body.data.SprintStatus;
-        var currentSprintName = request.body.data.CurrentSprintName;
-        console.log(currentSprintName);
-        db.collection("Main").doc(currentSprintName).update({
-            Status: sprintStatus,
-        });
-    });
-})
\ No newline at end of file
+exports.createNewTask = createNewTaskAPI.createNewTask;
+exports.startNewSprint = startNewSprintAPI.startNewSprint;
+exports.logWork = logWorkAPI.logWork;
+exports.editPageTask = editPageTaskAPI.editPageTask;
+exports.deleteTask = deleteTaskAPI.deleteTask;
+exports.createNewUser = createNewUserAPI.createNewUser;
+exports.updateSprintStatus = updateSprintStatusAPI.updateSprintStatus;
diff --git a/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.ts b/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.ts
index 6d9d6156c..7ce0ae35d 100644
--- a/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.ts
+++ b/worktrolly-ui/src/app/body/create-new-session/create-new-session.component.ts
@@ -3,6 +3,7 @@ import { AngularFireFunctions } from '@angular/fire/functions';
 import { NgForm } from '@angular/forms';
 import { Router } from '@angular/router';
 import { ValidationService } from '../../services/validation.service';
+import { ToolsService } from '../../services/tools.service';
 import { Location } from '@angular/common';
 
 @Component({
@@ -26,18 +27,14 @@ export class CreateNewSessionComponent implements OnInit {
   status: string
   sprintNumber: number
   storyPoint: number
+  time: string
   enableLoader: boolean = false
   valid: boolean = true;
 
-  constructor(private functions: AngularFireFunctions, public validationService: ValidationService, private router: Router, private location: Location) { }
+  constructor(private functions: AngularFireFunctions, public validationService: ValidationService, private router: Router, private location: Location, public toolsService: ToolsService) { }
   ngOnInit(): void {
-    var today = new Date();
-
-    var dd = String(today.getDate()).padStart(2, '0');
-    var mm = String(today.getMonth() + 1).padStart(2, '0');
-    var yyyy = today.getFullYear();
-
-    this.todayDate = dd + "/" + mm + "/" + yyyy;
+    this.todayDate = this.toolsService.date();
+    this.time = this.toolsService.time();
   }
 
   async submit(){
@@ -69,7 +66,7 @@ export class CreateNewSessionComponent implements OnInit {
     const callable = this.functions.httpsCallable('createNewTask');
 
     try {
-      const result = await callable({ Title: this.title, Description: this.description, Priority: this.priority, Difficulty: this.difficulty, Creator: this.creatorName, Assignee: this.assigneeName, EstimatedTime: this.estimatedTime, Status: this.status, Category: this.category, SprintNumber: this.sprintNumber, StoryPointNumber: this.storyPoint, CreationDate: this.todayDate }).toPromise();
+      const result = await callable({ Title: this.title, Description: this.description, Priority: this.priority, Difficulty: this.difficulty, Creator: this.creatorName, Assignee: this.assigneeName, EstimatedTime: this.estimatedTime, Status: this.status, Category: this.category, SprintNumber: this.sprintNumber, StoryPointNumber: this.storyPoint, CreationDate: this.todayDate, Time: this.time }).toPromise();
 
       console.log("Successfully created the task");
       console.log(result);
diff --git a/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.ts b/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.ts
index c81721079..d6183f808 100644
--- a/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.ts
+++ b/worktrolly-ui/src/app/body/task-details/edit-page/edit-page.component.ts
@@ -4,6 +4,7 @@ import { NgForm } from '@angular/forms';
 import { Tasks } from 'src/app/Interface/TasksInterface';
 import { Router } from '@angular/router';
 import { ValidationService } from '../../../services/validation.service';
+import { ToolsService } from '../../../services/tools.service';
 
 
 @Component({
@@ -20,12 +21,22 @@ export class EditPageComponent implements OnInit {
   editTask: Tasks
   previousSprintId: number
   enableLoader: boolean = false
+  todayDate: string
+  time: string
+  changedData: string = ""
+  prevVal =[]
+  newVal =[]
 
-  constructor(private functions: AngularFireFunctions, private router: Router, public validationService: ValidationService) { }
+  constructor(private functions: AngularFireFunctions, private router: Router, public validationService: ValidationService, public toolsService: ToolsService) { }
 
   ngOnInit(): void {
+
+    this.todayDate = this.toolsService.date();
+    this.time = this.toolsService.time();
+
     this.editTask = this.task;
     this.previousSprintId = this.task.SprintNumber;
+    this.prevVal = [this.task.Description, this.task.Assignee, this.task.EstimatedTime, this.task.Priority, this.task.Difficulty, this.task.StoryPointNumber];
   }
 
   async submit(){
@@ -40,6 +51,8 @@ export class EditPageComponent implements OnInit {
       return res;});
     if(condition)
     {
+      this.newVal = [this.editTask.Description, this.editTask.Assignee, this.editTask.EstimatedTime, this.editTask.Priority, this.editTask.Difficulty, this.editTask.StoryPointNumber];
+      this.generateChanges();
       console.log("Inputs are valid");
       this.editPage();
     }
@@ -47,6 +60,26 @@ export class EditPageComponent implements OnInit {
     console.log("Page not edited due to validation error");
   }
 
+async generateChanges() {
+  console.log(this.editTask, this.task);
+    if(this.prevVal[0] != this.newVal[0])
+      this.changedData = this.changedData + " description,";
+    if(this.prevVal[1] != this.newVal[1])
+      this.changedData = this.changedData + " assignee," ;
+    if(this.prevVal[2] != this.newVal[2])
+      this.changedData = this.changedData + " estimated-time," ;
+    if(this.prevVal[3] != this.newVal[3])
+      this.changedData = this.changedData + " priority," ;
+    if(this.prevVal[4] != this.newVal[4])
+      this.changedData = this.changedData + " difficulty," ;
+    if(this.prevVal[5] != this.newVal[5])
+      this.changedData = this.changedData + " story-point,";
+    if(this.changedData != "")
+      this.changedData = "Edited-" + this.changedData;
+      this.changedData = this.changedData.substring(0,this.changedData.length-1) + "."
+    console.log(this.changedData);
+  }
+
   async editPage() {
     this.enableLoader = true
     const callable = this.functions.httpsCallable('editPageTask');
@@ -58,7 +91,7 @@ export class EditPageComponent implements OnInit {
 
       console.log(this.editTask.SprintNumber);
       if (!(this.task.Status === "Completed")) {
-        const result = await callable({ Id: this.editTask.Id, Description: this.editTask.Description, Priority: this.editTask.Priority, Difficulty: this.editTask.Difficulty, Assignee: this.editTask.Assignee, EstimatedTime: this.editTask.EstimatedTime, Category: this.task.Category, SprintNumber: this.editTask.SprintNumber, StoryPointNumber: this.editTask.StoryPointNumber, PreviousId: this.previousSprintId, CreationDate: this.editTask.CreationDate }).toPromise();
+        const result = await callable({ Id: this.editTask.Id, Description: this.editTask.Description, Priority: this.editTask.Priority, Difficulty: this.editTask.Difficulty, Assignee: this.editTask.Assignee, EstimatedTime: this.editTask.EstimatedTime, Category: this.task.Category, SprintNumber: this.editTask.SprintNumber, StoryPointNumber: this.editTask.StoryPointNumber, PreviousId: this.previousSprintId, CreationDate: this.editTask.CreationDate, Date: this.todayDate, Time: this.time, ChangedData: this.changedData}).toPromise();
         console.log("Successfully Updated the task");
         console.log(result);
         this.editTaskDone();
@@ -79,5 +112,4 @@ export class EditPageComponent implements OnInit {
   backToTaskDetails(){
     window.location.reload();
   }
-
-}
+}
\ No newline at end of file
diff --git a/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.ts b/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.ts
index 8101eafd7..aeb62584e 100644
--- a/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.ts
+++ b/worktrolly-ui/src/app/body/task-details/log-work/log-work.component.ts
@@ -3,6 +3,7 @@ import { NgForm } from '@angular/forms';
 import { Tasks } from 'src/app/Interface/TasksInterface';
 import { AngularFireFunctions } from '@angular/fire/functions';
 import { ValidationService } from '../../../services/validation.service';
+import { ToolsService } from '../../../services/tools.service';
 
 @Component({
   selector: 'app-log-work',
@@ -21,11 +22,16 @@ export class LogWorkComponent implements OnInit {
   logWorkStatus: number
   logHours: number
   logWorkComment: number
+  todayDate: string
+  time: string
   enableLoader: boolean = false
 
-  constructor(private functions: AngularFireFunctions, public validationService: ValidationService) { }
+  constructor(private functions: AngularFireFunctions, public validationService: ValidationService, public toolsService: ToolsService) { }
 
-  ngOnInit(): void { }
+  ngOnInit(): void { 
+    this.todayDate = this.toolsService.date();
+    this.time = this.toolsService.time();
+  }
 
   async submit(){
     let labels = ['status', 'logHours', 'workCompleted', 'comment'];
@@ -50,7 +56,7 @@ export class LogWorkComponent implements OnInit {
     const callable = this.functions.httpsCallable('logWork');
 
     try {
-      const result = await callable({ SprintNumber: this.task.SprintNumber, LogTaskId: this.task.Id, LogHours: this.logHours, LogWorkDone: this.logWorkDone, LogWorkStatus: this.logWorkStatus, LogWorkComment: this.logWorkComment }).toPromise();
+      const result = await callable({ SprintNumber: this.task.SprintNumber, LogTaskId: this.task.Id, LogHours: this.logHours, LogWorkDone: this.logWorkDone, LogWorkStatus: this.logWorkStatus, LogWorkComment: this.logWorkComment, Date: this.todayDate, Time: this.time}).toPromise();
 
       console.log("Logged Work Successfully");
       console.log(result);
diff --git a/worktrolly-ui/src/app/body/task-details/task-details.component.ts b/worktrolly-ui/src/app/body/task-details/task-details.component.ts
index 1be5a2eae..40863a225 100644
--- a/worktrolly-ui/src/app/body/task-details/task-details.component.ts
+++ b/worktrolly-ui/src/app/body/task-details/task-details.component.ts
@@ -6,6 +6,7 @@ import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators'
 import { Tasks } from 'src/app/Interface/TasksInterface';
 import { AuthService } from 'src/app/services/auth.service';
+import { ToolsService } from '../../services/tools.service';
 import {Location} from '@angular/common';
 import { NavbarHandlerService } from 'src/app/services/navbar-handler.service';
 
@@ -24,12 +25,18 @@ export class TaskDetailsComponent implements OnInit {
   editTaskEnabled: boolean = false
   userLoggedIn: boolean = false
   task: Tasks
+  todayDate: string
+  time: string
+
   public taskDocument: AngularFirestoreDocument<Tasks>
   public taskDataObservable: Observable<Tasks>
 
-  constructor(private route: ActivatedRoute, public db: AngularFirestore, private router: Router, private functions: AngularFireFunctions, public authService: AuthService, private location: Location, private navbarHandler: NavbarHandlerService) { }
+  constructor(private route: ActivatedRoute, public db: AngularFirestore, private router: Router, private functions: AngularFireFunctions, public authService: AuthService, private location: Location, public toolsService: ToolsService, private navbarHandler: NavbarHandlerService) { }
 
   ngOnInit(): void {
+    this.todayDate = this.toolsService.date();
+    this.time = this.toolsService.time();
+
     this.Id = this.route.snapshot.params['taskId'];
 
     this.componentName = this.Id;
@@ -70,7 +77,7 @@ export class TaskDetailsComponent implements OnInit {
     const callable = this.functions.httpsCallable('deleteTask');
 
     try {
-      const result = await callable({ Id: this.task.Id, SprintNumber: this.task.SprintNumber, Category: this.task.Category, Status: this.task.Status }).toPromise();
+      const result = await callable({ Id: this.task.Id, SprintNumber: this.task.SprintNumber, Category: this.task.Category, Status: this.task.Status, Date: this.todayDate, Time: this.time }).toPromise();
       console.log(this.task.Id + " deleted");
       console.log(result);
       this.router.navigate(['/']);
diff --git a/worktrolly-ui/src/app/services/tools.service.ts b/worktrolly-ui/src/app/services/tools.service.ts
new file mode 100644
index 000000000..ea04476a7
--- /dev/null
+++ b/worktrolly-ui/src/app/services/tools.service.ts
@@ -0,0 +1,29 @@
+import { Injectable } from '@angular/core';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class ToolsService {
+
+  todayDate: string
+  todayTime: string
+
+  constructor() { }
+
+  date(){
+    var today = new Date();
+    var dd = String(today.getDate()).padStart(2, '0');
+    var mm = String(today.getMonth() + 1).padStart(2, '0');
+    var yyyy = today.getFullYear();
+    return this.todayDate = dd + "/" + mm + "/" + yyyy;
+  }
+
+  time(){
+    var today = new Date();
+    var hh = String(today.getHours()).padStart(2, '0');
+    var mn = String(today.getMinutes()).padStart(2, '0');
+    var ss= String(today.getSeconds()).padStart(2, '0');
+    return this.todayTime = hh + ":" + mn + ":" + ss;
+  }
+
+}
\ No newline at end of file

From 6907bb84b02caa18141e17163c8d09d348b93077 Mon Sep 17 00:00:00 2001
From: komal <komal9779@gmail.com>
Date: Sat, 30 Jan 2021 14:20:22 +0530
Subject: [PATCH 37/37] feat(dev/activity): re seperating API

---
 functions/createNewTaskAPI.js      | 240 +++++++++++++++++++++++++++++
 functions/createNewUserAPI.js      |  52 +++++++
 functions/deleteTaskAPI.js         | 147 ++++++++++++++++++
 functions/editPageTaskAPI.js       | 237 ++++++++++++++++++++++++++++
 functions/logWorkAPI.js            | 143 +++++++++++++++++
 functions/startNewSprintAPI.js     |  76 +++++++++
 functions/updateSprintStatusAPI.js |  17 ++
 7 files changed, 912 insertions(+)
 create mode 100644 functions/createNewTaskAPI.js
 create mode 100644 functions/createNewUserAPI.js
 create mode 100644 functions/deleteTaskAPI.js
 create mode 100644 functions/editPageTaskAPI.js
 create mode 100644 functions/logWorkAPI.js
 create mode 100644 functions/startNewSprintAPI.js
 create mode 100644 functions/updateSprintStatusAPI.js

diff --git a/functions/createNewTaskAPI.js b/functions/createNewTaskAPI.js
new file mode 100644
index 000000000..0b3f709b4
--- /dev/null
+++ b/functions/createNewTaskAPI.js
@@ -0,0 +1,240 @@
+const functions = require('firebase-functions');
+var cors = require('cors')({ origin: true });
+
+const admin = require('firebase-admin');
+
+const db = admin.firestore();
+
+exports.createNewTask = functions.https.onRequest((request, response) => {
+    cors(request, response, () => {
+        console.log(request);
+        var title = request.body.data.Title;
+        var des = request.body.data.Description;
+        var priority = request.body.data.Priority;
+        var difficulty = request.body.data.Difficulty;
+        var creator = request.body.data.Creator;
+        var assignee = request.body.data.Assignee;
+        var estimatedTime = parseInt(request.body.data.EstimatedTime);
+        var status = request.body.data.Status;
+        var category = request.body.data.Category;
+        var storyPointNumber = parseInt(request.body.data.StoryPointNumber);
+        var sprintNumber = parseInt(request.body.data.SprintNumber);
+        var creationDate = request.body.data.CreationDate;
+        var time = request.body.data.Time;
+        var fullSprintId = createSprintId(sprintNumber);
+        var loggedWorkTotalTime = 0;
+        var workDone = 0;
+        var taskId = "";
+        var totalDevelopmentTask;
+        var totalBusinessTask;
+        var totalOtherTask;
+        var totalMarketingTask;
+        var totalNumberOfTask;
+        var result;
+        var totalUnCompletedTask = 0;
+        var sprintDataPromise;
+
+        const promise1 = db.collection("RawData").doc("AppDetails").get().then((doc) => {
+            totalNumberOfTask = doc.data().TotalNumberOfTask;
+            totalDevelopmentTask = doc.data().TotalDevelopmentTask;
+            totalBusinessTask = doc.data().TotalBusinessTask;
+            totalMarketingTask = doc.data().TotalMarketingTask;
+            totalOtherTask = doc.data().TotalOtherTask;
+            totalUnCompletedTask = doc.data().TotalUnCompletedTask;
+            if (category === "Development") {
+                totalDevelopmentTask = totalDevelopmentTask + 1;
+                taskId = category[0] + totalDevelopmentTask;
+            } else if (category === "Business") {
+                totalBusinessTask = totalBusinessTask + 1;
+                taskId = category[0] + totalBusinessTask;
+            } else if (category === "Marketing") {
+                totalMarketingTask = totalMarketingTask + 1;
+                taskId = category[0] + totalMarketingTask;
+            } else {
+                totalOtherTask = totalOtherTask + 1;
+                taskId = category[0] + totalOtherTask;
+            }
+            totalUnCompletedTask = totalUnCompletedTask + 1;
+            totalNumberOfTask = totalNumberOfTask + 1;
+            console.log(taskId);
+            const P1 = db.collection("Tasks").doc(taskId).set({
+                Id: taskId,
+                Title: title,
+                Description: des,
+                Priority: priority,
+                Difficulty: difficulty,
+                Creator: creator,
+                Assignee: assignee,
+                EstimatedTime: estimatedTime,
+                Status: status,
+                Category: category,
+                LogWorkTotalTime: loggedWorkTotalTime,
+                WorkDone: workDone,
+                SprintNumber: sprintNumber,
+                StoryPointNumber: storyPointNumber,
+                CreationDate: creationDate
+            });
+            const P2 = db.collection("RawData").doc("AppDetails").update({
+                TotalDevelopmentTask: totalDevelopmentTask,
+                TotalBusinessTask: totalBusinessTask,
+                TotalMarketingTask: totalMarketingTask,
+                TotalOtherTask: totalOtherTask,
+                TotalNumberOfTask: totalNumberOfTask,
+                TotalUnCompletedTask: totalUnCompletedTask
+            });
+            updateActivity("CREATED", "Created task "+taskId, taskId, creationDate, time);
+            const Promises = [P1,P2];
+            return Promise.all(Promises);
+        });
+
+        const promise2 = db.collection("Main").doc(fullSprintId).get().then((doc) => {
+            if (doc.exists) {
+                totalNumberOfTask = doc.data().TotalNumberOfTask;
+                totalDevelopmentTask = doc.data().TotalDevelopmentTask;
+                totalBusinessTask = doc.data().TotalBusinessTask;
+                totalOtherTask = doc.data().TotalOtherTask;
+                totalMarketingTask = doc.data().TotalMarketingTask;
+                totalUnCompletedTask = doc.data().TotalUnCompletedTask;
+
+                if (category === "Development") {
+                    totalDevelopmentTask = totalDevelopmentTask + 1;
+                } else if (category === "Business") {
+                    totalBusinessTask = totalBusinessTask + 1;
+                } else if (category === "Marketing") {
+                    totalMarketingTask = totalMarketingTask + 1;
+                } else {
+                    totalOtherTask = totalOtherTask + 1;
+                }
+
+                totalNumberOfTask = totalNumberOfTask + 1;
+                totalUnCompletedTask = totalUnCompletedTask + 1;
+
+
+                sprintDataPromise = db.collection("Main").doc(fullSprintId).update({
+                    TotalBusinessTask: totalBusinessTask,
+                    TotalDevelopmentTask: totalDevelopmentTask,
+                    TotalMarketingTask: totalMarketingTask,
+                    TotalOtherTask: totalOtherTask,
+                    TotalUnCompletedTask: totalUnCompletedTask,
+                    TotalNumberOfTask: totalNumberOfTask
+                });
+            } else {
+                totalBusinessTask = 0;
+                totalDevelopmentTask = 0;
+                totalMarketingTask = 0;
+                totalOtherTask = 0;
+                totalUnCompletedTask = 0;
+                totalCompletedTask = 0;
+                totalNumberOfTask = 0;
+
+                if (category === "Development") {
+                    totalDevelopmentTask = totalDevelopmentTask + 1;
+                } else if (category === "Business") {
+                    totalBusinessTask = totalBusinessTask + 1;
+                } else if (category === "Marketing") {
+                    totalMarketingTask = totalMarketingTask + 1;
+                } else {
+                    totalOtherTask = totalOtherTask + 1;
+                }
+
+
+                totalNumberOfTask = totalNumberOfTask + 1;
+                totalUnCompletedTask = totalUnCompletedTask + 1;
+
+                sprintDataPromise = db.collection("Main").doc(fullSprintId).set({
+                    EndDate: "xx/xx/xxxx",
+                    StartDate: "xx/xx/xxxx",
+                    Status: "Not Started",
+                    TotalBusinessTask: totalBusinessTask,
+                    TotalDevelopmentTask: totalDevelopmentTask,
+                    TotalMarketingTask: totalMarketingTask,
+                    TotalOtherTask: totalOtherTask,
+                    TotalUnCompletedTask: totalUnCompletedTask,
+                    TotalCompletedTask: totalCompletedTask,
+                    TotalNumberOfTask: totalNumberOfTask
+                });
+
+            }
+            return Promise.resolve(sprintDataPromise);
+        });
+
+        const newTaskPromises = [promise1, promise2];
+        Promise.all(newTaskPromises).then(() => {
+                result = { data: "OK!" }
+                console.log("Document successfully written!");
+                return response.status(200).send(result);
+            })
+        .catch((error) => {
+            result = { data: error };
+            console.error("Error writing document: ", error);
+            return response.status(500).send(result);
+        });
+    });
+});
+
+function createSprintId(sprintNumber) {
+    if (sprintNumber === -1) {
+        return "Backlog";
+    } else {
+        return ("S" + sprintNumber);
+    }
+}
+
+async function updateActivity(type, comment, taskId, date, time){
+    var actionId = "";
+    if(type === "CREATED") {
+        actionId = "A0";
+        db.collection("Activity").doc(taskId).set({
+            TaskId: taskId,
+            TotalActions: 0,
+            TotalComments: 0
+        });
+        db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
+            Type: type,
+            Comment: comment,
+            Date: date,
+            Time: time
+        });
+    }
+    else if (type === "COMMENT") {
+        actionId = await db.collection("Activity").doc(taskId).get().then((doc) => {
+            totalActions = doc.data().TotalActions;
+            totalActions = totalActions+1;
+            totalComments = doc.data().TotalComments;
+            totalComments = totalComments+1;
+            return ("A" + totalActions);
+        });
+        if (actionId !== ""){
+            db.collection("Activity").doc(taskId).update({
+                TotalActions: totalActions,
+                TotalComments: totalComments,
+            });
+            db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
+                Type: type,
+                Comment: comment,
+                Date: date,
+                Time: time
+            });
+        }
+    }
+    else{
+        actionId = await db.collection("Activity").doc(taskId).get().then((doc) => {
+            totalActions = doc.data().TotalActions;
+            totalActions = totalActions+1;
+
+            return ("A" + totalActions);
+
+        });
+        if (actionId !== ""){
+            db.collection("Activity").doc(taskId).update({
+                TotalActions: totalActions,
+            });
+            db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
+                Type: type,
+                Comment: comment,
+                Date: date,
+                Time: time
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/functions/createNewUserAPI.js b/functions/createNewUserAPI.js
new file mode 100644
index 000000000..c2236a37d
--- /dev/null
+++ b/functions/createNewUserAPI.js
@@ -0,0 +1,52 @@
+const functions = require('firebase-functions');
+var cors = require('cors')({ origin: true });
+
+const admin = require('firebase-admin');
+
+const db = admin.firestore();
+
+exports.createNewUser = functions.https.onRequest((request, response) => {
+    cors(request, response, () => {
+        console.log(request);
+        const user = request.body.data;
+        const Uid = user.uid;
+        const PhotoURL = user.photoURL;
+        const DisplayName = user.displayName;
+        const Email = user.email;
+        const PhoneNumber = user.phoneNumber;
+        const ProviderId = user.providerId;
+
+        db.collection("Users").doc(Uid).get().then((doc) => {
+                if (doc.exists) {
+                    const userData = db.collection("Users").doc(Uid).update({
+                        uid: Uid,
+                        photoURL: PhotoURL,
+                        displayName: DisplayName,
+                        email: Email,
+                        phoneNumber: PhoneNumber,
+                        providerId: ProviderId
+                    });
+                    return Promise.resolve(userData);
+                } else {
+                    const userData = db.collection("Users").doc(Uid).set({
+                        uid: Uid,
+                        photoURL: PhotoURL,
+                        displayName: DisplayName,
+                        email: Email,
+                        phoneNumber: PhoneNumber,
+                        providerId: ProviderId
+                    });
+                    return Promise.resolve(userData);
+                }
+            }).then(() => {
+                result = { data: "User Logged In Successfully" };
+                console.log("Document successfully written");
+                return response.status(200).send(result);
+            })
+            .catch((error) => {
+                result = { data: error };
+                console.log("error", error);
+                return response.status(500).send(result)
+            });
+    });
+});
\ No newline at end of file
diff --git a/functions/deleteTaskAPI.js b/functions/deleteTaskAPI.js
new file mode 100644
index 000000000..c44447f37
--- /dev/null
+++ b/functions/deleteTaskAPI.js
@@ -0,0 +1,147 @@
+const functions = require('firebase-functions');
+var cors = require('cors')({ origin: true });
+
+const admin = require('firebase-admin');
+
+const db = admin.firestore();
+
+exports.deleteTask = functions.https.onRequest((request, response) => {
+    cors(request, response, () => {
+        console.log(request);
+
+        var sprintNumber = request.body.data.SprintNumber;
+        var taskId = request.body.data.Id;
+        var fullSprintId = createSprintId(sprintNumber);
+        var category = request.body.data.Category;
+        var status = request.body.data.Status;
+        var totalDevelopmentTask;
+        var totalBusinessTask;
+        var totalMarketingTask;
+        var totalOtherTask;
+        var totalNumberOfTask;
+        var result;
+        var totalCompletedTask;
+        var totalUnCompletedTask;
+        var date = request.body.data.Date;
+        var time = request.body.data.Time;
+        var totalActions;
+        var actionId;
+
+        const p1 = db.collection("Tasks").doc(taskId).update({
+            Category: "Trash",
+            SprintNumber: -2
+        });
+        
+        const p2 = db.collection("Main").doc(fullSprintId).get().then((doc) => {
+            totalNumberOfTask = doc.data().TotalNumberOfTask;
+            totalDevelopmentTask = doc.data().TotalDevelopmentTask;
+            totalBusinessTask = doc.data().TotalBusinessTask;
+            totalMarketingTask = doc.data().TotalMarketingTask;
+            totalOtherTask = doc.data().TotalOtherTask
+            totalCompletedTask = doc.data().TotalCompletedTask;
+            totalUnCompletedTask = doc.data().TotalUnCompletedTask;
+
+            if (category === "Development") {
+                totalDevelopmentTask = totalDevelopmentTask - 1;
+            } else if (category === "Business") {
+                totalBusinessTask = totalBusinessTask - 1;
+            } else if (category === "Marketing") {
+                totalMarketingTask = totalMarketingTask - 1;
+            } else {
+                totalOtherTask = totalOtherTask -1;
+            }
+            totalNumberOfTask = totalNumberOfTask - 1;
+            status === "Completed" ? totalCompletedTask = totalCompletedTask - 1 : totalUnCompletedTask = totalUnCompletedTask - 1;
+            var updateDeleteTaskCounter = db.collection("Main").doc(fullSprintId).update({
+                TotalDevelopmentTask: totalDevelopmentTask,
+                TotalBusinessTask: totalBusinessTask,
+                TotalMarketingTask: totalMarketingTask,
+                TotalOtherTask: totalOtherTask,
+                TotalNumberOfTask: totalNumberOfTask,
+                TotalCompletedTask: totalCompletedTask,
+                TotalUnCompletedTask: totalUnCompletedTask
+            });
+            return Promise.resolve(updateDeleteTaskCounter);
+        });
+        updateActivity("DELETED", "Deleted task "+taskId, taskId, date, time);
+
+        const deleteTaskPromises = [p1, p2];
+        Promise.all(deleteTaskPromises).then(() => {
+                result = { data: "OK" };
+                console.log("Document sucessfully deleted");
+                return response.status(200).send(result);
+            })
+            .catch((error) => {
+                result = { data: error };
+                console.log("error", error);
+                return response.status(500).send(result)
+            });
+    });
+});
+
+function createSprintId(sprintNumber) {
+    if (sprintNumber === -1) {
+        return "Backlog";
+    } else {
+        return ("S" + sprintNumber);
+    }
+}
+
+async function updateActivity(type, comment, taskId, date, time){
+    var actionId = "";
+    if(type === "CREATED") {
+        actionId = "A0";
+        db.collection("Activity").doc(taskId).set({
+            TaskId: taskId,
+            TotalActions: 0,
+            TotalComments: 0
+        });
+        db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
+            Type: type,
+            Comment: comment,
+            Date: date,
+            Time: time
+        });
+    }
+    else if (type === "COMMENT") {
+        actionId = await db.collection("Activity").doc(taskId).get().then((doc) => {
+            totalActions = doc.data().TotalActions;
+            totalActions = totalActions+1;
+            totalComments = doc.data().TotalComments;
+            totalComments = totalComments+1;
+            return ("A" + totalActions);
+        });
+        if (actionId !== ""){
+            db.collection("Activity").doc(taskId).update({
+                TotalActions: totalActions,
+                TotalComments: totalComments,
+            });
+            db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
+                Type: type,
+                Comment: comment,
+                Date: date,
+                Time: time
+            });
+        }
+    }
+    else{
+        actionId = await db.collection("Activity").doc(taskId).get().then((doc) => {
+            totalActions = doc.data().TotalActions;
+            totalActions = totalActions+1;
+
+            return ("A" + totalActions);
+
+        });
+        if (actionId !== ""){
+            db.collection("Activity").doc(taskId).update({
+                TotalActions: totalActions,
+            });
+            db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
+                Type: type,
+                Comment: comment,
+                Date: date,
+                Time: time
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/functions/editPageTaskAPI.js b/functions/editPageTaskAPI.js
new file mode 100644
index 000000000..69ab4c803
--- /dev/null
+++ b/functions/editPageTaskAPI.js
@@ -0,0 +1,237 @@
+const functions = require('firebase-functions');
+var cors = require('cors')({ origin: true });
+
+const admin = require('firebase-admin');
+
+const db = admin.firestore();
+
+exports.editPageTask = functions.https.onRequest((request, response) => {
+    cors(request, response, () => {
+        console.log(request);
+
+        var description = request.body.data.Description;
+        var priority = request.body.data.Priority;
+        var difficulty = request.body.data.Difficulty;
+        var assignee = request.body.data.Assignee;
+        var estimatedTime = request.body.data.EstimatedTime;
+        var category = request.body.data.Category;
+        var storyPointNumber = request.body.data.StoryPointNumber;
+        var editedSprintNumber = request.body.data.SprintNumber;
+        var previousId = request.body.data.PreviousId;
+        var creationDate = request.body.data.CreationDate;
+        var changedData = request.body.data.ChangedData;
+        var previousSprintId = createSprintId(previousId);
+        var taskId = request.body.data.Id;
+        var editedSprintId = createSprintId(editedSprintNumber);
+        var totalDevelopmentTask;
+        var totalBusinessTask;
+        var totalMarketingTask;
+        var totalOtherTask;
+        var totalNumberOfTask;
+        var result;
+        var totalUnCompletedTask;
+        var totalCompletedTask;
+        var sprintEditPromise;
+        var date = request.body.data.Date;
+        var time = request.body.data.Time;
+        var totalActions;
+        var actionId;
+        var type = "EDITED";
+        var comment = "Edited task details: ";
+
+
+        var promises = [];
+        if (editedSprintNumber !== previousId) {
+            comment += "Moved to sprint " + editedSprintId + ". ";
+            const p1 = db.collection("Main").doc(previousSprintId).get().then((doc) => {
+                totalNumberOfTask = doc.data().TotalNumberOfTask;
+                totalDevelopmentTask = doc.data().TotalDevelopmentTask;
+                totalBusinessTask = doc.data().TotalBusinessTask;
+                totalMarketingTask = doc.data().TotalMarketingTask;
+                totalOtherTask = doc.data().TotalOtherTask;
+                totalUnCompletedTask = doc.data().TotalUnCompletedTask;
+
+                if (category === "Development") {
+                    totalDevelopmentTask = totalDevelopmentTask - 1;
+                } else if (category === "Business") {
+                    totalBusinessTask = totalBusinessTask - 1;
+                } else if (category === "Marketing") {
+                    totalMarketingTask = totalMarketingTask - 1;
+                } else {
+                    totalOtherTask = totalOtherTask - 1;
+                }
+
+                totalNumberOfTask = totalNumberOfTask - 1;
+                totalUnCompletedTask = totalUnCompletedTask - 1;
+                var editSprintDeleteCounter = db.collection("Main").doc(previousSprintId).update({
+                    TotalDevelopmentTask: totalDevelopmentTask,
+                    TotalBusinessTask: totalBusinessTask,
+                    TotalMarketingTask: totalMarketingTask,
+                    TotalOtherTask: totalOtherTask,
+                    TotalNumberOfTask: totalNumberOfTask,
+                    TotalUnCompletedTask: totalUnCompletedTask
+                });
+
+                return Promise.resolve(editSprintDeleteCounter);
+            });
+            promises.push(p1);
+
+            const p2 = db.collection("Main").doc(editedSprintId).get().then((doc) => {
+                if (doc.exists) {
+                    totalNumberOfTask = doc.data().TotalNumberOfTask;
+                    totalDevelopmentTask = doc.data().TotalDevelopmentTask;
+                    totalBusinessTask = doc.data().TotalBusinessTask;
+                    totalMarketingTask = doc.data().TotalMarketingTask;
+                    totalOtherTask = doc.data().TotalOtherTask;
+                    totalUnCompletedTask = doc.data().TotalUnCompletedTask;
+
+                    if (category === "Development") {
+                        totalDevelopmentTask = totalDevelopmentTask + 1;
+                    } else if (category === "Business") {
+                        totalBusinessTask = totalBusinessTask + 1;
+                    } else if (category === "Marketing") {
+                        totalMarketingTask = totalMarketingTask + 1;
+                    } else {
+                        totalOtherTask = totalOtherTask + 1;
+                    }
+
+                    totalNumberOfTask = totalNumberOfTask + 1;
+                    totalUnCompletedTask = totalUnCompletedTask + 1;
+
+                    sprintEditPromise = db.collection("Main").doc(editedSprintId).update({
+                        TotalBusinessTask: totalBusinessTask,
+                        TotalDevelopmentTask: totalDevelopmentTask,
+                        TotalMarketingTask: totalMarketingTask,
+                        TotalOtherTask: totalOtherTask,
+                        TotalUnCompletedTask: totalUnCompletedTask,
+                        TotalNumberOfTask: totalNumberOfTask
+                    });
+                } else {
+                    totalBusinessTask = 0;
+                    totalDevelopmentTask = 0;
+                    totalMarketingTask = 0;
+                    totalOtherTask = 0;
+                    totalUnCompletedTask = 0;
+                    totalCompletedTask = 0;
+                    totalNumberOfTask = 0;
+
+                    if (category === "Development") {
+                        totalDevelopmentTask = totalDevelopmentTask + 1;
+                    } else if (category === "Business") {
+                        totalBusinessTask = totalBusinessTask + 1;
+                    } else if (category === "Marketing") {
+                        totalMarketingTask = totalMarketingTask + 1;
+                    } else {
+                        totalOtherTask = totalOtherTask + 1;
+                    }
+
+                    totalNumberOfTask = totalNumberOfTask + 1;
+                    totalUnCompletedTask = totalUnCompletedTask + 1;
+                    sprintEditPromise = db.collection("Main").doc(editedSprintId).set({
+                        TotalBusinessTask: totalBusinessTask,
+                        TotalDevelopmentTask: totalDevelopmentTask,
+                        TotalMarketingTask: totalMarketingTask,
+                        TotalOtherTask: totalOtherTask,
+                        TotalUnCompletedTask: totalUnCompletedTask,
+                        TotalCompletedTask: totalCompletedTask,
+                        TotalNumberOfTask: totalNumberOfTask
+                    });
+                }
+                return Promise.resolve(sprintEditPromise)
+            });
+            promises.push(p2);
+        }
+
+        var p3 = db.collection("Tasks").doc(taskId).update({
+                Description: description,
+                CreationDate: creationDate,
+                Priority: priority,
+                Difficulty: difficulty,
+                Assignee: assignee,
+                EstimatedTime: estimatedTime,
+                SprintNumber: editedSprintNumber,
+                StoryPointNumber: storyPointNumber
+        });
+        promises.push(p3);
+        comment = comment + changedData;
+        updateActivity(type, comment, taskId, date, time);
+
+        Promise.all(promises).then(() => {
+            result = { data: "OK" };
+            console.log("Document sucessfully written");
+            return response.status(200).send(result);
+        })
+        .catch((error) => {
+            result = { data: error };
+            console.log("error", error);
+            return response.status(500).send(result)
+        });
+    });
+});
+
+function createSprintId(sprintNumber) {
+    if (sprintNumber === -1) {
+        return "Backlog";
+    } else {
+        return ("S" + sprintNumber);
+    }
+}
+
+async function updateActivity(type, comment, taskId, date, time){
+    var actionId = "";
+    if(type === "CREATED") {
+        actionId = "A0";
+        db.collection("Activity").doc(taskId).set({
+            TaskId: taskId,
+            TotalActions: 0,
+            TotalComments: 0
+        });
+        db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
+            Type: type,
+            Comment: comment,
+            Date: date,
+            Time: time
+        });
+    }
+    else if (type === "COMMENT") {
+        actionId = await db.collection("Activity").doc(taskId).get().then((doc) => {
+            totalActions = doc.data().TotalActions;
+            totalActions = totalActions+1;
+            totalComments = doc.data().TotalComments;
+            totalComments = totalComments+1;
+            return ("A" + totalActions);
+        });
+        if (actionId !== ""){
+            db.collection("Activity").doc(taskId).update({
+                TotalActions: totalActions,
+                TotalComments: totalComments,
+            });
+            db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
+                Type: type,
+                Comment: comment,
+                Date: date,
+                Time: time
+            });
+        }
+    }
+    else{
+        actionId = await db.collection("Activity").doc(taskId).get().then((doc) => {
+            totalActions = doc.data().TotalActions;
+            totalActions = totalActions+1;
+
+            return ("A" + totalActions);
+
+        });
+        if (actionId !== ""){
+            db.collection("Activity").doc(taskId).update({
+                TotalActions: totalActions,
+            });
+            db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
+                Type: type,
+                Comment: comment,
+                Date: date,
+                Time: time
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/functions/logWorkAPI.js b/functions/logWorkAPI.js
new file mode 100644
index 000000000..1160b7a42
--- /dev/null
+++ b/functions/logWorkAPI.js
@@ -0,0 +1,143 @@
+const functions = require('firebase-functions');
+var cors = require('cors')({ origin: true });
+
+const admin = require('firebase-admin');
+
+const db = admin.firestore();
+
+exports.logWork = functions.https.onRequest((request, response) => {
+    cors(request, response, () => {
+        var status = request.body.data.LogWorkStatus;
+        var taskId = request.body.data.LogTaskId;
+        var logHours = parseInt(request.body.data.LogHours);
+        var workDone = parseInt(request.body.data.LogWorkDone);
+        var sprintNumber = parseInt(request.body.data.SprintNumber);
+        var logWorkComment = request.body.data.LogWorkComment;
+        var date = request.body.data.Date;
+        var time = request.body.data.Time;
+        var fullSprintId = createSprintId(sprintNumber);
+        var logWorkTotalTime;
+        var totalActions;
+        var totalComments;
+        var actionId;
+
+        const promise1 = db.collection("Tasks").doc(taskId).get().then((doc) => {
+            logWorkTotalTime = parseInt(doc.data().LogWorkTotalTime);
+            logWorkTotalTime = parseInt(logWorkTotalTime) + parseInt(logHours);
+
+            var updatePromise = db.collection("Tasks").doc(taskId).update({
+                LogWorkTotalTime: logWorkTotalTime,
+                WorkDone: workDone,
+                Status: status
+            });
+            return Promise.resolve(updatePromise);
+        });
+        const promise2 = db.collection("RawData").doc("AppDetails").get().then((doc) => {
+            totalCompletedTask = parseInt(doc.data().TotalCompletedTask);
+            totalUnCompletedTask = parseInt(doc.data().TotalUnCompletedTask);
+            if (status === "Completed") {
+                totalCompletedTask = totalCompletedTask + 1;
+                totalUnCompletedTask = totalUnCompletedTask - 1;
+            }
+            var updateStatus = db.collection("RawData").doc("AppDetails").update({
+                TotalCompletedTask: totalCompletedTask,
+                TotalUnCompletedTask: totalUnCompletedTask
+            });
+            return Promise.resolve(updateStatus);
+        });
+        const promise3 = db.collection("Main").doc(fullSprintId).get().then((doc) => {
+            totalCompletedTask = parseInt(doc.data().TotalCompletedTask);
+            totalUnCompletedTask = parseInt(doc.data().TotalUnCompletedTask);
+
+            if (status === "Completed") {
+                totalCompletedTask = totalCompletedTask + 1;
+                totalUnCompletedTask = totalUnCompletedTask - 1;
+            }
+            var updateSprintstatus = db.collection("Main").doc(fullSprintId).update({
+                TotalCompletedTask: totalCompletedTask,
+                TotalUnCompletedTask: totalUnCompletedTask
+            });
+            return Promise.resolve(updateSprintstatus);
+        });
+        updateActivity("COMMENT", logWorkComment, taskId, date, time);
+        
+        const logWorkPromises = [promise1, promise2, promise3];
+        Promise.all(logWorkPromises).then(() => {
+                result = { data: "OK" }
+                console.log("Document successfully written!");
+                return response.status(200).send(result);
+            })
+            .catch((error) => {
+                var result = { data: error };
+                console.log("error", error);
+                return response.status(500).send(result)
+            });
+    });
+});
+
+function createSprintId(sprintNumber) {
+    if (sprintNumber === -1) {
+        return "Backlog";
+    } else {
+        return ("S" + sprintNumber);
+    }
+}
+
+async function updateActivity(type, comment, taskId, date, time){
+    var actionId = "";
+    if(type === "CREATED") {
+        actionId = "A0";
+        db.collection("Activity").doc(taskId).set({
+            TaskId: taskId,
+            TotalActions: 0,
+            TotalComments: 0
+        });
+        db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
+            Type: type,
+            Comment: comment,
+            Date: date,
+            Time: time
+        });
+    }
+    else if (type === "COMMENT") {
+        actionId = await db.collection("Activity").doc(taskId).get().then((doc) => {
+            totalActions = doc.data().TotalActions;
+            totalActions = totalActions+1;
+            totalComments = doc.data().TotalComments;
+            totalComments = totalComments+1;
+            return ("A" + totalActions);
+        });
+        if (actionId !== ""){
+            db.collection("Activity").doc(taskId).update({
+                TotalActions: totalActions,
+                TotalComments: totalComments,
+            });
+            db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
+                Type: type,
+                Comment: comment,
+                Date: date,
+                Time: time
+            });
+        }
+    }
+    else{
+        actionId = await db.collection("Activity").doc(taskId).get().then((doc) => {
+            totalActions = doc.data().TotalActions;
+            totalActions = totalActions+1;
+
+            return ("A" + totalActions);
+
+        });
+        if (actionId !== ""){
+            db.collection("Activity").doc(taskId).update({
+                TotalActions: totalActions,
+            });
+            db.collection("Activity").doc(taskId).collection("Action").doc(actionId).set({
+                Type: type,
+                Comment: comment,
+                Date: date,
+                Time: time
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/functions/startNewSprintAPI.js b/functions/startNewSprintAPI.js
new file mode 100644
index 000000000..5da7fe2c2
--- /dev/null
+++ b/functions/startNewSprintAPI.js
@@ -0,0 +1,76 @@
+const functions = require('firebase-functions');
+var cors = require('cors')({ origin: true });
+
+const admin = require('firebase-admin');
+
+const db = admin.firestore();
+
+exports.startNewSprint = functions.https.onRequest((request, response) => {
+    cors(request, response, () => {
+        console.log(request);
+
+        var status = request.body.data.Status;
+        var startDate = request.body.data.StartDate;
+        var endDate = request.body.data.EndDate;
+        var totalDevelopment = parseInt(request.body.data.TotalDevelopment);
+        var totalBusiness = parseInt(request.body.data.TotalBusiness);
+        var totalMarketing = parseInt(request.body.data.TotalMarketing);
+        var totalOther = parseInt(request.body.data.TotalOther);
+        var newSprintId = parseInt(request.body.data.NewSprintId);
+        var newSprintIdString = "S" + newSprintId.toString();
+        var createSprintPromise;
+        var result;
+
+        console.log("End Date from Backend: " + endDate);
+        console.log("Start Date from Backend: " + startDate);
+        console.log("Status from Backend: " + status);
+
+        const p1 = db.collection("Main").doc(newSprintIdString).get().then((doc) => {
+            if (doc.exists) {
+                createSprintPromise = db.collection("Main").doc(newSprintIdString).update({
+                    TotalDevelopmentTask: totalDevelopment,
+                    TotalBusinessTask: totalBusiness,
+                    TotalMarketingTask: totalMarketing,
+                    TotalOtherTask: totalOther,
+                    EndDate: endDate,
+                    StartDate: startDate,
+                    Status: status
+                });
+            } else {
+                var totalUnCompletedTask = 0;
+                var totalCompletedTask = 0;
+                var totalNumberOfTask = 0;
+
+                createSprintPromise = db.collection("Main").doc(newSprintIdString).set({
+                    TotalDevelopmentTask: totalDevelopment,
+                    TotalBusinessTask: totalBusiness,
+                    TotalMarketingTask: totalMarketing,
+                    TotalOtherTask: totalOther,
+                    EndDate: endDate,
+                    StartDate: startDate,
+                    Status: status,
+                    TotalUnCompletedTask: totalUnCompletedTask,
+                    TotalCompletedTask: totalCompletedTask,
+                    TotalNumberOfTask: totalNumberOfTask
+                });
+            }
+            return Promise.resolve(createSprintPromise);
+        });
+        const p2 = db.collection("RawData").doc("AppDetails").update({
+            CurrentSprintId: newSprintId
+        });
+        const Promises = [p1,p2];
+        return Promise.all(Promises).then(() => {
+            console.log("Sprint started successfully");
+            result = { data: "OK" }
+            console.log("Document successfully written!");
+            return response.status(200).send(result);
+        })
+        .catch((error) => {
+            result = { data: error }
+            console.log("error", error);
+            return response.status(500).send(result);
+        });
+    });
+});
+
diff --git a/functions/updateSprintStatusAPI.js b/functions/updateSprintStatusAPI.js
new file mode 100644
index 000000000..71f8de785
--- /dev/null
+++ b/functions/updateSprintStatusAPI.js
@@ -0,0 +1,17 @@
+const functions = require('firebase-functions');
+var cors = require('cors')({ origin: true });
+
+const admin = require('firebase-admin');
+
+const db = admin.firestore();
+
+exports.updateSprintStatus = functions.https.onRequest((request, response) => {
+    cors(request, response, () => {
+        var sprintStatus = request.body.data.SprintStatus;
+        var currentSprintName = request.body.data.CurrentSprintName;
+        console.log(currentSprintName);
+        db.collection("Main").doc(currentSprintName).update({
+            Status: sprintStatus,
+        });
+    });
+})