@@ -391,13 +398,14 @@ const BandoViewBeneficiario = () => {
icon="pi pi-download" iconPos="right"/>*/}
diff --git a/src/pages/DashboardBeneficiario/components/LatestBandiTable/index.js b/src/pages/DashboardBeneficiario/components/LatestBandiTable/index.js
index b852369..e096145 100644
--- a/src/pages/DashboardBeneficiario/components/LatestBandiTable/index.js
+++ b/src/pages/DashboardBeneficiario/components/LatestBandiTable/index.js
@@ -1,4 +1,4 @@
-import React, { useState, useEffect} from 'react';
+import React, { useState, useEffect } from 'react';
import { __ } from '@wordpress/i18n';
import { uniq } from 'ramda';
@@ -89,9 +89,18 @@ const LatestBandiTable = () => {
const initFilters = () => {
setFilters({
global: { value: null, matchMode: FilterMatchMode.CONTAINS },
- name: { operator: FilterOperator.AND, constraints: [{ value: null, matchMode: FilterMatchMode.STARTS_WITH }] },
- start_date: { operator: FilterOperator.AND, constraints: [{ value: null, matchMode: FilterMatchMode.DATE_IS }] },
- end_date: { operator: FilterOperator.AND, constraints: [{ value: null, matchMode: FilterMatchMode.DATE_IS }] },
+ name: {
+ operator: FilterOperator.AND,
+ constraints: [{ value: null, matchMode: FilterMatchMode.STARTS_WITH }]
+ },
+ start_date: {
+ operator: FilterOperator.AND,
+ constraints: [{ value: null, matchMode: FilterMatchMode.DATE_IS }]
+ },
+ end_date: {
+ operator: FilterOperator.AND,
+ constraints: [{ value: null, matchMode: FilterMatchMode.DATE_IS }]
+ },
status: { operator: FilterOperator.OR, constraints: [{ value: null, matchMode: FilterMatchMode.EQUALS }] }
});
setGlobalFilterValue('');
@@ -100,10 +109,12 @@ const LatestBandiTable = () => {
const renderHeader = () => {
return (
-
+
);
@@ -118,11 +129,12 @@ const LatestBandiTable = () => {
};
const dateFilterTemplate = (options) => {
- return
options.filterCallback(e.value, options.index)} dateFormat="mm/dd/yy" placeholder="mm/dd/yyyy" mask="99/99/9999" />;
+ return options.filterCallback(e.value, options.index)}
+ dateFormat="mm/dd/yy" placeholder="mm/dd/yyyy" mask="99/99/9999"/>;
};
const balanceFilterTemplate = (options) => {
- return options.filterCallback(e.value, options.index)} />;
+ return options.filterCallback(e.value, options.index)}/>;
};
const statusBodyTemplate = (rowData) => {
@@ -130,22 +142,30 @@ const LatestBandiTable = () => {
};
const statusFilterTemplate = (options) => {
- return options.filterCallback(e.value, options.index)} itemTemplate={statusItemTemplate} placeholder="Select One" className="p-column-filter" showClear />;
+ return options.filterCallback(e.value, options.index)}
+ itemTemplate={statusItemTemplate} placeholder="Select One" className="p-column-filter"
+ showClear/>;
};
const statusItemTemplate = (option) => {
- return ;
+ return ;
};
const actionsBodyTemplate = (rowData) => {
- return
-
-
+ return rowData.confidi
+ ?
+
+
+ :
+
+
}
const header = renderHeader();
- return(
+ return (
{
style={{ minWidth: '10rem' }}
body={dateEndBodyTemplate} filter filterElement={dateFilterTemplate}/>
+ style={{ width: '120px' }} body={statusBodyTemplate}/>
diff --git a/src/pages/DashboardBeneficiario/components/MyLatestSubmissionsTable/index.js b/src/pages/DashboardBeneficiario/components/MyLatestSubmissionsTable/index.js
index 5c81745..1c26218 100644
--- a/src/pages/DashboardBeneficiario/components/MyLatestSubmissionsTable/index.js
+++ b/src/pages/DashboardBeneficiario/components/MyLatestSubmissionsTable/index.js
@@ -156,7 +156,7 @@ const MyLatestSubmissionsTable = () => {
{'DRAFT' === rowData.status
?
- : }
}