Skip to content
Snippets Groups Projects
Commit 1bc42e49 authored by Oleg Semenov's avatar Oleg Semenov
Browse files

module show iz da

parent 8cd398fb
No related branches found
No related tags found
No related merge requests found
...@@ -4,14 +4,14 @@ ...@@ -4,14 +4,14 @@
font: 13px Helvetica; font: 13px Helvetica;
} }
#faculties, #modules { #faculties, #modules, #groups {
margin: 0 0 2em 0; margin: 0 0 2em 0;
list-style-type: none; list-style-type: none;
padding: 0; padding: 0;
width: 15em; width: 15em;
} }
#faculties li, #modules li { #faculties li, #modules li, #groups li {
cursor: pointer; cursor: pointer;
position: relative; position: relative;
left: 0; left: 0;
...@@ -22,20 +22,20 @@ ...@@ -22,20 +22,20 @@
border-radius: 4px; border-radius: 4px;
} }
#faculties li:hover, #modules li:hover { #faculties li:hover, #modules li:hover, #groups li:hover {
background-color: palegreen; background-color: palegreen;
left: .1em; left: .1em;
} }
#faculties li.selected, #modules li.selected { #faculties li.selected, #modules li.selected , #groups li.selected {
background-color: darkseagreen; 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; background-color: darkseagreen;
} }
#faculties .badge, #modules .badge{ #faculties .badge, #modules .badge, #groups .badge {
display: inline-block; display: inline-block;
font-size: small; font-size: small;
color: white; color: white;
......
...@@ -6,11 +6,10 @@ ...@@ -6,11 +6,10 @@
[class.selected]="faculty === selectedFaculty" [class.selected]="faculty === selectedFaculty"
(click)="onSelectFac(faculty)"> (click)="onSelectFac(faculty)">
<span class="badge">{{faculty.fakultaet_ID}}</span> {{faculty.title}} <span class="badge">{{faculty.fakultaet_ID}}</span> {{faculty.title}}
</li> </li>
</ul> </ul>
<div *ngIf="selectedFaculty"> <div *ngIf="selectedFaculty">
<ul id="modules"> Module <ul id="modules">Module
<li *ngFor="let module of modules" <li *ngFor="let module of modules"
[class.selected]="module === selectedModule" [class.selected]="module === selectedModule"
(click)="onSelectMod(module)"> (click)="onSelectMod(module)">
...@@ -18,4 +17,13 @@ ...@@ -18,4 +17,13 @@
</li> </li>
</ul> </ul>
</div> </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> </div>
...@@ -22,7 +22,7 @@ export class GroupSearchComponent implements OnInit { ...@@ -22,7 +22,7 @@ export class GroupSearchComponent implements OnInit {
groups: GroupDO[]; groups: GroupDO[];
selectedModule:ModulesDO; selectedModule:ModulesDO;
selectedFaculty:FacultyDO; selectedFaculty:FacultyDO;
selectedGroup: GroupDO;
constructor(private route: ActivatedRoute,private dataService: DataProviderService) {} constructor(private route: ActivatedRoute,private dataService: DataProviderService) {}
...@@ -39,6 +39,11 @@ export class GroupSearchComponent implements OnInit { ...@@ -39,6 +39,11 @@ export class GroupSearchComponent implements OnInit {
this.selectedModule = module; this.selectedModule = module;
this.getAllGroups(); this.getAllGroups();
} }
onSelectGroup(groups: GroupDO): void {
this.selectedGroup = groups;
}
getAllFaculties() { getAllFaculties() {
} }
......
...@@ -16,8 +16,8 @@ export class DataProviderService { ...@@ -16,8 +16,8 @@ export class DataProviderService {
getGroupData(): Promise<RequestResponse<GroupDO[]>> { getGroupData(): Promise<RequestResponse<GroupDO[]>> {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
this.httpClient.get<GroupDO[]>('http://localhost:8080/groups').toPromise().then( this.httpClient.get<GroupDO[]>('http://localhost:8080/groups').toPromise().then(
(group: GroupDO[]) => { (groups: GroupDO[]) => {
resolve({type: ResponseType.SUCCESS, payload: group}); resolve({type: ResponseType.SUCCESS, payload: groups });
}, (error: HttpErrorResponse) => { }, (error: HttpErrorResponse) => {
if(error.status === 0) { if(error.status === 0) {
reject({type: ResponseType.CONNECTION_PROBLEM}); reject({type: ResponseType.CONNECTION_PROBLEM});
...@@ -35,8 +35,8 @@ export class DataProviderService { ...@@ -35,8 +35,8 @@ export class DataProviderService {
getFacultyData(): Promise<RequestResponse<FacultyDO[]>> { getFacultyData(): Promise<RequestResponse<FacultyDO[]>> {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
this.httpClient.get<FacultyDO[]>('http://localhost:8080/faculties').toPromise().then( this.httpClient.get<FacultyDO[]>('http://localhost:8080/faculties').toPromise().then(
(faculty: FacultyDO[]) => { (faculties: FacultyDO[]) => {
resolve({type: ResponseType.SUCCESS, payload: faculty}); resolve({type: ResponseType.SUCCESS, payload: faculties});
}, (error: HttpErrorResponse) => { }, (error: HttpErrorResponse) => {
if(error.status === 0) { if(error.status === 0) {
reject({type: ResponseType.CONNECTION_PROBLEM}); reject({type: ResponseType.CONNECTION_PROBLEM});
......
package thinkTogether.groupManagement.controller; package thinkTogether.groupManagement.controller;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import thinkTogether.groupManagement.model.Learninggroup; import thinkTogether.groupManagement.model.Learninggroup;
...@@ -9,6 +10,8 @@ import java.util.List; ...@@ -9,6 +10,8 @@ import java.util.List;
@RestController @RestController
@CrossOrigin(origins = "*", allowedHeaders = "*")
// Verwendet das Repository und gibt die Daten zurück // Verwendet das Repository und gibt die Daten zurück
public class GroupManagementController { public class GroupManagementController {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment