From ff0f6fc1f3f9e12389f2552e4d181f6a4eed022e Mon Sep 17 00:00:00 2001 From: MaxKey Date: Sun, 11 Dec 2022 15:42:26 +0800 Subject: [PATCH] user personal MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit education,graduateFrom --- .../main/java/org/maxkey/entity/UserInfo.java | 32 +- .../mapper/xml/mysql/UserInfoMapper.xml | 3 + .../maxkey-web-app/src/app/entity/Users.ts | 3 + .../config/profile/profile.component.html | 781 ++++++++---------- .../maxkey-web-app/src/assets/i18n/en-US.json | 3 + .../maxkey-web-app/src/assets/i18n/zh-CN.json | 5 +- .../maxkey-web-app/src/assets/i18n/zh-TW.json | 5 +- .../src/app/entity/Users.ts | 3 + .../user-editer/user-editer.component.html | 540 ++++++------ .../src/assets/i18n/en-US.json | 3 + .../src/assets/i18n/zh-CN.json | 5 +- .../src/assets/i18n/zh-TW.json | 5 +- 12 files changed, 659 insertions(+), 729 deletions(-) diff --git a/maxkey-core/src/main/java/org/maxkey/entity/UserInfo.java b/maxkey-core/src/main/java/org/maxkey/entity/UserInfo.java index 3e0d886d..e695117b 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/UserInfo.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/UserInfo.java @@ -114,6 +114,12 @@ public class UserInfo extends JpaBaseEntity { @Column protected String idCardNo; @Column + protected String education; + @Column + protected String graduateFrom; + @Column + protected String graduateDate; + @Column protected String webSite; @Column protected String startWorkDate; @@ -528,9 +534,31 @@ public class UserInfo extends JpaBaseEntity { this.nickName = nickName; } - + public String getEducation() { + return education; + } - public String getNameZhSpell() { + public void setEducation(String education) { + this.education = education; + } + + public String getGraduateFrom() { + return graduateFrom; + } + + public void setGraduateFrom(String graduateFrom) { + this.graduateFrom = graduateFrom; + } + + public String getGraduateDate() { + return graduateDate; + } + + public void setGraduateDate(String graduateDate) { + this.graduateDate = graduateDate; + } + + public String getNameZhSpell() { return nameZhSpell; } diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/UserInfoMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/UserInfoMapper.xml index a54fa745..65907b40 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/UserInfoMapper.xml +++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/UserInfoMapper.xml @@ -197,6 +197,9 @@ idtype = #{idType}, idcardno = #{idCardNo}, + education = #{education}, + graduatefrom = #{graduateFrom}, + graduatedate = #{graduateDate}, website = #{webSite}, locale = #{locale}, diff --git a/maxkey-web-frontend/maxkey-web-app/src/app/entity/Users.ts b/maxkey-web-frontend/maxkey-web-app/src/app/entity/Users.ts index 8f1db9fd..7ab9b110 100644 --- a/maxkey-web-frontend/maxkey-web-app/src/app/entity/Users.ts +++ b/maxkey-web-frontend/maxkey-web-app/src/app/entity/Users.ts @@ -51,6 +51,9 @@ export class Users extends BaseEntity { pictureBase64!: string; idType!: Number; idCardNo!: String; + education!: String; + graduateFrom!: String; + graduateDate!: String; webSite!: String; startWorkDate!: String; diff --git a/maxkey-web-frontend/maxkey-web-app/src/app/routes/config/profile/profile.component.html b/maxkey-web-frontend/maxkey-web-app/src/app/routes/config/profile/profile.component.html index d5e09357..e34d3410 100644 --- a/maxkey-web-frontend/maxkey-web-app/src/app/routes/config/profile/profile.component.html +++ b/maxkey-web-frontend/maxkey-web-app/src/app/routes/config/profile/profile.component.html @@ -10,46 +10,36 @@ {{ 'mxk.text.id' | i18n }} - - + +
- {{ 'mxk.users.displayName' | i18n }} - - + {{ 'mxk.users.displayName' | i18n }} + + +
- {{ 'mxk.users.username' | i18n }} - - + {{ 'mxk.users.username' | i18n }} + + +
{{ 'mxk.users.gender' | i18n }} - + @@ -58,28 +48,19 @@ - {{ 'mxk.users.picture' | i18n }} + {{ 'mxk.users.picture' | i18n }} +
- +
Upload
- + @@ -89,77 +70,55 @@
- {{ 'mxk.users.employeeNumber' | i18n }} - - + {{ 'mxk.users.employeeNumber' | i18n }} + + + - {{ 'mxk.users.windowsAccount' | i18n }} + {{ 'mxk.users.windowsAccount' | i18n }} + - +
{{ 'mxk.users.mobile' | i18n }} - - + + {{ 'mxk.users.email' | i18n }} - - + +
- {{ 'mxk.users.userType' | i18n }} - - + {{ 'mxk.users.userType' | i18n }} + + + - + + @@ -169,17 +128,15 @@ - {{ 'mxk.users.userstate' | i18n }} - - + {{ 'mxk.users.userstate' | i18n }} + + + - + + @@ -189,28 +146,21 @@
- {{ 'mxk.text.sortIndex' | i18n }} - - + {{ 'mxk.text.sortIndex' | i18n }} + + + - {{ 'mxk.text.status' | i18n }} - - + {{ 'mxk.text.status' | i18n }} + + + @@ -224,53 +174,37 @@
- {{ 'mxk.users.familyName' | i18n }} + {{ 'mxk.users.familyName' | i18n }} + - + - {{ 'mxk.users.middleName' | i18n }} + {{ 'mxk.users.middleName' | i18n }} + - +
- {{ 'mxk.users.givenName' | i18n }} + {{ 'mxk.users.givenName' | i18n }} + - + - {{ 'mxk.users.nickName' | i18n }} + {{ 'mxk.users.nickName' | i18n }} + - +
@@ -278,7 +212,8 @@ {{ 'mxk.users.idtype' | i18n }} - + @@ -288,15 +223,11 @@ - {{ 'mxk.users.idCardNo' | i18n }} + {{ 'mxk.users.idCardNo' | i18n }} + - +
@@ -304,7 +235,8 @@ {{ 'mxk.users.married' | i18n }} - + @@ -314,43 +246,66 @@ - {{ 'mxk.users.birthDate' | i18n }} + {{ 'mxk.users.birthDate' | i18n }} + - +
- {{ 'mxk.users.preferredLanguage' | i18n }} - - - + {{ 'mxk.users.education' | i18n + }} + + - {{ 'mxk.users.startWorkDate' | i18n }} + {{ 'mxk.users.graduateFrom' | i18n + }} + + + + +
+
+ + {{ 'mxk.users.graduateDate' | i18n + }} + + + + + + {{ 'mxk.users.startWorkDate' | i18n }} + - + + + +
+
+ + {{ 'mxk.users.timeZone' | i18n + }} + + + + + + {{ 'mxk.users.preferredLanguage' | + i18n }} + + +
@@ -358,19 +313,15 @@ {{ 'mxk.users.website' | i18n }} - + {{ 'mxk.users.ims' | i18n }} - +
@@ -378,169 +329,120 @@
- {{ 'mxk.users.organization' | i18n }} - - + {{ 'mxk.users.organization' | i18n }} + + + - {{ 'mxk.users.division' | i18n }} - - + {{ 'mxk.users.division' | i18n }} + + +
- {{ 'mxk.users.departmentId' | i18n }} - - + {{ 'mxk.users.departmentId' | i18n }} + + + - {{ 'mxk.users.department' | i18n }} - - + {{ 'mxk.users.department' | i18n }} + + +
- {{ 'mxk.users.costCenter' | i18n }} - - + {{ 'mxk.users.costCenter' | i18n }} + + + - {{ 'mxk.users.jobLevel' | i18n }} - - + {{ 'mxk.users.jobLevel' | i18n }} + + +
- {{ 'mxk.users.jobTitle' | i18n }} - - + {{ 'mxk.users.jobTitle' | i18n }} + + + {{ 'mxk.users.manager' | i18n }} - - + +
- {{ 'mxk.users.assistant' | i18n }} - - + {{ 'mxk.users.assistant' | i18n }} + + + - {{ 'mxk.users.workOfficeName' | i18n }} - - + {{ 'mxk.users.workOfficeName' | i18n }} + + +
- {{ 'mxk.users.entryDate' | i18n }} - - + {{ 'mxk.users.entryDate' | i18n }} + + + - {{ 'mxk.users.quitDate' | i18n }} - - + {{ 'mxk.users.quitDate' | i18n }} + + +
@@ -548,93 +450,80 @@
- {{ 'mxk.users.workPhoneNumber' | i18n }} - - + {{ 'mxk.users.workPhoneNumber' | i18n }} + + + - {{ 'mxk.users.workEmail' | i18n }} - - + {{ 'mxk.users.workEmail' | i18n }} + + +
- {{ 'mxk.users.workCountry' | i18n }} - - + {{ 'mxk.users.workCountry' | i18n }} + + + - {{ 'mxk.users.workRegion' | i18n }} - - + {{ 'mxk.users.workRegion' | i18n }} + + +
- {{ 'mxk.users.workLocality' | i18n }} - - + {{ 'mxk.users.workLocality' | i18n }} + + + - {{ 'mxk.users.workStreetAddress' | i18n }} - - + {{ 'mxk.users.workStreetAddress' | i18n }} + + +
- {{ 'mxk.users.workPostalCode' | i18n }} - - + {{ 'mxk.users.workPostalCode' | i18n }} + + + {{ 'mxk.users.workFax' | i18n }} - - + +
@@ -642,95 +531,81 @@
- {{ 'mxk.users.homeEmail' | i18n }} - - + {{ 'mxk.users.homeEmail' | i18n }} + + + - {{ 'mxk.users.homePhoneNumber' | i18n }} - - + {{ 'mxk.users.homePhoneNumber' | i18n }} + + +
{{ 'mxk.users.homeFax' | i18n }} - - + + - {{ 'mxk.users.homePostalCode' | i18n }} - - - - -
-
- - {{ 'mxk.users.homeCountry' | i18n }} - - - - - - {{ 'mxk.users.homeRegion' | i18n }} - - - - -
-
- - {{ 'mxk.users.homeLocality' | i18n }} - - - - - - {{ 'mxk.users.homeStreetAddress' | i18n }} + {{ 'mxk.users.homePostalCode' | i18n }} - - + + + + +
+
+ + {{ 'mxk.users.homeCountry' | i18n }} + + + + + + + {{ 'mxk.users.homeRegion' | i18n }} + + + + + +
+
+ + {{ 'mxk.users.homeLocality' | i18n }} + + + + + + + {{ 'mxk.users.homeStreetAddress' | + i18n }} + + +
@@ -749,4 +624,4 @@
- + \ No newline at end of file diff --git a/maxkey-web-frontend/maxkey-web-app/src/assets/i18n/en-US.json b/maxkey-web-frontend/maxkey-web-app/src/assets/i18n/en-US.json index fb82321b..00a13e1e 100644 --- a/maxkey-web-frontend/maxkey-web-app/src/assets/i18n/en-US.json +++ b/maxkey-web-frontend/maxkey-web-app/src/assets/i18n/en-US.json @@ -113,6 +113,9 @@ "idtype.studentcard": "studentcard", "idtype.militarycard": "militarycard", "idCardNo": "idCardNo", + "education": "education", + "graduateFrom": "graduateFrom", + "graduateDate": "graduateDate", "startWorkDate": "startWorkDate", "preferredLanguage": "preferredLanguage", "timeZone": "timeZone", diff --git a/maxkey-web-frontend/maxkey-web-app/src/assets/i18n/zh-CN.json b/maxkey-web-frontend/maxkey-web-app/src/assets/i18n/zh-CN.json index 764b575e..f2230320 100644 --- a/maxkey-web-frontend/maxkey-web-app/src/assets/i18n/zh-CN.json +++ b/maxkey-web-frontend/maxkey-web-app/src/assets/i18n/zh-CN.json @@ -117,7 +117,10 @@ "idtype.studentcard": "学生证", "idtype.militarycard": "军人证", "idCardNo": "证件号码", - "startWorkDate": "工作开始时间", + "education": "学历", + "graduateFrom": "毕业院校", + "graduateDate": "毕业时间", + "startWorkDate": "工作时间", "preferredLanguage": "语言偏好", "timeZone": "时区", "locale": "语言选择", diff --git a/maxkey-web-frontend/maxkey-web-app/src/assets/i18n/zh-TW.json b/maxkey-web-frontend/maxkey-web-app/src/assets/i18n/zh-TW.json index 38c55e93..f839e8b3 100644 --- a/maxkey-web-frontend/maxkey-web-app/src/assets/i18n/zh-TW.json +++ b/maxkey-web-frontend/maxkey-web-app/src/assets/i18n/zh-TW.json @@ -117,7 +117,10 @@ "idtype.studentcard": "學生證", "idtype.militarycard": "軍人證", "idCardNo": "證件號碼", - "startWorkDate": "工作開始時間", + "education": "學歷", + "graduateFrom": "畢業院校", + "graduateDate": "畢業時間", + "startWorkDate": "工作時間", "preferredLanguage": "語言偏好", "timeZone": "時區", "locale": "語言選擇", diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Users.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Users.ts index 66abaa29..d2cffff1 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Users.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Users.ts @@ -51,6 +51,9 @@ export class Users extends BaseEntity { pictureBase64!: string; idType!: Number; idCardNo!: String; + education!: String; + graduateFrom!: String; + graduateDate!: String; webSite!: String; startWorkDate!: String; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/users/user-editer/user-editer.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/users/user-editer/user-editer.component.html index 56014e32..8d4322ad 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/users/user-editer/user-editer.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/users/user-editer/user-editer.component.html @@ -7,53 +7,45 @@ {{ 'mxk.text.id' | i18n }} - - + +
- {{ 'mxk.users.displayName' | i18n }} - - + {{ 'mxk.users.displayName' | i18n }} + + +
- {{ 'mxk.users.username' | i18n }} - - + {{ 'mxk.users.username' | i18n }} + + +
- {{ 'mxk.users.password' | i18n }} - - + {{ 'mxk.users.password' | i18n }} + + +
{{ 'mxk.users.gender' | i18n }} - + @@ -64,21 +56,16 @@ {{ 'mxk.users.picture' | i18n }}
- +
Upload
- + @@ -88,50 +75,49 @@
- {{ 'mxk.users.employeeNumber' | i18n }} - - + {{ 'mxk.users.employeeNumber' | i18n }} + + + - {{ 'mxk.users.windowsAccount' | i18n }} + {{ 'mxk.users.windowsAccount' | i18n }} + - +
{{ 'mxk.users.mobile' | i18n }} - - + + {{ 'mxk.users.email' | i18n }} - +
- {{ 'mxk.users.userType' | i18n }} - - + {{ 'mxk.users.userType' | i18n }} + + + @@ -145,9 +131,12 @@ - {{ 'mxk.users.userstate' | i18n }} - - + {{ 'mxk.users.userstate' | i18n }} + + + @@ -159,21 +148,21 @@
- {{ 'mxk.text.sortIndex' | i18n }} - - + {{ 'mxk.text.sortIndex' | i18n }} + + + - {{ 'mxk.text.status' | i18n }} - - + {{ 'mxk.text.status' | i18n }} + + + @@ -189,25 +178,15 @@ {{ 'mxk.users.familyName' | i18n }} - + {{ 'mxk.users.middleName' | i18n }} - +
@@ -215,13 +194,15 @@ {{ 'mxk.users.givenName' | i18n }} - + {{ 'mxk.users.nickName' | i18n }} - +
@@ -229,7 +210,8 @@ {{ 'mxk.users.idtype' | i18n }} - + @@ -241,7 +223,8 @@ {{ 'mxk.users.idCardNo' | i18n }} - +
@@ -249,7 +232,8 @@ {{ 'mxk.users.married' | i18n }} - + @@ -261,33 +245,60 @@ {{ 'mxk.users.birthDate' | i18n }} - +
- {{ 'mxk.users.preferredLanguage' | i18n }} - - + {{ 'mxk.users.education' | i18n }} + + - {{ 'mxk.users.startWorkDate' | i18n }} + {{ 'mxk.users.graduateFrom' | i18n + }} + + + + +
+
+ + {{ 'mxk.users.graduateDate' | i18n + }} + + + + + + {{ 'mxk.users.startWorkDate' | i18n }} + - + + + +
+
+ + {{ 'mxk.users.timeZone' | i18n }} + + + + + + {{ 'mxk.users.preferredLanguage' | i18n }} + + +
@@ -295,13 +306,15 @@ {{ 'mxk.users.website' | i18n }} - + {{ 'mxk.users.ims' | i18n }} - + @@ -309,121 +322,116 @@
- {{ 'mxk.users.organization' | i18n }} - - + {{ 'mxk.users.organization' | i18n }} + + + {{ 'mxk.users.division' | i18n }} - - + +
- {{ 'mxk.users.departmentId' | i18n }} - - + {{ 'mxk.users.departmentId' | i18n + }} + + - {{ 'mxk.users.department' | i18n }} - + {{ 'mxk.users.department' | i18n }} + + - +
{{ 'mxk.users.costCenter' | i18n }} - - + + {{ 'mxk.users.jobLevel' | i18n }} - - + +
{{ 'mxk.users.jobTitle' | i18n }} - - + + {{ 'mxk.users.manager' | i18n }} - - + +
{{ 'mxk.users.assistant' | i18n }} - - + + - {{ 'mxk.users.workOfficeName' | i18n }} - - + {{ 'mxk.users.workOfficeName' | i18n }} + + +
{{ 'mxk.users.entryDate' | i18n }} - - + + {{ 'mxk.users.quitDate' | i18n }} - - + +
@@ -431,81 +439,77 @@
- {{ 'mxk.users.workPhoneNumber' | i18n }} - - + {{ 'mxk.users.workPhoneNumber' | i18n }} + + + {{ 'mxk.users.workEmail' | i18n }} - - + +
- {{ 'mxk.users.workCountry' | i18n }} - - + {{ 'mxk.users.workCountry' | i18n }} + + + {{ 'mxk.users.workRegion' | i18n }} - - + +
{{ 'mxk.users.workLocality' | i18n }} - - + + - {{ 'mxk.users.workStreetAddress' | i18n }} - - + {{ 'mxk.users.workStreetAddress' | i18n }} + + +
- {{ 'mxk.users.workPostalCode' | i18n }} - - + {{ 'mxk.users.workPostalCode' | i18n }} + + + {{ 'mxk.users.workFax' | i18n }} - - + +
@@ -514,80 +518,76 @@
{{ 'mxk.users.homeEmail' | i18n }} - - + + - {{ 'mxk.users.homePhoneNumber' | i18n }} - - + {{ 'mxk.users.homePhoneNumber' | i18n }} + + +
{{ 'mxk.users.homeFax' | i18n }} - - + + - {{ 'mxk.users.homePostalCode' | i18n }} - - + {{ 'mxk.users.homePostalCode' | i18n }} + + +
- {{ 'mxk.users.homeCountry' | i18n }} - - + {{ 'mxk.users.homeCountry' | i18n }} + + + {{ 'mxk.users.homeRegion' | i18n }} - - + +
{{ 'mxk.users.homeLocality' | i18n }} - - + + - {{ 'mxk.users.homeStreetAddress' | i18n }} - - + {{ 'mxk.users.homeStreetAddress' | i18n }} + + +
@@ -600,4 +600,4 @@
-
+ \ No newline at end of file diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/en-US.json b/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/en-US.json index 66fa934e..7ac06367 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/en-US.json +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/en-US.json @@ -121,6 +121,9 @@ "idtype.studentcard": "studentcard", "idtype.militarycard": "militarycard", "idCardNo": "idCardNo", + "education": "education", + "graduateFrom": "graduateFrom", + "graduateDate": "graduateDate", "startWorkDate": "startWorkDate", "preferredLanguage": "preferredLanguage", "timeZone": "timeZone", diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-CN.json b/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-CN.json index 57b819ad..1959bcfe 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-CN.json +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-CN.json @@ -121,7 +121,10 @@ "idtype.studentcard": "学生证", "idtype.militarycard": "军人证", "idCardNo": "证件号码", - "startWorkDate": "工作开始时间", + "education": "学历", + "graduateFrom": "毕业院校", + "graduateDate": "毕业时间", + "startWorkDate": "工作时间", "preferredLanguage": "语言偏好", "timeZone": "时区", "locale": "语言选择", diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-TW.json b/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-TW.json index c1375b8a..38802eae 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-TW.json +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-TW.json @@ -122,7 +122,10 @@ "idtype.studentcard": "學生證", "idtype.militarycard": "軍人證", "idCardNo": "證件號碼", - "startWorkDate": "工作開始時間", + "education": "學歷", + "graduateFrom": "畢業院校", + "graduateDate": "畢業時間", + "startWorkDate": "工作時間", "preferredLanguage": "語言偏好", "timeZone": "時區", "locale": "語言選擇",