Merge branch 'master' of https://gitlab.reutlingen-university.de/gessmann/vs_sose2020

frontend/src/app/components/group-search/group-search.component.html

@@ -6,15 +6,16 @@
         [class.selected]="faculty === selectedFaculty"
         (click)="onSelectFac(faculty)">
         <span class="badge">{{faculty.fakultaet_ID}}</span> {{faculty.title}}
-      <div *ngIf="selectedFaculty">
-        <ul id="modules">
-          <li *ngFor="let module of modules"
-              [class.selected]="module === selectedModule"
-              (click)="onSelectMod(module)">Module
-            <span class="badge">{{module.id}}</span> {{module.title}}
-          </li>
-        </ul>
-      </div>
+
     </li>
   </ul>
+  <div *ngIf="selectedFaculty">
+    <ul id="modules"> Module
+      <li *ngFor="let module of modules"
+          [class.selected]="module === selectedModule"
+          (click)="onSelectMod(module)">
+        <span class="badge">{{module.id}}</span> {{module.titel}}
+      </li>
+    </ul>
+  </div>
 </div>

frontend/src/app/components/group-search/group-search.component.ts

@@ -3,6 +3,7 @@ import { DataProviderService } from '../../services/data-provider.service';
 import { FacultyDO } from '../../types/facultyDO';
 import { ModulesDO } from '../../types/modulesDO';
 import { ActivatedRoute } from "@angular/router";
+import {GroupDO} from "../../types/groupDO";
 
 @Component({
   selector: 'app-group-search',
@@ -18,6 +19,7 @@ export class GroupSearchComponent implements OnInit {
   { fakultaet_ID: 1, title: 'Informatik' }
   ];
   modules: ModulesDO[];
+  groups: GroupDO[];
   selectedModule:ModulesDO;
   selectedFaculty:FacultyDO;
 
@@ -28,22 +30,17 @@ export class GroupSearchComponent implements OnInit {
   ngOnInit(): void {
   }
 
-
-
   onSelectFac(faculty: FacultyDO): void {
     this.selectedFaculty = faculty;
+    this.getAllModules();
   }
 
   onSelectMod(module: ModulesDO): void {
-    this.getAllModules();
     this.selectedModule = module;
+    this.getAllGroups();
   }
   getAllFaculties() {
-  //  this.route.params.subscribe((params)=> {
-   //   this.dataService.getFacultyData().then((response) => {
-    //    this.facultyDO = response.payload;
-     // })
-    //})
+
   }
 
   getAllModules() {
@@ -55,7 +52,11 @@ export class GroupSearchComponent implements OnInit {
   }
 
   getAllGroups() {
-
+    this.route.params.subscribe((params)=> {
+      this.dataService.getGroupData().then((response) => {
+        this.groups = response.payload;
+      })
+    })
   }
 
 }

frontend/src/app/services/data-provider.service.ts

@@ -11,13 +11,11 @@ import {ModulesDO} from "../types/modulesDO";
 })
 export class DataProviderService {
 
-  apiUrl = 'http://localhost:8080/'
-
   constructor(private httpClient: HttpClient) { }
 
   getGroupData(): Promise<RequestResponse<GroupDO[]>> {
     return new Promise((resolve, reject) => {
-      this.httpClient.get<GroupDO[]>('/group-search').toPromise().then(
+      this.httpClient.get<GroupDO[]>('http://localhost:8080/groups').toPromise().then(
         (group: GroupDO[]) => {
           resolve({type: ResponseType.SUCCESS, payload: group});
         }, (error: HttpErrorResponse) => {
@@ -36,7 +34,7 @@ export class DataProviderService {
 
   getFacultyData(): Promise<RequestResponse<FacultyDO[]>> {
     return new Promise((resolve, reject) => {
-      this.httpClient.get<FacultyDO[]>('localhost:8080/groups').toPromise().then(
+      this.httpClient.get<FacultyDO[]>('http://localhost:8080/faculties').toPromise().then(
         (faculty: FacultyDO[]) => {
           resolve({type: ResponseType.SUCCESS, payload: faculty});
         }, (error: HttpErrorResponse) => {
@@ -55,7 +53,7 @@ export class DataProviderService {
 
   getModulesData(): Promise<RequestResponse<ModulesDO[]>> {
     return new Promise((resolve, reject) => {
-      this.httpClient.get<ModulesDO[]>('/module').toPromise().then(
+      this.httpClient.get<ModulesDO[]>('http://localhost:8080/module').toPromise().then(
         (modules: ModulesDO[]) => {
           resolve({type: ResponseType.SUCCESS, payload: modules});
         }, (error: HttpErrorResponse) => {

frontend/src/app/types/groupDO.ts

 export class GroupDO {
-  group_ID: number;
-  modul_ID: number;
+  id: number;
+  modulid: number;
   status: string;
-  erstellDatum: string;
+  date: string;
 }

frontend/src/app/types/modulesDO.ts

 export class ModulesDO {
   id: number;
-  title: string;
+  titel: string;
 }

groupManagement/src/main/java/thinkTogether/groupManagement/controller/ModulRestController.java

 package thinkTogether.groupManagement.controller;
 
+import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 import thinkTogether.groupManagement.model.Modul;
@@ -8,6 +9,7 @@ import thinkTogether.groupManagement.repo.ModulRepository;
 import java.util.List;
 
 @RestController
+@CrossOrigin(origins = "*", allowedHeaders = "*")
 public class ModulRestController {
 
     private final ModulRepository modulRepository;