yangli/worldshine-redesign
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix discharged issue

Browse Source
This commit is contained in:
Lixian Zhou
2026-02-05 17:10:06 -05:00
parent 36a16fa658
commit 49d3c16179
19 changed files with 57 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.DS_Store vendored
View File

Binary file not shown.

BIN
app/.DS_Store vendored
View File

Binary file not shown.

BIN
app/views/.DS_Store vendored
View File

Binary file not shown.

12
app/views/asset-manifest.json
View File

@@ -1,16 +1,16 @@
{
"files": {
"main.css": "/static/css/main.7fa0ef40.css",
"main.js": "/static/js/main.ea61a51a.js",
"main.css": "/static/css/main.8bf7011f.css",
"main.js": "/static/js/main.62378aa0.js",
"static/js/787.c4e7f8f9.chunk.js": "/static/js/787.c4e7f8f9.chunk.js",
"static/media/landing.png": "/static/media/landing.d4c6072db7a67dff6a78.png",
"index.html": "/index.html",
"main.7fa0ef40.css.map": "/static/css/main.7fa0ef40.css.map",
"main.ea61a51a.js.map": "/static/js/main.ea61a51a.js.map",
"main.8bf7011f.css.map": "/static/css/main.8bf7011f.css.map",
"main.62378aa0.js.map": "/static/js/main.62378aa0.js.map",
"787.c4e7f8f9.chunk.js.map": "/static/js/787.c4e7f8f9.chunk.js.map"
},
"entrypoints": [
"static/css/main.7fa0ef40.css",
"static/js/main.ea61a51a.js"
"static/css/main.8bf7011f.css",
"static/js/main.62378aa0.js"
]
}

2
app/views/index.html
View File

@@ -1 +1 @@
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/4.17.10/lodash.min.js"></script><link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0/css/all.min.css"><link rel="manifest" href="/manifest.json"/><title>Worldshine Transportation</title><script defer="defer" src="/static/js/main.ea61a51a.js"></script><link href="/static/css/main.7fa0ef40.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/4.17.10/lodash.min.js"></script><link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0/css/all.min.css"><link rel="manifest" href="/manifest.json"/><title>Worldshine Transportation</title><script defer="defer" src="/static/js/main.62378aa0.js"></script><link href="/static/css/main.8bf7011f.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>

7
app/views/static/css/main.7fa0ef40.css
View File

File diff suppressed because one or more lines are too long

1
app/views/static/css/main.7fa0ef40.css.map
View File

File diff suppressed because one or more lines are too long

7
app/views/static/css/main.8bf7011f.css Normal file
View File

File diff suppressed because one or more lines are too long

1
app/views/static/css/main.8bf7011f.css.map Normal file
View File

File diff suppressed because one or more lines are too long

3
app/views/static/js/main.62378aa0.js Normal file
View File

File diff suppressed because one or more lines are too long

0
app/views/static/js/main.ea61a51a.js.LICENSE.txt → app/views/static/js/main.62378aa0.js.LICENSE.txt
View File

2
app/views/static/js/main.ea61a51a.js.map → app/views/static/js/main.62378aa0.js.map
View File

File diff suppressed because one or more lines are too long

3
app/views/static/js/main.ea61a51a.js
View File

File diff suppressed because one or more lines are too long

BIN
client/.DS_Store vendored
View File

Binary file not shown.

34
client/package-lock.json generated
View File

