Visualize Active Schedule and schedules todo
This commit is contained in:
		
							parent
							
								
									f2149358fa
								
							
						
					
					
						commit
						606e89b287
					
				@ -4,7 +4,14 @@
 | 
				
			|||||||
    <option name="autoReloadType" value="SELECTIVE" />
 | 
					    <option name="autoReloadType" value="SELECTIVE" />
 | 
				
			||||||
  </component>
 | 
					  </component>
 | 
				
			||||||
  <component name="ChangeListManager">
 | 
					  <component name="ChangeListManager">
 | 
				
			||||||
    <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Fix Foreign Key Constraint Fail when deleting Taskgroups" />
 | 
					    <list default="true" id="3a869f59-290a-4ab2-b036-a878ce801bc4" name="Changes" comment="Fix Foreign Key Constraint Fail when deleting Taskgroups">
 | 
				
			||||||
 | 
					      <change afterPath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/taskSchedule/ScheduleActivateInfo.java" afterDir="false" />
 | 
				
			||||||
 | 
					      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
 | 
				
			||||||
 | 
					      <change beforePath="$PROJECT_DIR$/src/main/java/core/api/controller/ScheduleController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/api/controller/ScheduleController.java" afterDir="false" />
 | 
				
			||||||
 | 
					      <change beforePath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/taskSchedule/ScheduleInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/api/models/timemanager/taskSchedule/ScheduleInfo.java" afterDir="false" />
 | 
				
			||||||
 | 
					      <change beforePath="$PROJECT_DIR$/src/main/java/core/repositories/timemanager/BasicTaskScheduleRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/repositories/timemanager/BasicTaskScheduleRepository.java" afterDir="false" />
 | 
				
			||||||
 | 
					      <change beforePath="$PROJECT_DIR$/src/main/java/core/services/TaskScheduleService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/core/services/TaskScheduleService.java" afterDir="false" />
 | 
				
			||||||
 | 
					    </list>
 | 
				
			||||||
    <option name="SHOW_DIALOG" value="false" />
 | 
					    <option name="SHOW_DIALOG" value="false" />
 | 
				
			||||||
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
 | 
					    <option name="HIGHLIGHT_CONFLICTS" value="true" />
 | 
				
			||||||
    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
 | 
					    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
 | 
				
			||||||
@ -94,7 +101,7 @@
 | 
				
			|||||||
      <workItem from="1698067098771" duration="4770000" />
 | 
					      <workItem from="1698067098771" duration="4770000" />
 | 
				
			||||||
      <workItem from="1698127431684" duration="2039000" />
 | 
					      <workItem from="1698127431684" duration="2039000" />
 | 
				
			||||||
      <workItem from="1698164397550" duration="2329000" />
 | 
					      <workItem from="1698164397550" duration="2329000" />
 | 
				
			||||||
      <workItem from="1698246651541" duration="1537000" />
 | 
					      <workItem from="1698246651541" duration="4710000" />
 | 
				
			||||||
    </task>
 | 
					    </task>
 | 
				
			||||||
    <task id="LOCAL-00001" summary="Structure Taskgroups in Hierarchies">
 | 
					    <task id="LOCAL-00001" summary="Structure Taskgroups in Hierarchies">
 | 
				
			||||||
      <option name="closed" value="true" />
 | 
					      <option name="closed" value="true" />
 | 
				
			||||||
@ -198,7 +205,7 @@
 | 
				
			|||||||
        </line-breakpoint>
 | 
					        </line-breakpoint>
 | 
				
			||||||
        <line-breakpoint enabled="true" type="java-line">
 | 
					        <line-breakpoint enabled="true" type="java-line">
 | 
				
			||||||
          <url>file://$PROJECT_DIR$/src/main/java/core/api/controller/ScheduleController.java</url>
 | 
					          <url>file://$PROJECT_DIR$/src/main/java/core/api/controller/ScheduleController.java</url>
 | 
				
			||||||
          <line>41</line>
 | 
					          <line>42</line>
 | 
				
			||||||
          <option name="timeStamp" value="2" />
 | 
					          <option name="timeStamp" value="2" />
 | 
				
			||||||
        </line-breakpoint>
 | 
					        </line-breakpoint>
 | 
				
			||||||
      </breakpoints>
 | 
					      </breakpoints>
 | 
				
			||||||
 | 
				
			|||||||
@ -3,6 +3,7 @@ package core.api.controller;
 | 
				
			|||||||
import core.api.models.auth.SimpleStatusResponse;
 | 
					import core.api.models.auth.SimpleStatusResponse;
 | 
				
			||||||
import core.api.models.timemanager.taskSchedule.BasicTaskScheduleEntityInfo;
 | 
					import core.api.models.timemanager.taskSchedule.BasicTaskScheduleEntityInfo;
 | 
				
			||||||
import core.api.models.timemanager.taskSchedule.BasicTaskScheduleFieldInfo;
 | 
					import core.api.models.timemanager.taskSchedule.BasicTaskScheduleFieldInfo;
 | 
				
			||||||
 | 
					import core.api.models.timemanager.taskSchedule.ScheduleActivateInfo;
 | 
				
			||||||
import core.api.models.timemanager.taskSchedule.ScheduleInfo;
 | 
					import core.api.models.timemanager.taskSchedule.ScheduleInfo;
 | 
				
			||||||
import core.entities.timemanager.BasicTaskSchedule;
 | 
					import core.entities.timemanager.BasicTaskSchedule;
 | 
				
			||||||
import core.entities.timemanager.ScheduleType;
 | 
					import core.entities.timemanager.ScheduleType;
 | 
				
			||||||
