Mirrors/super-productivity
1
0
Fork 0
mirror of https://github.com/johannesjo/super-productivity.git synced 2026-07-31 19:50:44 +00:00
Code Issues Projects Releases Wiki Activity

feat(dailySummary): prepare lastDayWorked model

Browse source
This commit is contained in:
Johannes Millan 2019-06-26 12:52:38 +02:00
parent 8309d4a570
commit 80916c0202
3 changed files with 39 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/app/features/project/project.service.ts
View file

@ -1,5 +1,5 @@
import {Injectable} from '@angular/core';
import {Observable} from 'rxjs';
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs';
import {
BreakNr,
BreakTime,
@ -12,9 +12,9 @@ import {
SimpleSummarySettings,
WorklogExportSettings
} from './project.model';
import {PersistenceService} from '../../core/persistence/persistence.service';
import {select, Store} from '@ngrx/store';
import {ProjectActionTypes, UpdateProjectOrder} from './store/project.actions';
import { PersistenceService } from '../../core/persistence/persistence.service';
import { select, Store } from '@ngrx/store';
import { ProjectActionTypes, UpdateProjectOrder } from './store/project.actions';
import shortid from 'shortid';
import {
initialProjectState,
@ -31,21 +31,22 @@ import {
selectProjectById,
selectProjectGithubCfg,
selectProjectJiraCfg,
selectProjectLastWorkEnd,
selectProjectWorkEndForDay,
selectProjectWorkStartForDay,
selectUnarchivedProjects
} from './store/project.reducer';
import {IssueIntegrationCfg, IssueProviderKey} from '../issue/issue';
import {JiraCfg} from '../issue/jira/jira';
import {DEFAULT_PROJECT} from './project.const';
import {Dictionary} from '@ngrx/entity';
import {getWorklogStr} from '../../util/get-work-log-str';
import {GithubCfg} from '../issue/github/github';
import {DEFAULT_ISSUE_PROVIDER_CFGS} from '../issue/issue.const';
import {Actions, ofType} from '@ngrx/effects';
import {distinctUntilChanged, take} from 'rxjs/operators';
import {isValidProjectExport} from './util/is-valid-project-export';
import {SnackService} from '../../core/snack/snack.service';
import { IssueIntegrationCfg, IssueProviderKey } from '../issue/issue';
import { JiraCfg } from '../issue/jira/jira';
import { DEFAULT_PROJECT } from './project.const';
import { Dictionary } from '@ngrx/entity';
import { getWorklogStr } from '../../util/get-work-log-str';
import { GithubCfg } from '../issue/github/github';
import { DEFAULT_ISSUE_PROVIDER_CFGS } from '../issue/issue.const';
import { Actions, ofType } from '@ngrx/effects';
import { distinctUntilChanged, take } from 'rxjs/operators';
import { isValidProjectExport } from './util/is-valid-project-export';
import { SnackService } from '../../core/snack/snack.service';
@Injectable({
providedIn: 'root',
@ -89,6 +90,8 @@ export class ProjectService {
breakTime$: Observable<BreakTime> = this._store$.pipe(select(selectProjectBreakTime));
breakNr$: Observable<BreakNr> = this._store$.pipe(select(selectProjectBreakNr));
lastWorkEnd$: Observable<number> = this._store$.pipe(select(selectProjectLastWorkEnd));
// DYNAMIC
workStartToday$: Observable<number> = this._store$.pipe(select(selectProjectWorkStartForDay, {day: getWorklogStr()}));
workEndToday$: Observable<number> = this._store$.pipe(select(selectProjectWorkEndForDay, {day: getWorklogStr()}));
@ -104,6 +107,7 @@ export class ProjectService {
private readonly _actions$: Actions,
) {
this.currentId$.subscribe((id) => this.currentId = id);
this.lastWorkEnd$.subscribe((val) => console.log('lastWorkEnd$', val));
}
async load() {

23
src/app/features/project/store/project.reducer.ts
View file

@ -1,8 +1,9 @@
import {createEntityAdapter, EntityAdapter, EntityState} from '@ngrx/entity';
import {BreakNrCopy, BreakNr, Project, WorkStartEnd, ProjectBasicCfg} from '../project.model';
import {ProjectActions, ProjectActionTypes} from './project.actions';
import {createFeatureSelector, createSelector} from '@ngrx/store';
import {FIRST_PROJECT} from '../project.const';
import { createEntityAdapter, EntityAdapter, EntityState } from '@ngrx/entity';
import { BreakNr, BreakNrCopy, Project, ProjectBasicCfg, WorkStartEnd } from '../project.model';
import { ProjectActions, ProjectActionTypes } from './project.actions';
import { createFeatureSelector, createSelector } from '@ngrx/store';
import { FIRST_PROJECT } from '../project.const';
import { sortStringDates } from '../../../util/sortStringDates';
export const PROJECT_FEATURE_NAME = 'projects';
@ -47,6 +48,18 @@ export const selectProjectBasicCfg = createSelector(selectCurrentProject, (proje
return basic;
});
export const selectProjectLastWorkEnd = createSelector(
selectProjectWorkEnd,
(workEnd: WorkStartEnd): number => {
if (!workEnd) {
return;
}
const allDates = Object.keys(workEnd);
const lastDate = sortStringDates(allDates)[allDates.length - 1];
return workEnd[lastDate];
}
);
// DYNAMIC SELECTORS
// -----------------

1
src/app/features/worklog/worklog.service.ts
View file

@ -60,6 +60,7 @@ export class WorklogService {
this._archiveUpdateTrigger$.next(true);
}
// TODO this is not waiting for worklog data
getTaskListForRange(rangeStart: Date, rangeEnd: Date, isFilterOutTimeSpentOnOtherDays = false): WorklogTask[] {
let tasks = this._getAllWorklogTasks();