diff --git a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Roles/Index.cshtml b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Roles/Index.cshtml index d2ef365c4..40928c600 100644 --- a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Roles/Index.cshtml +++ b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Roles/Index.cshtml @@ -31,12 +31,21 @@ } +
+
+
+

@L["Roles"]

+
-@section content_toolbar { - @await Component.InvokeAsync(typeof(AbpPageToolbarViewComponent), new { pageName = typeof(IndexModel).FullName }) -} - - - - - +
+ +
+ +
+ +
+
+
+ +
+
diff --git a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Roles/index.css b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Roles/index.css index 057d40a93..aa095676a 100644 --- a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Roles/index.css +++ b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Roles/index.css @@ -16,11 +16,6 @@ margin: 0.25rem; } -#AbpContentToolbar { - display: flex !important; - background-color: transparent; -} - #IdentityRolesWrapper { background-color: transparent; } diff --git a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Roles/index.js b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Roles/index.js index 7ceb16ebb..4d1c5d5df 100644 --- a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Roles/index.js +++ b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Roles/index.js @@ -1,6 +1,5 @@ -(function ($) { +$(function () { let l = abp.localization.getResource('AbpIdentity'); - let _identityRoleAppService = volo.abp.identity.identityRole; let _permissionsModal = new abp.ModalManager( abp.appPath + 'AbpPermissionManagement/PermissionManagementModal' @@ -78,6 +77,10 @@ [ { title: l("Actions"), + orderable: false, + className: 'notexport text-center', + name: 'rowActions', + index: 0, rowAction: { items: abp.ui.extensions.entityActions.get('identity.role').actions.toArray() } @@ -113,36 +116,46 @@ }, 0 //adds as the first contributor ); - - $(function () { - let _$table = $('#IdentityRolesTable'); - _dataTable = _$table.DataTable( - abp.libs.datatables.normalizeConfiguration({ - order: [[1, 'asc']], - searching: true, - processing: true, - serverSide: true, - scrollX: true, - paging: true, - ajax: abp.libs.datatables.createAjax( - _identityRoleAppService.getList - ), - columnDefs: abp.ui.extensions.tableColumns.get('identity.role').columns.toArray() - }) - ); + $.fn.dataTable.Buttons.defaults.dom.button.className = 'btn flex-none'; + let actionButtons = [ + ...commonTableActionButtons(l('Roles')) + ]; - _createModal.onResult(function () { - _dataTable.ajax.reloadEx(); - }); + let dt = $('#IdentityRolesTable'); + let listColumns = abp.ui.extensions.tableColumns.get('identity.role').columns.toArray(); + let defaultVisibleColumns = listColumns.map((item) => { return item['data']; }); - _editModal.onResult(function () { - _dataTable.ajax.reloadEx(); - }); + _dataTable = initializeDataTable({ + dt, + defaultVisibleColumns, + listColumns, + maxRowsPerPage: 25, + defaultSortColumn: 1, + dataEndpoint: _identityRoleAppService.getList, + data: {}, + responseCallback: function (result) { + return { + recordsTotal: result.totalCount, + recordsFiltered: result.items.length, + data: result.items + }; + }, + actionButtons, + pagingEnabled: true, + reorderEnabled: false, + languageSetValues: {}, + dataTableName: 'IdentityRolesTable', + dynamicButtonContainerId: 'dynamicButtonContainerId', + useNullPlaceholder: true, + externalSearchId: 'search-roles' + }); + + _createModal.onResult(function () { + _dataTable.ajax.reloadEx(); + }); - $('#AbpContentToolbar button[name=CreateRole]').click(function (e) { - e.preventDefault(); - _createModal.open(); - }); + _editModal.onResult(function () { + _dataTable.ajax.reloadEx(); }); -})(jQuery); +}); diff --git a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/Index.cshtml b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/Index.cshtml index 90a2ce392..c92827008 100644 --- a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/Index.cshtml +++ b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/Index.cshtml @@ -32,11 +32,21 @@ } -@section content_toolbar { - @await Component.InvokeAsync(typeof(AbpPageToolbarViewComponent), new { pageName = typeof(IndexModel).FullName }) -} - - - - - +
+
+
+

@L["Users"]

