-
-
-
-
-
-
-
-
Neue Userstory anlegen
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
Neue Userstory anlegen
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/userstory-form/userstory-form.component.ts b/src/app/components/userstory-form/userstory-form.component.ts
similarity index 68%
rename from src/app/userstory-form/userstory-form.component.ts
rename to src/app/components/userstory-form/userstory-form.component.ts
index 024906f..9838fe7 100644
--- a/src/app/userstory-form/userstory-form.component.ts
+++ b/src/app/components/userstory-form/userstory-form.component.ts
@@ -1,191 +1,207 @@
-import { Component, OnInit, Input } from '@angular/core';
-import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { BackendService, ScrumUserstory, Priority } from '../services/backend.service';
-import {
- ScrumTask,
- ScrumStatus,
- ScrumCategory,
- ScrumUser,
- ScrumProject,
-} from '../services/backend.service';
-
-@Component({
- selector: 'app-userstory-form',
- templateUrl: './userstory-form.component.html',
- styleUrls: ['./userstory-form.component.css']
-})
-export class UserstoryFormComponent implements OnInit {
- @Input() public userstory: ScrumUserstory;
- public allStatus: any[] = [];
- public status: ScrumStatus = { title: "", description: "" };
- public allUser: any[] = [];
- public user: ScrumUser = { name: "" };
- public allCategories: any[] = [];
- public category: ScrumCategory = { title: ""};
- private editing: boolean;
-
-
- constructor(private backendService: BackendService, private activeModalService: NgbActiveModal) {
- this.getUserstoryStatus();
- this.getAllUsers();
- this.getUserstoryCategory();
- }
-
- ngOnInit(): void {
- if (this.userstory === null || this.userstory === undefined) {
- this.userstory = { title: '' };
- this.editing = false;
- } else {
- this.editing = true;
- }
- document.getElementById('titleField').focus();
- }
-
- onSubmit() {
- if (this.editing) {
- this.backendService.putUserstory(this.userstory).subscribe((response) => {
- if (response.status > 399) {
- alert('Fehler');
- }
- });
- } else {
- this.backendService.postUserstory(this.userstory).subscribe((response) => {
- if (response.status > 399) {
- alert('Fehler');
- }
- });
- }
- this.activeModalService.close(this.userstory);
- }
- onClose() {
- this.activeModalService.dismiss(this.userstory);
- }
-
- // Methods for adding, choosing and deleting random status tags.
-
- getUserstoryStatus() {
- this.backendService.getAllStatus().subscribe((response) => {
- if (response.status > 399) {
- alert('Fehler');
- } else {
- this.allStatus.push(...response.body);
- }
- });
- }
-
- createUserstoryStatus(status: ScrumStatus) {
- this.backendService.postStatus(status).subscribe((response) => {
- if (response.status > 399) {
- alert('Fehler');
- }
- else {
- this.allStatus.push(response.body);
- }
- });
- }
-
- deleteStatus(id: number) {
- var status = this.allStatus.find((x) => x.id === id);
- this.backendService.deleteStatus(status).subscribe((response) => {
- if (response.status > 399) {
- alert('Fehler');
- }
- else {
- const index = this.allStatus.indexOf(status);
- if (index !== -1) {
- this.allStatus.splice(index, 1);
- }
- }
- this.userstory.statusid = null;
- });
- }
-
- getAllPriorities(): string[] {
- return Object.values(Priority);
- }
-
- getStatusTitleById(id: number): string {
- if (!id) {
- return null;
- }
- var status = this.allStatus.find((x) => x.id === id);
- if (!status) {
- return null;
- }
- return status.title;
- }
-
- // Methods for choosing creator of a userstory.
-
- getAllUsers() {
- this.backendService.getUsers().subscribe((response) => {
- if (response.status > 399) {
- alert('Fehler');
- } else {
- this.allUser.push(...response.body);
- }
- });
- }
-
- getAuthorById(id: number): string {
- if (!id) {
- return null;
- }
- var user = this.allUser.find((x) => x.id === id);
- if (!user) {
- return null;
- }
- return user.name;
- }
-
- // Methods for creating, choosing and deleting categories for a userstory.
-
- getUserstoryCategory() {
- this.backendService.getCategories().subscribe((response) => {
- if (response.status > 399) {
- alert('Fehler');
- } else {
- this.allCategories.push(...response.body);
- }
- });
- }
-
- createUserstoryCategory(category: ScrumCategory) {
- this.backendService.postCategory(category).subscribe((response) => {
- if (response.status > 399) {
- alert('Fehler');
- }
- else {
- this.allCategories.push(response.body);
- }
- });
- }
-
- deleteCategory(id: number) {
- var category = this.allCategories.find((x) => x.id === id);
- this.backendService.deleteCategory(category).subscribe((response) => {
- if (response.status > 399) {
- alert('Fehler');
- }
- else {
- const index = this.allCategories.indexOf(category);
- if (index !== -1) {
- this.allCategories.splice(index, 1);
- }
- }
- this.userstory.categoryid = null;
- });
- }
-
- getCategoryById(id: number): string {
- if (!id) {
- return null;
- }
- var category = this.allCategories.find((x) => x.id === id);
- if (!category) {
- return null;
- }
- return category.title;
- }
-
-}
+// Importing necessary components and interfaces.
+import { Component, OnInit, Input } from '@angular/core';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { BackendService, ScrumUserstory, Priority } from '../../services/backend.service';
+import {
+ ScrumTask,
+ ScrumStatus,
+ ScrumCategory,
+ ScrumUser,
+ ScrumProject,
+} from '../../services/backend.service';
+
+@Component({
+ selector: 'app-userstory-form',
+ templateUrl: './userstory-form.component.html',
+ styleUrls: ['./userstory-form.component.css']
+})
+
+// Class implements the logic for a popup window form to create and modify userstories.
+export class UserstoryFormComponent implements OnInit {
+ @Input() public userstory: ScrumUserstory;
+ public allStatus: any[] = [];
+ public status: ScrumStatus = { title: "", description: "" };
+ public allUser: any[] = [];
+ public user: ScrumUser = { name: "" };
+ public allCategories: any[] = [];
+ public category: ScrumCategory = { title: "" };
+ private editing: boolean;
+
+ constructor(private backendService: BackendService, private activeModalService: NgbActiveModal) {
+ this.getUserstoryStatus();
+ this.getAllUsers();
+ this.getUserstoryCategory();
+ }
+
+ // If no userstory exists a new one will be created.
+ // In other cases the userstory exists and gets modifiable.
+ ngOnInit(): void {
+ if (this.userstory === null || this.userstory === undefined) {
+ this.userstory = { title: '' };
+ this.editing = false;
+ } else {
+ this.editing = true;
+ }
+ document.getElementById('titleField').focus();
+ }
+
+ // A new created userstory will be saved in backend (POST).
+ // If a userstory already exists, modifying results an update (PUT) to the backend.
+ onSubmit() {
+ if (this.editing) {
+ this.backendService.putUserstory(this.userstory).subscribe((response) => {
+ if (response.status > 399) {
+ alert('Fehler');
+ }
+ });
+ } else {
+ this.backendService.postUserstory(this.userstory).subscribe((response) => {
+ if (response.status > 399) {
+ alert('Fehler');
+ }
+ });
+ }
+ // Closes the popup window after submitting/canceling.
+ this.activeModalService.close(this.userstory);
+ }
+
+ // Closes the popup form window (by clicking "close button").
+ onClose() {
+ this.activeModalService.dismiss(this.userstory);
+ }
+
+ // Getting all available status from backend to list it in status-dropdown in popup window.
+ getUserstoryStatus() {
+ this.backendService.getAllStatus().subscribe((response) => {
+ if (response.status > 399) {
+ alert('Fehler');
+ } else {
+ this.allStatus.push(...response.body);
+ }
+ });
+ }
+
+ // If desired a new arbitrary status (such as "Waiting") can be created, which will be stored in an array.
+ // The new status is available to all userstories.
+ createUserstoryStatus(status: ScrumStatus) {
+ this.backendService.postStatus(status).subscribe((response) => {
+ if (response.status > 399) {
+ alert('Fehler');
+ }
+ else {
+ this.allStatus.push(response.body);
+ }
+ });
+ }
+
+ // A custom status can even be deleted if not used anymore.
+ // This will remove the status from status-array.
+ deleteStatus(id: number) {
+ var status = this.allStatus.find((x) => x.id === id);
+ this.backendService.deleteStatus(status).subscribe((response) => {
+ if (response.status > 399) {
+ alert('Fehler');
+ }
+ else {
+ const index = this.allStatus.indexOf(status);
+ if (index !== -1) {
+ this.allStatus.splice(index, 1);
+ }
+ }
+ this.userstory.statusid = null;
+ });
+ }
+
+ // Getting the values of the Priority enum to be shown in a dropdown in popup window.
+ getAllPriorities(): Priority[] {
+ return Object.values(Priority);
+ }
+
+ // Shows the before choosen status in the status-field in the popup window.
+ getStatusTitleById(id: number): string {
+ if (!id) {
+ return null;
+ }
+ var status = this.allStatus.find((x) => x.id === id);
+ if (!status) {
+ return null;
+ }
+ return status.title;
+ }
+
+ // Getting all taskboard users from backend to show in a dropdown in popup window.
+ getAllUsers() {
+ this.backendService.getUsers().subscribe((response) => {
+ if (response.status > 399) {
+ alert('Fehler');
+ } else {
+ this.allUser.push(...response.body);
+ }
+ });
+ }
+
+ // Shows the before assigned user in the author-field in the popup window.
+ getAuthorById(id: number): string {
+ if (!id) {
+ return null;
+ }
+ var user = this.allUser.find((x) => x.id === id);
+ if (!user) {
+ return null;
+ }
+ return user.name;
+ }
+
+ // Getting all available categories from backend to list it in status-dropdown in popup window.
+ getUserstoryCategory() {
+ this.backendService.getCategories().subscribe((response) => {
+ if (response.status > 399) {
+ alert('Fehler');
+ } else {
+ this.allCategories.push(...response.body);
+ }
+ });
+ }
+
+ // If desired a new arbitrary category can be created, which will be stored in an array.
+ // The new category is available to all userstories.
+ createUserstoryCategory(category: ScrumCategory) {
+ this.backendService.postCategory(category).subscribe((response) => {
+ if (response.status > 399) {
+ alert('Fehler');
+ }
+ else {
+ this.allCategories.push(response.body);
+ }
+ });
+ }
+
+ // A custom category can even be deleted if not used anymore.
+ // This will remove the category from category-array.
+ deleteCategory(id: number) {
+ var category = this.allCategories.find((x) => x.id === id);
+ this.backendService.deleteCategory(category).subscribe((response) => {
+ if (response.status > 399) {
+ alert('Fehler');
+ }
+ else {
+ const index = this.allCategories.indexOf(category);
+ if (index !== -1) {
+ this.allCategories.splice(index, 1);
+ }
+ }
+ this.userstory.categoryid = null;
+ });
+ }
+ // Shows the before choosen category in the category-field in the popup window.
+ getCategoryById(id: number): string {
+ if (!id) {
+ return null;
+ }
+ var category = this.allCategories.find((x) => x.id === id);
+ if (!category) {
+ return null;
+ }
+ return category.title;
+ }
+}
diff --git a/src/app/components/userstory-inner-table/userstory-inner-table.component.css b/src/app/components/userstory-inner-table/userstory-inner-table.component.css
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/components/userstory-inner-table/userstory-inner-table.component.html b/src/app/components/userstory-inner-table/userstory-inner-table.component.html
new file mode 100644
index 0000000..2706790
--- /dev/null
+++ b/src/app/components/userstory-inner-table/userstory-inner-table.component.html
@@ -0,0 +1,90 @@
+
+
+
\ No newline at end of file
diff --git a/src/app/userstory-table/userstory-table.component.ts b/src/app/components/userstory-inner-table/userstory-inner-table.component.ts
similarity index 83%
rename from src/app/userstory-table/userstory-table.component.ts
rename to src/app/components/userstory-inner-table/userstory-inner-table.component.ts
index 2baa7bd..7a82081 100644
--- a/src/app/userstory-table/userstory-table.component.ts
+++ b/src/app/components/userstory-inner-table/userstory-inner-table.component.ts
@@ -1,31 +1,31 @@
-import { Component } from '@angular/core';
+import { Component, Input } from '@angular/core';
import {
BackendService,
ScrumTask,
ScrumUserstory,
ScrumStatus,
ScrumCategory,
-} from '../services/backend.service';
+} from '../../services/backend.service';
import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { TableComponentBase } from '../services/table-component.base';
-import { getNumberForPriority } from '../services/sorting.service';
+import { TableComponentBase } from '../../services/table-component.base';
+import { getNumberForPriority } from '../../services/sorting.service';
import { UserstoryFormComponent } from '../userstory-form/userstory-form.component';
import { ActivatedRoute, ParamMap, Router } from '@angular/router';
@Component({
- selector: 'app-userstory-table',
- templateUrl: './userstory-table.component.html',
- styleUrls: ['./userstory-table.component.css'],
+ selector: 'app-userstory-inner-table',
+ templateUrl: './userstory-inner-table.component.html',
+ styleUrls: ['./userstory-inner-table.component.css']
})
-export class UserstoryTableComponent extends TableComponentBase<
- ScrumUserstory
-> {
+export class UserstoryInnerTableComponent extends TableComponentBase
{
public tasks: ScrumTask[] = [];
public filterPriority: string | null = null;
public highlightId: number;
public status: ScrumStatus[] = [];
public categories: ScrumCategory[] = [];
+ @Input() public items: ScrumUserstory[] = [];
+
public get filteredItems() {
return this.items.filter(
(task) =>
@@ -44,13 +44,6 @@ export class UserstoryTableComponent extends TableComponentBase<
this.applyFilterParameters(this.route.snapshot.paramMap);
this.route.paramMap.subscribe((map) => this.applyFilterParameters(map));
- backendService.getUserstories().subscribe((response) => {
- if (response.status > 399) {
- alert('Fehler');
- } else {
- this.items.push(...response.body);
- }
- });
backendService.getTasks().subscribe((response) => {
if (response.status > 399) {
alert('Fehler');
@@ -96,7 +89,6 @@ export class UserstoryTableComponent extends TableComponentBase<
const modalRef = this.modalService.open(UserstoryFormComponent, {
backdrop: 'static',
keyboard: true,
- size: 'lg'
});
if (editUserstory === null) {
modalRef.result.then((result) => {
diff --git a/src/app/components/userstory-table/userstory-table.component.css b/src/app/components/userstory-table/userstory-table.component.css
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/components/userstory-table/userstory-table.component.html b/src/app/components/userstory-table/userstory-table.component.html
new file mode 100644
index 0000000..0203afa
--- /dev/null
+++ b/src/app/components/userstory-table/userstory-table.component.html
@@ -0,0 +1,6 @@
+
\ No newline at end of file
diff --git a/src/app/components/userstory-table/userstory-table.component.ts b/src/app/components/userstory-table/userstory-table.component.ts
new file mode 100644
index 0000000..fba1dd1
--- /dev/null
+++ b/src/app/components/userstory-table/userstory-table.component.ts
@@ -0,0 +1,24 @@
+import { Component } from '@angular/core';
+import {
+ BackendService,
+ ScrumUserstory,
+} from '../../services/backend.service';
+
+@Component({
+ selector: 'app-userstory-table',
+ templateUrl: './userstory-table.component.html',
+ styleUrls: ['./userstory-table.component.css'],
+})
+export class UserstoryTableComponent {
+ public items: ScrumUserstory[] = [];
+
+ constructor(private backendService: BackendService) {
+ backendService.getUserstories().subscribe((response) => {
+ if (response.status > 399) {
+ alert('Fehler');
+ } else {
+ this.items.push(...response.body);
+ }
+ });
+ }
+}
diff --git a/src/app/dashboard/dashboard.component.css b/src/app/dashboard/dashboard.component.css
deleted file mode 100644
index 4a386a0..0000000
--- a/src/app/dashboard/dashboard.component.css
+++ /dev/null
@@ -1,3 +0,0 @@
-/* .text-2em {
- font-size: 2rem;
-} */
diff --git a/src/app/dashboard/dashboard.component.html b/src/app/dashboard/dashboard.component.html
deleted file mode 100644
index b63d9f1..0000000
--- a/src/app/dashboard/dashboard.component.html
+++ /dev/null
@@ -1,60 +0,0 @@
-{% comment %}
-
-
-
Dashboard
-
-
-
-
Current sprint
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{getRemainingDaysInSprint()}}
-
-
-
-
-
-
-
-
- {{getNumberOfUserstoriesByStatus(status)}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Neuen Sprint anlegen
-
-
-
\ No newline at end of file
diff --git a/src/app/sprint-table/sprint-table.component.css b/src/app/sprint-table/sprint-table.component.css
deleted file mode 100644
index 70c4c49..0000000
--- a/src/app/sprint-table/sprint-table.component.css
+++ /dev/null
@@ -1,3 +0,0 @@
-th.sortable:hover {
- text-decoration: underline;
-}
\ No newline at end of file
diff --git a/src/app/sprint-table/sprint-table.component.html b/src/app/sprint-table/sprint-table.component.html
deleted file mode 100644
index 894bcb9..0000000
--- a/src/app/sprint-table/sprint-table.component.html
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
-
- Sprints
-
-
-
-
-
-
- |
- ID
-
-
-
-
-
- |
-
- Titel
-
-
-
-
-
- |
-
- Start
-
-
-
-
-
- |
-
- End
-
-
-
-
-
- |
- |
-
-
-
-
-
- | {{sprint.id}} |
- {{sprint.title}} |
- {{sprint.startDate | date:'dd.MM.yyyy'}} |
- {{sprint.endDate | date:'dd.MM.yyyy'}} |
-
-
-
- |
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/app/task-form/task-form.component.html b/src/app/task-form/task-form.component.html
deleted file mode 100644
index 2e688ac..0000000
--- a/src/app/task-form/task-form.component.html
+++ /dev/null
@@ -1,83 +0,0 @@
-
-
-
-
-
-
-
-
-
Neuen Task anlegen
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/app/task-table/task-table.component.html b/src/app/task-table/task-table.component.html
deleted file mode 100644
index 1a8b2f2..0000000
--- a/src/app/task-table/task-table.component.html
+++ /dev/null
@@ -1,126 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/src/app/userstory-table/userstory-table.component.css b/src/app/userstory-table/userstory-table.component.css
deleted file mode 100644
index 70f7a6e..0000000
--- a/src/app/userstory-table/userstory-table.component.css
+++ /dev/null
@@ -1,3 +0,0 @@
-th.sortable:hover {
- text-decoration: underline;
-}
diff --git a/src/app/userstory-table/userstory-table.component.html b/src/app/userstory-table/userstory-table.component.html
deleted file mode 100644
index 90e0ce0..0000000
--- a/src/app/userstory-table/userstory-table.component.html
+++ /dev/null
@@ -1,106 +0,0 @@
-
-
-
Userstories
-
-
-
-
-
diff --git a/src/styles.css b/src/styles.css
new file mode 100644
index 0000000..0fe5df0
--- /dev/null
+++ b/src/styles.css
@@ -0,0 +1,9 @@
+/* You can add global styles to this file, and also import other style files */
+.custom-text-secondary {
+ color: white;
+ }
+
+ .white-content .custom-text-secondary {
+ color: black !important;
+ }
+
\ No newline at end of file
diff --git a/src/styles.scss b/src/styles.scss
index 79fc2de..7fefb6f 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -2,4 +2,16 @@
.modal .modal-content {
display: contents;
-}
\ No newline at end of file
+}
+
+th.sortable:hover {
+ text-decoration: underline;
+}
+
+.content {
+ position: relative;
+ float: left;
+ margin-top: 10px;
+ margin-left: 20px;
+ width: 80%;
+}