[ENHANCEMENT]

- Removes getPropertiesByForm
- Improves InputReturn
- Add company form to register

Author: joaossmacedo

angular/src/app/core/models/form-models/base/base-form.model.ts

@@ -199,41 +199,4 @@ export abstract class BaseFormModel {
 
         return ret;
     }
-
-    // returns which properties belong to each object
-    // Ex:
-    // {
-    //      'stundent': ['name', 'phone', 'city'],
-    //      'curriculum_vitaes': ['summary', 'whatelse', 'link_linkedin'],
-    //      'cv_degrees': ['course', 'school', 'course_type'],
-    //      'cv_awards': ['title', 'desc']
-    // }
-    getPropertiesByForm(): { [form: string]: Array<string> } {
-        function auxGetPropertiesByForm(target: BaseFormModel, name: string) {
-            const keys = (Object.keys(target));
-
-            let ret = {};
-            ret[name] = [];
-
-            for (const key of keys) {
-                const field = target[key];
-
-                if (!BaseFormModel.isFieldValid(field)) {
-                    throw new Error(INVALID_FORM_MODEL);
-                }
-
-                if (field instanceof BaseFormModel) {
-                    const returnedValue = auxGetPropertiesByForm(field, key);
-                    // merge the objects
-                    ret = {...ret, ...returnedValue};
-                } else if (field instanceof InputFieldModel ||
-                           field instanceof Array) {
-                    ret[name].push(key);
-                }
-            }
-
-            return ret;
-        }
-        return auxGetPropertiesByForm(this, 'this');
-    }
 }

angular/src/app/home/models/company-form.model.ts

@@ -0,0 +1,14 @@
+import { BaseFormModel } from '../../core/models/form-models/base/base-form.model';
+import { InputFieldModel } from '../../core/models/form-models/base/input-field.model';
+
+export class CompanyFormModel extends BaseFormModel {
+    name: InputFieldModel;
+    area: InputFieldModel;
+
+    constructor(name: string = '',
+                area: string = '') {
+        super();
+        this.name = new InputFieldModel(name);
+        this.area = new InputFieldModel(area);
+    }
+}

angular/src/app/home/models/register-form.model.ts

@@ -1,3 +1,4 @@
+import { CompanyFormModel } from './company-form.model';
 import { LanguageFormModel } from './language-form.model';
 import { BaseFormModel } from '../../core/models/form-models/base/base-form.model';
 import { InputFieldModel } from '../../core/models/form-models/base/input-field.model';
@@ -10,18 +11,30 @@ export class RegisterFormModel extends BaseFormModel {
     city: InputFieldModel;
     skills: Array<InputFieldModel>;
     languages: Array<LanguageFormModel>;
-
+    company: CompanyFormModel;
 
     constructor(email: string = '',
                 phone: string = '',
-                city: string = '') {
+                city: string = '',
+                skills: Array<string> = [],
+                languages: Array<{name: string, speaking: string, writing: string,
+                                  reading: string, listening: string }> = [],
+                company: {name: string, area: string} = {name: '', area: ''}) {
         super();
         this.email = new InputFieldModel(email);
         this.phone = new InputFieldModel(phone);
         this.city = new InputFieldModel(city);
         this.password = new InputFieldModel('');
         this.passwordConfirmation = new InputFieldModel('');
         this.skills = [];
+        for (const skill of skills) {
+            this.skills.push(new InputFieldModel(skill));
+        }
         this.languages = [];
+        for (const language of languages) {
+            this.languages.push(new LanguageFormModel(language.name, language.speaking, language.writing,
+                                                      language.reading, language.listening));
+        }
+        this.company = new CompanyFormModel(company.name, company.area);
     }
 }

angular/src/app/home/pages/register/register.component.html

@@ -21,11 +21,17 @@ <h2>Personal Info</h2>
                (emitter)="inputReturn($event, 'passwordConfirmation')"
                [confirmValue]="form ? form.password.value : ''">
     </app-input>
