feature (switch between calendar formats): keep track of currently ac…

…tive calendar format
dhlab-basel · Apr 3, 2018 · 03445c9 · 03445c9
1 parent b6242ad
commit 03445c9
Show file tree

Hide file tree

Showing 2 changed files with 72 additions and 19 deletions.
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -1,4 +1,4 @@
-import {Component, Host, Inject} from '@angular/core';
+import {Component, Host, Inject, OnInit} from '@angular/core';
 import {FormBuilder, FormGroup, Validators} from '@angular/forms';
 import {DateAdapter, MatCalendar} from '@angular/material';
 import {JDNConvertibleCalendar} from 'jdnconvertiblecalendar';
@@ -31,10 +31,11 @@ export class AppComponent {
 @Component({
   selector: 'app-calendar-header',
   template: `
-    <select (change)="convertCalendar($event.target.value)">
-      <option>Gregorian</option>
-      <option>Julian</option>
-    </select>
+    <mat-form-field>
+      <mat-select [formControl]="form.controls['calendar']">
+        <mat-option *ngFor="let cal of supportedCalendarFormats" [value]="cal">{{cal}}</mat-option>
+      </mat-select>
+    </mat-form-field>
     <div class="custom-header">
       <button mat-icon-button (click)="previousClicked('year')">&lt;&lt;</button>
       <button mat-icon-button (click)="previousClicked('month')">&lt;</button>
@@ -45,9 +46,36 @@ export class AppComponent {
   `,
   styleUrls: []
 })
-export class HeaderComponent<D> {
+export class HeaderComponent<D> implements OnInit {
   constructor(@Host() private _calendar: MatCalendar<JDNConvertibleCalendar>,
-              private _dateAdapter: DateAdapter<JDNConvertibleCalendar>) {
+              private _dateAdapter: DateAdapter<JDNConvertibleCalendar>,
+              @Inject(FormBuilder) private fb: FormBuilder) {
+  }
+
+  form: FormGroup;
+
+  supportedCalendarFormats = JDNConvertibleCalendar.supportedCalendars;
+
+  activeFormat;
+
+  ngOnInit() {
+
+    this.activeFormat = 'Gregorian';
+
+    if (this._dateAdapter instanceof JDNConvertibleCalendarDateAdapter) {
+      this.activeFormat = this._dateAdapter.activeCalendarFormat;
+    }
+
+    // build a form for the calendar format selection
+    this.form = this.fb.group({
+      calendar: [this.activeFormat, Validators.required]
+    });
+
+    // update the selected calendar format
+    this.form.valueChanges.subscribe((data) => {
+      this.convertCalendar(data.calendar);
+    });
+
   }
 
   convertCalendar(calendar: 'Gregorian' | 'Julian') {

diff --git a/...pp/modules/jdnconvertiblecalendardateadapter/adapter/JDNConvertibleCalendarDateAdapter.ts b/...pp/modules/jdnconvertiblecalendardateadapter/adapter/JDNConvertibleCalendarDateAdapter.ts
@@ -22,6 +22,8 @@ import {Injectable} from '@angular/core';
 import {DateAdapter} from '@angular/material';
 import {JDNConvertibleCalendar, CalendarDate, GregorianCalendarDate, JDNPeriod} from 'jdnconvertiblecalendar';
 import {JDNConvertibleConversionModule} from 'jdnconvertiblecalendar';
+import {JDNConvertibleCalendarModule} from 'jdnconvertiblecalendar/dist/JDNConvertibleCalendar';
+import JulianCalendarDate = JDNConvertibleCalendarModule.JulianCalendarDate;
 
 
 @Injectable()
@@ -44,6 +46,13 @@ export class JDNConvertibleCalendarDateAdapter extends DateAdapter<JDNConvertibl
     'DD-MM-YYYY': /^(\d?\d)-(\d?\d)-(\d{4})/
   };
 
+  // the currently active calendar format
+  private _activeCalendarFormat = 'Gregorian';
+
+  get activeCalendarFormat() {
+    return this._activeCalendarFormat;
+  }
+
   /**
    * Adds leading zeros to a given number and returns the resulting string.
    *
@@ -55,7 +64,7 @@ export class JDNConvertibleCalendarDateAdapter extends DateAdapter<JDNConvertibl
     const missingDigits = digits - String(num).length;
 
     if (missingDigits > 0) {
-      let leadingZeros: string = '';
+      let leadingZeros = '';
       for (let i = 0; i < missingDigits; i++) {
         leadingZeros += '0';
       }
@@ -83,9 +92,11 @@ export class JDNConvertibleCalendarDateAdapter extends DateAdapter<JDNConvertibl
 
     switch (format) {
       case 'Gregorian':
+        this._activeCalendarFormat = 'Gregorian';
         return dateMod.convertCalendar('Gregorian');
 
       case 'Julian':
+        this._activeCalendarFormat = 'Julian';
         return dateMod.convertCalendar('Julian');
 
       default:
@@ -156,24 +167,35 @@ export class JDNConvertibleCalendarDateAdapter extends DateAdapter<JDNConvertibl
   }
 
   clone(date: JDNConvertibleCalendar): JDNConvertibleCalendar {
-    // TODO: assume Gregorian date for now, make this configurable
 
     const jdnPeriod = date.toJDNPeriod();
 
-    return new GregorianCalendarDate(jdnPeriod);
+    switch (this._activeCalendarFormat) {
+      case 'Gregorian':
+        return new GregorianCalendarDate(jdnPeriod);
+
+      case 'Julian':
+        return new JulianCalendarDate(jdnPeriod);
+    }
+
   }
 
   createDate(year: number, month: number, date: number): JDNConvertibleCalendar {
 
-    // TODO: support different calendar formats
-    // assume Gregorian for now
-
     // month param is 0 indexed, but we use 1 based index for months
     const calDate = new CalendarDate(year, month + 1, date);
 
-    const jdn = JDNConvertibleConversionModule.gregorianToJDN(calDate);
+    let jdn;
 
-    return new GregorianCalendarDate(new JDNPeriod(jdn, jdn));
+    switch (this._activeCalendarFormat) {
+      case 'Gregorian':
+        jdn = JDNConvertibleConversionModule.gregorianToJDN(calDate);
+        return new GregorianCalendarDate(new JDNPeriod(jdn, jdn));
+
+      case 'Julian':
+        jdn = JDNConvertibleConversionModule.julianToJDN(calDate);
+        return new JulianCalendarDate(new JDNPeriod(jdn, jdn));
+    }
 
   }
 
@@ -198,7 +220,7 @@ export class JDNConvertibleCalendarDateAdapter extends DateAdapter<JDNConvertibl
   parse(value: any, parseFormat: any): JDNConvertibleCalendar | null {
 
     let date;
-    if (parseFormat !== undefined && typeof parseFormat == 'string' && JDNConvertibleCalendarDateAdapter.parsableDateFormats.indexOf(parseFormat) !== -1) {
+    if (parseFormat !== undefined && typeof parseFormat === 'string' && JDNConvertibleCalendarDateAdapter.parsableDateFormats.indexOf(parseFormat) !== -1) {
 
       switch (parseFormat) {
         case JDNConvertibleCalendarDateAdapter.DD_MM_YYYY: {
@@ -237,15 +259,16 @@ export class JDNConvertibleCalendarDateAdapter extends DateAdapter<JDNConvertibl
 
   format(date: JDNConvertibleCalendar, displayFormat: any): string {
     let dateString = '';
-    if (displayFormat !== undefined && typeof displayFormat == 'string' && JDNConvertibleCalendarDateAdapter.displayDateFormats.lastIndexOf(displayFormat) !== -1) {
+    if (displayFormat !== undefined && typeof displayFormat === 'string' && JDNConvertibleCalendarDateAdapter.displayDateFormats.lastIndexOf(displayFormat) !== -1) {
 
       const calendarPeriod = date.toCalendarPeriod();
 
       switch (displayFormat) {
 
         case JDNConvertibleCalendarDateAdapter.DD_MM_YYYY: {
 
-          dateString = `${JDNConvertibleCalendarDateAdapter.addLeadingZeroToNumber(calendarPeriod.periodStart.day, 2)}-${JDNConvertibleCalendarDateAdapter.addLeadingZeroToNumber(calendarPeriod.periodStart.month, 2)}-${JDNConvertibleCalendarDateAdapter.addLeadingZeroToNumber(calendarPeriod.periodStart.year, 4)}`;
+          dateString =
+            `${JDNConvertibleCalendarDateAdapter.addLeadingZeroToNumber(calendarPeriod.periodStart.day, 2)}-${JDNConvertibleCalendarDateAdapter.addLeadingZeroToNumber(calendarPeriod.periodStart.month, 2)}-${JDNConvertibleCalendarDateAdapter.addLeadingZeroToNumber(calendarPeriod.periodStart.year, 4)}`;
           break;
 
         }
@@ -293,7 +316,7 @@ export class JDNConvertibleCalendarDateAdapter extends DateAdapter<JDNConvertibl
 
   addCalendarDays(date: JDNConvertibleCalendar, days: number): JDNConvertibleCalendar {
 
-    // another instance has to be returned, otherwiese events do not work correctly
+    // another instance has to be returned, otherwise events do not work correctly
 
     const dateMod = this.clone(date);
 
@@ -309,6 +332,8 @@ export class JDNConvertibleCalendarDateAdapter extends DateAdapter<JDNConvertibl
 
     const gregorianCalPeriod = gregorianCal.toCalendarPeriod();
 
+    console.log('to iso');
+
     return `${JDNConvertibleCalendarDateAdapter.addLeadingZeroToNumber(gregorianCalPeriod.periodStart.year, 4)}-${JDNConvertibleCalendarDateAdapter.addLeadingZeroToNumber(gregorianCalPeriod.periodStart.month, 2)}-${JDNConvertibleCalendarDateAdapter.addLeadingZeroToNumber(gregorianCalPeriod.periodStart.day, 2)}`;
 
   }