Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

NRPT-697: added name redaction on issuingAgency and made datepicker years scrollable #813

Merged
merged 4 commits into from
Mar 30, 2021
Merged

NRPT-697: added name redaction on issuingAgency and made datepicker years scrollable #813

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f193e40
Merge Master
MaxWardle Mar 25, 2021
ca90f2e
NRPT-697: cleanup
MaxWardle Mar 25, 2021
bf74782
Updates based on feedback
MaxWardle Mar 29, 2021
dfe8cbd
Merge branch 'master' into NRPT-697
MaxWardle Mar 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions angular/projects/admin-nrpti/src/app/communications/communications.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,17 @@ <h4>Application Communication Popup</h4>
<lib-date-picker
[control]="myForm.controls.startDate"
[isValidate]="true"
[reset]="resetDates">
</lib-date-picker>
[reset]="resetDates"
[minDate]="datepickerMinDate">
</lib-date-picker>
</div>
<div class="label-pair">
<label for="endDate">End Date</label>
<lib-date-picker
[control]="myForm.controls.endDate"
[isValidate]="true"
[reset]="resetDates">
[reset]="resetDates"
[minDate]="datepickerMinDate">
</lib-date-picker>
</div>
</div>
Expand Down
3 changes: 3 additions & 0 deletions angular/projects/admin-nrpti/src/app/communications/communications.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { CommunicationsPackage } from '../../../../common/src/app/models/master/
import { MapInfo } from './../../../../common/src/app/models/master/common-models/map-info';
import { FactoryService } from '../services/factory.service';
import { DatePickerComponent, LoadingScreenService, Utils } from 'nrpti-angular-components';
import { Constants } from '../utils/constants/misc';

