Added ability to set input age for pesel generator. No additional checks implemented - min < max or starting age of 1800. Someday...

2026-01-25 23:19:53 +01:00
parent 2813ce75a7
commit 7dc0c31be1
5 changed files with 123 additions and 46 deletions
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -2,10 +2,8 @@ import { NgModule } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { BrowserModule } from '@angular/platform-browser';
 import { AppComponent } from './components/app/app.component';
-import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { MatInputModule } from '@angular/material/input';
 import { MatIconModule } from '@angular/material/icon';
-import { MatGridListModule } from '@angular/material/grid-list';
 import { ClipboardModule } from '@angular/cdk/clipboard';
 import { MatSnackBarModule} from '@angular/material/snack-bar';
 import { TranslatePipe } from './translate-pipe';
@@ -13,6 +11,7 @@ import { PeselComponent } from './components/pesel/pesel.component';
 import { NipComponent } from './components/nip/nip.component';
 import { RegonComponent } from './components/regon/regon.component';
 import { IbanComponent } from './components/iban/iban.component';
+import {NgOptimizedImage} from "@angular/common";

@NgModule({
  declarations: [
@@ -23,17 +22,16 @@ import { IbanComponent } from './components/iban/iban.component';
    RegonComponent,
    IbanComponent
  ],
-  imports: [
-    BrowserModule,
-    FormsModule,
-    BrowserAnimationsModule,
-    MatInputModule,
-    MatIconModule,
-    MatGridListModule,
-    ClipboardModule,
-    MatSnackBarModule,
-    ReactiveFormsModule,
-  ],
+    imports: [
+        BrowserModule,
+        FormsModule,
+        MatInputModule,
+        MatIconModule,
+        ClipboardModule,
+        MatSnackBarModule,
+        ReactiveFormsModule,
+        NgOptimizedImage,
+    ],
  providers: [TranslatePipe],
  bootstrap: [AppComponent]
 })
--- a/src/app/components/pesel/pesel.component.html
+++ b/src/app/components/pesel/pesel.component.html
@@ -2,18 +2,27 @@
    <div class="title">
        <span>PESEL</span>
        <div class="titleButtons">
-            <img id="malePeselButton" src="assets/male_black_24dp.svg" title="Płeć męska" alt="Czy generować męskie numery PESEL" (click)="toggleMale()" [style.background] = "generateMale ? 'rgba(0, 0, 0, 0.35)' : ''" />
+            <input id="minAgeInput" type="number" [(ngModel)]="minAge"/>
+            <div class="titleBarText">-</div>
+            <input id="maxAgeInput" type="number" [(ngModel)]="maxAge"/>
+            <div style="width: 40px;"></div>
+            <img id="malePeselButton" ngSrc="assets/male_black_24dp.svg" title="Płeć męska" alt="Czy generować męskie numery PESEL" (click)="toggleMale()" [style.background] = "generateMale ? 'rgba(0, 0, 0, 0.35)' : ''"
+                 height="24" width="24"/>
            <div style="width: 20px;"></div>
-            <img id="femalePeselButton" src="assets/female_black_24dp.svg" title="Płeć żeńska" alt="Czy generować żeńskie numery PESEL" (click)="toggleFemale()" [style.background] = "generateFemale ? 'rgba(0, 0, 0, 0.35)' : ''" />
+            <img id="femalePeselButton" ngSrc="assets/female_black_24dp.svg" title="Płeć żeńska" alt="Czy generować żeńskie numery PESEL" (click)="toggleFemale()" [style.background] = "generateFemale ? 'rgba(0, 0, 0, 0.35)' : ''"
+                 height="24" width="24"/>
        </div>
    </div>
    <div class="container">
        <input type="text" [formControl]="valueField" />

        <div class="buttons">
