hardi
/
angular4-testing
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cosmetic tuning

merge-requests/1/head
Florian Hartwich 2017-04-07 02:55:42 +02:00
parent 7ed157625b
commit 27d92ed2dd
56 changed files with 511 additions and 439 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
project-manager/package.json
View File

@ -17,14 +17,14 @@
},
"private": true,
"dependencies": {
"@angular/common": "^4.0.0",
"@angular/compiler": "^4.0.0",
"@angular/core": "^4.0.0",
"@angular/forms": "^4.0.0",
"@angular/http": "^4.0.0",
"@angular/platform-browser": "^4.0.0",
"@angular/platform-browser-dynamic": "^4.0.0",
"@angular/router": "^4.0.0",
"@angular/common": "4.0.0",
"@angular/compiler": "4.0.0",
"@angular/core": "4.0.0",
"@angular/forms": "4.0.0",
"@angular/http": "4.0.0",
"@angular/platform-browser": "4.0.0",
"@angular/platform-browser-dynamic": "4.0.0",
"@angular/router": "4.0.0",
"bootstrap": "^3.3.7",
"core-js": "^2.4.1",
"jquery": "^3.1.0",
@ -38,7 +38,7 @@
},
"devDependencies": {
"@angular/cli": "1.0.0",
"@angular/compiler-cli": "^4.0.0",
"@angular/compiler-cli": "4.0.0",
"@types/jasmine": "2.5.38",
"@types/node": "~6.0.60",
"@types/socket.io-client": "^1.4.26",

3
project-manager/src/app/about/about.component.ts
View File

@ -8,6 +8,7 @@ import {Component} from '@angular/core';
})
export class AboutComponent {
constructor() {}
constructor() {
}
}

2
project-manager/src/app/app.component.css
View File