-
+    <h2>Company Info</h2>
+    <app-input type='company-name' label='Company Name' placeholder='Ex: Apple'
+               (emitter)="inputReturn($event, 'company', ['name'])">
+    </app-input>
+    <app-input type='company-area' label='Company Area' placeholder='Ex: Software Engineering'
+               (emitter)="inputReturn($event, 'company', ['area'])">
+    </app-input>
     <h2>Skills</h2>
     <div class="skill-input-container" *ngFor='let skill of form?.skills; let i = index;'>
         <app-input type='skill' label='Skill' placeholder='Ex: Angular'
-                   (emitter)="inputReturn($event, 'skills', i)">
+                   (emitter)="inputReturn($event, 'skills', [i])">
         </app-input>
         <div class="remove-button" (click)="removeSkill(i)">
             Remove
@@ -37,30 +43,30 @@ <h2>Languages</h2>
     <div class="languages-input-container" *ngFor='let languages of form?.languages; let i = index;'>
         <div class="language-input-container">
             <app-input type='language' label='Language' placeholder='Ex: English'
-                       (emitter)="inputReturn($event, 'languages', i, 'name')">
+                       (emitter)="inputReturn($event, 'languages', [i, 'name'])">
             </app-input>
             <div class="remove-button" (click)="removeLanguages(i)">
                 Remove
             </div>
         </div>
         <div class="language-input-container">
             <app-input type='language-level' label='Speaking Level(from: 1 to 5)' placeholder='Ex: 3'
-                       (emitter)="inputReturn($event, 'languages', i, 'speaking')">
+                       (emitter)="inputReturn($event, 'languages', [i, 'speaking'])">
             </app-input>
         </div>
         <div class="language-input-container">
             <app-input type='language-level' label='Writing Level(from: 1 to 5)' placeholder='Ex: 3'
-                       (emitter)="inputReturn($event, 'languages', i, 'writing')">
+                       (emitter)="inputReturn($event, 'languages', [i, 'writing'])">
             </app-input>
         </div>
         <div class="language-input-container">
             <app-input type='language-level' label='Reading Level(from: 1 to 5)' placeholder='Ex: 3'
-                       (emitter)="inputReturn($event, 'languages', i, 'reading')">
+                       (emitter)="inputReturn($event, 'languages', [i, 'reading'])">
             </app-input>
         </div>
         <div class="language-input-container">
             <app-input type='language-level' label='Listening Level(from: 1 to 5)' placeholder='Ex: 3'
-                       (emitter)="inputReturn($event, 'languages', i, 'listening')">
+                       (emitter)="inputReturn($event, 'languages', [i, 'listening'])">
             </app-input>
         </div>
     </div>

angular/src/app/home/pages/register/register.component.ts

@@ -20,13 +20,16 @@ export class RegisterComponent implements OnInit, AfterContentInit {
     this.form = new RegisterFormModel();
   }
 
-  inputReturn(obj: InputFieldModel, type: string, i = 0, field = '') {
-    if (type === 'languages') {
-      this.form.languages[i][field].value = obj.value;
-      this.form.languages[i][field].errors = obj.errors;
+  inputReturn(obj: InputFieldModel, type: string, path: Array<number | string> = []) {
+    if (type === 'company') {
+      this.form.company[path[0]].value = obj.value;
+      this.form.company[path[0]].errors = obj.errors;
+    } else if (type === 'languages') {
+      this.form.languages[path[0]][path[1]].value = obj.value;
+      this.form.languages[path[0]][path[1]].errors = obj.errors;
     } else if (type === 'skills') {
-      this.form.skills[i].value = obj.value;
-      this.form.skills[i].errors = obj.errors;
+      this.form.skills[path[0]].value = obj.value;
+      this.form.skills[path[0]].errors = obj.errors;
     } else {
       this.form[type] = obj;
     }
@@ -35,7 +38,6 @@ export class RegisterComponent implements OnInit, AfterContentInit {
 
   submit() {
     console.log(this.form.prepare2send());
-    console.log(this.form.getPropertiesByForm());
   }
 
   addNewSkill() {