+
+ +
+ +
+ +
+ +
+
+
+ +
+
diff --git a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/index.css b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/index.css index 51d5bddc6..318e48a77 100644 --- a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/index.css +++ b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/index.css @@ -25,11 +25,6 @@ cursor: pointer; } -#AbpContentToolbar { - display: flex !important; - background-color: transparent; -} - #UsersWrapper { background-color: transparent; } diff --git a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/index.js b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/index.js index 08b890f2e..5add6f00a 100644 --- a/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/index.js +++ b/applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/index.js @@ -1,5 +1,6 @@ -(function ($) { - let l = abp.localization.getResource('AbpIdentity'); +$(function () { + const l = abp.localization.getResource('AbpIdentity'); + const lg = abp.localization.getResource('GrantManager'); let _identityUserAppService = volo.abp.identity.identityUser; let _userImportService = unity.grantManager.identity.userImport; @@ -63,30 +64,30 @@ ) $('#ImportUserSearchButton').click(function (e) { - e.preventDefault(); + e.preventDefault(); _filterDataTable.ajax.reloadEx(); $('#import-user-btn').attr('disabled', true); - }); + }); $('#cancel-import-btn').click(function (e) { _importModal.close(); }); - _filterDataTable.on('select', function (e, dt, type, indexes) { + _filterDataTable.on('select', function (e, dt, type, indexes) { if (type === 'row') { - let selectedData = _filterDataTable.row(indexes).data(); + let selectedData = _filterDataTable.row(indexes).data(); $('#import-user-id').val(selectedData.userGuid); $('#import-user-btn').removeAttr('disabled'); - } + } }); _filterDataTable.on('deselect', function (e, dt, type, indexes) { $('#import-user-id').val(); $('#import-user-btn').attr('disabled', true); - }); + }); _importModal.onResult(function () { - _dataTable.ajax.reloadEx(); + dataTable.ajax.reloadEx(); }); } @@ -114,7 +115,7 @@ modalClass: "importUser" }); - let _dataTable = null; + let dataTable = null; abp.ui.extensions.entityActions.get('identity.user').addContributor( function (actionList) { @@ -159,7 +160,7 @@ _identityUserAppService .delete(data.record.id) .then(function () { - _dataTable.ajax.reloadEx(); + dataTable.ajax.reload(); abp.notify.success(l('SuccessfullyDeleted')); }); }, @@ -175,6 +176,11 @@ [ { title: l("Actions"), + sortable: false, + orderable: false, + className: 'notexport text-center', + name: 'rowActions', + index: 0, rowAction: { items: abp.ui.extensions.entityActions.get('identity.user').actions.toArray() } @@ -212,27 +218,56 @@ _importModal.onOpen(function () { setTimeout(() => { _filterDataTable.columns.adjust().draw(); - }); + }); }); - $(function () { - let _$table = $('#UsersTable'); - _dataTable = _$table.DataTable( - abp.libs.datatables.normalizeConfiguration({ - order: [[1, 'asc']], - processing: true, - serverSide: true, - scrollX: true, - paging: true, - ajax: abp.libs.datatables.createAjax( - _identityUserAppService.getList - ), - columnDefs: abp.ui.extensions.tableColumns.get('identity.user').columns.toArray() - }) - ); - - _editModal.onResult(function () { - _dataTable.ajax.reloadEx(); - }); + $.fn.dataTable.Buttons.defaults.dom.button.className = 'btn flex-none'; + let actionButtons = [ + { + text: ' ' + lg('Common:Command:Create') + '', + titleAttr: lg('Common:Command:Create'), + id: 'CreateIntakeButton', + className: 'btn-light rounded-1', + action: function (e, dt, node, config) { + e.preventDefault(); + _importModal.open(); + } + }, + ...commonTableActionButtons(l('Users')) + ]; + + let tableResponseCallback = function (result) { + return { + recordsTotal: result.totalCount, + recordsFiltered: result.items.length, + data: result.items + }; + }; + + let dt = $('#UsersTable'); + let listColumns = abp.ui.extensions.tableColumns.get('identity.user').columns.toArray(); + let defaultVisibleColumns = listColumns.map((item) => { return item['data']; }); + + dataTable = initializeDataTable({ + dt, + defaultVisibleColumns, + listColumns, + maxRowsPerPage: 25, + defaultSortColumn: 1, + dataEndpoint: _identityUserAppService.getList, + data: {}, + responseCallback: tableResponseCallback, + actionButtons, + pagingEnabled: true, + reorderEnabled: false, + languageSetValues: {}, + dataTableName: 'UsersTable', + dynamicButtonContainerId: 'dynamicButtonContainerId', + useNullPlaceholder: true, + externalSearchId: 'search-users' + }); + + _editModal.onResult(function () { + dataTable.ajax.reload(); }); -})(jQuery); +}); diff --git a/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/themes/ux2/table-utils.js b/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/themes/ux2/table-utils.js index 77edba7cd..75ccd29fd 100644 --- a/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/themes/ux2/table-utils.js +++ b/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/themes/ux2/table-utils.js @@ -38,7 +38,7 @@ function removePlaceholderFromCvsExportButton(actionButtons, useNullPlaceholder, function initializeDataTable(options) { const { dt, - defaultVisibleColumns, + defaultVisibleColumns = [], listColumns, maxRowsPerPage, defaultSortColumn, @@ -51,13 +51,17 @@ function initializeDataTable(options) { languageSetValues, dataTableName, dynamicButtonContainerId, - useNullPlaceholder = false + useNullPlaceholder = false, + externalSearchId = 'search', + disableColumnSelect = false, + listColumnDefs, } = options; // If useNullPlaceholder is true, update csv export buttons to include the example format function let updatedActionButtons = removePlaceholderFromCvsExportButton(actionButtons, useNullPlaceholder, nullPlaceholder); + let tableColumns = assignColumnIndices(listColumns); + let visibleColumns = getVisibleColumnIndexes(tableColumns, defaultVisibleColumns); - let visibleColumnsIndex = defaultVisibleColumns.map((name) => listColumns.find(obj => obj.name === name)?.index ?? 0); let filterData = {}; let iDt = dt.DataTable( @@ -71,6 +75,7 @@ function initializeDataTable(options) { paging: pagingEnabled, order: [[defaultSortColumn, 'desc']], searching: true, + externalSearchInputId: `#${externalSearchId}`, iDisplayLength: 25, lengthMenu: [10, 25, 50, 100], scrollX: true, @@ -110,30 +115,32 @@ function initializeDataTable(options) { }, initComplete: function () { }, - columns: listColumns, - columnDefs: [ + columns: tableColumns, + columnDefs: [ { - targets: visibleColumnsIndex, + targets: visibleColumns, visible: true }, { targets: '_all', // Hide all other columns initially - visible: false, + visible: false, // Set default content for all cells to placeholder if null - ...(useNullPlaceholder ? { defaultContent: nullPlaceholder } : {}) - } + ...(useNullPlaceholder ? { defaultContent: nullPlaceholder } : {}) + }, + // Add listColumnDefs if not null or empty + ...(Array.isArray(listColumnDefs) && listColumnDefs.length > 0 ? listColumnDefs : []) ], processing: true, stateSaveParams: function (settings, data) { - let searchValue = $('#search').val(); + let searchValue = $(settings.oInit.externalSearchInputId).val(); data.search.search = searchValue; let hasFilter = data.columns.some(value => value.search.search !== '') || searchValue !== ''; $('#btn-toggle-filter').text(hasFilter ? FilterDesc.With_Filter : FilterDesc.Default); }, stateLoadParams: function (settings, data) { - $('#search').val(data.search.search); + $(settings.oInit.externalSearchInputId).val(data.search.search); data.columns.forEach((column, index) => { if(settings.aoColumns[index] +"" != "undefined") { @@ -147,12 +154,14 @@ function initializeDataTable(options) { ); // Add custom manage columns button that remains sorted alphabetically - iDt.button().add(updatedActionButtons.length + 1 ,{ - text: 'Columns', - extend: 'collection', - buttons: getColumnToggleButtonsSorted(listColumns, iDt), - className: 'custom-table-btn flex-none btn btn-secondary' - }); + if (!disableColumnSelect) { + iDt.button().add(updatedActionButtons.length + 1, { + text: 'Columns', + extend: 'collection', + buttons: getColumnToggleButtonsSorted(tableColumns, iDt), + className: 'custom-table-btn flex-none btn btn-secondary' + }); + } iDt.buttons().container().prependTo(`#${dynamicButtonContainerId}`); $(`#${dataTableName}_wrapper`).append(`
`); @@ -173,11 +182,62 @@ function initializeDataTable(options) { searchFilter(iDt); + setExternalSearchFilter(iDt); + return iDt; } -function setTableHeighDynamic(tableName) { - let tableHeight = $(`#${tableName}_wrapper`)[0].clientHeight; +function assignColumnIndices(columnsArray) { + if (!Array.isArray(columnsArray) || columnsArray.length === 0) { + return []; + } + + const maxExistingIndex = Math.max(...columnsArray + .filter(col => 'index' in col && col.index !== undefined && col.index !== '') + .map(col => parseInt(col.index)) + .concat(-1) + ); + + let nextIndex = maxExistingIndex + 1; + return columnsArray.map(column => { + // Preserve existing index if it exists + if (column.index !== undefined && column.index !== '') { + return column; + } + + // Assign new index starting after max existing index + return { + ...column, + index: nextIndex++ + }; + }); +} + +function getVisibleColumnIndexes(columns, visibleColumnsArray) { + let indexes = []; + + if (Array.isArray(visibleColumnsArray) && visibleColumnsArray.length > 0) { + // Get indexes from provided visible column names. + indexes = visibleColumnsArray + .map(colName => columns.find(col => col.name === colName || col.data === colName)?.index) + .filter(index => typeof index !== 'undefined'); + } else { + // If visibleColumnsArray is empty, include all column indexes. + indexes = columns + .map(col => col.index) + .filter(index => typeof index !== 'undefined'); + } + + // Always add 0 if not already present + if (!indexes.includes(0)) { + indexes.push(0); + } + + return indexes.sort(); +} + +function setTableHeighDynamic(tableName) { + let tableHeight = $(`#${tableName}_wrapper`)[0].clientHeight; let docHeight = document.body.clientHeight; let tableOffset = 425; @@ -195,7 +255,7 @@ function getSelectColumn(title,dataField,uniqueTableId) { className: 'notexport text-center', data: dataField, name: 'select', - render: function (data) { + render: function (data) { return `` }, index: 0 @@ -203,13 +263,13 @@ function getSelectColumn(title,dataField,uniqueTableId) { } function init(iDt) { - $('.custom-table-btn').removeClass('dt-button buttons-csv buttons-html5'); + $('.custom-table-btn').removeClass('dt-button buttons-csv buttons-html5'); iDt.search('').columns().search('').draw(); } function initializeFilterButtonPopover(iDt) { const UIElements = { - search: $('#search'), + search: $(iDt.init().externalSearchInputId), btnToggleFilter: $('#btn-toggle-filter') }; @@ -240,16 +300,12 @@ function initializeFilterButtonPopover(iDt) { placement: 'bottom' }); - - UIElements.btnToggleFilter.on('shown.bs.popover', function () { - const searchElement = $('#search'); + const searchElement = $(iDt.init().externalSearchInputId); const trToggleElement = $(".tr-toggle-filter"); const popoverElement = $('.popover.custom-popover'); const customFilterElement = $('.custom-filter-input'); - - popoverElement.find('#showFilter').on('click', () => { trToggleElement.toggle(); }); @@ -321,18 +377,12 @@ function toggleManageColumnButton(config, dataTable) { column.visible(!column.visible()); } -function getColumnsVisibleByDefault(columns, listColumns) { - return columns - .map((name) => { - return TableUtils.getColumnByName(name, listColumns).index; - }); -} - -function getColumnToggleButtonsSorted(listColumns, dataTable) { +function getColumnToggleButtonsSorted(displayListColumns, dataTable) { let exludeIndxs = [0]; - const res = listColumns + const res = displayListColumns .map((obj) => ({ title: obj.title, data: obj.data, visible: obj.visible, index: obj.index })) .filter(obj => !exludeIndxs.includes(obj.index)) + .filter(obj => obj.title !== 'Actions') .sort((a, b) => a.title.localeCompare(b.title)) .map(a => ({ text: a.title, @@ -344,7 +394,6 @@ function getColumnToggleButtonsSorted(listColumns, dataTable) { } else { node.removeClass('dt-button-active'); } - }, className: 'dt-button dropdown-item buttons-columnVisibility' + isColumnVisToggled(a.title, dataTable), extend: 'columnToggle', @@ -353,6 +402,21 @@ function getColumnToggleButtonsSorted(listColumns, dataTable) { return res; } +function setExternalSearchFilter(dataTableInstance) { + let searchId = dataTableInstance.init().externalSearchInputId; + + // Exclude default search inputs that have custom logic + if (searchId !== false && searchId !== '#search') { + $('.dataTables_filter input').attr("placeholder", "Search"); + $('.dataTables_filter label')[0].childNodes[0].remove(); + + $(searchId).on('input', function () { + let filter = dataTableInstance.search($(this).val()).draw(); + console.info(`Filter on #${searchId}: ${filter}`); + }); + } +} + function updateFilter(dt, dtName, filterData) { let optionsOpen = false; $("#tr-filter").each(function () { @@ -366,7 +430,7 @@ function updateFilter(dt, dtName, filterData) { let column = this; if (column.visible()) { let title = column.header().textContent; - if (title) { + if (title && title !== 'Actions') { let filterValue = filterData[title] ? filterData[title] : ''; @@ -409,7 +473,7 @@ function updateFilter(dt, dtName, filterData) { } function searchFilter(iDt) { - let searchValue = $('#search').val(); + let searchValue = $(iDt.init().externalSearchInputId).val(); if (searchValue) { iDt.search(searchValue).draw(); } @@ -420,7 +484,7 @@ function searchFilter(iDt) { } function updateFilterButton(dt) { - let searchValue = $('#search').val(); + let searchValue = $(dt.init().externalSearchInputId).val(); let columnFiltersApplied = false; dt.columns().every(function () { let search = this.search(); @@ -440,5 +504,47 @@ $('.data-table-select-all').click(function () { } else { PubSub.publish('datatable_select_all', false); } - + +}); + +function commonTableActionButtons(exportTitle) { + return [ + { + text: 'Filter', + id: "btn-toggle-filter", + className: 'btn-secondary custom-table-btn m-0', + action: function (e, dt, node, config) { }, + attr: { + id: 'btn-toggle-filter' + } + }, + { + extend: 'csv', + text: 'Export', + title: exportTitle, + className: 'custom-table-btn flex-none btn btn-secondary hidden-export-btn d-none', + exportOptions: { + columns: ':visible:not(.notexport)', + orthogonal: 'fullName', + format: { + body: function (data, row, column, node) { + return data === nullPlaceholder ? '' : data; + } + } + } + } + ]; +} + +// Toggle hidden export buttons for Ctrl+Alt+Shift+E globally +$(document).keydown(function (e) { + if (e.ctrlKey && e.altKey && + e.shiftKey && e.key === 'E') { + // Toggle d-none class on elements with hidden-export class + $('.hidden-export-btn').toggleClass('d-none'); + + // Prevent default behavior + e.preventDefault(); + return false; + } }); \ No newline at end of file diff --git a/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/themes/ux2/unity-styles.css b/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/themes/ux2/unity-styles.css index b214f3ebd..231db0896 100644 --- a/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/themes/ux2/unity-styles.css +++ b/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/themes/ux2/unity-styles.css @@ -178,7 +178,6 @@ justify-content: space-between; align-items: center; padding: 1rem; - padding-bottom: 6px; } .unity-page-titlebar h4 { @@ -503,6 +502,10 @@ th #btn-toggle-filter-heading { display: none; } +.button-gap-1 > .dt-buttons { + gap: 0.25rem !important; +} + div.dt-buttons div.dropdown-menu { max-height: 35rem !important; overflow-y: auto !important; @@ -853,3 +856,13 @@ div.dataTables_wrapper div.dataTables_filter { .unt-form-switch label { opacity: 0.8 !important; } + +.filter-search-action-bar { + display: flex; + justify-content: flex-end; + align-items: center; +} + +.filter-search-action-bar_search-wrapper { + flex: 1; +} \ No newline at end of file diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Index.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Index.cshtml index 0fb66e97a..433e35701 100644 --- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Index.cshtml +++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Index.cshtml @@ -25,24 +25,19 @@ }
-
-

