diff --git a/groupManagement/manifest.yml b/frontend/manifest.yml similarity index 72% rename from groupManagement/manifest.yml rename to frontend/manifest.yml index caf6472be1c8885d4d81527e971c3348974cef2f..98d3d4cd53315a0023bc72f419aa03274441f2bf 100644 --- a/groupManagement/manifest.yml +++ b/frontend/manifest.yml @@ -3,4 +3,4 @@ applications: - name: thinkTogether memory: 256M host: thinkTogether - buildpack: java_buildpack \ No newline at end of file + buildpack: nodejs_buildpack \ No newline at end of file diff --git a/frontend/src/app/components/group-search/group-search.component.html b/frontend/src/app/components/group-search/group-search.component.html index dd3de2112c3bc8aaede5df4689bfb507b5a9f00a..20351f6a15d74ade770d11de3da4600f60e1010b 100644 --- a/frontend/src/app/components/group-search/group-search.component.html +++ b/frontend/src/app/components/group-search/group-search.component.html @@ -11,7 +11,7 @@ <li *ngFor="let module of modules" [class.selected]="module === selectedModule" (click)="onSelectMod(module)">Module - <span class="badge">{{module.modul_ID}}</span> {{module.title}} + <span class="badge">{{module.id}}</span> {{module.title}} </li> </ul> </div> diff --git a/frontend/src/app/components/group-search/group-search.component.ts b/frontend/src/app/components/group-search/group-search.component.ts index d3495af864993eb2d3993f2237da7e6e43204201..7e7b38b2c7cdc60355d3d65d0eb15030fd3c08b1 100644 --- a/frontend/src/app/components/group-search/group-search.component.ts +++ b/frontend/src/app/components/group-search/group-search.component.ts @@ -2,6 +2,7 @@ import {Component, OnInit} from '@angular/core'; import { DataProviderService } from '../../services/data-provider.service'; import { FacultyDO } from '../../types/facultyDO'; import { ModulesDO } from '../../types/modulesDO'; +import { ActivatedRoute } from "@angular/router"; @Component({ selector: 'app-group-search', @@ -10,36 +11,34 @@ import { ModulesDO } from '../../types/modulesDO'; }) export class GroupSearchComponent implements OnInit { - faculties: FacultyDO[] = [ - { fakultaet_ID: 1, title: 'Informatik' }, - { fakultaet_ID: 1, title: 'Informatik' }, - { fakultaet_ID: 1, title: 'Informatik' }, - { fakultaet_ID: 1, title: 'Informatik' } + faculties: FacultyDO[] = [ + { fakultaet_ID: 1, title: 'Informatik' }, + { fakultaet_ID: 1, title: 'Informatik' }, + { fakultaet_ID: 1, title: 'Informatik' }, + { fakultaet_ID: 1, title: 'Informatik' } ]; - modules: ModulesDO[] = [ - { member_ID: 1, modul_ID:1, title: 'Betriebssysteme' }, - { member_ID: 1, modul_ID:1, title: 'Betriebssysteme' }, - { member_ID: 1, modul_ID:1, title: 'Betriebssysteme' }, - { member_ID: 1, modul_ID:1, title: 'Betriebssysteme' }, - { member_ID: 1, modul_ID:1, title: 'Betriebssysteme' }, - { member_ID: 1, modul_ID:1, title: 'Betriebssysteme' }, - ]; - selectedModule:ModulesDO; - selectedFaculty:FacultyDO; - - constructor() {} + modules: ModulesDO[]; + selectedModule:ModulesDO; + selectedFaculty:FacultyDO; + + + + constructor(private route: ActivatedRoute,private dataService: DataProviderService) {} ngOnInit(): void { } + + onSelectFac(faculty: FacultyDO): void { this.selectedFaculty = faculty; } onSelectMod(module: ModulesDO): void { + this.getAllModules(); this.selectedModule = module; } - showFaculties() { + getAllFaculties() { // this.route.params.subscribe((params)=> { // this.dataService.getFacultyData().then((response) => { // this.facultyDO = response.payload; @@ -47,11 +46,15 @@ export class GroupSearchComponent implements OnInit { //}) } - showModules() { - + getAllModules() { + this.route.params.subscribe((params)=> { + this.dataService.getModulesData().then((response) => { + this.modules = response.payload; + }) + }) } - showGroups() { + getAllGroups() { } diff --git a/frontend/src/app/services/data-provider.service.ts b/frontend/src/app/services/data-provider.service.ts index f4103c4e61f6b8708035710aaf2586afffb1f3fa..5ac8c7b81842948c943080d149c4280fe531dacc 100644 --- a/frontend/src/app/services/data-provider.service.ts +++ b/frontend/src/app/services/data-provider.service.ts @@ -11,7 +11,7 @@ import {ModulesDO} from "../types/modulesDO"; }) export class DataProviderService { - apiUrl = 'http://localhost:8080/api' + apiUrl = 'http://localhost:8080/' constructor(private httpClient: HttpClient) { } @@ -36,7 +36,7 @@ export class DataProviderService { getFacultyData(): Promise<RequestResponse<FacultyDO[]>> { return new Promise((resolve, reject) => { - this.httpClient.get<FacultyDO[]>('/group-search').toPromise().then( + this.httpClient.get<FacultyDO[]>('localhost:8080/groups').toPromise().then( (faculty: FacultyDO[]) => { resolve({type: ResponseType.SUCCESS, payload: faculty}); }, (error: HttpErrorResponse) => { @@ -55,7 +55,7 @@ export class DataProviderService { getModulesData(): Promise<RequestResponse<ModulesDO[]>> { return new Promise((resolve, reject) => { - this.httpClient.get<ModulesDO[]>('/group-search').toPromise().then( + this.httpClient.get<ModulesDO[]>('/module').toPromise().then( (modules: ModulesDO[]) => { resolve({type: ResponseType.SUCCESS, payload: modules}); }, (error: HttpErrorResponse) => { diff --git a/frontend/src/app/types/modulesDO.ts b/frontend/src/app/types/modulesDO.ts index 1d7697e4175f87695aa52c5836151928c8ce2083..8c7a20a223b476b3eb039d37510ee9d6614b7220 100644 --- a/frontend/src/app/types/modulesDO.ts +++ b/frontend/src/app/types/modulesDO.ts @@ -1,5 +1,4 @@ export class ModulesDO { - modul_ID: number; - member_ID: number; + id: number; title: string; } diff --git a/groupManagement/pom.xml b/groupManagement/pom.xml index e05dcbec4ad7148ab5765c8e431525aa20e6f0ab..d817d765797660540320a895c9f22d7a49dea9c5 100644 --- a/groupManagement/pom.xml +++ b/groupManagement/pom.xml @@ -111,19 +111,16 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> - <artifactId></artifactId> <executions> <execution> <phase>package</phase> <goals> - <goal>single</goal> + </goals> </execution> </executions> <configuration> - <descriptorRefs> - <descriptorRef>jar-with-dependencies</descriptorRef> - </descriptorRefs> + </configuration> </plugin> </plugins> diff --git a/groupManagement/src/main/resources/application.properties b/groupManagement/src/main/resources/application.properties index e044a7409368c6cad9d68ce518c5efed388aeb45..ee7ebafb1125e14b2bc468caf95b8bee48f3616b 100644 --- a/groupManagement/src/main/resources/application.properties +++ b/groupManagement/src/main/resources/application.properties @@ -21,4 +21,4 @@ spring.jpa.show-sql=true #spring.jpa.open-in-view=false #spring.datasource.validationQuery=SELECT 1 -server.port=8800 \ No newline at end of file +server.port=8080 \ No newline at end of file