Bläddra i källkod

updated to fix errors being thrown when run locally

Lauren Green 6 år sedan
förälder
incheckning
321098980d

Binär
.DS_Store Visa fil


+ 0
- 14
webapp/app/entities/user-profile/user-profile-update.component.html Visa fil

@@ -38,20 +38,6 @@
38 38
                     </select>
39 39
                 </div>
40 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 41
                     <label class="form-control-label" jhiTranslate="zipConnectApp.userProfile.employer" for="field_employer">Employer</label>
56 42
                     <select class="form-control" id="field_employer" name="employer" [(ngModel)]="userProfile.employer" >
57 43
                         <option [ngValue]="null"></option>

+ 0
- 4
webapp/app/entities/user-profile/user-profile-update.component.ts Visa fil

@@ -26,10 +26,6 @@ export class UserProfileUpdateComponent implements OnInit {
26 26
 
27 27
     employers: IEmployer[];
28 28
 
29
-    employers: IEmployer[];
30
-
31
-    cohorts: ICohort[];
32
-
33 29
     constructor(
34 30
         private jhiAlertService: JhiAlertService,
35 31
         private userProfileService: UserProfileService,

+ 1
- 1
webapp/app/shared/model/cohort.model.ts Visa fil

@@ -5,5 +5,5 @@ export interface ICohort {
5 5
 }
6 6
 
7 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
webapp/app/shared/model/employer.model.ts Visa fil

@@ -7,5 +7,5 @@ export interface IEmployer {
7 7
 }
8 8
 
9 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
webapp/app/shared/model/post.model.ts Visa fil

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

+ 1
- 7
webapp/app/shared/model/privacy.model.ts Visa fil

@@ -7,13 +7,7 @@ export interface IPrivacy {
7 7
 }
8 8
 
9 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 11
         this.publicView = this.publicView || false;
18 12
         this.cohortView = this.cohortView || false;
19 13
         this.employerView = this.employerView || false;

+ 1
- 7
webapp/app/shared/model/user-profile.model.ts Visa fil

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

+ 2
- 4
webapp/i18n/en/global.json Visa fil

@@ -1,8 +1,7 @@
1 1
 {
2 2
     "global": {
3 3
         "title": "ZipConnect",
4
-        "browsehappy":
5
-            "You are using an <strong>outdated</strong> browser. Please <a href=\"http://browsehappy.com/?locale=en\">upgrade your browser</a> to improve your experience.",
4
+        "browsehappy": "You are using an <strong>outdated</strong> browser. Please <a href=\"http://browsehappy.com/?locale=en\">upgrade your browser</a> to improve your experience.",
6 5
         "menu": {
7 6
             "home": "Home",
8 7
             "jhipster-needle-menu-add-element": "JHipster will add additional menu entries here (do not translate!)",
@@ -56,8 +55,7 @@
56 55
                 "authenticated": {
57 56
                     "prefix": "If you want to ",
58 57
                     "link": "sign in",
59
-                    "suffix":
60
-                        ", you can try the default accounts:<br/>- Administrator (login=\"admin\" and password=\"admin\") <br/>- User (login=\"user\" and password=\"user\")."
58
+                    "suffix": ", you can try the default accounts:<br/>- Administrator (login=\"admin\" and password=\"admin\") <br/>- User (login=\"user\" and password=\"user\")."
61 59
                 },
62 60
                 "register": {
63 61
                     "noaccount": "You don't have an account yet?",

+ 2
- 4
webapp/i18n/es/global.json Visa fil

@@ -1,8 +1,7 @@
1 1
 {
2 2
     "global": {
3 3
         "title": "ZipConnect",
4
-        "browsehappy":
5
-            "Está usando un navegador <strong>no actualizado</strong>. Por favor, <a href=\"http://browsehappy.com/?locale=en\">actualice su navegador</a> para mejorar su experiencia.",
4
+        "browsehappy": "Está usando un navegador <strong>no actualizado</strong>. Por favor, <a href=\"http://browsehappy.com/?locale=en\">actualice su navegador</a> para mejorar su experiencia.",
6 5
         "menu": {
7 6
             "home": "Inicio",
8 7
             "jhipster-needle-menu-add-element": "JHipster will add additional menu entries here (do not translate!)",
@@ -56,8 +55,7 @@
56 55
                 "authenticated": {
57 56
                     "prefix": "Si desea ",
58 57
                     "link": "iniciar una sesión",
59
-                    "suffix":
60
-                        ", puede intentar con las cuentas predeterminadas:<br/>- Administrator (usuario=\"admin\" y contraseña=\"admin\") <br/>- Usuario (usuario=\"user\" y contraseña=\"user\")."
58
+                    "suffix": ", puede intentar con las cuentas predeterminadas:<br/>- Administrator (usuario=\"admin\" y contraseña=\"admin\") <br/>- Usuario (usuario=\"user\" y contraseña=\"user\")."
61 59
                 },
62 60
                 "register": {
63 61
                     "noaccount": "¿No tienes una cuenta todavía?",