-            <img id="peselGenerateButton" src="assets/autorenew_black_24dp.svg" title="Generuj numer PESEL" alt="Generuj numer PESEL" style="margin-left: 1em;" (click)="generate()"/>
-            <img id="peselCopyButton" src="assets/content_copy_black_24dp.svg" title="Skopiuj numer PESEL do schowka" alt="Skopiuj numer PESEL do schowka" style="margin: auto 1em;" (click)="copyToClipboard()"/>
-            <img id="peselHelpButton" src="assets/info_black_24dp.svg" title="Szczegóły dotyczące numeru PESEL" alt="Definicja numeru PESEL na Wikipedii" (click)="navigateToDocs()" />
+            <img id="peselGenerateButton" ngSrc="assets/autorenew_black_24dp.svg" title="Generuj numer PESEL" alt="Generuj numer PESEL" style="margin-left: 1em;" (click)="generate()"
+                 height="24" width="24"/>
+            <img id="peselCopyButton" ngSrc="assets/content_copy_black_24dp.svg" title="Skopiuj numer PESEL do schowka" alt="Skopiuj numer PESEL do schowka" style="margin: auto 1em;" (click)="copyToClipboard()"
+                 height="24" width="24"/>
+            <img id="peselHelpButton" ngSrc="assets/info_black_24dp.svg" title="Szczegóły dotyczące numeru PESEL" alt="Definicja numeru PESEL na Wikipedii" (click)="navigateToDocs()"
+                 height="24" width="24"/>
        </div>
    </div>
 </div>
