Merge pull request #14 from bogdanmarin/master

make default advanced cron valid when seconds or years are removed
claudiuconstantin · Mar 6, 2019 · c2d3ca0 · c2d3ca0
2 parents 642746d + cfe8f1c
commit c2d3ca0
Showing 1 changed file with 17 additions and 1 deletion.
diff --git a/projects/cron-editor/src/lib/cron-editor.component.ts b/projects/cron-editor/src/lib/cron-editor.component.ts
@@ -372,6 +372,22 @@ export class CronEditorComponent implements OnInit, OnChanges {
     return;
   }
 
+  private getDefaultAdvancedCronExpression(): string {
+    if (this.options.removeSeconds && !this.options.removeYears) {
+      return '15 10 L-2 * ? 2019';
+    }
+
+    if (!this.options.removeSeconds && this.options.removeYears) {
+      return '0 15 10 L-2 * ?';
+    }
+
+    if (this.options.removeSeconds && this.options.removeYears) {
+      return '15 10 L-2 * ?';
+    }
+
+    return '0 15 10 L-2 * ? 2019';
+  }
+
   private getDefaultState() {
     const [defaultHours, defaultMinutes, defaultSeconds] = this.options.defaultTime.split(':').map(Number);
 
@@ -455,7 +471,7 @@ export class CronEditorComponent implements OnInit, OnChanges {
         }
       },
       advanced: {
-        expression: '0 15 10 L-2 * ?'
+        expression: this.getDefaultAdvancedCronExpression()
       },
       validation: {
         isValid: true,