diff --git a/src/pages/Announcement/Search/index.js b/src/pages/Announcement/Search/index.js index cf58eb4..76d6418 100644 --- a/src/pages/Announcement/Search/index.js +++ b/src/pages/Announcement/Search/index.js @@ -75,7 +75,7 @@ const UserSearchPage_Individual = () => {
- Announcement + Announcement
diff --git a/src/pages/Announcement/Search_Public/index.js b/src/pages/Announcement/Search_Public/index.js index e6df731..f5d5818 100644 --- a/src/pages/Announcement/Search_Public/index.js +++ b/src/pages/Announcement/Search_Public/index.js @@ -75,7 +75,7 @@ const UserSearchPage_Individual = () => {
- +
diff --git a/src/pages/AuditLog/index.js b/src/pages/AuditLog/index.js index c4102da..9c03409 100644 --- a/src/pages/AuditLog/index.js +++ b/src/pages/AuditLog/index.js @@ -84,7 +84,7 @@ const AuditLogPage = () => {
- Audit Log + Audit Log
diff --git a/src/pages/DemandNote/Create/index.js b/src/pages/DemandNote/Create/index.js index d22572c..7cc4c4b 100644 --- a/src/pages/DemandNote/Create/index.js +++ b/src/pages/DemandNote/Create/index.js @@ -84,7 +84,7 @@ const Index = () => {
- + Create Demand Note diff --git a/src/pages/DemandNote/Search/index.js b/src/pages/DemandNote/Search/index.js index c1350aa..51dd08f 100644 --- a/src/pages/DemandNote/Search/index.js +++ b/src/pages/DemandNote/Search/index.js @@ -104,7 +104,7 @@ const UserSearchPage_Individual = () => {
- + Demand Note diff --git a/src/pages/GFMIS/index.js b/src/pages/GFMIS/index.js index 1486dfe..867a77e 100644 --- a/src/pages/GFMIS/index.js +++ b/src/pages/GFMIS/index.js @@ -127,7 +127,7 @@ const Index = () => {
- + GFMIS Generate XML diff --git a/src/pages/Organization/SearchPage/index.js b/src/pages/Organization/SearchPage/index.js index 5ec67e8..5cfe687 100644 --- a/src/pages/Organization/SearchPage/index.js +++ b/src/pages/Organization/SearchPage/index.js @@ -75,7 +75,7 @@ const OrganizationSearchPage = () => {
- View Organisation + View Organisation
diff --git a/src/pages/Payment/Search_GLD/index.js b/src/pages/Payment/Search_GLD/index.js index 793a4a3..5fb32ce 100644 --- a/src/pages/Payment/Search_GLD/index.js +++ b/src/pages/Payment/Search_GLD/index.js @@ -68,7 +68,7 @@ const Index = () => {
- + Online Payment Record diff --git a/src/pages/Proof/Create_FromApp/index.js b/src/pages/Proof/Create_FromApp/index.js index 3019f5d..e8df30a 100644 --- a/src/pages/Proof/Create_FromApp/index.js +++ b/src/pages/Proof/Create_FromApp/index.js @@ -79,7 +79,7 @@ const Index = () => {
- Create Proof + Create Proof
diff --git a/src/pages/Proof/Search_GLD/index.js b/src/pages/Proof/Search_GLD/index.js index d294304..6d16d41 100644 --- a/src/pages/Proof/Search_GLD/index.js +++ b/src/pages/Proof/Search_GLD/index.js @@ -101,7 +101,7 @@ const UserSearchPage_Individual = () => {
- Proof + Proof
diff --git a/src/pages/PublicNotice/Search_GLD/index.js b/src/pages/PublicNotice/Search_GLD/index.js index 39546d7..321487b 100644 --- a/src/pages/PublicNotice/Search_GLD/index.js +++ b/src/pages/PublicNotice/Search_GLD/index.js @@ -100,7 +100,7 @@ const UserSearchPage_Individual = () => {
- Application + Application
diff --git a/src/pages/Recon/index.js b/src/pages/Recon/index.js index 49f2821..0f860c6 100644 --- a/src/pages/Recon/index.js +++ b/src/pages/Recon/index.js @@ -125,7 +125,7 @@ const Index = () => {
- + Recon Report diff --git a/src/pages/User/DetailPage/index.js b/src/pages/User/DetailPage/index.js index b8afced..945b56c 100644 --- a/src/pages/User/DetailPage/index.js +++ b/src/pages/User/DetailPage/index.js @@ -244,7 +244,7 @@ const UserMaintainPage = () => {
- {isNewRecord ? "Create GLD User" : "Maintain GLD User"} + {isNewRecord ? "Create GLD User" : "Maintain GLD User"}
diff --git a/src/pages/User/DetailsPage_Individual/UserInformationCard_Individual_Pub.js b/src/pages/User/DetailsPage_Individual/UserInformationCard_Individual_Pub.js index 412a4ec..a1b3d7f 100644 --- a/src/pages/User/DetailsPage_Individual/UserInformationCard_Individual_Pub.js +++ b/src/pages/User/DetailsPage_Individual/UserInformationCard_Individual_Pub.js @@ -216,7 +216,7 @@ const UserInformationCard_Individual_Pub = ({ formData, loadDataFun }) => { - + : diff --git a/src/pages/User/SearchPage/index.js b/src/pages/User/SearchPage/index.js index cda72c3..d0afda3 100644 --- a/src/pages/User/SearchPage/index.js +++ b/src/pages/User/SearchPage/index.js @@ -80,7 +80,7 @@ const UserSettingPage = () => {
- View GLD User + View GLD User
diff --git a/src/pages/User/SearchPage_Individual/index.js b/src/pages/User/SearchPage_Individual/index.js index 44d0b30..ae7b3e3 100644 --- a/src/pages/User/SearchPage_Individual/index.js +++ b/src/pages/User/SearchPage_Individual/index.js @@ -75,7 +75,7 @@ const UserSearchPage_Individual = () => {
- + View Individual User diff --git a/src/pages/User/SearchPage_Organization/index.js b/src/pages/User/SearchPage_Organization/index.js index 1730740..14c8b17 100644 --- a/src/pages/User/SearchPage_Organization/index.js +++ b/src/pages/User/SearchPage_Organization/index.js @@ -76,7 +76,7 @@ const UserSearchPage_Organization = () => {
- View Organisation User + View Organisation User
diff --git a/src/pages/dashboard/GLD/index.js b/src/pages/dashboard/GLD/index.js index 42608f5..01fa246 100644 --- a/src/pages/dashboard/GLD/index.js +++ b/src/pages/dashboard/GLD/index.js @@ -38,7 +38,7 @@ const DashboardDefault = () => {
- + {getWelcomeMsg()}, {userData.fullenName} diff --git a/src/pages/pnspsUserGroupDetailPage/index.js b/src/pages/pnspsUserGroupDetailPage/index.js index cc625d1..6b284e7 100644 --- a/src/pages/pnspsUserGroupDetailPage/index.js +++ b/src/pages/pnspsUserGroupDetailPage/index.js @@ -177,7 +177,7 @@ const UserMaintainPage = () => {
- {isNewRecord ? "Create User Group" : "Maintain User Group"} + {isNewRecord ? "Create User Group" : "Maintain User Group"}
diff --git a/src/pages/pnspsUserGroupSearchPage/index.js b/src/pages/pnspsUserGroupSearchPage/index.js index 0d3a700..b8ce256 100644 --- a/src/pages/pnspsUserGroupSearchPage/index.js +++ b/src/pages/pnspsUserGroupSearchPage/index.js @@ -83,7 +83,7 @@ const UserGroupSearchPanel = () => {
- + View User Group diff --git a/src/utils/FieldUtils.js b/src/utils/FieldUtils.js index cd6b3e5..e415940 100644 --- a/src/utils/FieldUtils.js +++ b/src/utils/FieldUtils.js @@ -11,7 +11,7 @@ export const notNullFieldLabel = (label) => { export const getDateField = ({ label, valueName, form, disabled }) => { - return + return {label} @@ -29,7 +29,7 @@ export const getDateField = ({ label, valueName, form, disabled }) => { export const getTextField = ({ label, valueName, form, disabled }) => { return - + {label} @@ -48,7 +48,7 @@ export const getTextField = ({ label, valueName, form, disabled }) => { } export const getTextArea = ({ label, valueName, form, disabled, inputProps, ...props }) => { - return + return {label} @@ -76,7 +76,7 @@ export const getTextArea = ({ label, valueName, form, disabled, inputProps, ...p export const getPhoneField = ({ label, valueName, form, disabled }) => { - return + return {label} @@ -122,7 +122,7 @@ export const getPhoneField = ({ label, valueName, form, disabled }) => { export const getAddressField = ({ label, valueName, form, disabled }) => { - return + return {label} @@ -159,7 +159,7 @@ export const getAddressField = ({ label, valueName, form, disabled }) => { export const getComboField = ({ label, dataList, valueName, form, disabled, getOptionLabel, onInputChange, onChange, filterOptions, ...props }) => { let err = Boolean(form.errors[valueName]); - return + return {label}