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, rel_3_13 has been updated via 1eb7c96faa392812e6275812e5940510a33e85e8 (commit) from f7e96085cb9e212a07963533939be4f14a2af9bd (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 1eb7c96faa392812e6275812e5940510a33e85e8 Author: Stephanie Leary <stephanie.leary@equinoxoli.org> Date: Wed Mar 19 03:28:55 2025 +0000 LP2088096 Populate user email in report output options Sets the current user's email address as the default value for report output email field, if no address is saved via template. Also sets the autocomplete attribute and changes the input type to email for improved mobile user experience. Release-note: Sets user email as default for report output email option Signed-off-by: Stephanie Leary <stephanie.leary@equinoxoli.org> Signed-off-by: Steven Mayo <smayo@georgialibraries.org> Signed-off-by: Michele Morgan <mmorgan@noblenet.org> Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org> diff --git a/-multilnst b/-multilnst new file mode 100644 index 0000000000..e69de29bb2 diff --git a/Open-ILS/src/eg2/src/app/staff/reporter/full/reporter-output-options.component.html b/Open-ILS/src/eg2/src/app/staff/reporter/full/reporter-output-options.component.html index 75437d2a1f..c460ba7663 100644 --- a/Open-ILS/src/eg2/src/app/staff/reporter/full/reporter-output-options.component.html +++ b/Open-ILS/src/eg2/src/app/staff/reporter/full/reporter-output-options.component.html @@ -99,7 +99,7 @@ <legend class="col-form-label col-sm-1 pt-0" i18n>Email</legend> <div class="col-sm-3 form-inline"> <label class="form-control-label me-sm-2" for="srEmail" i18n>Email Address</label> - <input [disabled]="disabled" class="form-control" type="text" id="srEmail" name="srEmail" [(ngModel)]="templ.email"> + <input [disabled]="disabled" class="form-control" type="email" autocomplete="email" id="srEmail" name="srEmail" [(ngModel)]="templ.email"> </div> </div> <div *ngIf="!advancedMode" class="form-group row"> diff --git a/Open-ILS/src/eg2/src/app/staff/reporter/full/reporter-output-options.component.ts b/Open-ILS/src/eg2/src/app/staff/reporter/full/reporter-output-options.component.ts index 044878f5ac..438ffec97e 100644 --- a/Open-ILS/src/eg2/src/app/staff/reporter/full/reporter-output-options.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/reporter/full/reporter-output-options.component.ts @@ -1,16 +1,17 @@ /* eslint-disable */ -import {Component, Input} from '@angular/core'; +import {Component, Input, OnInit} from '@angular/core'; import {IdlService} from '@eg/core/idl.service'; import {ReporterService, SRTemplate} from '../share/reporter.service'; import {Tree} from '@eg/share/tree/tree'; import * as moment from 'moment-timezone'; +import { AuthService } from '@eg/core/auth.service'; @Component({ selector: 'eg-reporter-output-options', templateUrl: './reporter-output-options.component.html' }) -export class ReporterOutputOptionsComponent { +export class ReporterOutputOptionsComponent implements OnInit { @Input() advancedMode = false; @Input() disabled = false; @@ -23,6 +24,7 @@ export class ReporterOutputOptionsComponent { output_tree: Tree; constructor( + private auth: AuthService, private idl: IdlService, public RSvc: ReporterService ) { @@ -30,6 +32,19 @@ export class ReporterOutputOptionsComponent { this.output_tree = this.RSvc.myFolderTrees.outputs.clone({expanded:!this.RSvc.outputFolder}); } + ngOnInit(): void { + console.debug("User: ", this.auth.user()); + if (!this.templ.email) { + this.templ.email = this.auth.user().email(); + } + } + + bibIdFields () { + return this.templ.nonAggregateDisplayFields().filter( + f => !!((f.type === 'link' && f.class === 'bre' && f.reltype === 'has_a' && f.key === 'id') || f.treeNodeId.endsWith('bre.id')) + ); + } + canPivot() { return this.advancedMode && this.templ.aggregateDisplayFields().length > 0 ----------------------------------------------------------------------- Summary of changes: .../eg-help-popover.component.css => -multilnst | 0 .../full/reporter-output-options.component.html | 2 +- .../full/reporter-output-options.component.ts | 19 +++++++++++++++++-- 3 files changed, 18 insertions(+), 3 deletions(-) copy Open-ILS/src/eg2/src/app/share/eg-help-popover/eg-help-popover.component.css => -multilnst (100%) hooks/post-receive -- Evergreen ILS