Merge pull request #9517 from IgniteUI/bpenkov/date-editor-formatting

Treat all year formats that are not "yy" as "yyyy"

Author: Lipata

projects/igniteui-angular/src/lib/date-common/util/date-time.util.spec.ts

@@ -44,6 +44,32 @@ describe(`DateTimeUtil Unit tests`, () => {
             expect(resDict[DatePart.Date]).toEqual(jasmine.objectContaining({ start: 3, end: 5 }));
             expect(resDict[DatePart.Year]).toEqual(jasmine.objectContaining({ start: 6, end: 8 }));
 
+            // d/M/y should be 00/00/0000
+            result = DateTimeUtil.parseDateTimeFormat('d/M/y');
+            resDict = reduceToDictionary(result);
+            expect(result.length).toEqual(5);
+            expect(resDict[DatePart.Date]).toEqual(jasmine.objectContaining({ start: 0, end: 2 }));
+            expect(resDict[DatePart.Month]).toEqual(jasmine.objectContaining({ start: 3, end: 5 }));
+            expect(resDict[DatePart.Year]).toEqual(jasmine.objectContaining({ start: 6, end: 10 }));
+
+            // d/M/yyy should be 00/00/0000
+            result = DateTimeUtil.parseDateTimeFormat('d/M/yyy');
+            resDict = reduceToDictionary(result);
+            expect(result.length).toEqual(5);
+            expect(resDict[DatePart.Date]).toEqual(jasmine.objectContaining({ start: 0, end: 2 }));
+            expect(resDict[DatePart.Month]).toEqual(jasmine.objectContaining({ start: 3, end: 5 }));
+            expect(resDict[DatePart.Year]).toEqual(jasmine.objectContaining({ start: 6, end: 10 }));
+
+
+            // d/M/yyyy should 00/00/0000
+            result = DateTimeUtil.parseDateTimeFormat('d/M/yyyy');
+            resDict = reduceToDictionary(result);
+            expect(result.length).toEqual(5);
+            expect(resDict[DatePart.Date]).toEqual(jasmine.objectContaining({ start: 0, end: 2 }));
+            expect(resDict[DatePart.Month]).toEqual(jasmine.objectContaining({ start: 3, end: 5 }));
+            expect(resDict[DatePart.Year]).toEqual(jasmine.objectContaining({ start: 6, end: 10 }));
+
+
             // H:m:s should be 00:00:00
             result = DateTimeUtil.parseDateTimeFormat('H:m:s');
             resDict = reduceToDictionary(result);

projects/igniteui-angular/src/lib/date-common/util/date-time.util.ts

@@ -113,6 +113,12 @@ export abstract class DateTimeUtil {
         if (!dateTimeParts.filter(p => p.format.includes(currentPart.format)).length) {
             DateTimeUtil.addCurrentPart(currentPart, dateTimeParts);
         }
+        // formats like "y" or "yyy" are treated like "yyyy" while editing
+        const yearPart = dateTimeParts.filter(p => p.type === DatePart.Year)[0];
+        if (yearPart && yearPart.format !== 'yy') {
+            yearPart.end += 4 - yearPart.format.length;
+            yearPart.format = 'yyyy';
+        }
 
         return dateTimeParts;
     }