@ -13,11 +13,11 @@ li {
padding-right: 15px;
}
.right {
float: right;
width: 300px;
}
.left {
float: left;
width: calc(100% - 300px);

3
project-manager/src/app/app.component.html
View File

@ -50,7 +50,8 @@
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"
aria-expanded="false">
Schnellzugriff
<span class="caret"></span>
</a>

4
project-manager/src/app/app.component.ts
View File

@ -41,7 +41,7 @@ export class AppComponent {
this.taskService.tasks$.subscribe((tasks) => {
this.numberInProgress = tasks.filter(
(task:Task)=> task.state === 'IN_PROGRESS').length;
(task: Task) => task.state === 'IN_PROGRESS').length;
});
}
@ -51,7 +51,7 @@ export class AppComponent {
let title = this.defaultTitle;
let route = this.activatedRoute;
// firstChild gibt die Haupt-Kindroute der übergebenen Route zurück
while(route.firstChild) {
while (route.firstChild) {
console.log()
route = route.firstChild;
title = route.snapshot.data['title'] || title;

4
project-manager/src/app/app.routing.ts
View File

@ -15,11 +15,11 @@ import {ModelDrivenFormComponent} from "./model-driven-form/model-driven-form.co
export const appRoutes: Routes = [
{path: 'dashboard', component: DashboardComponent, data: {title: 'Startseite'}},
{path: '', redirectTo: '/dashboard', pathMatch: 'full'},
{path: 'settings', component: SettingsComponent, data: { title: 'Einstellungen' }},
{path: 'settings', component: SettingsComponent, data: {title: 'Einstellungen'}},
{path: 'about', component: AboutComponent, data: {title: 'Über uns'}},
{path: 'rxdemo', component: RxDemoComponent, data: {title: 'RxJS Demo'}},
{path: 'blog', component: BlogComponent, data: {title: 'Blog'}},
{path: 'model-form', component: ModelDrivenFormComponent, data: { title: 'Model Driven Task Form' }},
{path: 'model-form', component: ModelDrivenFormComponent, data: {title: 'Model Driven Task Form'}},
{path: 'login', component: LoginComponent},

12
project-manager/src/app/blog/blog-entry/blog-entry.component.spec.ts
View File

@ -12,9 +12,9 @@ describe('Blog Entry Isolated Test', () => {
declarations: [BlogEntryComponent]
});
const fixture = TestBed.createComponent(BlogEntryComponent);
const blogEntryComponent : BlogEntryComponent = fixture.componentInstance;
const blogEntryComponent: BlogEntryComponent = fixture.componentInstance;
const element = fixture.nativeElement;
const blogEntry : BlogEntry = new BlogEntry;
const blogEntry: BlogEntry = new BlogEntry;
// Testdaten
const testId = 101;
@ -60,19 +60,19 @@ describe('Blog Entry Isolated Test', () => {
describe('BlogEntryComp -> BlogComp Relational Test', () => {
it ('should remove entry from BlogComponent on "delete" button click', () => {
it('should remove entry from BlogComponent on "delete" button click', () => {
TestBed.configureTestingModule({
imports: [RouterTestingModule.withRoutes([])],
declarations: [BlogEntryComponent, BlogComponent]
});
const entryFixture = TestBed.createComponent(BlogEntryComponent);
const entryInstance : BlogEntryComponent = entryFixture.componentInstance;
const entryInstance: BlogEntryComponent = entryFixture.componentInstance;
const blogFixture = TestBed.createComponent(BlogComponent);
const blogInstance : BlogComponent = blogFixture.componentInstance;
const blogInstance: BlogComponent = blogFixture.componentInstance;
const blogEntry : BlogEntry = blogInstance.entries[0];
const blogEntry: BlogEntry = blogInstance.entries[0];
entryInstance.entry = blogEntry;
entryInstance.blogComponent = blogInstance;

2
project-manager/src/app/blog/blog-entry/blog-entry.component.ts
View File

@ -11,7 +11,7 @@ export class BlogEntryComponent {
@Input() blogComponent: BlogComponent;
@Input() entry: BlogEntry;
deleteBlogEntry(id:number) {
deleteBlogEntry(id: number) {
this.blogComponent.deleteBlogEntry(id);
}

2
project-manager/src/app/blog/blog-entry/blog-entry.ts
View File

@ -1,5 +1,5 @@
export class BlogEntry {
id : number;
id: number;
title: string;
text: string;
image: string;

4
project-manager/src/app/blog/blog.component.html
View File

@ -6,11 +6,11 @@
<div class="control">
<label for="title">Titel:</label>
<input type="text" id="title" #title />
<input type="text" id="title" #title/>
</div>
<div class="control">
<label for="title">Bild-URL:</label>
<input type="text" id="image" #image />
<input type="text" id="image" #image/>
</div>
<div class="control">
<label for="text">Text:</label>

8
project-manager/src/app/blog/blog.component.ts
View File

@ -29,11 +29,11 @@ export class BlogComponent {
title: "Neue Vorschläge für die kommende Module-Loader-Syntax",
image: "https://cdn-images-1.medium.com/max/1000/1*RQFLsbQumE-iNrXzs_Oz8g.jpeg",
text: "Nachdem im ES2015-Standard bereits die Module-API verabschiedet wurde, hat das zuständige Konsortium nun neue Vorschläge für die Module-Loader-Syntax bekannt gegeben...",
createdAt : null
createdAt: null
}
];
this.entries = initialEntries;
this.entries.forEach((entry)=> {
this.entries.forEach((entry) => {
entry.createdAt = new Date();
if (this.id < entry.id) {
this.id = entry.id;
@ -41,7 +41,7 @@ export class BlogComponent {
});
}
createBlogEntry(title:string, image:string, text:string) {
createBlogEntry(title: string, image: string, text: string) {
this.id++;
let entry = new BlogEntry();
entry.id = this.id;
@ -53,7 +53,7 @@ export class BlogComponent {
this.entries.push(entry);
}
deleteBlogEntry(id:number) {
deleteBlogEntry(id: number) {
let entryIndex = this.entries.findIndex(entry => entry.id === id);
if (entryIndex >= 0) {
this.entries.splice(entryIndex, 1);

2
project-manager/src/app/dashboard/dashboard.component.ts
View File

@ -11,6 +11,7 @@ import {Title} from '@angular/platform-browser';
export class DashboardComponent {
title: string;
constructor(r: ActivatedRoute, private router: Router, private titleService: Title) {
}
@ -22,6 +23,7 @@ export class DashboardComponent {
this.titleService.setTitle(this.title);
}
}
ngOnDestroy() {
this.titleService.setTitle(this.originalTitle);
}

47
project-manager/src/app/login/login.component.css
View File

@ -1,19 +1,18 @@
.form-signin
{
.form-signin {
max-width: 330px;
padding: 15px;
margin: 0 auto;
}
.form-signin .form-signin-heading, .form-signin .checkbox
{
.form-signin .form-signin-heading, .form-signin .checkbox {
margin-bottom: 10px;
}
.form-signin .checkbox
{
.form-signin .checkbox {
font-weight: normal;
}
.form-signin .form-control
{
.form-signin .form-control {
position: relative;
font-size: 16px;
height: auto;
@ -22,24 +21,24 @@
-moz-box-sizing: border-box;
box-sizing: border-box;
}
.form-signin .form-control:focus
{
.form-signin .form-control:focus {
z-index: 2;
}
.form-signin input[type="text"]
{
.form-signin input[type="text"] {
margin-bottom: -1px;
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
}
.form-signin input[type="password"]
{
.form-signin input[type="password"] {
margin-bottom: 10px;
border-top-left-radius: 0;
border-top-right-radius: 0;
}
.account-wall
{
.account-wall {
margin-top: 20px;
padding: 40px 0px 20px 0px;
background-color: #f7f7f7;
@ -47,15 +46,15 @@
-webkit-box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
}
.login-title
{
.login-title {
color: #555;
font-size: 18px;
font-weight: 400;
display: block;
}
.profile-img
{
.profile-img {
width: 96px;
height: 96px;
margin: 0 auto 10px;
@ -64,12 +63,12 @@
-webkit-border-radius: 50%;
border-radius: 50%;
}
.need-help
{
.need-help {
margin-top: 10px;
}
.new-account
{
.new-account {
display: block;
margin-top: 10px;
}

2
project-manager/src/app/login/login.component.ts
View File

@ -9,7 +9,7 @@ import {NgForm} from "@angular/forms";
styleUrls: ['./login.component.css']
})
export class LoginComponent {
@ViewChild(NgForm) form : NgForm;
@ViewChild(NgForm) form: NgForm;
constructor(private loginService: LoginService,

12
project-manager/src/app/login/login.guard.ts
View File

@ -1,10 +1,12 @@
import { Injectable } from '@angular/core';
import {CanActivate,
import {Injectable} from '@angular/core';
import {
CanActivate,
Router,
ActivatedRouteSnapshot,
RouterStateSnapshot } from '@angular/router';
import { Observable } from 'rxjs/Observable';
import { LoginService } from "../services/login-service/login-service";
RouterStateSnapshot
} from '@angular/router';
import {Observable} from 'rxjs/Observable';
import {LoginService} from "../services/login-service/login-service";
@Injectable()
export class LoginGuard implements CanActivate {

2
project-manager/src/app/mocks/mock-socket.ts
View File

@ -1,9 +1,11 @@
export class MockSocket {
emit(action, data) {
}
addEventListener(l) {
}
removeEventListener(l) {
}

2
project-manager/src/app/model-driven-form/model-driven-form.component.html
View File

@ -28,7 +28,7 @@
</div>
</div>
<div class="form-group">
<button class="btn btn-success" (click)="addTag()"> + </button>
<button class="btn btn-success" (click)="addTag()"> +</button>
</div>
<div class="form-group">
<label>Status</label>

22
project-manager/src/app/model-driven-form/model-driven-form.component.spec.ts
View File

@ -4,12 +4,15 @@ import {ModelDrivenFormComponent} from './model-driven-form.component';
import {UserService} from '../services/user-service/user.service';
import {TaskServiceModelForm} from "../services/task-service/task-model-form.service";
import {ShowErrorComponentModelDriven} from "../show-error/show-error-model-driven.component";
import {generateRandomString} from "../../test/test.helper";
import {generateRandomString} from "../test/test.helper";
describe('Model Driven Form', () => {
let fixture ;
let form ;
// ModelDrivenFormComponent Fixture
let fixture;
// main FormGroup
let form;
beforeEach(() => {
TestBed.configureTestingModule({
@ -30,16 +33,20 @@ describe('Model Driven Form', () => {
it('should show error on tag name provided with gt 0 and lt 3', () => {
// "add tag" Aufruf starten -> neue FormGroup wird erstellt
const tagControlGroup : FormGroup = fixture.componentInstance.createTagControl()
const tagControlGroup: FormGroup = fixture.componentInstance.createTagControl()
const tagLabel = tagControlGroup.get('label');
expectErrorOnInput(tagLabel, '');
expectErrorOnInput(tagLabel, 'xyz');
expectErrorOnInput(tagLabel, 'xy', {requiredLength: 3, actualLength: 2}, 'minlength');
});
it('should show error in description gt 2000 signs', () => {
const descriptionControl = form.get('description');
expectErrorOnInput(descriptionControl, generateRandomString(2000));
expectErrorOnInput(descriptionControl, generateRandomString(2001), {requiredLength: 2000, actualLength: 2001}, 'maxlength');
expectErrorOnInput(descriptionControl, generateRandomString(2001), {
requiredLength: 2000,
actualLength: 2001
}, 'maxlength');
});
it('should show error on email not matching email-pattern', () => {
@ -52,7 +59,9 @@ describe('Model Driven Form', () => {
expectErrorOnInput(assigneeEMail, 'test@web.de');
});
function expectErrorOnInput(formControl, inputString, expectedErrorObject?, expectedErrorAttribute?){
// helper method
// check for error object according to given input value
function expectErrorOnInput(formControl, inputString, expectedErrorObject?, expectedErrorAttribute?) {
formControl.setValue(inputString);
if (expectedErrorObject && expectedErrorAttribute) {
expect(formControl.errors[expectedErrorAttribute]).toEqual(expectedErrorObject);
@ -63,5 +72,4 @@ describe('Model Driven Form', () => {
}
}
});

2
project-manager/src/app/model-driven-form/model-driven-form.component.ts
View File

@ -82,7 +82,7 @@ export class ModelDrivenFormComponent {
}
loadTask(id: number) {
const task : Task = this.taskService.getTask(id);
const task: Task = this.taskService.getTask(id);
this.adjustTagsArray(task.tags);
this.taskForm.patchValue(task);
this.task = task;

12
project-manager/src/app/models/app-validators.ts
View File

@ -16,7 +16,7 @@ export function asyncIfNotBacklogThenAssignee(control): Promise<any> {
return promise;
}
export function ifNotBacklogThanAssignee(formGroup: FormControl): {[key: string]: any} {
export function ifNotBacklogThanAssignee(formGroup: FormControl): { [key: string]: any } {
const nameControl = formGroup.get('assignee.name');
const stateControl = formGroup.get('state');
if (!nameControl || !stateControl) {
@ -39,7 +39,7 @@ export function ifNotBacklogThanAssignee(formGroup: FormControl): {[key: string]
})
export class IfNotBacklogThanAssigneeValidatorDirective {
public validate(formGroup: AbstractControl): {[key: string]: any} {
public validate(formGroup: AbstractControl): { [key: string]: any } {
const nameControl = formGroup.get('assignee.name');
const stateControl = formGroup.get('state');
if (!nameControl || !stateControl) {
@ -61,7 +61,7 @@ export class IfNotBacklogThanAssigneeValidatorDirective {
}]
})
export class EmailValidatorDirective {
validate(control: AbstractControl): {[key: string]: any} {
validate(control: AbstractControl): { [key: string]: any } {
const re = /^([\w-]+(?:\.[\w-]+)*)@((?:[\w-]+\.)*\w[\w-]{0,66})\.([a-z]{2,6}(?:\.[a-z]{2})?)$/i;
if (!control.value || control.value === '' || re.test(control.value)) {
return null;
@ -71,11 +71,11 @@ export class EmailValidatorDirective {
}
}
export function emailValidator(control): {[key: string]: any} {
export function emailValidator(control): { [key: string]: any } {
return new EmailValidatorDirective().validate(control);
}
export function emailValidator2(control): {[key: string]: any} {
export function emailValidator2(control): { [key: string]: any } {
const re = /^([\w-]+(?:\.[\w-]+)*)@((?:[\w-]+\.)*\w[\w-]{0,66})\.([a-z]{2,6}(?:\.[a-z]{2})?)$/i;
if (!control.value || control.value === '' || re.test(control.value)) {
return null;
@ -100,7 +100,7 @@ export class UserExistsValidatorDirective {
validate(control: AbstractControl): Observable<any> {
return this.userService.checkUserExists(control.value)
.map(userExists => {
return (userExists === false) ? {userNotFound: true} :null;
return (userExists === false) ? {userNotFound: true} : null;
});
}
}

8
project-manager/src/app/models/model-interfaces.ts
View File

@ -55,9 +55,9 @@ export const stateTexts = {
'COMPLETED': 'Abgeschlossen'
};
export const statesAsObjects = [{ name: 'BACKLOG', text: 'Backlog'},
{ name: 'IN_PROGRESS', text: 'In Bearbeitung'},
{ name: 'TEST', text: 'Test'},
{ name: 'COMPLETED', text: 'Abgeschlossen'}];
export const statesAsObjects = [{name: 'BACKLOG', text: 'Backlog'},
{name: 'IN_PROGRESS', text: 'In Bearbeitung'},
{name: 'TEST', text: 'Test'},
{name: 'COMPLETED', text: 'Abgeschlossen'}];

5
project-manager/src/app/not-found/not-found.component.ts
View File

@ -1,4 +1,4 @@
import { Component, OnInit } from '@angular/core';
import {Component, OnInit} from '@angular/core';
@Component({
selector: 'app-not-found',
@ -7,7 +7,8 @@ import { Component, OnInit } from '@angular/core';
})
export class NotFoundComponent implements OnInit {
constructor() {}
constructor() {
}
ngOnInit() {
}

4
project-manager/src/app/rxdemo/rxdemo.component.ts
View File

@ -231,7 +231,7 @@ export class RxDemoComponent {
console.log(`Subscription 2: ${value}`);
});
/*
/*
this.randomValuesSubject = new Subject();
const interval = setInterval(() => {
this.randomValuesSubject.next(Math.random());
@ -244,7 +244,7 @@ export class RxDemoComponent {
this.sub2 = this.randomValuesSubject.subscribe((value) => {
console.log(`Subscription 2: ${value}`);
});
*/
*/
const square = document.getElementById('square');
Observable.fromEvent(square, '')

2
project-manager/src/app/services/login-service/login-service.ts
View File

@ -27,7 +27,7 @@ export class LoginService {
this.socket = socketIO(WEB_SOCKET_URL);
}
getUser(name: string) : User[]{
getUser(name: string): User[] {
this.http.get(BASE_URL + "?name=" + name).subscribe(result => this.results$ = result.json());
return this.results$;
}

2
project-manager/src/app/services/stores/generic-store.ts
View File

@ -29,7 +29,7 @@ export class Store<T extends Identifiable> {
case EDIT:
return items.map(task => {
var editedTask = action.data;
if (task.id !== editedTask.id){
if (task.id !== editedTask.id) {
return task;
}
return editedTask;

2
project-manager/src/app/services/stores/task.store.ts
View File

@ -25,7 +25,7 @@ export class TaskStore {
case EDIT:
return tasks.map(task => {
const editedTask = action.data;
if (task.id !== editedTask.id){
if (task.id !== editedTask.id) {
return task;
}
return editedTask;

6
project-manager/src/app/services/task-service/task.service.ts
View File

@ -39,7 +39,8 @@ export class TaskService {
.map(res => res.json())
.do((tasks) => {
this.taskStore.dispatch({type: LOAD, data: tasks});
}).subscribe(_ => {});
}).subscribe(_ => {
});
return this.tasks$;
}
@ -62,11 +63,12 @@ export class TaskService {
.do(savedTask => {
this.tasksChanged.next(savedTask);
const actionType = task.id ? EDIT : ADD;
const action = {type : actionType, data: savedTask};
const action = {type: actionType, data: savedTask};
this.taskStore.dispatch(action);
this.socket.emit('broadcast_task', action);
});
}
deleteTask(task: Task) {
return this.http.delete(BASE_URL + task.id)
.do(response => {

1
project-manager/src/app/services/user-service/user.service.ts
View File

@ -1,4 +1,3 @@
import {Observable} from 'rxjs/Observable';
export class UserService {
checkUserExists(name: string): Observable<boolean> {

1
project-manager/src/app/settings/settings.component.ts
View File

@ -27,6 +27,7 @@ export class SettingsComponent {
this.titleService.setTitle(title);
}
}
ngOnDestroy() {
this.titleService.setTitle(this.originalTitle);
}

3
project-manager/src/app/show-error/show-error-model-driven.component.ts
View File

@ -8,7 +8,8 @@ import {NgForm, FormGroup, FormGroupDirective} from '@angular/forms';
<div *ngFor="let errorMessage of errorMessages">
{{errorMessage}}
</div>
</div>` })
</div>`
})
export class ShowErrorComponentModelDriven {
@Input('path') path;

3
project-manager/src/app/show-error/show-error.component.ts
View File

@ -8,7 +8,8 @@ import {NgForm, FormGroup} from '@angular/forms';
<div *ngFor="let errorMessage of errorMessages">
{{errorMessage}}
</div>
</div>` })
</div>`
})
export class ShowErrorComponent {
@Input('path') controlPath;

12
project-manager/src/app/tasks/edit-task/edit-task.component.html
View File

@ -1,8 +1,8 @@
<h2 *ngIf="!task.id">Neue Aufgabe anlegen</h2>
<h2 *ngIf="task.id">Aufgabe bearbeiten</h2>
<form (submit)="saveTask()" #form="ngForm" >
<div class="form-group" >
<form (submit)="saveTask()" #form="ngForm">
<div class="form-group">
<label for="title">Titel</label>
<input type="text" class="form-control"
[(ngModel)]="task.title"
@ -20,8 +20,8 @@
<show-error text="Beschreibung" path="description"></show-error>
</div>
<div >
<div *ngFor="let tag of task.tags; let i = index" >
<div>
<div *ngFor="let tag of task.tags; let i = index">
<div class="form-inline form-group">
<input class="form-control"
name="tag{{i}}"
@ -38,7 +38,7 @@
</div>
<div class="form-group">
<button class="btn btn-success"
(click)="addTag()" >
(click)="addTag()">
+
</button>
</div>
@ -55,7 +55,7 @@
</div>
<h4>Zuständiger</h4>
<div >
<div>
<div class="form-group">
<label for="assignee_name">Name</label>
<input type="text"

51
project-manager/src/app/tasks/edit-task/edit-task.component.js
View File

@ -1,10 +1,10 @@
import { ViewChild, Component } from '@angular/core';
import { Title } from '@angular/platform-browser';
import { Router, ActivatedRoute } from '@angular/router';
import { Location } from '@angular/common';
import { NgForm } from '@angular/forms';
import { createInitialTask } from '../../models/model-interfaces';
import { TaskService } from '../../services/task-service/task.service';
import {ViewChild, Component} from '@angular/core';
import {Title} from '@angular/platform-browser';
import {Router, ActivatedRoute} from '@angular/router';
import {Location} from '@angular/common';
import {NgForm} from '@angular/forms';
import {createInitialTask} from '../../models/model-interfaces';
import {TaskService} from '../../services/task-service/task.service';
import * as model from '../../models/model-interfaces';
export var EditTaskComponent = (function () {
function EditTaskComponent(route, taskService, router, titleService, location) {
@ -17,12 +17,19 @@ export var EditTaskComponent = (function () {
this.task = createInitialTask();
this.saved = false;
}
EditTaskComponent.prototype.ngOnInit = function () {
var _this = this;
this.subscription = this.route.params
.map(function (params) { return params['id']; })
.filter(function (id) { return id != undefined; })
.flatMap(function (id) { return _this.taskService.getTask(id); })
.map(function (params) {
return params['id'];
})
.filter(function (id) {
return id != undefined;
})
.flatMap(function (id) {
return _this.taskService.getTask(id);
})
.subscribe(function (task) {
_this.task = task;
});
@ -31,7 +38,7 @@ export var EditTaskComponent = (function () {
this.subscription.unsubscribe();
};
EditTaskComponent.prototype.addTag = function () {
this.task.tags.push({ label: '' });
this.task.tags.push({label: ''});
return false;
};
EditTaskComponent.prototype.removeTag = function (i) {
@ -43,13 +50,13 @@ export var EditTaskComponent = (function () {
this.taskService.saveTask(this.task).subscribe(function (task) {
_this.saved = true;
var relativeUrl = _this.router.url.includes('edit') ? '../..' : '..';
_this.router.navigate([relativeUrl], { relativeTo: _this.route });
_this.router.navigate([relativeUrl], {relativeTo: _this.route});
});
};
EditTaskComponent.prototype.cancel = function () {
//this.location.back();
var relativeUrl = this.router.url.includes('edit') ? '../..' : '..';
this.router.navigate([relativeUrl], { relativeTo: this.route });
this.router.navigate([relativeUrl], {relativeTo: this.route});
return false;
};
EditTaskComponent.prototype.canDeactivate = function () {
@ -59,21 +66,23 @@ export var EditTaskComponent = (function () {
return window.confirm("Ihr Formular besitzt ungespeicherte \u00C4nderungen, m\u00F6chten Sie die Seite wirklich verlassen?");
};
EditTaskComponent.decorators = [
{ type: Component, args: [{
{
type: Component, args: [{
templateUrl: './edit-task.component.html',
styleUrls: ['./edit-task.component.css']
},] },
},]
},
];
/** @nocollapse */
EditTaskComponent.ctorParameters = [
{ type: ActivatedRoute, },
{ type: TaskService, },
{ type: Router, },
{ type: Title, },
{ type: Location, },
{type: ActivatedRoute,},
{type: TaskService,},
{type: Router,},
{type: Title,},
{type: Location,},
];
EditTaskComponent.propDecorators = {
'form': [{ type: ViewChild, args: [NgForm,] },],
'form': [{type: ViewChild, args: [NgForm,]},],
};
return EditTaskComponent;
}());

11
project-manager/src/app/tasks/edit-task/edit-task.component.js.map
View File

@ -1 +1,10 @@
{"version":3,"file":"edit-task.component.js","sourceRoot":"","sources":["edit-task.component.ts"],"names":[],"mappings":"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"}
{
"version": 3,
"file": "edit-task.component.js",
"sourceRoot": "",
"sources": [
"edit-task.component.ts"
],
"names": [],
"mappings": "OAAO,EAAC,SAAS,EAAE,SAAS,EAAC,MAAM,eAAe;OAC3C,EAAC,KAAK,EAAC,MAAM,2BAA2B;OACxC,EACL,MAAM,EACN,cAAc,EACf,MAAM,iBAAiB;OACjB,EAAC,QAAQ,EAAC,MAAM,iBAAiB;OACjC,EAAC,MAAM,EAAC,MAAM,gBAAgB;OAC9B,EAAO,iBAAiB,EAAC,MAAM,+BAA+B;OAC9D,EAAC,WAAW,EAAC,MAAM,0CAA0C;OAE7D,KAAK,KAAK,MAAM,+BAA+B;AAItD;IAUE,2BACoB,KAAqB,EACrB,WAAwB,EACxB,MAAc,EACd,YAAmB,EACnB,QAAkB;QAJlB,UAAK,GAAL,KAAK,CAAgB;QACrB,gBAAW,GAAX,WAAW,CAAa;QACxB,WAAM,GAAN,MAAM,CAAQ;QACd,iBAAY,GAAZ,YAAY,CAAO;QACnB,aAAQ,GAAR,QAAQ,CAAU;QAbtC,UAAK,GAAG,KAAK,CAAC;QACd,SAAI,GAAS,iBAAiB,EAAE,CAAC;QACjC,UAAK,GAAG,KAAK,CAAC;IAYd,CAAC;IAED,oCAAQ,GAAR;QAAA,iBAQC;QAPC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM;aAClC,GAAG,CAAC,UAAA,MAAM,IAAI,OAAA,MAAM,CAAC,IAAI,CAAC,EAAZ,CAAY,CAAC;aAC3B,MAAM,CAAC,UAAA,EAAE,IAAI,OAAA,EAAE,IAAI,SAAS,EAAf,CAAe,CAAC;aAC7B,OAAO,CAAC,UAAA,EAAE,IAAI,OAAA,KAAI,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC,EAA5B,CAA4B,CAAC;aAC3C,SAAS,CAAC,UAAA,IAAI;YACb,KAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACnB,CAAC,CAAC,CAAA;IACN,CAAC;IAED,uCAAW,GAAX;QACE,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC;IAClC,CAAC;IAED,kCAAM,GAAN;QACE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAC,KAAK,EAAE,EAAE,EAAC,CAAC,CAAC;QACjC,MAAM,CAAC,KAAK,CAAC;IACf,CAAC;IAED,qCAAS,GAAT,UAAU,CAAQ;QAChB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAC5B,MAAM,CAAC,KAAK,CAAC;IACf,CAAC;IAED,oCAAQ,GAAR;QAAA,iBAMC;QALC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,UAAA,IAAI;YACjD,KAAI,CAAC,KAAK,GAAG,IAAI,CAAC;YAClB,IAAI,WAAW,GAAG,KAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,OAAO,GAAG,IAAI,CAAC;YACpE,KAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,WAAW,CAAC,EAAE,EAAC,UAAU,EAAE,KAAI,CAAC,KAAK,EAAC,CAAC,CAAC;QAChE,CAAC,CAAC,CAAC;IACL,CAAC;IAED,kCAAM,GAAN;QACE,uBAAuB;QAEvB,IAAI,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,OAAO,GAAG,IAAI,CAAC;QACpE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,WAAW,CAAC,EAAE,EAAC,UAAU,EAAE,IAAI,CAAC,KAAK,EAAC,CAAC,CAAC;QAE9D,MAAM,CAAC,KAAK,CAAC;IACf,CAAC;IAED,yCAAa,GAAb;QACE,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;YACnC,MAAM,CAAC,IAAI,CAAC;QACd,CAAC;QACD,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,qGAA2F,CAAC,CAAC;IACrH,CAAC;IAEI,4BAAU,GAA0B;QAC3C,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;oBACxB,WAAW,EAAE,4BAA4B;oBACzC,SAAS,EAAE,CAAC,2BAA2B,CAAC;iBACzC,EAAG,EAAE;KACL,CAAC;IACF,kBAAkB;IACX,gCAAc,GAA6D;QAClF,EAAC,IAAI,EAAE,cAAc,GAAG;QACxB,EAAC,IAAI,EAAE,WAAW,GAAG;QACrB,EAAC,IAAI,EAAE,MAAM,GAAG;QAChB,EAAC,IAAI,EAAE,KAAK,GAAG;QACf,EAAC,IAAI,EAAE,QAAQ,GAAG;KACjB,CAAC;IACK,gCAAc,GAA2C;QAChE,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,MAAM,EAAG,EAAE,EAAE;KAC/C,CAAC;IACF,wBAAC;AAAD,CAAC,AAnFD,IAmFC"
}

0
project-manager/src/app/tasks/edit-task/edit-task.component.spec.ts Normal file
View File

7
project-manager/src/app/tasks/edit-task/edit-task.component.ts
View File

@ -26,8 +26,7 @@ export class EditTaskComponent {
subscription: Subscription;
constructor(
private route: ActivatedRoute,
constructor(private route: ActivatedRoute,
private taskService: TaskService,
private router: Router,
private titleService: Title,
@ -53,7 +52,7 @@ export class EditTaskComponent {
return false;
}
removeTag(i:number) {
removeTag(i: number) {
this.task.tags.splice(i, 1);
return false;
}
@ -75,7 +74,7 @@ export class EditTaskComponent {
return false;
}
canDeactivate() : boolean {
canDeactivate(): boolean {
if (this.saved || !this.form.dirty) {
return true;
}

5
project-manager/src/app/tasks/edit-task/edit-task.guard.js
View File

@ -1,12 +1,13 @@
import { Injectable } from '@angular/core';
import {Injectable} from '@angular/core';
export var EditTaskGuard = (function () {
function EditTaskGuard() {
}
EditTaskGuard.prototype.canDeactivate = function (component, route, router) {
return component.canDeactivate();
};
EditTaskGuard.decorators = [
{ type: Injectable },
{type: Injectable},
];
/** @nocollapse */
EditTaskGuard.ctorParameters = [];

11
project-manager/src/app/tasks/edit-task/edit-task.guard.js.map
View File

@ -1 +1,10 @@
{"version":3,"file":"edit-task.guard.js","sourceRoot":"","sources":["edit-task.guard.ts"],"names":[],"mappings":"OAAO,EAAE,UAAU,EAAE,MAAS,eAAe;AAM7C;IAAA;IAcA,CAAC;IAZC,qCAAa,GAAb,UAAc,SAA4B,EAC5B,KAA6B,EAC7B,MAA2B;QAEvC,MAAM,CAAC,SAAS,CAAC,aAAa,EAAE,CAAC;IACnC,CAAC;IACI,wBAAU,GAA0B;QAC3C,EAAE,IAAI,EAAE,UAAU,EAAE;KACnB,CAAC;IACF,kBAAkB;IACX,4BAAc,GAA6D,EACjF,CAAC;IACF,oBAAC;AAAD,CAAC,AAdD,IAcC"}
{
"version": 3,
"file": "edit-task.guard.js",
"sourceRoot": "",
"sources": [
"edit-task.guard.ts"
],
"names": [],
"mappings": "OAAO,EAAE,UAAU,EAAE,MAAS,eAAe;AAM7C;IAAA;IAcA,CAAC;IAZC,qCAAa,GAAb,UAAc,SAA4B,EAC5B,KAA6B,EAC7B,MAA2B;QAEvC,MAAM,CAAC,SAAS,CAAC,aAAa,EAAE,CAAC;IACnC,CAAC;IACI,wBAAU,GAA0B;QAC3C,EAAE,IAAI,EAAE,UAAU,EAAE;KACnB,CAAC;IACF,kBAAkB;IACX,4BAAc,GAA6D,EACjF,CAAC;IACF,oBAAC;AAAD,CAAC,AAdD,IAcC"
}

9
project-manager/src/app/tasks/edit-task/edit-task.guard.ts
View File

@ -1,15 +1,14 @@
import { Injectable } from '@angular/core';
import {Injectable} from '@angular/core';
import {ActivatedRouteSnapshot, RouterStateSnapshot, CanDeactivate} from '@angular/router';
import { Observable } from 'rxjs/Observable';
import {Observable} from 'rxjs/Observable';
import {EditTaskComponent} from "./edit-task.component";
@Injectable()
export class EditTaskGuard implements CanDeactivate<EditTaskComponent>{
export class EditTaskGuard implements CanDeactivate<EditTaskComponent> {
canDeactivate(component: EditTaskComponent,
route: ActivatedRouteSnapshot,
router: RouterStateSnapshot)
: Observable<boolean> | boolean {
router: RouterStateSnapshot): Observable<boolean> | boolean {
return component.canDeactivate();
}
}

51
project-manager/src/app/tasks/task-list/task-item.component.css
View File

@ -14,10 +14,12 @@ div.task-list-entry, a.task-list-entry {
span {
cursor: pointer;
}
a {
font-size: x-large;
font-weight: 700;
}
small {
color: grey;
}
@ -32,21 +34,44 @@ small {
background-color: aliceblue;
}
@-webkit-keyframes fadeIn { from { opacity:0; } to { opacity:1; } }
@-moz-keyframes fadeIn { from { opacity:0; } to { opacity:1; } }
@keyframes fadeIn { from { opacity:0; } to { opacity:1; } }
@-webkit-keyframes fadeIn {
from {
opacity: 0;
}
to {
opacity: 1;
}
}
@-moz-keyframes fadeIn {
from {
opacity: 0;
}
to {
opacity: 1;
}
}
@keyframes fadeIn {
from {
opacity: 0;
}
to {
opacity: 1;
}
}
.fade-in {
opacity:0; /* make things invisible upon start */
-webkit-animation:fadeIn ease-in 1; /* call our keyframe named fadeIn, use animattion ease-in and repeat it only 1 time */
-moz-animation:fadeIn ease-in 1;
animation:fadeIn ease-in 1;
opacity: 0; /* make things invisible upon start */
-webkit-animation: fadeIn ease-in 1; /* call our keyframe named fadeIn, use animattion ease-in and repeat it only 1 time */
-moz-animation: fadeIn ease-in 1;
animation: fadeIn ease-in 1;
-webkit-animation-fill-mode:forwards; /* this makes sure that after animation is done we remain at the last keyframe value (opacity: 1)*/
-moz-animation-fill-mode:forwards;
animation-fill-mode:forwards;
-webkit-animation-fill-mode: forwards; /* this makes sure that after animation is done we remain at the last keyframe value (opacity: 1)*/
-moz-animation-fill-mode: forwards;
animation-fill-mode: forwards;
-webkit-animation-duration:0.5s;
-moz-animation-duration:0.5s;
animation-duration:0.5s;
-webkit-animation-duration: 0.5s;
-moz-animation-duration: 0.5s;
animation-duration: 0.5s;
}

3
project-manager/src/app/tasks/task-list/task-item.component.ts
View File

@ -8,7 +8,7 @@ import {Task} from '../../models/model-interfaces';
styleUrls: ['./task-item.component.css'],
changeDetection: ChangeDetectionStrategy.OnPush,
inputs: ['task', 'selected'],
outputs: ['taskSelected' , 'taskDelete'],
outputs: ['taskSelected', 'taskDelete'],
})
export class TaskItemComponent {
@ -23,6 +23,7 @@ export class TaskItemComponent {
constructor(private router: Router) {
}
select() {
this.taskSelected.emit(this.task.id)
}

2
project-manager/src/app/tasks/task-list/task-list.component.ts
View File

@ -58,7 +58,7 @@ export class TaskListComponent implements OnInit {
selectTask(taskId: string | number) {
this.selectedTaskId = taskId;
this.router.navigate([ {outlets: {'right': [ 'overview' , taskId]}}], {relativeTo: this.route});
this.router.navigate([{outlets: {'right': ['overview', taskId]}}], {relativeTo: this.route});
}
findTasks(queryString: string) {

3
project-manager/src/app/tasks/task-overview/task-overview.component.html
View File

@ -24,7 +24,8 @@
</div>
<div class="col-xs-12">
<h4>Status</h4>
<select class="form-control" name="state" [ngModel]="task.state" (ngModelChange)="task.state = $event; saveTask()" >
<select class="form-control" name="state" [ngModel]="task.state"
(ngModelChange)="task.state = $event; saveTask()">
<optgroup *ngFor="let group of model.stateGroups" [label]="group.label">
<option *ngFor="let state of group.states" [value]="state">
{{model.stateTexts[state]}}

2
project-manager/src/app/tasks/tasks.component.css
View File

@ -1,5 +1,5 @@
#left {
width:535px;
width: 535px;
float: left;
padding-right: 10px;
}

2
project-manager/src/app/tasks/tasks.component.html
View File

@ -1 +1 @@
<router-outlet></router-outlet>
<router-outlet></router-outlet>

2
project-manager/src/app/test-example/basic-test.spec.ts → project-manager/src/app/test/basic-test-example.spec.ts
View File

@ -11,7 +11,7 @@ describe('Basic Test', () => {
// Testfall 1
it('should succeed on most commonly used matchers', () => {
expect(1+1).toBe(2)
expect(1 + 1).toBe(2)
expect(null).toEqual(null);
expect('Hello world').toContain('Hello');
expect(true).toBeTruthy();

5
project-manager/src/test/test.helper.ts → project-manager/src/app/test/test.helper.ts
View File

@ -1,10 +1,9 @@
// method to create random string of given length, from:
// return random string of given length, from:
// http://stackoverflow.com/questions/16106701/how-to-generate-a-random-string-of-letters-and-numbers-in-javascript
export function generateRandomString(len) {
var text = "";
var charset = "abcdefghijklmnopqrstuvwxyz0123456789";
for( var i=0; i < len; i++ )
for (var i = 0; i < len; i++)
text += charset.charAt(Math.floor(Math.random() * charset.length));
return text;
}