onAction('deactivate', record.id)} className={style.ResearcherStatusButton}>
-
onAction('suspend', record.id)} className={style.ResearcherStatusButton}>
+
);
- case false:
+ case 'suspended':
return (
-
onAction('activate', record.id)} className={style.ResearcherStatusButton}>
-
+
+
+
+ onAction('reactivate', record.id)}>
+
+
);
default:
@@ -162,8 +145,7 @@ const ResearchersTable = ({...props}) => {
const renderStatus = (record) => {
return (
- {renderResearcherApprovedStatus(record)}
- {renderResearcherActiveStatus(record)}
+ {renderResearcherStatus(record)}
)
}
@@ -177,7 +159,7 @@ const ResearchersTable = ({...props}) => {
okType: 'danger',
cancelText: 'No',
onOk() {
- remove(`/v1//researchers-db/researchers/${id}/`).then(() => {
+ remove(`/v1/research/researcher/${id}/`).then(() => {
handleDelete(data.length);
deleteAlert();
refresh();
@@ -203,7 +185,11 @@ const ResearchersTable = ({...props}) => {
return (
-
+
{
- const { params, tableState, handleTableChange} = useTable('researchers-visits');
- const { data, loading, refresh} = useData(`/v1/research/visits`, params);
+ const { data, loading, refresh, tableState, handleDataChange, handleTableChange} = useTable('researcherVisits', `/v1/research/visits`);
const [createFormOpen, setCreateFormOpen] = useState(true);
@@ -25,6 +24,18 @@ const ResearchersTable = ({...props}) => {
key: 'researcher__last_name',
width: 200,
sorter: true,
+ }, {
+ title: 'Email',
+ dataIndex: 'email',
+ key: 'researcher__email',
+ width: 150,
+ sorter: true,
+ }, {
+ title: 'Card No.',
+ dataIndex: 'card_number',
+ key: 'researcher__card_number',
+ width: 100,
+ sorter: true,
}, {
title: 'Check In',
dataIndex: 'check_in',
@@ -40,6 +51,12 @@ const ResearchersTable = ({...props}) => {
},
];
+ useEffect(() => {
+ if (data) {
+ handleDataChange(data.count)
+ }
+ }, [data]);
+
const onCheckOut = (data) => {
const { confirm } = Modal;
@@ -94,7 +111,7 @@ const ResearchersTable = ({...props}) => {
return (
-
+
diff --git a/components/Tables/RestrictedRequestsTable.js b/components/Tables/RestrictedRequestsTable.js
new file mode 100644
index 0000000..aeb020c
--- /dev/null
+++ b/components/Tables/RestrictedRequestsTable.js
@@ -0,0 +1,254 @@
+import {Badge, Button, Popconfirm, Popover, Table, Tooltip} from "antd";
+import React, {useEffect} from "react";
+import {
+ CheckOutlined, CloseOutlined, FileProtectOutlined, InfoCircleOutlined, CheckSquareOutlined
+} from "@ant-design/icons";
+import TableFilters from "./TableFilters";
+import style from './Table.module.scss';
+import {useTable} from "../../utils/hooks/useTable";
+import moment from "moment";
+import {AiOutlineLoading} from "react-icons/ai";
+import {put} from "../../utils/api";
+
+const STATUS = {
+ 'new': 'New',
+ 'approved': 'Approved',
+ 'rejected': 'Rejected',
+ 'lifted': 'Lifted',
+ 'approved_on_site': 'Approved for on-site'
+}
+
+const RestrictedRequestsTable = ({...props}) => {
+ const { data, loading, refresh , tableState,
+ handleDataChange, handleTableChange, handleExpandedRowsChange, handleFilterChange } = useTable('restricted-requests', `/v1/research/restricted-requests`);
+
+ useEffect(() => {
+ if (data) {
+ handleDataChange(data.count)
+ }
+ }, [data]);
+
+ const columns = [
+ {
+ title: 'Reference Code',
+ dataIndex: 'reference_code',
+ key: 'request_item__container__archival_unit__reference_code',
+ width: 200,
+ sorter: true,
+ }, {
+ title: 'View',
+ key: 'view',
+ width: 100,
+ sorter: false,
+ render: (record) => renderView(record)
+ }, {
+ title: 'Researcher',
+ key: 'request_item__request__researcher__last_name',
+ render: (record) => renderResearcher(record),
+ sorter: true,
+ }, {
+ title: 'Planned Visit',
+ dataIndex: 'request_date',
+ key: 'request_item__request__request_date',
+ render: (data) => renderDate(data) ,
+ sorter: true,
+ }, {
+ title: 'Status',
+ dataIndex: 'status',
+ key: 'status',
+ width: 140,
+ className: style.ActionColumn,
+ render: (data) => renderStatus(data),
+ }, {
+ title: 'Info',
+ width: 50,
+ className: style.ActionColumn,
+ render: (data) => renderInfo(data),
+ }, {
+ title: 'Actions',
+ width: 100,
+ className: style.ActionColumn,
+ render: (data) => renderActions(data),
+ }
+ ];
+
+ const renderDate = (data) => {
+ return (moment(data).format('YYYY-MM-DD, dddd'))
+ }
+
+ const renderStatus = (data) => {
+ const getColor = () => {
+ switch (data) {
+ case 'new':
+ return '#e03c3c';
+ case 'approved':
+ return '#83c04d';
+ case 'approved_on_site':
+ return '#4dc098';
+ case 'rejected':
+ return '#e06d3c';
+ case 'lifted':
+ return '#223f00';
+ }
+ }
+
+ return (
+
+ )
+ }
+
+ const onAccept = (record) => {
+ put(`/v1/research/restricted-requests/approve/${record.id}/`).then(() => {
+ refresh();
+ })
+ }
+
+ const onAcceptOnSite = (record) => {
+ put(`/v1/research/restricted-requests/approve_on_site/${record.id}/`).then(() => {
+ refresh();
+ })
+ }
+
+ const onReject = (record) => {
+ put(`/v1/research/restricted-requests/reject/${record.id}/`).then(() => {
+ refresh();
+ })
+ }
+
+ const onLift = (record) => {
+ put(`/v1/research/restricted-requests/lift/${record.id}/`).then(() => {
+ refresh();
+ })
+ }
+
+ const renderActions = (record) => {
+ return (
+
+
+ Are you sure you would like to approve access for this item
but keep it's restricted status?}
+ icon={}
+ onConfirm={() => onAccept(record)}
+ okText="Yes"
+ cancelText="No"
+ placement="left"
+ >
+ }/>
+
+
+
+ Are you sure you would like to approve access for on-site viewing for this item
but keep it's restricted status?}
+ icon={}
+ onConfirm={() => onAcceptOnSite(record)}
+ okText="Yes"
+ cancelText="No"
+ placement="left"
+ >
+ }/>
+
+
+
+ Are you sure you would like to reject access for this item
but keep it's restricted status?}
+ icon={}
+ onConfirm={() => onReject(record)}
+ okText="Yes"
+ cancelText="No"
+ placement="left"
+ >
+ }/>
+
+
+
+ Are you sure you would like to lift the restriction permanently for this item?}
+ icon={}
+ onConfirm={() => onLift(record)}
+ okText="Yes"
+ cancelText="No"
+ placement="left"
+ >
+ } />
+
+
+
+ )
+ }
+
+ const renderView = (record) => {
+ return (
+
+ )
+ }
+
+ const renderInfo = (record) => {
+ const content = (
+
+
+ Research Subject:
+ {record['research_subject']}
+
+
+ Motivation:
+ {record['motivation']}
+
+
{record['researcher']}
+ {record['researcher_email']}
+
+ )
+ } else {
+ return record['researcher']
+ }
+ }
+
+ return (
+
+
+ record.id}
+ dataSource={data ? data.results : []}
+ columns={columns}
+ size={'small'}
+ loading={{
+ spinning: loading,
+ indicator: ,
+ }}
+ pagination={tableState['pagination']}
+ onChange={handleTableChange}
+ />
+
+ )
+};
+
+export default RestrictedRequestsTable;
diff --git a/components/Tables/SimpleTable.js b/components/Tables/SimpleTable.js
index 8a58400..249b835 100644
--- a/components/Tables/SimpleTable.js
+++ b/components/Tables/SimpleTable.js
@@ -6,14 +6,13 @@ import TableFilters from "./TableFilters";
import style from './Table.module.scss';
import Link from "next/link";
import {remove} from "../../utils/api";
-import {useData} from "../../utils/hooks/useData";
import {useTable} from "../../utils/hooks/useTable";
import {deleteAlert} from "./functions/deleteAlert";
const SimpleTable = ({api, columns, module, button, actions=[], footer=true, ...props}) => {
- const { params, tableState, handleDataChange, handleTableChange, handleFilterChange, handleDelete } = useTable(module);
- const { data, loading, refresh} = useData(api, params);
+ const { data, loading, refresh, tableState,
+ handleDataChange, handleTableChange, handleFilterChange, handleDelete } = useTable(module, api);
useEffect(() => {
if (data) {
@@ -55,7 +54,11 @@ const SimpleTable = ({api, columns, module, button, actions=[], footer=true, ...
return (
-
+
{
+const TableFilters = ({onFilterChange, module, filters, ...props}) => {
const renderFilters = () => {
switch (module) {
case 'accessions':
return ;
case 'archival-units':
- return ;
+ return ;
case 'isad':
- return ;
+ return ;
case 'isaar':
- return ;
+ return ;
case 'mlr':
return ;
case 'digitization':
return ;
+ case 'digitization-finding_aids':
+ return ;
case 'researcher':
return
case 'researcher-visits':
return
case 'requests':
return
+ case 'restricted-requests':
+ return
default:
return ;
}
@@ -42,6 +48,7 @@ const TableFilters = ({onFilterChange, module, ...props}) => {