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 3ed7aba4e6b251add1913fc4d44fa0708008aee3..43c4848c9dab5e60ed0cde01805eae0b5197d87e 100644 --- a/frontend/src/app/components/create-group/create-group.component.ts +++ b/frontend/src/app/components/create-group/create-group.component.ts @@ -21,6 +21,7 @@ export class CreateGroupComponent implements OnInit { selectedFaculty:FacultyDO; newGroup: GroupDO; errorMessage: string; + createdGroup: GroupDO; constructor(private router: Router, private route: ActivatedRoute,private dataService: DataProviderService) {} @@ -68,10 +69,16 @@ export class CreateGroupComponent implements OnInit { createGroup() { let newID = this.modules.length + 1; - let moduleId = this.selectedModule.getId; - this.newGroup = new GroupDO(newID, '', '', moduleId); + let moduleId = this.selectedModule.id; + this.newGroup = new GroupDO(); + this.newGroup.id = newID; + this.newGroup.date = ''; + this.newGroup.status = ''; + this.newGroup.modulid = moduleId; + this.dataService.createGroupData(this.newGroup).then((group) => { - this.router.navigateByUrl('http://localhost:8080/groups/new', {state: {group: this.newGroup}}); + this.createdGroup = group.payload; + this.router.navigateByUrl('http://localhost:8080/groups/new', {state: {group: this.createdGroup}}); }, (error) => { if(error.type === ResponseType.CONNECTION_PROBLEM) { this.errorMessage = 'Connection Problem'; diff --git a/frontend/src/app/types/groupDO.ts b/frontend/src/app/types/groupDO.ts index 86ed63383df6ba7dfd564aaafec8157c2bd1b966..54116b311174121cd56784722962fd506f4ab10d 100644 --- a/frontend/src/app/types/groupDO.ts +++ b/frontend/src/app/types/groupDO.ts @@ -4,12 +4,4 @@ export class GroupDO { status: string; date: string; modulid: number; - - constructor(private iD: number, private statuS: string, - private datE: string, private moduleId: number) { - this.id = iD; - this.modulid = moduleId; - this.status = statuS; - this.date = datE; - } } diff --git a/groupManagement/src/main/java/thinkTogether/groupManagement/controller/GroupManagementController.java b/groupManagement/src/main/java/thinkTogether/groupManagement/controller/GroupManagementController.java index d5e3eee0c28b0a50cbf3fc79f4eedf6e4afe5a43..78296f777e9170cc71f9644d9b9bf0e90ac1fc99 100644 --- a/groupManagement/src/main/java/thinkTogether/groupManagement/controller/GroupManagementController.java +++ b/groupManagement/src/main/java/thinkTogether/groupManagement/controller/GroupManagementController.java @@ -33,10 +33,10 @@ public class GroupManagementController { @PostMapping("/groups/new") public Learninggroup save(@RequestBody Learninggroup group){ - groupRepository.save(group); { - group.setDatum(LocalDate.now()); - group.setStatus("open"); - } + groupRepository.save(group); + group.setDatum(LocalDate.now()); + group.setStatus("open"); + return group; }