Procházet zdrojové kódy

all errors fixed so project runs locally now

Lauren Green před 6 roky
rodič
revize
2af632b58b

+ 0
- 14
src/main/webapp/app/entities/user-profile/user-profile-update.component.html Zobrazit soubor

38
                     </select>
38
                     </select>
39
                 </div>
39
                 </div>
40
                 <div class="form-group">
40
                 <div class="form-group">
41
-                    <label class="form-control-label" jhiTranslate="zipConnectApp.userProfile.cohort" for="field_cohort">Cohort</label>
42
-                    <select class="form-control" id="field_cohort" name="cohort" [(ngModel)]="userProfile.cohort">
43
-                        <option [ngValue]="null"></option>
44
-                        <option [ngValue]="cohortOption.id === userProfile.cohort?.id ? userProfile.cohort : cohortOption" *ngFor="let cohortOption of cohorts; trackBy: trackCohortById">{{cohortOption.id}}</option>
45
-                    </select>
46
-                </div>
47
-                <div class="form-group">
48
-                    <label class="form-control-label" jhiTranslate="zipConnectApp.userProfile.employer" for="field_employer">Employer</label>
49
-                    <select class="form-control" id="field_employer" name="employer" [(ngModel)]="userProfile.employer">
50
-                        <option [ngValue]="null"></option>
51
-                        <option [ngValue]="employerOption.id === userProfile.employer?.id ? userProfile.employer : employerOption" *ngFor="let employerOption of employers; trackBy: trackEmployerById">{{employerOption.id}}</option>
52
-                    </select>
53
-                </div>
54
-                <div class="form-group">
55
                     <label class="form-control-label" jhiTranslate="zipConnectApp.userProfile.employer" for="field_employer">Employer</label>
41
                     <label class="form-control-label" jhiTranslate="zipConnectApp.userProfile.employer" for="field_employer">Employer</label>
56
                     <select class="form-control" id="field_employer" name="employer" [(ngModel)]="userProfile.employer" >
42
                     <select class="form-control" id="field_employer" name="employer" [(ngModel)]="userProfile.employer" >
57
                         <option [ngValue]="null"></option>
43
                         <option [ngValue]="null"></option>

+ 0
- 4
src/main/webapp/app/entities/user-profile/user-profile-update.component.ts Zobrazit soubor

26
 
26
 
27
     employers: IEmployer[];
27
     employers: IEmployer[];
28
 
28
 
29
-    employers: IEmployer[];
30
-
31
-    cohorts: ICohort[];
32
-
33
     constructor(
29
     constructor(
34
         private jhiAlertService: JhiAlertService,
30
         private jhiAlertService: JhiAlertService,
35
         private userProfileService: UserProfileService,
31
         private userProfileService: UserProfileService,

+ 1
- 1
src/main/webapp/app/shared/model/cohort.model.ts Zobrazit soubor

5
 }
5
 }
6
 
6
 
7
 export class Cohort implements ICohort {
7
 export class Cohort implements ICohort {
8
-    constructor(public id?: number, public cohortId?: number, public gradDate?: string) {}
8
+    constructor(public id?: number, public gradDate?: string) {}
9
 }
9
 }

+ 1
- 1
src/main/webapp/app/shared/model/employer.model.ts Zobrazit soubor

7
 }
7
 }
8
 
8
 
9
 export class Employer implements IEmployer {
9
 export class Employer implements IEmployer {
10
-    constructor(public id?: number, public employerId?: number, public companyName?: string, public city?: string, public state?: string) {}
10
+    constructor(public id?: number, public companyName?: string, public city?: string, public state?: string) {}
11
 }
11
 }

+ 1
- 5
src/main/webapp/app/shared/model/post.model.ts Zobrazit soubor

4
 
4
 
5
 export interface IPost {
5
 export interface IPost {
6
     id?: number;
6
     id?: number;
7
-    postId?: number;
8
     timestamp?: Moment;
7
     timestamp?: Moment;
9
     content?: string;
8
     content?: string;
10
     likes?: string;
9
     likes?: string;
11
     poster?: IUser;
10
     poster?: IUser;
12
     privacySetting?: IPrivacy;
11
     privacySetting?: IPrivacy;
13
-    poster?: IUser;
14
 }
12
 }
15
 
13
 
16
 export class Post implements IPost {
14
 export class Post implements IPost {
17
     constructor(
15
     constructor(
18
         public id?: number,
16
         public id?: number,
19
-        public postId?: number,
20
         public timestamp?: Moment,
17
         public timestamp?: Moment,
21
         public content?: string,
18
         public content?: string,
22
         public likes?: string,
19
         public likes?: string,
23
         public poster?: IUser,
20
         public poster?: IUser,
24
-        public privacySetting?: IPrivacy,
25
-        public poster?: IUser
21
+        public privacySetting?: IPrivacy
26
     ) {}
22
     ) {}
27
 }
23
 }

+ 1
- 7
src/main/webapp/app/shared/model/privacy.model.ts Zobrazit soubor