@L["ApplicationForms"]

-
- - - - - @L["ApplicationForms:UpdateAPIToken"].Value - @L["ApplicationForms:DownloadAPIConfiguration"].Value - - +
+
+

@L["ApplicationForms"]

+
+ +
+ +
+ +
-
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Index.css b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Index.css index 961dfc3a9..ecc228497 100644 --- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Index.css +++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Index.css @@ -40,14 +40,6 @@ flex: 1; } -.dataTables_filter { - display: flex !important; -} - -.ApplicationFormsTable_filter { - margin-top: -20px; -} - input::placeholder { color: #8e8e8e !important; } \ No newline at end of file diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Index.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Index.js index 79561fd3e..2b2c7eb12 100644 --- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Index.js +++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Index.js @@ -6,68 +6,128 @@ viewUrl: '/ApplicationForms/TokenModal', modalClass: 'ManageTokens' }) - let _applicationFormsAppService = unity.grantManager.applicationForms.applicationForm; /** * Application Forms: List All */ - let dataTable = $('#ApplicationFormsTable').DataTable( - abp.libs.datatables.normalizeConfiguration({ - serverSide: false, - paging: true, - order: [[1, "asc"]], - searching: true, - language: { - search: "", - searchPlaceholder: "Search", - }, - scrollX: true, - processing: true, - ajax: abp.libs.datatables.createAjax(_applicationFormsAppService.getList), - columnDefs: [ - { - title: l('Actions'), - rowAction: { - items: - [ - { - text: l('Common:Command:Edit'), - action: function (data) { - updateModal.open({ id: data.record.id }) - } - }, - { - text: l('ApplicationForms:Mapping'), - action: function (data) { - location.href = '/ApplicationForms/Mapping?ApplicationId=' + data.record.id - } - } - ] - } - }, - { - title: l('Common:Name'), - data: "applicationFormName" - }, - { - title: l('Common:Description'), - data: "applicationFormDescription", - }, + let dt = $('#ApplicationFormsTable'); + const listColumns = [ + { + title: l('Actions'), + orderable: false, + className: 'notexport text-center', + data: null, + name: 'rowActions', + index: 0, + rowAction: { + items: + [ + { + text: l('Common:Command:Edit'), + action: function (data) { + updateModal.open({ id: data.record.id }) + } + }, + { + text: l('ApplicationForms:Mapping'), + action: function (data) { + location.href = '/ApplicationForms/Mapping?ApplicationId=' + data.record.id + } + } + ] + } + }, + { + title: l('Common:Name'), + data: 'applicationFormName', + name: 'applicationFormName', + index: 1 + }, + { + title: l('Common:Description'), + data: 'applicationFormDescription', + name: 'applicationFormDescription', + index: 2 + }, + { + title: l('ApplicationForms:Category'), + data: 'category', + name: 'category', + index: 3 + }, + { + title: l('ApplicationForms:ChefsFormId'), + data: 'chefsApplicationFormGuid', + name: 'chefsApplicationFormGuid', + index: 4 + } + ]; + + const defaultVisibleColumns = [ + 'rowActions', + 'applicationFormName', + 'applicationFormDescription', + 'category', + 'chefsApplicationFormGuid' + ]; + + let responseCallback = function (result) { + return { + recordsTotal: result.totalCount, + recordsFiltered: result.items.length, + data: result.items + }; + }; + + $.fn.dataTable.Buttons.defaults.dom.button.className = 'btn flex-none'; + let actionButtons = [ + { + text: ' ' + l('Common:Command:Create') + '', + titleAttr: l('Common:Command:Create'), + id: 'CreateApplicationFormButton', + className: 'btn-light rounded-1', + action: (e, dt, node, config) => createApplicationFormBtn(e) + }, + { + extend: 'collection', + text: ' ' + l('ApplicationForms:APIConfiguration') + '', + titleAttr: l('ApplicationForms:APIConfiguration'), + id: 'FormsManageDropdown', + className: 'btn-light rounded-1', + buttons: [ { - title: l('ApplicationForms:Category'), - data: "category", + text: l('ApplicationForms:UpdateAPIToken'), + id: 'SetApiTokenBtn', + action: (e, dt, node, config) => setApiTokenBtn(e) }, { - title: l('ApplicationForms:ChefsFormId'), - data: "chefsApplicationFormGuid", + text: l('ApplicationForms:DownloadAPIConfiguration'), + id: 'GetApiTokenBtn', + action: (e, dt, node, config) => getApiTokenBtn(e) } ] - }) - ); + }, + ...commonTableActionButtons(l('ApplicationForms')) + ]; - dataTable.on('search.dt', () => handleSearch()); - $('.dataTables_filter input').attr("placeholder", "Search"); - $('.dataTables_filter label')[0].childNodes[0].remove(); + let dataTable = initializeDataTable({ + dt, + defaultVisibleColumns, + listColumns, + maxRowsPerPage: 25, + defaultSortColumn: 1, + dataEndpoint: unity.grantManager.applicationForms.applicationForm.getList, + data: {}, + responseCallback, + actionButtons, + pagingEnabled: true, + reorderEnabled: false, + languageSetValues: {}, + dataTableName: 'ApplicationFormsTable', + dynamicButtonContainerId: 'dynamicButtonContainerId', + useNullPlaceholder: true, + externalSearchId: 'search-forms', + }); createModal.onResult(function () { dataTable.ajax.reload(); @@ -77,17 +137,17 @@ dataTable.ajax.reload(); }); - $('#CreateApplicationFormButton').click(function (e) { + function createApplicationFormBtn(e) { e.preventDefault(); createModal.open(); - }); + }; - $('#SetApiTokenBtn').click(function (e) { + function setApiTokenBtn(e) { e.preventDefault(); tokenModal.open(); - }); + }; - $('#GetApiTokenBtn').click(function (e) { + function getApiTokenBtn(e) { e.preventDefault(); let link = document.createElement("a"); link.setAttribute('download', ''); @@ -95,12 +155,7 @@ document.body.appendChild(link); link.click(); link.remove(); - }); - - function handleSearch() { - let filter = $('.dataTables_filter input').val(); - console.info(filter); - } + }; }); diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantPrograms/Index.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantPrograms/Index.cshtml index 8e44851b2..9f858a354 100644 --- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantPrograms/Index.cshtml +++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantPrograms/Index.cshtml @@ -20,13 +20,22 @@ } -
-
- - @L["GrantPrograms"] - +
+
+
+

@L["GrantPrograms"]

+
+
+ +
+ +
+ +
+
+
+
-
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantPrograms/Index.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantPrograms/Index.js index ab6d52928..b3a341d57 100644 --- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantPrograms/Index.js +++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantPrograms/Index.js @@ -9,7 +9,7 @@ }; }; - let submitTenantSwap = function (data) { + let submitTenantSwap = function (data) { $('#SwapTenantId').val(data); tenantSwapForm.submit(); }; @@ -17,33 +17,50 @@ /** * Users Grant Programs: List All */ - $('#UserGrantProgramsTable').DataTable( - abp.libs.datatables.normalizeConfiguration({ - serverSide: false, - paging: false, - order: [[0, "asc"]], - searching: true, - scrollX: true, - ajax: abp.libs.datatables.createAjax(unity.grantManager.identity.userTenant.getList, null, responseCallback), - columnDefs: [ - { - title: l('Name'), - data: "tenantName" - }, - { - orderable: false, - rowAction: { - items: - [ - { - text: l('Common:Command:Select'), - action: (data) => submitTenantSwap(data.record.tenantId) - } - ] - } - } - ] - }) - ); + let listColumns = [ + { + title: l('Name'), + name: 'tenantName', + data: 'tenantName', + index: 0 + }, + { + title: l('Actions'), + orderable: false, + className: 'notexport text-center', + name: 'rowActions', + data: 'tenantId', + index: 1, + rowAction: { + items: + [ + { + text: l('Common:Command:Select'), + action: (data) => submitTenantSwap(data.record.tenantId) + } + ] + } + } + ]; + + let dt = $('#UserGrantProgramsTable'); + + initializeDataTable({ + dt, + listColumns, + maxRowsPerPage: 25, + defaultSortColumn: 0, + dataEndpoint: unity.grantManager.identity.userTenant.getList, + data: {}, + responseCallback, + actionButtons: [...commonTableActionButtons('Grant Programs')], + pagingEnabled: true, + reorderEnabled: false, + languageSetValues: {}, + dataTableName: 'UserGrantProgramsTable', + dynamicButtonContainerId: 'dynamicButtonContainerId', + externalSearchId: 'search-grant-programs', + disableColumnSelect: true + }); }); diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Intakes/Index.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Intakes/Index.cshtml index 3aba6d6af..0df238eae 100644 --- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Intakes/Index.cshtml +++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Intakes/Index.cshtml @@ -20,15 +20,19 @@ }
-
-