@Component({
selector: 'communications-add',
Expand Down Expand Up @@ -40,6 +41,8 @@ export class CommunicationsComponent implements OnInit, OnDestroy {
' removeformat | help' ]
};

public datepickerMinDate = Constants.DatepickerMinDate;

constructor(
public route: ActivatedRoute,
public router: Router,
Expand Down
4 changes: 3 additions & 1 deletion ...r/projects/admin-nrpti/src/app/mines/mines-records-edit/mines-records-edit.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,9 @@ <h2 class="border-0 mb-0">Edit record</h2>
<lib-date-picker
[control]="myForm.controls.recordDate"
[isValidate]="true"
[isDisabled]="disableEdit">
[isDisabled]="disableEdit"
[minDate]="datepickerMinDate"
[maxDate]="datepickerMaxDate">
</lib-date-picker>
</div>
<div class="label-pair">
Expand Down
4 changes: 4 additions & 0 deletions ...lar/projects/admin-nrpti/src/app/mines/mines-records-edit/mines-records-edit.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { DialogService } from 'ng2-bootstrap-modal';
import moment from 'moment';
import { ConfirmComponent } from '../../confirm/confirm.component';
import { takeUntil, catchError } from 'rxjs/operators';
import { Constants } from '../../utils/constants/misc';

@Component({
selector: 'app-mines-records-edit',
Expand Down Expand Up @@ -53,6 +54,9 @@ export class MinesRecordsEditComponent implements OnInit {
// record add edit state
public recordState = null;

public datepickerMinDate = Constants.DatepickerMinDate;
public datepickerMaxDate = Constants.DatepickerMaxDate;

constructor(
public route: ActivatedRoute,
public router: Router,
Expand Down
3 changes: 2 additions & 1 deletion angular/projects/admin-nrpti/src/app/news/news-add-edit/news-add-edit.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ <h2 *ngIf="!isEditing">Add News Post</h2>
<label class="font-weight-bold" for="date">Date:</label>
<lib-date-picker
[control]="myForm.controls.date"
[isValidate]="true">
[isValidate]="true"
[minDate]="datepickerMinDate">
</lib-date-picker>
</div>
<div class="label-pair mr-5 mt-4">
Expand Down
3 changes: 3 additions & 0 deletions angular/projects/admin-nrpti/src/app/news/news-add-edit/news-add-edit.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { Utils } from 'nrpti-angular-components';
import { LoadingScreenService } from 'nrpti-angular-components';
import { News } from '../../../../../common/src/app/models/master/common-models/news';
import { FactoryService } from '../../services/factory.service';
import { Constants } from '../../utils/constants/misc';

@Component({
selector: 'app-news-add-edit',
Expand All @@ -30,6 +31,8 @@ export class NewsAddEditComponent implements OnInit, OnDestroy {
public lngPublishSubtext = 'Not published';
public nrcedPublishSubtext = 'Not published';

public datepickerMinDate = Constants.DatepickerMinDate;

// Pick lists
public projects = [{
id: '588511d0aaecd9001b826192',
Expand Down
3 changes: 2 additions & 1 deletion ...-penalties/administrative-penalty-add-edit/administrative-penalty-add-edit.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ <h4>Basic Information</h4>
<lib-date-picker
[control]="myForm.controls.dateIssued"
[isValidate]="true"
[minDate]="datepickerMinDate">
[minDate]="datepickerMinDate"
[maxDate]="datepickerMaxDate">
</lib-date-picker>
</div>
<div class="label-pair">
Expand Down
1 change: 1 addition & 0 deletions ...ve-penalties/administrative-penalty-add-edit/administrative-penalty-add-edit.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ export class AdministrativePenaltyAddEditComponent implements OnInit, OnDestroy
public documentsToDelete = [];

public datepickerMinDate = Constants.DatepickerMinDate;
public datepickerMaxDate = Constants.DatepickerMaxDate;

constructor(
public route: ActivatedRoute,
Expand Down
3 changes: 2 additions & 1 deletion ...anctions/administrative-sanction-add-edit/administrative-sanction-add-edit.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ <h4>Basic Information</h4>
<lib-date-picker
[control]="myForm.controls.dateIssued"
[isValidate]="true"
[minDate]="datepickerMinDate">
[minDate]="datepickerMinDate"
[maxDate]="datepickerMaxDate">
</lib-date-picker>
</div>
<div class="label-pair">
Expand Down
1 change: 1 addition & 0 deletions ...-sanctions/administrative-sanction-add-edit/administrative-sanction-add-edit.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ export class AdministrativeSanctionAddEditComponent implements OnInit, OnDestroy
public documentsToDelete = [];

public datepickerMinDate = Constants.DatepickerMinDate;
public datepickerMaxDate = Constants.DatepickerMaxDate;

constructor(
public route: ActivatedRoute,
Expand Down
3 changes: 2 additions & 1 deletion ...min-nrpti/src/app/records/agreements/agreement-add-edit/agreement-add-edit.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ <h4>Basic Information</h4>
<lib-date-picker
[control]="myForm.controls.dateIssued"
[isValidate]="true"
[minDate]="datepickerMinDate">
[minDate]="datepickerMinDate"
[maxDate]="datepickerMaxDate">
</lib-date-picker>
</div>
<div class="label-pair">
Expand Down
1 change: 1 addition & 0 deletions ...admin-nrpti/src/app/records/agreements/agreement-add-edit/agreement-add-edit.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ export class AgreementAddEditComponent implements OnInit, OnDestroy {
public documentsToDelete = [];

public datepickerMinDate = Constants.DatepickerMinDate;
public datepickerMaxDate = Constants.DatepickerMaxDate;

constructor(
public route: ActivatedRoute,
Expand Down
3 changes: 2 additions & 1 deletion ...c/app/records/annual-reports/annual-report-add-edit/annual-report-add-edit.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ <h4>Basic Information</h4>
<lib-date-picker
[control]="myForm.controls.dateIssued"
[isValidate]="true"
[minDate]="datepickerMinDate">
[minDate]="datepickerMinDate"
[maxDate]="datepickerMaxDate">
</lib-date-picker>
</div>
<div class="label-pair">
Expand Down
1 change: 1 addition & 0 deletions ...src/app/records/annual-reports/annual-report-add-edit/annual-report-add-edit.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ export class AnnualReportAddEditComponent implements OnInit, OnDestroy {
public agencies = Picklists.agencyPicklist;

public datepickerMinDate = Constants.DatepickerMinDate;
public datepickerMaxDate = Constants.DatepickerMaxDate;

// Documents
public documents = [];
Expand Down
3 changes: 2 additions & 1 deletion ...amendments/certificate-amendments-add-edit/certificate-amendments-add-edit.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ <h4>Basic Information</h4>
<lib-date-picker
[control]="myForm.controls.dateIssued"
[isValidate]="true"
[minDate]="datepickerMinDate">
[minDate]="datepickerMinDate"
[maxDate]="datepickerMaxDate">
</lib-date-picker>
</div>
<div class="label-pair">
Expand Down
1 change: 1 addition & 0 deletions ...e-amendments/certificate-amendments-add-edit/certificate-amendments-add-edit.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ export class CertificateAmendmentAddEditComponent implements OnInit, OnDestroy {
public agencies = Picklists.agencyPicklist;

public datepickerMinDate = Constants.DatepickerMinDate;
public datepickerMaxDate = Constants.DatepickerMaxDate;

// Documents
public documents = [];
Expand Down
3 changes: 2 additions & 1 deletion ...pti/src/app/records/certificates/certificate-add-edit/certificate-add-edit.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ <h4>Basic Information</h4>
<lib-date-picker
[control]="myForm.controls.dateIssued"
[isValidate]="true"
[minDate]="datepickerMinDate">
[minDate]="datepickerMinDate"
[maxDate]="datepickerMaxDate">
</lib-date-picker>
</div>
<div class="label-pair">
Expand Down
1 change: 1 addition & 0 deletions ...nrpti/src/app/records/certificates/certificate-add-edit/certificate-add-edit.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ export class CertificateAddEditComponent implements OnInit, OnDestroy {
public agencies = Picklists.agencyPicklist;

public datepickerMinDate = Constants.DatepickerMinDate;
public datepickerMaxDate = Constants.DatepickerMaxDate;

// Documents
public documents = [];
Expand Down
3 changes: 2 additions & 1 deletion ...s/construction-plans/construction-plan-add-edit/construction-plan-add-edit.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ <h4>Basic Information</h4>
<lib-date-picker
[control]="myForm.controls.dateIssued"
[isValidate]="true"
[minDate]="datepickerMinDate">
[minDate]="datepickerMinDate"
[maxDate]="datepickerMaxDate">
</lib-date-picker>
</div>
<div class="label-pair">
Expand Down
1 change: 1 addition & 0 deletions ...rds/construction-plans/construction-plan-add-edit/construction-plan-add-edit.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ export class ConstructionPlanAddEditComponent implements OnInit, OnDestroy {
public documentsToDelete = [];

public datepickerMinDate = Constants.DatepickerMinDate;
public datepickerMaxDate = Constants.DatepickerMaxDate;

constructor(
public route: ActivatedRoute,
Expand Down
3 changes: 2 additions & 1 deletion ...pp/records/correspondences/correspondence-add-edit/correspondence-add-edit.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ <h4>Basic Information</h4>
<lib-date-picker
[control]="myForm.controls.dateIssued"
[isValidate]="true"
[minDate]="datepickerMinDate">
[minDate]="datepickerMinDate"
[maxDate]="datepickerMaxDate">
</lib-date-picker>
</div>
<div class="label-pair">
Expand Down
1 change: 1 addition & 0 deletions .../app/records/correspondences/correspondence-add-edit/correspondence-add-edit.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ export class CorrespondenceAddEditComponent implements OnInit, OnDestroy {
public documentsToDelete = [];

public datepickerMinDate = Constants.DatepickerMinDate;
public datepickerMaxDate = Constants.DatepickerMaxDate;

constructor(
public route: ActivatedRoute,
Expand Down
3 changes: 2 additions & 1 deletion ...ords/court-convictions/court-conviction-add-edit/court-conviction-add-edit.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ <h4>Basic Information</h4>
<lib-date-picker
[control]="myForm.controls.dateIssued"
[isValidate]="true"
[minDate]="datepickerMinDate">
[minDate]="datepickerMinDate"
[maxDate]="datepickerMaxDate">
</lib-date-picker>
</div>
<div class="label-pair">
Expand Down
1 change: 1 addition & 0 deletions ...ecords/court-convictions/court-conviction-add-edit/court-conviction-add-edit.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ export class CourtConvictionAddEditComponent implements OnInit, OnDestroy {
public documentsToDelete = [];

public datepickerMinDate = Constants.DatepickerMinDate;
public datepickerMaxDate = Constants.DatepickerMaxDate;

constructor(
private route: ActivatedRoute,
Expand Down
3 changes: 2 additions & 1 deletion ...-inspections/dam-safety-inspection-add-edit/dam-safety-inspection-add-edit.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ <h4>Basic Information</h4>
<lib-date-picker
[control]="myForm.controls.dateIssued"
[isValidate]="true"
[minDate]="datepickerMinDate">
[minDate]="datepickerMinDate"
[maxDate]="datepickerMaxDate">
</lib-date-picker>
</div>
<div class="label-pair">
Expand Down
1 change: 1 addition & 0 deletions ...ty-inspections/dam-safety-inspection-add-edit/dam-safety-inspection-add-edit.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ export class DamSafetyInspectionAddEditComponent implements OnInit, OnDestroy {
public documentsToDelete = [];

public datepickerMinDate = Constants.DatepickerMinDate;
public datepickerMaxDate = Constants.DatepickerMaxDate;

constructor(
public route: ActivatedRoute,
Expand Down
3 changes: 2 additions & 1 deletion ...-nrpti/src/app/records/inspections/inspection-add-edit/inspection-add-edit.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ <h4>Basic Information</h4>
<lib-date-picker
[control]="myForm.controls.dateIssued"
[isValidate]="true"
[minDate]="datepickerMinDate">
[minDate]="datepickerMinDate"
[maxDate]="datepickerMaxDate">
</lib-date-picker>
</div>
<div class="label-pair">
Expand Down
1 change: 1 addition & 0 deletions ...in-nrpti/src/app/records/inspections/inspection-add-edit/inspection-add-edit.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ export class InspectionAddEditComponent implements OnInit, OnDestroy {
public documentsToDelete = [];

public datepickerMinDate = Constants.DatepickerMinDate;
public datepickerMaxDate = Constants.DatepickerMaxDate;

constructor(
public route: ActivatedRoute,
Expand Down
3 changes: 2 additions & 1 deletion ...records/management-plans/management-plan-add-edit/management-plan-add-edit.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ <h4>Basic Information</h4>
<lib-date-picker
[control]="myForm.controls.dateIssued"
[isValidate]="true"
[minDate]="datepickerMinDate">
[minDate]="datepickerMinDate"
[maxDate]="datepickerMaxDate">
</lib-date-picker>
</div>
<div class="label-pair">
Expand Down
1 change: 1 addition & 0 deletions ...p/records/management-plans/management-plan-add-edit/management-plan-add-edit.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ export class ManagementPlanAddEditComponent implements OnInit, OnDestroy {
public documentsToDelete = [];

public datepickerMinDate = Constants.DatepickerMinDate;
public datepickerMaxDate = Constants.DatepickerMaxDate;

constructor(
public route: ActivatedRoute,
Expand Down
3 changes: 2 additions & 1 deletion .../projects/admin-nrpti/src/app/records/orders/order-add-edit/order-add-edit.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ <h4>Basic Information</h4>
<lib-date-picker
[control]="myForm.controls.dateIssued"
[isValidate]="true"
[minDate]="datepickerMinDate">
[minDate]="datepickerMinDate"
[maxDate]="datepickerMaxDate">
</lib-date-picker>
</div>
<div class="label-pair">
Expand Down
1 change: 1 addition & 0 deletions ...ar/projects/admin-nrpti/src/app/records/orders/order-add-edit/order-add-edit.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ export class OrderAddEditComponent implements OnInit, OnDestroy {
public documentsToDelete = [];

public datepickerMinDate = Constants.DatepickerMinDate;
public datepickerMaxDate = Constants.DatepickerMaxDate;

constructor(
public route: ActivatedRoute,
Expand Down
1 change: 1 addition & 0 deletions ...ojects/admin-nrpti/src/app/records/permits/permit-add-edit/permit-add-edit.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ <h4>Basic Information</h4>
[control]="myForm.controls.dateIssued"
[isValidate]="true"
[minDate]="datepickerMinDate"
[maxDate]="datepickerMaxDate"
[isDisabled]="disableEdit">
</lib-date-picker>
</div>
Expand Down
1 change: 1 addition & 0 deletions ...projects/admin-nrpti/src/app/records/permits/permit-add-edit/permit-add-edit.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ export class PermitAddEditComponent implements OnInit, OnDestroy {
public disableEdit = false;

public datepickerMinDate = Constants.DatepickerMinDate;
public datepickerMaxDate = Constants.DatepickerMaxDate;

constructor(
public route: ActivatedRoute,
Expand Down
3 changes: 2 additions & 1 deletion ...ojects/admin-nrpti/src/app/records/reports/report-add-edit/report-add-edit.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ <h4>Basic Information</h4>
<lib-date-picker
[control]="myForm.controls.dateIssued"
[isValidate]="true"
[minDate]="datepickerMinDate">
[minDate]="datepickerMinDate"
[maxDate]="datepickerMaxDate">
</lib-date-picker>
</div>
<div class="label-pair">
Expand Down
1 change: 1 addition & 0 deletions ...projects/admin-nrpti/src/app/records/reports/report-add-edit/report-add-edit.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ export class ReportAddEditComponent implements OnInit, OnDestroy {
public documentsToDelete = [];

public datepickerMinDate = Constants.DatepickerMinDate;
public datepickerMaxDate = Constants.DatepickerMaxDate;

constructor(
public route: ActivatedRoute,
Expand Down
3 changes: 2 additions & 1 deletion ...orative-justices/restorative-justice-add-edit/restorative-justice-add-edit.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ <h4>Basic Information</h4>
<lib-date-picker
[control]="myForm.controls.dateIssued"
[isValidate]="true"
[minDate]="datepickerMinDate">
[minDate]="datepickerMinDate"
[maxDate]="datepickerMaxDate">
</lib-date-picker>
</div>
<div class="label-pair">
Expand Down
1 change: 1 addition & 0 deletions ...storative-justices/restorative-justice-add-edit/restorative-justice-add-edit.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ export class RestorativeJusticeAddEditComponent implements OnInit, OnDestroy {
public documentsToDelete = [];

public datepickerMinDate = Constants.DatepickerMinDate;
public datepickerMaxDate = Constants.DatepickerMaxDate;

constructor(
public route: ActivatedRoute,
Expand Down
3 changes: 2 additions & 1 deletion ...pti/src/app/records/self-reports/self-report-add-edit/self-report-add-edit.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ <h4>Basic Information</h4>
<lib-date-picker
[control]="myForm.controls.dateIssued"
[isValidate]="true"
[minDate]="datepickerMinDate">
[minDate]="datepickerMinDate"
[maxDate]="datepickerMaxDate">
</lib-date-picker>
</div>
<div class="label-pair">
Expand Down
1 change: 1 addition & 0 deletions ...nrpti/src/app/records/self-reports/self-report-add-edit/self-report-add-edit.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ export class SelfReportAddEditComponent implements OnInit, OnDestroy {
public documentsToDelete = [];

public datepickerMinDate = Constants.DatepickerMinDate;
public datepickerMaxDate = Constants.DatepickerMaxDate;

constructor(
public route: ActivatedRoute,
Expand Down
Loading