This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Evergreen ILS". The branch, main has been updated via 5a4981b85c55c3290c3dccfb6c2734b8dd0295cc (commit) via 421458824c1b0dac6760042b3267aaa09af736f2 (commit) from 81015760b636b39d759234023a76c351f2d32da5 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 5a4981b85c55c3290c3dccfb6c2734b8dd0295cc Author: Stephanie Leary <stephanie.leary@equinoxoli.org> Date: Fri Aug 1 14:09:03 2025 +0000 LP#2118783 Stamp upgrade script Signed-off-by: Stephanie Leary <stephanie.leary@equinoxoli.org> diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql index aac96106ff..2fa4f555b1 100644 --- a/Open-ILS/src/sql/Pg/002.schema.config.sql +++ b/Open-ILS/src/sql/Pg/002.schema.config.sql @@ -92,7 +92,7 @@ CREATE TRIGGER no_overlapping_deps BEFORE INSERT OR UPDATE ON config.db_patch_dependencies FOR EACH ROW EXECUTE PROCEDURE evergreen.array_overlap_check ('deprecates'); -INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1477', :eg_version); -- csharp/elidavis +INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1478', :eg_version); -- dbriem/sleary CREATE TABLE config.bib_source ( id SERIAL PRIMARY KEY, diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.ou_proximity_adj_grid.sql b/Open-ILS/src/sql/Pg/upgrade/1478.data.ou_proximity_adj_grid.sql similarity index 85% rename from Open-ILS/src/sql/Pg/upgrade/XXXX.data.ou_proximity_adj_grid.sql rename to Open-ILS/src/sql/Pg/upgrade/1478.data.ou_proximity_adj_grid.sql index efc608371f..9da812fccb 100644 --- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.ou_proximity_adj_grid.sql +++ b/Open-ILS/src/sql/Pg/upgrade/1478.data.ou_proximity_adj_grid.sql @@ -1,6 +1,6 @@ BEGIN; -SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version); +SELECT evergreen.upgrade_deps_block_check('1478', :eg_version); INSERT INTO config.workstation_setting_type (name, grp, datatype, label) VALUES ( commit 421458824c1b0dac6760042b3267aaa09af736f2 Author: Dan Briem <dbriem@harrisonpl.org> Date: Tue Jul 29 16:16:42 2025 +0000 LP#2118783 Org Unit Proximity Adjustment Interface Issues Adds a workstation setting for the org unit proximity adjustment admin grid so the grid configuration saves. Adds support to the GridFilterControlComponent to filter by datatype number using the same logic as datatype float. Signed-off-by: Dan Briem <dbriem@harrisonpl.org> Signed-off-by: Stephanie Leary <stephanie.leary@equinoxoli.org> diff --git a/Open-ILS/src/eg2/src/app/share/grid/grid-filter-control.component.html b/Open-ILS/src/eg2/src/app/share/grid/grid-filter-control.component.html index 1914149bf8..eba8b59231 100644 --- a/Open-ILS/src/eg2/src/app/share/grid/grid-filter-control.component.html +++ b/Open-ILS/src/eg2/src/app/share/grid/grid-filter-control.component.html @@ -36,6 +36,31 @@ </select> </ng-template> +<ng-template #numericFilter> + <div class="input-group"> + <div ngbDropdown container="body" class="d-inline-block py-1" autoClose="outside" placement="bottom-left" + [ngClass]="{'border rounded border-secondary eg-grid-col-is-filtered' : col.isFiltered}"> + <button type="button" ngbDropdownToggle class="no-dropdown-caret btn"> + <ng-container *ngTemplateOutlet="dropdownToggle"></ng-container> + </button> + <div ngbDropdownMenu class="eg-grid-filter-menu"> + <div class="dropdown-item"> + <div> + <label class="form-label" for="eg-filter-op-select-{{col.name}}" i18n>Operator</label> + <ng-container *ngTemplateOutlet="numericOperators"></ng-container> + </div> + <div class="pt-2"> + <input type="number" class="form-control" + [(ngModel)]="col.filterValue" (change)="applyFilterCommon(col)" + [disabled]="col.filterInputDisabled || context.dataSource.requestingData"> + </div> + <ng-container *ngTemplateOutlet="actionsTemplate"></ng-container> + </div> + </div> + </div> + </div> +</ng-template> + <div *ngIf="col.isFilterable" class="eg-grid-filter-control"> <div [ngSwitch]="col.datatype"> <div *ngSwitchCase="'link'"> @@ -172,28 +197,10 @@ </div> </div> <div *ngSwitchCase="'float'"> - <div class="input-group"> - <div ngbDropdown container="body" class="d-inline-block py-1" autoClose="outside" placement="bottom-left" - [ngClass]="{'border rounded border-secondary eg-grid-col-is-filtered' : col.isFiltered}"> - <button type="button" ngbDropdownToggle class="no-dropdown-caret btn"> - <ng-container *ngTemplateOutlet="dropdownToggle"></ng-container> - </button> - <div ngbDropdownMenu class="eg-grid-filter-menu"> - <div class="dropdown-item"> - <div> - <label class="form-label" for="eg-filter-op-select-{{col.name}}" i18n>Operator</label> - <ng-container *ngTemplateOutlet="numericOperators"></ng-container> - </div> - <div class="pt-2"> - <input type="number" class="form-control" - [(ngModel)]="col.filterValue" (change)="applyFilterCommon(col)" - [disabled]="col.filterInputDisabled || context.dataSource.requestingData"> - </div> - <ng-container *ngTemplateOutlet="actionsTemplate"></ng-container> - </div> - </div> - </div> - </div> + <ng-container *ngTemplateOutlet="numericFilter"></ng-container> + </div> + <div *ngSwitchCase="'number'"> + <ng-container *ngTemplateOutlet="numericFilter"></ng-container> </div> <div *ngSwitchCase="'money'"> <div class="input-group"> diff --git a/Open-ILS/src/sql/Pg/950.data.seed-values.sql b/Open-ILS/src/sql/Pg/950.data.seed-values.sql index 29ef6acf57..c886368379 100644 --- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql +++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql @@ -20958,6 +20958,13 @@ VALUES ( 'Grid Config: admin.server.config.z3950_source', 'cwst', 'label' ) +), ( + 'eg.grid.admin.server.actor.org_unit_proximity_adjustment', 'gui', 'object', + oils_i18n_gettext( + 'eg.grid.admin.server.actor.org_unit_proximity_adjustment', + 'Grid Config: eg.grid.admin.server.actor.org_unit_proximity_adjustment', + 'cwst', 'label' + ) ); INSERT INTO config.org_unit_setting_type diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.ou_proximity_adj_grid.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.ou_proximity_adj_grid.sql new file mode 100644 index 0000000000..efc608371f --- /dev/null +++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.ou_proximity_adj_grid.sql @@ -0,0 +1,15 @@ +BEGIN; + +SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version); + +INSERT INTO config.workstation_setting_type (name, grp, datatype, label) +VALUES ( + 'eg.grid.admin.server.actor.org_unit_proximity_adjustment', 'gui', 'object', + oils_i18n_gettext( + 'eg.grid.admin.server.actor.org_unit_proximity_adjustment', + 'Grid Config: eg.grid.admin.server.actor.org_unit_proximity_adjustment', + 'cwst', 'label' + ) +); + +COMMIT; ----------------------------------------------------------------------- Summary of changes: .../share/grid/grid-filter-control.component.html | 51 ++++++++++++---------- Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +- Open-ILS/src/sql/Pg/950.data.seed-values.sql | 7 +++ .../Pg/upgrade/1478.data.ou_proximity_adj_grid.sql | 15 +++++++ 4 files changed, 52 insertions(+), 23 deletions(-) create mode 100644 Open-ILS/src/sql/Pg/upgrade/1478.data.ou_proximity_adj_grid.sql hooks/post-receive -- Evergreen ILS