@L["Intakes"]

- +
+
+

@L["Intakes"]

+
+
+ +
+ +
+ +
-
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Intakes/Index.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Intakes/Index.js index 70f2a0527..5a11d15d6 100644 --- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Intakes/Index.js +++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Intakes/Index.js @@ -6,57 +6,107 @@ /** * Intakes: List All */ - let dataTable = $('#IntakesTable').DataTable( - abp.libs.datatables.normalizeConfiguration({ - serverSide: false, - paging: true, - order: [[1, "asc"]], - searching: true, - scrollX: true, - processing: true, - ajax: abp.libs.datatables.createAjax(unity.grantManager.intakes.intake.getList), - columnDefs: [ - { - title: l('Intake'), - data: "intakeName" - }, - { - title: l('Common:StartDate'), - data: "startDate", - render: (data) => luxon - .DateTime - .fromISO(data, { - locale: abp.localization.currentCulture.name - }).toLocaleString(luxon.DateTime.DATE_SHORT) - }, - { - title: l('Common:EndDate'), - data: "endDate", - render: (data) => luxon - .DateTime - .fromISO(data, { - locale: abp.localization.currentCulture.name - }).toLocaleString(luxon.DateTime.DATE_SHORT) - }, - { - title: l("Budget"), - data: "budget" - }, - { - title: l('Common:Command:Edit'), - rowAction: { - items: - [ - { - text: l('Common:Command:Edit'), - action: (data) => updateModal.open({ id: data.record.id }) - } - ] - } - } - ] - }) - ); + $.fn.dataTable.Buttons.defaults.dom.button.className = 'btn flex-none'; + let actionButtons = [ + { + text: ' ' + l('Common:Command:Create') + '', + titleAttr: l('Common:Command:Create'), + id: 'CreateIntakeButton', + className: 'btn-light rounded-1', + action: (e, dt, node, config) => createIntakeBtn(e) + }, + ...commonTableActionButtons(l('Intake')) + ]; + + const listColumns = [ + { + title: l('Intake'), + name: "intakeName", + data: "intakeName", + index: 0 + }, + { + title: l('Common:StartDate'), + name: "startDate", + data: "startDate", + index: 1, + render: (data) => luxon + .DateTime + .fromISO(data, { + locale: abp.localization.currentCulture.name + }).toLocaleString(luxon.DateTime.DATE_SHORT) + }, + { + title: l('Common:EndDate'), + name: "endDate", + data: "endDate", + index: 2, + render: (data) => luxon + .DateTime + .fromISO(data, { + locale: abp.localization.currentCulture.name + }).toLocaleString(luxon.DateTime.DATE_SHORT) + }, + { + title: l("Budget"), + name: "budget", + data: "budget", + index: 3 + }, + { + title: l('Actions'), + orderable: false, + className: 'notexport text-center', + name: 'rowActions', + index: 4, + rowAction: { + items: + [ + { + text: l('Common:Command:Edit'), + action: (data) => updateModal.open({ id: data.record.id }) + } + ] + } + } + ]; + + const defaultVisibleColumns = [ + 'intakeName', + 'startDate', + 'endDate', + 'budget', + 'rowActions' + ]; + + let responseCallback = function (result) { + return { + recordsTotal: result.totalCount, + recordsFiltered: result.items.length, + data: result.items + }; + }; + + let dt = $('#IntakesTable'); + + let dataTable = initializeDataTable({ + dt, + defaultVisibleColumns, + listColumns, + maxRowsPerPage: 25, + defaultSortColumn: 0, + dataEndpoint: unity.grantManager.intakes.intake.getList, + data: {}, + responseCallback, + actionButtons, + pagingEnabled: true, + reorderEnabled: false, + languageSetValues: {}, + dataTableName: 'IntakesTable', + dynamicButtonContainerId: 'dynamicButtonContainerId', + useNullPlaceholder: true, + externalSearchId: 'search-intakes' + }); createModal.onResult(function () { dataTable.ajax.reload(); @@ -66,10 +116,9 @@ dataTable.ajax.reload(); }); - $('#CreateIntakeButton').click(function (e) { + function createIntakeBtn(e) { e.preventDefault(); createModal.open(); - }); - + }; }); diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/PaymentHistory/Details.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/PaymentHistory/Details.cshtml index 5194a3dc4..3e1d65dee 100644 --- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/PaymentHistory/Details.cshtml +++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/PaymentHistory/Details.cshtml @@ -2,8 +2,15 @@ @using Microsoft.Extensions.Localization @using Unity.Payments.Localization; @model Unity.GrantManager.Web.Pages.Payments.DisplayPaymentHistoryModel +@using Volo.Abp.AspNetCore.Mvc.UI.Layout @inject IStringLocalizer L +@inject IPageLayout PageLayout +@{ + PageLayout.Content.MenuItemName = "GrantManager.Payments"; + PageLayout.Content.Title = "Payment History"; + ViewBag.PageTitle = "Payment History"; +} @section scripts { @@ -14,20 +21,22 @@ } - - -
Payment History
+ +
+
+

