Skip to content

Commit

Permalink
tslint cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
carsnwd committed Feb 21, 2019
1 parent 7c23b52 commit 8aff0ef
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 39 deletions.
2 changes: 1 addition & 1 deletion src/app/app.component.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<task-list></task-list>
<app-task-list></app-task-list>
4 changes: 2 additions & 2 deletions src/app/task-dialog/task-dialog.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ export class TaskDialogComponent implements OnInit {
this.form = this.fb.group({
name: new FormControl(''),
color: new FormControl('')
})
});
}

public save(){
this.dialogRef.close(this.form.value);
}

public close(): void{
public close(): void {
this.dialogRef.close();
}

Expand Down
12 changes: 6 additions & 6 deletions src/app/task-factory-service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ export class TaskFactoryService {
return Math.floor(Math.random() * 99999);
}

private verifyTaskOptions(options): boolean{
if(options.name && options.color){
private verifyTaskOptions(options): boolean {
if (options.name && options.color) {
return true;
}
throw new Error("Invalid parameters provided for the task. Requires name, color, startTime, endTime");
throw new Error('Invalid parameters provided for the task. Requires name, color, startTime, endTime');
}

public createTask(options): Task{
if(this.verifyTaskOptions(options)){
public createTask(options): Task {
if (this.verifyTaskOptions(options)) {
const task = new Task();
task.id = this.generateId();
task.name = options.name;
Expand All @@ -31,7 +31,7 @@ export class TaskFactoryService {
}
}

public cloneTaskObjectToTaskClass(taskObject: any): Task{
public cloneTaskObjectToTaskClass(taskObject: any): Task {
const task = new Task();
task.id = taskObject._id;
task.name = taskObject._name;
Expand Down
29 changes: 16 additions & 13 deletions src/app/task-list/task-list.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,26 @@ import { Component, OnInit } from '@angular/core';
import { TaskRepositoryServiceService } from '../task-repository-service.service';
import { TaskFactoryService } from '../task-factory-service';
import { Task } from '../models/task';
import { MatDialog } from "@angular/material";
import { MatDialog } from '@angular/material';
import { TaskDialogComponent } from '../task-dialog/task-dialog.component';

@Component({
selector: 'task-list',
selector: 'app-task-list',
templateUrl: './task-list.component.html',
styleUrls: ['./task-list.component.less']
})
export class TaskListComponent{
export class TaskListComponent {

tasks: Object;
tasks: object;

constructor(private taskRepositoryService: TaskRepositoryServiceService, private taskFactoryService: TaskFactoryService, private createTaskDialog: MatDialog){
constructor(
private taskRepositoryService: TaskRepositoryServiceService,
private taskFactoryService: TaskFactoryService,
private createTaskDialog: MatDialog) {
this.tasks = taskRepositoryService.getAllTasks();
}

public createTask(task): boolean{
public createTask(task): boolean {
const taskObject = this.taskFactoryService.createTask({
name: task.name,
color: task.color
Expand All @@ -27,31 +30,31 @@ export class TaskListComponent{
return true;
}

public updateTask(): boolean{
public updateTask(): boolean {
return true;
}

public removeTask(taskObject): boolean{
public removeTask(taskObject): boolean {
const task = taskObject as Task;
return this.taskRepositoryService.removeTask(task);
}

public startTask(task: Task): boolean{
public startTask(task: Task): boolean {
return true;
}

public stopTask(task: Task): boolean{
public stopTask(task: Task): boolean {
return true;
}

public getTotalTime(): number{
public getTotalTime(): number {
return 0;
}

public openCreateTaskDialog(): void {
let dialogRef = this.createTaskDialog.open(TaskDialogComponent);
const dialogRef = this.createTaskDialog.open(TaskDialogComponent);
dialogRef.afterClosed().subscribe((data) => {
if(data){
if (data) {
this.createTask(data);
}
});
Expand Down
34 changes: 17 additions & 17 deletions src/app/task-repository-service.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,64 +11,64 @@ export class TaskRepositoryServiceService {
private LOCAL_STORAGE_TASKS_ID;
private tasks: object;

constructor(private taskFactoryService: TaskFactoryService) {
this.LOCAL_STORAGE_TASKS_ID = "timeKeeperTasks";
constructor(private taskFactoryService: TaskFactoryService) {
this.LOCAL_STORAGE_TASKS_ID = 'timeKeeperTasks';
this.tasks = this.getTasksInLocalStorage();
}

private setTasksInLocalStorage(tasks:object): boolean{
private setTasksInLocalStorage(tasks: object): boolean {
localStorage.setItem(this.LOCAL_STORAGE_TASKS_ID, JSON.stringify(tasks));
return true;
}

private getTasksInLocalStorage(): object{
let tasksObjectString = localStorage.getItem(this.LOCAL_STORAGE_TASKS_ID)
if(_.isNil(tasksObjectString)){
private getTasksInLocalStorage(): object {
const tasksObjectString = localStorage.getItem(this.LOCAL_STORAGE_TASKS_ID)
if (_.isNil(tasksObjectString)) {
this.setTasksInLocalStorage({});
return {};
}
return this.parseObjecTaskIntoTypeScriptTaskCLass(JSON.parse(tasksObjectString));
}

private parseObjecTaskIntoTypeScriptTaskCLass(tasksObject: any){
private parseObjecTaskIntoTypeScriptTaskCLass(tasksObject: any) {
const returnTasks = {};
const that = this;
if(!_.isEmpty(tasksObject)){
_.forEach(tasksObject, function(taskObject){
if (!_.isEmpty(tasksObject)) {
_.forEach(tasksObject, (taskObject) => {
returnTasks[taskObject._id] = that.taskFactoryService.cloneTaskObjectToTaskClass(taskObject);
});
}
return returnTasks;
}

public addTask(task:Task): boolean{
if(task.id && !this.tasks[task.id]){
public addTask(task: Task): boolean {
if (task.id && !this.tasks[task.id]) {
this.tasks[task.id] = task;
this.setTasksInLocalStorage(this.tasks);
return true;
}
return false;
}

public removeTask(task:Task): boolean{
if(task.id && this.tasks[task.id]){
public removeTask(task: Task): boolean {
if (task.id && this.tasks[task.id]) {
delete this.tasks[task.id];
this.setTasksInLocalStorage(this.tasks);
return true;
}
return false;
}

public updateTask(task:Task): boolean{
if(task.id && this.tasks[task.id]){
public updateTask(task: Task): boolean {
if (task.id && this.tasks[task.id]) {
this.tasks[task.id] = task;
this.setTasksInLocalStorage(this.tasks);
return true;
}
return false;
}
public getAllTasks(): object{

public getAllTasks(): object {
return this.tasks;
}
}

0 comments on commit 8aff0ef

Please sign in to comment.