diff --git a/src/components/I18nProvider.js b/src/components/I18nProvider.js index 413b7ee..cd09a53 100644 --- a/src/components/I18nProvider.js +++ b/src/components/I18nProvider.js @@ -4,7 +4,7 @@ import enMessages from '../translations/en.json'; import cnMessages from '../translations/zh-CN.json'; import hkMessages from '../translations/zh-HK.json'; -import { POST_TERMS_N_CONDITIONS } from "utils/ApiPathConst"; +import { GET_COMBO, POST_TERMS_N_CONDITIONS } from "utils/ApiPathConst"; import * as HttpUtils from "utils/HttpUtils"; const LocaleContext = createContext(); @@ -30,6 +30,19 @@ export const I18nProvider = ({ children }) => { hkMessages["termsAndCon"]= responseData.zh; } }); + + HttpUtils.get({ + url: GET_COMBO, + onSuccess: (responseData) => { + for(let i =0; i { diff --git a/src/pages/DemandNote/Details/ApplicationDetailCard.js b/src/pages/DemandNote/Details/ApplicationDetailCard.js index 8f7caed..c4e2bda 100644 --- a/src/pages/DemandNote/Details/ApplicationDetailCard.js +++ b/src/pages/DemandNote/Details/ApplicationDetailCard.js @@ -62,7 +62,7 @@ const ApplicationDetailCard = ({ data }) => { - + @@ -96,7 +96,7 @@ const ApplicationDetailCard = ({ data }) => { - + @@ -126,7 +126,7 @@ const ApplicationDetailCard = ({ data }) => { - + diff --git a/src/pages/DemandNote/Details/DnDetailCard.js b/src/pages/DemandNote/Details/DnDetailCard.js index 52507d9..ea4629d 100644 --- a/src/pages/DemandNote/Details/DnDetailCard.js +++ b/src/pages/DemandNote/Details/DnDetailCard.js @@ -8,6 +8,7 @@ import { import * as React from "react"; import * as HttpUtils from "utils/HttpUtils"; +import * as DateUtils from "utils/DateUtils"; import * as StatusUtils from "utils/statusUtils/DnStatus"; import Loadable from 'components/Loadable'; const MainCard = Loadable(React.lazy(() => import('components/MainCard'))); @@ -39,7 +40,7 @@ const DnDetailCard = ({ data }) => { }; const getDisplayField = (label, value) => { - return + return @@ -70,7 +71,7 @@ const DnDetailCard = ({ data }) => { {getDisplayField("DN No.", dnData.dnNo)} - + @@ -89,7 +90,7 @@ const DnDetailCard = ({ data }) => { {getDisplayField("Issue Date", dnData.issueDate)} - {getDisplayField("DN Sent", dnData?.sentDate ? dnData.sentDate + " - " + dnData.sentBy : "--")} + {getDisplayField("DN Sent", dnData?.sentDate ? dnData.sentDate + " - " + (dnData.sentBy == null ? "System" : dnData.sentBy) : "--")} @@ -120,6 +121,35 @@ const DnDetailCard = ({ data }) => { + + + {getDisplayField("Reminder Schedule", "")} + {getDisplayField("Sent on", "")} + + + {getDisplayField("Reminder 1", DateUtils.dateStr(dnData.expectReminder1))} + {getDisplayField("Reminder 1", dnData?.reminder1 ? DateUtils.datetimeStr(dnData.reminder1) : "--")} + + + + {getDisplayField("Reminder 2", DateUtils.dateStr(dnData.expectReminder2))} + {getDisplayField("Reminder 2", dnData?.reminder2 ? DateUtils.datetimeStr(dnData.reminder2) : "--")} + + + {getDisplayField("Reminder 3", DateUtils.dateStr(dnData.expectReminder3))} + {getDisplayField("Reminder 3", dnData?.reminder3 ? DateUtils.datetimeStr(dnData.reminder3) : "--")} + + + {getDisplayField("Reminder 4", DateUtils.dateStr(dnData.expectReminder4))} + {getDisplayField("Reminder 4", dnData?.reminder4 ? DateUtils.datetimeStr(dnData.reminder4) : "--")} + + + {getDisplayField("Reminder Final", DateUtils.dateStr(dnData.expectReminderFinal))} + {getDisplayField("Reminder Final", dnData?.reminderFinal ? DateUtils.datetimeStr(dnData.reminderFinal) : "--")} + + + + diff --git a/src/pages/Organization/DetailPage/OrganizationCard.js b/src/pages/Organization/DetailPage/OrganizationCard.js index 13f6d8f..241bb76 100644 --- a/src/pages/Organization/DetailPage/OrganizationCard.js +++ b/src/pages/Organization/DetailPage/OrganizationCard.js @@ -279,7 +279,7 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => { - Organization Details + Organisation Details diff --git a/src/pages/Organization/DetailPage/index.js b/src/pages/Organization/DetailPage/index.js index efed39c..231c082 100644 --- a/src/pages/Organization/DetailPage/index.js +++ b/src/pages/Organization/DetailPage/index.js @@ -136,7 +136,7 @@ const OrganizationDetailPage = () => { {isGLDLoggedIn()? - Maintain Organization + Maintain Organisation : diff --git a/src/translations/en.json b/src/translations/en.json index de9f4e6..e375196 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -283,27 +283,6 @@ "pwGood": "Good", "pwStrong": "Strong", - "islandCombo": "Island District", - "kwaiTsingCombo": "Kwai Tsing District", - "northCombo": "North District", - "saiKungCombo": "Sai Kung District", - "shaTinCombo": "Sha Tin District", - "taiPoCombo": "Tai Po District", - "tsuenWanCombo": "Tsuen Wan District", - "tuenMunCombo": "Tuen Mun District", - "yuenLongCombo": "Yuen Long District", - "kowloonCityCombo": "Kowloon City District", - "kwunTongCombo": "Kwun Tong District", - "shamShuiPoCombo": "Sham Shui Po District", - "wongTaiSinCombo": "Wong Tai Sin District", - "yauTsimMongCombo": "Yau Tsim Mong District", - "centralAndWesternCombo": "Central and Western District", - "easternCombo": "Eastern District", - "southernCombo": "Southern District", - "wanChaiCombo": "Wan Chai District", - "lantauIslandCombo": "Lantau Island", - "lammaIslandCombo": "Lamma Island District", - "pengChauCombo": "Peng Chau District", "applyPublicNotice": "Apply for Public Notice", "attention": "attention", diff --git a/src/translations/zh-CN.json b/src/translations/zh-CN.json index a7374cb..2cc6206 100644 --- a/src/translations/zh-CN.json +++ b/src/translations/zh-CN.json @@ -277,28 +277,6 @@ "pwGood": "良好", "pwStrong": "强", - "islandCombo": "离岛区", - "kwaiTsingCombo": "葵青区", - "northCombo": "北区", - "saiKungCombo": "西贡区", - "shaTinCombo": "沙田区", - "taiPoCombo": "大埔区", - "tsuenWanCombo": "荃湾区", - "tuenMunCombo": "屯门区", - "yuenLongCombo": "元朗区", - "kowloonCityCombo": "九龙城区", - "kwunTongCombo": "观塘区", - "shamShuiPoCombo": "深水埗区", - "wongTaiSinCombo": "黄大仙区", - "yauTsimMongCombo": "油尖旺区", - "centralAndWesternCombo": "中西区", - "easternCombo": "东区", - "southernCombo": "南区", - "wanChaiCombo": "湾仔区", - "lantauIslandCombo": "大屿山区", - "lammaIslandCombo": "南丫岛区", - "pengChauCombo": "坪洲区", - "applyPublicNotice": "申请公共启事", "attention": "注意", "to": "到", diff --git a/src/translations/zh-HK.json b/src/translations/zh-HK.json index 39941ef..be4aa26 100644 --- a/src/translations/zh-HK.json +++ b/src/translations/zh-HK.json @@ -280,28 +280,6 @@ "pwGood": "良好", "pwStrong": "強", - "islandCombo": "離島區", - "kwaiTsingCombo": "葵青區", - "northCombo": "北區", - "saiKungCombo": "西貢區", - "shaTinCombo": "沙田區", - "taiPoCombo": "大埔區", - "tsuenWanCombo": "荃灣區", - "tuenMunCombo": "屯門區", - "yuenLongCombo": "元朗區", - "kowloonCityCombo": "九龍城區", - "kwunTongCombo": "觀塘區", - "shamShuiPoCombo": "深水埗區", - "wongTaiSinCombo": "黃大仙區", - "yauTsimMongCombo": "油尖旺區", - "centralAndWesternCombo": "中西區", - "easternCombo": "東區", - "southernCombo": "南區", - "wanChaiCombo": "灣仔區", - "lantauIslandCombo": "大嶼山區", - "lammaIslandCombo": "南丫島區", - "pengChauCombo": "坪洲區", - "applyPublicNotice": "申請公共啟事", "attention": "注意", "to": "到", diff --git a/src/utils/ApiPathConst.js b/src/utils/ApiPathConst.js index 63fd471..0ef48e9 100644 --- a/src/utils/ApiPathConst.js +++ b/src/utils/ApiPathConst.js @@ -79,6 +79,7 @@ export const POST_LOGIN = '/login'; export const POST_CAPTCHA = apiPath+'/captcha'; export const POST_TERMS_N_CONDITIONS = apiPath+'/termsAndConditions'; export const POST_VERIFY_CAPTCHA = apiPath+'/verifyCaptcha'; +export const GET_COMBO = apiPath+'/combo-data'; //register export const POST_PUBLIC_USER_REGISTER = apiPath+'/user/register';