Payment History

+
- +
-
+
- +
- - \ No newline at end of file +
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/PaymentHistory/Details.css b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/PaymentHistory/Details.css index 588e0fdda..b27ebdc71 100644 --- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/PaymentHistory/Details.css +++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/PaymentHistory/Details.css @@ -1,8 +1,4 @@ -.unity-app-main-container { - background-color: white; -} - -.spinner-loader { +.spinner-loader { display: flex; align-items: center; justify-content: center; diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/PaymentHistory/Details.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/PaymentHistory/Details.js index 44907d052..affacd784 100644 --- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/PaymentHistory/Details.js +++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/PaymentHistory/Details.js @@ -3,8 +3,7 @@ let dataTable; const listColumns = getColumns(); - const defaultVisibleColumns = ['EntityName', 'PropertyName', 'OriginalValue', 'NewValue', 'ChangeTime', 'UserName']; - let actionButtons = []; + let actionButtons = [...commonTableActionButtons('Payment History')]; let responseCallback = function (result) { if (result + "" == "undefined") { @@ -27,7 +26,6 @@ dataTable = initializeDataTable({ dt, - defaultVisibleColumns, listColumns, maxRowsPerPage: 20, defaultSortColumn: 0, @@ -39,20 +37,10 @@ reorderEnabled: true, languageSetValues: {}, dataTableName: 'AuditHistoryTable', - dynamicButtonContainerId: 'dynamicButtonContainerId'}); - - dataTable.on('search.dt', () => handleSearch()); - - $('#search').on('input', function () { - let table = $('#AuditHistoryTable').DataTable(); - table.search($(this).val()).draw(); + dynamicButtonContainerId: 'dynamicButtonContainerId', + externalSearchId: 'search-payment-history', }); - function handleSearch() { - let filter = $('.dataTables_filter input').val(); - console.info(filter); - } - function getColumns() { return [ getEntityNameColumn(),