Merge pull request #48 from danglotb/fix-compiation-errors-front

fix: update field birthdate of the user model in the front
Bootcamp2020 · Mar 28, 2020 · 2cead80 · 2cead80
2 parents 406e14f + 4bfa247
commit 2cead80
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 27 deletions.
diff --git a/skillful_network_client/src/app/home/dashboard/profile/profile.component.html b/skillful_network_client/src/app/home/dashboard/profile/profile.component.html
@@ -16,11 +16,11 @@
           <!--Idee ajouter le statuts etudiant ou demandeur d'emploi (ça permet a luniv et pole emploi d'evoir une statistique-->
           <li>Statut : {{ user.status }}</li>
 
-          <li> Qualification : {{ user.qualification }}</li>
+          <li> Qualification : {{ user.qualificationSet }}</li>
           <!-- <li> Statut : {{ user.status }}</li> -->
-          <li> Competences : {{ user.competences }}</li>
-          <!-- <li> Statut : {{ user.statut }}</li> -->
           <li> Competences : {{ user.skillSet }}</li>
+          <!-- <li> Statut : {{ user.statut }}</li> -->
+          <li> Abonnements : {{ user.subscriptionSet }}</li>
 
           <!--Idee ajouter les centre d'interet cela permet au recruteur de cybler les profil adequat-->
           <!-- <li> Centre d'interet : {{ user.subscriptionSet }}</li> -->

diff --git a/skillful_network_client/src/app/shared/models/user.ts b/skillful_network_client/src/app/shared/models/user.ts
@@ -10,7 +10,7 @@ export class User {
   private _lastName: string;
   private _password: string;
   private _email: string;
-  private _birthDate: string;
+  private _birthDate: Date;
   private _qualification: string;
   private _competences: string[];
   private _mobileNumber: string;
@@ -24,25 +24,24 @@ export class User {
 
   private _careerGoal: string;
   constructor(data: any) {
-    this.id = data.id;
-    this.firstName = data.firstName;
-
-    this.email = data.email;
-    this.status = data.status;
+    this._id = data.id;
+    this._firstName = data.firstName;
+    this._email = data.email;
+    this._status = data.status;
     this._qualification = data.qualification;
-    this.lastName = data.lastName;
-    this.password = data.password;
+    this._lastName = data.lastName;
+    this._password = data.password;
     this._birthDate = data.birthDate;
-    this.email = data.email;
+    this._email = data.email;
     this._mobileNumber = data.mobileNumber;
-    this.status = data.status;
-    this.validated = data.validated;
-    this.photo = data.photo;
-    this.skillSet = data.skillSet;
-    this.qualificationSet = data.qualificationSet;
-    this.subscriptionSet = data.subscriptionSet;
-    this.photoProfile = data.photoProfile;
-    this.careerGoal = data.careerGoal;
+    this._status = data.status;
+    this._validated = data.validated;
+    this._photo = data.photo;
+    this._skillSet = data.skillSet;
+    this._qualificationSet = data.qualificationSet;
+    this._subscriptionSet = data.subscriptionSet;
+    this._photoProfile = data.photoProfile;
+    this._careerGoal = data.careerGoal;
   }
   /* GETTERS & SETTERS */
   public get id(): number {
@@ -69,12 +68,12 @@ export class User {
   public set password(value: string) {
     this._password = value;
   }
- /* get birthDate(): Date {
+  get birthDate(): Date {
     return this._birthDate;
   }
   set birthDate(value: Date) {
     this._birthDate = value;
-  }*/
+  }
   public get email(): string {
     return this._email;
   }
@@ -87,8 +86,7 @@ export class User {
   public set status(value: string) {
     this._status = value;
   }
-
-    public get mobileNumber(): string {
+  public get mobileNumber(): string {
     return this._mobileNumber;
   }
   public set mobileNumber(value: string) {
@@ -113,7 +111,6 @@ export class User {
   public set skillSet(value: Skill[]) {
     this._skillSet = value;
   }
-
   public get qualificationSet(): Qualif[] {
     return this._qualificationSet;
   }

diff --git a/skillful_network_client/tsconfig.app.json b/skillful_network_client/tsconfig.app.json
@@ -6,8 +6,7 @@
   },
   "files": [
     "src/main.ts",
-    "src/polyfills.ts",
-    "node_modules/zone.js/lib/zone-spec/long-stack-trace.d.ts"
+    "src/polyfills.ts"
   ],
   "include": [
     "src/**/*.d.ts"