@@ -26,6 +26,7 @@
"browser-image-compression": "^2.0.0",
"chart.js": "^4.5.0",
"immutability-helper": "^3.1.1",
"moment": "^2.30.1",
"react": "^18.1.0",
"react-bootstrap": "^2.4.0",
"react-bootstrap-icons": "^1.11.5",
@@ -6463,9 +6464,9 @@
}
},
"node_modules/caniuse-lite": {
"version": "1.0.30001338",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001338.tgz",
"integrity": "sha512-1gLHWyfVoRDsHieO+CaeYe7jSo/MT7D7lhaXUiwwbuR5BwQxORs0f1tAwUSQr3YbxRXJvxHM/PA5FfPQRnsPeQ==",
"version": "1.0.30001768",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001768.tgz",
"integrity": "sha512-qY3aDRZC5nWPgHUgIB84WL+nySuo19wk0VJpp/XI9T34lrvkyhRvNVOFJOp2kxClQhiFBu+TaUSudf6oa3vkSA==",
"funding": [
{
"type": "opencollective",
@@ -6474,8 +6475,13 @@
{
"type": "tidelift",
"url": "https://tidelift.com/funding/github/npm/caniuse-lite"
},
{
"type": "github",
"url": "https://github.com/sponsors/ai"
}
]
],
"license": "CC-BY-4.0"
},
"node_modules/case-sensitive-paths-webpack-plugin": {
"version": "2.4.0",
@@ -14625,6 +14631,15 @@
"safe-buffer": "~5.1.0"
}
},
"node_modules/moment": {
"version": "2.30.1",
"resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
"integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
"license": "MIT",
"engines": {
"node": "*"
}
},
"node_modules/ms": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -26651,9 +26666,9 @@
}
},
"caniuse-lite": {
"version": "1.0.30001338",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001338.tgz",
"integrity": "sha512-1gLHWyfVoRDsHieO+CaeYe7jSo/MT7D7lhaXUiwwbuR5BwQxORs0f1tAwUSQr3YbxRXJvxHM/PA5FfPQRnsPeQ=="
"version": "1.0.30001768",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001768.tgz",
"integrity": "sha512-qY3aDRZC5nWPgHUgIB84WL+nySuo19wk0VJpp/XI9T34lrvkyhRvNVOFJOp2kxClQhiFBu+TaUSudf6oa3vkSA=="
},
"case-sensitive-paths-webpack-plugin": {
"version": "2.4.0",
@@ -32755,6 +32770,11 @@
}
}
},
"moment": {
"version": "2.30.1",
"resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
"integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how=="
},
"ms": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",

1
client/package.json
View File

@@ -21,6 +21,7 @@
"browser-image-compression": "^2.0.0",
"chart.js": "^4.5.0",
"immutability-helper": "^3.1.1",
"moment": "^2.30.1",
"react": "^18.1.0",
"react-bootstrap": "^2.4.0",
"react-bootstrap-icons": "^1.11.5",

BIN
client/src/.DS_Store vendored
View File

Binary file not shown.

8
client/src/components/dashboard/DashboardCustomersList.js
View File

@@ -147,9 +147,11 @@ const DashboardCustomersList = () => {
// Active/Inactive filter
if (showInactive) {
filtered = filtered.filter(item => (item.type === CUSTOMER_TYPE.TRANSFERRED || item.type === CUSTOMER_TYPE.DECEASED || item.type === CUSTOMER_TYPE.DISCHARED) && item.status !== 'active');
// Discharged Customers tab: show customers with type discharged, transferred, or deceased
filtered = filtered.filter(item => item.type === CUSTOMER_TYPE.TRANSFERRED || item.type === CUSTOMER_TYPE.DECEASED || item.type === CUSTOMER_TYPE.DISCHARGED);
} else {
filtered = filtered.filter(item => (item.type !== CUSTOMER_TYPE.TRANSFERRED && item.type!=CUSTOMER_TYPE.DECEASED && item.type!=CUSTOMER_TYPE.DISCHARED) && item.status === 'active');
// Active Customers tab: show customers who are active AND not discharged/transferred/deceased
filtered = filtered.filter(item => item.status === 'active' && item.type !== CUSTOMER_TYPE.TRANSFERRED && item.type !== CUSTOMER_TYPE.DECEASED && item.type !== CUSTOMER_TYPE.DISCHARGED);
}
// Health condition filter
@@ -397,7 +399,7 @@ const DashboardCustomersList = () => {
<Tab eventKey="activeCustomers" title="Active Customers">
{table}
</Tab>
<Tab eventKey="archivedCustomers" title="Discharge Customers">
<Tab eventKey="archivedCustomers" title="Discharged Customers">
{table}
</Tab>
</Tabs>

6
client/src/shared/constants/customer.constant.js
View File

@@ -14,7 +14,11 @@ export const PICKUP_STATUS_TEXT = {
export const CUSTOMER_TYPE = {
MEMBER: 'member',
VISITOR: 'visitor'
VISITOR: 'visitor',
SELF_PAY: 'self_pay',
TRANSFERRED: 'transferred',
DECEASED: 'deceased',
DISCHARGED: 'discharged'
}
export const CUSTOMER_TYPE_TEXT = {