7
 }
7
 }
8
 
8
 
9
 export class Privacy implements IPrivacy {
9
 export class Privacy implements IPrivacy {
10
-    constructor(
11
-        public id?: number,
12
-        public privacyId?: number,
13
-        public publicView?: boolean,
14
-        public cohortView?: boolean,
15
-        public employerView?: boolean
16
-    ) {
10
+    constructor(public id?: number, public publicView?: boolean, public cohortView?: boolean, public employerView?: boolean) {
17
         this.publicView = this.publicView || false;
11
         this.publicView = this.publicView || false;
18
         this.cohortView = this.cohortView || false;
12
         this.cohortView = this.cohortView || false;
19
         this.employerView = this.employerView || false;
13
         this.employerView = this.employerView || false;

+ 1
- 7
src/main/webapp/app/shared/model/user-profile.model.ts Zobrazit soubor

4
 
4
 
5
 export interface IUserProfile {
5
 export interface IUserProfile {
6
     id?: number;
6
     id?: number;
7
-    profileId?: number;
8
     firstName?: string;
7
     firstName?: string;
9
     lastName?: string;
8
     lastName?: string;
10
     userStack?: string;
9
     userStack?: string;
11
     user?: IUser;
10
     user?: IUser;
12
     cohort?: ICohort;
11
     cohort?: ICohort;
13
     employer?: IEmployer;
12
     employer?: IEmployer;
14
-    employer?: IEmployer;
15
-    cohort?: ICohort;
16
 }
13
 }
17
 
14
 
18
 export class UserProfile implements IUserProfile {
15
 export class UserProfile implements IUserProfile {
19
     constructor(
16
     constructor(
20
         public id?: number,
17
         public id?: number,
21
-        public profileId?: number,
22
         public firstName?: string,
18
         public firstName?: string,
23
         public lastName?: string,
19
         public lastName?: string,
24
         public userStack?: string,
20
         public userStack?: string,
25
         public user?: IUser,
21
         public user?: IUser,
26
         public cohort?: ICohort,
22
         public cohort?: ICohort,
27
-        public employer?: IEmployer,
28
-        public employer?: IEmployer,
29
-        public cohort?: ICohort
23
+        public employer?: IEmployer
30
     ) {}
24
     ) {}
31
 }
25
 }

+ 0
- 20
src/test/javascript/e2e/entities/post/post.page-object.ts Zobrazit soubor

32
     likesInput = element(by.id('field_likes'));
32
     likesInput = element(by.id('field_likes'));
33
     posterSelect = element(by.id('field_poster'));
33
     posterSelect = element(by.id('field_poster'));
34
     privacySettingSelect = element(by.id('field_privacySetting'));
34
     privacySettingSelect = element(by.id('field_privacySetting'));
35
-    posterSelect = element(by.id('field_poster'));
36
 
35
 
37
     async getPageTitle() {
36
     async getPageTitle() {
38
         return this.pageTitle.getAttribute('jhiTranslate');
37
         return this.pageTitle.getAttribute('jhiTranslate');
77
             .click();
76
             .click();
78
     }
77
     }
79
 
78
 
80
-    async posterSelectOption(option) {
81
-        await this.posterSelect.sendKeys(option);
82
-    }
83
-
84
-    getPosterSelect(): ElementFinder {
85
-        return this.posterSelect;
86
-    }
87
-
88
-    async getPosterSelectedOption() {
89
-        return this.posterSelect.element(by.css('option:checked')).getText();
90
-    }
91
-
92
     async privacySettingSelectLastOption() {
79
     async privacySettingSelectLastOption() {
93
         await this.privacySettingSelect
80
         await this.privacySettingSelect
94
             .all(by.tagName('option'))
81
             .all(by.tagName('option'))
108
         return this.privacySettingSelect.element(by.css('option:checked')).getText();
95
         return this.privacySettingSelect.element(by.css('option:checked')).getText();
109
     }
96
     }
110
 
97
 
111
-    async posterSelectLastOption() {
112
-        await this.posterSelect
113
-            .all(by.tagName('option'))
114
-            .last()
115
-            .click();
116
-    }
117
-
118
     async posterSelectOption(option) {
98
     async posterSelectOption(option) {
119
         await this.posterSelect.sendKeys(option);
99
         await this.posterSelect.sendKeys(option);
120
     }
100
     }

+ 0
- 40
src/test/javascript/e2e/entities/user-profile/user-profile.page-object.ts Zobrazit soubor

33
     userSelect = element(by.id('field_user'));
33
     userSelect = element(by.id('field_user'));
34
     cohortSelect = element(by.id('field_cohort'));
34
     cohortSelect = element(by.id('field_cohort'));
35
     employerSelect = element(by.id('field_employer'));
35
     employerSelect = element(by.id('field_employer'));
36
-    employerSelect = element(by.id('field_employer'));
37
-    cohortSelect = element(by.id('field_cohort'));
38
 
36
 
39
     async getPageTitle() {
37
     async getPageTitle() {
40
         return this.pageTitle.getAttribute('jhiTranslate');
38
         return this.pageTitle.getAttribute('jhiTranslate');
91
         return this.userSelect.element(by.css('option:checked')).getText();
89
         return this.userSelect.element(by.css('option:checked')).getText();
92
     }
90
     }
93
 
91
 
94
-    async cohortSelectLastOption() {
95
-        await this.cohortSelect
96
-            .all(by.tagName('option'))
97
-            .last()
98
-            .click();
99
-    }
100
-
101
-    async cohortSelectOption(option) {
102
-        await this.cohortSelect.sendKeys(option);
103
-    }
104
-
105
-    getCohortSelect(): ElementFinder {
106
-        return this.cohortSelect;
107
-    }
108
-
109
-    async getCohortSelectedOption() {
110
-        return this.cohortSelect.element(by.css('option:checked')).getText();
111
-    }
112
-
113
-    async employerSelectLastOption() {
114
-        await this.employerSelect
115
-            .all(by.tagName('option'))
116
-            .last()
117
-            .click();
118
-    }
119
-
120
-    async employerSelectOption(option) {
121
-        await this.employerSelect.sendKeys(option);
122
-    }
123
-
124
-    getEmployerSelect(): ElementFinder {
125
-        return this.employerSelect;
126
-    }
127
-
128
-    async getEmployerSelectedOption() {
129
-        return this.employerSelect.element(by.css('option:checked')).getText();
130
-    }
131
-
132
     async employerSelectLastOption() {
92
     async employerSelectLastOption() {
133
         await this.employerSelect
93
         await this.employerSelect
134
             .all(by.tagName('option'))
94
             .all(by.tagName('option'))

+ 1
- 1
src/test/javascript/spec/app/entities/cohort/cohort.service.spec.ts Zobrazit soubor

21
             service = injector.get(CohortService);
21
             service = injector.get(CohortService);
22
             httpMock = injector.get(HttpTestingController);
22
             httpMock = injector.get(HttpTestingController);
23
 
23
 
24
-            elemDefault = new Cohort(0, 0, 'AAAAAAA');
24
+            elemDefault = new Cohort(0, 'January 2019');
25
         });
25
         });
26
 
26
 
27
         describe('Service methods', async () => {
27
         describe('Service methods', async () => {

+ 1
- 1
src/test/javascript/spec/app/entities/employer/employer.service.spec.ts Zobrazit soubor

21
             service = injector.get(EmployerService);
21
             service = injector.get(EmployerService);
22
             httpMock = injector.get(HttpTestingController);
22
             httpMock = injector.get(HttpTestingController);
23
 
23
 
24
-            elemDefault = new Employer(0, 0, 'AAAAAAA', 'AAAAAAA', 'AAAAAAA');
24
+            elemDefault = new Employer(0, 'AAAAAAA', 'AAAAAAA', 'AAAAAAA');
25
         });
25
         });
26
 
26
 
27
         describe('Service methods', async () => {
27
         describe('Service methods', async () => {

+ 1
- 1
src/test/javascript/spec/app/entities/post/post.service.spec.ts Zobrazit soubor

25
             httpMock = injector.get(HttpTestingController);
25
             httpMock = injector.get(HttpTestingController);
26
             currentDate = moment();
26
             currentDate = moment();
27
 
27
 
28
-            elemDefault = new Post(0, 0, currentDate, 'AAAAAAA', 'AAAAAAA');
28
+            elemDefault = new Post(0, currentDate, 'AAAAAAA', 'AAAAAAA');
29
         });
29
         });
30
 
30
 
31
         describe('Service methods', async () => {
31
         describe('Service methods', async () => {

+ 1
- 1
src/test/javascript/spec/app/entities/privacy/privacy.service.spec.ts Zobrazit soubor

21
             service = injector.get(PrivacyService);
21
             service = injector.get(PrivacyService);
22
             httpMock = injector.get(HttpTestingController);
22
             httpMock = injector.get(HttpTestingController);
23
 
23
 
24
-            elemDefault = new Privacy(0, 0, false, false, false);
24
+            elemDefault = new Privacy(0, false, false, false);
25
         });
25
         });
26
 
26
 
27
         describe('Service methods', async () => {
27
         describe('Service methods', async () => {

+ 1
- 1
src/test/javascript/spec/app/entities/user-profile/user-profile.service.spec.ts Zobrazit soubor

21
             service = injector.get(UserProfileService);
21
             service = injector.get(UserProfileService);
22
             httpMock = injector.get(HttpTestingController);
22
             httpMock = injector.get(HttpTestingController);
23
 
23
 
24
-            elemDefault = new UserProfile(0, 0, 'AAAAAAA', 'AAAAAAA', 'AAAAAAA');
24
+            elemDefault = new UserProfile(0, 'AAAAAAA', 'AAAAAAA', 'AAAAAAA');
25
         });
25
         });
26
 
26
 
27
         describe('Service methods', async () => {
27
         describe('Service methods', async () => {