--- a/src/app/components/pesel/pesel.component.ts
+++ b/src/app/components/pesel/pesel.component.ts
@@ -14,6 +14,8 @@ export class PeselComponent implements OnInit {

  public generateMale: boolean;
  public generateFemale: boolean;
+  public minAge: number;
+  public maxAge: number;

  constructor(private peselService: PeselService, private clipboardService: ClipboardService) {
    this.valueField = new FormControl('pesel');
@@ -21,6 +23,8 @@ export class PeselComponent implements OnInit {

    this.generateMale = true;
    this.generateFemale = true;
+    this.minAge = 18;
+    this.maxAge = 100;
  }

  ngOnInit(): void {
@@ -28,11 +32,11 @@ export class PeselComponent implements OnInit {
  }

  generate(): void {
-    if (this.generateMale === false && this.generateFemale === false) {
+    if (!this.generateMale && !this.generateFemale) {
      return;
    }

-    this.valueField.setValue(this.peselService.generatePesel(this.generateMale, this.generateFemale));
+    this.valueField.setValue(this.peselService.generatePesel(this.generateMale, this.generateFemale, this.minAge, this.maxAge));
  }

  toggleMale(): void {
--- a/src/app/service/pesel.service.ts
+++ b/src/app/service/pesel.service.ts
@@ -1,8 +1,7 @@
 import { Injectable } from '@angular/core';
 import { CommonService } from './common.service';
-import { endOfMonth } from 'date-fns'
+import {addDays, addYears, differenceInDays, endOfMonth} from 'date-fns'
 import { ValidationErrors } from '@angular/forms';
-import { concat } from 'rxjs';


@Injectable({
@@ -10,30 +9,45 @@ import { concat } from 'rxjs';
 })
 export class PeselService {
  // wagi kolejnych cyfr numeru PESEL
-  private readonly peselWeights: number[] = [1, 3, 7, 9, 1, 3, 7, 9, 1, 3];
+  private static readonly peselWeights: number[] = [1, 3, 7, 9, 1, 3, 7, 9, 1, 3];

-  private readonly maleDigits: number[] = [1, 3, 5, 7, 9];
+  private static readonly maleDigits: number[] = [1, 3, 5, 7, 9];

-  private readonly femaleDigits: number[] = [0, 2, 4, 6, 8];
+  private static readonly femaleDigits: number[] = [0, 2, 4, 6, 8];

  constructor(private common: CommonService) { }

-  public generatePesel(male: boolean, female: boolean): string {
+  public generatePesel(male: boolean, female: boolean, minAge: number, maxAge: number): string {
+    console.log('Generating PESEL female: ', female, ', male: ', male, ' with age range:', minAge, 'to', maxAge);
+    console.log('Current date:', new Date())
+
+    // ustalenie granicznych dat
+    const startDate = addYears(new Date(), -maxAge);
+    const endDate = addYears(new Date(), -minAge);
+
+    // wyliczenie roznicy w dniach i jej dolanie do daty startowej
+    const difference = differenceInDays(endDate, startDate);
+    console.log("Difference in days: ", difference)
+
+    const finalDate = addDays(startDate, this.common.getRandomInt(0, difference));
+
+    console.log('Final date:', finalDate);
+
    // losowanie pierwszych 10 cyfr
-    const year: number = this.common.getRandomInt(0, 99);
-    const month: number = this.common.getRandomInt(1, 12);
-    const endDayOfMonth: number = endOfMonth(new Date(year, month - 1)).getDate();
-    const day: number = this.common.getRandomInt(1, endDayOfMonth);
+    const fullYear: number = finalDate.getFullYear();
+    const year: number = fullYear % 100;
+    const month: number = this.encodePeselMonth(finalDate.getMonth() + 1, fullYear);
+    const day: number = finalDate.getDate();
    const rest: number = this.common.getRandomInt(0, 999);

-    const sexDigits: number[] = [... male ? this.maleDigits : [], ...female ? this.femaleDigits : []];
+    const sexDigits: number[] = [... male ? PeselService.maleDigits : [], ...female ? PeselService.femaleDigits : []];

-    const sexDigitIndex: number = this.common.getRandomInt(0, sexDigits.length - 1);
-    const sexDigit = sexDigits[sexDigitIndex];
+    const sexDigitIndex: number = this.common.getRandomInt(0, sexDigits.length - 1)
+    const sexDigit = sexDigits[sexDigitIndex]

    // wyliczenie cyfry kontrolnej
    const peselWithoutControlDigit: string = this.common.pad(year, 2) + this.common.pad(month, 2) + this.common.pad(day, 2) + this.common.pad(rest, 3) + this.common.pad(sexDigit, 1);
-    const controlDigit: number = this.common.calculateControlDigit(peselWithoutControlDigit, this.peselWeights, this.lastStepFunction);
+    const controlDigit: number = this.common.calculateControlDigit(peselWithoutControlDigit, PeselService.peselWeights, this.lastStepFunction);

    // ostateczna konkatenacja
    return peselWithoutControlDigit + controlDigit;
@@ -87,7 +101,7 @@ export class PeselService {
   * @returns
   */
  private validatePeselControlDigit(pesel: string): boolean {
-    return this.common.validateControlDigit(pesel, this.peselWeights, this.lastStepFunction);
+    return this.common.validateControlDigit(pesel, PeselService.peselWeights, this.lastStepFunction);
  }

  /**
@@ -159,6 +173,23 @@ export class PeselService {
    }
  }

+  private encodePeselMonth(month: number, year: number): number {
+    if (year >= 1800 && year <= 1899) {
+      return month + 80;
+    }
+    if (year >= 2000 && year <= 2099) {
+      return month + 20;
+    }
+    if (year >= 2100 && year <= 2199) {
+      return month + 40;
+    }
+    if (year >= 2200 && year <= 2299) {
+      return month + 60;
+    }
+
+    return month;
+  }
+
  private lastStepFunction(sum: number): number {
    sum = sum % 10;

--- a/src/styles.scss
+++ b/src/styles.scss
@@ -124,7 +124,7 @@ body {
 input[type="text"] {
  margin-top: 1em;
  width: 210px;
-  min-width: 0px;
+  min-width: 0;
  flex-grow: 1;
  flex-shrink: 1;
  padding: 0 0.7em;
@@ -147,6 +147,41 @@ input[type="text"] {
  }
 }

+input[type="number"] {
+  -moz-appearance:textfield; /* Firefox */
+  margin: auto 0;
+  width: 37px;
+  min-width: 0;
+  flex-grow: 1;
+  flex-shrink: 1;
+  padding: 0 0.1em;
+  letter-spacing: 1px;
+  font-size: 0.8em;
+  height: 1.5em;
+  color: white;
+
+  background: rgba(255, 255, 255, 0.15);
+  box-shadow: 0 8px 32px 0 rgba( 0, 38, 135, 0.37 );
+  border-radius: 3px;
+  border: 1px solid rgba( 255, 255, 255, 0.20 );
+}
+
+input::-webkit-outer-spin-button,
+input::-webkit-inner-spin-button {
+  display: none;
+  -webkit-appearance: none;
+  margin: 0;
+}
+
+.titleBarText {
+  width: 20px;
+  color: white;
+  text-align: center;
+  font-weight: bold;
+  letter-spacing: 2px;
+  margin-top: 10px;
+}
+
 img {
  cursor: pointer;
  filter: invert(100%);