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

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

@@ -4,14 +4,14 @@
   font: 13px Helvetica;
 }
 
-#faculties, #modules {
+#faculties, #modules, #groups {
   margin: 0 0 2em 0;
   list-style-type: none;
   padding: 0;
   width: 15em;
 }
 
-#faculties li, #modules li {
+#faculties li, #modules li, #groups li {
   cursor: pointer;
   position: relative;
   left: 0;
@@ -22,20 +22,20 @@
   border-radius: 4px;
 }
 
-#faculties li:hover, #modules li:hover {
+#faculties li:hover, #modules li:hover, #groups li:hover {
   background-color: palegreen;
   left: .1em;
 }
 
-#faculties li.selected, #modules li.selected {
+#faculties li.selected, #modules li.selected , #groups li.selected {
   background-color: darkseagreen;
 }
 
-#faculties li.selected:hover, #modules li.selected.hover {
+#faculties li.selected:hover, #modules li.selected.hover , #groups li.selected:hover {
   background-color: darkseagreen;
 }
 
-#faculties .badge, #modules .badge{
+#faculties .badge, #modules .badge, #groups .badge {
   display: inline-block;
   font-size: small;
   color: white;

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

@@ -6,11 +6,10 @@
         [class.selected]="faculty === selectedFaculty"
         (click)="onSelectFac(faculty)">
         <span class="badge">{{faculty.fakultaet_ID}}</span> {{faculty.title}}
-
     </li>
   </ul>
   <div *ngIf="selectedFaculty">
-    <ul id="modules"> Module
+    <ul id="modules">Module
       <li *ngFor="let module of modules"
           [class.selected]="module === selectedModule"
           (click)="onSelectMod(module)">
@@ -18,4 +17,13 @@
       </li>
     </ul>
   </div>
+  <div *ngIf="selectedModule">
+    <ul id="groups">Gruppen
+      <li *ngFor="let group of groups"
+          [class.selected]="group === selectedGroup"
+          (click)="onSelectGroup(group)">
+        <span class="badge">{{group.id}}</span> {{'Gruppe'}}
+      </li>
+    </ul>
+  </div>
 </div>

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

@@ -22,7 +22,7 @@ export class GroupSearchComponent implements OnInit {
   groups: GroupDO[];
   selectedModule:ModulesDO;
   selectedFaculty:FacultyDO;
-
+  selectedGroup: GroupDO;
 
 
   constructor(private route: ActivatedRoute,private dataService: DataProviderService) {}
@@ -39,6 +39,11 @@ export class GroupSearchComponent implements OnInit {
     this.selectedModule = module;
     this.getAllGroups();
   }
+
+  onSelectGroup(groups: GroupDO): void {
+    this.selectedGroup = groups;
+  }
+
   getAllFaculties() {
 
   }

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

@@ -16,8 +16,8 @@ export class DataProviderService {
   getGroupData(): Promise<RequestResponse<GroupDO[]>> {
     return new Promise((resolve, reject) => {
       this.httpClient.get<GroupDO[]>('http://localhost:8080/groups').toPromise().then(
-        (group: GroupDO[]) => {
-          resolve({type: ResponseType.SUCCESS, payload: group});
+        (groups: GroupDO[]) => {
+          resolve({type: ResponseType.SUCCESS, payload: groups });
         }, (error: HttpErrorResponse) => {
           if(error.status === 0) {
             reject({type: ResponseType.CONNECTION_PROBLEM});
@@ -35,8 +35,8 @@ export class DataProviderService {
   getFacultyData(): Promise<RequestResponse<FacultyDO[]>> {
     return new Promise((resolve, reject) => {
       this.httpClient.get<FacultyDO[]>('http://localhost:8080/faculties').toPromise().then(
-        (faculty: FacultyDO[]) => {
-          resolve({type: ResponseType.SUCCESS, payload: faculty});
+        (faculties: FacultyDO[]) => {
+          resolve({type: ResponseType.SUCCESS, payload: faculties});
         }, (error: HttpErrorResponse) => {
           if(error.status === 0) {
             reject({type: ResponseType.CONNECTION_PROBLEM});

groupManagement/src/main/java/thinkTogether/groupManagement/controller/GroupManagementController.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.Learninggroup;
@@ -9,6 +10,8 @@ import java.util.List;
 
 
 @RestController
+@CrossOrigin(origins = "*", allowedHeaders = "*")
+
 // Verwendet das Repository und gibt die Daten zurück
 public class GroupManagementController {