From 5f1be1ae80771d322d8ebc8252c4e92c283abbe5 Mon Sep 17 00:00:00 2001
From: semenovo <oleg.semenov@student.reutlingen-university.de>
Date: Fri, 17 Jul 2020 20:57:47 +0200
Subject: [PATCH] save fixed
---
.../create-group/create-group.component.ts | 12 +++---------
frontend/src/app/types/groupDO.ts | 6 +++---
.../controller/GroupManagementController.java | 2 +-
.../groupManagement/model/Learninggroup.java | 9 +++++----
4 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/frontend/src/app/components/create-group/create-group.component.ts b/frontend/src/app/components/create-group/create-group.component.ts
index 85980dd..3ed7aba 100644
--- a/frontend/src/app/components/create-group/create-group.component.ts
+++ b/frontend/src/app/components/create-group/create-group.component.ts
@@ -19,7 +19,6 @@ export class CreateGroupComponent implements OnInit {
groups: GroupDO[];
selectedModule:ModulesDO;
selectedFaculty:FacultyDO;
- selectedGroup: GroupDO;
newGroup: GroupDO;
errorMessage: string;
@@ -39,10 +38,6 @@ export class CreateGroupComponent implements OnInit {
this.getAllGroups();
}
- onSelectGroup(groups: GroupDO): void {
- this.selectedGroup = groups;
- }
-
clickToCreate(): void {
this.createGroup();
}
@@ -74,16 +69,15 @@ export class CreateGroupComponent implements OnInit {
createGroup() {
let newID = this.modules.length + 1;
let moduleId = this.selectedModule.getId;
- this.newGroup = new GroupDO(newID, moduleId, '', '');
+ this.newGroup = new GroupDO(newID, '', '', moduleId);
this.dataService.createGroupData(this.newGroup).then((group) => {
- this.router.navigateByUrl('/new', {state: {group: this.newGroup}});
+ this.router.navigateByUrl('http://localhost:8080/groups/new', {state: {group: this.newGroup}});
}, (error) => {
if(error.type === ResponseType.CONNECTION_PROBLEM) {
this.errorMessage = 'Connection Problem';
} else {
this.errorMessage = 'Unknown error happened!';
}
- }
- );
+ });
}
}
diff --git a/frontend/src/app/types/groupDO.ts b/frontend/src/app/types/groupDO.ts
index 67ff4a8..86ed633 100644
--- a/frontend/src/app/types/groupDO.ts
+++ b/frontend/src/app/types/groupDO.ts
@@ -1,12 +1,12 @@
export class GroupDO {
id: number;
- modulid: number;
status: string;
date: string;
+ modulid: number;
- constructor(private iD: number, private moduleId:
- number, private statuS: string, datE: string) {
+ constructor(private iD: number, private statuS: string,
+ private datE: string, private moduleId: number) {
this.id = iD;
this.modulid = moduleId;
this.status = statuS;
diff --git a/groupManagement/src/main/java/thinkTogether/groupManagement/controller/GroupManagementController.java b/groupManagement/src/main/java/thinkTogether/groupManagement/controller/GroupManagementController.java
index 70c5190..d5e3eee 100644
--- a/groupManagement/src/main/java/thinkTogether/groupManagement/controller/GroupManagementController.java
+++ b/groupManagement/src/main/java/thinkTogether/groupManagement/controller/GroupManagementController.java
@@ -33,7 +33,7 @@ public class GroupManagementController {
@PostMapping("/groups/new")
public Learninggroup save(@RequestBody Learninggroup group){
- groupRepository.save(group) {
+ groupRepository.save(group); {
group.setDatum(LocalDate.now());
group.setStatus("open");
}
diff --git a/groupManagement/src/main/java/thinkTogether/groupManagement/model/Learninggroup.java b/groupManagement/src/main/java/thinkTogether/groupManagement/model/Learninggroup.java
index 28937cd..fdbbddf 100644
--- a/groupManagement/src/main/java/thinkTogether/groupManagement/model/Learninggroup.java
+++ b/groupManagement/src/main/java/thinkTogether/groupManagement/model/Learninggroup.java
@@ -2,6 +2,7 @@ package thinkTogether.groupManagement.model;
import javax.persistence.*;
import java.sql.Date;
+import java.time.LocalDate;
@Entity
public class Learninggroup {
@@ -10,14 +11,14 @@ public class Learninggroup {
private String status;
- private Date date;
+ private LocalDate date;
private int modulid;
protected Learninggroup() {
}
- public Learninggroup(String status, Date erstelldatum, int modulid) {
+ public Learninggroup(String status, LocalDate erstelldatum, int modulid) {
this.date = erstelldatum;
this.modulid = modulid;
this.status = status;
@@ -32,11 +33,11 @@ public class Learninggroup {
return id;
}
- public Date getDatum() {
+ public LocalDate getDatum() {
return date;
}
- public void setDatum(Date datum) {
+ public void setDatum(LocalDate datum) {
this.date = datum;
}
--
GitLab