Feature/hcmpre 1632 #2114
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| { | ||
| "name": "@egovernments/digit-ui-module-campaign-manager", | ||
| "version": "0.4.0", | ||
| "description": "Campaign", | ||
| "main": "dist/index.js", | ||
| "module": "dist/index.modern.js", | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -57,6 +57,9 @@ import MapView from "./components/MapView"; | |
| import NoResultsFound from "./components/NoResultsFound"; | ||
| import UploadDataMappingWrapper from "./components/UploadDataMappingWrapper"; | ||
| import DataUploadWrapper from "./components/DataUploadWrapper"; | ||
| import Attendance from "./pages/employee/Attendance"; | ||
| import IndividualUserTable from "./components/IndividualUserTable"; | ||
| import ProgressBar from "./components/ProgressBar"; | ||
|
|
||
| /** | ||
| * MDMS Module name | ||
|
|
@@ -175,6 +178,9 @@ const componentsToRegister = { | |
| NoResultsFound, | ||
| UploadDataMappingWrapper, | ||
| DataUploadWrapper, | ||
| Attendance, | ||
| IndividualUserTable, | ||
| ProgressBar | ||
| }; | ||
|
|
||
| const overrideHooks = () => { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,257 @@ | ||
| import React, { useState, useCallback, useEffect } from 'react'; | ||
| import { Card, Button, PopUp, Loader, Chip, TextInput } from "@egovernments/digit-ui-components"; | ||
| import DataTable from "react-data-table-component"; | ||
| import { CustomSVG } from "@egovernments/digit-ui-components"; | ||
| import { tableCustomStyle } from "./tableCustomStyle"; | ||
| import { useTranslation } from "react-i18next"; | ||
| import ProgressBar from './ProgressBar'; | ||
|
|
||
| const SupervisorPopup = ({ setShowPopUp, supervisors }) => { | ||
| const { t } = useTranslation(); | ||
| return ( | ||
| <PopUp | ||
| className="wrapper-popup-boundary-chips" | ||
| style={{ maxWidth: "40%" }} | ||
| type="default" | ||
| heading={t("SUPERVISORS_ASSIGNED")} | ||
| footerChildren={[]} | ||
| onOverlayClick={() => setShowPopUp(false)} | ||
| onClose={() => setShowPopUp(false)} | ||
| > | ||
| <div className="digit-tag-container userAccessCell" | ||
| style={{ | ||
| display: "flex", | ||
| flexWrap: "wrap", | ||
| justifyContent: "flex-start", | ||
| gap: "8px" | ||
| }}> | ||
| {supervisors.map((supervisor, index) => ( | ||
| <Chip | ||
| key={index} | ||
| text={supervisor} | ||
| hideClose={true} | ||
| /> | ||
| ))} | ||
| </div> | ||
| </PopUp> | ||
| ); | ||
| }; | ||
|
|
||
| const IndividualUserTable = ({ tenantId, staffAttendeeIds = [], supervisorName = "" }) => { | ||
| const { t } = useTranslation(); | ||
| const [totalRows, setTotalRows] = useState(0); | ||
| const [currentPage, setCurrentPage] = useState(1); | ||
| const [rowsPerPage, setRowsPerPage] = useState(5); | ||
| const [searchQuery, setSearchQuery] = useState(''); | ||
| const [paginatedData, setPaginatedData] = useState([]); | ||
| const [chipPopUpRowId, setChipPopUpRowId] = useState(null); | ||
|
|
||
| const individualUsers = { | ||
| url: `/health-individual/v1/_search`, | ||
| params: { | ||
| tenantId: tenantId, | ||
| limit: 1000, | ||
| offset: 0 | ||
| }, | ||
| body: { | ||
| Individual: {}, | ||
| }, | ||
| }; | ||
|
Comment on lines
+49
to
+59
There was a problem hiding this comment. 🧹 Nitpick (assertive) Consider implementing server-side pagination The current implementation fetches 1000 records at once which could cause performance issues with large datasets. Consider implementing server-side pagination to fetch only the required records. const individualUsers = {
url: `/health-individual/v1/_search`,
params: {
tenantId: tenantId,
- limit: 1000,
- offset: 0
+ limit: rowsPerPage,
+ offset: (currentPage - 1) * rowsPerPage
},
body: {
Individual: {},
},
};
|
||
|
|
||
| const { isLoading, data, isFetching } = Digit.Hooks.useCustomAPIHook(individualUsers); | ||
|
|
||
| const getDisplayData = useCallback(() => { | ||
| if (!data?.Individual) return []; | ||
|
|
||
| const filteredData = data.Individual.filter(user => { | ||
| const userName = user.name?.givenName?.toLowerCase() || ''; | ||
| return userName.includes(searchQuery.toLowerCase()); | ||
| }).map(user => ({ | ||
| ...user, | ||
| isAssigned: staffAttendeeIds.includes(user.id) | ||
| })); | ||
|
|
||
| setTotalRows(filteredData.length); | ||
|
|
||
| const startIndex = (currentPage - 1) * rowsPerPage; | ||
| const endIndex = startIndex + rowsPerPage; | ||
| return filteredData.slice(startIndex, endIndex); | ||
| }, [data, searchQuery, staffAttendeeIds, currentPage, rowsPerPage]); | ||
|
|
||
| useEffect(() => { | ||
| if (data?.Individual) { | ||
| setPaginatedData(getDisplayData()); | ||
| } | ||
| }, [data, searchQuery, currentPage, rowsPerPage, getDisplayData]); | ||
|
|
||
| const handlePaginationChange = (page) => { | ||
| setCurrentPage(page); | ||
| }; | ||
|
|
||
| const handleRowsPerPageChange = (newPerPage) => { | ||
| setRowsPerPage(newPerPage); | ||
| setCurrentPage(1); | ||
| }; | ||
|
|
||
| const handleSearchChange = (e) => { | ||
| setSearchQuery(e.target.value); | ||
| setCurrentPage(1); | ||
| }; | ||
|
|
||
| const handleAssign = (userId) => { | ||
| //code to be written | ||
| }; | ||
|
|
||
| const handleUnassign = (userId) => { | ||
| //code to be written | ||
| }; | ||
|
Comment on lines
+101
to
+107
There was a problem hiding this comment. 🧹 Nitpick (assertive) Implement missing core functionality The handleAssign and handleUnassign functions are not implemented, which will result in non-functional assign/unassign buttons. Would you like me to help implement these functions or create GitHub issues to track this task? |
||
|
|
||
| const columns = [ | ||
| { | ||
| name: t('Name'), | ||
| selector: row => row.name?.givenName || '', | ||
| sortable: true, | ||
| }, | ||
| { | ||
| name: t('Mobile Number'), | ||
| selector: row => row.mobileNumber || '', | ||
| sortable: true, | ||
| }, | ||
| { | ||
| name: t("USER_TYPE"), | ||
| selector: row => row?.userDetails?.type || '', | ||
| sortable: true | ||
| }, | ||
| { | ||
| name: t('Assigned Supervisor'), | ||
| selector: row => row.isAssigned ? supervisorName : t('Not Assigned'), | ||
| sortable: true, | ||
| grow: 2, | ||
| cell: row => { | ||
| const supervisors = row.isAssigned ? [supervisorName] : []; | ||
|
|
||
| return ( | ||
| <div className="digit-tag-container"> | ||
| {supervisors.length > 0 ? ( | ||
| <div className="chip-container"> | ||
| {supervisors.slice(0, 2).map((supervisor, index) => ( | ||
| <div key={index} className="chip-wrapper"> | ||
| <Chip | ||
| text={supervisor} | ||
| hideClose={true} | ||
| /> | ||
| </div> | ||
| ))} | ||
|
|
||
| {supervisors.length > 2 && ( | ||
| <Button | ||
| label={`+${supervisors.length - 2} ${t("ES_MORE")}`} | ||
| variation="link" | ||
| onClick={() => setChipPopUpRowId(row.id)} | ||
| className="more-button" | ||
| style={{ | ||
| height: "2rem", | ||
| minWidth: "4.188rem", | ||
| minHeight: "2rem", | ||
| padding: "0.5rem" | ||
| }} | ||
| textStyles={{ | ||
| fontSize: "0.875rem", | ||
| fontWeight: "400", | ||
| color: "#C84C0E", | ||
| }} | ||
| /> | ||
| )} | ||
|
|
||
| {chipPopUpRowId === row.id && ( | ||
| <SupervisorPopup | ||
| setShowPopUp={setChipPopUpRowId} | ||
| supervisors={supervisors} | ||
| /> | ||
| )} | ||
| </div> | ||
| ) : ( | ||
| <span className="text-gray-400">{t('Not Assigned')}</span> | ||
| )} | ||
| </div> | ||
| ); | ||
| }, | ||
| }, | ||
| { | ||
| name: t('Actions'), | ||
| cell: row => ( | ||
| <div> | ||
| {row.isAssigned ? ( | ||
| <Button | ||
| label={t('Unassign')} | ||
| variation="secondary" | ||
| icon="Close" | ||
| onClick={() => handleUnassign(row.id)} | ||
| /> | ||
| ) : ( | ||
| <Button | ||
| label={t('Assign')} | ||
| variation="primary" | ||
| icon="CheckCircle" | ||
| onClick={() => handleAssign(row.id)} | ||
| /> | ||
| )} | ||
| </div> | ||
| ) | ||
| }, | ||
| ]; | ||
|
|
||
| return ( | ||
| <div className="w-full"> | ||
| {isLoading && <Loader />} | ||
| {!isLoading && ( | ||
| <div> | ||
| <Card type={"secondary"} style={{ maxWidth: "100%", overflow: "auto", marginBottom: "1rem" }}> | ||
| <div> | ||
| <div style={{ marginBottom: "0.5rem" }}>{t("USER_NAME")}</div> | ||
| <TextInput | ||
| style={{ maxWidth: "fit-content" }} | ||
| disabled={false} | ||
| className="textinput-example" | ||
| type="text" | ||
| name={t("USER_NAME")} | ||
| value={searchQuery} | ||
| onChange={handleSearchChange} | ||
| placeholder={t("SEARCH_BY_NAME")} | ||
| /> | ||
| </div> | ||
| </Card> | ||
|
|
||
| <DataTable | ||
| columns={columns} | ||
| data={paginatedData} | ||
| progressPending={isLoading || isFetching} | ||
| progressComponent={<Loader />} | ||
| pagination | ||
| paginationServer | ||
| customStyles={tableCustomStyle} | ||
| paginationTotalRows={totalRows} | ||
| onChangePage={handlePaginationChange} | ||
| onChangeRowsPerPage={handleRowsPerPageChange} | ||
| paginationPerPage={rowsPerPage} | ||
| sortIcon={<CustomSVG.SortUp width="16px" height="16px" fill="#0b4b66" />} | ||
| paginationRowsPerPageOptions={[5, 10, 15, 20]} | ||
| noDataComponent={<div>{t('No records found')}</div>} | ||
| /> | ||
|
|
||
| {/* Progress Bar Section */} | ||
| <div style={{ display: "flex", justifyContent: "space-between", alignItems: "center", marginTop: "1rem" }}> | ||
| <div style={{ display: "flex", alignItems: "center", gap: "1rem" }}> | ||
| <span style={{ fontWeight: 600 }}>{t("REGISTER_ASSIGNED_USERS")}</span> | ||
| <ProgressBar amount={40} total={100} /> | ||
| <span style={{ fontWeight: 600 }}>{`${40}%`}</span> | ||
| </div> | ||
| </div> | ||
|
Comment on lines
+242
to
+249
There was a problem hiding this comment. 🛠️ Refactor suggestion Replace hardcoded progress values with dynamic calculation The progress bar is using hardcoded values (40%) instead of calculating the actual progress based on assigned users. - <ProgressBar amount={40} total={100} />
- <span style={{ fontWeight: 600 }}>{`${40}%`}</span>
+ <ProgressBar amount={staffAttendeeIds.length} total={data?.Individual?.length || 0} />
+ <span style={{ fontWeight: 600 }}>{`${Math.round((staffAttendeeIds.length / (data?.Individual?.length || 1)) * 100)}%`}</span>
|
||
| </div> | ||
| )} | ||
| </div> | ||
| ); | ||
|
|
||
| }; | ||
|
|
||
| export default IndividualUserTable; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
| @@ -0,0 +1,15 @@ | ||||||||
| import React from 'react'; | ||||||||
|
|
||||||||
| const ProgressBar = ({ amount, total }) => { | ||||||||
| const percentage = Math.min((amount / total) * 100, 100); | ||||||||
|
There was a problem hiding this comment. Handle division by zero when If Apply this diff: const ProgressBar = ({ amount, total }) => {
- const percentage = Math.min((amount / total) * 100, 100);
+ const percentage = total > 0 ? Math.min((amount / total) * 100, 100) : 0;📝 Committable suggestion
Suggested change
|
||||||||
|
|
||||||||
| return ( | ||||||||
| <div className="progress-bar-container"> | ||||||||
| <div className="progress-bar-fill" style={{ width: `${percentage}%` }}> | ||||||||
| <span className="progress-bar-text">{`${percentage.toFixed(1)}%`}</span> | ||||||||
| </div> | ||||||||
| </div> | ||||||||
| ); | ||||||||
| }; | ||||||||
|
|
||||||||
| export default ProgressBar; | ||||||||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🧹 Nitpick (assertive)
Consider enhancing the attendance cell layout.
The flex container could benefit from additional properties for better layout control and responsiveness.
.attendanceCell { display: flex; + align-items: center; + gap: 1rem; + flex-wrap: wrap; }📝 Committable suggestion