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

backend/frontend connection iz da

parent adde0613
No related branches found
No related tags found
No related merge requests found
...@@ -6,15 +6,16 @@ ...@@ -6,15 +6,16 @@
[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}}
<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> </li>
</ul> </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> </div>
...@@ -3,6 +3,7 @@ import { DataProviderService } from '../../services/data-provider.service'; ...@@ -3,6 +3,7 @@ import { DataProviderService } from '../../services/data-provider.service';
import { FacultyDO } from '../../types/facultyDO'; import { FacultyDO } from '../../types/facultyDO';
import { ModulesDO } from '../../types/modulesDO'; import { ModulesDO } from '../../types/modulesDO';
import { ActivatedRoute } from "@angular/router"; import { ActivatedRoute } from "@angular/router";
import {GroupDO} from "../../types/groupDO";
@Component({ @Component({
selector: 'app-group-search', selector: 'app-group-search',
...@@ -18,6 +19,7 @@ export class GroupSearchComponent implements OnInit { ...@@ -18,6 +19,7 @@ export class GroupSearchComponent implements OnInit {
{ fakultaet_ID: 1, title: 'Informatik' } { fakultaet_ID: 1, title: 'Informatik' }
]; ];
modules: ModulesDO[]; modules: ModulesDO[];
groups: GroupDO[];
selectedModule:ModulesDO; selectedModule:ModulesDO;
selectedFaculty:FacultyDO; selectedFaculty:FacultyDO;
...@@ -28,22 +30,17 @@ export class GroupSearchComponent implements OnInit { ...@@ -28,22 +30,17 @@ export class GroupSearchComponent implements OnInit {
ngOnInit(): void { ngOnInit(): void {
} }
onSelectFac(faculty: FacultyDO): void { onSelectFac(faculty: FacultyDO): void {
this.selectedFaculty = faculty; this.selectedFaculty = faculty;
this.getAllModules();
} }
onSelectMod(module: ModulesDO): void { onSelectMod(module: ModulesDO): void {
this.getAllModules();
this.selectedModule = module; this.selectedModule = module;
this.getAllGroups();
} }
getAllFaculties() { getAllFaculties() {
// this.route.params.subscribe((params)=> {
// this.dataService.getFacultyData().then((response) => {
// this.facultyDO = response.payload;
// })
//})
} }
getAllModules() { getAllModules() {
...@@ -55,7 +52,11 @@ export class GroupSearchComponent implements OnInit { ...@@ -55,7 +52,11 @@ export class GroupSearchComponent implements OnInit {
} }
getAllGroups() { getAllGroups() {
this.route.params.subscribe((params)=> {
this.dataService.getGroupData().then((response) => {
this.groups = response.payload;
})
})
} }
} }
...@@ -11,13 +11,11 @@ import {ModulesDO} from "../types/modulesDO"; ...@@ -11,13 +11,11 @@ import {ModulesDO} from "../types/modulesDO";
}) })
export class DataProviderService { export class DataProviderService {
apiUrl = 'http://localhost:8080/'
constructor(private httpClient: HttpClient) { } constructor(private httpClient: HttpClient) { }
getGroupData(): Promise<RequestResponse<GroupDO[]>> { getGroupData(): Promise<RequestResponse<GroupDO[]>> {
return new Promise((resolve, reject) => { 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[]) => { (group: GroupDO[]) => {
resolve({type: ResponseType.SUCCESS, payload: group}); resolve({type: ResponseType.SUCCESS, payload: group});
}, (error: HttpErrorResponse) => { }, (error: HttpErrorResponse) => {
...@@ -36,7 +34,7 @@ export class DataProviderService { ...@@ -36,7 +34,7 @@ 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[]>('localhost:8080/groups').toPromise().then( this.httpClient.get<FacultyDO[]>('http://localhost:8080/faculties').toPromise().then(
(faculty: FacultyDO[]) => { (faculty: FacultyDO[]) => {
resolve({type: ResponseType.SUCCESS, payload: faculty}); resolve({type: ResponseType.SUCCESS, payload: faculty});
}, (error: HttpErrorResponse) => { }, (error: HttpErrorResponse) => {
...@@ -55,7 +53,7 @@ export class DataProviderService { ...@@ -55,7 +53,7 @@ export class DataProviderService {
getModulesData(): Promise<RequestResponse<ModulesDO[]>> { getModulesData(): Promise<RequestResponse<ModulesDO[]>> {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
this.httpClient.get<ModulesDO[]>('/module').toPromise().then( this.httpClient.get<ModulesDO[]>('http://localhost:8080/module').toPromise().then(
(modules: ModulesDO[]) => { (modules: ModulesDO[]) => {
resolve({type: ResponseType.SUCCESS, payload: modules}); resolve({type: ResponseType.SUCCESS, payload: modules});
}, (error: HttpErrorResponse) => { }, (error: HttpErrorResponse) => {
......
export class GroupDO { export class GroupDO {
group_ID: number; id: number;
modul_ID: number; modulid: number;
status: string; status: string;
erstellDatum: string; date: string;
} }
export class ModulesDO { export class ModulesDO {
id: number; id: number;
title: string; titel: string;
} }
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.Modul; import thinkTogether.groupManagement.model.Modul;
...@@ -8,6 +9,7 @@ import thinkTogether.groupManagement.repo.ModulRepository; ...@@ -8,6 +9,7 @@ import thinkTogether.groupManagement.repo.ModulRepository;
import java.util.List; import java.util.List;
@RestController @RestController
@CrossOrigin(origins = "*", allowedHeaders = "*")
public class ModulRestController { public class ModulRestController {
private final ModulRepository modulRepository; private final ModulRepository modulRepository;
......
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