diff --git a/src/app/models/user.ts b/src/app/models/user.ts
index c092e1a..472eaac 100644
--- a/src/app/models/user.ts
+++ b/src/app/models/user.ts
@@ -1,4 +1,4 @@
-export class User {
+export class AuthUser {
request_token: string;
refresh_token: string;
user: {
@@ -10,4 +10,13 @@ export class User {
}
}
+}
+
+export class User {
+ id: number;
+ name: string;
+ email: string;
+ attributes : {
+ profile_url: string;
+ }
}
\ No newline at end of file
diff --git a/src/app/pages/profile/profile.component.html b/src/app/pages/profile/profile.component.html
new file mode 100644
index 0000000..ecca39d
--- /dev/null
+++ b/src/app/pages/profile/profile.component.html
@@ -0,0 +1,13 @@
+
diff --git a/src/app/pages/profile/profile.component.scss b/src/app/pages/profile/profile.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/pages/profile/profile.component.ts b/src/app/pages/profile/profile.component.ts
new file mode 100644
index 0000000..b970ac6
--- /dev/null
+++ b/src/app/pages/profile/profile.component.ts
@@ -0,0 +1,155 @@
+import { Component, OnInit } from '@angular/core';
+import { BikesService } from '../../services/bikes.service';
+
+@Component({
+ selector: 'app-profile',
+ templateUrl: './profile.component.html',
+ styleUrls: ['./profile.component.scss'],
+})
+export class ProfileComponent implements OnInit {
+ columnInfo = [
+ {
+ dataPath: 'name',
+ translation: 'Name',
+ sticky: true,
+ link: (row: any) => {
+ return '/bike/' + row.id;
+ },
+ },
+ { dataPath: 'id', translation: 'ID', readonly: true },
+ { dataPath: 'group', translation: 'Gruppe' },
+ { dataPath: 'modelName', translation: 'Modell' },
+ {
+ dataPath: 'insuranceData.billing',
+ translation: 'Versicherung Abrechnung',
+ },
+ { dataPath: 'insuranceData.hasFixedRate', translation: 'Pauschale j/n' },
+ { dataPath: 'insuranceData.fixedRate', translation: 'Pauschale Betrag' },
+ { dataPath: 'insuranceData.name', translation: 'Versicherer' },
+ { dataPath: 'insuranceData.benefactor', translation: 'Kostenträger' },
+ { dataPath: 'insuranceData.noPnP', translation: 'Nr. P&P' },
+ {
+ dataPath: 'insuranceData.maintenanceResponsible',
+ translation: 'Wartung zuständig',
+ },
+ {
+ dataPath: 'insuranceData.maintenanceBenefactor',
+ translation: 'Wartung Kostenträger',
+ },
+ {
+ dataPath: 'insuranceData.maintenanceAgreement',
+ translation: 'Wartungsvereinbarung',
+ },
+ {
+ dataPath: 'insuranceData.projectAllowance',
+ translation: 'Projektzuschuss',
+ },
+ { dataPath: 'insuranceData.notes', translation: 'Sonstiges' },
+ { dataPath: 'dimensionsAndLoad.bikeLength', translation: 'Länge' },
+ { dataPath: 'dimensionsAndLoad.bikeWeight', translation: 'Gewicht' },
+ { dataPath: 'dimensionsAndLoad.bikeHeight', translation: 'Höhe' },
+ { dataPath: 'dimensionsAndLoad.bikeWidth', translation: 'Breite' },
+ { dataPath: 'dimensionsAndLoad.boxHeightRange', translation: 'Boxhöhe' },
+ { dataPath: 'dimensionsAndLoad.boxLengthRange', translation: 'Boxlänge' },
+ { dataPath: 'dimensionsAndLoad.boxWidthRange', translation: 'Boxbreite' },
+ {
+ dataPath: 'dimensionsAndLoad.hasCoverBox',
+ translation: 'Boxabdeckung j/n',
+ },
+ { dataPath: 'dimensionsAndLoad.lockable', translation: 'Box abschließbar' },
+ {
+ dataPath: 'dimensionsAndLoad.maxWeightBox',
+ translation: 'max Zuladung Box',
+ },
+ {
+ dataPath: 'dimensionsAndLoad.maxWeightLuggageRack',
+ translation: 'max Zuladung Gepäckträger',
+ },
+ {
+ dataPath: 'dimensionsAndLoad.maxWeightTotal',
+ translation: 'max Gesamtgewicht',
+ },
+ { dataPath: 'numberOfChildren', translation: 'Anzahl Kinder' },
+ { dataPath: 'numberOfWheels', translation: 'Anzahl Räder' },
+ { dataPath: 'forCargo', translation: 'für Lasten j/n' },
+ { dataPath: 'forChildren', translation: 'für Kinder j/n' },
+ { dataPath: 'security.frameNumber', translation: 'Rahmennummer' },
+ { dataPath: 'security.adfcCoding', translation: 'ADFC Codierung' },
+ {
+ dataPath: 'security.keyNumberAXAChain',
+ translation: 'Schlüsselnrummer Rahmenschloss',
+ },
+ {
+ dataPath: 'security.keyNumberFrameLock',
+ translation: 'Schlüsselnrummer AXA-Kette',
+ },
+ { dataPath: 'security.policeCoding', translation: 'Polizei Codierung' },
+ { dataPath: 'technicalEquipment.bicycleShift', translation: 'Schaltung' },
+ { dataPath: 'technicalEquipment.isEBike', translation: 'E-Bike j/n' },
+ {
+ dataPath: 'technicalEquipment.hasLightSystem',
+ translation: 'Lichtanlage j/n',
+ },
+ {
+ dataPath: 'technicalEquipment.specialFeatures',
+ translation: 'Besonderheiten',
+ },
+ { dataPath: 'stickerBikeNameState', translation: 'Aufkleber Status' },
+ { dataPath: 'note', translation: 'Aufkleber Kommentar' },
+ { dataPath: 'taxes.costCenter', translation: 'Steuern Kostenstelle' },
+ {
+ dataPath: 'taxes.organisationArea',
+ translation: 'Steuern Vereinsbereich',
+ },
+ { dataPath: 'provider.id', translation: '' },
+ { dataPath: 'provider.formName', translation: '' },
+ { dataPath: 'provider.privatePerson.id', translation: '' },
+ { dataPath: 'provider.privatePerson.person.id', translation: '' },
+ { dataPath: 'provider.privatePerson.person.name', translation: '' },
+ { dataPath: 'provider.privatePerson.person.firstName', translation: '' },
+ {
+ dataPath: 'provider.privatePerson.person.contactInformation.email',
+ translation: '',
+ },
+ { dataPath: 'lendingStation.id', translation: '' },
+ { dataPath: 'lendingStation.name', translation: '' },
+ { dataPath: 'lendingStation.address.number', translation: '' },
+ { dataPath: 'lendingStation.address.street', translation: '' },
+ { dataPath: 'lendingStation.address.zip', translation: '' },
+ ];
+
+ dataService: any;
+
+ tableDataGQLType: string = 'CargoBike';
+ tableDataGQLCreateInputType: string = 'CargoBikeCreateInput';
+ tableDataGQLUpdateInputType: string = 'CargoBikeUpdateInput';
+
+ headline = 'Lastenräder';
+
+ loadingRowIds: string[] = [];
+ constructor(private bikesService: BikesService) {}
+
+ ngOnInit() {
+ this.dataService = this.bikesService;
+ }
+
+ create(object: { currentId: string; row: any }) {
+ this.bikesService.createBike(object.currentId, { bike: object.row });
+ }
+
+ lock(row: any) {
+ this.bikesService.lockBike({ id: row.id });
+ }
+
+ save(row: any) {
+ this.bikesService.updateBike({ bike: row });
+ }
+
+ cancel(row: any) {
+ this.bikesService.unlockBike({ id: row.id });
+ }
+
+ delete(row: any) {
+ this.bikesService.deleteBike({ id: row.id });
+ }
+}
diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts
index 975b2e6..aab18d8 100644
--- a/src/app/services/auth.service.ts
+++ b/src/app/services/auth.service.ts
@@ -3,22 +3,22 @@ import { HttpClient } from '@angular/common/http';
import { catchError, finalize, map, tap } from 'rxjs/operators';
import { environment } from '../../environments/environment';
import { Observable, BehaviorSubject, of } from 'rxjs';
-import { User } from "../models/user";
+import { AuthUser } from "../models/user";
@Injectable({
providedIn: 'root',
})
export class AuthService {
- private currentUserSubject: BehaviorSubject;
- public currentUser: Observable;
+ private currentUserSubject: BehaviorSubject;
+ public currentUser: Observable;
public loggedIn: BehaviorSubject;
private readonly REQUEST_TOKEN = 'requestToken';
private readonly REFRESH_TOKEN = 'refreshToken';
private readonly CURRENT_USER = 'currentUser';
constructor(private http: HttpClient) {
- this.currentUserSubject = new BehaviorSubject(
+ this.currentUserSubject = new BehaviorSubject(
JSON.parse(localStorage.getItem(this.CURRENT_USER))
);
this.currentUser = this.currentUserSubject.asObservable();
@@ -29,10 +29,10 @@ export class AuthService {
}
- public get getCurrentUserValue(): User {
+ public get getCurrentUserValue(): AuthUser {
var value = this.currentUserSubject.value;
if (value === null){
- value = new User();
+ value = new AuthUser();
}
return value;
}
@@ -108,7 +108,7 @@ export class AuthService {
//localStorage.setItem(this.REFRESH_TOKEN, tokens.refresh_token);
}
- private storeUser(usr: User){
+ private storeUser(usr: AuthUser){
localStorage.setItem(this.CURRENT_USER, JSON.stringify(usr));
this.currentUserSubject.next(usr);
}
diff --git a/src/app/services/user.service.ts b/src/app/services/user.service.ts
new file mode 100644
index 0000000..adfe31a
--- /dev/null
+++ b/src/app/services/user.service.ts
@@ -0,0 +1,44 @@
+import { Injectable } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+import { catchError, finalize, map, tap } from 'rxjs/operators';
+import { environment } from '../../environments/environment';
+import { Observable, BehaviorSubject, of } from 'rxjs';
+import { User } from "../models/user";
+import { AuthService} from "./auth.service";
+import { ObserveOnSubscriber } from 'rxjs/internal/operators/observeOn';
+
+
+@Injectable({
+ providedIn: 'root',
+})
+export class UserService {
+
+ constructor(private http: HttpClient, private authService: AuthService) {
+
+
+
+
+ }
+
+
+ public getAllUsers(): Observable {
+ return this.http.get(`${environment.authUrl}/users`);
+ }
+
+ public getUser(email: string): Observable {
+ return this.http.get(`${environment.authUrl}/users/${email}`);
+ }
+
+ public getUserPermissions(email: string): Observable {
+ return this.http.get(`${environment.authUrl}/users/${email}/permissions`)
+ }
+
+ public updateUser(user: User): Observable {
+ return this.http.post(`${environment.authUrl}/users/${user.email}/update`, user);
+ }
+
+ public deleteUser(email: string): Observable {
+ return this.http.delete(`${environment.authUrl}/users/` + email + "/delete");
+ }
+
+}