@ -139,4 +140,33 @@ public class ScheduleController {
 | 
				
			|||||||
            return ResponseEntity.ok(new BasicTaskScheduleEntityInfo(scheduleResult.getResult()));
 | 
					            return ResponseEntity.ok(new BasicTaskScheduleEntityInfo(scheduleResult.getResult()));
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @GetMapping("/schedules/active")
 | 
				
			||||||
 | 
					    public ResponseEntity<?> getActiveSchedule() {
 | 
				
			||||||
 | 
					        ServiceResult<BasicTaskSchedule> activeScheduleResult = taskScheduleService.getActiveSchedule(SecurityContextHolder.getContext().getAuthentication().getName());
 | 
				
			||||||
 | 
					        if(activeScheduleResult.getExitCode() == ServiceExitCode.MISSING_ENTITY) {
 | 
				
			||||||
 | 
					            return ResponseEntity.status(404).body(new SimpleStatusResponse("failed"));
 | 
				
			||||||
 | 
					        } else {
 | 
				
			||||||
 | 
					            return ResponseEntity.ok(new ScheduleInfo(activeScheduleResult.getResult()));
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @PostMapping("/schedules/{scheduleID}/activate")
 | 
				
			||||||
 | 
					    public ResponseEntity<?> activateSchedule(@PathVariable long scheduleID) {
 | 
				
			||||||
 | 
					        PermissionResult<BasicTaskSchedule> schedulePermissionResult = taskScheduleService.getSchedulePermissions(scheduleID, SecurityContextHolder.getContext().getAuthentication().getName());
 | 
				
			||||||
 | 
					        if(!schedulePermissionResult.isHasPermissions()) {
 | 
				
			||||||
 | 
					            return ResponseEntity.status(403).body(new SimpleStatusResponse("failed"));
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if(schedulePermissionResult.getExitCode() == ServiceExitCode.MISSING_ENTITY) {
 | 
				
			||||||
 | 
					            return ResponseEntity.status(404).body(new SimpleStatusResponse("failed"));
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        ServiceResult<BasicTaskSchedule> scheduleActivateResult = taskScheduleService.activateSchedule(schedulePermissionResult.getResult());
 | 
				
			||||||
 | 
					        if(scheduleActivateResult.getExitCode() == ServiceExitCode.ENTITY_ALREADY_EXIST) {
 | 
				
			||||||
 | 
					            return ResponseEntity.status(409).body(new SimpleStatusResponse("failed"));
 | 
				
			||||||
 | 
					        } else {
 | 
				
			||||||
 | 
					            return ResponseEntity.ok(new ScheduleActivateInfo(scheduleActivateResult.getResult().getStartTime()));
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
@ -0,0 +1,21 @@
 | 
				
			|||||||
 | 
					package core.api.models.timemanager.taskSchedule;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import java.time.LocalDate;
 | 
				
			||||||
 | 
					import java.time.LocalDateTime;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					public class ScheduleActivateInfo {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    private LocalDateTime startTime;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public ScheduleActivateInfo(LocalDateTime startTime) {
 | 
				
			||||||
 | 
					        this.startTime = startTime;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public LocalDateTime getStartTime() {
 | 
				
			||||||
 | 
					        return startTime;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public void setStartTime(LocalDateTime startTime) {
 | 
				
			||||||
 | 
					        this.startTime = startTime;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@ -32,7 +32,7 @@ public class ScheduleInfo {
 | 
				
			|||||||
        this.finishTime = basicTaskSchedule.getFinishedTime();
 | 
					        this.finishTime = basicTaskSchedule.getFinishedTime();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        if(this.finishTime == null && this.startTime != null) {
 | 
					        if(this.finishTime == null && this.startTime != null) {
 | 
				
			||||||
            this.activeMinutes = (int) Duration.between(basicTaskSchedule.getStartTime(), LocalDate.now()).toMinutes();
 | 
					            this.activeMinutes = (int) Duration.between(basicTaskSchedule.getStartTime(), LocalDateTime.now()).toMinutes();
 | 
				
			||||||
        } else if(this.startTime != null){
 | 
					        } else if(this.startTime != null){
 | 
				
			||||||
            this.activeMinutes = (int) Duration.between(basicTaskSchedule.getStartTime(), basicTaskSchedule.getFinishedTime()).toMinutes();
 | 
					            this.activeMinutes = (int) Duration.between(basicTaskSchedule.getStartTime(), basicTaskSchedule.getFinishedTime()).toMinutes();
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
				
			|||||||
@ -11,6 +11,7 @@ import org.springframework.stereotype.Repository;
 | 
				
			|||||||
import javax.transaction.Transactional;
 | 
					import javax.transaction.Transactional;
 | 
				
			||||||
import java.time.LocalDate;
 | 
					import java.time.LocalDate;
 | 
				
			||||||
import java.util.List;
 | 
					import java.util.List;
 | 
				
			||||||
 | 
					import java.util.Optional;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@Repository
 | 
					@Repository
 | 
				
			||||||
public interface BasicTaskScheduleRepository extends CrudRepository<BasicTaskSchedule, Long> {
 | 
					public interface BasicTaskScheduleRepository extends CrudRepository<BasicTaskSchedule, Long> {
 | 
				
			||||||
@ -30,4 +31,7 @@ public interface BasicTaskScheduleRepository extends CrudRepository<BasicTaskSch
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    @Query(value = "SELECT bts FROM BasicTaskSchedule bts WHERE bts.task.taskgroup.user = ?1 AND bts.scheduleDate = ?2")
 | 
					    @Query(value = "SELECT bts FROM BasicTaskSchedule bts WHERE bts.task.taskgroup.user = ?1 AND bts.scheduleDate = ?2")
 | 
				
			||||||
    List<BasicTaskSchedule> findAllByUserAndDate(User user, LocalDate localDate);
 | 
					    List<BasicTaskSchedule> findAllByUserAndDate(User user, LocalDate localDate);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @Query(value = "SELECT bts FROM BasicTaskSchedule bts WHERE bts.task.taskgroup.user.username = ?1 AND bts.startTime is not null  and bts.finishedTime is null")
 | 
				
			||||||
 | 
					    Optional<BasicTaskSchedule> findActiveTaskSchedule(String username);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 | 
				
			|||||||
import org.springframework.stereotype.Service;
 | 
					import org.springframework.stereotype.Service;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import java.time.LocalDate;
 | 
					import java.time.LocalDate;
 | 
				
			||||||
 | 
					import java.time.LocalDateTime;
 | 
				
			||||||
import java.util.List;
 | 
					import java.util.List;
 | 
				
			||||||
import java.util.Optional;
 | 
					import java.util.Optional;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -80,4 +81,19 @@ public class TaskScheduleService {
 | 
				
			|||||||
    public void deleteScheduleByTask(Task task) {
 | 
					    public void deleteScheduleByTask(Task task) {
 | 
				
			||||||
        basicTaskScheduleRepository.deleteAllByTask(task);
 | 
					        basicTaskScheduleRepository.deleteAllByTask(task);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public ServiceResult<BasicTaskSchedule> getActiveSchedule(String username) {
 | 
				
			||||||
 | 
					        Optional<BasicTaskSchedule> activeTaskScheduleResult = basicTaskScheduleRepository.findActiveTaskSchedule(username);
 | 
				
			||||||
 | 
					        return activeTaskScheduleResult.map(ServiceResult::new).orElseGet(() -> new ServiceResult<>(ServiceExitCode.MISSING_ENTITY));
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public ServiceResult<BasicTaskSchedule> activateSchedule(BasicTaskSchedule taskSchedule) {
 | 
				
			||||||
 | 
					        if(getActiveSchedule(taskSchedule.getTask().getTaskgroup().getUser().getUsername()).getExitCode() == ServiceExitCode.MISSING_ENTITY) {
 | 
				
			||||||
 | 
					            taskSchedule.setStartTime(LocalDateTime.now());
 | 
				
			||||||
 | 
					            basicTaskScheduleRepository.save(taskSchedule);
 | 
				
			||||||
 | 
					            return new ServiceResult<>(taskSchedule);
 | 
				
			||||||
 | 
					        } else {
 | 
				
			||||||
 | 
					            return new ServiceResult<>(ServiceExitCode.ENTITY_ALREADY_EXIST);
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
@ -28,6 +28,7 @@ model/passwordChangeRequest.ts
 | 
				
			|||||||
model/propertiesInfo.ts
 | 
					model/propertiesInfo.ts
 | 
				
			||||||
model/propertyInfo.ts
 | 
					model/propertyInfo.ts
 | 
				
			||||||
model/propertyUpdateRequest.ts
 | 
					model/propertyUpdateRequest.ts
 | 
				
			||||||
 | 
					model/scheduleActivateInfo.ts
 | 
				
			||||||
model/scheduleInfo.ts
 | 
					model/scheduleInfo.ts
 | 
				
			||||||
model/signUpRequest.ts
 | 
					model/signUpRequest.ts
 | 
				
			||||||
model/simpleStatusResponse.ts
 | 
					model/simpleStatusResponse.ts
 | 
				
			||||||
 | 
				
			|||||||
@ -20,6 +20,7 @@ import { Observable }                                        from 'rxjs';
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
import { BasicScheduleEntityInfo } from '../model/models';
 | 
					import { BasicScheduleEntityInfo } from '../model/models';
 | 
				
			||||||
import { BasicScheduleFieldInfo } from '../model/models';
 | 
					import { BasicScheduleFieldInfo } from '../model/models';
 | 
				
			||||||
 | 
					import { ScheduleActivateInfo } from '../model/models';
 | 
				
			||||||
import { ScheduleInfo } from '../model/models';
 | 
					import { ScheduleInfo } from '../model/models';
 | 
				
			||||||
import { SimpleStatusResponse } from '../model/models';
 | 
					import { SimpleStatusResponse } from '../model/models';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -88,6 +89,61 @@ export class ScheduleService {
 | 
				
			|||||||
        return httpParams;
 | 
					        return httpParams;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    /**
 | 
				
			||||||
 | 
					     * get active schedule
 | 
				
			||||||
 | 
					     * get active schedule
 | 
				
			||||||
 | 
					     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
 | 
				
			||||||
 | 
					     * @param reportProgress flag to report request and response progress.
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    public schedulesActiveGet(observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<ScheduleInfo>;
 | 
				
			||||||
 | 
					    public schedulesActiveGet(observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpResponse<ScheduleInfo>>;
 | 
				
			||||||
 | 
					    public schedulesActiveGet(observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpEvent<ScheduleInfo>>;
 | 
				
			||||||
 | 
					    public schedulesActiveGet(observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<any> {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        let localVarHeaders = this.defaultHeaders;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        let localVarCredential: string | undefined;
 | 
				
			||||||
 | 
					        // authentication (API_TOKEN) required
 | 
				
			||||||
 | 
					        localVarCredential = this.configuration.lookupCredential('API_TOKEN');
 | 
				
			||||||
 | 
					        if (localVarCredential) {
 | 
				
			||||||
 | 
					            localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential);
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept;
 | 
				
			||||||
 | 
					        if (localVarHttpHeaderAcceptSelected === undefined) {
 | 
				
			||||||
 | 
					            // to determine the Accept header
 | 
				
			||||||
 | 
					            const httpHeaderAccepts: string[] = [
 | 
				
			||||||
 | 
					                'application/json'
 | 
				
			||||||
 | 
					            ];
 | 
				
			||||||
 | 
					            localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts);
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        if (localVarHttpHeaderAcceptSelected !== undefined) {
 | 
				
			||||||
 | 
					            localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected);
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        let localVarHttpContext: HttpContext | undefined = options && options.context;
 | 
				
			||||||
 | 
					        if (localVarHttpContext === undefined) {
 | 
				
			||||||
 | 
					            localVarHttpContext = new HttpContext();
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        let responseType_: 'text' | 'json' = 'json';
 | 
				
			||||||
 | 
					        if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) {
 | 
				
			||||||
 | 
					            responseType_ = 'text';
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        return this.httpClient.get<ScheduleInfo>(`${this.configuration.basePath}/schedules/active`,
 | 
				
			||||||
 | 
					            {
 | 
				
			||||||
 | 
					                context: localVarHttpContext,
 | 
				
			||||||
 | 
					                responseType: <any>responseType_,
 | 
				
			||||||
 | 
					                withCredentials: this.configuration.withCredentials,
 | 
				
			||||||
 | 
					                headers: localVarHeaders,
 | 
				
			||||||
 | 
					                observe: observe,
 | 
				
			||||||
 | 
					                reportProgress: reportProgress
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        );
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    /**
 | 
					    /**
 | 
				
			||||||
     * gets all schedules of user
 | 
					     * gets all schedules of user
 | 
				
			||||||
     * gets all schedules of user
 | 
					     * gets all schedules of user
 | 
				
			||||||
@ -143,6 +199,66 @@ export class ScheduleService {
 | 
				
			|||||||
        );
 | 
					        );
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    /**
 | 
				
			||||||
 | 
					     * activates schedule
 | 
				
			||||||
 | 
					     * activates schedule
 | 
				
			||||||
 | 
					     * @param scheduleID internal id of schedule
 | 
				
			||||||
 | 
					     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
 | 
				
			||||||
 | 
					     * @param reportProgress flag to report request and response progress.
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    public schedulesScheduleIDActivatePost(scheduleID: number, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<ScheduleActivateInfo>;
 | 
				
			||||||
 | 
					    public schedulesScheduleIDActivatePost(scheduleID: number, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpResponse<ScheduleActivateInfo>>;
 | 
				
			||||||
 | 
					    public schedulesScheduleIDActivatePost(scheduleID: number, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpEvent<ScheduleActivateInfo>>;
 | 
				
			||||||
 | 
					    public schedulesScheduleIDActivatePost(scheduleID: number, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<any> {
 | 
				
			||||||
 | 
					        if (scheduleID === null || scheduleID === undefined) {
 | 
				
			||||||
 | 
					            throw new Error('Required parameter scheduleID was null or undefined when calling schedulesScheduleIDActivatePost.');
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        let localVarHeaders = this.defaultHeaders;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        let localVarCredential: string | undefined;
 | 
				
			||||||
 | 
					        // authentication (API_TOKEN) required
 | 
				
			||||||
 | 
					        localVarCredential = this.configuration.lookupCredential('API_TOKEN');
 | 
				
			||||||
 | 
					        if (localVarCredential) {
 | 
				
			||||||
 | 
					            localVarHeaders = localVarHeaders.set('Authorization', 'Bearer ' + localVarCredential);
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept;
 | 
				
			||||||
 | 
					        if (localVarHttpHeaderAcceptSelected === undefined) {
 | 
				
			||||||
 | 
					            // to determine the Accept header
 | 
				
			||||||
 | 
					            const httpHeaderAccepts: string[] = [
 | 
				
			||||||
 | 
					                'application/json'
 | 
				
			||||||
 | 
					            ];
 | 
				
			||||||
 | 
					            localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts);
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        if (localVarHttpHeaderAcceptSelected !== undefined) {
 | 
				
			||||||
 | 
					            localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected);
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        let localVarHttpContext: HttpContext | undefined = options && options.context;
 | 
				
			||||||
 | 
					        if (localVarHttpContext === undefined) {
 | 
				
			||||||
 | 
					            localVarHttpContext = new HttpContext();
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        let responseType_: 'text' | 'json' = 'json';
 | 
				
			||||||
 | 
					        if(localVarHttpHeaderAcceptSelected && localVarHttpHeaderAcceptSelected.startsWith('text')) {
 | 
				
			||||||
 | 
					            responseType_ = 'text';
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        return this.httpClient.post<ScheduleActivateInfo>(`${this.configuration.basePath}/schedules/${encodeURIComponent(String(scheduleID))}/activate`,
 | 
				
			||||||
 | 
					            null,
 | 
				
			||||||
 | 
					            {
 | 
				
			||||||
 | 
					                context: localVarHttpContext,
 | 
				
			||||||
 | 
					                responseType: <any>responseType_,
 | 
				
			||||||
 | 
					                withCredentials: this.configuration.withCredentials,
 | 
				
			||||||
 | 
					                headers: localVarHeaders,
 | 
				
			||||||
 | 
					                observe: observe,
 | 
				
			||||||
 | 
					                reportProgress: reportProgress
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        );
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    /**
 | 
					    /**
 | 
				
			||||||
     * reschedules task
 | 
					     * reschedules task
 | 
				
			||||||
     * reschedules a task
 | 
					     * reschedules a task
 | 
				
			||||||
 | 
				
			|||||||
@ -12,6 +12,7 @@ export * from './passwordChangeRequest';
 | 
				
			|||||||
export * from './propertiesInfo';
 | 
					export * from './propertiesInfo';
 | 
				
			||||||
export * from './propertyInfo';
 | 
					export * from './propertyInfo';
 | 
				
			||||||
export * from './propertyUpdateRequest';
 | 
					export * from './propertyUpdateRequest';
 | 
				
			||||||
 | 
					export * from './scheduleActivateInfo';
 | 
				
			||||||
export * from './scheduleInfo';
 | 
					export * from './scheduleInfo';
 | 
				
			||||||
export * from './signUpRequest';
 | 
					export * from './signUpRequest';
 | 
				
			||||||
export * from './simpleStatusResponse';
 | 
					export * from './simpleStatusResponse';
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										20
									
								
								frontend/src/api/model/scheduleActivateInfo.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										20
									
								
								frontend/src/api/model/scheduleActivateInfo.ts
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,20 @@
 | 
				
			|||||||
 | 
					/**
 | 
				
			||||||
 | 
					 * API Title
 | 
				
			||||||
 | 
					 * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 | 
					 * The version of the OpenAPI document: 1.0
 | 
				
			||||||
 | 
					 * 
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 | 
					 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
 | 
				
			||||||
 | 
					 * https://openapi-generator.tech
 | 
				
			||||||
 | 
					 * Do not edit the class manually.
 | 
				
			||||||
 | 
					 */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					export interface ScheduleActivateInfo { 
 | 
				
			||||||
 | 
					    /**
 | 
				
			||||||
 | 
					     * point in time at which the schedule was started
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    startTime: string;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -63,6 +63,7 @@ import {MatSelectModule} from "@angular/material/select";
 | 
				
			|||||||
import { BasicSchedulerComponent } from './schedules/basic-scheduler/basic-scheduler.component';
 | 
					import { BasicSchedulerComponent } from './schedules/basic-scheduler/basic-scheduler.component';
 | 
				
			||||||
import { ScheduleDashboardComponent } from './schedules/schedule-dashboard/schedule-dashboard.component';
 | 
					import { ScheduleDashboardComponent } from './schedules/schedule-dashboard/schedule-dashboard.component';
 | 
				
			||||||
import { DashboardComponent } from './dashboard/dashboard.component';
 | 
					import { DashboardComponent } from './dashboard/dashboard.component';
 | 
				
			||||||
 | 
					import { ActiveScheduleComponent } from './dashboard/active-schedule/active-schedule.component';
 | 
				
			||||||
@NgModule({
 | 
					@NgModule({
 | 
				
			||||||
  declarations: [
 | 
					  declarations: [
 | 
				
			||||||
    AppComponent,
 | 
					    AppComponent,
 | 
				
			||||||
@ -90,7 +91,8 @@ import { DashboardComponent } from './dashboard/dashboard.component';
 | 
				
			|||||||
    SchedulerComponent,
 | 
					    SchedulerComponent,
 | 
				
			||||||
    BasicSchedulerComponent,
 | 
					    BasicSchedulerComponent,
 | 
				
			||||||
    ScheduleDashboardComponent,
 | 
					    ScheduleDashboardComponent,
 | 
				
			||||||
    DashboardComponent
 | 
					    DashboardComponent,
 | 
				
			||||||
 | 
					    ActiveScheduleComponent
 | 
				
			||||||
  ],
 | 
					  ],
 | 
				
			||||||
  imports: [
 | 
					  imports: [
 | 
				
			||||||
    BrowserModule,
 | 
					    BrowserModule,
 | 
				
			||||||
 | 
				
			|||||||
@ -0,0 +1,141 @@
 | 
				
			|||||||
 | 
					.container {
 | 
				
			||||||
 | 
					  margin: 20px auto;
 | 
				
			||||||
 | 
					  width: 70%;
 | 
				
			||||||
 | 
					  display: flex;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					.spacer {
 | 
				
			||||||
 | 
					  margin-bottom: 2.5%;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					@media screen and (max-width: 600px) {
 | 
				
			||||||
 | 
					  .container {
 | 
				
			||||||
 | 
					    width: 100%;
 | 
				
			||||||
 | 
					    margin: 20px 10px;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					.today-worked-info {
 | 
				
			||||||
 | 
					  margin-left: 20px;
 | 
				
			||||||
 | 
					  background-color: #e1e1e1;
 | 
				
			||||||
 | 
					  padding-right: 5px;
 | 
				
			||||||
 | 
					  padding-left: 5px;
 | 
				
			||||||
 | 
					  border-radius: 5px;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					.red-card {
 | 
				
			||||||
 | 
					  background-color: #e54c3c;
 | 
				
			||||||
 | 
					  color: white;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					.green-card {
 | 
				
			||||||
 | 
					  background-color: #00bc8c;
 | 
				
			||||||
 | 
					  color: white;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					.main-container {
 | 
				
			||||||
 | 
					  width: 45%;
 | 
				
			||||||
 | 
					  margin-right: 20px;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					.btn-link {
 | 
				
			||||||
 | 
					  text-decoration: underline;
 | 
				
			||||||
 | 
					  color: white;
 | 
				
			||||||
 | 
					  margin-left: 20px;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					.dashboard-heading {
 | 
				
			||||||
 | 
					  margin-top: 20px;
 | 
				
			||||||
 | 
					  font-size: 2.5em;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					.today-worked-info {
 | 
				
			||||||
 | 
					  font-size: .8em;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					.lightBlueBtn {
 | 
				
			||||||
 | 
					  background-color: #3498db;
 | 
				
			||||||
 | 
					  color: white;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					.grayBtn {
 | 
				
			||||||
 | 
					  background-color: #444444;
 | 
				
			||||||
 | 
					  color: white;
 | 
				
			||||||
 | 
					  border-radius: 0;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					::ng-deep .mat-mdc-list-base {
 | 
				
			||||||
 | 
					  --mdc-list-list-item-label-text-color: white
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					::ng-deep .mat-mdc-list-base .taskgroup-btn, ::ng-deep .mat-mdc-list-base .taskgroup-last-btn  {
 | 
				
			||||||
 | 
					  --mdc-list-list-item-label-text-color: black
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					.taskgroup-overview {
 | 
				
			||||||
 | 
					  width: 25%;
 | 
				
			||||||
 | 
					  float: right;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					.spacer {
 | 
				
			||||||
 | 
					  flex: 1 1 auto;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					.taskgroup-btn {
 | 
				
			||||||
 | 
					  background-color: #f3f3f3;
 | 
				
			||||||
 | 
					  border: 0 solid #000000;
 | 
				
			||||||
 | 
					  border-bottom-width: 1px;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					.taskgroup-last-btn {
 | 
				
			||||||
 | 
					  background-color: #f3f3f3;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					.link-no-deco {
 | 
				
			||||||
 | 
					  text-decoration: none;
 | 
				
			||||||
 | 
					  color: black;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					.link-no-deco:hover{
 | 
				
			||||||
 | 
					  text-decoration: underline;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					.gray-text {
 | 
				
			||||||
 | 
					  color: #6e6e6e;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					.yellowBtn {
 | 
				
			||||||
 | 
					  background-color: #f39c12;
 | 
				
			||||||
 | 
					  color: white;
 | 
				
			||||||
 | 
					  border-radius: 0;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					.primaryBtn {
 | 
				
			||||||
 | 
					  border-radius: 0;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					::ng-deep .mat-mdc-card-header-text {
 | 
				
			||||||
 | 
					  display: block;
 | 
				
			||||||
 | 
					  width: 100%;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					.schedule-del-btn {
 | 
				
			||||||
 | 
					  margin-top: 10px;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					.left-actions {
 | 
				
			||||||
 | 
					  float: left;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					.right-actions {
 | 
				
			||||||
 | 
					  float: right;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					.greenBtn {
 | 
				
			||||||
 | 
					  background-color: #00bc8c;
 | 
				
			||||||
 | 
					  color: white;
 | 
				
			||||||
 | 
					  border-radius: 0;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@ -0,0 +1,19 @@
 | 
				
			|||||||
 | 
					<mat-card class="green-card" *ngIf="activeSchedule == undefined">
 | 
				
			||||||
 | 
					  <mat-card-content>
 | 
				
			||||||
 | 
					    <p>Currently there is no task in progress.</p>
 | 
				
			||||||
 | 
					    <a class="btn-link" routerLink="/">Did you forget to start an activity?</a>
 | 
				
			||||||
 | 
					  </mat-card-content>
 | 
				
			||||||
 | 
					</mat-card>
 | 
				
			||||||
 | 
					<mat-card *ngIf="activeSchedule != undefined">
 | 
				
			||||||
 | 
					  <mat-card-header>
 | 
				
			||||||
 | 
					    <mat-card-title><a routerLink="/" class="link-no-deco">{{activeSchedule!.task.taskName}}</a></mat-card-title>
 | 
				
			||||||
 | 
					  </mat-card-header>
 | 
				
			||||||
 | 
					  <mat-card-content>
 | 
				
			||||||
 | 
					    <span *ngFor="let taskgroupPath of activeSchedule!.taskgroupPath">{{taskgroupPath.taskgroupName}} /</span>
 | 
				
			||||||
 | 
					    <p class="gray-text" *ngIf="activeSchedule!.scheduleType==='BASIC'">Running for {{displayTime}}</p>
 | 
				
			||||||
 | 
					  </mat-card-content>
 | 
				
			||||||
 | 
					  <mat-card-actions>
 | 
				
			||||||
 | 
					    <button mat-raised-button class="grayBtn">Stop</button>
 | 
				
			||||||
 | 
					    <button mat-raised-button class="greenBtn">Finish</button>
 | 
				
			||||||
 | 
					  </mat-card-actions>
 | 
				
			||||||
 | 
					</mat-card>
 | 
				
			||||||
@ -0,0 +1,21 @@
 | 
				
			|||||||
 | 
					import { ComponentFixture, TestBed } from '@angular/core/testing';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import { ActiveScheduleComponent } from './active-schedule.component';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					describe('ActiveScheduleComponent', () => {
 | 
				
			||||||
 | 
					  let component: ActiveScheduleComponent;
 | 
				
			||||||
 | 
					  let fixture: ComponentFixture<ActiveScheduleComponent>;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  beforeEach(() => {
 | 
				
			||||||
 | 
					    TestBed.configureTestingModule({
 | 
				
			||||||
 | 
					      declarations: [ActiveScheduleComponent]
 | 
				
			||||||
 | 
					    });
 | 
				
			||||||
 | 
					    fixture = TestBed.createComponent(ActiveScheduleComponent);
 | 
				
			||||||
 | 
					    component = fixture.componentInstance;
 | 
				
			||||||
 | 
					    fixture.detectChanges();
 | 
				
			||||||
 | 
					  });
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  it('should create', () => {
 | 
				
			||||||
 | 
					    expect(component).toBeTruthy();
 | 
				
			||||||
 | 
					  });
 | 
				
			||||||
 | 
					});
 | 
				
			||||||
@ -0,0 +1,51 @@
 | 
				
			|||||||
 | 
					import {Component, Input, OnInit} from '@angular/core';
 | 
				
			||||||
 | 
					import {ScheduleInfo, ScheduleService} from "../../../api";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					@Component({
 | 
				
			||||||
 | 
					  selector: 'app-active-schedule',
 | 
				
			||||||
 | 
					  templateUrl: './active-schedule.component.html',
 | 
				
			||||||
 | 
					  styleUrls: ['./active-schedule.component.css']
 | 
				
			||||||
 | 
					})
 | 
				
			||||||
 | 
					export class ActiveScheduleComponent implements OnInit{
 | 
				
			||||||
 | 
					  activeSchedule: ScheduleInfo | undefined
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  startTime: number = 0;
 | 
				
			||||||
 | 
					  currentTime: number = 0;
 | 
				
			||||||
 | 
					  displayTime: string = "00:00:00"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  constructor(private scheduleService: ScheduleService) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  updateTime() {
 | 
				
			||||||
 | 
					    const now = Date.now();
 | 
				
			||||||
 | 
					    const elapsed = this.activeSchedule != undefined ? now - this.startTime + this.currentTime : this.currentTime;
 | 
				
			||||||
 | 
					    this.displayTime = this.formatTime(elapsed);
 | 
				
			||||||
 | 
					    console.log("Update!")
 | 
				
			||||||
 | 
					    requestAnimationFrame(() => this.updateTime());
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  formatTime(milliseconds: number): string {
 | 
				
			||||||
 | 
					    const seconds = Math.floor((milliseconds / 1000) % 60);
 | 
				
			||||||
 | 
					    const minutes = Math.floor((milliseconds / 1000 / 60) % 60);
 | 
				
			||||||
 | 
					    const hours = Math.floor(milliseconds / 1000 / 60 / 60);
 | 
				
			||||||
 | 
					    return `${this.padNumber(hours)}:${this.padNumber(minutes)}:${this.padNumber(seconds)}`;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  padNumber(num: number): string {
 | 
				
			||||||
 | 
					    return num < 10 ? `0${num}` : `${num}`;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  ngOnInit(): void {
 | 
				
			||||||
 | 
					    this.scheduleService.schedulesActiveGet().subscribe({
 | 
				
			||||||
 | 
					      next: resp => {
 | 
				
			||||||
 | 
					        this.activeSchedule = resp;
 | 
				
			||||||
 | 
					        this.startTime = new Date(this.activeSchedule.startTime).getTime();
 | 
				
			||||||
 | 
					        this.updateTime()
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
 | 
					    })
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@ -8,12 +8,7 @@
 | 
				
			|||||||
    </mat-card>
 | 
					    </mat-card>
 | 
				
			||||||
    <h1 class="dashboard-heading">Now<b class="today-worked-info">Today: 0 min</b></h1>
 | 
					    <h1 class="dashboard-heading">Now<b class="today-worked-info">Today: 0 min</b></h1>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    <mat-card class="green-card" *ngIf="!taskRunning">
 | 
					    <app-active-schedule #activeSchedule></app-active-schedule>
 | 
				
			||||||
      <mat-card-content>
 | 
					 | 
				
			||||||
        <p>Currently there is no task in progress.</p>
 | 
					 | 
				
			||||||
        <a class="btn-link" routerLink="/">Did you forget to start an activity?</a>
 | 
					 | 
				
			||||||
      </mat-card-content>
 | 
					 | 
				
			||||||
    </mat-card>
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    <h1 class="dashboard-heading">Scheduled for today</h1>
 | 
					    <h1 class="dashboard-heading">Scheduled for today</h1>
 | 
				
			||||||
    <mat-card class="green-card" *ngIf="schedules.length == 0">
 | 
					    <mat-card class="green-card" *ngIf="schedules.length == 0">
 | 
				
			||||||
@ -22,6 +17,8 @@
 | 
				
			|||||||
      </mat-card-content>
 | 
					      </mat-card-content>
 | 
				
			||||||
    </mat-card>
 | 
					    </mat-card>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    <div>
 | 
					    <div>
 | 
				
			||||||
      <mat-card *ngFor="let schedule of schedules">
 | 
					      <mat-card *ngFor="let schedule of schedules">
 | 
				
			||||||
        <mat-card-header>
 | 
					        <mat-card-header>
 | 
				
			||||||
@ -34,7 +31,7 @@
 | 
				
			|||||||
          <p class="gray-text" *ngIf="schedule.scheduleType==='BASIC'">To be done sometime today</p>
 | 
					          <p class="gray-text" *ngIf="schedule.scheduleType==='BASIC'">To be done sometime today</p>
 | 
				
			||||||
        </mat-card-content>
 | 
					        </mat-card-content>
 | 
				
			||||||
        <mat-card-actions>
 | 
					        <mat-card-actions>
 | 
				
			||||||
          <button mat-raised-button color="primary" class="primaryBtn">Start now</button>
 | 
					          <button mat-raised-button color="primary" class="primaryBtn" (click)="startSchedule(schedule)" [disabled]="activeScheduleComponent!.activeSchedule != undefined">Start now</button>
 | 
				
			||||||
          <button mat-raised-button class="yellowBtn">Reschedule</button>
 | 
					          <button mat-raised-button class="yellowBtn">Reschedule</button>
 | 
				
			||||||
        </mat-card-actions>
 | 
					        </mat-card-actions>
 | 
				
			||||||
      </mat-card>
 | 
					      </mat-card>
 | 
				
			||||||
 | 
				
			|||||||
@ -1,5 +1,6 @@
 | 
				
			|||||||
import {Component, OnInit} from '@angular/core';
 | 
					import {Component, OnInit, ViewChild} from '@angular/core';
 | 
				
			||||||
import {ScheduleInfo, ScheduleService} from "../../api";
 | 
					import {ScheduleInfo, ScheduleService} from "../../api";
 | 
				
			||||||
 | 
					import {ActiveScheduleComponent} from "./active-schedule/active-schedule.component";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@Component({
 | 
					@Component({
 | 
				
			||||||
  selector: 'app-dashboard',
 | 
					  selector: 'app-dashboard',
 | 
				
			||||||
@ -9,9 +10,9 @@ import {ScheduleInfo, ScheduleService} from "../../api";
 | 
				
			|||||||
export class DashboardComponent implements OnInit{
 | 
					export class DashboardComponent implements OnInit{
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  missedSchedules: boolean = true
 | 
					  missedSchedules: boolean = true
 | 
				
			||||||
  taskRunning: boolean = false
 | 
					 | 
				
			||||||
  schedules: ScheduleInfo[] = []
 | 
					  schedules: ScheduleInfo[] = []
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  @ViewChild('activeSchedule') activeScheduleComponent: ActiveScheduleComponent | undefined
 | 
				
			||||||
  constructor(private scheduleService: ScheduleService) {
 | 
					  constructor(private scheduleService: ScheduleService) {
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -21,5 +22,20 @@ export class DashboardComponent implements OnInit{
 | 
				
			|||||||
        this.schedules = resp;
 | 
					        this.schedules = resp;
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
    })
 | 
					    })
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  startSchedule(schedule: ScheduleInfo) {
 | 
				
			||||||
 | 
					    this.scheduleService.schedulesScheduleIDActivatePost(schedule.scheduleID).subscribe({
 | 
				
			||||||
 | 
					      next: resp => {
 | 
				
			||||||
 | 
					        schedule.startTime = resp.startTime;
 | 
				
			||||||
 | 
					        if(this.activeScheduleComponent != undefined) {
 | 
				
			||||||
 | 
					          this.activeScheduleComponent.activeSchedule = schedule;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
 | 
					    })
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										76
									
								
								openapi.yaml
									
									
									
									
									
								
							
							
						
						
									
										76
									
								
								openapi.yaml
									
									
									
									
									
								
							@ -1417,6 +1417,73 @@ paths:
 | 
				
			|||||||
              schema:
 | 
					              schema:
 | 
				
			||||||
                type: object
 | 
					                type: object
 | 
				
			||||||
                $ref: "#/components/schemas/SimpleStatusResponse"
 | 
					                $ref: "#/components/schemas/SimpleStatusResponse"
 | 
				
			||||||
 | 
					  /schedules/active: 
 | 
				
			||||||
 | 
					    get:
 | 
				
			||||||
 | 
					      security:
 | 
				
			||||||
 | 
					        - API_TOKEN: []
 | 
				
			||||||
 | 
					      tags:
 | 
				
			||||||
 | 
					        - schedule
 | 
				
			||||||
 | 
					      description: get active schedule
 | 
				
			||||||
 | 
					      summary: get active schedule
 | 
				
			||||||
 | 
					      responses:
 | 
				
			||||||
 | 
					        200:
 | 
				
			||||||
 | 
					          description: operation successfull
 | 
				
			||||||
 | 
					          content:
 | 
				
			||||||
 | 
					            application/json:
 | 
				
			||||||
 | 
					              schema:
 | 
				
			||||||
 | 
					                $ref: '#/components/schemas/ScheduleInfo'
 | 
				
			||||||
 | 
					        404:
 | 
				
			||||||
 | 
					          description: there is no active schedule
 | 
				
			||||||
 | 
					          content:
 | 
				
			||||||
 | 
					            application/json:
 | 
				
			||||||
 | 
					              schema:
 | 
				
			||||||
 | 
					                $ref: '#/components/schemas/SimpleStatusResponse'
 | 
				
			||||||
 | 
					  /schedules/{scheduleID}/activate:
 | 
				
			||||||
 | 
					    post:
 | 
				
			||||||
 | 
					      security:
 | 
				
			||||||
 | 
					        - API_TOKEN: []
 | 
				
			||||||
 | 
					      tags:
 | 
				
			||||||
 | 
					        - schedule
 | 
				
			||||||
 | 
					      description: activates schedule
 | 
				
			||||||
 | 
					      summary: activates schedule
 | 
				
			||||||
 | 
					      parameters:
 | 
				
			||||||
 | 
					        - name: scheduleID
 | 
				
			||||||
 | 
					          in: path
 | 
				
			||||||
 | 
					          description: internal id of schedule
 | 
				
			||||||
 | 
					          required: true
 | 
				
			||||||
 | 
					          schema:
 | 
				
			||||||
 | 
					            type: number
 | 
				
			||||||
 | 
					            example: 1
 | 
				
			||||||
 | 
					      responses:
 | 
				
			||||||
 | 
					        200:
 | 
				
			||||||
 | 
					          description: Operation successfull
 | 
				
			||||||
 | 
					          content:
 | 
				
			||||||
 | 
					            application/json:
 | 
				
			||||||
 | 
					              schema:
 | 
				
			||||||
 | 
					                type: object
 | 
				
			||||||
 | 
					                $ref: '#/components/schemas/ScheduleActivateInfo'
 | 
				
			||||||
 | 
					        403:
 | 
				
			||||||
 | 
					          description: No permission
 | 
				
			||||||
 | 
					          content:
 | 
				
			||||||
 | 
					            'application/json':
 | 
				
			||||||
 | 
					              schema:
 | 
				
			||||||
 | 
					                type: object
 | 
				
			||||||
 | 
					                $ref: "#/components/schemas/SimpleStatusResponse"
 | 
				
			||||||
 | 
					        404:
 | 
				
			||||||
 | 
					          description: Schedule does not exist
 | 
				
			||||||
 | 
					          content:
 | 
				
			||||||
 | 
					            'application/json':
 | 
				
			||||||
 | 
					              schema:
 | 
				
			||||||
 | 
					                type: object
 | 
				
			||||||
 | 
					                $ref: "#/components/schemas/SimpleStatusResponse"
 | 
				
			||||||
 | 
					        409:
 | 
				
			||||||
 | 
					          description: Task is already running
 | 
				
			||||||
 | 
					          content:
 | 
				
			||||||
 | 
					            'application/json':
 | 
				
			||||||
 | 
					              schema:
 | 
				
			||||||
 | 
					                type: object
 | 
				
			||||||
 | 
					                $ref: "#/components/schemas/SimpleStatusResponse"
 | 
				
			||||||
 | 
					      
 | 
				
			||||||
      
 | 
					      
 | 
				
			||||||
      
 | 
					      
 | 
				
			||||||
components:
 | 
					components:
 | 
				
			||||||
@ -1834,3 +1901,12 @@ components:
 | 
				
			|||||||
          type: string
 | 
					          type: string
 | 
				
			||||||
          description: name of task
 | 
					          description: name of task
 | 
				
			||||||
          example: "Vorlesung zusammenfassen"
 | 
					          example: "Vorlesung zusammenfassen"
 | 
				
			||||||
 | 
					    ScheduleActivateInfo:
 | 
				
			||||||
 | 
					      required:
 | 
				
			||||||
 | 
					        - startTime
 | 
				
			||||||
 | 
					      additionalProperties: false
 | 
				
			||||||
 | 
					      properties:
 | 
				
			||||||
 | 
					        startTime:
 | 
				
			||||||
 | 
					          type: string
 | 
				
			||||||
 | 
					          format: date-time
 | 
				
			||||||
 | 
					          description: point in time at which the schedule was started
 | 
				
			||||||
		Loading…
	
		Reference in New Issue
	
	Block a user