diff --git a/src/app/services/myinfo/__tests__/myinfo.test.constants.ts b/src/app/services/myinfo/__tests__/myinfo.test.constants.ts index 15a7491b0d..3585e09904 100644 --- a/src/app/services/myinfo/__tests__/myinfo.test.constants.ts +++ b/src/app/services/myinfo/__tests__/myinfo.test.constants.ts @@ -18,7 +18,7 @@ export const MOCK_MYINFO_DATA = { classification: 'C', nbr: '97324992', }, - mailadd: { + regadd: { country: 'US', unit: '', street: '5TH AVENUE', @@ -39,14 +39,6 @@ export const MOCK_MYINFO_DATA = { } export const MOCK_MYINFO_FORMAT_DATA = { - homeno: { - code: '65', - prefix: '+', - lastupdated: '2017-11-20', - source: '2', - classification: 'C', - nbr: '66132665', - }, mobileno: { code: '65', prefix: '+', @@ -67,30 +59,6 @@ export const MOCK_MYINFO_FORMAT_DATA = { floor: '09', building: '', }, - mailadd: { - country: 'US', - unit: '', - street: '5TH AVENUE', - lastupdated: '2016-03-11', - block: '725', - source: '2', - postal: 'NY 10022', - classification: 'C', - floor: '', - building: 'TRUMP TOWER', - }, - billadd: { - country: 'SG', - street: 'SERANGOON AVE 3', - lastupdated: '2016-03-11', - block: '329', - source: '1', - postal: '550329', - classification: 'C', - floor: '09', - unit: '360', - building: '', - }, workpassexpirydate: { lastupdated: '2018-03-02', source: '1', @@ -116,13 +84,7 @@ export const MOCK_FORM_FIELDS = [ { fieldType: 'textfield', isVisible: true, - myInfo: { attr: 'homeno' }, - _id: new ObjectId().toHexString(), - }, - { - fieldType: 'textfield', - isVisible: true, - myInfo: { attr: 'mailadd' }, + myInfo: { attr: 'regadd' }, _id: new ObjectId().toHexString(), }, // Some non-MyInfo fields @@ -133,7 +95,7 @@ export const MOCK_FORM_FIELDS = [ export const MOCK_HASHES = { name: 'name', mobileno: 'mobileno', - mailadd: 'mailadd', + regadd: 'regadd', } // Based on MOCK_FORM_FIELDS and MOCK_HASHES, only expect these attributes to @@ -141,14 +103,13 @@ export const MOCK_HASHES = { // and homeno does not match because it does not have a hash. export const MOCK_HASHED_FIELD_IDS = new Set( MOCK_FORM_FIELDS.filter( - (field) => field.myInfo && ['name', 'mailadd'].includes(field.myInfo?.attr), + (field) => field.myInfo && ['name', 'regadd'].includes(field.myInfo?.attr), ).map((field) => field._id), ) const populatedValues = [ { fieldValue: 'TAN XIAO HUI', disabled: true }, { fieldValue: '+65 97324992', disabled: false }, - { fieldValue: '', disabled: false }, { fieldValue: 'TRUMP TOWER, 725 5TH AVENUE, UNITED STATES NY 10022', disabled: false, diff --git a/src/app/services/myinfo/__tests__/myinfo.util.spec.ts b/src/app/services/myinfo/__tests__/myinfo.util.spec.ts index 72e9f95fb0..c967539411 100644 --- a/src/app/services/myinfo/__tests__/myinfo.util.spec.ts +++ b/src/app/services/myinfo/__tests__/myinfo.util.spec.ts @@ -46,23 +46,6 @@ describe('myinfo.util', () => { }) describe('Phone numbers', () => { - it('should correctly return formatted home phone numbers if valid', () => { - // Arrange - // code: '65', - // prefix: '+', - // nbr: '66132665', - const expected = '+65 66132665' - - // Act - const actual = getMyInfoValue( - 'homeno' as MyInfoAttribute.HomeNo, - (MOCK_MYINFO_FORMAT_DATA as unknown) as IPersonBasic, - ) - - // Assert - expect(actual).toEqual(expected) - }) - it('should correctly return formatted mobile phone numbers if valid', () => { // Arrange // code: '65', @@ -102,60 +85,16 @@ describe('myinfo.util', () => { expect(actual).toEqual(expected) }) - it('should correctly return formatted mailing addresses', () => { - // Arrange - // country: 'US', - // unit: '', - // street: '5TH AVENUE', - // lastupdated: '2016-03-11', - // block: '725', - // source: '2', - // postal: 'NY 10022', - // classification: 'C', - // floor: '', - // building: 'TRUMP TOWER', - const expected = 'TRUMP TOWER, 725 5TH AVENUE, UNITED STATES NY 10022' - - // Act - const actual = getMyInfoValue( - 'mailadd' as MyInfoAttribute.MailingAddress, - (MOCK_MYINFO_FORMAT_DATA as unknown) as IPersonBasic, - ) - - // Assert - expect(actual).toEqual(expected) - }) - - it('should correctly return formatted billing addresses', () => { - // Arrange - // country: 'SG', - // street: 'SERANGOON AVE 3', - // block: '329', - // postal: '550329', - // floor: '09', - // unit: '360', - const expected = '329 SERANGOON AVE 3, #09-360, SINGAPORE 550329' - - // Act - const actual = getMyInfoValue( - 'billadd' as MyInfoAttribute.BillingAddress, - (MOCK_MYINFO_FORMAT_DATA as unknown) as IPersonBasic, - ) - - // Assert - expect(actual).toEqual(expected) - }) - it('should return empty string if address missing one of [block, street, country, postal] keys', () => { // Arrange - const mockBillAdd = cloneDeep(MOCK_MYINFO_FORMAT_DATA.billadd) - mockBillAdd.block = '' + const mockAddress = cloneDeep(MOCK_MYINFO_FORMAT_DATA.regadd) + mockAddress.block = '' // Act const actual = getMyInfoValue( - 'billadd' as MyInfoAttribute.BillingAddress, + 'regadd' as MyInfoAttribute.RegisteredAddress, ({ - billAdd: mockBillAdd, + regAdd: mockAddress, } as unknown) as IPersonBasic, ) diff --git a/src/app/services/myinfo/myinfo.util.ts b/src/app/services/myinfo/myinfo.util.ts index 10ee64f30e..78c473fd41 100644 --- a/src/app/services/myinfo/myinfo.util.ts +++ b/src/app/services/myinfo/myinfo.util.ts @@ -52,11 +52,8 @@ export const getMyInfoValue = ( switch (myInfoAttr) { // Phone numbers case MyInfoAttribute.MobileNo: - case MyInfoAttribute.HomeNo: return formatPhoneNumber(myInfoData[myInfoAttr]) case MyInfoAttribute.RegisteredAddress: - case MyInfoAttribute.BillingAddress: - case MyInfoAttribute.MailingAddress: return formatAddress(myInfoData[myInfoAttr]) default: // Categorical data lookup diff --git a/src/config/ndi-config.ts b/src/config/ndi-config.ts index bea519aad2..823d443e46 100644 --- a/src/config/ndi-config.ts +++ b/src/config/ndi-config.ts @@ -12,11 +12,9 @@ export const FIELD_MAPPING = { 'housingtype', 'hdbtype', 'marital', - 'edulevel', 'countryofmarriage', 'workpassstatus', 'householdincome', - 'schoolname', 'occupation', ], textfield: [ @@ -27,14 +25,11 @@ export const FIELD_MAPPING = { 'hanyupinyinaliasname', 'passportnumber', 'regadd', - 'mailadd', - 'billadd', 'employment', 'vehno', 'marriagecertno', ], mobile: ['mobileno'], - homeno: ['homeno'], date: [ 'dob', 'passportexpirydate', @@ -42,5 +37,4 @@ export const FIELD_MAPPING = { 'divorcedate', 'workpassexpirydate', ], - number: ['gradyear'], } diff --git a/src/public/modules/forms/base/directives/field.client.directive.js b/src/public/modules/forms/base/directives/field.client.directive.js index b62789db61..15fdfb1214 100644 --- a/src/public/modules/forms/base/directives/field.client.directive.js +++ b/src/public/modules/forms/base/directives/field.client.directive.js @@ -57,8 +57,6 @@ function fieldDirective(FormFields) { function _getMyInfoPlaceholder(myInfoAttr, readOnly) { if (readOnly) { return '' - } else if (myInfoAttr === 'homeno') { - return '+65 6XXXXXXX' } else if (myInfoAttr === 'mobileno') { return '+65 9XXXXXXX' } diff --git a/src/public/modules/forms/base/resources/icon-types.js b/src/public/modules/forms/base/resources/icon-types.js index 605bfa88ae..30ab78e1be 100644 --- a/src/public/modules/forms/base/resources/icon-types.js +++ b/src/public/modules/forms/base/resources/icon-types.js @@ -29,7 +29,6 @@ const iconTypeMap = { housingtype: 'bx bx-home-alt', hdbtype: 'bx bx-home', marital: 'bx bx-diamond', - edulevel: 'bx bx-book-bookmark', countryofmarriage: 'bx bx-globe-alt', workpassstatus: 'bx bx-task', // householdincome: "", @@ -40,9 +39,6 @@ const iconTypeMap = { // secondaryrace: "", passportnumber: 'bx bx-world', regadd: 'bx bx-building', - mailadd: 'bx bx-newsletter', - billadd: 'bx bx-wallet', - schoolname: 'bx bx-book-open', occupation: 'bx bx-briefcase', employment: 'bx bx-contact', vehno: 'bx bx-car', @@ -51,10 +47,8 @@ const iconTypeMap = { marriagedate: 'bx bx-calendar-check', divorcedate: 'bx bx-calendar-x', workpassexpirydate: 'bx bx-calendar-alt', - homeno: 'bx bx-phone', mobileno: 'bx bx-mobile-alt', marriagecertno: 'bx bx-award', - gradyear: 'bx bx-calendar', } module.exports = { diff --git a/src/public/modules/forms/services/form-fields.client.service.js b/src/public/modules/forms/services/form-fields.client.service.js index 5a202e7b5c..aa8efee5a2 100644 --- a/src/public/modules/forms/services/form-fields.client.service.js +++ b/src/public/modules/forms/services/form-fields.client.service.js @@ -181,23 +181,13 @@ function FormFields() { case 'passportnumber': return 'E1234567X' case 'regadd': - case 'mailadd': - case 'billadd': return '411 CHUA CHU KANG AVE 3, #12-3, SINGAPORE 238823' case 'mobileno': return '+65 98765432' - case 'homeno': - return '+65 65123456' - case 'edulevel': - return 'PRIMARY' - case 'schoolname': - return 'TECK WHYE PRIMARY SCHOOL' case 'occupation': return 'MANAGING DIRECTOR/CHIEF EXECUTIVE OFFICER' case 'employment': return 'PCK PTE LTD' - case 'gradyear': - return 1977 case 'marital': return 'MARRIED' case 'dob': diff --git a/src/shared/resources/myinfo/index.ts b/src/shared/resources/myinfo/index.ts index 9e1fbf869b..6e27ba8b76 100644 --- a/src/shared/resources/myinfo/index.ts +++ b/src/shared/resources/myinfo/index.ts @@ -5,7 +5,6 @@ import DIALECTS from './myinfo-dialects' import NATIONALITIES from './myinfo-nationalities' import OCCUPATIONS from './myinfo-occupations' import RACES from './myinfo-races' -import SCHOOLS from './myinfo-schools' type MyInfoVerifiedType = 'SG' | 'PR' | 'F' interface IMyInfoFieldType { @@ -20,14 +19,7 @@ interface IMyInfoFieldType { ValidationOptions?: Record } -// TODO: Enable more MyInfo fields. export const types: IMyInfoFieldType[] = [ - // Email fieldType - // { - // name: 'email', - // value: 'Email', - // fieldType: 'email' - // }, { name: MyInfoAttribute.Name, value: 'Name', @@ -92,12 +84,6 @@ export const types: IMyInfoFieldType[] = [ fieldType: BasicField.Dropdown, fieldOptions: COUNTRIES, }, - // { - // name: 'secondaryrace', - // value: 'Race (Secondary)', - // category: "personal", - // fieldType: BasicField.Dropdown - // }, { name: MyInfoAttribute.ResidentialStatus, value: 'Residential Status', @@ -183,28 +169,6 @@ export const types: IMyInfoFieldType[] = [ fieldType: BasicField.Dropdown, fieldOptions: ['SINGLE', 'MARRIED', 'WIDOWED', 'DIVORCED'], }, - { - name: MyInfoAttribute.EducationLevel, - value: 'Highest education', - category: 'employment_education', - verified: [], - source: 'User-provided', - description: 'Highest education level of form-filler.', - fieldType: BasicField.Dropdown, - fieldOptions: [ - 'NO FORMAL QUALIFICATION / PRE-PRIMARY / LOWER PRIMARY', - 'PRIMARY', - 'LOWER SECONDARY', - 'SECONDARY', - 'POST-SECONDARY (NON-TERTIARY): GENERAL & VOCATION', - 'POLYTECHNIC DIPLOMA', - 'PROFESSIONAL QUALIFICATION AND OTHER DIPLOMA', - "BACHELOR'S OR EQUIVALENT", - "POSTGRADUATE DIPLOMA / CERTIFICATE (EXCLUDING MASTER'S AND DOCTORATE)", - "MASTER'S AND DOCTORATE OR EQUIVALENT", - 'MODULAR CERTIFICATION (NON-AWARD COURSES / NON-FULL QUALIFICATIONS)', - ], - }, { name: MyInfoAttribute.CountryOfMarriage, value: 'Country of marriage', @@ -216,39 +180,6 @@ export const types: IMyInfoFieldType[] = [ fieldType: BasicField.Dropdown, fieldOptions: COUNTRIES, }, - // { - // name: 'householdincome', - // value: 'Household Income', - // category: "employment_education", - // verified: [], - // source: "User-provided" - // description: "", - // fieldType: BasicField.Dropdown, - // }, - // { - // name: 'marriedname', - // value: 'Married Name', - // category: "family", - // fieldType: 'textfield' - // }, - // { - // name: 'hanyupinyinname', - // value: 'Hanyu Pinyin Name', - // category: "personal", - // fieldType: 'textfield' - // }, - // { - // name: 'aliasname', - // value: 'Alias Name', - // category: "personal", - // fieldType: 'textfield' - // }, - // { - // name: 'hanyupinyinaliasname', - // value: 'Hanyu Pinyin Alias Name', - // category: "personal", - // fieldType: 'textfield' - // }, { name: MyInfoAttribute.RegisteredAddress, value: 'Registered address', @@ -258,35 +189,6 @@ export const types: IMyInfoFieldType[] = [ description: 'The registered address of the form-filler.', fieldType: BasicField.ShortText, }, - { - name: MyInfoAttribute.MailingAddress, - value: 'Mailing address', - category: 'contact', - verified: [], - source: 'User-provided', - description: 'The mailing address of the form-filler.', - fieldType: BasicField.ShortText, - }, - { - name: MyInfoAttribute.BillingAddress, - value: 'Billing address', - category: 'contact', - verified: [], - source: 'User-provided', - description: 'The billing address of the form-filler.', - fieldType: BasicField.ShortText, - }, - { - name: MyInfoAttribute.SchoolName, - value: 'School name', - category: 'employment_education', - verified: [], - source: 'User-provided', - description: - 'List of primary, secondary and tertiary educational institutions in Singapore. Does not include private or international educational institutions.', - fieldType: BasicField.Dropdown, - fieldOptions: SCHOOLS, - }, { name: MyInfoAttribute.Occupation, value: 'Occupation', @@ -375,29 +277,4 @@ export const types: IMyInfoFieldType[] = [ description: 'Mobile telephone number of form-filler.', fieldType: BasicField.Mobile, }, - { - name: MyInfoAttribute.HomeNo, - value: 'Home number', - category: 'contact', - verified: [], - source: 'User-provided', - description: 'Home telephone number of form-filler.', - fieldType: BasicField.HomeNo, - }, - { - name: MyInfoAttribute.GraduationYear, - value: 'Year of graduation', - category: 'employment_education', - verified: [], - source: 'User-provided', - description: - "Graduation year of form filler's last attended educational institution.", - fieldType: BasicField.Number, - ValidationOptions: { - selectedValidation: 'Exact', - customVal: 4, - customMin: 4, - customMax: 4, - }, - }, ] diff --git a/src/shared/resources/myinfo/myinfo-schools.ts b/src/shared/resources/myinfo/myinfo-schools.ts deleted file mode 100644 index 386427d00e..0000000000 --- a/src/shared/resources/myinfo/myinfo-schools.ts +++ /dev/null @@ -1,387 +0,0 @@ -const myInfoSchools = [ - 'ADMIRALTY PRIMARY SCHOOL', - 'ADMIRALTY SECONDARY SCHOOL', - 'AHMAD IBRAHIM PRIMARY SCHOOL', - 'AHMAD IBRAHIM SECONDARY SCHOOL', - 'AI TONG SCHOOL', - 'ALEXANDRA PRIMARY SCHOOL', - 'ANCHOR GREEN PRIMARY SCHOOL', - 'ANDERSON JUNIOR COLLEGE', - 'ANDERSON PRIMARY SCHOOL', - 'ANDERSON SECONDARY SCHOOL', - 'ANG MO KIO PRIMARY SCHOOL', - 'ANG MO KIO SECONDARY SCHOOL', - 'ANGLICAN HIGH SCHOOL', - 'ANGLO-CHINESE JUNIOR COLLEGE', - 'ANGLO-CHINESE SCHOOL (BARKER ROAD)', - 'ANGLO-CHINESE SCHOOL (INDEPENDENT)', - 'ANGLO-CHINESE SCHOOL (JUNIOR)', - 'ANGLO-CHINESE SCHOOL (PRIMARY)', - 'ASSUMPTION ENGLISH SCHOOL', - 'ASSUMPTION PATHWAY SCHOOL', - 'BALESTIER HILL PRIMARY SCHOOL', - 'BALESTIER HILL SECONDARY SCHOOL', - 'BARTLEY SECONDARY SCHOOL', - 'BEACON PRIMARY SCHOOL', - 'BEATTY SECONDARY SCHOOL', - 'BEDOK GREEN PRIMARY SCHOOL', - 'BEDOK GREEN SECONDARY SCHOOL', - 'BEDOK NORTH SECONDARY SCHOOL', - 'BEDOK SOUTH SECONDARY SCHOOL', - 'BEDOK TOWN SECONDARY SCHOOL', - 'BEDOK VIEW SECONDARY SCHOOL', - 'BENDEMEER PRIMARY SCHOOL', - 'BENDEMEER SECONDARY SCHOOL', - 'BISHAN PARK SECONDARY SCHOOL', - 'BLANGAH RISE PRIMARY SCHOOL', - 'BOON LAY GARDEN PRIMARY SCHOOL', - 'BOON LAY SECONDARY SCHOOL', - 'BOWEN SECONDARY SCHOOL', - 'BROADRICK SECONDARY SCHOOL', - 'BUKIT BATOK SECONDARY SCHOOL', - 'BUKIT MERAH SECONDARY SCHOOL', - 'BUKIT PANJANG GOVT. HIGH SCHOOL', - 'BUKIT PANJANG PRIMARY SCHOOL', - 'BUKIT TIMAH PRIMARY SCHOOL', - 'BUKIT VIEW PRIMARY SCHOOL', - 'BUKIT VIEW SECONDARY SCHOOL', - 'CANBERRA PRIMARY SCHOOL', - 'CANBERRA SECONDARY SCHOOL', - 'CANOSSA CONVENT PRIMARY SCHOOL', - 'CANTONMENT PRIMARY SCHOOL', - 'CASUARINA PRIMARY SCHOOL', - 'CATHOLIC HIGH SCHOOL', - 'CATHOLIC JUNIOR COLLEGE', - "CEDAR GIRLS' SECONDARY SCHOOL", - 'CEDAR PRIMARY SCHOOL', - 'CG PROTEGE ANIMATION SCHOOL', - 'CHANGKAT CHANGI SECONDARY SCHOOL', - 'CHANGKAT PRIMARY SCHOOL', - 'CHESTNUT DRIVE SECONDARY SCHOOL', - 'CHIJ (KATONG) PRIMARY', - 'CHIJ (KELLOCK)', - 'CHIJ KATONG CONVENT', - 'CHIJ OUR LADY OF GOOD COUNSEL', - 'CHIJ OUR LADY OF THE NATIVITY', - 'CHIJ OUR LADY QUEEN OF PEACE', - 'CHIJ PRIMARY (TOA PAYOH)', - 'CHIJ SECONDARY (TOA PAYOH)', - "CHIJ ST. JOSEPH'S CONVENT", - "CHIJ ST. NICHOLAS GIRLS' SCHOOL", - "CHIJ ST. THERESA'S CONVENT", - 'CHONG BOON SECONDARY SCHOOL', - 'CHONGFU PRIMARY SCHOOL', - 'CHONGZHENG PRIMARY SCHOOL', - 'CHRIST CHURCH SECONDARY SCHOOL', - 'CHUA CHU KANG PRIMARY SCHOOL', - 'CHUA CHU KANG SECONDARY SCHOOL', - 'CHUNG CHENG HIGH SCHOOL (MAIN)', - 'CHUNG CHENG HIGH SCHOOL (YISHUN)', - 'CLEMENTI PRIMARY SCHOOL', - 'CLEMENTI TOWN SECONDARY SCHOOL', - 'CLEMENTI WOODS SECONDARY SCHOOL', - 'COMMONWEALTH SECONDARY SCHOOL', - 'COMPASSVALE PRIMARY SCHOOL', - 'COMPASSVALE SECONDARY SCHOOL', - 'CONCORD PRIMARY SCHOOL', - 'CORAL PRIMARY SCHOOL', - 'CORAL SECONDARY SCHOOL', - 'CORPORATION PRIMARY SCHOOL', - "CRESCENT GIRLS' SCHOOL", - 'CREST SECONDARY SCHOOL', - 'DA QIAO PRIMARY SCHOOL', - 'DAMAI PRIMARY SCHOOL', - 'DAMAI SECONDARY SCHOOL', - 'DAZHONG PRIMARY SCHOOL', - 'DE LA SALLE SCHOOL', - 'DEYI SECONDARY SCHOOL', - 'DUNEARN SECONDARY SCHOOL', - 'DUNMAN HIGH SCHOOL', - 'DUNMAN SECONDARY SCHOOL', - 'EAST COAST PRIMARY SCHOOL', - 'EAST SPRING PRIMARY SCHOOL', - 'EAST SPRING SECONDARY SCHOOL', - 'EAST VIEW PRIMARY SCHOOL', - 'EAST VIEW SECONDARY SCHOOL', - 'EDGEFIELD PRIMARY SCHOOL', - 'EDGEFIELD SECONDARY SCHOOL', - 'ELIAS PARK PRIMARY SCHOOL', - 'ENDEAVOUR PRIMARY SCHOOL', - 'EUNOS PRIMARY SCHOOL', - 'EVERGREEN PRIMARY SCHOOL', - 'EVERGREEN SECONDARY SCHOOL', - 'FAIRFIELD METHODIST SCHOOL (PRIMARY)', - 'FAIRFIELD METHODIST SCHOOL (SECONDARY)', - 'FAJAR SECONDARY SCHOOL', - 'FARRER PARK PRIMARY SCHOOL', - 'FENGSHAN PRIMARY SCHOOL', - 'FERNVALE PRIMARY SCHOOL', - 'FIRST TOA PAYOH PRIMARY SCHOOL', - 'FIRST TOA PAYOH SECONDARY SCHOOL', - 'FRONTIER PRIMARY SCHOOL', - 'FUCHUN PRIMARY SCHOOL', - 'FUCHUN SECONDARY SCHOOL', - 'FUHUA PRIMARY SCHOOL', - 'FUHUA SECONDARY SCHOOL', - 'GAN ENG SENG PRIMARY SCHOOL', - 'GAN ENG SENG SCHOOL', - 'GEYLANG METHODIST SCHOOL (PRIMARY)', - 'GEYLANG METHODIST SCHOOL (SECONDARY)', - 'GONGSHANG PRIMARY SCHOOL', - 'GREENDALE PRIMARY SCHOOL', - 'GREENDALE SECONDARY SCHOOL', - 'GREENRIDGE PRIMARY SCHOOL', - 'GREENRIDGE SECONDARY SCHOOL', - 'GREENVIEW SECONDARY SCHOOL', - 'GREENWOOD PRIMARY SCHOOL', - 'GUANGYANG PRIMARY SCHOOL', - 'GUANGYANG SECONDARY SCHOOL', - 'HAI SING CATHOLIC SCHOOL', - "HAIG GIRLS' SCHOOL", - 'HENDERSON SECONDARY SCHOOL', - 'HENRY PARK PRIMARY SCHOOL', - 'HILLGROVE SECONDARY SCHOOL', - "HOLY INNOCENTS' HIGH SCHOOL", - "HOLY INNOCENTS' PRIMARY SCHOOL", - 'HONG KAH SECONDARY SCHOOL', - 'HONG WEN SCHOOL', - 'HORIZON PRIMARY SCHOOL', - 'HOUGANG PRIMARY SCHOOL', - 'HOUGANG SECONDARY SCHOOL', - 'HUA YI SECONDARY SCHOOL', - 'HUAMIN PRIMARY SCHOOL', - 'HWA CHONG INSTITUTION', - 'INNOVA JUNIOR COLLEGE', - 'INNOVA PRIMARY SCHOOL', - 'JIEMIN PRIMARY SCHOOL', - 'JING SHAN PRIMARY SCHOOL', - 'JUNYUAN PRIMARY SCHOOL', - 'JUNYUAN SECONDARY SCHOOL', - 'JURONG JUNIOR COLLEGE', - 'JURONG PRIMARY SCHOOL', - 'JURONG SECONDARY SCHOOL', - 'JURONG WEST PRIMARY SCHOOL', - 'JURONG WEST SECONDARY SCHOOL', - 'JURONGVILLE SECONDARY SCHOOL', - 'JUYING PRIMARY SCHOOL', - 'JUYING SECONDARY SCHOOL', - 'KEMING PRIMARY SCHOOL', - 'KENT RIDGE SECONDARY SCHOOL', - 'KHENG CHENG SCHOOL', - 'KONG HWA SCHOOL', - 'KRANJI PRIMARY SCHOOL', - 'KRANJI SECONDARY SCHOOL', - 'KUO CHUAN PRESBYTERIAN PRIMARY SCHOOL', - 'KUO CHUAN PRESBYTERIAN SECONDARY SCHOOL', - 'LAKESIDE PRIMARY SCHOOL', - 'LASALLE COLLEGE OF THE ARTS', - 'LIANHUA PRIMARY SCHOOL', - 'LOYANG PRIMARY SCHOOL', - 'LOYANG SECONDARY SCHOOL', - 'MACPHERSON PRIMARY SCHOOL', - 'MACPHERSON SECONDARY SCHOOL', - 'MAHA BODHI SCHOOL', - 'MANJUSRI SECONDARY SCHOOL', - 'MARIS STELLA HIGH SCHOOL', - 'MARSILING PRIMARY SCHOOL', - 'MARSILING SECONDARY SCHOOL', - 'MARYMOUNT CONVENT SCHOOL', - 'MAYFLOWER PRIMARY SCHOOL', - 'MAYFLOWER SECONDARY SCHOOL', - 'MEE TOH SCHOOL', - 'MERIDIAN JUNIOR COLLEGE', - 'MERIDIAN PRIMARY SCHOOL', - "METHODIST GIRLS' SCHOOL (PRIMARY)", - "METHODIST GIRLS' SCHOOL (SECONDARY)", - 'MILLENNIA INSTITUTE', - 'MONTFORT JUNIOR SCHOOL', - 'MONTFORT SECONDARY SCHOOL', - 'NAN CHIAU HIGH SCHOOL', - 'NAN CHIAU PRIMARY SCHOOL', - 'NAN HUA HIGH SCHOOL', - 'NAN HUA PRIMARY SCHOOL', - 'NANYANG ACADEMY OF FINE ARTS', - "NANYANG GIRLS' HIGH SCHOOL", - 'NANYANG JUNIOR COLLEGE', - 'NANYANG POLYTECHNIC', - 'NANYANG PRIMARY SCHOOL', - 'NANYANG TECHNOLOGICAL UNIVERSITY', - 'NATIONAL JUNIOR COLLEGE', - 'NATIONAL UNIVERSITY OF SINGAPORE', - 'NAVAL BASE PRIMARY SCHOOL', - 'NAVAL BASE SECONDARY SCHOOL', - 'NEW TOWN PRIMARY SCHOOL', - 'NEW TOWN SECONDARY SCHOOL', - 'NGEE ANN POLYTECHNIC', - 'NGEE ANN PRIMARY SCHOOL', - 'NGEE ANN SECONDARY SCHOOL', - 'NORTH SPRING PRIMARY SCHOOL', - 'NORTH VIEW PRIMARY SCHOOL', - 'NORTH VIEW SECONDARY SCHOOL', - 'NORTH VISTA PRIMARY SCHOOL', - 'NORTH VISTA SECONDARY SCHOOL', - 'NORTHBROOKS SECONDARY SCHOOL', - 'NORTHLAND PRIMARY SCHOOL', - 'NORTHLAND SECONDARY SCHOOL', - 'NORTHLIGHT SCHOOL', - 'NORTHOAKS PRIMARY SCHOOL', - 'NUS HIGH SCHOOL OF MATHEMATICS AND SCIENCE', - 'OPERA ESTATE PRIMARY SCHOOL', - 'ORCHID PARK SECONDARY SCHOOL', - 'OUTRAM SECONDARY SCHOOL', - 'PALM VIEW PRIMARY SCHOOL', - 'PARK VIEW PRIMARY SCHOOL', - 'PASIR RIS CREST SECONDARY SCHOOL', - 'PASIR RIS PRIMARY SCHOOL', - 'PASIR RIS SECONDARY SCHOOL', - "PAYA LEBAR METHODIST GIRLS' SCHOOL (PRIMARY)", - "PAYA LEBAR METHODIST GIRLS' SCHOOL (SECONDARY)", - 'PEI CHUN PUBLIC SCHOOL', - 'PEI HWA PRESBYTERIAN PRIMARY SCHOOL', - 'PEI HWA SECONDARY SCHOOL', - 'PEI TONG PRIMARY SCHOOL', - 'PEICAI SECONDARY SCHOOL', - 'PEIRCE SECONDARY SCHOOL', - 'PEIYING PRIMARY SCHOOL', - 'PING YI SECONDARY SCHOOL', - 'PIONEER JUNIOR COLLEGE', - 'PIONEER PRIMARY SCHOOL', - 'PIONEER SECONDARY SCHOOL', - 'POI CHING SCHOOL', - 'PRESBYTERIAN HIGH SCHOOL', - 'PRINCESS ELIZABETH PRIMARY SCHOOL', - 'PUNGGOL GREEN PRIMARY SCHOOL', - 'PUNGGOL PRIMARY SCHOOL', - 'PUNGGOL SECONDARY SCHOOL', - 'PUNGGOL VIEW PRIMARY SCHOOL', - 'QIFA PRIMARY SCHOOL', - 'QIHUA PRIMARY SCHOOL', - 'QUEENSTOWN PRIMARY SCHOOL', - 'QUEENSTOWN SECONDARY SCHOOL', - 'QUEENSWAY SECONDARY SCHOOL', - 'RADIN MAS PRIMARY SCHOOL', - "RAFFLES GIRLS' PRIMARY SCHOOL", - "RAFFLES GIRLS' SCHOOL (SECONDARY)", - 'RAFFLES INSTITUTION', - 'RED SWASTIKA SCHOOL', - 'REGENT SECONDARY SCHOOL', - 'REPUBLIC POLYTECHNIC', - 'RIVER VALLEY HIGH SCHOOL', - 'RIVER VALLEY PRIMARY SCHOOL', - 'RIVERSIDE PRIMARY SCHOOL', - 'RIVERSIDE SECONDARY SCHOOL', - 'RIVERVALE PRIMARY SCHOOL', - 'ROSYTH SCHOOL', - 'RULANG PRIMARY SCHOOL', - 'SCHOOL OF SCIENCE AND TECHNOLOGY, SINGAPORE', - 'SCHOOL OF THE ARTS, SINGAPORE', - 'SEMBAWANG PRIMARY SCHOOL', - 'SEMBAWANG SECONDARY SCHOOL', - 'SENG KANG PRIMARY SCHOOL', - 'SENG KANG SECONDARY SCHOOL', - 'SENGKANG GREEN PRIMARY SCHOOL', - 'SERANGOON GARDEN SECONDARY SCHOOL', - 'SERANGOON JUNIOR COLLEGE', - 'SERANGOON SECONDARY SCHOOL', - 'SHUQUN PRIMARY SCHOOL', - 'SHUQUN SECONDARY SCHOOL', - 'SI LING PRIMARY SCHOOL', - 'SI LING SECONDARY SCHOOL', - 'SIGLAP SECONDARY SCHOOL', - 'SIM UNIVERSITY', - "SINGAPORE CHINESE GIRLS' PRIMARY SCHOOL", - "SINGAPORE CHINESE GIRLS' SCHOOL", - 'SINGAPORE INSTITUTE OF TECHNOLOGY', - 'SINGAPORE MANAGEMENT UNIVERSITY', - 'SINGAPORE POLYTECHNIC', - 'SINGAPORE RAFFLES MUSIC COLLEGE', - 'SINGAPORE SPORTS SCHOOL', - 'SINGAPORE UNIVERSITY OF TECHNOLOGY AND DESIGN', - 'SOUTH VIEW PRIMARY SCHOOL', - 'SPECTRA SECONDARY SCHOOL', - 'SPRINGDALE PRIMARY SCHOOL', - 'SPRINGFIELD SECONDARY SCHOOL', - "ST. ANDREW'S JUNIOR COLLEGE", - "ST. ANDREW'S JUNIOR SCHOOL", - "ST. ANDREW'S SECONDARY SCHOOL", - "ST. ANTHONY'S CANOSSIAN PRIMARY SCHOOL", - "ST. ANTHONY'S CANOSSIAN SECONDARY SCHOOL", - "ST. ANTHONY'S PRIMARY SCHOOL", - "ST. GABRIEL'S PRIMARY SCHOOL", - "ST. GABRIEL'S SECONDARY SCHOOL", - "ST. HILDA'S PRIMARY SCHOOL", - "ST. HILDA'S SECONDARY SCHOOL", - "ST. JOSEPH'S INSTITUTION", - "ST. JOSEPH'S INSTITUTION JUNIOR", - "ST. MARGARET'S PRIMARY SCHOOL", - "ST. MARGARET'S SECONDARY SCHOOL", - "ST. PATRICK'S SCHOOL", - "ST. STEPHEN'S SCHOOL", - 'STAMFORD PRIMARY SCHOOL', - 'SWISS COTTAGE SECONDARY SCHOOL', - 'TAMPINES JUNIOR COLLEGE', - 'TAMPINES NORTH PRIMARY SCHOOL', - 'TAMPINES PRIMARY SCHOOL', - 'TAMPINES SECONDARY SCHOOL', - 'TANGLIN SECONDARY SCHOOL', - "TANJONG KATONG GIRLS' SCHOOL", - 'TANJONG KATONG PRIMARY SCHOOL', - 'TANJONG KATONG SECONDARY SCHOOL', - 'TAO NAN SCHOOL', - 'TECK GHEE PRIMARY SCHOOL', - 'TECK WHYE PRIMARY SCHOOL', - 'TECK WHYE SECONDARY SCHOOL', - 'TELOK KURAU PRIMARY SCHOOL', - 'TEMASEK JUNIOR COLLEGE', - 'TEMASEK POLYTECHNIC', - 'TEMASEK PRIMARY SCHOOL', - 'TEMASEK SECONDARY SCHOOL', - 'TOWNSVILLE PRIMARY SCHOOL', - 'UNITY PRIMARY SCHOOL', - 'UNITY SECONDARY SCHOOL', - 'VICTORIA JUNIOR COLLEGE', - 'VICTORIA SCHOOL', - 'WELLINGTON PRIMARY SCHOOL', - 'WEST GROVE PRIMARY SCHOOL', - 'WEST SPRING PRIMARY SCHOOL', - 'WEST SPRING SECONDARY SCHOOL', - 'WEST VIEW PRIMARY SCHOOL', - 'WESTWOOD PRIMARY SCHOOL', - 'WESTWOOD SECONDARY SCHOOL', - 'WHITE SANDS PRIMARY SCHOOL', - 'WHITLEY SECONDARY SCHOOL', - 'WOODGROVE PRIMARY SCHOOL', - 'WOODGROVE SECONDARY SCHOOL', - 'WOODLANDS PRIMARY SCHOOL', - 'WOODLANDS RING PRIMARY SCHOOL', - 'WOODLANDS RING SECONDARY SCHOOL', - 'WOODLANDS SECONDARY SCHOOL', - 'XINGHUA PRIMARY SCHOOL', - 'XINGNAN PRIMARY SCHOOL', - 'XINMIN PRIMARY SCHOOL', - 'XINMIN SECONDARY SCHOOL', - 'XISHAN PRIMARY SCHOOL', - 'YALE-NUS COLLEGE', - 'YANGZHENG PRIMARY SCHOOL', - 'YEW TEE PRIMARY SCHOOL', - 'YIO CHU KANG PRIMARY SCHOOL', - 'YIO CHU KANG SECONDARY SCHOOL', - 'YISHUN JUNIOR COLLEGE', - 'YISHUN PRIMARY SCHOOL', - 'YISHUN SECONDARY SCHOOL', - 'YISHUN TOWN SECONDARY SCHOOL', - 'YU NENG PRIMARY SCHOOL', - 'YUAN CHING SECONDARY SCHOOL', - 'YUHUA PRIMARY SCHOOL', - 'YUHUA SECONDARY SCHOOL', - 'YUMIN PRIMARY SCHOOL', - 'YUSOF ISHAK SECONDARY SCHOOL', - 'YUYING SECONDARY SCHOOL', - 'ZHANGDE PRIMARY SCHOOL', - 'ZHENGHUA PRIMARY SCHOOL', - 'ZHENGHUA SECONDARY SCHOOL', - 'ZHONGHUA PRIMARY SCHOOL', - 'ZHONGHUA SECONDARY SCHOOL', -] - -export default myInfoSchools diff --git a/src/types/field/fieldTypes.ts b/src/types/field/fieldTypes.ts index 432516baa0..d3d9915b92 100644 --- a/src/types/field/fieldTypes.ts +++ b/src/types/field/fieldTypes.ts @@ -24,8 +24,6 @@ export enum MyInfoAttribute { Name = 'name', PassportNumber = 'passportnumber', RegisteredAddress = 'regadd', - MailingAddress = 'mailadd', - BillingAddress = 'billadd', Employment = 'employment', VehicleNo = 'vehno', MarriageCertNo = 'marriagecertno', @@ -38,17 +36,13 @@ export enum MyInfoAttribute { HousingType = 'housingtype', HdbType = 'hdbtype', Marital = 'marital', - EducationLevel = 'edulevel', CountryOfMarriage = 'countryofmarriage', WorkpassStatus = 'workpassstatus', - SchoolName = 'schoolname', Occupation = 'occupation', MobileNo = 'mobileno', - HomeNo = 'homeno', DateOfBirth = 'dob', PassportExpiryDate = 'passportexpirydate', MarriageDate = 'marriagedate', DivorceDate = 'divorcedate', WorkpassExpiryDate = 'workpassexpirydate', - GraduationYear = 'gradyear', }