TheLanc3/YoutubeDL-Material
1
0
Fork 0
mirror of https://github.com/Tzahi12345/YoutubeDL-Material.git synced 2026-04-23 08:03:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug where task time was not properly set with values of 0

Browse Source 
Fixed issue where time field was not properly populated in the schedule dialog
This commit is contained in:
Isaac Abadi
2022-04-24 04:10:27 -04:00
parent 0bc2193f25
commit 0585943d67
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
backend/tasks.js
View File

@@ -42,9 +42,9 @@ function scheduleJob(task_key, schedule) {
if (schedule['type'] === 'timestamp') { if (schedule['type'] === 'timestamp') {
converted_schedule = new Date(schedule['data']['timestamp']); converted_schedule = new Date(schedule['data']['timestamp']);
} else if (schedule['type'] === 'recurring') { } else if (schedule['type'] === 'recurring') {
const dayOfWeek = schedule['data']['dayOfWeek'] ? schedule['data']['dayOfWeek'] : null; const dayOfWeek = schedule['data']['dayOfWeek'] != null ? schedule['data']['dayOfWeek'] : null;
const hour = schedule['data']['hour'] ? schedule['data']['hour'] : null; const hour = schedule['data']['hour'] != null ? schedule['data']['hour'] : null;
const minute = schedule['data']['minute'] ? schedule['data']['minute'] : null; const minute = schedule['data']['minute'] != null ? schedule['data']['minute'] : null;
converted_schedule = new scheduler.RecurrenceRule(null, null, null, dayOfWeek, hour, minute); converted_schedule = new scheduler.RecurrenceRule(null, null, null, dayOfWeek, hour, minute);
} else { } else {
logger.error(`Failed to schedule job '${task_key}' as the type '${schedule['type']}' is invalid.`) logger.error(`Failed to schedule job '${task_key}' as the type '${schedule['type']}' is invalid.`)

13
src/app/dialogs/update-task-schedule-dialog/update-task-schedule-dialog.component.ts
View File

@@ -1,6 +1,6 @@
import { Component, Inject, OnInit } from '@angular/core'; import { Component, Inject, OnInit } from '@angular/core';
import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
import { Schedule } from 'api-types'; import { Schedule, Task } from 'api-types';
import { PostsService } from 'app/posts.services'; import { PostsService } from 'app/posts.services';
@Component({ @Component({
@@ -18,7 +18,7 @@ export class UpdateTaskScheduleDialogComponent implements OnInit {
date = null; date = null;
today = new Date(); today = new Date();
constructor(@Inject(MAT_DIALOG_DATA) public data: any, private dialogRef: MatDialogRef<UpdateTaskScheduleDialogComponent>, private postsService: PostsService) { constructor(@Inject(MAT_DIALOG_DATA) public data: {task: Task}, private dialogRef: MatDialogRef<UpdateTaskScheduleDialogComponent>, private postsService: PostsService) {
this.processTask(this.data.task); this.processTask(this.data.task);
this.postsService.getTask(this.data.task.key).subscribe(res => { this.postsService.getTask(this.data.task.key).subscribe(res => {
this.processTask(res['task']); this.processTask(res['task']);
@@ -28,7 +28,7 @@ export class UpdateTaskScheduleDialogComponent implements OnInit {
ngOnInit(): void { ngOnInit(): void {
} }
processTask(task) { processTask(task: Task): void {
if (!task['schedule']) { if (!task['schedule']) {
this.enabled = false; this.enabled = false;
return; return;
@@ -39,7 +39,11 @@ export class UpdateTaskScheduleDialogComponent implements OnInit {
this.recurring = schedule['type'] === Schedule.type.RECURRING; this.recurring = schedule['type'] === Schedule.type.RECURRING;
if (this.recurring) { if (this.recurring) {
this.time = `${schedule['data']['hour']}:${schedule['data']['minute']}`; const hour = schedule['data']['hour'];
const minute = schedule['data']['minute'];
// add padding 0s if necessary to hours and minutes
this.time = (hour < 10 ? '0' : '') + hour + ':' + (minute < 10 ? '0' : '') + minute;
if (schedule['data']['dayOfWeek']) { if (schedule['data']['dayOfWeek']) {
this.days_of_week = schedule['data']['dayOfWeek']; this.days_of_week = schedule['data']['dayOfWeek'];
@@ -75,7 +79,6 @@ export class UpdateTaskScheduleDialogComponent implements OnInit {
} }
} else { } else {
this.date.setHours(hours, minutes); this.date.setHours(hours, minutes);
console.log(this.date);
schedule['data'] = {timestamp: this.date.getTime()}; schedule['data'] = {timestamp: this.date.getTime()};
} }
this.dialogRef.close(schedule); this.dialogRef.close(schedule);